evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

l10n: some minor string changes

Browse Source
This commit is contained in:
steffen123 2010-08-29 19:12:48 +02:00
parent 2ff55401ca
commit 168b114646
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pyfpdb/GuiAutoImport.py
View File

@ -113,7 +113,7 @@ class GuiAutoImport (threading.Thread):
hbox.pack_start(lbl1, expand=True, fill=False) hbox.pack_start(lbl1, expand=True, fill=False)
self.doAutoImportBool = False self.doAutoImportBool = False
self.startButton = gtk.ToggleButton(_(" Start _Autoimport ")) self.startButton = gtk.ToggleButton(_(" Start _Auto Import "))
self.startButton.connect("clicked", self.startClicked, "start clicked") self.startButton.connect("clicked", self.startClicked, "start clicked")
hbox.pack_start(self.startButton, expand=False, fill=False) hbox.pack_start(self.startButton, expand=False, fill=False)
@ -132,7 +132,7 @@ class GuiAutoImport (threading.Thread):
scrolledwindow.add(self.textview) scrolledwindow.add(self.textview)
self.mainVBox.show_all() self.mainVBox.show_all()
self.addText(_("AutoImport Ready.")) self.addText(_("Auto Import Ready."))
def addText(self, text): def addText(self, text):
end_iter = self.textbuffer.get_end_iter() end_iter = self.textbuffer.get_end_iter()
@ -145,7 +145,7 @@ class GuiAutoImport (threading.Thread):
"""runs when user clicks one of the browse buttons in the auto import tab""" """runs when user clicks one of the browse buttons in the auto import tab"""
current_path=data[1].get_text() current_path=data[1].get_text()
dia_chooser = gtk.FileChooserDialog(title=_("Please choose the path that you want to auto import"), dia_chooser = gtk.FileChooserDialog(title=_("Please choose the path that you want to Auto Import"),
action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK)) buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
#dia_chooser.set_current_folder(pathname) #dia_chooser.set_current_folder(pathname)
@ -179,9 +179,9 @@ class GuiAutoImport (threading.Thread):
def reset_startbutton(self): def reset_startbutton(self):
if self.pipe_to_hud is not None: if self.pipe_to_hud is not None:
self.startButton.set_label(_(u' Stop _Autoimport ')) self.startButton.set_label(_(u' Stop _Auto Import '))
else: else:
self.startButton.set_label(_(u' Start _Autoimport ')) self.startButton.set_label(_(u' Start _Auto Import '))
return False return False
@ -206,7 +206,7 @@ class GuiAutoImport (threading.Thread):
if self.settings['global_lock'].acquire(False): # returns false immediately if lock not acquired if self.settings['global_lock'].acquire(False): # returns false immediately if lock not acquired
self.addText(_("\nGlobal lock taken ... Auto Import Started.\n")) self.addText(_("\nGlobal lock taken ... Auto Import Started.\n"))
self.doAutoImportBool = True self.doAutoImportBool = True
widget.set_label(_(u' _Stop Autoimport ')) widget.set_label(_(u' _Stop Auto Import '))
if self.pipe_to_hud is None: if self.pipe_to_hud is None:
if Configuration.FROZEN: if Configuration.FROZEN:
path = Configuration.EXEC_PATH path = Configuration.EXEC_PATH
@ -246,19 +246,19 @@ class GuiAutoImport (threading.Thread):
self.importtimer = gobject.timeout_add(interval * 1000, self.do_import) self.importtimer = gobject.timeout_add(interval * 1000, self.do_import)
else: else:
self.addText(_("\nauto-import aborted - global lock not available")) self.addText(_("\nAuto Import aborted - global lock not available"))
else: # toggled off else: # toggled off
gobject.source_remove(self.importtimer) gobject.source_remove(self.importtimer)
self.settings['global_lock'].release() self.settings['global_lock'].release()
self.doAutoImportBool = False # do_import will return this and stop the gobject callback timer self.doAutoImportBool = False # do_import will return this and stop the gobject callback timer
self.addText(_("\nStopping autoimport - global lock released.")) self.addText(_("\nStopping Auto Import - global lock released."))
if self.pipe_to_hud.poll() is not None: if self.pipe_to_hud.poll() is not None:
self.addText(_("\n * Stop Autoimport: HUD already terminated")) self.addText(_("\n * Stop Auto Import: HUD already terminated"))
else: else:
#print >>self.pipe_to_hud.stdin, "\n" #print >>self.pipe_to_hud.stdin, "\n"
self.pipe_to_hud.communicate('\n') # waits for process to terminate self.pipe_to_hud.communicate('\n') # waits for process to terminate
self.pipe_to_hud = None self.pipe_to_hud = None
self.startButton.set_label(_(u' Start _Autoimport ')) self.startButton.set_label(_(u' Start _Auto Import '))
#end def GuiAutoImport.startClicked #end def GuiAutoImport.startClicked

