From b7f6e57eff2ad25d3426b5956cac99cb693a5808 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 14 Jan 2019 05:39:00 +0100 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" --- effects/fadingpopups/package/metadata.desktop | 2 ++ effects/scale/package/metadata.desktop | 1 + effects/squash/package/metadata.desktop | 2 ++ kcmkwin/kwindecoration/kwindecoration.desktop | 2 +- packageplugins/effect/kwin-packagestructure-effect.desktop | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop index aae7193973..4317980451 100644 --- a/effects/fadingpopups/package/metadata.desktop +++ b/effects/fadingpopups/package/metadata.desktop @@ -10,6 +10,7 @@ Name[id]=Fading Popups Name[it]=Finestre a comparsa che si dissolvono Name[nl]=Vervagende pop-ups Name[nn]=Inn- og uttoning av sprettoppvindauge +Name[pl]=Zanikające okna wysuwne Name[pt]=Mensagens Desvanecentes Name[ru]=Растворяющиеся всплывающие окна Name[sk]=Miznúce vyskakovacie okná @@ -30,6 +31,7 @@ Comment[id]=Buat sembulan secara halus lesap-masuk dan lesap-keluar ketika ia di Comment[it]=Fai dissolvere e comparire gradualmente le finestre a comparsa quando vengono mostrate o nascoste Comment[nl]=Laat pop-ups vloeiend opkomen/vervagen als ze worden weergegeven of verborgen Comment[nn]=Ton sprettoppvindauge gradvis inn og ut når dei vert viste eller gøymde +Comment[pl]=Gładkie zanikanie i wyłanianie się okien wysuwnych przy ich otwieraniu i zamykaniu Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas Comment[ru]=Всплывающие окна при закрытии будут становиться всё более прозрачными, а потом совсем исчезать Comment[sk]=Okná sa plynule objavia/zmiznú pri ich zobrazení alebo skrytí diff --git a/effects/scale/package/metadata.desktop b/effects/scale/package/metadata.desktop index 6ec7728ecc..8ee2b0940f 100644 --- a/effects/scale/package/metadata.desktop +++ b/effects/scale/package/metadata.desktop @@ -41,6 +41,7 @@ Comment[id]=Buat window menskala besar atau kecil secara mulus ketika ia ditampi Comment[it]=Ridimensiona le finestre dolcemente quando sono mostrate o nascoste Comment[nl]=Laat vensters vloeiend kleiner en groter schalen als ze worden getoond of verborgen Comment[nn]=Skaler vindauge jamt inn og ut når dei vert viste eller gøymde +Comment[pl]=Gładkie powiększanie i pomniejszanie okien przy ich otwieraniu i zamykaniu Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas Comment[pt_BR]=Faz com que as janelas aumentem ou reduzam o seu tamanho de forma suave ao serem exibidas ou ocultadas Comment[ru]=Плавное увеличение или уменьшение окон при их появлении и скрытии diff --git a/effects/squash/package/metadata.desktop b/effects/squash/package/metadata.desktop index 9f6f3da258..d66e2cf257 100644 --- a/effects/squash/package/metadata.desktop +++ b/effects/squash/package/metadata.desktop @@ -10,6 +10,7 @@ Comment[id]=Sesakkan window ketika mereka diminimalkan Comment[it]=Schiaccia le finestre quando vengono minimizzate Comment[nl]=Krimp vensters wanneer ze geminimaliseerd zijn Comment[nn]=Skvis vindauge når dei vert minimerte +Comment[pl]=Ściskanie okien, gdy ulegają minimalizacji Comment[pt]=Esmagar as janelas quando são minimizadas Comment[ru]=Сжатие окна при сворачивании Comment[sk]=Deformuje okná pri ich minimalizovaní @@ -30,6 +31,7 @@ Name[id]=Squash Name[it]=Schiaccia Name[nl]=Krimpen Name[nn]=Skvis +Name[pl]=Ściskanie Name[pt]=Esmagar Name[ru]=Сжатие Name[sv]=Kläm diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index e7011d421b..162f055968 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -34,7 +34,7 @@ Name[hi]=विंडो सजावट Name[hr]=Ukrasi prozora Name[hu]=Ablakdekorációk Name[ia]=Decorationes de fenestra -Name[id]=Window Decorations +Name[id]=Dekorasi Window Name[is]=Gluggaskreytingar Name[it]=Decorazioni delle finestre Name[ja]=ウィンドウの飾り diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/packageplugins/effect/kwin-packagestructure-effect.desktop index 1b1f93a199..328a5e6793 100644 --- a/packageplugins/effect/kwin-packagestructure-effect.desktop +++ b/packageplugins/effect/kwin-packagestructure-effect.desktop @@ -13,6 +13,7 @@ Name[id]=KWin Effect Name[it]=Effetto di KWin Name[nl]=KWin-effect Name[nn]=KWin-effekt +Name[pl]=Efekt KWin Name[pt]=Efeito do KWin Name[pt_BR]=Efeito do KWin Name[ru]=Эффект диспетчера окон