From 705cb1a9adacfa7a87be8d3ebfeb3a6940f6124b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Jan 2017 07:41:21 +0100 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" --- kcmkwin/kwincompositing/kwineffect.knsrc | 1 + kcmkwin/kwinscripts/kwinscripts.knsrc | 1 + kcmkwin/kwintabbox/kwinswitcher.knsrc | 1 + .../scripts/kwin-packagestructure-scripts.desktop | 6 ++++++ .../kwin-packagestructure-windowswitcher.desktop | 6 ++++++ plugins/kdecorations/aurorae/src/aurorae.knsrc | 1 + plugins/platforms/hwcomposer/hwcomposer.json | 1 - plugins/platforms/wayland/wayland.json | 1 - plugins/platforms/x11/standalone/x11.json | 2 -- plugins/platforms/x11/windowed/x11.json | 1 - 10 files changed, 16 insertions(+), 5 deletions(-) diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index be799f313e..21dcde0cae 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Effects Name[es]=Efectos del gestor de ventanas Name[ia]=Gerente de effectos de fenestra Name[it]=Effetti del gestore delle finestre +Name[ko]=창 관리자 효과 Name[nl]=Effecten van vensterbeheerder Name[nn]=Effektar for vindaugshandsamar Name[pl]=Efekty zarządzania oknami diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index ab1ca69bea..54411f794a 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Scripts Name[es]=Guiones del gestor de ventanas Name[ia]=Gerente de scripts de fenestra Name[it]=Script del gestore delle finestre +Name[ko]=창 관리자 스크립트 Name[nl]=Scripts van vensterbeheerder Name[nn]=Skript for vindaugshandsamar Name[pl]=Skrypty zarządzania oknami diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index 4b66a4a821..312df08216 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Switching Layouts Name[es]=Esquemas de cambio del gestor de ventanas Name[ia]=Disposition de commutator de gerente de fenestra Name[it]=Disposizione scambiafinestre del gestore delle finestre +Name[ko]=창 관리자 전환기 레이아웃 Name[nl]=Omschakelende indelingen van vensterbeheerder Name[pl]=Układ przełączania zarządzana oknami Name[pt]=Disposições da Mudança de Janelas do KWin diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index 5e9ef8785a..51043f3cf9 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -1,7 +1,13 @@ [Desktop Entry] Name=KWin Script Name[ca]=Script del KWin +Name[ca@valencia]=Script del KWin +Name[en_GB]=KWin Script +Name[it]=Script di KWin +Name[ko]=KWin 스크립트 Name[nl]=KWin-script +Name[pl]=Skrypt KWin +Name[sv]=Kwin-skript Name[uk]=Скрипт KWin Name[x-test]=xxKWin Scriptxx Type=Service diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index 43f9342471..fb25cec63a 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -1,7 +1,13 @@ [Desktop Entry] Name=KWin Window Switcher Name[ca]=Commutador de finestres del KWin +Name[ca@valencia]=Commutador de finestres del KWin +Name[en_GB]=KWin Window Switcher +Name[it]=Scambiafinestre di KWin +Name[ko]=KWin 창 전환기 Name[nl]=KWin-vensterwisselaar +Name[pl]=Przełącznik okien KWin +Name[sv]=Kwin-fönsterbyte Name[uk]=Перемикач вікон KWin Name[x-test]=xxKWin Window Switcherxx Type=Service diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 90ef67efd9..3cc581e126 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -7,6 +7,7 @@ Name[en_GB]=Aurorae Window Decorations Name[es]=Decoración de ventanas Aurorae Name[ia]=Decorationes de fenestra Aurorae Name[it]=Decorazioni delle finestre Aurorae +Name[ko]=Aurorae 창 장식 Name[nl]=Aurorea-vensterdecoraties Name[pl]=Ozdoby okienne Aurorae Name[pt]=Decorações das Janelas do Aurorae diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json index 5c6a5eb6ed..22e284cb0e 100644 --- a/plugins/platforms/hwcomposer/hwcomposer.json +++ b/plugins/platforms/hwcomposer/hwcomposer.json @@ -4,7 +4,6 @@ "Description[ca@valencia]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", "Description[ca]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", "Description[da]": "Rendér igennem hwcomposer igennem libhybris.", - "Description[de]": "In hwcomposer mit libhybris rendern.", "Description[el]": "Αποτύπωση μέσω hwcomposer μέσω libhybris.", "Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».", "Description[et]": "Renderdamine hwcomposeris libhybrise abil.", diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json index 8a4b3f4970..656dee2250 100644 --- a/plugins/platforms/wayland/wayland.json +++ b/plugins/platforms/wayland/wayland.json @@ -4,7 +4,6 @@ "Description[ca@valencia]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", "Description[ca]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", "Description[da]": "Rendér til et indlejret vindue på kørende Wayland-compositor.", - "Description[de]": "In ein eingebettetes Fenster auf dem laufenden Wayland-Kompositor rendern.", "Description[el]": "Αποτύπωση σε εμφωλευμένο παράθυρο κατά την εκτέλεση του συνθέτη Wayland.", "Description[es]": "Renderizar en una ventana anidada en el compositor Wayland en ejecución.", "Description[et]": "Renderdamine töötava Waylandi komposiitori pesastatud aknas.", diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json index 98f09d1d42..c5de0da90e 100644 --- a/plugins/platforms/x11/standalone/x11.json +++ b/plugins/platforms/x11/standalone/x11.json @@ -4,7 +4,6 @@ "Description[ca@valencia]": "Connector de plataforma per una X11 autònoma en el kwin_x11.", "Description[ca]": "Connector de plataforma per una X11 autònoma en el kwin_x11.", "Description[da]": "Platform-plugin til standalone x11 i kwin_x11.", - "Description[de]": "Plattform-Modul für ein selbstständiges X11 in kwin_x11.", "Description[el]": "Πρόσθετο πλατφόρμας για αυτόνομο x11 και kwin_x11.", "Description[es]": "Complemento de Platform para X11 autónomo en kwin_x11.", "Description[et]": "Autonoomse x11 platvormi plugin kwin_x11-s", @@ -33,7 +32,6 @@ "Name": "x11-standalone", "Name[ca@valencia]": "X11-autònoma", "Name[ca]": "X11-autònoma", - "Name[de]": "Selbständiges-x11", "Name[el]": "x11-αυτόνομος", "Name[es]": "x11-autónomo", "Name[gl]": "x11-independente", diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json index 84ac0a0556..fbaa5fdb17 100644 --- a/plugins/platforms/x11/windowed/x11.json +++ b/plugins/platforms/x11/windowed/x11.json @@ -4,7 +4,6 @@ "Description[ca@valencia]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", "Description[ca]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", "Description[da]": "Rendér til et indlejret vindue på X11-vinduessystemet.", - "Description[de]": "In ein eingebettetes Fenster auf X11-Fenstersystemen rendern.", "Description[el]": "Αποτύπωση σε εμφωλευμένο παράθυρο σε παραθυρικό σύστημα X11.", "Description[es]": "Renderizar en una ventana anidada en el sistema de ventanas X11.", "Description[et]": "Pesastatud akna renderdamine X11 aknasüsteemis.",