Commit 8db29172 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 71ab346d
......@@ -15,6 +15,7 @@ GenericName[eu]=Musika jotzailea
GenericName[fi]=Musiikkisoitin
GenericName[fr]=Lecteur multimédia
GenericName[gl]=Reprodutor de música
GenericName[ia]=Reproductor musical
GenericName[id]=Pemutar Musik
GenericName[it]=Lettore musicale
GenericName[ko]=음악 재생기
......@@ -48,6 +49,7 @@ Name[fi]=Elisa
Name[fr]=Elisa
Name[gl]=Elisa
Name[hu]=Elisa
Name[ia]=Elisa
Name[id]=Elisa
Name[it]=Elisa
Name[ko]=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