Commit c7140a64 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 dd7f871e
......@@ -42,7 +42,7 @@ Name[sr@ijekavian]=Рођендани и годишњице
Name[sr@ijekavianlatin]=Rođendani i godišnjice
Name[sr@latin]=Rođendani i godišnjice
Name[sv]=Födelsedagar och årsdagar
Name[tr]=Doğum günleri & Yıl dönümleri
Name[tr]=Doğum Günleri ve Yıl Dönümleri
Name[ug]=تۇغۇلغان كۈن ۋە خاتىرە كۈنلەر
Name[uk]=Дні народження і річниці весіль
Name[x-test]=xxBirthdays & Anniversariesxx
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