Merge latest 1.6

INSTALL

@@ -12,8 +12,9 @@ are a few dependencies:
   7. urwid (if you want to use the curses client - needs version >=0.9.8.3)
   8. pm-utils (optional for suspend/resume integration - needs version >=1.2.4)
 
-If you are installing from a bzr pull or beta/rc tarball and you want 
+If you are installing from a bzr pull and you want 
 the native language translations, first run this:
+  python setup.py update_translations_py
   python setup.py get_translations
 You will not need to do this if you're installing from a release tarball.
 

curses/netentry_curses.py

@@ -62,17 +62,17 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
         ok_t = 'OK'
         
         self.static_ip_cb = urwid.CheckBox(static_ip_t,
-                on_state_change=self.static_ip_set_state)
+                on_state_change=self.static_ip_toggle)
         self.ip_edit     =DynWrap(urwid.Edit(ip_t),False)
         self.netmask_edit=DynWrap(urwid.Edit(netmask_t),False)
         self.gateway_edit=DynWrap(urwid.Edit(gateway_t),False)
 
 
-        self.static_dns_cb = urwid.CheckBox(use_static_dns_t,
+        self.static_dns_cb = DynWrap(urwid.CheckBox(use_static_dns_t,
-                on_state_change=self.dns_toggle)
+                on_state_change=self.dns_toggle),True,('body','editnfc'),None)
         self.global_dns_cb = DynWrap(urwid.CheckBox(use_global_dns_t,
                 on_state_change=self.dns_toggle),False,('body','editnfc'),None)
-        checkb_cols = urwid.Columns([self.static_dns_cb,
+        self.checkb_cols = urwid.Columns([self.static_dns_cb,
                                      self.global_dns_cb])
         self.dns_dom_edit      = DynWrap(urwid.Edit(dns_dom_t)   ,False)
         self.search_dom_edit   = DynWrap(urwid.Edit(search_dom_t),False)
@@ -87,7 +87,7 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
                                          self.netmask_edit,
                                          self.gateway_edit,
                                          _blank,
-                                         checkb_cols,
+                                         self.checkb_cols,
                                          self.dns_dom_edit,self.search_dom_edit,
                                          self.dns1,self.dns2,self.dns3
                                         ])
@@ -99,12 +99,19 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
         self._frame = urwid.Frame(self._listbox)
         self.__super.__init__(self._frame)
     
-    def static_ip_set_state(self,checkb,new_state,user_data=None):
+    def static_ip_toggle(self,checkb,new_state,user_data=None):
         for w in [ self.ip_edit,self.netmask_edit,self.gateway_edit ]:
             w.set_sensitive(new_state)
+        self.static_dns_cb.set_state(new_state)
+        self.static_dns_cb.set_sensitive(not new_state)
+        if new_state:
+            self.checkb_cols.set_focus(self.global_dns_cb)
+        else:
+            self.checkb_cols.set_focus(self.static_dns_cb)
+
         
     def dns_toggle(self,checkb,new_state,user_data=None):
-        if checkb == self.static_dns_cb:
+        if checkb == self.static_dns_cb.get_w():
             for w in [ self.dns_dom_edit,self.search_dom_edit,
                     self.dns1,self.dns2,self.dns3 ]:
                 w.set_sensitive(new_state)
@@ -256,6 +263,8 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
         self.static_dns_cb.set_state(bool(wireless.GetWirelessProperty(networkID,
                                                                   'use_static_dns')))
         
+        if stringToNone(self.ip_edit.get_edit_text()):
+            self.static_ip_cb.set_state(True)
         self.dns1.set_edit_text(self.format_entry(networkID, "dns1"))
         self.dns2.set_edit_text(self.format_entry(networkID, "dns2"))
         self.dns3.set_edit_text(self.format_entry(networkID, "dns3"))
@@ -327,8 +336,6 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
             return False
         else:
             self.set_net_prop("enctype", "None")
-            for entry in encrypt_info.iterkeys():
-                self.set_net_prop(entry[0].entry, "")
         AdvancedSettingsDialog.save_settings(self)
 
         # Save the autoconnect setting.  This is not where it originally was
