From 7ac1b02d15f60d567c153093ad85757912db925c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Feb 2016 09:28:04 +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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index 40cdf5bf0d..f9b192c462 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -1,8 +1,18 @@ [Desktop Entry] 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[pt]=Animar o desvanecimento quando as dicas ou notificações mudarem de tamanho +Comment[sv]=Övertona animering när verktygstips eller underrättelser ändrar storlek +Comment[uk]=Анімація зі зміною освітленості під час зміни геометрії панелей підказок і сповіщень +Comment[x-test]=xxCross fade animation when Tooltips or Notifications change their geometryxx Encoding=UTF-8 Icon=preferences-system-windows-effect-morphingpopups Name=Morphing popups +Name[ca]=Missatges emergents en metamorfosi +Name[pt]=Mensagens com mudança de forma +Name[sv]=Föränderliga meddelanderutor +Name[uk]=Аморфні контекстні панелі +Name[x-test]=xxMorphing popupsxx Type=Service X-KDE-ParentApp= X-KDE-PluginInfo-Author=Marco Martin