Commit 4d877853 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 40f5301f
......@@ -63,6 +63,7 @@ Name[th]=เรียกปรับปรุงอัตโนมัติ
Name[tr]=Otomatik Tazele
Name[ug]=ئۆزلۈكىدىن يېڭىلا
Name[uk]=Автоматичне оновлення
Name[vi]=Cập nhật tự động
Name[x-test]=xxAuto Refreshxx
......@@ -125,6 +126,7 @@ Comment[th]=ส่วนเสริมเรียกปรับปรุง
Comment[tr]=Otomatik Yenileme eklentisi
Comment[ug]=ئۆزلۈكىدىن يېڭىلاش قىستۇرمىسى
Comment[uk]=Додаток автоматичного оновлення
Comment[vi]=Phần cài cắm cập nhật tự động
Comment[wa]=Tchôke-divins d' oto-rafristaedje
Comment[x-test]=xxAuto Refresh pluginxx
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