From 941ece36fb433f158a94a2228b775e79bcb97cea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Jul 2020 05:49:03 +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 a55e927a5..e1b10f549 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop @@ -9,6 +9,7 @@ Name[et]=Plasma kaardistiil Name[eu]=Plasmako fitxen estiloa Name[fi]=Plasma-välilehtityyli Name[fr]=Style de l'onglet de Plasma +Name[gl]=Estilo de separador de Plasma Name[it]=Stile delle schede di Plasma Name[ko]=Plasma 탭 스타일 Name[lt]=Plasma kortelių stilius @@ -31,6 +32,7 @@ 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[gl]=Indicador de estilo de separador de Plasma para Latte Comment[it]=Indicatore stile delle schede di Plasma di Latte Comment[ko]=Latte Plasma 탭 스타일 표시기 Comment[lt]=Plasma kortelių stiliaus indikatorius skirtas Latte