@@ -347,9 +354,9 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
     # More or less ripped from netentry.py
     def change_encrypt_method(self):
         #self.lbox_encrypt = urwid.ListBox()
+        self.encryption_info = {}
         wid,ID = self.encryption_combo.get_focus()
         methods = misc.LoadEncryptionMethods()
-        self.encryption_info = {}
 
         if self._w.body.body.__contains__(self.pile_encrypt):
             self._w.body.body.pop(self._w.body.body.__len__()-1)

curses/wicd-curses.py

@@ -33,7 +33,10 @@ at least get a network connection.  Or those who don't like using X.  ;-)
 
     Comments, criticisms, patches, bug reports all welcome!
 """
-
+# Filter out a confusing urwid warning in python 2.6.
+# This is valid as of urwid version 0.9.8.4
+import warnings 
+warnings.filterwarnings("ignore","The popen2 module is deprecated.  Use the subprocess module.") 
 # UI stuff
 # This library is the only reason why I wrote this program.
 import urwid

setup.py

@@ -332,6 +332,26 @@ class test(Command):
         print 'running tests'
         tests.run_tests()
 
+class update_translations_py(Command):
+    description = "download new translations.py from the online translator"
+
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        import urllib, shutil
+        # grab translations.py
+        filename, headers = urllib.urlretrieve('http://wicd.net/translator/generate/translations.py/')
+        # copy it into the right location
+        shutil.copyfile(filename,
+                        os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                                     'wicd/translations.py'))
+
 class get_translations(Command):
     description = "download the translations from the online translator"
          
@@ -482,7 +502,9 @@ iwscan_ext = Extension(name='iwscan', libraries=['iw'],
                        sources=['depends/python-iwscan/pyiwscan.c'])
     
 setup(cmdclass={'configure' : configure, 'get_translations' : get_translations,
-                'uninstall' : uninstall, 'test' : test, 'clear_generated' : clear_generated},
+                'uninstall' : uninstall, 'test' : test, 'clear_generated' :
+                clear_generated, 'update_translations_py' :
+                update_translations_py},
       name="Wicd",
       version=VERSION_NUM,
       description="A wireless and wired network manager",

wicd/netentry.py

@@ -431,8 +431,6 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
         else:
             print "no encryption specified..."
             self.set_net_prop("enctype", "None")
-            for entry in encrypt_info.iterkeys():
-                self.set_net_prop(entry[0], "")
         AdvancedSettingsDialog.save_settings(self)
         
         if self.chkbox_global_settings.get_active():

wicd/translations.py

@@ -55,177 +55,160 @@ def get_gettext():
     _ = lang.gettext
     return _
 
+# Generated automatically on Sat, 02 May 2009 02:29:29 CDT
 _ = get_gettext()
 language = {}
-language['connect'] = _('Connect')
+language['resetting_ip_address'] = _('''Resetting IP address...''')
-language['ip'] = _('IP')
+language['prefs_help'] = _('''Preferences dialog''')
-language['netmask'] = _('Netmask')
+language['no_dhcp_offers'] = _('''Connection Failed: No DHCP offers received.''')
-language['gateway'] = _('Gateway')
+language['more_help'] = _('''For more detailed help, consult the wicd-curses(8) man page.''')
-language['dns'] = _('DNS')
+language['bad_pass'] = _('''Connection Failed: Bad password''')
-language['use_static_ip'] = _('Use Static IPs')
+language['cannot_start_daemon'] = _('''Unable to connect to wicd daemon DBus interface. This typically means there was a problem starting the daemon. Check the wicd log for more information.''')
-language['use_static_dns'] = _('Use Static DNS')
+language['wired_always_on'] = _('''Always show wired interface''')
-language['use_encryption'] = _('Use Encryption')
+language['could_not_connect'] = _('''Could not connect to wicd's D-Bus interface. Check the wicd log for error messages.''')
-language['advanced_settings'] = _('Advanced Settings')
+language['path_to_pac_file'] = _('''Path to PAC File''')
-language['properties'] = _('Properties')
+language['always_switch_to_wired'] = _('''Always switch to wired connection when available''')
-language['wired_network'] = _('Wired Network')
+language['disconn_help'] = _('''Disconnect from all networks''')
-language['wired_network_instructions'] = _('To connect to a wired network,'
+language['wired_networks'] = _('''Wired Networks''')
-' you must create a network profile. To create a network profile, type a'
+language['backend_alert'] = _('''Changes to your backend won't occur until the daemon is restarted.''')
-' name that describes this network, and press Add.')
+language['about_help'] = _('''Stop a network connection in progress''')
-language['automatic_connect'] = _('Automatically connect to this network')
+language['connecting'] = _('''Connecting''')
-language['secured'] = _('Secured')
+language['disconnect_script'] = _('''Run disconnect script''')
-language['unsecured'] = _('Unsecured')
+language['cannot_edit_scripts_1'] = _('''To avoid various complications, wicd-curses does not support directly editing the scripts directly.  However, you can edit them manually.  First, (as root)", open the "$A" config file, and look for the section labeled by the $B in question.  In this case, this is:''')
-language['channel'] = _('Channel')
+language['cannot_edit_scripts_3'] = _('''You can also configure the wireless networks by looking for the "[<ESSID>]" field in the config file.''')
-language['preferences'] = _('Preferences')
+language['cannot_edit_scripts_2'] = _('''Once there, you can adjust (or add) the "beforescript", "afterscript", and "disconnectscript" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively.  Note that you will be specifying the full path to the scripts - not the actual script contents.  You will need to add/edit the script contents separately.  Refer to the wicd manual page for more information.''')
-language['wpa_supplicant_driver'] = _('WPA Supplicant Driver')
+language['scripts_need_pass'] = _('''You must enter your password to configure scripts''')
-language['wireless_interface'] = _('Wireless Interface')
+language['dns_domain'] = _('''DNS domain''')
-language['wired_interface'] = _('Wired Interface')
+language['aborted'] = _('''Connection Cancelled''')
-language['hidden_network'] = _('Hidden Network')
+language['scanning_stand_by'] = _('''Scanning networks... stand by...''')
-language['hidden_network_essid'] = _('Hidden Network ESSID')
+language['password'] = _('''Password''')
-language['connected_to_wireless'] = _('Connected to $A at $B (IP: $C)')
+language['no_daemon_tooltip'] = _('''Wicd daemon unreachable''')
-language['connected_to_wired'] = _('Connected to wired network (IP: $A)')
+language['use_static_dns'] = _('''Use Static DNS''')
-language['not_connected'] = _('Not connected')
+language['setting_broadcast_address'] = _('''Setting broadcast address...''')
-language['no_wireless_networks_found'] = _('No wireless networks found.')
+language['choose_wired_profile'] = _('''Select or create a wired profile to connect with''')
-language['killswitch_enabled'] = _('Wireless Kill Switch Enabled')
+language['make_wired_profile'] = _('''To connect to a wired network, you must create a network profile.  To create a network profile, type a name that describes this network, and press Add.''')
-language['key'] = _('Key')
+language['esc_to_cancel'] = _('''Press ESC to cancel''')
-language['username'] = _('Username')
+language['scanning'] = _('''Scanning''')
-language['password'] = _('Password')
+language['flushing_routing_table'] = _('''Flushing the routing table...''')
-language['anonymous_identity'] = _('Anonymous Identity')
+language['brought_to_you'] = _('''Brought to you by:''')
-language['identity'] = _('Identity')
+language['refresh_help'] = _('''Refresh network list''')
-language['authentication'] = _('Authentication')
+language['select_hidden_essid'] = _('''Select Hidden Network ESSID''')
-language['path_to_pac_file'] = _('Path to PAC File')
+language['ext_programs'] = _('''External Programs''')
-language['select_a_network'] = _('Choose from the networks below:')
+language['connect'] = _('''Connect''')
-#language['connecting...'] = _('Connecting...')
+language['help_help'] = _('''Display this help dialog''')
-language['wired_always_on'] = _('Always show wired interface')
+language['use_global_dns'] = _('''Use global DNS servers''')
-language['auto_reconnect'] = _('Automatically reconnect on connection loss')
+language['enable_encryption'] = _('''This network requires encryption to be enabled.''')
-language['create_adhoc_network'] = _('Create an Ad-Hoc Network')
+language['use_last_used_profile'] = _('''Use last used profile on wired autoconnect''')
-language['essid'] = _('ESSID')
+language['preferences'] = _('''Preferences''')
-language['use_wep_encryption'] = _('Use Encryption (WEP only)')
+language['dhcp_failed'] = _('''Connection Failed: Unable to Get IP Address''')
-language['before_script'] = _('Run script before connect')
+language['setting_static_ip'] = _('''Setting static IP addresses...''')
-language['after_script'] = _('Run script after connect')
+language['connecting_to_daemon'] = _('''Connecting to daemon...''')
-language['disconnect_script'] = _('Run disconnect script')
+language['automatic_connect'] = _('''Automatically connect to this network''')
-language['script_settings'] = _('Scripts')
+language['add_new_wired_profile'] = _('''Add a new wired profile''')
-language['use_ics'] = _('Activate Internet Connection Sharing')
+language['dhcp_client'] = _('''DHCP Client''')
-language['madwifi_for_adhoc'] = _('Check if using madwifi/atheros drivers')
+language['display_type_dialog'] = _('''Use dBm to measure signal strength''')
-language['default_wired'] = _('Use as default profile (overwrites any previous default)')
+language['global_settings'] = _('''Use these settings for all networks sharing this essid''')
-language['use_debug_mode'] = _('Enable debug mode')
+language['config_help'] = _('''Configure Selected Network''')
-language['use_global_dns'] = _('Use global DNS servers')
+language['use_debug_mode'] = _('''Enable debug mode''')
-language['use_default_profile'] = _('Use default profile on wired autoconnect')
+language['removing_old_connection'] = _('''Removing old connection...''')
-language['show_wired_list'] = _('Prompt for profile on wired autoconnect')
+language['no_sudo_prog'] = _('''Could not find a graphical sudo program.  The script editor could not be launched.  You'll have to edit scripts directly your configuration file.''')
-language['use_last_used_profile'] = _('Use last used profile on wired autoconnect')
+language['wireless_networks'] = _('''Wireless Networks''')
-language['choose_wired_profile'] = _('Select or create a wired profile to connect with')
+language['configuring_wired'] = _('''Configuring preferences for wired profile "$A"''')
-language['wired_network_found'] = _('Wired connection detected')
+language['no_wireless_networks_found'] = _('''No wireless networks found.''')
-language['stop_showing_chooser'] = _('Stop Showing Autoconnect pop-up temporarily')
+language['madwifi_for_adhoc'] = _('''Check if using madwifi/atheros drivers''')
-language['display_type_dialog'] = _('Use dBm to measure signal strength')
+language['properties'] = _('''Properties''')
-language['scripts'] = _('Scripts')
+language['setting_encryption_info'] = _('''Setting encryption info''')
-language['invalid_address'] = _('Invalid address in $A entry.')
+language['about'] = _('''About Wicd''')
-language['global_settings'] = _('Use these settings for all networks sharing this essid')
+language['ok'] = _('''OK''')
-language['encrypt_info_missing'] = _('Required encryption information is missing.')
+language['adhoc_help'] = _('''Set up Ad-hoc network''')
-language['enable_encryption'] = _('This network requires encryption to be enabled.')
+language['scripts_help'] = _('''Select scripts''')
-language['wicd_auto_config'] = _('Automatic (recommended)')
+language['invalid_address'] = _('''Invalid address in $A entry.''')
-language["gen_settings"] = _('General Settings')
+language['configuring_interface'] = _('''Configuring wireless interface...''')
-language["ext_programs"] = _('External Programs')
+language['generating_psk'] = _('''Generating PSK...''')
-language["dhcp_client"] = _('DHCP Client')
+language['validating_authentication'] = _('''Validating authentication...''')
-language["wired_detect"] = _('Wired Link Detection')
+language['essid'] = _('''ESSID''')
-language["route_flush"] = _('Route Table Flushing')
+language['anonymous_identity'] = _('''Anonymous Identity''')
-language["backend"] = _('Backend')
+language['wireless_interface'] = _('''Wireless Interface''')
-language["backend_alert"] = _('Changes to your backend won\'t occur until the daemon is restarted.')
+language['hidden_network'] = _('''Hidden Network''')
-language['dns_domain'] = _('DNS domain')
+language['key'] = _('''Key''')
-language['search_domain'] = _('Search domain')
+language['wicd_curses'] = _('''Wicd Curses Interface''')
-language['global_dns_not_enabled'] = _('Global DNS has not been enabled in general preferences.')
+language['debugging'] = _('''Debugging''')
-language['scripts_need_pass'] = _('You must enter your password to configure scripts')
+language['use_encryption'] = _('''Use Encryption''')
-language['no_sudo_prog'] = _('Could not find a graphical sudo program.  The script editor could not be launched.' +
+language['wpa_supplicant'] = _('''WPA Supplicant''')
-                             '  You\'ll have to edit scripts directly your configuration file.')
+language['global_dns_servers'] = _('''Global DNS servers''')
-
+language['not_connected'] = _('''Not connected''')
-language['interface_down'] = _('Putting interface down...')
+language['done'] = _('''Done connecting...''')
-language['resetting_ip_address'] = _('Resetting IP address...')
+language['cannot_connect_to_daemon'] = _('''Can't connect to the daemon, trying to start it automatically...''')
-language['interface_up'] = _('Putting interface up...')
+language['cancel'] = _('''Cancel''')
-language['setting_encryption_info'] = _('Setting encryption info')
+language['case_sensitive'] = _('''All controls are case sensitive''')
-language['removing_old_connection'] = _('Removing old connection...')
+language['gateway'] = _('''Gateway''')
-language['generating_psk'] = _('Generating PSK...')
+language['backend'] = _('''Backend''')
-language['generating_wpa_config'] = _('Generating WPA configuration file...')
+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.''')
-language['flushing_routing_table'] = _('Flushing the routing table...')
+language['terminated'] = _('''Terminated by user''')
-language['configuring_interface'] = _('Configuring wireless interface...')
+language['wired_detect'] = _('''Wired Link Detection''')
-language['validating_authentication'] = _('Validating authentication...')
+language['add_new_profile'] = _('''Add a new profile''')
-language['setting_broadcast_address'] = _('Setting broadcast address...')
+language['use_ics'] = _('''Activate Internet Connection Sharing''')
-language['setting_static_dns'] = _('Setting static DNS servers...')
+language['create_adhoc_network'] = _('''Create an Ad-Hoc Network''')
-language['setting_static_ip'] = _('Setting static IP addresses...')
+language['interface_up'] = _('''Putting interface up...''')
-language['running_dhcp'] = _('Obtaining IP address...')
+language['global_dns_not_enabled'] = _('''Global DNS has not been enabled in general preferences.''')
-language['dhcp_failed'] = _('Connection Failed: Unable to Get IP Address')
+language['dns'] = _('''DNS''')
-language['no_dhcp_offers'] = _('Connection Failed: No DHCP offers received.')
+language['advanced_settings'] = _('''Advanced Settings''')
-language['aborted'] = _('Connection Cancelled')
+language['username'] = _('''Username''')
-language['bad_pass'] = _('Connection Failed: Could not authenticate (bad password?)')
+language['wicd_auto_config'] = _('''Automatic (recommended)''')
-language['verifying_association'] = _("Verifying access point association...")
+language['wired_network_found'] = _('''Wired connection detected''')
-language['association_failed'] = _("Connection Failed: Could not contact the wireless access point.")
+language['netmask'] = _('''Netmask''')
-language['done'] = _('Done connecting...')
+language['select_a_network'] = _('''Choose from the networks below:''')
-language['scanning'] = _('Scanning')
+language['connect_help'] = _('''Connect to selected network''')
-language['scanning_stand_by'] = _('Scanning networks... stand by...')
+language['no_delete_last_profile'] = _('''wicd-curses does not support deleting the last wired profile.  Try renaming it ('F2')''')
-language['cannot_start_daemon'] = _('Unable to connect to wicd daemon DBus interface.  " + \
+language['gen_settings'] = _('''General Settings''')
-                                "This typically means there was a problem starting the daemon.  " + \
+language['connected_to_wireless'] = _('''Connected to $A at $B (IP: $C)''')
-                                "Check the wicd log for more info')
+language['exception'] = _('''EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:''')
-language['lost_dbus'] = _('The wicd daemon has shut down, the UI will not function properly until it is restarted.')
+language['configuring_wireless'] = _('''Configuring preferences for wireless network "$A" ($B)''')
-language['access_denied'] = _("Unable to contact the wicd dameon due to an access denied error from DBus.  Please check your DBus configuration.")
+language['generating_wpa_config'] = _('''Generating WPA configuration file...''')
-language['configuring_wireless'] = _('Configuring preferences for wireless network "$A" ($B)')
+language['search_domain'] = _('''Search domain''')
-language['configuring_wired'] = _('Configuring preferences for wired profile "$A"')
+language['encrypt_info_missing'] = _('''Required encryption information is missing.''')
-language['scan'] = _('Scan')
+language['running_dhcp'] = _('''Obtaining IP address...''')
-language['always_switch_to_wired'] = _('Always switch to wired connection when available')
+language['lost_dbus'] = _('''The wicd daemon has shut down. The UI will not function properly until it is restarted.''')
-language['wired_autoconnect_settings'] = _('Wired Autoconnect Settings')
+language['wired_network_instructions'] = _('''To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add.''')
-language['always_use_wext'] = _('You should almost always use wext as the WPA supplicant driver')
+language['setting_static_dns'] = _('''Setting static DNS servers...''')
-language['debugging'] = _('Debugging')
+language['auto_reconnect'] = _('''Automatically reconnect on connection loss''')
-language['wpa_supplicant'] = _('WPA Supplicant')
+language['use_wep_encryption'] = _('''Use Encryption (WEP only)''')
-language['automatic_reconnection'] = _('Automatic Reconnection')
+language['wired_autoconnect_settings'] = _('''Wired Autoconnect Settings''')
-language['global_dns_servers'] = _('Global DNS servers')
+language['before_script'] = _('''Run script before connect''')
-language['network_interfaces'] = _('Network Interfaces')
+language['always_use_wext'] = _('''You should almost always use wext as the WPA supplicant driver''')
-language['connecting_to_daemon'] = _('Connecting to daemon...')
+language['network_interfaces'] = _('''Network Interfaces''')
-language['cannot_connect_to_daemon'] = _('Can\'t connect to the daemon, trying to start it automatically...')
+language['use_default_profile'] = _('''Use default profile on wired autoconnect''')
-language['could_not_connect'] = _('Could not connect to wicd\'s D-Bus interface. Check the wicd log for error messages.')
+language['scan'] = _('''Scan''')
-language["exception"] = _('EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:')
+language['ip'] = _('''IP''')
-language["brought_to_you"] = _('Brought to you by:')
+language['connected_to_wired'] = _('''Connected to wired network (IP: $A)''')
-language["add_new_profile"] = _('Add a new profile')
+language['wpa_supplicant_driver'] = _('''WPA Supplicant Driver''')
-language["add_new_wired_profile"] = _('Add a new wired profile')
+language['access_cards'] = _('''Wicd needs to access your computer's network cards.''')
-language["no_delete_last_profile"] = _('wicd-curses does not support deleting the last wired profile.  Try renaming it (\'F2\')')
+language['killswitch_enabled'] = _('''Wireless Kill Switch Enabled''')
-language["rename_wired_profile"] = _('Rename wired profile')
+language['hidden_network_essid'] = _('''Hidden Network ESSID''')
-language["select_hidden_essid"] = _('Select Hidden Network ESSID')
+language['secured'] = _('''Secured''')
-language["esc_to_cancel"] = _('Press ESC to cancel')
+language['interface_down'] = _('''Putting interface down...''')
-language["press_to_quit"] = _('Press F8 or Q to quit.')
+language['authentication'] = _('''Authentication''')
-
+language['after_script'] = _('''Run script after connect''')
-language['terminated'] = _('Terminated by user')
+language['show_wired_list'] = _('''Prompt for profile on wired autoconnect''')
-language['wicd_curses'] = _('Wicd Curses Interface')
+language['channel'] = _('''Channel''')
-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.')
+language['unsecured'] = _('''Unsecured''')
-
+language['rename_wired_profile'] = _('''Rename wired profile''')
-# These are in the tray list, but not in the non-tray list
+language['daemon_unavailable'] = _('''The wicd daemon is unavailable, so your request cannot be completed''')
-language['connecting'] = _('Connecting')
+language['stop_showing_chooser'] = _('''Stop Showing Autoconnect pop-up temporarily''')
-language['daemon_unavailable'] = _('The wicd daemon is unavailable, so your request cannot be completed')
+language['scan_help'] = _('''Scan for hidden networks''')
-language['no_daemon_tooltip'] = _('Wicd daemon unreachable')
+language['use_static_ip'] = _('''Use Static IPs''')
-
+language['raw_screen_arg'] = _('''use urwid's raw screen controller''')
-# Translations added on Wed Mar  4 03:36:24 UTC 2009
+language['route_flush'] = _('''Route Table Flushing''')
-language['make_wired_profile'] = _('To connect to a wired network, you must create a network profile.  To create a network profile, type a name that describes this network, and press Add.')
+language['scripts'] = _('''Scripts''')
-language['access_cards'] = _('Wicd needs to access your computer\'s network cards.')
+language['identity'] = _('''Identity''')
-#language['CHANGE_ME'] = _('Create Ad-Hoc network')
+language['automatic_reconnection'] = _('''Automatic Reconnection''')
-#language['CHANGE_ME'] = _('Wired Autoconnect Setting:')
+language['wired_interface'] = _('''Wired Interface''')
-language['bad_pass'] = _('Connection Failed: Bad password')
+language['press_to_quit'] = _('''Press F8 or Q to quit.''')
-language['cannot_edit_scripts_1'] = _('To avoid various complications, wicd-curses does not support directly editing the scripts directly.  However, you can edit them manually.  First, (as root)", open the "$A" config file, and look for the section labeled by the $B in question.  In this case, this is:')
+language['default_wired'] = _('''Use as default profile (overwrites any previous default)''')
-language['cannot_edit_scripts_2'] = _('Once there, you can adjust (or add) the "beforescript", "afterscript", and "disconnectscript" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively.  Note that you will be specifying the full path to the scripts - not the actual script contents.  You will need to add/edit the script contents separately.  Refer to the wicd manual page for more information.')
+language['wired_network'] = _('''Wired Network''')
-language['cannot_edit_scripts_3'] = _('You can also configure the wireless networks by looking for the "[<ESSID>]" field in the config file.')
+language['dns_server'] = _('''DNS server''')
-language['wired_networks'] = _('Wired Networks')
+language['notifications'] = _('''Notifications''')
-language['wireless_networks'] = _('Wireless Networks')
+language['display_notifications'] = _('''Display notifications about connection status''')
-language['about'] = _('About Wicd')
+language['connection_established'] = _('''Connection established''')
-language['more_help'] = _('For more detailed help, consult the wicd-curses(8) man page.')
+language['disconnected'] = _('''Disconnected''')
-language['case_sensitive'] = _('All controls are case sensitive')
+language['establishing_connection'] = _('''Establishing connection...''')
-language['help_help'] = _('Display this help dialog')
-language['connect_help'] = _('Connect to selected network')
-language['disconn_help'] = _('Disconnect from all networks')
-language['about_help'] = _('Stop a network connection in progress')
-language['refresh_help'] = _('Refresh network list')
-language['prefs_help'] = _('Preferences dialog')
-language['scan_help'] = _('Scan for hidden networks')
-language['scripts_help'] = _('Select scripts')
-language['adhoc_help'] = _('Set up Ad-hoc network')
-language['config_help'] = _('Configure Selected Network')
-#language[''] = _('Press H or ? for help') # Defunct in curses-uimod
-language['raw_screen_arg'] = _('use urwid\'s raw screen controller')
-language['ok'] = _('OK')
-language['cancel'] = _('Cancel')
-
-language['disconnected'] = _('Disconnected')
-language['connection_established'] = _('Connection established')
-language['establishing_connection'] = _('Establishing connection...')