Commit 7957d6fd 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 fc910623
......@@ -20,7 +20,7 @@ Name[fa]=کمک برخط
Name[fi]=Online-ohje
Name[fr]=Aide en ligne
Name[ga]=Cabhair Ar Líne
Name[gl]=Axuda con conexión
Name[gl]=Axuda en Internet
Name[gu]=ઓનલાઈન મદદ
Name[he]=עזרה מקוונת
Name[hi]=ऑनलाइन सहायक
......
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