Commit 53d0e297 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 70cdb542
......@@ -2,6 +2,7 @@
Name=Angelfish Web Browser
Name[ca]=Navegador web Angelfish
Name[ca@valencia]=Navegador web Angelfish
Name[cs]=Webový prohlížeč Angelfish
Name[en_GB]=Angelfish Web Browser
Name[es]=Navegador web Angelfish
......@@ -22,6 +23,7 @@ Name[zh_TW]=Angelfish 網頁瀏覽器
Comment=Mobile web browser
Comment[ca]=Navegador web mòbil
Comment[ca@valencia]=Navegador web mòbil
Comment[cs]=Mobilní webový prohlížeč
Comment[en_GB]=Mobile web browser
Comment[es]=Navegador web para móviles
......@@ -41,6 +43,7 @@ Comment[zh_TW]=行動網頁瀏覽器
GenericName=Web Browser
GenericName[ca]=Navegador web
GenericName[ca@valencia]=Navegador web
GenericName[cs]=Webový prohlížeč
GenericName[en_GB]=Web Browser
GenericName[es]=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