From bf21539a08585b0430af713c5d383e59b9f5bf03 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Tue, 15 Jul 2003 17:17:58 +0000 Subject: [PATCH] * src/plugins/ReadPkg.py: Enable "..." in the menu item. * src/plugins/ReadNative.py: Likewise. * src/plugins/ReadGedcom.py: Likewise. * src/Report.py: Put "Style" label in singular form (was plural). svn: r1883 --- gramps2/ChangeLog | 4 ++++ gramps2/src/Report.py | 2 +- gramps2/src/plugins/ReadGedcom.py | 8 ++++---- gramps2/src/plugins/ReadNative.py | 12 +++++++----- gramps2/src/plugins/ReadPkg.py | 9 +++++---- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index dc15195ac..707007f67 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,5 +1,9 @@ 2003-07-15 Alex Roitman * src/plugins/CustomBookText.py: Add to CVS. + * src/plugins/ReadPkg.py: Enable "..." in the menu item. + * src/plugins/ReadNative.py: Likewise. + * src/plugins/ReadGedcom.py: Likewise. + * src/Report.py: Put "Style" label in singular form (was plural). 2003-07-14 Donald Peterson * src/docgen/LaTeXDoc.py: Regress UNICODE support to be only a diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py index 49bd85047..db8b0cb8f 100644 --- a/gramps2/src/Report.py +++ b/gramps2/src/Report.py @@ -420,7 +420,7 @@ class BareReportDialog: choose from.""" # Styles Frame - label = gtk.Label("%s:" % _("Styles")) + label = gtk.Label("%s:" % _("Style")) label.set_alignment(0.0,0.5) self.style_menu = gtk.OptionMenu() diff --git a/gramps2/src/plugins/ReadGedcom.py b/gramps2/src/plugins/ReadGedcom.py index dcb41f52a..bfa849458 100644 --- a/gramps2/src/plugins/ReadGedcom.py +++ b/gramps2/src/plugins/ReadGedcom.py @@ -69,6 +69,8 @@ UPDATE = 25 db = None callback = None +_title_string = _("Import from GEDCOM") + def nocnv(s): return unicode(s) @@ -1732,7 +1734,7 @@ def readData(database,active_person,cb): db = database callback = cb - file_top = gtk.FileSelection("%s - GRAMPS" % _("Import from GEDCOM")) + file_top = gtk.FileSelection("%s - GRAMPS" % _title_string) file_top.hide_fileop_buttons() file_top.ok_button.connect('clicked', on_ok_clicked) file_top.cancel_button.connect('clicked', Utils.destroy_passed_object) @@ -1775,6 +1777,4 @@ if __name__ == "__main__": else: from Plugins import register_import - register_import(readData,_("Import from GEDCOM")) - - + register_import(readData,"%s..." % _title_string) diff --git a/gramps2/src/plugins/ReadNative.py b/gramps2/src/plugins/ReadNative.py index 88337c2fc..4466c6cd6 100644 --- a/gramps2/src/plugins/ReadNative.py +++ b/gramps2/src/plugins/ReadNative.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000 Donald N. Allingham +# Copyright (C) 2000-2003 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,6 +31,8 @@ import gtk import const import os +_title_string = _("Import from GRAMPS database") + #------------------------------------------------------------------------- # # @@ -49,7 +51,7 @@ class ReadNative: self.db = database self.callback = cb - self.top = gtk.FileSelection("%s - GRAMPS" % _("Import from GRAMPS database")) + self.top = gtk.FileSelection("%s - GRAMPS" % _title_string) self.top.hide_fileop_buttons() self.top.ok_button.connect('clicked', self.on_ok_clicked) self.top.cancel_button.connect('clicked', self.close_window) @@ -60,10 +62,10 @@ class ReadNative: def show_display(self): self.window = gtk.Window() - self.window.set_title(_("Import from GRAMPS database")) + self.window.set_title(_title_string) vbox = gtk.VBox() self.window.add(vbox) - label = gtk.Label(_("Import from GRAMPS database")) + label = gtk.Label(_title_string) vbox.add(label) adj = gtk.Adjustment(lower=0,upper=100) self.progress_bar = gtk.ProgressBar(adj) @@ -102,4 +104,4 @@ class ReadNative: #------------------------------------------------------------------------ from Plugins import register_import -register_import(readData,_("Import from GRAMPS database")) +register_import(readData,"%s..." % _title_string) diff --git a/gramps2/src/plugins/ReadPkg.py b/gramps2/src/plugins/ReadPkg.py index 71c166c62..ad017a67b 100644 --- a/gramps2/src/plugins/ReadPkg.py +++ b/gramps2/src/plugins/ReadPkg.py @@ -34,6 +34,7 @@ import time from QuestionDialog import ErrorDialog, WarningDialog import TarFile +_title_string = _("Import from GRAMPS package") #------------------------------------------------------------------------- # # @@ -52,7 +53,7 @@ class ReadPkg: self.db = database self.callback = cb - self.top = gtk.FileSelection("%s - GRAMPS" % _("Import from GRAMPS package")) + self.top = gtk.FileSelection("%s - GRAMPS" % _title_string) self.top.hide_fileop_buttons() self.top.ok_button.connect('clicked', self.on_ok_clicked) self.top.cancel_button.connect('clicked', self.close_window) @@ -63,10 +64,10 @@ class ReadPkg: def show_display(self): self.window = gtk.Window() - self.window.set_title(_("Import from GRAMPS package")) + self.window.set_title(_title_string) vbox = gtk.VBox() self.window.add(vbox) - label = gtk.Label(_("Import from GRAMPS package")) + label = gtk.Label(_title_string) vbox.add(label) adj = gtk.Adjustment(lower=0,upper=100) self.progress_bar = gtk.ProgressBar(adj) @@ -137,4 +138,4 @@ class ReadPkg: #------------------------------------------------------------------------ from Plugins import register_import -register_import(readData,_("Import from GRAMPS package")) +register_import(readData,"%s..." % _title_string)