From 8cb6d42191ef6125026e878eb792541f908cfbff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 21 Feb 2017 12:50:44 +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" --- effects/morphingpopups/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index 15fd7c5d86..61e37f803f 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -40,6 +40,7 @@ Name[ca]=Missatges emergents en metamorfosi Name[ca@valencia]=Missatges emergents en metamorfosi Name[da]=Sammensmeltende pop-op'er Name[de]=Verformende Aufklappfenster +Name[el]=Αναδυόμενα morphing Name[en_GB]=Morphing popups Name[es]=Transformación de ventanas emergentes Name[et]=Moonduvad hüpikdialoogid