From 50ed071d9366ece0d5aabed5be0382ff867837b8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 31 Mar 2020 06:13:11 +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 7949c51e2..fc869b641 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop @@ -3,6 +3,7 @@ Name=Plasma Tab Style Name[ca]=Estil pestanya del Plasma Name[ca@valencia]=Estil pestanya del Plasma Name[cs]=Styl Karet Plasma +Name[en_GB]=Plasma Tab Style Name[es]=Estilo de pestaña Plasma Name[et]=Plasma kaardistiil Name[eu]=Plasmako fitxen estiloa @@ -21,6 +22,7 @@ Comment=Plasma Tab style indicator for Latte 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[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 Comment[et]=Latte Plasma kaardistiili indikaator Comment[eu]=Plasmako fitxa estiloko adierazlea Latte-n