From f47f98da0bbfd1b61219343beded42fef8834e09 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 Sep 2020 05:58:18 +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" --- examples/applets/bugreport/metadata.desktop | 5 +++-- examples/applets/compactrepresentation/metadata.desktop | 1 + examples/applets/conditionalloader/metadata.desktop | 1 + examples/applets/config/metadata.desktop | 1 + examples/applets/dataenginemodel/metadata.desktop | 1 + examples/applets/helloworld/metadata.desktop | 1 + examples/applets/notes/metadata.desktop | 1 + examples/applets/nowplaying/metadata.desktop | 1 + examples/applets/qmltasks/metadata.desktop | 2 ++ examples/applets/testcomponents/metadata.desktop | 1 + examples/applets/testtheme/metadata.desktop | 1 + examples/applets/widgetgallery/metadata.desktop | 2 ++ examples/applets/windowthumbnails/metadata.desktop | 2 ++ examples/containments/testcontainment/metadata.desktop | 1 + .../plasma-dataengine-example-customDataContainers.desktop | 1 + .../plasma-dataengine-example-sourcesOnRequest.desktop | 1 + examples/developerguide/basic/metadata.desktop | 1 + src/desktoptheme/breeze-dark/metadata.desktop.cmake | 1 + src/desktoptheme/breeze-light/metadata.desktop.cmake | 1 + src/plasma/data/servicetypes/plasma-containment.desktop | 1 + src/plasma/data/servicetypes/plasma-dataengine.desktop | 1 + src/plasma/data/servicetypes/plasma-generic.desktop | 1 + .../qml/data/plasma-scriptengine-applet-declarative.desktop | 1 + .../plasma-wallpaper-with-qml-extension.kdevtemplate | 1 + 24 files changed, 29 insertions(+), 2 deletions(-) diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop index ef87ff57e..eed34b15a 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -30,7 +30,7 @@ Comment[pa]=ਪਲਾਜ਼ਮਾ ਵਿੱਚ ਬੱਗ ਦੀ ਜਾਣਕਾਰ Comment[pl]=Zgłoś błąd w Plazmie Comment[pt]=Comunicar um erro no Plasma Comment[pt_BR]=Comunicar um erro no Plasma -Comment[ro]=Raportează eroare în Plasma +Comment[ro]=Raportează o problemă în Plasma Comment[ru]=Отчёт об ошибке в Plasma Comment[sk]=Oznámiť chybu v Plasma Comment[sl]=Poročaj o napaki v Plasmi @@ -72,7 +72,7 @@ Keywords[nn]=plasma;bugzilla;feil;utvikling;støtte; Keywords[pl]=plazma;bugzilla;błąd;rozwój;programowanie;wsparcie;obsługa; Keywords[pt]=plasma;bugzilla;erro;desenvolvimento;suporte; Keywords[pt_BR]=plasma;bugzilla;erro;bug;desenvolvimento;suporte; -Keywords[ro]=plasma;bugzilla;bug;development;support; +Keywords[ro]=plasma;bugzilla;bug;development;suport;problemă; Keywords[ru]=plasma;bugzilla;bug;development;support;ошибка;сбой;поддержка;разработка; Keywords[sk]=plasma;bugzilla;chyba;vývoj;podpora; Keywords[sl]=plasma;bugzilla;hrošč;napaka;razvoj;podpora; @@ -119,6 +119,7 @@ Name[pa]=ਬੱਗ Name[pl]=Błąd Name[pt]=Insecto Name[pt_BR]=Erro +Name[ro]=Problemă Name[ru]=Ошибка Name[sk]=Chyba Name[sl]=Hrošč diff --git a/examples/applets/compactrepresentation/metadata.desktop b/examples/applets/compactrepresentation/metadata.desktop index c35c687fc..5310f1a2a 100644 --- a/examples/applets/compactrepresentation/metadata.desktop +++ b/examples/applets/compactrepresentation/metadata.desktop @@ -32,6 +32,7 @@ Name[nn]=hei, verda Name[pl]=witaj świecie Name[pt]=olá mundo Name[pt_BR]=Olá mundo +Name[ro]=salut lume Name[ru]=Здравствуй, мир! Name[sk]=ahoj svet Name[sl]=pozdravljen svet diff --git a/examples/applets/conditionalloader/metadata.desktop b/examples/applets/conditionalloader/metadata.desktop index feed889a3..747ef6d20 100644 --- a/examples/applets/conditionalloader/metadata.desktop +++ b/examples/applets/conditionalloader/metadata.desktop @@ -33,6 +33,7 @@ Name[pa]=ਐਪਲਿਟ ਟੈਸਟ Name[pl]=Próba apletu Name[pt]=Teste de 'Applets' Name[pt_BR]=Teste de miniaplicativo +Name[ro]=Test miniaplicație Name[ru]=Тестовый виджет Name[sk]=Test Appletu Name[sl]=Preizkus apleta diff --git a/examples/applets/config/metadata.desktop b/examples/applets/config/metadata.desktop index c94705cfd..c443ee7ab 100644 --- a/examples/applets/config/metadata.desktop +++ b/examples/applets/config/metadata.desktop @@ -32,6 +32,7 @@ Name[pa]=ਸੰਰਚਨਾ ਟੈਸਟ Name[pl]=Próba ustawień Name[pt]=Teste de configuração Name[pt_BR]=Teste de configuração +Name[ro]=Test configurări Name[ru]=Тестовая конфигурация Name[sk]=Test nastavenia Name[sl]=Preizkus nastavitev diff --git a/examples/applets/dataenginemodel/metadata.desktop b/examples/applets/dataenginemodel/metadata.desktop index bab635aac..4affe57ad 100644 --- a/examples/applets/dataenginemodel/metadata.desktop +++ b/examples/applets/dataenginemodel/metadata.desktop @@ -68,6 +68,7 @@ Name[nn]=Datamotor-modell Name[pl]=Model silnika danych Name[pt]=Modelo de motor de dados Name[pt_BR]=Modelo de mecanismo de dados +Name[ro]=Model de motor de date Name[ru]=Модель в источнике данных Plasma Name[sk]=Model dátového enginu Name[sl]=Model podatkovnega pogona diff --git a/examples/applets/helloworld/metadata.desktop b/examples/applets/helloworld/metadata.desktop index 42865259b..b1d28d126 100644 --- a/examples/applets/helloworld/metadata.desktop +++ b/examples/applets/helloworld/metadata.desktop @@ -32,6 +32,7 @@ Name[nn]=hei, verda Name[pl]=witaj świecie Name[pt]=olá mundo Name[pt_BR]=Olá mundo +Name[ro]=salut lume Name[ru]=Здравствуй, мир! Name[sk]=ahoj svet Name[sl]=pozdravljen svet diff --git a/examples/applets/notes/metadata.desktop b/examples/applets/notes/metadata.desktop index fe2a77dea..940ab5a02 100644 --- a/examples/applets/notes/metadata.desktop +++ b/examples/applets/notes/metadata.desktop @@ -69,6 +69,7 @@ Name[nn]=Eksempelnotat Name[pl]=Uwagi do przykładu Name[pt]=Notas de exemplo Name[pt_BR]=Notas de exemplo +Name[ro]=Notițe ca exemplu Name[ru]=Пример с заметками Name[sk]=Ukážkové poznámky Name[sl]=Primeri sporočilc diff --git a/examples/applets/nowplaying/metadata.desktop b/examples/applets/nowplaying/metadata.desktop index e164d0916..a02e6aa95 100644 --- a/examples/applets/nowplaying/metadata.desktop +++ b/examples/applets/nowplaying/metadata.desktop @@ -29,6 +29,7 @@ Name[nn]=Spelar no (QML) Name[pl]=Teraz odtwarzane (QML) Name[pt]=Agora a tocar (QML) Name[pt_BR]=Reproduzindo (QML) +Name[ro]=În redare (QML) Name[ru]=Сейчас играет (QML) Name[sk]=Práve hrám (QML) Name[sl]=Trenutno se predvaja (QML) diff --git a/examples/applets/qmltasks/metadata.desktop b/examples/applets/qmltasks/metadata.desktop index de961a0ea..2baadd2b6 100644 --- a/examples/applets/qmltasks/metadata.desktop +++ b/examples/applets/qmltasks/metadata.desktop @@ -27,6 +27,7 @@ Name[nn]=Fattigmanns oppgåvehandsamar Name[pl]=Zadania biednego człowieka Name[pt]=Tarefas Simples Name[pt_BR]=Tarefas simples +Name[ro]=Sarcinile săracului Name[ru]=Панель задач «для бедных» Name[sk]=Úlohy úbohého človeka Name[sl]=Opravila za reveže @@ -70,6 +71,7 @@ Comment[nn]=Eksempel på korleis du kan skriva dine eigne oppgåveelement Comment[pl]=Przykład pokazujący w jaki sposób napisać swój własny element interfejsu zadań Comment[pt]=Um exemplo que demonstra como criar o seu próprio item de tarefas Comment[pt_BR]=Exemplo que mostra como criar seu próprio widget de tarefas +Comment[ro]=Exemple ce demonstrează scrierea propriului control grafic pentru sarcini Comment[ru]=Пример виджета со списком задач Comment[sk]=Ukážka zobrazujúca ako písať váš vlastný widget úloh Comment[sl]=Primer izdelave lastnega gradnika za opravila diff --git a/examples/applets/testcomponents/metadata.desktop b/examples/applets/testcomponents/metadata.desktop index 36bd374a5..f0bff22b7 100644 --- a/examples/applets/testcomponents/metadata.desktop +++ b/examples/applets/testcomponents/metadata.desktop @@ -31,6 +31,7 @@ Name[nn]=Komponenttest Name[pl]=Próba składników Name[pt]=Teste de Componentes Name[pt_BR]=Teste de componentes +Name[ro]=Test componente Name[ru]=Тест компонентов Name[sk]=Test komponentov Name[sl]=Preizkus sestavnih delov diff --git a/examples/applets/testtheme/metadata.desktop b/examples/applets/testtheme/metadata.desktop index 1eb7a4d64..4893addda 100644 --- a/examples/applets/testtheme/metadata.desktop +++ b/examples/applets/testtheme/metadata.desktop @@ -29,6 +29,7 @@ Name[nn]=Tematest Name[pl]=Próba wystroju Name[pt]=Teste de Tema Name[pt_BR]=Teste de tema +Name[ro]=Test tematică Name[ru]=Тест тем Name[sk]=Test témy Name[sl]=Preizkus teme diff --git a/examples/applets/widgetgallery/metadata.desktop b/examples/applets/widgetgallery/metadata.desktop index 76d719826..7ca37486f 100644 --- a/examples/applets/widgetgallery/metadata.desktop +++ b/examples/applets/widgetgallery/metadata.desktop @@ -29,6 +29,7 @@ Name[nn]=Elementgalleri Name[pl]=Galeria elementów interfejsu Name[pt]=Galeria de elementos Name[pt_BR]=Galeria de widgets +Name[ro]=Galerie de controale Name[ru]=Галерея виджетов Name[sk]=Galéria widgetov Name[sl]=Galerija gradnikov @@ -71,6 +72,7 @@ Comment[nn]=Galleri med element laga med Plasma QtComponents Comment[pl]=galeria elementów interfejsu wykonana w QtComponents Plazmy Comment[pt]=Uma galeria de elementos gráficos feita com o QtComponents do Plasma Comment[pt_BR]=Galeria de widgets gráficos feita com o QtComponents do Plasma +Comment[ro]=galerie de controale făcute cu Plasma QtComponents Comment[ru]=Галерея виджетов, реализованная при помощи QtComponents в Plasma Comment[sk]=Galéria widgetov vytvorených pomocou Plasma QtComponents Comment[sl]=galerija gradnikov ustvarjena s Plasma QtComponents diff --git a/examples/applets/windowthumbnails/metadata.desktop b/examples/applets/windowthumbnails/metadata.desktop index a7cc61e8f..ac978bb94 100644 --- a/examples/applets/windowthumbnails/metadata.desktop +++ b/examples/applets/windowthumbnails/metadata.desktop @@ -26,6 +26,7 @@ Name[nn]=Eksempel på list med vindaugsminiatyrbilete Name[pl]=Przykładowe wykazem miniatur okien Name[pt]=Lista de miniaturas das janelas de exemplo Name[pt_BR]=Lista de miniaturas das janelas de exemplo +Name[ro]=Listă exemplificativă de miniaturi ferestre Name[ru]=Пример списка окон с миниатюрами Name[sk]=Ukážkové okno so zoznamom miniatúr Name[sl]=Primer seznama sličic oken @@ -68,6 +69,7 @@ Comment[nn]=Eksempel som viser korleis visa miniatyrbilete av vindauge Comment[pl]=Przykład pokazujący sposób wyświetlania miniatur okien Comment[pt]=Exemplo que demonstra como apresentar miniaturas das janelas Comment[pt_BR]=Exemplo que demostra como apresentar as miniaturas das janelas +Comment[ro]=Exemplu ce arată cum să afișați miniaturile ferestrelor Comment[ru]=Демонстрация отрисовки миниатюр окон Comment[sk]=Ukážka zobrazujúca ako zobraziť miniatúry okna Comment[sl]=Primer kako prikazati sličice oken diff --git a/examples/containments/testcontainment/metadata.desktop b/examples/containments/testcontainment/metadata.desktop index 96ae31316..4a1c4a0f2 100644 --- a/examples/containments/testcontainment/metadata.desktop +++ b/examples/containments/testcontainment/metadata.desktop @@ -29,6 +29,7 @@ Name[nn]=Behaldartest Name[pl]=Próba pojemnika Name[pt]=Teste de Contentores Name[pt_BR]=Teste de contenção +Name[ro]=Test container Name[ru]=Тест контейнеров Name[sk]=Test zadržania Name[sl]=Preizkus vsebnikov diff --git a/examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop b/examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop index bee45fe5b..461ee6328 100644 --- a/examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop +++ b/examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop @@ -26,6 +26,7 @@ Name[nn]=Tilpassa «DataContainers» Name[pl]=Własne pojemniki danych Name[pt]=Contentores Personalizados Name[pt_BR]=DataContainers personalizados +Name[ro]=DataContainere personalizate Name[ru]=Нестандартные объекты DataContainer Name[sk]=Vlastné dátové kontajnery Name[sl]=DataContainers po meri diff --git a/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop b/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop index 60e922f66..38d2dd800 100644 --- a/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop +++ b/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop @@ -26,6 +26,7 @@ Name[nn]=Kjelder på førespurnad Name[pl]=Źródła na żądanie Name[pt]=Fontes a Pedido Name[pt_BR]=Fontes a pedido +Name[ro]=Surse la cerere Name[ru]=Источники по запросу Name[sk]=Zdroje na požiadanie Name[sl]=Viri na zahtevo diff --git a/examples/developerguide/basic/metadata.desktop b/examples/developerguide/basic/metadata.desktop index ee9a93555..179df625c 100644 --- a/examples/developerguide/basic/metadata.desktop +++ b/examples/developerguide/basic/metadata.desktop @@ -72,6 +72,7 @@ Name[pa]=ਬੱਗ Name[pl]=Błąd Name[pt]=Insecto Name[pt_BR]=Erro +Name[ro]=Problemă Name[ru]=Ошибка Name[sk]=Chyba Name[sl]=Hrošč diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index 6ea4f264e..009358be0 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake @@ -71,6 +71,7 @@ Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼ ਗੂ Comment[pl]=Ciemna bryza autorstwa KDE VDG Comment[pt]=Brisa Escuro da VDG do KDE Comment[pt_BR]=Breeze Dark pelo KDE VDG +Comment[ro]=Briză, întunecat, de KDE VDG Comment[ru]=Тёмный вариант Breeze от KDE VDG Comment[sk]=Vánok Tmavý od KDE VDG Comment[sl]=Sapica temna (Breeze Dark) od KDE VDG diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake index 8853f8d79..bfc670334 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake @@ -69,6 +69,7 @@ Comment[nn]=Breeze lys frå KDE VDG Comment[pl]=Jasna Bryza autorstwa KDE VDG Comment[pt]=Brisa Claro da VDG do KDE Comment[pt_BR]=Breeze Light pelo KDE VDG +Comment[ro]=Briză, luminos, de KDE VDG Comment[ru]=Светлый вариант Breeze от KDE VDG Comment[sk]=Vánok Svetlý od KDE VDG Comment[sl]=Sapica (svetla) (Breeze Light) od KDE VDG diff --git a/src/plasma/data/servicetypes/plasma-containment.desktop b/src/plasma/data/servicetypes/plasma-containment.desktop index e302e14a2..c6456ce59 100644 --- a/src/plasma/data/servicetypes/plasma-containment.desktop +++ b/src/plasma/data/servicetypes/plasma-containment.desktop @@ -33,6 +33,7 @@ Comment[pa]=ਪਲਾਜ਼ਮਾ ਐਪਲਿਟ ਕੰਨਟੇਨਰ ਅਤ Comment[pl]=Pojemnik apletu Plazmy i malowanie w tle Comment[pt]=Contentor de 'applets' do Plasma e pintor do fundo Comment[pt_BR]=Recipiente de miniaplicativos do Plasma e pintor de plano de fundo +Comment[ro]=Container de miniaplicații Plasma și desenator de fundal Comment[ru]=Контейнер и модуль отрисовки виджета Plasma Comment[sk]=Kontainer appletov Plasma a vykresľovač pozadia Comment[sl]=Vsebnik apletov in izrisovalnik ozadja za Plasmo diff --git a/src/plasma/data/servicetypes/plasma-dataengine.desktop b/src/plasma/data/servicetypes/plasma-dataengine.desktop index 8c3e58a55..58821d037 100644 --- a/src/plasma/data/servicetypes/plasma-dataengine.desktop +++ b/src/plasma/data/servicetypes/plasma-dataengine.desktop @@ -35,6 +35,7 @@ Comment[pa]=ਪਲਾਜ਼ਮਾ ਡਾਟਾ ਇੰਜਣ Comment[pl]=Silnik danych Plazmy Comment[pt]=Motor de Dados do Plasma Comment[pt_BR]=Mecanismo de dados do Plasma +Comment[ro]=Motor de date Plasma Comment[ru]=Источник данных Plasma Comment[sk]=Dátový nástroj Plasma Comment[sl]=Podatkovni pogon za Plasmo diff --git a/src/plasma/data/servicetypes/plasma-generic.desktop b/src/plasma/data/servicetypes/plasma-generic.desktop index d978fe5f4..c141425c7 100644 --- a/src/plasma/data/servicetypes/plasma-generic.desktop +++ b/src/plasma/data/servicetypes/plasma-generic.desktop @@ -80,6 +80,7 @@ Comment[pa]=ਆਮ ਪਲਾਜ਼ਮਾ ਪੈਕੇਜ Comment[pl]=Zwykły Pakiet Plazmy Comment[pt]=Pacote Genérico do Plasma Comment[pt_BR]=Pacote genérico do Plasma +Comment[ro]=Pachet Plasma generic Comment[ru]=Произвольный пакет Plasma Comment[sk]=Všeobecný Plasma balík Comment[sl]=Splošen paket za Plasmo diff --git a/src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop b/src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop index 0e3de820c..de87a7f1a 100644 --- a/src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop +++ b/src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop @@ -30,6 +30,7 @@ Name[pa]=ਡਿਕਲਰੇਟਿਵ ਵਿਦਜੈੱਟ Name[pl]=Deklaratywny element interfejsu Name[pt]=Item declarativo Name[pt_BR]=Widget declarativo +Name[ro]=Control grafic declarativ Name[ru]=Декларативный виджет Name[sk]=Deklaratívny widget Name[sl]=Deklarativni gradnik diff --git a/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate b/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate index b32519adc..283c13674 100644 --- a/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate +++ b/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate @@ -24,6 +24,7 @@ Name[nn]=Enkelt Plasma-bakgrunnsbilete med QML-utviding Name[pl]=Prosta tapeta Plazmy z rozszerzeniami QML Name[pt]=Papel de Parede Simples do Plasma com com extensão QML Name[pt_BR]=Papel de parede simples do Plasma com extensão QML +Name[ro]=Tapet Plasma simplu cu extensie QML Name[ru]=Простые обои для Plasma с расширением для QML Name[sk]=Jednoduchá Tapeta Plasma s QML rozšírením Name[sl]=Enostavna Plasma ozadje z razširitvijo QML