Commit 02c5ded5 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 e6a57b19
......@@ -19,6 +19,7 @@ Name[nn]=Angelfish
Name[pt]=Angelfish
Name[pt_BR]=Angelfish
Name[ru]=Angelfish
Name[sl]=Angelfish
Name[sv]=Angelfish
Name[uk]=Angelfish
Name[x-test]=xxAngelfishxx
......@@ -47,6 +48,7 @@ Comment[pt]=Navegador Web móvel
Comment[pt_BR]=Navegador Web móvel
Comment[ru]=Веб-браузер для мобильных устройств
Comment[sk]=Mobilný webový prehliadač
Comment[sl]=Mobilni spletni brskalnik
Comment[sv]=Mobilwebbläsare
Comment[uk]=Браузер для мобільних пристроїв
Comment[x-test]=xxMobile web browserxx
......@@ -75,6 +77,7 @@ GenericName[pt]=Navegador Web
GenericName[pt_BR]=Navegador Web
GenericName[ru]=Веб-браузер
GenericName[sk]=Webový prehliadač
GenericName[sl]=Spletni brskalnik
GenericName[sv]=Webbläsare
GenericName[uk]=Браузер
GenericName[x-test]=xxWeb Browserxx
......
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