[network-manager-netbook: 3/4] Update translations, add some new ones.

[Tambet Ingo <tambeti src gnome org>]

commit 4cacf38d38b2bc75cb97d90d81e9e9047d283632
Author: Tambet Ingo <tambet gmail com>
Date:   Tue Nov 10 11:05:16 2009 +0200

    Update translations, add some new ones.

 po/LINGUAS  |    5 +
 po/ar.po    |  402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/cs.po    |  402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/de.po    |  204 +++++++++++++------------------
 po/el.po    |  197 +++++++++++++-----------------
 po/es.po    |  203 +++++++++++++-----------------
 po/fi.po    |  199 +++++++++++++-----------------
 po/fr.po    |  214 ++++++++++++++------------------
 po/hu.po    |  402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/it.po    |  175 +++++++++++---------------
 po/ja.po    |  224 ++++++++++++++++------------------
 po/ko.po    |  207 ++++++++++++++-----------------
 po/nl.po    |  205 +++++++++++++-----------------
 po/pl.po    |  206 +++++++++++++-----------------
 po/pt_BR.po |  213 +++++++++++++------------------
 po/ru.po    |  201 +++++++++++++-----------------
 po/sv.po    |  167 +++++++++++--------------
 po/tr.po    |  402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/uk.po    |  402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh_CN.po |  204 ++++++++++++++-----------------
 po/zh_TW.po |  197 +++++++++++++----------------
 21 files changed, 3325 insertions(+), 1706 deletions(-)
---
diff --git a/po/LINGUAS b/po/LINGUAS
index b2da22a..0ebae17 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,11 +1,14 @@
 # please keep this list sorted alphabetically
 #
+ar
+cs
 de
 el
 es
 et
 fi
 fr
+hu
 it
 ja
 ko
@@ -14,5 +17,7 @@ pl
 pt_BR
 ru
 sv
+tr
+uk
 zh_CN
 zh_TW
diff --git a/po/ar.po b/po/ar.po
new file mode 100644
index 0000000..2fd8b1c
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,402 @@
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"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 "سÙ?ؤدÙ? Ù?ذا Ø¥Ù?Ù? تعطÙ?Ù? Ù?اÙ?Ø© اÙ?اتصاÙ?ات اÙ?Ù?اسÙ?Ù?Ù?Ø©"
+
+#: ../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
+msgid "None"
+msgstr "بÙ?ا"
+
+#: ../src/wireless-dialog.c:671
+msgid "WEP 40/128-bit Key"
+msgstr "Ù?Ù?تاح 40/128 Ù?Ù? WEP"
+
+#: ../src/wireless-dialog.c:680
+msgid "WEP 128-bit Passphrase"
+msgstr "عبارة Ù?رÙ?ر 128 بت Ù?Ù?Ù? WEP"
+
+#: ../src/wireless-dialog.c:697
+#: ../src/wireless-security/wireless-security.c:345
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../src/wireless-dialog.c:710
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP دÙ?Ù?اÙ?Ù?Ù?Ù? (802.1x)"
+
+#: ../src/wireless-dialog.c:724
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../src/wireless-dialog.c:738
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 Enterprise"
+
+#: ../src/wireless-dialog.c:798
+msgid "C_reate"
+msgstr "Ø¥Ù?_شاء"
+
+#: ../src/wireless-dialog.c:869
+#, c-format
+msgid "Passwords or encryption keys are required to access the wireless network '%s'."
+msgstr "Ù?Ù?Ù?ات اÙ?سر Ø£Ù? Ù?Ù?اتÙ?Ø­ اÙ?تشÙ?Ù?ر Ù?Ø·Ù?Ù?بة Ù?Ù?Ù?صÙ?Ù? Ø¥Ù?Ù? اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø© '%s'."
+
+#: ../src/wireless-dialog.c:871
+msgid "Wireless Network Authentication Required"
+msgstr "Ù?Ø·Ù?Ù?ب Ù?صادÙ?Ø© اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø©"
+
+#: ../src/wireless-dialog.c:873
+msgid "Authentication required by wireless network"
+msgstr "Ù?Ø·Ù?Ù?ب اÙ?Ù?صادÙ?Ø© Ù?Ù? Ù?Ù?بÙ? اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø©"
+
+#: ../src/wireless-dialog.c:878
+msgid "Create New Wireless Network"
+msgstr "Ø¥Ù?شاء شبÙ?Ø© Ù?اسÙ?Ù?Ù?Ø© جدÙ?دة"
+
+#: ../src/wireless-dialog.c:880
+msgid "New wireless network"
+msgstr "شبÙ?Ø© Ù?اسÙ?Ù?Ù?Ø© جدÙ?دة"
+
+#: ../src/wireless-dialog.c:881
+msgid "Enter a name for the wireless network you wish to create."
+msgstr "أدخÙ? اسÙ?Ù?ا Ù?Ù?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø© اÙ?تÙ? ترÙ?د Ø¥Ù?شاءÙ?ا."
+
+#: ../src/wireless-dialog.c:883
+msgid "Connect to Hidden Wireless Network"
+msgstr "اتصاÙ? باÙ?شبÙ?ات اÙ?Ù?اسÙ?Ù?Ù?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©"
+
+#: ../src/wireless-dialog.c:885
+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 "أدخÙ? اÙ?اسÙ? Ù?تÙ?اصÙ?Ù? Ø£Ù?اÙ? اÙ?شبÙ?Ø© اÙ?Ù?اسÙ?Ù?Ù?Ø© اÙ?Ù?Ø®Ù?Ù?Ø© اÙ?تÙ? ترÙ?د اÙ?اتصاÙ? بÙ?ا."
+
+#: ../src/wireless-security.ui.h:1
+msgid "C_onnect"
+msgstr "ات_صاÙ?"
+
+#: ../src/wireless-security.ui.h:2
+msgid "Connection:"
+msgstr "اÙ?اتصاÙ?:"
+
+#: ../src/wireless-security.ui.h:3
+msgid "Other Wireless Network..."
+msgstr "شبÙ?Ø© Ù?اسÙ?Ù?Ù?Ø© أخرÙ?..."
+
+#: ../src/wireless-security.ui.h:4
+msgid "Wireless _adapter:"
+msgstr "Ù?_Ø­Ù?Ù? Ù?اسÙ?Ù?Ù?:"
+
+#: ../src/wireless-security.ui.h:5
+msgid "_Network Name:"
+msgstr "ا_سÙ? اÙ?شبÙ?Ø©:"
+
+#: ../src/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
+msgid "Choose CA Certificate"
+msgstr "اختر Ø´Ù?ادة CA"
+
+#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+msgid "Don't warn me again"
+msgstr "عدÙ? إظÙ?ار اÙ?تحذÙ?ر Ù?رة أخرÙ?"
+
+#: ../src/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
+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
+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
+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
+msgid "User Name:"
+msgstr "اسÙ? اÙ?Ù?ستخدÙ?:"
+
+#: ../src/wireless-security/eap-peap.ui.h:1
+#: ../src/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
+msgid "CA Certificate:"
+msgstr "Ø´Ù?ادة CA:"
+
+#: ../src/wireless-security/eap-peap.ui.h:3
+#: ../src/wireless-security/eap-ttls.ui.h:3
+msgid "Inner Authentication:"
+msgstr "Ù?صادÙ?Ø© داخÙ?Ù?Ø©:"
+
+#: ../src/wireless-security/eap-peap.ui.h:4
+msgid "PEAP Version:"
+msgstr "إصدار PEAP:"
+
+#: ../src/wireless-security/eap-tls.ui.h:2
+msgid "Identity:"
+msgstr "اÙ?Ù?Ù?Ù?Ø©:"
+
+#: ../src/wireless-security/eap-tls.ui.h:3
+msgid "Private Key Password:"
+msgstr "Ù?Ù?Ù?Ø© سر اÙ?Ù?Ù?تاح اÙ?خاص:"
+
+#: ../src/wireless-security/eap-tls.ui.h:4
+msgid "Private Key:"
+msgstr "اÙ?Ù?Ù?تاح اÙ?خاص:"
+
+#: ../src/wireless-security/eap-tls.ui.h:6
+msgid "User Certificate:"
+msgstr "Ø´Ù?ادة اÙ?Ù?ستخدÙ?:"
+
+#: ../src/wireless-security/wep-key.ui.h:2
+msgid "Key:"
+msgstr "اÙ?Ù?Ù?تاح:"
+
+#: ../src/wireless-security/wep-key.ui.h:3
+msgid "Show key"
+msgstr "إظÙ?ار اÙ?Ù?Ù?تاح"
+
+#: ../src/wireless-security/wep-key.ui.h:4
+msgid "WEP Index:"
+msgstr "Ù?Ù?رس WEP:"
+
+#: ../src/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
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../src/wireless-security/eap-method-peap.c:239
+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
+msgid "Choose a Certificate Authority certificate..."
+msgstr "اختÙ?ار Ø´Ù?ادة جÙ?Ø© إصدار اÙ?Ø´Ù?ادات..."
+
+#: ../src/wireless-security/eap-method-tls.c:390
+msgid "Choose your personal certificate..."
+msgstr "اختÙ?ار Ø´Ù?ادة شخصÙ?Ø©..."
+
+#: ../src/wireless-security/eap-method-tls.c:399
+msgid "Choose your private key..."
+msgstr "Ù?تÙ? اÙ?Ø¢Ù? اختÙ?ار Ù?Ù?تاحÙ? اÙ?خاص..."
+
+#: ../src/wireless-security/eap-method-ttls.c:223
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:237
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:265
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../src/wireless-security/eap-method.c:456
+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
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr "اÙ?Ø´Ù?ادتاÙ? DER Ø£Ù? PEM (*.der, *.pem, *.crt, *.cer)"
+
+#: ../src/wireless-security/wireless-security.c:333
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/wireless-security/wireless-security.c:357
+msgid "Tunneled TLS"
+msgstr "TLS Ù?Ù?Ù?Ù?"
+
+#: ../src/wireless-security/wireless-security.c:368
+msgid "Protected EAP (PEAP)"
+msgstr "EAP Ù?Ø­Ù?Ù? (PEAP)"
+
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 0000000..af53765
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,402 @@
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"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í"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../src/nmn-new-connection.c:218
+msgid "3G disabled"
+msgstr "PÅ?ipojení 3G zakázáno"
+
+#: ../src/nmn-new-connection.c:225
+msgid "No modems detected"
+msgstr "Nebyly rozpoznány žádné modemy"
+
+#: ../src/wireless-dialog.c:654
+msgid "None"
+msgstr "Žádný"
+
+#: ../src/wireless-dialog.c:671
+msgid "WEP 40/128-bit Key"
+msgstr "WEP â?? 40/128bitový klíÄ?"
+
+#: ../src/wireless-dialog.c:680
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP â?? 128bitové heslo"
+
+#: ../src/wireless-dialog.c:697
+#: ../src/wireless-security/wireless-security.c:345
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../src/wireless-dialog.c:710
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamický WEP (802.1x)"
+
+#: ../src/wireless-dialog.c:724
+msgid "WPA & WPA2 Personal"
+msgstr "WPA a WPA2 Personal"
+
+#: ../src/wireless-dialog.c:738
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA a WPA2 Enterprise"
+
+#: ../src/wireless-dialog.c:798
+msgid "C_reate"
+msgstr "_VytvoÅ?it"
+
+#: ../src/wireless-dialog.c:869
+#, 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."
+
+#: ../src/wireless-dialog.c:871
+msgid "Wireless Network Authentication Required"
+msgstr "Je požadováno ovÄ?Å?ení bezdrátové sítÄ?"
+
+#: ../src/wireless-dialog.c:873
+msgid "Authentication required by wireless network"
+msgstr "Bezdrátová síť požaduje ovÄ?Å?ení"
+
+#: ../src/wireless-dialog.c:878
+msgid "Create New Wireless Network"
+msgstr "VytvoÅ?it novou bezdrátovou síť"
+
+#: ../src/wireless-dialog.c:880
+msgid "New wireless network"
+msgstr "Nová bezdrátová síť"
+
+#: ../src/wireless-dialog.c:881
+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
+msgid "Connect to Hidden Wireless Network"
+msgstr "PÅ?ipojit ke skryté bezdrátové síti"
+
+#: ../src/wireless-dialog.c:885
+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."
+
+#: ../src/wireless-security.ui.h:1
+msgid "C_onnect"
+msgstr "_PÅ?ipojit"
+
+#: ../src/wireless-security.ui.h:2
+msgid "Connection:"
+msgstr "PÅ?ipojení:"
+
+#: ../src/wireless-security.ui.h:3
+msgid "Other Wireless Network..."
+msgstr "Jiná bezdrátová síť..."
+
+#: ../src/wireless-security.ui.h:4
+msgid "Wireless _adapter:"
+msgstr "Bezdrátový _adaptér:"
+
+#: ../src/wireless-security.ui.h:5
+msgid "_Network Name:"
+msgstr "_Název sítÄ?:"
+
+#: ../src/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
+msgid "Choose CA Certificate"
+msgstr "Zvolit certifikát CA"
+
+#: ../src/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
+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
+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
+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
+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
+msgid "User Name:"
+msgstr "Uživatelské jméno:"
+
+#: ../src/wireless-security/eap-peap.ui.h:1
+#: ../src/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
+msgid "CA Certificate:"
+msgstr "Certifikát CA:"
+
+#: ../src/wireless-security/eap-peap.ui.h:3
+#: ../src/wireless-security/eap-ttls.ui.h:3
+msgid "Inner Authentication:"
+msgstr "VnitÅ?ní ovÄ?Å?ení:"
+
+#: ../src/wireless-security/eap-peap.ui.h:4
+msgid "PEAP Version:"
+msgstr "Verze PEAP:"
+
+#: ../src/wireless-security/eap-tls.ui.h:2
+msgid "Identity:"
+msgstr "Identita:"
+
+#: ../src/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
+msgid "Private Key:"
+msgstr "Soukromý klíÄ?:"
+
+#: ../src/wireless-security/eap-tls.ui.h:6
+msgid "User Certificate:"
+msgstr "Uživatelský certifikát:"
+
+#: ../src/wireless-security/wep-key.ui.h:2
+msgid "Key:"
+msgstr "KlíÄ?:"
+
+#: ../src/wireless-security/wep-key.ui.h:3
+msgid "Show key"
+msgstr "Zobrazit klíÄ?"
+
+#: ../src/wireless-security/wep-key.ui.h:4
+msgid "WEP Index:"
+msgstr "Index WEP:"
+
+#: ../src/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
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../src/wireless-security/eap-method-peap.c:239
+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
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Zvolit certifikát CertifikaÄ?ní autority..."
+
+#: ../src/wireless-security/eap-method-tls.c:390
+msgid "Choose your personal certificate..."
+msgstr "Zvolit osobní certifikát..."
+
+#: ../src/wireless-security/eap-method-tls.c:399
+msgid "Choose your private key..."
+msgstr "Zvolit soukromý klíÄ?..."
+
+#: ../src/wireless-security/eap-method-ttls.c:223
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:237
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:265
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../src/wireless-security/eap-method.c:456
+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
+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
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/wireless-security/wireless-security.c:357
+msgid "Tunneled TLS"
+msgstr "Tunelované pÅ?ipojení TLS"
+
+#: ../src/wireless-security/wireless-security.c:368
+msgid "Protected EAP (PEAP)"
+msgstr "ChránÄ?né pÅ?ipojení EAP (PEAP)"
+
diff --git a/po/de.po b/po/de.po
index 531386e..b076339 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,68 +1,56 @@
-# German translation of the NetworkManager netbook.
-# Copyright (C) 2005 Dan Williams <dcbw redhat com>
-# This file is distributed under the same license as the NetworkManager package.
-# Hendrik Brandt <heb gnome-de org>, 2004, 2005.
-# Frank Arnold <frank scirocco-5v-turbo de>, 2005.
-# Hendrik Richter <hendrikr gnome org>, 2006.
-# Jochen Skulj <jochen jochenskulj de>, 2008.
-# Tobias Wolf <towolf gmx net>, 2008.
-# Hauke Mehrtens <hauke hauke-m de>, 2008.
-# Mario Blättermann <mariobl gnome org>, 2008, 2009.
-# Stefan Horning <stefan hornings de>, 2009.
-# Christian Kirbach <Christian Kirbach googlemail com>, 2009.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 12:57+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"PO-Revision-Date: 2009-09-16 15:15\n"
+"Last-Translator: Novell Language <language novell com>\n"
+"Language-Team: Novell Language <language novell com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
-msgstr "(keine)"
+msgstr "(ohne)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "Verbinden:"
+msgstr "Verbinden durch:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Link-Local"
+msgstr "Link Local"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "IP-Adresse:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
-msgstr "Subnetz-Maske:"
+msgstr "Teilnetzmaske:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Vorgaberoute:"
+msgstr "Router:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
@@ -75,7 +63,7 @@ msgstr "Nicht verfügbar"
 #. * instead
 #: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
 msgid "On"
-msgstr "Ein"
+msgstr "An"
 
 #. Draw the second label; "Off"
 #. TRANSLATORS: If this string takes more than four or five characters in
@@ -84,27 +72,27 @@ msgstr "Ein"
 msgid "Off"
 msgstr "Aus"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "Verbindung getrennt"
+msgstr "Nicht verbunden"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
-msgstr "Verbinden"
+msgstr "Verbinde"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Verbinde..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
-msgstr "Trennen"
+msgstr "Getrennt"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Erweitert"
 
@@ -114,7 +102,7 @@ msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Flugmodus</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
@@ -122,52 +110,51 @@ msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr "Kabelgebunden"
+msgstr "<b>Verkabelt</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Neue Verbindung hinzufügen</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>Netzwerke</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Neue Verbindung hinzufügen"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Verborgenes Funknetzwerk"
+msgstr "Verborgenes Netzwerk"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Internes 3G-Modem und SIM-Karte gefunden"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Zurück zum Netzwerk"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Sichere Verbindung"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Dadurch werden alle drahtlosen Verbindungen deaktiviert"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
-msgstr "Vorgabe"
+msgstr "Standard"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G deaktiviert"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Keine Modems gefunden"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -175,7 +162,7 @@ msgstr "Keine"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "WEP 64/128-bit-Schlüssel"
+msgstr "WEP 40/128-bit Schlüssel"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
@@ -188,7 +175,7 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "Dynamisches WEP (802.1x)"
+msgstr "Dynamic WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
@@ -200,72 +187,60 @@ msgstr "WPA & WPA2 Enterprise"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
-msgstr "E_rzeugen"
+msgstr "E_rstellen"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"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."
+msgid "Passwords or encryption keys are required to access the wireless network '%s'."
+msgstr "Passwörter oder Schlüssel werden benötigt, um auf das drahtlose Netzwerk '%s' zuzugreifen."
 
 #: ../src/wireless-dialog.c:871
 msgid "Wireless Network Authentication Required"
-msgstr "Legitimierung für Funknetzwerk benötigt"
+msgstr "Das drahtlose Netzwerk benötigt eine Authentifizierung"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "Legitimierung für Funknetzwerk benötigt"
+msgstr "Eine Authentifizierung wird vom drahtlosen Netzwerk benötigt"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "Neues Funknetzwerk erstellen"
+msgstr "Neues drahtloses Netzwerk erstellen"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr "Neues Funknetzwerk"
+msgstr "Neues drahtloses Netzwerk"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr ""
-"Bitte geben Sie den Namen des Funknetzwerks ein, das Sie erstellen möchten."
+msgstr "Bitte einen Namen für das drahtlose Netzwerk, das erstellt werden soll, eingeben."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "Mit einem verborgenen Funknetzwerk verbinden"
+msgstr "Zu einem versteckten drahtlosen Netzwerk verbinden"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr "Verborgenes Funknetzwerk"
+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 geben Sie den Namen und die Sicherheitseinstellungen des verborgenen "
-"Funknetzwerks ein, mit dem Sie sich verbinden möchten."
+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
-#, fuzzy
 msgid "C_onnect"
