From 53bc6b803b996c671e486f6a48ffcce3884b6b49 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Feb 2016 10:55:49 +0000 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index e380a418f4..8d700e9c33 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -2,6 +2,7 @@ Comment=Cross fade animation when Tooltips or Notifications change their geometry Comment[ca]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seva geometria Comment[ca@valencia]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seua geometria +Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry Comment[nl]=Verwissel animatie van opkomen/vervagen wanneer tekstballonnen of meldingen hun geometrie wijzigen Comment[pl]=Animacja zanikania przy zmianie geometrii wskazówek lub powiadomień Comment[pt]=Animar o desvanecimento quando as dicas ou notificações mudarem de tamanho @@ -19,6 +20,7 @@ Icon=preferences-system-windows-effect-morphingpopups Name=Morphing popups Name[ca]=Missatges emergents en metamorfosi Name[ca@valencia]=Missatges emergents en metamorfosi +Name[en_GB]=Morphing popups Name[nl]=Morphing popups Name[pl]=Morfing elementów wysuwnych Name[pt]=Mensagens com mudança de forma