From d391a907e1a9a459b39fd85a526145f92622b2a5 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Wed, 2 Jan 2013 18:37:41 +0100 Subject: [PATCH 1/2] Reduce warning Don't add graphics items twice to the scene. Reparenting already sets the scene. REVIEW: 108079 --- widgets/declarativewidget.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/widgets/declarativewidget.cpp b/widgets/declarativewidget.cpp index 81f09c305..28b48b583 100644 --- a/widgets/declarativewidget.cpp +++ b/widgets/declarativewidget.cpp @@ -145,9 +145,6 @@ void DeclarativeWidgetPrivate::finishExecute() if (object) { static_cast(object)->setParentItem(q); - if (q->scene()) { - q->scene()->addItem(object); - } } if (widget) { From 362ba9245cedf6630874313ee9e2a4a3beb16a7f Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Thu, 3 Jan 2013 07:37:34 +0100 Subject: [PATCH 2/2] SVN_SILENT made messages (.desktop file) --- data/services/plasma-applet-extenderapplet.desktop | 1 + data/services/plasma.protocol | 1 + data/servicetypes/plasma-animator.desktop | 1 + data/servicetypes/plasma-applet-popupapplet.desktop | 1 + data/servicetypes/plasma-applet.desktop | 1 + data/servicetypes/plasma-containment.desktop | 1 + data/servicetypes/plasma-containmentactions.desktop | 1 + data/servicetypes/plasma-dataengine.desktop | 1 + data/servicetypes/plasma-packagestructure.desktop | 1 + data/servicetypes/plasma-runner.desktop | 1 + data/servicetypes/plasma-scriptengine.desktop | 1 + data/servicetypes/plasma-service.desktop | 1 + data/servicetypes/plasma-toolbox.desktop | 1 + data/servicetypes/plasma-wallpaper.desktop | 1 + tests/packagemetadatatest.desktop | 2 ++ .../plasma-containmentactions-test.desktop | 2 ++ tests/testengine/plasma-dataengine-testengine.desktop | 1 + 17 files changed, 19 insertions(+) diff --git a/data/services/plasma-applet-extenderapplet.desktop b/data/services/plasma-applet-extenderapplet.desktop index 5db063255..36a2a60c4 100644 --- a/data/services/plasma-applet-extenderapplet.desktop +++ b/data/services/plasma-applet-extenderapplet.desktop @@ -42,6 +42,7 @@ Name[ku]=Berhevok Name[lt]=Rinkinys Name[lv]=Kolekcija Name[ml]=കൂട്ടം +Name[mr]=संग्रह Name[ms]=Koleksi Name[nb]=Samling Name[nds]=Sammeln diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol index f8bd81219..464a1e087 100644 --- a/data/services/plasma.protocol +++ b/data/services/plasma.protocol @@ -34,6 +34,7 @@ Description[kk]=Plasma қызметінің протоколы Description[km]=ពិធីការ​សម្រាប់​សេវា​កម្ម​ប្លាស្មា Description[ko]=Plasma 서비스 프로토콜 Description[lv]=Plasma servisu protokols +Description[mr]=प्लाज्मा सेवांसाठी शिष्टाचार Description[nb]=En protokoll for plasma-tjenester Description[nds]=En Protokoll för Plasma-Deensten Description[nl]=Een protocol voor Plasma-services diff --git a/data/servicetypes/plasma-animator.desktop b/data/servicetypes/plasma-animator.desktop index 00dc23215..9383cacdc 100644 --- a/data/servicetypes/plasma-animator.desktop +++ b/data/servicetypes/plasma-animator.desktop @@ -47,6 +47,7 @@ Comment[lt]=Plasma animacijos varikliukas Comment[lv]=Plasma animācijas dzinējs Comment[mai]=प्लाजमा भावचिन्ह इंजन Comment[ml]=പ്ലാസ്മ അനിമേഷന്‍ എഞ്ചിന്‍ +Comment[mr]=प्लाज्मा एनीमेशन इंजिन Comment[nb]=Plasma animasjonsmotor Comment[nds]=Plasma-Animeerkarn Comment[nl]=Plasma-animatie-engine diff --git a/data/servicetypes/plasma-applet-popupapplet.desktop b/data/servicetypes/plasma-applet-popupapplet.desktop index 2e6a496c4..2968ef702 100644 --- a/data/servicetypes/plasma-applet-popupapplet.desktop +++ b/data/servicetypes/plasma-applet-popupapplet.desktop @@ -39,6 +39,7 @@ Comment[ko]=Plasma 스크립팅 팝업 애플릿 Comment[ku]=Sepanoka skrîptkirina agahiyan ya Plasma Comment[lv]=Plasma skriptu uznirstošais logs Comment[ml]=പ്ലാസ്മ സ്ക്രിപ്റ്റിങ്ങിന്റെ പൊങ്ങിവരുന്ന ലഘുപ്രയോഗം +Comment[mr]=प्लाज्मा स्क्रिप्टींग पॉपअप एप्लेट Comment[nb]=Oppsprett-miniprogram for Plasma-skripting Comment[nds]=Skript-Opduklüttprogramm vun Plasma Comment[nl]=Plasma-applet voor scripting-popup diff --git a/data/servicetypes/plasma-applet.desktop b/data/servicetypes/plasma-applet.desktop index 3360da1bc..428870e08 100644 --- a/data/servicetypes/plasma-applet.desktop +++ b/data/servicetypes/plasma-applet.desktop @@ -48,6 +48,7 @@ Comment[lt]=Plasma įskiepis Comment[lv]=Plasma aplets Comment[mai]=प्लाजमा एप्पलेट Comment[ml]=പ്ലാസ്മ ലഘുപ്രയോഗം +Comment[mr]=प्लाज्मा एप्लेट Comment[nb]=Plasma miniprogram Comment[nds]=Plasma-Lüttprogramm Comment[nl]=Plasma-applet diff --git a/data/servicetypes/plasma-containment.desktop b/data/servicetypes/plasma-containment.desktop index 4dbe02716..56b359598 100644 --- a/data/servicetypes/plasma-containment.desktop +++ b/data/servicetypes/plasma-containment.desktop @@ -45,6 +45,7 @@ Comment[lt]=Plasma įskiepio dėklas ir fono paišiklis Comment[lv]=Plasma sīkrīku konteiners un fona zīmētājs Comment[mai]=प्लाजमा एप्पलेट कंटेनर आओर पृष्ठभूमि पेंटर Comment[ml]=പ്ലാസ്മ ലഘുപ്രയോഗം കണ്ടൈനറും പശ്ചാത്തല പെയിന്ററും +Comment[mr]=प्लाज्मा एप्लेट कंटेनर व बेकग्राउंड पेंटर Comment[nb]=Plasma beholder for miniprogram og bakgrunnsopptegner Comment[nds]=Plasma-Gelaats för Lüttprogrammen un Achtergrundpleger Comment[nl]=Container voor plasma-applets en achtergrondinvulling diff --git a/data/servicetypes/plasma-containmentactions.desktop b/data/servicetypes/plasma-containmentactions.desktop index 382211e6b..4ce739f07 100644 --- a/data/servicetypes/plasma-containmentactions.desktop +++ b/data/servicetypes/plasma-containmentactions.desktop @@ -34,6 +34,7 @@ Comment[ko]=Plasma ContainmentActions Comment[ku]=Plasma ContainmentActions Comment[lt]=Plasma konteinerių veiksmai Comment[lv]=Plasma ietvara darbības +Comment[mr]=प्लाज्मा कंटेनमेंट कृती Comment[nb]=Plasma ContainmentActions Comment[nds]=Plasma-Gelaatsakschonen Comment[nl]=Plasma Containeracties diff --git a/data/servicetypes/plasma-dataengine.desktop b/data/servicetypes/plasma-dataengine.desktop index 4853baca4..990190a8d 100644 --- a/data/servicetypes/plasma-dataengine.desktop +++ b/data/servicetypes/plasma-dataengine.desktop @@ -47,6 +47,7 @@ Comment[lt]=Plasma duomenų varikliukas Comment[lv]=Plasma datu dzinējs Comment[mai]=प्लाजमा डेटा इंजन Comment[ml]=പ്ലാസ്മ ഡാറ്റ എഞ്ചിന്‍ +Comment[mr]=प्लाज्मा डेटा इंजिन Comment[nb]=Plasma datamotor Comment[nds]=Plasma-Datenkarn Comment[nl]=Plasma-gegevensengine diff --git a/data/servicetypes/plasma-packagestructure.desktop b/data/servicetypes/plasma-packagestructure.desktop index 566d3f4a7..a665ea5ce 100644 --- a/data/servicetypes/plasma-packagestructure.desktop +++ b/data/servicetypes/plasma-packagestructure.desktop @@ -43,6 +43,7 @@ Comment[lt]=Plasma paketo struktūros aprašymas Comment[lv]=Plasma pakotņu struktūras definīcija Comment[mai]=प्लाजमा पैकेज संरचनाक परिभाषा Comment[ml]=പ്ലാസ്മ പാക്കേജ് സ്ട്രക്ചര്‍ ഡെഫനിഷന്‍ +Comment[mr]=प्लाज्मा पेकेज संरचना व्याख्या Comment[nb]=Definisjon av Plasma pakkestruktur Comment[nds]=Paketstruktuur-Fastleggen vun Plasma Comment[nl]=Structuurdefinitie van plasmapakket diff --git a/data/servicetypes/plasma-runner.desktop b/data/servicetypes/plasma-runner.desktop index d69217b8a..0ce1eb0dc 100644 --- a/data/servicetypes/plasma-runner.desktop +++ b/data/servicetypes/plasma-runner.desktop @@ -49,6 +49,7 @@ Comment[lt]=KRunner priedas Comment[lv]=KRunner spraudnis Comment[mai]=केरनर प्लगइन Comment[ml]=കെറണ്ണര്‍ സംയോജകം +Comment[mr]=KRunner प्लगइन Comment[nb]=KRunner-programtillegg Comment[nds]=KRunner-Moduul Comment[nl]=KRunner-plugin diff --git a/data/servicetypes/plasma-scriptengine.desktop b/data/servicetypes/plasma-scriptengine.desktop index bcbb44f7a..7335bff6a 100644 --- a/data/servicetypes/plasma-scriptengine.desktop +++ b/data/servicetypes/plasma-scriptengine.desktop @@ -45,6 +45,7 @@ Comment[lt]=Scenarijų kalbos praplėtimas, skirtas Plasma Comment[lv]=Skriptēšanas valodu Plasma paplašinājums Comment[mai]=प्लाजमाक लेल स्क्रिप्टिंग भाषाक विस्तार Comment[ml]=പ്ലാസ്മയ്ക്കുള്ള സ്ക്രിപ്റ്റിങ്ങ് ഭാഷാ എക്സ്റ്റന്‍ഷന്‍ +Comment[mr]=प्लाज्मा साठी स्क्रिप्टींग भाषा एक्सटेंशन Comment[nb]=Skriptspråk-utvidelse for Plasma Comment[nds]=Skriptspraak-Verwiedern för Plasma Comment[nl]=Scripttaalextensie voor Plasma diff --git a/data/servicetypes/plasma-service.desktop b/data/servicetypes/plasma-service.desktop index d8a0e54c9..34c327abf 100644 --- a/data/servicetypes/plasma-service.desktop +++ b/data/servicetypes/plasma-service.desktop @@ -33,6 +33,7 @@ Comment[km]=សេវា​​ប្លាស្មា Comment[ko]=Plasma 서비스 Comment[lt]=Plasma tarnyba Comment[lv]=Plasma serviss +Comment[mr]=प्लाज्मा सेवा Comment[nb]=Plasma-tjeneste Comment[nds]=Plasma-Deenst Comment[nl]=Plasma-service diff --git a/data/servicetypes/plasma-toolbox.desktop b/data/servicetypes/plasma-toolbox.desktop index c5916ee62..ce16e8901 100644 --- a/data/servicetypes/plasma-toolbox.desktop +++ b/data/servicetypes/plasma-toolbox.desktop @@ -34,6 +34,7 @@ Comment[ko]=Plasma 도구 상자 Comment[ku]=Qutiya amûrên Plasma Comment[lt]=Pasma įrankinė Comment[lv]=Plasma rīkkopa +Comment[mr]=प्लाज्मा साधने Comment[nb]=Plasma-verktøykasse Comment[nds]=Plasma-Warktüüchkist Comment[nl]=Plasma-hulpmiddelen diff --git a/data/servicetypes/plasma-wallpaper.desktop b/data/servicetypes/plasma-wallpaper.desktop index 777d6e762..d4f2281d6 100644 --- a/data/servicetypes/plasma-wallpaper.desktop +++ b/data/servicetypes/plasma-wallpaper.desktop @@ -47,6 +47,7 @@ Comment[lt]=Plasma apmušalas Comment[lv]=Plasma ekrāntapete Comment[mai]=प्लाजमा वालपेपर Comment[ml]=പ്ലാസ്മ ചുമര്‍ച്ചിത്രം +Comment[mr]=प्लाज्मा वालपेपर Comment[nb]=Plasma tapet Comment[nds]=Plasma-Achtergrundbild Comment[nl]=Plasma-bureaubladachtergrond diff --git a/tests/packagemetadatatest.desktop b/tests/packagemetadatatest.desktop index 85c4b1efa..855785a1a 100644 --- a/tests/packagemetadatatest.desktop +++ b/tests/packagemetadatatest.desktop @@ -42,6 +42,7 @@ Name[lt]=Paketo metaduomenų bandomasis failas Name[lv]=Pakotņu metadatu testa fails Name[mai]=संकुलक मेटाडाटा जाँचि फाइल Name[ml]=പാക്കേജ് മെറ്റാഡാറ്റാ പരിശോധനാ ഫയല്‍ +Name[mr]=पेकेज मेटाडेटा चाचणी फाइल Name[nb]=Testfil for Package metadata Name[nds]=Paketmetadaten-Testdatei Name[nl]=Testbestand voor pakketmetadata @@ -115,6 +116,7 @@ Comment[lt]=Bandomasis desktop failas skirtas PackageMetaData klasei. Comment[lv]=Testa .dekstop fails, lai pārbaudītu PackageMetaData klasi. Comment[mai]=PackageMetaData वर्गक जाँचबाक लेल एकटा जाँचि डेस्कटाप फाइल. Comment[ml]=പാക്കേജ്മെറ്റാഡാറ്റാ ക്ലാസ് പരിശോധിയ്ക്കാനുള്ള പരിശോധനാ പണിയിട ഫയല്‍. +Comment[mr]=पेकेज मेटाडेटा क्लास चाचणीसाठी चाचणी डेस्कटॉप फाइल. Comment[nb]=En skrivebordsfil med testdata for klassen PackageMetaData. Comment[nds]=En Test-Schriefdischdatei för't Utproberen vun de Klass "PackageMetaData". Comment[nl]=Een desktop-bestand voor het testen van de PackageMetaData-klasse. diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop index f76f66d78..af63a10e2 100644 --- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop +++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop @@ -32,6 +32,7 @@ Name[ko]=테스트 Name[ku]=Bicaribîne Name[lt]=Testas Name[lv]=Tests +Name[mr]=चाचणी Name[nb]=Test Name[nds]=Utproberen Name[nl]=Test @@ -93,6 +94,7 @@ Comment[ko]=테스트를 위한 뼈대 플러그인 Comment[ku]=Pêvekekî hêsan ji bo ceribandinê Comment[lt]=Netikras priedas testavimui Comment[lv]=Testēšanai paredzēts spraudnis +Comment[mr]=चाचणीसाठी नकली प्लगइन Comment[nb]=Et attrapp-programtillegg for testing Comment[nds]=En Platzholler-Moduul för't Utproberen Comment[nl]=Een dummy plugin voor testen diff --git a/tests/testengine/plasma-dataengine-testengine.desktop b/tests/testengine/plasma-dataengine-testengine.desktop index 9a037a4f7..89ce04d3d 100644 --- a/tests/testengine/plasma-dataengine-testengine.desktop +++ b/tests/testengine/plasma-dataengine-testengine.desktop @@ -44,6 +44,7 @@ Name[lt]=Bandomasis duomenų variklis Name[lv]=Testēšanas datu dzinējs Name[mai]=जाँचि डाटा इंडन Name[ml]=പരിശോധനാ ഡാറ്റാ എഞ്ചിന്‍ +Name[mr]=चाचणी डेटा इंजिन Name[nb]=Testdata-motor Name[nds]=Test-Datenkarn Name[nl]=Testgegevensengine