From aedea03193120d6dd7b6081f283a33f5a0a10b13 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 Feb 2020 05:36:03 +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 76b6fa515..236229d64 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop @@ -7,6 +7,7 @@ Name[et]=Plasma kaardistiil Name[it]=Stile delle schede di Plasma Name[lt]=Plasma kortelių stilius Name[nl]=Plasma-tabbladstijl +Name[nn]=Faner i Plasma-stil Name[pt]=Estilo de Páginas do Plasma Name[pt_BR]=Estilo de abas do Plasma Name[sv]=Plasma flikstil @@ -21,6 +22,7 @@ Comment[et]=Latte Plasma kaardistiili indikaator Comment[it]=Indicatore stile delle schede di Plasma di Latte Comment[lt]=Plasma kortelių stiliaus indikatorius skirtas Latte Comment[nl]=Plasma tabbladstijlindicator voor Latte +Comment[nn]=Fanemarkør i Plasma-stil Comment[pt]=Indicador do estilo de Páginas do Plasma para o Latte Comment[pt_BR]=Indicador de estilo de abas do Plasma para o Latte Comment[sv]=Plasma flikstilsindikator för Latte