-msgstr "Verbinden"
+msgstr "V_erbinden"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Verbinden"
+msgstr "Verbindung:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Neues Funknetzwerk erstellen"
+msgstr "Anderes drahtloses Netzwerk..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "Funknetzwerkk_arte:"
+msgstr "Drahtloser _Adapter:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
@@ -273,29 +248,19 @@ msgstr "_Netzwerkname:"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "Funknetzwerkk_arte:"
+msgstr "_Drahtloses Netzwerk:"
 
 #: ../src/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\">Es wurde kein CA-Zertifikat ausgewählt</span>\n"
-"\n"
-"Benutzt man kein CA-Zertifikat, kann dies zu unsicheren Verbindungen oder schadhaften Funknetzwerken führen. Möchten Sie ein CA-Zertifikat auswählen?"
+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\">Kein Zertifikat einer Zertifizierungsstelle ausgewählt</span>\n\nWenn kein Zertifikat einer Zertifizierungsstelle (CA) verwendet wird, kann dies zu unsicheren, nicht autorisierten drahtlosen Netzwerken führen. Möchten Sie ein Zertifikat einer Zertifizierungsstelle auswählen?"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:4
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Ihr persönliches Zertifikat auswählen �"
+msgstr "CA-Zertifikat auswählen"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "Diese Warnung nicht mehr anzeigen"
+msgstr "Warnhinweis nicht mehr anzeigen"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -305,7 +270,7 @@ msgstr "Ignorieren"
 #: ../src/wireless-security/wep-key.ui.h:1
 #: ../src/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
-msgstr "Legitimierung:"
+msgstr "Authentifizierung:"
 
 #: ../src/wireless-security/eap-leap.ui.h:1
 #: ../src/wireless-security/eap-simple.ui.h:1
@@ -342,11 +307,11 @@ msgstr "CA-Zertifikat:"
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "Innere Legitimierung:"
+msgstr "Interne Authentifizierung:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
-msgstr "PEAP Version:"
+msgstr "PEAP-Version:"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
@@ -354,11 +319,11 @@ msgstr "Identität:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "Passwort des geheimen Schlüssels:"
+msgstr "Passwort des privaten Schlüssels:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
-msgstr "Geheimer Schlüssel:"
+msgstr "Privater Schlüssel:"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
@@ -383,7 +348,7 @@ msgstr "Typ:"
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
 msgid "MSCHAPv2"
-msgstr "MSCHP v2"
+msgstr "MSCHAPv2"
 
 #: ../src/wireless-security/eap-method-peap.c:239
 msgid "MD5"
@@ -393,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "CA-Zertifikat auswählen �"
+msgstr "Zertifikat der Zertifizierungsstelle auswählen..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "Ihr persönliches Zertifikat auswählen �"
+msgstr "Persönliches Zertifikat auswählen..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Ihren geheimen Schlüssel auswählen �"
+msgstr "Privaten Schlüssel auswählen..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -417,11 +382,11 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER-, PEM- oder PKCS#12-Schlüssel (*.der, *.pem, *.p12)"
+msgstr "DER, PEM, oder PKCS#12 private Schlüssel (*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER- oder PEM-Zertifikate (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER oder PEM Zertifikate (*.der, *.pem, *.crt, *.cer)"
 
 #: ../src/wireless-security/wireless-security.c:333
 msgid "TLS"
@@ -433,4 +398,5 @@ msgstr "Getunneltes TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "Geschütztes EAP (PEAP)"
+msgstr "Protected EAP (PEAP)"
+
diff --git a/po/el.po b/po/el.po
index c1b4b90..14d8431 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,180 +1,172 @@
-# translation of el.po to Greek
-# NetworkManager translation to Greek
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-# Nikos Charonitakis <charosn her forthnet gr>, 2005.
-# Kostas Papadimas <pkst gnome org>, 2005-2007, 2008.
-# Dimitris Glezos <dimitris glezos com>, 2006.
-# Jennie Petoumenou <epetoumenou gmail com>, 2008.
-# Tambet Ingo <tambet novell com>, 2009.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:03+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(κανένα)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "ΣÏ?νδεÏ?η:"
+msgstr "ΤÏ?Ï?Ï?οÏ? Ï?Ï?νδεÏ?ηÏ?:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
-msgstr "ΧειÏ?οκίνηÏ?α"
+msgstr "Î?η αÏ?Ï?Ï?μαÏ?η"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Î?διÏ?Ï?ικÏ? Ï?οÏ?ικÏ? δίκÏ?Ï?ο (Link-Local)"
+msgstr "ΤοÏ?ική Ï?Ï?νδεÏ?η"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "Î?ιεÏ?θÏ?νÏ?η IP:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
-msgstr "Î?άÏ?κα Ï?Ï?οδικÏ?Ï?οÏ?:"
+msgstr "Î?άÏ?κα subnet:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Î Ï?οεÏ?ιλεγμένη διαδÏ?ομή:"
+msgstr "Î?Ï?ομολογηÏ?ήÏ?:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
-msgstr ""
+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 ""
+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 ""
+msgstr "Î?νενεÏ?γÏ?"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
 msgstr "ΧÏ?Ï?ίÏ? Ï?Ï?νδεÏ?η"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "ΣÏ?νδεÏ?η"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Î?ίνεÏ?αι Ï?Ï?νδεÏ?η..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "Î?Ï?οÏ?Ï?νδεÏ?η"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
-msgstr "ΣÏ?νδεθήκαÏ?ε"
+msgstr "Î?ε Ï?Ï?νδεÏ?η"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
-msgstr "Î?Ï?ιλογέÏ? για Ï?Ï?οÏ?Ï?Ï?ημένοÏ?Ï?"
+msgstr "Î?ια Ï?Ï?οÏ?Ï?Ï?ημένοÏ?Ï?"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Î?ειÏ?οÏ?Ï?γία Ï?Ï?ήÏ?ηÏ?</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Î?νÏ?Ï?Ï?μαÏ?η</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Î Ï?οÏ?θήκη νέαÏ? Ï?Ï?νδεÏ?ηÏ?</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>Î?ίκÏ?Ï?α</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Î Ï?οÏ?θήκη νέαÏ? Ï?Ï?νδεÏ?ηÏ?"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Î?Ï?Ï?Ï?Ï? αÏ?Ï?Ï?μαÏ?ο δικÏ?Ï?ο"
+msgstr "Î?Ï?Ï?Ï?Ï? δίκÏ?Ï?ο"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Î?νÏ?οÏ?ίÏ?Ï?ηκαν εÏ?Ï?Ï?εÏ?ικÏ? 3G modem και κάÏ?Ï?α SIM"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Î?Ï?ιÏ?Ï?Ï?οÏ?ή Ï?Ï?ο Î?ίκÏ?Ï?ο"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Î?Ï?οθήκεÏ?Ï?η Ï?Ï?νδεÏ?ηÏ?"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Î?Ï?Ï?ι θα αÏ?ενεÏ?γοÏ?οιηθοÏ?ν Ï?λεÏ? οι αÏ?Ï?Ï?μαÏ?εÏ? Ï?Ï?νδέÏ?ειÏ?"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
-msgstr "Ï?Ï?οεÏ?ιλεγμένη"
+msgstr "Î Ï?οεÏ?ιλογή"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "Το 3G αÏ?ενεÏ?γοÏ?οιήθηκε"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Î?εν ενÏ?οÏ?ίÏ?Ï?ηκαν modem"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
-msgstr "ΧÏ?Ï?ίÏ?"
+msgstr "Î?αμία"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "Î?λειδί WEP 40/128-bit"
+msgstr "Î?λειδί WEP 40/128 bit"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "ΣÏ?νθημαÏ?ική Ï?Ï?άÏ?η WEP 128-bit"
+msgstr "ΣÏ?νθημαÏ?ική Ï?Ï?άÏ?η WEP 128 bit"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -183,7 +175,7 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "Î?Ï?ναμικÏ? WEP (802.1x)"
+msgstr "Dynamic WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
@@ -195,24 +187,20 @@ msgstr "WPA & WPA2 Enterprise"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
-msgstr "Î?_ημιοÏ?Ï?γία"
+msgstr "_Î?ημιοÏ?Ï?γία"
 
 #: ../src/wireless-dialog.c:869
 #, 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
 msgid "Wireless Network Authentication Required"
-msgstr "Î?Ï?αιÏ?είÏ?αι Ï?ιÏ?Ï?οÏ?οίηÏ?η αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?"
+msgstr "Î?Ï?αιÏ?είÏ?αι έλεγÏ?οÏ? Ï?αÏ?Ï?Ï?Ï?ηÏ?αÏ? Ï?Ï?ο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "Î?Ï?αιÏ?είÏ?αι Ï?ιÏ?Ï?οÏ?οίηÏ?η αÏ?Ï? Ï?ο αÏ?Ï?Ï?μαÏ?ο δικÏ?Ï?ο"
+msgstr "Î?Ï?αιÏ?είÏ?αι έλεγÏ?οÏ? Ï?αÏ?Ï?Ï?Ï?ηÏ?αÏ? αÏ?Ï? Ï?ο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
@@ -220,12 +208,11 @@ msgstr "Î?ημιοÏ?Ï?γία νέοÏ? αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr "Î?έο αÏ?Ï?Ï?μαÏ?ο δικÏ?Ï?ο"
+msgstr "Î?έο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr ""
-"Î?ιÏ?άγεÏ?ε Ï?ο Ï?νομα Ï?οÏ? αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ? Ï?οÏ? εÏ?ιθÏ?μείÏ?ε να δημιοÏ?Ï?γήÏ?εÏ?ε."
+msgstr "Î?αÏ?αÏ?Ï?Ï?ήÏ?Ï?ε ένα Ï?νομα για Ï?ο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο Ï?οÏ? θέλεÏ?ε να δημιοÏ?Ï?γήÏ?εÏ?ε."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
@@ -233,30 +220,23 @@ msgstr "ΣÏ?νδεÏ?η Ï?ε κÏ?Ï?Ï?Ï? αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr "Î?Ï?Ï?Ï?Ï? αÏ?Ï?Ï?μαÏ?ο δικÏ?Ï?ο"
+msgstr "Î?Ï?Ï?Ï?Ï? αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο"
 
 #: ../src/wireless-dialog.c:886
-msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
-msgstr ""
-"Î?ιÏ?άγεÏ?ε Ï?ο Ï?νομα και Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? αÏ?Ï?αλείαÏ? Ï?οÏ? κÏ?Ï?Ï?οÏ? αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ? "
-"Ï?Ï?ο οÏ?οίο εÏ?ιθÏ?μείÏ?ε να Ï?Ï?νδεθείÏ?ε."
+msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+msgstr "Î?αÏ?αÏ?Ï?Ï?ήÏ?Ï?ε Ï?ο Ï?νομα και Ï?α Ï?Ï?οιÏ?εία αÏ?Ï?αλείαÏ? Ï?οÏ? κÏ?Ï?Ï?οÏ? αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?, Ï?Ï?ο οÏ?οίο θέλεÏ?ε να Ï?Ï?νδεθείÏ?ε."
 
 #: ../src/wireless-security.ui.h:1
-#, fuzzy
 msgid "C_onnect"
-msgstr "ΣÏ?νδεÏ?η"
+msgstr "_ΣÏ?νδεÏ?η"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "ΣÏ?νδεÏ?η"
+msgstr "ΣÏ?νδεÏ?η:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Î?ημιοÏ?Ï?γία νέοÏ? αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?"
+msgstr "Î?λλο αÏ?Ï?Ï?μαÏ?ο δίκÏ?Ï?ο..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
@@ -264,50 +244,40 @@ msgstr "Î?Ï?Ï?Ï?μαÏ?οÏ? _Ï?Ï?οÏ?αÏ?μογέαÏ?:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
-msgstr "Î?_νομα δικÏ?Ï?οÏ?:"
+msgstr "Î?νομα _δικÏ?Ï?οÏ?:"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "Î?Ï?_Ï?άλεια αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?:"
+msgstr "_Î?Ï?Ï?άλεια αÏ?Ï?Ï?μαÏ?οÏ? δικÏ?Ï?οÏ?:"
 
 #: ../src/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), μÏ?οÏ?εί να Ï?Ï?νδεθείÏ?ε Ï?ε μη αÏ?Ï?αλή και εÏ?άλÏ?Ï?α αÏ?Ï?Ï?μαÏ?α δίκÏ?Ï?α. Î?έλεÏ?ε να εÏ?ιλέξεÏ?ε Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ? Î?Ï?Ï?ήÏ? ΠιÏ?Ï?οÏ?οίηÏ?ηÏ?;"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Î?Ï?ιλέξÏ?ε Ï?ο Ï?Ï?οÏ?Ï?Ï?ικÏ? Ï?αÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?..."
+msgstr "Î?Ï?ιλογή Ï?ιÏ?Ï?οÏ?οιηÏ?ικοÏ? CA"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "Î?α μη γίνει Ï?Ï?οειδοÏ?οίηÏ?η ξανά"
+msgstr "Î?α μην Ï?Ï?οειδοÏ?οιηθÏ? ξανά"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
-msgstr "Î?γνÏ?ηÏ?η"
+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
 msgid "Authentication:"
-msgstr "ΠιÏ?Ï?οÏ?οίηÏ?η:"
+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
 msgid "Password:"
-msgstr "ΣÏ?νθημαÏ?ικÏ?:"
+msgstr "Î?Ï?δικÏ?Ï? Ï?Ï?Ï?Ï?βαÏ?ηÏ?:"
 
 #: ../src/wireless-security/eap-leap.ui.h:2
 #: ../src/wireless-security/eap-simple.ui.h:2
@@ -315,7 +285,7 @@ msgstr "ΣÏ?νθημαÏ?ικÏ?:"
 #: ../src/wireless-security/leap.ui.h:2
 #: ../src/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
-msgstr "Î?μÏ?άνιÏ?η Ï?Ï?νθημαÏ?ικοÏ?"
+msgstr "Î?μÏ?άνιÏ?η κÏ?δικοÏ? Ï?Ï?Ï?Ï?βαÏ?ηÏ?"
 
 #: ../src/wireless-security/eap-leap.ui.h:3
 #: ../src/wireless-security/eap-simple.ui.h:3
@@ -337,7 +307,7 @@ msgstr "ΠιÏ?Ï?οÏ?οιηÏ?ικÏ? CA:"
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "Î?Ï?Ï?Ï?εÏ?ική Ï?ιÏ?Ï?οÏ?οίηÏ?η:"
+msgstr "Î?νδÏ?Ï?εÏ?οÏ? έλεγÏ?οÏ? Ï?αÏ?Ï?Ï?Ï?ηÏ?αÏ?:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
@@ -349,7 +319,7 @@ msgstr "ΤαÏ?Ï?Ï?Ï?ηÏ?α:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "ΣÏ?νθημαÏ?ικÏ? ιδιÏ?Ï?ικοÏ? κλειδιοÏ?:"
+msgstr "Î?Ï?δικÏ?Ï? Ï?Ï?Ï?Ï?βαÏ?ηÏ? ιδιÏ?Ï?ικοÏ? κλειδιοÏ?:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
@@ -388,7 +358,7 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Î?Ï?ιλέξÏ?ε Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ? Î?Ï?Ï?ήÏ? ΠιÏ?Ï?οÏ?οίηÏ?ηÏ?..."
+msgstr "Î?Ï?ιλέξÏ?ε ένα Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ? αÏ?Ï? κάÏ?οια αÏ?Ï?ή έκδοÏ?ηÏ? Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
@@ -428,4 +398,5 @@ msgstr "Tunneled TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "Î Ï?οÏ?Ï?αÏ?εÏ?μένο EAP (PEAP)"
+msgstr "Protected EAP (PEAP)"
+
diff --git a/po/es.po b/po/es.po
index 2a73669..24fb5ee 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,66 +1,56 @@
-# translation of network-manager-netbook to Español
-# translation of NetworkManager.po to
-# Traducción de NetworkManager al español.
-# Copyright (C) Spanish translation for NetworkManager
-# This file is distributed under the same license as the NetworkManager package.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-# Antonio Ognio <antonio linux org pe>, 2004.
-# Francisco Javier F. Serrador <serrador cvs gnome org>, 2004, 2005, 2006.
-# Lucas Vieites Fariña <lucas asixinformatica com>, 2005, 2006.
-# Jorge González <jorgegonz svn gnome org>, 2007, 200, 2009.
-# Tambet Ingo <tambet novell com>, 2009.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:07+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
-msgstr "(ninguna)"
+msgstr "(ninguno)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "Conectar:"
+msgstr "Conectar mediante:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
-msgstr "Automático"
+msgstr "Manual"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Enlace local"
+msgstr "Local del enlace"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "Dirección IP:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
 msgstr "Máscara de subred:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Ruta predeterminada:"
+msgstr "Router:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
@@ -82,102 +72,101 @@ msgstr "Encendido"
 msgid "Off"
 msgstr "Apagado"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Conectando..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Avanzado"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Modo de vuelo</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Con cable</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+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 ""
+msgstr "<big><b>Redes</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Añadir una conexión nueva"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Red inalámbrica oculta"
+msgstr "Red oculta"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Se ha detectado un módem 3G interno y una tarjeta SIM"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Volver a redes"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Guardar conexión"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "De esta forma se inhabilitarán todas las conexiones inalámbricas"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
-msgstr "Predeterminado"
+msgstr "Defecto"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G inhabilitado"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "No se ha detectado ningún módem"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
-msgstr "Ninguna"
+msgstr "Ninguno"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-bit Key"
+msgstr "Llave WEP 40/128-bit"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "Frase de paso WEP de 128 bits"
+msgstr "Contrase�a WEP 128-bit"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -186,15 +175,15 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "WEP dinámica"
+msgstr "WEP din�mico (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA y WPA2 personal"
+msgstr "WPA & WPA2 Personal"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA y WPA2 enterprise"
+msgstr "WPA & WPA2 Empresarial"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
@@ -202,63 +191,52 @@ msgstr "C_rear"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
-msgstr ""
-"Se necesitan contraseñas o claves de cifrado 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
 msgid "Wireless Network Authentication Required"
-msgstr "Autenticación requerida para la red inalámbrica"
+msgstr "Autenticaci�n de red inal�mbrica requerida"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "La red inalámbrica necesita autenticación"
+msgstr "Autenticaci�n requerida por la red inal�mbrica"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "Crear una red inalámbrica nueva"
+msgstr "Crear nueva red inal�mbrica"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr "Red inalámbrica nueva"
+msgstr "Nueva red inal�mbrica"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Introduzca un nombre para la red inalámbrica que desea crear."
+msgstr "Ingresa un nombre para la red inal�mbrica que deseas crear."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "Conectar con una red inalámbrica oculta"
+msgstr "Conectar a una red inal�mbrica no visible"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr "Red inalámbrica oculta"
+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 ""
-"Introduzca el nombre y los detalles de seguridad de la red inalámbrica "
-"oculta a la que quiere conectarse."
+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
-#, fuzzy
 msgid "C_onnect"
-msgstr "Conectar"
+msgstr "C_onectar"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Conectar"
+msgstr "Conexión:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Crear una red inalámbrica nueva"
+msgstr "Otra red inalámbrica..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
@@ -266,33 +244,23 @@ msgstr "_Adaptador inalámbrico:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
-msgstr "Nombre de _red:"
+msgstr "_Nombre de la red:"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "_Seguridad inalámbrica:"
+msgstr "Seg_uridad inalámbrica:"
 
 #: ../src/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\">No se ha elegido ningún certificado CA</span>\n"
