From 30b7f42308bf883a52d13e97f1478cf813893c6f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 17 Feb 2018 04:59:54 +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" --- .../plasma-containmentactions-lattecontextmenu.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop index 85438384c..4966901b2 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[es]=Menú estándar de Latte Name[it]=Menu standard di Latte Name[nl]=Standaard menu van Latte Name[pt]=Menu Normal do Latte @@ -12,6 +13,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[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 Comment[pt]=O menu do Latte que normalmente aparece com o botão direito do rato