Commit 67b9488b 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 79d79365
......@@ -17,6 +17,7 @@ Name[nl]=Angelfish
Name[nn]=Angelfish
Name[pt]=Angelfish
Name[pt_BR]=Angelfish
Name[ru]=Angelfish
Name[sv]=Angelfish
Name[uk]=Angelfish
Name[x-test]=xxAngelfishxx
......@@ -42,6 +43,7 @@ Comment[nn]=Mobil nettlesar
Comment[pl]=Przenośna przeglądarka sieciowa
Comment[pt]=Navegador Web móvel
Comment[pt_BR]=Navegador Web móvel
Comment[ru]=Веб-браузер для мобильных устройств
Comment[sk]=Mobilný webový prehliadač
Comment[sv]=Mobilwebbläsare
Comment[uk]=Браузер для мобільних пристроїв
......
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