From 2fd43cdf5967feef802a20750e7f80839ee73aee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Apr 2018 05:43:35 +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" --- runners/shell/plasma-runner-shell.desktop | 2 +- .../shell/plasma-packagestructure-plasma-shell.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runners/shell/plasma-runner-shell.desktop b/runners/shell/plasma-runner-shell.desktop index 41bd54876..d84e5b7bf 100644 --- a/runners/shell/plasma-runner-shell.desktop +++ b/runners/shell/plasma-runner-shell.desktop @@ -99,7 +99,7 @@ Comment[fi]=Suorittaa komentorivikomentoja Comment[fr]=Exécute des commandes shell Comment[fy]=Flueskommando's útfiere Comment[ga]=Rith orduithe blaoisce -Comment[gl]=Executa ordes da shell +Comment[gl]=Executa ordes do intérprete de ordes Comment[gu]=શૅલ આદેશ ચલાવો Comment[he]=הרץ פקודת Shell Comment[hi]=शेल कमांड्स चलाता है diff --git a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop index b2d4ad648..6a4042cab 100644 --- a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop +++ b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop @@ -13,7 +13,7 @@ Name[et]=Plasma shell Name[eu]=Plasma-ingurunea Name[fi]=Plasma-kuori Name[fr]=Environnement Plasma -Name[gl]=Shell de Plasma +Name[gl]=Intérprete de ordes de Plasma Name[hu]=Plasma felület Name[id]=Shell Plasma Name[is]=Plasma skel