[network-manager-netbook/MplPanelClient] Update translations



commit c66d077f12c1b2c422c150f7f2af1c0b4368fa77
Author: Tambet Ingo <tambet gmail com>
Date:   Fri Nov 27 16:38:50 2009 +0200

    Update translations

 po/ar.po    |  593 +++++++++++++++++++++++++++++++++++---------------------
 po/cs.po    |  600 ++++++++++++++++++++++++++++++++++++---------------------
 po/de.po    |  615 ++++++++++++++++++++++++++++++++++------------------------
 po/el.po    |  604 ++++++++++++++++++++++++++++++++++++---------------------
 po/es.po    |  605 ++++++++++++++++++++++++++++++++++-----------------------
 po/et.po    |  477 +++++++++++++++++++++++++++++++++------------
 po/fi.po    |  600 ++++++++++++++++++++++++++++++++++++---------------------
 po/fr.po    |  602 ++++++++++++++++++++++++++++++++++++---------------------
 po/gu.po    |  585 +++++++++++++++++++++++++++++++++-----------------------
 po/hu.po    |  601 ++++++++++++++++++++++++++++++++++++---------------------
 po/id.po    |  623 +++++++++++++++++++++++++++++++++++------------------------
 po/it.po    |  601 ++++++++++++++++++++++++++++++++++++---------------------
 po/ja.po    |  598 ++++++++++++++++++++++++++++++++++++---------------------
 po/ko.po    |  592 +++++++++++++++++++++++++++++++++++---------------------
 po/nl.po    |  601 ++++++++++++++++++++++++++++++++++++---------------------
 po/pa.po    |  589 +++++++++++++++++++++++++++++++++-----------------------
 po/pl.po    |  600 ++++++++++++++++++++++++++++++++++++---------------------
 po/pt_BR.po |  601 ++++++++++++++++++++++++++++++++++++---------------------
 po/ru.po    |  600 ++++++++++++++++++++++++++++++++++++---------------------
 po/sv.po    |  621 +++++++++++++++++++++++++++++++++++------------------------
 po/tr.po    |  599 ++++++++++++++++++++++++++++++++++++---------------------
 po/uk.po    |  601 ++++++++++++++++++++++++++++++++++++---------------------
 po/zh_CN.po |  589 +++++++++++++++++++++++++++++++++++---------------------
 po/zh_TW.po |  589 +++++++++++++++++++++++++++++++++++---------------------
 24 files changed, 8914 insertions(+), 5372 deletions(-)
