Commit 6a05693e 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 02bdc53a
......@@ -33,6 +33,7 @@ Name[ru]=Шаблоны для дизайна
Name[sk]=Šablóny dizajnu
Name[sl]=Oblikovalske predloge
Name[sv]=Designmallar
Name[tg]=Қолабҳои тарҳсозӣ
Name[tr]=Tasarım Şablonları
Name[uk]=Шаблони компонування
Name[x-test]=xxDesign Templatesxx
......
......@@ -27,6 +27,7 @@ Name[pt]=Olá Mundo
Name[pt_BR]=Olá mundo
Name[sk]=Ahoj svet
Name[sv]=Hello World
Name[tg]=Салом ҷаҳон
Name[tr]=Merhaba Dünya
Name[uk]=Привіт, світе
Name[x-test]=xxHello Worldxx
......
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