Commit e6f8248f 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 51920e13
......@@ -103,7 +103,7 @@ Name[zh_TW]=音樂播放_JuK
Name=Cover Successfully Downloaded
Name[bg]=Обложката е изтеглена
Name[bs]=Omot uspješno preuzet
Name[ca]=La caràtula s'ha baixat correctament
Name[ca]=La caràtula ha baixat correctament
Name[ca@valencia]=La caràtula s'ha baixat correctament
Name[cs]=Obal úspěšně stažen
Name[da]=Download af omslag gennemført
......
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