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 2022-02-09 01:48:59 +00:00
parent f7ed3ac9f7
commit 0898ee2e80
3 changed files with 5 additions and 0 deletions

View file

@ -8,6 +8,7 @@ Name[ast]=Plasma
Name[ca]=Plasma
Name[ca@valencia]=Plasma
Name[cs]=Plasma
Name[da]=Plasma
Name[de]=Plasma
Name[en_GB]=Plasma
Name[es]=Plasma
@ -38,6 +39,7 @@ Name=Captured
Name[ca]=Capturat
Name[ca@valencia]=Capturat
Name[cs]=Zachyceno
Name[da]=Indfanget
Name[de]=Aufgenommen
Name[en_GB]=Captured
Name[es]=Capturado
@ -65,6 +67,7 @@ Comment=Captured
Comment[ca]=Capturat
Comment[ca@valencia]=Capturat
Comment[cs]=Zachyceno
Comment[da]=Indfanget
Comment[de]=Aufgenommen
Comment[en_GB]=Captured
Comment[es]=Capturado

View file

@ -6,6 +6,7 @@ Name=Airplane Mode
Name[ca]=Mode avió
Name[ca@valencia]=Mode avió
Name[cs]=Režim v Letadle
Name[da]=Flytilstand
Name[de]=Flugzeug-Modus
Name[en_GB]=Airplane Mode
Name[es]=Modo avión

View file

@ -6,6 +6,7 @@ Name=Night Color
Name[ca]=Color de nit
Name[ca@valencia]=Color de nit
Name[cs]=Noční barva
Name[da]=Natfarver
Name[de]=Nachtfarben
Name[en_GB]=Night Colour
Name[es]=Color nocturno