[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma
From: Ambroz Bizjak <ambrop7 () gmail ! com>
Date: 2009-01-25 23:54:25
Message-ID: 1232927665.812942.25611.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 916779 by abizjak:
SVN_SILENT Merge upstream changes.
M +1 -0 applets/calendar/plasma-applet-calendar.desktop
M +1 -0 applets/devicenotifier/plasma-applet-devicenotifier.desktop
M +1 -0 applets/icon/plasma-applet-icon.desktop
M +14 -7 applets/kickoff/core/applicationmodel.cpp
M +1 -0 applets/quicklaunch/plasma-applet-quicklaunch.desktop
M +1 -0 applets/system-monitor/plasma-applet-sm_cpu.desktop
M +1 -0 applets/system-monitor/plasma-applet-sm_hdd.desktop
M +1 -0 applets/system-monitor/plasma-applet-sm_hwinfo.desktop
M +1 -0 applets/system-monitor/plasma-applet-sm_net.desktop
M +1 -0 applets/system-monitor/plasma-applet-sm_temperature.desktop
M +1 -0 applets/systemtray/core/job.cpp
M +1 -0 applets/webbrowser/plasma-applet-webbrowser.desktop
M +1 -0 dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop \
M +1 -0 dataengines/dict/plasma-dataengine-dict.desktop
M +1 -0 dataengines/executable/plasma-dataengine-executable.desktop
M +1 -0 dataengines/filebrowser/plasma-dataengine-filebrowser.desktop
M +1 -0 dataengines/network/plasma-dataengine-network.desktop
M +1 -0 dataengines/notifications/plasma-dataengine-notifications.desktop
M +1 -0 dataengines/nowplaying/plasma-dataengine-nowplaying.desktop
M +1 -0 dataengines/places/plasma-dataengine-places.desktop
M +1 -0 dataengines/powermanagement/plasma-dataengine-powermanagement.desktop \
M +1 -0 dataengines/soliddevice/plasma-dataengine-soliddevice.desktop
M +1 -0 runners/places/plasma-runner-places.desktop
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/calendar/plasma-applet-calendar.desktop \
#916778:916779 @@ -17,6 +17,7 @@
Name[fi]=Kalenteri
Name[fr]=Calendrier
Name[fy]=Aginda
+Name[ga]=Féilire
Name[gl]=Calendario
Name[gu]=કેલેન્ડર
Name[he]=לוח ש ה
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/devicenotifier/plasma-applet-devicenotifier.desktop \
#916778:916779 @@ -17,6 +17,7 @@
Name[fi]=Laitehuomautin
Name[fr]=Notification de nouveau périphérique
Name[fy]=Apparaat meidieler
+Name[ga]=Fógróir Gléis
Name[gl]=Notificador de dispositivos
Name[gu]=ઉપકરણ નોંધ કરનાર
Name[hi]=उपकरण सूचक
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/icon/plasma-applet-icon.desktop \
#916778:916779 @@ -89,6 +89,7 @@
Comment[fi]=Yleinen kuvake
Comment[fr]=Une icône générique
Comment[fy]=In algemien byldkaike
+Comment[ga]=Deilbhín ginearálta
Comment[gl]=Unha icona xenérica
Comment[gu]=સામાન્ય ચિહ્ન
Comment[he]=סמל כללי
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/kickoff/core/applicationmodel.cpp \
#916778:916779 @@ -172,9 +172,18 @@
continue;
} else {
// find and remove the existing entry with the same name
- for (int i = 0 ; i < node->children.count() ; i++) {
+ for (int i = node->children.count() - 1; i >= 0; --i) {
if (node->children[i]->appName == appName) {
- delete node->children.takeAt(i);
+ AppNode* n = node->children.takeAt(i);
+ const QString s = n->genericName.toLower();
+ if(genericNames.contains(s)) {
+ QList<AppNode*> l = genericNames[s];
+ for(int j = l.count() - 1; j >= 0; --j)
+ if(l[j] == n)
+ l.takeAt(j);
+ genericNames[s] = l;
+ }
+ delete n;
}
}
}
@@ -225,11 +234,9 @@
if (p->isType(KST_KService)) {
const QString s = genericName.toLower();
- if (genericNames.contains(s)) {
- genericNames[s].append(newnode);
- } else {
- genericNames[s] = QList<AppNode*>() << newnode;
- }
+ QList<AppNode*> list = genericNames.contains(s) ? genericNames[s] : \
QList<AppNode*>(); + list.append(newnode);
+ genericNames[s] = list;
}
}
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/quicklaunch/plasma-applet-quicklaunch.desktop \
#916778:916779 @@ -58,6 +58,7 @@
Comment[eu]=Abiarazi zure gogoko aplikazioak
Comment[fr]=Lanceur pour vos applications favorites
Comment[fy]=Jo favorite programma's starte
+Comment[ga]=Tosaigh na Feidhmchláir is ansa leat
Comment[gl]=Inicia os seus programas favoritos
Comment[gu]=તમને ગમતાં કાર્યક્રમો શરૂ \
કરો Comment[he]=הפעל את היישומים האהובים עליך
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/system-monitor/plasma-applet-sm_cpu.desktop \
#916778:916779 @@ -18,6 +18,7 @@
Name[fi]=Järjestelmän valvonta - Prosessori
Name[fr]=Surveillance du système - Processeur
Name[fy]=Systeemmonitor - CPU
+Name[ga]=Monatóir an Chórais - LAP
Name[gl]=Vixiante do sistema - CPU
Name[gu]=સિસ્ટમ દેખરેખ - સીપીયુ
Name[he]=צג מערכת - מעבד
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/system-monitor/plasma-applet-sm_hdd.desktop \
#916778:916779 @@ -18,6 +18,7 @@
Name[fi]=Järjestelmän valvonta - Kiintolevy
Name[fr]=Surveillance du système - Disque dur
Name[fy]=Systeemmonitor - Fêste skiif
+Name[ga]=Monatóir an Chórais - Diosca Crua
Name[gl]=Vixiante do sistema - Disco duro
Name[gu]=સિસ્ટમ દેખરેખ - હાર્ડ ડિસ્ક
Name[he]=צג מערכת - כו ן
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/system-monitor/plasma-applet-sm_hwinfo.desktop \
#916778:916779 @@ -18,6 +18,7 @@
Name[fi]=Järjestelmän valvonta - Laitteistotiedot
Name[fr]=Surveillance du système - Informations sur le matériel
Name[fy]=Systeemmonitor - Hardware ynfo
+Name[ga]=Monatóir an Chórais - Eolas Crua-Earraí
Name[gl]=Vixiante do sistema - Información do hardware
Name[gu]=સિસ્ટમ દેખરેખ - હાર્ડવેર \
માહિતી Name[he]=צג מערכת - מידע אודות החומרה
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/system-monitor/plasma-applet-sm_net.desktop \
#916778:916779 @@ -18,6 +18,7 @@
Name[fi]=Järjestelmän valvonta - Verkko
Name[fr]=Surveillance du système - Réseau
Name[fy]=Systeemmonitor - Netwurk
+Name[ga]=Monatóir an Chórais - Líonra
Name[gl]=Vixiante do sistema - Rede
Name[gu]=સિસ્ટમ દેખરેખ - નેટવર્ક
Name[he]=צג מערכת - רשת
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/system-monitor/plasma-applet-sm_temperature.desktop \
#916778:916779 @@ -18,6 +18,7 @@
Name[fi]=Järjestelmän valvonta - Lämpötila
Name[fr]=Surveillance du système - Température
Name[fy]=Systeemmonitor - Tempratuer
+Name[ga]=Monatóir an Chórais - Teocht
Name[gl]=Vixiante do sistema - Temperatura
Name[gu]=સિસ્ટમ મોનિટર - તાપમાન
Name[he]=צג מערכת - טמפרטורה
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/systemtray/core/job.cpp \
#916778:916779 @@ -31,6 +31,7 @@
{
public:
Private() :
+ state(Running),
percentage(0),
timerId(0),
killable(false),
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/webbrowser/plasma-applet-webbrowser.desktop \
#916778:916779 @@ -98,6 +98,7 @@
Comment[fi]=Yksinkertainen selain
Comment[fr]=Un navigateur Web simple
Comment[fy]=In ienfâldige webblêder
+Comment[ga]=Brabhsálaí simplí
Comment[gl]=Un navegador web simples
Comment[gu]=સરળ વેબ બ્રાઉઝર
Comment[hi]=एक सादा वेब ब्राउज़र
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop \
#916778:916779 @@ -61,6 +61,7 @@
Comment[eu]=Kuiserver datuak Plasmoidentzako
Comment[fr]=Données de Kuiserver pour les plasmoïdes
Comment[fy]=Kuiserver gegevens foar Plasmoids
+Comment[ga]=Sonraí Kuiserver le haghaidh Plasmoids
Comment[gl]=Datos de Kuiserver para Plasmoides
Comment[gu]=પ્લાઝમોઇડ માટે Kuiserver માહિતી
Comment[hi]=प्लाज्माइड्स के लिए \
के-यूआई-सर्वर
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/dict/plasma-dataengine-dict.desktop \
#916778:916779 @@ -18,6 +18,7 @@
Name[fi]=Sanakirja
Name[fr]=Dictionnaire
Name[fy]=Wurdboek
+Name[ga]=Foclóir
Name[gl]=Dicionario
Name[gu]=ડિક્શનરી
Name[he]=מילון
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/executable/plasma-dataengine-executable.desktop \
#916778:916779 @@ -18,6 +18,7 @@
Name[fi]=Suorita komentoja
Name[fr]=Chercher des définitions de mots
Name[fy]=Rin kommando's
+Name[ga]=Rith Orduithe
Name[gl]=Executar comandos
Name[gu]=આદેશ ચલાવો
Name[he]=הרצת פקודה
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop \
#916778:916779 @@ -17,6 +17,7 @@
Name[fi]=Tiedostot ja kansiot
Name[fr]=Fichiers et dossiers
Name[fy]=triemmen en triemtafels
+Name[ga]=Comhaid agus Comhadlanna
Name[gl]=Ficheiros e cartafoles
Name[gu]=ફાઇલો અને ડિરેક્ટરીઓ
Name[he]=קבצים ותיקיות
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/network/plasma-dataengine-network.desktop \
#916778:916779 @@ -18,6 +18,7 @@
Name[fi]=Verkko
Name[fr]=Réseau
Name[fy]=netwurkjen
+Name[ga]=Líonrú
Name[gl]=Rede
Name[gu]=નેટવર્કિંગ
Name[hi]=नेटवर्किंग
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/notifications/plasma-dataengine-notifications.desktop \
#916778:916779 @@ -15,6 +15,7 @@
Name[fi]=Huomautukset
Name[fr]=Notifications des applications
Name[fy]=Applikaasje ntifikaasjes
+Name[ga]=Fógairtí Feidhmchláir
Name[gl]=Notificacións dos programas
Name[gu]=કાર્યક્રમ નોંધણીઓ
Name[he]=הודעות מערכת
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop \
#916778:916779 @@ -16,6 +16,7 @@
Name[eu]=Orain erreproduzitzen
Name[fr]=En cours de lecture
Name[fy]=Spilet ôf
+Name[ga]=Á Sheinm Anois
Name[gl]=A reproducir
Name[gu]=અત્યારે વગાડે છે
Name[he]=מ גן כעת
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/places/plasma-dataengine-places.desktop \
#916778:916779 @@ -16,6 +16,7 @@
Name[eu]=Lekuak
Name[fi]=Sijainnit
Name[fr]=Lieux
+Name[ga]=Áiteanna
Name[gl]=Lugares
Name[gu]=જગ્યાઓ
Name[he]=מקומות
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop \
#916778:916779 @@ -16,6 +16,7 @@
Name[fi]=Virranhallinta
Name[fr]=Gestion de l'énergie
Name[fy]=Enerzjybehear
+Name[ga]=Bainisteoireacht Cumhachta
Name[gl]=Xestión da enerxía
Name[gu]=પાવર વ્યવસ્થાપક
Name[he]= יהול צריכת חשמל
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop \
#916778:916779 @@ -17,6 +17,7 @@
Name[fi]=Laitetiedot
Name[fr]=Informations sur les périphériques
Name[fy]=Apparaatynformaasje
+Name[ga]=Eolas faoi Ghléas
Name[gl]=Información de dispositivos
Name[gu]=ઉપકરણ માહિતી
Name[he]=מידע על התק ים
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/runners/places/plasma-runner-places.desktop \
#916778:916779 @@ -16,6 +16,7 @@
Name[eu]=Lekuak
Name[fi]=Sijainnit
Name[fr]=Lieux
+Name[ga]=Áiteanna
Name[gl]=Lugares
Name[gu]=જગ્યાઓ
Name[he]=מקומות
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic