Commit 9d5c8502 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 bf3e2b52
......@@ -114,7 +114,7 @@ Comment[tg]=Файлҳои XML тавассути xmllint муайян меку
Comment[tr]=XML dosyalarını xmllint kullanarak doğrular
Comment[ug]=xmllint پروگرامما ئىشلىتىپ XML ھۆججەت دەلىللەيدۇ
Comment[uk]=Перевіряє файли XML за допомогою xmllint
Comment[vi]=Xác nhận các tập tin XML sử dụng xmllint
Comment[vi]=Xác nhận các tệp XML sử dụng xmllint
Comment[x-test]=xxValidates XML files using xmllintxx
Comment[zh_CN]=使用 xmllint 程序校验 XML 文件
Comment[zh_TW]=用 xmllint 來確認 XML 檔
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