packages: kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff, kde4-k...
arekm
arekm at pld-linux.org
Wed Aug 19 21:55:14 CEST 2009
Author: arekm Date: Wed Aug 19 19:55:14 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 5; branch diff is back
---- Files affected:
packages/kde4-kdebase-workspace:
kde4-kdebase-workspace-branch.diff (1.12 -> 1.13) , kde4-kdebase-workspace.spec (1.167 -> 1.168)
---- Diffs:
================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.12 packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.13
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.12 Thu May 28 21:40:38 2009
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff Wed Aug 19 21:55:08 2009
@@ -1,2027 +1,6657 @@
---- workspace/ksmserver/kcm/kcmsmserver.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
-+++ workspace/ksmserver/kcm/kcmsmserver.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
-@@ -87,8 +87,8 @@
- Name[uz at cyrillic]=Сеанс бошқарувчиси
- Name[vi]=Bộ quản lý phiên chạy
- Name[wa]=Manaedjeu di sessions
-+Name[xh]=Umphathi wesiqendu
- Name[x-test]=xxSession Managerxx
--Name[xh]=Umphathi wesiqendu
- Name[zh_CN]=会话管理器
- Name[zh_TW]=工作階段管理程式
-
-@@ -167,8 +167,8 @@
- Comment[uz at cyrillic]=Сеанс бошқарувчисини ва чиқиш мосламаларини мослаш
- Comment[vi]=Cấu hình trình quản lý phiên chạy và thiết lập đăng xuất
- Comment[wa]=Apontiaedje do manaedjeu di sessions eyet apontiaedjes do dislodjaedje
-+Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle
- Comment[x-test]=xxConfigure the session manager and logout settingsxx
--Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle
- Comment[zh_CN]=配置会话管理器和注销设置
- Comment[zh_TW]=設定工作階段管理程式與登出設定值
-
---- workspace/kcontrol/dateandtime/clock.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
-+++ workspace/kcontrol/dateandtime/clock.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
-@@ -90,8 +90,8 @@
- Name[uz at cyrillic]=Сана ва вақт
- Name[vi]=Ngày và Giờ
- Name[wa]=Date et eure
-+Name[xh]=Umhla & Ixesha
- Name[x-test]=xxDate & Timexx
--Name[xh]=Umhla & Ixesha
- Name[zh_CN]=日期和时间
- Name[zh_TW]=日期和時間
-
-@@ -173,8 +173,8 @@
- Comment[uz at cyrillic]=Сана ва вақтнинг мосламалари
- Comment[vi]=Thiết lập ngày giờ
- Comment[wa]=Apontiaedjes del date et l' eure
-+Comment[xh]=Izicwangciso zomhla kunye nexesha
- Comment[x-test]=xxDate and time settingsxx
--Comment[xh]=Izicwangciso zomhla kunye nexesha
- Comment[zh_CN]=日期和时间设置
- Comment[zh_TW]=日期和時間設定值
-
---- workspace/kcontrol/dateandtime/dtime.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
-+++ workspace/kcontrol/dateandtime/dtime.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
-@@ -204,8 +204,6 @@
+--- workspace/kcontrol/dateandtime/helper.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/dateandtime/helper.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -52,7 +52,7 @@
+ {
+ int ret = 0;
+ // write to the system config file
+- KConfig _config( KDE_CONFDIR "kcmclockrc", KConfig::SimpleConfig);
++ KConfig _config( KDE_CONFDIR "/kcmclockrc", KConfig::SimpleConfig);
+ KConfigGroup config(&_config, "NTP");
+ config.writeEntry("servers", ntpServers );
+ config.writeEntry("enabled", ntpEnabled );
+--- workspace/kcontrol/kfontinst/apps/installfont.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/kfontinst/apps/installfont.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -33,7 +33,7 @@
+ Name[he]=התקנה...
+ Name[hi]=संस्थापित करें...
+ Name[hne]=इंस्टाल करव...
+-Name[hr]=Instaliraj...
++Name[hr]=Instaliraj …
+ Name[hsb]=instalować...
+ Name[hu]=Telepítés...
+ Name[is]=Setja upp...
+--- workspace/kcontrol/standard_actions/standard_actions.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/standard_actions/standard_actions.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -36,6 +36,7 @@
+ Name[he]=קיצורי מקשים סטנדרטיים
+ Name[hi]=मानक कुंजीपट शॉर्टकट
+ Name[hne]=स्टेन्डर्ड कुंजीपट सार्टकट
++Name[hr]=Standardni prečaci tipkovnice
+ Name[hsb]=Standardne tastaturowe skrótšenki
+ Name[hu]=Billentyűparancsok
+ Name[is]=Staðlaðir flýtilyklar
+@@ -103,6 +104,7 @@
+ Comment[he]=הגדרה של שיוכי מקשים תקניים
+ Comment[hi]=मानक की-बाइंडिंग का विन्यस्तेशन
+ Comment[hne]=स्टेन्डर्ड की-बाइंडिंग के कान्फिगरेसन
++Comment[hr]=Konfiguriranje standardnih prečaca tipkovnice
+ Comment[hsb]=Standardne tastaturowe skrótšenki připrawić
+ Comment[hu]=A billentyűparancsok beállításai
+ Comment[is]=Stillingar staðlaðra lyklabindinga
+--- workspace/kcontrol/autostart/autostart.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/autostart/autostart.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -105,6 +105,7 @@
+ Comment[gu]=KDE શરૂ થાય ત્યારે કયા કાર્યક્રમો શરૂ કરવા તેનું રૂપરેખાંકન સાધન
+ Comment[he]=כלי לניהול אילו תוכניות מופעלות ביחד עם KDE.
+ Comment[hne]=केडीई के साथ चालू होवइया प्रोग्राम ल कानफिगर करे बर औजार
++Comment[hr]=Konfiguracijski alat za upravljanje koji će se programi pokretati pri pokretanju KDE-a
+ Comment[hsb]=Připrawjadło za rjadowanje, kotre programy so awtomatisce z KDE wuwjedu.
+ Comment[hu]=Beállítóeszköz a KDE-vel együtt elinduló programokhoz
+ Comment[is]=Stjórntæki til að stilla hvaða forrit eigi að ræsast upp með KDE.
+--- workspace/kcontrol/hardware/joystick/joystick.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/hardware/joystick/joystick.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -39,6 +39,7 @@
+ Comment[he]=הגדרות ג'ויסטיק
+ Comment[hi]=जॉयस्टिक विन्यास
+ Comment[hne]=जायस्टिक सेटिंग
++Comment[hr]=Postavke igraće palice (joysticka)
+ Comment[hsb]=Nastajenja za joystick
+ Comment[hu]=Botkormány-beállítások
+ Comment[is]=Stillingar stýripinna
+--- workspace/kcontrol/style/style.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/style/style.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -146,7 +146,7 @@
+ Comment[mr]=KDE की शैली व विजेट वर्तन मध्ये बदल करण्याकरीता सहमती देता आहे
+ Comment[ms]=Membolehkan manipulasi kelakuan widget dan mengubah Gaya untuk KDE
+ Comment[nb]=Her kan du endre skjermelementenes oppførsel og stiler i KDE
+-Comment[nds]=Hier kann dat Bedregen vun Bedeen-Elementen un ehr KDE-Stil ännert warrn
++Comment[nds]=Dat Bedregen vun Bedeen-Elementen un ehr KDE-Stil ännern
+ Comment[ne]=केडीईका लागि परिवर्तन शैली र विजेट व्यवहारको परिचालन गर्न अनुमति दिन्छ
+ Comment[nl]=Hiermee kunt u het gedrag van de widgets aanpassen en de stijl van KDE wijzigen
+ Comment[nn]=Let deg endra KDE-stilen og åtferda til skjermelementa
+--- workspace/kcontrol/randr/krandrtray.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/randr/krandrtray.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -121,6 +121,7 @@
+ Comment[he]=יישומון לוח לשינוי גודל וכיוון המסך
+ Comment[hi]=एक्स स्क्रीन का आकार बदलने तथा फिर से दिशानिर्धारण के लिए एक फलक ऐपलेट
+ Comment[hne]=एक्स स्क्रीन के आकार बदले अउ फिर से दिसानिर्धारन बर एक पेनल ऐपलेट
++Comment[hr]=Applet trake za promjenu veličine i orjentacije X zaslona.
+ Comment[hsb]=Pasowy applet za připrawjenje a wjerćenje X-wobrazowkow
+ Comment[hu]=Panel-kisalkalmazás X képernyők átméretezéséhez és elforgatásához
+ Comment[is]=Smáforrit á spjöld sem stjórnar stærð og snúningi X skjáa.
+--- workspace/kcontrol/launch/kcmlaunch.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/launch/kcmlaunch.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -222,13 +222,13 @@
+ LaunchConfig::defaults()
+ {
+ cb_busyCursor->setCurrentIndex(2);
+- cb_taskbarButton->setChecked((bool)Default & TaskbarButton);
++ cb_taskbarButton->setChecked( (bool)(Default & TaskbarButton) );
+
+ sb_cursorTimeout->setValue( 30 );
+ sb_taskbarTimeout->setValue( 30 );
+
+ slotBusyCursor( 2 );
+- slotTaskbarButton( (bool)Default & TaskbarButton );
++ slotTaskbarButton( (bool)(Default & TaskbarButton) );
+
+ checkChanged();
+ }
+--- workspace/kcontrol/keys/kglobalshortcutseditor.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/keys/kglobalshortcutseditor.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -60,12 +60,64 @@
+ * model.
+ */
+
+-struct componentData
+-{
+- KShortcutsEditor *editor;
+- QString uniqueName;
+-};
++class ComponentData
++ {
+
++public:
++
++ ComponentData(
++ const QString &uniqueName,
++ const QDBusObjectPath &path,
++ KShortcutsEditor *_editor);
++
++ ~ComponentData();
++
++ QString uniqueName() const;
++ KShortcutsEditor *editor();
++ QDBusObjectPath dbusPath();
++
++private:
++
++ QString _uniqueName;
++ QDBusObjectPath _path;
++ QPointer<KShortcutsEditor> _editor;
++ };
++
++
++ComponentData::ComponentData(
++ const QString &uniqueName,
++ const QDBusObjectPath &path,
++ KShortcutsEditor *editor)
++ : _uniqueName(uniqueName),
++ _path(path),
++ _editor(editor)
++ {}
++
++
++ComponentData::~ComponentData()
++ {
++ delete _editor; _editor = 0;
++ }
++
++
++QString ComponentData::uniqueName() const
++ {
++ return _uniqueName;
++ }
++
++
++QDBusObjectPath ComponentData::dbusPath()
++ {
++ return _path;
++ }
++
++
++KShortcutsEditor *ComponentData::editor()
++ {
++ return _editor;
++ }
++
++
+ class KGlobalShortcutsEditor::KGlobalShortcutsEditorPrivate
+ {
+ public:
+@@ -95,7 +147,7 @@
+ Ui::KGlobalShortcutsEditor ui;
+ QStackedWidget *stack;
+ KShortcutsEditor::ActionTypes actionTypes;
+- QHash<QString, componentData> components;
++ QHash<QString, ComponentData*> components;
+ QDBusConnection bus;
+ };
+
+@@ -142,7 +194,7 @@
+
+ void KGlobalShortcutsEditor::activateComponent(const QString &component)
+ {
+- QHash<QString, componentData>::Iterator iter = d->components.find(component);
++ QHash<QString, ComponentData*>::Iterator iter = d->components.find(component);
+ if (iter == d->components.end()) {
+ kDebug() << "The component" << component << "is unknown";
+ Q_ASSERT(iter == d->components.end());
+@@ -153,7 +205,7 @@
+ if (index > -1) {
+ // Known component. Get it.
+ d->ui.components->setCurrentIndex(index);
+- d->stack->setCurrentWidget((*iter).editor);
++ d->stack->setCurrentWidget((*iter)->editor());
+ }
+ }
+ }
+@@ -161,12 +213,13 @@
+
+ void KGlobalShortcutsEditor::addCollection(
+ KActionCollection *collection,
++ const QDBusObjectPath &objectPath,
+ const QString &id,
+ const QString &friendlyName)
+ {
+ KShortcutsEditor *editor;
+ // Check if this component is known
+- QHash<QString, componentData>::Iterator iter = d->components.find(friendlyName);
++ QHash<QString, ComponentData*>::Iterator iter = d->components.find(friendlyName);
+ if (iter == d->components.end()) {
+ // Unknown component. Create an editor.
+ editor = new KShortcutsEditor(this, d->actionTypes);
+@@ -178,15 +231,13 @@
+ d->ui.components->model()->sort(0);
+
+ // Add to our component registry
+- componentData cd;
+- cd.editor = editor;
+- cd.uniqueName = id;
++ ComponentData *cd = new ComponentData(id, objectPath, editor);
+ d->components.insert(friendlyName, cd);
+
+ connect(editor, SIGNAL(keyChange()), this, SLOT(_k_key_changed()));
+ } else {
+ // Known component.
+- editor = (*iter).editor;
++ editor = (*iter)->editor();
+ }
+
+ // Add the collection to the editor of the component
+@@ -202,7 +253,7 @@
+ void KGlobalShortcutsEditor::clearConfiguration()
+ {
+ QString name = d->ui.components->currentText();
+- d->components.value(name).editor->clearConfiguration();
++ d->components[name]->editor()->clearConfiguration();
+ }
+
+
+@@ -211,16 +262,16 @@
+ switch (scope)
+ {
+ case AllComponents:
+- foreach (const componentData &cd, d->components) {
++ Q_FOREACH (ComponentData *cd, d->components) {
+ // The editors are responsible for the reset
+- cd.editor->allDefault();
++ cd->editor()->allDefault();
+ }
+ break;
+
+ case CurrentComponent: {
+ QString name = d->ui.components->currentText();
+ // The editors are responsible for the reset
+- d->components.value(name).editor->allDefault();
++ d->components[name]->editor()->allDefault();
+ }
+ break;
+
+@@ -233,9 +284,7 @@
+ void KGlobalShortcutsEditor::clear()
+ {
+ // Remove all components and their associated editors
+- foreach (const componentData &cd, d->components) {
+- delete cd.editor;
+- }
++ qDeleteAll(d->components.values());
+ d->components.clear();
+ d->ui.components->clear();
+ }
+@@ -366,8 +415,8 @@
+ {
+ // The editors are responsible for the saving
+ kDebug() << "Save the changes";
+- foreach (const componentData &cd, d->components) {
+- cd.editor->commit();
++ Q_FOREACH (ComponentData *cd, d->components) {
++ cd->editor()->commit();
+ }
+ }
+
+@@ -378,22 +427,22 @@
+
+ // In a first step clean out the current configurations. We do this
+ // because we want to minimize the chance of conflicts.
+- Q_FOREACH (const componentData &cd, d->components) {
+- KConfigGroup group(config, cd.uniqueName);
+- kDebug() << cd.uniqueName << group.name();
++ Q_FOREACH (ComponentData *cd, d->components) {
++ KConfigGroup group(config, cd->uniqueName());
++ kDebug() << cd->uniqueName() << group.name();
+ if (group.exists()) {
+- kDebug() << "Removing" << cd.uniqueName;
+- cd.editor->clearConfiguration();
++ kDebug() << "Removing" << cd->uniqueName();
++ cd->editor()->clearConfiguration();
+ }
+ }
+
+ // Now import the new configurations.
+- Q_FOREACH (const componentData &cd, d->components) {
+- KConfigGroup group(config, cd.uniqueName);
++ Q_FOREACH (ComponentData *cd, d->components) {
++ KConfigGroup group(config, cd->uniqueName());
+ kDebug();
+ if (group.exists()) {
+- kDebug() << "Importing" << cd.uniqueName;
+- cd.editor->importConfiguration(&group);
++ kDebug() << "Importing" << cd->uniqueName();
++ cd->editor()->importConfiguration(&group);
+ }
+ }
+ }
+@@ -402,16 +451,16 @@
+ {
+ Q_FOREACH (const QString &componentFriendly, components)
+ {
+- QHash<QString, componentData>::Iterator iter = d->components.find(componentFriendly);
++ QHash<QString, ComponentData*>::Iterator iter = d->components.find(componentFriendly);
+ if (iter == d->components.end())
+ {
+- Q_ASSERT(iter == d->components.end());
++ Q_ASSERT(iter != d->components.end());
+ continue;
+ }
+ else
+ {
+- KConfigGroup group(config, (*iter).uniqueName);
+- (*iter).editor->exportConfiguration(&group);
++ KConfigGroup group(config, (*iter)->uniqueName());
++ (*iter)->editor()->exportConfiguration(&group);
+ }
+ }
+ }
+@@ -421,16 +470,16 @@
+ {
+ // The editors are responsible for the undo
+ kDebug() << "Undo the changes";
+- foreach (const componentData &cd, d->components) {
+- cd.editor->undoChanges();
++ Q_FOREACH (ComponentData *cd, d->components) {
++ cd->editor()->undoChanges();
+ }
+ }
+
+
+ bool KGlobalShortcutsEditor::isModified() const
+ {
+- foreach (const componentData &cd, d->components) {
+- if (cd.editor->isModified()) {
++ Q_FOREACH (ComponentData *cd, d->components) {
++ if (cd->editor()->isModified()) {
+ return true;
+ }
+ }
+@@ -453,7 +502,7 @@
+ void KGlobalShortcutsEditor::KGlobalShortcutsEditorPrivate::removeComponent()
+ {
+ QString name = ui.components->currentText();
+- QString componentUnique = components.value(name).uniqueName;
++ QString componentUnique = components.value(name)->uniqueName();
+
+ // The confirmation text is different when the component is active
+ if (KGlobalAccel::isComponentActive(componentUnique)) {
+@@ -476,12 +525,17 @@
+ }
+ }
+
++ // Initiate the removing of the component.
+ if (KGlobalAccel::cleanComponent(componentUnique)) {
++
++ // Get the objectPath BEFORE we delete the source of it
++ QDBusObjectPath oPath = components.value(name)->dbusPath();
+ // Remove the component from the gui
+ removeComponent(componentUnique);
+
+ // Load it again
+- if (loadComponent(componentPath(componentUnique))) {
++ // #############
++ if (loadComponent(oPath)) {
+ // Active it
+ q->activateComponent(name);
+ }
+@@ -545,7 +599,7 @@
+ KComponentData(componentContextId.toAscii()));
+
+ // Now add the shortcuts.
+- foreach (const KGlobalShortcutInfo &shortcut, shortcuts) {
++ Q_FOREACH (const KGlobalShortcutInfo &shortcut, shortcuts) {
+
+ const QString &objectName = shortcut.uniqueName();
+ KAction *action = col->addAction(objectName);
+@@ -576,7 +630,7 @@
+ QString('[') + shortcuts[0].contextFriendlyName() + QString(']');
+ }
+
+- q->addCollection(col, componentContextId, componentFriendlyName);
++ q->addCollection(col, componentPath, componentContextId, componentFriendlyName );
+
+ } // Q_FOREACH(context)
- connect( &internalTimer, SIGNAL(timeout()), SLOT(timeout()) );
+@@ -591,7 +645,7 @@
-- load();
+ Q_FOREACH (const QString &text, components.keys())
+ {
+- if (components.value(text).uniqueName == componentUnique)
++ if (components.value(text)->uniqueName() == componentUnique)
+ {
+ // Remove from QComboBox
+ int index = ui.components->findText(text);
+@@ -599,13 +653,10 @@
+ ui.components->removeItem(index);
+
+ // Remove from QStackedWidget
+- stack->removeWidget(components.value(text).editor);
++ stack->removeWidget(components[text]->editor());
+
+- // Delete the editor
+- delete components.value(text).editor; components[text].editor = 0;
-
- kclock->setEnabled(false);
+ // Remove the componentData
+- components.remove(text);
++ delete components.take(text);
+ }
+ }
+ }
+--- workspace/kcontrol/keys/keys.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/keys/keys.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -36,6 +36,7 @@
+ Name[he]=קיצורי מקשים גלובליים
+ Name[hi]=वैश्विक कुंजीपट शॉर्टकट
+ Name[hne]=वैस्विक कुंजीपट सार्टकट
++Name[hr]=Globalni prečaci tipkovnice
+ Name[hsb]=Globalne tastaturowe skrótšenki
+ Name[hu]=Globális billentyűparancsok
+ Name[is]=Víðværir flýtilyklar
+--- workspace/kcontrol/keys/kglobalshortcutseditor.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/keys/kglobalshortcutseditor.h (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -25,6 +25,7 @@
+ class KActionCollection;
+ class KShortcut;
+ class KConfig;
++class QDBusObjectPath;
+
+ /**
+ * Combine a KShortcutsEditor with a KComboBox.
+@@ -55,7 +56,7 @@
+ * @param component title for the component
+ * @param title title for the subtree in the component
+ */
+- void addCollection(KActionCollection *, const QString &id, const QString &name);
++ void addCollection(KActionCollection *, const QDBusObjectPath &path, const QString &id, const QString &name);
+
+ /**
+ * Clear all collections were currently hosting. Current changes are not
+--- workspace/kcontrol/keys/export_scheme_dialog.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/kcontrol/keys/export_scheme_dialog.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -63,7 +63,8 @@
+ {
+ if (button->isChecked())
+ {
+- rc.append(button->text());
++ // Remove the '&' added by KAcceleratorManager magically
++ rc.append(KGlobal::locale()->removeAcceleratorMarker(button->text()));
+ }
+ }
+ return rc;
+--- workspace/systemsettings/classic/settings-classic-view.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/systemsettings/classic/settings-classic-view.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -23,6 +23,7 @@
+ Name[fy]=Klassike beamstrucktuer
+ Name[gl]=Vista en árbore clásica
+ Name[gu]=પરંપરાગત વૃક્ષ દેખાવ
++Name[hr]=Klasičan prikaz stabla
+ Name[hu]=Klasszikus fastruktúra-nézet
+ Name[is]=Klassísk trjásýn
+ Name[it]=Classica vista ad albero
+@@ -69,6 +70,7 @@
+ Comment[fr]=Une vue des paramètres systèmes classique dans le style de KControl de KDE 3
+ Comment[fy]=In klassike KDE 3 KControl styl systeem ynstellings werjefte.
+ Comment[gl]=Unha vista da configuración do sistema co estilo clásico de KControl de KDE 3.
++Comment[hr]=Klasični KDE 3 KControl stil prikaza sustavskih postavki.
+ Comment[hu]=KDE 3 KControl-stílusú nézet a Rendszerbeállításokhoz.
+ Comment[is]=Klassískur stíll KDE 3 KControl kerfisstillingasýnar.
+ Comment[it]=La classica vista delle impostazioni di sistema sullo stile di KControl di KDE 3
+--- workspace/systemsettings/categories/settings-general.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/systemsettings/categories/settings-general.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -22,6 +22,7 @@
+ Name[gl]=Xeral
+ Name[gu]=સામાન્ય
+ Name[hi]=सामान्य
++Name[hr]=Općenito
+ Name[hu]=Általános
+ Name[is]=Almennt
+ Name[ja]=一般
+--- workspace/systemsettings/categories/settings-look-and-feel.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/systemsettings/categories/settings-look-and-feel.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -33,6 +33,7 @@
+ Name[he]=מראה ותחושה
+ Name[hi]=रूप व आकार
+ Name[hne]=रूप अउ आकार
++Name[hr]=Izgled & osjećaj
+ Name[hu]=Megjelenés
+ Name[is]=Útlit og virkni
+ Name[it]=Aspetto
+--- workspace/systemsettings/categories/settings-network-and-connectivity.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/systemsettings/categories/settings-network-and-connectivity.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -32,6 +32,7 @@
+ Name[he]=רשת וקישוריות
+ Name[hi]=नेटवर्क व कनेक्टिविटी
+ Name[hne]=नेटवर्क अउ कनेक्टिविटी
++Name[hr]=Mreže & Spojivost
+ Name[hu]=Hálózat
+ Name[is]=Net og tengjanleiki
+ Name[it]=Rete e connettività
+--- workspace/systemsettings/categories/systemsettingscategory.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/systemsettings/categories/systemsettingscategory.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -28,6 +28,7 @@
+ Name[he]=קטגוריית הגדרות מערכת
+ Name[hi]=तंत्र विन्यास वर्ग
+ Name[hne]=तंत्र सेटिंग वर्ग
++Name[hr]=Kategorija sustavskih postavki
+ Name[hu]=Rendszerbeállítási kategória
+ Name[is]=Kerfisstillingaflokkur
+ Name[it]=Categoria delle impostazioni di sistema
+--- workspace/systemsettings/core/systemsettingsview.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/systemsettings/core/systemsettingsview.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -20,6 +20,7 @@
+ Name[gl]=Vista da configuración do sistema
+ Name[gu]=સિસ્ટમ ગોઠવણીઓ દેખાવ
+ Name[hi]=तंत्र सेटिंग दृश्य
++Name[hr]=Prikaz postavki sustava
+ Name[hu]=Rendszerbeállítások nézet
+ Name[is]=Sýn á kerfisstillingar
+ Name[it]=Vista impostazioni di sistema
+--- workspace/systemsettings/core/ToolTips/SystemSettingsBalloonToolTipDelegate.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013409)
++++ workspace/systemsettings/core/ToolTips/SystemSettingsBalloonToolTipDelegate.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013409)
+@@ -109,7 +109,7 @@
+ const SystemSettingsToolTipItem* controlItem = static_cast<const SystemSettingsToolTipItem*>( &item );
+ if ( controlItem->lines().count() ) {
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.167&r2=1.168&f=u
More information about the pld-cvs-commit
mailing list