From 0d7911328b22115ef2f0695e7c59f3ff8ba6fce7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Mar 2022 03:49:11 +0000 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop index fa4440afd..0274560ec 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop @@ -2,7 +2,7 @@ Name=Plasma Tab Style Name[az]=Plasma Vərəq Üslubu Name[ca]=Estil pestanya del Plasma -Name[ca@valencia]=Estil pestanya del Plasma +Name[ca@valencia]=Estil pestanya de Plasma Name[cs]=Styl Karet Plasma Name[en_GB]=Plasma Tab Style Name[es]=Estilo de pestaña Plasma @@ -29,7 +29,7 @@ Name[zh_TW]=Plasma 分頁樣式 Comment=Plasma Tab style indicator for Latte Comment[az]=Latte üçün Plasma Vərəq Üslubu indikatoru 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[ca@valencia]=Indicador a l'estil pestanya de Plasma per al Latte Comment[cs]=Ukazatel stylu Karet Plasma pro Latte Comment[en_GB]=Plasma Tab style indicator for Latte Comment[es]=Indicador de estilo de pestaña Plasma para Latte