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-08 02:04:40 +00:00
parent 76a24ad65f
commit 3c231724d5
2 changed files with 8 additions and 0 deletions

View file

@ -20,11 +20,13 @@
"Description[nn]": "Kopla til og synkroniser einingar",
"Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia",
"Description[pt]": "Ligue e sincronize os seus dispositivos",
"Description[pt_BR]": "Conecta e sincroniza seus dispositivos",
"Description[ru]": "Подключение и синхронизация с мобильными устройствами",
"Description[sl]": "Poveži in sinhroniziraj svoje naprave",
"Description[tr]": "Aygıtlarını bağla ve eşzamanla",
"Description[uk]": "З'єднання і синхронізація ваших пристроїв",
"Description[x-test]": "xxConnect and sync your devicesxx",
"Description[zh_CN]": "连接并同步您的设备",
"Description[zh_TW]": "與您的裝置連線並同步",
"Icon": "preferences-kde-connect",
"Name": "KDE Connect",
@ -46,11 +48,13 @@
"Name[nn]": "KDE Connect",
"Name[pl]": "KDE Connect",
"Name[pt]": "KDE Connect",
"Name[pt_BR]": "KDE Connect",
"Name[ru]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[tr]": "KDE Bağlan",
"Name[uk]": "KDE Connect",
"Name[x-test]": "xxKDE Connectxx",
"Name[zh_CN]": "KDE Connect",
"Name[zh_TW]": "KDE 連線"
},
"X-DocPath": "kdeconnect/index.html",

View file

@ -22,11 +22,13 @@
"Name[nn]": "Yoram Bar-Haim",
"Name[pl]": "Yoram Bar-Haim",
"Name[pt]": "Yoram Bar-Haim",
"Name[pt_BR]": "Yoram Bar-Haim",
"Name[ru]": "Yoram Bar-Haim",
"Name[sl]": "Yoram Bar-Haim",
"Name[tr]": "Yoram Bar-Haim",
"Name[uk]": "Йорам Бар-Хаїм",
"Name[x-test]": "xxYoram Bar-Haimxx",
"Name[zh_CN]": "Yoram Bar-Haim",
"Name[zh_TW]": "Yoram Bar-Haim"
}
],
@ -94,10 +96,12 @@
"Name[nn]": "ModemManager-telefoniintegrering",
"Name[pl]": "Integracja z telefonią zarządzania modemem",
"Name[pt]": "Integração telefónica com o ModemManager",
"Name[pt_BR]": "Integração telefônica do ModemManager",
"Name[sl]": "Upravljalnik modema integracija telefonije",
"Name[tr]": "ModemManager Telefon tümleştirmesi",
"Name[uk]": "Інтеграція телефонії ModemManager",
"Name[x-test]": "xxModemManager Telephony integrationxx",
"Name[zh_CN]": "ModemManager Telephony 集成",
"Name[zh_TW]": "ModemManager 電話整合",
"ServiceTypes": [
"KdeConnect/Plugin"