Commit 089b0d25 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 73dfd6e6
......@@ -71,6 +71,7 @@ Name[ug]=ھۆججەت شىفىرلاش
Name[uk]=Зашифрувати файл
Name[vi]=Mã Hóa Tập Tin
Name[wa]=Ecripter fitchî
Name[x-test]=xxEncrypt Filexx
Name[zh_CN]=加密文件
Name[zh_TW]=加密檔案
Icon=document-encrypt
......
......@@ -64,6 +64,7 @@ Name[tr]=Dizini Arşivle ve Şifrele
Name[ug]=ئارخىپلاش ۋە قىسقۇچ شىفىرلاش
Name[uk]=Зробити архів теки і зашифрувати
Name[vi]=Đóng Gói & Mã Hóa Thư Mục
Name[x-test]=xxArchive & Encrypt Folderxx
Name[zh_CN]=存档并加密文件夹
Name[zh_TW]=壓縮並加密資料夾
Icon=kgpg
......
......@@ -70,6 +70,7 @@ GenericName[tr]=Şifreleme Aracı
GenericName[ug]=شىفىرلاش قورالى
GenericName[uk]=Засіб для шифрування
GenericName[vi]=Công Cụ Mã Hóa
GenericName[x-test]=xxEncryption Toolxx
GenericName[zh_CN]=加密工具
GenericName[zh_TW]=加密工具
Comment=A GnuPG frontend
......@@ -136,6 +137,7 @@ Comment[uk]=Інтерфейс до GnuPG
Comment[uz]=GnuPG uchun grafik interfeys
Comment[uz@cyrillic]=GnuPG учун график интерфейс
Comment[wa]=Ene eterface po GnuPG
Comment[x-test]=xxA GnuPG frontendxx
Comment[zh_CN]=GnuPG 前端
Comment[zh_TW]=GnuPG 前端軟體
Terminal=false
......@@ -206,6 +208,7 @@ Name[uz]=KGpg
Name[uz@cyrillic]=KGpg
Name[vi]=KGpg
Name[wa]=KGpg
Name[x-test]=xxKGpgxx
Name[zh_CN]=KGpg
Name[zh_TW]=KGpg
......
......@@ -56,6 +56,7 @@ Name[sv]=Visa filen avkodad
Name[th]=ดูแฟ้มที่ถูกเข้ารหัส
Name[tr]=Dosyayı şifrelemesi açılmış olarak göster
Name[uk]=Перегляньте розшифрований файл
Name[x-test]=xxView file decryptedxx
Name[zh_CN]=查看解密文件
Name[zh_TW]=檢視解密後檔案
Icon=document-edit-decrypt-verify
......
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