From cf462de7b1554f829f99531641f472e08b8113af Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Apr 2018 05:39: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" --- src/plasma/data/servicetypes/plasma-lookandfeel.desktop | 2 +- src/plasma/data/servicetypes/plasma-shell.desktop | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop index 39b037c86..cb1ed981f 100644 --- a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop +++ b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop @@ -57,7 +57,7 @@ Comment[eu]=Plasma oskolentzako ikus-hizkuntza definitzen du Comment[fi]=Määrittää Plasma-kuorien visuaalisen kielen Comment[fr]=Définit le langage visuel pour les terminaux de Plasma Comment[gd]=Mìnichidh seo cànan lèirsinneach nam Plasma shells -Comment[gl]=Define a linguaxe visual das shells de Plasma +Comment[gl]=Define a linguaxe visual dos intérpretes de ordes de Plasma. Comment[hu]=A Plasma felület vizuális nyelvének leírása Comment[ia]=Ildefine le linguage visual per Shells de Plasma Comment[id]=Tentukan Visual Language untuk Plasma Shells diff --git a/src/plasma/data/servicetypes/plasma-shell.desktop b/src/plasma/data/servicetypes/plasma-shell.desktop index 2b973c099..09fb243e7 100644 --- a/src/plasma/data/servicetypes/plasma-shell.desktop +++ b/src/plasma/data/servicetypes/plasma-shell.desktop @@ -17,7 +17,7 @@ Name[eu]=Plasmaren oskola Name[fi]=Plasma-kuori Name[fr]=Terminal de Plasma Name[gd]=Plasma Shell -Name[gl]=Shell de Plasma +Name[gl]=Intérprete de ordes de Plasma Name[hu]=Plasma felület Name[ia]=Plasma Shell (Shell de Plasma) Name[id]=Shell Plasma @@ -60,7 +60,7 @@ Comment[eu]=Plasma oskolaren osagaiak Comment[fi]=Plasma-kuoren komponentit Comment[fr]=Composant des terminaux de Plasma Comment[gd]=Cò-phàirtean Plasma Shell -Comment[gl]=Compoñentes da shell de Plasma +Comment[gl]=Compoñentes do intérprete de ordes de Plasma Comment[hu]=Plasma felület elemei Comment[ia]=Componentes de Plasma Shell Comment[id]=Komponen Shell Plasma