Commit 71ab346d 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 652fd496
......@@ -18,6 +18,7 @@ GenericName[gl]=Reprodutor de música
GenericName[id]=Pemutar Musik
GenericName[it]=Lettore musicale
GenericName[ko]=음악 재생기
GenericName[lt]=Muzikos grotuvas
GenericName[nl]=Muziekspeler
GenericName[nn]=Musikkspelar
GenericName[pl]=Odtwarzacz muzyki
......@@ -50,6 +51,7 @@ Name[hu]=Elisa
Name[id]=Elisa
Name[it]=Elisa
Name[ko]=Elisa
Name[lt]=Elisa
Name[nl]=Elisa
Name[nn]=Elisa
Name[pl]=Elisa
......
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