Commit b3979529 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 887c03ca
......@@ -29,6 +29,7 @@ Name[nn]=Eksterne verktøy
Name[pa]=ਬਾਹਰੀ ਟੂਲ
Name[pl]=Narzędzia zewnętrzne
Name[pt]=Ferramentas Externas
Name[pt_BR]=Ferramentas externas
Name[ro]=Unelte externe
Name[si]=බාහිර මෙවලම්
Name[sv]=Externa verktyg
......@@ -67,6 +68,7 @@ Comment[nn]=Eksterne verktøy
Comment[pa]=ਬਾਹਰੀ ਟੂਲ
Comment[pl]=Narzędzia zewnętrzne
Comment[pt]=Ferramentas Externas
Comment[pt_BR]=Ferramentas externas
Comment[ro]=Unelte externe
Comment[si]=බාහිර මෙවලම්
Comment[sv]=Externa verktyg
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