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 2023-02-28 02:08:05 +00:00
parent 2dc7364a23
commit 1bfe7c2659
3 changed files with 3 additions and 0 deletions

View file

@ -50,6 +50,7 @@
"Name[ca]": "Contrast del fons",
"Name[cs]": "Kontrast pozadí",
"Name[de]": "Hintergrundkontrast",
"Name[en_GB]": "Background Contrast",
"Name[es]": "Contraste del fondo",
"Name[eu]": "Atzeko planoaren kontrastea",
"Name[fr]": "Contraste de l'arrière-plan",

View file

@ -86,6 +86,7 @@
"Name[ca]": "Missatges emergents en metamorfosi",
"Name[cs]": "Morfující vyskakovací okna",
"Name[de]": "Verformende Aufklappfenster",
"Name[en_GB]": "Morphing Popups",
"Name[es]": "Transformación de ventanas emergentes",
"Name[eu]": "Eraldatzen diren gainerakorrak",
"Name[fr]": "Effectuer un fondu enchaîné des infobulles",

View file

@ -50,6 +50,7 @@
"Name[ca]": "Missatges emergents desplaçant-se",
"Name[cs]": "Klouzající vyskakovací okna",
"Name[de]": "Hereingleitende Aufklappfenster",
"Name[en_GB]": "Sliding Popups",
"Name[es]": "Deslizar ventanas emergentes",
"Name[eu]": "Gainerakor irristakorrak",
"Name[fr]": "Annotations glissantes",