From 91169b3a09009bc26025624b0ec481d6e67c9414 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 23 Feb 2020 05:32:15 +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" --- indicators/org.kde.latte.plasmatabstyle/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop index 236229d64..fc1ec3693 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Estil pestanya del Plasma Name[ca@valencia]=Estil pestanya del Plasma Name[es]=Estilo de pestaña Plasma Name[et]=Plasma kaardistiil +Name[eu]=Plasmako fitxen estiloa Name[it]=Stile delle schede di Plasma Name[lt]=Plasma kortelių stilius Name[nl]=Plasma-tabbladstijl @@ -19,6 +20,7 @@ Comment[ca]=Indicador a l'estil pestanya del Plasma per al Latte Comment[ca@valencia]=Indicador a l'estil pestanya del Plasma per al Latte Comment[es]=Indicador de estilo de pestaña Plasma para Latte Comment[et]=Latte Plasma kaardistiili indikaator +Comment[eu]=Plasmako fitxa estiloko adierazlea Latte-n Comment[it]=Indicatore stile delle schede di Plasma di Latte Comment[lt]=Plasma kortelių stiliaus indikatorius skirtas Latte Comment[nl]=Plasma tabbladstijlindicator voor Latte