From cfa8d19df1f818d389865c9d7ac6a9cfb4cf7d3a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 Oct 2018 06:37:25 +0200 Subject: [PATCH] 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" --- misc/org.kde.dragonplayer.desktop | 1 - 1 file changed, 1 deletion(-) diff --git a/misc/org.kde.dragonplayer.desktop b/misc/org.kde.dragonplayer.desktop index ebba28a..0496d78 100755 --- a/misc/org.kde.dragonplayer.desktop +++ b/misc/org.kde.dragonplayer.desktop @@ -56,7 +56,6 @@ Name[zh_CN]=Dragon Player Name[zh_TW]=影音播放_神龍播放器 GenericName=Video Player GenericName[ar]=مشغّل فيديوهات -GenericName[ast]=Reproductor de videu GenericName[bg]=Възпроизвеждане на видео GenericName[bs]=Video izvođač GenericName[ca]=Reproductor de vídeo -- GitLab