---
 curses/wicd-curses.py |    2 
 gtk/gui.py            |    3 -
 other/wicd.service    |    1 
 po/ast.po             |  130 +++++++++++++++++++++++++-------------------------
 po/bg.po              |   14 ++---
 po/eo.po              |    4 -
 po/es.po              |    2 
 po/es_CL.po           |    4 -
 po/es_GT.po           |    2 
 po/es_MX.po           |    2 
 po/es_VE.po           |    2 
 po/eu.po              |    2 
 po/fr.po              |   45 +++++++++++------
 po/fr_CA.po           |    6 +-
 po/gl.po              |    2 
 po/hr.po              |   10 +--
 po/hu.po              |    2 
 po/it.po              |   14 +++++
 po/lv.po              |    4 -
 po/nn.po              |    8 +--
 po/ru.po              |    2 
 po/uk.po              |    2 
 po/zh_TW.po           |   16 +++---
 wicd/configmanager.py |    9 ++-
 wicd/misc.py          |   15 +++++
 wicd/monitor.py       |    4 -
 wicd/wicd-daemon.py   |    2 
 wicd/wnettools.py     |    3 -
 28 files changed, 178 insertions(+), 134 deletions(-)

--- wicd.orig/curses/wicd-curses.py
+++ wicd/curses/wicd-curses.py
@@ -747,7 +747,7 @@ class appGUI():
                 iwconfig = wireless.GetIwconfig()
             else:
                 iwconfig = ''
-            essid = wireless.GetCurrentNetwork()
+            essid = wireless.GetCurrentNetwork(iwconfig)
             stat = wireless.CheckWirelessConnectingMessage()
             return self.set_status("%s: %s" % (essid, stat), True)
         if wired_connecting:
--- wicd.orig/gtk/gui.py
+++ wicd/gtk/gui.py
@@ -468,8 +468,7 @@ class appGui(object):
             gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
         if info[0] == "wireless":
             stat = wireless.CheckWirelessConnectingMessage()
-            gobject.idle_add(self.set_status, "%s: %s" % \
-                (wireless.GetCurrentNetwork(), stat))
+            gobject.idle_add(self.set_status, "%s: %s" % (info[1], stat))
         elif info[0] == "wired":
             gobject.idle_add(self.set_status, _('Wired Network') + ': ' \
                 + wired.CheckWiredConnectingMessage())
--- wicd.orig/wicd/wicd-daemon.py
+++ wicd/wicd/wicd-daemon.py
@@ -1392,7 +1392,7 @@ class WiredDaemon(dbus.service.Object):
     def CheckWiredConnectingMessage(self):
         """ Returns the wired interface's status message. """
         if self.wired.connecting_thread:
-            return _status_dict(self.CheckWiredConnectingStatus())
+            return _status_dict[self.CheckWiredConnectingStatus()]
         else:
             return False
 
--- wicd.orig/other/wicd.service
+++ wicd/other/wicd.service
@@ -3,7 +3,6 @@ Description=Wicd a wireless and wired ne
 After=syslog.target
 Wants=network.target
 Before=network.target
-Conflicts=NetworkManager.service
 
 [Service]
 Type=dbus
--- wicd.orig/wicd/configmanager.py
+++ wicd/wicd/configmanager.py
@@ -28,6 +28,7 @@ reusable for other purposes as well.
 import sys, os
 
 from ConfigParser import RawConfigParser, ParsingError
+import codecs
 
 from wicd.misc import Noneify, to_unicode
 
@@ -51,7 +52,7 @@ class ConfigManager(RawConfigParser):
         self.config_file = path
         self.debug = debug
         self.mrk_ws = mark_whitespace
-        if path:
+        if os.path.exists(path):
             sanitize_config_file(path)
         try:
             self.read(path)
@@ -116,6 +117,7 @@ class ConfigManager(RawConfigParser):
             if (isinstance(ret, basestring) and ret.startswith(self.mrk_ws) 
                 and ret.endswith(self.mrk_ws)):
                 ret = ret[3:-3]
+            ret = to_unicode(ret)
             if default:
                 if self.debug:
                     print ''.join(['found ', option, ' in configuration ', 
@@ -175,7 +177,8 @@ class ConfigManager(RawConfigParser):
         in the '.d' directory are read in normal sorted order and section
         entries in these files override entries in the main file.
         """
-        RawConfigParser.read(self, path)
+        if os.path.exists(path):
+            RawConfigParser.readfp(self, codecs.open(path, 'r', 'utf-8'))
 
         path_d = path + ".d"
         files = []
@@ -186,7 +189,7 @@ class ConfigManager(RawConfigParser):
 
         for fname in files:
             p = RawConfigParser()
-            p.read(fname)
+            p.readfp(codecs.open(fname, 'r', 'utf-8'))
             for section_name in p.sections():
                 # New files override old, so remove first to avoid DuplicateSectionError.
                 self.remove_section(section_name)
--- wicd.orig/po/ast.po
+++ wicd/po/ast.po
@@ -257,7 +257,7 @@ msgstr "Desconeutar toles redes"
 
 #: gtk/wicd-client.py:338 gtk/wicd-client.py:641
 msgid "Disconnected"
-msgstr ""
+msgstr "Desconeutáu"
 
 #: gtk/gui.py:724
 msgid "Disconnecting active connections..."
@@ -265,19 +265,19 @@ msgstr ""
 
 #: curses/wicd-curses.py:225
 msgid "Display 'about' dialog"
-msgstr ""
+msgstr "Amosar dialogu 'tocante a'"
 
 #: gtk/prefs.py:349 data/wicd.ui:992
 msgid "Display notifications about connection status"
-msgstr ""
+msgstr "Amosar notificaciones sobro l'estáu conexón"
 
 #: curses/wicd-curses.py:213
 msgid "Display this help dialog"
-msgstr ""
+msgstr "Amosar esti dialogu d'aida"
 
 #: wicd/translations.py:78
 msgid "Domain"
-msgstr ""
+msgstr "Dominiu"
 
 #: wicd/misc.py:82
 msgid "Done connecting..."
@@ -288,6 +288,8 @@ msgid ""
 "ERROR: wicd-curses was denied access to the wicd daemon: please check that "
 "your user is in the \"$A\" group."
 msgstr ""
+"ERRU: wicd-curses denegóse-y l'accesu al degorriu wicd: por favor compreba "
+"que'l to usuariu ta nel grupu \"$A'"
 
 #: curses/wicd-curses.py:460 gtk/gui.py:266
 msgid "ESSID"
@@ -295,15 +297,15 @@ msgstr ""
 
 #: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511
 msgid "Enable debug mode"
-msgstr ""
+msgstr "Activar mou depuración"
 
 #: gtk/wicd-client.py:318 gtk/wicd-client.py:322
 msgid "Establishing connection..."
-msgstr ""
+msgstr "Coneutándose..."
 
 #: curses/prefs_curses.py:51 data/wicd.ui:1398
 msgid "External Programs"
-msgstr ""
+msgstr "Programes esternos"
 
 #: wicd/misc.py:84
 msgid "Flushing the routing table..."
@@ -315,95 +317,95 @@ msgstr ""
 
 #: curses/netentry_curses.py:52 gtk/netentry.py:76
 msgid "Gateway"
-msgstr ""
+msgstr "Puerta d'enllaz"
 
 #: curses/prefs_curses.py:50 data/wicd.ui:1018
 msgid "General Settings"
-msgstr ""
+msgstr "Axustes xenerales"
 
 #: wicd/misc.py:85
 msgid "Generating PSK..."
-msgstr ""
+msgstr "Xenerando PSK..."
 
 #: wicd/misc.py:86
 msgid "Generating WPA configuration file..."
-msgstr ""
+msgstr "Xenerando archivu configuración de WPA"
 
 #: gtk/netentry.py:232
 msgid "Global DNS has not been enabled in general preferences."
-msgstr ""
+msgstr "Les DNS globales nun foron activaes nes preferencies xenerales."
 
 #: curses/prefs_curses.py:72
 msgid "Global DNS servers"
-msgstr ""
+msgstr "Sirvidores globales DNS"
 
 #: curses/wicd-curses.py:554
 msgid "Help"
-msgstr ""
+msgstr "Aida"
 
 #: curses/wicd-curses.py:562
 msgid "Hidden"
-msgstr ""
+msgstr "Anubríu"
 
 #: gtk/gui.py:357
 msgid "Hidden Network ESSID"
-msgstr ""
+msgstr "Rede ESSID anubría"
 
 #: curses/netentry_curses.py:50 curses/wicd-curses.py:461 gtk/gui.py:265
 #: gtk/netentry.py:73
 msgid "IP"
-msgstr ""
+msgstr "IP"
 
 #: wicd/translations.py:79
 msgid "Identity"
-msgstr ""
+msgstr "Identidá"
 
 #: gtk/wicd-client.py:498
 msgid "Information about the current connection"
-msgstr ""
+msgstr "Información tocante la conexón actual"
 
 #: gtk/netentry.py:166
 msgid "Invalid IP address entered."
-msgstr ""
+msgstr "Puesta direición IP inválida"
 
 #: gtk/gui.py:630 gtk/gui.py:638
 msgid "Invalid address in $A entry."
-msgstr ""
+msgstr "Direición inválida na entrada $A."
 
 #: curses/wicd-curses.py:463 gtk/gui.py:268 wicd/translations.py:80
 msgid "Key"
-msgstr ""
+msgstr "Clave"
 
 #: curses/netentry_curses.py:51 gtk/netentry.py:75
 msgid "Netmask"
-msgstr ""
+msgstr "Mázcara de rede"
 
 #: curses/prefs_curses.py:66
 msgid "Network Interfaces"
-msgstr ""
+msgstr "Interfaces de rede"
 
 #: gtk/netentry.py:817
 msgid "Never connect to this network"
-msgstr ""
+msgstr "Tanina coneutar pa esta rede"
 
 #: curses/wicd-curses.py:526 gtk/gui.py:603 gtk/wicd-client.py:795
 msgid "No wireless networks found."
-msgstr ""
+msgstr "Nun s'alcontró rede inalámbrica dala."
 
 #: curses/wicd-curses.py:737 gtk/gui.py:439 gtk/wicd-client.py:211
 #: gtk/wicd-client.py:221 gtk/wicd-client.py:333 gtk/wicd-client.py:336
 msgid "Not connected"
-msgstr ""
+msgstr "Non coneutáu"
 
 #: curses/configscript_curses.py:73 curses/curses_misc.py:527
 #: curses/netentry_curses.py:66 curses/wicd-curses.py:489
 #: curses/wicd-curses.py:601 curses/wicd-curses.py:605
 msgid "OK"
-msgstr ""
+msgstr "Val"
 
 #: wicd/misc.py:91
 msgid "Obtaining IP address..."
-msgstr ""
+msgstr "Obteniendo direición IP"
 
 #: curses/wicd-curses.py:277
 msgid ""
@@ -417,23 +419,23 @@ msgstr ""
 
 #: wicd/translations.py:81
 msgid "Passphrase"
-msgstr ""
+msgstr "Fras de pasu"
 
 #: wicd/translations.py:82
 msgid "Password"
-msgstr ""
+msgstr "Conseña"
 
 #: wicd/translations.py:83
 msgid "Path to CA cert"
-msgstr ""
+msgstr "Parchear pal certificáu CA"
 
 #: wicd/translations.py:85
 msgid "Path to PAC file"
-msgstr ""
+msgstr "Parchear pal archivu PAC"
 
 #: wicd/translations.py:84
 msgid "Path to client cert"
-msgstr ""
+msgstr "Parchear pal certificáu de cliente"
 
 #: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644
 msgid "Ping static gateways after connecting to verify association"
@@ -457,31 +459,31 @@ msgstr ""
 
 #: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318
 msgid "Preferences"
-msgstr ""
+msgstr "Preferencies"
 
 #: curses/wicd-curses.py:218
 msgid "Preferences dialog"
-msgstr ""
+msgstr "Diálogu preferencies"
 
 #: curses/wicd-curses.py:561
 msgid "Prefs"
-msgstr ""
+msgstr "Prefs"
 
 #: wicd/translations.py:86
 msgid "Preshared key"
-msgstr ""
+msgstr "Preshared key"
 
 #: curses/wicd-curses.py:228
 msgid "Press any key to return."
-msgstr ""
+msgstr "Primi cualaquier tecla pa tornar."
 
 #: wicd/translations.py:87
 msgid "Private key"
-msgstr ""
+msgstr "Cnoseña acutada"
 
 #: wicd/translations.py:88
 msgid "Private key password"
-msgstr ""
+msgstr "Llave la conseña acutada"
 
 #: curses/prefs_curses.py:83 gtk/prefs.py:343
 msgid "Prompt for profile on wired autoconnect"
@@ -489,7 +491,7 @@ msgstr ""
 
 #: gtk/netentry.py:58 gtk/netentry.py:60 gtk/netentry.py:597
 msgid "Properties"
-msgstr ""
+msgstr "Propiedaes"
 
 #: wicd/misc.py:87
 msgid "Putting interface down..."
@@ -497,87 +499,87 @@ msgstr ""
 
 #: wicd/misc.py:88
 msgid "Putting interface up..."
-msgstr ""
+msgstr "Poniendo la interfaz a..."
 
 #: curses/wicd-curses.py:564
 msgid "Quit"
-msgstr ""
+msgstr "Colar"
 
 #: curses/wicd-curses.py:226
 msgid "Quit wicd-curses"
-msgstr ""
+msgstr "Colar de wicd-curses"
 
 #: gtk/wicd-client.py:500
 msgid "Quit wicd-tray-icon"
-msgstr ""
+msgstr "Colar del iconu la bandexa"
 
 #: curses/wicd-curses.py:560
 msgid "Refresh"
-msgstr ""
+msgstr "Anovar"
 
 #: curses/wicd-curses.py:217
 msgid "Refresh network list"
-msgstr ""
+msgstr "Anovar llista de rede"
 
 #: curses/wicd-curses.py:440
 msgid "Rename wired profile"
-msgstr ""
+msgstr "Renomar perfil cableáu"
 
 #: curses/netentry_curses.py:357 gtk/gui.py:693 gtk/netentry.py:485
 msgid "Required encryption information is missing."
-msgstr ""
+msgstr "La información d'encriptación requería ta perdía"
 
 #: wicd/misc.py:90
 msgid "Resetting IP address..."
-msgstr ""
+msgstr "Reaniciando direición IP"
 
 #: curses/wicd-curses.py:557
 msgid "RfKill"
-msgstr ""
+msgstr "RfKill"
 
 #: curses/prefs_curses.py:103
 msgid "Route Table Flushing"
-msgstr ""
+msgstr "Tables de ruta Flushing"
 
 #: curses/wicd-curses.py:628
 msgid "Scan"
-msgstr ""
+msgstr "Desaminar"
 
 #: curses/wicd-curses.py:221
 msgid "Scan for hidden networks"
-msgstr ""
+msgstr "Desaminar por redes anubríes"
 
 #: gtk/gui.py:223 gtk/gui.py:528 gtk/wicd-client.py:808
 msgid "Scanning"
-msgstr ""
+msgstr "Desaminando"
 
 #: curses/wicd-curses.py:525
 msgid "Scanning networks... stand by..."
-msgstr ""
+msgstr "Desaminando redes... aparar..."
 
 #: gtk/netentry.py:101
 msgid "Scripts"
-msgstr ""
+msgstr "Scripts"
 
 #: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:77
 msgid "Search domain"
-msgstr ""
+msgstr "Guetar dominiu"
 
 #: gtk/netentry.py:959 gtk/netentry.py:1081
 msgid "Secured"
-msgstr ""
+msgstr "Seguro"
 
 #: curses/wicd-curses.py:628
 msgid "Select Hidden Network ESSID"
-msgstr ""
+msgstr "Esbillar rede ESSID anubría"
 
 #: gtk/gui.py:103
 msgid "Select or create a wired profile to connect with"
-msgstr ""
+msgstr "Esbillar o criar un perfil cableáu con conexón con"
 
 #: curses/wicd-curses.py:222
 msgid "Select scripts"
-msgstr ""
+msgstr "Esbillar sripts"
 
 #: curses/wicd-curses.py:223
 msgid "Set up Ad-hoc network"
--- wicd.orig/po/bg.po
+++ wicd/po/bg.po
@@ -185,7 +185,7 @@ msgstr "Свързването неус�
 
 #: wicd/misc.py:95
 msgid "Connection successful."
-msgstr "Връзката прекъсната"
+msgstr ""
 
 #: gtk/gui.py:65 gtk/wicd-client.py:952
 msgid ""
@@ -851,7 +851,7 @@ msgstr "Връзката прекъсн�
 
 #: data/wicd.ui:108
 msgid "_Refresh"
-msgstr "Настройки"
+msgstr ""
 
 #: data/wicd.ui:122
 msgid "_Preferences"
@@ -867,7 +867,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Връзка установена..."
+msgstr ""
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
@@ -922,11 +922,11 @@ msgstr "Автоматично свър�
 
 #: data/wicd.ui:625
 msgid "<b>Automatic Reconnection</b>"
-msgstr "Автоматично възстановяване на връзката, в случай на прекъсване"
+msgstr ""
 
 #: data/wicd.ui:641
 msgid "Use last wired network profile"
-msgstr "Преименувай профил"
+msgstr ""
 
 #: data/wicd.ui:663
 msgid "Prompt for wired network profile"
@@ -934,11 +934,11 @@ msgstr ""
 
 #: data/wicd.ui:686
 msgid "Use default wired network profile"
-msgstr "Преименувай профил"
+msgstr ""
 
 #: data/wicd.ui:707
 msgid "<b>Wired automatic connection</b>"
-msgstr "Автоматично възстановяване на връзката, в случай на прекъсване"
+msgstr ""
 
 #: data/wicd.ui:725
 msgid "Wired interface:"
--- wicd.orig/po/eo.po
+++ wicd/po/eo.po
@@ -845,7 +845,7 @@ msgstr "_Eliri"
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Bone konektita..."
+msgstr "Konektanta..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
@@ -904,7 +904,7 @@ msgstr "<b>Aŭtomata Rekonekti</b>"
 
 #: data/wicd.ui:641
 msgid "Use last wired network profile"
-msgstr ""
+msgstr "Uzi lasta drata reta profilo"
 
 #: data/wicd.ui:663
 msgid "Prompt for wired network profile"
--- wicd.orig/po/es.po
+++ wicd/po/es.po
@@ -884,7 +884,7 @@ msgstr "_Cerrar"
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Conexión establecida..."
+msgstr "Conectando..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/es_CL.po
+++ wicd/po/es_CL.po
@@ -153,7 +153,7 @@ msgstr ""
 
 #: gtk/gui.py:191 gtk/wicd-client.py:311 gtk/wicd-client.py:639
 msgid "Connecting"
-msgstr "Conectando:"
+msgstr "Conectando"
 
 #: wicd/misc.py:77
 msgid "Connection Cancelled"
@@ -845,7 +845,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Conectando:"
+msgstr "Conectando..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/es_GT.po
+++ wicd/po/es_GT.po
@@ -834,7 +834,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Conectando"
+msgstr "Conectando..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/es_MX.po
+++ wicd/po/es_MX.po
@@ -871,7 +871,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Conexión realizada..."
+msgstr "Conectando..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/es_VE.po
+++ wicd/po/es_VE.po
@@ -871,7 +871,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Conexión establecida..."
+msgstr "Conectando..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/eu.po
+++ wicd/po/eu.po
@@ -835,7 +835,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Konexioa egiten..."
+msgstr ""
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/fr.po
+++ wicd/po/fr.po
@@ -836,7 +836,15 @@ msgstr "Vous devez entrer votre mot de p
 #: curses/prefs_curses.py:111
 msgid "You should almost always use wext as the WPA supplicant driver"
 msgstr ""
-"La plupart du temps, il faut utiliser wext comme pilote WPA supplicant"
+"La plupart du temps, il convient d'utiliser wext comme pilote WPA supplicant"
+
+#: gtk/wicd-client.py:499
+msgid "_Connection Info"
+msgstr "_Infos Connexion"
+
+#: gtk/wicd-client.py:502 data/wicd.ui:151
+msgid "_Quit"
+msgstr "_Quitter"
 
 #: curses/wicd-curses.py:427
 msgid ""
@@ -854,6 +862,14 @@ msgstr "Aide wicd-curses"
 msgid "Wicd Network Manager"
 msgstr "Gestionnaire réseau Wicd"
 
+#: data/wicd.ui:46
+msgid "Create an ad-hoc network"
+msgstr "Créer un réseau Ad-Hoc"
+
+#: data/wicd.ui:55
+msgid "Find a hidden network"
+msgstr "Trouver un réseau caché"
+
 #: data/wicd.ui:57
 msgid "Enter a hidden network to try to locate."
 msgstr ""
@@ -864,11 +880,11 @@ msgstr "Eteindre le Wi-fi"
 
 #: data/wicd.ui:94
 msgid "_Disconnect All"
-msgstr "Déconnecté"
+msgstr "Déconnecter"
 
 #: data/wicd.ui:108
 msgid "_Refresh"
-msgstr "Préférences"
+msgstr "_Actualiser"
 
 #: data/wicd.ui:122
 msgid "_Preferences"
@@ -878,13 +894,9 @@ msgstr "Préférences"
 msgid "_About"
 msgstr "_À propos"
 
-#: data/wicd.ui:151
-msgid "_Quit"
-msgstr "_Quitter"
-
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Connexion effectuée…"
+msgstr "Connexion en cours..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
@@ -931,7 +943,7 @@ msgstr "Domaine DNS"
 
 #: data/wicd.ui:590
 msgid "<b>Never Connect</b>"
-msgstr ""
+msgstr "<b>Ne jamais se connecter</b>"
 
 #: data/wicd.ui:606
 msgid "Automatically reconnect on network connection loss"
@@ -939,7 +951,7 @@ msgstr "Reconnecter automatiquement en c
 
 #: data/wicd.ui:625
 msgid "<b>Automatic Reconnection</b>"
-msgstr "Reconnexion automatique"
+msgstr "<b>Reconnexion automatique</b>"
 
 #: data/wicd.ui:641
 msgid "Use last wired network profile"
@@ -995,6 +1007,9 @@ msgid ""
 "window. This can be useful if your wired network card does not detect when "
 "the interface is connected to a cable."
 msgstr ""
+"Si activée, l'interface réseau filaire apparaîtra toujours dans la "
+"fenêtreprincipale. Ceci peut être utile si votre carte réseau filaire ne "
+"détecte pas le branchement du câble."
 
 #: data/wicd.ui:976
 msgid "<b>Notifications</b>"
@@ -1014,13 +1029,15 @@ msgstr "<b>Client DHCP</b>"
 
 #: data/wicd.ui:1300
 msgid "<b>Graphical Sudo Application</b>"
-msgstr ""
+msgstr "<b>Programme Sudo graphique</b>"
 
 #: data/wicd.ui:1421
 msgid ""
 "Hover your mouse over the selected backend \n"
 "to read its description."
 msgstr ""
+"Déplacez la souris sur le protocole choisi \n"
+"pour afficher une description de celui-ci"
 
 #: data/wicd.ui:1474
 msgid "Driver:"
@@ -1040,15 +1057,15 @@ msgstr "Débogage"
 
 #: data/wicd.ui:1574
 msgid "Backend:"
-msgstr "Backend"
+msgstr "Protocole:"
 
 #: data/wicd.ui:1601
 msgid "<b>Backend</b>"
-msgstr ""
+msgstr "<b>Protocole</b>"
 
 #: data/wicd.ui:1615
 msgid ""
 "You should almost always use wext as the\n"
 "WPA supplicant driver."
 msgstr ""
-"La plupart du temps, il faut utiliser wext comme pilote WPA supplicant"
+"La plupart du temps, il convient d'utiliser wext comme pilote WPA supplicant"
--- wicd.orig/po/fr_CA.po
+++ wicd/po/fr_CA.po
@@ -861,7 +861,7 @@ msgstr "Déconnecté"
 
 #: data/wicd.ui:108
 msgid "_Refresh"
-msgstr "Préférences"
+msgstr "_Actualiser"
 
 #: data/wicd.ui:122
 msgid "_Preferences"
@@ -873,11 +873,11 @@ msgstr ""
 
 #: data/wicd.ui:151
 msgid "_Quit"
-msgstr ""
+msgstr "_Quitter"
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Connexion effectuée..."
+msgstr "Connexion en cours..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/gl.po
+++ wicd/po/gl.po
@@ -186,7 +186,7 @@ msgstr ""
 
 #: wicd/misc.py:95
 msgid "Connection successful."
-msgstr "Conexión cancelada"
+msgstr ""
 
 #: gtk/gui.py:65 gtk/wicd-client.py:952
 msgid ""
--- wicd.orig/po/hr.po
+++ wicd/po/hr.po
@@ -194,7 +194,7 @@ msgstr "Neuspjelo spajanje: Ne mogu kont
 
 #: wicd/misc.py:95
 msgid "Connection successful."
-msgstr "Veza poništena"
+msgstr ""
 
 #: gtk/gui.py:65 gtk/wicd-client.py:952
 msgid ""
@@ -828,7 +828,7 @@ msgid ""
 "it (\"F2\")"
 msgstr ""
 
-#: curses/wicd-curses.py:205
+#: curses/wicd-curses.py:206
 msgid "wicd-curses help"
 msgstr ""
 
@@ -866,7 +866,7 @@ msgstr "_Isključi"
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Povezivanje završeno..."
+msgstr ""
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
@@ -928,7 +928,7 @@ msgstr "<b>Automatsko prespajanje</b>"
 
 #: data/wicd.ui:641
 msgid "Use last wired network profile"
-msgstr "Koristi zadnji žični profil"
+msgstr ""
 
 #: data/wicd.ui:663
 msgid "Prompt for wired network profile"
@@ -936,7 +936,7 @@ msgstr ""
 
 #: data/wicd.ui:686
 msgid "Use default wired network profile"
-msgstr "Koristi zadani žični profil"
+msgstr ""
 
 #: data/wicd.ui:707
 msgid "<b>Wired automatic connection</b>"
--- wicd.orig/po/hu.po
+++ wicd/po/hu.po
@@ -492,7 +492,7 @@ msgstr "Profil választás vezetékes ú
 
 #: gtk/netentry.py:58 gtk/netentry.py:60 gtk/netentry.py:597
 msgid "Properties"
-msgstr "Beállítások"
+msgstr "Tulajdonságok"
 
 #: wicd/misc.py:87
 msgid "Putting interface down..."
--- wicd.orig/po/it.po
+++ wicd/po/it.po
@@ -850,6 +850,10 @@ msgstr "È necessario inserire la passwo
 msgid "You should almost always use wext as the WPA supplicant driver"
 msgstr "Dovresti utilizzare sempre wext come driver WPA supplicant"
 
+#: gtk/wicd-client.py:499
+msgid "_Connection Info"
+msgstr "_Info Connessione"
+
 #: curses/wicd-curses.py:427
 msgid ""
 "wicd-curses does not support deleting the last wired profile.  Try renaming "
@@ -866,6 +870,14 @@ msgstr "aiuto di wicd-curses"
 msgid "Wicd Network Manager"
 msgstr "Gestore di Rete Wicd"
 
+#: data/wicd.ui:46
+msgid "Create an ad-hoc network"
+msgstr "Crea rete ad-hoc"
+
+#: data/wicd.ui:55
+msgid "Find a hidden network"
+msgstr "Trova rete nascosta"
+
 #: data/wicd.ui:57
 msgid "Enter a hidden network to try to locate."
 msgstr "Inserisci una rete nascosta da cercare."
@@ -896,7 +908,7 @@ msgstr "_Esci"
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Connessione..."
+msgstr "Connessione in corso..."
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/lv.po
+++ wicd/po/lv.po
@@ -818,7 +818,7 @@ msgstr ""
 
 #: data/wicd.ui:108
 msgid "_Refresh"
-msgstr "Iestatījumi"
+msgstr ""
 
 #: data/wicd.ui:122
 msgid "_Preferences"
@@ -834,7 +834,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Pieslēgšanās pabeigta"
+msgstr ""
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
--- wicd.orig/po/nn.po
+++ wicd/po/nn.po
@@ -185,7 +185,7 @@ msgstr ""
 
 #: wicd/misc.py:95
 msgid "Connection successful."
-msgstr "Tilkopling avbroten"
+msgstr ""
 
 #: gtk/gui.py:65 gtk/wicd-client.py:952
 msgid ""
@@ -821,7 +821,7 @@ msgstr "Kople frå alle nettverk"
 
 #: data/wicd.ui:108
 msgid "_Refresh"
-msgstr "Innstillingar"
+msgstr ""
 
 #: data/wicd.ui:122
 msgid "_Preferences"
@@ -837,7 +837,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "Koplar til"
+msgstr ""
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
@@ -896,7 +896,7 @@ msgstr ""
 
 #: data/wicd.ui:641
 msgid "Use last wired network profile"
-msgstr "Legg til ny kabla profil"
+msgstr ""
 
 #: data/wicd.ui:663
 msgid "Prompt for wired network profile"
--- wicd.orig/po/ru.po
+++ wicd/po/ru.po
@@ -378,7 +378,7 @@ msgstr "Сетевые интерфей�
 
 #: gtk/netentry.py:817
 msgid "Never connect to this network"
-msgstr "Автоматически подключаться к этой сети"
+msgstr "Никогда не подключаться к этой сети"
 
 #: curses/wicd-curses.py:526 gtk/gui.py:603 gtk/wicd-client.py:795
 msgid "No wireless networks found."
--- wicd.orig/po/uk.po
+++ wicd/po/uk.po
@@ -381,7 +381,7 @@ msgstr "Мережеві інтерфе�
 
 #: gtk/netentry.py:817
 msgid "Never connect to this network"
-msgstr "Автоматично з’єднуватись з цією мережею"
+msgstr "Ніколи не з’єднуватися з цією мережею"
 
 #: curses/wicd-curses.py:526 gtk/gui.py:603 gtk/wicd-client.py:795
 msgid "No wireless networks found."
--- wicd.orig/po/zh_TW.po
+++ wicd/po/zh_TW.po
@@ -194,9 +194,9 @@ msgstr "連線失敗：無法聯接到�
 
 #: wicd/misc.py:95
 msgid "Connection successful."
-msgstr "連線成功"
+msgstr ""
 
-#: gtk/gui.py:65 gtk/wicd-client.py:952
+#: gtk/gui.py:66 gtk/wicd-client.py:952
 msgid ""
 "Could not connect to wicd's D-Bus interface. Check the wicd log for error "
 "messages."
@@ -831,7 +831,7 @@ msgstr "斷線"
 
 #: data/wicd.ui:108
 msgid "_Refresh"
-msgstr "喜好設定"
+msgstr ""
 
 #: data/wicd.ui:122
 msgid "_Preferences"
@@ -847,7 +847,7 @@ msgstr ""
 
 #: data/wicd.ui:213 data/wicd.ui:215
 msgid "Connecting..."
-msgstr "完成連接中..."
+msgstr ""
 
 #: data/wicd.ui:228
 msgid "Cancel the current connection attempt"
@@ -902,11 +902,11 @@ msgstr "當連線中斷時,自動重新�
 
 #: data/wicd.ui:625
 msgid "<b>Automatic Reconnection</b>"
-msgstr "自動重新連接:"
+msgstr ""
 
 #: data/wicd.ui:641
 msgid "Use last wired network profile"
-msgstr "重新命名設定:"
+msgstr ""
 
 #: data/wicd.ui:663
 msgid "Prompt for wired network profile"
@@ -914,11 +914,11 @@ msgstr ""
 
 #: data/wicd.ui:686
 msgid "Use default wired network profile"
-msgstr "重新命名設定:"
+msgstr ""
 
 #: data/wicd.ui:707
 msgid "<b>Wired automatic connection</b>"
-msgstr "自動重新連接:"
+msgstr ""
 
 #: data/wicd.ui:725
 msgid "Wired interface:"
--- wicd.orig/wicd/misc.py
+++ wicd/wicd/misc.py
@@ -413,7 +413,7 @@ def noneToString(text):
     if text in (None, ""):
         return "None"
     else:
-        return str(text)
+        return to_unicode(text)
 
 def to_unicode(x):
     """ Attempts to convert a string to utf-8. """
@@ -422,6 +422,19 @@ def to_unicode(x):
         return x
     if isinstance(x, unicode):
         return x.encode('utf-8')
+
+    # FIXME: this is a workaround to correctly parse utf-8
+    # encoded ESSIDs returned by iwlist -- python replaces
+    # \xNN with \\xNN, thus losing the characters :/.
+    # It should really be handled in a better way. Maybe
+    # using index()/find()?
+    if '\\' in x:
+        begin = x.split('\\x')[:1]
+        chars = x.split('\\x')[1:]
+        end = [chars[-1][2:]]
+        chars[-1] = chars[-1][:2]
+        x = ''.join(begin + map(lambda c: chr(int(c, 16)), chars) + end)
+
     encoding = locale.getpreferredencoding()
     try:
         ret = x.decode(encoding).encode('utf-8')
--- wicd.orig/wicd/monitor.py
+++ wicd/wicd/monitor.py
@@ -274,10 +274,10 @@ class ConnectionStatus(object):
             if wired.CheckIfWiredConnecting():
                 info = ["wired"]
             else:
-                info = ["wireless", str(wireless.GetCurrentNetwork(iwconfig))]
+                info = ["wireless", wireless.GetCurrentNetwork(iwconfig)]
         elif state == misc.WIRELESS:
             self.reconnect_tries = 0
-            info = [str(wifi_ip), str(wireless.GetCurrentNetwork(iwconfig)),
+            info = [str(wifi_ip), wireless.GetCurrentNetwork(iwconfig),
                     str(self._get_printable_sig_strength()),
                     str(wireless.GetCurrentNetworkID(iwconfig)),
                     wireless.GetCurrentBitrate(iwconfig)]
--- wicd.orig/wicd/wnettools.py
+++ wicd/wicd/wnettools.py
@@ -1502,8 +1502,7 @@ class BaseWirelessInterface(BaseInterfac
             output = self.GetIwconfig()
         else:
             output = iwconfig
-        network = misc.RunRegex(re.compile('.*ESSID:"(.*?)"',
-                                           re.I | re.M  | re.S), output)
+        network = misc.to_unicode(misc.RunRegex(essid_pattern, output))
         if network:
             network = misc.to_unicode(network)
         return network
