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-01-05 01:57:09 +00:00
parent 7896fc749d
commit 58de62cd8e
2 changed files with 5 additions and 0 deletions

View file

@ -5,12 +5,14 @@
"Description[ar]": "اتّصل وزامن أجهزتك",
"Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius",
"Description[ca]": "Connecta i sincronitza els vostres dispositius",
"Description[cs]": "Připojte a synchronizujte svá zařízení",
"Description[en_GB]": "Connect and sync your devices",
"Description[eu]": "Zure gailuak konektatu eta sinkronizatzea",
"Description[fr]": "Vous connecter à vos périphériques et se synchroniser avec eux",
"Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია",
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia",
"Description[pt]": "Ligue e sincronize os seus dispositivos",
"Description[sl]": "Poveži in sinhroniziraj svoje naprave",
"Description[tr]": "Aygıtlarını bağla ve eşzamanla",
"Description[uk]": "З'єднання і синхронізація ваших пристроїв",
@ -28,6 +30,7 @@
"Name[ka]": "KDE Connect",
"Name[nl]": "KDE Connect",
"Name[pl]": "KDE Connect",
"Name[pt]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[tr]": "KDE Connect",
"Name[uk]": "KDE Connect",

View file

@ -7,6 +7,7 @@
"Name[ar]": "يورام بار-هايم",
"Name[ca@valencia]": "Yoram Bar-Haim",
"Name[ca]": "Yoram Bar-Haim",
"Name[cs]": "Yoram Bar-Haim",
"Name[en_GB]": "Yoram Bar-Haim",
"Name[es]": "Yoram Bar-Haim",
"Name[eu]": "Yoram Bar-Haim",
@ -70,6 +71,7 @@
"Name[ar]": "تكامل هاتف ModemManager",
"Name[ca@valencia]": "Integració amb la telefonia de ModemManager",
"Name[ca]": "Integració amb la telefonia del ModemManager",
"Name[cs]": "Integrace telefonu pro ModemManager",
"Name[en_GB]": "ModemManager Telephony integration",
"Name[es]": "Integración con el teléfono ModemManager",
"Name[eu]": "«ModemManager» telefonia bateratzea",