-"\n"
-"No usar un certificado de Certificate Authority (CA) puede dar lugar a conexiones inseguras, redes inalámbricas promiscuas. ¿Quiere elegir un certificado Certificate Authority?"
+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\">No se ha elegido ningún certificado de una autoridad certificadora.</span>\n\nSi no se usa un certificado de una autoridad certificadora (CA) las conexiones podrían no ser seguras o se podrían producir accesos inalámbricos no autorizados. ¿Desea elegir un certificado de una autoridad certificadora?"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:4
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Elija su certificado personalâ?¦"
+msgstr "Elegir certificado CA"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "No avisarme de nuevo"
+msgstr "No preguntar de nuevo"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -317,13 +285,13 @@ msgstr "Contraseña:"
 #: ../src/wireless-security/leap.ui.h:2
 #: ../src/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
-msgstr "Mostrar la contraseña"
+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
 msgid "User Name:"
-msgstr "Nombre de usuario:"
+msgstr "Usuario:"
 
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
@@ -334,7 +302,7 @@ msgstr "Identidad anónima:"
 #: ../src/wireless-security/eap-tls.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
-msgstr "Certificado CA:"
+msgstr "Certificado CA"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
@@ -343,7 +311,7 @@ msgstr "Autenticación interna:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
-msgstr "Versión PEAP:"
+msgstr "Versión de PEAP:"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
@@ -359,7 +327,7 @@ msgstr "Clave privada:"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
-msgstr "Certificado del usuario:"
+msgstr "Certificado de usuario:"
 
 #: ../src/wireless-security/wep-key.ui.h:2
 msgid "Key:"
@@ -367,7 +335,7 @@ msgstr "Clave:"
 
 #: ../src/wireless-security/wep-key.ui.h:3
 msgid "Show key"
-msgstr "Mostrar la clave"
+msgstr "Mostrar clave"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
@@ -380,7 +348,7 @@ msgstr "Tipo:"
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
 msgid "MSCHAPv2"
-msgstr "MSCHAP v2"
+msgstr "MSCHAPv2"
 
 #: ../src/wireless-security/eap-method-peap.c:239
 msgid "MD5"
@@ -390,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Elija un certificado CAâ?¦"
+msgstr "Escoge un certificado de una Autoridad Certificadora..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "Elija su certificado personalâ?¦"
+msgstr "Escoge tu certificado personal..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Elija su clave privadaâ?¦"
+msgstr "Escoge tu llave privada..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -414,7 +382,7 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "Certificados DER o PEM (*.der, *.pem, *.crt, *.cer)"
+msgstr "Llaves privadas DER, PEM, o PKCS#12 (*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
@@ -426,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr "TLS a través de túnel"
+msgstr "Tunelado TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegido (PEAP)"
+
diff --git a/po/fi.po b/po/fi.po
index f0d74c0..1fabc43 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,69 +1,62 @@
-# Finnish messages for network-manager-netbook
-# Copyright (C) 2005-2008 Ilkka Tuohela, Timo Jyrinki.
-# This file is distributed under the same license as the network-manager-netbook
-# package.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-# Ilkka Tuohela <hile iki fi>, 2005-2008.
-# Timo Jyrinki <timo jyrinki iki fi>, 2008.
-# Tambet Ingo <tambet novell com>, 2009.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:12+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(ei mitään)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "Yhdistä"
+msgstr "Yhdistämistapa:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
-msgstr "Automaattinen"
+msgstr "Manuaalinen"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Vain linkkitaso"
+msgstr "Linkki paikalliseen"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "IP-osoite:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
-msgstr "Aliverkkopeite:"
+msgstr "Aliverkon peite:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Yhdyskäytävä"
+msgstr "Reititin:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
-msgstr "DNS"
+msgstr "DNS:"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
-msgstr "Ei tavoitettavissa"
+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
@@ -79,90 +72,89 @@ msgstr "Päällä"
 msgid "Off"
 msgstr "Pois päältä"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "Katkaistu"
+msgstr "Yhteys katkaistu"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr "Yhteyttä..."
+msgstr "Yhdistetään..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
-msgstr "Yhdistetty"
+msgstr "Yhteydessä"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Lentotila</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Langallinen</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Lisää uusi yhteys</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>Verkot</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Lisää uusi yhteys"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Piilotettu langaton verkko"
+msgstr "Piilotettu verkko"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Havaittiin sisäinen 3G-modeemi ja SIM-kortti"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Palaa verkkoon"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Tallenna yhteys"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Tämä poistaa kaikki langattomat yhteydet käytöstä"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
 msgstr "Oletus"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G poistettu käytöstä"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Modeemeita ei ole havaittu"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -174,7 +166,7 @@ msgstr "WEP 40/128-bittinen avain"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bittinen tunnuslause"
+msgstr "WEP 128-bittinen salauslause"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -183,36 +175,32 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "Dynaaminen WEP"
+msgstr "Dynaaminen WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 (henkilökohtainen)"
+msgstr "WPA ja WPA2 Personal"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA2 Enterprise"
+msgstr "WPA ja WPA2 Enterprise"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
-msgstr "Luo"
+msgstr "L_uo"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
-msgstr ""
-"Salasanoja tai salausavaimia tarvitaan langattomaan verkkoon â??%sâ?? "
-"pääsemiseksi."
+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
 msgid "Wireless Network Authentication Required"
-msgstr "Langattoman verkon salaustiedot vaaditaan"
+msgstr "Langattoman verkon todennus vaaditaan"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "Langaton verkko vaatii salaustietoja"
+msgstr "Langattoman verkon vaatima todennus"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
@@ -224,41 +212,35 @@ msgstr "Uusi langaton verkko"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Syötä sen langattoman verkon nimi, jonka haluat luoda."
+msgstr "Anna luotavalle langattomalle verkolle nimi."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "Ota yhteys piilotettuun langattomaan verkkoon"
+msgstr "Muodosta yhteys piilotettuun langattomaan verkkoon"
 
 #: ../src/wireless-dialog.c:885
 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 ""
-"Syötä yhdistettävän piilotetun langattoman verkon nimi ja salaustiedot."
+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
-#, fuzzy
 msgid "C_onnect"
-msgstr "Yhdistä"
+msgstr "_Yhdistä"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Yhdistä"
+msgstr "Yhteys:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Luo uusi langaton verkko"
+msgstr "Muu langaton verkko..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "Langaton _verkkolaite:"
+msgstr "Langaton _sovitin:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
@@ -266,29 +248,19 @@ msgstr "_Verkon nimi:"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "_Langaton tietoturva:"
+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"
-"\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\">Varmentajavarmennetta ei valittu</span>\n"
-"\n"
-"Varmentajan (CA) käyttämättä jättäminen voi johtaa yhteyksien ottamiseen turvattomiin, epäluotettaviin langattomiin verkkoihin. Haluatko valita varmentajan varmenteen?"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Valitse oma varmenne..."
+msgstr "Valitse varmenteen myäntäjän varmenne"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "�lä huomauta uudestaan"
+msgstr "�lä näytä tätä varoitusta enää uudelleen"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -298,7 +270,7 @@ msgstr "Ohita"
 #: ../src/wireless-security/wep-key.ui.h:1
 #: ../src/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
-msgstr "Todentaminen:"
+msgstr "Todennus:"
 
 #: ../src/wireless-security/eap-leap.ui.h:1
 #: ../src/wireless-security/eap-simple.ui.h:1
@@ -319,23 +291,23 @@ msgstr "Näytä salasana"
 #: ../src/wireless-security/eap-simple.ui.h:3
 #: ../src/wireless-security/leap.ui.h:3
 msgid "User Name:"
-msgstr "Käyttäjätunnus:"
+msgstr "Käyttäjänimi:"
 
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "Anonyymi tunniste:"
+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
 msgid "CA Certificate:"
-msgstr "CA-varmenne:"
+msgstr "Varmenne:"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "Sisempi todentaminen:"
+msgstr "Sisäinen varmennus:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
@@ -343,19 +315,19 @@ msgstr "PEAP-versio:"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
-msgstr "Tunniste:"
+msgstr "Henkilöllisyys:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "Salausavaimen salasana:"
+msgstr "Yksityisen avaimen salasana:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
-msgstr "Salainen avain:"
+msgstr "Yksityinen avain:"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
-msgstr "Käyttäjävarmenne:"
+msgstr "Käyttäjän varmenne:"
 
 #: ../src/wireless-security/wep-key.ui.h:2
 msgid "Key:"
@@ -376,7 +348,7 @@ msgstr "Tyyppi:"
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
 msgid "MSCHAPv2"
-msgstr "MSCHAP v2"
+msgstr "MSCHAPv2"
 
 #: ../src/wireless-security/eap-method-peap.c:239
 msgid "MD5"
@@ -386,7 +358,7 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Valitse varmentajavarmenne..."
+msgstr "Valitse varmenteen myöntäjän varmenne..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
@@ -394,7 +366,7 @@ msgstr "Valitse oma varmenne..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Valitse salainen avain..."
+msgstr "Valitse oma yksityinen avain..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -410,7 +382,7 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER-, PEM- tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12)"
+msgstr "DER- PEM- tai PKCS#12 -yksityiset avaimet (*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
@@ -427,3 +399,4 @@ msgstr "Tunneloitu TLS"
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Suojattu EAP (PEAP)"
+
diff --git a/po/fr.po b/po/fr.po
index 498b147..63bdee2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,67 +1,58 @@
-# French translation of NetworkManager.
-# Copyright (C) 2004-2009 The GNOME Foundation.
-# This file is distributed under the same license as the NetworkManager package.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-# Raphaël Tournoy <lexpas free fr>, 2004.
-# Stéphane Raimbault <stephae raimbault gmail com>, 2006-2008
-# Claude Paroz <claude 2xlibre net>, 2007-2009.
-# Robert-André Mauchin <zebob m pengzone org>, 2007-2008.
-# Jonathan Ernst <jonathan ernstfamily ch>, 2008.
-# Tambet Ingo <tambet novell com>, 2009.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:15+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(aucun)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "Se connecter:"
+msgstr "Mode de connexion :"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Lien-local"
+msgstr "Link Local"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
-msgstr "Adresse IP:"
+msgstr "Adresse IP :"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
-msgstr "Masque de sous-réseau:"
+msgstr "Masque de sous-réseau :"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Route par défaut:"
+msgstr "Routeur :"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
-msgstr "DNS:"
+msgstr "DNS :"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
@@ -72,7 +63,7 @@ msgstr "Indisponible"
 #. * instead
 #: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
 msgid "On"
-msgstr "Activé"
+msgstr "Actif"
 
 #. Draw the second label; "Off"
 #. TRANSLATORS: If this string takes more than four or five characters in
@@ -81,90 +72,89 @@ msgstr "Activé"
 msgid "Off"
 msgstr "Désactivé"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "Se connecter"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Connexion en cours..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "Se déconnecter"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Avancé"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Mode Flight</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Câblé</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Ajouter une nouvelle connexion</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>Réseaux</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Ajouter une nouvelle connexion"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Réseau sans fil invisible"
+msgstr "Réseau masqué"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Carte SIM et modem 3G interne détectés"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Retour à la réseautique"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Enregistrer la connexion"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Cette opération désactive toutes les connexions sans fil."
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
-msgstr "Par défaut"
+msgstr "Valeur par défaut"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G désactivé"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Aucun modem détecté"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -172,11 +162,11 @@ msgstr "Aucun"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "Clé WEP 40/128-bit"
+msgstr "Clé WEP 40/128 bits"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bit à phrase secrète"
+msgstr "Phrase secrète WEP 128 bits"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -189,11 +179,11 @@ msgstr "WEP dynamique (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA et WPA2 personnel"
+msgstr "WPA et WPA2 Personnel"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA et WPA2 entreprise"
+msgstr "WPA et WPA2 Entreprise"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
@@ -201,24 +191,20 @@ msgstr "C_réer"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
-msgstr ""
-"Des mots de passe ou des clés de chiffrement sont nécessaires pour l'accès "
-"au réseau sans fil « %s »."
+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
 msgid "Wireless Network Authentication Required"
-msgstr "Authentification nécessaire pour le réseau sans fil"
+msgstr "Une authentification au réseau sans fil est requise."
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "Authentification nécessaire pour le réseau sans fil"
+msgstr "Une authentification est requise par le réseau sans fil."
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "Création d'un nouveau réseau sans fil"
+msgstr "Créer un nouveau réseau sans fil"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
@@ -226,68 +212,51 @@ msgstr "Nouveau réseau sans fil"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Saisissez le nom du réseau sans fil que vous voulez créer."
+msgstr "Entrez un nom pour le réseau sans fil que vous souhaitez créer."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "Connexion à des réseaux sans fil invisibles"
+msgstr "Se connecter à un réseau sans fil masqué"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr "Réseau sans fil invisible"
+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 ""
-"Saisissez le nom et les détails de sécurité du réseau sans fil invisible "
-"auquel vous voulez vous connecter."
+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
-#, fuzzy
 msgid "C_onnect"
-msgstr "Se connecter"
+msgstr "Se c_onnecter"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Se connecter"
+msgstr "Connexion :"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Création d'un nouveau réseau sans fil"
+msgstr "Autre réseau sans fil..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "Ad_aptateur sans fil :"
+msgstr "_Adaptateur sans fil :"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
-msgstr "_Nom de réseau :"
+msgstr "_Nom du réseau :"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "_Sécurité sans fil :"
+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"
-"\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 choisi</span>\n"
-"\n"
-"Ne pas utiliser de certificat provenant d'une autorité de certification (CA) peut conduire à la connexion à des réseaux sans fil corrompus et non sécurisés. Souhaitez-vous choisir un certificat d'une autorité de certification?"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Choisissez votre certificat personnel..."
+msgstr "Sélectionner un certificat CA"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
@@ -301,14 +270,14 @@ msgstr "Ignorer"
 #: ../src/wireless-security/wep-key.ui.h:1
 #: ../src/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
-msgstr "Authentification :"
+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
 msgid "Password:"
-msgstr "Mot de passe :"
+msgstr "Mot de passe :"
 
 #: ../src/wireless-security/eap-leap.ui.h:2
 #: ../src/wireless-security/eap-simple.ui.h:2
@@ -322,47 +291,47 @@ msgstr "Afficher le mot de passe"
 #: ../src/wireless-security/eap-simple.ui.h:3
 #: ../src/wireless-security/leap.ui.h:3
 msgid "User Name:"
-msgstr "Nom d'utilisateur :"
+msgstr "Nom d'utilisateur :"
 
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "Identité anonyme :"
+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
 msgid "CA Certificate:"
-msgstr "Certificat du CAÂ :"
+msgstr "Certificat CA :"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "Authentification interne :"
+msgstr "Authentification interne :"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
-msgstr "Version de PEAPÂ :"
+msgstr "Version PEAP :"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
-msgstr "Identité :"
+msgstr "Identité :"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "Mot de passe de la clé privée :"
+msgstr "Mot de passe de la clé privée :"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
-msgstr "Clé privée :"
+msgstr "Clé privée :"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
-msgstr "Certificat de l'utilisateur :"
+msgstr "Certificat utilisateur :"
 
 #: ../src/wireless-security/wep-key.ui.h:2
 msgid "Key:"
-msgstr "Clé :"
+msgstr "Clé :"
 
 #: ../src/wireless-security/wep-key.ui.h:3
 msgid "Show key"
@@ -370,16 +339,16 @@ msgstr "Afficher la clé"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
-msgstr "Index WEPÂ :"
+msgstr "Index WEP :"
 
 #: ../src/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
-msgstr "Type :"
+msgstr "Type :"
 
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
 msgid "MSCHAPv2"
-msgstr "MSCHAP v2"
+msgstr "MSCHAPv2"
 
 #: ../src/wireless-security/eap-method-peap.c:239
 msgid "MD5"
@@ -389,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Choisissez un certificat d'une autorité de certification..."
+msgstr "Choisir un certificat d'une autorité de certification..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "Choisissez votre certificat personnel..."
+msgstr "Choisir votre certificat personnel..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Choisissez votre clé privée..."
+msgstr "Choisir votre clé privée..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -429,4 +398,5 @@ msgstr "Tunneled TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "Protected EAP (PEAP)"
+msgstr "EAP protégé (PEAP)"
+
diff --git a/po/hu.po b/po/hu.po
new file mode 100644
index 0000000..85685fe
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,402 @@
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"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"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: ../src/nmn-new-connection.c:218
+msgid "3G disabled"
+msgstr "3G letiltva"
+
+#: ../src/nmn-new-connection.c:225
+msgid "No modems detected"
+msgstr "Nem található modem"
+
+#: ../src/wireless-dialog.c:654
+msgid "None"
+msgstr "Nincs"
+
+#: ../src/wireless-dialog.c:671
+msgid "WEP 40/128-bit Key"
+msgstr "WEP 40/128 bites kulcs"
+
+#: ../src/wireless-dialog.c:680
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128 bites jelszó"
+
+#: ../src/wireless-dialog.c:697
+#: ../src/wireless-security/wireless-security.c:345
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../src/wireless-dialog.c:710
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamikus WEP (802.1x)"
+
+#: ../src/wireless-dialog.c:724
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../src/wireless-dialog.c:738
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 Enterprise"
+
+#: ../src/wireless-dialog.c:798
+msgid "C_reate"
+msgstr "Létre_hozás"
+
+#: ../src/wireless-dialog.c:869
+#, 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."
+
+#: ../src/wireless-dialog.c:871
+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
+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
+msgid "Create New Wireless Network"
+msgstr "�j vezeték nélküli hálózat létrehozása"
+
+#: ../src/wireless-dialog.c:880
+msgid "New wireless network"
+msgstr "�j vezeték nélküli hálózat"
+
+#: ../src/wireless-dialog.c:881
+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
+msgid "Connect to Hidden Wireless Network"
+msgstr "Kapcsolódás rejtett vezeték nélküli hálózathoz"
+
+#: ../src/wireless-dialog.c:885
+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."
+
+#: ../src/wireless-security.ui.h:1
+msgid "C_onnect"
+msgstr "C_satlakozás"
+
+#: ../src/wireless-security.ui.h:2
+msgid "Connection:"
+msgstr "Kapcsolat:"
+
+#: ../src/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
+msgid "Wireless _adapter:"
+msgstr "Vezeték nélküli _adapter:"
+
+#: ../src/wireless-security.ui.h:5
+msgid "_Network Name:"
+msgstr "_Hálózat neve:"
+
+#: ../src/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
+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
+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
+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
+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
+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
+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
+msgid "User Name:"
+msgstr "Felhasználónév:"
+
+#: ../src/wireless-security/eap-peap.ui.h:1
+#: ../src/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
+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
+msgid "Inner Authentication:"
+msgstr "BelsÅ? hitelesítés:"
+
+#: ../src/wireless-security/eap-peap.ui.h:4
+msgid "PEAP Version:"
+msgstr "PEAP-verzió:"
+
+#: ../src/wireless-security/eap-tls.ui.h:2
+msgid "Identity:"
+msgstr "Azonosító:"
+
+#: ../src/wireless-security/eap-tls.ui.h:3
+msgid "Private Key Password:"
+msgstr "Személyes kulcs jelszava:"
+
+#: ../src/wireless-security/eap-tls.ui.h:4
+msgid "Private Key:"
+msgstr "Személyes kulcs:"
+
+#: ../src/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
+msgid "Key:"
+msgstr "Kulcs:"
+
+#: ../src/wireless-security/wep-key.ui.h:3
+msgid "Show key"
+msgstr "Kulcs megjelenítése"
+
+#: ../src/wireless-security/wep-key.ui.h:4
+msgid "WEP Index:"
+msgstr "WEP-index:"
+
+#: ../src/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
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../src/wireless-security/eap-method-peap.c:239
+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
+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
+msgid "Choose your personal certificate..."
+msgstr "Személyes tanúsítvány választása..."
+
+#: ../src/wireless-security/eap-method-tls.c:399
+msgid "Choose your private key..."
+msgstr "Személyes kulcs választása..."
+
+#: ../src/wireless-security/eap-method-ttls.c:223
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:237
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:265
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../src/wireless-security/eap-method.c:456
+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
+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
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/wireless-security/wireless-security.c:357
+msgid "Tunneled TLS"
+msgstr "Bújtatott TLS"
+
+#: ../src/wireless-security/wireless-security.c:368
+msgid "Protected EAP (PEAP)"
+msgstr "Protected EAP (PEAP)"
+
diff --git a/po/it.po b/po/it.po
index 43739a0..e629044 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,60 +1,56 @@
-# Italian translation for NetworkManager-Netbook
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 the NetworkManager-Netbook CopyRight Holder
-# This file is distributed under the same license as the NetworkManager-Netbook package.
-# Francesco Marletta <francesco marletta tiscali it>, 2004, 2005, 2006, 2007, 2008, 2009.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:38+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
-msgstr "(nessuna)"
+msgstr "(nessuno)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "Connettere:"
+msgstr "Connetti per:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
 msgstr "Manuale"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Link-Local"
+msgstr "Collega locale"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "Indirizzo IP:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
-msgstr "Maschera di rete:"
+msgstr "Maschera di sottorete:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Instradamento predefinito:"
+msgstr "Router:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
@@ -76,94 +72,93 @@ msgstr "On"
 msgid "Off"
 msgstr "Off"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "Connetti"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Connessione in corso..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "Disconnetti"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
-msgstr "Connessi"
+msgstr "Connesso"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
-msgstr "Avanzate"
+msgstr "Avanzato"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Modalità flight</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Cablata</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Aggiungi nuova connessione</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>Reti</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Aggiungi nuova connessione"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Rete wireless nascosta"
+msgstr "Rete nascosta"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Rilevati modem 3G interno e scheda SIM"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Torna a Networking"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Salva connessione"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Tutte le connessioni wireless saranno disabilitate"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
-msgstr "Predefinita"
+msgstr "Default"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G disabilitato"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Nessun modem rilevato"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
-msgstr "Nessuna"
+msgstr "Nessuno"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
@@ -171,7 +166,7 @@ msgstr "Chiave WEP a 40/128 bit"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "Frase di accesso WEP a 128 bit"
+msgstr "Passphrase WEP a 128 bit"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -196,20 +191,16 @@ msgstr "C_rea"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
-msgstr ""
-"Per accedere alla rete wireless \"%s\" è necessaria una password o una "
-"chiave 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
 msgid "Wireless Network Authentication Required"
-msgstr "Richiesta autenticazione rete wireless"
+msgstr "Richiesta autenticazione per rete wireless"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "La rete wireless richiede autenticazione"
+msgstr "Autenticazione richiesta dalla rete wireless"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
@@ -221,7 +212,7 @@ msgstr "Nuova rete wireless"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Inserire un nome per la rete wireless che si vuole creare."
+msgstr "Immettere un nome per la rete wireless che si desidera creare."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
@@ -232,25 +223,20 @@ 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 "Non è stato scelto alcun certificato di un'Autorità di Certificazione"
+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
-#, fuzzy
 msgid "C_onnect"
-msgstr "Connetti"
+msgstr "C_onnetti"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Connetti"
+msgstr "Connessione:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Crea nuova rete wireless"
+msgstr "Altra rete wireless..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
@@ -265,26 +251,16 @@ 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"
-"\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 scelto alcun certificato di un'Autorità di Certificazione</span>\n"
-"\n"
-"Fare a meno di un certificato di un'Autorità di Certificazione (CA) può portare a connessioni a reti wireless insicure o malevole. Scegliere un certificato di un'Autorità di Certificazione?"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Scegliere il certificato personale..."
+msgstr "Scegliere un certificato CA"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "Non avvisare più"
+msgstr "Non visualizzare più questo messaggio"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -309,7 +285,7 @@ msgstr "Password:"
 #: ../src/wireless-security/leap.ui.h:2
 #: ../src/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
-msgstr "Mostra la password"
+msgstr "Mostra password"
 
 #: ../src/wireless-security/eap-leap.ui.h:3
 #: ../src/wireless-security/eap-simple.ui.h:3
@@ -326,7 +302,7 @@ msgstr "Identità anonima:"
 #: ../src/wireless-security/eap-tls.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
-msgstr "Certificato della CA:"
+msgstr "Certificato CA:"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
@@ -343,7 +319,7 @@ msgstr "Identità :"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "Password della chiave privata:"
+msgstr "Password chiave privata:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
@@ -359,7 +335,7 @@ msgstr "Chiave:"
 
 #: ../src/wireless-security/wep-key.ui.h:3
 msgid "Show key"
-msgstr "Mostra la chiave"
+msgstr "Mostra chiave"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
@@ -372,7 +348,7 @@ msgstr "Tipo:"
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
 msgid "MSCHAPv2"
-msgstr "MSCHAP v2"
+msgstr "MSCHAPv2"
 
 #: ../src/wireless-security/eap-method-peap.c:239
 msgid "MD5"
@@ -382,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Scegliere un certificato di un'Autorità di Certificazione..."
+msgstr "Selezionare il certificato di un'autorità di certificazione..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "Scegliere il certificato personale..."
+msgstr "Selezionare il certificato personale..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Scegliere la chiave privata personale..."
+msgstr "Selezionare la chiave privata..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -418,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr "TLS via tunnel"
+msgstr "TLS tunnel"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "EAP Protetto (PEAP)"
+msgstr "EAP protetto (PEAP)"
+
diff --git a/po/ja.po b/po/ja.po
index f315ffa..d6c2220 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,60 +1,56 @@
-# Japanese translation for NetworkManager (network-manager-netbook)
-# Copyright (C) 2005 Dan Williams <dcbw redhat com>
-# This file is distributed under the same license as the NetworkManager package.
-# Satoru SATOH <ss gnome gr jp>, 2005 - 2007.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:42+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
-msgstr "ã?ªã??"
+msgstr "(ã?ªã??)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr ""
+msgstr "����:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
-msgstr ""
+msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
-msgstr ""
+msgstr "æ??å??"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr ""
+msgstr "��������"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
-msgstr "IP ã?¢ã??ã?¬ã?¹:"
+msgstr "IPã?¢ã??ã?¬ã?¹:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
 msgstr "ã?µã??ã??ã??ã??ã??ã?¹ã?¯:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "ã??ã??ã?©ã?«ã??ã?«ã?¼ã??:"
+msgstr "���:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
@@ -67,98 +63,98 @@ msgstr "使ç?¨ã?§ã??ã?¾ã??ã??"
 #. * instead
 #: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
 msgid "On"
-msgstr "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 "OFF"
+msgstr "ã?ªã??"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "å??æ?­ã??ã??ã?¾ã??ã??"
+msgstr "���"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
-msgstr ""
+msgstr "��"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
-msgstr ""
+msgstr "å??æ?­"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
-msgstr ""
+msgstr "����"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
-msgstr ""
+msgstr "詳細"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>ã??ã?©ã?¤ã??ã?¢ã?¼ã??</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>æ??ç·?</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>æ?°ã??ã??æ?¥ç¶?ã?®è¿½å? </b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>ã??ã??ã??ã?¯ã?¼ã?¯</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "æ?°ã??ã??æ?¥ç¶?ã??追å? ã??ã?¾ã??"
 
 #: ../src/network-manager-netbook.ui.h:8
 msgid "Hidden network"
-msgstr ""
+msgstr "é??表示ã?®ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "å??é?¨3Gã??ã??ã?³SIMIã?«ã?¼ã??ã??æ¤?å?ºã??ã??ã?¾ã??ã??"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "ã??ã??ã??ã?¯ã?¼ã?­ã?³ã?°ã?«æ?»ã??"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "�����"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹æ?¥ç¶?ã??ã??ã?¹ã?¦ç?¡å?¹ã?«ã?ªã??ã?¾ã??"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
-msgstr ""
+msgstr "ã??ã??ã?©ã?«ã??"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3Gç?¡å?¹"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "ã?¢ã??ã? ã??æ¤?å?ºã??ã??ã?¾ã??ã??"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -166,90 +162,85 @@ msgstr "ã?ªã??"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr ""
+msgstr "WEP 40/128ã??ã??ã??ã?­ã?¼"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr ""
+msgstr "WEP 128ã??ã??ã??ã??ã?¹ã??ã?¬ã?¼ã?º"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
 msgid "LEAP"
-msgstr ""
+msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr ""
+msgstr "ã??ã?¤ã??ã??ã??ã?¯WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr ""
+msgstr "WPA & WPA2ã??ã?¼ã?½ã??ã?«"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr ""
+msgstr "WPA & WPA2ã?¨ã?³ã?¿ã?¼ã??ã?©ã?¤ã?º"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
-msgstr ""
+msgstr "ä½?æ??(_R)"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
-msgstr ""
+msgid "Passwords or encryption keys are required to access the wireless network '%s'."
+msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ '%s' ã?«ã?¢ã?¯ã?»ã?¹ã??ã??ã?«ã?¯ã??ã?¹ã?¯ã?¼ã??ã?¾ã??ã?¯æ??å?·å??ã?­ã?¼ã??å¿?è¦?ã?§ã??ã??"
 
 #: ../src/wireless-dialog.c:871
 msgid "Wireless Network Authentication Required"
-msgstr ""
+msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¢ã?¼ã?¯èª?証ã??å¿?è¦?ã?§ã??"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr ""
+msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã??ã??èª?証ã??å¿?è¦?ã?§ã??"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr ""
+msgstr "æ?°è¦?ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?®ä½?æ??"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr ""
+msgstr "æ?°è¦?ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr ""
+msgstr "ä½?æ??ã??ã??ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?®å??å??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??"
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr ""
+msgstr "é??表示ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr ""
+msgstr "é??表示ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯"
 
 #: ../src/wireless-dialog.c:886
-msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
-msgstr ""
+msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+msgstr "æ?¥ç¶?ã??ã??é??表示ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯ã?®å??å??ã?¨ã?»ã?­ã?¥ã?ªã??ã?£è©³ç´°ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??"
 
 #: ../src/wireless-security.ui.h:1
-#, fuzzy
 msgid "C_onnect"
-msgstr "å??æ?­ã??ã??ã?¾ã??ã??"
+msgstr "��(_O)"
 
 #: ../src/wireless-security.ui.h:2
 msgid "Connection:"
-msgstr ""
+msgstr "��:"
 
 #: ../src/wireless-security.ui.h:3
 msgid "Other Wireless Network..."
-msgstr ""
+msgstr "ã??ã?®ä»?ã?®ã?¯ã?¤ã?¤ã?¬ã?¹ã??ã??ã??ã?¯ã?¼ã?¯..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "ç?¡ç·?ã?¢ã??ã??ã?¿(_A):"
+msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã?¢ã??ã??ã?¿(_A):"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
@@ -257,29 +248,23 @@ msgstr "ã??ã??ã??ã?¯ã?¼ã?¯å??(_N):"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "ç?¡ç·?ã?»ã?­ã?¥ã?ªã??ã?£(_W):"
+msgstr "ã?¯ã?¤ã?¤ã?¬ã?¹ã?»ã?­ã?¥ã?ªã??ã?£(_W):"
 
 #: ../src/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 ""
+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
 msgid "Choose CA Certificate"
-msgstr ""
+msgstr "CA証æ??æ?¸ã?®é?¸æ??"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr ""
+msgstr "ä»?å¾?ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã??表示ã??ã?ªã??"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
-msgstr ""
+msgstr "��"
 
 #: ../src/wireless-security/dynamic-wep.ui.h:1
 #: ../src/wireless-security/wep-key.ui.h:1
@@ -300,49 +285,49 @@ msgstr "ã??ã?¹ã?¯ã?¼ã??:"
 #: ../src/wireless-security/leap.ui.h:2
 #: ../src/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
-msgstr "ã??ã?¹ã?¯ã?¼ã??ã??表示"
+msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®è¡¨ç¤º"
 
 #: ../src/wireless-security/eap-leap.ui.h:3
 #: ../src/wireless-security/eap-simple.ui.h:3
 #: ../src/wireless-security/leap.ui.h:3
 msgid "User Name:"
-msgstr "ã?¦ã?¼ã?¶ã?¼å??:"
+msgstr "ã?¦ã?¼ã?¶å??:"
 
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "å?¿å??:"
+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
 msgid "CA Certificate:"
-msgstr "CA 証æ??æ?¸ã??ã?¡ã?¤ã?«:"
+msgstr "CA証æ??æ?¸:"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr ""
+msgstr "å??é?¨èª?証:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
-msgstr ""
+msgstr "PEAPã??ã?¼ã?¸ã?§ã?³:"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
-msgstr "ID:"
+msgstr "è­?å?¥æ??å ±:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "ç§?å¯?é?µã??ã?¹ã?¯ã?¼ã??:"
+msgstr "ç§?å¯?é?µã?®ã??ã?¹ã?¯ã?¼ã??:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
-msgstr "ç§?å¯?é?µã??ã?¡ã?¤ã?«:"
+msgstr "���:"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
-msgstr ""
+msgstr "ã?¦ã?¼ã?¶è¨¼æ??æ?¸:"
 
 #: ../src/wireless-security/wep-key.ui.h:2
 msgid "Key:"
@@ -350,11 +335,11 @@ msgstr "é?µ:"
 
 #: ../src/wireless-security/wep-key.ui.h:3
 msgid "Show key"
-msgstr "é?µã??表示"
+msgstr "��表示"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
-msgstr ""
+msgstr "WEPã?¤ã?³ã??ã??ã?¯ã?¹:"
 
 #: ../src/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
@@ -373,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr ""
+msgstr "èª?証å±?証æ??æ?¸ã?®é?¸æ??..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr ""
+msgstr "å??人証æ??æ?¸ã?®é?¸æ??..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr ""
+msgstr "ç§?å¯?é?µã?®é?¸æ??..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -393,15 +378,15 @@ msgstr "MSCHAP"
 
 #: ../src/wireless-security/eap-method-ttls.c:265
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr ""
+msgstr "DERã??PEMã??ã?¾ã??ã?¯PKCS#12ã?®ç§?å¯?é?µ(*.derã??*.pemã??*.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr ""
+msgstr "DERã?¾ã??ã?¯PEM証æ??æ?¸(*.derã??*.pemã??*.crtã??*.cer)"
 
 #: ../src/wireless-security/wireless-security.c:333
 msgid "TLS"
@@ -409,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr ""
+msgstr "ã??ã?³ã??ã?«å??TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr ""
+msgstr "�護��EAP (PEAP)"
+
diff --git a/po/ko.po b/po/ko.po
index 098fe09..759444a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,165 +1,160 @@
-# networkmanager korean translation.
-# Copyright (C) 2007 THE NetworkManager'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the NetworkManager package.
-# Young-Ho Cha <ganadist gmail com>, 2006.
-# Namhyung Kim <namhyung gmail com>, 2007.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:46+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
-msgstr "ì??ì??"
+msgstr "(ì??ì??)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr ""
+msgstr "ì?°ê²° ë°©ë²?:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
-msgstr ""
+msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
 msgstr "ì??ë??"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr ""
+msgstr "�� �컬"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "IP 주ì??:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
 msgstr "ì??ë¸?ë?· ë§?ì?¤í?¬:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "기본 Route:"
+msgstr "���:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
-msgstr "����"
+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 "껴기"
+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 "ë??기"
+msgstr "í?´ì ?"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "ì?°ê²° ë??ê²¼ì??"
+msgstr "ì?°ê²° í?´ì ?ë?¨"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
-msgstr ""
+msgstr "ì?°ê²°"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "�결 �..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
-msgstr ""
+msgstr "ì?°ê²° í?´ì ?"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
 msgstr "ì?°ê²°ë?¨"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
-msgstr ""
+msgstr "ê³ ê¸?"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>ë¹?í?? 모ë??</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>ì? ì? </b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>ì?? ì?°ê²° ì¶?ê°?</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>ë?¤í?¸ì??í?¬</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "ì?? ì?°ê²° ì¶?ê°?"
 
 #: ../src/network-manager-netbook.ui.h:8
 msgid "Hidden network"
-msgstr ""
+msgstr "ì?¨ê²¨ì§? ë?¤í?¸ì??í?¬"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "í??ì§?ë?? ë?´ë¶? 3G 모ë?? ë°? SIM ì¹´ë??"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "ë?¤í?¸ì??í?¹ì?¼ë¡? ë??ì??ê°?기"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "ì?°ê²° ì ?ì?¥"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "모ë?  무ì?  ì?°ê²°ì?´ ë¹?í??ì?±í??ë?©ë??ë?¤."
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
-msgstr ""
+msgstr "기본�"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G ì?¬ì?© ì?? í?¨"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "í??ì§?ë?? 모ë?? ì??ì??"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -167,11 +162,11 @@ msgstr "ì??ì??"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128 ë¹?í?¸ 16ì§?ì??"
+msgstr "WEP 40/128ë¹?í?¸ í?¤"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128 ë¹?í?¸ ì?´ì? ê¸?"
+msgstr "WEP 128ë¹?í?¸ ì??í?¸ 구문"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -180,75 +175,68 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "Dynamic WEP (802.1x)"
+msgstr "ë??ì ? WEP(802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "��� WPA2"
+msgstr "WPA & WPA2 ê°?ì?¸"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 기ì??ì?©"
+msgstr "WPA & WPA2 기ì??"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
-msgstr ""
+msgstr "ì??ì?±(_R)"
 
 #: ../src/wireless-dialog.c:869
 #, 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
 msgid "Wireless Network Authentication Required"
-msgstr "무ì?  ë?¤í?¸ì??í?¬ í?¤ê°? í??ì??í?©ë??ë?¤"
+msgstr "무ì?  ë?¤í?¸ì??í?¬ ì?¸ì¦?ì?´ í??ì??í?¨"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr ""
+msgstr "무ì?  ë?¤í?¸ì??í?¬ì??ì?? ì?¸ì¦?ì?? ì??구í?¨"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "ì?? 무ì?  ë?¤í?¸ì??í?¬ ë§?ë?¤ê¸°(_N)..."
+msgstr "ì?? 무ì?  ë?¤í?¸ì??í?¬ ì??ì?±"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr ""
+msgstr "ì?? 무ì?  ë?¤í?¸ì??í?¬"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr ""
+msgstr "ì??ì?±í?  무ì?  ë?¤í?¸ì??í?¬ì?? ì?´ë¦?ì?? ì??ë ¥í?©ë??ë?¤."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "ë?¤ë¥¸ 무ì?  ë?¤í?¸ì??í?¬ì?? ì?°ê²°(_C)..."
+msgstr "ì?¨ê²¨ì§? 무ì?  ë?¤í?¸ì??í?¬ì?? ì?°ê²°"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr ""
+msgstr "ì?¨ê²¨ì§? 무ì?  ë?¤í?¸ì??í?¬"
 
 #: ../src/wireless-dialog.c:886
-msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
-msgstr "ë§?ë??ë ¤ë?? 무ì?  ë?¤í?¸ì??í?¬ì?? ì?´ë¦?ê³¼ ë³´ì?? ì?¤ì ?ì?? ì??ë ¥í??ì?­ì??ì?¤."
+msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+msgstr "ì?°ê²°í?  ì?¨ê²¨ì§? 무ì?  ë?¤í?¸ì??í?¬ì?? ì?´ë¦? ë°? ë³´ì?? ì?¸ë¶? ì?¬í?­ì?? ì??ë ¥í?©ë??ë?¤."
 
 #: ../src/wireless-security.ui.h:1
-#, fuzzy
 msgid "C_onnect"
-msgstr "ì?°ê²°ë?¨"
+msgstr "ì?°ê²°(_O)"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "ì?°ê²°ë?¨"
+msgstr "ì?°ê²°:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "ì?? 무ì?  ë?¤í?¸ì??í?¬ ë§?ë?¤ê¸°(_N)..."
+msgstr "기í?? 무ì?  ë?¤í?¸ì??í?¬..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
@@ -263,26 +251,16 @@ 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"
-"\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)ì?? ì?¸ì¦?ì??를 ì?´ì?©í??ì§? ì??ì?¼ë©´, 무ì?  ë?¤í?¸ì??í?¬ ì?°ê²°ì?? ë³´ì?? ì??ì?? í??ì ?ì?´ ë°?ì??í?  ì?? ì??ì?µë??ë?¤. CA ì?¸ì¦?ì??를 ì? í??í??ì??ê² ì?µë??ê¹??"
+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 ì?¸ì¦?ì??를 ì? í??í??ì??ê² ì?µë??ê¹??"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:4
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "ê°?ì?¸ ì?¸ì¦?ì?? ì? í??..."
+msgstr "CA ì?¸ì¦?ì?? ì? í??"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "ë?¤ì?? ë³´ì§? ì??기"
+msgstr "ì?´ ë©?ì??ì§?를 ë?¤ì?? í??ì?? ì?? í?¨"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -299,7 +277,7 @@ msgstr "��:"
 #: ../src/wireless-security/leap.ui.h:1
 #: ../src/wireless-security/wpa-psk.ui.h:1
 msgid "Password:"
-msgstr "ì??í?¸:"
+msgstr "ë¹?ë°?ë²?í?¸:"
 
 #: ../src/wireless-security/eap-leap.ui.h:2
 #: ../src/wireless-security/eap-simple.ui.h:2
@@ -307,7 +285,7 @@ msgstr "ì??í?¸:"
 #: ../src/wireless-security/leap.ui.h:2
 #: ../src/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
-msgstr "ì??í?¸ ë³´ì?¬ì£¼ê¸°"
+msgstr "ë¹?ë°?ë²?í?¸ í??ì??"
 
 #: ../src/wireless-security/eap-leap.ui.h:3
 #: ../src/wireless-security/eap-simple.ui.h:3
@@ -318,7 +296,7 @@ msgstr "ì?¬ì?©ì?? ì?´ë¦?:"
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "ì?µëª? ì? ë¶? í??ì?¸:"
+msgstr "�� ID:"
 
 #: ../src/wireless-security/eap-peap.ui.h:2
 #: ../src/wireless-security/eap-tls.ui.h:1
@@ -337,15 +315,15 @@ msgstr "PEAP ë²?ì ?:"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
-msgstr "ì? ë¶? í??ì?¸:"
+msgstr "ID:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "ê°?ì?¸í?¤ ì??í?¸:"
+msgstr "ê°?ì?¸ í?¤ ë¹?ë°?ë²?í?¸:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
-msgstr "���:"
+msgstr "ê°?ì?¸ í?¤:"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
@@ -357,15 +335,15 @@ msgstr "í?¤:"
 
 #: ../src/wireless-security/wep-key.ui.h:3
 msgid "Show key"
-msgstr "� 보�주기"
+msgstr "í?¤ í??ì??"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
-msgstr ""
+msgstr "WEP ���:"
 
 #: ../src/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
-msgstr "í??ì??:"
+msgstr "ì? í??:"
 
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
@@ -388,7 +366,7 @@ msgstr "ê°?ì?¸ ì?¸ì¦?ì?? ì? í??..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "ë¹?ë°?í?¤ ì? í??..."
+msgstr "ê°?ì?¸ í?¤ ì? í??..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -404,11 +382,11 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr ""
+msgstr "DER, PEM ë??ë?? PKCS#12 ê°?ì?¸ í?¤(*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DEP í?¹ì?? PEM ì?¸ì¦?ì?? (*.det, *.pem, *.crt, *.cer)"
+msgstr "DER ë??ë?? PEM ì?¸ì¦?ì??(*.pem, *.crt, *.key, *.cer)"
 
 #: ../src/wireless-security/wireless-security.c:333
 msgid "TLS"
@@ -416,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr "Tunneled TLS"
+msgstr "í?°ë?? TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "Protected EAP (PEAP)"
+msgstr "ë³´í?¸ë?? EAP(PEAP)"
+
diff --git a/po/nl.po b/po/nl.po
index db613c2..90eedc3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,172 +1,160 @@
-# Dutch translation of Network Manager Netbook
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-# This file is distributed under the same license as the
-# network-manager-netbook package.
-#
-# Tino Meinen <a t meinen chello nl>, 2004, 2005, 2006, 2008.
-# Daniel van Eeden <daniel_e dds nl>, 2004.
-# Tambet Ingo <tambet novell com>, 2009.
-#
-#
-# the wired network       het kabelnetwerk (is meer voor TV-kabelnetwerk?)
-#                         bekabelde/bekabeld netwerk/draadnetwerk/vast netwerk
-# the wireless network    het draadloos netwerk
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:50+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(geen)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "Verbinden:"
+msgstr "Verbinden via:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
 msgstr "Handmatig"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Link Local"
+msgstr "Lokaal koppelen"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "IP-adres:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
 msgstr "Subnetmasker:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Standaardroute:"
+msgstr "Router:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
-msgstr ""
+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 ""
+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 ""
+msgstr "Uit"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "Verbinding verbroken"
+msgstr "Niet verbonden"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
-msgstr "Verbinden"
+msgstr "Verbind"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Verbinden..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
-msgstr "Verbinding verbreken"
+msgstr "Verbreek verbinding"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
 msgstr "Verbonden"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Geavanceerd"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Vluchtmodus</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Bedraad</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Een nieuwe verbinding toevoegen</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>Netwerken</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Nieuwe verbinding toevoegen"
 
 #: ../src/network-manager-netbook.ui.h:8
 msgid "Hidden network"
-msgstr ""
+msgstr "Verborgen netwerk"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Interne 3G-modem en SIM-kaart gedetecteerd"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Terug naar netwerken"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Verbinding opslaan"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Hiermee worden alle draadloze verbindingen uitgeschakeld"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
 msgstr "Standaard"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G uitgeschakeld"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Geen modems gedetecteerd"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -174,7 +162,7 @@ msgstr "Geen"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-bit Key"
+msgstr "WEB 40/128-bits sleutel"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
@@ -187,40 +175,36 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "Dynamisch WEP (802.1x)"
+msgstr "Dynamische WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 persoonlijk"
+msgstr "WPA & WPA2 Persoonlijk"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 enterprise"
+msgstr "WPA & WPA2 Enterprise"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
-msgstr "Aanmaken"
+msgstr "_Maak"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
-msgstr ""
-"Er worden wachtwoorden of cryptografiesleutels gevraagd om toegang te "
-"krijgen tot het 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
 msgid "Wireless Network Authentication Required"
-msgstr "Geheimen voor draadloos netwerk"
+msgstr "Draadloze netwerk authenticatie vereist"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr ""
+msgstr "Authenticatie vereist door draadloos netwerk"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "Nieuw draadloos netwerk aanmaken"
+msgstr "Maak een nieuw draadloos netwerk"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
@@ -228,41 +212,35 @@ msgstr "Nieuw draadloos netwerk"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Geef een naam aan het draadloos netwerk dat u wilt aanmaken."
+msgstr "Geef een naam voor het nieuwe draadloze netwerk."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "Verbinden met ander draadloos netwerk"
+msgstr "Verbind met een verborgen draadloos netwerk"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr ""
+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 van het draadloos netwerk waarmee u een verbinding wilt maken."
+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
-#, fuzzy
 msgid "C_onnect"
-msgstr "Verbinden"
+msgstr "_Verbinden"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Verbinden"
+msgstr "Verbinding:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Nieuw draadloos netwerk aanmaken"
+msgstr "Ander draadloos netwerk..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "Draadloos _adapter:"
+msgstr "Draadloze _adapter:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
@@ -270,29 +248,19 @@ msgstr "_Netwerknaam:"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "_Draadloos beveiliging:"
+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"
-"\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 certificaat van certificaatautoriteit gekozen</span>\n"
-"\n"
-"Het niet gebruiken van een certificaat van een Certificaatautoriteit (CA) kan resulteren in verbindingen met onveilige draadloze netwerken. Wilt u een certificaat van een certificaatautoriteit kiezen?"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Kies uw persoonlijke certificaatâ?¦"
+msgstr "Certificeringsinstantiecertificaat kiezen"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "Geen certificaat van certificaatautoriteit gekozen"
+msgstr "Niet opnieuw waarschuwen"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -302,7 +270,7 @@ msgstr "Negeren"
 #: ../src/wireless-security/wep-key.ui.h:1
 #: ../src/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
-msgstr "Aanmeldingscontrole:"
+msgstr "Verificatie:"
 
 #: ../src/wireless-security/eap-leap.ui.h:1
 #: ../src/wireless-security/eap-simple.ui.h:1
@@ -317,7 +285,7 @@ msgstr "Wachtwoord:"
 #: ../src/wireless-security/leap.ui.h:2
 #: ../src/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
-msgstr "Wachtwoord tonen"
+msgstr "Wachtwoord weergeven"
 
 #: ../src/wireless-security/eap-leap.ui.h:3
 #: ../src/wireless-security/eap-simple.ui.h:3
@@ -334,12 +302,12 @@ msgstr "Anonieme identiteit:"
 #: ../src/wireless-security/eap-tls.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:2
 msgid "CA Certificate:"
-msgstr "CA-certificaat:"
+msgstr "Certificaat van certificeringsinstantie:"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "Interne aanmeldingscontrole:"
+msgstr "Binnenste verificatie:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
@@ -351,7 +319,7 @@ msgstr "Identiteit:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "Privé sleutelwachtwoord:"
+msgstr "Wachtwoord van privésleutel:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
@@ -367,7 +335,7 @@ msgstr "Sleutel:"
 
 #: ../src/wireless-security/wep-key.ui.h:3
 msgid "Show key"
-msgstr "Sleutel tonen"
+msgstr "Sleutel weergeven"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
@@ -390,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Kies een certificaat van een certificaatautoriteitâ?¦"
+msgstr "Kies een certifikaat autoriteits bestand..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "Kies uw persoonlijke certificaatâ?¦"
+msgstr "Kies je persoonlijke certifikaat..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Kies uw privésleutel�"
+msgstr "Kie je persoonlijke sleutel..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -414,11 +382,11 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr ""
+msgstr "DER, PEM, of PKCS#12 prive sleutels (*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER- of PEM-certificaten (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER of PEM certifikaten (*.der, *.pem, *.crt, *.cer)"
 
 #: ../src/wireless-security/wireless-security.c:333
 msgid "TLS"
@@ -426,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr "Getunneld TLS"
+msgstr "Vertunneld TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "Beschermd EAP (PEAP)"
+
diff --git a/po/pl.po b/po/pl.po
index 24c7b43..506065d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,170 +1,160 @@
-# Polish translation of the network-manager-netbook application.
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aviary.pl
-# JeÅ?li masz jakiekolwiek uwagi odnoszÄ?ce siÄ? do tÅ?umaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielÄ?gnowaniu, napisz do nas:
-# gnomepl aviary pl
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Tomasz Dominikowski <tdominikowski aviary pl>, 2008, 2009.
-# Piotr Zaryk <pzaryk aviary pl>, 2008.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:53+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(brak)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "PoÅ?Ä?cz:"
+msgstr "PoÅ?Ä?cz przez:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
-msgstr "RÄ?czne"
+msgstr "RÄ?cznie"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Link-Local"
+msgstr "Å?Ä?cze lokalne"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "Adres IP:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
 msgstr "Maska podsieci:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "DomyÅ?lna droga:"
+msgstr "Router:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
-msgstr ""
+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 "WÅ?Ä?czone"
+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 "WyÅ?Ä?czone"
+msgstr "Nie"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "RozÅ?Ä?czony"
+msgstr "NiepoÅ?Ä?czony"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "PoÅ?Ä?cz"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Å?Ä?czenie..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "RozÅ?Ä?cz"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
-msgstr "PoÅ?Ä?czenie"
+msgstr "PoÅ?Ä?czony"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Zaawansowane"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Tryb samolotowy</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>Wi-Fi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>SieÄ? przewodowa</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Dodaj nowe poÅ?Ä?czenie</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>Sieci</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Dodaj nowe poÅ?Ä?czenie"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Ukryta sieÄ? bezprzewodowa"
+msgstr "SieÄ? ukryta"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Wykryto wewnÄ?trzny modem 3G i kartÄ? SIM"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Powrót do obszaru Sieci"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Zapisz poÅ?Ä?czenie"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Spowoduje to wyÅ?Ä?czenie wszystkich poÅ?Ä?czeÅ? bezprzewodowych"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
 msgstr "DomyÅ?lne"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "SieÄ? 3G jest wyÅ?Ä?czona"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Nie wykryto modemów"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -172,11 +162,11 @@ msgstr "Brak"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "Klucz WEP 40/128-bit ASCII"
+msgstr "Klucz WEP 40/128-bitowy"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bit dÅ?ugie hasÅ?o"
+msgstr "128-bitowe hasÅ?o WEP"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -185,15 +175,15 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "Dynamiczny WEP (802.1x)"
+msgstr "Dynamic WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA i WPA2 Personal"
+msgstr "WPA i WPA2 osobiste"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA i WPA2 Enterprise"
+msgstr "WPA i WPA2 enterprise"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
@@ -201,24 +191,20 @@ msgstr "_Utwórz"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
-msgstr ""
-"Do poÅ?Ä?czenia z sieciÄ? bezprzewodowÄ? \"%s\" wymagane sÄ? hasÅ?a lub klucze "
-"szyfrujÄ?ce."
+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
 msgid "Wireless Network Authentication Required"
-msgstr "Wymagane uwierzytelnienie w sieci bezprzewodowej"
+msgstr "Wymagane uwierzytelnienie bezprzewodowe"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "Wymagane uwierzytelnienie w sieci bezprzewodowej"
+msgstr "Ta sieÄ? bezprzewodowa wymaga uwierzytelnienia"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "Tworzenie nowej sieci bezprzewodowej"
+msgstr "Utwórz nowÄ? sieÄ? bezprzewodowÄ?"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
@@ -226,42 +212,35 @@ msgstr "Nowa sieÄ? bezprzewodowa"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "ProszÄ? wprowadziÄ? nazwÄ? sieci bezprzewodowej jaka ma zostaÄ? utworzona."
+msgstr "Podaj nazwÄ? dla poÅ?Ä?czenia sieciowego, które chcesz utworzyÄ?."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "PoÅ?Ä?czenie z ukrytÄ? sieciÄ? bezprzewodowÄ?"
+msgstr "PoÅ?Ä?cz z ukrytÄ? sieciÄ? bezprzewodowÄ?"
 
 #: ../src/wireless-dialog.c:885
 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 ""
-"ProszÄ? wprowadziÄ? nazwÄ? i ustawienia bezpieczeÅ?stwa dla żÄ?danej sieci "
-"bezprzewodowej."
+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
-#, fuzzy
 msgid "C_onnect"
-msgstr "PoÅ?Ä?cz"
+msgstr "_PoÅ?Ä?cz"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "PoÅ?Ä?cz"
+msgstr "PoÅ?Ä?czenie:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Tworzenie nowej sieci bezprzewodowej"
+msgstr "Inna sieÄ? bezprzewodowa..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "_Adapter bezprzewodowy:"
+msgstr "Bezprzewodowa _karta sieciowa:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
@@ -269,25 +248,15 @@ msgstr "_Nazwa sieci:"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "Zabezpieczenia sieci bezprze_wodowej:"
+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"
-"\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 CA</span>\n"
-"\n"
-"Nieskorzystanie z certyfikatu CA może spowodowaÄ? poÅ?Ä?czenia z niezabezpieczonymi sieciami bezprzewodowymi. Czy wybraÄ? certyfikat CA?"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Wybór prywatnego certyfikatu..."
+msgstr "Wybierz certyfikat oÅ?rodka certyfikacji"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
@@ -316,33 +285,33 @@ msgstr "HasÅ?o:"
 #: ../src/wireless-security/leap.ui.h:2
 #: ../src/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
-msgstr "WyÅ?wietlanie hasÅ?a"
+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
 msgid "User Name:"
-msgstr "Nazwa użytkownika"
+msgstr "Nazwa użytkownika:"
 
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "Anonimowa tożsamoÅ?Ä?:"
+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
 msgid "CA Certificate:"
-msgstr "Certyfikat CA:"
+msgstr "Certyfikat oÅ?rodka certyfikacji:"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "WewnÄ?trzne uwierzytelnianie:"
+msgstr "Uwierzytelnianie wewnÄ?trzne:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
-msgstr "Wersja PEAP:"
+msgstr "Wersja protokoÅ?u PEAP:"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
@@ -350,7 +319,7 @@ msgstr "TożsamoÅ?Ä?:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "HasÅ?o prywatnego klucza:"
+msgstr "HasÅ?o klucza prywatnego:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
@@ -366,7 +335,7 @@ msgstr "Klucz:"
 
 #: ../src/wireless-security/wep-key.ui.h:3
 msgid "Show key"
-msgstr "WyÅ?wietlanie klucza"
+msgstr "Pokaż klucz"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
@@ -374,7 +343,7 @@ msgstr "Indeks WEP:"
 
 #: ../src/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
-msgstr "Rodzaj:"
+msgstr "Typ:"
 
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
@@ -389,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Wybór certyfikatu CA..."
+msgstr "Wybierz certyfikat Wystawcy Certyfikatów..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "Wybór prywatnego certyfikatu..."
+msgstr "Wybierz certyfikat osobisty..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Wybór klucza prywatnego..."
+msgstr "Wybierz Twój klucz prywatny..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -413,7 +382,7 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "Certyfikaty DER, PEM lub klucze prywatne PKCS#12 (*.der, *.pem, *.p12)"
+msgstr "Klucze prywatne DER, PEM lub PKCS#12 (*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
@@ -425,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr "Tunelowane TLS"
+msgstr "TLS tunelowany"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "Chronione EAP (PEAP)"
+msgstr "Chroniony EAP (PEAP)"
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 33cb57e..b2404c2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,185 +1,172 @@
-# Brazilian Portuguese translation of NetworkManager applet.
-# Copyright (C) 2004-2008 the NetworkManager applet authors.
-# This file is distributed under the same license as the network-manager-netbook package.
-# Raphael Higino <In memoriam>, 2004-2007.
-# Leonardo Ferreira Fontenelle <leonardof gnome org>, 2007, 2008.
-# Luiz Armesto <luiz armesto gmail com>, 2008.
-# Henrique P Machado <zehrique gmail com>, 2008.
-# Fábio Nogueira <deb-user-ba ubuntu com>, 2008.
-# Vladimir Melo <vladimirmelo psi gmail com>, 2008.
-# Michel Recondo <mrecondo gmail com>, 2008.
-# Carlos Eduardo Moreira dos Santos <cems cemshost com br>, 2008.
-# Djavan Fagundes <dnoway gmail com>, 2008.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:56+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(nenhum)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "Conectar:"
+msgstr "Conectar por:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
-msgstr "DHCP:"
+msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Link-local"
+msgstr "Link Local"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "Endereço IP:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
-msgstr "Máscara de subrede:"
+msgstr "Máscara de sub-rede:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Rota padrão:"
+msgstr "Roteador:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
-msgstr "Não disponível"
+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 "Lig."
+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 "Desl."
+msgstr "Desativado"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "Desconectou"
+msgstr "Desconectado"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Conectando..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Avançado"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Modo de vôo</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>Wi-Fi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Cabeada</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Adicionar uma nova conexão</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>Redes</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Adicionar uma nova conexão"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Rede sem fio oculta"
+msgstr "Rede oculta"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Modem 3G interno e cartão SIM detectados"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Voltar à Rede"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Gravar conexão"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Isto desabilitará todas as conexões wireless"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G desabilitado"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Nenhum modem detectado"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
-msgstr "Nenhuma"
+msgstr "Nenhum"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "Chave WEP de 40/128 bits ASCII"
+msgstr "Chave WEP 40/128 bits"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "Frase secreta do WEP de 128 bits"
+msgstr "Frase Secreta WEP 128 bits"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -188,15 +175,15 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "WEP dinâmico (802.1x)"
+msgstr "WEP Dinâmico (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 pessoal"
+msgstr "WPA e WPA2 Pessoal"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 empresas"
+msgstr "WPA e WPA2 Empresarial"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
@@ -204,97 +191,76 @@ msgstr "C_riar"
 
 #: ../src/wireless-dialog.c:869
 #, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
