Only in NetworkManagerApplet_MBM/: aclocal.m4 Only in NetworkManagerApplet_MBM/: .bzr Only in NetworkManagerApplet_MBM/: compile Only in NetworkManagerApplet_MBM/: config.guess Only in NetworkManagerApplet_MBM/: config.h.in Only in NetworkManagerApplet_MBM/: config.sub Only in NetworkManagerApplet_MBM/: configure diff -rU8 -p applet.svn/configure.ac NetworkManagerApplet_MBM/configure.ac --- applet.svn/configure.ac 2008-11-24 21:36:08.000000000 +0100 +++ NetworkManagerApplet_MBM/configure.ac 2008-11-24 21:39:33.000000000 +0100 @@ -216,11 +216,12 @@ fi AC_OUTPUT([ Makefile src/Makefile src/marshallers/Makefile src/utils/Makefile src/gconf-helpers/Makefile src/wireless-security/Makefile src/connection-editor/Makefile +src/modems/Makefile icons/Makefile po/Makefile.in ]) Only in NetworkManagerApplet_MBM/: depcomp diff -rU8 -p applet.svn/icons/Makefile.am NetworkManagerApplet_MBM/icons/Makefile.am --- applet.svn/icons/Makefile.am 2008-11-24 21:36:04.000000000 +0100 +++ NetworkManagerApplet_MBM/icons/Makefile.am 2008-11-24 21:39:33.000000000 +0100 @@ -1,16 +1,18 @@ NULL = -largeicondir=${datadir}/icons/hicolor/48x48/apps +theme_icon=gnome + +largeicondir=${datadir}/icons/${theme_icon}/48x48/apps largeicon_DATA=\ nm-device-wireless.png -smallicondir=${datadir}/icons/hicolor/22x22/apps +smallicondir=${datadir}/icons/${theme_icon}/22x22/apps smallicon_DATA= \ nm-no-connection.png\ nm-device-wired.png \ nm-device-wwan.png \ nm-adhoc.png \ nm-stage01-connecting01.png \ nm-stage01-connecting02.png \ nm-stage01-connecting03.png \ @@ -39,16 +41,20 @@ smallicon_DATA= \ nm-stage03-connecting04.png \ nm-stage03-connecting05.png \ nm-stage03-connecting06.png \ nm-stage03-connecting07.png \ nm-stage03-connecting08.png \ nm-stage03-connecting09.png \ nm-stage03-connecting10.png \ nm-stage03-connecting11.png \ + nm-tech-gprs.png \ + nm-tech-edge.png \ + nm-tech-umts.png \ + nm-tech-hsdpa.png \ nm-signal-00.png \ nm-signal-25.png \ nm-signal-50.png \ nm-signal-75.png \ nm-signal-100.png \ nm-vpn-connecting01.png \ nm-vpn-connecting02.png \ nm-vpn-connecting03.png \ @@ -61,17 +67,17 @@ smallicon_DATA= \ nm-vpn-connecting10.png \ nm-vpn-connecting11.png \ nm-vpn-connecting12.png \ nm-vpn-connecting13.png \ nm-vpn-connecting14.png \ nm-vpn-active-lock.png \ $(NULL) -smallericondir=${datadir}/icons/hicolor/16x16/apps +smallericondir=${datadir}/icons/${theme_icon}/16x16/apps smallericon_DATA= \ nm-vpn-standalone-lock.png \ $(NULL) EXTRA_DIST=\ $(largeicon_DATA) \ $(smallicon_DATA) \ $(smallericon_DATA) Only in NetworkManagerApplet_MBM/icons: nm-tech-edge.png Only in NetworkManagerApplet_MBM/icons: nm-tech-gprs.png Only in NetworkManagerApplet_MBM/icons: nm-tech-hsdpa.png Only in NetworkManagerApplet_MBM/icons: nm-tech-umts.png Only in applet.svn/icons: .svn Only in NetworkManagerApplet_MBM/: install-sh Only in NetworkManagerApplet_MBM/: intltool-extract.in Only in NetworkManagerApplet_MBM/: intltool-merge.in Only in NetworkManagerApplet_MBM/: intltool-update.in Only in NetworkManagerApplet_MBM/: ltmain.sh Only in NetworkManagerApplet_MBM/: Makefile.in Only in NetworkManagerApplet_MBM/: missing diff -rU8 -p applet.svn/po/ChangeLog NetworkManagerApplet_MBM/po/ChangeLog --- applet.svn/po/ChangeLog 2008-11-24 21:36:08.000000000 +0100 +++ NetworkManagerApplet_MBM/po/ChangeLog 2008-11-24 21:39:33.000000000 +0100 @@ -1,8 +1,25 @@ +2008-10-15 Timo Jyrinki + + * fi.po: Updated Finnish translation. + +2008-10-12 Petr Kovar + + * cs.po: Updated Czech translation by Adrian Gunis + (bug #552929 again). + +2008-10-12 Jorge Gonzalez + + * es.po: Updated Spanish translation. + +2008-10-10 Claude Paroz + + * fr.po: Updated French translation. + 2008-10-07 Kjartan Maraas * nb.po: Updated Norwegian bokmål translation. 2008-10-07 Daniel Nylander * sv.po: Updated Swedish translation. diff -rU8 -p applet.svn/po/cs.po NetworkManagerApplet_MBM/po/cs.po --- applet.svn/po/cs.po 2008-11-24 21:36:08.000000000 +0100 +++ NetworkManagerApplet_MBM/po/cs.po 2008-11-24 21:39:32.000000000 +0100 @@ -1,161 +1,134 @@ # Czech translation of network-manager-applet. # Copyright (C) 2004, 2005, 2006, 2008 the author(s) of network-manager-applet. # Copyright (C) 2004, 2005, 2006 Miloslav Trmac . # This file is distributed under the same license as the network-manager-applet package. # Miloslav Trmac , 2004 - 2006. # Jakub Friedl , 2006. -# Adrian Guniš , 2006. +# Adrian Guniš , 2008. +# Petr Kovar , 2008. # msgid "" msgstr "" "Project-Id-Version: network-manager-applet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-21 02:59+0200\n" -"PO-Revision-Date: 2008-09-21 02:55+0200\n" +"POT-Creation-Date: 2008-10-12 15:33+0200\n" +"PO-Revision-Date: 2008-10-12 15:28+0200\n" "Last-Translator: Petr Kovar \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Poedit-Language: Czech\n" +"X-Generator: KBabel 1.11.4\n" #: ../src/applet-device-cdma.c:55 -msgid "Auto CDMA network connection" -msgstr "Automatické připojení k síti CDMA" +msgid "Auto Mobile Broadband (CDMA) connection" +msgstr "Automatické mobilní širokopásmové připojení (CDMA)" #: ../src/applet-device-cdma.c:196 ../src/applet-device-gsm.c:197 msgid "Disconnect" msgstr "Odpojit" -#: ../src/applet-device-cdma.c:236 +#: ../src/applet-device-cdma.c:235 ../src/applet-device-gsm.c:236 #, c-format -msgid "CDMA Connections (%s)" -msgstr "Připojení pomocí CDMA (%s)" +msgid "Mobile Broadband (%s)" +msgstr "Mobilní širokopásmová (%s)" -#: ../src/applet-device-cdma.c:238 -#, c-format -msgid "CDMA Network (%s)" -msgstr "Síť CDMA (%s)" - -#: ../src/applet-device-cdma.c:241 -msgid "CDMA Connections" -msgstr "Připojení pomocí CDMA" - -#: ../src/applet-device-cdma.c:243 -msgid "CDMA Network" -msgstr "Síť CDMA" +#: ../src/applet-device-cdma.c:237 ../src/applet-device-gsm.c:238 +#: ../src/connection-editor/page-mobile.c:274 +#: ../src/connection-editor/nm-connection-editor.glade.h:6 +#: ../src/connection-editor/nm-connection-list.c:1481 +msgid "Mobile Broadband" +msgstr "Mobilní širokopásmová" -#: ../src/applet-device-cdma.c:261 ../src/applet-device-gsm.c:262 +#: ../src/applet-device-cdma.c:255 ../src/applet-device-gsm.c:256 #: ../src/applet-device-wired.c:224 ../src/applet-device-wifi.c:699 msgid "device is unmanaged" msgstr "zařízení není spravováno" -#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:286 -#: ../src/applet-device-wired.c:247 ../src/applet-device-wifi.c:1188 +#: ../src/applet-device-cdma.c:288 ../src/applet-device-gsm.c:289 +#: ../src/applet-device-wired.c:256 +#, c-format +msgid "You are now connected to '%s'." +msgstr "Jste právě připojeni k '%s'." + +#: ../src/applet-device-cdma.c:292 ../src/applet-device-gsm.c:293 +#: ../src/applet-device-wired.c:260 ../src/applet-device-wifi.c:1192 msgid "Connection Established" msgstr "Připojení navázáno" -#: ../src/applet-device-cdma.c:286 +#: ../src/applet-device-cdma.c:293 msgid "You are now connected to the CDMA network." msgstr "Jste právě připojeni k síti CDMA." -#: ../src/applet-device-cdma.c:304 +#: ../src/applet-device-cdma.c:316 ../src/applet-device-gsm.c:317 #, c-format -msgid "Dialing CDMA device %s..." -msgstr "Vytáčí se zařízení CDMA %s..." +msgid "Dialing mobile broadband device %s..." +msgstr "Probíhá vytáčení mobilního širokopásmového zařízení %s..." -#: ../src/applet-device-cdma.c:307 ../src/applet-device-gsm.c:308 +#: ../src/applet-device-cdma.c:319 ../src/applet-device-gsm.c:320 #, c-format msgid "Starting PPP on device %s..." msgstr "Spouští se PPP na zařízení %s..." -#: ../src/applet-device-cdma.c:310 ../src/applet-device-gsm.c:311 +#: ../src/applet-device-cdma.c:322 ../src/applet-device-gsm.c:323 #, c-format msgid "Waiting for user authentication on device '%s'..." msgstr "Čeká se na ověření uživatele k zařízení '%s'..." -#: ../src/applet-device-cdma.c:313 -msgid "CDMA connection" -msgstr "Připojení pomocí CDMA" - -#: ../src/applet-device-cdma.c:421 -msgid "CDMA Network Password" -msgstr "Síťové heslo pro CDMA" - -#: ../src/applet-device-cdma.c:428 -msgid "A password is required to connect to the CDMA network." -msgstr "Pro připojení k síti CDMA je vyžadováno heslo." +#: ../src/applet-device-cdma.c:326 ../src/applet-device-gsm.c:327 +#, c-format +msgid "Mobile broadband connection '%s'" +msgstr "Mobilní širokopásmové připojení '%s'" + +#: ../src/applet-device-cdma.c:328 ../src/applet-device-gsm.c:329 +msgid "Mobile broadband connection" +msgstr "Mobilní širokopásmové připojení" + +#: ../src/applet-device-cdma.c:438 ../src/applet-device-gsm.c:541 +msgid "Mobile broadband network password" +msgstr "Heslo k mobilní širokopásmové síti" + +#: ../src/applet-device-cdma.c:447 ../src/applet-device-gsm.c:550 +#, c-format +msgid "A password is required to connect to '%s'." +msgstr "Pro připojení k '%s' je vyžadováno heslo." -#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:547 +#: ../src/applet-device-cdma.c:465 ../src/applet-device-gsm.c:568 #: ../src/applet.glade.h:22 ../src/connection-editor/ce-page-dsl.glade.h:1 #: ../src/connection-editor/ce-page-mobile.glade.h:14 msgid "Password:" msgstr "Heslo:" #: ../src/applet-device-gsm.c:56 -msgid "Auto GSM network connection" -msgstr "Automatické připojení k síti GSM" - -#: ../src/applet-device-gsm.c:237 -#, c-format -msgid "GSM Connections (%s)" -msgstr "Připojení pomocí GSM (%s)" - -#: ../src/applet-device-gsm.c:239 -#, c-format -msgid "GSM Network (%s)" -msgstr "Síť GSM (%s)" - -#: ../src/applet-device-gsm.c:242 -msgid "GSM Connections" -msgstr "Připojení pomocí GSM" - -#: ../src/applet-device-gsm.c:244 -msgid "GSM Network" -msgstr "Síť GSM" +msgid "Auto Mobile Broadband (GSM) connection" +msgstr "Automatické mobilní širokopásmové připojení (GSM)" -#: ../src/applet-device-gsm.c:287 +#: ../src/applet-device-gsm.c:294 msgid "You are now connected to the GSM network." msgstr "Jste právě připojeni k síti GSM." -#: ../src/applet-device-gsm.c:305 -#, c-format -msgid "Dialing GSM device %s..." -msgstr "Vytáčí se zařízení GSM %s..." - -#: ../src/applet-device-gsm.c:314 -msgid "GSM connection" -msgstr "Připojení pomocí GSM" - -#: ../src/applet-device-gsm.c:452 +#: ../src/applet-device-gsm.c:467 msgid "PIN code required" msgstr "Požadován kód PIN" -#: ../src/applet-device-gsm.c:454 +#: ../src/applet-device-gsm.c:469 msgid "PUK code required" msgstr "Požadován kód PUK" -#: ../src/applet-device-gsm.c:464 -msgid "PIN code is needed for the GSM device" -msgstr "Pro zařízení GSM je vyžadován kód PIN" - -#: ../src/applet-device-gsm.c:466 -msgid "PUK code is needed for the GSM device" -msgstr "Pro zařízení GSM je vyžadován kód PUK" - -#: ../src/applet-device-gsm.c:524 -msgid "GSM Network Password" -msgstr "Síťové heslo pro GSM" - -#: ../src/applet-device-gsm.c:531 -msgid "A password is required to connect to the GSM network." -msgstr "Pro připojení k síti GSM je vyžadováno heslo." +#: ../src/applet-device-gsm.c:479 +msgid "PIN code is needed for the mobile broadband device" +msgstr "Pro mobilní širokopásmové zařízení je vyžadován kód PIN" + +#: ../src/applet-device-gsm.c:481 +msgid "PUK code is needed for the mobile broadband device" +msgstr "Pro mobilní širokopásmové zařízení je vyžadován kód PUK" #: ../src/applet-device-wired.c:65 msgid "Auto Ethernet" msgstr "Auto Ethernet" #: ../src/applet-device-wired.c:193 #, c-format msgid "Wired Networks (%s)" @@ -169,46 +142,46 @@ msgstr "Drátová síť (%s)" #: ../src/applet-device-wired.c:198 msgid "Wired Networks" msgstr "Drátové sítě" #: ../src/applet-device-wired.c:200 msgid "Wired Network" msgstr "Drátová síť" -#: ../src/applet-device-wired.c:248 +#: ../src/applet-device-wired.c:261 msgid "You are now connected to the wired network." msgstr "Jste právě připojeni k drátové síti." -#: ../src/applet-device-wired.c:266 +#: ../src/applet-device-wired.c:281 #, c-format msgid "Preparing device %s for the wired network..." msgstr "Připravuje se zařízení %s pro drátovou síť..." -#: ../src/applet-device-wired.c:269 +#: ../src/applet-device-wired.c:284 #, c-format msgid "Configuring device %s for the wired network..." msgstr "Nastavuje se zařízení %s pro drátovou síť..." -#: ../src/applet-device-wired.c:272 +#: ../src/applet-device-wired.c:287 #, c-format msgid "Requesting a network address from the wired network..." -msgstr "Žádá se o síťovou adresu od drátové sítě..." +msgstr "Žádá se o síťovou adresu k drátové síti..." -#: ../src/applet-device-wired.c:276 +#: ../src/applet-device-wired.c:291 msgid "Wired network connection" msgstr "Drátové připojení k síti" -#: ../src/applet-device-wired.c:507 +#: ../src/applet-device-wired.c:522 msgid "DSL authentication" msgstr "Ověření DSL" #: ../src/applet-device-wifi.c:87 -msgid "_Connect to Other Wireless Network..." -msgstr "_Připojit se k jiné bezdrátové síti..." +msgid "_Connect to Hidden Wireless Network..." +msgstr "_Připojit se ke skryté bezdrátové síti..." #: ../src/applet-device-wifi.c:119 msgid "Create _New Wireless Network..." msgstr "Vytvořit _novou bezdrátovou síť..." #: ../src/applet-device-wifi.c:669 #, c-format msgid "Wireless Networks (%s)" @@ -237,58 +210,58 @@ msgstr "Dostupné bezdrátové sítě" #: ../src/applet-device-wifi.c:989 msgid "Click on this icon to connect to a wireless network" msgstr "Klikněte na tuto ikonu pro připojení k bezdrátové síti" #: ../src/applet-device-wifi.c:992 msgid "Don't show this message again" msgstr "Tuto zprávu již příště nezobrazovat" -#: ../src/applet-device-wifi.c:1186 +#: ../src/applet-device-wifi.c:1190 #, c-format msgid "You are now connected to the wireless network '%s'." msgstr "Jste právě připojeni k bezdrátové síti '%s'." -#: ../src/applet-device-wifi.c:1187 ../src/applet-device-wifi.c:1215 +#: ../src/applet-device-wifi.c:1191 ../src/applet-device-wifi.c:1220 msgid "(none)" msgstr "(žádné)" -#: ../src/applet-device-wifi.c:1221 +#: ../src/applet-device-wifi.c:1226 #, c-format msgid "Preparing device %s for the wireless network '%s'..." msgstr "Připravuje se zařízení %s pro bezdrátovou síť '%s'..." -#: ../src/applet-device-wifi.c:1224 +#: ../src/applet-device-wifi.c:1229 #, c-format msgid "Attempting to join the wireless network '%s'..." msgstr "Probíhá pokus o připojení k bezdrátové síti '%s'..." -#: ../src/applet-device-wifi.c:1227 +#: ../src/applet-device-wifi.c:1232 #, c-format msgid "Requesting a network address from the wireless network '%s'..." -msgstr "Žádá se o síťovou adresu od bezdrátové sítě '%s'..." +msgstr "Žádá se o síťovou adresu k bezdrátové síti '%s'..." -#: ../src/applet-device-wifi.c:1230 +#: ../src/applet-device-wifi.c:1235 #, c-format msgid "Waiting for Network Key for the wireless network '%s'..." msgstr "Čeká se na síťový klíč k bezdrátové síti '%s'..." -#: ../src/applet-device-wifi.c:1250 +#: ../src/applet-device-wifi.c:1255 #, c-format msgid "Wireless network connection to '%s' (%d%%)" msgstr "Bezdrátové připojení k '%s' (%d%%)" -#: ../src/applet-device-wifi.c:1254 +#: ../src/applet-device-wifi.c:1259 #, c-format msgid "Wireless network connection to '%s'" msgstr "Bezdrátové připojení k '%s'" #: ../src/applet-dialogs.c:54 msgid "Error displaying connection information:" -msgstr "Chyba při zobrazování informací o připojení:" +msgstr "Chyba při zobrazování informací o spojení:" #: ../src/applet-dialogs.c:81 #: ../src/connection-editor/page-wireless-security.c:277 #: ../src/wireless-dialog.c:775 #: ../src/wireless-security/wireless-security.c:334 msgid "LEAP" msgstr "LEAP" @@ -382,17 +355,17 @@ msgid "Primary DNS:" msgstr "Primární DNS:" #: ../src/applet-dialogs.c:398 msgid "Secondary DNS:" msgstr "Sekundární DNS:" #. Shouldn't really happen but ... #: ../src/applet-dialogs.c:459 -msgid "No valid active connecitons found!" +msgid "No valid active connections found!" msgstr "Nenalezena žádná platná aktivní připojení!" #: ../src/applet-dialogs.c:585 msgid "" "Copyright © 2004-2008 Red Hat, Inc.\n" "Copyright © 2005-2008 Novell, Inc." msgstr "" "Copyright © 2004-2008 Red Hat, Inc.\n" @@ -475,172 +448,181 @@ msgstr "" #, c-format msgid "" "\n" "The VPN connection '%s' failed because there were no valid VPN secrets." msgstr "" "\n" "Připojení k VPN '%s' selhalo, protože nebyly zadány platné tajné klíče k VPN." -#: ../src/applet.c:490 +#: ../src/applet.c:487 +#, c-format +msgid "" +"\n" +"The VPN connection '%s' failed because of invalid VPN secrets." +msgstr "" +"\n" +"Připojení k VPN '%s' selhalo kvůli neplatným tajným klíčům k VPN." + +#: ../src/applet.c:493 #, c-format msgid "" "\n" "The VPN connection '%s' failed." msgstr "" "\n" "Připojení k VPN '%s' selhalo." -#: ../src/applet.c:508 +#: ../src/applet.c:511 #, c-format msgid "" "\n" "The VPN connection '%s' disconnected because the network connection was " "interrupted." msgstr "" "\n" "Připojení k VPN '%s' bylo odpojeno, protože bylo přerušeno připojení k síti." -#: ../src/applet.c:510 +#: ../src/applet.c:513 #, c-format msgid "" "\n" "The VPN connection '%s' disconnected because the VPN service stopped." msgstr "" "\n" "Připojení k VPN '%s' bylo odpojeno, protože se zastavila služba VPN." -#: ../src/applet.c:515 +#: ../src/applet.c:518 #, c-format msgid "" "\n" "The VPN connection '%s' disconnected." msgstr "" "\n" "Připojení k VPN '%s' bylo odpojeno." -#: ../src/applet.c:541 +#: ../src/applet.c:544 msgid "VPN Login Message" msgstr "Zpráva po přihlášení VPN" -#: ../src/applet.c:553 ../src/applet.c:561 ../src/applet.c:605 +#: ../src/applet.c:556 ../src/applet.c:564 ../src/applet.c:608 msgid "VPN Connection Failed" msgstr "Připojení k VPN selhalo" -#: ../src/applet.c:612 +#: ../src/applet.c:615 #, c-format msgid "" "\n" "The VPN connection '%s' failed because the VPN service failed to start.\n" "\n" "%s" msgstr "" "\n" "Připojení k VPN '%s' selhalo, protože se nezdařilo spuštění služby VPN.\n" "\n" "%s" -#: ../src/applet.c:615 +#: ../src/applet.c:618 #, c-format msgid "" "\n" "The VPN connection '%s' failed to start.\n" "\n" "%s" msgstr "" "\n" "Připojení k VPN '%s' se nepodařilo spustit.\n" "\n" "%s" #: ../src/applet.c:937 msgid "No network devices available" msgstr "Nejsou dostupná žádná síťová zařízení" -#: ../src/applet.c:1027 +#: ../src/applet.c:1025 msgid "_VPN Connections" msgstr "Připojení k _VPN" -#: ../src/applet.c:1077 +#: ../src/applet.c:1075 msgid "_Configure VPN..." msgstr "_Nastavit VPN..." -#: ../src/applet.c:1081 +#: ../src/applet.c:1079 msgid "_Disconnect VPN..." msgstr "_Odpojit VPN..." -#: ../src/applet.c:1130 +#: ../src/applet.c:1128 msgid "NetworkManager is not running..." msgstr "NetworkManager neběží..." -#: ../src/applet.c:1135 ../src/applet.c:1718 +#: ../src/applet.c:1133 ../src/applet.c:1728 msgid "Networking disabled" msgstr "Síť zakázána" #. 'Enable Networking' item -#: ../src/applet.c:1312 +#: ../src/applet.c:1310 msgid "Enable _Networking" msgstr "Povolit _síť" #. 'Enable Wireless' item -#: ../src/applet.c:1321 +#: ../src/applet.c:1319 msgid "Enable _Wireless" msgstr "Povolit _bezdrátové" #. 'Connection Information' item -#: ../src/applet.c:1332 +#: ../src/applet.c:1330 msgid "Connection _Information" msgstr "_Informace o spojení" #. 'Edit Connections...' item -#: ../src/applet.c:1342 +#: ../src/applet.c:1340 msgid "Edit Connections..." msgstr "Upravit připojení..." #. Help item -#: ../src/applet.c:1356 +#: ../src/applet.c:1354 msgid "_Help" msgstr "_Nápověda" #. About item -#: ../src/applet.c:1365 +#: ../src/applet.c:1363 msgid "_About" msgstr "O _aplikaci" -#: ../src/applet.c:1530 +#: ../src/applet.c:1536 msgid "Disconnected" msgstr "Odpojen" -#: ../src/applet.c:1531 +#: ../src/applet.c:1537 msgid "The network connection has been disconnected." msgstr "Připojení k síti bylo odpojeno." -#: ../src/applet.c:1722 +#: ../src/applet.c:1732 msgid "No network connection" msgstr "Žádné připojení k síti" -#: ../src/applet.c:2028 +#: ../src/applet.c:2038 msgid "" "The NetworkManager applet could not find some required resources. It cannot " "continue.\n" msgstr "" -"Applet NetworkManager nemohl najít některé vyžadované zdroje. Nemůže " +"Applet NetworkManager nenalezl některé vyžadované zdroje. Nelze " "pokračovat.\n" -#: ../src/applet.c:2171 +#: ../src/applet.c:2181 msgid "NetworkManager Applet" msgstr "Applet NetworkManager" -#: ../src/applet.c:2176 ../src/wired-dialog.c:103 +#: ../src/applet.c:2186 ../src/wired-dialog.c:103 msgid "" "The NetworkManager Applet could not find some required resources (the glade " "file was not found)." msgstr "" -"Applet NetworkManager nemohl najít některé vyžadované zdroje (soubor glade " -"nebyl nalezen)." +"Applet NetworkManager nenalezl některé vyžadované zdroje (soubor glade nebyl " +"nalezen)." #: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1 #: ../src/connection-editor/ce-vpn-wizard.glade.h:1 msgid " " msgstr " " #: ../src/applet.glade.h:2 msgid "" @@ -871,26 +853,26 @@ msgstr "Základní" #: ../src/connection-editor/ce-page-mobile.glade.h:3 msgid "APN:" msgstr "APN:" #: ../src/connection-editor/ce-page-mobile.glade.h:4 msgid "" "Any\n" -"GPRS\n" -"GSM\n" -"Prefer GPRS\n" -"Prefer GSM" +"3G (UMTS/HSPA)\n" +"2G (GPRS/EDGE)\n" +"Prefer 3G (UMTS/HSPA)\n" +"Prefer 2G (GPRS/EDGE)" msgstr "" "Žádný\n" -"GPRS\n" -"GSM\n" -"Dát přednost GPRS\n" -"Dát přednost GSM" +"3G (UMTS/HSPA)\n" +"2G (GPRS/EDGE)\n" +"Dát přednost 3G (UMTS/HSPA)\n" +"Dát přednost 2G (GPRS/EDGE)" #: ../src/connection-editor/ce-page-mobile.glade.h:9 msgid "Band:" msgstr "Pásmo:" #: ../src/connection-editor/ce-page-mobile.glade.h:10 msgid "Network:" msgstr "Síť:" @@ -1031,20 +1013,20 @@ msgstr "_Pásmo:" #: ../src/connection-editor/ce-page-wireless.glade.h:5 msgid "C_hannel:" msgstr "_Kanál:" #: ../src/connection-editor/ce-page-wireless.glade.h:6 msgid "" "Infrastructure\n" -"Adhoc" +"Ad-hoc" msgstr "" "Infrastruktura\n" -"Adhoc" +"Ad-hoc" #: ../src/connection-editor/ce-page-wireless.glade.h:9 msgid "M_ode:" msgstr "_Režim:" #: ../src/connection-editor/ce-page-wireless.glade.h:10 msgid "Mb/s" msgstr "Mb/s" @@ -1177,22 +1159,16 @@ msgstr "Úprava tras IPv4 pro %s" #: ../src/connection-editor/page-ip4.c:588 msgid "IPv4 Settings" msgstr "Nastavení IPv4" #: ../src/connection-editor/page-ip4.c:633 msgid "Netmask" msgstr "Síťová maska" -#: ../src/connection-editor/page-mobile.c:264 -#: ../src/connection-editor/nm-connection-editor.glade.h:6 -#: ../src/connection-editor/nm-connection-list.c:1481 -msgid "Mobile Broadband" -msgstr "Mobilní širokopásmová" - #: ../src/connection-editor/page-ppp.c:128 #: ../src/wireless-security/eap-method-ttls.c:308 msgid "PAP" msgstr "PAP" #: ../src/connection-editor/page-ppp.c:129 #: ../src/wireless-security/eap-method-ttls.c:353 msgid "CHAP" @@ -1283,33 +1259,33 @@ msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" #: ../src/connection-editor/nm-connection-editor.c:93 #, c-format msgid "Editing %s" msgstr "Úprava %s" #: ../src/connection-editor/nm-connection-editor.c:97 -msgid "Editing unamed connection" +msgid "Editing un-named connection" msgstr "Úprava nepojmenovaného připojení" #: ../src/connection-editor/nm-connection-editor.c:174 msgid "" "The connection editor could not find some required resources (the " "NetworkManager applet glade file was not found)." msgstr "" -"Editor připojení nemohl najít některé vyžadované zdroje (soubor glade " -"appletu NetworkManager nebyl nalezen)." +"Editor připojení nenalezl některé vyžadované zdroje (soubor glade appletu " +"NetworkManager nebyl nalezen)." #: ../src/connection-editor/nm-connection-editor.c:187 msgid "" "The connection editor could not find some required resources (the glade file " "was not found)." msgstr "" -"Editor připojení nemohl najít některé vyžadované zdroje (soubor glade nebyl " +"Editor připojení nenalezl některé vyžadované zdroje (soubor glade nebyl " "nalezen)." #: ../src/connection-editor/nm-connection-editor.glade.h:1 msgid "Connect _automatically" msgstr "Připojit _automaticky" #: ../src/connection-editor/nm-connection-editor.glade.h:2 msgid "Connection Editor" @@ -1451,152 +1427,159 @@ msgid "DSL connection %d" msgstr "Připojení pomocí DSL %d" #: ../src/connection-editor/nm-connection-list.c:1060 #, c-format msgid "Are you sure you wish to delete the connection %s?" msgstr "Jste si jisti, že chcete smazat připojení %s?" #: ../src/connection-editor/nm-connection-list.c:1156 -#: ../src/connection-editor/vpn-helpers.c:226 +#: ../src/connection-editor/vpn-helpers.c:228 msgid "Cannot import VPN connection" msgstr "Nelze importovat připojení k VPN" #: ../src/connection-editor/nm-connection-list.c:1158 msgid "" "The VPN plugin failed to import the VPN connection correctly\n" "\n" "Error: no VPN service type." msgstr "" "Zásuvnému modulu VPN se nepodařilo správně importovat připojení k VPN\n" "\n" "Chyba: žádný typ služby VPN." -#: ../src/connection-editor/vpn-helpers.c:228 +#: ../src/connection-editor/vpn-helpers.c:230 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " "connection information\n" "\n" "Error: %s." msgstr "" -"Soubor '%s' nelze číst nebo neobsahuje rozpoznatelné informace o připojení k " -"VPN\n" +"Soubor '%s' nelze přečíst nebo neobsahuje rozpoznatelné informace o " +"připojení k VPN\n" "\n" "Chyba: %s." -#: ../src/connection-editor/vpn-helpers.c:259 +#: ../src/connection-editor/vpn-helpers.c:261 msgid "Select file to import" msgstr "Vyberte soubor k importu" -#: ../src/connection-editor/vpn-helpers.c:305 +#: ../src/connection-editor/vpn-helpers.c:307 #, c-format msgid "A file named \"%s\" already exists." msgstr "Soubor s názvem \"%s\" už existuje." -#: ../src/connection-editor/vpn-helpers.c:307 +#: ../src/connection-editor/vpn-helpers.c:309 msgid "_Replace" msgstr "_Nahradit" -#: ../src/connection-editor/vpn-helpers.c:309 +#: ../src/connection-editor/vpn-helpers.c:311 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" -msgstr "Chcete nahradit %s připojením k VPN, které jste uložili?" +msgstr "Chcete nahradit %s připojením k VPN, které jste právě uložili?" -#: ../src/connection-editor/vpn-helpers.c:343 +#: ../src/connection-editor/vpn-helpers.c:345 msgid "Cannot export VPN connection" msgstr "Nelze exportovat připojení k VPN" -#: ../src/connection-editor/vpn-helpers.c:345 +#: ../src/connection-editor/vpn-helpers.c:347 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" "\n" "Error: %s." msgstr "" "Připojení k VPN '%s' nemohlo být exportováno do %s.\n" "\n" "Chyba: %s." -#: ../src/connection-editor/vpn-helpers.c:376 +#: ../src/connection-editor/vpn-helpers.c:378 msgid "Export VPN connection..." msgstr "Exportovat připojení k VPN..." #: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:244 #, c-format msgid "Cannot start VPN connection '%s'" msgstr "Nelze spustit připojení k VPN '%s'" #: ../src/vpn-password-dialog.c:140 #, c-format msgid "" "Could not find the authentication dialog for VPN connection type '%s'. " "Contact your system administrator." msgstr "" -"Nelze najít ověřovací dialog pro typ připojení k VPN '%s'. Kontaktujte " -"vašeho správce systému." +"Nelze najít ověřovací dialog pro typ připojení k VPN '%s'. Kontaktujte svého " +"správce systému." #: ../src/vpn-password-dialog.c:247 #, c-format msgid "" "There was a problem launching the authentication dialog for VPN connection " "type '%s'. Contact your system administrator." msgstr "" "Při spouštění ověřovacího dialogu pro typ připojení k VPN '%s' se vyskytl " -"problém. Kontaktujte vašeho správce systému." +"problém. Kontaktujte svého správce systému." -# Nevím, ale drátové připojení 802.1x neznám. Asi by zde mělo být "bezdrátové" #: ../src/wired-dialog.c:74 msgid "Wired 802.1X authentication" msgstr "Ověření drátového připojení 802.1X" #: ../src/wireless-dialog.c:408 msgid "New..." msgstr "Nový..." -#: ../src/wireless-dialog.c:920 +#: ../src/wireless-dialog.c:866 +msgid "C_reate" +msgstr "_Vytvořit" + +#: ../src/wireless-dialog.c:935 #, c-format msgid "" "Passwords or encryption keys are required to access the wireless network '%" "s'." msgstr "" "Pro přístup k bezdrátové síti '%s' jsou vyžadována hesla nebo šifrovací " "klíče." -#: ../src/wireless-dialog.c:922 -msgid "Wireless Network Secrets Required" -msgstr "K bezdrátové síti jsou vyžadovány tajné klíče" - -#: ../src/wireless-dialog.c:924 -msgid "Secrets required by wireless network" -msgstr "K bezdrátové síti jsou vyžadovány tajné klíče" +#: ../src/wireless-dialog.c:937 +msgid "Wireless Network Authentication Required" +msgstr "K bezdrátové síti je vyžadováno ověření" + +#: ../src/wireless-dialog.c:939 +msgid "Authentication required by wireless network" +msgstr "K bezdrátové síti je vyžadováno ověření" -#: ../src/wireless-dialog.c:929 +#: ../src/wireless-dialog.c:944 msgid "Create New Wireless Network" msgstr "Vytvořit novou bezdrátovou síť" -#: ../src/wireless-dialog.c:931 +#: ../src/wireless-dialog.c:946 msgid "New wireless network" msgstr "Nová bezdrátová síť" -#: ../src/wireless-dialog.c:932 +#: ../src/wireless-dialog.c:947 msgid "Enter a name for the wireless network you wish to create." msgstr "Zadejte název bezdrátové sítě, kterou chcete vytvořit." -#: ../src/wireless-dialog.c:934 -msgid "Connect to Other Wireless Network" -msgstr "Připojit se k jiné bezdrátové síti" - -#: ../src/wireless-dialog.c:936 -msgid "Existing wireless network" -msgstr "Existující bezdrátová síť" +#: ../src/wireless-dialog.c:949 +msgid "Connect to Hidden Wireless Network" +msgstr "Připojit se ke skryté bezdrátové síti" -#: ../src/wireless-dialog.c:937 -msgid "Enter the name of the wireless network to which you wish to connect." -msgstr "Zadejte název bezdrátové sítě, ke které se chcete připojit." +#: ../src/wireless-dialog.c:951 +msgid "Hidden wireless network" +msgstr "Skrytá bezdrátová síť" + +#: ../src/wireless-dialog.c:952 +msgid "" +"Enter the name and security details of the hidden wireless network you wish " +"to connect to." +msgstr "" +"Zadejte název a podrobnosti o zabezpečení skryté bezdrátové sítě, ke které " +"se chcete připojit." #: ../src/wireless-security/eap-method.c:293 msgid "DER or PEM certificates (*.der, *.pem)" msgstr "Certifikáty DER nebo PEM (*.der, *.pem)" #: ../src/wireless-security/eap-method-peap.c:234 #: ../src/wireless-security/eap-method-tls.c:290 #: ../src/wireless-security/eap-method-ttls.c:221 diff -rU8 -p applet.svn/po/es.po NetworkManagerApplet_MBM/po/es.po --- applet.svn/po/es.po 2008-11-24 21:36:08.000000000 +0100 +++ NetworkManagerApplet_MBM/po/es.po 2008-11-24 21:39:32.000000000 +0100 @@ -7,157 +7,128 @@ # Antonio Ognio , 2004. # Francisco Javier F. Serrador , 2004, 2005, 2006. # Lucas Vieites Fariña , 2005, 2006. # Jorge González , 2007, 2008. msgid "" msgstr "" "Project-Id-Version: network-manager-applet.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 16:18+0000\n" -"PO-Revision-Date: 2008-09-27 12:10+0200\n" +"POT-Creation-Date: 2008-10-07 00:06+0000\n" +"PO-Revision-Date: 2008-10-12 13:41+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/applet-device-cdma.c:55 -msgid "Auto CDMA network connection" -msgstr "Conexión de red CDMA automática" +msgid "Auto Mobile Broadband (CDMA) connection" +msgstr "Conexión de banda ancha móvil (CDMA)" #: ../src/applet-device-cdma.c:196 ../src/applet-device-gsm.c:197 msgid "Disconnect" msgstr "Desconectar" -#: ../src/applet-device-cdma.c:236 +#: ../src/applet-device-cdma.c:235 ../src/applet-device-gsm.c:236 #, c-format -msgid "CDMA Connections (%s)" -msgstr "Conexiones CDMA (%s)" +msgid "Mobile Broadband (%s)" +msgstr "Banda ancha móvil (%s)" -#: ../src/applet-device-cdma.c:238 -#, c-format -msgid "CDMA Network (%s)" -msgstr "Red CDMA (%s)" - -#: ../src/applet-device-cdma.c:241 -msgid "CDMA Connections" -msgstr "Conexiones CDMA" - -#: ../src/applet-device-cdma.c:243 -msgid "CDMA Network" -msgstr "Redes CDMA" +#: ../src/applet-device-cdma.c:237 ../src/applet-device-gsm.c:238 +#: ../src/connection-editor/page-mobile.c:274 +#: ../src/connection-editor/nm-connection-editor.glade.h:6 +#: ../src/connection-editor/nm-connection-list.c:1481 +msgid "Mobile Broadband" +msgstr "Banda ancha móvil" -#: ../src/applet-device-cdma.c:261 ../src/applet-device-gsm.c:262 +#: ../src/applet-device-cdma.c:255 ../src/applet-device-gsm.c:256 #: ../src/applet-device-wired.c:224 ../src/applet-device-wifi.c:699 msgid "device is unmanaged" msgstr "el dispositivo no está gestionado" -#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:286 -#: ../src/applet-device-wired.c:247 ../src/applet-device-wifi.c:1188 +#: ../src/applet-device-cdma.c:288 ../src/applet-device-gsm.c:289 +#: ../src/applet-device-wired.c:256 +#, c-format +msgid "You are now connected to '%s'." +msgstr "Ahora está conectado a «%s»." + +#: ../src/applet-device-cdma.c:292 ../src/applet-device-gsm.c:293 +#: ../src/applet-device-wired.c:260 ../src/applet-device-wifi.c:1192 msgid "Connection Established" msgstr "Se ha establecido la conexión" -#: ../src/applet-device-cdma.c:286 +#: ../src/applet-device-cdma.c:293 msgid "You are now connected to the CDMA network." msgstr "Ahora está conectado a la red CDMA." -#: ../src/applet-device-cdma.c:304 +#: ../src/applet-device-cdma.c:316 ../src/applet-device-gsm.c:317 #, c-format -msgid "Dialing CDMA device %s..." -msgstr "Llamando al servicio CDMA %s…" +msgid "Dialing mobile broadband device %s..." +msgstr "Llamando al dispositivo de banda ancha móvil %s…" -#: ../src/applet-device-cdma.c:307 ../src/applet-device-gsm.c:308 +#: ../src/applet-device-cdma.c:319 ../src/applet-device-gsm.c:320 #, c-format msgid "Starting PPP on device %s..." msgstr "Iniciando PPP sobre el dispositivo %s…" -#: ../src/applet-device-cdma.c:310 ../src/applet-device-gsm.c:311 +#: ../src/applet-device-cdma.c:322 ../src/applet-device-gsm.c:323 #, c-format msgid "Waiting for user authentication on device '%s'..." -msgstr "Esperando la autenticación del usuario en el dispositivo «%s»..." +msgstr "Esperando la autenticación del usuario en el dispositivo «%s»…" + +#: ../src/applet-device-cdma.c:326 ../src/applet-device-gsm.c:327 +#, c-format +msgid "Mobile broadband connection '%s'" +msgstr "Conexión móvil de banda ancha «%s»" -#: ../src/applet-device-cdma.c:313 -msgid "CDMA connection" -msgstr "Conexión CDMA" +#: ../src/applet-device-cdma.c:328 ../src/applet-device-gsm.c:329 +msgid "Mobile broadband connection" +msgstr "Conexión móvil de banda ancha" -#: ../src/applet-device-cdma.c:421 -msgid "CDMA Network Password" -msgstr "Contraseña de la red CDMA" +#: ../src/applet-device-cdma.c:438 ../src/applet-device-gsm.c:541 +msgid "Mobile broadband network password" +msgstr "Contraseña de la red móvil de banda ancha" -#: ../src/applet-device-cdma.c:428 -msgid "A password is required to connect to the CDMA network." -msgstr "Se necesita una contraseña para conectar con la red CDMA." +#: ../src/applet-device-cdma.c:447 ../src/applet-device-gsm.c:550 +#, c-format +msgid "A password is required to connect to '%s'." +msgstr "Se necesita una contraseña para conectar con «%s»" -#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:547 +#: ../src/applet-device-cdma.c:465 ../src/applet-device-gsm.c:568 #: ../src/applet.glade.h:22 ../src/connection-editor/ce-page-dsl.glade.h:1 #: ../src/connection-editor/ce-page-mobile.glade.h:14 msgid "Password:" msgstr "Contraseña:" #: ../src/applet-device-gsm.c:56 -msgid "Auto GSM network connection" -msgstr "Conexión de red GSM automática" +msgid "Auto Mobile Broadband (GSM) connection" +msgstr "Conexión móvil de banda ancha (GSM) automática" -#: ../src/applet-device-gsm.c:237 -#, c-format -msgid "GSM Connections (%s)" -msgstr "Conexiones GSM (%s)" - -#: ../src/applet-device-gsm.c:239 -#, c-format -msgid "GSM Network (%s)" -msgstr "Red GSM (%s)" - -#: ../src/applet-device-gsm.c:242 -msgid "GSM Connections" -msgstr "Conexiones GSM" - -#: ../src/applet-device-gsm.c:244 -msgid "GSM Network" -msgstr "Rede GSM" - -#: ../src/applet-device-gsm.c:287 +#: ../src/applet-device-gsm.c:294 msgid "You are now connected to the GSM network." msgstr "Ahora está conectado a la red GSM." -#: ../src/applet-device-gsm.c:305 -#, c-format -msgid "Dialing GSM device %s..." -msgstr "Llamando al servicio GSM %s…" - -#: ../src/applet-device-gsm.c:314 -msgid "GSM connection" -msgstr "Conexiones GSM" - -#: ../src/applet-device-gsm.c:452 +#: ../src/applet-device-gsm.c:467 msgid "PIN code required" msgstr "Se necesita un código PIN" -#: ../src/applet-device-gsm.c:454 +#: ../src/applet-device-gsm.c:469 msgid "PUK code required" msgstr "Se necesita un código PUK" -#: ../src/applet-device-gsm.c:464 -msgid "PIN code is needed for the GSM device" -msgstr "Se necesita un código PIN para el dispositivo GSM" - -#: ../src/applet-device-gsm.c:466 -msgid "PUK code is needed for the GSM device" -msgstr "Se necesita un código PUK para el dispositivo GSM" - -#: ../src/applet-device-gsm.c:524 -msgid "GSM Network Password" -msgstr "Contraseña de la red GSM" - -#: ../src/applet-device-gsm.c:531 -msgid "A password is required to connect to the GSM network." -msgstr "Se necesita una contraseña para conectar con la red GSM." +#: ../src/applet-device-gsm.c:479 +msgid "PIN code is needed for the mobile broadband device" +msgstr "Se necesita un código PIN para el dispositivo móvil de banda ancha" + +#: ../src/applet-device-gsm.c:481 +msgid "PUK code is needed for the mobile broadband device" +msgstr "Se necesita un código PUK para el dispositivo móvil de banda ancha" #: ../src/applet-device-wired.c:65 msgid "Auto Ethernet" msgstr "Ethernet automática" #: ../src/applet-device-wired.c:193 #, c-format msgid "Wired Networks (%s)" @@ -171,46 +142,46 @@ msgstr "Red cableada (%s)" #: ../src/applet-device-wired.c:198 msgid "Wired Networks" msgstr "Redes cableadas" #: ../src/applet-device-wired.c:200 msgid "Wired Network" msgstr "Red cableada" -#: ../src/applet-device-wired.c:248 +#: ../src/applet-device-wired.c:261 msgid "You are now connected to the wired network." msgstr "Ahora está conectado a la red cableada." -#: ../src/applet-device-wired.c:266 +#: ../src/applet-device-wired.c:281 #, c-format msgid "Preparing device %s for the wired network..." msgstr "Preparando el dispositivo %s para la red cableada…" -#: ../src/applet-device-wired.c:269 +#: ../src/applet-device-wired.c:284 #, c-format msgid "Configuring device %s for the wired network..." msgstr "Configurando el dispositivo %s para la red cableada…" -#: ../src/applet-device-wired.c:272 +#: ../src/applet-device-wired.c:287 #, c-format msgid "Requesting a network address from the wired network..." msgstr "Solicitando una dirección de red a la red cableada…" -#: ../src/applet-device-wired.c:276 +#: ../src/applet-device-wired.c:291 msgid "Wired network connection" msgstr "Conexión de red cableada" -#: ../src/applet-device-wired.c:507 +#: ../src/applet-device-wired.c:522 msgid "DSL authentication" msgstr "Autenticación DSL" #: ../src/applet-device-wifi.c:87 -msgid "_Connect to Other Wireless Network..." -msgstr "_Conectar a otra red inalámbrica…" +msgid "_Connect to Hidden Wireless Network..." +msgstr "_Conectar a otra red inalámbrica oculta…" #: ../src/applet-device-wifi.c:119 msgid "Create _New Wireless Network..." msgstr "Crear una red inalámbrica _nueva…" #: ../src/applet-device-wifi.c:669 #, c-format msgid "Wireless Networks (%s)" @@ -238,51 +209,51 @@ msgstr "Redes inalámbricas disponibles" #: ../src/applet-device-wifi.c:989 msgid "Click on this icon to connect to a wireless network" msgstr "Pulse sobre este icono para conectarse a una red inalámbrica" #: ../src/applet-device-wifi.c:992 msgid "Don't show this message again" msgstr "No mostrar este mensaje de nuevo" -#: ../src/applet-device-wifi.c:1186 +#: ../src/applet-device-wifi.c:1190 #, c-format msgid "You are now connected to the wireless network '%s'." msgstr "Ahora está conectado a la red inalámbrica «%s»." -#: ../src/applet-device-wifi.c:1187 ../src/applet-device-wifi.c:1215 +#: ../src/applet-device-wifi.c:1191 ../src/applet-device-wifi.c:1220 msgid "(none)" msgstr "(ninguna)" -#: ../src/applet-device-wifi.c:1221 +#: ../src/applet-device-wifi.c:1226 #, c-format msgid "Preparing device %s for the wireless network '%s'..." msgstr "Preparando el dispositivo %s para la red inalámbrica «%s»…" -#: ../src/applet-device-wifi.c:1224 +#: ../src/applet-device-wifi.c:1229 #, c-format msgid "Attempting to join the wireless network '%s'..." msgstr "Intentando conectar con la red inalámbrica «%s»…" -#: ../src/applet-device-wifi.c:1227 +#: ../src/applet-device-wifi.c:1232 #, c-format msgid "Requesting a network address from the wireless network '%s'..." msgstr "Solicitando una dirección de red a la red inalámbrica «%s»…" -#: ../src/applet-device-wifi.c:1230 +#: ../src/applet-device-wifi.c:1235 #, c-format msgid "Waiting for Network Key for the wireless network '%s'..." msgstr "Esperando la contraseña de red para la red inalámbrica «%s»…" -#: ../src/applet-device-wifi.c:1250 +#: ../src/applet-device-wifi.c:1255 #, c-format msgid "Wireless network connection to '%s' (%d%%)" msgstr "Conexión de red inalámbrica a «%s» (%d%%)" -#: ../src/applet-device-wifi.c:1254 +#: ../src/applet-device-wifi.c:1259 #, c-format msgid "Wireless network connection to '%s'" msgstr "Conexión de red inalámbrica a «%s»" #: ../src/applet-dialogs.c:54 msgid "Error displaying connection information:" msgstr "Ha ocurrido un error al mostrar información de conexión:" @@ -383,17 +354,17 @@ msgid "Primary DNS:" msgstr "DNS primario:" #: ../src/applet-dialogs.c:398 msgid "Secondary DNS:" msgstr "DNS secundario:" #. Shouldn't really happen but ... #: ../src/applet-dialogs.c:459 -msgid "No valid active connecitons found!" +msgid "No valid active connections found!" msgstr "No se encontró ninguna conexión activa válida" #: ../src/applet-dialogs.c:585 msgid "" "Copyright © 2004-2008 Red Hat, Inc.\n" "Copyright © 2005-2008 Novell, Inc." msgstr "" "Copyright © 2004-2008 Red Hat, Inc.\n" @@ -558,95 +529,95 @@ msgid "" "\n" "%s" msgstr "" "\n" "La conexión VPN «%s» falló al iniciarse.\n" "\n" "%s" -#: ../src/applet.c:940 +#: ../src/applet.c:937 msgid "No network devices available" msgstr "No hay dispositivos de red disponibles" -#: ../src/applet.c:1030 +#: ../src/applet.c:1025 msgid "_VPN Connections" msgstr "Conexiones _VPN" -#: ../src/applet.c:1080 +#: ../src/applet.c:1075 msgid "_Configure VPN..." msgstr "_Configurar VPN…" -#: ../src/applet.c:1084 +#: ../src/applet.c:1079 msgid "_Disconnect VPN..." msgstr "_Desconectar VPN…" -#: ../src/applet.c:1133 +#: ../src/applet.c:1128 msgid "NetworkManager is not running..." msgstr "NetworkManager no se está ejecutando…" -#: ../src/applet.c:1138 ../src/applet.c:1721 +#: ../src/applet.c:1133 ../src/applet.c:1728 msgid "Networking disabled" msgstr "Red desactivada" #. 'Enable Networking' item -#: ../src/applet.c:1315 +#: ../src/applet.c:1310 msgid "Enable _Networking" msgstr "Activar _red" #. 'Enable Wireless' item -#: ../src/applet.c:1324 +#: ../src/applet.c:1319 msgid "Enable _Wireless" msgstr "Activar _inalámbrico" #. 'Connection Information' item -#: ../src/applet.c:1335 +#: ../src/applet.c:1330 msgid "Connection _Information" msgstr "_Información de la conexión" #. 'Edit Connections...' item -#: ../src/applet.c:1345 +#: ../src/applet.c:1340 msgid "Edit Connections..." msgstr "Editar las conexiones…" #. Help item -#: ../src/applet.c:1359 +#: ../src/applet.c:1354 msgid "_Help" msgstr "Ay_uda" #. About item -#: ../src/applet.c:1368 +#: ../src/applet.c:1363 msgid "_About" msgstr "A_cerca de" -#: ../src/applet.c:1533 +#: ../src/applet.c:1536 msgid "Disconnected" msgstr "Desconectado" -#: ../src/applet.c:1534 +#: ../src/applet.c:1537 msgid "The network connection has been disconnected." msgstr "La conexión de red ha sido desconectada." -#: ../src/applet.c:1725 +#: ../src/applet.c:1732 msgid "No network connection" msgstr "Sin conexión de red" -#: ../src/applet.c:2031 +#: ../src/applet.c:2038 msgid "" "The NetworkManager applet could not find some required resources. It cannot " "continue.\n" msgstr "" "La miniaplicación NetworkManager no pudo encontrar algunos recursos " "necesarios. No se puede continuar.\n" -#: ../src/applet.c:2174 +#: ../src/applet.c:2181 msgid "NetworkManager Applet" msgstr "Miniaplicación NetworkManager" -#: ../src/applet.c:2179 ../src/wired-dialog.c:103 +#: ../src/applet.c:2186 ../src/wired-dialog.c:103 msgid "" "The NetworkManager Applet could not find some required resources (the glade " "file was not found)." msgstr "" "La miniaplicación NetworkManager no pudo encontrar algunos archivos de " "recursos (No se encontró el archivo de glade)." #: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1 @@ -854,17 +825,17 @@ msgid "Ignore automatically obtained rou msgstr "Ignorar rutas obtenidas automáticamente" #: ../src/connection-editor/ce-page-ip4.glade.h:10 msgid "Method:" msgstr "Método:" #: ../src/connection-editor/ce-page-ip4.glade.h:11 msgid "Routes..." -msgstr "Rutas..." +msgstr "Rutas…" #: ../src/connection-editor/ce-page-ip4.glade.h:12 msgid "Search Domains:" msgstr "Dominios de búsqueda:" #: ../src/connection-editor/ce-page-ip4.glade.h:13 msgid "gtk-cancel" msgstr "gtk-cancel" @@ -1042,20 +1013,20 @@ msgstr "Ban_da:" #: ../src/connection-editor/ce-page-wireless.glade.h:5 msgid "C_hannel:" msgstr "_Canal:" #: ../src/connection-editor/ce-page-wireless.glade.h:6 msgid "" "Infrastructure\n" -"Adhoc" +"Ad-hoc" msgstr "" "Infraestructura\n" -"Adhoc" +"Ad-hoc" #: ../src/connection-editor/ce-page-wireless.glade.h:9 msgid "M_ode:" msgstr "M_odo:" #: ../src/connection-editor/ce-page-wireless.glade.h:10 msgid "Mb/s" msgstr "Mb/s" @@ -1186,22 +1157,16 @@ msgstr "Editando las rutas IPv4 para %s" #: ../src/connection-editor/page-ip4.c:588 msgid "IPv4 Settings" msgstr "Ajustes de IPv4" #: ../src/connection-editor/page-ip4.c:633 msgid "Netmask" msgstr "Máscara de red" -#: ../src/connection-editor/page-mobile.c:264 -#: ../src/connection-editor/nm-connection-editor.glade.h:6 -#: ../src/connection-editor/nm-connection-list.c:1481 -msgid "Mobile Broadband" -msgstr "Banda ancha móvil" - #: ../src/connection-editor/page-ppp.c:128 #: ../src/wireless-security/eap-method-ttls.c:308 msgid "PAP" msgstr "PAP" #: ../src/connection-editor/page-ppp.c:129 #: ../src/wireless-security/eap-method-ttls.c:353 msgid "CHAP" @@ -1292,17 +1257,17 @@ msgid "WPA & WPA2 Enterprise" msgstr "WPA y WPA2 Enterprise" #: ../src/connection-editor/nm-connection-editor.c:93 #, c-format msgid "Editing %s" msgstr "Editando %s" #: ../src/connection-editor/nm-connection-editor.c:97 -msgid "Editing unamed connection" +msgid "Editing un-named connection" msgstr "Editando la conexión sin nombre" #: ../src/connection-editor/nm-connection-editor.c:174 msgid "" "The connection editor could not find some required resources (the " "NetworkManager applet glade file was not found)." msgstr "" "El editor de la conexión no pudo encontrar algunos archivos de recursos (no " @@ -1455,79 +1420,79 @@ msgid "DSL connection %d" msgstr "Conexión DSL %d" #: ../src/connection-editor/nm-connection-list.c:1060 #, c-format msgid "Are you sure you wish to delete the connection %s?" msgstr "¿Está seguro de que quiere borrar la conexión %s?" #: ../src/connection-editor/nm-connection-list.c:1156 -#: ../src/connection-editor/vpn-helpers.c:226 +#: ../src/connection-editor/vpn-helpers.c:228 msgid "Cannot import VPN connection" msgstr "No se puede importar la conexión VPN" #: ../src/connection-editor/nm-connection-list.c:1158 msgid "" "The VPN plugin failed to import the VPN connection correctly\n" "\n" "Error: no VPN service type." msgstr "" "El complemento de VPN falló al importar correctamente la conexión VPN\n" "\n" "Error: no existe el tipo de servicio VPN." -#: ../src/connection-editor/vpn-helpers.c:228 +#: ../src/connection-editor/vpn-helpers.c:230 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " "connection information\n" "\n" "Error: %s." msgstr "" "No se pudo leer el archivo «%s» o no contiene información de conexión VPN que " "se pueda reconocer\n" "\n" "Error: %s." -#: ../src/connection-editor/vpn-helpers.c:259 +#: ../src/connection-editor/vpn-helpers.c:261 msgid "Select file to import" msgstr "Seleccione el archivo que importar" -#: ../src/connection-editor/vpn-helpers.c:305 +#: ../src/connection-editor/vpn-helpers.c:307 #, c-format msgid "A file named \"%s\" already exists." msgstr "Ya existe un archivo llamado «%s»." -#: ../src/connection-editor/vpn-helpers.c:307 +#: ../src/connection-editor/vpn-helpers.c:309 msgid "_Replace" msgstr "_Reemplazar" -#: ../src/connection-editor/vpn-helpers.c:309 +#: ../src/connection-editor/vpn-helpers.c:311 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "¿Quiere reemplazar %s con la conexión VPN que está guardando?" -#: ../src/connection-editor/vpn-helpers.c:343 +#: ../src/connection-editor/vpn-helpers.c:345 msgid "Cannot export VPN connection" msgstr "No se puede exportar la conexión VPN" -#: ../src/connection-editor/vpn-helpers.c:345 +#: ../src/connection-editor/vpn-helpers.c:347 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" "\n" "Error: %s." msgstr "" "No se pudo exportar la conexión VPN «%s» a %s.\n" "\n" "Error: %s." -#: ../src/connection-editor/vpn-helpers.c:376 +#: ../src/connection-editor/vpn-helpers.c:378 msgid "Export VPN connection..." -msgstr "Exportar conexión VPN..." +msgstr "Exportar conexión VPN…" #: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:244 #, c-format msgid "Cannot start VPN connection '%s'" msgstr "No se puede iniciar la conexión VPN «%s»" #: ../src/vpn-password-dialog.c:140 #, c-format @@ -1550,56 +1515,64 @@ msgstr "" #: ../src/wired-dialog.c:74 msgid "Wired 802.1X authentication" msgstr "Autenticación cableada 802.1x" #: ../src/wireless-dialog.c:408 msgid "New..." msgstr "Nueva…" -#: ../src/wireless-dialog.c:920 +#: ../src/wireless-dialog.c:866 +msgid "C_reate" +msgstr "C_rear" + +#: ../src/wireless-dialog.c:935 #, c-format msgid "" "Passwords or encryption keys are required to access the wireless network '%" "s'." msgstr "" "Se requieren contraseñas o claves de cifrado para acceder a la red " "inalámbrica «%s»." -#: ../src/wireless-dialog.c:922 -msgid "Wireless Network Secrets Required" -msgstr "Clave requerida para la red inalámbrica" - -#: ../src/wireless-dialog.c:924 -msgid "Secrets required by wireless network" -msgstr "Se requiere contraseña para la red inalámbrica" +#: ../src/wireless-dialog.c:937 +msgid "Wireless Network Authentication Required" +msgstr "Autenticación requerida para la red inalámbrica" + +#: ../src/wireless-dialog.c:939 +msgid "Authentication required by wireless network" +msgstr "La red inalámbrica requiere autenticación" -#: ../src/wireless-dialog.c:929 +#: ../src/wireless-dialog.c:944 msgid "Create New Wireless Network" msgstr "Crear una red inalámbrica nueva" -#: ../src/wireless-dialog.c:931 +#: ../src/wireless-dialog.c:946 msgid "New wireless network" msgstr "Red inalámbrica nueva" -#: ../src/wireless-dialog.c:932 +#: ../src/wireless-dialog.c:947 msgid "Enter a name for the wireless network you wish to create." msgstr "Introduzca un nombre para la red inalámbrica que desea crear." -#: ../src/wireless-dialog.c:934 -msgid "Connect to Other Wireless Network" -msgstr "Conectar a otra red inalámbrica" - -#: ../src/wireless-dialog.c:936 -msgid "Existing wireless network" -msgstr "Red inalámbrica existente" +#: ../src/wireless-dialog.c:949 +msgid "Connect to Hidden Wireless Network" +msgstr "Conectar con una red inalámbrica oculta" -#: ../src/wireless-dialog.c:937 -msgid "Enter the name of the wireless network to which you wish to connect." -msgstr "Introduzca el nombre de la red inalámbrica a la que desea conectarse." +#: ../src/wireless-dialog.c:951 +msgid "Hidden wireless network" +msgstr "Red inalámbrica oculta" + +#: ../src/wireless-dialog.c:952 +msgid "" +"Enter the name and security details of the hidden wireless network you wish " +"to connect to." +msgstr "" +"Introduzca el nombre y los detalles de seguridad de la red inalámbrica " +"oculta a la que quiere conectarse." #: ../src/wireless-security/eap-method.c:293 msgid "DER or PEM certificates (*.der, *.pem)" msgstr "Certificados DER o PEM (*.der, *.pem)" #: ../src/wireless-security/eap-method-peap.c:234 #: ../src/wireless-security/eap-method-tls.c:290 #: ../src/wireless-security/eap-method-ttls.c:221 @@ -1655,16 +1628,67 @@ msgstr "TLS" #: ../src/wireless-security/wireless-security.c:346 msgid "Tunneled TLS" msgstr "TLS a través de túnel" #: ../src/wireless-security/wireless-security.c:357 msgid "Protected EAP (PEAP)" msgstr "EAP protegido (PEAP)" +#~ msgid "Auto CDMA network connection" +#~ msgstr "Conexión de red CDMA automática" + +#~ msgid "CDMA Connections (%s)" +#~ msgstr "Conexiones CDMA (%s)" + +#~ msgid "CDMA Network (%s)" +#~ msgstr "Red CDMA (%s)" + +#~ msgid "CDMA Connections" +#~ msgstr "Conexiones CDMA" + +#~ msgid "CDMA Network" +#~ msgstr "Redes CDMA" + +#~ msgid "Dialing CDMA device %s..." +#~ msgstr "Llamando al servicio CDMA %s…" + +#~ msgid "CDMA connection" +#~ msgstr "Conexión CDMA" + +#~ msgid "CDMA Network Password" +#~ msgstr "Contraseña de la red CDMA" + +#~ msgid "A password is required to connect to the CDMA network." +#~ msgstr "Se necesita una contraseña para conectar con la red CDMA." + +#~ msgid "Auto GSM network connection" +#~ msgstr "Conexión de red GSM automática" + +#~ msgid "GSM Connections (%s)" +#~ msgstr "Conexiones GSM (%s)" + +#~ msgid "GSM Network (%s)" +#~ msgstr "Red GSM (%s)" + +#~ msgid "GSM Connections" +#~ msgstr "Conexiones GSM" + +#~ msgid "GSM Network" +#~ msgstr "Rede GSM" + +#~ msgid "GSM connection" +#~ msgstr "Conexiones GSM" + +#~ msgid "GSM Network Password" +#~ msgstr "Contraseña de la red GSM" + +#~ msgid "Existing wireless network" +#~ msgstr "Red inalámbrica existente" + #~ msgid "" #~ "Any\n" #~ "GPRS\n" #~ "GSM\n" #~ "Prefer GPRS\n" #~ "Prefer GSM" #~ msgstr "" #~ "Cualquiera\n" diff -rU8 -p applet.svn/po/fi.po NetworkManagerApplet_MBM/po/fi.po --- applet.svn/po/fi.po 2008-11-24 21:36:08.000000000 +0100 +++ NetworkManagerApplet_MBM/po/fi.po 2008-11-24 21:39:32.000000000 +0100 @@ -5,156 +5,127 @@ # # Ilkka Tuohela , 2005-2008. # Timo Jyrinki , 2008. # msgid "" msgstr "" "Project-Id-Version: network-manager-applet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-04 16:16+0300\n" -"PO-Revision-Date: 2008-10-04 16:15+0300\n" +"POT-Creation-Date: 2008-10-15 10:41+0300\n" +"PO-Revision-Date: 2008-10-15 10:41+0300\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/applet-device-cdma.c:55 -msgid "Auto CDMA network connection" -msgstr "Automaattinen CDMA-verkkoyhteys" +msgid "Auto Mobile Broadband (CDMA) connection" +msgstr "Automaattinen mobiililaajakaistayhteys (CDMA)" #: ../src/applet-device-cdma.c:196 ../src/applet-device-gsm.c:197 msgid "Disconnect" msgstr "Katkaise yhteys" -#: ../src/applet-device-cdma.c:236 +#: ../src/applet-device-cdma.c:235 ../src/applet-device-gsm.c:236 #, c-format -msgid "CDMA Connections (%s)" -msgstr "CDMA-yhteydet (%s)" +msgid "Mobile Broadband (%s)" +msgstr "Mobiililaajakaista (%s)" -#: ../src/applet-device-cdma.c:238 -#, c-format -msgid "CDMA Network (%s)" -msgstr "CDMA-verkko (%s)" - -#: ../src/applet-device-cdma.c:241 -msgid "CDMA Connections" -msgstr "CDMA-yhteydet" - -#: ../src/applet-device-cdma.c:243 -msgid "CDMA Network" -msgstr "CDMA-verkko" +#: ../src/applet-device-cdma.c:237 ../src/applet-device-gsm.c:238 +#: ../src/connection-editor/page-mobile.c:274 +#: ../src/connection-editor/nm-connection-editor.glade.h:6 +#: ../src/connection-editor/nm-connection-list.c:1481 +msgid "Mobile Broadband" +msgstr "Mobiililaajakaista" -#: ../src/applet-device-cdma.c:261 ../src/applet-device-gsm.c:262 +#: ../src/applet-device-cdma.c:255 ../src/applet-device-gsm.c:256 #: ../src/applet-device-wired.c:224 ../src/applet-device-wifi.c:699 msgid "device is unmanaged" msgstr "laiteta ei hallita" -#: ../src/applet-device-cdma.c:287 ../src/applet-device-gsm.c:288 -#: ../src/applet-device-wired.c:249 ../src/applet-device-wifi.c:1190 +#: ../src/applet-device-cdma.c:288 ../src/applet-device-gsm.c:289 +#: ../src/applet-device-wired.c:256 +#, c-format +msgid "You are now connected to '%s'." +msgstr "Yhteys verkkoon \"%s\" on nyt muodostettu." + +#: ../src/applet-device-cdma.c:292 ../src/applet-device-gsm.c:293 +#: ../src/applet-device-wired.c:260 ../src/applet-device-wifi.c:1192 msgid "Connection Established" msgstr "Yhteys muodostettu" -#: ../src/applet-device-cdma.c:288 +#: ../src/applet-device-cdma.c:293 msgid "You are now connected to the CDMA network." msgstr "Yhteys CDMA-verkkoon on nyt muodostettu." -#: ../src/applet-device-cdma.c:306 +#: ../src/applet-device-cdma.c:316 ../src/applet-device-gsm.c:317 #, c-format -msgid "Dialing CDMA device %s..." -msgstr "Soitetaan CDMA-laitteella %s..." +msgid "Dialing mobile broadband device %s..." +msgstr "Soitetaan mobiililaajakaistalaitteella %s..." -#: ../src/applet-device-cdma.c:309 ../src/applet-device-gsm.c:310 +#: ../src/applet-device-cdma.c:319 ../src/applet-device-gsm.c:320 #, c-format msgid "Starting PPP on device %s..." msgstr "Käynnistetään PPP laitteella %s..." -#: ../src/applet-device-cdma.c:312 ../src/applet-device-gsm.c:313 +#: ../src/applet-device-cdma.c:322 ../src/applet-device-gsm.c:323 #, c-format msgid "Waiting for user authentication on device '%s'..." msgstr "Odotetaan käyttäjän tunnistautumista laitteella \"%s\"..." -#: ../src/applet-device-cdma.c:315 -msgid "CDMA connection" -msgstr "CDMA-yhteys" - -#: ../src/applet-device-cdma.c:423 -msgid "CDMA Network Password" -msgstr "CDMA-verkon salasana" - -#: ../src/applet-device-cdma.c:430 -msgid "A password is required to connect to the CDMA network." -msgstr "Yhteys CDMA-verkkoon vaatii salasanan." +#: ../src/applet-device-cdma.c:326 ../src/applet-device-gsm.c:327 +#, c-format +msgid "Mobile broadband connection '%s'" +msgstr "Mobiililaajakaistayhteys \"%s\"" + +#: ../src/applet-device-cdma.c:328 ../src/applet-device-gsm.c:329 +msgid "Mobile broadband connection" +msgstr "Mobiililaajakaistayhteys" + +#: ../src/applet-device-cdma.c:438 ../src/applet-device-gsm.c:541 +msgid "Mobile broadband network password" +msgstr "Mobiililaajakaistaverkon salasana" + +#: ../src/applet-device-cdma.c:447 ../src/applet-device-gsm.c:550 +#, c-format +msgid "A password is required to connect to '%s'." +msgstr "Yhteys verkkoon \"%s\" vaatii salasanan." -#: ../src/applet-device-cdma.c:446 ../src/applet-device-gsm.c:549 +#: ../src/applet-device-cdma.c:465 ../src/applet-device-gsm.c:568 #: ../src/applet.glade.h:22 ../src/connection-editor/ce-page-dsl.glade.h:1 #: ../src/connection-editor/ce-page-mobile.glade.h:14 msgid "Password:" msgstr "Salasana:" #: ../src/applet-device-gsm.c:56 -msgid "Auto GSM network connection" -msgstr "Automaattinen GSM-verkkoyhteys" +msgid "Auto Mobile Broadband (GSM) connection" +msgstr "Automaattinen mobiililaajakaistayhteys (GSM)" -#: ../src/applet-device-gsm.c:237 -#, c-format -msgid "GSM Connections (%s)" -msgstr "GSM-yhteydet (%s)" - -#: ../src/applet-device-gsm.c:239 -#, c-format -msgid "GSM Network (%s)" -msgstr "GSM-verkko (%s)" - -#: ../src/applet-device-gsm.c:242 -msgid "GSM Connections" -msgstr "GSM-yhteydet" - -#: ../src/applet-device-gsm.c:244 -msgid "GSM Network" -msgstr "GSM-verkko" - -#: ../src/applet-device-gsm.c:289 +#: ../src/applet-device-gsm.c:294 msgid "You are now connected to the GSM network." msgstr "Yhteys GSM-verkkoon on nyt muodostettu." -#: ../src/applet-device-gsm.c:307 -#, c-format -msgid "Dialing GSM device %s..." -msgstr "Soitetaan GSM-laitteella %s..." - -#: ../src/applet-device-gsm.c:316 -msgid "GSM connection" -msgstr "GSM-yhteys" - -#: ../src/applet-device-gsm.c:454 +#: ../src/applet-device-gsm.c:467 msgid "PIN code required" msgstr "PIN-koodi vaaditaan" -#: ../src/applet-device-gsm.c:456 +#: ../src/applet-device-gsm.c:469 msgid "PUK code required" msgstr "PUK-koodi vaaditaan" -#: ../src/applet-device-gsm.c:466 -msgid "PIN code is needed for the GSM device" -msgstr "GSM-laite vaatii PIN-koodin" - -#: ../src/applet-device-gsm.c:468 -msgid "PUK code is needed for the GSM device" -msgstr "GSM-laite vaatii PUK-koodin" - -#: ../src/applet-device-gsm.c:526 -msgid "GSM Network Password" -msgstr "GSM-verkon salasana" - -#: ../src/applet-device-gsm.c:533 -msgid "A password is required to connect to the GSM network." -msgstr "Yhteys GSM-verkkoon vaatii salasanan." +#: ../src/applet-device-gsm.c:479 +msgid "PIN code is needed for the mobile broadband device" +msgstr "Mobiililaajakaistalaite vaatii PIN-koodin" + +#: ../src/applet-device-gsm.c:481 +msgid "PUK code is needed for the mobile broadband device" +msgstr "Mobiililaajakaistalaite vaatii PUK-koodin" #: ../src/applet-device-wired.c:65 msgid "Auto Ethernet" msgstr "Automaattinen Ethernet" #: ../src/applet-device-wired.c:193 #, c-format msgid "Wired Networks (%s)" @@ -168,46 +139,46 @@ msgstr "Kiinteä verkkoyhteys (%s)" #: ../src/applet-device-wired.c:198 msgid "Wired Networks" msgstr "Kiinteät verkkoyhteydet" #: ../src/applet-device-wired.c:200 msgid "Wired Network" msgstr "Kiinteä verkkoyhteys" -#: ../src/applet-device-wired.c:250 +#: ../src/applet-device-wired.c:261 msgid "You are now connected to the wired network." msgstr "Yhteys kiinteään verkkoon on nyt muodostettu." -#: ../src/applet-device-wired.c:268 +#: ../src/applet-device-wired.c:281 #, c-format msgid "Preparing device %s for the wired network..." msgstr "Valmistellaan laitetta %s kiinteälle verkkoyhteydelle..." -#: ../src/applet-device-wired.c:271 +#: ../src/applet-device-wired.c:284 #, c-format msgid "Configuring device %s for the wired network..." msgstr "Määritellään laitetta %s kiinteälle verkkoyhteydelle..." -#: ../src/applet-device-wired.c:274 +#: ../src/applet-device-wired.c:287 #, c-format msgid "Requesting a network address from the wired network..." msgstr "Pyydetään verkko-osoitetta kiinteästä verkosta..." -#: ../src/applet-device-wired.c:278 +#: ../src/applet-device-wired.c:291 msgid "Wired network connection" msgstr "Kiinteä verkkoyhteys" -#: ../src/applet-device-wired.c:509 +#: ../src/applet-device-wired.c:522 msgid "DSL authentication" msgstr "DSL-todentaminen" #: ../src/applet-device-wifi.c:87 -msgid "_Connect to Other Wireless Network..." -msgstr "_Yhdistä muihin langattomiin verkkoihin..." +msgid "_Connect to Hidden Wireless Network..." +msgstr "_Yhdistä piilotettuun langattomaan verkkoon..." #: ../src/applet-device-wifi.c:119 msgid "Create _New Wireless Network..." msgstr "Luo _uusi langaton verkko..." #: ../src/applet-device-wifi.c:669 #, c-format msgid "Wireless Networks (%s)" @@ -235,51 +206,51 @@ msgstr "Langattomia verkkoja saatavilla" #: ../src/applet-device-wifi.c:989 msgid "Click on this icon to connect to a wireless network" msgstr "Yhdistä langattomaan verkkoon napsauttamalla tästä" #: ../src/applet-device-wifi.c:992 msgid "Don't show this message again" msgstr "Älä näytä tätä uudestaan" -#: ../src/applet-device-wifi.c:1188 +#: ../src/applet-device-wifi.c:1190 #, c-format msgid "You are now connected to the wireless network '%s'." msgstr "Yhteys langattomaan verkkoon \"%s\" on nyt muodostettu." -#: ../src/applet-device-wifi.c:1189 ../src/applet-device-wifi.c:1217 +#: ../src/applet-device-wifi.c:1191 ../src/applet-device-wifi.c:1220 msgid "(none)" msgstr "(ei mitään)" -#: ../src/applet-device-wifi.c:1223 +#: ../src/applet-device-wifi.c:1226 #, c-format msgid "Preparing device %s for the wireless network '%s'..." msgstr "Valmistellaan laitetta %s langattomalle verkolle \"%s\"..." -#: ../src/applet-device-wifi.c:1226 +#: ../src/applet-device-wifi.c:1229 #, c-format msgid "Attempting to join the wireless network '%s'..." msgstr "Yritetään liittyä langattomaan verkkoon \"%s\"..." -#: ../src/applet-device-wifi.c:1229 +#: ../src/applet-device-wifi.c:1232 #, c-format msgid "Requesting a network address from the wireless network '%s'..." msgstr "Pyydetään verkko-osoitetta langattomasta verkosta \"%s\"..." -#: ../src/applet-device-wifi.c:1232 +#: ../src/applet-device-wifi.c:1235 #, c-format msgid "Waiting for Network Key for the wireless network '%s'..." msgstr "Odotetaan verkon avainta langattomalle verkolle \"%s\"" -#: ../src/applet-device-wifi.c:1252 +#: ../src/applet-device-wifi.c:1255 #, c-format msgid "Wireless network connection to '%s' (%d%%)" msgstr "Langaton verkkoyhteys \"%s\" (%d%%)" -#: ../src/applet-device-wifi.c:1256 +#: ../src/applet-device-wifi.c:1259 #, c-format msgid "Wireless network connection to '%s'" msgstr "Langaton verkkoyhteys \"%s\"" #: ../src/applet-dialogs.c:54 msgid "Error displaying connection information:" msgstr "Virhe näytettäessä yhteyden tietoja:" @@ -556,95 +527,95 @@ msgid "" "\n" "%s" msgstr "" "\n" "VPN-yhteyden \"%s\" käynnistys epäonnistui.\n" "\n" "%s" -#: ../src/applet.c:940 +#: ../src/applet.c:937 msgid "No network devices available" msgstr "Verkkolaitteita ei löytynyt" -#: ../src/applet.c:1030 +#: ../src/applet.c:1025 msgid "_VPN Connections" msgstr "_VPN-yhteydet" -#: ../src/applet.c:1080 +#: ../src/applet.c:1075 msgid "_Configure VPN..." msgstr "_Määrittele VPN-yhteys..." -#: ../src/applet.c:1084 +#: ../src/applet.c:1079 msgid "_Disconnect VPN..." msgstr "_Katkaise VPN-yhteys..." -#: ../src/applet.c:1133 +#: ../src/applet.c:1128 msgid "NetworkManager is not running..." msgstr "NetworkManager ei ole käytössä..." -#: ../src/applet.c:1138 ../src/applet.c:1729 +#: ../src/applet.c:1133 ../src/applet.c:1728 msgid "Networking disabled" msgstr "Verkko ei ole käytössä" #. 'Enable Networking' item -#: ../src/applet.c:1315 +#: ../src/applet.c:1310 msgid "Enable _Networking" msgstr "Ota _verkko käyttöön" #. 'Enable Wireless' item -#: ../src/applet.c:1324 +#: ../src/applet.c:1319 msgid "Enable _Wireless" msgstr "Ota _langaton käyttöön" #. 'Connection Information' item -#: ../src/applet.c:1335 +#: ../src/applet.c:1330 msgid "Connection _Information" msgstr "Tietoja _yhteydestä" #. 'Edit Connections...' item -#: ../src/applet.c:1345 +#: ../src/applet.c:1340 msgid "Edit Connections..." msgstr "Muokkaa yhteyksiä..." #. Help item -#: ../src/applet.c:1359 +#: ../src/applet.c:1354 msgid "_Help" msgstr "O_hje" #. About item -#: ../src/applet.c:1368 +#: ../src/applet.c:1363 msgid "_About" msgstr "_Tietoja" -#: ../src/applet.c:1541 +#: ../src/applet.c:1536 msgid "Disconnected" msgstr "Yhteys katkaistu" -#: ../src/applet.c:1542 +#: ../src/applet.c:1537 msgid "The network connection has been disconnected." msgstr "Yhteys verkkoon on katkaistu." -#: ../src/applet.c:1733 +#: ../src/applet.c:1732 msgid "No network connection" msgstr "Ei verkkoyhteyttä" -#: ../src/applet.c:2039 +#: ../src/applet.c:2038 msgid "" "The NetworkManager applet could not find some required resources. It cannot " "continue.\n" msgstr "" "NetworkManager-sovelma ei löytänyt joitain vaadituista resursseista eikä " "pysty jatkamaan.\n" -#: ../src/applet.c:2182 +#: ../src/applet.c:2181 msgid "NetworkManager Applet" msgstr "NetworkManager-sovelma" -#: ../src/applet.c:2187 ../src/wired-dialog.c:103 +#: ../src/applet.c:2186 ../src/wired-dialog.c:103 msgid "" "The NetworkManager Applet could not find some required resources (the glade " "file was not found)." msgstr "" "NetworkManager-sovelma ei voinut ladata jotain vaadituista resursseista " "(glade-tiedostoa ei löytynyt)." #: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1 @@ -793,24 +764,24 @@ msgid "alert text" msgstr "hälytysteksti" #: ../src/connection-editor/ce-mobile-wizard.glade.h:2 msgid "" "Choose a Mobile Broadband Connection\n" "\n" "Select or connect the mobile broadband device you wish to use for the new " -"connection. If the device is not availabe, you may select a generic " +"connection. If the device is not available, you may select a generic " "connection type." msgstr "" -"Valitse mobiililaajakaistan yhteysValitse mobiililaajakaistayhteys\n" "\n" "Valitse tai yhdistä mobiiliverkon laajakaistalaite, jota haluat käyttää " -"uudessa yhteydessä. Jos laite ei ole käytettävissä, voit valita yleisen " +"uudessa yhteydessä. Jos laite ei ole valittavissa, voit valita yleisen " "yhteystyypin." #: ../src/connection-editor/ce-page.c:52 msgid "automatic" msgstr "automaattinen" #: ../src/connection-editor/ce-page-dsl.glade.h:2 msgid "Service:" @@ -1184,22 +1155,16 @@ msgstr "Muokataan yhteyden %s IPv4-reitt #: ../src/connection-editor/page-ip4.c:588 msgid "IPv4 Settings" msgstr "IPv4-asetukset" #: ../src/connection-editor/page-ip4.c:633 msgid "Netmask" msgstr "Verkkopeite" -#: ../src/connection-editor/page-mobile.c:264 -#: ../src/connection-editor/nm-connection-editor.glade.h:6 -#: ../src/connection-editor/nm-connection-list.c:1481 -msgid "Mobile Broadband" -msgstr "Mobiililaajakaista" - #: ../src/connection-editor/page-ppp.c:128 #: ../src/wireless-security/eap-method-ttls.c:308 msgid "PAP" msgstr "PAP" #: ../src/connection-editor/page-ppp.c:129 #: ../src/wireless-security/eap-method-ttls.c:353 msgid "CHAP" @@ -1563,46 +1528,49 @@ msgstr "_Luo" msgid "" "Passwords or encryption keys are required to access the wireless network '%" "s'." msgstr "" "Salasanoja tai salausavaimia tarvitaan langattomaan verkkoon \"%s\" " "pääsemiseksi." #: ../src/wireless-dialog.c:937 -msgid "Wireless Network Secrets Required" +msgid "Wireless Network Authentication Required" msgstr "Langattoman verkon salaustiedot vaaditaan" #: ../src/wireless-dialog.c:939 -msgid "Secrets required by wireless network" +msgid "Authentication required by wireless network" msgstr "Langaton verkko vaatii salaustietoja" #: ../src/wireless-dialog.c:944 msgid "Create New Wireless Network" msgstr "Luo uusi langaton verkko" #: ../src/wireless-dialog.c:946 msgid "New wireless network" msgstr "Uusi langaton verkko" #: ../src/wireless-dialog.c:947 msgid "Enter a name for the wireless network you wish to create." msgstr "Syötä sen langattoman verkon nimi, jonka haluat luoda." #: ../src/wireless-dialog.c:949 -msgid "Connect to Other Wireless Network" -msgstr "Ota yhteyttä muuhun langattomaan verkkoon" +msgid "Connect to Hidden Wireless Network" +msgstr "Ota yhteys piilotettuun langattomaan verkkoon" #: ../src/wireless-dialog.c:951 -msgid "Existing wireless network" -msgstr "Olemassaoleva langaton verkko" +msgid "Hidden wireless network" +msgstr "Piilotettu langaton verkko" #: ../src/wireless-dialog.c:952 -msgid "Enter the name of the wireless network to which you wish to connect." -msgstr "Syötä sen langattoman verkon nimi, johon haluat ottaa yhteyttä." +msgid "" +"Enter the name and security details of the hidden wireless network you wish " +"to connect to." +msgstr "" +"Syötä yhdistettävän piilotetun langattoman verkon nimi ja salaustiedot." #: ../src/wireless-security/eap-method.c:293 msgid "DER or PEM certificates (*.der, *.pem)" msgstr "DER- tai PEM-varmeneet (*.der, *.pem)" #: ../src/wireless-security/eap-method-peap.c:234 #: ../src/wireless-security/eap-method-tls.c:290 #: ../src/wireless-security/eap-method-ttls.c:221 @@ -1658,16 +1626,70 @@ msgstr "TLS" #: ../src/wireless-security/wireless-security.c:346 msgid "Tunneled TLS" msgstr "Tunneloitu TLS" #: ../src/wireless-security/wireless-security.c:357 msgid "Protected EAP (PEAP)" msgstr "Suojattu EAP (PEAP)" +#~ msgid "Auto CDMA network connection" +#~ msgstr "Automaattinen CDMA-verkkoyhteys" + +#~ msgid "CDMA Connections (%s)" +#~ msgstr "CDMA-yhteydet (%s)" + +#~ msgid "CDMA Network (%s)" +#~ msgstr "CDMA-verkko (%s)" + +#~ msgid "CDMA Connections" +#~ msgstr "CDMA-yhteydet" + +#~ msgid "CDMA Network" +#~ msgstr "CDMA-verkko" + +#~ msgid "Dialing CDMA device %s..." +#~ msgstr "Soitetaan CDMA-laitteella %s..." + +#~ msgid "CDMA connection" +#~ msgstr "CDMA-yhteys" + +#~ msgid "CDMA Network Password" +#~ msgstr "CDMA-verkon salasana" + +#~ msgid "A password is required to connect to the CDMA network." +#~ msgstr "Yhteys CDMA-verkkoon vaatii salasanan." + +#~ msgid "Auto GSM network connection" +#~ msgstr "Automaattinen GSM-verkkoyhteys" + +#~ msgid "GSM Connections (%s)" +#~ msgstr "GSM-yhteydet (%s)" + +#~ msgid "GSM Network (%s)" +#~ msgstr "GSM-verkko (%s)" + +#~ msgid "GSM Connections" +#~ msgstr "GSM-yhteydet" + +#~ msgid "GSM Network" +#~ msgstr "GSM-verkko" + +#~ msgid "GSM connection" +#~ msgstr "GSM-yhteys" + +#~ msgid "GSM Network Password" +#~ msgstr "GSM-verkon salasana" + +#~ msgid "Existing wireless network" +#~ msgstr "Olemassaoleva langaton verkko" + +#~ msgid "Enter the name of the wireless network to which you wish to connect." +#~ msgstr "Syötä sen langattoman verkon nimi, johon haluat ottaa yhteyttä." + #~ msgid "" #~ "Any\n" #~ "GPRS\n" #~ "GSM\n" #~ "Prefer GPRS\n" #~ "Prefer GSM" #~ msgstr "" #~ "Mikä tahansa\n" @@ -2041,21 +2063,16 @@ msgstr "Suojattu EAP (PEAP)" #~ msgid "" #~ "By default, the wireless network's name is set to your computer's name, %" #~ "s, with no encryption enabled" #~ msgstr "" #~ "Oletuksena langattoman verkon nimi asetetaan samaksi kuin tietokoneesi " #~ "nimi \"%s\" ja salaus on poissa käytöstä" -#~ msgid "" -#~ "Enter the name and security settings of the wireless network you wish to " -#~ "create." -#~ msgstr "Syötä luotavan langattoman verkon nimi ja turva-asetukset." - #~ msgid "Error connecting to wireless network" #~ msgstr "Virhe yhdistettäessä langattomaan verkkoon" #~ msgid "" #~ "The requested wireless network requires security capabilities unsupported " #~ "by your hardware." #~ msgstr "" #~ "Pyydetty langaton verkko vaatii tietoturvakykyjä, joita laitteistosi ei " diff -rU8 -p applet.svn/po/fr.po NetworkManagerApplet_MBM/po/fr.po --- applet.svn/po/fr.po 2008-11-24 21:36:08.000000000 +0100 +++ NetworkManagerApplet_MBM/po/fr.po 2008-11-24 21:39:33.000000000 +0100 @@ -6,156 +6,127 @@ # Stéphane Raimbault , 2006-2008 # Claude Paroz , 2007-2008. # Robert-André Mauchin , 2007-2008. # msgid "" msgstr "" "Project-Id-Version: NetworkManager 0.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 22:43+0200\n" -"PO-Revision-Date: 2008-09-25 22:51+0200\n" +"POT-Creation-Date: 2008-10-10 22:38+0200\n" +"PO-Revision-Date: 2008-10-10 22:51+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" #: ../src/applet-device-cdma.c:55 -msgid "Auto CDMA network connection" -msgstr "Connexion automatique aux réseaux CDMA" +msgid "Auto Mobile Broadband (CDMA) connection" +msgstr "Créer une connexion CDMA (Auto Mobile Broadband)" #: ../src/applet-device-cdma.c:196 ../src/applet-device-gsm.c:197 msgid "Disconnect" msgstr "Se déconnecter" -#: ../src/applet-device-cdma.c:236 +#: ../src/applet-device-cdma.c:235 ../src/applet-device-gsm.c:236 #, c-format -msgid "CDMA Connections (%s)" -msgstr "Connexions CDMA (%s)" +msgid "Mobile Broadband (%s)" +msgstr "Téléphone mobile à large bande (%s)" -#: ../src/applet-device-cdma.c:238 -#, c-format -msgid "CDMA Network (%s)" -msgstr "Réseau CDMA (%s)" - -#: ../src/applet-device-cdma.c:241 -msgid "CDMA Connections" -msgstr "Connexions CDMA" - -#: ../src/applet-device-cdma.c:243 -msgid "CDMA Network" -msgstr "Réseau CDMA" +#: ../src/applet-device-cdma.c:237 ../src/applet-device-gsm.c:238 +#: ../src/connection-editor/page-mobile.c:274 +#: ../src/connection-editor/nm-connection-editor.glade.h:6 +#: ../src/connection-editor/nm-connection-list.c:1481 +msgid "Mobile Broadband" +msgstr "Téléphone mobile à large bande" -#: ../src/applet-device-cdma.c:261 ../src/applet-device-gsm.c:262 +#: ../src/applet-device-cdma.c:255 ../src/applet-device-gsm.c:256 #: ../src/applet-device-wired.c:224 ../src/applet-device-wifi.c:699 msgid "device is unmanaged" msgstr "le périphérique n'est pas géré" -#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:286 -#: ../src/applet-device-wired.c:247 ../src/applet-device-wifi.c:1188 +#: ../src/applet-device-cdma.c:288 ../src/applet-device-gsm.c:289 +#: ../src/applet-device-wired.c:256 +#, c-format +msgid "You are now connected to '%s'." +msgstr "Vous êtes maintenant connecté à « %s »." + +#: ../src/applet-device-cdma.c:292 ../src/applet-device-gsm.c:293 +#: ../src/applet-device-wired.c:260 ../src/applet-device-wifi.c:1192 msgid "Connection Established" msgstr "Connexion établie" -#: ../src/applet-device-cdma.c:286 +#: ../src/applet-device-cdma.c:293 msgid "You are now connected to the CDMA network." msgstr "Vous êtes maintenant connecté au réseau CDMA." -#: ../src/applet-device-cdma.c:304 +#: ../src/applet-device-cdma.c:316 ../src/applet-device-gsm.c:317 #, c-format -msgid "Dialing CDMA device %s..." -msgstr "Connexion au périphérique CDMA %s..." +msgid "Dialing mobile broadband device %s..." +msgstr "Connexion au périphérique téléphone mobile à large bande %s..." -#: ../src/applet-device-cdma.c:307 ../src/applet-device-gsm.c:308 +#: ../src/applet-device-cdma.c:319 ../src/applet-device-gsm.c:320 #, c-format msgid "Starting PPP on device %s..." msgstr "Lancement de PPP sur le périphérique %s..." -#: ../src/applet-device-cdma.c:310 ../src/applet-device-gsm.c:311 +#: ../src/applet-device-cdma.c:322 ../src/applet-device-gsm.c:323 #, c-format msgid "Waiting for user authentication on device '%s'..." msgstr "Attente d'authentification de l'utilisateur sur le périphérique %s..." -#: ../src/applet-device-cdma.c:313 -msgid "CDMA connection" -msgstr "Connexion CDMA" - -#: ../src/applet-device-cdma.c:421 -msgid "CDMA Network Password" -msgstr "Mot de passe du réseau CDMA" - -#: ../src/applet-device-cdma.c:428 -msgid "A password is required to connect to the CDMA network." -msgstr "Un mot de passe est requis pour vous connecter au réseau CDMA." +#: ../src/applet-device-cdma.c:326 ../src/applet-device-gsm.c:327 +#, c-format +msgid "Mobile broadband connection '%s'" +msgstr "Connexion téléphone mobile à large bande « %s »" + +#: ../src/applet-device-cdma.c:328 ../src/applet-device-gsm.c:329 +msgid "Mobile broadband connection" +msgstr "Connexion téléphone mobile à large bande" + +#: ../src/applet-device-cdma.c:438 ../src/applet-device-gsm.c:541 +msgid "Mobile broadband network password" +msgstr "Mot de passe du réseau téléphone mobile à large bande" -#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:547 +#: ../src/applet-device-cdma.c:447 ../src/applet-device-gsm.c:550 +#, c-format +msgid "A password is required to connect to '%s'." +msgstr "Un mot de passe est requis pour vous connecter à « %s »." + +#: ../src/applet-device-cdma.c:465 ../src/applet-device-gsm.c:568 #: ../src/applet.glade.h:22 ../src/connection-editor/ce-page-dsl.glade.h:1 #: ../src/connection-editor/ce-page-mobile.glade.h:14 msgid "Password:" msgstr "Mot de passe :" #: ../src/applet-device-gsm.c:56 -msgid "Auto GSM network connection" -msgstr "Connexion automatique aux réseaux GSM" - -#: ../src/applet-device-gsm.c:237 -#, c-format -msgid "GSM Connections (%s)" -msgstr "Connexions GSM (%s)" - -#: ../src/applet-device-gsm.c:239 -#, c-format -msgid "GSM Network (%s)" -msgstr "Réseau GSM (%s)" - -#: ../src/applet-device-gsm.c:242 -msgid "GSM Connections" -msgstr "Connexions GSM" +msgid "Auto Mobile Broadband (GSM) connection" +msgstr "Connexion GSM (Auto Mobile Broadband)" -#: ../src/applet-device-gsm.c:244 -msgid "GSM Network" -msgstr "Réseau GSM" - -#: ../src/applet-device-gsm.c:287 +#: ../src/applet-device-gsm.c:294 msgid "You are now connected to the GSM network." msgstr "Vous êtes maintenant connecté au réseau GSM." -#: ../src/applet-device-gsm.c:305 -#, c-format -msgid "Dialing GSM device %s..." -msgstr "Connexion au périphérique GSM %s..." - -#: ../src/applet-device-gsm.c:314 -msgid "GSM connection" -msgstr "Connexion GSM" - -#: ../src/applet-device-gsm.c:452 +#: ../src/applet-device-gsm.c:467 msgid "PIN code required" msgstr "Code PIN requis" -#: ../src/applet-device-gsm.c:454 +#: ../src/applet-device-gsm.c:469 msgid "PUK code required" msgstr "Code PUK requis" -#: ../src/applet-device-gsm.c:464 -msgid "PIN code is needed for the GSM device" -msgstr "Le code PIN est nécessaire pour le périphérique GSM" - -#: ../src/applet-device-gsm.c:466 -msgid "PUK code is needed for the GSM device" -msgstr "Le code PUK est nécessaire pour le périphérique GSM" - -#: ../src/applet-device-gsm.c:524 -msgid "GSM Network Password" -msgstr "Mot de passe du réseau GSM" - -#: ../src/applet-device-gsm.c:531 -msgid "A password is required to connect to the GSM network." -msgstr "Un mot de passe est requis pour vous connecter au réseau GSM." +#: ../src/applet-device-gsm.c:479 +msgid "PIN code is needed for the mobile broadband device" +msgstr "Le code PIN est nécessaire pour le téléphone mobile à large bande" + +#: ../src/applet-device-gsm.c:481 +msgid "PUK code is needed for the mobile broadband device" +msgstr "Le code PUK est nécessaire pour le téléphone mobile à large bande" #: ../src/applet-device-wired.c:65 msgid "Auto Ethernet" msgstr "Ethernet automatique" #: ../src/applet-device-wired.c:193 #, c-format msgid "Wired Networks (%s)" @@ -169,46 +140,46 @@ msgstr "Réseau filaire (%s)" #: ../src/applet-device-wired.c:198 msgid "Wired Networks" msgstr "Réseaux filaires" #: ../src/applet-device-wired.c:200 msgid "Wired Network" msgstr "Réseau filaire" -#: ../src/applet-device-wired.c:248 +#: ../src/applet-device-wired.c:261 msgid "You are now connected to the wired network." msgstr "Vous êtes maintenant connecté au réseau filaire." -#: ../src/applet-device-wired.c:266 +#: ../src/applet-device-wired.c:281 #, c-format msgid "Preparing device %s for the wired network..." msgstr "Préparation du périphérique %s pour la connexion filaire..." -#: ../src/applet-device-wired.c:269 +#: ../src/applet-device-wired.c:284 #, c-format msgid "Configuring device %s for the wired network..." msgstr "Configuration du périphérique %s pour la connexion filaire..." -#: ../src/applet-device-wired.c:272 +#: ../src/applet-device-wired.c:287 #, c-format msgid "Requesting a network address from the wired network..." msgstr "Obtention d'une adresse réseau depuis le réseau filaire..." -#: ../src/applet-device-wired.c:276 +#: ../src/applet-device-wired.c:291 msgid "Wired network connection" msgstr "Connexion à un réseau filaire" -#: ../src/applet-device-wired.c:507 +#: ../src/applet-device-wired.c:522 msgid "DSL authentication" msgstr "Authentification DSL" #: ../src/applet-device-wifi.c:87 -msgid "_Connect to Other Wireless Network..." -msgstr "_Se connecter à d'autres réseaux sans fil..." +msgid "_Connect to Hidden Wireless Network..." +msgstr "_Se connecter à un réseau sans fil invisible..." #: ../src/applet-device-wifi.c:119 msgid "Create _New Wireless Network..." msgstr "Créer un _nouveau réseau sans fil..." #: ../src/applet-device-wifi.c:669 #, c-format msgid "Wireless Networks (%s)" @@ -236,51 +207,51 @@ msgstr "Réseaux sans fil disponibles" #: ../src/applet-device-wifi.c:989 msgid "Click on this icon to connect to a wireless network" msgstr "Cliquez sur cette icône pour vous connecter à un réseau sans fil" #: ../src/applet-device-wifi.c:992 msgid "Don't show this message again" msgstr "Ne plus m'avertir" -#: ../src/applet-device-wifi.c:1186 +#: ../src/applet-device-wifi.c:1190 #, c-format msgid "You are now connected to the wireless network '%s'." msgstr "Vous êtes maintenant connecté au réseau sans fil « %s »." -#: ../src/applet-device-wifi.c:1187 ../src/applet-device-wifi.c:1215 +#: ../src/applet-device-wifi.c:1191 ../src/applet-device-wifi.c:1220 msgid "(none)" msgstr "(aucun)" -#: ../src/applet-device-wifi.c:1221 +#: ../src/applet-device-wifi.c:1226 #, c-format msgid "Preparing device %s for the wireless network '%s'..." msgstr "Préparation du périphérique %s pour le réseau sans fil « %s »..." -#: ../src/applet-device-wifi.c:1224 +#: ../src/applet-device-wifi.c:1229 #, c-format msgid "Attempting to join the wireless network '%s'..." msgstr "Tentative de rejoindre le réseau sans fil « %s »..." -#: ../src/applet-device-wifi.c:1227 +#: ../src/applet-device-wifi.c:1232 #, c-format msgid "Requesting a network address from the wireless network '%s'..." msgstr "Obtention d'une adresse réseau depuis le réseau sans fil « %s »..." -#: ../src/applet-device-wifi.c:1230 +#: ../src/applet-device-wifi.c:1235 #, c-format msgid "Waiting for Network Key for the wireless network '%s'..." msgstr "Attente de la clé réseau pour le réseau sans fil « %s »..." -#: ../src/applet-device-wifi.c:1250 +#: ../src/applet-device-wifi.c:1255 #, c-format msgid "Wireless network connection to '%s' (%d%%)" msgstr "Connexion par réseau sans fil à « %s » (%d%%)" -#: ../src/applet-device-wifi.c:1254 +#: ../src/applet-device-wifi.c:1259 #, c-format msgid "Wireless network connection to '%s'" msgstr "Connexion par réseau sans fil à « %s »" #: ../src/applet-dialogs.c:54 msgid "Error displaying connection information:" msgstr "Impossible d'afficher les informations de connexion :" @@ -381,17 +352,17 @@ msgid "Primary DNS:" msgstr "DNS primaire :" #: ../src/applet-dialogs.c:398 msgid "Secondary DNS:" msgstr "DNS secondaire :" #. Shouldn't really happen but ... #: ../src/applet-dialogs.c:459 -msgid "No valid active connecitons found!" +msgid "No valid active connections found!" msgstr "Aucune connexion valide active trouvée !" #: ../src/applet-dialogs.c:585 msgid "" "Copyright © 2004-2008 Red Hat, Inc.\n" "Copyright © 2005-2008 Novell, Inc." msgstr "" "Copyright © 2004-2008 Red Hat, Inc.\n" @@ -559,95 +530,95 @@ msgid "" "\n" "%s" msgstr "" "\n" "Le démarrage de la connexion VPN « %s » a échoué.\n" "\n" "%s" -#: ../src/applet.c:940 +#: ../src/applet.c:937 msgid "No network devices available" msgstr "Aucun périphérique réseau disponible" -#: ../src/applet.c:1030 +#: ../src/applet.c:1025 msgid "_VPN Connections" msgstr "_Connexions VPN" -#: ../src/applet.c:1080 +#: ../src/applet.c:1075 msgid "_Configure VPN..." msgstr "_Configurer le VPN..." -#: ../src/applet.c:1084 +#: ../src/applet.c:1079 msgid "_Disconnect VPN..." msgstr "_Déconnecter le VPN..." -#: ../src/applet.c:1133 +#: ../src/applet.c:1128 msgid "NetworkManager is not running..." msgstr "NetworkManager n'est pas lancé..." -#: ../src/applet.c:1138 ../src/applet.c:1721 +#: ../src/applet.c:1133 ../src/applet.c:1728 msgid "Networking disabled" msgstr "Réseau désactivé" #. 'Enable Networking' item -#: ../src/applet.c:1315 +#: ../src/applet.c:1310 msgid "Enable _Networking" msgstr "Activer le _réseau" #. 'Enable Wireless' item -#: ../src/applet.c:1324 +#: ../src/applet.c:1319 msgid "Enable _Wireless" msgstr "Activer le réseau _sans fil" #. 'Connection Information' item -#: ../src/applet.c:1335 +#: ../src/applet.c:1330 msgid "Connection _Information" msgstr "_Informations de connexion" #. 'Edit Connections...' item -#: ../src/applet.c:1345 +#: ../src/applet.c:1340 msgid "Edit Connections..." msgstr "Modification des connexions..." #. Help item -#: ../src/applet.c:1359 +#: ../src/applet.c:1354 msgid "_Help" msgstr "_Aide" #. About item -#: ../src/applet.c:1368 +#: ../src/applet.c:1363 msgid "_About" msgstr "À _propos" -#: ../src/applet.c:1533 +#: ../src/applet.c:1536 msgid "Disconnected" msgstr "Déconnecté" -#: ../src/applet.c:1534 +#: ../src/applet.c:1537 msgid "The network connection has been disconnected." msgstr "La connexion réseau a été déconnectée." -#: ../src/applet.c:1725 +#: ../src/applet.c:1732 msgid "No network connection" msgstr "Aucune connexion réseau" -#: ../src/applet.c:2031 +#: ../src/applet.c:2038 msgid "" "The NetworkManager applet could not find some required resources. It cannot " "continue.\n" msgstr "" "L'applet NetworkManager n'ayant pas trouvé les ressources requises, " "l'exécution ne peut pas continuer.\n" -#: ../src/applet.c:2174 +#: ../src/applet.c:2181 msgid "NetworkManager Applet" msgstr "Applet NetworkManager" -#: ../src/applet.c:2179 ../src/wired-dialog.c:103 +#: ../src/applet.c:2186 ../src/wired-dialog.c:103 msgid "" "The NetworkManager Applet could not find some required resources (the glade " "file was not found)." msgstr "" "L'applet NetworkManager n'a pas pu trouver les ressources requises (le " "fichier glade n'a pas été trouvé)." #: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1 @@ -1045,20 +1016,20 @@ msgstr "Ban_de :" #: ../src/connection-editor/ce-page-wireless.glade.h:5 msgid "C_hannel:" msgstr "_Canal :" #: ../src/connection-editor/ce-page-wireless.glade.h:6 msgid "" "Infrastructure\n" -"Adhoc" +"Ad-hoc" msgstr "" "Infrastructure\n" -"Adhoc" +"Ad hoc" #: ../src/connection-editor/ce-page-wireless.glade.h:9 msgid "M_ode:" msgstr "M_ode " #: ../src/connection-editor/ce-page-wireless.glade.h:10 msgid "Mb/s" msgstr "Mb/s" @@ -1190,22 +1161,16 @@ msgstr "Modification des routes IPv4 pou #: ../src/connection-editor/page-ip4.c:588 msgid "IPv4 Settings" msgstr "Paramètres IPv4" #: ../src/connection-editor/page-ip4.c:633 msgid "Netmask" msgstr "Masque de réseau" -#: ../src/connection-editor/page-mobile.c:264 -#: ../src/connection-editor/nm-connection-editor.glade.h:6 -#: ../src/connection-editor/nm-connection-list.c:1481 -msgid "Mobile Broadband" -msgstr "Téléphone mobile à large bande" - #: ../src/connection-editor/page-ppp.c:128 #: ../src/wireless-security/eap-method-ttls.c:308 msgid "PAP" msgstr "PAP" #: ../src/connection-editor/page-ppp.c:129 #: ../src/wireless-security/eap-method-ttls.c:353 msgid "CHAP" @@ -1296,17 +1261,17 @@ msgid "WPA & WPA2 Enterprise" msgstr "WPA et WPA2 entreprise" #: ../src/connection-editor/nm-connection-editor.c:93 #, c-format msgid "Editing %s" msgstr "Modification de %s" #: ../src/connection-editor/nm-connection-editor.c:97 -msgid "Editing unamed connection" +msgid "Editing un-named connection" msgstr "Modification de la connexion anonyme" #: ../src/connection-editor/nm-connection-editor.c:174 msgid "" "The connection editor could not find some required resources (the " "NetworkManager applet glade file was not found)." msgstr "" "L'éditeur de connexion n'a pas pu trouver les ressources requises (le " @@ -1459,79 +1424,79 @@ msgid "DSL connection %d" msgstr "Connexion DSL %d" #: ../src/connection-editor/nm-connection-list.c:1060 #, c-format msgid "Are you sure you wish to delete the connection %s?" msgstr "Voulez-vous vraiment supprimer la connexion %s ?" #: ../src/connection-editor/nm-connection-list.c:1156 -#: ../src/connection-editor/vpn-helpers.c:226 +#: ../src/connection-editor/vpn-helpers.c:228 msgid "Cannot import VPN connection" msgstr "Impossible d'importer la connexion VPN" #: ../src/connection-editor/nm-connection-list.c:1158 msgid "" "The VPN plugin failed to import the VPN connection correctly\n" "\n" "Error: no VPN service type." msgstr "" "Le greffon VPN n'a pas réussi à importer correctement la connexion VPN\n" "\n" "Erreur : aucun type de service VPN." -#: ../src/connection-editor/vpn-helpers.c:228 +#: ../src/connection-editor/vpn-helpers.c:230 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " "connection information\n" "\n" "Error: %s." msgstr "" "Le fichier « %s » ne peut pas être lu ou ne contient pas des informations de " "connexion VPN reconnues\n" "\n" "Erreur : %s." -#: ../src/connection-editor/vpn-helpers.c:259 +#: ../src/connection-editor/vpn-helpers.c:261 msgid "Select file to import" msgstr "Sélectionnez le fichier à importer" -#: ../src/connection-editor/vpn-helpers.c:305 +#: ../src/connection-editor/vpn-helpers.c:307 #, c-format msgid "A file named \"%s\" already exists." msgstr "Un fichier nommé « %s » existe déjà." -#: ../src/connection-editor/vpn-helpers.c:307 +#: ../src/connection-editor/vpn-helpers.c:309 msgid "_Replace" msgstr "_Remplacer" -#: ../src/connection-editor/vpn-helpers.c:309 +#: ../src/connection-editor/vpn-helpers.c:311 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "Voulez-vous remplacer %s par la connexion VPN que vous êtes en train " "d'enregistrer ?" -#: ../src/connection-editor/vpn-helpers.c:343 +#: ../src/connection-editor/vpn-helpers.c:345 msgid "Cannot export VPN connection" msgstr "Impossible d'exporter la connexion VPN" -#: ../src/connection-editor/vpn-helpers.c:345 +#: ../src/connection-editor/vpn-helpers.c:347 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" "\n" "Error: %s." msgstr "" "La connexion VPN « %s » ne peut pas être exportée vers %s.\n" "\n" "Erreur : %s." -#: ../src/connection-editor/vpn-helpers.c:376 +#: ../src/connection-editor/vpn-helpers.c:378 msgid "Export VPN connection..." msgstr "Exporter la connexion VPN..." #: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:244 #, c-format msgid "Cannot start VPN connection '%s'" msgstr "Impossible de démarrer la connexion VPN « %s »" @@ -1556,56 +1521,64 @@ msgstr "" #: ../src/wired-dialog.c:74 msgid "Wired 802.1X authentication" msgstr "Authentification 802.1X filaire" #: ../src/wireless-dialog.c:408 msgid "New..." msgstr "Nouveau..." -#: ../src/wireless-dialog.c:920 +#: ../src/wireless-dialog.c:866 +msgid "C_reate" +msgstr "C_réer" + +#: ../src/wireless-dialog.c:935 #, c-format msgid "" "Passwords or encryption keys are required to access the wireless network '%" "s'." msgstr "" "Des mots de passe ou des clés de chiffrement sont nécessaires pour l'accès " "au réseau sans fil « %s »." -#: ../src/wireless-dialog.c:922 -msgid "Wireless Network Secrets Required" -msgstr "Secrets du réseau sans fil nécessaires" - -#: ../src/wireless-dialog.c:924 -msgid "Secrets required by wireless network" -msgstr "Secrets nécessaires au réseau sans fil" +#: ../src/wireless-dialog.c:937 +msgid "Wireless Network Authentication Required" +msgstr "Authentification nécessaire pour le réseau sans fil" -#: ../src/wireless-dialog.c:929 +#: ../src/wireless-dialog.c:939 +msgid "Authentication required by wireless network" +msgstr "Authentification nécessaire pour le réseau sans fil" + +#: ../src/wireless-dialog.c:944 msgid "Create New Wireless Network" msgstr "Création d'un nouveau réseau sans fil" -#: ../src/wireless-dialog.c:931 +#: ../src/wireless-dialog.c:946 msgid "New wireless network" msgstr "Nouveau réseau sans fil" -#: ../src/wireless-dialog.c:932 +#: ../src/wireless-dialog.c:947 msgid "Enter a name for the wireless network you wish to create." msgstr "Saisissez le nom du réseau sans fil que vous voulez créer." -#: ../src/wireless-dialog.c:934 -msgid "Connect to Other Wireless Network" -msgstr "Connexion aux autres réseaux sans fil" - -#: ../src/wireless-dialog.c:936 -msgid "Existing wireless network" -msgstr "Réseau sans fil existant" +#: ../src/wireless-dialog.c:949 +msgid "Connect to Hidden Wireless Network" +msgstr "Connexion à des réseaux sans fil invisibles" -#: ../src/wireless-dialog.c:937 -msgid "Enter the name of the wireless network to which you wish to connect." -msgstr "Saisissez le nom du réseau sans fil auquel vous voulez vous connecter." +#: ../src/wireless-dialog.c:951 +msgid "Hidden wireless network" +msgstr "Réseau sans fil invisible" + +#: ../src/wireless-dialog.c:952 +msgid "" +"Enter the name and security details of the hidden wireless network you wish " +"to connect to." +msgstr "" +"Saisissez le nom et les détails de sécurité du réseau sans fil invisible " +"auquel vous voulez vous connecter." #: ../src/wireless-security/eap-method.c:293 msgid "DER or PEM certificates (*.der, *.pem)" msgstr "Certificats DER ou PEM (*.der ou *.pem)" #: ../src/wireless-security/eap-method-peap.c:234 #: ../src/wireless-security/eap-method-tls.c:290 #: ../src/wireless-security/eap-method-ttls.c:221 @@ -1662,8 +1635,58 @@ msgstr "TLS" #: ../src/wireless-security/wireless-security.c:346 msgid "Tunneled TLS" msgstr "Tunneled TLS" #: ../src/wireless-security/wireless-security.c:357 msgid "Protected EAP (PEAP)" msgstr "Protected EAP (PEAP)" +#~ msgid "Auto CDMA network connection" +#~ msgstr "Connexion automatique aux réseaux CDMA" + +#~ msgid "CDMA Connections (%s)" +#~ msgstr "Connexions CDMA (%s)" + +#~ msgid "CDMA Network (%s)" +#~ msgstr "Réseau CDMA (%s)" + +#~ msgid "CDMA Connections" +#~ msgstr "Connexions CDMA" + +#~ msgid "CDMA Network" +#~ msgstr "Réseau CDMA" + +#~ msgid "Dialing CDMA device %s..." +#~ msgstr "Connexion au périphérique CDMA %s..." + +#~ msgid "CDMA connection" +#~ msgstr "Connexion CDMA" + +#~ msgid "CDMA Network Password" +#~ msgstr "Mot de passe du réseau CDMA" + +#~ msgid "A password is required to connect to the CDMA network." +#~ msgstr "Un mot de passe est requis pour vous connecter au réseau CDMA." + +#~ msgid "Auto GSM network connection" +#~ msgstr "Connexion automatique aux réseaux GSM" + +#~ msgid "GSM Connections (%s)" +#~ msgstr "Connexions GSM (%s)" + +#~ msgid "GSM Network (%s)" +#~ msgstr "Réseau GSM (%s)" + +#~ msgid "GSM Connections" +#~ msgstr "Connexions GSM" + +#~ msgid "GSM Network" +#~ msgstr "Réseau GSM" + +#~ msgid "GSM connection" +#~ msgstr "Connexion GSM" + +#~ msgid "GSM Network Password" +#~ msgstr "Mot de passe du réseau GSM" + +#~ msgid "Existing wireless network" +#~ msgstr "Réseau sans fil existant" Only in NetworkManagerApplet_MBM/po: Makefile.in.in Only in applet.svn/po: .svn diff -rU8 -p applet.svn/src/applet.c NetworkManagerApplet_MBM/src/applet.c --- applet.svn/src/applet.c 2008-11-24 21:36:03.000000000 +0100 +++ NetworkManagerApplet_MBM/src/applet.c 2008-11-24 21:39:32.000000000 +0100 @@ -63,16 +63,17 @@ #include "applet-device-wifi.h" #include "applet-device-gsm.h" #include "applet-device-cdma.h" #include "applet-dialogs.h" #include "vpn-password-dialog.h" #include "applet-dbus-manager.h" #include "utils.h" #include "gconf-helpers.h" +#include "nma-gsm-modem.h" G_DEFINE_TYPE(NMApplet, nma, G_TYPE_OBJECT) static NMActiveConnection * applet_get_best_activating_connection (NMApplet *applet, NMDevice **device) { NMActiveConnection *best = NULL; @@ -1759,16 +1760,35 @@ applet_update_icon (gpointer user_data) applet->animation_step = 0; break; default: break; } } foo_set_icon (applet, pixbuf, ICON_LAYER_VPN); + if (applet->modem) { + guint32 network_mode; + network_mode = applet->modem_network_mode; + pixbuf = NULL; + switch (network_mode) { + case MM_MODEM_GSM_NETWORK_MODE_GPRS: + pixbuf = applet->tech_gprs_icon; break; + case MM_MODEM_GSM_NETWORK_MODE_EDGE: + pixbuf = applet->tech_edge_icon; break; + case MM_MODEM_GSM_NETWORK_MODE_3G: + pixbuf = applet->tech_umts_icon; break; + case MM_MODEM_GSM_NETWORK_MODE_HSDPA: + pixbuf = applet->tech_hsdpa_icon; break; + } + foo_set_icon(applet, pixbuf, ICON_LAYER_TECH); + } else { + foo_set_icon(applet, NULL, ICON_LAYER_TECH); + } + return FALSE; } void applet_schedule_update_icon (NMApplet *applet) { if (!applet->update_icon_id) applet->update_icon_id = g_idle_add (applet_update_icon, applet); @@ -1955,16 +1975,22 @@ static void nma_icons_free (NMApplet *ap for (i = 0; i <= ICON_LAYER_MAX; i++) CLEAR_ICON(applet->icon_layers[i]); CLEAR_ICON(applet->no_connection_icon); CLEAR_ICON(applet->wired_icon); CLEAR_ICON(applet->adhoc_icon); CLEAR_ICON(applet->wwan_icon); CLEAR_ICON(applet->vpn_lock_icon); + + CLEAR_ICON(applet->tech_gprs_icon); + CLEAR_ICON(applet->tech_edge_icon); + CLEAR_ICON(applet->tech_umts_icon); + CLEAR_ICON(applet->tech_hsdpa_icon); + CLEAR_ICON(applet->wireless_00_icon); CLEAR_ICON(applet->wireless_25_icon); CLEAR_ICON(applet->wireless_50_icon); CLEAR_ICON(applet->wireless_75_icon); CLEAR_ICON(applet->wireless_100_icon); for (i = 0; i < NUM_CONNECTING_STAGES; i++) { for (j = 0; j < NUM_CONNECTING_FRAMES; j++) @@ -2002,16 +2028,22 @@ nma_icons_load (NMApplet *applet) return FALSE; ICON_LOAD(applet->no_connection_icon, "nm-no-connection"); ICON_LOAD(applet->wired_icon, "nm-device-wired"); ICON_LOAD(applet->adhoc_icon, "nm-adhoc"); ICON_LOAD(applet->wwan_icon, "nm-device-wwan"); ICON_LOAD(applet->vpn_lock_icon, "nm-vpn-active-lock"); + ICON_LOAD(applet->tech_gprs_icon, "nm-tech-gprs"); + ICON_LOAD(applet->tech_edge_icon, "nm-tech-edge"); + ICON_LOAD(applet->tech_umts_icon, "nm-tech-umts"); + ICON_LOAD(applet->tech_hsdpa_icon, "nm-tech-hsdpa"); + + ICON_LOAD(applet->wireless_00_icon, "nm-signal-00"); ICON_LOAD(applet->wireless_25_icon, "nm-signal-25"); ICON_LOAD(applet->wireless_50_icon, "nm-signal-50"); ICON_LOAD(applet->wireless_75_icon, "nm-signal-75"); ICON_LOAD(applet->wireless_100_icon, "nm-signal-100"); for (i = 0; i < NUM_CONNECTING_STAGES; i++) { for (j = 0; j < NUM_CONNECTING_FRAMES; j++) { diff -rU8 -p applet.svn/src/applet-device-gsm.c NetworkManagerApplet_MBM/src/applet-device-gsm.c --- applet.svn/src/applet-device-gsm.c 2008-11-24 21:36:03.000000000 +0100 +++ NetworkManagerApplet_MBM/src/applet-device-gsm.c 2008-11-24 21:39:32.000000000 +0100 @@ -19,31 +19,36 @@ * * (C) Copyright 2008 Red Hat, Inc. */ #ifdef HAVE_CONFIG_H #include #endif +#include +#include + #include #include #include #include #include #include #include #include #include #include #include #include "applet.h" #include "applet-device-gsm.h" +#include "nma-gsm-modem.h" +#include "mm-types.h" #include "utils.h" typedef struct { NMApplet *applet; NMDevice *device; NMConnection *connection; } GSMMenuItemInfo; @@ -160,25 +165,70 @@ add_default_connection_item (NMDevice *d G_CALLBACK (gsm_menu_item_activate), info, (GClosureNotify) gsm_menu_item_info_destroy, 0); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); } static void +child_setup (gpointer user_data G_GNUC_UNUSED) +{ + /* We are in the child process at this point */ + pid_t pid = getpid (); + setpgid (pid, pid); +} + +static void +gsm_properties_cb (GtkMenuItem *mi, gpointer user_data) +{ + NMDevice *device = NM_DEVICE (user_data); + char *argv[3]; + GError *error = NULL; + gboolean success; + + argv[0] = BINDIR "/nm-modem-properties"; + argv[1] = (char *) nm_device_get_udi (device); + argv[2] = NULL; + + success = g_spawn_async ("/", argv, NULL, 0, &child_setup, NULL, NULL, &error); + if (!success) { + g_warning ("Error launching modem properties dialog: %s", error->message); + g_error_free (error); + } +} + +static void +add_properties_item (NMDevice *device, + GtkWidget *menu) +{ + GtkWidget *item; + + if (nm_device_get_state (device) != NM_DEVICE_STATE_DISCONNECTED) + return; + + item = gtk_menu_item_new_with_label (_("Properties")); + g_signal_connect (item, "activate", + G_CALLBACK (gsm_properties_cb), + device); + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); +} + +static void gsm_menu_item_deactivate (GtkMenuItem *item, gpointer user_data) { GSMMenuItemInfo *info = (GSMMenuItemInfo *) user_data; NMActiveConnection *active = NULL; applet_find_active_connection_for_device (info->device, info->applet, &active); - if (active) + if (active) { nm_client_deactivate_connection (info->applet->nm_client, active); - else + info->applet->modem = NULL; + } else g_warning ("%s: couldn't find active connection to deactive", __func__); } static void add_disconnect_item (NMDevice *device, GtkWidget *menu, NMApplet *applet) { @@ -259,56 +309,106 @@ gsm_add_menu_item (NMDevice *device, gtk_widget_show (item); goto out; } if (g_slist_length (connections)) add_connection_items (device, connections, active, menu, applet); else add_default_connection_item (device, menu, applet); + add_disconnect_item (device, menu, applet); + add_properties_item (device, menu); out: g_slist_free (connections); } static void +signal_quality_changed (NMAGsmModem *modem, guint32 quality, gpointer user_data) +{ + applet_schedule_update_icon (NM_APPLET (user_data)); +} + +static void gsm_device_state_changed (NMDevice *device, NMDeviceState new_state, NMDeviceState old_state, NMDeviceStateReason reason, NMApplet *applet) { - if (new_state == NM_DEVICE_STATE_ACTIVATED) { - NMConnection *connection; - NMSettingConnection *s_con = NULL; - char *str = NULL; - - connection = applet_find_active_connection_for_device (device, applet, NULL); - if (connection) { - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - if (s_con && s_con->id) - str = g_strdup_printf (_("You are now connected to '%s'."), s_con->id); - } + NMAGsmModem *modem; + char *oper_code; + char *oper_name; + char *msg; + guint32 reg_status; + static int bPinErrorShown = 0; + + g_debug("new_state = %d, old_state = %d, reason = %d", new_state, old_state, reason); + if (reason == NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED && !bPinErrorShown++) { + GtkWidget *dialog; + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "The PIN code is wrong!\nPlease, edit connections."); + gtk_window_set_title (GTK_WINDOW (dialog), "Can't connect"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } else + if (reason == NM_DEVICE_STATE_REASON_GSM_PUK_CHECK_FAILED && !bPinErrorShown++) { + GtkWidget *dialog; + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "The PUK code is wrong!\nPlease, edit connections."); + gtk_window_set_title (GTK_WINDOW (dialog), "Can't connect"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } else + bPinErrorShown = 0; - applet_do_notify (applet, NOTIFY_URGENCY_LOW, - _("Connection Established"), - str ? str : _("You are now connected to the GSM network."), - "nm-device-wwan", NULL, NULL, NULL, NULL); - g_free (str); - } + if (new_state != NM_DEVICE_STATE_ACTIVATED) + return; + + modem = (NMAGsmModem *) g_object_get_data (G_OBJECT (device), "gsm-modem"); + if (!modem) { + DBusGConnection *bus; + + bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL); + if (!bus) + return; + + modem = nma_gsm_modem_new (bus, nm_device_get_udi (device)); + dbus_g_connection_unref (bus); + + g_object_set_data_full (G_OBJECT (device), "gsm-modem", modem, g_object_unref); + + g_signal_connect (modem, "signal-quality", + G_CALLBACK (signal_quality_changed), + applet); + } + + oper_code = NULL; + oper_name = NULL; + reg_status = nma_gsm_modem_get_registration_info (modem, &oper_code, &oper_name); + msg = g_strdup_printf (_("You are now connected to the %s GSM network %s%s%s."), + reg_status == MM_GSM_MODEM_REG_STATUS_ROAMING ? _("roaming") : _("home"), + *oper_name?"'":"",oper_name, *oper_name?"'":""); + + applet_do_notify (applet, NOTIFY_URGENCY_LOW, + _("Connection Established"), msg, + "nm-device-wwan", NULL, NULL, NULL, NULL); + + g_free (oper_code); + g_free (oper_name); + g_free (msg); } static GdkPixbuf * gsm_get_icon (NMDevice *device, NMDeviceState state, NMConnection *connection, char **tip, NMApplet *applet) { + NMAGsmModem *modem; GdkPixbuf *pixbuf = NULL; const char *iface; NMSettingConnection *s_con = NULL; iface = nm_device_get_iface (NM_DEVICE (device)); if (connection) s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); @@ -318,21 +418,61 @@ gsm_get_icon (NMDevice *device, break; case NM_DEVICE_STATE_CONFIG: *tip = g_strdup_printf (_("Starting PPP on device %s..."), iface); break; case NM_DEVICE_STATE_NEED_AUTH: *tip = g_strdup_printf (_("Waiting for user authentication on device '%s'..."), iface); break; case NM_DEVICE_STATE_ACTIVATED: - if (s_con && s_con->id) - *tip = g_strdup_printf (_("Mobile broadband connection '%s'"), s_con->id); - else - *tip = g_strdup (_("Mobile broadband connection")); - pixbuf = applet->wwan_icon; + modem = (NMAGsmModem *) g_object_get_data (G_OBJECT (device), "gsm-modem"); + if (modem) { + char *oper_code; + char *oper_name; + guint32 reg_status; + guint32 quality; + guint32 network_mode; + + + applet->modem = modem; + + quality = nma_gsm_modem_get_signal_quality (modem); + quality = CLAMP (quality, 0, 100); + network_mode = nma_gsm_modem_get_network_mode (modem); + applet->modem_network_mode = network_mode; + + g_debug("quality = %d, net = %d", quality, network_mode); + + if (quality > 80) { + pixbuf = applet->wireless_100_icon; + + } else if (quality > 55) { + pixbuf = applet->wireless_75_icon; + } else if (quality > 30) { + pixbuf = applet->wireless_50_icon; + } else if (quality > 5) { + pixbuf = applet->wireless_25_icon; + } else + pixbuf = applet->wireless_00_icon; + + reg_status = nma_gsm_modem_get_registration_info (modem, &oper_code, &oper_name); + *tip = g_strdup_printf (_("%s GSM connection %s%s%s (%d%%)"), + reg_status == MM_GSM_MODEM_REG_STATUS_ROAMING ? _("Roaming") : _("Home"), + *oper_name ? _("'") : _(""), oper_name, *oper_name ? _("'") : _(""), quality); + + g_free (oper_name); + g_free (oper_code); + + } else { + pixbuf = applet->wireless_00_icon; + *tip = g_strdup_printf (_("GSM connection")); + applet->modem = NULL; + applet->modem_network_mode = 0; + } + break; default: break; } return pixbuf; } diff -rU8 -p applet.svn/src/applet-dialogs.c NetworkManagerApplet_MBM/src/applet-dialogs.c --- applet.svn/src/applet-dialogs.c 2008-11-24 21:36:03.000000000 +0100 +++ NetworkManagerApplet_MBM/src/applet-dialogs.c 2008-11-24 21:39:32.000000000 +0100 @@ -297,19 +297,24 @@ info_dialog_add_page (GtkNotebook *noteb speed = 0; if (NM_IS_DEVICE_ETHERNET (device)) { /* Wired speed in Mb/s */ speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (device)); } else if (NM_IS_DEVICE_WIFI (device)) { /* Wireless speed in Kb/s */ speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (device)); speed /= 1000; + } else //if (NM_IS_DEVICE_MBM (device)) + { + speed = 7200; } - if (speed) + if (speed == 7200) + str = g_strdup_printf (_("%u/%u kb/s"), 7200, 2000); + else if (speed) str = g_strdup_printf (_("%u Mb/s"), speed); else str = NULL; gtk_table_attach_defaults (table, create_info_label (_("Speed:")), 0, 1, row, row + 1); gtk_table_attach_defaults (table, diff -rU8 -p applet.svn/src/applet.h NetworkManagerApplet_MBM/src/applet.h --- applet.svn/src/applet.h 2008-11-24 21:36:03.000000000 +0100 +++ NetworkManagerApplet_MBM/src/applet.h 2008-11-24 21:39:32.000000000 +0100 @@ -62,17 +62,18 @@ typedef struct { GObjectClass parent_class; } NMAppletClass; #define APPLET_PREFS_PATH "/apps/nm-applet" #define ICON_LAYER_LINK 0 #define ICON_LAYER_VPN 1 -#define ICON_LAYER_MAX ICON_LAYER_VPN +#define ICON_LAYER_TECH 2 +#define ICON_LAYER_MAX ICON_LAYER_TECH typedef struct NMADeviceClass NMADeviceClass; /* * Applet instance data * */ typedef struct @@ -99,16 +100,22 @@ typedef struct guint update_icon_id; gboolean icons_loaded; GtkIconTheme * icon_theme; GdkPixbuf * no_connection_icon; GdkPixbuf * wired_icon; GdkPixbuf * adhoc_icon; GdkPixbuf * wwan_icon; + + GdkPixbuf * tech_gprs_icon; + GdkPixbuf * tech_edge_icon; + GdkPixbuf * tech_umts_icon; + GdkPixbuf * tech_hsdpa_icon; + GdkPixbuf * wireless_00_icon; GdkPixbuf * wireless_25_icon; GdkPixbuf * wireless_50_icon; GdkPixbuf * wireless_75_icon; GdkPixbuf * wireless_100_icon; #define NUM_CONNECTING_STAGES 3 #define NUM_CONNECTING_FRAMES 11 GdkPixbuf * network_connecting_icons[NUM_CONNECTING_STAGES][NUM_CONNECTING_FRAMES]; @@ -135,16 +142,19 @@ typedef struct guint networking_enabled_toggled_id; GtkWidget * wifi_enabled_item; guint wifi_enabled_toggled_id; GtkWidget * info_menu_item; GtkWidget * connections_menu_item; GladeXML * info_dialog_xml; NotifyNotification* notification; + + void* modem; + guint32 modem_network_mode; } NMApplet; struct NMADeviceClass { NMConnection * (*new_auto_connection) (NMDevice *device, NMApplet *applet, gpointer user_data); @@ -210,9 +220,22 @@ void applet_do_notify (NMApplet *applet, const char *action1_label, NotifyActionCallback action1_cb, gpointer action1_user_data); NMConnection * applet_find_active_connection_for_device (NMDevice *device, NMApplet *applet, NMActiveConnection **out_active); + +typedef enum { + MM_MODEM_GSM_NETWORK_MODE_ANY = 0, + MM_MODEM_GSM_NETWORK_MODE_GPRS = 1, + MM_MODEM_GSM_NETWORK_MODE_EDGE = 2, + MM_MODEM_GSM_NETWORK_MODE_3G = 3, + MM_MODEM_GSM_NETWORK_MODE_HSDPA = 4, + MM_MODEM_GSM_NETWORK_MODE_PREFER_2G = 5, + MM_MODEM_GSM_NETWORK_MODE_PREFER_3G = 6, + + MM_MODEM_GSM_NETWORK_MODE_LAST = MM_MODEM_GSM_NETWORK_MODE_PREFER_3G +} MMModemGsmNetworkMode; + #endif diff -rU8 -p applet.svn/src/connection-editor/ce-mobile-wizard.glade NetworkManagerApplet_MBM/src/connection-editor/ce-mobile-wizard.glade --- applet.svn/src/connection-editor/ce-mobile-wizard.glade 2008-11-24 21:36:02.000000000 +0100 +++ NetworkManagerApplet_MBM/src/connection-editor/ce-mobile-wizard.glade 2008-11-24 21:39:32.000000000 +0100 @@ -98,17 +98,17 @@ False 12 True <span weight="bold" size="larger">Choose a Mobile Broadband Connection</span> -Select or connect the mobile broadband device you wish to use for the new connection. If the device is not availabe, you may select a generic connection type. +Select or connect the mobile broadband device you wish to use for the new connection. If the device is not available, you may select a generic connection type. False True GTK_JUSTIFY_LEFT True False 0 0.5 0 diff -rU8 -p applet.svn/src/connection-editor/ce-page-ip4.glade NetworkManagerApplet_MBM/src/connection-editor/ce-page-ip4.glade --- applet.svn/src/connection-editor/ce-page-ip4.glade 2008-11-24 21:36:02.000000000 +0100 +++ NetworkManagerApplet_MBM/src/connection-editor/ce-page-ip4.glade 2008-11-24 21:39:33.000000000 +0100 @@ -375,27 +375,27 @@ Shared to other computers True GTK_BUTTONBOX_END True True True - gtk-cancel + gtk-cancel True -6 True True True - gtk-ok + gtk-ok True -5 1 diff -rU8 -p applet.svn/src/connection-editor/ce-page-mobile.glade NetworkManagerApplet_MBM/src/connection-editor/ce-page-mobile.glade --- applet.svn/src/connection-editor/ce-page-mobile.glade 2008-11-24 21:36:02.000000000 +0100 +++ NetworkManagerApplet_MBM/src/connection-editor/ce-page-mobile.glade 2008-11-24 21:39:33.000000000 +0100 @@ -1,631 +1,385 @@ - - - + + + - - - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 6 - True - False - 6 - - - - True - False - 6 - - - - True - <b>Basic</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - 3 - 2 - False - 6 - 6 - - - - True - Number: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Username: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - mobile_username - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Password: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - mobile_password - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - False - 0 - - True - False - - - 1 - 2 - 2 - 3 - - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - <b>Advanced</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - 6 - 2 - False - 6 - 6 - - - - True - APN: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - Network: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - - True - Type: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Any + + window1 + + + True + 6 + 6 + + + True + 6 + + + True + 0 + <b>Basic</b> + True + + + False + False + + + + + True + 12 + + + True + 3 + 2 + 6 + 6 + + + True + 0 + Number: + + + GTK_FILL + + + + + + True + 0 + Username: + True + mobile_username + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Password: + True + mobile_password + + + 2 + 3 + GTK_FILL + + + + + + True + True + + + 1 + 2 + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + False + + + 1 + 2 + 2 + 3 + + + + + + + + 1 + + + + + + + True + 6 + + + True + 0 + <b>Advanced</b> + True + + + False + False + + + + + True + 12 + + + True + 7 + 2 + 6 + 6 + + + + + + + + + True + 0 + APN: + + + GTK_FILL + + + + + + True + True + + + 1 + 2 + + + + + + True + 0 + Network: + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Type: + + + 2 + 3 + GTK_FILL + + + + + + True + Any 3G (UMTS/HSPA) 2G (GPRS/EDGE) Prefer 3G (UMTS/HSPA) Prefer 2G (GPRS/EDGE) - False - True - - - 1 - 2 - 2 - 3 - fill - fill - - - - - - True - Band: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - False - True - - - 1 - 2 - 3 - 4 - fill - fill - - - - - - True - PIN: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - True - True - False - 0 - - True - False - - - 1 - 2 - 4 - 5 - - - - - - - True - PUK: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - True - True - False - 0 - - True - False - - - 1 - 2 - 5 - 6 - - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - True - Show passwords - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - GTK_PACK_END - - - - - 0 - False - False - - - - - - + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + 0 + Band: + + + 3 + 4 + GTK_FILL + + + + + + True + + + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + 0 + PIN: + + + 4 + 5 + GTK_FILL + + + + + + True + True + False + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + PUK: + + + 5 + 6 + GTK_FILL + + + + + + True + True + False + + + 1 + 2 + 5 + 6 + + + + + + + + 1 + + + + + 1 + + + + + True + + + True + + + True + + + + + 1 + + + + + True + True + True + PIN functions + 0 + + + 2 + + + + + True + True + Show passwords + True + 0 + True + + + False + False + GTK_PACK_END + 2 + + + + + False + False + 2 + + + + + Only in NetworkManagerApplet_MBM/src/connection-editor: ce-page-pin.glade diff -rU8 -p applet.svn/src/connection-editor/Makefile.am NetworkManagerApplet_MBM/src/connection-editor/Makefile.am --- applet.svn/src/connection-editor/Makefile.am 2008-11-24 21:36:02.000000000 +0100 +++ NetworkManagerApplet_MBM/src/connection-editor/Makefile.am 2008-11-24 21:39:32.000000000 +0100 @@ -73,16 +73,17 @@ glade_DATA = \ ce-page-wired.glade \ ce-page-wireless.glade \ ce-page-wireless-security.glade \ ce-page-ip4.glade \ ce-page-dsl.glade \ ce-page-mobile.glade \ ce-mobile-wizard.glade \ ce-page-ppp.glade \ - ce-vpn-wizard.glade + ce-vpn-wizard.glade \ + ce-page-pin.glade BUILT_SOURCES = nm-connection-editor-service-glue.h CLEANFILES = *.bak *.gladep $(BUILT_SOURCES) EXTRA_DIST = $(glade_DATA) nm-connection-editor-service.xml diff -rU8 -p applet.svn/src/connection-editor/nm-connection-editor.c NetworkManagerApplet_MBM/src/connection-editor/nm-connection-editor.c --- applet.svn/src/connection-editor/nm-connection-editor.c 2008-11-24 21:36:02.000000000 +0100 +++ NetworkManagerApplet_MBM/src/connection-editor/nm-connection-editor.c 2008-11-24 21:39:33.000000000 +0100 @@ -1,28 +1,31 @@ -/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* NetworkManager Connection editor -- Connection editor for NetworkManager * * Rodrigo Moya + * Dan Williams + * Tambet Ingo * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2004-2005 Red Hat, Inc. + * (C) Copyright 2007 - 2008 Red Hat, Inc. + * (C) Copyright 2007 - 2008 Novell, Inc. */ #include #include #include #include #include diff -rU8 -p applet.svn/src/connection-editor/page-mobile.c NetworkManagerApplet_MBM/src/connection-editor/page-mobile.c --- applet.svn/src/connection-editor/page-mobile.c 2008-11-24 21:36:02.000000000 +0100 +++ NetworkManagerApplet_MBM/src/connection-editor/page-mobile.c 2008-11-24 21:39:33.000000000 +0100 @@ -16,48 +16,79 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2008 Red Hat, Inc. */ #include +#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include "../applet.h" +#include "../marshallers/nma-marshal.h" +#include "../applet-dbus-manager.h" + #include "page-mobile.h" #include "nm-connection-editor.h" #include "gconf-helpers.h" + G_DEFINE_TYPE (CEPageMobile, ce_page_mobile, CE_TYPE_PAGE) #define CE_PAGE_MOBILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CE_TYPE_PAGE_MOBILE, CEPageMobilePrivate)) + +#define MM_DBUS_SERVICE "org.freedesktop.ModemManager" +#define MM_DBUS_PATH "/org/freedesktop/ModemManager" +#define MM_DBUS_INTERFACE "org.freedesktop.ModemManager" +#define MM_DBUS_INTERFACE_MODEM "org.freedesktop.ModemManager.Modem" + +#define MM_DBUS_INTERFACE_MODEM_GSM_CARD "org.freedesktop.ModemManager.Modem.Gsm.Card" +#define MM_DBUS_INTERFACE_MODEM_GSM_NETWORK "org.freedesktop.ModemManager.Modem.Gsm.Network" + +#define NM_DBUS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ + NM_TYPE_DBUS_MANAGER, \ + NMDBusManagerPrivate)) + +#define MM_MODEM_ERROR "org.freedesktop.ModemManager.Modem.Gsm" +#define MM_MODEM_ERROR_SIM_PUK MM_MODEM_ERROR ".SimPukRequired" +#define MM_MODEM_ERROR_SIM_WRONG MM_MODEM_ERROR ".SimWrong" +#define MM_MODEM_ERROR_SIM_PIN MM_MODEM_ERROR ".SimPinRequired" + + typedef struct { NMSetting *setting; /* Common to GSM and CDMA */ GtkEntry *number; GtkEntry *username; GtkEntry *password; /* GSM only */ GtkEntry *apn; GtkEntry *network_id; GtkComboBox *network_type; GtkComboBox *band; GtkEntry *pin; GtkEntry *puk; + gboolean disposed; } CEPageMobilePrivate; #define NET_TYPE_ANY 0 #define NET_TYPE_3G 1 #define NET_TYPE_2G 2 #define NET_TYPE_PREFER_3G 3 #define NET_TYPE_PREFER_2G 4 @@ -76,16 +107,17 @@ mobile_private_init (CEPageMobile *self) priv->apn = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_apn")); priv->network_id = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_network_id")); priv->network_type = GTK_COMBO_BOX (glade_xml_get_widget (xml, "mobile_network_type")); priv->band = GTK_COMBO_BOX (glade_xml_get_widget (xml, "mobile_band")); priv->pin = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_pin")); priv->puk = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_puk")); + } static GHashTable * get_secrets (NMConnection *connection, const char *setting_name) { GError *error = NULL; GHashTable *secrets; @@ -102,17 +134,16 @@ get_secrets (NMConnection *connection, c static void populate_gsm_ui (CEPageMobile *self, NMConnection *connection) { CEPageMobilePrivate *priv = CE_PAGE_MOBILE_GET_PRIVATE (self); NMSettingGsm *setting = NM_SETTING_GSM (priv->setting); int type_idx; GHashTable *secrets; GValue *value; - GtkWidget *widget; if (setting->number) gtk_entry_set_text (priv->number, setting->number); if (setting->username) gtk_entry_set_text (priv->username, setting->username); if (setting->apn) @@ -136,27 +167,16 @@ populate_gsm_ui (CEPageMobile *self, NMC break; case NM_GSM_NETWORK_ANY: default: type_idx = NET_TYPE_ANY; break; } gtk_combo_box_set_active (priv->network_type, type_idx); - /* Hide network type widgets; not supported yet */ - gtk_widget_hide (GTK_WIDGET (priv->network_type)); - widget = glade_xml_get_widget (CE_PAGE (self)->xml, "type_label"); - gtk_widget_hide (widget); - - /* Hide Band widgets; not supported yet */ - widget = glade_xml_get_widget (CE_PAGE (self)->xml, "mobile_band"); - gtk_widget_hide (widget); - widget = glade_xml_get_widget (CE_PAGE (self)->xml, "band_label"); - gtk_widget_hide (widget); - secrets = get_secrets (connection, nm_setting_get_name (priv->setting)); if (setting->password) gtk_entry_set_text (priv->password, setting->password); else if (secrets) { value = g_hash_table_lookup (secrets, NM_SETTING_GSM_PASSWORD); if (value) gtk_entry_set_text (priv->password, g_value_get_string (value)); @@ -241,16 +261,391 @@ show_passwords (GtkToggleButton *button, active = gtk_toggle_button_get_active (button); gtk_entry_set_visibility (priv->password, active); gtk_entry_set_visibility (priv->pin, active); gtk_entry_set_visibility (priv->puk, active); } +// -------------------------------------------------------------------------------------------------- +typedef enum { + NOTHING, + CHANGE_PIN, + ENABLE_PIN, + DISABLE_PIN +} EPIN_FUNC; + +typedef struct { + GtkWidget *dialog; + GladeXML *xml; + DBusGConnection *bus; + DBusGProxy *proxy; + char *path; + + EPIN_FUNC pin_func; + + GtkEntry *pin; + GtkEntry *new_pin; + GtkEntry *puk; + GtkEntry *status; + + char *pin_str; + char *new_pin_str; + char *puk_str; + + int bUsePuk; + +} CEPagePinPrivate; + +static void do_change_pin (CEPagePinPrivate* pin_priv); + +static void +change_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer data) +{ + GError *error = NULL; + GtkWidget *dialog; + CEPagePinPrivate *pin_priv = (CEPagePinPrivate *) data; + char response[100]; + + if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { + switch (pin_priv->pin_func) { + case CHANGE_PIN: strcpy (response, "Wrong PIN! Couldn't change pin."); break; + case ENABLE_PIN: strcpy (response, "Wrong PIN! Couldn't enable pin."); break; + case DISABLE_PIN: strcpy (response, "Wrong PIN! Couldn't disable pin."); break; + case NOTHING: + default: + strcpy(response, "Unknown function"); + } + if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_PIN)) { + g_debug("MM_MODEM_ERROR_SIM_PIN"); + } else if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_PUK)) { + strcat (response, " PUK code is needed!"); + g_debug("MM_MODEM_ERROR_SIM_PUK"); + if (!pin_priv->bUsePuk) { + pin_priv->bUsePuk = 1; + g_warning ("%s", error->message); + g_error_free (error); + if (strlen(pin_priv->puk_str) != 8) { + strcpy (response, "PUK code is needed. \nPlease, provide the correct 8 digit PUK code."); + } else { + do_change_pin (pin_priv); + return; + } + } + } else if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_WRONG)) { + g_debug("MM_MODEM_ERROR_SIM_WRONG"); + } + dialog = gtk_message_dialog_new (GTK_WINDOW (pin_priv->dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, response); + gtk_window_set_title (GTK_WINDOW (dialog), "Error"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + g_warning ("%s", error->message); + g_error_free (error); + + } else { + switch (pin_priv->pin_func) { + case CHANGE_PIN: strcpy (response, "Pin changed!"); break; + case ENABLE_PIN: strcpy (response, "SIM lock enabled! Active after turning of device"); break; + case DISABLE_PIN: strcpy (response, "SIM lock removed!"); break; + case NOTHING: + default: + strcpy(response, "Unknown function"); + } + dialog = gtk_message_dialog_new (GTK_WINDOW (pin_priv->dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, response); + gtk_window_set_title (GTK_WINDOW (dialog), "Information"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + + } + g_free(pin_priv->path); + g_free(pin_priv->pin_str); + g_free(pin_priv->new_pin_str); + g_free(pin_priv->puk_str); + gtk_widget_destroy(pin_priv->dialog); +} + +static void do_change_pin (CEPagePinPrivate* pin_priv) +{ + DBusGProxy *gsm_proxy; + + g_debug("do_change_pin"); + + gsm_proxy = dbus_g_proxy_new_for_name (pin_priv->bus, + MM_DBUS_SERVICE, pin_priv->path, MM_DBUS_INTERFACE_MODEM_GSM_CARD); + + g_debug("after gsm_proxy"); + + + g_debug("pin = %s, new_pin = %s, puk = %s", pin_priv->pin_str, pin_priv->new_pin_str, pin_priv->puk_str); + + if (pin_priv->bUsePuk) { + g_debug("SendPuk"); + dbus_g_proxy_begin_call (gsm_proxy, "SendPuk", change_done, + pin_priv, NULL, + G_TYPE_STRING, pin_priv->puk_str, + G_TYPE_STRING, pin_priv->new_pin_str, + G_TYPE_INVALID); + + gtk_entry_set_text(pin_priv->status, "Started PIN change using PUK..."); + } else + { + g_debug("ChangePin"); + dbus_g_proxy_begin_call (gsm_proxy, "ChangePin", change_done, + pin_priv, NULL, + G_TYPE_STRING, pin_priv->pin_str, + G_TYPE_STRING, pin_priv->new_pin_str, + G_TYPE_INVALID); + gtk_entry_set_text(pin_priv->status, "Started PIN change..."); + } +} + +static void do_enable_pin (CEPagePinPrivate* pin_priv, gboolean enabled) +{ + DBusGProxy *gsm_proxy; + + g_debug("do_enable_pin"); + + gsm_proxy = dbus_g_proxy_new_for_name (pin_priv->bus, + MM_DBUS_SERVICE, pin_priv->path, MM_DBUS_INTERFACE_MODEM_GSM_CARD); + + g_debug("after gsm_proxy"); + + + g_debug("pin = %s, new_pin = %s", pin_priv->pin_str, pin_priv->new_pin_str); + + dbus_g_proxy_begin_call (gsm_proxy, "EnablePin", change_done, + pin_priv, NULL, + G_TYPE_STRING, pin_priv->pin_str, + G_TYPE_BOOLEAN, enabled, + G_TYPE_INVALID); + gtk_entry_set_text(pin_priv->status, "Started SIM lock change"); +} + +static void +send_pin_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer data) +{ + GError *error = NULL; + CEPagePinPrivate *pin_priv = (CEPagePinPrivate *) data; + if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { + + if (!strcmp(error->message, "Incorrect password")) { + g_debug("wrong pin!!!"); + } + if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_PUK)) { + pin_priv->bUsePuk = 1; + } + + g_warning ("%s", error->message); + g_error_free (error); + } + + if (pin_priv->bUsePuk && (!CHANGE_PIN || !strlen(pin_priv->puk_str))) { + GtkWidget *dialog; + dialog = gtk_message_dialog_new (GTK_WINDOW (pin_priv->dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "You must change PIN using your PUK code!"); + gtk_window_set_title (GTK_WINDOW (dialog), "Error"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + g_free(pin_priv->path); + g_free(pin_priv->pin_str); + g_free(pin_priv->new_pin_str); + g_free(pin_priv->puk_str); + gtk_widget_destroy(pin_priv->dialog); + return; + } + switch (pin_priv->pin_func) { + case CHANGE_PIN: do_change_pin(pin_priv); break; + case ENABLE_PIN: do_enable_pin(pin_priv, TRUE); break; + case DISABLE_PIN: do_enable_pin(pin_priv, FALSE); break; + case NOTHING: g_debug("NOTHING!"); + } +} + +static void do_send_pin (CEPagePinPrivate* pin_priv) +{ + DBusGProxy *gsm_proxy; + + g_debug("do_send_pin"); + + gsm_proxy = dbus_g_proxy_new_for_name (pin_priv->bus, + MM_DBUS_SERVICE, pin_priv->path, MM_DBUS_INTERFACE_MODEM_GSM_CARD); + + + g_debug("pin = %s, new_pin = %s", pin_priv->pin_str, pin_priv->new_pin_str); + + dbus_g_proxy_begin_call (gsm_proxy, "SendPin", send_pin_done, + pin_priv, NULL, + G_TYPE_STRING, pin_priv->pin_str, + G_TYPE_INVALID); +} + + +static void + enable_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer data) +{ + GError *error = NULL; + GtkWidget *dialog; + CEPagePinPrivate *pin_priv = (CEPagePinPrivate *) data; + + if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { + g_warning ("%s", error->message); + g_error_free (error); + dialog = gtk_message_dialog_new (GTK_WINDOW (pin_priv->dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Couldn't enable device!"); + gtk_window_set_title (GTK_WINDOW (dialog), "Error"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + g_free(pin_priv->path); + g_free(pin_priv->pin_str); + g_free(pin_priv->new_pin_str); + g_free(pin_priv->puk_str); + gtk_widget_destroy(pin_priv->dialog); + return; + } else { + g_debug("before pin_func"); + gtk_entry_set_text(pin_priv->status, "Device enabled...."); + do_send_pin(pin_priv); + } +} + +static void + enumerate_devices_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer data) +{ +// NMModemManager *manager = NM_MODEM_MANAGER (data); + GPtrArray *modems; + GError *error = NULL; + CEPagePinPrivate *pin_priv = (CEPagePinPrivate *) data; + + if (!dbus_g_proxy_end_call (proxy, call_id, &error, + dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &modems, + G_TYPE_INVALID)) { + g_debug ("Could not get modem list: %s", error->message); + g_error_free (error); + } else { + int i; + + if (modems->len == 0) { + GtkWidget *dialog; + g_debug("No modems found"); + dialog = gtk_message_dialog_new (GTK_WINDOW (pin_priv->dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "No modems found!"); + gtk_window_set_title (GTK_WINDOW (dialog), "Error"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + g_free(pin_priv->path); + g_free(pin_priv->pin_str); + g_free(pin_priv->new_pin_str); + g_free(pin_priv->puk_str); + gtk_widget_destroy(pin_priv->dialog); + return; + } else + if (modems->len > 1) { + GtkWidget *dialog; + g_debug("%d modems found", modems->len); + dialog = gtk_message_dialog_new (GTK_WINDOW (pin_priv->dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Several modems found! using the first..."); + gtk_window_set_title (GTK_WINDOW (dialog), "Warning"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } + + for (i = 0; i < modems->len; i++) { + DBusGProxy *gsm_proxy; + char *path = (char *) g_ptr_array_index (modems, i); + + g_debug("path = %s", path); + + gsm_proxy = dbus_g_proxy_new_for_name (pin_priv->bus, + MM_DBUS_SERVICE, path, MM_DBUS_INTERFACE_MODEM); + + pin_priv->path = g_strdup(path); + dbus_g_proxy_begin_call (gsm_proxy, "Enable", enable_done, + pin_priv, NULL, + G_TYPE_BOOLEAN, TRUE, + G_TYPE_INVALID); + + g_debug("after enable"); + +// create_modem (manager, path); + g_free (path); + } + + g_ptr_array_free (modems, TRUE); + } +} + + +static void + enumerate_devices (CEPagePinPrivate *pin_priv) +{ + GError *error = NULL; + + /* DBus */ + pin_priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); + if (!pin_priv->bus) { + g_error ("Couldn't connect to DBus: %s", error->message); + g_error_free (error); + + return; + } + pin_priv->proxy = dbus_g_proxy_new_for_name (pin_priv->bus, + MM_DBUS_SERVICE, MM_DBUS_PATH, MM_DBUS_INTERFACE); + + + dbus_g_proxy_begin_call (pin_priv->proxy, "EnumerateDevices", enumerate_devices_done, pin_priv, NULL, G_TYPE_INVALID); +} + + +static void + pin_utils (GtkButton *button, gpointer user_data) +{ + static CEPagePinPrivate pin_priv; +// CEPageMobilePrivate *priv = CE_PAGE_MOBILE_GET_PRIVATE (user_data); + + gint result; + + pin_priv.xml = glade_xml_new (GLADEDIR "/ce-page-pin.glade", NULL, NULL); + pin_priv.dialog = glade_xml_get_widget (pin_priv.xml, "dialog1"); + +// glade_xml_signal_autoconnect (xml); + + pin_priv.pin = GTK_ENTRY (glade_xml_get_widget (pin_priv.xml, "mobile_pin_pin")); + pin_priv.new_pin = GTK_ENTRY (glade_xml_get_widget (pin_priv.xml, "mobile_pin_new_pin")); + pin_priv.puk = GTK_ENTRY (glade_xml_get_widget (pin_priv.xml, "mobile_pin_puk")); + pin_priv.status = GTK_ENTRY (glade_xml_get_widget (pin_priv.xml, "mobile_pin_status")); + + gtk_window_set_title (GTK_WINDOW (pin_priv.dialog), "PIN functions"); + gtk_widget_show_all(pin_priv.dialog); + + pin_priv.bUsePuk = 0; + result = gtk_dialog_run (GTK_DIALOG(pin_priv.dialog)); + + pin_priv.pin_str = g_strdup(gtk_entry_get_text(pin_priv.pin)); + pin_priv.new_pin_str = g_strdup(gtk_entry_get_text(pin_priv.new_pin)); + pin_priv.puk_str = g_strdup(gtk_entry_get_text(pin_priv.puk)); + + + switch (result) { + case 1: pin_priv.pin_func = CHANGE_PIN; gtk_entry_set_text(pin_priv.status, "Changing pin...."); break; + case 2: pin_priv.pin_func = ENABLE_PIN; gtk_entry_set_text(pin_priv.status, "Enabling pin....");break; + case 3: pin_priv.pin_func = DISABLE_PIN; gtk_entry_set_text(pin_priv.status, "Disabling pin....");break; + default: + pin_priv.pin_func = NOTHING; + } + + if (!pin_priv.pin_func == NOTHING) + enumerate_devices(&pin_priv); + else { + g_free(pin_priv.path); + g_free(pin_priv.pin_str); + g_free(pin_priv.new_pin_str); + g_free(pin_priv.puk_str); + gtk_widget_destroy(pin_priv.dialog); + } + + g_debug ("result = %d", result); +} + CEPageMobile * ce_page_mobile_new (NMConnection *connection) { CEPageMobile *self; CEPageMobilePrivate *priv; CEPage *parent; self = CE_PAGE_MOBILE (g_object_new (CE_TYPE_PAGE_MOBILE, NULL)); @@ -296,16 +691,18 @@ ce_page_mobile_new (NMConnection *connec g_signal_connect (priv->network_id, "changed", G_CALLBACK (stuff_changed), self); g_signal_connect (priv->network_type, "changed", G_CALLBACK (stuff_changed), self); g_signal_connect (priv->pin, "changed", G_CALLBACK (stuff_changed), self); g_signal_connect (priv->puk, "changed", G_CALLBACK (stuff_changed), self); g_signal_connect (glade_xml_get_widget (parent->xml, "mobile_show_passwords"), "toggled", G_CALLBACK (show_passwords), self); + g_signal_connect (glade_xml_get_widget (parent->xml, "mobile_pin_button"), + "clicked", G_CALLBACK (pin_utils), self); return self; } static const char * nm_entry_get_text (GtkEntry *entry) { const char *txt; @@ -336,16 +733,17 @@ gsm_ui_to_setting (CEPageMobile *self) net_type = NM_GSM_NETWORK_PREFER_GPRS_EDGE; break; case NET_TYPE_ANY: default: net_type = NM_GSM_NETWORK_ANY; break; } + g_object_set (priv->setting, NM_SETTING_GSM_NUMBER, nm_entry_get_text (priv->number), NM_SETTING_GSM_USERNAME, nm_entry_get_text (priv->username), NM_SETTING_GSM_PASSWORD, nm_entry_get_text (priv->password), NM_SETTING_GSM_APN, nm_entry_get_text (priv->apn), NM_SETTING_GSM_NETWORK_ID, nm_entry_get_text (priv->network_id), NM_SETTING_GSM_NETWORK_TYPE, net_type, NM_SETTING_GSM_PIN, nm_entry_get_text (priv->pin), Only in applet.svn/src/connection-editor: .svn Only in NetworkManagerApplet_MBM/src/gconf-helpers: Makefile.in Only in applet.svn/src/gconf-helpers: .svn diff -rU8 -p applet.svn/src/main.c NetworkManagerApplet_MBM/src/main.c --- applet.svn/src/main.c 2008-11-24 21:36:03.000000000 +0100 +++ NetworkManagerApplet_MBM/src/main.c 2008-11-24 21:39:32.000000000 +0100 @@ -28,20 +28,76 @@ #include #include #include #include #include #include "applet.h" +#include static GMainLoop *loop = NULL; static void +log_handler (const gchar *log_domain, + GLogLevelFlags log_level, + const gchar *message, + gpointer ignored) +{ + int syslog_priority; + + switch (log_level) { + case G_LOG_LEVEL_ERROR: + syslog_priority = LOG_CRIT; + break; + + case G_LOG_LEVEL_CRITICAL: + syslog_priority = LOG_ERR; + break; + + case G_LOG_LEVEL_WARNING: + syslog_priority = LOG_WARNING; + break; + + case G_LOG_LEVEL_MESSAGE: + syslog_priority = LOG_NOTICE; + break; + + case G_LOG_LEVEL_DEBUG: + syslog_priority = LOG_DEBUG; + break; + + case G_LOG_LEVEL_INFO: + default: + syslog_priority = LOG_INFO; + break; + } + + syslog (syslog_priority, "%s", message); +} + +static void +logging_setup (void) +{ + openlog (G_LOG_DOMAIN, LOG_CONS, LOG_DAEMON); + g_log_set_handler (G_LOG_DOMAIN, + G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, + log_handler, + NULL); +} + +static void +logging_shutdown (void) +{ + closelog (); +} + + +static void signal_handler (int signo) { if (signo == SIGINT || signo == SIGTERM) { g_message ("Caught signal %d, shutting down...", signo); g_main_loop_quit (loop); } } @@ -63,21 +119,26 @@ int main (int argc, char *argv[]) { NMApplet * applet; bindtextdomain (GETTEXT_PACKAGE, NMALOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); gtk_init (&argc, &argv); textdomain (GETTEXT_PACKAGE); + logging_setup (); + + g_debug("main"); + applet = nm_applet_new (); if (applet == NULL) exit (1); loop = g_main_loop_new (NULL, FALSE); setup_signals (); g_main_loop_run (loop); g_object_unref (G_OBJECT (applet)); + logging_shutdown (); exit (0); } diff -rU8 -p applet.svn/src/Makefile.am NetworkManagerApplet_MBM/src/Makefile.am --- applet.svn/src/Makefile.am 2008-11-24 21:36:03.000000000 +0100 +++ NetworkManagerApplet_MBM/src/Makefile.am 2008-11-24 21:39:32.000000000 +0100 @@ -1,9 +1,9 @@ -SUBDIRS = marshallers utils gconf-helpers wireless-security connection-editor +SUBDIRS = marshallers utils gconf-helpers wireless-security connection-editor modems NULL= bin_PROGRAMS = nm-applet nm_applet_CPPFLAGS = \ $(NMA_CFLAGS) \ $(NOTIFY_CFLAGS) \ @@ -44,16 +44,19 @@ nm_applet_SOURCES = \ applet-device-wifi.h \ applet-device-wifi.c \ ap-menu-item.h \ ap-menu-item.c \ applet-device-gsm.h \ applet-device-gsm.c \ applet-device-cdma.h \ applet-device-cdma.c \ + mm-types.h \ + nma-gsm-modem.c \ + nma-gsm-modem.h \ $(NULL) nm_applet_LDADD = \ $(NMA_LIBS) \ $(NOTIFY_LIBS) \ ${top_builddir}/src/marshallers/libmarshallers.la \ ${top_builddir}/src/utils/libutils.la \ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ Only in NetworkManagerApplet_MBM/src: Makefile.in Only in NetworkManagerApplet_MBM/src/marshallers: Makefile.in Only in applet.svn/src/marshallers: .svn Only in NetworkManagerApplet_MBM/src: mm-types.h Only in NetworkManagerApplet_MBM/src: modems Only in NetworkManagerApplet_MBM/src: nma-gsm-modem.c Only in NetworkManagerApplet_MBM/src: nma-gsm-modem.h Only in applet.svn/src: .svn Only in NetworkManagerApplet_MBM/src/utils: Makefile.in Only in applet.svn/src/utils: .svn Only in NetworkManagerApplet_MBM/src/wireless-security: Makefile.in Only in applet.svn/src/wireless-security: .svn Only in applet.svn/: .svn