diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py index f6c8d2d..1c92f82 100755 --- a/curses/prefs_curses.py +++ b/curses/prefs_curses.py @@ -60,13 +60,13 @@ class PrefsDialog(urwid.WidgetWrap): #### # General Settings - net_cat_t = ('header','Network Interfaces') + net_cat_t = ('header',language['network_interfaces']) wired_t = ('editcp',language['wired_interface']+': ') wless_t = ('editcp',language['wireless_interface']+':') - always_show_wired_t = 'Always show wired interface' - prefer_wired_t = 'Always switch to a wired connection when available' + always_show_wired_t = language['wired_always_on'] + prefer_wired_t = language['always_switch_to_wired'] - global_dns_cat_t = ('header','Global DNS Servers') + global_dns_cat_t = ('header',language['global_dns_servers']) global_dns_t = ('editcp',language['use_global_dns']) dns_dom_t = ('editcp',' DNS Domain: ') search_dom_t = ('editcp',' Search domain:') @@ -75,13 +75,13 @@ class PrefsDialog(urwid.WidgetWrap): dns3_t = ('editcp',' DNS server 3: ') - wired_auto_cat_t= ('header','Wired Autoconnect Settings') + wired_auto_cat_t= ('header',language['wired_autoconnect_settings']) wired_auto_1_t = language['use_default_profile'] wired_auto_2_t = language['show_wired_list'] wired_auto_3_t = language['use_last_used_profile'] - auto_reconn_cat_t = ('header','Automatic Reconnection') - auto_reconn_t = 'Automatically reconnect on connection loss' + auto_reconn_cat_t = ('header',language['automatic_reconnection']) + auto_reconn_t = language['auto_reconnect'] #### External Programs automatic_t = language['wicd_auto_config'] @@ -102,20 +102,20 @@ class PrefsDialog(urwid.WidgetWrap): #### Advanced Settings #wpa_t=('editcp',language['wpa_supplicant_driver']+':') - wpa_cat_t=('header','WPA_Supplicant') + wpa_cat_t=('header',language['wpa_supplicant']) wpa_t=('editcp','Driver:') wpa_list = ['spam','double spam','triple spam','quadruple spam'] - wpa_warn_t = ('important','You should almost always use wext as the WPA Supplicant Driver') + wpa_warn_t = ('important',language['always_use_wext']) backend_cat_t = ('header',language['backend']) backend_t = language['backend']+':' backend_list = ['spam','double spam','triple spam','quadruple spam'] - backend_warn_t = ('important','Changes to the backend (probably) requires a daemon restart') + #backend_warn_t = ('important','Changes to the backend (probably) requires a daemon restart') - debug_cat_t = ('header','Debugging') + debug_cat_t = ('header',language['debugging']) debug_mode_t = language['use_debug_mode'] - wless_cat_t = ('header','Wireless Interface') + wless_cat_t = ('header',language['wireless_interface']) use_dbm_t = language['display_type_dialog'] @@ -210,7 +210,6 @@ class PrefsDialog(urwid.WidgetWrap): self.backend_cat = urwid.Text(backend_cat_t) self.backend_cbox = ComboBox(backend_t) - self.backend_warn = urwid.Text(backend_warn_t) self.debug_cat = urwid.Text(debug_cat_t) self.debug_mode_checkb = urwid.CheckBox(debug_mode_t) @@ -222,7 +221,7 @@ class PrefsDialog(urwid.WidgetWrap): advancedLB = urwid.ListBox([self.wpa_cat, self.wpa_cbox,self.wpa_warn,_blank, self.backend_cat, - self.backend_cbox,self.backend_warn,_blank, + self.backend_cbox,_blank, self.debug_cat, self.debug_mode_checkb, _blank, self.wless_cat, @@ -262,7 +261,7 @@ class PrefsDialog(urwid.WidgetWrap): #self.walker = urwid.SimpleListWalker(content) #self.listbox = urwid.ListBox(self.walker) #self._linebox = urwid.LineBox(self._listbox) - self.tabs = TabColumns(headerList,lbList,'Preferences',self.button_cols) + self.tabs = TabColumns(headerList,lbList,language['preferences'],self.button_cols) #overlay = urwid.Overlay(self.tabs, body, ('fixed left', pos[0]), # width, ('fixed top', pos[1]), height) self.__super.__init__(self.tabs) diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 9cd9815..8db06ee 100644 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -100,7 +100,7 @@ class wrap_exceptions: print "This is most likely caused by the wicd daemon stopping" print "while wicd-curses is running." print "" - print "Please restart the daemon, and restart wicd-curses." + print "Please restart the daemon, and then restart wicd-curses." raise except : # If the UI isn't inactive (redraw_tag wouldn't normally be @@ -324,7 +324,7 @@ class NetLabel(urwid.WidgetWrap): str(wireless.GetWirelessProperty(id, strenstr))) self.essid = wireless.GetWirelessProperty(id, 'essid') self.bssid = wireless.GetWirelessProperty(id, 'bssid') - self.encrypt = wireless.GetWirelessProperty(id,'encryption_method') if wireless.GetWirelessProperty(id, 'encryption') else 'Unsecured' + self.encrypt = wireless.GetWirelessProperty(id,'encryption_method') if wireless.GetWirelessProperty(id, 'encryption') else language['unsecured'] self.mode = wireless.GetWirelessProperty(id, 'mode') # Master, Ad-Hoc self.channel = wireless.GetWirelessProperty(id, 'channel') theString = ' %*s %25s %9s %17s %6s: %s' % (gap, @@ -390,7 +390,7 @@ class WiredComboBox(ComboBox): prev_focus = self.get_focus()[1] key = self.__super.keypress(size,key) if self.get_focus()[1] == len(self.list)-1: - dialog = InputDialog(('header',"Add new wired profile"),7,30) + dialog = InputDialog(('header',"Add a new wired profile"),7,30) exitcode,name = dialog.run(ui,self.parent) if exitcode == 0: @@ -465,7 +465,7 @@ class AdHocDialog(Dialog2): body = urwid.ListBox(l) #body = urwid.AttrWrap(body, 'body') - header = ('header',"Create an Ad-Hoc network") + header = ('header',language['create_adhoc_network']) Dialog2.__init__(self, header, 15, 50, body) self.add_buttons([('OK',1),('Cancel',-1)]) self.frame.set_focus('body') @@ -503,8 +503,8 @@ class appGUI(): # Happy screen saying that you can't do anything because we're scanning # for networks. :-) # Will need a translation sooner or later - self.screen_locker = urwid.Filler(urwid.Text(('important',"Scanning networks... stand by..."), align='center')) - self.no_wlan = urwid.Filler(urwid.Text(('important',"No wireless networks found."), align='center')) + self.screen_locker = urwid.Filler(urwid.Text(('important',language['scanning_stand_by']), align='center')) + self.no_wlan = urwid.Filler(urwid.Text(('important',language['no_wireless_networks_found']), align='center')) self.TITLE = 'Wicd Curses Interface' self.WIRED_IDX = 1 self.WLESS_IDX = 3 @@ -542,7 +542,6 @@ class appGUI(): self.footerList = urwid.ListBox([self.footer1,self.footer2]) # Pop takes a number! #walker.pop(1) - nothingness = urwid.Filler(urwid.Text('Hello, world!')) self.frame = urwid.Frame(self.thePile, header=header, footer=urwid.BoxAdapter(self.footerList,2)) diff --git a/setup.py b/setup.py index 82de34d..032029b 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ import subprocess # VERSIONNUMBER VERSION_NUM = '1.6.0' REVISION_NUM = 'unknown' -CURSES_REVNO = 'r254' +CURSES_REVNO = 'r260' try: if not os.path.exists('vcsinfo.py'): diff --git a/wicd/misc.py b/wicd/misc.py index 356f9d4..cb425dc 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -553,7 +553,7 @@ def get_language_list_gui(): language['global_dns_servers'] = _("Global DNS servers") language['network_interfaces'] = _("Network Interfaces") language['connecting_to_daemon'] = _("Connecting to daemon...") - langauge['cannot_connect_to_daemon'] = _("Can't connect to the daemon, trying to start it automatically...") + language['cannot_connect_to_daemon'] = _("Can't connect to the daemon, trying to start it automatically...") language['could_not_connect'] = _("Could not connect to wicd's D-Bus interface. Check the wicd log for error messages.") return language