marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-28 22:53: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-06 06:09:24 +01:00
parent f9ab2bc9dd
commit 981851ea5e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plasma_phone_components.notifyrc
View file

@ -4,10 +4,12 @@ Name=Plasma
Name[ca]=Plasma Name[ca]=Plasma
Name[cs]=Plasma Name[cs]=Plasma
Name[es]=Plasma Name[es]=Plasma
Name[ia]=Plasma
Name[nl]=Plasma Name[nl]=Plasma
Name[nn]=Plasma Name[nn]=Plasma
Name[pt]=Plasma Name[pt]=Plasma
Name[pt_BR]=Plasma Name[pt_BR]=Plasma
Name[sk]=Plasma
Name[sl]=Plasma Name[sl]=Plasma
Name[sv]=Plasma Name[sv]=Plasma
Name[uk]=Плазма Name[uk]=Плазма
@ -17,6 +19,7 @@ Name[x-test]=xxPlasmaxx
Name=Captured Name=Captured
Name[ca]=Captura Name[ca]=Captura
Name[es]=Capturado Name[es]=Capturado
Name[ia]=Capturate
Name[nl]=Opgenomen Name[nl]=Opgenomen
Name[nn]=Opptak Name[nn]=Opptak
Name[pt]=Capturada Name[pt]=Capturada
@ -28,6 +31,7 @@ Name[x-test]=xxCapturedxx
Comment=Captured Comment=Captured
Comment[ca]=Captura Comment[ca]=Captura
Comment[es]=Capturado Comment[es]=Capturado
Comment[ia]=Capturate
Comment[nl]=Opgenomen Comment[nl]=Opgenomen
Comment[nn]=Opptak Comment[nn]=Opptak
Comment[pt]=Capturada Comment[pt]=Capturada