diff --git a/CHANGES b/CHANGES index 8517745..8946d49 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,39 @@ ------------------------------------------------------------ +revno: 409 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Fri 2009-06-05 15:08:47 +0800 +message: + merged experimental-nacl + ------------------------------------------------------------ + revno: 202.2.53 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Thu 2009-06-04 22:19:33 -0400 + message: + If a network dialog is up when a scan is initiated externally, drop the dialog. + ------------------------------------------------------------ + revno: 202.2.52 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Thu 2009-06-04 22:10:05 -0400 + message: + Merge r408 of mainline 1.6. +------------------------------------------------------------ +revno: 408 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Thu 2009-06-04 22:24:14 +0800 +message: + add .sourceforge.net to the URLs in the translator +------------------------------------------------------------ +revno: 407 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Thu 2009-06-04 21:39:36 +0800 +message: + updated CHANGES, setup.py version, and NEWS +------------------------------------------------------------ revno: 406 committer: Andrew Psaltis branch nick: 1.6 diff --git a/wicd/translations.py b/wicd/translations.py index 948b26d..77d232d 100644 --- a/wicd/translations.py +++ b/wicd/translations.py @@ -55,7 +55,7 @@ def get_gettext(): _ = lang.gettext return _ -# Generated automatically on Sun, 17 May 2009 19:17:27 CDT +# Generated automatically on Fri, 05 Jun 2009 03:13:27 CDT _ = get_gettext() language = {} language['resetting_ip_address'] = _('''Resetting IP address...''') @@ -214,5 +214,5 @@ language['connection_established'] = _('''Connection established''') language['disconnected'] = _('''Disconnected''') language['establishing_connection'] = _('''Establishing connection...''') language['association_failed'] = _('''Connection failed: Could not contact the wireless access point.''') -language['access_denied'] = _('''Unable to contact the wicd dameon due to an access denied error from DBus. Please check your DBus configuration.''') +language['access_denied'] = _('''Unable to contact the Wicd daemon due to an access denied error from DBus. Please check your DBus configuration.''') language['disconnecting_active'] = _('''Disconnecting active connections...''')