Commit 4c6ed17a 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 ff28cfc1
...@@ -70,7 +70,7 @@ Name[th]=เข้ารหัสแฟ้ม ...@@ -70,7 +70,7 @@ Name[th]=เข้ารหัสแฟ้ม
Name[tr]=Dosya Şifrele Name[tr]=Dosya Şifrele
Name[ug]=ھۆججەت شىفىرلاش Name[ug]=ھۆججەت شىفىرلاش
Name[uk]=Зашифрувати файл Name[uk]=Зашифрувати файл
Name[vi]=Mã Hóa Tập Tin Name[vi]=Mã Hóa Tệp
Name[wa]=Ecripter fitchî Name[wa]=Ecripter fitchî
Name[x-test]=xxEncrypt Filexx Name[x-test]=xxEncrypt Filexx
Name[zh_CN]=加密文件 Name[zh_CN]=加密文件
......
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