---
diff --git a/po/ar.po b/po/ar.po
index 2fd8b1c..7094708 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-24 11:55\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,543 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(بÙ?ا)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "اتصاÙ? بÙ?اسطة:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Ù?دÙ?Ù?"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "ارتباط Ù?Ø­Ù?Ù?"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "عÙ?Ù?اÙ? IP:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Ù?Ù?اع اÙ?شبÙ?Ø© اÙ?Ù?رعÙ?Ø©:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Ù?Ù?جÙ?:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "غÙ?ر Ù?تاح"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "تشغÙ?Ù?"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Ø¥Ù?Ù?اÙ? اÙ?تشغÙ?Ù?"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "غÙ?ر Ù?تصÙ?"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "اتصاÙ?"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Ù?تÙ? اÙ?Ø¢Ù? اÙ?اتصاÙ?..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Ù?طع اÙ?اتصاÙ?"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Ù?تصÙ?"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Ù?تÙ?دÙ?"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Ù?ضع اÙ?Ø·Ù?راÙ?</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>سÙ?Ù?Ù?</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>إضاÙ?Ø© اتصاÙ? جدÙ?د</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>اÙ?شبÙ?ات</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "إضاÙ?Ø© اتصاÙ? جدÙ?د"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "شبÙ?Ø© Ù?Ø®Ù?Ù?Ø©"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "تÙ? اÙ?تشاÙ? Ù?Ù?دÙ? 3G داخÙ?Ù? Ù?بطاÙ?Ø© SIM"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "اÙ?عÙ?دة Ø¥Ù?Ù? اÙ?شبÙ?ات"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Ø­Ù?ظ اÙ?اتصاÙ?"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "سÙ?ؤدÙ? Ù?ذا Ø¥Ù?Ù? تعطÙ?Ù? Ù?اÙ?Ø© اÙ?اتصاÙ?ات اÙ?Ù?اسÙ?Ù?Ù?Ø©"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "اÙ?تراضÙ?"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "تÙ? تعطÙ?Ù? 3G"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Ù?Ù? Ù?تÙ? اÙ?تشاÙ? أجÙ?زة Ù?Ù?دÙ?"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "بÙ?ا"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "Ù?Ù?تاح 40/128 Ù?Ù? WEP"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارة Ù?رÙ?ر 128 بت Ù?Ù?Ù? WEP"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP دÙ?Ù?اÙ?Ù?Ù?Ù? (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "Ø¥Ù?_شاء"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
 msgstr "Ù?Ù?Ù?ات اÙ?سر Ø£Ù? Ù?Ù?اتÙ?Ø­ اÙ?تشÙ?Ù?ر Ù?Ø·Ù?Ù?بة Ù?Ù?Ù?صÙ?Ù? Ø¥Ù?Ù? اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø© '%s'."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Ù?Ø·Ù?Ù?ب Ù?صادÙ?Ø© اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø©"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Ù?Ø·Ù?Ù?ب اÙ?Ù?صادÙ?Ø© Ù?Ù? Ù?Ù?بÙ? اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø©"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Ø¥Ù?شاء شبÙ?Ø© Ù?اسÙ?Ù?Ù?Ø© جدÙ?دة"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "شبÙ?Ø© Ù?اسÙ?Ù?Ù?Ø© جدÙ?دة"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "أدخÙ? اسÙ?Ù?ا Ù?Ù?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø© اÙ?تÙ? ترÙ?د Ø¥Ù?شاءÙ?ا."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "اتصاÙ? باÙ?شبÙ?ات اÙ?Ù?اسÙ?Ù?Ù?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "شبÙ?Ø© Ù?اسÙ?Ù?Ù?Ø© Ù?Ø®Ù?Ù?Ø©"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "أدخÙ? اÙ?اسÙ? Ù?تÙ?اصÙ?Ù? Ø£Ù?اÙ? اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø© اÙ?Ù?Ø®Ù?Ù?Ø© اÙ?تÙ? ترÙ?د اÙ?اتصاÙ? بÙ?ا."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"أدخÙ? اÙ?اسÙ? Ù?تÙ?اصÙ?Ù? Ø£Ù?اÙ? اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø© اÙ?Ù?Ø®Ù?Ù?Ø© اÙ?تÙ? ترÙ?د اÙ?اتصاÙ? بÙ?ا."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "ات_صاÙ?"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "اÙ?اتصاÙ?:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "شبÙ?Ø© Ù?اسÙ?Ù?Ù?Ø© أخرÙ?..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Ù?_Ø­Ù?Ù? Ù?اسÙ?Ù?Ù?:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "ا_سÙ? اÙ?شبÙ?Ø©:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "Ø£Ù?_اÙ? اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø©:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Ù?Ù? Ù?تÙ? اختÙ?ار Ø£Ù? Ø´Ù?ادة جÙ?Ø© إصدا اÙ?Ø´Ù?ادات</span>\n\nÙ?د Ù?ؤدÙ? عدÙ? استخداÙ? Ø´Ù?ادة جÙ?Ø© إصدار اÙ?Ø´Ù?ادات Ø¥Ù?Ù? عÙ?Ù?Ù?ات اتصاÙ? بشبÙ?ات Ù?اسÙ?Ù?Ù?Ø© تاÙ?Ù?Ø©  Ù?غÙ?ر Ø¢Ù?Ù?Ø©. Ù?Ù? ترÙ?د اختÙ?ار Ø´Ù?ادة جÙ?Ø© إصدار Ø´Ù?اداتØ?"
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Ù?Ù? Ù?تÙ? اختÙ?ار Ø£Ù? Ø´Ù?ادة جÙ?Ø© إصدا "
+"اÙ?Ø´Ù?ادات</span>\n"
+"\n"
+"Ù?د Ù?ؤدÙ? عدÙ? استخداÙ? Ø´Ù?ادة جÙ?Ø© إصدار اÙ?Ø´Ù?ادات Ø¥Ù?Ù? عÙ?Ù?Ù?ات اتصاÙ? بشبÙ?ات Ù?اسÙ?Ù?Ù?Ø© "
+"تاÙ?Ù?Ø©  Ù?غÙ?ر Ø¢Ù?Ù?Ø©. Ù?Ù? ترÙ?د اختÙ?ار Ø´Ù?ادة جÙ?Ø© إصدار Ø´Ù?اداتØ?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "اختر Ø´Ù?ادة CA"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "عدÙ? إظÙ?ار اÙ?تحذÙ?ر Ù?رة أخرÙ?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "تجاÙ?Ù?"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Ù?صادÙ?Ø©:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Ù?Ù?Ù?Ø© اÙ?سر:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "إظÙ?ار Ù?Ù?Ù?Ø© اÙ?سر"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "اسÙ? اÙ?Ù?ستخدÙ?:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Ù?Ù?Ù?Ø© Ù?جÙ?Ù?Ù?Ø©:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Ø´Ù?ادة CA:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Ù?صادÙ?Ø© داخÙ?Ù?Ø©:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "إصدار PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "اÙ?Ù?Ù?Ù?Ø©:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Ù?Ù?Ù?Ø© سر اÙ?Ù?Ù?تاح اÙ?خاص:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "اÙ?Ù?Ù?تاح اÙ?خاص:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Ø´Ù?ادة اÙ?Ù?ستخدÙ?:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "اÙ?Ù?Ù?تاح:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "إظÙ?ار اÙ?Ù?Ù?تاح"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Ù?Ù?رس WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "اÙ?Ù?Ù?ع:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "اختÙ?ار Ø´Ù?ادة جÙ?Ø© إصدار اÙ?Ø´Ù?ادات..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "اختÙ?ار Ø´Ù?ادة شخصÙ?Ø©..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Ù?تÙ? اÙ?Ø¢Ù? اختÙ?ار Ù?Ù?تاحÙ? اÙ?خاص..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "اÙ?Ù?Ù?اتÙ?Ø­ اÙ?خاصة DER Ø£Ù? PEM Ø£Ù? PKCS#12  (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "اÙ?Ø´Ù?ادتاÙ? DER Ø£Ù? PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "TLS Ù?Ù?Ù?Ù?"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Ù?Ø­Ù?Ù? (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "إضاÙ?Ø© اتصاÙ? جدÙ?د"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "ا_سÙ? اÙ?شبÙ?Ø©:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "سÙ?ؤدÙ? Ù?ذا Ø¥Ù?Ù? تعطÙ?Ù? Ù?اÙ?Ø© اÙ?اتصاÙ?ات اÙ?Ù?اسÙ?Ù?Ù?Ø©"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "شبÙ?Ø© Ù?Ø®Ù?Ù?Ø©"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "غÙ?ر Ù?تصÙ?"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "ا_سÙ? اÙ?شبÙ?Ø©:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "إضاÙ?Ø© اتصاÙ? جدÙ?د"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "غÙ?ر Ù?تصÙ?"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Ù?تصÙ?"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Ù?طع اÙ?اتصاÙ?"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Ù?تÙ? اÙ?Ø¢Ù? اÙ?اتصاÙ?..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "غÙ?ر Ù?تصÙ?"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "اتصاÙ?"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(بÙ?ا)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "اتصاÙ? بÙ?اسطة:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Ù?دÙ?Ù?"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "ارتباط Ù?Ø­Ù?Ù?"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "عÙ?Ù?اÙ? IP:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Ù?Ù?اع اÙ?شبÙ?Ø© اÙ?Ù?رعÙ?Ø©:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Ù?Ù?جÙ?:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "تÙ? تعطÙ?Ù? 3G"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "تÙ? اÙ?تشاÙ? Ù?Ù?دÙ? 3G داخÙ?Ù? Ù?بطاÙ?Ø© SIM"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Ù?Ù? Ù?تÙ? اÙ?تشاÙ? أجÙ?زة Ù?Ù?دÙ?"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "إضاÙ?Ø© اتصاÙ? جدÙ?د"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "شبÙ?Ø© Ù?Ø®Ù?Ù?Ø©"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Ø­Ù?ظ اÙ?اتصاÙ?"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "اÙ?عÙ?دة Ø¥Ù?Ù? اÙ?شبÙ?ات"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "اÙ?تراضÙ?"
+
+#~ msgid "Unavailable"
+#~ msgstr "غÙ?ر Ù?تاح"
+
+#~ msgid "On"
+#~ msgstr "تشغÙ?Ù?"
+
+#~ msgid "Off"
+#~ msgstr "Ø¥Ù?Ù?اÙ? اÙ?تشغÙ?Ù?"
+
+#~ msgid "Advanced"
+#~ msgstr "Ù?تÙ?دÙ?"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Ù?ضع اÙ?Ø·Ù?راÙ?</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>سÙ?Ù?Ù?</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>إضاÙ?Ø© اتصاÙ? جدÙ?د</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>اÙ?شبÙ?ات</b></big>"
diff --git a/po/cs.po b/po/cs.po
index af53765..87c93af 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-22 11:14\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(žádné)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "PÅ?ipojit pomocí:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "RuÄ?nÄ?"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Místní propojení"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "Adresa IP:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Maska podsítÄ?:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "SmÄ?rovaÄ?:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Nedostupné"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Zap."
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Vyp."
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Odpojeno"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "PÅ?ipojit"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "PÅ?ipojování..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Odpojit"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "PÅ?ipojeno"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "PokroÄ?ilé"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Režim V letadle</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>Wi-Fi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Kabelové</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>PÅ?idat nové pÅ?ipojení</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>SítÄ?</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "PÅ?idat nové pÅ?ipojení"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Skrytá síť"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Rozpoznán interní modem 3G a karta SIM"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "ZpÄ?t do nastavení sítí"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Uložit pÅ?ipojení"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Budou zakázána vÅ¡echna bezdrátová pÅ?ipojení"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Výchozí"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "PÅ?ipojení 3G zakázáno"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Nebyly rozpoznány žádné modemy"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Žádný"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP â?? 40/128bitový klíÄ?"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP â?? 128bitové heslo"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamický WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA a WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA a WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "_VytvoÅ?it"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, 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 požadována hesla nebo Å¡ifrovací klíÄ?e."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Pro pÅ?ístup k bezdrátové síti %s jsou požadována hesla nebo Å¡ifrovací klíÄ?e."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Je požadováno ovÄ?Å?ení bezdrátové sítÄ?"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Bezdrátová síť požaduje ovÄ?Å?ení"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "VytvoÅ?it novou bezdrátovou síť"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Nová bezdrátová síť"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 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:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "PÅ?ipojit ke skryté bezdrátové síti"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Skrytá bezdrátová síť"
 
-#: ../src/wireless-dialog.c:886
-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."
+#: ../libnm-gtk/wireless-dialog.c:887
+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.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "_PÅ?ipojit"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "PÅ?ipojení:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Jiná bezdrátová síť..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Bezdrátový _adaptér:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Název sítÄ?:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_ZabezpeÄ?ení bezdrátové sítÄ?:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Nebyl zvolen žádný certifikát CertifikaÄ?ní autority</span>\n\nPÅ?ipojení bez certifikátu CertifikaÄ?ní autority (CA) může vést k pÅ?ipojení k nezabezpeÄ?ené a tedy nebezpeÄ?né bezdrátové síti. Chcete zvolit certifikát CertifikaÄ?ní autority?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Nebyl zvolen žádný certifikát "
+"CertifikaÄ?ní autority</span>\n"
+"\n"
+"PÅ?ipojení bez certifikátu CertifikaÄ?ní autority (CA) může vést k pÅ?ipojení k "
+"nezabezpeÄ?ené a tedy nebezpeÄ?né bezdrátové síti. Chcete zvolit certifikát "
+"CertifikaÄ?ní autority?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Zvolit certifikát CA"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Toto upozornÄ?ní již pÅ?íštÄ? nezobrazovat"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "OvÄ?Å?ení:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Zobrazit heslo"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Uživatelské jméno:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Anonymní identita:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Certifikát CA:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "VnitÅ?ní ovÄ?Å?ení:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Verze PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identita:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Heslo soukromého klíÄ?e:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Soukromý klíÄ?:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Uživatelský certifikát:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "KlíÄ?:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Zobrazit klíÄ?"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Index WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Zvolit certifikát CertifikaÄ?ní autority..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Zvolit osobní certifikát..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Zvolit soukromý klíÄ?..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Soukromé klíÄ?e DER, PEM nebo PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certifikáty DER nebo PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunelované pÅ?ipojení TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "ChránÄ?né pÅ?ipojení EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "PÅ?idat nové pÅ?ipojení"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Název sítÄ?:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Budou zakázána vÅ¡echna bezdrátová pÅ?ipojení"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Skrytá síť"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Odpojeno"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Název sítÄ?:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "PÅ?idat nové pÅ?ipojení"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Odpojeno"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "PÅ?ipojeno"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Odpojit"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "PÅ?ipojování..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Odpojeno"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "PÅ?ipojit"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(žádné)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "PÅ?ipojit pomocí:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "RuÄ?nÄ?"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Místní propojení"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "Adresa IP:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Maska podsítÄ?:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "SmÄ?rovaÄ?:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "PÅ?ipojení 3G zakázáno"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Rozpoznán interní modem 3G a karta SIM"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Nebyly rozpoznány žádné modemy"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "PÅ?idat nové pÅ?ipojení"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Skrytá síť"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Uložit pÅ?ipojení"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "ZpÄ?t do nastavení sítí"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Výchozí"
+
+#~ msgid "Unavailable"
+#~ msgstr "Nedostupné"
+
+#~ msgid "On"
+#~ msgstr "Zap."
+
+#~ msgid "Off"
+#~ msgstr "Vyp."
+
+#~ msgid "Advanced"
+#~ msgstr "PokroÄ?ilé"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Režim V letadle</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>Wi-Fi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Kabelové</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>PÅ?idat nové pÅ?ipojení</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>SítÄ?</b></big>"
diff --git a/po/de.po b/po/de.po
index 02cb5a1..145b48f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,9 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-netbook 0.2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=NetworkManager&component=network-manager-netbook\n"
-"POT-Creation-Date: 2009-10-10 13:20+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-10-16 18:16+0100\n"
 "Last-Translator: Mario Blättermann <mariobl gnome org>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -26,432 +25,548 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:104
-msgid "(none)"
-msgstr "(ohne)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:475
-msgid "Connect by:"
-msgstr "Verbinden durch:"
-
-#: ../src/nmn-connection-details.c:478
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:483
-msgid "Manual"
-msgstr "Manuell"
-
-#: ../src/nmn-connection-details.c:488
-msgid "Link Local"
-msgstr "Link Local"
-
-#. Address
-#: ../src/nmn-connection-details.c:496
-msgid "IP Address:"
-msgstr "IP-Adresse:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:505
-msgid "Subnet mask:"
-msgstr "Teilnetzmaske:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:514
-msgid "Router:"
-msgstr "Router:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:523
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "An"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Aus"
-
-#: ../src/nmn-network-item.c:254
-msgid "Disconnected"
-msgstr "Nicht verbunden"
-
-#: ../src/nmn-network-item.c:255 ../src/nmn-network-item.c:695
-msgid "Connect"
-msgstr "Verbinde"
-
-#: ../src/nmn-network-item.c:258
-msgid "Connecting..."
-msgstr "Verbindung wird aufgebaut â?¦"
-
-#: ../src/nmn-network-item.c:259 ../src/nmn-network-item.c:263
-msgid "Disconnect"
-msgstr "Getrennt"
-
-#: ../src/nmn-network-item.c:262
-msgid "Connected"
-msgstr "Verbunden"
-
-#: ../src/nmn-network-item.c:690
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: ../src/nmn-networks.c:75
-msgid " and "
-msgstr " einzuschalten und"
-
-#: ../src/nmn-networks.c:86
-msgid "Sorry, we can't find any networks."
-msgstr "Es können leider keine Netzwerke gefunden werden."
-
-#: ../src/nmn-networks.c:89
-msgid " You could try disabling Offline mode."
-msgstr " Sie könnten versuchen, den Offline-Modus zu deaktivieren."
+#: ../libnm-gtk/nm-ethernet-item.c:38
+#, fuzzy
+msgid "wired"
+msgstr "Kabelgebunden"
 
-#: ../src/nmn-networks.c:109
-msgid " You could try turning on "
-msgstr " Sie könnten versuchen,"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-networks.c:112
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
 msgid "WiFi"
 msgstr "WiFi"
 
-#: ../src/nmn-networks.c:117
-msgid "Wired"
-msgstr "Kabelgebunden"
-
-#: ../src/nmn-networks.c:122
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
 msgid "3G"
 msgstr "3G"
 
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-#| msgid "<b>Wired</b>"
-msgid "<b>Offline mode</b>"
-msgstr "<b>Offline-Modus</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Verkabelt</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Eine neue Verbindung hinzufügen</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Netzwerke</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Eine neue Verbindung hinzufügen"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Verborgenes Netzwerk"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Internes 3G-Modem und SIM-Karte wurden erkannt"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Zurück zum Netzwerk"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Verbindung speichern"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all network connections"
-msgstr "Dadurch werden alle Netzwerkverbindungen deaktiviert"
-
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Standard"
-
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G ist deaktiviert"
-
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Keine Modems erkannt"
-
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Keine"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128-bit Schlüssel"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "E_rstellen"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%s'."
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
 msgstr ""
-"Es werden Passwörter oder Schlüssel für die Verschlüsselung benötigt, um sich "
-"mit dem Funknetzwerk »%s« zu verbinden."
+"Es werden Passwörter oder Schlüssel für die Verschlüsselung benötigt, um "
+"sich mit dem Funknetzwerk »%s« zu verbinden."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Das drahtlose Netzwerk benötigt eine Authentifizierung"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Eine Authentifizierung wird vom drahtlosen Netzwerk benötigt"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Neues drahtloses Netzwerk erstellen"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Neues drahtloses Netzwerk"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Bitte einen Namen für das drahtlose Netzwerk, das erstellt werden soll, eingeben."
+msgstr ""
+"Bitte einen Namen für das drahtlose Netzwerk, das erstellt werden soll, "
+"eingeben."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Zu einem versteckten drahtlosen Netzwerk verbinden"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Verstecktes drahtloses Netzwerk"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Bitte Namen und Sicherheitsdetails für das versteckte drahtlose Netzwerk eingeben, mit dem Sie sich verbinden wollen. "
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Bitte Namen und Sicherheitsdetails für das versteckte drahtlose Netzwerk "
+"eingeben, mit dem Sie sich verbinden wollen. "
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Verbindung:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Anderes kabelgebundenes Netzwerk â?¦"
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Drahtloser _Adapter:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Netzwerkname:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Drahtloses Netzwerk:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
 "chosen</span>\n"
 "\n"
 "Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a Certificate "
-"Authority certificate?"
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Es wurde kein CA-Zertifikat ausgewählt</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">Es wurde kein CA-Zertifikat "
+"ausgewählt</span>\n"
 "\n"
 "Wenn Sie kein CA-Zertifikat verwenden, kann dies zu unsicheren Verbindungen "
 "oder schadhaften Funknetzwerken führen. Möchten Sie ein CA-Zertifikat "
 "auswählen?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "CA-Zertifikat auswählen �"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Warnhinweis nicht mehr anzeigen"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Authentifizierung:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1 ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5 ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Passwort anzeigen"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Benutzername:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Anonyme Identität:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA-Zertifikat:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Interne Authentifizierung:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP-Version:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identität:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Passwort des privaten Schlüssels:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Privater Schlüssel:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Benutzerzertifikat:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Schlüssel:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Schlüssel anzeigen"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP-Index:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Zertifikat der Zertifizierungsstelle auswählen..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Persönliches Zertifikat auswählen..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Privaten Schlüssel auswählen..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, oder PKCS#12 private Schlüssel (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER oder PEM Zertifikate (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Getunneltes TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr " einzuschalten und"
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr "Es können leider keine Netzwerke gefunden werden."
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr " Sie könnten versuchen, den Offline-Modus zu deaktivieren."
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr " Sie könnten versuchen,"
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr "Kabelgebunden"
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Eine neue Verbindung hinzufügen"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Netzwerkname:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+#, fuzzy
+msgid "Offline mode"
+msgstr "<b>Offline-Modus</b>"
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Dadurch werden alle Netzwerkverbindungen deaktiviert"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Verborgenes Netzwerk"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Nicht verbunden"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Netzwerkname:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Eine neue Verbindung hinzufügen"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Nicht verbunden"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Verbunden"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Getrennt"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Verbindung wird aufgebaut â?¦"
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Nicht verbunden"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Verbinde"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(ohne)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Verbinden durch:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manuell"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Link Local"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP-Adresse:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Teilnetzmaske:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Router:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G ist deaktiviert"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Internes 3G-Modem und SIM-Karte wurden erkannt"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Keine Modems erkannt"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Eine neue Verbindung hinzufügen"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Verborgenes Netzwerk"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Verbindung speichern"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Zurück zum Netzwerk"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Standard"
+
+#~ msgid "Unavailable"
+#~ msgstr "Nicht verfügbar"
+
+#~ msgid "On"
+#~ msgstr "An"
+
+#~ msgid "Off"
+#~ msgstr "Aus"
+
+#~ msgid "Advanced"
+#~ msgstr "Erweitert"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Verkabelt</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Eine neue Verbindung hinzufügen</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Netzwerke</b></big>"
diff --git a/po/el.po b/po/el.po
index 14d8431..fd4afdd 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-16 15:16\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,548 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(κανένα)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "ΤÏ?Ï?Ï?οÏ? Ï?Ï?νδεÏ?ηÏ?:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Î?η αÏ?Ï?Ï?μαÏ?η"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "ΤοÏ?ική Ï?Ï?νδεÏ?η"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "Î?ιεÏ?θÏ?νÏ?η IP:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Î?άÏ?κα subnet:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Î?Ï?ομολογηÏ?ήÏ?:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Î?η διαθέÏ?ιμο"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Î?νεÏ?γÏ?"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Î?νενεÏ?γÏ?"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "ΧÏ?Ï?ίÏ? Ï?Ï?νδεÏ?η"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "ΣÏ?νδεÏ?η"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Î?ίνεÏ?αι Ï?Ï?νδεÏ?η..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Î?Ï?οÏ?Ï?νδεÏ?η"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Î?ε Ï?Ï?νδεÏ?η"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Î?ια Ï?Ï?οÏ?Ï?Ï?ημένοÏ?Ï?"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Î?ειÏ?οÏ?Ï?γία Ï?Ï?ήÏ?ηÏ?</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Î?νÏ?Ï?Ï?μαÏ?η</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>ΠÏ?οÏ?θήκη νέαÏ? Ï?Ï?νδεÏ?ηÏ?</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Î?ίκÏ?Ï?α</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "ΠÏ?οÏ?θήκη νέαÏ? Ï?Ï?νδεÏ?ηÏ?"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Î?Ï?Ï?Ï?Ï? δίκÏ?Ï?ο"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Î?νÏ?οÏ?ίÏ?Ï?ηκαν εÏ?Ï?Ï?εÏ?ικÏ? 3G modem και κάÏ?Ï?α SIM"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Î?Ï?ιÏ?Ï?Ï?οÏ?ή Ï?Ï?ο Î?ίκÏ?Ï?ο"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Î?Ï?οθήκεÏ?Ï?η Ï?Ï?νδεÏ?ηÏ?"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Î?Ï?Ï?ι θα αÏ?ενεÏ?γοÏ?οιηθοÏ?ν Ï?λεÏ? οι αÏ?Ï?Ï?μαÏ?εÏ? Ï?Ï?νδέÏ?ειÏ?"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "ΠÏ?οεÏ?ιλογή"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "Το 3G αÏ?ενεÏ?γοÏ?οιήθηκε"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Î?εν ενÏ?οÏ?ίÏ?Ï?ηκαν modem"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Î?αμία"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "Î?λειδί WEP 40/128 bit"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "ΣÏ?νθημαÏ?ική Ï?Ï?άÏ?η WEP 128 bit"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "_Î?ημιοÏ?Ï?γία"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Î?Ï?αιÏ?οÏ?νÏ?αι κÏ?δικοί Ï?Ï?Ï?Ï?βαÏ?ηÏ? ή κλειδιά κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?ηÏ? για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Î?Ï?αιÏ?οÏ?νÏ?αι κÏ?δικοί Ï?Ï?Ï?Ï?βαÏ?ηÏ? ή κλειδιά κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?ηÏ? για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο "
+"αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο '%s'."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Î?Ï?αιÏ?είÏ?αι έλεγÏ?οÏ? Ï?αÏ?Ï?Ï?Ï?ηÏ?αÏ? Ï?Ï?ο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Î?Ï?αιÏ?είÏ?αι έλεγÏ?οÏ? Ï?αÏ?Ï?Ï?Ï?ηÏ?αÏ? αÏ?Ï? Ï?ο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Î?ημιοÏ?Ï?γία νέοÏ? αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Î?έο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Î?αÏ?αÏ?Ï?Ï?ήÏ?Ï?ε ένα Ï?νομα για Ï?ο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο Ï?οÏ? θέλεÏ?ε να δημιοÏ?Ï?γήÏ?εÏ?ε."
+msgstr ""
+"Î?αÏ?αÏ?Ï?Ï?ήÏ?Ï?ε ένα Ï?νομα για Ï?ο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο Ï?οÏ? θέλεÏ?ε να δημιοÏ?Ï?γήÏ?εÏ?ε."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "ΣÏ?νδεÏ?η Ï?ε κÏ?Ï?Ï?Ï? αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Î?Ï?Ï?Ï?Ï? αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Î?αÏ?αÏ?Ï?Ï?ήÏ?Ï?ε Ï?ο Ï?νομα και Ï?α Ï?Ï?οιÏ?εία αÏ?Ï?αλείαÏ? Ï?οÏ? κÏ?Ï?Ï?οÏ? αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?, Ï?Ï?ο οÏ?οίο θέλεÏ?ε να Ï?Ï?νδεθείÏ?ε."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Î?αÏ?αÏ?Ï?Ï?ήÏ?Ï?ε Ï?ο Ï?νομα και Ï?α Ï?Ï?οιÏ?εία αÏ?Ï?αλείαÏ? Ï?οÏ? κÏ?Ï?Ï?οÏ? αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?, "
+"Ï?Ï?ο οÏ?οίο θέλεÏ?ε να Ï?Ï?νδεθείÏ?ε."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "_ΣÏ?νδεÏ?η"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "ΣÏ?νδεÏ?η:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Î?λλο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Î?Ï?Ï?Ï?μαÏ?οÏ? _Ï?Ï?οÏ?αÏ?μογέαÏ?:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "Î?νομα _δικÏ?Ï?οÏ?:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Î?Ï?Ï?άλεια αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Î?εν εÏ?ιλέÏ?θηκε Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ? κάÏ?οιαÏ? αÏ?Ï?ήÏ? έκδοÏ?ηÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν</span>\n\nÎ?ν δεν Ï?Ï?ηÏ?ιμοÏ?οιηθεί κάÏ?οια αÏ?Ï?ή έκδοÏ?ηÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν (CA), μÏ?οÏ?εί να Ï?Ï?οκÏ?Ï?οÏ?ν Ï?Ï?νδέÏ?ειÏ? Ï?ε μη αÏ?Ï?αλή, εÏ?ικίνδÏ?να αÏ?Ï?Ï?μαÏ?α δίκÏ?Ï?α.  Î?έλεÏ?ε να εÏ?ιλέξεÏ?ε ένα Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ? μιαÏ? αÏ?Ï?ήÏ? έκδοÏ?ηÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν;"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Î?εν εÏ?ιλέÏ?θηκε Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ? κάÏ?οιαÏ? "
+"αÏ?Ï?ήÏ? έκδοÏ?ηÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν</span>\n"
+"\n"
+"Î?ν δεν Ï?Ï?ηÏ?ιμοÏ?οιηθεί κάÏ?οια αÏ?Ï?ή έκδοÏ?ηÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν (CA), μÏ?οÏ?εί να "
+"Ï?Ï?οκÏ?Ï?οÏ?ν Ï?Ï?νδέÏ?ειÏ? Ï?ε μη αÏ?Ï?αλή, εÏ?ικίνδÏ?να αÏ?Ï?Ï?μαÏ?α δίκÏ?Ï?α.  Î?έλεÏ?ε να "
+"εÏ?ιλέξεÏ?ε ένα Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ? μιαÏ? αÏ?Ï?ήÏ? έκδοÏ?ηÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν;"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Î?Ï?ιλογή Ï?ιÏ?Ï?οÏ?οιηÏ?ικοÏ? CA"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Î?α μην Ï?Ï?οειδοÏ?οιηθÏ? ξανά"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "ΠαÏ?άβλεÏ?η"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Î?λεγÏ?οÏ? Ï?αÏ?Ï?Ï?Ï?ηÏ?αÏ?:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Î?Ï?δικÏ?Ï? Ï?Ï?Ï?Ï?βαÏ?ηÏ?:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Î?μÏ?άνιÏ?η κÏ?δικοÏ? Ï?Ï?Ï?Ï?βαÏ?ηÏ?"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Î?νομα Ï?Ï?ήÏ?Ï?η:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Î?νÏ?νÏ?μη Ï?αÏ?Ï?Ï?Ï?ηÏ?α:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "ΠιÏ?Ï?οÏ?οιηÏ?ικÏ? CA:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Î?νδÏ?Ï?εÏ?οÏ? έλεγÏ?οÏ? Ï?αÏ?Ï?Ï?Ï?ηÏ?αÏ?:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Î?κδοÏ?η PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "ΤαÏ?Ï?Ï?Ï?ηÏ?α:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Î?Ï?δικÏ?Ï? Ï?Ï?Ï?Ï?βαÏ?ηÏ? ιδιÏ?Ï?ικοÏ? κλειδιοÏ?:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Î?διÏ?Ï?ικÏ? κλειδί:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "ΠιÏ?Ï?οÏ?οιηÏ?ικÏ? Ï?Ï?ήÏ?Ï?η:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Î?λειδί:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Î?μÏ?άνιÏ?η κλειδιοÏ?"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Î?είκÏ?ηÏ? WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "ΤÏ?Ï?οÏ?:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Î?Ï?ιλέξÏ?ε ένα Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ? αÏ?Ï? κάÏ?οια αÏ?Ï?ή έκδοÏ?ηÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Î?Ï?ιλέξÏ?ε Ï?ο Ï?Ï?οÏ?Ï?Ï?ικÏ? Ï?αÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Î?Ï?ιλέξÏ?ε Ï?ο ιδιÏ?Ï?ικÏ? Ï?αÏ? κλειδί..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Î?διÏ?Ï?ικά κλειδιά DER, PEM ή PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "ΠιÏ?Ï?οÏ?οιηÏ?ικά DER ή PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "ΠÏ?οÏ?θήκη νέαÏ? Ï?Ï?νδεÏ?ηÏ?"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "Î?νομα _δικÏ?Ï?οÏ?:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Î?Ï?Ï?ι θα αÏ?ενεÏ?γοÏ?οιηθοÏ?ν Ï?λεÏ? οι αÏ?Ï?Ï?μαÏ?εÏ? Ï?Ï?νδέÏ?ειÏ?"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Î?Ï?Ï?Ï?Ï? δίκÏ?Ï?ο"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "ΧÏ?Ï?ίÏ? Ï?Ï?νδεÏ?η"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "Î?νομα _δικÏ?Ï?οÏ?:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "ΠÏ?οÏ?θήκη νέαÏ? Ï?Ï?νδεÏ?ηÏ?"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "ΧÏ?Ï?ίÏ? Ï?Ï?νδεÏ?η"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Î?ε Ï?Ï?νδεÏ?η"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Î?Ï?οÏ?Ï?νδεÏ?η"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Î?ίνεÏ?αι Ï?Ï?νδεÏ?η..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "ΧÏ?Ï?ίÏ? Ï?Ï?νδεÏ?η"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "ΣÏ?νδεÏ?η"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(κανένα)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "ΤÏ?Ï?Ï?οÏ? Ï?Ï?νδεÏ?ηÏ?:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Î?η αÏ?Ï?Ï?μαÏ?η"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "ΤοÏ?ική Ï?Ï?νδεÏ?η"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "Î?ιεÏ?θÏ?νÏ?η IP:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Î?άÏ?κα subnet:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Î?Ï?ομολογηÏ?ήÏ?:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "Το 3G αÏ?ενεÏ?γοÏ?οιήθηκε"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Î?νÏ?οÏ?ίÏ?Ï?ηκαν εÏ?Ï?Ï?εÏ?ικÏ? 3G modem και κάÏ?Ï?α SIM"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Î?εν ενÏ?οÏ?ίÏ?Ï?ηκαν modem"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "ΠÏ?οÏ?θήκη νέαÏ? Ï?Ï?νδεÏ?ηÏ?"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Î?Ï?Ï?Ï?Ï? δίκÏ?Ï?ο"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Î?Ï?οθήκεÏ?Ï?η Ï?Ï?νδεÏ?ηÏ?"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Î?Ï?ιÏ?Ï?Ï?οÏ?ή Ï?Ï?ο Î?ίκÏ?Ï?ο"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "ΠÏ?οεÏ?ιλογή"
+
+#~ msgid "Unavailable"
+#~ msgstr "Î?η διαθέÏ?ιμο"
+
+#~ msgid "On"
+#~ msgstr "Î?νεÏ?γÏ?"
+
+#~ msgid "Off"
+#~ msgstr "Î?νενεÏ?γÏ?"
+
+#~ msgid "Advanced"
+#~ msgstr "Î?ια Ï?Ï?οÏ?Ï?Ï?ημένοÏ?Ï?"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Î?ειÏ?οÏ?Ï?γία Ï?Ï?ήÏ?ηÏ?</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Î?νÏ?Ï?Ï?μαÏ?η</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>ΠÏ?οÏ?θήκη νέαÏ? Ï?Ï?νδεÏ?ηÏ?</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Î?ίκÏ?Ï?α</b></big>"
diff --git a/po/es.po b/po/es.po
index 03aac38..433cc81 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-netbook 0.2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=NetworkManager&component=network-manager-netbook\n"
-"POT-Creation-Date: 2009-10-10 13:20+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-11-02 11:57+0100\n"
 "Last-Translator: Jorge González <jorgegonz svn gnome org>\n"
 "Language-Team: Español <gnome-es-list gnome org>\n"
@@ -20,272 +19,129 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:104
-msgid "(none)"
-msgstr "(ninguno)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:475
-msgid "Connect by:"
-msgstr "Conectar mediante:"
-
-#: ../src/nmn-connection-details.c:478
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:483
-msgid "Manual"
-msgstr "Manual"
-
-#: ../src/nmn-connection-details.c:488
-msgid "Link Local"
-msgstr "Local del enlace"
-
-#. Address
-#: ../src/nmn-connection-details.c:496
-msgid "IP Address:"
-msgstr "Dirección IP:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:505
-msgid "Subnet mask:"
-msgstr "Máscara de subred:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:514
-msgid "Router:"
-msgstr "Router:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:523
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "No disponible"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Encendido"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Apagado"
-
-#: ../src/nmn-network-item.c:254
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: ../src/nmn-network-item.c:255 ../src/nmn-network-item.c:695
-msgid "Connect"
-msgstr "Conectar"
-
-#: ../src/nmn-network-item.c:258
-msgid "Connecting..."
-msgstr "Conectandoâ?¦"
-
-#: ../src/nmn-network-item.c:259 ../src/nmn-network-item.c:263
-msgid "Disconnect"
-msgstr "Desconectar"
-
-#: ../src/nmn-network-item.c:262
-msgid "Connected"
-msgstr "Conectado"
-
-#: ../src/nmn-network-item.c:690
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: ../src/nmn-networks.c:75
-msgid " and "
-msgstr " y "
-
-#: ../src/nmn-networks.c:86
-msgid "Sorry, we can't find any networks."
-msgstr "No se encontró ninguna red."
-
-#: ../src/nmn-networks.c:89
-msgid " You could try disabling Offline mode."
-msgstr " Puede intentarlo desactivando el modo Desconectado."
+#: ../libnm-gtk/nm-ethernet-item.c:38
+#, fuzzy
+msgid "wired"
+msgstr "Conexión cableada"
 
-#: ../src/nmn-networks.c:109
-msgid " You could try turning on "
-msgstr " Puede intentarlo activándo"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-networks.c:112
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
 msgid "WiFi"
 msgstr "WiFi"
 
-#: ../src/nmn-networks.c:117
-msgid "Wired"
-msgstr "Conexión cableada"
-
-#: ../src/nmn-networks.c:122
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
 msgid "3G"
 msgstr "3G"
 
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Offline mode</b>"
-msgstr "<b>Modo desconectado:</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Conexión cableada</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Añadir una conexión nueva</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Redes</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Añadir una conexión nueva"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Red oculta"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Módem 3G interno y tarjeta SIM detectados"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Volver a las redes"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Guardar la conexión"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all network connections"
-msgstr "Esto desactivará todas las conexiones de red"
-
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Defecto"
-
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G desactivado"
-
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "No se detectó ningún módem"
-
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Ninguno"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "Llave WEP 40/128-bit"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "Contrase�a WEP 128-bit"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP din�mico (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Empresarial"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Contrase�as o llaves de encripci�n son requeridas para acceder a la red inal�mbrica '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Contrase�as o llaves de encripci�n son requeridas para acceder a la red "
+"inal�mbrica '%s'."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Autenticaci�n de red inal�mbrica requerida"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Autenticaci�n requerida por la red inal�mbrica"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Crear nueva red inal�mbrica"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Nueva red inal�mbrica"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Ingresa un nombre para la red inal�mbrica que deseas crear."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Conectar a una red inal�mbrica no visible"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Red inal�mbrica no visible"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Ingresa el nombre y los detalles de seguridad de la red inal�mbrica a la que deseas conectarte."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Ingresa el nombre y los detalles de seguridad de la red inal�mbrica a la que "
+"deseas conectarte."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Conexión:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Otra red inalámbrica�"
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "_Adaptador inalámbrico:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Nombre de la red:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "Seg_uridad inalámbrica:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
 "chosen</span>\n"
@@ -301,149 +157,408 @@ msgstr ""
 "conexiones inseguras, redes inalámbricas promiscuas. ¿Quiere elegir un "
 "certificado Certificate Authority?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Elegir certificado CA"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "No preguntar de nuevo"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Autenticación:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Mostrar contraseña"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Usuario:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Identidad anónima:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Certificado CA"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Autenticación interna:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Versión de PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identidad:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Contraseña de clave privada:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Clave privada:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Certificado de usuario:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Clave:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Mostrar clave"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Ã?ndice WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Escoge un certificado de una Autoridad Certificadora..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Escoge tu certificado personal..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Escoge tu llave privada..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Llaves privadas DER, PEM, o PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificados DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunelado TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegido (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr " y "
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr "No se encontró ninguna red."
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr " Puede intentarlo desactivando el modo Desconectado."
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr " Puede intentarlo activándo"
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr "Conexión cableada"
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Añadir una conexión nueva"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Nombre de la red:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+#, fuzzy
+msgid "Offline mode"
+msgstr "<b>Modo desconectado:</b>"
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Esto desactivará todas las conexiones de red"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Red oculta"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Desconectado"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Nombre de la red:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Añadir una conexión nueva"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Desconectado"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Desconectar"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Conectandoâ?¦"
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Conectar"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(ninguno)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Conectar mediante:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manual"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Local del enlace"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "Dirección IP:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Máscara de subred:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Router:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G desactivado"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Módem 3G interno y tarjeta SIM detectados"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "No se detectó ningún módem"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Añadir una conexión nueva"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Red oculta"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Guardar la conexión"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Volver a las redes"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Defecto"
+
+#~ msgid "Unavailable"
+#~ msgstr "No disponible"
+
+#~ msgid "On"
+#~ msgstr "Encendido"
+
+#~ msgid "Off"
+#~ msgstr "Apagado"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Conexión cableada</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Añadir una conexión nueva</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Redes</b></big>"
diff --git a/po/et.po b/po/et.po
index 06393bd..ef0e374 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,9 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-netbook 0.2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=NetworkManager&component=network-manager-netbook\n"
-"POT-Creation-Date: 2009-10-10 13:20+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-27 16:31+0200\n"
 "PO-Revision-Date: 2009-11-01 18:28+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
 "Language-Team: \n"
@@ -23,163 +22,60 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "(none)"
-msgstr "(Puudub)"
-
-#. Connect by:
-msgid "Connect by:"
-msgstr "Ã?henda:"
-
-msgid "DHCP"
-msgstr "DHCP"
-
-msgid "Manual"
-msgstr "Käsitsi:"
-
-msgid "Link Local"
-msgstr "Link Local"
-
-#. Address
-msgid "IP Address:"
-msgstr "IP Aadress:"
-
-#. Netmask
-msgid "Subnet mask:"
-msgstr "Alamvõrgu mask:"
-
-#. Gateway
-msgid "Router:"
-msgstr "Gateway:"
-
-#. DNS
-msgid "DNS:"
-msgstr "DNS:"
-
-msgid "Unavailable"
-msgstr "Pole saadaval"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-msgid "On"
-msgstr "Sees"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-msgid "Off"
-msgstr "Väljas"
-
-msgid "Disconnected"
-msgstr "Ã?hendamata"
-
-msgid "Connect"
-msgstr "Ã?henda"
-
-msgid "Connecting..."
-msgstr "Ã?hendamine..."
-
-msgid "Disconnect"
-msgstr "Ã?henda lahti"
-
-msgid "Connected"
-msgstr "Ã?hendatud"
-
-msgid "Advanced"
-msgstr "Laiendatud"
-
-msgid " and "
-msgstr " ja "
-
-msgid "Sorry, we can't find any networks."
-msgstr "Vabandust, ühtegi võrku ei leitud."
-
-msgid " You could try disabling Offline mode."
-msgstr "Võid proovida võrguta režiimi väljalülitamist."
+#: ../libnm-gtk/nm-ethernet-item.c:38
+#, fuzzy
+msgid "wired"
+msgstr "Juhtmega"
 
-msgid " You could try turning on "
-msgstr "Võid proovida sisselülitada "
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
 msgid "WiFi"
 msgstr "WiFi"
 
-msgid "Wired"
-msgstr "Juhtmega"
-
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
 msgid "3G"
 msgstr "3G"
 
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#| msgid "<b>Wired</b>"
-msgid "<b>Offline mode</b>"
-msgstr "<b>Võrguta režiim</b>"
-
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-msgid "<b>Wired</b>"
-msgstr "<b>Juhtmega</b>"
-
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Lisa uus ühendus</b></big>"
-
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Võrgud</b></big>"
-
-msgid "Add a new connection"
-msgstr "Lisa uus ühendus"
-
-msgid "Hidden network"
-msgstr "Varjatud juhtmeta võrk"
-
-msgid "Internal 3G modem and SIM card detected"
-msgstr "3G modem ja SIM kaart leitud"
-
-msgid "Return to Networking"
-msgstr "Tagasi"
-
-msgid "Save connection"
-msgstr "Salvesta ühendus"
-
-#| msgid "This will disable all wireless connections"
-msgid "This will disable all network connections"
-msgstr "Keelab kõik võrguühendused"
-
-msgid "Default"
-msgstr "Vaikimisi"
-
-msgid "3G disabled"
-msgstr "3G keelatud"
-
-msgid "No modems detected"
-msgstr "Ei leitud ühtegi modemit"
-
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Puudub"
 
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128-bitine võti"
 
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitine parool"
 
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dünaamiline WEP (802.1x)"
 
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "Dünaamiline WEP"
 
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ettevõtte"
 
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "Loo..."
 
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
@@ -188,51 +84,66 @@ msgstr ""
 "Paroolid või krüpteerimisvõtmed on vajalikud ligipääsuks juhtmeta võrgule '%"
 "s'."
 
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Juhtmeta võrgu salasõna päring"
 
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Juhtmeta võrgu jaoks on vaja salasõna"
 
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Loo uus juhtmeta võrk"
 
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Uus juhtmeta võrk"
 
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Sisesta loodava juhtmeta võrgu nimi"
 
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr " Varjatud juhtmeta võrku ühendumine"
 
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Varjatud juhmeta võrk"
 
+#: ../libnm-gtk/wireless-dialog.c:887
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 msgstr ""
 "Sisesta varjatud juhtmeta võrgu nimi ja parool, millesse tahad ühenduda."
 
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "Ã?henda"
 
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Ã?henda"
 
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Loo uus juhtmeta võrk..."
 
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Võrgukaart:"
 
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "Võrgu nimi:"
 
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Juhtmeta võrgu turvalisus:"
 
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
 "chosen</span>\n"
@@ -248,98 +159,408 @@ msgstr ""
 "ühendumise ebaturvalistesse, kuritegelikesse võrkudesse. Kas sa valiksid "
 "siiski sertifitseerimiskeskuse sertifikaadifaili?"
 
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Vali privaatsertifikaati fail"
 
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Ã?ra enam hoiata"
 
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Eira"
 
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Autentimine:"
 
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Parool:"
 
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Näita parooli"
 
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Kasutajanimi:"
 
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Anonüümne identiteet:"
 
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Sertifitseerimiskeskuse sertifikaadifail:"
 
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Sise-autentimine:"
 
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP versioon:"
 
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identiteet:"
 
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Privaatvõtme parool:"
 
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Privaatvõtme fail:"
 
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Kasutaja sertifikaadifail:"
 
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Võti:"
 
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Näita võtit"
 
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP indeks:"
 
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Liik:"
 
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Vali sertifitseerimiskeskuse sertifikaadifail..."
 
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Vali privaatsertifikaati fail..."
 
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Vali privaatvõtme fail..."
 
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM või PKCS#12 privaatvõtmed (*.der, *.pem, *.p12)"
 
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER või PEM sertifikaadid (*.der, *.pem, *.crt, *.cer)"
 
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunnelis TLS"
 
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Kaitstud EAP (PEAP)"
+
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr " ja "
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr "Vabandust, ühtegi võrku ei leitud."
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr "Võid proovida võrguta režiimi väljalülitamist."
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr "Võid proovida sisselülitada "
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr "Juhtmega"
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Lisa uus ühendus"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "Võrgu nimi:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+#, fuzzy
+msgid "Offline mode"
+msgstr "<b>Võrguta režiim</b>"
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Keelab kõik võrguühendused"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Varjatud juhtmeta võrk"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Ã?hendamata"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "Võrgu nimi:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Lisa uus ühendus"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Ã?hendamata"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Ã?hendatud"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Ã?henda lahti"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Ã?hendamine..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Ã?hendamata"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Ã?henda"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(Puudub)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Ã?henda:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Käsitsi:"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Link Local"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP Aadress:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Alamvõrgu mask:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Gateway:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G keelatud"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "3G modem ja SIM kaart leitud"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Ei leitud ühtegi modemit"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Lisa uus ühendus"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Varjatud juhtmeta võrk"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Salvesta ühendus"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Tagasi"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Vaikimisi"
+
+#~ msgid "Unavailable"
+#~ msgstr "Pole saadaval"
+
+#~ msgid "On"
+#~ msgstr "Sees"
+
+#~ msgid "Off"
+#~ msgstr "Väljas"
+
+#~ msgid "Advanced"
+#~ msgstr "Laiendatud"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Juhtmega</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Lisa uus ühendus</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Võrgud</b></big>"
diff --git a/po/fi.po b/po/fi.po
index 1fabc43..75948c9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-16 15:17\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(ei mitään)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "Yhdistämistapa:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Manuaalinen"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Linkki paikalliseen"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP-osoite:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Aliverkon peite:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Reititin:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Ei käytettävissä"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Päällä"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Pois päältä"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Yhteys katkaistu"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "Yhdistä"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Yhdistetään..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Katkaise yhteys"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Yhteydessä"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Lisäasetukset"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Lentotila</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Langallinen</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Lisää uusi yhteys</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Verkot</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Lisää uusi yhteys"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Piilotettu verkko"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Havaittiin sisäinen 3G-modeemi ja SIM-kortti"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Palaa verkkoon"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Tallenna yhteys"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Tämä poistaa kaikki langattomat yhteydet käytöstä"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Oletus"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G poistettu käytöstä"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Modeemeita ei ole havaittu"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128-bittinen avain"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen salauslause"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynaaminen WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ja WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ja WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "L_uo"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Langattoman verkon %s käyttäminen edellyttää salasanoja tai salausavaimia."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Langattoman verkon %s käyttäminen edellyttää salasanoja tai salausavaimia."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Langattoman verkon todennus vaaditaan"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Langattoman verkon vaatima todennus"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Luo uusi langaton verkko"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Uusi langaton verkko"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Anna luotavalle langattomalle verkolle nimi."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Muodosta yhteys piilotettuun langattomaan verkkoon"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Piilotettu langaton verkko"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Anna sen piilotetun langattoman verkon nimi ja suojaustiedot, johon haluat muodostaa yhteyden."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Anna sen piilotetun langattoman verkon nimi ja suojaustiedot, johon haluat "
+"muodostaa yhteyden."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "_Yhdistä"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Yhteys:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Muu langaton verkko..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Langaton _sovitin:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Verkon nimi:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "L_angaton suojaus:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Varmenteen myöntäjän varmennetta ei ole valittu</span>\n\nJos et käytä varmenteen myöntäjän varmennetta, yhteys voidaan muodostaa suojaamattomiin langattomiin verkkoihin. Haluatko valita varmenteen myöntäjän varmenteen?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Varmenteen myöntäjän varmennetta ei "
+"ole valittu</span>\n"
+"\n"
+"Jos et käytä varmenteen myöntäjän varmennetta, yhteys voidaan muodostaa "
+"suojaamattomiin langattomiin verkkoihin. Haluatko valita varmenteen "
+"myöntäjän varmenteen?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Valitse varmenteen myäntäjän varmenne"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "�lä näytä tätä varoitusta enää uudelleen"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ohita"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Todennus:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Näytä salasana"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Käyttäjänimi:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Anonyymi henkilöllisyys:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Varmenne:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Sisäinen varmennus:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP-versio:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Henkilöllisyys:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Yksityisen avaimen salasana:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Yksityinen avain:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Käyttäjän varmenne:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Avain:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Näytä avain"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP-indeksi:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Valitse varmenteen myöntäjän varmenne..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Valitse oma varmenne..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Valitse oma yksityinen avain..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER- PEM- tai PKCS#12 -yksityiset avaimet (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunneloitu TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Suojattu EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Lisää uusi yhteys"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Verkon nimi:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Tämä poistaa kaikki langattomat yhteydet käytöstä"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Piilotettu verkko"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Yhteys katkaistu"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Verkon nimi:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Lisää uusi yhteys"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Yhteys katkaistu"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Yhteydessä"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Katkaise yhteys"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Yhdistetään..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Yhteys katkaistu"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Yhdistä"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(ei mitään)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Yhdistämistapa:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manuaalinen"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Linkki paikalliseen"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP-osoite:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Aliverkon peite:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Reititin:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G poistettu käytöstä"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Havaittiin sisäinen 3G-modeemi ja SIM-kortti"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Modeemeita ei ole havaittu"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Lisää uusi yhteys"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Piilotettu verkko"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Tallenna yhteys"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Palaa verkkoon"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Oletus"
+
+#~ msgid "Unavailable"
+#~ msgstr "Ei käytettävissä"
+
+#~ msgid "On"
+#~ msgstr "Päällä"
+
+#~ msgid "Off"
+#~ msgstr "Pois päältä"
+
+#~ msgid "Advanced"
+#~ msgstr "Lisäasetukset"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Lentotila</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Langallinen</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Lisää uusi yhteys</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Verkot</b></big>"
diff --git a/po/fr.po b/po/fr.po
index 63bdee2..0bc956a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-17 11:24\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,548 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(aucun)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "Mode de connexion :"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Manuel"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Link Local"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "Adresse IP :"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Masque de sous-réseau :"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Routeur :"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS :"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Indisponible"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Actif"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Désactivé"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Déconnecté"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "Se connecter"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Connexion en cours..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Se déconnecter"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Connecté"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Avancé"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Mode Flight</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Câblé</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Ajouter une nouvelle connexion</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Réseaux</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Ajouter une nouvelle connexion"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Réseau masqué"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Carte SIM et modem 3G interne détectés"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Retour à la réseautique"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Enregistrer la connexion"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Cette opération désactive toutes les connexions sans fil."
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Valeur par défaut"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G désactivé"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Aucun modem détecté"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "Clé WEP 40/128 bits"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "Phrase secrète WEP 128 bits"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dynamique (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA et WPA2 Personnel"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA et WPA2 Entreprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "C_réer"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Des clés de codage ou des mots de passe sont requis pour accéder au réseau sans fil '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Des clés de codage ou des mots de passe sont requis pour accéder au réseau "
+"sans fil '%s'."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Une authentification au réseau sans fil est requise."
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Une authentification est requise par le réseau sans fil."
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Créer un nouveau réseau sans fil"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Nouveau réseau sans fil"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Entrez un nom pour le réseau sans fil que vous souhaitez créer."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Se connecter à un réseau sans fil masqué"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Réseau sans fil masqué"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Entrez le nom et les détails de sécurité du réseau sans fil masqué auquel vous souhaitez vous connecter."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Entrez le nom et les détails de sécurité du réseau sans fil masqué auquel "
+"vous souhaitez vous connecter."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "Se c_onnecter"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Connexion :"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Autre réseau sans fil..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "_Adaptateur sans fil :"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Nom du réseau :"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "Sécurité sans _fil :"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Aucun certificat d'autorité de certification sélectionné</span>\n\nSi vous ne choisissez pas un certificat d'une autorité de certification (CA), vous risquez de vous connecter à des réseaux sans fil non sécurisés malveillants. Voulez-vous sélectionner un certificat d'autorité de certification ?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Aucun certificat d'autorité de "
+"certification sélectionné</span>\n"
+"\n"
+"Si vous ne choisissez pas un certificat d'une autorité de certification "
+"(CA), vous risquez de vous connecter à des réseaux sans fil non sécurisés "
+"malveillants. Voulez-vous sélectionner un certificat d'autorité de "
+"certification ?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Sélectionner un certificat CA"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Ne plus m'avertir"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Authentification :"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Afficher le mot de passe"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Nom d'utilisateur :"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Identité anonyme :"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Certificat CA :"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Authentification interne :"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Version PEAP :"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identité :"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Mot de passe de la clé privée :"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Clé privée :"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Certificat utilisateur :"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Clé :"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Afficher la clé"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Index WEP :"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Type :"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Choisir un certificat d'une autorité de certification..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Choisir votre certificat personnel..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Choisir votre clé privée..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Clés privées DER, PEM ou PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificats DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protégé (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Ajouter une nouvelle connexion"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Nom du réseau :"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Cette opération désactive toutes les connexions sans fil."
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Réseau masqué"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Déconnecté"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Nom du réseau :"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Ajouter une nouvelle connexion"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Déconnecté"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Connecté"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Se déconnecter"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Connexion en cours..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Déconnecté"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Se connecter"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(aucun)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Mode de connexion :"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manuel"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Link Local"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "Adresse IP :"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Masque de sous-réseau :"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Routeur :"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS :"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G désactivé"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Carte SIM et modem 3G interne détectés"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Aucun modem détecté"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Ajouter une nouvelle connexion"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Réseau masqué"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Enregistrer la connexion"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Retour à la réseautique"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Valeur par défaut"
+
+#~ msgid "Unavailable"
+#~ msgstr "Indisponible"
+
+#~ msgid "On"
+#~ msgstr "Actif"
+
+#~ msgid "Off"
+#~ msgstr "Désactivé"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancé"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Mode Flight</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Câblé</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Ajouter une nouvelle connexion</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Réseaux</b></big>"
diff --git a/po/gu.po b/po/gu.po
index b8af849..be2ab40 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-netbook.po.master.gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=network-manager-netbook\n";
-"POT-Creation-Date: 2009-10-27 03:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-10-28 16:16+0530\n"
 "Last-Translator: Sweta Kothari <swkothar redhat com>\n"
 "Language-Team: Gujarati\n"
@@ -18,276 +18,125 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/nmn-connection-details.c:104
-msgid "(none)"
-msgstr "(��� નહિ�)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:475
-msgid "Connect by:"
-msgstr "વડ� ��ડાવ�:"
-
-#: ../src/nmn-connection-details.c:478
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:483
-msgid "Manual"
-msgstr ""
-
-#: ../src/nmn-connection-details.c:488
-msgid "Link Local"
-msgstr ""
-
-#. Address
-#: ../src/nmn-connection-details.c:496
-msgid "IP Address:"
-msgstr "IP સરનામ��:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:505
-msgid "Subnet mask:"
-msgstr "સબન�� માસ��:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:514
-msgid "Router:"
-msgstr "રા��ર:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:523
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "બિન�પલ�બધ"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "�ાલ�"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "બ�ધ"
-
-#: ../src/nmn-network-item.c:254
-msgid "Disconnected"
-msgstr ""
-
-#: ../src/nmn-network-item.c:255 ../src/nmn-network-item.c:695
-msgid "Connect"
-msgstr ""
-
-#: ../src/nmn-network-item.c:258
-msgid "Connecting..."
-msgstr "��ડાણ �ર� રહ�યા ��..."
-
-#: ../src/nmn-network-item.c:259 ../src/nmn-network-item.c:263
-msgid "Disconnect"
-msgstr "��ડાણન� ત�ડ�"
-
-#: ../src/nmn-network-item.c:262
-msgid "Connected"
-msgstr "��ડાય�લ"
-
-#: ../src/nmn-network-item.c:690
-msgid "Advanced"
-msgstr "�ન�નત"
-
-#: ../src/nmn-networks.c:75
-msgid " and "
-msgstr " �ન� "
-
-#: ../src/nmn-networks.c:86
-msgid "Sorry, we can't find any networks."
-msgstr "દિલ��ર ���, �મ� ���પણ ન��વર���ન� શ�ધ� શ��યા નહિ�."
-
-#: ../src/nmn-networks.c:89
-msgid " You could try disabling Offline mode."
-msgstr "તમ� �ફલા�ન સ�થિતિન� નિષ���રિય �રવાન� પ�રયત�ન �ર� શ�� ��."
+#: ../libnm-gtk/nm-ethernet-item.c:38
+#, fuzzy
+msgid "wired"
+msgstr "વાયરવાળ��"
 
-#: ../src/nmn-networks.c:109
-msgid " You could try turning on "
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
 msgstr ""
 
-#: ../src/nmn-networks.c:112
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
 msgid "WiFi"
 msgstr "WiFi"
 
-#: ../src/nmn-networks.c:117
-msgid "Wired"
-msgstr "વાયરવાળ��"
-
-#: ../src/nmn-networks.c:122
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
 msgid "3G"
 msgstr "3G"
 
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Offline mode</b>"
-msgstr "<b>�ફલા�ન સ�થિતિ</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>વાયરવાળ��</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>નવા� ��ડાણન� �મ�ર�</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>ન��વર���</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "નવા� ��ડાણન� �મ�ર�"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "��પાય�લ ન��વર��"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "��તરિ� 3G મ�ડ�મ �ન� SIM �ાર�ડ મળ�યા�"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr ""
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "��ડાણન� સ���રહ�"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all network connections"
-msgstr "� બધા ન��વર�� ��ડાણ�ન� નિષ���રિય �રશ�"
-
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "મ�ળભ�ત"
-
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G નિષ���રિય થય�લ"
-
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "મ�ડ�મ� મળ�યા નહિ�"
-
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "��� નહિ�"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128-bit ��"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit પાસફ�ર��"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "બનાવ� (_r)"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
 "s'."
 msgstr ""
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "વાયરલ�સ ન��વર�� સત�તાધિ�રણ �ર�ર�"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "સત�તાધિ�રણ � વાયરલ�સ ન��વર�� દ�દારા �ર�ર� ��"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "નવા� વાયરલ�સ ન��વર��ન� બનાવ�"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "નવ�� વાયરલ�સ ન��વર��"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "વાયરલ�સ ન��વર�� �� તમ� બનાવવા મા��� �� ત� મા�� નામન� દા�લ �ર�."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "��પાય�લ વાયરલ�સ ન��વર�� ન� ��ડ�"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "��પાય�લ વાયરલ�સ ન��વર��"
 
-#: ../src/wireless-dialog.c:886
+#: ../libnm-gtk/wireless-dialog.c:887
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 msgstr ""
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "��ડાવ� (_o)"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "��ડાણ:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "બ��ા વાયરલ�સ ન��વર��..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "વાયરલ�સ �ડપ��ર (_a):"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "ન��વર�� નામ (_N):"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "વાયરલ�સ સ�ર��ષા (_W):"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
 "chosen</span>\n"
@@ -297,149 +146,407 @@ msgid ""
 "Certificate Authority certificate?"
 msgstr ""
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "CA પ�રમાણપત�રન� પસ�દ �ર�"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "ફર�થ� મન� ��તવ� નહિ�"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "�વ�ણ�"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "સત�તાધિ�રણ:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "પાસવર�ડ:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "પાસવર�ડન� બતાવ�"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "વપરાશ�ર�તા નામ:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr ""
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA પ�રમાણપત�ર:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr ""
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP �વ�ત�તિ:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr ""
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "�ાન�� �� પાસવર�ડ:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "�ાન�� ��:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "વપરાશ�ર�તા પ�રમાણપત�ર:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "��:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "��ન� બતાવ�"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP �ન���રમણિ�ા:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "પ�ર�ાર:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Certificate Authority પ�રમાણપત�રન� પસ�દ �ર�..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "તમારા� વ�ય��તિ�ત પ�રમાણપત�રન� પસ�દ �ર�..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "તમાર� �ાન�� �� ન� પસ�દ �ર�..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, �થવા PKCS#12 �ાન�� ��� (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER or PEM પ�રમાણપત�ર� (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "સ�ર��ષિત EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr " �ન� "
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr "દિલ��ર ���, �મ� ���પણ ન��વર���ન� શ�ધ� શ��યા નહિ�."
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr "તમ� �ફલા�ન સ�થિતિન� નિષ���રિય �રવાન� પ�રયત�ન �ર� શ�� ��."
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr "વાયરવાળ��"
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "નવા� ��ડાણન� �મ�ર�"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "ન��વર�� નામ (_N):"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+#, fuzzy
+msgid "Offline mode"
+msgstr "<b>�ફલા�ન સ�થિતિ</b>"
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "� બધા ન��વર�� ��ડાણ�ન� નિષ���રિય �રશ�"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "��પાય�લ ન��વર��"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "��ડાય�લ"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "ન��વર�� નામ (_N):"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "નવા� ��ડાણન� �મ�ર�"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+msgid "networks - connected"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "��ડાય�લ"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "��ડાણન� ત�ડ�"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "��ડાણ �ર� રહ�યા ��..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(��� નહિ�)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "વડ� ��ડાવ�:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr ""
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr ""
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP સરનામ��:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "સબન�� માસ��:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "રા��ર:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G નિષ���રિય થય�લ"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "��તરિ� 3G મ�ડ�મ �ન� SIM �ાર�ડ મળ�યા�"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "મ�ડ�મ� મળ�યા નહિ�"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "નવા� ��ડાણન� �મ�ર�"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "��પાય�લ ન��વર��"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "��ડાણન� સ���રહ�"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr ""
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "મ�ળભ�ત"
+
+#~ msgid "Unavailable"
+#~ msgstr "બિન�પલ�બધ"
+
+#~ msgid "On"
+#~ msgstr "�ાલ�"
+
+#~ msgid "Off"
+#~ msgstr "બ�ધ"
+
+#~ msgid "Advanced"
+#~ msgstr "�ન�નત"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>વાયરવાળ��</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>નવા� ��ડાણન� �મ�ર�</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>ન��વર���</b></big>"
diff --git a/po/hu.po b/po/hu.po
index 85685fe..bf5005b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-22 10:51\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,547 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(nincs)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "Csatlakozás:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Manuális"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Helyi kapcsolat"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP-cím:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Alhálózati maszk:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "�tválasztó:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Nem érhetÅ? el"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Be"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Ki"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Nincs kapcsolat"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "Csatlakozás"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Csatlakozás folyamatban..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Kapcsolat bontása"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Csatlakozva"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Speciális"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>RepülÅ?gépes üzemmód</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Vezetékes</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>�j kapcsolat hozzáadása</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Hálózatok</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "�j kapcsolat hozzáadása"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Rejtett hálózat"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "BelsÅ? 3G-modem és SIM-kártya észlelhetÅ?"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Vissza a Hálózathoz"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Kapcsolat mentése"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Ezzel az összes vezeték nélküli kapcsolat le lesz tiltva"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Alapértelmezett"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G letiltva"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Nem található modem"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Nincs"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128 bites kulcs"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bites jelszó"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamikus WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "Létre_hozás"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "A(z) '%s' vezeték nélküli hálózat eléréséhez jelszó vagy titkosítási kulcs szükséges."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"A(z) '%s' vezeték nélküli hálózat eléréséhez jelszó vagy titkosítási kulcs "
+"szükséges."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Vezeték nélküli hálózati hitelesítés szükséges"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "A vezeték nélküli hálózathoz hitelesítés szükséges"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "�j vezeték nélküli hálózat létrehozása"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "�j vezeték nélküli hálózat"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Add meg a létrehozni kívánt vezeték nélküli hálózat nevét."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Kapcsolódás rejtett vezeték nélküli hálózathoz"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Rejtett vezeték nélküli hálózat"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Add meg annak a rejtett vezeték nélküli hálózatnak a nevét és biztonsági adatait, amelyikhez kapcsolódni szeretnél."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Add meg annak a rejtett vezeték nélküli hálózatnak a nevét és biztonsági "
+"adatait, amelyikhez kapcsolódni szeretnél."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "C_satlakozás"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Kapcsolat:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Egyéb vezeték nélküli hálózat..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Vezeték nélküli _adapter:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Hálózat neve:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "Ve_zeték nélküli biztonság:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Nincs kiválasztott hitelesítésszolgáltatói tanúsítvány</span>\n\nA hitelesítésszolgáltatói tanúsítvány használatának mellÅ?zése nem biztonságos, engedélyezetlen vezeték nélküli hálózatokhoz való csatlakozást eredményezhet. Választasz most hitelesítésszolgáltatói tanúsítványt?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Nincs kiválasztott "
+"hitelesítésszolgáltatói tanúsítvány</span>\n"
+"\n"
+"A hitelesítésszolgáltatói tanúsítvány használatának mellÅ?zése nem "
+"biztonságos, engedélyezetlen vezeték nélküli hálózatokhoz való csatlakozást "
+"eredményezhet. Választasz most hitelesítésszolgáltatói tanúsítványt?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Hitelesítésszolgáltatói tanúsítvány választása"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Ne jelenjen meg legközelebb ez a figyelmeztetés"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Figyelmen kívül hagyás"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Hitelesítés:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Jelszó megjelenítése"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Felhasználónév:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Névtelen identitás:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Hitelesítésszolgáltatói tanúsítvány:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "BelsÅ? hitelesítés:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP-verzió:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Azonosító:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Személyes kulcs jelszava:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Személyes kulcs:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Felhasználói tanúsítvány:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Kulcs:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Kulcs megjelenítése"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP-index:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Típus:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Hitelesítésszolgáltatói tanúsítvány választása..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Személyes tanúsítvány választása..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Személyes kulcs választása..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM vagy PKCS#12 személyes kulcs (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER vagy PEM tanúsítvány (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Bújtatott TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "�j kapcsolat hozzáadása"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Hálózat neve:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Ezzel az összes vezeték nélküli kapcsolat le lesz tiltva"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Rejtett hálózat"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Nincs kapcsolat"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Hálózat neve:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "�j kapcsolat hozzáadása"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Nincs kapcsolat"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Csatlakozva"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Kapcsolat bontása"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Csatlakozás folyamatban..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Nincs kapcsolat"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Csatlakozás"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(nincs)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Csatlakozás:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manuális"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Helyi kapcsolat"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP-cím:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Alhálózati maszk:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "�tválasztó:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G letiltva"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "BelsÅ? 3G-modem és SIM-kártya észlelhetÅ?"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Nem található modem"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "�j kapcsolat hozzáadása"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Rejtett hálózat"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Kapcsolat mentése"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Vissza a Hálózathoz"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#~ msgid "Unavailable"
+#~ msgstr "Nem érhetÅ? el"
+
+#~ msgid "On"
+#~ msgstr "Be"
+
+#~ msgid "Off"
+#~ msgstr "Ki"
+
+#~ msgid "Advanced"
+#~ msgstr "Speciális"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>RepülÅ?gépes üzemmód</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Vezetékes</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>�j kapcsolat hozzáadása</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Hálózatok</b></big>"
diff --git a/po/id.po b/po/id.po
index e929e51..0cdbfe0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-netbook master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=network-manager-netbook\n";
-"POT-Creation-Date: 2009-10-16 16:36+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-10-27 10:24+0700\n"
 "Last-Translator: Andika Triwidada <andika gmail com>\n"
 "Language-Team: Indonesian <id li org>\n"
@@ -18,429 +18,546 @@ msgstr ""
 "X-Poedit-Country: Indonesia\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../src/nmn-connection-details.c:104
-msgid "(none)"
-msgstr "(tiada)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:475
-msgid "Connect by:"
-msgstr "Menyambung dengan:"
-
-#: ../src/nmn-connection-details.c:478
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:483
-msgid "Manual"
-msgstr "Manual"
-
-#: ../src/nmn-connection-details.c:488
-msgid "Link Local"
-msgstr "Link Lokal"
-
-#. Address
-#: ../src/nmn-connection-details.c:496
-msgid "IP Address:"
-msgstr "Alamat IP:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:505
-msgid "Subnet mask:"
-msgstr "Mask subnet:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:514
-msgid "Router:"
-msgstr "Router:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:523
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Tak tersedia"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173
-#: ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Hidup"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191
-#: ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Mati"
-
-#: ../src/nmn-network-item.c:254
-msgid "Disconnected"
-msgstr "Terputus"
-
-#: ../src/nmn-network-item.c:255
-#: ../src/nmn-network-item.c:695
-msgid "Connect"
-msgstr "Sambungkan"
-
-#: ../src/nmn-network-item.c:258
-msgid "Connecting..."
-msgstr "Menyambung..."
-
-#: ../src/nmn-network-item.c:259
-#: ../src/nmn-network-item.c:263
-msgid "Disconnect"
-msgstr "Putuskan"
-
-#: ../src/nmn-network-item.c:262
-msgid "Connected"
-msgstr "Terhubung"
-
-#: ../src/nmn-network-item.c:690
-msgid "Advanced"
-msgstr "Tingkat lanjut"
-
-#: ../src/nmn-networks.c:75
-msgid " and "
-msgstr " dan "
-
-#: ../src/nmn-networks.c:86
-msgid "Sorry, we can't find any networks."
-msgstr "Maaf, kami tak menemukan jaringan apapun."
-
-#: ../src/nmn-networks.c:89
-msgid " You could try disabling Offline mode."
-msgstr " Anda dapat mencoba mematikan mode Terputus."
+#: ../libnm-gtk/nm-ethernet-item.c:38
+#, fuzzy
+msgid "wired"
+msgstr "Kabel"
 
-#: ../src/nmn-networks.c:109
-msgid " You could try turning on "
-msgstr " Anda dapat mencoba menyalakan "
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-networks.c:112
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
 msgid "WiFi"
 msgstr "WiFi"
 
-#: ../src/nmn-networks.c:117
-msgid "Wired"
-msgstr "Kabel"
-
-#: ../src/nmn-networks.c:122
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
 msgid "3G"
 msgstr "3G"
 
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Offline mode</b>"
-msgstr "<b>Mode terputus</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Kabel</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Tambah suatu sambungan baru</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Jejaring</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Tambah sambungan baru"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Jaringan tersembunyi"
-
-#: ../src/network-manager-netbook.ui.h:9
-#: ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Modem 3G internal dan kartu SIM terdeteksi"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Kembali ke Jaringan"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Simpan sambungan"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all network connections"
-msgstr "Ini akan mematikan semua sambungan jaringan"
-
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Baku"
-
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3D dimatikan"
-
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Tak ada modem terdeteksi"
-
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Tidak ada"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "Kunci WEP 40/128-bit"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasa-kunci WEP 128-bit"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP Dinamis (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "B_uat"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Kata sandi atau kunci penyandian diperlukan untuk mengakses jaringan nirkabel '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Kata sandi atau kunci penyandian diperlukan untuk mengakses jaringan "
+"nirkabel '%s'."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Otentikasi Jaringan Nirkabel Diperlukan"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Otentikasi dibutuhkan oleh jaringan nirkabel"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Buat Jaringan Nirkabel Baru"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Jaringan nirkabel baru"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Masukkan sebuah nama untuk jaringan nirkabel yang ingin Anda buat."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Sambung ke Jaringan Nirkabel Tersembunyi"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Jaringan nirkabel tersembunyi"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Masukkan nama dan detil keamanan dari jaringan nirkabel tersembunyi yang ingin Anda sambungkan."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Masukkan nama dan detil keamanan dari jaringan nirkabel tersembunyi yang "
+"ingin Anda sambungkan."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "S_ambung"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Sambungan:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Jaringan Nirkabel Lain..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "_Adaptor nirkabel:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Nama Jaringan:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Keamanan Nirkabel:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
 msgid ""
-"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n"
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
 "\n"
-"Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Tak ada sertifikat Certificate Authority yang dipilih</span>\n"
+"<span weight=\"bold\" size=\"larger\">Tak ada sertifikat Certificate "
+"Authority yang dipilih</span>\n"
 "\n"
-"Tak memakai sertifikat Certificate Authority (CA) bisa menghasilkan sambungan ke jaringan nirkabel liar yang tak aman.  Apakah Anda ingin memilih sebuah sertificat Certificate Authority?"
+"Tak memakai sertifikat Certificate Authority (CA) bisa menghasilkan "
+"sambungan ke jaringan nirkabel liar yang tak aman.  Apakah Anda ingin "
+"memilih sebuah sertificat Certificate Authority?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Pilih Sertifikat CA"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Jangan peringatkan saya lagi"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Abaikan"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Otentikasi:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Kata sandi:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Tampilkan kata sandi"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Nama Pengguna:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Identitas Anonim:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Sertifikat CA:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Otentikasi Inner:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Versi PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identitas:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Kata Sandi Kunci Privat:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Kunci Privat:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Sertifikat Pengguna:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Kunci:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Tampilkan kunci"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Indeks WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Jenis:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Pilih sebuah sertifikat Certificate Authority..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Pilih sertifikat pribadi Anda..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Pilih kunci privat Anda..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Kunci privat DER, PEM, atau PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Sertfikat DER atau PEM  (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Terlindungi (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr " dan "
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr "Maaf, kami tak menemukan jaringan apapun."
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr " Anda dapat mencoba mematikan mode Terputus."
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr " Anda dapat mencoba menyalakan "
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr "Kabel"
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Tambah sambungan baru"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Nama Jaringan:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+#, fuzzy
+msgid "Offline mode"
+msgstr "<b>Mode terputus</b>"
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Ini akan mematikan semua sambungan jaringan"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Jaringan tersembunyi"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Terputus"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Nama Jaringan:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Tambah sambungan baru"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Terputus"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Terhubung"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Putuskan"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Menyambung..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Terputus"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Sambungkan"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(tiada)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Menyambung dengan:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manual"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Link Lokal"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "Alamat IP:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Mask subnet:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Router:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3D dimatikan"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Modem 3G internal dan kartu SIM terdeteksi"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Tak ada modem terdeteksi"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Tambah sambungan baru"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Jaringan tersembunyi"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Simpan sambungan"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Kembali ke Jaringan"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Baku"
+
+#~ msgid "Unavailable"
+#~ msgstr "Tak tersedia"
+
+#~ msgid "On"
+#~ msgstr "Hidup"
+
+#~ msgid "Off"
+#~ msgstr "Mati"
+
+#~ msgid "Advanced"
+#~ msgstr "Tingkat lanjut"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Kabel</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Tambah suatu sambungan baru</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Jejaring</b></big>"
diff --git a/po/it.po b/po/it.po
index e629044..5609252 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-09-22 10:57\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,547 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(nessuno)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "Connetti per:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Manuale"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Collega locale"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "Indirizzo IP:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Maschera di sottorete:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Router:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Non disponibile"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "On"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Off"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Disconnesso"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "Connetti"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Connessione in corso..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Disconnetti"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Connesso"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Avanzato"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Modalità flight</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Cablata</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Aggiungi nuova connessione</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Reti</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Aggiungi nuova connessione"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Rete nascosta"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Rilevati modem 3G interno e scheda SIM"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Torna a Networking"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Salva connessione"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Tutte le connessioni wireless saranno disabilitate"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Default"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G disabilitato"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Nessun modem rilevato"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Nessuno"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "Chiave WEP a 40/128 bit"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "Passphrase WEP a 128 bit"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamico (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA e WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA e WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "C_rea"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Per accedere alla rete wireless '%s' è necessario disporre di password o chiavi di cifratura."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Per accedere alla rete wireless '%s' è necessario disporre di password o "
+"chiavi di cifratura."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Richiesta autenticazione per rete wireless"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Autenticazione richiesta dalla rete wireless"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Crea nuova rete wireless"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Nuova rete wireless"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Immettere un nome per la rete wireless che si desidera creare."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Connetti a rete wireless nascosta"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Rete wireless nascosta"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Immettere il nome e i dettagli di sicurezza della rete wireless alla quale ci si desidera connettere."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Immettere il nome e i dettagli di sicurezza della rete wireless alla quale "
+"ci si desidera connettere."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "C_onnetti"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Connessione:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Altra rete wireless..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "_Adattatore wireless:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Nome rete:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "Sicurezza _wireless:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Non è stato selezionato un certificato di un'autorità di certificazione</span>\n\nSe non si utilizza un certificato un'autorità di certificazione (CA) si rischia di connettersi a reti wireless insicure e pericolose. Selezionare un certificato di un'autorità di certificazione?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Non è stato selezionato un certificato "
+"di un'autorità di certificazione</span>\n"
+"\n"
+"Se non si utilizza un certificato un'autorità di certificazione (CA) si "
+"rischia di connettersi a reti wireless insicure e pericolose. Selezionare un "
+"certificato di un'autorità di certificazione?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Scegliere un certificato CA"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Non visualizzare più questo messaggio"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Autenticazione:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Mostra password"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Nome utente:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Identità anonima:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Certificato CA:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Autenticazione interna:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Versione PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identità:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Password chiave privata:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Chiave privata:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Certificato utente:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Chiave:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Mostra chiave"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Indice WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Selezionare il certificato di un'autorità di certificazione..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Selezionare il certificato personale..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Selezionare la chiave privata..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Chiavi private DER, PEM o PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificati DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "TLS tunnel"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protetto (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Aggiungi nuova connessione"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Nome rete:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Tutte le connessioni wireless saranno disabilitate"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Rete nascosta"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Disconnesso"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Nome rete:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Aggiungi nuova connessione"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Disconnesso"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Connesso"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Disconnetti"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Connessione in corso..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Disconnesso"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Connetti"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(nessuno)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Connetti per:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manuale"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Collega locale"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "Indirizzo IP:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Maschera di sottorete:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Router:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G disabilitato"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Rilevati modem 3G interno e scheda SIM"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Nessun modem rilevato"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Aggiungi nuova connessione"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Rete nascosta"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Salva connessione"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Torna a Networking"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Default"
+
+#~ msgid "Unavailable"
+#~ msgstr "Non disponibile"
+
+#~ msgid "On"
+#~ msgstr "On"
+
+#~ msgid "Off"
+#~ msgstr "Off"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzato"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Modalità flight</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Cablata</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Aggiungi nuova connessione</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Reti</b></big>"
diff --git a/po/ja.po b/po/ja.po
index d6c2220..2f28863 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-16 15:18\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(ã?ªã??)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "����:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "æ??å??"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "��������"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IPã?¢ã??ã?¬ã?¹:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "ã?µã??ã??ã??ã??ã??ã?¹ã?¯:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "���:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "使ç?¨ã?§ã??ã?¾ã??ã??"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "��"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "ã?ªã??"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "���"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "��"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "å??æ?­"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "����"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "詳細"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>ã??ã?©ã?¤ã??ã?¢ã?¼ã??</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>æ??ç·?</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>æ?°ã??ã??æ?¥ç¶?ã?®è¿½å? </b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>ã??ã??ã??ã?¯ã?¼ã?¯</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "æ?°ã??ã??æ?¥ç¶?ã??追å? ã??ã?¾ã??"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "é??表示ã?®ã??ã??ã??ã?¯ã?¼ã?¯"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "å??é?¨3Gã??ã??ã?³SIMIã?«ã?¼ã??ã??æ¤?å?ºã??ã??ã?¾ã??ã??"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?­ã?³ã?°ã?«æ?»ã??"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "�����"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹æ?¥ç¶?ã??ã??ã?¹ã?¦ç?¡å?¹ã?«ã?ªã??ã?¾ã??"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "ã??ã??ã?©ã?«ã??"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3Gç?¡å?¹"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "ã?¢ã??ã? ã??æ¤?å?ºã??ã??ã?¾ã??ã??"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "ã?ªã??"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128ã??ã??ã??ã?­ã?¼"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128ã??ã??ã??ã??ã?¹ã??ã?¬ã?¼ã?º"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "ã??ã?¤ã??ã??ã??ã?¯WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2ã??ã?¼ã?½ã??ã?«"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2ã?¨ã?³ã?¿ã?¼ã??ã?©ã?¤ã?º"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "ä½?æ??(_R)"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ '%s' ã?«ã?¢ã?¯ã?»ã?¹ã??ã??ã?«ã?¯ã??ã?¹ã?¯ã?¼ã??ã?¾ã??ã?¯æ??å?·å??ã?­ã?¼ã??å¿?è¦?ã?§ã??ã??"
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ '%s' ã?«ã?¢ã?¯ã?»ã?¹ã??ã??ã?«ã?¯ã??ã?¹ã?¯ã?¼ã??ã?¾ã??ã?¯æ??å?·å??ã?­ã?¼ã??å¿?"
+"è¦?ã?§ã??ã??"
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¢ã?¼ã?¯èª?証ã??å¿?è¦?ã?§ã??"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã??ã??èª?証ã??å¿?è¦?ã?§ã??"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "æ?°è¦?ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?®ä½?æ??"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "æ?°è¦?ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "ä½?æ??ã??ã??ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?®å??å??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "é??表示ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "é??表示ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "æ?¥ç¶?ã??ã??é??表示ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?®å??å??ã?¨ã?»ã?­ã?¥ã?ªã??ã?£è©³ç´°ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??"
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"æ?¥ç¶?ã??ã??é??表示ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?®å??å??ã?¨ã?»ã?­ã?¥ã?ªã??ã?£è©³ç´°ã??å?¥å??ã??ã?¦ã??ã? "
+"ã??ã??ã??"
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "��(_O)"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "��:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "ã??ã?®ä»?ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã?¢ã??ã??ã?¿(_A):"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯å??(_N):"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã?»ã?­ã?¥ã?ªã??ã?£(_W):"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">èª?証å±?ã?®è¨¼æ??æ?¸ã??é?¸æ??ã??ã??ã?¦ã??ã?¾ã??ã??</span>\n\nèª?証å±?(CA)ã?®è¨¼æ??æ?¸ã??使ç?¨ã??ã?¦ã??ã?ªã??å ´å??ã??å®?å?¨ã?§ã?ªã??ä¸?æ­£ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??èª?証å±?ã?®è¨¼æ??æ?¸ã??é?¸æ??ã??ã?¾ã??ã???"
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">èª?証å±?ã?®è¨¼æ??æ?¸ã??é?¸æ??ã??ã??ã?¦ã??ã?¾ã??ã??</"
+"span>\n"
+"\n"
+"èª?証å±?(CA)ã?®è¨¼æ??æ?¸ã??使ç?¨ã??ã?¦ã??ã?ªã??å ´å??ã??å®?å?¨ã?§ã?ªã??ä¸?æ­£ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼"
+"ã?¯ã?«æ?¥ç¶?ã??ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??èª?証å±?ã?®è¨¼æ??æ?¸ã??é?¸æ??ã??ã?¾ã??ã???"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "CA証æ??æ?¸ã?®é?¸æ??"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "ä»?å¾?ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã??表示ã??ã?ªã??"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "��"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "�証:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "ã??ã?¹ã?¯ã?¼ã??:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®è¡¨ç¤º"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "ã?¦ã?¼ã?¶å??:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "å?¿å??ã?®è­?å?¥æ??å ±:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA証æ??æ?¸:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "å??é?¨èª?証:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAPã??ã?¼ã?¸ã?§ã?³:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "è­?å?¥æ??å ±:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "ç§?å¯?é?µã?®ã??ã?¹ã?¯ã?¼ã??:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "���:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "ã?¦ã?¼ã?¶è¨¼æ??æ?¸:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "é?µ:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "��表示"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEPã?¤ã?³ã??ã??ã?¯ã?¹:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "ã?¿ã?¤ã??:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "èª?証å±?証æ??æ?¸ã?®é?¸æ??..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "å??人証æ??æ?¸ã?®é?¸æ??..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "ç§?å¯?é?µã?®é?¸æ??..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DERã??PEMã??ã?¾ã??ã?¯PKCS#12ã?®ç§?å¯?é?µ(*.derã??*.pemã??*.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DERã?¾ã??ã?¯PEM証æ??æ?¸(*.derã??*.pemã??*.crtã??*.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "ã??ã?³ã??ã?«å??TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "�護��EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "æ?°ã??ã??æ?¥ç¶?ã??追å? ã??ã?¾ã??"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯å??(_N):"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹æ?¥ç¶?ã??ã??ã?¹ã?¦ç?¡å?¹ã?«ã?ªã??ã?¾ã??"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "é??表示ã?®ã??ã??ã??ã?¯ã?¼ã?¯"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "���"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯å??(_N):"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "æ?°ã??ã??æ?¥ç¶?ã??追å? ã??ã?¾ã??"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "���"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "����"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "å??æ?­"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "���"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "��"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(ã?ªã??)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "����:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "æ??å??"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "��������"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IPã?¢ã??ã?¬ã?¹:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "ã?µã??ã??ã??ã??ã??ã?¹ã?¯:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "���:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3Gç?¡å?¹"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "å??é?¨3Gã??ã??ã?³SIMIã?«ã?¼ã??ã??æ¤?å?ºã??ã??ã?¾ã??ã??"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "ã?¢ã??ã? ã??æ¤?å?ºã??ã??ã?¾ã??ã??"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "æ?°ã??ã??æ?¥ç¶?ã??追å? ã??ã?¾ã??"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "é??表示ã?®ã??ã??ã??ã?¯ã?¼ã?¯"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "�����"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?­ã?³ã?°ã?«æ?»ã??"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "ã??ã??ã?©ã?«ã??"
+
+#~ msgid "Unavailable"
+#~ msgstr "使ç?¨ã?§ã??ã?¾ã??ã??"
+
+#~ msgid "On"
+#~ msgstr "��"
+
+#~ msgid "Off"
+#~ msgstr "ã?ªã??"
+
+#~ msgid "Advanced"
+#~ msgstr "詳細"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>ã??ã?©ã?¤ã??ã?¢ã?¼ã??</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>æ??ç·?</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>æ?°ã??ã??æ?¥ç¶?ã?®è¿½å? </b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>ã??ã??ã??ã?¯ã?¼ã?¯</b></big>"
diff --git a/po/ko.po b/po/ko.po
index 759444a..b523fbf 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-16 15:19\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,542 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(ì??ì??)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "ì?°ê²° ë°©ë²?:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "ì??ë??"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "�� �컬"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP 주ì??:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "ì??ë¸?ë?· ë§?ì?¤í?¬:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "���:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "�� ���"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "��"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "í?´ì ?"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "ì?°ê²° í?´ì ?ë?¨"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "ì?°ê²°"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "�결 �..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "ì?°ê²° í?´ì ?"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "ì?°ê²°ë?¨"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "고�"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>ë¹?í?? 모ë??</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>ì? ì? </b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>ì?? ì?°ê²° ì¶?ê°?</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>ë?¤í?¸ì??í?¬</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "ì?? ì?°ê²° ì¶?ê°?"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "ì?¨ê²¨ì§? ë?¤í?¸ì??í?¬"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "í??ì§?ë?? ë?´ë¶? 3G 모ë?? ë°? SIM ì¹´ë??"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "ë?¤í?¸ì??í?¹ì?¼ë¡? ë??ì??ê°?기"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "ì?°ê²° ì ?ì?¥"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "모ë?  무ì?  ì?°ê²°ì?´ ë¹?í??ì?±í??ë?©ë??ë?¤."
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "기본�"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G ì?¬ì?© ì?? í?¨"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "í??ì§?ë?? 모ë?? ì??ì??"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128ë¹?í?¸ í?¤"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128ë¹?í?¸ ì??í?¸ 구문"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "ë??ì ? WEP(802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ê°?ì?¸"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 기ì??"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "ì??ì?±(_R)"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "무ì?  ë?¤í?¸ì??í?¬ '%s'ì?? ì?¡ì?¸ì?¤í??려면 ë¹?ë°?ë²?í?¸ ë??ë?? ì??í?¸í?? í?¤ê°? í??ì??í?©ë??ë?¤."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"무ì?  ë?¤í?¸ì??í?¬ '%s'ì?? ì?¡ì?¸ì?¤í??려면 ë¹?ë°?ë²?í?¸ ë??ë?? ì??í?¸í?? í?¤ê°? í??ì??í?©ë??ë?¤."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "무ì?  ë?¤í?¸ì??í?¬ ì?¸ì¦?ì?´ í??ì??í?¨"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "무ì?  ë?¤í?¸ì??í?¬ì??ì?? ì?¸ì¦?ì?? ì??구í?¨"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "ì?? 무ì?  ë?¤í?¸ì??í?¬ ì??ì?±"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "ì?? 무ì?  ë?¤í?¸ì??í?¬"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "ì??ì?±í?  무ì?  ë?¤í?¸ì??í?¬ì?? ì?´ë¦?ì?? ì??ë ¥í?©ë??ë?¤."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "ì?¨ê²¨ì§? 무ì?  ë?¤í?¸ì??í?¬ì?? ì?°ê²°"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "ì?¨ê²¨ì§? 무ì?  ë?¤í?¸ì??í?¬"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
 msgstr "ì?°ê²°í?  ì?¨ê²¨ì§? 무ì?  ë?¤í?¸ì??í?¬ì?? ì?´ë¦? ë°? ë³´ì?? ì?¸ë¶? ì?¬í?­ì?? ì??ë ¥í?©ë??ë?¤."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "ì?°ê²°(_O)"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "ì?°ê²°:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "기í?? 무ì?  ë?¤í?¸ì??í?¬..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "무ì?  ì?´ë??í?°(_A):"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "ë?¤í?¸ì??í?¬ ì?´ë¦?(_N):"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "무ì?  ë³´ì??(_W):"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">ì? í??í?? CA ì?¸ì¦?ì??ê°? ì??ì?µë??ë?¤</span>\n\nCA(Certificate Authority) ì?¸ì¦?ì??를 ì?¬ì?©í??ì§? ì??ì?? ê²½ì?° ì??ì ?í??ì§? ì??ì?? 무ì?  ë?¤í?¸ì??í?¬ì?? ì?°ê²°ë?  ì?? ì??ì?µë??ë?¤. CA ì?¸ì¦?ì??를 ì? í??í??ì??ê² ì?µë??ê¹??"
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">ì? í??í?? CA ì?¸ì¦?ì??ê°? ì??ì?µë??ë?¤</span>\n"
+"\n"
+"CA(Certificate Authority) ì?¸ì¦?ì??를 ì?¬ì?©í??ì§? ì??ì?? ê²½ì?° ì??ì ?í??ì§? ì??ì?? 무ì?  ë?¤í?¸"
+"ì??í?¬ì?? ì?°ê²°ë?  ì?? ì??ì?µë??ë?¤. CA ì?¸ì¦?ì??를 ì? í??í??ì??ê² ì?µë??ê¹??"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "CA ì?¸ì¦?ì?? ì? í??"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "ì?´ ë©?ì??ì§?를 ë?¤ì?? í??ì?? ì?? í?¨"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "무ì??"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "��:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "ë¹?ë°?ë²?í?¸:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "ë¹?ë°?ë²?í?¸ í??ì??"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "ì?¬ì?©ì?? ì?´ë¦?:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "�� ID:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA ì?¸ì¦?ì??:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "�� ��:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP ë²?ì ?:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "ID:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "ê°?ì?¸ í?¤ ë¹?ë°?ë²?í?¸:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "ê°?ì?¸ í?¤:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "ì?¬ì?©ì?? ì?¸ì¦?ì??:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "í?¤:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "í?¤ í??ì??"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP ���:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "ì? í??:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "ì?¸ì¦? 기ê´? ì?¸ì¦?ì?? ì? í??..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "ê°?ì?¸ ì?¸ì¦?ì?? ì? í??..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "ê°?ì?¸ í?¤ ì? í??..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM ë??ë?? PKCS#12 ê°?ì?¸ í?¤(*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ë??ë?? PEM ì?¸ì¦?ì??(*.pem, *.crt, *.key, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "í?°ë?? TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "ë³´í?¸ë?? EAP(PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "ì?? ì?°ê²° ì¶?ê°?"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "ë?¤í?¸ì??í?¬ ì?´ë¦?(_N):"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "모ë?  무ì?  ì?°ê²°ì?´ ë¹?í??ì?±í??ë?©ë??ë?¤."
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "ì?¨ê²¨ì§? ë?¤í?¸ì??í?¬"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "ì?°ê²° í?´ì ?ë?¨"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "ë?¤í?¸ì??í?¬ ì?´ë¦?(_N):"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "ì?? ì?°ê²° ì¶?ê°?"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "ì?°ê²° í?´ì ?ë?¨"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "ì?°ê²°ë?¨"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "ì?°ê²° í?´ì ?"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "�결 �..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "ì?°ê²° í?´ì ?ë?¨"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "ì?°ê²°"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(ì??ì??)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "ì?°ê²° ë°©ë²?:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "ì??ë??"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "�� �컬"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP 주ì??:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "ì??ë¸?ë?· ë§?ì?¤í?¬:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "���:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G ì?¬ì?© ì?? í?¨"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "í??ì§?ë?? ë?´ë¶? 3G 모ë?? ë°? SIM ì¹´ë??"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "í??ì§?ë?? 모ë?? ì??ì??"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "ì?? ì?°ê²° ì¶?ê°?"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "ì?¨ê²¨ì§? ë?¤í?¸ì??í?¬"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "ì?°ê²° ì ?ì?¥"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "ë?¤í?¸ì??í?¹ì?¼ë¡? ë??ì??ê°?기"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "기본�"
+
+#~ msgid "Unavailable"
+#~ msgstr "�� ���"
+
+#~ msgid "On"
+#~ msgstr "��"
+
+#~ msgid "Off"
+#~ msgstr "í?´ì ?"
+
+#~ msgid "Advanced"
+#~ msgstr "고�"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>ë¹?í?? 모ë??</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>ì? ì? </b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>ì?? ì?°ê²° ì¶?ê°?</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>ë?¤í?¸ì??í?¬</b></big>"
diff --git a/po/nl.po b/po/nl.po
index 90eedc3..c7ec829 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-09-22 11:00\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,547 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(geen)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "Verbinden via:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Handmatig"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Lokaal koppelen"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP-adres:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Subnetmasker:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Router:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Niet beschikbaar"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Aan"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Uit"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Niet verbonden"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "Verbind"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Verbinden..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Verbreek verbinding"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Verbonden"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Vluchtmodus</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Bedraad</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Een nieuwe verbinding toevoegen</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Netwerken</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Nieuwe verbinding toevoegen"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Verborgen netwerk"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Interne 3G-modem en SIM-kaart gedetecteerd"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Terug naar netwerken"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Verbinding opslaan"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Hiermee worden alle draadloze verbindingen uitgeschakeld"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Standaard"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G uitgeschakeld"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Geen modems gedetecteerd"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Geen"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEB 40/128-bits sleutel"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit wachtwoordzin"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamische WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Persoonlijk"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "_Maak"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Wachtwoorden of versleuteling is nodig om toegang te krijgen tot draadloos netwerk '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Wachtwoorden of versleuteling is nodig om toegang te krijgen tot draadloos "
+"netwerk '%s'."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Draadloze netwerk authenticatie vereist"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Authenticatie vereist door draadloos netwerk"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Maak een nieuw draadloos netwerk"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Nieuw draadloos netwerk"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Geef een naam voor het nieuwe draadloze netwerk."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Verbind met een verborgen draadloos netwerk"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Verborgen draadloos netwerk"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Geef de naam en beveiligings details op van het verborgen draadloos netwek waar je mee wilt verbinden."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Geef de naam en beveiligings details op van het verborgen draadloos netwek "
+"waar je mee wilt verbinden."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Verbinding:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Ander draadloos netwerk..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Draadloze _adapter:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Netwerknaam:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Draadloze beveiliging:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Geen certificeringsinstantiecertificaat gekozen</span>\n\nAls u geen certificaat van een certificeringsinstantie gebruikt, kan dit leiden tot verbindingen met onveilige, kwaadaardige draadloze netwerken. Wilt u een certificeringsinstantiecertificaat kiezen?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Geen "
+"certificeringsinstantiecertificaat gekozen</span>\n"
+"\n"
+"Als u geen certificaat van een certificeringsinstantie gebruikt, kan dit "
+"leiden tot verbindingen met onveilige, kwaadaardige draadloze netwerken. "
+"Wilt u een certificeringsinstantiecertificaat kiezen?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Certificeringsinstantiecertificaat kiezen"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Niet opnieuw waarschuwen"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Verificatie:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Wachtwoord weergeven"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Gebruikersnaam:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Anonieme identiteit:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Certificaat van certificeringsinstantie:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Binnenste verificatie:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP-versie:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identiteit:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Wachtwoord van privésleutel:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Privésleutel:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Gebruikerscertificaat:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Sleutel:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Sleutel weergeven"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP-index:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Kies een certifikaat autoriteits bestand..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Kies je persoonlijke certifikaat..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Kie je persoonlijke sleutel..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, of PKCS#12 prive sleutels (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER of PEM certifikaten (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Vertunneld TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Beschermd EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Nieuwe verbinding toevoegen"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Netwerknaam:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Hiermee worden alle draadloze verbindingen uitgeschakeld"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Verborgen netwerk"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Niet verbonden"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Netwerknaam:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Nieuwe verbinding toevoegen"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Niet verbonden"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Verbonden"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Verbreek verbinding"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Verbinden..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Niet verbonden"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Verbind"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(geen)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Verbinden via:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Handmatig"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Lokaal koppelen"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP-adres:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Subnetmasker:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Router:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G uitgeschakeld"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Interne 3G-modem en SIM-kaart gedetecteerd"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Geen modems gedetecteerd"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Nieuwe verbinding toevoegen"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Verborgen netwerk"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Verbinding opslaan"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Terug naar netwerken"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Standaard"
+
+#~ msgid "Unavailable"
+#~ msgstr "Niet beschikbaar"
+
+#~ msgid "On"
+#~ msgstr "Aan"
+
+#~ msgid "Off"
+#~ msgstr "Uit"
+
+#~ msgid "Advanced"
+#~ msgstr "Geavanceerd"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Vluchtmodus</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Bedraad</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Een nieuwe verbinding toevoegen</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Netwerken</b></big>"
diff --git a/po/pa.po b/po/pa.po
index 5d90e97..806fa6c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-netbook master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=NetworkManager&component=network-manager-netbook\n"
-"POT-Creation-Date: 2009-10-16 16:18+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-10-16 22:05+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
@@ -18,276 +17,125 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/nmn-connection-details.c:104
-msgid "(none)"
-msgstr "(��� ਨਹ��)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:475
-msgid "Connect by:"
-msgstr "��ਨ��� ��ਤਾ:"
-
-#: ../src/nmn-connection-details.c:478
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:483
-msgid "Manual"
-msgstr "ਮ�ਨ��ਲ"
-
-#: ../src/nmn-connection-details.c:488
-msgid "Link Local"
-msgstr "ਲ��ਲ ਲਿੰ�"
-
-#. Address
-#: ../src/nmn-connection-details.c:496
-msgid "IP Address:"
-msgstr "IP �ਡਰ�ੱਸ:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:505
-msgid "Subnet mask:"
-msgstr "ਸਬਨ�ੱ� ਮਾਸ�:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:514
-msgid "Router:"
-msgstr "ਰਾ��ਰ:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:523
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "�ਪਲੱਬਧ ਨਹ��"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "�ਾਲ�"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "ਬੰਦ"
-
-#: ../src/nmn-network-item.c:254
-msgid "Disconnected"
-msgstr "ਡਿਸ-��ਨ��� ਹ�"
-
-#: ../src/nmn-network-item.c:255 ../src/nmn-network-item.c:695
-msgid "Connect"
-msgstr "��ਨ��� �ਰ�"
-
-#: ../src/nmn-network-item.c:258
-msgid "Connecting..."
-msgstr "��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
-
-#: ../src/nmn-network-item.c:259 ../src/nmn-network-item.c:263
-msgid "Disconnect"
-msgstr "ਡਿਸ-��ਨ��� �ਰ�"
-
-#: ../src/nmn-network-item.c:262
-msgid "Connected"
-msgstr "��ਨ��� ਹ�"
-
-#: ../src/nmn-network-item.c:690
-msgid "Advanced"
-msgstr "ਮਾਹਰ"
-
-#: ../src/nmn-networks.c:75
-msgid " and "
-msgstr " �ਤ� "
-
-#: ../src/nmn-networks.c:86
-msgid "Sorry, we can't find any networks."
-msgstr "�ਫਸ�ਸ, ਸਾਨ�ੰ ��� ਵ� ਨ�ੱ�ਵਰ� ਨਹ�� ਲੱਭਿ�।"
-
-#: ../src/nmn-networks.c:89
-msgid " You could try disabling Offline mode."
-msgstr " ਤ�ਸ�� �ਫਲਾ�ਨ ਮ�ਡ ਨ�ੰ ਬੰਦ �ਰ�� ��ਸ਼ਿਸ਼ �ਰ ਸ�ਦ� ਹ�।"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+#, fuzzy
+msgid "wired"
+msgstr "ਤਾਰ"
 
-#: ../src/nmn-networks.c:109
-msgid " You could try turning on "
-msgstr " ਤ�ਸ�� �ਾਲ �ਰ�� ��ਸ਼ਿਸ਼ �ਰ ਸ�ਦ� ਹ� "
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-networks.c:112
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
 msgid "WiFi"
 msgstr "ਵਾ�ਫਾ�"
 
-#: ../src/nmn-networks.c:117
-msgid "Wired"
-msgstr "ਤਾਰ"
-
-#: ../src/nmn-networks.c:122
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
 msgid "3G"
 msgstr "3G"
 
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Offline mode</b>"
-msgstr "<b>�ਫਲਾ�ਨ ਮ�ਡ</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>ਵਾ�ਫਾ�</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>ਤਾਰ ਵਾਲਾ</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>ਨਵਾ� ��ਨ��ਸ਼ਨ ਸ਼ਾਮਲ �ਰ�</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>ਨ�ੱ�ਵਰ�</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "ਨਵਾ� ��ਨ��ਸ਼ਨ ਸ਼ਾਮਲ �ਰ�"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "ਲ��ਵਾ� ਨ�ੱ�ਵਰ�"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "�ੰਦਰ�ਨ� 3G ਮਾਡਮ �ਤ� SIM �ਾਰਡ ਮਿਲਿ�"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "ਨ�ੱ�ਵਰ�ਿੰ� �ੱਤ� ਵਾਪਸ �ਾ�"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "��ਨ��ਸ਼ਨ ਸੰਭਾਲ�"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all network connections"
-msgstr "�ਸ ਨਾਲ ਸਾਰ� ਨ�ੱ�ਵਰ� ��ਨ��ਸ਼ਨ �ਯ�� ਹ� �ਾਣ��"
-
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "ਡਿਫਾਲ�"
-
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G �ਯ��"
-
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "ਮਾਡਮ ਨਹ�� ਮਿਲਿ�"
-
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128-ਬਿੱ� ��ੰ��"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ਬਿੱ� ਸ਼ਬਦ"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "ਡਾ�ਨ�ਮਿ� WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ਨਿੱ��"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 �ੰ�ਰਪਰਾ��਼"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "ਬਣਾ�(_r)"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
 "s'."
 msgstr ""
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "ਬ�ਤਾਰ ਨ�ੱ�ਵਰ� ਪਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "ਬ�ਤਾਰ ਨ�ੱ�ਵਰ� ਵਲ�� ਪਰਮਾਣ�ਿਤਾ ਲ� ਲ�� ਹ�"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "ਨਵਾ� ਬ�ਤਾਰ ਨ�ੱ�ਵਰ� ਬਣਾ�"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "ਨਵਾ� ਬ�ਤਾਰ ਨ�ੱ�ਵਰ�"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "ਬ�ਤਾਰ ਨ�ੱ�ਵਰ� ਲ� ਨਾ� ਦਿ�, �� ਤ�ਸ�� ਬਣਾ� �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "ਲ��ਵਾ� ਬ�ਤਾਰ ਨ�ੱ�ਵਰ� ਬਣਾ�"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "ਲ��ਵਾ� ਬ�ਤਾਰ ਨ�ੱ�ਵਰ�"
 
-#: ../src/wireless-dialog.c:886
+#: ../libnm-gtk/wireless-dialog.c:887
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 msgstr ""
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "��ਨ��� �ਰ�(_o)"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "��ਨ��ਸ਼ਨ:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "ਹ�ਰ ਬ�ਤਾਰ ਨ�ੱ�ਵਰ�..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "ਬ�ਤਾਰ �ਡੱਪ�ਰ(_a):"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "ਨ�ੱ�ਵਰ� ਨਾ�(_N):"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "ਬ�ਤਾਰ ਸ�ਰੱ�ਿ�(_W):"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
 "chosen</span>\n"
@@ -297,149 +145,408 @@ msgid ""
 "Certificate Authority certificate?"
 msgstr ""
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "CA ਸਰ��ਫਿ��� ��ਣ�"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "ਮ�ਨ�ੰ ��ਤਾਵਨ� ਨਾ ਦਿ�"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "�ਣਡਿੱਠਾ"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "ਪਰਮਾਣ�ਿਤਾ:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "ਪਾਸਵਰਡ ਵ���"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "ਯ��਼ਰ ਨਾ�:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr ""
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA ਸਰ��ਫਿ���:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr ""
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP ਵਰ�ਨ:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "ਪ�ਾਣ:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "ਪ�ਰਾ�ਵ�� ��ੰ�� ਪਾਸਵਰਡ:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "ਪ�ਰਾ�ਵ�� ��ੰ��:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "ਯ��਼ਰ ਸਰ��ਫਿ���:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "��ੰ��:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "��ੰ�� ਵ���"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP �ੰਡ��ਸ:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "�ਾ�ਪ:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "�ਪਣਾ ਪ�ਰਾ�ਵ�� ਸਰ��ਫਿ��� ��ਣ�..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "�ਪਣ� ਪ�ਰਾ�ਵ�� ��ੰ�� ��ਣ�..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, �ਾ� PKCS#12 ਪ�ਰਾ�ਵ�� ��ੰ���� (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER �ਾ� PEM ਸਰ��ਫਿ��� (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "�ਨਲ TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "ਸ�ਰੱ�ਿ�ਤ EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr " �ਤ� "
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr "�ਫਸ�ਸ, ਸਾਨ�ੰ ��� ਵ� ਨ�ੱ�ਵਰ� ਨਹ�� ਲੱਭਿ�।"
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr " ਤ�ਸ�� �ਫਲਾ�ਨ ਮ�ਡ ਨ�ੰ ਬੰਦ �ਰ�� ��ਸ਼ਿਸ਼ �ਰ ਸ�ਦ� ਹ�।"
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr " ਤ�ਸ�� �ਾਲ �ਰ�� ��ਸ਼ਿਸ਼ �ਰ ਸ�ਦ� ਹ� "
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr "ਤਾਰ"
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "ਨਵਾ� ��ਨ��ਸ਼ਨ ਸ਼ਾਮਲ �ਰ�"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "ਨ�ੱ�ਵਰ� ਨਾ�(_N):"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+#, fuzzy
+msgid "Offline mode"
+msgstr "<b>�ਫਲਾ�ਨ ਮ�ਡ</b>"
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "�ਸ ਨਾਲ ਸਾਰ� ਨ�ੱ�ਵਰ� ��ਨ��ਸ਼ਨ �ਯ�� ਹ� �ਾਣ��"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "ਲ��ਵਾ� ਨ�ੱ�ਵਰ�"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "ਡਿਸ-��ਨ��� ਹ�"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "ਨ�ੱ�ਵਰ� ਨਾ�(_N):"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "ਨਵਾ� ��ਨ��ਸ਼ਨ ਸ਼ਾਮਲ �ਰ�"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "ਡਿਸ-��ਨ��� ਹ�"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "��ਨ��� ਹ�"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "ਡਿਸ-��ਨ��� �ਰ�"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "ਡਿਸ-��ਨ��� ਹ�"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "��ਨ��� �ਰ�"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(��� ਨਹ��)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "��ਨ��� ��ਤਾ:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "ਮ�ਨ��ਲ"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "ਲ��ਲ ਲਿੰ�"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP �ਡਰ�ੱਸ:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "ਸਬਨ�ੱ� ਮਾਸ�:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "ਰਾ��ਰ:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G �ਯ��"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "�ੰਦਰ�ਨ� 3G ਮਾਡਮ �ਤ� SIM �ਾਰਡ ਮਿਲਿ�"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "ਮਾਡਮ ਨਹ�� ਮਿਲਿ�"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "ਨਵਾ� ��ਨ��ਸ਼ਨ ਸ਼ਾਮਲ �ਰ�"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "ਲ��ਵਾ� ਨ�ੱ�ਵਰ�"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "��ਨ��ਸ਼ਨ ਸੰਭਾਲ�"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "ਨ�ੱ�ਵਰ�ਿੰ� �ੱਤ� ਵਾਪਸ �ਾ�"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "ਡਿਫਾਲ�"
+
+#~ msgid "Unavailable"
+#~ msgstr "�ਪਲੱਬਧ ਨਹ��"
+
+#~ msgid "On"
+#~ msgstr "�ਾਲ�"
+
+#~ msgid "Off"
+#~ msgstr "ਬੰਦ"
+
+#~ msgid "Advanced"
+#~ msgstr "ਮਾਹਰ"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>ਵਾ�ਫਾ�</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>ਤਾਰ ਵਾਲਾ</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>ਨਵਾ� ��ਨ��ਸ਼ਨ ਸ਼ਾਮਲ �ਰ�</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>ਨ�ੱ�ਵਰ�</b></big>"
diff --git a/po/pl.po b/po/pl.po
index 506065d..ba7eee5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-22 11:03\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(brak)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "PoÅ?Ä?cz przez:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "RÄ?cznie"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Å?Ä?cze lokalne"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "Adres IP:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Maska podsieci:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Router:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "NiedostÄ?pne"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Tak"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Nie"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "NiepoÅ?Ä?czony"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "PoÅ?Ä?cz"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Å?Ä?czenie..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "RozÅ?Ä?cz"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "PoÅ?Ä?czony"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Tryb samolotowy</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>Wi-Fi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>SieÄ? przewodowa</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Dodaj nowe poÅ?Ä?czenie</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Sieci</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Dodaj nowe poÅ?Ä?czenie"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "SieÄ? ukryta"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Wykryto wewnÄ?trzny modem 3G i kartÄ? SIM"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Powrót do obszaru Sieci"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Zapisz poÅ?Ä?czenie"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Spowoduje to wyÅ?Ä?czenie wszystkich poÅ?Ä?czeÅ? bezprzewodowych"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "DomyÅ?lne"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "SieÄ? 3G jest wyÅ?Ä?czona"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Nie wykryto modemów"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Brak"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "Klucz WEP 40/128-bitowy"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bitowe hasÅ?o WEP"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 osobiste"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "_Utwórz"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "DostÄ?p do sieci bezprzewodowej \"%s\" wymaga hasÅ?a lub kluczy szyfrowania."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"DostÄ?p do sieci bezprzewodowej \"%s\" wymaga hasÅ?a lub kluczy szyfrowania."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Wymagane uwierzytelnienie bezprzewodowe"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Ta sieÄ? bezprzewodowa wymaga uwierzytelnienia"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Utwórz nowÄ? sieÄ? bezprzewodowÄ?"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Nowa sieÄ? bezprzewodowa"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Podaj nazwÄ? dla poÅ?Ä?czenia sieciowego, które chcesz utworzyÄ?."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "PoÅ?Ä?cz z ukrytÄ? sieciÄ? bezprzewodowÄ?"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Ukryta sieÄ? bezprzewodowa"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Podaj nazwÄ? i dane zabezpieczeÅ? ukrytej sieci bezprzewodowej z którÄ? chcesz siÄ? Å?Ä?czyÄ?."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Podaj nazwÄ? i dane zabezpieczeÅ? ukrytej sieci bezprzewodowej z którÄ? chcesz "
+"siÄ? Å?Ä?czyÄ?."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "_PoÅ?Ä?cz"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "PoÅ?Ä?czenie:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Inna sieÄ? bezprzewodowa..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Bezprzewodowa _karta sieciowa:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Nazwa sieci:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Zabezpieczenia bezprzewodowe:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Nie wybrano certyfikatu oÅ?rodka certyfikacji</span>\n\nNiestosowanie certyfikatu oÅ?rodka certyfikacji może spowodowaÄ? nawiÄ?zywanie poÅ?Ä?czeÅ? z niebezpiecznymi i przestÄ?pczymi sieciami bezprzewodowymi. Czy chcesz wybraÄ? certyfikat oÅ?rodka certyfikacji?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Nie wybrano certyfikatu oÅ?rodka "
+"certyfikacji</span>\n"
+"\n"
+"Niestosowanie certyfikatu oÅ?rodka certyfikacji może spowodowaÄ? nawiÄ?zywanie "
+"poÅ?Ä?czeÅ? z niebezpiecznymi i przestÄ?pczymi sieciami bezprzewodowymi. Czy "
+"chcesz wybraÄ? certyfikat oÅ?rodka certyfikacji?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Wybierz certyfikat oÅ?rodka certyfikacji"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Nie ostrzegaj ponownie"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Uwierzytelnianie:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "HasÅ?o:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Pokaż hasÅ?o"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Nazwa użytkownika:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "TożsamoÅ?Ä? anonimowa:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Certyfikat oÅ?rodka certyfikacji:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Uwierzytelnianie wewnÄ?trzne:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Wersja protokoÅ?u PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "TożsamoÅ?Ä?:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "HasÅ?o klucza prywatnego:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Klucz prywatny:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Certyfikat użytkownika:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Klucz:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Pokaż klucz"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Indeks WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Wybierz certyfikat Wystawcy Certyfikatów..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Wybierz certyfikat osobisty..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Wybierz Twój klucz prywatny..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Klucze prywatne DER, PEM lub PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certyfikaty DER lub PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "TLS tunelowany"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Chroniony EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Dodaj nowe poÅ?Ä?czenie"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Nazwa sieci:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Spowoduje to wyÅ?Ä?czenie wszystkich poÅ?Ä?czeÅ? bezprzewodowych"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "SieÄ? ukryta"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "NiepoÅ?Ä?czony"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Nazwa sieci:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Dodaj nowe poÅ?Ä?czenie"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "NiepoÅ?Ä?czony"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "PoÅ?Ä?czony"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "RozÅ?Ä?cz"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Å?Ä?czenie..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "NiepoÅ?Ä?czony"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "PoÅ?Ä?cz"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(brak)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "PoÅ?Ä?cz przez:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "RÄ?cznie"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Å?Ä?cze lokalne"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "Adres IP:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Maska podsieci:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Router:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "SieÄ? 3G jest wyÅ?Ä?czona"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Wykryto wewnÄ?trzny modem 3G i kartÄ? SIM"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Nie wykryto modemów"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Dodaj nowe poÅ?Ä?czenie"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "SieÄ? ukryta"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Zapisz poÅ?Ä?czenie"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Powrót do obszaru Sieci"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "DomyÅ?lne"
+
+#~ msgid "Unavailable"
+#~ msgstr "NiedostÄ?pne"
+
+#~ msgid "On"
+#~ msgstr "Tak"
+
+#~ msgid "Off"
+#~ msgstr "Nie"
+
+#~ msgid "Advanced"
+#~ msgstr "Zaawansowane"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Tryb samolotowy</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>Wi-Fi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>SieÄ? przewodowa</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Dodaj nowe poÅ?Ä?czenie</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Sieci</b></big>"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b2404c2..f1172b5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-09-17 08:38\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,547 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(nenhum)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "Conectar por:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Manual"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Link Local"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "Endereço IP:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Máscara de sub-rede:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Roteador:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Indisponível"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Ativado"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Desativado"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "Conectar"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Conectando..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Desconectar"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Conectado"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Avançado"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Modo de vôo</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>Wi-Fi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Cabeada</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Adicionar uma nova conexão</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Redes</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Adicionar uma nova conexão"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Rede oculta"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Modem 3G interno e cartão SIM detectados"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Voltar à Rede"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Gravar conexão"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Isto desabilitará todas as conexões wireless"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Padrão"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G desabilitado"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Nenhum modem detectado"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "Chave WEP 40/128 bits"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase Secreta WEP 128 bits"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP Dinâmico (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA e WPA2 Pessoal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA e WPA2 Empresarial"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "C_riar"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Senhas ou chaves criptográficas são obrigatórias para acessar a rede wireless '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Senhas ou chaves criptográficas são obrigatórias para acessar a rede "
+"wireless '%s'."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Autenticação de Rede Wireless Obrigatória"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Autenticação obrigatória por rede wireless"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Criar Nova Rede Wireless"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Nova rede wireless"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Digite um nome para a rede wireless que deseja criar."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Conectar à Rede Wireless Oculta"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Rede wireless oculta"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Digite o nome e os detalhes de segurança da rede wireless oculta à qual deseja se conectar."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Digite o nome e os detalhes de segurança da rede wireless oculta à qual "
+"deseja se conectar."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Conexão:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Outra Rede Wireless..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Adaptador _wireless:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Nome da Rede:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Segurança Wireless:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Nenhum certificado de Autoridade de Certificação escolhido</span>\n\nSe um certificado de Autoridade de Certificação (CA) não for usado, isso poderá resultar em conexões com redes wireless não seguras nem confiáveis. Deseja escolher um certificado de Autoridade de Certificação?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Nenhum certificado de Autoridade de "
+"Certificação escolhido</span>\n"
+"\n"
+"Se um certificado de Autoridade de Certificação (CA) não for usado, isso "
+"poderá resultar em conexões com redes wireless não seguras nem confiáveis. "
+"Deseja escolher um certificado de Autoridade de Certificação?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Escolher Certificado CA"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Não avisar novamente"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Autenticação:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Mostrar senha"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Nome de Usuário:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Identidade Anônima:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "Certificado CA:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Autenticação Interna:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Versão do PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identidade:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Senha de Chave Privada:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Chave Privada:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Certificado do Usuário:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Chave:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Mostrar chave"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Ã?ndice WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Escolher um certificado da Autoridade de Certificação..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Escolher seu certificado pessoal..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Escolher sua chave privada..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Chaves privadas DER, PEM ou PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "TLS Encapsulado"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Protegido (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Adicionar uma nova conexão"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Nome da Rede:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Isto desabilitará todas as conexões wireless"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Rede oculta"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Desconectado"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Nome da Rede:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Adicionar uma nova conexão"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Desconectado"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Desconectar"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Conectar"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(nenhum)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Conectar por:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manual"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Link Local"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "Endereço IP:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Máscara de sub-rede:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Roteador:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G desabilitado"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Modem 3G interno e cartão SIM detectados"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Nenhum modem detectado"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Adicionar uma nova conexão"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Rede oculta"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Gravar conexão"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Voltar à Rede"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Padrão"
+
+#~ msgid "Unavailable"
+#~ msgstr "Indisponível"
+
+#~ msgid "On"
+#~ msgstr "Ativado"
+
+#~ msgid "Off"
+#~ msgstr "Desativado"
+
+#~ msgid "Advanced"
+#~ msgstr "Avançado"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Modo de vôo</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>Wi-Fi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Cabeada</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Adicionar uma nova conexão</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Redes</b></big>"
diff --git a/po/ru.po b/po/ru.po
index bd3c430..a632d24 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-22 11:09\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(неÑ?)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "Ð?одклÑ?Ñ?иÑ?Ñ? Ñ?еÑ?ез:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Ð?Ñ?Ñ?Ñ?нÑ?Ñ?"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Ð?окалÑ?ное Ñ?оединение"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP-адÑ?еÑ?:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Ð?аÑ?ка подÑ?еÑ?и:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Ð?едоÑ?Ñ?Ñ?пно"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Ð?клÑ?Ñ?ено"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Ð?Ñ?клÑ?Ñ?ено"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Ð?Ñ?Ñ?оединено"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "Ð?одклÑ?Ñ?иÑ?Ñ?"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Ð?одклÑ?Ñ?ение..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Ð?Ñ?Ñ?оединиÑ?Ñ?"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Ð?одклÑ?Ñ?ено"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Ð?ополниÑ?елÑ?но"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Режим полеÑ?а</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>Wi-Fi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Ð?Ñ?оводное</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Ð?обавиÑ?Ñ? новое Ñ?оединение</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>СеÑ?и</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Ð?обавиÑ?Ñ? новое Ñ?оединение"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "СкÑ?Ñ?Ñ?аÑ? Ñ?еÑ?Ñ?"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Ð?бнаÑ?Ñ?жен вÑ?Ñ?Ñ?оеннÑ?й 3G-модем и SIM-каÑ?Ñ?а"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Ð?еÑ?нÑ?Ñ?Ñ?Ñ?Ñ? в Ñ?аздел Ñ?еÑ?ей"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?оединение"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "ЭÑ?о пÑ?иведеÑ? к Ñ?азÑ?Ñ?вÑ? вÑ?еÑ? беÑ?пÑ?оводнÑ?Ñ? Ñ?оединений"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Ð?о Ñ?молÑ?аниÑ?"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G оÑ?клÑ?Ñ?ено"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Ð?одемÑ? не найденÑ?"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Ð?еÑ?"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128-bit  клÑ?Ñ?"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit клÑ?Ñ?еваÑ? Ñ?Ñ?аза"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Ð?инамиÑ?еÑ?кий WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA и WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA и WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "_СоздаÑ?Ñ?"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Ð?лÑ? доÑ?Ñ?Ñ?па к беÑ?пÑ?оводной Ñ?еÑ?и '%s' необÑ?одим паÑ?олÑ? или клÑ?Ñ? Ñ?иÑ?Ñ?ованиÑ?"
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Ð?лÑ? доÑ?Ñ?Ñ?па к беÑ?пÑ?оводной Ñ?еÑ?и '%s' необÑ?одим паÑ?олÑ? или клÑ?Ñ? Ñ?иÑ?Ñ?ованиÑ?"
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ? в беÑ?пÑ?оводной Ñ?еÑ?и"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Ð?еобÑ?одима аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ? в беÑ?пÑ?оводной Ñ?еÑ?и"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "СоздаÑ?Ñ? новое беÑ?пÑ?оводное подклÑ?Ñ?ение"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Ð?овое беÑ?пÑ?оводное подклÑ?Ñ?ение"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Ð?ведиÑ?е имÑ? Ñ?оздаваемой беÑ?пÑ?оводной Ñ?еÑ?и"
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Ð?одклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?кÑ?Ñ?Ñ?ой беÑ?пÑ?оводной Ñ?еÑ?и"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "СкÑ?Ñ?Ñ?аÑ? беÑ?пÑ?оводнаÑ? Ñ?еÑ?Ñ?"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Ð?ведиÑ?е имÑ? и дополниÑ?елÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?кÑ?Ñ?Ñ?ой беÑ?пÑ?оводной Ñ?еÑ?и, к коÑ?оÑ?ой вÑ? Ñ?оÑ?иÑ?е подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ?."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Ð?ведиÑ?е имÑ? и дополниÑ?елÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?кÑ?Ñ?Ñ?ой беÑ?пÑ?оводной Ñ?еÑ?и, к "
+"коÑ?оÑ?ой вÑ? Ñ?оÑ?иÑ?е подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ?."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "Ð?_одклÑ?Ñ?иÑ?Ñ?"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Соединение:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Ð?Ñ?Ñ?гаÑ? беÑ?пÑ?оводнаÑ? Ñ?еÑ?Ñ?..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "_Ð?дапÑ?еÑ? беÑ?пÑ?оводной Ñ?еÑ?и:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Ð?мÑ? Ñ?еÑ?и:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "Ð?езопаÑ?ноÑ?Ñ?Ñ? _беÑ?пÑ?оводной Ñ?еÑ?и:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Ð?е вÑ?бÑ?ано ни одного Ñ?еÑ?Ñ?иÑ?икаÑ?а какой-либо Ñ?еÑ?Ñ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ей оÑ?ганизаÑ?ии</span>\n\nÐ?Ñ?каз оÑ? иÑ?полÑ?зованиÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а Ñ?еÑ?Ñ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ей оÑ?ганизаÑ?ии (СÐ?) можеÑ? пÑ?ивеÑ?Ñ?и к иÑ?полÑ?зованиÑ? незаÑ?иÑ?еннÑ?Ñ?, моÑ?енниÑ?еÑ?киÑ? беÑ?пÑ?оводнÑ?Ñ? Ñ?еÑ?ей. Ð?Ñ?бÑ?аÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? Ñ?еÑ?Ñ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ей оÑ?ганизаÑ?ии?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Ð?е вÑ?бÑ?ано ни одного Ñ?еÑ?Ñ?иÑ?икаÑ?а какой-"
+"либо Ñ?еÑ?Ñ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ей оÑ?ганизаÑ?ии</span>\n"
+"\n"
+"Ð?Ñ?каз оÑ? иÑ?полÑ?зованиÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а Ñ?еÑ?Ñ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ей оÑ?ганизаÑ?ии (СÐ?) можеÑ? "
+"пÑ?ивеÑ?Ñ?и к иÑ?полÑ?зованиÑ? незаÑ?иÑ?еннÑ?Ñ?, моÑ?енниÑ?еÑ?киÑ? беÑ?пÑ?оводнÑ?Ñ? Ñ?еÑ?ей. "
+"Ð?Ñ?бÑ?аÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? Ñ?еÑ?Ñ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ей оÑ?ганизаÑ?ии?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? СÐ?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Ð?олÑ?Ñ?е не пÑ?едÑ?пÑ?еждаÑ?Ñ?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ð?гноÑ?иÑ?оваÑ?Ñ?"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ?:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Ð?аÑ?олÑ?:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Ð?оказаÑ?Ñ? паÑ?олÑ?"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Ð?мÑ? полÑ?зоваÑ?елÑ?:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Ð?нонимнаÑ? Ñ?лекÑ?Ñ?оннаÑ? пеÑ?Ñ?она:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? СÐ?:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Ð?еÑ?Ñ?иÑ? PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "ЭлекÑ?Ñ?оннаÑ? пеÑ?Ñ?она:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Ð?аÑ?олÑ? закÑ?Ñ?Ñ?ого клÑ?Ñ?а:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ?й клÑ?Ñ?:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? полÑ?зоваÑ?елÑ?:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Ð?лÑ?Ñ?:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Ð?оказаÑ?Ñ? клÑ?Ñ?"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Ð?ндекÑ? WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ? Ñ?еÑ?Ñ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ей оÑ?ганизаÑ?ии..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?вой лиÑ?нÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ?"
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?вой Ñ?екÑ?еÑ?нÑ?й клÑ?Ñ?"
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, или Ñ?екÑ?еÑ?нÑ?е клÑ?Ñ?и PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "СеÑ?Ñ?иÑ?икаÑ?Ñ? DER или PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "ТÑ?ннелÑ?нÑ?й TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Ð?аÑ?иÑ?Ñ?ннÑ?й EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Ð?обавиÑ?Ñ? новое Ñ?оединение"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Ð?мÑ? Ñ?еÑ?и:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "ЭÑ?о пÑ?иведеÑ? к Ñ?азÑ?Ñ?вÑ? вÑ?еÑ? беÑ?пÑ?оводнÑ?Ñ? Ñ?оединений"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "СкÑ?Ñ?Ñ?аÑ? Ñ?еÑ?Ñ?"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Ð?Ñ?Ñ?оединено"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Ð?мÑ? Ñ?еÑ?и:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Ð?обавиÑ?Ñ? новое Ñ?оединение"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Ð?Ñ?Ñ?оединено"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Ð?одклÑ?Ñ?ено"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Ð?Ñ?Ñ?оединиÑ?Ñ?"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Ð?одклÑ?Ñ?ение..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Ð?Ñ?Ñ?оединено"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Ð?одклÑ?Ñ?иÑ?Ñ?"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(неÑ?)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Ð?одклÑ?Ñ?иÑ?Ñ? Ñ?еÑ?ез:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Ð?Ñ?Ñ?Ñ?нÑ?Ñ?"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Ð?окалÑ?ное Ñ?оединение"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP-адÑ?еÑ?:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Ð?аÑ?ка подÑ?еÑ?и:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G оÑ?клÑ?Ñ?ено"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Ð?бнаÑ?Ñ?жен вÑ?Ñ?Ñ?оеннÑ?й 3G-модем и SIM-каÑ?Ñ?а"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Ð?одемÑ? не найденÑ?"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Ð?обавиÑ?Ñ? новое Ñ?оединение"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "СкÑ?Ñ?Ñ?аÑ? Ñ?еÑ?Ñ?"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?оединение"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Ð?еÑ?нÑ?Ñ?Ñ?Ñ?Ñ? в Ñ?аздел Ñ?еÑ?ей"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Ð?о Ñ?молÑ?аниÑ?"
+
+#~ msgid "Unavailable"
+#~ msgstr "Ð?едоÑ?Ñ?Ñ?пно"
+
+#~ msgid "On"
+#~ msgstr "Ð?клÑ?Ñ?ено"
+
+#~ msgid "Off"
+#~ msgstr "Ð?Ñ?клÑ?Ñ?ено"
+
+#~ msgid "Advanced"
+#~ msgstr "Ð?ополниÑ?елÑ?но"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Режим полеÑ?а</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>Wi-Fi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Ð?Ñ?оводное</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Ð?обавиÑ?Ñ? новое Ñ?оединение</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>СеÑ?и</b></big>"
diff --git a/po/sv.po b/po/sv.po
index 0424819..e289654 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-netbook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 23:28+0100\n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-10-28 23:32+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -15,429 +15,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:104
-msgid "(none)"
-msgstr "(ingen)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:475
-msgid "Connect by:"
-msgstr "Anslut med:"
-
-#: ../src/nmn-connection-details.c:478
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:483
-msgid "Manual"
-msgstr "Manuellt"
-
-#: ../src/nmn-connection-details.c:488
-msgid "Link Local"
-msgstr "Lokal länk"
-
-#. Address
-#: ../src/nmn-connection-details.c:496
-msgid "IP Address:"
-msgstr "IP-adress:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:505
-msgid "Subnet mask:"
-msgstr "Nätmask:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:514
-msgid "Router:"
-msgstr "Router:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:523
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Ej tillgänglig"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173
-#: ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "PÃ¥"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191
-#: ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Av"
-
-#: ../src/nmn-network-item.c:254
-msgid "Disconnected"
-msgstr "Inte ansluten"
-
-#: ../src/nmn-network-item.c:255
-#: ../src/nmn-network-item.c:695
-msgid "Connect"
-msgstr "Anslut"
-
-#: ../src/nmn-network-item.c:258
-msgid "Connecting..."
-msgstr "Ansluter..."
-
-#: ../src/nmn-network-item.c:259
-#: ../src/nmn-network-item.c:263
-msgid "Disconnect"
-msgstr "Koppla från"
-
-#: ../src/nmn-network-item.c:262
-msgid "Connected"
-msgstr "Ansluten"
-
-#: ../src/nmn-network-item.c:690
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: ../src/nmn-networks.c:75
-msgid " and "
-msgstr " och "
-
-#: ../src/nmn-networks.c:86
-msgid "Sorry, we can't find any networks."
-msgstr "Tyvärr, vi kunde inte hitta några nätverk."
-
-#: ../src/nmn-networks.c:89
-msgid " You could try disabling Offline mode."
-msgstr " Du kan försöka att inaktivera frånkopplat läge."
+#: ../libnm-gtk/nm-ethernet-item.c:38
+#, fuzzy
+msgid "wired"
+msgstr "Trådat"
 
-#: ../src/nmn-networks.c:109
-msgid " You could try turning on "
-msgstr " Du kan försöka att slå på "
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-networks.c:112
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
 msgid "WiFi"
 msgstr "WiFi"
 
-#: ../src/nmn-networks.c:117
-msgid "Wired"
-msgstr "Trådat"
-
-#: ../src/nmn-networks.c:122
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
 msgid "3G"
 msgstr "3G"
 
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Offline mode</b>"
-msgstr "<b>Frånkopplat läge</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Trådat</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Lägg till en ny anslutning</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Nätverk</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Lägg till en ny anslutning"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Dolt nätverk"
-
-#: ../src/network-manager-netbook.ui.h:9
-#: ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Internt 3G-modem och SIM-kort hittades"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "�tergå till nätverksinställningar"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Spara anslutning"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all network connections"
-msgstr "Detta kommer att inaktivera alla nätverksanslutningar"
-
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Standard"
-
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G inaktiverat"
-
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Inga modem hittades"
-
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128-bitars nyckel"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitars lösenord"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA och WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA och WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "S_kapa"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Lösenord eller krypteringsnycklar krävs för att komma åt det trådlösa nätverket \"%s\"."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Lösenord eller krypteringsnycklar krävs för att komma åt det trådlösa "
+"nätverket \"%s\"."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Autentisering till det trådlösa nätverket krävs"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Autentisering krävs av det trådlösa nätverket"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Skapa nytt trådlöst nätverk"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Nytt trådlöst nätverk"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Ange ett namn för det trådlösa nätverket som du vill skapa."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Anslut till dolt trådlöst nätverk"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Dolt trådlöst nätverk"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Ange namn och säkerhetsuppgifter för det dolda trådlösa nätverket som du vill ansluta till."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Ange namn och säkerhetsuppgifter för det dolda trådlösa nätverket som du "
+"vill ansluta till."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "A_nslut"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Anslutning:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Annat trådlöst nätverk..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Trådlös _adapter:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Nätverksnamn:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Trådlös säkerhet:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
 msgid ""
-"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n"
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
 "\n"
-"Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Inget Certificate Authority-certifikat har valts</span>\n"
+"<span weight=\"bold\" size=\"larger\">Inget Certificate Authority-certifikat "
+"har valts</span>\n"
 "\n"
-"Att inte använda ett Certificate Authority-certifikat (CA) kan resultera i anslutningar till osäkra och missledande trådlösa nätverk.  Vill du välja ett Certificate Authority-certifikat?"
+"Att inte använda ett Certificate Authority-certifikat (CA) kan resultera i "
+"anslutningar till osäkra och missledande trådlösa nätverk.  Vill du välja "
+"ett Certificate Authority-certifikat?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Välj CA-certifikat"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Varna inte igen"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Visa lösenord"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Användarnamn:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Anonym identitet:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA-certifikat:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Inre autentisering:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP-version:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Identitet:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Lösenord för privat nyckel:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Privat nyckel:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Användarcertifikat:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Nyckel:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Visa nyckel"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP-index:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "TYP:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Välj ett certifikat från en certifikatutfärdare..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Välj ditt personliga certifikat..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Välj din privata nyckel..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Privata nycklar av typen DER, PEM eller PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- eller PEM-certifikat (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tunnlad TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr " och "
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr "Tyvärr, vi kunde inte hitta några nätverk."
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr " Du kan försöka att inaktivera frånkopplat läge."
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr " Du kan försöka att slå på "
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr "Trådat"
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Lägg till en ny anslutning"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Nätverksnamn:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+#, fuzzy
+msgid "Offline mode"
+msgstr "<b>Frånkopplat läge</b>"
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Detta kommer att inaktivera alla nätverksanslutningar"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Dolt nätverk"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Inte ansluten"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Nätverksnamn:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Lägg till en ny anslutning"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Inte ansluten"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Ansluten"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Koppla från"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Ansluter..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Inte ansluten"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Anslut"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(ingen)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Anslut med:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Manuellt"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Lokal länk"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP-adress:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Nätmask:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Router:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G inaktiverat"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Internt 3G-modem och SIM-kort hittades"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Inga modem hittades"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Lägg till en ny anslutning"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Dolt nätverk"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Spara anslutning"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "�tergå till nätverksinställningar"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Standard"
+
+#~ msgid "Unavailable"
+#~ msgstr "Ej tillgänglig"
+
+#~ msgid "On"
+#~ msgstr "PÃ¥"
+
+#~ msgid "Off"
+#~ msgstr "Av"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancerat"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Trådat</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Lägg till en ny anslutning</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Nätverk</b></big>"
diff --git a/po/tr.po b/po/tr.po
index a03e19b..05301b2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-09-22 11:18\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,545 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(hiçbiri)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "BaÄ?lantı yöntemi:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Elle"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Yerel BaÄ?lantı"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP Adresi:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Alt aÄ? maskesi:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Yönlendirici:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Kullanılamıyor"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "Açık"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Kapalı"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "BaÄ?lantı Kesildi"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "BaÄ?lan"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "BaÄ?lanıyor..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "BaÄ?lantı Kes"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "BaÄ?lantı Kuruldu"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "GeliÅ?miÅ?"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>UçuÅ? modu/b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Kablolu</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Yeni baÄ?lantı ekle</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>AÄ?lar</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Yeni baÄ?lantı ekle"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Gizli aÄ?"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Dahili 3G modem ve SIM kart algılandı"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "AÄ?a Dön"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "BaÄ?lantıyı kaydet"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Bu iÅ?lem tüm kablosuz baÄ?lantıları devre dıÅ?ı bırakacak"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Varsayılan"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G devre dıÅ?ı"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Hiçbir modem algılanmadı"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Yok"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128 bit Anahtar"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bit Å?ifre"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ve  WPA2 KiÅ?isel"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ve WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "OluÅ?tu_r"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "'%s' kablosuz aÄ?a eriÅ?mek için parolalar veya Å?ifreleme anahtarları gerekir."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"'%s' kablosuz aÄ?a eriÅ?mek için parolalar veya Å?ifreleme anahtarları gerekir."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Kablosuz AÄ? Kimlik DoÄ?rulaması Gerekli"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Kablosuz aÄ? kimlik doÄ?rulaması gerektiriyor"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "Yeni Kablosuz AÄ? OluÅ?tur"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Yeni kablosuz aÄ?"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "OluÅ?turmak istediÄ?iniz kablosuz aÄ? için bir ad girin."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Gizli Kablosuz AÄ?a BaÄ?lan"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Gizli kablosuz aÄ?"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "BaÄ?lantı istediÄ?iniz gizli kablosuz aÄ?ın adını ve güvenlik bilgileriniı girin"
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"BaÄ?lantı istediÄ?iniz gizli kablosuz aÄ?ın adını ve güvenlik bilgileriniı girin"
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "B_aÄ?lan"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "BaÄ?lantı:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "BaÅ?ka Kablosuz AÄ?..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Kablosuz baÄ?_daÅ?tırıcı:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_AÄ? Adı:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Kablosuz GüvenliÄ?i:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Hiçbir Sertifika Yetkilisi sertifikası seçilmemiÅ?</span>\n\nBir Sertifika Yetkilisi (CA) sertifikasının kullanılmaması  güvenli olmayan, sahtecilik yapılan kablosuz aÄ?lara baÄ?lantı yapılmasına neden olabilir.  Bir Sertifika Yetkilisi sertifikası seçmek ister misiniz?"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Hiçbir Sertifika Yetkilisi sertifikası "
+"seçilmemiÅ?</span>\n"
+"\n"
+"Bir Sertifika Yetkilisi (CA) sertifikasının kullanılmaması  güvenli olmayan, "
+"sahtecilik yapılan kablosuz aÄ?lara baÄ?lantı yapılmasına neden olabilir.  Bir "
+"Sertifika Yetkilisi sertifikası seçmek ister misiniz?"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "CA Sertifikası Seç"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Bir daha uyarma"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Yoksay"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Kimlik DoÄ?rulama:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Parolayı göster"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Kullanıcı Adı:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Adsız Kimlik:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA Sertifikası:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "İç Kimlik DoÄ?rulama:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP Sürümü:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Kimlik:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "�zel Anahtar Parolası:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Ã?zal Anahtar:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "Kullanıcı Sertifikası:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Anahtar:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Anahtarı göster"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP Dizini:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Tür:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Bir Sertifika Yetkilisi sertifikası seç..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "KÅ?isel sertifikanızı seçin..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "�zel anahtarınızı seçin..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM veya PKCS#12 özel anahtarları (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER veya PEM sertifikaları (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "Tünel TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Korumalı EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Yeni baÄ?lantı ekle"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_AÄ? Adı:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Bu iÅ?lem tüm kablosuz baÄ?lantıları devre dıÅ?ı bırakacak"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Gizli aÄ?"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "BaÄ?lantı Kesildi"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_AÄ? Adı:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Yeni baÄ?lantı ekle"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "BaÄ?lantı Kesildi"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "BaÄ?lantı Kuruldu"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "BaÄ?lantı Kes"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "BaÄ?lanıyor..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "BaÄ?lantı Kesildi"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "BaÄ?lan"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(hiçbiri)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "BaÄ?lantı yöntemi:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Elle"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Yerel BaÄ?lantı"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP Adresi:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Alt aÄ? maskesi:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Yönlendirici:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G devre dıÅ?ı"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Dahili 3G modem ve SIM kart algılandı"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Hiçbir modem algılanmadı"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Yeni baÄ?lantı ekle"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Gizli aÄ?"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "BaÄ?lantıyı kaydet"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "AÄ?a Dön"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Varsayılan"
+
+#~ msgid "Unavailable"
+#~ msgstr "Kullanılamıyor"
+
+#~ msgid "On"
+#~ msgstr "Açık"
+
+#~ msgid "Off"
+#~ msgstr "Kapalı"
+
+#~ msgid "Advanced"
+#~ msgstr "GeliÅ?miÅ?"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>UçuÅ? modu/b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Kablolu</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Yeni baÄ?lantı ekle</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>AÄ?lar</b></big>"
diff --git a/po/uk.po b/po/uk.po
index d2ffd55..ccc9267 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:37+0200\n"
 "PO-Revision-Date: 2009-09-22 11:12\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,547 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(немаÑ?)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ? за допомогоÑ?:"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "Ð?Ñ?Ñ?Ñ?нÑ?"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "Ð?окалÑ?не з'Ñ?днаннÑ?"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP-адÑ?еÑ?а:"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "Ð?аÑ?ка пÑ?дмеÑ?ежÑ?:"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?:"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNS:"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "Ð?едоÑ?Ñ?Ñ?пно"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "УвÑ?мк."
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "Ð?имк."
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "Ð?Ñ?дклÑ?Ñ?ено"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ?"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "Ð?Ñ?дклÑ?Ñ?еннÑ?..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ?"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "Ð?Ñ?дклÑ?Ñ?ено"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "Ð?одаÑ?ково"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>Режим полÑ?оÑ?Ñ?</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>Ð?Ñ?оводове</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>Ð?одаÑ?и нове пÑ?дклÑ?Ñ?еннÑ?</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>Ð?еÑ?ежÑ?</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "Ð?одаÑ?и нове пÑ?дклÑ?Ñ?еннÑ?"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "Ð?Ñ?иÑ?ована меÑ?ежа"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "Ð?нÑ?Ñ?Ñ?Ñ?Ñ?нÑ?й модем 3G Ñ?з виÑ?вленоÑ? SIM-каÑ?Ñ?коÑ?"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "Ð?овеÑ?нÑ?Ñ?иÑ?Ñ? до меÑ?еж"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "Ð?беÑ?егÑ?и пÑ?дклÑ?Ñ?еннÑ?"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "Ð?Ñ?де вÑ?дÑ?илено вÑ?Ñ? безпÑ?оводовÑ? пÑ?дклÑ?Ñ?еннÑ?"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "Ð?а пÑ?омовÑ?аннÑ?м"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G вÑ?дклÑ?Ñ?ено"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "Ð?одемÑ?в не виÑ?влено"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "Ð?емаÑ?"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP Ñ?з 40/128-Ñ?озÑ?Ñ?дним клÑ?Ñ?ем"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP Ñ?з 128-Ñ?озÑ?Ñ?дноÑ? кодовоÑ? Ñ?Ñ?азоÑ?"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "Ð?инамÑ?Ñ?ний WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA Ñ? WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA Ñ? WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "С_Ñ?воÑ?иÑ?и"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Ð?лÑ? доÑ?Ñ?Ñ?пÑ? до безпÑ?оводовоÑ? меÑ?ежÑ? '%s' поÑ?Ñ?Ñ?бнÑ? паÑ?олÑ? або клÑ?Ñ?Ñ? Ñ?иÑ?Ñ?Ñ?ваннÑ?."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Ð?лÑ? доÑ?Ñ?Ñ?пÑ? до безпÑ?оводовоÑ? меÑ?ежÑ? '%s' поÑ?Ñ?Ñ?бнÑ? паÑ?олÑ? або клÑ?Ñ?Ñ? "
+"Ñ?иÑ?Ñ?Ñ?ваннÑ?."
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "Ð?оÑ?Ñ?Ñ?бна авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ? безпÑ?оводовоÑ? меÑ?ежÑ?"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "Ð?езпÑ?оводова меÑ?ежа вимагаÑ? авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "СÑ?воÑ?иÑ?и новÑ? безпÑ?оводовÑ? меÑ?ежÑ?"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "Ð?ова безпÑ?оводова меÑ?ежа"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Ð?ведÑ?Ñ?Ñ? Ñ?м'Ñ? длÑ? безпÑ?оводовоÑ? меÑ?ежÑ?, Ñ?кÑ? поÑ?Ñ?Ñ?бно Ñ?Ñ?воÑ?иÑ?и."
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ? до пÑ?иÑ?ованоÑ? безпÑ?оводовоÑ? меÑ?ежÑ?"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "Ð?Ñ?иÑ?ована безпÑ?оводова меÑ?ежа"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Ð?ведÑ?Ñ?Ñ? Ñ?м'Ñ? Ñ?а вÑ?домоÑ?Ñ?Ñ? пÑ?о безпекÑ? пÑ?иÑ?ованоÑ? безпÑ?оводовоÑ? меÑ?ежÑ?, до Ñ?коÑ? поÑ?Ñ?Ñ?бно пÑ?дклÑ?Ñ?иÑ?иÑ?Ñ?."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr ""
+"Ð?ведÑ?Ñ?Ñ? Ñ?м'Ñ? Ñ?а вÑ?домоÑ?Ñ?Ñ? пÑ?о безпекÑ? пÑ?иÑ?ованоÑ? безпÑ?оводовоÑ? меÑ?ежÑ?, до "
+"Ñ?коÑ? поÑ?Ñ?Ñ?бно пÑ?дклÑ?Ñ?иÑ?иÑ?Ñ?."
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "_Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ?"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "Ð?Ñ?дклÑ?Ñ?еннÑ?:"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "Ð?нÑ?а безпÑ?оводова меÑ?ежа..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "Ð?езпÑ?оводовий _адапÑ?еÑ?:"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "_Ð?м'Ñ? меÑ?ежÑ?:"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "_Ð?езпÑ?оводова безпека:"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">Ð?е вибÑ?ано Ñ?еÑ?Ñ?иÑ?Ñ?каÑ? Ñ?енÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?Ñ?Ñ?</span>\n\nÐ?евикоÑ?иÑ?Ñ?аннÑ? Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?а, виданого Ñ?енÑ?Ñ?ом Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?Ñ?Ñ? (ЦС), може пÑ?извеÑ?Ñ?и до пÑ?дклÑ?Ñ?еннÑ? до незаÑ?иÑ?ениÑ? небезпеÑ?ниÑ? безпÑ?оводовиÑ? меÑ?еж. Ð?ибÑ?аÑ?и Ñ?еÑ?Ñ?иÑ?Ñ?каÑ? Ñ?енÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?Ñ?Ñ??"
-
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Ð?е вибÑ?ано Ñ?еÑ?Ñ?иÑ?Ñ?каÑ? Ñ?енÑ?Ñ?Ñ? "
+"Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?Ñ?Ñ?</span>\n"
+"\n"
+"Ð?евикоÑ?иÑ?Ñ?аннÑ? Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?а, виданого Ñ?енÑ?Ñ?ом Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?Ñ?Ñ? (ЦС), може "
+"пÑ?извеÑ?Ñ?и до пÑ?дклÑ?Ñ?еннÑ? до незаÑ?иÑ?ениÑ? небезпеÑ?ниÑ? безпÑ?оводовиÑ? меÑ?еж. "
+"Ð?ибÑ?аÑ?и Ñ?еÑ?Ñ?иÑ?Ñ?каÑ? Ñ?енÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?Ñ?Ñ??"
+
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "Ð?ибÑ?аÑ?и Ñ?еÑ?Ñ?иÑ?Ñ?каÑ? ЦС"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "Ð?Ñ?лÑ?Ñ?е не попеÑ?еджаÑ?и"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "Ð?гноÑ?Ñ?ваÑ?и"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "Ð?вÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?:"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "Ð?аÑ?олÑ?:"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "Ð?оказаÑ?и паÑ?олÑ?"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "Ð?м'Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а:"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "Ð?нонÑ?мна Ñ?денÑ?иÑ?Ñ?каÑ?Ñ?Ñ?:"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "СеÑ?Ñ?иÑ?Ñ?каÑ? ЦС:"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "Ð?нÑ?Ñ?Ñ?Ñ?Ñ?нÑ? авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?:"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "Ð?еÑ?Ñ?Ñ?Ñ? PEAP:"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "Ð?денÑ?иÑ?Ñ?каÑ?Ñ?Ñ?:"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "Ð?аÑ?олÑ? закÑ?иÑ?ого клÑ?Ñ?а:"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "Ð?акÑ?иÑ?ий клÑ?Ñ?:"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "СеÑ?Ñ?иÑ?Ñ?каÑ? коÑ?иÑ?Ñ?Ñ?ваÑ?а:"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "Ð?лÑ?Ñ?:"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "Ð?оказаÑ?и клÑ?Ñ?"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "Ð?ндекÑ? WEP:"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Ð?ибÑ?аÑ?и Ñ?еÑ?Ñ?иÑ?Ñ?каÑ? Ñ?енÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?Ñ?Ñ?..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? ваÑ? оÑ?обиÑ?Ñ?ий Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? ваÑ? закÑ?иÑ?ий клÑ?Ñ?..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "Ð?акÑ?иÑ?Ñ? клÑ?Ñ?Ñ? DER, PEM або PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "СеÑ?Ñ?иÑ?Ñ?каÑ?и DER або PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "ТÑ?нелÑ?ований TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Ð?аÑ?иÑ?ений EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "Ð?одаÑ?и нове пÑ?дклÑ?Ñ?еннÑ?"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "_Ð?м'Ñ? меÑ?ежÑ?:"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "Ð?Ñ?де вÑ?дÑ?илено вÑ?Ñ? безпÑ?оводовÑ? пÑ?дклÑ?Ñ?еннÑ?"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "Ð?Ñ?иÑ?ована меÑ?ежа"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "Ð?Ñ?дклÑ?Ñ?ено"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "_Ð?м'Ñ? меÑ?ежÑ?:"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "Ð?одаÑ?и нове пÑ?дклÑ?Ñ?еннÑ?"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "Ð?Ñ?дклÑ?Ñ?ено"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "Ð?Ñ?дклÑ?Ñ?ено"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ?"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "Ð?Ñ?дклÑ?Ñ?еннÑ?..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "Ð?Ñ?дклÑ?Ñ?ено"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ?"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(немаÑ?)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ? за допомогоÑ?:"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "Ð?Ñ?Ñ?Ñ?нÑ?"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "Ð?окалÑ?не з'Ñ?днаннÑ?"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP-адÑ?еÑ?а:"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "Ð?аÑ?ка пÑ?дмеÑ?ежÑ?:"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?:"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNS:"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G вÑ?дклÑ?Ñ?ено"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "Ð?нÑ?Ñ?Ñ?Ñ?Ñ?нÑ?й модем 3G Ñ?з виÑ?вленоÑ? SIM-каÑ?Ñ?коÑ?"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "Ð?одемÑ?в не виÑ?влено"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "Ð?одаÑ?и нове пÑ?дклÑ?Ñ?еннÑ?"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "Ð?Ñ?иÑ?ована меÑ?ежа"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "Ð?беÑ?егÑ?и пÑ?дклÑ?Ñ?еннÑ?"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "Ð?овеÑ?нÑ?Ñ?иÑ?Ñ? до меÑ?еж"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Ð?а пÑ?омовÑ?аннÑ?м"
+
+#~ msgid "Unavailable"
+#~ msgstr "Ð?едоÑ?Ñ?Ñ?пно"
+
+#~ msgid "On"
+#~ msgstr "УвÑ?мк."
+
+#~ msgid "Off"
+#~ msgstr "Ð?имк."
+
+#~ msgid "Advanced"
+#~ msgstr "Ð?одаÑ?ково"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>Режим полÑ?оÑ?Ñ?</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>Ð?Ñ?оводове</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>Ð?одаÑ?и нове пÑ?дклÑ?Ñ?еннÑ?</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>Ð?еÑ?ежÑ?</b></big>"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 23e5007..6401055 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-09-16 15:20\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,541 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "ï¼?æ? ï¼?"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "���"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "æ??å?¨"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "����"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP å?°å??ï¼?"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "�����"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "路���"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNSï¼?"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "���"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "å¼?"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "å?³"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "已��"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "è¿?æ?¥"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "正���..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "æ?­å¼?"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "已��"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "�级"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>��模�</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>æ??线</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>添����</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>ç½?ç»?</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "添����"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "é??è??ç½?ç»?"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "æ£?æµ?å?°å??é?¨ 3G è°?å?¶è§£è°?å?¨å?? SIM å?¡"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "è¿?å??è??ç½?ç?¶æ??"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "ä¿?å­?è¿?æ?¥"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "è¿?å°?ç¦?ç?¨æ??æ??æ? çº¿è¿?æ?¥"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "�认"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "3G 已��"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "������解��"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "æ? "
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128 ���"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 ä½?é??è¡?å?£ä»¤"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "å?¨æ?? WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 个人ç??"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ä¼?ä¸?ç??"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "å??建(_R)"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
 msgstr "é??è¦?å?£ä»¤æ??å? å¯?å¯?é?¥æ??è?½è®¿é?®æ? çº¿ç½?ç»?â??%sâ??ã??"
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "é??è¦?æ? çº¿ç½?ç»?é?´å®?"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "æ? çº¿ç½?ç»?é??è¦?é?´å®?"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "å??建æ?°ç??æ? çº¿ç½?ç»?"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "�建�线��"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "è¾?å?¥è¦?å??建ç??æ? çº¿ç½?ç»?å??称ã??"
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "è¿?æ?¥å?°é??è??ç??æ? çº¿ç½?ç»?"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "é??è??æ? çº¿ç½?ç»?"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
 msgstr "è¾?å?¥è¦?è¿?æ?¥ç??å·²é??è??æ? çº¿ç½?ç»?ç??å??称å??å®?å?¨ç»?è??ã??"
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "è¿?æ?¥(_O)"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "���"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "���线��..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "æ? çº¿é??é??å?¨(_A)ï¼?"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "ç½?ç»?å??称(_N)ï¼?"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "�线���(_W)�"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">æ?ªé??æ?©â??è¯?书é¢?å??æ?ºæ??â??è¯?书</span>\n\nä¸?使ç?¨â??è¯?书é¢?å??æ?ºæ??â??(CA) è¯?书å?¯è?½å¯¼è?´è¿?æ?¥å?°ä¸?å®?å?¨ã??å¼?常ç??æ? çº¿ç½?ç»?ã??æ?¯å?¦è¦?é??æ?©â??è¯?书é¢?å??æ?ºæ??â??è¯?书ï¼?"
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">æ?ªé??æ?©â??è¯?书é¢?å??æ?ºæ??â??è¯?书</span>\n"
+"\n"
+"ä¸?使ç?¨â??è¯?书é¢?å??æ?ºæ??â??(CA) è¯?书å?¯è?½å¯¼è?´è¿?æ?¥å?°ä¸?å®?å?¨ã??å¼?常ç??æ? çº¿ç½?ç»?ã??æ?¯å?¦è¦?é??"
+"æ?©â??è¯?书é¢?å??æ?ºæ??â??è¯?书ï¼?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "é??æ?© CA è¯?书"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "ä¸?å??è­¦å??æ??"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "é?´å®?ï¼?"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "�令�"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "�示�令"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "ç?¨æ?·å??ï¼?"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "å?¿å??身份ï¼?"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA �书�"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "å??é?¨é?´å®?ï¼?"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP ç??æ?¬ï¼?"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "身份�"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "�����令�"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "�����"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "���书�"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "���"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "�示��"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP 索��"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "ç±»å??ï¼?"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "é??æ?©è¯?书é¢?å??æ?ºæ??è¯?书..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "é??æ?©ä¸ªäººè¯?书..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "é??æ?©ç§?ç?¨å¯?é?¥..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DERã??PEM æ?? PKCS#12 ç§?ç?¨å¯?é?¥ï¼?*.derã??*.pemã??*.p12ï¼?"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER æ?? PEM è¯?书ï¼?*.derã??*.pemã??*.crtã??*.cerï¼?"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "é?§é?? TLS"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "å??ä¿?æ?¤ç?? EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "添����"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "ç½?ç»?å??称(_N)ï¼?"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "è¿?å°?ç¦?ç?¨æ??æ??æ? çº¿è¿?æ?¥"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "é??è??ç½?ç»?"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "已��"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "ç½?ç»?å??称(_N)ï¼?"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "添����"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "已��"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "已��"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "æ?­å¼?"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "正���..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "已��"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "è¿?æ?¥"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "ï¼?æ? ï¼?"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "���"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "æ??å?¨"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "����"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP å?°å??ï¼?"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "�����"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "路���"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNSï¼?"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "3G 已��"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "æ£?æµ?å?°å??é?¨ 3G è°?å?¶è§£è°?å?¨å?? SIM å?¡"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "������解��"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "添����"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "é??è??ç½?ç»?"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "ä¿?å­?è¿?æ?¥"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "è¿?å??è??ç½?ç?¶æ??"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "�认"
+
+#~ msgid "Unavailable"
+#~ msgstr "���"
+
+#~ msgid "On"
+#~ msgstr "å¼?"
+
+#~ msgid "Off"
+#~ msgstr "å?³"
+
+#~ msgid "Advanced"
+#~ msgstr "�级"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>��模�</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>æ??线</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>添����</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>ç½?ç»?</b></big>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 120a127..f5a4a3b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"POT-Creation-Date: 2009-11-27 16:38+0200\n"
 "PO-Revision-Date: 2009-09-17 08:42\n"
 "Last-Translator: Novell Language <language novell com>\n"
 "Language-Team: Novell Language <language novell com>\n"
@@ -13,390 +13,541 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:101
-msgid "(none)"
-msgstr "(ç?¡)"
-
-#. Connect by:
-#: ../src/nmn-connection-details.c:477
-msgid "Connect by:"
-msgstr "���︰"
-
-#: ../src/nmn-connection-details.c:480
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../src/nmn-connection-details.c:485
-msgid "Manual"
-msgstr "æ??å??"
-
-#: ../src/nmn-connection-details.c:490
-msgid "Link Local"
-msgstr "����"
-
-#. Address
-#: ../src/nmn-connection-details.c:498
-msgid "IP Address:"
-msgstr "IP ä½?å??ï¼?"
-
-#. Netmask
-#: ../src/nmn-connection-details.c:507
-msgid "Subnet mask:"
-msgstr "�網路�罩�"
-
-#. Gateway
-#: ../src/nmn-connection-details.c:516
-msgid "Router:"
-msgstr "路���"
-
-#. DNS
-#: ../src/nmn-connection-details.c:525
-msgid "DNS:"
-msgstr "DNSï¼?"
-
-#: ../src/nbtk-gtk-light-switch.c:153
-msgid "Unavailable"
-msgstr "���"
-
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the MEDIUM VERTICAL BAR unicode character
-#. * instead
-#: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
-msgid "On"
-msgstr "é??å??"
-
-#. Draw the second label; "Off"
-#. TRANSLATORS: If this string takes more than four or five characters in
-#. * your language, please use the ROUND CIRCLE unicode character instead
-#: ../src/nbtk-gtk-light-switch.c:191 ../src/nbtk-gtk-light-switch.c:244
-msgid "Off"
-msgstr "é??é??"
-
-#: ../src/nmn-item.c:121
-msgid "Disconnected"
-msgstr "��中�"
-
-#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
-msgid "Connect"
-msgstr "��"
-
-#: ../src/nmn-item.c:125
-msgid "Connecting..."
-msgstr "正���..."
-
-#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
-msgid "Disconnect"
-msgstr "解���"
-
-#: ../src/nmn-item.c:129
-msgid "Connected"
-msgstr "已��"
-
-#: ../src/nmn-item.c:398
-msgid "Advanced"
-msgstr "é?²é??"
-
-#: ../src/network-manager-netbook.ui.h:1
-msgid "<b>3G</b>"
-msgstr "<b>3G</b>"
-
-#: ../src/network-manager-netbook.ui.h:2
-msgid "<b>Flight mode</b>"
-msgstr "<b>��模�</b>"
-
-#: ../src/network-manager-netbook.ui.h:3
-msgid "<b>WiFi</b>"
-msgstr "<b>WiFi</b>"
-
-#: ../src/network-manager-netbook.ui.h:4
-msgid "<b>Wired</b>"
-msgstr "<b>æ??ç·?</b>"
-
-#: ../src/network-manager-netbook.ui.h:5
-msgid "<big><b>Add a new connection</b></big>"
-msgstr "<big><b>æ?°å¢?æ?°ç??é?£ç·?</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:6
-msgid "<big><b>Networks</b></big>"
-msgstr "<big><b>網路</b></big>"
-
-#: ../src/network-manager-netbook.ui.h:7
-msgid "Add a new connection"
-msgstr "æ?°å¢?æ?°ç??é?£ç·?"
-
-#: ../src/network-manager-netbook.ui.h:8
-msgid "Hidden network"
-msgstr "é?±è??ç??網路"
-
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
-msgid "Internal 3G modem and SIM card detected"
-msgstr "å?µæ¸¬å?°å?§é?¨ 3G æ?¸æ??æ©?è?? SIM å?¡"
-
-#: ../src/network-manager-netbook.ui.h:10
-msgid "Return to Networking"
-msgstr "è¿?å??è?³ç¶²è·¯"
-
-#: ../src/network-manager-netbook.ui.h:11
-msgid "Save connection"
-msgstr "����"
-
-#: ../src/network-manager-netbook.ui.h:12
-msgid "This will disable all wireless connections"
-msgstr "æ­¤æ??ä½?å°?å??ç?¨æ??æ??ç?¡ç·?é?£ç·?"
+#: ../libnm-gtk/nm-ethernet-item.c:38
+msgid "wired"
+msgstr ""
 
-#: ../src/nmn-mobile-providers.c:504
-msgid "Default"
-msgstr "�設"
+#: ../libnm-gtk/nm-ethernet-item.c:88
+msgid "802.1x"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:218
-msgid "3G disabled"
-msgstr "å·²å??ç?¨ 3G"
+#: ../libnm-gtk/nm-wifi-item.c:60 ../src/nmn-list.c:105
+#: ../src/nmn-applet.c:337 ../src/nmn-new-connection.c:636
+msgid "WiFi"
+msgstr ""
 
-#: ../src/nmn-new-connection.c:225
-msgid "No modems detected"
-msgstr "æ?ªå?µæ¸¬å?°æ?¸æ??æ©?"
+#: ../libnm-gtk/nm-gsm-item.c:36 ../libnm-gtk/nm-cdma-item.c:36
+#: ../src/nmn-list.c:115 ../src/nmn-applet.c:349
+#: ../src/nmn-new-connection.c:661
+msgid "3G"
+msgstr ""
 
-#: ../src/wireless-dialog.c:654
+#: ../libnm-gtk/wireless-dialog.c:655
 msgid "None"
 msgstr "ç?¡"
 
-#: ../src/wireless-dialog.c:671
+#: ../libnm-gtk/wireless-dialog.c:672
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128 ä½?å??é??é?°"
 
-#: ../src/wireless-dialog.c:680
+#: ../libnm-gtk/wireless-dialog.c:681
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 ä½?å??å¯?碼ç??èª?"
 
-#: ../src/wireless-dialog.c:697
-#: ../src/wireless-security/wireless-security.c:345
+#: ../libnm-gtk/wireless-dialog.c:698
+#: ../libnm-gtk/wireless-security/wireless-security.c:345
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/wireless-dialog.c:710
+#: ../libnm-gtk/wireless-dialog.c:711
 msgid "Dynamic WEP (802.1x)"
 msgstr "å??æ?? WEP (802.1x)"
 
-#: ../src/wireless-dialog.c:724
+#: ../libnm-gtk/wireless-dialog.c:725
 msgid "WPA & WPA2 Personal"
 msgstr "WPA è?? WPA2 Personal"
 
-#: ../src/wireless-dialog.c:738
+#: ../libnm-gtk/wireless-dialog.c:739
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA è?? WPA2 Enterprise"
 
-#: ../src/wireless-dialog.c:798
+#: ../libnm-gtk/wireless-dialog.c:799
 msgid "C_reate"
 msgstr "建�(_R)"
 
-#: ../src/wireless-dialog.c:869
+#: ../libnm-gtk/wireless-dialog.c:870
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
 msgstr "å­?å??ç?¡ç·?網路ã??%sã??é??è¦?æ??ä¾?å¯?碼æ??å? å¯?é??é?°ã??"
 
-#: ../src/wireless-dialog.c:871
+#: ../libnm-gtk/wireless-dialog.c:872
 msgid "Wireless Network Authentication Required"
 msgstr "é??è¦?ç?¡ç·?網路é©?è­?"
 
-#: ../src/wireless-dialog.c:873
+#: ../libnm-gtk/wireless-dialog.c:874
 msgid "Authentication required by wireless network"
 msgstr "ç?¡ç·?網路é??è¦?é©?è­?"
 
-#: ../src/wireless-dialog.c:878
+#: ../libnm-gtk/wireless-dialog.c:879
 msgid "Create New Wireless Network"
 msgstr "�建��網路"
 
-#: ../src/wireless-dialog.c:880
+#: ../libnm-gtk/wireless-dialog.c:881
 msgid "New wireless network"
 msgstr "���網路"
 
-#: ../src/wireless-dialog.c:881
+#: ../libnm-gtk/wireless-dialog.c:882
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "ç?ºè¦?建ç«?ç??ç?¡ç·?網路輸å?¥å??稱ã??"
 
-#: ../src/wireless-dialog.c:883
+#: ../libnm-gtk/wireless-dialog.c:884
 msgid "Connect to Hidden Wireless Network"
 msgstr "é?£æ?¥è?³é?±è??ç??ç?¡ç·?網路"
 
-#: ../src/wireless-dialog.c:885
+#: ../libnm-gtk/wireless-dialog.c:886
 msgid "Hidden wireless network"
 msgstr "é?±è??ç??ç?¡ç·?網路"
 
-#: ../src/wireless-dialog.c:886
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+#: ../libnm-gtk/wireless-dialog.c:887
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
 msgstr "輸å?¥è¦?é?£æ?¥ä¹?é?±è??ç?¡ç·?網路ç??å??稱å??å®?å?¨æ?§è©³ç´°è³?æ??ã??"
 
-#: ../src/wireless-security.ui.h:1
+#: ../libnm-gtk/wireless-security.ui.h:1
 msgid "C_onnect"
 msgstr "��(_O)"
 
-#: ../src/wireless-security.ui.h:2
+#: ../libnm-gtk/wireless-security.ui.h:2
 msgid "Connection:"
 msgstr "��︰"
 
-#: ../src/wireless-security.ui.h:3
+#: ../libnm-gtk/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
 msgstr "����網路..."
 
-#: ../src/wireless-security.ui.h:4
+#: ../libnm-gtk/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
 msgstr "�����(_A)�"
 
-#: ../src/wireless-security.ui.h:5
+#: ../libnm-gtk/wireless-security.ui.h:5
 msgid "_Network Name:"
 msgstr "網路å??稱(_N)ï¼?"
 
-#: ../src/wireless-security.ui.h:6
+#: ../libnm-gtk/wireless-security.ui.h:6
 msgid "_Wireless Security:"
 msgstr "Wireless Security(_W)ï¼?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "<span weight=\"bold\" size=\"larger\">æ?ªé?¸æ??è­?æ?¸ç®¡ç??中å¿?ç°½ç?¼ç??è­?æ?¸</span>\n\nè?¥ä¸?使ç?¨è­?æ?¸ç®¡ç??中å¿? (CA) ç°½ç?¼ç??è­?æ?¸ï¼?å?¯è?½æ??é?£ç·?è?³ä¸?å®?å?¨ã??ä¸?å??ç´?æ??ç??ç?¡ç·?網路ã??è¦?é?¸æ??è­?æ?¸ç®¡ç??中å¿?ç°½ç?¼ç??è­?æ?¸å??ï¼?"
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+"chosen</span>\n"
+"\n"
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue wireless networks.  Would you like to choose a "
+"Certificate Authority certificate?"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">æ?ªé?¸æ??è­?æ?¸ç®¡ç??中å¿?ç°½ç?¼ç??è­?æ?¸</span>\n"
+"\n"
+"è?¥ä¸?使ç?¨è­?æ?¸ç®¡ç??中å¿? (CA) ç°½ç?¼ç??è­?æ?¸ï¼?å?¯è?½æ??é?£ç·?è?³ä¸?å®?å?¨ã??ä¸?å??ç´?æ??ç??ç?¡ç·?網"
+"è·¯ã??è¦?é?¸æ??è­?æ?¸ç®¡ç??中å¿?ç°½ç?¼ç??è­?æ?¸å??ï¼?"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:4
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:4
 msgid "Choose CA Certificate"
 msgstr "é?¸æ?? CA è­?æ?¸"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
 msgstr "ä¸?è¦?å??次警å??"
 
-#: ../src/wireless-security/ca-nag-dialog.ui.h:6
+#: ../libnm-gtk/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../src/wireless-security/dynamic-wep.ui.h:1
-#: ../src/wireless-security/wep-key.ui.h:1
-#: ../src/wireless-security/wpa-eap.ui.h:1
+#: ../libnm-gtk/wireless-security/dynamic-wep.ui.h:1
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
 msgstr "é©?è­?ï¼?"
 
-#: ../src/wireless-security/eap-leap.ui.h:1
-#: ../src/wireless-security/eap-simple.ui.h:1
-#: ../src/wireless-security/leap.ui.h:1
-#: ../src/wireless-security/wpa-psk.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:1
+#: ../libnm-gtk/wireless-security/leap.ui.h:1
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
 msgstr "�碼�"
 
-#: ../src/wireless-security/eap-leap.ui.h:2
-#: ../src/wireless-security/eap-simple.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:5
-#: ../src/wireless-security/leap.ui.h:2
-#: ../src/wireless-security/wpa-psk.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:5
+#: ../libnm-gtk/wireless-security/leap.ui.h:2
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
 msgstr "顯示�碼"
 
-#: ../src/wireless-security/eap-leap.ui.h:3
-#: ../src/wireless-security/eap-simple.ui.h:3
-#: ../src/wireless-security/leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-leap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-simple.ui.h:3
+#: ../libnm-gtk/wireless-security/leap.ui.h:3
 msgid "User Name:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../src/wireless-security/eap-peap.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
 msgstr "å?¿å??身å??ï¼?"
 
-#: ../src/wireless-security/eap-peap.ui.h:2
-#: ../src/wireless-security/eap-tls.ui.h:1
-#: ../src/wireless-security/eap-ttls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:1
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
 msgstr "CA ��︰"
 
-#: ../src/wireless-security/eap-peap.ui.h:3
-#: ../src/wireless-security/eap-ttls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
 msgstr "�����"
 
-#: ../src/wireless-security/eap-peap.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
 msgstr "PEAP ç??æ?¬ï¼?"
 
-#: ../src/wireless-security/eap-tls.ui.h:2
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
 msgstr "身å??︰"
 
-#: ../src/wireless-security/eap-tls.ui.h:3
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
 msgstr "ç§?å¯?é??é?°å¯?碼ï¼?"
 
-#: ../src/wireless-security/eap-tls.ui.h:4
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
 msgstr "ç§?å¯?é??é?°ï¼?"
 
-#: ../src/wireless-security/eap-tls.ui.h:6
+#: ../libnm-gtk/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
 msgstr "使ç?¨è??è­?æ?¸ï¸°"
 
-#: ../src/wireless-security/wep-key.ui.h:2
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:2
 msgid "Key:"
 msgstr "é??é?°ï¼?"
 
-#: ../src/wireless-security/wep-key.ui.h:3
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:3
 msgid "Show key"
 msgstr "顯示é??é?°"
 
-#: ../src/wireless-security/wep-key.ui.h:4
+#: ../libnm-gtk/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
 msgstr "WEP 索��"
 
-#: ../src/wireless-security/wpa-psk.ui.h:3
+#: ../libnm-gtk/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:251
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:231
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/eap-method-peap.c:239
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:241
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:289
-#: ../src/wireless-security/eap-method-tls.c:394
-#: ../src/wireless-security/eap-method-ttls.c:319
+#: ../libnm-gtk/wireless-security/eap-method-peap.c:291
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:383
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:321
 msgid "Choose a Certificate Authority certificate..."
 msgstr "é?¸æ??è­?æ?¸ç®¡ç??中å¿?ç°½ç?¼ç??æ??è­?..."
 
-#: ../src/wireless-security/eap-method-tls.c:390
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:377
 msgid "Choose your personal certificate..."
 msgstr "é?¸æ??å??人æ??è­?..."
 
-#: ../src/wireless-security/eap-method-tls.c:399
+#: ../libnm-gtk/wireless-security/eap-method-tls.c:390
 msgid "Choose your private key..."
 msgstr "é?¸æ??ç§?å¯?é??é?°..."
 
-#: ../src/wireless-security/eap-method-ttls.c:223
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:225
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:237
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:239
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../libnm-gtk/wireless-security/eap-method-ttls.c:267
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/wireless-security/eap-method.c:456
+#: ../libnm-gtk/wireless-security/eap-method.c:467
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DERã??PEM æ?? PKCS#12 ç§?å¯?é??é?° (*.derã??*.pemã??*.p12)"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../libnm-gtk/wireless-security/eap-method.c:470
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER æ?? PEM æ??è­? (*.derã??*.pemã??*.crtã??*.cer)"
 
-#: ../src/wireless-security/wireless-security.c:333
+#: ../libnm-gtk/wireless-security/wireless-security.c:333
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:357
+#: ../libnm-gtk/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
 msgstr "ç¶?ç?± TLS é??é??"
 
-#: ../src/wireless-security/wireless-security.c:368
+#: ../libnm-gtk/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "å??ä¿?è­·ç?? EAP (PEAP)"
 
+#: ../src/nmn-list.c:68
+msgid " and "
+msgstr ""
+
+#: ../src/nmn-list.c:79
+msgid "Sorry, we can't find any networks."
+msgstr ""
+
+#: ../src/nmn-list.c:82
+msgid " You could try disabling Offline mode."
+msgstr ""
+
+#: ../src/nmn-list.c:102
+msgid " You could try turning on "
+msgstr ""
+
+#: ../src/nmn-list.c:110 ../src/nmn-applet.c:343
+msgid "Wired"
+msgstr ""
+
+#: ../src/nmn-applet.c:304
+#, fuzzy
+msgid "Add new connection"
+msgstr "æ?°å¢?æ?°ç??é?£ç·?"
+
+#: ../src/nmn-applet.c:310
+#, fuzzy
+msgid "Networks"
+msgstr "網路å??稱(_N)ï¼?"
+
+#: ../src/nmn-applet.c:355
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/nmn-applet.c:362
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/nmn-applet.c:376
+msgid "Offline mode"
+msgstr ""
+
+#: ../src/nmn-applet.c:382
+#, fuzzy
+msgid "This will disable all your connections"
+msgstr "æ­¤æ??ä½?å°?å??ç?¨æ??æ??ç?¡ç·?é?£ç·?"
+
+#: ../src/main.c:54
+msgid "Run in standalone mode"
+msgstr ""
+
+#: ../src/main.c:61
+msgid "NetworkManager Netbook"
+msgstr ""
+
+#: ../src/main.c:62
+msgid "- NetworkManager Netbook"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:67
+#, fuzzy
+msgid "network"
+msgstr "é?±è??ç??網路"
+
+#: ../src/nmn-panel-client.c:181
+#, fuzzy
+msgid "Network connected"
+msgstr "��中�"
+
+#: ../src/nmn-panel-client.c:185
+#, c-format
+msgid "You're now connected to %s, a %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:188
+#, c-format
+msgid "You're now connected to %s network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:190
+msgid "You're now connected to network"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:192
+#, fuzzy
+msgid "Network lost"
+msgstr "網路å??稱(_N)ï¼?"
+
+#: ../src/nmn-panel-client.c:196
+#, c-format
+msgid "Sorry, we've lost your %s connection to %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:199
+#, c-format
+msgid "Sorry, we've lost your %s connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:201
+msgid "Sorry, we've lost your connection"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:236
+#, c-format
+msgid "networks - not connected"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:239
+#, fuzzy, c-format
+msgid "networks - connecting"
+msgstr "æ?°å¢?æ?°ç??é?£ç·?"
+
+#: ../src/nmn-panel-client.c:247
+#, c-format
+msgid "networks - %s - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:249
+#, c-format
+msgid "networks - %s"
+msgstr ""
+
+#: ../src/nmn-panel-client.c:251
+#, fuzzy
+msgid "networks - connected"
+msgstr "��中�"
+
+#: ../src/nmn-item-renderer.c:140
+msgid "Connected"
+msgstr "已��"
+
+#: ../src/nmn-item-renderer.c:141 ../src/nmn-item-renderer.c:145
+msgid "Disconnect"
+msgstr "解���"
+
+#: ../src/nmn-item-renderer.c:144
+msgid "Connecting..."
+msgstr "正���..."
+
+#: ../src/nmn-item-renderer.c:148
+msgid "Disconnected"
+msgstr "��中�"
+
+#: ../src/nmn-item-renderer.c:149
+msgid "Connect"
+msgstr "��"
+
+#: ../src/nmn-item-renderer.c:263
+msgid "Really remove?"
+msgstr ""
+
+#: ../src/nmn-item-renderer.c:279
+#, c-format
+msgid ""
+"Do you want to remove the '%s' %s network? This\n"
+"will forget the password and you will no longer be\n"
+"automatically connected to '%s'."
+msgstr ""
+
+#: ../src/nmn-connection-details.c:104
+msgid "(none)"
+msgstr "(ç?¡)"
+
+#. Connect by:
+#: ../src/nmn-connection-details.c:475
+msgid "Connect by:"
+msgstr "���︰"
+
+#: ../src/nmn-connection-details.c:478
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../src/nmn-connection-details.c:483
+msgid "Manual"
+msgstr "æ??å??"
+
+#: ../src/nmn-connection-details.c:488
+msgid "Link Local"
+msgstr "����"
+
+#. Address
+#: ../src/nmn-connection-details.c:496
+msgid "IP Address:"
+msgstr "IP ä½?å??ï¼?"
+
+#. Netmask
+#: ../src/nmn-connection-details.c:505
+msgid "Subnet mask:"
+msgstr "�網路�罩�"
+
+#. Gateway
+#: ../src/nmn-connection-details.c:514
+msgid "Router:"
+msgstr "路���"
+
+#. DNS
+#: ../src/nmn-connection-details.c:523
+msgid "DNS:"
+msgstr "DNSï¼?"
+
+#: ../src/nmn-new-connection.c:247
+msgid "3G disabled"
+msgstr "å·²å??ç?¨ 3G"
+
+#: ../src/nmn-new-connection.c:252
+msgid "Internal 3G modem and SIM card detected"
+msgstr "å?µæ¸¬å?°å?§é?¨ 3G æ?¸æ??æ©?è?? SIM å?¡"
+
+#: ../src/nmn-new-connection.c:254
+msgid "No modems detected"
+msgstr "æ?ªå?µæ¸¬å?°æ?¸æ??æ©?"
+
+#: ../src/nmn-new-connection.c:611
+msgid "Add a new connection"
+msgstr "æ?°å¢?æ?°ç??é?£ç·?"
+
+#: ../src/nmn-new-connection.c:631
+msgid "Hidden network"
+msgstr "é?±è??ç??網路"
+
+#: ../src/nmn-new-connection.c:657
+msgid "Save connection"
+msgstr "����"
+
+#: ../src/nmn-new-connection.c:666
+msgid "Return to Networking"
+msgstr "è¿?å??è?³ç¶²è·¯"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "�設"
+
+#~ msgid "Unavailable"
+#~ msgstr "���"
+
+#~ msgid "On"
+#~ msgstr "é??å??"
+
+#~ msgid "Off"
+#~ msgstr "é??é??"
+
+#~ msgid "Advanced"
+#~ msgstr "é?²é??"
+
+#~ msgid "<b>3G</b>"
+#~ msgstr "<b>3G</b>"
+
+#~ msgid "<b>Flight mode</b>"
+#~ msgstr "<b>��模�</b>"
+
+#~ msgid "<b>WiFi</b>"
+#~ msgstr "<b>WiFi</b>"
+
+#~ msgid "<b>Wired</b>"
+#~ msgstr "<b>æ??ç·?</b>"
+
+#~ msgid "<big><b>Add a new connection</b></big>"
+#~ msgstr "<big><b>æ?°å¢?æ?°ç??é?£ç·?</b></big>"
+
+#~ msgid "<big><b>Networks</b></big>"
+#~ msgstr "<big><b>網路</b></big>"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]