From fddd65dedad41ac708ce9af63b3953308ab043ae Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Dec 2022 02:09:12 +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" --- src/kcms/compositing/kwincompositing.json | 2 ++ src/kcms/decoration/kcm_kwindecoration.json | 2 ++ src/kcms/desktop/kcm_kwin_virtualdesktops.json | 2 ++ src/kcms/effects/kcm_kwin_effects.json | 2 ++ src/kcms/options/kcm_kwinoptions.json | 2 ++ src/kcms/rules/kcm_kwinrules.json | 2 ++ src/kcms/screenedges/kcm_kwinscreenedges.json | 2 ++ src/kcms/screenedges/kcm_kwintouchscreen.json | 1 + src/kcms/tabbox/kcm_kwintabbox.json | 2 ++ src/kcms/virtualkeyboard/kcm_virtualkeyboard.json | 2 ++ src/kcms/xwayland/kcm_kwinxwayland.json | 4 ++++ 11 files changed, 23 insertions(+) diff --git a/src/kcms/compositing/kwincompositing.json b/src/kcms/compositing/kwincompositing.json index 53b3410141..6962a1c418 100644 --- a/src/kcms/compositing/kwincompositing.json +++ b/src/kcms/compositing/kwincompositing.json @@ -26,6 +26,7 @@ "Description[pl]": "Ustawienia kompozytora dla efektów pulpitu", "Description[pt]": "Configuração dos Efeitos de Ecrã do Compositor", "Description[pt_BR]": "Definições do Compositor para os efeitos da área de trabalho", + "Description[ro]": "Configurări compozitor pentru efecte de birou", "Description[ru]": "Настройка модуля обеспечения эффектов рабочего стола", "Description[sk]": "Nastavenia kompozítora pre efekty plochy", "Description[sl]": "Nastavitev upravljalnika skladnje za učinke namizja", @@ -64,6 +65,7 @@ "Name[pl]": "Kompozytor", "Name[pt]": "Compositor", "Name[pt_BR]": "Compositor", + "Name[ro]": "Compozitor", "Name[ru]": "Обеспечение эффектов", "Name[sk]": "Kompozítor", "Name[sl]": "Upravljalnik skladnje", diff --git a/src/kcms/decoration/kcm_kwindecoration.json b/src/kcms/decoration/kcm_kwindecoration.json index cbefcdd9a4..b259b8cf8c 100644 --- a/src/kcms/decoration/kcm_kwindecoration.json +++ b/src/kcms/decoration/kcm_kwindecoration.json @@ -27,6 +27,7 @@ "Description[pl]": "Ustawienia pasków tytułów i obramowań okien", "Description[pt]": "Configurar as barras de título e contornos das janelas", "Description[pt_BR]": "Configure as barras de títulos e bordas da janela", + "Description[ro]": "Configurează barele de titlu și contururile ferestrelor", "Description[ru]": "Настройка заголовка и границ окон", "Description[sk]": "Nastaviť záhlavia a okraje okna", "Description[sl]": "Prilagodite naslovne vrstice in obrobe oken", @@ -69,6 +70,7 @@ "Name[pl]": "Wygląd okien", "Name[pt]": "Decorações das Janelas", "Name[pt_BR]": "Decorações da janela", + "Name[ro]": "Decorații fereastră", "Name[ru]": "Оформление окон", "Name[sk]": "Dekorácie okien", "Name[sl]": "Okrasitev oken", diff --git a/src/kcms/desktop/kcm_kwin_virtualdesktops.json b/src/kcms/desktop/kcm_kwin_virtualdesktops.json index 84dd0a56ea..92b43c6d25 100644 --- a/src/kcms/desktop/kcm_kwin_virtualdesktops.json +++ b/src/kcms/desktop/kcm_kwin_virtualdesktops.json @@ -27,6 +27,7 @@ "Description[pl]": "Ustawienia poruszania się, liczby oraz układu wirtualnych klawiatur", "Description[pt]": "Configurar a navegação, o número e a disposição dos ecrãs virtuais", "Description[pt_BR]": "Configura a navegação, quantidade e layout das áreas de trabalho virtuais", + "Description[ro]": "Configurează navigarea, numărul și aranjamentul birourilor virtuale", "Description[ru]": "Число, расположение и способ переключения рабочих столов", "Description[sk]": "Nastaviť navigáciu, počet a rozloženie virtuálnych plôch", "Description[sl]": "Prilagodite krmarjenje, število in postavitev navideznih namizij", @@ -68,6 +69,7 @@ "Name[pl]": "Pulpity wirtualne", "Name[pt]": "Ecrãs Virtuais", "Name[pt_BR]": "Áreas de trabalho virtuais", + "Name[ro]": "Birouri virtuale", "Name[ru]": "Виртуальные рабочие столы", "Name[sk]": "Virtuálne pracovné plochy", "Name[sl]": "Navidezna namizja", diff --git a/src/kcms/effects/kcm_kwin_effects.json b/src/kcms/effects/kcm_kwin_effects.json index 4bbdf7c11e..31e38f2696 100644 --- a/src/kcms/effects/kcm_kwin_effects.json +++ b/src/kcms/effects/kcm_kwin_effects.json @@ -26,6 +26,7 @@ "Description[pl]": "Ustawienia kompozytora dla efektów pulpitu", "Description[pt]": "Configurar as definições dos efeitos do ecrã do compositor", "Description[pt_BR]": "Defina as configurações do compositor para os efeitos da área de trabalho", + "Description[ro]": "Configurează opțiunile compozitorului pentru efecte de birou", "Description[ru]": "Настройка модуля обеспечения эффектов рабочего стола", "Description[sk]": "Nastavenia kompozítora pre efekty plochy", "Description[sl]": "Prilagodite nastavitve skladanja za učinke namizja", @@ -68,6 +69,7 @@ "Name[pl]": "Efekty pulpitu", "Name[pt]": "Efeitos do Ecrã", "Name[pt_BR]": "Efeitos da área de trabalho", + "Name[ro]": "Efecte de birou", "Name[ru]": "Эффекты рабочего стола", "Name[sk]": "Efekty plochy", "Name[sl]": "Namizni učinki", diff --git a/src/kcms/options/kcm_kwinoptions.json b/src/kcms/options/kcm_kwinoptions.json index a9a7af3fb3..9ef6494d39 100644 --- a/src/kcms/options/kcm_kwinoptions.json +++ b/src/kcms/options/kcm_kwinoptions.json @@ -27,6 +27,7 @@ "Description[pl]": "Ustawienia działań i zachowań okien", "Description[pt]": "Configurar as acções e comportamento das janelas", "Description[pt_BR]": "Configure as ações e comportamento das janelas", + "Description[ro]": "Configurează acțiunile și comportamentul ferestrelor", "Description[ru]": "Настройка поведения окон", "Description[sk]": "Nastaviť akcie a správanie okien", "Description[sl]": "Prilagodite dejavnosti in vedenje oken", @@ -65,6 +66,7 @@ "Name[pl]": "Zachowania okien", "Name[pt]": "Comportamento das Janelas", "Name[pt_BR]": "Comportamento das janelas", + "Name[ro]": "Comportament ferestre", "Name[ru]": "Поведение окон", "Name[sk]": "Správanie okien", "Name[sl]": "Vedenje oken", diff --git a/src/kcms/rules/kcm_kwinrules.json b/src/kcms/rules/kcm_kwinrules.json index a9c5611e81..8dd8a9e425 100644 --- a/src/kcms/rules/kcm_kwinrules.json +++ b/src/kcms/rules/kcm_kwinrules.json @@ -27,6 +27,7 @@ "Description[pl]": "Wyjątkowe okna", "Description[pt]": "Comportamento da Janela Individual", "Description[pt_BR]": "Comportamento das janelas individuais", + "Description[ro]": "Comportament al ferestrelor individuale", "Description[ru]": "Особые параметры конкретных окон", "Description[sk]": "Individuálne správanie okien", "Description[sl]": "Individualno vedenje oken", @@ -68,6 +69,7 @@ "Name[pl]": "Zasady okien", "Name[pt]": "Regras das Janelas", "Name[pt_BR]": "Regras das janelas", + "Name[ro]": "Reguli ferestre", "Name[ru]": "Особые параметры окон", "Name[sk]": "Pravidlá okien", "Name[sl]": "Pravila oken", diff --git a/src/kcms/screenedges/kcm_kwinscreenedges.json b/src/kcms/screenedges/kcm_kwinscreenedges.json index 5de03d26dd..ea999d848c 100644 --- a/src/kcms/screenedges/kcm_kwinscreenedges.json +++ b/src/kcms/screenedges/kcm_kwinscreenedges.json @@ -26,6 +26,7 @@ "Description[pl]": "Ustawienia czułych narożników i krawędzi ekranu", "Description[pt]": "Configurar os cantos e extremos activos do ecrã", "Description[pt_BR]": "Configurar os cantos de bordas da tela ativa", + "Description[ro]": "Configurează colțurile și marginile active ale ecranului", "Description[ru]": "Настройка действий для краёв и углов экрана", "Description[sk]": "Nastavenie aktívnych okrajov obrazovky a hrán", "Description[sl]": "Prilagodite aktivna oglišča in robove zaslona", @@ -63,6 +64,7 @@ "Name[pl]": "Krawędzie ekranu", "Name[pt]": "Extremos do Ecrã", "Name[pt_BR]": "Bordas da tela", + "Name[ro]": "Marginile ecranului", "Name[ru]": "Края экрана", "Name[sk]": "Okraje obrazovky", "Name[sl]": "Robovi zaslona", diff --git a/src/kcms/screenedges/kcm_kwintouchscreen.json b/src/kcms/screenedges/kcm_kwintouchscreen.json index 4ec04bd205..1eb70bc1db 100644 --- a/src/kcms/screenedges/kcm_kwintouchscreen.json +++ b/src/kcms/screenedges/kcm_kwintouchscreen.json @@ -26,6 +26,7 @@ "Description[pl]": "Ustawienia gestów na ekranie dotykowym", "Description[pt]": "Configurar os gestos de deslizamento do ecrã táctil", "Description[pt_BR]": "Configurar os gestos da tela sensível ao toque", + "Description[ro]": "Configurează gesturi de tragere pe ecran tactil", "Description[ru]": "Настройка действий при проведении по сенсорному экрану", "Description[sk]": "Nastaviť ťahacie gestá dotykovej obrazovky", "Description[sl]": "Prilagodite geste drsenja po zaslonu z dotikom", diff --git a/src/kcms/tabbox/kcm_kwintabbox.json b/src/kcms/tabbox/kcm_kwintabbox.json index b2cc855484..2ec543cd4c 100644 --- a/src/kcms/tabbox/kcm_kwintabbox.json +++ b/src/kcms/tabbox/kcm_kwintabbox.json @@ -26,6 +26,7 @@ "Description[pl]": "Przełączanie pomiędzy oknami", "Description[pt]": "Navegação pelas Janelas", "Description[pt_BR]": "Navegação pelas janelas", + "Description[ro]": "Navigare printre ferestre", "Description[ru]": "Настройка переключателя окон", "Description[sk]": "Navigácia cez okná", "Description[sl]": "Krmarjenje med okni", @@ -64,6 +65,7 @@ "Name[pl]": "Przełącznik zadań", "Name[pt]": "Selector de Tarefas", "Name[pt_BR]": "Seletor de tarefas", + "Name[ro]": "Comutator de sarcini", "Name[ru]": "Переключение окон", "Name[sk]": "Prepínač úloh", "Name[sl]": "Preklopnik opravil", diff --git a/src/kcms/virtualkeyboard/kcm_virtualkeyboard.json b/src/kcms/virtualkeyboard/kcm_virtualkeyboard.json index ac98884233..ae5dce9f00 100644 --- a/src/kcms/virtualkeyboard/kcm_virtualkeyboard.json +++ b/src/kcms/virtualkeyboard/kcm_virtualkeyboard.json @@ -27,6 +27,7 @@ "Description[pl]": "Wybierz której klawiatury ekranowej użyć", "Description[pt]": "Seleccione qual o teclado virtual a usar", "Description[pt_BR]": "Selecione qual teclado virtual a ser usado", + "Description[ro]": "Alegeți ce tastatură virtuală să fie folosită", "Description[ru]": "Выбор виртуальной клавиатуры", "Description[sk]": "Vyberte, ktorá virtuálna klávesnica sa má použiť", "Description[sl]": "Izberite, katere navidezne tipkovnice želite uporabljati", @@ -65,6 +66,7 @@ "Name[pl]": "Klawiatura ekranowa", "Name[pt]": "Teclado Virtual", "Name[pt_BR]": "Teclado virtual", + "Name[ro]": "Tastatură virtuală", "Name[ru]": "Виртуальная клавиатура", "Name[sk]": "Virtuálna klávesnica", "Name[sl]": "Navidezna tipkovnica", diff --git a/src/kcms/xwayland/kcm_kwinxwayland.json b/src/kcms/xwayland/kcm_kwinxwayland.json index 1cb99d86c5..d506195a75 100644 --- a/src/kcms/xwayland/kcm_kwinxwayland.json +++ b/src/kcms/xwayland/kcm_kwinxwayland.json @@ -10,7 +10,9 @@ "Description[es]": "Seleccionar las teclas que estarán disponibles globalmente para las aplicaciones X11 heredadas", "Description[eu]": "Hautatu ze tekla egongo diren X11 ondare aplikazioetarako globalki erabilgarri", "Description[fr]": "Sélectionnez quelles touches doivent être totalement disponibles pour les applications anciennes sous X11", + "Description[it]": "Seleziona quali tasti saranno disponibili a livello globale per le applicazioni X11 originali", "Description[nl]": "Selecteer welke toetsen globaal beschikbaar zijn aan verouderde X11 apps", + "Description[pl]": "Wybierz klawisze, które będą globalnie dostępne dla starych aplikacji X11", "Description[pt]": "Seleccione as teclas que estarão disponíveis globalmente para as aplicações antigas em X11", "Description[sl]": "Izberite tipke, ki bodo globalno na voljo za tradicionalne aplikacije X11", "Description[ta]": "பழைய X11 செயலிகள் எவ்விசைகளை எப்போது வேண்டுமானாலும் கண்டறிய முடியுமென்பதை அமையுங்கள்", @@ -26,8 +28,10 @@ "Name[es]": "Compatibilidad de aplicaciones X11 heredadas", "Name[eu]": "X11 ondare aplikazioen euskarria", "Name[fr]": "Prise en charge des applications anciennes sous X11", + "Name[it]": "Supporto per le applicazioni X11 originali", "Name[ka]": "მოძველებული X11 პროგრამების მხარდაჭერა", "Name[nl]": "Verouderde ondersteuning voor X11 App", + "Name[pl]": "Wsparcie starych aplikacji X11", "Name[pt]": "Suporte para Aplicações de X11 Antigas", "Name[sl]": "Podpora tradicionalnim aplikacijam X11", "Name[ta]": "பழைய X11 செயலிகளுக்கான ஆதரவு",