Hello community,
here is the log from the commit of package NetworkManager-kde4 for openSUSE:Factory
checked in at Fri Nov 5 16:09:18 CET 2010.
--------
--- KDE/NetworkManager-kde4/NetworkManager-kde4.changes 2010-10-06 10:25:09.000000000 +0200
+++ NetworkManager-kde4/NetworkManager-kde4.changes 2010-11-03 12:22:32.000000000 +0100
@@ -1,0 +2,15 @@
+Wed Nov 3 11:21:24 UTC 2010 - tittiatcoke@gmail.com
+
+- update to r1192577
+ * Hide popup when losing focus
+ * Patch from Jirka Klimes against monolithic KNM to reflect a
+ change in Solid Network Manager backend. (bko#238325)
+
+-------------------------------------------------------------------
+Sun Oct 10 11:22:32 UTC 2010 - tittiatcoke@gmail.com
+
+- update to r1184295
+ * Fix crash and enable CDMA support in Mobile Connection Wizard
+ * Workaround for the crash when Network Manager restarts
+
+-------------------------------------------------------------------
@@ -4 +19 @@
-- update to 1182930
+- update to r1182930
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde4.spec ++++++
--- /var/tmp/diff_new_pack.wziKhj/_old 2010-11-05 16:08:17.000000000 +0100
+++ /var/tmp/diff_new_pack.wziKhj/_new 2010-11-05 16:08:17.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-kde4 (Version 0.9.svn1182930)
+# spec file for package NetworkManager-kde4 (Version 0.9.svn1192577)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: NetworkManager-kde4
BuildRequires: NetworkManager-devel kdebase4-workspace-devel
-Version: 0.9.svn1182930
+Version: 0.9.svn1192577
Release: 1
License: LGPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ networkmanagement.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/applet/networkmanager.cpp new/networkmanagement/applet/networkmanager.cpp
--- old/networkmanagement/applet/networkmanager.cpp 2010-10-03 04:02:56.000000000 +0200
+++ new/networkmanagement/applet/networkmanager.cpp 2010-11-03 12:12:36.000000000 +0100
@@ -78,7 +78,7 @@
{
setHasConfigurationInterface(true);
setPopupIcon(QIcon());
- setPassivePopup(true); // FIXME: disable, only true for testing ...
+ //setPassivePopup(true); // FIXME: disable, only true for testing ...
m_overlayTimeline.setEasingCurve(QEasingCurve::OutExpo);
m_currentState = Solid::Control::NetworkInterface::UnknownState;
connect(&m_overlayTimeline, SIGNAL(valueChanged(qreal)), this, SLOT(repaint()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/applet/plasma-applet-networkmanagement.desktop new/networkmanagement/applet/plasma-applet-networkmanagement.desktop
--- old/networkmanagement/applet/plasma-applet-networkmanagement.desktop 2010-09-24 10:59:57.000000000 +0200
+++ new/networkmanagement/applet/plasma-applet-networkmanagement.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -13,6 +13,7 @@
Name[nb]=Nettverksstyring
Name[nds]=Nettwarkpleeg
Name[nl]=Netwerkbeheer
+Name[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ
Name[pt]=Gestão de Rede
Name[pt_BR]=Gerenciamento de redes
Name[sk]=Správa siete
@@ -24,6 +25,7 @@
Name[x-test]=xxNetwork Managementxx
Name[zh_TW]=網路管理
Comment=Network status and control utility
+Comment[cs]=Nástroj stavu a ovládání sítě
Comment[da]=Værktøj til netværksstatus og -kontrol
Comment[de]=Dienstprogramm für Netzwerkstatus und -kontrolle
Comment[en_GB]=Network status and control utility
@@ -35,6 +37,7 @@
Comment[nb]=Verktøy for nettverksstatus og styring
Comment[nds]=Warktüüch för den Nettwarkstatus un sien Kuntrull
Comment[nl]=Netwerkstatus en besturingsprogramma
+Comment[pa]=ਨੈੱਟਵਰਕ ਹਾਲਤ ਤੇ ਕੰਟਰੋਲ ਸਹੂਲਤ
Comment[pt]=Utilitário de estado e controlo da rede
Comment[pt_BR]=Utilitário de controle e status da rede
Comment[sk]=Nástroj na riadenie a stav siete
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/kded/networkmanagement.desktop new/networkmanagement/kded/networkmanagement.desktop
--- old/networkmanagement/kded/networkmanagement.desktop 2010-09-28 12:21:11.000000000 +0200
+++ new/networkmanagement/kded/networkmanagement.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=NetworkManager User Settings Service
+Name[cs]=Služba uživatelského nastavení NetworkManageru
Name[da]=Tjeneste til brugerindstillinger for NetworkManager
Name[de]=Benutzereinstellungsdienst für NetworkManager
Name[en_GB]=NetworkManager User Settings Service
@@ -10,6 +11,7 @@
Name[nb]=Tjeneste for brukerinnstillinger i NetworkManager
Name[nds]=Brukerinstellen-Deenst för Nettwarkpleeg
Name[nl]=Gebruikersinstellingenservice van netwerkbeheer
+Name[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਯੂਜ਼ਰ ਸੈਟਿੰਗ ਸਰਵਿਸ
Name[pt]=Serviço de Configuração do Utilizador do NetworkManager
Name[pt_BR]=Serviço de configuração do usuário do NetworkManager
Name[sl]=Uporabniška storitev za nastavitev NetworkManagerja
@@ -30,6 +32,7 @@
Comment[nb]=Forsyner NetworkManager-nissen med nettverksoppsett
Comment[nds]=Stellt Nettwarkinstellen över den Nettwarkpleger-Dämoon praat
Comment[nl]=Levert de netwerkconfiguratie voor de NetworkManager-daemon
+Comment[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਡੈਮਨ ਲਈ ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ ਦਿੰਦੀ ਹੈ
Comment[pt]=Oferece a configuração da rede ao servidor do NetworkManager
Comment[pt_BR]=Fornece a configuração da rede ao daemon do NetworkManager
Comment[sk]=Poskytuje nastavenie siete pre démona NetworkManager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/service/activatablelist.cpp new/networkmanagement/libs/service/activatablelist.cpp
--- old/networkmanagement/libs/service/activatablelist.cpp 2010-10-03 04:02:56.000000000 +0200
+++ new/networkmanagement/libs/service/activatablelist.cpp 2010-10-20 17:34:48.000000000 +0200
@@ -29,11 +29,22 @@
ActivatableList::ActivatableList(QObject * parent)
: QObject(parent), d_ptr(new ActivatableListPrivate)
{
+ // Disabling for now, it needs more work.
+ //init();
}
ActivatableList::ActivatableList(ActivatableListPrivate & dd, QObject * parent)
: QObject(parent), d_ptr(&dd)
{
+ // Disabling for now, it needs more work.
+ //init();
+}
+
+void ActivatableList::init()
+{
+ QObject::connect(Solid::Control::NetworkManager::notifier(),
+ SIGNAL(statusChanged(Solid::Networking::Status)),
+ this, SLOT(nm_restart_workaround(Solid::Networking::Status)));
}
ActivatableList::~ActivatableList()
@@ -41,6 +52,15 @@
delete d_ptr;
}
+void ActivatableList::nm_restart_workaround(Solid::Networking::Status status)
+{
+ if (status == Solid::Networking::Unknown || status == Solid::Networking::Unconnected) {
+ Q_D(ActivatableList);
+ kDebug() << "----- Emptying activatables list, activatables cleared: " << d->activatables.count();
+ d->activatables.clear();
+ }
+}
+
void ActivatableList::registerObserver(ActivatableObserver * observer, ActivatableObserver * insertAfter)
{
Q_D(ActivatableList);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/service/activatablelist.h new/networkmanagement/libs/service/activatablelist.h
--- old/networkmanagement/libs/service/activatablelist.h 2009-11-18 09:35:04.000000000 +0100
+++ new/networkmanagement/libs/service/activatablelist.h 2010-10-09 04:51:36.000000000 +0200
@@ -22,6 +22,7 @@
#define ACTIVATABLELIST_H
#include <QObject>
+#include
#include "knm_export.h"
namespace Knm
@@ -59,7 +60,9 @@
virtual void unregisterObserver(ActivatableObserver *);
protected Q_SLOTS:
void activatableChanged();
+ void nm_restart_workaround(Solid::Networking::Status status);
protected:
+ void init();
void addActivatableInternal(Knm::Activatable * activatable);
void notifyOnAddActivatable(Knm::Activatable * activatable);
ActivatableListPrivate * d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/ui/cdmaconnectioneditor.cpp new/networkmanagement/libs/ui/cdmaconnectioneditor.cpp
--- old/networkmanagement/libs/ui/cdmaconnectioneditor.cpp 2009-11-16 09:26:28.000000000 +0100
+++ new/networkmanagement/libs/ui/cdmaconnectioneditor.cpp 2010-10-09 21:47:27.000000000 +0200
@@ -38,11 +38,20 @@
QString connectionId = args[0].toString();
m_connection = new Knm::Connection(QUuid(connectionId), Knm::Connection::Cdma);
m_contents->setConnection(m_connection);
- m_contents->setDefaultName(i18n("New Cellular Connection"));
CdmaWidget * cdmaWidget = new CdmaWidget(m_connection, this);
PppWidget * pppWidget = new PppWidget(m_connection, this);
+ if (args.count() > 1) {
+ m_contents->setDefaultName(args[1].toString());
+
+ if (args.count() > 2) {
+ cdmaWidget->setCdmaInfo(args[2].toMap());
+ }
+ } else {
+ m_contents->setDefaultName(i18n("New Cellular Connection"));
+ }
+
addToTabWidget(cdmaWidget);
addToTabWidget(pppWidget);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/ui/gsmconnectioneditor.cpp new/networkmanagement/libs/ui/gsmconnectioneditor.cpp
--- old/networkmanagement/libs/ui/gsmconnectioneditor.cpp 2010-10-06 04:01:25.000000000 +0200
+++ new/networkmanagement/libs/ui/gsmconnectioneditor.cpp 2010-10-09 21:47:27.000000000 +0200
@@ -44,22 +44,28 @@
PppWidget * pppWidget = new PppWidget(m_connection, this);
IpV4Widget * ipV4Widget = new IpV4Widget(m_connection, this);
- if (!args[1].isNull() && !args[2].isNull() && !args[3].isNull()) {
- QList<QVariant> networkIds = args[2].toList();
- if (!networkIds.isEmpty()) {
- gsmWidget->setNetworkIds(networkIds);
+ if (args.count() > 1) {
+ if (args.count() > 2) {
+ QList<QVariant> networkIds = args[2].toList();
+ if (!networkIds.isEmpty()) {
+ gsmWidget->setNetworkIds(networkIds);
+ }
}
- QMap apnInfo = args[3].toMap();
- if (apnInfo["name"].isNull()) {
- m_contents->setDefaultName(args[1].toString());
+ if (args.count() > 3) {
+ QMap apnInfo = args[3].toMap();
+ if (apnInfo["name"].isNull()) {
+ m_contents->setDefaultName(args[1].toString());
+ } else {
+ m_contents->setDefaultName(args[1].toString() + " - " + apnInfo["name"].toString());
+ }
+ gsmWidget->setApnInfo(apnInfo);
+
+ if (!apnInfo["dnsList"].isNull()) {
+ ipV4Widget->setDns(apnInfo["dnsList"].toList());
+ }
} else {
- m_contents->setDefaultName(args[1].toString() + " - " + apnInfo["name"].toString());
- }
- gsmWidget->setApnInfo(apnInfo);
-
- if (!apnInfo["dnsList"].isNull()) {
- ipV4Widget->setDns(apnInfo["dnsList"].toList());
+ m_contents->setDefaultName(args[1].toString());
}
} else {
m_contents->setDefaultName(i18n("New Cellular Connection"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/ui/networkmanagement_vpnuiplugin.desktop new/networkmanagement/libs/ui/networkmanagement_vpnuiplugin.desktop
--- old/networkmanagement/libs/ui/networkmanagement_vpnuiplugin.desktop 2010-09-28 12:21:11.000000000 +0200
+++ new/networkmanagement/libs/ui/networkmanagement_vpnuiplugin.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -6,12 +6,14 @@
Name[da]=UI-plugin til VPN-netværkshåndtering
Name[de]=Netzwerkverwaltung VPN-Modul
Name[en_GB]=Network Management VPN UI Plugin
+Name[es]=Complemento de IU para VPN de gestión de red
Name[et]=Võrguhalduri VPN-i UI plugin
Name[fr]=Module externe d'interface utilisateur VPN de gestion de réseau
Name[hu]=Hálózatkezelő VPN UI bővítmény
Name[nb]=Programtillegg til nettverksstyring med VPN brukerflate
Name[nds]=Nettwarkpleger-VPN-Böversietmoduul
Name[nl]=Netwerkbeheer VPN UI-plugin
+Name[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ VPN UI ਪਲੱਗਇਨ
Name[pt]='Plugin' de Interface VPN da Gestão de Rede
Name[pt_BR]=Plug-in de interface VPN do gerenciamento de redes
Name[sk]=Modul pre správu siete VPN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/CMakeLists.txt new/networkmanagement/monolithic/CMakeLists.txt
--- old/networkmanagement/monolithic/CMakeLists.txt 2010-05-19 01:03:37.000000000 +0200
+++ new/networkmanagement/monolithic/CMakeLists.txt 2010-10-21 17:44:39.000000000 +0200
@@ -76,7 +76,7 @@
install(TARGETS knetworkmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES knetworkmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(PROGRAMS knetworkmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
if (INSTALL_KNM_AUTOSTART)
install(FILES kde4-knetworkmanager-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/kde4-knetworkmanager-autostart.desktop new/networkmanagement/monolithic/kde4-knetworkmanager-autostart.desktop
--- old/networkmanagement/monolithic/kde4-knetworkmanager-autostart.desktop 2010-09-24 10:59:57.000000000 +0200
+++ new/networkmanagement/monolithic/kde4-knetworkmanager-autostart.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -11,6 +11,7 @@
Name[nb]=KNetworkManager
Name[nds]=KDE-Nettwarkpleger
Name[nl]=KNetworkManager
+Name[pa]=ਕੇਨੈੱਟਵਰਕਮੈਨੇਜਰ
Name[pt]=KNetworkManager
Name[pt_BR]=KNetworkManager
Name[sk]=KNetworkManager
@@ -33,6 +34,7 @@
GenericName[nb]=Nettverksstyring
GenericName[nds]=Nettwarkpleger
GenericName[nl]=Netwerkbeheer
+GenericName[pa]=ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ
GenericName[pt]=KNetworkManager
GenericName[pt_BR]=Gerenciador de redes
GenericName[sk]=Správca siete
@@ -58,6 +60,7 @@
Comment[nb]=Et KDE-grensesnitt til NetworkManager
Comment[nds]=En KDE-Böversiet för »NetworkManager«
Comment[nl]=Een KDE-schil voor NetworkManager
+Comment[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਲਈ KDE ਫਰੰਟਐਂਡ
Comment[pt]=Uma interface para KDE do NetworkManager
Comment[pt_BR]=Uma interface do NetworkManager para o KDE
Comment[sk]=KDE rozhranie pre NetworkManager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/knetworkmanager.desktop new/networkmanagement/monolithic/knetworkmanager.desktop
--- old/networkmanagement/monolithic/knetworkmanager.desktop 2010-09-24 10:59:57.000000000 +0200
+++ new/networkmanagement/monolithic/knetworkmanager.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -11,6 +11,7 @@
Name[nb]=KNetworkManager
Name[nds]=KDE-Nettwarkpleger
Name[nl]=KNetworkManager
+Name[pa]=ਕੇਨੈੱਟਵਰਕਮੈਨੇਜਰ
Name[pt]=KNetworkManager
Name[pt_BR]=KNetworkManager
Name[sk]=KNetworkManager
@@ -33,6 +34,7 @@
GenericName[nb]=Nettverksstyring
GenericName[nds]=Nettwarkpleger
GenericName[nl]=Netwerkbeheer
+GenericName[pa]=ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ
GenericName[pt]=KNetworkManager
GenericName[pt_BR]=Gerenciador de redes
GenericName[sk]=Správca siete
@@ -58,6 +60,7 @@
Comment[nb]=Et KDE-grensesnitt til NetworkManager
Comment[nds]=En KDE-Böversiet för »NetworkManager«
Comment[nl]=Een KDE-schil voor NetworkManager
+Comment[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਲਈ KDE ਫਰੰਟਐਂਡ
Comment[pt]=Uma interface para KDE do NetworkManager
Comment[pt_BR]=Uma interface do NetworkManager para o KDE
Comment[sk]=KDE rozhranie pre NetworkManager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/knetworkmanagertrayicon.cpp new/networkmanagement/monolithic/knetworkmanagertrayicon.cpp
--- old/networkmanagement/monolithic/knetworkmanagertrayicon.cpp 2010-07-01 05:11:43.000000000 +0200
+++ new/networkmanagement/monolithic/knetworkmanagertrayicon.cpp 2010-10-11 15:19:26.000000000 +0200
@@ -64,6 +64,7 @@
KNetworkManagerTrayIconPrivate()
: list(0),
iconName(QLatin1String("networkmanager")),
+ networkingEnableAction(0),
flightModeAction(0),
prefsAction(0),
copyIpAddrAction(0),
@@ -75,6 +76,7 @@
QHash actions;
QStringList deviceUnis;
QString iconName;
+ KAction * networkingEnableAction;
KAction * flightModeAction;
KAction * prefsAction;
KAction * copyIpAddrAction;
@@ -110,6 +112,13 @@
setAssociatedWidget(contextMenu());
setStatus( (!d->active || Solid::Control::NetworkManager::status() == Solid::Networking::Unknown )? PARENT_ICON_CLASS::Passive : PARENT_ICON_CLASS::Active);
+ d->networkingEnableAction = new KAction(i18nc("@action:inmenu turns off networking", "Enable networking"), this);
+ d->networkingEnableAction->setCheckable(true);
+ d->networkingEnableAction->setChecked(Solid::Control::NetworkManager::isNetworkingEnabled());
+ connect(d->networkingEnableAction, SIGNAL(toggled(bool)), this, SLOT(enableNetworking(bool)));
+ connect(Solid::Control::NetworkManager::notifier(), SIGNAL(networkingEnabledChanged(bool)),
+ this, SLOT(networkingEnabledChanged()));
+
if (types.testFlag(Solid::Control::NetworkInterface::Ieee80211)) {
d->flightModeAction = new KAction(i18nc("@action:inmenu turns off wireless networking", "Enable wireless"), this);
d->flightModeAction->setCheckable(true);
@@ -200,7 +209,7 @@
}
}
- // if not active, add a warning notice and stop
+ // if not active, add a warning notice, show Networking and Wireless check buttons and stop
if (Solid::Control::NetworkManager::status() == Solid::Networking::Unknown) {
QString passiveText = i18nc("@action:inmenu Disable action text used when the NetworkManager daemon is not running", "Network Management disabled");
QString passiveTooltip = i18nc("@info:tooltip NetworkManager is not running, this client cannot do anything", "The system Network Management service is not running");
@@ -209,6 +218,12 @@
passiveAction->setToolTip(passiveTooltip);
passiveAction->setEnabled(false);
contextMenu()->addAction(passiveAction);
+
+ // show "Enable" check buttons
+ contextMenu()->addAction(d->networkingEnableAction);
+ if (!wirelessDeviceUnis.isEmpty() /*TODO Bluetooth too */ && d->interfaceTypes.testFlag(Solid::Control::NetworkInterface::Ieee80211)) {
+ contextMenu()->addAction(d->flightModeAction);
+ }
return;
}
@@ -309,9 +324,11 @@
// add the housekeeping actions
contextMenu()->addSeparator();
+ contextMenu()->addAction(d->networkingEnableAction);
if (!wirelessDeviceUnis.isEmpty() /*TODO Bluetooth too */ && d->interfaceTypes.testFlag(Solid::Control::NetworkInterface::Ieee80211)) {
contextMenu()->addAction(d->flightModeAction);
}
+ contextMenu()->addSeparator();
contextMenu()->addAction(d->prefsAction);
}
@@ -531,6 +548,12 @@
}
}
+void KNetworkManagerTrayIcon::enableNetworking(bool enabled)
+{
+ kDebug() << enabled;
+ Solid::Control::NetworkManager::setNetworkingEnabled(enabled);
+}
+
void KNetworkManagerTrayIcon::enableWireless(bool enabled)
{
kDebug() << enabled;
@@ -548,6 +571,12 @@
}
}
+void KNetworkManagerTrayIcon::networkingEnabledChanged()
+{
+ Q_D(KNetworkManagerTrayIcon);
+ d->networkingEnableAction->setChecked(Solid::Control::NetworkManager::isNetworkingEnabled());
+}
+
void KNetworkManagerTrayIcon::setActive(bool active)
{
Q_D(KNetworkManagerTrayIcon);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/knetworkmanagertrayicon.h new/networkmanagement/monolithic/knetworkmanagertrayicon.h
--- old/networkmanagement/monolithic/knetworkmanagertrayicon.h 2009-12-01 09:06:04.000000000 +0100
+++ new/networkmanagement/monolithic/knetworkmanagertrayicon.h 2010-10-11 15:19:26.000000000 +0200
@@ -91,6 +91,11 @@
void networkingStatusChanged(Solid::Networking::Status);
/**
+ * Enable networking in response to user action
+ */
+ void enableNetworking(bool);
+
+ /**
* Enable wireless in response to user action
*/
void enableWireless(bool);
@@ -101,6 +106,11 @@
void wirelessEnabledChanged();
/**
+ * Update UI in response to system network management networking state changes
+ */
+ void networkingEnabledChanged();
+
+ /**
* Starts monitoring new network interfaces' state changes
*/
void networkInterfaceAdded(const QString&);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/networkmanagement.notifyrc new/networkmanagement/networkmanagement.notifyrc
--- old/networkmanagement/networkmanagement.notifyrc 2010-09-28 12:21:11.000000000 +0200
+++ new/networkmanagement/networkmanagement.notifyrc 2010-10-20 10:30:53.000000000 +0200
@@ -13,6 +13,7 @@
Name[nb]=Nettverksstyring
Name[nds]=Nettwarkpleeg
Name[nl]=Netwerkbeheer
+Name[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ
Name[pt]=Gestão de Rede
Name[pt_BR]=Gerenciamento de redes
Name[sk]=Správa siete
@@ -37,6 +38,7 @@
Comment[nb]=Nettverksstyring
Comment[nds]=Nettwarkpleeg
Comment[nl]=Netwerkbeheer
+Comment[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ
Comment[pt]=Gestão de Rede
Comment[pt_BR]=Gerenciamento de redes
Comment[sk]=Správa siete
@@ -62,6 +64,7 @@
Name[nb]=Tilkoblingstype til nettverk
Name[nds]=Nettwarkverbinnentyp
Name[nl]=Type netwerkverbinding
+Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ
Name[pt]=Tipo da Ligação de Rede
Name[pt_BR]=Tipo de conexão de rede
Name[sk]=Typ sieťového pripojenia
@@ -75,6 +78,7 @@
[Event/hwadded]
Name=Network Interface Attached
+Name[cs]=Síťové rozhraní připojeno
Name[da]=Netkort tilsluttet
Name[de]=Netzwerkschnittstelle angeschlossen
Name[en_GB]=Network Interface Attached
@@ -85,6 +89,7 @@
Name[nb]=Nettverksgrensesnitt lagt til
Name[nds]=Nettwarkkoppelsteed toföögt
Name[nl]=Netwerkinterface aangesloten
+Name[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਟੇਸ ਜੋੜਿਆ ਗਿਆ
Name[pt]=Interface de Rede Ligada
Name[pt_BR]=Interface de rede conectada
Name[sk]=Sieťové rozhranie bolo pripojené
@@ -96,6 +101,7 @@
Name[x-test]=xxNetwork Interface Attachedxx
Name[zh_TW]=網路介面已接上
Comment=A network interface was attached
+Comment[cs]=Síťové rozhraní bylo připojeno
Comment[da]=Et netkort blev tilsluttet
Comment[de]=Eine Netzwerkschnittstelle ist angeschlossen worden
Comment[en_GB]=A network interface was attached
@@ -106,6 +112,7 @@
Comment[nb]=Et nettverksgrensesnitt ble lagt til
Comment[nds]=En Nettwarkkoppelsteed wöör toföögt.
Comment[nl]=Er is een netwerkinterface aangesloten
+Comment[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਜੋੜਿਆ ਗਿਆ ਹੈ
Comment[pt]=Foi ligada uma interface de rede
Comment[pt_BR]=Uma interface de rede foi conectada
Comment[sk]=Sieťové rozhranie bolo pripojené
@@ -130,6 +137,7 @@
Name[nb]=Nettverksgrensesnitt fjernet
Name[nds]=Nettwark-Koppelsteed wegdaan
Name[nl]=Netwerkinterface verwijderd
+Name[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਹਟਾਇਆ ਗਿਆ
Name[pt]=Interface de Rede Removida
Name[pt_BR]=Interface de rede removida
Name[sk]=Sieťové rozhranie bolo odstránené
@@ -152,6 +160,7 @@
Comment[nb]=Et nettverksgrensesnitt ble tatt bort
Comment[nds]=En Nettwark-Koppelsteed wöör wegdaan.
Comment[nl]=Er is een netwerkinterface verwijderd
+Comment[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਨੂੰ ਹਟਾਇਆ ਗਿਆ
Comment[pt]=Foi removida uma interface de rede
Comment[pt_BR]=Uma interface de rede foi removida
Comment[sk]=Sieťové rozhranie bolo odstránené
@@ -165,6 +174,7 @@
[Event/networkappeared]
Name=Found Wireless Network
+Name[cs]=Nalezena bezdrátová síť
Name[da]=Fandt trådløst netværk
Name[de]=Drahtloses Netzwerk gefunden
Name[en_GB]=Found Wireless Network
@@ -175,6 +185,7 @@
Name[nb]=Fant trådløst nettverk
Name[nds]=Funknettwark opdeckt
Name[nl]=Draadloos netwerk gevonden
+Name[pa]=ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਲੱਭਿਆ
Name[pt]=Rede Sem-Fios Descoberta
Name[pt_BR]=Rede sem fio encontrada
Name[sk]=Nájdená bezdrôtová sieť
@@ -186,6 +197,7 @@
Name[x-test]=xxFound Wireless Networkxx
Name[zh_TW]=找到無線網路
Comment=A wireless network appeared
+Comment[cs]=Objevila se bezdrátová síť
Comment[da]=Et trådløst netværk er dukket op
Comment[de]=Ein drahtloses Netzwerk ist entdeckt worden
Comment[en_GB]=A wireless network appeared
@@ -196,6 +208,7 @@
Comment[nb]=Et trådløst nettverk dukket opp
Comment[nds]=En Funknettwark is opdukt.
Comment[nl]=Er verscheen een draadloos netwerk
+Comment[pa]=ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੋਇਆ
Comment[pt]=Apareceu uma rede sem-fios
Comment[pt_BR]=Um rede sem fio apareceu
Comment[sk]=Objavila sa bezdrôtová sieť
@@ -209,6 +222,7 @@
[Event/networkdisappeared]
Name=Lost Wireless Network
+Name[cs]=Bezdrátová síť ztracena
Name[da]=Mistede trådløst netværk
Name[de]=Drahtloses Netzwerk verloren
Name[en_GB]=Lost Wireless Network
@@ -219,6 +233,7 @@
Name[nb]=Mistet trådløst nettverk
Name[nds]=Funknettwark wegkamen
Name[nl]=Verloren draadloos netwerk
+Name[pa]=ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਗੁਆਚਾ
Name[pt]=Rede Sem-Fios Perdida
Name[pt_BR]=Rede sem fio perdida
Name[sk]=Stratená bezdrôtová sieť
@@ -230,6 +245,7 @@
Name[x-test]=xxLost Wireless Networkxx
Name[zh_TW]=遺失無線網路
Comment=A wireless network disappeared
+Comment[cs]=Bezdrátová síť zmizela
Comment[da]=Et trådløst netværk forsvandt
Comment[de]=Ein drahtloses Netzwerk ist nicht mehr vorhanden
Comment[en_GB]=A wireless network disappeared
@@ -240,6 +256,7 @@
Comment[nb]=Et trådløst nettverk forsvant
Comment[nds]=En Funknettwark is wegkamen.
Comment[nl]=Een draadloos netwerk is verdwenen
+Comment[pa]=ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਖਤਮ ਹੋ ਗਿਆ ਹੈ
Comment[pt]=Desapareceu uma rede sem-fios
Comment[pt_BR]=Uma rede sem fio desapareceu
Comment[sk]=Bezdrôtová sieť zmizla
@@ -253,6 +270,7 @@
[Event/userconnectionattempt]
Name=Establishing Network Connection
+Name[cs]=Navazuje se síťové spojení
Name[da]=Opretter netværksforbindelse
Name[de]=Netzwerkverbindung wird hergestellt
Name[en_GB]=Establishing Network Connection
@@ -263,6 +281,7 @@
Name[nb]=Oppretter nettverkstilkobling
Name[nds]=Tokoppeln na Nettwark
Name[nl]=Netwerkverbinding opzetten
+Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ
Name[pt]=A Estabelecer a Ligação à Rede
Name[pt_BR]=Estabelecendo conexão de rede
Name[sk]=Vytvára sa sieťové pripojenie
@@ -274,6 +293,7 @@
Name[x-test]=xxEstablishing Network Connectionxx
Name[zh_TW]=建立網路連線中
Comment=The user started making a connection
+Comment[cs]=Uživatel zahájil spojení
Comment[da]=Brugeren begyndte at oprette en forbindelse
Comment[de]=Der Benutzer hat einen Verbindungsaufbau gestartet
Comment[en_GB]=The user started making a connection
@@ -297,6 +317,7 @@
[Event/autoconnectionattempt]
Name=Establishing Network Connection
+Name[cs]=Navazuje se síťové spojení
Name[da]=Opretter netværksforbindelse
Name[de]=Netzwerkverbindung wird hergestellt
Name[en_GB]=Establishing Network Connection
@@ -307,6 +328,7 @@
Name[nb]=Oppretter nettverkstilkobling
Name[nds]=Tokoppeln na Nettwark
Name[nl]=Netwerkverbinding opzetten
+Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ
Name[pt]=A Estabelecer a Ligação à Rede
Name[pt_BR]=Estabelecendo conexão de rede
Name[sk]=Vytvára sa sieťové pripojenie
@@ -318,6 +340,7 @@
Name[x-test]=xxEstablishing Network Connectionxx
Name[zh_TW]=建立網路連線中
Comment=A connection is being started automatically
+Comment[cs]=Spojení je automaticky navazováno
Comment[da]=En forbindelse er blevet startet automatisk
Comment[de]=Es wird automatisch eine Verbindung aufgebaut
Comment[en_GB]=A connection is being started automatically
@@ -328,6 +351,7 @@
Comment[nb]=En tilkobling blir nå startet automatisk
Comment[nds]=En Verbinnen warrt automaatsch opstellt.
Comment[nl]=Er is automatisch begonnen met het maken van een verbinding
+Comment[pa]=ਕੁਨੈਕਸ਼ਨ ਆਟੋਮੈਟਿਕ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ
Comment[pt]=Uma ligação está a ser iniciada automaticamente
Comment[pt_BR]=Uma conexão foi iniciada automaticamente
Comment[sk]=Pripojenie sa spúšťa automaticky
@@ -342,6 +366,7 @@
[Event/connecting]
Name=Establishing Network Connection
+Name[cs]=Navazuje se síťové spojení
Name[da]=Opretter netværksforbindelse
Name[de]=Netzwerkverbindung wird hergestellt
Name[en_GB]=Establishing Network Connection
@@ -352,6 +377,7 @@
Name[nb]=Oppretter nettverkstilkobling
Name[nds]=Tokoppeln na Nettwark
Name[nl]=Netwerkverbinding opzetten
+Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ
Name[pt]=A Estabelecer a Ligação à Rede
Name[pt_BR]=Estabelecendo conexão de rede
Name[sk]=Vytvára sa sieťové pripojenie
@@ -363,6 +389,7 @@
Name[x-test]=xxEstablishing Network Connectionxx
Name[zh_TW]=建立網路連線中
Comment=A network connection attempt was begun
+Comment[cs]=Zahájen pokus o síťové spojení
Comment[da]=Et netværksforbindelsesforsøg er påbegyndt
Comment[de]=Ein Verbindungsversuch ist begonnen worden
Comment[en_GB]=A network connection attempt was begun
@@ -373,6 +400,7 @@
Comment[nb]=Det ble begynt et forsøk på nettverkstilkobling
Comment[nds]=Mit Tokoppeln na en Nettwark anfungen
Comment[nl]=Een poging tot het maken van een netwerkverbinding is begonnen
+Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਆਟੋਮੈਟਿਕ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਗਈ
Comment[pt]=Iniciou-se uma tentativa de ligação à rede
Comment[pt_BR]=Foi iniciada uma tentativa de conexão de rede
Comment[sk]=Pokus o sieťové pripojenie začal
@@ -387,6 +415,7 @@
[Event/disconnected]
Name=Network Connection Disconnected
+Name[cs]=Síťové spojení odpojeno
Name[da]=Netværksforbindelse afbrudt
Name[de]=Netzwerkverbindung getrennt
Name[en_GB]=Network Connection Disconnected
@@ -397,6 +426,7 @@
Name[nb]=Nettverkstilkobling ble frakoblet
Name[nds]=Vun Nettwark afkoppelt
Name[nl]=Netwerkverbinding verbroken
+Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਡਿਸ-ਕੁਨੈਕਟ ਹੈ
Name[pt]=Ligação de Rede Desligada
Name[pt_BR]=Conexão de rede desconectada
Name[sk]=Sieťové pripojenie bolo odpojené
@@ -408,6 +438,7 @@
Name[x-test]=xxNetwork Connection Disconnectedxx
Name[zh_TW]=網路連線已中斷
Comment=A network connection was disconnected
+Comment[cs]=Síťové spojení bylo odpojeno
Comment[da]=En netværksforbindelse blev afbrudt
Comment[de]=Eine Netzwerkverbindung ist getrennt worden
Comment[en_GB]=A network connection was disconnected
@@ -418,6 +449,7 @@
Comment[nb]=En nettverkstilkobling ble frakoblet
Comment[nds]=En Nettwark-Verbinnen wöör afkoppelt.
Comment[nl]=Een netwerkverbinding was verbroken
+Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਗਿਆ
Comment[pt]=A ligação de rede terminou
Comment[pt_BR]=Uma conexão de rede foi desconectada
Comment[sk]=Sieťové pripojenie bolo odpojené
@@ -442,6 +474,7 @@
Name[nb]=Nettverkstilkobling fullført
Name[nds]=Mit Spood na Nettwark tokoppelt
Name[nl]=Netwerkverbinding geslaagd
+Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸਫ਼ਲ ਰਿਹਾ
Name[pt]=Ligação à Rede com Sucesso
Name[pt_BR]=Conexão de rede estabelecida com sucesso
Name[sk]=Sieťové pripojenie bolo úspešné
@@ -464,6 +497,7 @@
Comment[nb]=En nettverkstilkobling ble opprettet
Comment[nds]=En Nettwark-Verbinnen wöör opstellt.
Comment[nl]=Een netwerkverbinding is opgezet
+Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਗਿਆ
Comment[pt]=Foi estabelecida uma ligação à rede
Comment[pt_BR]=Uma conexão de rede foi estabelecida
Comment[sk]=Sieťové pripojenie bolo vytvorené
@@ -489,6 +523,7 @@
Name[nb]=Nettverkstilkobling lyktes ikke
Name[nds]=Tokoppeln na Nettwark fehlslaan
Name[nl]=Netwerkverbinding is mislukt
+Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ
Name[pt]=Ligação à Rede sem Sucesso
Name[pt_BR]=Falha na conexão de rede
Name[sk]=Sieťové pripojenie zlyhalo
@@ -511,6 +546,7 @@
Comment[nb]=Et forsøk på nettverkstilkobling lyktes ikke
Comment[nds]=Dat Tokoppeln na en Nettwark is fehlslaan.
Comment[nl]=Een poging tot het maken van een netwerkverbinding is mislukt
+Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਫੇਲ੍ਹ ਹੋਈ
Comment[pt]=A tentativa de ligação à rede foi mal-sucedida
Comment[pt_BR]=Uma tentativa de conexão de rede falhou
Comment[sk]=Pokus o sieťové pripojenie zlyhal
@@ -534,6 +570,7 @@
Name[nb]=Radio-maskinvare slått av
Name[nds]=Funkreedschap utmaakt
Name[nl]=Radio-hardware uitgeschakeld
+Name[pa]=ਰੇਡੀਓ ਹਾਰਡਵੇਅਰ ਬੰਦ ਹੈ
Name[pt]='Hardware' de Rádio Desligado
Name[pt_BR]=Hardware de rádio desligado
Name[sk]=Bezdrôtový hardvér bol vypnutý
@@ -554,6 +591,7 @@
Comment[nb]=Trådløse sendere/mottakere slått av med maskinbryter
Comment[nds]=Funkreedschap mit Hardwareschalter utmaakt
Comment[nl]=Draadloze transceivers uitgeschakeld door hardware schakelaar
+Comment[pa]=ਬੇਤਾਰ ਟਰਾਂਸਸੀਵਰ ਹਾਰਡਵੇਅਰ ਸਵਿੱਚ ਨਾਲ ਬੰਦ ਕੀਤੇ ਹਨ
Comment[pt]=Os receptores/transmissores sem-fios foram desligados pelo interruptor
Comment[pt_BR]=Os transmissores/receptores sem fio foram desabilitados pelo interruptor do hardware
Comment[sk]=Bezdrôtový vysielač bol vypnutý hardvérovým vypínačom
@@ -577,6 +615,7 @@
Name[nb]=Radio-maskinvare slått på
Name[nds]=Funkreedschap anmaakt
Name[nl]=Radio-hardware aan geschakeld
+Name[pa]=ਰੇਡੀਓ ਹਾਰਡਵੇਅਰ ਚਾਲੂ ਹੈ
Name[pt]='Hardware' de Rádio Ligado
Name[pt_BR]=Hardware de rádio ligado
Name[sk]=Bezdrôtový hardvér bol zapnutý
@@ -597,6 +636,7 @@
Comment[nb]=Trådløse sendere/mottakere slått på
Comment[nds]=Funkreedschap wöör anmaakt
Comment[nl]=Draadloze transceivers ingeschakeld
+Comment[pa]=ਬੇਤਾਰ ਟਰਾਂਸਸੀਵਰ ਚਾਲੂ ਹੈ
Comment[pt]=Os receptores/transmissores sem-fios foram ligados
Comment[pt_BR]=Os transmissores/receptores sem fio foram habilitados
Comment[sk]=Bezdrôtový vysielač bol zapnutý
@@ -611,6 +651,7 @@
[Event/lowsignal]
Name=Low Wireless Signal Strength
+Name[cs]=Slabý bezdrátový signál
Name[da]=Lav signalstyrke på trådløst
Name[de]=Niedrige Signalstärke
Name[en_GB]=Low Wireless Signal Strength
@@ -622,6 +663,7 @@
Name[nb]=Lav trådløs signalstyrkee
Name[nds]=Minn Funksignaalstärk
Name[nl]=Lage draadloze signaalsterkte
+Name[pa]=ਘੱਟ ਬੇਤਾਰ ਸਿਗਨਲ ਤਾਕਤ
Name[pt]=Potência do Sinal Sem-Fios Fraca
Name[pt_BR]=Potência baixa do sinal sem fio
Name[sk]=Nízka sila bezdrôtového signálu
@@ -633,6 +675,7 @@
Name[x-test]=xxLow Wireless Signal Strengthxx
Name[zh_TW]=無線網路信號強度偏低
Comment=The wireless signal strength is low
+Comment[cs]=Síla bezdrátového signálu je slabá
Comment[da]=Den trådløse signalstyrke er lav
Comment[de]=Die Signalstärke der drahtlosen Verbindung ist niedrig
Comment[en_GB]=The wireless signal strength is low
@@ -643,6 +686,7 @@
Comment[nb]=Den trådløse signalstyrken er lav
Comment[nds]=De Stärk vun't Funksignaal is minn.
Comment[nl]=De sterkte van het draadloze signaal is laag
+Comment[pa]=ਬੇਤਾਰ ਸਿਗਨਲ ਤਾਕਤ ਘੱਟ ਹੈ
Comment[pt]=A potência do sinal sem-fios é fraca
Comment[pt_BR]=A potência do sinal sem fio está baixa
Comment[sk]=Sila bezdrôtového signálu je nízka
@@ -657,6 +701,7 @@
[Event/ifacestatechange]
Name=Interface changed state
+Name[cs]=Rozhraní změnilo stav
Name[da]=Netkort ændrede tilstand
Name[de]=Schnittstellenstatus geändert
Name[en_GB]=Interface changed state
@@ -667,6 +712,7 @@
Name[nb]=Grensesnitt endret status
Name[nds]=Koppelsteed hett Status wesselt
Name[nl]=Status interface gewijzigd
+Name[pa]=ਇੰਟਰਫੇਸ ਬਦਲਿਆ ਗਿਆ
Name[pt]=A interface mudou de estado
Name[pt_BR]=A interface alterou o estado
Name[sk]=Rozhranie zmenilo stav
@@ -678,6 +724,7 @@
Name[x-test]=xxInterface changed statexx
Name[zh_TW]=介面已變更狀態
Comment=An interface changed state
+Comment[cs]=Stav rozhraní se změnil
Comment[da]=Et netkort ændrede tilstand
Comment[de]=Der Status einer Schnittstelle hat sich geändert
Comment[en_GB]=An interface changed state
@@ -688,6 +735,7 @@
Comment[nb]=Et grensesnitt endret status
Comment[nds]=En Koppelsteed hett den Status wesselt.
Comment[nl]=De status van een interface is gewijzigd
+Comment[pa]=ਇੰਟਰਫੇਸ ਹਾਲਤ ਬਦਲਈ ਗਈ
Comment[pt]=Uma interface de rede mudou de estado
Comment[pt_BR]=Uma interface alterou o estado
Comment[sk]=Rozhranie zmenilo stav
@@ -701,6 +749,7 @@
[Event/networkingdisabled]
Name=Network management disabled
+Name[cs]=Správa sítě zakázána
Name[da]=Netværkshåndtering deaktiveret
Name[de]=Netzwerkverwaltung deaktiviert
Name[en_GB]=Network management disabled
@@ -711,6 +760,7 @@
Name[nb]=Nettverksstyring slått av
Name[nds]=Nettwarkpleeg utmaakt
Name[nl]=Netwerkbeheer uitgeschakeld
+Name[pa]=ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ ਬੰਦ ਹੈ
Name[pt]=Gestão de rede desactivada
Name[pt_BR]=Gerenciamento de redes desabilitado
Name[sk]=Správa siete bola zakázaná
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/kcm_networkmanagement.desktop new/networkmanagement/settings/config/kcm_networkmanagement.desktop
--- old/networkmanagement/settings/config/kcm_networkmanagement.desktop 2010-10-03 12:06:57.000000000 +0200
+++ new/networkmanagement/settings/config/kcm_networkmanagement.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -12,6 +12,7 @@
Name[nb]=Nettverksforbindelser
Name[nds]=Nettwarkverbinnen
Name[nl]=Netwerkverbindingen
+Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ
Name[pt]=Ligações de Rede
Name[pt_BR]=Conexões de rede
Name[sk]=Sieťové pripojenia
@@ -35,6 +36,7 @@
Comment[nb]=Legg til, endre og fjern nettverksforbindelser
Comment[nds]=Nettwark-Verbinnen tofögen, bewerken un wegmaken
Comment[nl]=Netwerkverbindingen toevoegen, bewerken en verwijderen
+Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ, ਸੋਧੋ ਤੇ ਹਟਾਉ
Comment[pt]=Adicionar, Editar e Remover as Ligações de Rede
Comment[pt_BR]=Adiciona, edita e remove conexões de rede
Comment[sk]=Pridanie, úprava a odstránenie sieťových pripojení
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/kcm_networkmanagement_tray.desktop new/networkmanagement/settings/config/kcm_networkmanagement_tray.desktop
--- old/networkmanagement/settings/config/kcm_networkmanagement_tray.desktop 2010-09-28 12:21:11.000000000 +0200
+++ new/networkmanagement/settings/config/kcm_networkmanagement_tray.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -13,6 +13,7 @@
Name[nb]=Andre
Name[nds]=Anner
Name[nl]=Overig
+Name[pa]=ਹੋਰ
Name[pt]=Outra
Name[pt_BR]=Outra
Name[sk]=Ostatné
@@ -35,6 +36,7 @@
Comment[nb]=Sett opp verktøyet for nettverksstyring
Comment[nds]=Dat Nettwark-Pleegwarktüüch instellen
Comment[nl]=Hulpmiddel voor netwerkbeheer instellen
+Comment[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ ਟੂਲ ਸੰਰਚਨਾ
Comment[pt]=Configurar a ferramenta de Gestão da Rede
Comment[pt_BR]=Configura a ferramenta de gerenciamento de redes
Comment[sk]=Nastavenie nástroja pre správu siete
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/manageconnectionwidget.cpp new/networkmanagement/settings/config/manageconnectionwidget.cpp
--- old/networkmanagement/settings/config/manageconnectionwidget.cpp 2010-10-06 04:01:25.000000000 +0200
+++ new/networkmanagement/settings/config/manageconnectionwidget.cpp 2010-10-09 21:47:27.000000000 +0200
@@ -260,7 +260,7 @@
mMobileConnectionWizard = new MobileConnectionWizard();
if (mMobileConnectionWizard->exec() == QDialog::Accepted) {
- mEditor->addConnection(false, connectionTypeForCurrentIndex(), mMobileConnectionWizard->args(), true);
+ mEditor->addConnection(false, mMobileConnectionWizard->type(), mMobileConnectionWizard->args(), true);
}
} else { // show connection settings widget for the active tab
mEditor->addConnection(false, connectionTypeForCurrentIndex());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/mobileconnectionwizard.cpp new/networkmanagement/settings/config/mobileconnectionwizard.cpp
--- old/networkmanagement/settings/config/mobileconnectionwizard.cpp 2010-10-06 04:01:25.000000000 +0200
+++ new/networkmanagement/settings/config/mobileconnectionwizard.cpp 2010-10-09 21:47:27.000000000 +0200
@@ -32,7 +32,7 @@
#include "mobileconnectionwizard.h"
-MobileConnectionWizard::MobileConnectionWizard(QWidget * parent): QWizard(parent), mType(0), mPlanComboBox(0), mCountryList(0), mProvidersList(0), userApn(0), mProviders(0)
+MobileConnectionWizard::MobileConnectionWizard(QWidget * parent): QWizard(parent)
{
mProviders = new MobileProviders();
setWindowTitle(i18nc("Mobile Connection Wizard", "New Mobile Broadband Connection"));
@@ -189,6 +189,15 @@
return temp;
}
+Knm::Connection::Type MobileConnectionWizard::type()
+{
+ if (mIface && mIface ->type() == Solid::Control::NetworkInterface::Cdma) {
+ return Knm::Connection::Cdma;
+ }
+
+ return Knm::Connection::Gsm;
+}
+
/**********************************************************/
/* Intro page */
/**********************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/mobileconnectionwizard.h new/networkmanagement/settings/config/mobileconnectionwizard.h
--- old/networkmanagement/settings/config/mobileconnectionwizard.h 2010-10-06 04:01:25.000000000 +0200
+++ new/networkmanagement/settings/config/mobileconnectionwizard.h 2010-10-09 21:47:27.000000000 +0200
@@ -30,6 +30,7 @@
#include
#include "mobileproviders.h"
+#include "../../libs/internals/connection.h"
class MobileConnectionWizard : public QWizard
{
@@ -49,6 +50,8 @@
*/
QVariantList args();
+ Knm::Connection::Type type();
+
private Q_SLOTS:
void introDeviceAdded(const QString uni);
void introDeviceRemoved(const QString uni);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/vpnplugins/openvpn/networkmanagement_openvpnui.desktop new/networkmanagement/vpnplugins/openvpn/networkmanagement_openvpnui.desktop
--- old/networkmanagement/vpnplugins/openvpn/networkmanagement_openvpnui.desktop 2010-09-24 10:59:57.000000000 +0200
+++ new/networkmanagement/vpnplugins/openvpn/networkmanagement_openvpnui.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -27,6 +27,7 @@
Name[nb]=OpenVPN
Name[nds]=OpenVPN
Name[nl]=OpenVPN
+Name[pa]=OpenVPN
Name[pt]=OpenVPN
Name[pt_BR]=OpenVPN
Name[sk]=OpenVPN
@@ -50,6 +51,7 @@
Comment[nb]=OpenVPN programtillegg
Comment[nds]=OpenVPN-Moduul
Comment[nl]=OpenVPN-plugin
+Comment[pa]=OpenVPN ਪਲੱਗਇਨ
Comment[pt]='Plugin' do OpenVPN
Comment[pt_BR]=Plug-in do OpenVPN
Comment[sk]=OpenVPN modul
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/vpnplugins/pptp/networkmanagement_pptpui.desktop new/networkmanagement/vpnplugins/pptp/networkmanagement_pptpui.desktop
--- old/networkmanagement/vpnplugins/pptp/networkmanagement_pptpui.desktop 2010-09-24 10:59:57.000000000 +0200
+++ new/networkmanagement/vpnplugins/pptp/networkmanagement_pptpui.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -26,6 +26,7 @@
Name[nb]=PPTP
Name[nds]=PPTP
Name[nl]=PPTP
+Name[pa]=PPTP
Name[pt]=PPTP
Name[pt_BR]=PPTP
Name[sk]=PPTP
@@ -49,6 +50,7 @@
Comment[nb]=PPTP programtillegg
Comment[nds]=PPTP-Moduul
Comment[nl]=PPTP-plugin
+Comment[pa]=PPTP ਪਲੱਗਇਨ
Comment[pt]='Plugin' de PPTP
Comment[pt_BR]=Plug-in de PPTP
Comment[sk]=PPTP modul
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/vpnplugins/vpnc/networkmanagement_vpncui.desktop new/networkmanagement/vpnplugins/vpnc/networkmanagement_vpncui.desktop
--- old/networkmanagement/vpnplugins/vpnc/networkmanagement_vpncui.desktop 2010-09-24 10:59:57.000000000 +0200
+++ new/networkmanagement/vpnplugins/vpnc/networkmanagement_vpncui.desktop 2010-10-20 10:30:53.000000000 +0200
@@ -26,6 +26,7 @@
Name[nb]=VPNC
Name[nds]=VPNC
Name[nl]=VPNC
+Name[pa]=VPNC
Name[pt]=VPNC
Name[pt_BR]=VPNC
Name[sk]=VPNC
@@ -49,6 +50,7 @@
Comment[nb]=VPNC programtillegg
Comment[nds]=VPNC-Moduul
Comment[nl]=VPNC-plugin
+Comment[pa]=VPNC ਪਲੱਗਇਨ
Comment[pt]='Plugin' do VPNC
Comment[pt_BR]=Plug-in do VPNC
Comment[sk]=VPNC modul
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org