From 3dc974f3bba3f8d882e5ba18e45cf72168b5f1a5 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Mon, 9 Jan 2012 08:36:30 +0100 Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file) --- clients/aurorae/src/aurorae.desktop | 2 +- effects/_test/videorecord.desktop | 2 +- effects/_test/videorecord_config.desktop | 2 +- kcmkwin/kwincompositing/kwincompositing.desktop | 1 + kcmkwin/kwindecoration/kwindecoration.desktop | 1 + kcmkwin/kwindesktop/desktop.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 3 ++- kcmkwin/kwinoptions/kwinadvanced.desktop | 1 + kcmkwin/kwinoptions/kwinfocus.desktop | 2 ++ kcmkwin/kwinoptions/kwinmoving.desktop | 1 + kcmkwin/kwinoptions/kwinoptions.desktop | 2 ++ kcmkwin/kwinrules/kwinrules.desktop | 2 ++ kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 ++ kcmkwin/kwintabbox/kwintabbox.desktop | 1 + 14 files changed, 19 insertions(+), 4 deletions(-) diff --git a/clients/aurorae/src/aurorae.desktop b/clients/aurorae/src/aurorae.desktop index 9fb77c769a..dfd0a0c794 100644 --- a/clients/aurorae/src/aurorae.desktop +++ b/clients/aurorae/src/aurorae.desktop @@ -9,7 +9,7 @@ Name[ca@valencia]=Motor del tema de decoració Aurorae Name[cs]=Stroj motivů dekorace Aurorae Name[csb]=Mòtór dekòracëji wëzdrzatkù Aurorae Name[da]=Temamotor til Aurorae-dekorationen -Name[de]=Aurorae +Name[de]=Aurorae-Dekorationsdesign-Engine Name[el]=Μηχανισμός διακόσμησης θέματων Aurorae Name[en_GB]=Auroræ Decoration Theme Engine Name[eo]=Aurorae Ornamaĵ-etosa Modulo diff --git a/effects/_test/videorecord.desktop b/effects/_test/videorecord.desktop index 3e7a7d5143..a40bd7ca2a 100644 --- a/effects/_test/videorecord.desktop +++ b/effects/_test/videorecord.desktop @@ -14,7 +14,7 @@ Name[ca@valencia]=Gravador de vídeo Name[cs]=Nahrávání videa Name[csb]=Nagranié wideò Name[da]=Videooptagelse -Name[de]=Video-Aufnahme +Name[de]=Videoaufnahme Name[el]=Εγγραφή βίντεο Name[en_GB]=Video Record Name[eo]=Videoregistrilo diff --git a/effects/_test/videorecord_config.desktop b/effects/_test/videorecord_config.desktop index 63014d16dd..d53fdab09f 100644 --- a/effects/_test/videorecord_config.desktop +++ b/effects/_test/videorecord_config.desktop @@ -21,7 +21,7 @@ Name[ca@valencia]=Gravador de vídeo Name[cs]=Nahrávání videa Name[csb]=Nagranié wideò Name[da]=Videooptagelse -Name[de]=Video-Aufnahme +Name[de]=Videoaufnahme Name[el]=Εγγραφή βίντεο Name[en_GB]=Video Record Name[eo]=Videoregistrilo diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 1831716ed9..b8c466a021 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -181,6 +181,7 @@ Comment[zh_TW]=設定桌面效果 X-KDE-Keywords=kwin,window,manager,compositing,effect X-KDE-Keywords[ca]=kwin,finestra,gestor,composició,efecte +X-KDE-Keywords[ca@valencia]=kwin,finestra,gestor,composició,efecte X-KDE-Keywords[da]=kwin,vindueshåndtering,window,manager,compositing,effekter X-KDE-Keywords[de]=kwin,fenster,manager,effekt,verwaltung,compositing X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,efekt diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index ddd2ac1183..134a3d2287 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -161,6 +161,7 @@ Comment[zh_TW]=設定視窗標題列的外觀與感覺 X-KDE-Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration X-KDE-Keywords[ca]=kwin,finestra,gestor,vora,estil,tema,aspecte,aparença,disposició,botó,gestió,vora,kwm,decoració +X-KDE-Keywords[ca@valencia]=kwin,finestra,gestor,vora,estil,tema,aspecte,aparença,disposició,botó,gestió,vora,kwm,decoració X-KDE-Keywords[da]=kwin,vindueshåndtering,window,manager,kant,stil,tema,udseende,layout,knap,håndtag,kant,kwm,dekoration X-KDE-Keywords[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen X-KDE-Keywords[et]=kwin,aken,haldur,piire,stiil,teema,välimus,paigutus,nupp,pide,serv,kwm,dekoratsioon diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index 0e9ffe226b..3d7af595a8 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -163,6 +163,7 @@ Comment[zh_CN]=您可以在这里配置虚拟桌面的数量。 Comment[zh_TW]=您可以在這裡設定要有多少個虛擬桌面。 X-KDE-Keywords=desktop,desktops,number,virtual desktop X-KDE-Keywords[ca]=escriptori,escriptoris,número,escriptori virtual +X-KDE-Keywords[ca@valencia]=escriptori,escriptoris,número,escriptori virtual X-KDE-Keywords[da]=skrivebord,skriveborde,antal,virtuelle skriveborde X-KDE-Keywords[de]=Arbeitsfläche,Desktop,Anzahl,Virtuelle Arbeitsfläche X-KDE-Keywords[et]=töölaud,töölauad,arv,virtuaalne töölaud diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 6e8a625802..cc244cf508 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -190,8 +190,9 @@ Comment[zh_TW]=設定鍵盤與滑鼠的設定值 X-KDE-Keywords=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize X-KDE-Keywords[ca]=ombra,maximització,minimització,abaixa,menú d'operacions,barra de títol,redimensió +X-KDE-Keywords[ca@valencia]=ombra,maximització,minimització,abaixa,menú d'operacions,barra de títol,redimensió X-KDE-Keywords[da]=skyg,maksimer,minimer,nedre,operationsmenu,titellinje,ændr størrelse -X-KDE-Keywords[de]=Fensterheber,Maximieren,Minimieren,Nach oben/unten,Titelleiste,Größe ändern +X-KDE-Keywords[de]=Fenstermenü,Fensterheber,Maximieren,Minimieren,Nach oben/unten,Titelleiste,Größe ändern X-KDE-Keywords[et]=varjamine,peitmine,maksimeerimine,minimeerimine,allakerimine,üleskerimine,menüü,tiitliriba,suuruse muutmine X-KDE-Keywords[fi]=varjosta,rullaa,suurenna,pienennä,laske,toimintovalikko,otsikkopalkki,muuta kokoa X-KDE-Keywords[ga]=scáth,scáthaigh,uasmhéadaigh,íosmhéadaigh,íoslaghdaigh,laghdaigh,roghchlár oibríochta,barra teidil,athraigh méid diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index bf92b8c8c1..2e9b10ab83 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -188,6 +188,7 @@ Comment[zh_TW]=設定進階視窗管理功能 X-KDE-Keywords=shading,border,hover,active borders X-KDE-Keywords[ca]=ombrejat,vora,passar per sobre,vores actives +X-KDE-Keywords[ca@valencia]=ombrejat,vora,passar per sobre,vores actives X-KDE-Keywords[da]=skyg,kant,hover,aktive kanter X-KDE-Keywords[de]=Schatten,Umrandung,Aktive Ränder,Schweben,Fensterheber X-KDE-Keywords[et]=varjamine,piire,aktiivsed piirded,hiire all diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 62d509ffcf..9629009f81 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -185,7 +185,9 @@ Comment[zh_TW]=設定視窗焦點政策 X-KDE-Keywords=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop X-KDE-Keywords[ca]=focus,situació,elevació automàtica,elevació,elevació de clic,teclat,CDE,alt-tab,tots els escriptoris +X-KDE-Keywords[ca@valencia]=focus,situació,elevació automàtica,elevació,elevació de clic,teclat,CDE,alt-tab,tots els escriptoris X-KDE-Keywords[da]=fokus,placering,autohæv,hæv,klikhæv,tastatur,CDE,alt-tab,alle skriveborde +X-KDE-Keywords[de]=Fokus,Aktivierung,Platzierung,Autom. Aktivierung,Nach oben/unten, Klick,Tastatur,CDE,Alt+Tab X-KDE-Keywords[et]=fookus,paigutus,automaatne esiletoomine,esiletoomine,klõpsuga esiletoomine,klaviatuur,CDE,alt-tab,kõik töölauad X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,automaattinen nosto,nosta,nosto,nosta napsauttamalla,näppäimistö,CDE,alt-tab,alt-sarkain X-KDE-Keywords[ga]=fócas,láithriú,uathardaigh,ardaigh,gliogardaigh,méarchlár,CDE,alt-tab,gach deasc diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index 83f005addb..aec41916b3 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -187,6 +187,7 @@ Comment[zh_TW]=設定視窗移動的方式 X-KDE-Keywords=moving,smart,cascade,maximize,maximise,snap zone,snap,border X-KDE-Keywords[ca]=moviment,intel·ligent,cascada,maximització,zona d'ajust,ajust,vora +X-KDE-Keywords[ca@valencia]=moviment,intel·ligent,cascada,maximització,zona d'ajust,ajust,vora X-KDE-Keywords[da]=flytning,smart,kaskade,maksimer,hægtzone,hægt,kant X-KDE-Keywords[de]=Verschieben,Gestaffelt,Maximieren,Minimieren,Einrastzone,Ränder X-KDE-Keywords[et]=liigutamine,nutikas,kaskaad,maksimeerimine,haardetsoon,haaramine,piire diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 363b5c2797..d038790b5e 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -191,7 +191,9 @@ Comment[zh_TW]=設定視窗行為 X-KDE-Keywords=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick X-KDE-Keywords[ca]=focus,situació,comportament de finestra,animació,elevació,elevació automàtica,finestres,marc,barra de títol,clic doble +X-KDE-Keywords[ca@valencia]=focus,situació,comportament de finestra,animació,elevació,elevació automàtica,finestres,marc,barra de títol,clic doble X-KDE-Keywords[da]=fokus,placering,vinduesopførsel,animation,hæv,autohæv,vinduesramme,titelbjælke,dobbeltklik +X-KDE-Keywords[de]=Aktivierung,Platzierung,Fensterverhalten,Animation,Nach vorn/hinten, Fenster,Rahmen,Umrandung,Titelleiste,Doppelklick X-KDE-Keywords[et]=fookus,asetus,paigutus,akende käitumine,animeerimine,animatsioon,esiletoomine,automaatne esiletoomine,aknad,raam,tiitliriba,topeltklõps X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,ikkunoiden käyttäytyminen,animaatio,nosta,automaattinen nosto,ikkunat,kehys,otsikkopalkki,kaksoisnapsautus,tuplanapsautus,kaksoisklikkaus,tuplaklikkaus X-KDE-Keywords[ga]=fócas,láithriú,oibriú na bhfuinneog,beochan,ardaigh,uathardaigh,fuinneoga,fráma,ceannteideal,déchliceáil diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index 10e817cdb2..75d2a681d0 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -160,7 +160,9 @@ Comment[zh_TW]=設定特定視窗設定值 X-KDE-Keywords=size,position,state,window behavior,windows,specific,workarounds,remember,rules X-KDE-Keywords[ca]=mida,posició,estat,comportament de finestra,finestres,específic,solucions alternatives,record,regles +X-KDE-Keywords[ca@valencia]=mida,posició,estat,comportament de finestra,finestres,específic,solucions alternatives,record,regles X-KDE-Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifikt,workarounds,husk,regler +X-KDE-Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln X-KDE-Keywords[et]=suurus,asukoht,olek,akende käitumine,aknad,meeldejätmine,reeglid X-KDE-Keywords[fi]=koko,sijainti,tila,ikkunan käyttäytyminen,ikkunat,erikoisasetukset,korjaukset,muista,muistaminen,säännöt X-KDE-Keywords[ga]=méid,ionad,staid,oibriú na bhfuinneog,fuinneoga,sainiúil,réitigh seiftithe,meabhraigh,rialacha diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 5191a6d8f0..5fe73fa375 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -149,7 +149,9 @@ Comment[zh_TW]=設定作用的螢幕邊緣 X-KDE-Keywords=kwin,window,manager,effect,edge,border,action,switch,desktop X-KDE-Keywords[ca]=kwin,finestra,gestor,efecte,vora,acció,commutació,escriptori +X-KDE-Keywords[ca@valencia]=kwin,finestra,gestor,efecte,vora,acció,commutació,escriptori X-KDE-Keywords[da]=kwin,vindueshåndtering,window,manager,effekt,kant,handling,skrift,skrivebord +X-KDE-Keywords[de]=kwin,fenster,manager,effekt,verwaltung,ränder,Aktion,Wechsel,Arbeitsfläche X-KDE-Keywords[et]=kwin,aken,haldur,efekt,serv,piire,toiming,lülitamine,töölaud X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,ikkunaohjelma,tehoste,kulma,reuna,toiminto,vaihda,vaihto,vaihtaminen,työpöytä X-KDE-Keywords[ga]=kwin,fuinneog,bainisteoir,maisíocht,ciumhais,imlíne,gníomh,athraigh,athrú,deasc diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index e94f96c875..c8b848943a 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -122,6 +122,7 @@ Comment[zh_CN]=配置窗口导航的行为 Comment[zh_TW]=設定透過視窗導覽的行為。 X-KDE-Keywords=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[ca]=finestra,finestres,commutador,commutador de finestres,commutació,commutació de finestres,alttab,alt-tab,alt+tab,alt tab +X-KDE-Keywords[ca@valencia]=finestra,finestres,commutador,commutador de finestres,commutació,commutació de finestres,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[da]=vindue,vinduer,skifter,vinduesskifter,skift,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[et]=aken,aknad,lülitaja,akende vahetaja,vahetamine,lülitamine,akende lülitamine,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[fi]=ikkuna,ikkunat,vaihtaja,vaihto,ikkunan vaihtaja,vaihtaminen,ikkunan vaihtaminen,ikkunan vaihto,alttab,alt-tab,alt+tab,alt tab,altsarkain,alt-sarkain,alt+sarkain,alt sarkain From 0f8e0545f5ac2a7a8d579b6720e8ad8271a140c9 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Mon, 9 Jan 2012 09:42:37 +0100 Subject: [PATCH 2/3] Changed QSharedPointer -> QPointer CCBUG: 290965 --- clients/oxygen/config/oxygenexceptionlistwidget.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/clients/oxygen/config/oxygenexceptionlistwidget.cpp b/clients/oxygen/config/oxygenexceptionlistwidget.cpp index 6de5a5e124..d10cfc6aa1 100644 --- a/clients/oxygen/config/oxygenexceptionlistwidget.cpp +++ b/clients/oxygen/config/oxygenexceptionlistwidget.cpp @@ -27,7 +27,7 @@ #include "oxygenexceptionlistwidget.moc" #include "oxygenexceptiondialog.h" -#include +#include #include #include @@ -113,9 +113,13 @@ namespace Oxygen { // map dialog - QSharedPointer dialog( new ExceptionDialog( this ) ); + //QSharedPointer dialog( new ExceptionDialog( this ) ); + QPointer dialog = new ExceptionDialog( this ); dialog->setException( _defaultConfiguration ); + + // run dialog and check existence if( dialog->exec() == QDialog::Rejected ) return; + if( !dialog ) return; // retrieve exception and check Exception exception( dialog->exception() ); @@ -132,6 +136,8 @@ namespace Oxygen ui.exceptionListView->selectionModel()->setCurrentIndex( index, QItemSelectionModel::Current|QItemSelectionModel::Rows ); } + delete dialog; + resizeColumns(); emit changed(); return; From 49d44ee2a5fa6c1d3b4f84f47de45e146cdaa1d8 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Mon, 9 Jan 2012 09:49:44 +0100 Subject: [PATCH 3/3] removed other instances of QSharedPointer (damn Qt) CCBUG: 290965 --- .../config/oxygenexceptionlistwidget.cpp | 40 ++++++++++++++----- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/clients/oxygen/config/oxygenexceptionlistwidget.cpp b/clients/oxygen/config/oxygenexceptionlistwidget.cpp index d10cfc6aa1..474f2b2a4b 100644 --- a/clients/oxygen/config/oxygenexceptionlistwidget.cpp +++ b/clients/oxygen/config/oxygenexceptionlistwidget.cpp @@ -113,16 +113,24 @@ namespace Oxygen { // map dialog - //QSharedPointer dialog( new ExceptionDialog( this ) ); QPointer dialog = new ExceptionDialog( this ); dialog->setException( _defaultConfiguration ); // run dialog and check existence - if( dialog->exec() == QDialog::Rejected ) return; + if( dialog->exec() == QDialog::Rejected ) + { + delete dialog; + return; + } + + // check dialog if( !dialog ) return; // retrieve exception and check Exception exception( dialog->exception() ); + delete dialog; + + // check exceptions if( !checkException( exception ) ) return; // create new item @@ -136,8 +144,6 @@ namespace Oxygen ui.exceptionListView->selectionModel()->setCurrentIndex( index, QItemSelectionModel::Current|QItemSelectionModel::Rows ); } - delete dialog; - resizeColumns(); emit changed(); return; @@ -155,12 +161,22 @@ namespace Oxygen Exception& exception( model().get( current ) ); // create dialog - QSharedPointer dialog( new ExceptionDialog( this ) ); + QPointer dialog( new ExceptionDialog( this ) ); dialog->setException( exception ); // map dialog - if( dialog->exec() == QDialog::Rejected ) return; + if( dialog->exec() == QDialog::Rejected ) + { + delete dialog; + return; + } + + // check dialog + if( !dialog ) return; + + // retrieve exception Exception newException = dialog->exception(); + delete dialog; // check if exception was changed if( exception == newException ) return; @@ -170,6 +186,7 @@ namespace Oxygen // asign new exception *&exception = newException; + resizeColumns(); emit changed(); return; @@ -316,11 +333,16 @@ namespace Oxygen { KMessageBox::error( this, i18n("Regular Expression syntax is incorrect") ); - QSharedPointer dialog( new ExceptionDialog( this ) ); + QPointer dialog( new ExceptionDialog( this ) ); dialog->setException( exception ); - if( dialog->exec() == QDialog::Rejected ) return false; - exception = dialog->exception(); + if( dialog->exec() == QDialog::Rejected ) + { + delete dialog; + return false; + } + exception = dialog->exception(); + delete dialog; } return true;