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-07-31 02:57:59 +00:00
parent ea0ed96731
commit 7b8b0c7fd5

View file

@ -13,6 +13,7 @@
"Name[de]": "Aleix Pol i Gonzalez",
"Name[en_GB]": "Aleix Pol i Gonzalez",
"Name[es]": "Aleix Pol i Gonzalez",
"Name[eu]": "Aleix Pol i Gonzalez",
"Name[fi]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[ia]": "Aleix Pol i Gonzalez",
@ -29,7 +30,8 @@
"Name[sv]": "Aleix Pol i Gonzalez",
"Name[tr]": "Aleix Pol i Gonzalez",
"Name[uk]": "Aleix Pol i Gonzalez",
"Name[x-test]": "xxAleix Pol i Gonzalezxx"
"Name[x-test]": "xxAleix Pol i Gonzalezxx",
"Name[zh_CN]": "Aleix Pol i Gonzalez"
}
],
"Description": "Use your devices as virtual monitors",
@ -42,6 +44,7 @@
"Description[de]": "Verwenden Sie Ihre Geräte als virtuelle Monitore",
"Description[en_GB]": "Use your devices as virtual monitors",
"Description[es]": "Usar sus dispositivos como monitores virtuales",
"Description[eu]": "Erabili zure gailuak alegiazko monitore gisa",
"Description[fi]": "Käytä laitteita virtuaalinäyttöinä",
"Description[fr]": "Utilisez vos périphériques comme des écrans virtuels",
"Description[ia]": "Usa tu dispositivos como monitor virtual",
@ -60,6 +63,7 @@
"Description[tr]": "Aygıtlarınızı sanal ekranlar olarak kullanın",
"Description[uk]": "Використання ваших пристроїв як віртуальних моніторів",
"Description[x-test]": "xxUse your devices as virtual monitorsxx",
"Description[zh_CN]": "使用您的设备作为虚拟显示器",
"EnabledByDefault": true,
"Icon": "video-monitor",
"Id": "kdeconnect_virtualmonitor",
@ -74,6 +78,7 @@
"Name[de]": "Virtueller Monitor",
"Name[en_GB]": "Virtual Monitor",
"Name[es]": "Monitor virtual",
"Name[eu]": "Alegiazko monitorea",
"Name[fi]": "Virtuaalinäyttö",
"Name[fr]": "Écran virtuel",
"Name[ia]": "Monitor virtual",
@ -92,6 +97,7 @@
"Name[tr]": "Sanal Ekran",
"Name[uk]": "Віртуальний монітор",
"Name[x-test]": "xxVirtual Monitorxx",
"Name[zh_CN]": "虚拟显示器",
"ServiceTypes": [
"KdeConnect/Plugin"
],