Commit 7b1fe272 authored by Script Kiddy's avatar Script Kiddy

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 a9de72ee
...@@ -140,7 +140,7 @@ Comment[tr]=Arşiv İşleme Aracı ...@@ -140,7 +140,7 @@ Comment[tr]=Arşiv İşleme Aracı
Comment[uk]=Засіб роботи з архівами Comment[uk]=Засіб роботи з архівами
Comment[uz]=Arxiv uchun vosita Comment[uz]=Arxiv uchun vosita
Comment[uz@cyrillic]=Архив учун восита Comment[uz@cyrillic]=Архив учун восита
Comment[vi]=Công Cụ Xử Lý Các Tập Tin Nén Comment[vi]=Công Cụ Xử Lý Các Tệp Nén
Comment[wa]=Usteye po-z apougnî les årtchives Comment[wa]=Usteye po-z apougnî les årtchives
Comment[xh]=Isixhobo sokuphatha i Archive Comment[xh]=Isixhobo sokuphatha i Archive
Comment[x-test]=xxArchive Handling Toolxx Comment[x-test]=xxArchive Handling Toolxx
......
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