-msgstr ""
-"Senhas ou chaves de criptografia são necessárias para acessar a rede sem fio "
-"\"%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
 msgid "Wireless Network Authentication Required"
-msgstr "Autenticação necessária na rede sem fio"
+msgstr "Autenticação de Rede Wireless Obrigatória"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "Autenticação necessária pela rede sem fio"
+msgstr "Autenticação obrigatória por rede wireless"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "Criar nova rede sem fio"
+msgstr "Criar Nova Rede Wireless"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr "Nova rede sem fio"
+msgstr "Nova rede wireless"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Digite um nome para rede sem fio que você deseja criar."
+msgstr "Digite um nome para a rede wireless que deseja criar."
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "Conectar a rede sem fio oculta"
+msgstr "Conectar à Rede Wireless Oculta"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr "Rede sem fio oculta"
+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 sem fio oculta a qual você "
-"deseja se conectar."
+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
-#, fuzzy
 msgid "C_onnect"
-msgstr "Conectar"
+msgstr "C_onectar"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Conectar"
+msgstr "Conexão:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Criar nova rede sem fio"
+msgstr "Outra Rede Wireless..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "_Adaptador sem fio:"
+msgstr "Adaptador _wireless:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
-msgstr "_Nome da rede:"
+msgstr "_Nome da Rede:"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "_Segurança sem fio:"
+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"
-"\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 certificadora escolhido</span>\n"
-"\n"
-"Não usar um certificado de Autoridade Certificadora (CA) pode resultar em conexões inseguras, redes sem fio vulneráveis e não confiáveis. Você gostaria de escolher um certificado de Autoridade Certificadora?"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Escolha seu certificado pessoal..."
+msgstr "Escolher Certificado CA"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "Não me avise novamente"
+msgstr "Não avisar novamente"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -325,12 +291,12 @@ msgstr "Mostrar senha"
 #: ../src/wireless-security/eap-simple.ui.h:3
 #: ../src/wireless-security/leap.ui.h:3
 msgid "User Name:"
-msgstr "Nome do usuário:"
+msgstr "Nome de Usuário:"
 
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "Identidade anônima:"
+msgstr "Identidade Anônima:"
 
 #: ../src/wireless-security/eap-peap.ui.h:2
 #: ../src/wireless-security/eap-tls.ui.h:1
@@ -341,7 +307,7 @@ msgstr "Certificado CA:"
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "Autenticação interior:"
+msgstr "Autenticação Interna:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
@@ -353,15 +319,15 @@ msgstr "Identidade:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "Senha da chave privada:"
+msgstr "Senha de Chave Privada:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
-msgstr "Chave privada:"
+msgstr "Chave Privada:"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
-msgstr "Certificado de usuário:"
+msgstr "Certificado do Usuário:"
 
 #: ../src/wireless-security/wep-key.ui.h:2
 msgid "Key:"
@@ -382,7 +348,7 @@ msgstr "Tipo:"
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
 msgid "MSCHAPv2"
-msgstr "MSCHAP v2"
+msgstr "MSCHAPv2"
 
 #: ../src/wireless-security/eap-method-peap.c:239
 msgid "MD5"
@@ -392,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Escolha um certificado da Autoridade Certificadora..."
+msgstr "Escolher um certificado da Autoridade de Certificação..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "Escolha seu certificado pessoal..."
+msgstr "Escolher seu certificado pessoal..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Escolha sua chave privada..."
+msgstr "Escolher sua chave privada..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -416,7 +382,7 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "Chaves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12)"
+msgstr "Chaves privadas DER, PEM ou PKCS#12 (*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
@@ -428,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr "TLS encapsulado"
+msgstr "TLS Encapsulado"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Protegido (PEAP)"
+
diff --git a/po/ru.po b/po/ru.po
index a8b853b..bd3c430 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,167 +1,160 @@
-# translation of ru.po to Russian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-# Leonid Kanter <leon asplinux ru>, 2006, 2007, 2008, 2009.
-# Ð?Ñ?Ñ?Ñ?м Ð?опов <artfwo gmail com>, 2009.
-# Tambet Ingo <tambet novell com>, 2009.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 13:59+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(неÑ?)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "СоединиÑ?Ñ?:"
+msgstr "Ð?одклÑ?Ñ?иÑ?Ñ? Ñ?еÑ?ез:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
 msgstr "Ð?Ñ?Ñ?Ñ?нÑ?Ñ?"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "Link-Local"
+msgstr "Ð?окалÑ?ное Ñ?оединение"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "IP-адÑ?еÑ?:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
 msgstr "Ð?аÑ?ка подÑ?еÑ?и:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "ШлÑ?з по Ñ?молÑ?аниÑ?:"
+msgstr "Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
-msgstr ""
+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 ""
+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 ""
+msgstr "Ð?Ñ?клÑ?Ñ?ено"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "Соединение Ñ?азоÑ?вано"
+msgstr "Ð?Ñ?Ñ?оединено"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
-msgstr "Ð?одклÑ?Ñ?аÑ?Ñ?"
+msgstr "Ð?одклÑ?Ñ?иÑ?Ñ?"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Ð?одклÑ?Ñ?ение..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
-msgstr "Ð?Ñ?клÑ?Ñ?иÑ?Ñ?Ñ?Ñ?"
+msgstr "Ð?Ñ?Ñ?оединиÑ?Ñ?"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
-msgstr "подклÑ?Ñ?енÑ?"
+msgstr "Ð?одклÑ?Ñ?ено"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Ð?ополниÑ?елÑ?но"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Режим полеÑ?а</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>Wi-Fi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Ð?Ñ?оводное</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>Ð?обавиÑ?Ñ? новое Ñ?оединение</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>СеÑ?и</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Ð?обавиÑ?Ñ? новое Ñ?оединение"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "СкÑ?Ñ?Ñ?аÑ? беÑ?пÑ?оводнаÑ? Ñ?еÑ?Ñ?"
+msgstr "СкÑ?Ñ?Ñ?аÑ? Ñ?еÑ?Ñ?"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Ð?бнаÑ?Ñ?жен вÑ?Ñ?Ñ?оеннÑ?й 3G-модем и SIM-каÑ?Ñ?а"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "Ð?еÑ?нÑ?Ñ?Ñ?Ñ?Ñ? в Ñ?аздел Ñ?еÑ?ей"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?оединение"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "ЭÑ?о пÑ?иведеÑ? к Ñ?азÑ?Ñ?вÑ? вÑ?еÑ? беÑ?пÑ?оводнÑ?Ñ? Ñ?оединений"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
-msgstr "по Ñ?молÑ?аниÑ?"
+msgstr "Ð?о Ñ?молÑ?аниÑ?"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G оÑ?клÑ?Ñ?ено"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Ð?одемÑ? не найденÑ?"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -169,11 +162,11 @@ msgstr "Ð?еÑ?"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-биÑ?нÑ?й клÑ?Ñ?"
+msgstr "WEP 40/128-bit  клÑ?Ñ?"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-биÑ?наÑ? клÑ?Ñ?еваÑ? Ñ?Ñ?аза"
+msgstr "WEP 128-bit клÑ?Ñ?еваÑ? Ñ?Ñ?аза"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -186,77 +179,68 @@ msgstr "Ð?инамиÑ?еÑ?кий WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 Personal"
+msgstr "WPA и WPA2 Personal"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 Enterprise"
+msgstr "WPA и WPA2 Enterprise"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
-msgstr "С_оздаÑ?Ñ?"
+msgstr "_СоздаÑ?Ñ?"
 
 #: ../src/wireless-dialog.c:869
 #, 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
 msgid "Wireless Network Authentication Required"
-msgstr "Ð?лÑ? доÑ?Ñ?Ñ?па к беÑ?пÑ?оводной Ñ?еÑ?и Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?"
+msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ? в беÑ?пÑ?оводной Ñ?еÑ?и"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "Ð?лÑ? доÑ?Ñ?Ñ?па к беÑ?пÑ?оводной Ñ?еÑ?и Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?"
+msgstr "Ð?еобÑ?одима аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ? в беÑ?пÑ?оводной Ñ?еÑ?и"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "Создание новой беÑ?пÑ?оводной Ñ?еÑ?и"
+msgstr "СоздаÑ?Ñ? новое беÑ?пÑ?оводное подклÑ?Ñ?ение"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr "Ð?оваÑ? беÑ?пÑ?оводнаÑ? Ñ?еÑ?Ñ?"
+msgstr "Ð?овое беÑ?пÑ?оводное подклÑ?Ñ?ение"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "Ð?ведиÑ?е имÑ? беÑ?пÑ?оводной Ñ?еÑ?и, коÑ?оÑ?Ñ?Ñ? необÑ?одимо Ñ?оздаÑ?Ñ?."
+msgstr "Ð?ведиÑ?е имÑ? Ñ?оздаваемой беÑ?пÑ?оводной Ñ?еÑ?и"
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "Ð?одклÑ?Ñ?ение к Ñ?кÑ?Ñ?Ñ?ой беÑ?пÑ?оводной Ñ?еÑ?и"
+msgstr "Ð?одклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?кÑ?Ñ?Ñ?ой беÑ?пÑ?оводной Ñ?еÑ?и"
 
 #: ../src/wireless-dialog.c:885
 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 ""
-"Ð?ведиÑ?е имÑ? и паÑ?амеÑ?Ñ?Ñ? безопаÑ?ноÑ?Ñ?и Ñ?кÑ?Ñ?Ñ?ой беÑ?пÑ?оводной Ñ?еÑ?и, к коÑ?оÑ?ой "
-"необÑ?одимо подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ?."
+msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+msgstr "Ð?ведиÑ?е имÑ? и дополниÑ?елÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?кÑ?Ñ?Ñ?ой беÑ?пÑ?оводной Ñ?еÑ?и, к коÑ?оÑ?ой вÑ? Ñ?оÑ?иÑ?е подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ?."
 
 #: ../src/wireless-security.ui.h:1
-#, fuzzy
 msgid "C_onnect"
-msgstr "Ð?одклÑ?Ñ?аÑ?Ñ?"
+msgstr "Ð?_одклÑ?Ñ?иÑ?Ñ?"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Ð?одклÑ?Ñ?аÑ?Ñ?"
+msgstr "Соединение:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Создание новой беÑ?пÑ?оводной Ñ?еÑ?и"
+msgstr "Ð?Ñ?Ñ?гаÑ? беÑ?пÑ?оводнаÑ? Ñ?еÑ?Ñ?..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "Ð?еÑ?пÑ?оводнÑ?й _адапÑ?еÑ?:"
+msgstr "_Ð?дапÑ?еÑ? беÑ?пÑ?оводной Ñ?еÑ?и:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
@@ -264,29 +248,19 @@ msgstr "_Ð?мÑ? Ñ?еÑ?и:"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "_Ð?аÑ?иÑ?а беÑ?пÑ?оводной Ñ?еÑ?и:"
+msgstr "Ð?езопаÑ?ноÑ?Ñ?Ñ? _беÑ?пÑ?оводной Ñ?еÑ?и:"
 
 #: ../src/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) можеÑ? бÑ?Ñ?Ñ? подклÑ?Ñ?ение к небезопаÑ?нÑ?м, злонамеÑ?еннÑ?м Ñ?еÑ?Ñ?м.  Ð?Ñ?бÑ?аÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? ЦенÑ?Ñ?а Ñ?еÑ?Ñ?иÑ?икаÑ?ии?"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? пеÑ?Ñ?оналÑ?нÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ?..."
+msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? СÐ?"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "Ð?е пÑ?едÑ?пÑ?еждаÑ?Ñ? менÑ? болÑ?Ñ?е"
+msgstr "Ð?олÑ?Ñ?е не пÑ?едÑ?пÑ?еждаÑ?Ñ?"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -322,13 +296,13 @@ msgstr "Ð?мÑ? полÑ?зоваÑ?елÑ?:"
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "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
 msgid "CA Certificate:"
-msgstr "СеÑ?Ñ?иÑ?икаÑ? CA:"
+msgstr "СеÑ?Ñ?иÑ?икаÑ? СÐ?:"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
@@ -341,15 +315,15 @@ msgstr "Ð?еÑ?Ñ?иÑ? PEAP:"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
-msgstr "Identity:"
+msgstr "ЭлекÑ?Ñ?оннаÑ? пеÑ?Ñ?она:"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "Ð?аÑ?олÑ? лиÑ?ного клÑ?Ñ?а:"
+msgstr "Ð?аÑ?олÑ? закÑ?Ñ?Ñ?ого клÑ?Ñ?а:"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
-msgstr "Ð?иÑ?нÑ?й клÑ?Ñ?:"
+msgstr "Ð?акÑ?Ñ?Ñ?Ñ?й клÑ?Ñ?:"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
@@ -384,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? ЦенÑ?Ñ?а Ñ?еÑ?Ñ?иÑ?икаÑ?ии..."
+msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ? Ñ?еÑ?Ñ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ей оÑ?ганизаÑ?ии..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? пеÑ?Ñ?оналÑ?нÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ?..."
+msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?вой лиÑ?нÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ?"
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? лиÑ?нÑ?й клÑ?Ñ?..."
+msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?вой Ñ?екÑ?еÑ?нÑ?й клÑ?Ñ?"
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -408,7 +382,7 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "Ð?иÑ?нÑ?е клÑ?Ñ?и DER, PEM или PKCS#12 (*.der, *.pem, *.p12)"
+msgstr "DER, PEM, или Ñ?екÑ?еÑ?нÑ?е клÑ?Ñ?и PKCS#12 (*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
@@ -420,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr "ТÑ?ннелиÑ?ованнÑ?й TLS"
+msgstr "ТÑ?ннелÑ?нÑ?й TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "Ð?аÑ?иÑ?ено EAP (PEAP)"
+msgstr "Ð?аÑ?иÑ?Ñ?ннÑ?й EAP (PEAP)"
+
diff --git a/po/sv.po b/po/sv.po
index 46f5a7f..94f4854 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,66 +1,62 @@
-# Swedish messages for NetworkManagerNetbook.
-# Copyright (C) 2004-2009 Free Software Foundation, Inc.
-# Christian Rose <menthos menthos com>, 2004, 2005, 2006.
-# Daniel Nylander <po danielnylander se>, 2006, 2007, 2008, 2009.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 14:03+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\n"
+"PO-Revision-Date: 2009-09-17 08:40\n"
+"Last-Translator: Novell Language <language novell com>\n"
+"Language-Team: Novell Language <language novell com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(ingen)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "_Anslut"
+msgstr "Anslut via:"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
-msgstr "Manuell"
+msgstr "Manuellt"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
 msgstr "Lokal länk"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "IP-adress:"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
-msgstr "Subnätsmask:"
+msgstr "Nätmask:"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "Standardväg:"
+msgstr "Router:"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
 msgstr "DNS:"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
-msgstr "Otillgänglig"
+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
@@ -76,90 +72,89 @@ msgstr "PÃ¥"
 msgid "Off"
 msgstr "Av"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "Frånkopplad"
+msgstr "Inte ansluten"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "Anslut"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "Ansluter..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "Koppla från"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "Avancerat"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>Flygplansläge</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>Trådbunden</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+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 ""
+msgstr "<big><b>Nätverk</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "Lägg till en ny anslutning"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "Dolt trådlöst nätverk"
+msgstr "Dolt nätverk"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "Ett internt 3G-modem och SIM-kort har identifierats"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "�tergå till Nätverk"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "Spara anslutning"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "Detta inaktiverar alla trådlösa anslutningar"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G inaktiverat"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "Inga modem identifierades"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -171,7 +166,7 @@ msgstr "WEP 40/128-bitars nyckel"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bitars lösenfras"
+msgstr "WEP 128-bitars lösenord"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -180,7 +175,7 @@ msgstr "LEAP"
 
 #: ../src/wireless-dialog.c:710
 msgid "Dynamic WEP (802.1x)"
-msgstr "Dynamisk WEP"
+msgstr "Dynamisk WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
@@ -196,20 +191,16 @@ msgstr "S_kapa"
 
 #: ../src/wireless-dialog.c:869
 #, 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 åtkomst till det trådlösa nätverket %s."
 
 #: ../src/wireless-dialog.c:871
 msgid "Wireless Network Authentication Required"
-msgstr "Autentisering krävs för det trådlösa nätverket"
+msgstr "Autentisering till det trådlösa nätverket krävs"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "Autentisering krävs för det trådlösa nätverket"
+msgstr "Autentisering krävs av det trådlösa nätverket"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
@@ -232,31 +223,24 @@ 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."
+msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+msgstr "Ange namn och säkerhetsinformation för det dolda trådlösa nätverket som du vill ansluta till."
 
 #: ../src/wireless-security.ui.h:1
-#, fuzzy
 msgid "C_onnect"
-msgstr "Anslut"
+msgstr "A_nslut"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "Anslut"
+msgstr "Anslutning:"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "Skapa nytt trådlöst nätverk"
+msgstr "Annat trådlöst nätverk..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "Trådlös _nätverksadapter:"
+msgstr "Trådlös _adapter:"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
@@ -267,26 +251,16 @@ msgid "_Wireless Security:"
 msgstr "_Trådlös säkerhet:"
 
 #: ../src/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\">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?"
+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\">Inget certifikat från certifikatutfärdare har valts</span>\n\nOm inget certifikat från en CA (certifikatutfärdare) används kan det leda till anslutningar till osäkra och skadliga trådlösa nätverk. Vill du välja ett certifikat från en certifikatutfärdare?"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:4
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "Välj ditt personliga certifikat..."
+msgstr "Välj CA-certifikat"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "Varna mig inte igen"
+msgstr "Varna inte igen"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -337,7 +311,7 @@ msgstr "Inre autentisering:"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
-msgstr "PEAP version:"
+msgstr "PEAP-version:"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
@@ -369,12 +343,12 @@ msgstr "WEP-index:"
 
 #: ../src/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
-msgstr "Typ:"
+msgstr "TYP:"
 
 #: ../src/wireless-security/eap-method-peap.c:229
 #: ../src/wireless-security/eap-method-ttls.c:251
 msgid "MSCHAPv2"
-msgstr "MSCHAP v2"
+msgstr "MSCHAPv2"
 
 #: ../src/wireless-security/eap-method-peap.c:239
 msgid "MD5"
