marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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-04 06:29:34 +01:00
parent e2e6d4cc13
commit 99e43d39a2
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plasma_phone_components.notifyrc
View file

@ -2,8 +2,10 @@
IconName=preferences-system-windows-effect-screenshot IconName=preferences-system-windows-effect-screenshot
Name=Plasma Name=Plasma
Name[ca]=Plasma Name[ca]=Plasma
Name[es]=Plasma
Name[nl]=Plasma Name[nl]=Plasma
Name[pt]=Plasma Name[pt]=Plasma
Name[sl]=Plasma
Name[sv]=Plasma Name[sv]=Plasma
Name[uk]=Плазма Name[uk]=Плазма
Name[x-test]=xxPlasmaxx Name[x-test]=xxPlasmaxx
@ -11,15 +13,19 @@ Name[x-test]=xxPlasmaxx
[Event/captured] [Event/captured]
Name=Captured Name=Captured
Name[ca]=Captura Name[ca]=Captura
Name[es]=Capturado
Name[nl]=Opgenomen Name[nl]=Opgenomen
Name[pt]=Capturada Name[pt]=Capturada
Name[sl]=Zajeto
Name[sv]=Lagrad Name[sv]=Lagrad
Name[uk]=Захоплено Name[uk]=Захоплено
Name[x-test]=xxCapturedxx Name[x-test]=xxCapturedxx
Comment=Captured Comment=Captured
Comment[ca]=Captura Comment[ca]=Captura
Comment[es]=Capturado
Comment[nl]=Opgenomen Comment[nl]=Opgenomen
Comment[pt]=Capturada Comment[pt]=Capturada
Comment[sl]=Zajeto
Comment[sv]=Lagrad Comment[sv]=Lagrad
Comment[uk]=Захоплено Comment[uk]=Захоплено
Comment[x-test]=xxCapturedxx Comment[x-test]=xxCapturedxx