19
pyfpdb/fpdb.pyw
View File

@ -876,8 +876,7 @@ class fpdb:
if self.config.example_copy: if self.config.example_copy:
self.info_box(_("Config file") self.info_box(_("Config file")
, _("has been created at:\n%s.\n") % self.config.file , _("has been created at:\n%s.\n") % self.config.file
+ _("Edit your screen_name and hand history path in the supported_sites ") + _("Edit your screen_name and hand history path in the supported_sites section of the Preferences window (Main menu) before trying to import hands."))
+ _("section of the Preferences window (Main menu) before trying to import hands."))
self.settings = {} self.settings = {}
self.settings['global_lock'] = self.lock self.settings['global_lock'] = self.lock
if (os.sep=="/"): if (os.sep=="/"):
@ -906,10 +905,10 @@ class fpdb:
err_msg = _("MySQL client reports: 2002 or 2003 error. Unable to connect - ") \ err_msg = _("MySQL client reports: 2002 or 2003 error. Unable to connect - ") \
+ _("Please check that the MySQL service has been started") + _("Please check that the MySQL service has been started")
except Exceptions.FpdbPostgresqlAccessDenied: except Exceptions.FpdbPostgresqlAccessDenied:
err_msg = _("Postgres Server reports: Access denied. Are your permissions set correctly?") err_msg = _("PostgreSQL Server reports: Access denied. Are your permissions set correctly?")
except Exceptions.FpdbPostgresqlNoDatabase: except Exceptions.FpdbPostgresqlNoDatabase:
err_msg = _("Postgres client reports: Unable to connect - ") \ err_msg = _("PostgreSQL client reports: Unable to connect - ") \
+ _("Please check that the Postgres service has been started") + _("Please check that the PostgreSQL service has been started")
if err_msg is not None: if err_msg is not None:
self.db = None self.db = None
self.warning_box(err_msg) self.warning_box(err_msg)
@ -966,10 +965,10 @@ class fpdb:
def obtain_global_lock(self, source): def obtain_global_lock(self, source):
ret = self.lock.acquire(source=source) # will return false if lock is already held ret = self.lock.acquire(source=source) # will return false if lock is already held
if ret: if ret:
print _("\nGlobal lock taken by"), source print (_("\nGlobal lock taken by %s") % source)
self.lockTakenBy=source self.lockTakenBy=source
else: else:
print _("\nFailed to get global lock, it is currently held by"), source print (_("\nFailed to get global lock, it is currently held by %s") % source)
return ret return ret
# need to release it later: # need to release it later:
# self.lock.release() # self.lock.release()
@ -1134,8 +1133,8 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an
if not options.errorsToConsole: if not options.errorsToConsole:
fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt') fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt')
print _("\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in:\n") \ print (_("\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in: %s") % self.config.dir_log) \
+ self.config.dir_log + _("\nAny major error will be reported there _only_.\n") + _("\nAny major error will be reported there _only_.\n")
errorFile = open(fileName, 'w', 0) errorFile = open(fileName, 'w', 0)
sys.stderr = errorFile sys.stderr = errorFile
@ -1239,7 +1238,7 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an
hhdir = hhbase hhdir = hhbase
if not os.path.isdir(hhdir): if not os.path.isdir(hhdir):
diapath = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Setup hh dir") diapath = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Setup hh dir")
diastring = _("WARNING: Unable to find output hh directory %s\n\n Press YES to create this directory, or NO to select a new one.") % hhdir diastring = _("WARNING: Unable to find output hand history directory %s\n\n Press YES to create this directory, or NO to select a new one.") % hhdir
diapath.format_secondary_text(diastring) diapath.format_secondary_text(diastring)
response = diapath.run() response = diapath.run()
diapath.destroy() diapath.destroy()