From 0f97a13fc4d2d0fb1f0ed05f595534863db65fc4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 26 Sep 2019 05:23:56 +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" --- kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop | 1 + kcmkwin/kwindesktop/package/metadata.desktop | 1 + kcmkwin/kwineffects/kcm_kwin_effects.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 2 ++ kcmkwin/kwinoptions/kwinadvanced.desktop | 3 +++ kcmkwin/kwinoptions/kwinfocus.desktop | 3 +++ kcmkwin/kwinoptions/kwinmoving.desktop | 2 ++ kcmkwin/kwinoptions/kwinoptions.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 3 ++- kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 1 + 10 files changed, 17 insertions(+), 1 deletion(-) diff --git a/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop b/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop index 330570def1..faacb8d721 100644 --- a/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop +++ b/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop @@ -85,6 +85,7 @@ Comment[fr]=Configurer la navigation, le nombre et la disposition des bureaux vi Comment[gl]=Configurar a navegación, cantidade e disposición dos escritorios virtuais Comment[id]=Konfigurasikan navigasi, nomor dan tataletak desktop virtual Comment[it]=Configura navigazione, numero e disposizione dei desktop virtuali +Comment[ko]=가상 데스크톱 탐색, 개수, 레이아웃 설정 Comment[nl]=Navigatie, aantal en indeling van virtuele bureaubladen configureren Comment[nn]=Set opp navigering, nummer og vising av virtuelle skrivebord Comment[pl]=Ustawienia poruszania się, liczby oraz układu wirtualnych klawiatur diff --git a/kcmkwin/kwindesktop/package/metadata.desktop b/kcmkwin/kwindesktop/package/metadata.desktop index 5325007e51..41e47e37e2 100644 --- a/kcmkwin/kwindesktop/package/metadata.desktop +++ b/kcmkwin/kwindesktop/package/metadata.desktop @@ -72,6 +72,7 @@ Comment[fr]=Configurer la navigation, le nombre et la disposition des bureaux vi Comment[gl]=Configurar a navegación, cantidade e disposición dos escritorios virtuais Comment[id]=Konfigurasikan navigasi, nomor dan tataletak desktop virtual Comment[it]=Configura navigazione, numero e disposizione dei desktop virtuali +Comment[ko]=가상 데스크톱 탐색, 개수, 레이아웃 설정 Comment[nl]=Navigatie, aantal en indeling van virtuele bureaubladen configureren Comment[nn]=Set opp navigering, nummer og vising av virtuelle skrivebord Comment[pl]=Ustawienia poruszania się, liczby oraz układu wirtualnych klawiatur diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index e896ae0723..ade028a697 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -67,6 +67,7 @@ Comment[en_GB]=Configure compositor settings for desktop effects Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio Comment[gl]=Configurar o compositor para os efectos de escritorio Comment[it]=Configura impostazioni del compositore per gli effetti del desktop +Comment[ko]=데스크톱 효과에 사용되는 컴포지터 설정 Comment[nl]=Instellingen van compositor configureren voor bureaubladeffecten Comment[nn]=Samansetjarinnstillingar for skrivebordseffektar Comment[pl]=Ustawienia kompozytora dla efektów pulpitu diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 977c7216ee..5aa261bcfa 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -17,6 +17,7 @@ Name[es]=Acciones de ventanas Name[eu]=Leihoetako ekintzak Name[gl]=Accións da xanela Name[it]=Azioni delle finestre +Name[ko]=창 동작 Name[nl]=Vensteracties Name[nn]=Handlingar for vindauge Name[pl]=Zachowanie okien @@ -35,6 +36,7 @@ Comment[es]=Configurar las acciones del ratón para las ventanas y las barras de Comment[eu]=Konfiguratu saguaren ekintzak leihoekin eta titulu-barrekin Comment[gl]=Configurar as accións do rato para xanelas e barras de título Comment[it]=Configura azioni del mouse per finestre e barre del titolo +Comment[ko]=창과 제목 표시줄 마우스 동작 설정 Comment[nl]=Muisacties voor vensters en titelbalken configureren Comment[nn]=Set opp musehandlingar for vindauge og tittellinjer Comment[pl]=Ustawienia działań myszy dla okien i pasków tytułu diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index d67de64b6b..fdc84adfdc 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -16,6 +16,7 @@ Name[es]=Comportamiento avanzado de las ventanas Name[eu]=Leihoaren portaera aurreratua Name[gl]=Comportamento avanzado das xanelas Name[it]=Comportamento avanzato delle finestre +Name[ko]=고급 창 행동 Name[nl]=Geavanceerd venstergedrag Name[nn]=Avansert vindaugsåtferd Name[pl]=Zaawansowane zachowania okien @@ -35,6 +36,7 @@ Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak Comment[gl]=Configurar as funcionalidades avanzadas da xestión de xanelas Comment[it]=Configura opzioni avanzate della gestione delle finestre +Comment[ko]=고급 창 관리자 기능 설정 Comment[nl]=Geavanceerde vensterbeheermogelijkheden configureren Comment[nn]=Set opp avanserte vindaugshandsamarinnstillingar Comment[pl]=Zaawansowane ustawienia zarządzania oknami @@ -53,6 +55,7 @@ X-KDE-Keywords[es]=desplegar,extender,recoger,plegar,borde,pasada,bordes activos X-KDE-Keywords[eu]=zabaldu,zabaltzea,bildu,biltzea,gainetik pasatzea,ertz aktiboak,lauzatze,fitxak,leihoa,leihoen fitxak,leihoak lauza moduan,leihoen kokapena,leihoen jokabide aurreratua X-KDE-Keywords[gl]=dessombrar,dessombramento,sombra,bordo,beira,pasar,bordos activos,beiras activas,xanela,lapelas,agrupar xanelas, situación das xanelas,colocación,colocación das xanelas,comportamento avanzado das xanelas X-KDE-Keywords[it]=arrotola,srotola,ombra,ombreggiatura,bordo,sovrapponi,bordi attivi,affiancamento,schede,navigazione a schede,finestre,finestre a schede,raggruppamento finestre,affiancamento finestre,posizionamento,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre +X-KDE-Keywords[ko]=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[nl]=verhelderen,verheldering,schaduw,verduistering,rand,boven zweven,actieve randen,schuin achter elkaar,tabbladen,met tabbladen werken,venster,vensterwisseling,verstergroepering,vensters schuin achter elkaar,plaatsing,vensterplaatsing,plaatsing van vensters,geavanceerd gedrag van vensters X-KDE-Keywords[nn]=opprulling,kant,sveva,aktive kantar,flislegging,faner,vindaugsfaner,vindaugsgruppering,vindaugsflislegging,vindaugsplassering,plassering,plassering av vindauge,avansert vindaugsåtferd X-KDE-Keywords[pl]=rozwijanie,zwijanie,obramowanie,unoszenie,aktywne obramowania,kafelkowanie,karty,tworzenie kart,okno, umieszczanie okien w kartach,grupowanie okien,kafelkowanie okien,umieszczanie,umieszczanie okien, zaawansowane zachowania okien diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 261d2a935e..8c35283ab9 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -16,6 +16,7 @@ Name[es]=Comportamiento del foco de las ventanas Name[eu]=Leiho fokuaren portaera Name[gl]=Comportamento do foco das xanelas Name[it]=Comportamento del fuoco delle finestre +Name[ko]=창 초점 동작 Name[nl]=Focusgedrag venster Name[nn]=Fokus­åtferd for vindauge Name[pl]=Zachowanie uaktywnienia okien @@ -34,6 +35,7 @@ Comment[es]=Configurar la política de activación de ventanas Comment[eu]=Konfiguratu leihoa aktibatzeko gidalerroak Comment[gl]=Configurar a política de activación de xanelas Comment[it]=Configura criteri di attivazione delle finestre +Comment[ko]=창 활성화 정책 설정 Comment[nl]=Vensteractiveringsbeleid configureren Comment[nn]=Set opp praksisen for vindaugsaktivering Comment[pl]=Ustawienia uaktywniania okien @@ -52,6 +54,7 @@ X-KDE-Keywords[es]=foco,auto levantar,levantar,clic para levantar,teclado,CDE,al X-KDE-Keywords[eu]=fokua,automatikoki igo,igo,egin klik igotzeko,teklatu,CDE,alt-tab,mahaigain guztiak,fokuak saguari jarraitzen dio,foku-prebentzioa,foku-lapurreta,fokuaren gidalerro,leihoen fokuaren portaera,leihoen pantailen portaera X-KDE-Keywords[gl]=foco,erguer automaticamente,erguer,erguer ao premer,teclado,CDE,alt-tab,todo o escritorio,foco que segue o rato,prevención do foco,roubar o foco,política de foco,comportamento de foco de xanela,comportamento de pantalla de xanela X-KDE-Keywords[it]=fuoco,avanzamento automatico,avanzamento,avanzamento con clic,tastiera,CDE,alt-tab,tutti i desktop,il fuoco segue il mouse,impedisci il fuoco,mantieni il fuoco,regole fuoco,comportamento fuoco finestra, comportamento schermo finestra +X-KDE-Keywords[ko]=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[nl]=focus,automatisch omhoog komen,omhoog komen,omhoog komen bij klikken,toetsenbord,CDE,alt-tab,alle bureaubladen,focus volgt muis,voorkomen van focus,focus stelen,focusbeleid,focusgedrag in venster,gedrag van vensterscherm X-KDE-Keywords[nn]=fokus,autohev,hev,klikk-og-hev,tastatur,CDE,alt-tab,alle skrivebord,fokus følgjer mus,fokushindring,fokussteling,fokuspraksis,fokusåtferd for vindauge,vindaugsåtferd på skjerm X-KDE-Keywords[pl]=uaktywnienie,auto wznoszenie,wznoszenie,wznoszenie na kliknięcie,klawiatura,CDE,alt-tab,wszystkie pulpity diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index e45bd6deec..d251b0f484 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -17,6 +17,7 @@ Name[es]=Movimiento de las ventanas Name[eu]=Leihoaren mugimendua Name[gl]=Movemento das xanelas Name[it]=Spostamento delle finestre +Name[ko]=창 이동 Name[nl]=Verplaatsen van vensters Name[nn]=Vidaugs­flytting Name[pl]=Przesuwanie okien @@ -36,6 +37,7 @@ Comment[es]=Configurar las opciones del movimiento de las ventanas Comment[eu]=Konfiguratu leiho mugimenduaren aukerak Comment[gl]=Configurar o movemento das xanelas Comment[it]=Configura opzioni di spostamento delle finestre +Comment[ko]=창 이동 옵션 설정 Comment[nl]=Opties voor vensterverplaatsing configureren Comment[nn]=Set opp vindaugsflytting Comment[pl]=Ustawienia opcji przesuwania okien diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 8952575129..b34d9bca3c 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -107,6 +107,7 @@ Comment[es]=Configurar las acciones y el comportamiento de las ventanas Comment[eu]=Konfiguratu leihoaren ekintzak eta jokabidea Comment[gl]=Configurar o comportamento e as accións das xanelas Comment[it]=Configura azioni e comportamento delle finestre +Comment[ko]=창 동작과 행동 설정 Comment[nl]=Vensteracties en gedrag configureren Comment[nn]=Set opp utsjånad og åtferd for vindauge Comment[pl]=Ustawienia działań i zachowań okien diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 2e17c9311a..1846cd7a8e 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -91,6 +91,7 @@ Comment[fr]=Configurer les bords et les coins d'écran actifs Comment[gl]=Configurar os bordos e esquinas activos da pantalla Comment[id]=Konfigurasikan tepian dan sudut layar aktif Comment[it]=Configura angoli e bordi attivi dello schermo +Comment[ko]=활성 화면 경계와 꼭짓점 설정 Comment[nl]=Actieve schermhoeken en -randen configureren Comment[nn]=Set opp aktive skjermhjørne og skjermkantar Comment[pl]=Ustawienia czułych narożników i krawędzi ekranu @@ -122,7 +123,7 @@ X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,sarok,szél,szegély,művelet,vá X-KDE-Keywords[ia]=kwin,fenestra,gerente,effecto,bordo,margine,action,commuta,scriptorio,bordos de schermo de kwin,bordos de scriptorio,bordos de scriptorio,maximisa fenestras,tegula fenestras,parte de schermo, comportamento de schermo,commuta scriptorio,scriptorio virtual,angulos de schermo X-KDE-Keywords[id]=kwin,window,pengelola,efek,sudut,,tepi,bingkai,aksi,alihkan,desktop,tepian layar kwin,tepian desktop,tepian layar,maksimalkan window,ubinkan window,sisi layar,perilaku layar,alihkan desktop,virtualkan desktop,sudut layar X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,angolo,bordo,azione,scambiatore,desktop,bordi schermo kwin,bordi desktop,bordi schermo,massimizza finestre,affianca finestre,lato dello schermo,comportamento schermo,scambia desktop,desktop virtuale,angoli dello schermo -X-KDE-Keywords[ko]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,창,관리자,효과,경계,경계선,동작,액션,전환,kwin 화면 경계,화면 경계,창 최대화,최대화,바둑판식 배열,화면 행동,데스크톱 전환,가상 데스크톱,화면 모서리,꼭지점 +X-KDE-Keywords[ko]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,창,관리자,효과,경계,경계선,동작,액션,전환,kwin 화면 경계,화면 경계,창 최대화,최대화,바둑판식 배열,화면 행동,데스크톱 전환,가상 데스크톱,화면 모서리,꼭짓점 X-KDE-Keywords[nb]=kwin,vindu,behandler,effekt,kant,hjørne,ramme,handling,bytte,skrivebord,kwin skjermkanter,skrivebordkanter,skjermkanter,maksimere vinduer,flislegge vinduer,skjermside,skjermoppførsel,bytte skrivebord,virtuelt skrivebord,skjermhjørner X-KDE-Keywords[nds]=KWin,Finster,Pleger,Effekt,Hörn,Kant,Rahmen,Akschoon,wesseln,Schriefdisch,maximeren,kacheln,Schirmkant,Schirmbedregen,Schirmhuuk X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,hoek,kant,rand,actie,omschakelen,bureaublad,schermranden van kwin,bureaubladkanten,schermkanten,vensters maximaliseren,venster schuin achter elkaar,zijkant van het scherm,schermgedrag,bureaublad omschakelen,virtueel bureaublad,schermhoeken diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index 0f48c9c2b0..f2ff866d86 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -59,6 +59,7 @@ Comment[fr]=Configurer les mouvements sur l'écran tactile Comment[gl]=Configurar os xestos de pantalla táctil Comment[id]=Konfigurasikan gestur usapan layar sentuh Comment[it]=Configura gesti dello schermo a sfioramento +Comment[ko]=터치 스크린 밀기 제스처 설정 Comment[nl]=Veeggebaren voor aanraakscherm configureren Comment[nn]=Set opp fingerrørsler på trykkskjerm Comment[pl]=Ustawienia gestów na ekranie dotykowym