1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-30 02:12:29 +01:00

Merged in translations.py changes (r315) from mainline 1.6.

This commit is contained in:
Andrew Psaltis
2009-03-04 00:41:28 -05:00
12 changed files with 356 additions and 304 deletions

View File

@@ -28,7 +28,9 @@ from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool
language = misc.get_language_list_gui()
from wicd.translations import language
for i in language.keys():
language[i] = language[i].decode('utf8')
daemon = None
wired = None
@@ -56,9 +58,9 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
use_global_dns_t = language['use_global_dns']
dns_dom_t = ('editcp',language['dns_domain']+': ')
search_dom_t = ('editcp',language['search_domain']+':')
dns1_t = ('editcp',language['dns']+ ' ' + language['1']+':'+' '*8)
dns2_t = ('editcp',language['dns']+ ' ' + language['2']+':'+' '*8)
dns3_t = ('editcp',language['dns']+ ' ' + language['3']+':'+' '*8)
dns1_t = ('editcp',language['dns']+ ' 1'+':'+' '*8)
dns2_t = ('editcp',language['dns']+ ' 2'+':'+' '*8)
dns3_t = ('editcp',language['dns']+ ' 3'+':'+' '*8)
cancel_t = 'Cancel'
ok_t = 'OK'

View File

@@ -28,7 +28,9 @@ daemon = None
wireless = None
wired = None
language = misc.get_language_list_gui()
from wicd.translations import language
for i in language.keys():
language[i] = language[i].decode('utf8')
class PrefsDialog(urwid.WidgetWrap):
def __init__(self,body,pos,ui,dbus=None):

View File

@@ -67,9 +67,10 @@ from optparse import OptionParser
CURSES_REVNO=wpath.curses_revision
language = misc.get_language_list_gui()
# We need 'Connecting' without the '...'
language['connecting']=misc.get_language_list_tray()['connecting']
# Fix strings in wicd-curses
from wicd.translations import language
for i in language.keys():
language[i] = language[i].decode('utf8')
########################################
##### SUPPORT CLASSES