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-12-26 02:06:05 +00:00
parent 61d6430cfc
commit 5476511e8b

View file

@ -54,7 +54,7 @@
"Description[az]": "Plasma Böyük ekranın işlək olduğu televizora səs əmri göndər", "Description[az]": "Plasma Böyük ekranın işlək olduğu televizora səs əmri göndər",
"Description[bg]": "Изпращане на гласови команди към телевизора с Bigscreen на Plasma", "Description[bg]": "Изпращане на гласови команди към телевизора с Bigscreen на Plasma",
"Description[ca@valencia]": "Envieu ordres de veu al TV executant Plasma Bigscreen", "Description[ca@valencia]": "Envieu ordres de veu al TV executant Plasma Bigscreen",
"Description[ca]": "Envieu ordres de veu al TV executant el Plasma Bigscreen", "Description[ca]": "Envieu ordres de veu al televisor executant el Plasma Bigscreen",
"Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen", "Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen",
"Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen", "Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
"Description[eo]": "Sendi voĉkomandojn al via televidilo kun Plasma Bigscreen", "Description[eo]": "Sendi voĉkomandojn al via televidilo kun Plasma Bigscreen",