marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-01 09:18:07 +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-16 06:45:25 +01:00
parent 1abb6737e4
commit 1933626d36
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

@ -7,6 +7,7 @@ Name[cs]=Plasma
Name[en_GB]=Plasma Name[en_GB]=Plasma
Name[es]=Plasma Name[es]=Plasma
Name[ia]=Plasma Name[ia]=Plasma
Name[it]=Plasma
Name[nl]=Plasma Name[nl]=Plasma
Name[nn]=Plasma Name[nn]=Plasma
Name[pt]=Plasma Name[pt]=Plasma
@ -23,6 +24,7 @@ Name[ca]=Captura
Name[en_GB]=Captured Name[en_GB]=Captured
Name[es]=Capturado Name[es]=Capturado
Name[ia]=Capturate Name[ia]=Capturate
Name[it]=Catturato
Name[nl]=Opgenomen Name[nl]=Opgenomen
Name[nn]=Opptak Name[nn]=Opptak
Name[pt]=Capturada Name[pt]=Capturada
@ -36,6 +38,7 @@ Comment[ca]=Captura
Comment[en_GB]=Captured Comment[en_GB]=Captured
Comment[es]=Capturado Comment[es]=Capturado
Comment[ia]=Capturate Comment[ia]=Capturate
Comment[it]=Catturato
Comment[nl]=Opgenomen Comment[nl]=Opgenomen
Comment[nn]=Opptak Comment[nn]=Opptak
Comment[pt]=Capturada Comment[pt]=Capturada