Commit c61927ff authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 00c53f0c
......@@ -35,6 +35,7 @@
"Name[sv]": "Montering och avmontering av Plasma valv",
"Name[tg]": "Васл ва ҷудо кардани ҷузвадонҳои рамзгузории Plasma",
"Name[uk]": "Монтування і демонтування Сховища Плазми",
"Name[x-test]": "xxPlasma Vault mount and unmountxx",
"Name[zh_CN]": "Plasma Valut 挂载和卸载",
"Name[zh_TW]": "Plasma 儲存庫掛載與取消掛載",
"ServiceTypes": [
......
......@@ -38,6 +38,7 @@ Name[sv]=Plasma valvmodul
Name[tg]=Модули анбори рамзгузории Плазма
Name[tr]=Plazma Kasası modülü
Name[uk]=Модуль сховищ Плазми
Name[x-test]=xxPlasma Vault modulexx
Name[zh_CN]=Plasma 保险库模块
Name[zh_TW]=Plasma 儲存庫模組
Comment=Provides encrypted vaults
......@@ -79,6 +80,7 @@ Comment[sv]=Tillhandahåller krypterade valv
Comment[tg]=Анборҳои рамзгузоришударо таъмин менамояд
Comment[tr]=Şifreli kasalar sağlar
Comment[uk]=Надає доступ до шифрованих сховищ
Comment[x-test]=xxProvides encrypted vaultsxx
Comment[zh_CN]=提供加密的保险库
Comment[zh_TW]=提供加密過的儲存庫
......
......@@ -38,6 +38,7 @@ Name[sv]=Valv
Name[tg]=Анборҳои рамзгузорӣ
Name[tr]=Kasalar
Name[uk]=Сховища
Name[x-test]=xxVaultsxx
Name[zh_CN]=保险库
Name[zh_TW]=儲存庫
Comment=Create encrypted vaults
......@@ -79,6 +80,7 @@ Comment[sv]=Skapa krypterade valv
Comment[tg]=Эҷод кардани анборҳои рамзгузорӣ
Comment[tr]=Şifrelenmiş kasa oluştur
Comment[uk]=Створення шифрованих сховищ
Comment[x-test]=xxCreate encrypted vaultsxx
Comment[zh_CN]=创建加密的保险库
Comment[zh_TW]=建立加密過的儲存庫
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment