From 4c145d4604d3e1ffddd883e246485ed63b860870 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Sun, 22 Jan 2012 09:32:56 +0100 Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwindesktop/desktop.desktop | 1 + kcmkwin/kwinoptions/kwinmoving.desktop | 1 + kcmkwin/kwinoptions/kwinoptions.desktop | 1 + kcmkwin/kwinrules/kwinrules.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 1 + kcmkwin/kwintabbox/kwintabbox.desktop | 1 + 6 files changed, 6 insertions(+) diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index ec6ba15fe1..62fb6ff3b0 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -180,6 +180,7 @@ X-KDE-Keywords[nl]=bureaublad,bureaubladen,nummer,virtueel bureaublad X-KDE-Keywords[pa]=ਡੈਸਕਟਾਪ,ਨੰਬਰ,ਵਰਚੁਅਲ ਡੈਸਕਟਾਪ X-KDE-Keywords[pt]=ecrã,ecrãs,número,ecrã virtual X-KDE-Keywords[pt_BR]=área de trabalho,áreas de trabalho,número,área de trabalho virtual +X-KDE-Keywords[ro]=birou,birouri,număr,birou virtual X-KDE-Keywords[sr]=desktop,desktops,number,virtual desktop,површ,број,виртуелна површ X-KDE-Keywords[sr@ijekavian]=desktop,desktops,number,virtual desktop,површ,број,виртуелна површ X-KDE-Keywords[sr@ijekavianlatin]=desktop,desktops,number,virtual desktop,površ,broj,virtuelna površ diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index 7cb48804ab..f77a17929e 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -197,6 +197,7 @@ X-KDE-Keywords[hu]=mozgatás,intelligens,lépcsőzetes,maximalizálás,maximaliz X-KDE-Keywords[ia]=movente,intelligente,cascada,maximisa,maximiza,zona de ruptura,margine X-KDE-Keywords[it]=spostamento,intelligente,cascata,massimizza,zona di aggancio,agganciamento,bordo X-KDE-Keywords[kk]=moving,smart,cascade,maximize,maximise,snap zone,snap,border +X-KDE-Keywords[ko]=moving,smart,cascade,maximize,maximise,snap zone,snap,border,이동,스마트,계단식,최대화,경계선 X-KDE-Keywords[nb]=flytting,smart,kaskade,maksimer,gripesone,gripe,kant X-KDE-Keywords[nl]=verplaatsen,smart,cascade,maximaliseren,zone vastzetten,vastzetten,grens X-KDE-Keywords[pt]=movimento,inteligente,cascata,maximizar,ajuste à zona,ajuste,contorno diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 1ac70094e1..b8ec0ae3e6 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -202,6 +202,7 @@ X-KDE-Keywords[hu]=fókus,elhelyezés,ablakműködés,animáció,felemelés,auto X-KDE-Keywords[ia]=focus,placiamento,comportamento de fenestra,animation,altiar,auto altiar,fenestras,quadro,barra de titulo,duple click X-KDE-Keywords[it]=fuoco,posizionamento,comportamento della finestra,animazione,sollevamento,sollevamento automatico,finestre,riquadro,barra del titolo,doppio clic X-KDE-Keywords[kk]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick +X-KDE-Keywords[ko]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick,초점,위치,창 행동,애니메이션,올리기,창,프레임,제목 표시줄 X-KDE-Keywords[nb]=fokus,plassering,vindusppførsel,animering,hev,autohev,vinduer,ramme,tittellinje,dobbeltklikk X-KDE-Keywords[nl]=focus,plaatsing,venstegedrag,animatie,omhoog,automatisch omhoog,vensters,frame,titelbalk,dubbelklik X-KDE-Keywords[pt]=foco,colocação,comportamento da janela,animação,elevar,elevar automaticamente,janelas,contorno,barra de título,duplo-click diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index 9a35eb9e26..b83720deba 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -171,6 +171,7 @@ X-KDE-Keywords[hu]=méret,elhelyezkedés,állapot,ablakműködés,ablakok,specif X-KDE-Keywords[ia]=grandor,position,stato,comportamento de fenestra,fenestras,specific,workarounds,memora,regulas X-KDE-Keywords[it]=dimensione,posizione,stato,comportamento della finestra,finestre,specifico,espedienti,ricorda,regole X-KDE-Keywords[kk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules +X-KDE-Keywords[ko]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,크기,위치,창 행동,창,창 지정,규칙 X-KDE-Keywords[nb]=størrelsse,plassering,vindusoppførsel,vindu,bestemt,løsninger,husk,regler X-KDE-Keywords[nl]=grootte,positie,status,venstergedrag,vensters,specifiek,er omheen gewerkt,herinneren,regels X-KDE-Keywords[pt]=tamanho,posição,estado,comportamento da janela,janelas,específico,alternativas,recordar,regras diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 74c09d4f2e..5636ada61d 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -160,6 +160,7 @@ X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,szél,szegély,művelet,váltás, X-KDE-Keywords[ia]=kwin,fenestra,gerente,effecto,bordo,margine,action,commuta,scriptorio X-KDE-Keywords[it]=kwin,gestore,finestra,effetto,bordo,azione,cambio,desktop X-KDE-Keywords[kk]=kwin,window,manager,effect,edge,border,action,switch,desktop +X-KDE-Keywords[ko]=kwin,window,manager,effect,edge,border,action,switch,desktop,창,관리자,창 관리자,경계선,효과,동작,데스크톱,전환 X-KDE-Keywords[nb]=kwin,vindu,behandler,effekt,kant,ramme,handling,bytte,skrivebord X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,rand,grens,actie,schakelaar,bureaublad X-KDE-Keywords[pt]=kwin,janela,gestor,efeito,extremo,contorno,acção,mudar,ecrã diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index 6e5654b302..5b6ff2f498 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -131,6 +131,7 @@ X-KDE-Keywords[hu]=ablak,ablakok,váltó,ablakváltó,váltás,ablakváltás,alt X-KDE-Keywords[ia]=fenestra,fenestras,commutator,commutator de fenestra,commutar,commutar fenestra,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[it]=finestra,finestre,scambiatore,scambiafinestre,scambio,scambio finestre,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[kk]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab +X-KDE-Keywords[ko]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab,창,창 전환,창 전환기,전환 X-KDE-Keywords[nb]=vindu,vinduer,bytter,vindusbytter,bytte,vindusbytte,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[nl]=venster,vensters,schakelaar,vensterwisselaar,wisseling,vensterwisseling,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[pt]=janela,janelas,selector,selector de janelas,mudar,mudança de janela,alttab,alt-tab,alt+tab,alt tab From a94932475c757272862d1fa4967a8074cb8a4b14 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Mon, 23 Jan 2012 09:42:47 +0100 Subject: [PATCH 2/3] SVN_SILENT made messages (.desktop file) --- effects/screenshot/screenshot.desktop | 2 ++ kcmkwin/kwindesktop/desktop.desktop | 4 +-- kwin.notifyrc | 40 +++++++++++++-------------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/effects/screenshot/screenshot.desktop b/effects/screenshot/screenshot.desktop index 952c112a0b..4ccda2ee4e 100644 --- a/effects/screenshot/screenshot.desktop +++ b/effects/screenshot/screenshot.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Screenshot +Name[ar]=لقطة شاشة Name[ast]=Captura de pantalla Name[bg]=Снимка на екрана Name[bs]=Snimak ekrana @@ -59,6 +60,7 @@ Name[zh_CN]=屏幕截图 Name[zh_TW]=螢幕快照 Icon=preferences-system-windows-effect-screenshot Comment=Saves screenshot of active window into the home directory +Comment[ar]=يحفظ لقطة شاشة للنافذة الحالية إلى مجلد المنزل Comment[ast]=Guarda una captura de la ventana activa na carpeta personal Comment[bg]=Запазване снимка на активния прозорец в домашната папка Comment[bs]=Upisuje snimak aktivnog prozora u domaću fasciklu diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index 62fb6ff3b0..338c702b6c 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -12,7 +12,7 @@ X-KDE-System-Settings-Parent-Category=workspace-behavior X-KDE-Weight=60 Name=Virtual Desktops -Name[ar]=أسطح المكتب الإفتراضية +Name[ar]=أسطح المكتب الافتراضية Name[ast]=Escritorios virtuales Name[bg]=Виртуални работни плотове Name[bs]=Virtuelne površi @@ -75,7 +75,7 @@ Name[zh_TW]=虛擬桌面 Comment=You can configure how many virtual desktops there are. Comment[af]=Jy kan opstel hoeveel virtuele werkskerms daar is. -Comment[ar]=تستطيع ضبط عدد أسطح المكتب الإفتراضية +Comment[ar]=تستطيع ضبط عدد أسطح المكتب الافتراضية Comment[ast]=Configuración del númberu d'escritorios virtuales. Comment[be]=Тут вы можаце змяніць колькасць віртуальных стальніц. Comment[be@latin]=Tut možna naładzić, kolki jość virtualnych rabočych stałoŭ. diff --git a/kwin.notifyrc b/kwin.notifyrc index bd8a93e9f6..483b32577e 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -152,7 +152,7 @@ Name[zh_CN]=转到桌面 1 Name[zh_TW]=切換到桌面 1 Comment=Virtual desktop one is selected Comment[af]=Virtuele Werkskerm een is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 1 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 1 Comment[ast]=Escoyóse l'escritoriu virtual un Comment[be@latin]=Vybrany pieršy virtualny stoł. Comment[bg]=Избран е виртуален плот 1 @@ -328,7 +328,7 @@ Name[zh_CN]=转到桌面 2 Name[zh_TW]=切換到桌面 2 Comment=Virtual desktop two is selected Comment[af]=Virtuele Werkskerm twee is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 2 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 2 Comment[ast]=Escoyóse l'escritoriu virtual dos Comment[be@latin]=Vybrany druhi virtualny stoł. Comment[bg]=Избран е виртуален плот 2 @@ -504,7 +504,7 @@ Name[zh_CN]=转到桌面 3 Name[zh_TW]=切換到桌面 3 Comment=Virtual desktop three is selected Comment[af]=Virtuele Werkskerm drie is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 3 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 3 Comment[ast]=Escoyóse l'escritoriu virtual trés Comment[be@latin]=Vybrany treci virtualny stoł. Comment[bg]=Избран е виртуален плот 3 @@ -680,7 +680,7 @@ Name[zh_CN]=转到桌面 4 Name[zh_TW]=切換到桌面 4 Comment=Virtual desktop four is selected Comment[af]=Virtuele Werkskerm vier is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 4 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 4 Comment[ast]=Escoyóse l'escritoriu virtual cuatro Comment[be@latin]=Vybrany čaćviorty virtualny stoł. Comment[bg]=Избран е виртуален плот 4 @@ -856,7 +856,7 @@ Name[zh_CN]=转到桌面 5 Name[zh_TW]=切換到桌面 5 Comment=Virtual desktop five is selected Comment[af]=Virtuele Werkskerm vyf is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 5 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 5 Comment[ast]=Escoyóse l'escritoriu virtual cinco Comment[be@latin]=Vybrany piaty virtualny stoł. Comment[bg]=Избран е виртуален плот 5 @@ -1032,7 +1032,7 @@ Name[zh_CN]=转到桌面 6 Name[zh_TW]=切換到桌面 6 Comment=Virtual desktop six is selected Comment[af]=Virtuele Werkskerm ses is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 6 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 6 Comment[ast]=Escoyóse l'escritoriu virtual seis Comment[be@latin]=Vybrany šosty virtualny stoł. Comment[bg]=Избран е виртуален плот 6 @@ -1206,7 +1206,7 @@ Name[zh_CN]=转到桌面 7 Name[zh_TW]=切換到桌面 7 Comment=Virtual desktop seven is selected Comment[af]=Virtuele Werkskerm sewe is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 7 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 7 Comment[ast]=Escoyóse l'escritoriu virtual siete Comment[be@latin]=Vybrany siomy virtualny stoł. Comment[bg]=Избран е виртуален плот 7 @@ -1382,7 +1382,7 @@ Name[zh_CN]=转到桌面 8 Name[zh_TW]=切換到桌面 8 Comment=Virtual desktop eight is selected Comment[af]=Virtuele Werkskerm agt is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 8 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 8 Comment[ast]=Escoyóse l'escritoriu virtual ocho Comment[be@latin]=Vybrany vośmy virtualny stoł. Comment[bg]=Избран е виртуален плот 8 @@ -1556,7 +1556,7 @@ Name[zh_CN]=转到桌面 9 Name[zh_TW]=切換到桌面 9 Comment=Virtual desktop nine is selected Comment[af]=Virtuele Werkskerm nege is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 9 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 9 Comment[ast]=Escoyóse l'escritoriu virtual nueve Comment[be@latin]=Vybrany dziaviaty virtualny stoł. Comment[bg]=Избран е виртуален плот 9 @@ -1728,7 +1728,7 @@ Name[zh_CN]=转到桌面 10 Name[zh_TW]=切換到桌面 10 Comment=Virtual desktop ten is selected Comment[af]=Virtuele Werkskerm tien is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 10 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 10 Comment[ast]=Escoyóse l'escritoriu virtual diez Comment[be@latin]=Vybrany dziasiaty virtualny stoł. Comment[bg]=Избран е виртуален плот 10 @@ -1900,7 +1900,7 @@ Name[zh_CN]=转到桌面 11 Name[zh_TW]=切換到桌面 11 Comment=Virtual desktop eleven is selected Comment[af]=Virtuele Werkskerm elf is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 11 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 11 Comment[ast]=Escoyóse l'escritoriu virtual once Comment[be@latin]=Vybrany adzinaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 11 @@ -2072,7 +2072,7 @@ Name[zh_CN]=转到桌面 12 Name[zh_TW]=切換到桌面 12 Comment=Virtual desktop twelve is selected Comment[af]=Virtuele Werkskerm twaalf is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 12 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 12 Comment[ast]=Escoyóse l'escritoriu virtual doce Comment[be@latin]=Vybrany dvanaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 12 @@ -2244,7 +2244,7 @@ Name[zh_CN]=转到桌面 13 Name[zh_TW]=切換到桌面 13 Comment=Virtual desktop thirteen is selected Comment[af]=Virtuele Werkskerm dertien is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 13 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 13 Comment[ast]=Escoyóse l'escritoriu virtual trece Comment[be@latin]=Vybrany trynaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 13 @@ -2416,7 +2416,7 @@ Name[zh_CN]=转到桌面 14 Name[zh_TW]=切換到桌面 14 Comment=Virtual desktop fourteen is selected Comment[af]=Virtuele Werkskerm veertien is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 14 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 14 Comment[ast]=Escoyóse l'escritoriu virtual catorce Comment[be@latin]=Vybrany čatyrnaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 14 @@ -2588,7 +2588,7 @@ Name[zh_CN]=转到桌面 15 Name[zh_TW]=切換到桌面 15 Comment=Virtual desktop fifteen is selected Comment[af]=Virtuele Werkskerm vyftien is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 15 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 15 Comment[ast]=Escoyóse l'escritoriu virtual quince Comment[be@latin]=Vybrany piatnaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 15 @@ -2760,7 +2760,7 @@ Name[zh_CN]=转到桌面 16 Name[zh_TW]=切換到桌面 16 Comment=Virtual desktop sixteen is selected Comment[af]=Virtuele Werkskerm sestien is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 16 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 16 Comment[ast]=Escoyóse l'escritoriu virtual dieciseis Comment[be@latin]=Vybrany šasnaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 16 @@ -2932,7 +2932,7 @@ Name[zh_CN]=转到桌面 17 Name[zh_TW]=切換到桌面 17 Comment=Virtual desktop seventeen is selected Comment[af]=Virtuele Werkskerm sewentien is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 17 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 17 Comment[ast]=Escoyóse l'escritoriu virtual diecisiete Comment[be@latin]=Vybrany siamnaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 17 @@ -3104,7 +3104,7 @@ Name[zh_CN]=转到桌面 18 Name[zh_TW]=切換到桌面 18 Comment=Virtual desktop eighteen is selected Comment[af]=Virtuele Werkskerm agtien is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 18 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 18 Comment[ast]=Escoyóse l'escritoriu virtual dieciocho Comment[be@latin]=Vybrany asiamnaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 18 @@ -3276,7 +3276,7 @@ Name[zh_CN]=转到桌面 19 Name[zh_TW]=切換到桌面 19 Comment=Virtual desktop nineteen is selected Comment[af]=Virtuele Werkskerm negentien is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 19 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 19 Comment[ast]=Escoyóse l'escritoriu virtual diecinueve Comment[be@latin]=Vybrany dzieviatnaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 19 @@ -3448,7 +3448,7 @@ Name[zh_CN]=转到桌面 20 Name[zh_TW]=切換到桌面 20 Comment=Virtual desktop twenty is selected Comment[af]=Virtuele Werkskerm twintig is gekies -Comment[ar]=تم اختيار سطح المكتب الإفتراضي 20 +Comment[ar]=تم اختيار سطح المكتب الافتراضي 20 Comment[ast]=Escoyóse l'escritoriu virtual veinte Comment[be@latin]=Vybrany dvaccaty virtualny stoł. Comment[bg]=Избран е виртуален плот 20 From 7acf1330bde58083a15afa677b71341cce8c779e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Tue, 24 Jan 2012 16:58:33 +0100 Subject: [PATCH 3/3] Support withdrawal of shadows The Oxygen deco uses this to remove built-in shadows from decorated windows when adding (legacy...) decoration shadows CCBUG: 291774 REVIEW: 103751 --- shadow.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shadow.cpp b/shadow.cpp index b5a7e08cef..de989c7955 100644 --- a/shadow.cpp +++ b/shadow.cpp @@ -206,6 +206,9 @@ bool Shadow::updateShadow() { QVector data = Shadow::readX11ShadowProperty(m_topLevel->window()); if (data.isEmpty()) { + if (m_topLevel && m_topLevel->effectWindow() && m_topLevel->effectWindow()->sceneWindow()) + m_topLevel->effectWindow()->sceneWindow()->updateShadow(0); + deleteLater(); return false; } init(data);