From de35075eac823d811a8328e950c435f53c47a671 Mon Sep 17 00:00:00 2001 From: l10n daemon script <scripty@kde.org> Date: Fri, 6 Apr 2018 05:21:26 +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" --- kwin_scripts/activatelattelaunchermenu/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kwin_scripts/activatelattelaunchermenu/metadata.desktop b/kwin_scripts/activatelattelaunchermenu/metadata.desktop index 8c210e261..d364f4338 100644 --- a/kwin_scripts/activatelattelaunchermenu/metadata.desktop +++ b/kwin_scripts/activatelattelaunchermenu/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Activa el menú del llançador del Latte Name[de]=Latte-Anwendungsmenü öffnen Name[en_GB]=Activate Latte Launcher Menu Name[es]=Activar menú de lanzadores de Latte +Name[it]=Attiva il menu del lanciatore di Latte Name[nl]=Latte-startprogramma activeren Name[pt]=Activar o Menu de Lançamento do Latte Name[sv]=Aktivera Latte startmeny @@ -16,6 +17,7 @@ Comment[ca@valencia]=Activa el menú del llançador del Latte des de la vora de Comment[de]=Latte-Anwendungsmenü über eine Bildschirmecke öffnen Comment[en_GB]=Activate Latte Launcher Menu from screen edge Comment[es]=Activar menú de lanzadores de Latte desde el borde de la pantalla +Comment[it]=Attiva il menu del lanciatore di Latte dal bordo dello schermo Comment[nl]=Latte-startprogramma activeren vanaf de schermrand Comment[pt]=Activar o Menu de Lançamento do Latte no extremo do ecrã Comment[sv]=Aktivera Latte startmeny från skärmkant