SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2020-12-03 06:37:59 +01:00
parent b34862e469
commit e2e6d4cc13

View file

@ -1,8 +1,26 @@
[Global]
IconName=preferences-system-windows-effect-screenshot
Name=Plasma
Name[ca]=Plasma
Name[nl]=Plasma
Name[pt]=Plasma
Name[sv]=Plasma
Name[uk]=Плазма
Name[x-test]=xxPlasmaxx
[Event/captured]
Name=Captured
Name[ca]=Captura
Name[nl]=Opgenomen
Name[pt]=Capturada
Name[sv]=Lagrad
Name[uk]=Захоплено
Name[x-test]=xxCapturedxx
Comment=Captured
Comment[ca]=Captura
Comment[nl]=Opgenomen
Comment[pt]=Capturada
Comment[sv]=Lagrad
Comment[uk]=Захоплено
Comment[x-test]=xxCapturedxx
Action=Popup