marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-01 17:24:48 +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-13 06:38:47 +01:00
parent 3ca6a2d395
commit 417279e9c7
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plasma_phone_components.notifyrc
View file

@ -3,6 +3,7 @@ IconName=preferences-system-windows-effect-screenshot
Name=Plasma Name=Plasma
Name[ca]=Plasma Name[ca]=Plasma
Name[cs]=Plasma Name[cs]=Plasma
Name[en_GB]=Plasma
Name[es]=Plasma Name[es]=Plasma
Name[ia]=Plasma Name[ia]=Plasma
Name[nl]=Plasma Name[nl]=Plasma
@ -18,6 +19,7 @@ Name[x-test]=xxPlasmaxx
[Event/captured] [Event/captured]
Name=Captured Name=Captured
Name[ca]=Captura Name[ca]=Captura
Name[en_GB]=Captured
Name[es]=Capturado Name[es]=Capturado
Name[ia]=Capturate Name[ia]=Capturate
Name[nl]=Opgenomen Name[nl]=Opgenomen
@ -30,6 +32,7 @@ Name[uk]=Захоплено
Name[x-test]=xxCapturedxx Name[x-test]=xxCapturedxx
Comment=Captured Comment=Captured
Comment[ca]=Captura Comment[ca]=Captura
Comment[en_GB]=Captured
Comment[es]=Capturado Comment[es]=Capturado
Comment[ia]=Capturate Comment[ia]=Capturate
Comment[nl]=Opgenomen Comment[nl]=Opgenomen