Commit dda777fe 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 3b4d480c
......@@ -2,11 +2,15 @@
Name=Angelfish
Name[ca]=Angelfish
Name[cs]=Angelfish
Name[es]=Angelfish
Name[lt]=Angelfish
Name[nl]=Angelfish
Name[pt]=Angelfish
Name[pt_BR]=Angelfish
Name[sv]=Angelfish
Name[uk]=Angelfish
Name[x-test]=xxAngelfishxx
Name[zh_TW]=Angelfish
Comment=Mobile web browser
Comment[ca]=Navegador web mòbil
Comment[ca@valencia]=Navegador web mòbil
......@@ -20,6 +24,7 @@ Comment[fr]=Navigateur Web mobile
Comment[gl]=Navegador web para móbiles
Comment[it]=Browser web per dispositivi mobili
Comment[ko]=모바일 웹 브라우저
Comment[lt]=Mobilioji saityno naršyklė
Comment[nl]=Webbrowser voor mobiel
Comment[nn]=Mobil nettlesar
Comment[pl]=Przenośna przeglądarka sieciowa
......@@ -43,6 +48,7 @@ GenericName[fr]=Navigateur Web
GenericName[gl]=Navegador web
GenericName[it]=Browser web
GenericName[ko]=웹 브라우저
GenericName[lt]=Saityno naršyklė
GenericName[nl]=Webbrowser
GenericName[nn]=Nettlesar
GenericName[pl]=Przeglądarka sieciowa
......
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