From 1f76c005e99e1533e833d63725ce0a0a278b4293 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 24 Sep 2016 12:33:32 +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" --- kcmkwin/kwindecoration/kwindecoration.desktop | 2 +- plugins/kdecorations/aurorae/src/kwindecoration.desktop | 2 +- scripts/enforcedeco/metadata.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index e84c96f2af..b87e4b1d63 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -51,7 +51,7 @@ Name[nds]=Finstern opfladusen Name[nl]=Vensterdecoraties Name[nn]=Vindaugspynt Name[pa]=ਵਿੰਡੋ ਸਜਾਵਟ -Name[pl]=Wystrój okien +Name[pl]=Wygląd okien Name[pt]=Decorações das Janelas Name[pt_BR]=Decorações da janela Name[ro]=Decorații fereastră diff --git a/plugins/kdecorations/aurorae/src/kwindecoration.desktop b/plugins/kdecorations/aurorae/src/kwindecoration.desktop index d123388218..f3f29e3ce2 100644 --- a/plugins/kdecorations/aurorae/src/kwindecoration.desktop +++ b/plugins/kdecorations/aurorae/src/kwindecoration.desktop @@ -35,7 +35,7 @@ Comment[nds]=KWin-Finsterdekoratschoon Comment[nl]=KWin vensterdecoratie Comment[nn]=KWin vindaugsdekorasjon Comment[pa]=ਕੇਵਿੰਨ ਵਿੰਡੋ ਸਜਾਵਟ -Comment[pl]=Wystrój okien KWin +Comment[pl]=Wygląd okien KWin Comment[pt]=Decoração das Janelas do KWin Comment[pt_BR]=Decorações de janelas do KWin Comment[ro]=Decorații de fereastră KWin diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop index 9508c98a54..a8c743d341 100644 --- a/scripts/enforcedeco/metadata.desktop +++ b/scripts/enforcedeco/metadata.desktop @@ -25,7 +25,7 @@ Name[nb]=Påtvinger vinduspynt på GTK+-vindu Name[nds]=Verdwingt dat Opfladusen ok vun GTK+-Finstern Name[nl]=Dwingt vensterdecoraties af op GTK+ venster Name[nn]=Tvingar vindagspynt på GTK+-vindauge -Name[pl]=Wymusza wystrój okien na oknach GTK+ +Name[pl]=Wymusza wygląd okien na oknach GTK+ Name[pt]=Forçar as Decorações das Janelas nas janelas em GTK+ Name[pt_BR]=Forçar as decorações das janelas em janelas GTK+ Name[ru]=Применение выбранного оформления к окнам GTK+