From e5546c9236d55cf296578ff1a020e2085149f24a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 9 Feb 2020 05:53:12 +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" --- effects/sessionquit/package/metadata.desktop | 2 ++ kcmkwin/kwincompositing/kwincompositing.desktop | 1 + kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop | 1 + kcmkwin/kwindesktop/package/metadata.desktop | 1 + kcmkwin/kwineffects/kcm_kwin_effects.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 1 + kcmkwin/kwinoptions/kwinadvanced.desktop | 3 +++ kcmkwin/kwinoptions/kwinfocus.desktop | 3 +++ kcmkwin/kwinoptions/kwinmoving.desktop | 2 ++ kcmkwin/kwinoptions/kwinoptions.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 1 + kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 1 + 12 files changed, 18 insertions(+) diff --git a/effects/sessionquit/package/metadata.desktop b/effects/sessionquit/package/metadata.desktop index cbed4f8cbb..438f72f2c1 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -2,6 +2,7 @@ Name=Session Quit Name[ca]=Sortida de la sessió Name[cs]=Sezení bylo ukončeno +Name[da]=Afslutning af session Name[en_GB]=Session Quit Name[es]=Cierre de sesión Name[et]=Seansist väljumine @@ -28,6 +29,7 @@ Name[zh_TW]=離開工作階段 Icon=preferences-system-windows-effect-logout Comment=Keep the desktop background alive during logout until the end Comment[ca]=Manté viu el fons de l'escriptori durant la sortida de la sessió fins el final +Comment[da]=Hold skrivebordsbaggrunden i live under log ud helt til sidst Comment[en_GB]=Keep the desktop background alive during logout until the end Comment[es]=Mantener el fondo del escritorio activo durante el cierre de sesión hasta el final Comment[et]=Töölaua taust hoitakse väljalogimisel alles kuni lõpuni diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 4f14312156..995ba853d3 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -104,6 +104,7 @@ Comment[zh_TW]=桌面效果使用的組合器設定 X-KDE-Keywords=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects X-KDE-Keywords[ca]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D,OpenGL,XRender,arranjament de vídeo,efectes gràfics,efectes de l'escriptori +X-KDE-Keywords[da]=kwin,vindue,håndtering,window,manager,compositing,effekt,3D effekter,2D effekter,OpenGL,XRender,video-indstillinger,grafiske effekter,skrivebordseffekter,desktop effects X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid X-KDE-Keywords[eu]=kwin,leihoa,kudeatzailea,konposatzailea,efektua,3Dtako efektuak,2Dtako efektuak,OpenGL,XRender,bideo ezarpenak,efektu grafikoak,mahaigaineko efektuak diff --git a/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop b/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop index 5725b7dae7..3af3e5a6f1 100644 --- a/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop +++ b/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop @@ -76,6 +76,7 @@ Name[zh_TW]=虛擬桌面 Comment=Configure navigation, number and layout of virtual desktops Comment[ca]=Configura la navegació, el nombre i la disposició dels escriptoris virtuals +Comment[da]=Indstil navigation, antal og layout af virtuelle skriveborde Comment[de]=Navigation, Anzahl und Layout virtueller Arbeitsflächen einrichten Comment[en_GB]=Configure navigation, number and layout of virtual desktops Comment[es]=Configurar la navegación, número y disposición de los escritorios virtuales diff --git a/kcmkwin/kwindesktop/package/metadata.desktop b/kcmkwin/kwindesktop/package/metadata.desktop index 1e5a46fff4..7165031b6d 100644 --- a/kcmkwin/kwindesktop/package/metadata.desktop +++ b/kcmkwin/kwindesktop/package/metadata.desktop @@ -63,6 +63,7 @@ Name[zh_TW]=虛擬桌面 Comment=Configure navigation, number and layout of virtual desktops Comment[ca]=Configura la navegació, el nombre i la disposició dels escriptoris virtuals +Comment[da]=Indstil navigation, antal og layout af virtuelle skriveborde Comment[de]=Navigation, Anzahl und Layout virtueller Arbeitsflächen einrichten Comment[en_GB]=Configure navigation, number and layout of virtual desktops Comment[es]=Configurar la navegación, número y disposición de los escritorios virtuales diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index edbc3baa9e..ee78f454fd 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -64,6 +64,7 @@ Name[zh_TW]=桌面效果 Comment=Configure compositor settings for desktop effects Comment[ca]=Configura l'arranjament del compositor per als efectes de l'escriptori Comment[cs]=Nastavení kompozitoru pro efekty pracovní plochy +Comment[da]=Compositor-indstillinger til skrivebordseffekter Comment[de]=Compositor-Einstellungen für Arbeitsflächen-Effekte einrichten Comment[en_GB]=Configure compositor settings for desktop effects Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 287a926022..3ac1eaa624 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -42,6 +42,7 @@ Name[zh_TW]=視窗動作 Comment=Configure mouse actions for windows and titlebars Comment[ca]=Configura les accions de ratolí per a les finestres i les barres de títol Comment[cs]=Nastavení činností myši na oknech a pruhu titulku +Comment[da]=Indstil mushandlinger for vinduer og titellinjer Comment[de]=Mausaktionen für Fenster und Titelleisten einrichten Comment[en_GB]=Configure mouse actions for windows and titlebars Comment[es]=Configurar las acciones del ratón para las ventanas y las barras de títulos diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index f1461e151b..8cac4f583e 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinadvanced Name=Advanced Window Behavior Name[ca]=Comportament avançat de les finestres Name[cs]=Pokročilé chování oken +Name[da]=Avanceret vinduesopførsel Name[de]=Erweitertes Fensterverhalten Name[en_GB]=Advanced Window Behaviour Name[es]=Comportamiento avanzado de las ventanas @@ -40,6 +41,7 @@ Name[zh_TW]=進階視窗行為 Comment=Configure advanced window management options Comment[ca]=Configura les opcions avançades per a la gestió de les finestres Comment[cs]=Nastavení pokročilých voleb správce oken +Comment[da]=Indstil avancerede vindueshåndteringsegenskaber Comment[de]=Einstellungen für erweiterte Fensterverwaltung einrichten Comment[en_GB]=Configure advanced window management options Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas @@ -68,6 +70,7 @@ Comment[zh_TW]=設定進階視窗管理選項 X-KDE-Keywords=unshade,unshading,shade,shading,border,hover,active borders,tiling,tabs,tabbing,window,window tabbing,window grouping,window tiling,placement,window placement,placement of windows,window advanced behavior X-KDE-Keywords[ca]=desplega,desplegament,ombra,vora,passar per sobre,vores actives,mosaic,pestanyes,pestanyes de finestra,finestra,agrupació de les finestres,mosaic de les finestres,col·locació,col·locació de les finestres,comportament avançat de les finestres +X-KDE-Keywords[da]=kant,hover,aktive kanter,tiling,faneblade,vinduesfaneblade,gruppering af vinduer,vinduesplacering,placering,placering af vinduer,avanceret vinduesopførsel X-KDE-Keywords[en_GB]=unshade,unshading,shade,shading,border,hover,active borders,tiling,tabs,tabbing,window,window tabbing,window grouping,window tiling,placement,window placement,placement of windows,window advanced behaviour X-KDE-Keywords[es]=desplegar,extender,recoger,plegar,borde,pasada,bordes activos,mosaico,pestañas,páginas en pestañas,ventana,pestañas de páginas,agrupación de ventanas,ventanas en mosaico,posicionamiento,posicionamiento de ventanas,comportamiento avanzado de las ventanas X-KDE-Keywords[et]=varjamine,piire,kohalviibimine,aktiivsed piirded,paanimine,kaardid,aknad kaartidena,akende rühmitamine,akende paanimine,akende paigutus,akende täpne käitumine,aken,paigutus diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index c1259a657e..37c519f220 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinfocus Name=Window Focus Behavior Name[ca]=Comportament del focus de les finestres Name[cs]=Chování při zaměření na okno +Name[da]=Opførsel af vinduesfokus Name[en_GB]=Window Focus Behaviour Name[es]=Comportamiento del foco de las ventanas Name[et]=Akende fookuse käitumine @@ -39,6 +40,7 @@ Name[zh_TW]=視窗焦點行為 Comment=Configure window activation policy Comment[ca]=Configura la política d'activació de les finestres Comment[cs]=Nastavení pravidel aktivování oken +Comment[da]=Indstil vinduers aktiveringspolitik Comment[en_GB]=Configure window activation policy Comment[es]=Configurar la política de activación de ventanas Comment[et]=Akende aktiveerimise reeglite seadistamine @@ -66,6 +68,7 @@ Comment[zh_TW]=設定視窗啟用策略 X-KDE-Keywords=focus,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,focus follows mouse,focus prevention,focus stealing,focus policy,window focus behavior,window screen behavior X-KDE-Keywords[ca]=focus,elevació automàtica,elevació,elevació en clic,teclat,CDE,alt-tab,tots els escriptoris,focus segueix el ratolí,prevenció del focus,robatori del focus,política del focus,comportament del focus de la finestra,comportament en pantalla de la finestra +X-KDE-Keywords[da]=fokus,autohæv,hæv,klikhæv,tastatur,CDE,alt-tab,alle skriveborde,fokus følger mus,fokusforhindring,stjæler fokus,fokuspolitik,opførsel for vinduesfokus X-KDE-Keywords[en_GB]=focus,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,focus follows mouse,focus prevention,focus stealing,focus policy,window focus behaviour,window screen behaviour X-KDE-Keywords[es]=foco,auto levantar,levantar,clic para levantar,teclado,CDE,alt-tab,todo el escritorio,el foco sigue al ratón,prevención de foco,robo del foco,política del foco,comportamiento del foco de las ventanas,comportamiento de la pantalla de ventanas X-KDE-Keywords[et]=fookus,asetus,automaatne esiletoomine,klõpsuga esiletoomine,klaviatuur,CDE,alt-tab,kõik töölauad,fookus järgib hiirt,fookuse vältimine,fookuse röövimine,fookuse reegel,akna fookuse käitumine diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index ef90aaa91d..4806ff761b 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -12,6 +12,7 @@ X-KDE-PluginKeyword=kwinmoving Name=Window Movement Name[ca]=Moviment de les finestres Name[cs]=Pohyb oken +Name[da]=Flytning af vinduer Name[en_GB]=Window Movement Name[es]=Movimiento de las ventanas Name[et]=Akna liigutamine @@ -40,6 +41,7 @@ Name[zh_TW]=視窗移動 Comment=Configure window movement options Comment[ca]=Configura les opcions de moviment de les finestres Comment[cs]=Nastavit volby pohybu oken +Comment[da]=Indstil flytning af vinduer Comment[en_GB]=Configure window movement options Comment[es]=Configurar las opciones del movimiento de las ventanas Comment[et]=Akende liigutamise seadistamine diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 53d398a91c..69668445ce 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -102,6 +102,7 @@ Name[zh_TW]=視窗行為 Comment=Configure window actions and behavior Comment[ca]=Configura les accions i comportament de les finestres Comment[cs]=Nastavte činností a chování oken +Comment[da]=Indstil vindueshandlinger og -opførsel Comment[de]=Fenster-Aktionen und -verhalten einrichten Comment[en_GB]=Configure window actions and behaviour Comment[es]=Configurar las acciones y el comportamiento de las ventanas diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index bc3c50d1ea..a85e52b25e 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -82,6 +82,7 @@ Name[zh_TW]=螢幕邊緣 Comment=Configure active screen corners and edges Comment[ca]=Configura les cantonades i vores actives de la pantalla +Comment[da]=Indstil aktive skærmhjørner- og kanter Comment[de]=Aktive Bildschirmränder und -ecken einrichten Comment[en_GB]=Configure active screen corners and edges Comment[es]=Configurar los bordes y las esquinas de pantalla activos diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index 2bd6b797aa..84ef21262c 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -52,6 +52,7 @@ Name[zh_CN]=触摸屏 Name[zh_TW]=觸控螢幕 Comment=Configure touch screen swipe gestures Comment[ca]=Configura els gestos de lliscament en la pantalla tàctil +Comment[da]=Indstil strygegestusser til touchskærme Comment[de]=Wischgesten für Touchscreens einrichten Comment[en_GB]=Configure touch screen swipe gestures Comment[es]=Configurar los gestos de deslizamiento en pantalla táctil