From 25f1b66d563361cfb965af83b7cc483af17556a0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Jun 2020 05:19:54 +0200 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 439693c1b..4fe2292ec 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop @@ -7,6 +7,7 @@ Name[en_GB]=Plasma Tab Style Name[es]=Estilo de pestaña Plasma Name[et]=Plasma kaardistiil Name[eu]=Plasmako fitxen estiloa +Name[fi]=Plasma-välilehtityyli Name[fr]=Style de l'onglet de Plasma Name[it]=Stile delle schede di Plasma Name[ko]=Plasma 탭 스타일 @@ -27,6 +28,7 @@ Comment[en_GB]=Plasma Tab style indicator for 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[fi]=Plasma-välilehtityylin ilmaisin Lattelle Comment[fr]=Indicateur dans le style des onglets Plasma pour Latte Comment[it]=Indicatore stile delle schede di Plasma di Latte Comment[ko]=Latte Plasma 탭 스타일 표시기