From 0c68b55a49f9b1be7aea9a0792322bd25d7c0549 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Jan 2020 05:55:57 +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 +- indicators/org.kde.latte.plasma/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop index 408e7e039..0cce70949 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop @@ -26,7 +26,7 @@ Name[x-test]=xxStandard Latte Menuxx Name[zh_CN]=标准 Latte 菜单 Name[zh_TW]=標準的 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]=El menú del 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[cs]=Nabídka Latte, jenž se běžně zobrazuje při kliknutí pravým tlačítkem Comment[de]=Das Latte-Menü, das normalerweise mit der rechten Maustaste angezeigt wird diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop index 198fb1afb..966fa88d7 100644 --- a/indicators/org.kde.latte.plasma/metadata.desktop +++ b/indicators/org.kde.latte.plasma/metadata.desktop @@ -27,7 +27,7 @@ Name[x-test]=xxPlasmaxx Name[zh_CN]=Plasma Name[zh_TW]=Plasma Comment=Latte Plasma style indicator -Comment[ca]=Indicador a l'estil Plasma del Latte +Comment[ca]=Indicador a l'estil Plasma per al Latte Comment[ca@valencia]=Indicador a l'estil Plasma del Latte Comment[cs]=Ukazatel Latte ve stylu Plasma Comment[el]=Δείκτης Latte σε στιλ Plasma