From 4c3404e150ac6c7d4f42d9fc34a36143eb726818 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Apr 2017 04:05:25 +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" --- effects/eyeonscreen/package/metadata.desktop | 2 +- effects/fade/package/metadata.desktop | 2 +- effects/logout/package/metadata.desktop | 1 + effects/maximize/package/metadata.desktop | 4 ++-- effects/morphingpopups/package/metadata.desktop | 4 ++-- effects/scalein/package/metadata.desktop | 2 +- .../decoration/kwin-packagestructure-decoration.desktop | 1 + packageplugins/scripts/kwin-packagestructure-scripts.desktop | 1 + .../kwin-packagestructure-windowswitcher.desktop | 1 + 9 files changed, 11 insertions(+), 7 deletions(-) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 39b608bf13..b9fd0288f1 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -59,7 +59,7 @@ Comment[ko]=창을 데스크톱으로 흡수시켜 데스크톱을 표시합니 Comment[nb]=Sug vinduer inn i skrivebordet for å vise det. Dette minner deg kanskje om noe. Comment[nl]=Laat vensters wegzinken in het bureaublad om deze te tonen. Dit kan u aan iets herinneren. Comment[nn]=Sug vindauge inn i skrivebordet for å visa skrivebordet. Dette minner deg kanskje om noko. -Comment[pl]=Zasysa okna na pulpicie, aby go pokazać. Powinno nasuwać pewne skojarzenia. +Comment[pl]=Zasysa okna, aby pokazać pulpit. Skojarzenia powinny nasuwać się same. Comment[pt]=Suga as janelas para o ecrã mostrar a última. Isto podê-lo-á recordar de algo. Comment[pt_BR]=Suga as janelas na área de trabalho para mostrar a última. Isso pode lembrá-lo de algo. Comment[ru]=Для просмотра рабочего стола окна временно втягиваются в центр экрана diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop index 8881946681..30bdf2511b 100644 --- a/effects/fade/package/metadata.desktop +++ b/effects/fade/package/metadata.desktop @@ -123,7 +123,7 @@ Comment[nds]=Finstern bi't Wiesen oder Versteken week in- oder utblennen Comment[nl]=Laat vensters vloeiend opkomen/vervagen als ze worden weergegeven of verborgen Comment[nn]=Ton vindauge inn og ut når dei vert viste eller gøymde Comment[pa]=ਜਦੋਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਵੇਖਾਉਣਾ ਜਾਂ ਓਹਲੇ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਕੂਲੇ ਢੰਗ ਨਾਲ ਫੇਡ ਇਨ/ਆਉਟ ਕਰੋ -Comment[pl]=Gładkie zanikanie i wyłanianie się okien przy ich pokazywaniu lub ukrywaniu +Comment[pl]=Gładkie zanikanie i wyłanianie się 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 as janelas aparecerem/desaparecerem suavemente quando são exibidas ou ocultadas Comment[ro]=Face ferestrele să se (de)coloreze când sunt afișate sau ascunse diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 2b2838bd85..902cec0164 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -6,6 +6,7 @@ Name[cs]=odhlášení Name[el]=αποσύνδεση Name[es]=cerrar la sesión Name[hu]=Kijelentkezés +Name[ia]=Clausura de session Name[it]=uscita Name[nl]=afmelden Name[pl]=wylogowanie diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index 210e6449e4..4768ad12ae 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -27,7 +27,7 @@ Comment[nb]=Animering for et vindu som maksimeres/tilbakestilles fra maksimering Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstellt warrt Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting. -Comment[pl]=Animacja dla okna mającego zostać zmaksymalizowanym/przywróconym z maksymalizacji +Comment[pl]=Efekt skalowania okien przy ich maksymalizowaniu i powrocie z niego Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada Comment[ro]=Animație pentru o fereastră ce trece la maximizare/restabilire din maximizare @@ -79,7 +79,7 @@ Name[nds]=Maximeren Name[nl]=Maximaliseren Name[nn]=Maksimer Name[pa]=ਵੱਧੋ-ਵੱਧ -Name[pl]=Maksymalizowanie +Name[pl]=Animacja maksymalizacji Name[pt]=Maximização Name[pt_BR]=Maximizar Name[ro]=Maximizează diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index 61e37f803f..7b21c6f5b1 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -18,7 +18,7 @@ Comment[it]=Animazione in dissolvenza quando i suggerimenti e le notifiche cambi Comment[ko]=풍선 도움말이나 알림 크기가 변경될 때 크로스페이드 애니메이션 사용 Comment[nl]=Verwissel animatie van opkomen/vervagen wanneer tekstballonnen of meldingen hun geometrie wijzigen Comment[nn]=Krysstoningsanimasjon når hjelpebobler eller varslingar endrar form -Comment[pl]=Animacja zanikania przy zmianie geometrii wskazówek lub powiadomień +Comment[pl]=Efekt zmiany kształtu podpowiedzi i powiadomień przy zmianie ich geometrii Comment[pt]=Animar o desvanecimento quando as dicas ou notificações mudarem de tamanho Comment[pt_BR]=Animar a transição suave quando as dicas ou notificações mudarem de tamanho Comment[ru]=При изменении формы всплывающих подсказок или уведомлений они плавно растягиваются или сжимаются @@ -54,7 +54,7 @@ Name[it]=Finestre a comparsa che si trasformano Name[ko]=변형되는 팝업 Name[nl]=Morphing popups Name[nn]=Formendring for sprettoppvindauge -Name[pl]=Morfing elementów wysuwnych +Name[pl]=Zmiennokształtne elementy pomocnicze Name[pt]=Mensagens com mudança de forma Name[pt_BR]=Mensagens com mudança de forma Name[ru]=Анимация преобразования всплывающих окон diff --git a/effects/scalein/package/metadata.desktop b/effects/scalein/package/metadata.desktop index 64a59d0202..b94e42154e 100644 --- a/effects/scalein/package/metadata.desktop +++ b/effects/scalein/package/metadata.desktop @@ -123,7 +123,7 @@ Comment[nds]=Dat Opduken vun Finstern animeren Comment[nl]=Voorziet het verschijnen van vensters van een animatie Comment[nn]=Animer opning av vindauge Comment[pa]=ਵਿੰਡੋ ਵੇਖਾਉਣ ਨੂੰ ਐਨੀਮੇਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ -Comment[pl]=Animacja pojawiania się okna +Comment[pl]=Efekt skalowania okien przy ich otwieraniu i zamykaniu Comment[pt]=Animar a aparição das janelas Comment[pt_BR]=Anima o aparecimento de janelas Comment[ro]=Animează apariția ferestrelor diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop index 3930062695..44b12e3895 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -6,6 +6,7 @@ Name[cs]=Dekorace KWin Name[el]=Διακοσμήσεις KWin Name[es]=Decoración de KWin Name[hu]=KWin dekoráció +Name[ia]=Decorationes de KWin Name[it]=Decorazioni di KWin Name[nl]=KWin-decoraties Name[pl]=Wygląd KWin diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index a6db55ebe2..aa3a94bde4 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -10,6 +10,7 @@ Name[en_GB]=KWin Script Name[es]=Guion de KWin Name[fi]=KWin-skripti Name[hu]=KWin szkript +Name[ia]=Script de KWin Name[it]=Script di KWin Name[ko]=KWin 스크립트 Name[nl]=KWin-script diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index c1decec557..a80800fc5a 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -10,6 +10,7 @@ Name[en_GB]=KWin Window Switcher Name[es]=Cambiador de ventanas de KWin Name[fi]=KWin-ikkunanvalitsin Name[hu]=KWin ablakváltó +Name[ia]=Commutator de fenestra de KWin Name[it]=Scambiafinestre di KWin Name[ko]=KWin 창 전환기 Name[nl]=KWin-vensterwisselaar