From d020409beecaa8dcc44cd86d0a751dadd62f04a3 Mon Sep 17 00:00:00 2001
From: David Paleino <d.paleino@gmail.com>
Date: Tue, 6 Mar 2012 12:11:45 +0100
Subject: [PATCH] Fixes in a more general way

---
 curses/wicd-curses.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py
index 51fe96b..a436daa 100755
--- a/curses/wicd-curses.py
+++ b/curses/wicd-curses.py
@@ -75,10 +75,14 @@ from os import system
 CURSES_REV=wpath.curses_revision
 
 # Fix strings in wicd-curses
-from wicd.translations import language, _
+from wicd.translations import language
+from wicd.translations import _ as orig_
 for i in language.keys():
     language[i] = language[i].decode('utf8')
 
+def _(s):
+    orig_(s).decode('utf8')
+
 ########################################
 ##### SUPPORT CLASSES
 ########################################
@@ -350,7 +354,7 @@ class NetLabel(urwid.WidgetWrap):
         if wireless.GetWirelessProperty(id, 'encryption'):
             self.encrypt = wireless.GetWirelessProperty(id,'encryption_method')
         else:
-            self.encrypt = _('Unsecured').decode('utf-8')
+            self.encrypt = _('Unsecured')
 
         self.mode  = wireless.GetWirelessProperty(id, 'mode') # Master, Ad-Hoc
         self.channel = wireless.GetWirelessProperty(id, 'channel')