@@ -384,7 +358,7 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "Välj ett Certificate Authority-certifikat..."
+msgstr "Välj ett certifikat från en certifikatutfärdare..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
@@ -408,11 +382,11 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "Privat nyckel av typen DER, PEM eller PKCS#12 (*.der, *.pem, *.p12)"
+msgstr "Privata nycklar av typen DER, PEM eller PKCS#12 (*.der, *.pem, *.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER eller PEM-certifikat (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER- eller PEM-certifikat (*.der, *.pem, *.crt, *.cer)"
 
 #: ../src/wireless-security/wireless-security.c:333
 msgid "TLS"
@@ -424,4 +398,5 @@ msgstr "Tunnlad TLS"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "Protected EAP (PEAP)"
+msgstr "Skyddad EAP (PEAP)"
+
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 0000000..a03e19b
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,402 @@
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"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"
+
+#: ../src/nmn-mobile-providers.c:504
+msgid "Default"
+msgstr "Varsayılan"
+
+#: ../src/nmn-new-connection.c:218
+msgid "3G disabled"
+msgstr "3G devre dıÅ?ı"
+
+#: ../src/nmn-new-connection.c:225
+msgid "No modems detected"
+msgstr "Hiçbir modem algılanmadı"
+
+#: ../src/wireless-dialog.c:654
+msgid "None"
+msgstr "Yok"
+
+#: ../src/wireless-dialog.c:671
+msgid "WEP 40/128-bit Key"
+msgstr "WEP 40/128 bit Anahtar"
+
+#: ../src/wireless-dialog.c:680
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128 bit Å?ifre"
+
+#: ../src/wireless-dialog.c:697
+#: ../src/wireless-security/wireless-security.c:345
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../src/wireless-dialog.c:710
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamic WEP (802.1x)"
+
+#: ../src/wireless-dialog.c:724
+msgid "WPA & WPA2 Personal"
+msgstr "WPA ve  WPA2 KiÅ?isel"
+
+#: ../src/wireless-dialog.c:738
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA ve WPA2 Enterprise"
+
+#: ../src/wireless-dialog.c:798
+msgid "C_reate"
+msgstr "OluÅ?tu_r"
+
+#: ../src/wireless-dialog.c:869
+#, 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."
+
+#: ../src/wireless-dialog.c:871
+msgid "Wireless Network Authentication Required"
+msgstr "Kablosuz AÄ? Kimlik DoÄ?rulaması Gerekli"
+
+#: ../src/wireless-dialog.c:873
+msgid "Authentication required by wireless network"
+msgstr "Kablosuz aÄ? kimlik doÄ?rulaması gerektiriyor"
+
+#: ../src/wireless-dialog.c:878
+msgid "Create New Wireless Network"
+msgstr "Yeni Kablosuz AÄ? OluÅ?tur"
+
+#: ../src/wireless-dialog.c:880
+msgid "New wireless network"
+msgstr "Yeni kablosuz aÄ?"
+
+#: ../src/wireless-dialog.c:881
+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
+msgid "Connect to Hidden Wireless Network"
+msgstr "Gizli Kablosuz AÄ?a BaÄ?lan"
+
+#: ../src/wireless-dialog.c:885
+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"
+
+#: ../src/wireless-security.ui.h:1
+msgid "C_onnect"
+msgstr "B_aÄ?lan"
+
+#: ../src/wireless-security.ui.h:2
+msgid "Connection:"
+msgstr "BaÄ?lantı:"
+
+#: ../src/wireless-security.ui.h:3
+msgid "Other Wireless Network..."
+msgstr "BaÅ?ka Kablosuz AÄ?..."
+
+#: ../src/wireless-security.ui.h:4
+msgid "Wireless _adapter:"
+msgstr "Kablosuz baÄ?_daÅ?tırıcı:"
+
+#: ../src/wireless-security.ui.h:5
+msgid "_Network Name:"
+msgstr "_AÄ? Adı:"
+
+#: ../src/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
+msgid "Choose CA Certificate"
+msgstr "CA Sertifikası Seç"
+
+#: ../src/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
+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
+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
+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
+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
+msgid "User Name:"
+msgstr "Kullanıcı Adı:"
+
+#: ../src/wireless-security/eap-peap.ui.h:1
+#: ../src/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
+msgid "CA Certificate:"
+msgstr "CA Sertifikası:"
+
+#: ../src/wireless-security/eap-peap.ui.h:3
+#: ../src/wireless-security/eap-ttls.ui.h:3
+msgid "Inner Authentication:"
+msgstr "İç Kimlik DoÄ?rulama:"
+
+#: ../src/wireless-security/eap-peap.ui.h:4
+msgid "PEAP Version:"
+msgstr "PEAP Sürümü:"
+
+#: ../src/wireless-security/eap-tls.ui.h:2
+msgid "Identity:"
+msgstr "Kimlik:"
+
+#: ../src/wireless-security/eap-tls.ui.h:3
+msgid "Private Key Password:"
+msgstr "�zel Anahtar Parolası:"
+
+#: ../src/wireless-security/eap-tls.ui.h:4
+msgid "Private Key:"
+msgstr "Ã?zal Anahtar:"
+
+#: ../src/wireless-security/eap-tls.ui.h:6
+msgid "User Certificate:"
+msgstr "Kullanıcı Sertifikası:"
+
+#: ../src/wireless-security/wep-key.ui.h:2
+msgid "Key:"
+msgstr "Anahtar:"
+
+#: ../src/wireless-security/wep-key.ui.h:3
+msgid "Show key"
+msgstr "Anahtarı göster"
+
+#: ../src/wireless-security/wep-key.ui.h:4
+msgid "WEP Index:"
+msgstr "WEP Dizini:"
+
+#: ../src/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
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../src/wireless-security/eap-method-peap.c:239
+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
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Bir Sertifika Yetkilisi sertifikası seç..."
+
+#: ../src/wireless-security/eap-method-tls.c:390
+msgid "Choose your personal certificate..."
+msgstr "KÅ?isel sertifikanızı seçin..."
+
+#: ../src/wireless-security/eap-method-tls.c:399
+msgid "Choose your private key..."
+msgstr "�zel anahtarınızı seçin..."
+
+#: ../src/wireless-security/eap-method-ttls.c:223
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:237
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:265
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../src/wireless-security/eap-method.c:456
+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
+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
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/wireless-security/wireless-security.c:357
+msgid "Tunneled TLS"
+msgstr "Tünel TLS"
+
+#: ../src/wireless-security/wireless-security.c:368
+msgid "Protected EAP (PEAP)"
+msgstr "Korumalı EAP (PEAP)"
+
diff --git a/po/uk.po b/po/uk.po
new file mode 100644
index 0000000..d2ffd55
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,402 @@
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"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 "Ð?Ñ?де вÑ?дÑ?илено вÑ?Ñ? безпÑ?оводовÑ? пÑ?дклÑ?Ñ?еннÑ?"
+
+#: ../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
+msgid "None"
+msgstr "Ð?емаÑ?"
+
+#: ../src/wireless-dialog.c:671
+msgid "WEP 40/128-bit Key"
+msgstr "WEP Ñ?з 40/128-Ñ?озÑ?Ñ?дним клÑ?Ñ?ем"
+
+#: ../src/wireless-dialog.c:680
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP Ñ?з 128-Ñ?озÑ?Ñ?дноÑ? кодовоÑ? Ñ?Ñ?азоÑ?"
+
+#: ../src/wireless-dialog.c:697
+#: ../src/wireless-security/wireless-security.c:345
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../src/wireless-dialog.c:710
+msgid "Dynamic WEP (802.1x)"
+msgstr "Ð?инамÑ?Ñ?ний WEP (802.1x)"
+
+#: ../src/wireless-dialog.c:724
+msgid "WPA & WPA2 Personal"
+msgstr "WPA Ñ? WPA2 Personal"
+
+#: ../src/wireless-dialog.c:738
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA Ñ? WPA2 Enterprise"
+
+#: ../src/wireless-dialog.c:798
+msgid "C_reate"
+msgstr "С_Ñ?воÑ?иÑ?и"
+
+#: ../src/wireless-dialog.c:869
+#, c-format
+msgid "Passwords or encryption keys are required to access the wireless network '%s'."
+msgstr "Ð?лÑ? доÑ?Ñ?Ñ?пÑ? до безпÑ?оводовоÑ? меÑ?ежÑ? '%s' поÑ?Ñ?Ñ?бнÑ? паÑ?олÑ? або клÑ?Ñ?Ñ? Ñ?иÑ?Ñ?Ñ?ваннÑ?."
+
+#: ../src/wireless-dialog.c:871
+msgid "Wireless Network Authentication Required"
+msgstr "Ð?оÑ?Ñ?Ñ?бна авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ? безпÑ?оводовоÑ? меÑ?ежÑ?"
+
+#: ../src/wireless-dialog.c:873
+msgid "Authentication required by wireless network"
+msgstr "Ð?езпÑ?оводова меÑ?ежа вимагаÑ? авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?"
+
+#: ../src/wireless-dialog.c:878
+msgid "Create New Wireless Network"
+msgstr "СÑ?воÑ?иÑ?и новÑ? безпÑ?оводовÑ? меÑ?ежÑ?"
+
+#: ../src/wireless-dialog.c:880
+msgid "New wireless network"
+msgstr "Ð?ова безпÑ?оводова меÑ?ежа"
+
+#: ../src/wireless-dialog.c:881
+msgid "Enter a name for the wireless network you wish to create."
+msgstr "Ð?ведÑ?Ñ?Ñ? Ñ?м'Ñ? длÑ? безпÑ?оводовоÑ? меÑ?ежÑ?, Ñ?кÑ? поÑ?Ñ?Ñ?бно Ñ?Ñ?воÑ?иÑ?и."
+
+#: ../src/wireless-dialog.c:883
+msgid "Connect to Hidden Wireless Network"
+msgstr "Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ? до пÑ?иÑ?ованоÑ? безпÑ?оводовоÑ? меÑ?ежÑ?"
+
+#: ../src/wireless-dialog.c:885
+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 "Ð?ведÑ?Ñ?Ñ? Ñ?м'Ñ? Ñ?а вÑ?домоÑ?Ñ?Ñ? пÑ?о безпекÑ? пÑ?иÑ?ованоÑ? безпÑ?оводовоÑ? меÑ?ежÑ?, до Ñ?коÑ? поÑ?Ñ?Ñ?бно пÑ?дклÑ?Ñ?иÑ?иÑ?Ñ?."
+
+#: ../src/wireless-security.ui.h:1
+msgid "C_onnect"
+msgstr "_Ð?Ñ?дклÑ?Ñ?иÑ?иÑ?Ñ?"
+
+#: ../src/wireless-security.ui.h:2
+msgid "Connection:"
+msgstr "Ð?Ñ?дклÑ?Ñ?еннÑ?:"
+
+#: ../src/wireless-security.ui.h:3
+msgid "Other Wireless Network..."
+msgstr "Ð?нÑ?а безпÑ?оводова меÑ?ежа..."
+
+#: ../src/wireless-security.ui.h:4
+msgid "Wireless _adapter:"
+msgstr "Ð?езпÑ?оводовий _адапÑ?еÑ?:"
+
+#: ../src/wireless-security.ui.h:5
+msgid "_Network Name:"
+msgstr "_Ð?м'Ñ? меÑ?ежÑ?:"
+
+#: ../src/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
+msgid "Choose CA Certificate"
+msgstr "Ð?ибÑ?аÑ?и Ñ?еÑ?Ñ?иÑ?Ñ?каÑ? ЦС"
+
+#: ../src/wireless-security/ca-nag-dialog.ui.h:5
+msgid "Don't warn me again"
+msgstr "Ð?Ñ?лÑ?Ñ?е не попеÑ?еджаÑ?и"
+
+#: ../src/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
+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
+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
+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
+msgid "User Name:"
+msgstr "Ð?м'Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а:"
+
+#: ../src/wireless-security/eap-peap.ui.h:1
+#: ../src/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
+msgid "CA Certificate:"
+msgstr "СеÑ?Ñ?иÑ?Ñ?каÑ? ЦС:"
+
+#: ../src/wireless-security/eap-peap.ui.h:3
+#: ../src/wireless-security/eap-ttls.ui.h:3
+msgid "Inner Authentication:"
+msgstr "Ð?нÑ?Ñ?Ñ?Ñ?Ñ?нÑ? авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?:"
+
+#: ../src/wireless-security/eap-peap.ui.h:4
+msgid "PEAP Version:"
+msgstr "Ð?еÑ?Ñ?Ñ?Ñ? PEAP:"
+
+#: ../src/wireless-security/eap-tls.ui.h:2
+msgid "Identity:"
+msgstr "Ð?денÑ?иÑ?Ñ?каÑ?Ñ?Ñ?:"
+
+#: ../src/wireless-security/eap-tls.ui.h:3
+msgid "Private Key Password:"
+msgstr "Ð?аÑ?олÑ? закÑ?иÑ?ого клÑ?Ñ?а:"
+
+#: ../src/wireless-security/eap-tls.ui.h:4
+msgid "Private Key:"
+msgstr "Ð?акÑ?иÑ?ий клÑ?Ñ?:"
+
+#: ../src/wireless-security/eap-tls.ui.h:6
+msgid "User Certificate:"
+msgstr "СеÑ?Ñ?иÑ?Ñ?каÑ? коÑ?иÑ?Ñ?Ñ?ваÑ?а:"
+
+#: ../src/wireless-security/wep-key.ui.h:2
+msgid "Key:"
+msgstr "Ð?лÑ?Ñ?:"
+
+#: ../src/wireless-security/wep-key.ui.h:3
+msgid "Show key"
+msgstr "Ð?оказаÑ?и клÑ?Ñ?"
+
+#: ../src/wireless-security/wep-key.ui.h:4
+msgid "WEP Index:"
+msgstr "Ð?ндекÑ? WEP:"
+
+#: ../src/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
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../src/wireless-security/eap-method-peap.c:239
+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
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Ð?ибÑ?аÑ?и Ñ?еÑ?Ñ?иÑ?Ñ?каÑ? Ñ?енÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?Ñ?Ñ?..."
+
+#: ../src/wireless-security/eap-method-tls.c:390
+msgid "Choose your personal certificate..."
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? ваÑ? оÑ?обиÑ?Ñ?ий Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?..."
+
+#: ../src/wireless-security/eap-method-tls.c:399
+msgid "Choose your private key..."
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? ваÑ? закÑ?иÑ?ий клÑ?Ñ?..."
+
+#: ../src/wireless-security/eap-method-ttls.c:223
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:237
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/wireless-security/eap-method-ttls.c:265
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../src/wireless-security/eap-method.c:456
+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
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr "СеÑ?Ñ?иÑ?Ñ?каÑ?и DER або PEM (*.der, *.pem, *.crt, *.cer)"
+
+#: ../src/wireless-security/wireless-security.c:333
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/wireless-security/wireless-security.c:357
+msgid "Tunneled TLS"
+msgstr "ТÑ?нелÑ?ований TLS"
+
+#: ../src/wireless-security/wireless-security.c:368
+msgid "Protected EAP (PEAP)"
+msgstr "Ð?аÑ?иÑ?ений EAP (PEAP)"
+
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0a78d5f..23e5007 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,63 +1,58 @@
-# Simplified Chinese translation to network-manager-netbook.
-# Copyright (C) Free Software Foundation, Inc.
-# This file is distributed under the same license as the network-manager-netbook package.
-# Funda Wang <fundawang linux net cn>, 2004.
-# Wei Mingzhi <whistler openoffice org>, 2009.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 14:06+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
-msgstr "(æ? )"
+msgstr "ï¼?æ? ï¼?"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "è¿?æ?¥:"
+msgstr "���"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
 msgstr "æ??å?¨"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr "����"
+msgstr "����"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
-msgstr "IP å?°å??:"
+msgstr "IP å?°å??ï¼?"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
-msgstr "å­?ç½?æ?©ç ?:"
+msgstr "�����"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "�认路�:"
+msgstr "路���"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
-msgstr "DNS:"
+msgstr "DNSï¼?"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
@@ -77,90 +72,89 @@ msgstr "å¼?"
 msgid "Off"
 msgstr "å?³"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "已����"
+msgstr "已��"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
 msgstr "è¿?æ?¥"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "正���..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
 msgstr "æ?­å¼?"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
-msgstr ""
+msgstr "已��"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "�级"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>��模�</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>æ??线</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>æ·»å? æ?°è¿?æ?¥</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>ç½?ç»?</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "æ·»å? æ?°è¿?æ?¥"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "é??è??ç??æ? 线ç½?ç»?"
+msgstr "é??è??ç½?ç»?"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "æ£?æµ?å?°å??é?¨ 3G è°?å?¶è§£è°?å?¨å?? SIM å?¡"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "è¿?å??è??ç½?ç?¶æ??"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "ä¿?å­?è¿?æ?¥"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "è¿?å°?ç¦?ç?¨æ??æ??æ? 线è¿?æ?¥"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
 msgstr "�认"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "3G 已��"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "������解��"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -172,7 +166,7 @@ msgstr "WEP 40/128 ���"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128 ä½?å¯?ç ?å?¥"
+msgstr "WEP 128 ä½?é??è¡?å?£ä»¤"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -185,30 +179,28 @@ msgstr "å?¨æ?? WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA å?? WPA2 个人"
+msgstr "WPA & WPA2 个人ç??"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA å?? WPA2 ä¼?ä¸?"
+msgstr "WPA & WPA2 ä¼?ä¸?ç??"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
-msgstr "建�(_R)"
+msgstr "å??建(_R)"
 
 #: ../src/wireless-dialog.c:869
 #, 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
 msgid "Wireless Network Authentication Required"
-msgstr "é??è¦?æ? 线ç½?ç»?认è¯?"
+msgstr "é??è¦?æ? 线ç½?ç»?é?´å®?"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "æ? 线ç½?ç»?é??è¦?认è¯?"
+msgstr "æ? 线ç½?ç»?é??è¦?é?´å®?"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
@@ -216,11 +208,11 @@ msgstr "å??建æ?°ç??æ? 线ç½?ç»?"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr "æ?°æ? 线ç½?ç»?"
+msgstr "æ?°å»ºæ? 线ç½?ç»?"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "请为æ?¨å¸?æ??建ç«?ç??æ? 线ç½?ç»?è¾?å?¥ä¸?个å??称ã??"
+msgstr "è¾?å?¥è¦?å??建ç??æ? 线ç½?ç»?å??称ã??"
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
@@ -228,28 +220,23 @@ msgstr "è¿?æ?¥å?°é??è??ç??æ? 线ç½?ç»?"
 
 #: ../src/wireless-dialog.c:885
 msgid "Hidden wireless network"
-msgstr "é??è??ç??æ? 线ç½?ç»?"
+msgstr "é??è??æ? 线ç½?ç»?"
 
 #: ../src/wireless-dialog.c:886
-msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
-msgstr "è¾?å?¥æ?¨æ?³è¿?æ?¥å?°ç??é??è??æ? 线ç½?ç»?ç??å??称å??å®?å?¨æ?§è¯¦ç»?ä¿¡æ?¯ã??"
+msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+msgstr "è¾?å?¥è¦?è¿?æ?¥ç??å·²é??è??æ? 线ç½?ç»?ç??å??称å??å®?å?¨ç»?è??ã??"
 
 #: ../src/wireless-security.ui.h:1
-#, fuzzy
 msgid "C_onnect"
-msgstr "è¿?æ?¥"
+msgstr "è¿?æ?¥(_O)"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "è¿?æ?¥"
+msgstr "���"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "å??建æ?°ç??æ? 线ç½?ç»?"
+msgstr "å?¶ä»?æ? 线ç½?ç»?..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
@@ -257,33 +244,23 @@ msgstr "æ? 线é??é??å?¨(_A)ï¼?"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
-msgstr "ç½?ç»?å??称(_N):"
+msgstr "ç½?ç»?å??称(_N)ï¼?"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "æ? 线å®?å?¨æ?§(_W):"
+msgstr "æ? 线å®?å?¨æ?§(_W)ï¼?"
 
 #: ../src/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) è¯?书å?¯è?½å¯¼è?´è¿?æ?¥å?°ä¸?å®?å?¨ç??ã??模ç³?ç??æ? 线ç½?ç»?ã??è¦?é??æ?©ä¸?个认è¯?中å¿?è¯?书å???"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "é??æ?©æ?¨ç??个人è¯?书..."
+msgstr "é??æ?© CA è¯?书"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "以å??ä¸?å??è­¦å??"
+msgstr "ä¸?å??è­¦å??æ??"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -293,14 +270,14 @@ msgstr "忽�"
 #: ../src/wireless-security/wep-key.ui.h:1
 #: ../src/wireless-security/wpa-eap.ui.h:1
 msgid "Authentication:"
-msgstr "认�:"
+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
 msgid "Password:"
-msgstr "å¯?ç ?:"
+msgstr "�令�"
 
 #: ../src/wireless-security/eap-leap.ui.h:2
 #: ../src/wireless-security/eap-simple.ui.h:2
@@ -308,7 +285,7 @@ msgstr "å¯?ç ?:"
 #: ../src/wireless-security/leap.ui.h:2
 #: ../src/wireless-security/wpa-psk.ui.h:2
 msgid "Show password"
-msgstr "æ?¾ç¤ºå¯?ç ?"
+msgstr "�示�令"
 
 #: ../src/wireless-security/eap-leap.ui.h:3
 #: ../src/wireless-security/eap-simple.ui.h:3
@@ -319,42 +296,42 @@ msgstr "ç?¨æ?·å??ï¼?"
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "å?¿å??身份:"
+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
 msgid "CA Certificate:"
-msgstr "CA �书:"
+msgstr "CA �书�"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "å??é?¨è®¤è¯?:"
+msgstr "å??é?¨é?´å®?ï¼?"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
-msgstr "PEAP ç??æ?¬:"
+msgstr "PEAP ç??æ?¬ï¼?"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
-msgstr "身份:"
+msgstr "身份�"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
-msgstr "ç§?é?¥å¯?ç ?:"
+msgstr "�����令�"
 
 #: ../src/wireless-security/eap-tls.ui.h:4
 msgid "Private Key:"
-msgstr "��:"
+msgstr "�����"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
-msgstr "���书:"
+msgstr "���书�"
 
 #: ../src/wireless-security/wep-key.ui.h:2
 msgid "Key:"
-msgstr "��:"
+msgstr "���"
 
 #: ../src/wireless-security/wep-key.ui.h:3
 msgid "Show key"
@@ -362,7 +339,7 @@ msgstr "�示��"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
-msgstr "WEP 索�:"
+msgstr "WEP 索��"
 
 #: ../src/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
@@ -381,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "é??æ?©ä¸?个认è¯?中å¿?è¯?书..."
+msgstr "é??æ?©è¯?书é¢?å??æ?ºæ??è¯?书..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "é??æ?©æ?¨ç??个人è¯?书..."
+msgstr "é??æ?©ä¸ªäººè¯?书..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "é??æ?©æ?¨ç??ç§?é?¥..."
+msgstr "é??æ?©ç§?ç?¨å¯?é?¥..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -405,11 +382,11 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, æ?? PKCS#12 ç§?é?¥ (*.der, *.pem, *.p12)"
+msgstr "DERã??PEM æ?? PKCS#12 ç§?ç?¨å¯?é?¥ï¼?*.derã??*.pemã??*.p12ï¼?"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER æ?? PEM è¯?书 (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER æ?? PEM è¯?书ï¼?*.derã??*.pemã??*.crtã??*.cerï¼?"
 
 #: ../src/wireless-security/wireless-security.c:333
 msgid "TLS"
@@ -422,3 +399,4 @@ msgstr "é?§é?? TLS"
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
 msgstr "å??ä¿?æ?¤ç?? EAP (PEAP)"
+
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 61326ff..120a127 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,62 +1,58 @@
-# Traditional Chinese translation of Network Manager.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Woodman Tuen <wmtuen gmail com>, 2005.
-# Hialan Liu <hialan liu gmail com>, 2008.
-# Tambet Ingo <tambet novell com>, 2009.
+# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-netbook 0.2\n"
+"Project-Id-Version: upstream-translations.network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 12:19+0300\n"
-"PO-Revision-Date: 2009-08-31 14:10+0300\n"
-"Last-Translator: Tambet Ingo <tambet novell com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-08 14:16+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nmn-connection-details.c:84
+#: ../src/nmn-connection-details.c:101
 msgid "(none)"
 msgstr "(ç?¡)"
 
 #. Connect by:
-#: ../src/nmn-connection-details.c:456
+#: ../src/nmn-connection-details.c:477
 msgid "Connect by:"
-msgstr "��:"
+msgstr "���︰"
 
-#: ../src/nmn-connection-details.c:459
+#: ../src/nmn-connection-details.c:480
 msgid "DHCP"
 msgstr "DHCP"
 
-#: ../src/nmn-connection-details.c:464
+#: ../src/nmn-connection-details.c:485
 msgid "Manual"
-msgstr "��端��"
+msgstr "æ??å??"
 
-#: ../src/nmn-connection-details.c:469
+#: ../src/nmn-connection-details.c:490
 msgid "Link Local"
-msgstr ""
+msgstr "����"
 
 #. Address
-#: ../src/nmn-connection-details.c:477
+#: ../src/nmn-connection-details.c:498
 msgid "IP Address:"
 msgstr "IP ä½?å??ï¼?"
 
 #. Netmask
-#: ../src/nmn-connection-details.c:486
+#: ../src/nmn-connection-details.c:507
 msgid "Subnet mask:"
 msgstr "�網路�罩�"
 
 #. Gateway
-#: ../src/nmn-connection-details.c:495
+#: ../src/nmn-connection-details.c:516
 msgid "Router:"
-msgstr "é ?設路ç?±ï¼?"
+msgstr "路���"
 
 #. DNS
-#: ../src/nmn-connection-details.c:504
+#: ../src/nmn-connection-details.c:525
 msgid "DNS:"
-msgstr "DNS:"
+msgstr "DNSï¼?"
 
 #: ../src/nbtk-gtk-light-switch.c:153
 msgid "Unavailable"
@@ -67,7 +63,7 @@ msgstr "���"
 #. * instead
 #: ../src/nbtk-gtk-light-switch.c:173 ../src/nbtk-gtk-light-switch.c:246
 msgid "On"
-msgstr "å??å??"
+msgstr "é??å??"
 
 #. Draw the second label; "Off"
 #. TRANSLATORS: If this string takes more than four or five characters in
@@ -76,90 +72,89 @@ msgstr "å??å??"
 msgid "Off"
 msgstr "é??é??"
 
-#: ../src/nmn-item.c:96
+#: ../src/nmn-item.c:121
 msgid "Disconnected"
-msgstr "已��"
+msgstr "��中�"
 
-#: ../src/nmn-item.c:97 ../src/nmn-item.c:371
+#: ../src/nmn-item.c:122 ../src/nmn-item.c:403
 msgid "Connect"
-msgstr ""
+msgstr "��"
 
-#: ../src/nmn-item.c:100
+#: ../src/nmn-item.c:125
 msgid "Connecting..."
-msgstr ""
+msgstr "正���..."
 
-#: ../src/nmn-item.c:101 ../src/nmn-item.c:105
+#: ../src/nmn-item.c:126 ../src/nmn-item.c:130
 msgid "Disconnect"
-msgstr "æ?·ç·?"
+msgstr "解���"
 
-#: ../src/nmn-item.c:104
+#: ../src/nmn-item.c:129
 msgid "Connected"
-msgstr ""
+msgstr "已��"
 
-#: ../src/nmn-item.c:366
+#: ../src/nmn-item.c:398
 msgid "Advanced"
 msgstr "é?²é??"
 
 #: ../src/network-manager-netbook.ui.h:1
 msgid "<b>3G</b>"
-msgstr ""
+msgstr "<b>3G</b>"
 
 #: ../src/network-manager-netbook.ui.h:2
 msgid "<b>Flight mode</b>"
-msgstr ""
+msgstr "<b>��模�</b>"
 
 #: ../src/network-manager-netbook.ui.h:3
 msgid "<b>WiFi</b>"
-msgstr ""
+msgstr "<b>WiFi</b>"
 
 #: ../src/network-manager-netbook.ui.h:4
 msgid "<b>Wired</b>"
-msgstr ""
+msgstr "<b>æ??ç·?</b>"
 
 #: ../src/network-manager-netbook.ui.h:5
 msgid "<big><b>Add a new connection</b></big>"
-msgstr ""
+msgstr "<big><b>æ?°å¢?æ?°ç??é?£ç·?</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:6
 msgid "<big><b>Networks</b></big>"
-msgstr ""
+msgstr "<big><b>網路</b></big>"
 
 #: ../src/network-manager-netbook.ui.h:7
 msgid "Add a new connection"
-msgstr ""
+msgstr "æ?°å¢?æ?°ç??é?£ç·?"
 
 #: ../src/network-manager-netbook.ui.h:8
-#, fuzzy
 msgid "Hidden network"
-msgstr "é?±è??ç??ç?¡ç·?網路"
+msgstr "é?±è??ç??網路"
 
-#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:206
+#: ../src/network-manager-netbook.ui.h:9 ../src/nmn-new-connection.c:223
 msgid "Internal 3G modem and SIM card detected"
-msgstr ""
+msgstr "å?µæ¸¬å?°å?§é?¨ 3G æ?¸æ??æ©?è?? SIM å?¡"
 
 #: ../src/network-manager-netbook.ui.h:10
 msgid "Return to Networking"
-msgstr ""
+msgstr "è¿?å??è?³ç¶²è·¯"
 
 #: ../src/network-manager-netbook.ui.h:11
 msgid "Save connection"
-msgstr ""
+msgstr "����"
 
 #: ../src/network-manager-netbook.ui.h:12
 msgid "This will disable all wireless connections"
-msgstr ""
+msgstr "æ­¤æ??ä½?å°?å??ç?¨æ??æ??ç?¡ç·?é?£ç·?"
 
-#: ../src/nmn-mobile-providers.c:506
+#: ../src/nmn-mobile-providers.c:504
 msgid "Default"
 msgstr "é ?設"
 
-#: ../src/nmn-new-connection.c:201
+#: ../src/nmn-new-connection.c:218
 msgid "3G disabled"
-msgstr ""
+msgstr "å·²å??ç?¨ 3G"
 
-#: ../src/nmn-new-connection.c:208
+#: ../src/nmn-new-connection.c:225
 msgid "No modems detected"
-msgstr ""
+msgstr "æ?ªå?µæ¸¬å?°æ?¸æ??æ©?"
 
 #: ../src/wireless-dialog.c:654
 msgid "None"
@@ -167,11 +162,11 @@ msgstr "ç?¡"
 
 #: ../src/wireless-dialog.c:671
 msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-ä½?å?? é??é?°"
+msgstr "WEP 40/128 ä½?å??é??é?°"
 
 #: ../src/wireless-dialog.c:680
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-ä½?å?? å¯?èª?"
+msgstr "WEP 128 ä½?å??å¯?碼ç??èª?"
 
 #: ../src/wireless-dialog.c:697
 #: ../src/wireless-security/wireless-security.c:345
@@ -184,11 +179,11 @@ msgstr "å??æ?? WEP (802.1x)"
 
 #: ../src/wireless-dialog.c:724
 msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 å??人ç??"
+msgstr "WPA è?? WPA2 Personal"
 
 #: ../src/wireless-dialog.c:738
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 ä¼?業ç??"
+msgstr "WPA è?? WPA2 Enterprise"
 
 #: ../src/wireless-dialog.c:798
 msgid "C_reate"
@@ -196,63 +191,56 @@ msgstr "建�(_R)"
 
 #: ../src/wireless-dialog.c:869
 #, 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
 msgid "Wireless Network Authentication Required"
-msgstr ""
+msgstr "é??è¦?ç?¡ç·?網路é©?è­?"
 
 #: ../src/wireless-dialog.c:873
 msgid "Authentication required by wireless network"
-msgstr "ç?¡ç·?網路æ??é??è¦?ç??é©?è­?"
+msgstr "ç?¡ç·?網路é??è¦?é©?è­?"
 
 #: ../src/wireless-dialog.c:878
 msgid "Create New Wireless Network"
-msgstr "建ç«?æ?°ç??ç?¡ç·?網路"
+msgstr "�建��網路"
 
 #: ../src/wireless-dialog.c:880
 msgid "New wireless network"
-msgstr "æ?°ç??ç?¡ç·?網路"
+msgstr "���網路"
 
 #: ../src/wireless-dialog.c:881
 msgid "Enter a name for the wireless network you wish to create."
-msgstr "輸å?¥æ?¨è¦?建ç«?ç??ç?¡ç·?網路ç??å??稱ã??"
+msgstr "ç?ºè¦?建ç«?ç??ç?¡ç·?網路輸å?¥å??稱ã??"
 
 #: ../src/wireless-dialog.c:883
 msgid "Connect to Hidden Wireless Network"
-msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?網路"
+msgstr "é?£æ?¥è?³é?±è??ç??ç?¡ç·?網路"
 
 #: ../src/wireless-dialog.c:885
 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 "輸å?¥æ?¨è¦?é?£æ?¥ç??é?±è??ç?¡ç·?網路ç??å??稱è??å®?å?¨æ?§è©³ç´°è³?æ??ã??"
+msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
+msgstr "輸å?¥è¦?é?£æ?¥ä¹?é?±è??ç?¡ç·?網路ç??å??稱å??å®?å?¨æ?§è©³ç´°è³?æ??ã??"
 
 #: ../src/wireless-security.ui.h:1
-#, fuzzy
 msgid "C_onnect"
-msgstr "��:"
+msgstr "��(_O)"
 
 #: ../src/wireless-security.ui.h:2
-#, fuzzy
 msgid "Connection:"
-msgstr "��:"
+msgstr "��︰"
 
 #: ../src/wireless-security.ui.h:3
-#, fuzzy
 msgid "Other Wireless Network..."
-msgstr "建ç«?æ?°ç??ç?¡ç·?網路"
+msgstr "����網路..."
 
 #: ../src/wireless-security.ui.h:4
 msgid "Wireless _adapter:"
-msgstr "��網絡�(_A)�"
+msgstr "�����(_A)�"
 
 #: ../src/wireless-security.ui.h:5
 msgid "_Network Name:"
@@ -260,29 +248,19 @@ msgstr "網路å??稱(_N)ï¼?"
 
 #: ../src/wireless-security.ui.h:6
 msgid "_Wireless Security:"
-msgstr "��網路�護(_W):"
+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"
-"\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) ç??æ??è­?æ??é? æ??é?£ç·?ä¸?å®?å?¨ã??æµ?æ°?ç?¡ç·?網路(å?¯è?½è¢«ç«?å??ã??å?«è?½ä¹?æ??)ã??æ?¯å?¦è¦?é?¸æ??ä¸?å??æ??è­?中å¿?ç??æ??è­?ï¼?"
+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
-#, fuzzy
 msgid "Choose CA Certificate"
-msgstr "é?¸æ??æ?¨ç??å??人æ??è­?..."
+msgstr "é?¸æ?? CA è­?æ?¸"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:5
 msgid "Don't warn me again"
-msgstr "ä¸?è¦?å??æ??é??æ??"
+msgstr "ä¸?è¦?å??次警å??"
 
 #: ../src/wireless-security/ca-nag-dialog.ui.h:6
 msgid "Ignore"
@@ -318,18 +296,18 @@ msgstr "使ç?¨è??å??稱ï¼?"
 #: ../src/wireless-security/eap-peap.ui.h:1
 #: ../src/wireless-security/eap-ttls.ui.h:1
 msgid "Anonymous Identity:"
-msgstr "å?¿å??è­?å?¥ï¼?"
+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
 msgid "CA Certificate:"
-msgstr "CA æ??è­?ï¼?"
+msgstr "CA ��︰"
 
 #: ../src/wireless-security/eap-peap.ui.h:3
 #: ../src/wireless-security/eap-ttls.ui.h:3
 msgid "Inner Authentication:"
-msgstr "����:"
+msgstr "�����"
 
 #: ../src/wireless-security/eap-peap.ui.h:4
 msgid "PEAP Version:"
@@ -337,7 +315,7 @@ msgstr "PEAP ç??æ?¬ï¼?"
 
 #: ../src/wireless-security/eap-tls.ui.h:2
 msgid "Identity:"
-msgstr "���"
+msgstr "身å??︰"
 
 #: ../src/wireless-security/eap-tls.ui.h:3
 msgid "Private Key Password:"
@@ -349,7 +327,7 @@ msgstr "ç§?å¯?é??é?°ï¼?"
 
 #: ../src/wireless-security/eap-tls.ui.h:6
 msgid "User Certificate:"
-msgstr "使ç?¨è??æ??è­?ï¼?"
+msgstr "使ç?¨è??è­?æ?¸ï¸°"
 
 #: ../src/wireless-security/wep-key.ui.h:2
 msgid "Key:"
@@ -361,7 +339,7 @@ msgstr "顯示é??é?°"
 
 #: ../src/wireless-security/wep-key.ui.h:4
 msgid "WEP Index:"
-msgstr "WEP 索�:"
+msgstr "WEP 索��"
 
 #: ../src/wireless-security/wpa-psk.ui.h:3
 msgid "Type:"
@@ -380,15 +358,15 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:394
 #: ../src/wireless-security/eap-method-ttls.c:319
 msgid "Choose a Certificate Authority certificate..."
-msgstr "é?¸æ??æ??è­?æ??æ¬?å?®ä½?(CA)æ??è­?..."
+msgstr "é?¸æ??è­?æ?¸ç®¡ç??中å¿?ç°½ç?¼ç??æ??è­?..."
 
 #: ../src/wireless-security/eap-method-tls.c:390
 msgid "Choose your personal certificate..."
-msgstr "é?¸æ??æ?¨ç??å??人æ??è­?..."
+msgstr "é?¸æ??å??人æ??è­?..."
 
 #: ../src/wireless-security/eap-method-tls.c:399
 msgid "Choose your private key..."
-msgstr "é?¸æ??æ?¨ç??ç§?å¯?é??é?°..."
+msgstr "é?¸æ??ç§?å¯?é??é?°..."
 
 #: ../src/wireless-security/eap-method-ttls.c:223
 msgid "PAP"
@@ -404,11 +382,11 @@ msgstr "CHAP"
 
 #: ../src/wireless-security/eap-method.c:456
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, æ?? PKCS#12 ç§?å¯?é??é?°(*.der, *.pem, *.p12)"
+msgstr "DERã??PEM æ?? PKCS#12 ç§?å¯?é??é?° (*.derã??*.pemã??*.p12)"
 
 #: ../src/wireless-security/eap-method.c:459
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER æ?? PEM æ??è­? (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER æ?? PEM æ??è­? (*.derã??*.pemã??*.crtã??*.cer)"
 
 #: ../src/wireless-security/wireless-security.c:333
 msgid "TLS"
@@ -416,8 +394,9 @@ msgstr "TLS"
 
 #: ../src/wireless-security/wireless-security.c:357
 msgid "Tunneled TLS"
-msgstr "穿�� TLS"
+msgstr "ç¶?ç?± TLS é??é??"
 
 #: ../src/wireless-security/wireless-security.c:368
 msgid "Protected EAP (PEAP)"
-msgstr "ä¿?è­·å¼? EAP (PEAP)"
+msgstr "å??ä¿?è­·ç?? EAP (PEAP)"
+