From adc10bb30ca7b0c36a71f6909959896c7212a80f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Dec 2017 04:39:09 +0100 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" --- examples/applets/nowplaying/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/applets/nowplaying/metadata.desktop b/examples/applets/nowplaying/metadata.desktop index 6a9d30857..5de859fef 100644 --- a/examples/applets/nowplaying/metadata.desktop +++ b/examples/applets/nowplaying/metadata.desktop @@ -42,7 +42,7 @@ Name[zh_TW]=現正播放（QML） Comment=A proof of concept media player controller qml Comment[ar]=متحكّم لمشغّل وسائط ب‍QML يثبت فعاليّة المبدأ Comment[bs]=Dokaz koncepta media player upravljača qml -Comment[ca]=Una prova del concepte de controlador qml per a un reproductor multimèdia +Comment[ca]=Una prova del concepte de controlador QML per a un reproductor multimèdia Comment[ca@valencia]=Una prova del concepte de controlador qml per a un reproductor multimèdia Comment[da]=Prototype af medieafspiller-betjening i qml Comment[de]=Ein Konzeptnachweis für eine Medien-Wiedergabe geschrieben in QML