Commit cfa8d19d 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 e22105a0
...@@ -56,7 +56,6 @@ Name[zh_CN]=Dragon Player ...@@ -56,7 +56,6 @@ Name[zh_CN]=Dragon Player
Name[zh_TW]=影音播放_神龍播放器 Name[zh_TW]=影音播放_神龍播放器
GenericName=Video Player GenericName=Video Player
GenericName[ar]=مشغّل فيديوهات GenericName[ar]=مشغّل فيديوهات
GenericName[ast]=Reproductor de videu
GenericName[bg]=Възпроизвеждане на видео GenericName[bg]=Възпроизвеждане на видео
GenericName[bs]=Video izvođač GenericName[bs]=Video izvođač
GenericName[ca]=Reproductor de vídeo GenericName[ca]=Reproductor de vídeo
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