gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-28 11:15:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge 411 of mainline 1.6.

Browse Source
This commit is contained in:
Andrew Psaltis
2009-06-07 14:53:04 -04:00
parent 8f6d807d87 99d025c4c5
commit cf0f485c28
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
CHANGES
View File

@@ -1,4 +1,39 @@
------------------------------------------------------------ ------------------------------------------------------------
revno: 409
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Fri 2009-06-05 15:08:47 +0800
message:
merged experimental-nacl
------------------------------------------------------------
revno: 202.2.53
committer: Andrew Psaltis <ampsaltis@gmail.com>
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 <ampsaltis@gmail.com>
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 <compwiz18@gmail.com>
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 <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Thu 2009-06-04 21:39:36 +0800
message:
updated CHANGES, setup.py version, and NEWS
------------------------------------------------------------
revno: 406 revno: 406
committer: Andrew Psaltis <ampsaltis@gmail.com> committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: 1.6 branch nick: 1.6

4
wicd/translations.py
View File

@@ -55,7 +55,7 @@ def get_gettext():
_ = lang.gettext _ = lang.gettext
return _ 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() _ = get_gettext()
language = {} language = {}
language['resetting_ip_address'] = _('''Resetting IP address...''') language['resetting_ip_address'] = _('''Resetting IP address...''')
@@ -214,5 +214,5 @@ language['connection_established'] = _('''Connection established''')
language['disconnected'] = _('''Disconnected''') language['disconnected'] = _('''Disconnected''')
language['establishing_connection'] = _('''Establishing connection...''') language['establishing_connection'] = _('''Establishing connection...''')
language['association_failed'] = _('''Connection failed: Could not contact the wireless access point.''') 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...''') language['disconnecting_active'] = _('''Disconnecting active connections...''')