Commit bbd512ad 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 951796e4
......@@ -9,6 +9,7 @@ Name[es]=Angelfish
Name[et]=Angelfish
Name[fr]=Angelfish
Name[gl]=Angelfish
Name[ia]=Angelfish
Name[it]=Angelfish
Name[ko]=Angelfish
Name[lt]=Angelfish
......@@ -31,6 +32,7 @@ Comment[et]=Mobiilne veebilehitseja
Comment[fi]=Mobiiliverkkoselain
Comment[fr]=Navigateur Web mobile
Comment[gl]=Navegador web para móbiles
Comment[ia]=Navigator Web Mobile
Comment[it]=Browser web per dispositivi mobili
Comment[ko]=모바일 웹 브라우저
Comment[lt]=Mobilioji saityno naršyklė
......@@ -56,6 +58,7 @@ GenericName[et]=Veebilehitseja
GenericName[fi]=Verkkoselain
GenericName[fr]=Navigateur Web
GenericName[gl]=Navegador web
GenericName[ia]=Navigator Web
GenericName[it]=Browser web
GenericName[ko]=웹 브라우저
GenericName[lt]=Saityno naršyklė
......
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