Commit 44fd8cce 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 bc7d56fa
......@@ -12,10 +12,9 @@ Name[el]=Εξωτερικά εργαλεία
Name[en_GB]=External Tools
Name[et]=Välised tööriistad
Name[eu]=Kanpoko tresnak
Name[fi]=Ulkoiset työkalut
Name[fr]=Outils externes
Name[ga]=Uirlisí Seachtracha
Name[gl]=Utilidades externas
Name[gl]=Ferramentas externas
Name[hu]=Külső eszközök
Name[ia]=Instrumentos externe
Name[it]=Strumenti esterni
......@@ -49,10 +48,9 @@ Comment[el]=Εξωτερικά εργαλεία
Comment[en_GB]=External Tools
Comment[et]=Välised tööriistad
Comment[eu]=Kanpoko tresnak
Comment[fi]=Ulkoiset työkalut
Comment[fr]=Outils externes
Comment[ga]=Uirlisí Seachtracha
Comment[gl]=Utilidades externas
Comment[gl]=Ferramentas externas
Comment[hu]=Külső eszközök
Comment[ia]=Instrumentos externe
Comment[it]=Strumenti esterni
......
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