Commit 5913a537 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 a684bc42
......@@ -4,6 +4,7 @@ Name[ca]=Navegador web Angelfish
Name[ca@valencia]=Navegador web Angelfish
Name[cs]=Webový prohlížeč Angelfish
Name[de]=Angelfish-Webbrowser
Name[el]=Angelfish περιηγητής ιστού
Name[en_GB]=Angelfish Web Browser
Name[es]=Navegador web Angelfish
Name[fi]=Angelfish-verkkoselain
......@@ -27,6 +28,7 @@ Comment[ca]=Navegador web mòbil
Comment[ca@valencia]=Navegador web mòbil
Comment[cs]=Mobilní webový prohlížeč
Comment[de]=Webbrowser für Mobilgeräte
Comment[el]=Περιηγητής ιστού για κινητά
Comment[en_GB]=Mobile web browser
Comment[es]=Navegador web para móviles
Comment[fi]=Mobiiliverkkoselain
......@@ -49,6 +51,7 @@ GenericName[ca]=Navegador web
GenericName[ca@valencia]=Navegador web
GenericName[cs]=Webový prohlížeč
GenericName[de]=Webbrowser
GenericName[el]=Περιηγητής ιστού
GenericName[en_GB]=Web Browser
GenericName[es]=Navegador web
GenericName[fi]=Verkkoselain
......
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