From cb6d7bda742b972b1ab95c729c0061e7d55b4c1a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 Feb 2018 04:57:38 +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" --- app/latte-layouts.knsrc | 1 + .../plasma-containmentactions-lattecontextmenu.desktop | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc index 53b561a73..7b9d48f6a 100644 --- a/app/latte-layouts.knsrc +++ b/app/latte-layouts.knsrc @@ -4,6 +4,7 @@ Name[ar]=مخطّطات لاتيه Name[ca]=Disposicions del Latte Name[ca@valencia]=Disposicions del Latte Name[de]=Latte-Profile +Name[en_GB]=Latte Layouts Name[es]=Distribuciones de Latte Name[fi]=Latte-asettelut Name[it]=Disposizioni di Latte diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop index 4966901b2..7b46ece07 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop @@ -2,6 +2,7 @@ Name=Standard Latte Menu Name[ca]=Menú estàndard del Latte Name[ca@valencia]=Menú estàndard del Latte +Name[en_GB]=Standard Latte Menu Name[es]=Menú estándar de Latte Name[it]=Menu standard di Latte Name[nl]=Standaard menu van Latte @@ -13,6 +14,7 @@ Name[zh_CN]=标准 Latte 菜单 Comment=The latte menu that normally shows on right-click Comment[ca]=El menú Latte que es mostra normalment amb un clic del botó dret Comment[ca@valencia]=El menú Latte que es mostra normalment amb un clic del botó dret +Comment[en_GB]=The latte menu that normally shows on right-click Comment[es]=Este es el menú de Latte que normalmente se muestra tras un clic derecho Comment[it]=Il menu di Latte che normalmente viene mostrato al clic destro Comment[nl]=Het menu van latte dat normaal getoond wordt bij rechtsklikken