From 88f5a3ea1ef1ae8c8d54274556e254932c7d0f39 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Thu, 29 Dec 2011 10:48:03 +0100 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) --- kpart/plasma-kpart.desktop | 1 + scriptengines/javascript/data/plasma-javascriptaddon.desktop | 1 + .../data/plasma-packagestructure-javascript-addon.desktop | 1 + .../data/plasma-scriptengine-applet-declarative.desktop | 1 + .../data/plasma-scriptengine-dataengine-javascript.desktop | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kpart/plasma-kpart.desktop b/kpart/plasma-kpart.desktop index 7ceef9936..20f17c78d 100644 --- a/kpart/plasma-kpart.desktop +++ b/kpart/plasma-kpart.desktop @@ -16,6 +16,7 @@ Name[eu]=plasma-kpart Name[fa]=plasma-kpart Name[fi]=plasma-kpart Name[fr]=plasma-kpart +Name[ga]=plasma-kpart Name[he]=plasma-kpart Name[hi]=plasma-kpart Name[hr]=plasma-kpart diff --git a/scriptengines/javascript/data/plasma-javascriptaddon.desktop b/scriptengines/javascript/data/plasma-javascriptaddon.desktop index c1d2bb662..f06ce5363 100644 --- a/scriptengines/javascript/data/plasma-javascriptaddon.desktop +++ b/scriptengines/javascript/data/plasma-javascriptaddon.desktop @@ -16,6 +16,7 @@ Name[eu]=Plasma JavaScript gehigarria Name[fa]=افزودنی جاوااسکریپت پلاسما Name[fi]=Plasma JavaScript -lisäosa Name[fr]=Module complémentaire Javascript de Plasma +Name[ga]=Breiseán JavaScript Plasma Name[he]=תוסף עבור JavaScript של Plasma Name[hi]=प्लाज़मा जावा-स्क्रिप्ट एडोन Name[hr]=Dodatak JavaScripta Plasmi diff --git a/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop b/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop index 8e5c5c5e1..c397bcb79 100644 --- a/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop +++ b/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop @@ -16,6 +16,7 @@ Name[eu]=Javascript gehigarria Name[fa]=افزودنی جاوااسکریپت Name[fi]=Javascript-lisäosa Name[fr]=Module complémentaire Javascript +Name[ga]=Breiseán JavaScript Name[he]=תוסף JavaScript Name[hi]=जावास्क्रिप्ट एडोन Name[hr]=Dodadak za Javascript diff --git a/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop b/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop index 8c529b22f..228658931 100644 --- a/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop +++ b/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop @@ -68,6 +68,7 @@ Comment[et]=QML-is ja JavaScriptis kirjutatud Plasma vidin Comment[eu]=Plasma jatorrizko trepeta QML eta JavaScript-en idatzia Comment[fi]=Natiivi, QML-pohjainen Plasma-sovelma Comment[fr]=Composant graphique natif de Plasma écrit en QML et JavaScript +Comment[ga]=Giuirléid dhúchasach Plasma, scríofa in QML agus JavaScript Comment[he]=ווידג׳טים של Plasma הנכתבים ב־QML וב־JavaScript Comment[hr]=Izvorni Plasma widget napisan u QML-u i JavaScriptu Comment[hu]=QML-ben és JavaScriptben írt natív Plazma-widget diff --git a/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop b/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop index 54086efa5..9a48dc4ac 100644 --- a/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop +++ b/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop @@ -59,7 +59,7 @@ Name[sv]=Javascript-datagränssnitt Name[tg]=Маълумоти муҳаррики JavaScript Name[th]=กลไกข้อมูลของจาวาสคริปต์ Name[tr]=JavaScript Veri Motoru -Name[ug]=JavaScript سانلىق مەلۇمات ماتورى +Name[ug]=JavaScript سانلىق-مەلۇمات ماتورى Name[uk]=Рушій даних JavaScript Name[wa]=Moteur di dnêyes JavaScript Name[x-test]=xxJavaScript DataEnginexx From 980feaaec0ad65d85c243ccd16a6c3edf0645d73 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 29 Dec 2011 15:13:02 +0100 Subject: [PATCH 2/2] fix the api to the standard one, items->content --- declarativeimports/plasmacomponents/qmenu.cpp | 2 +- declarativeimports/plasmacomponents/qmenu.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/declarativeimports/plasmacomponents/qmenu.cpp b/declarativeimports/plasmacomponents/qmenu.cpp index b4e690d0e..4db65076c 100644 --- a/declarativeimports/plasmacomponents/qmenu.cpp +++ b/declarativeimports/plasmacomponents/qmenu.cpp @@ -38,7 +38,7 @@ QMenuProxy::~QMenuProxy() delete m_menu; } -QDeclarativeListProperty QMenuProxy::items() +QDeclarativeListProperty QMenuProxy::content() { return QDeclarativeListProperty(this, m_items); } diff --git a/declarativeimports/plasmacomponents/qmenu.h b/declarativeimports/plasmacomponents/qmenu.h index 0f503efaf..6c6409ada 100644 --- a/declarativeimports/plasmacomponents/qmenu.h +++ b/declarativeimports/plasmacomponents/qmenu.h @@ -32,8 +32,8 @@ class QMenuProxy : public QObject { Q_OBJECT - Q_PROPERTY(QDeclarativeListProperty items READ items CONSTANT) - Q_CLASSINFO("DefaultProperty", "items") + Q_PROPERTY(QDeclarativeListProperty content READ content CONSTANT) + Q_CLASSINFO("DefaultProperty", "content") Q_PROPERTY(QDeclarativeItem *visualParent READ visualParent WRITE setVisualParent NOTIFY visualParentChanged()) Q_PROPERTY(DialogStatus::Status status READ status NOTIFY statusChanged) @@ -41,7 +41,7 @@ public: QMenuProxy(QObject *parent = 0); ~QMenuProxy(); - QDeclarativeListProperty items(); + QDeclarativeListProperty content(); int actionCount() const; QMenuItem *action(int) const; DialogStatus::Status status() const;