From ec11cfd04fc65fedbdc3e8bbb0522ece015c692b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 30 Jul 2017 04:57:22 +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/frozenapp/package/metadata.desktop | 2 ++ effects/logout/package/metadata.desktop | 1 + kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 3 +++ packageplugins/aurorae/kwin-packagestructure-aurorae.desktop | 1 + .../decoration/kwin-packagestructure-decoration.desktop | 1 + 5 files changed, 8 insertions(+) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index ad81c0aef5..c933ddcd7a 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -14,6 +14,7 @@ Name[it]=Desatura le applicazioni che non rispondono Name[nl]=Verzadiging van niet responsieve toepassingen verminderen Name[pl]=Odbarw nieodpowiadające aplikacje Name[pt]=Reduzir a Saturação das Aplicações Bloqueadas +Name[pt_BR]=Reduzir saturação de aplicativos que não respondem Name[sk]=Desaturovať neodpovedajúce aplikácie Name[sl]=Zmanjšaj nasičenost neodzivnih programov Name[sr]=Посивљавање програма без одзива @@ -42,6 +43,7 @@ Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate Comment[nl]=Verzadiging van vensters van niet responsieve (bevroren) toepassingen verminderen Comment[pl]=Odbarw okna nieodpowiadających (zawieszonych) aplikacji Comment[pt]=Reduzir a saturação das janelas das aplicações sem resposta (bloqueadas) +Comment[pt_BR]=Reduzir saturação de janelas de aplicativos que não respondem (travados) Comment[sk]=Desaturovať okná neodpovedajúcich aplikácií Comment[sl]=Zmanjšaj nasičenost oken neodzivnih (zamrznjenih) programov Comment[sr]=Прозори програма који се не одазивају (смрзнутих) бивају посивљени diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 1d35abd484..9ba36140f5 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -18,6 +18,7 @@ Name[it]=uscita Name[nl]=afmelden Name[pl]=wylogowanie Name[pt]=encerramento +Name[pt_BR]=sair Name[sk]=odhlásiť Name[sl]=odjavi Name[sr]=Одјава diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index 298336da32..63582158f1 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -28,6 +28,7 @@ Name[lt]=Jutiklinis ekranas Name[nl]=Aanraakscherm Name[pl]=Ekran dotykowy Name[pt]=Ecrã Táctil +Name[pt_BR]=Touch Screen Name[sk]=Dotyková obrazovka Name[sl]=Zaslon na dotik Name[sr]=Додирник @@ -54,6 +55,7 @@ Comment[it]=Gesti dello schermo a sfioramento Comment[nl]=Veeggebaren voor aanraakscherm Comment[pl]=Gesty na ekranie dotykowym Comment[pt]=Gestos para deslizar o ecrã táctil +Comment[pt_BR]=Gestos no touch screen Comment[sk]=Ťahacie gestá dotykovej obrazovky Comment[sl]=Kretnje vlečenja za zaslon na dotik Comment[sr]=Гестови замаха на додирнику @@ -80,6 +82,7 @@ X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,angolo,bordo,azione,scambiatore X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,kant,rand,actie,omschakelen,bureaublad,bureaubladkanten,schermkanten,zijkant van het scherm,schermgedrag,aanraakscherm X-KDE-Keywords[pl]=kwin,okno,menadżer,efekt,krawędź,obramowanie,działanie,przełącz,pulpit,krawędzie pulpitu,krawędzie ekranu,strona ekranu,zachowanie ekranu,ekran dotykowy X-KDE-Keywords[pt]=kwin,janela,gestor,efeito,extremo,contorno,acção,mudar,ecrã,extremos do ecrã no kwin,extremos do ecrã,maximizar as janelas,janelas lado-a-lado,lado do ecrã,comportamento do ecrã,ecrã táctil +X-KDE-Keywords[pt_BR]=kwin,janela,gerenciador,efeito,canto,contorno,borda,ação,mudar,área de trabalho,cantos da área de trabalho, desktop,lado da tela,comportamento da tela,touch screen X-KDE-Keywords[sk]=Kwin, okná, manažér, efekt, okraj, hranice, akcie, prepínač, desktop, okraje plochy,Okraje obrazovky, bočná strana obrazovky, správanie obrazovky, dotyková obrazovka X-KDE-Keywords[sl]=kwin,okno,upravljalnik oken,upravljanje oken,učinki,rob,obroba,dejanje,preklopi,preklapljanje,robovi namizja,robovi zaslona,rob zaslona,obnašanje zaslona,zaslon na dotik X-KDE-Keywords[sr]=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen,К‑вин,прозор,менаџер,ефекат,ивица,радња,пребаци,површ,ивице екрана,ивице површи,странице прозора,понашање прозора,додирник diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index 9b36d28d62..8d92ec753d 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -16,6 +16,7 @@ Name[it]=Aurorae di Kwin Name[nl]=KWin Aurorae Name[pl]=KWin Aurorae Name[pt]=Aurora do KWin +Name[pt_BR]=KWin Aurorae Name[sk]=KWin Aurorae Name[sl]=KWin Aurorae Name[sr]=К‑винова аурора diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop index 9b85f54290..109021d06b 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -18,6 +18,7 @@ Name[lt]=Kwin dekoracijos Name[nl]=KWin-decoraties Name[pl]=Wygląd KWin Name[pt]=Decorações do KWin +Name[pt_BR]=Decoração do KWin Name[sk]=Dekorácie KWin Name[sl]=Okraski KWin Name[sr]=К‑винова декорација