From 5cb6f51ef6c3d2f81d9d73c24ae6b172a31dd69f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Oct 2020 06:01:48 +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/fullscreen/package/metadata.desktop | 2 ++ effects/windowaperture/package/metadata.desktop | 1 + kcmkwin/kwincompositing/kwincompositing.desktop | 1 + kwin.notifyrc | 2 ++ 5 files changed, 8 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index ff81c78947..ce8515ec87 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -16,6 +16,7 @@ Name[ko]=화면 위의 눈 Name[lt]=Akis ekrane Name[nl]=Oog op scherm Name[nn]=Auge på skjerm +Name[pl]=Oko na ekranie Name[pt]=Olho no Ecrã Name[pt_BR]=Olho na tela Name[ro]=Ochi pe ecran @@ -44,6 +45,7 @@ Comment[ko]=창을 바탕 화면으로 흡수 Comment[lt]=Įtraukti langus į darbalaukį Comment[nl]=Zuig vensters in het bureaublad Comment[nn]=Sug vindauge inn i skrivebordet +Comment[pl]=Zasysa okna na pulpicie Comment[pt]=Aspira as janelas para o ecrã Comment[pt_BR]=Suga as janelas para a área de trabalho Comment[ro]=Suge ferestrele în birou diff --git a/effects/fullscreen/package/metadata.desktop b/effects/fullscreen/package/metadata.desktop index 771125949e..abe6a3780b 100644 --- a/effects/fullscreen/package/metadata.desktop +++ b/effects/fullscreen/package/metadata.desktop @@ -10,6 +10,7 @@ Comment[it]=Animazione per una finestra che entra e esce dalla modalità a scher Comment[ko]=창이 전체 화면 모드로 진입하거나 벗어날 때 사용할 애니메이션 Comment[nl]=Animatie voor een venster dat gaat naar volledig scherm en deze verlaat Comment[nn]=Animasjon for vindauge som går til eller frå fullskjermsmodus +Comment[pl]=Animacja dla okna wchodzącego i wychodzącego z trybu pełnego ekranu Comment[pt]=Animação para uma janela que vai entrar/sair do modo de ecrã completo Comment[pt_BR]=Animação para uma janela indo e saindo do modo de tela cheia Comment[ro]=Animație pentru o fereastră ce intră sau iese din regim de ecran complet @@ -33,6 +34,7 @@ Name[it]=Schermo intero Name[ko]=전체 화면 Name[nl]=Volledig scherm Name[nn]=Fullskjerm +Name[pl]=Pełny ekran Name[pt]=Ecrã Completo Name[pt_BR]=Tela inteira Name[ro]=Ecran complet diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index def8fa360b..1b65492ec3 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -59,6 +59,7 @@ Comment[ko]=창을 화면 꼭짓점으로 이동 Comment[lt]=Perkelti langus į kampus Comment[nl]=Verplaats vensters in de hoeken van het scherm Comment[nn]=Flytt vindauge til skjermhjørne +Comment[pl]=Rozsuwa okna w narożniki ekranu Comment[pt]=Mover as janelas para os cantos do ecrã Comment[pt_BR]=Move as janelas para os cantos da tela Comment[ro]=Mută ferestrele în colțurile ecranului diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 2a3356e7f9..f1f3b459d8 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -124,6 +124,7 @@ X-KDE-Keywords[ko]=kwin,window,manager,compositing,effect,3D effects,2D effects, X-KDE-Keywords[lt]=kwin,langas,langai,tvarkytuvė,tvarkytuve,komponavimas,kompozicionavimas,efektas,efektai,3D efektai,2D efektai,trimačiai efektai,trimaciai efektai,dvimačiai efektai,dvimaciai efektai,OpenGL,XRender,vaizdo nustatymai,vaizdo nuostatos,video nustatymai,video nuostatos,grafiniai efektai,grafikos efektai,darbalaukio efektai,darbastalio efektai X-KDE-Keywords[nl]=kwin,window,manager,beheerder,compositing,effecten,3D-effecten,2D-effecten,OpenGL,XRender,video-instellingen,grafische effecten,bureaubladeffecten X-KDE-Keywords[nn]=kwin,vindauge,vindaugshandsamar,samansetjing,effekt,3D-effektar,2D-effektar,OpenGL,XRender,videoinnstillingar,grafiske effektar,skrivebordseffektar +X-KDE-Keywords[pl]=kwin,okno,menadżer,menedżer,zarządca,kompozytor,efekt,efekt 3D,efekt 2D,OpenGL,XRender,ustawienia wideo,efekty graficzne,efekty pulpitu X-KDE-Keywords[pt]=kwin,janela,gestor,composição,efeito,efeitos 3D,efeitos 2D,OpenGL,XRender,configuração do vídeo,efeitos gráficos,efeitos do ecrã X-KDE-Keywords[pt_BR]=kwin,janela,gerenciador,composição,efeito,efeitos 3D,efeitos 2D,OpenGL,XRender,configurações de vídeo,efeitos gráficos,efeitos da área de trabalho X-KDE-Keywords[ro]=kwin,fereastră,gestionar,compoziționare,efect,efecte 3D,OpenGL,XRender,configurări video,efecte grafice,efecte de birou diff --git a/kwin.notifyrc b/kwin.notifyrc index da4259f20a..f0f78e4e61 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -301,6 +301,7 @@ Name[it]=Chiusura inattesa di Xwayland Name[ko]=Xwayland 충돌 Name[nl]=Xwayland-crash Name[nn]=Xwayland-krasj +Name[pl]=Usterka Xwayland Name[pt]=Estoiro do Xwayland Name[pt_BR]=Falha no Xwayland Name[ro]=Prăbușire Xwayland @@ -322,6 +323,7 @@ Comment[it]=Xwayland è stato terminato in modo inatteso Comment[ko]=Xwayland가 충돌함 Comment[nl]=Xwayland is gecrasht Comment[nn]=Xwayland krasja +Comment[pl]=Xwayland napotkał usterkę Comment[pt]=O Xwayland estoirou Comment[pt_BR]=O Xwayland falhou Comment[ro]=Xwayland s-a prăbușit