Commit 5385c9ff 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 8b28d1e0
......@@ -32,6 +32,7 @@ Name[pl]=Narzędzia zewnętrzne
Name[pt]=Ferramentas Externas
Name[pt_BR]=Ferramentas externas
Name[ro]=Unelte externe
Name[ru]=Внешние инструменты
Name[si]=බාහිර මෙවලම්
Name[sv]=Externa verktyg
Name[tg]=Асбобҳои берунӣ
......@@ -39,6 +40,7 @@ Name[ug]=سىرتقى قوراللار
Name[uk]=Зовнішні засоби
Name[wa]=Divantrinnès usteyes
Name[x-test]=xxExternal Toolsxx
Comment=External Tools
Comment[ar]=الأدوات الخارجية
......@@ -73,6 +75,7 @@ Comment[pl]=Narzędzia zewnętrzne
Comment[pt]=Ferramentas Externas
Comment[pt_BR]=Ferramentas externas
Comment[ro]=Unelte externe
Comment[ru]=Внешние инструменты
Comment[si]=බාහිර මෙවලම්
Comment[sv]=Externa verktyg
Comment[tg]=Асбобҳои берунӣ
......@@ -80,4 +83,5 @@ Comment[ug]=سىرتقى قوراللار
Comment[uk]=Зовнішні інструменти
Comment[wa]=Divantrinnès usteyes
Comment[x-test]=xxExternal Toolsxx
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment