diff --git a/.bzrignore b/.bzrignore
index 4cb9c80..8a13d6a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,3 +3,19 @@ install.log
 uninstall.log
 .bzrignore
 vcsinfo.py
+build/*
+init/*/*
+man/wicd-curses.8
+man/wicd-manager-settings.conf.5
+man/wicd-wired-settings.conf.5
+man/wicd-wireless-settings.conf.5
+man/wicd.8
+other/50-wicd-suspend.sh
+other/55wicd
+other/80-wicd-connect.sh
+other/WHEREAREMYFILES
+other/wicd.conf
+scripts/wicd
+scripts/wicd-client
+scripts/wicd-curses
+wicd/wpath.py
diff --git a/wicd/misc.py b/wicd/misc.py
index 3e076aa..e0a69c6 100644
--- a/wicd/misc.py
+++ b/wicd/misc.py
@@ -529,7 +529,7 @@ def get_language_list_gui():
     language['stop_showing_chooser'] = _('Stop Showing Autoconnect pop-up temporarily')
     language['display_type_dialog'] = _('Use dBm to measure signal strength')
     language['scripts'] = _('Scripts')
-    language['invalid_address'] = _('Invalid address in $A entry.')
+    #language['invalid_address'] = _('Invalid address in $A entry.')
     language['global_settings'] = _('Use these settings for all networks sharing this essid')
     language['encrypt_info_missing'] = _('Required encryption information is missing.')
     language['enable_encryption'] = _('This network requires encryption to be enabled.')
@@ -614,6 +614,14 @@ def get_language_list_gui():
     language['wicd_curses'] = _("Wicd Curses Interface")
     language['dbus_fail'] = _("DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses.")
 
+    # Fix strings in wicd-curses
+    for i in language.keys():
+        try :
+            language[i] = language[i].decode('utf8')
+        except:
+            print "\"%s\"" % language[i]
+            raise
+
 
     return language