Commit 10b469ac authored by Script Kiddy's avatar Script Kiddy
Browse files

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 55e921db
......@@ -4,6 +4,7 @@ Name[ca]=Angelfish
Name[cs]=Angelfish
Name[en_GB]=Angelfish
Name[es]=Angelfish
Name[et]=Angelfish
Name[it]=Angelfish
Name[lt]=Angelfish
Name[nl]=Angelfish
......@@ -21,6 +22,7 @@ Comment[de]=Webbrowser für Mobilgeräte
Comment[el]=Περιηγητής ιστού για κινητά
Comment[en_GB]=Mobile web browser
Comment[es]=Navegador web para móviles
Comment[et]=Mobiilne veebilehitseja
Comment[fi]=Mobiiliverkkoselain
Comment[fr]=Navigateur Web mobile
Comment[gl]=Navegador web para móbiles
......@@ -45,6 +47,7 @@ GenericName[de]=Webbrowser
GenericName[el]=Περιηγητής ιστού
GenericName[en_GB]=Web Browser
GenericName[es]=Navegador web
GenericName[et]=Veebilehitseja
GenericName[fi]=Verkkoselain
GenericName[fr]=Navigateur Web
GenericName[gl]=Navegador web
......
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