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:
parent
6c7e5adca1
commit
9d0eda2582
2 changed files with 3 additions and 0 deletions
|
@ -26,6 +26,7 @@
|
|||
"Description[uk]": "Знайти цей пристрій, наказавши йому відтворити дзвінок",
|
||||
"Description[x-test]": "xxFind this device by making it play an alarm soundxx",
|
||||
"Description[zh_CN]": "通过播放铃声来找到您不见的手机",
|
||||
"Description[zh_TW]": "讓手機發出警報聲,以讓您找到這個裝置。",
|
||||
"EnabledByDefault": true,
|
||||
"Icon": "edit-find",
|
||||
"Id": "kdeconnect_findthisdevice",
|
||||
|
@ -47,6 +48,7 @@
|
|||
"Name[uk]": "Знайти цей пристрій",
|
||||
"Name[x-test]": "xxFind this devicexx",
|
||||
"Name[zh_CN]": "查找此设备",
|
||||
"Name[zh_TW]": "尋找這個裝置",
|
||||
"ServiceTypes": [
|
||||
"KdeConnect/Plugin"
|
||||
],
|
||||
|
|
|
@ -23,5 +23,6 @@ Name[pt_BR]=Configurações do plugin Procurar Este Dispositivo
|
|||
Name[sv]=Inställningar av insticksprogrammet Hitta apparaten
|
||||
Name[uk]=Параметри додатка пошуку пристрою
|
||||
Name[x-test]=xxFind This Device plugin settingsxx
|
||||
Name[zh_TW]=尋找此裝置的外掛設定
|
||||
|
||||
Categories=Qt;KDE;X-KDE-settings-kdeconnect;
|
||||
|
|
Loading…
Reference in a new issue