From c9103538055975e29e60127dbfc1507d8f2abdca Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 23 May 2001 22:20:10 +0000 Subject: [PATCH] String changes for translation purposes svn: r56 --- src/EditPerson.glade | 60 ++++---------------------------- src/filters/NoBirthdate.py | 6 ++-- src/gramps.glade | 2 +- src/gramps_main.py | 2 +- src/plugins/AncestorChart.py | 6 ++-- src/plugins/AncestorReport.py | 22 ++++++------ src/plugins/Desbrowser.py | 2 +- src/plugins/HtmlReport.py | 4 +-- src/plugins/ancestorchart.glade | 2 +- src/plugins/ancestorreport.glade | 6 ++-- src/plugins/merge.glade | 4 +-- 11 files changed, 35 insertions(+), 81 deletions(-) diff --git a/src/EditPerson.glade b/src/EditPerson.glade index 2d1d7bdc9..c55fe50bb 100644 --- a/src/EditPerson.glade +++ b/src/EditPerson.glade @@ -1829,7 +1829,7 @@ GtkLabel label140 - + GTK_JUSTIFY_CENTER False 1 @@ -1989,38 +1989,6 @@ - - GtkLabel - label147 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 5 - False - True - - - - - GtkEntry - address_stop - True - True - True - 0 - - - 0 - True - True - - - GtkButton button91 @@ -2196,15 +2164,14 @@ GtkCList address_list - 120 True select_row on_address_list_select_row - Tue, 01 May 2001 14:07:12 GMT + Wed, 23 May 2001 18:42:16 GMT - 3 - 138,119,80 + 2 + 165,80 GTK_SELECTION_SINGLE True GTK_SHADOW_IN @@ -2212,8 +2179,8 @@ GtkLabel CList:title - label144 - + label150 + GTK_JUSTIFY_CENTER False 0.5 @@ -2225,20 +2192,7 @@ GtkLabel CList:title - label145 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label146 + label151 GTK_JUSTIFY_CENTER False diff --git a/src/filters/NoBirthdate.py b/src/filters/NoBirthdate.py index 154e444c9..b1d9b532a 100644 --- a/src/filters/NoBirthdate.py +++ b/src/filters/NoBirthdate.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -"People no listed birth date" +"People without a birth date" import Filter import string @@ -27,7 +27,7 @@ import intl _ = intl.gettext class NoBirthdate(Filter.Filter): - "People no listed birth date" + "People without a birth date" def match(self,person): return person.getBirth().getDate() == "" @@ -39,6 +39,6 @@ def need_qualifier(): return 0 def get_name(): - return _("People no listed birth date") + return _("People without a birth date") diff --git a/src/gramps.glade b/src/gramps.glade index 57c7442eb..2d642a66f 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -3686,7 +3686,7 @@ Other GtkWindow sourceDisplay - Reletivity - Source Information + Gramps - Source Information GTK_WINDOW_DIALOG GTK_WIN_POS_CENTER True diff --git a/src/gramps_main.py b/src/gramps_main.py index 0f24b7ea6..394d8038c 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -910,7 +910,7 @@ def on_delete_person_clicked(obj): if not active_person: return - topWindow.question(_("Do you really wish to delete ") + \ + topWindow.question(_("Do you really wish to delete %s") % \ Config.nameof(active_person), delete_person_response) #------------------------------------------------------------------------- diff --git a/src/plugins/AncestorChart.py b/src/plugins/AncestorChart.py index 9daef11de..599bb094b 100644 --- a/src/plugins/AncestorChart.py +++ b/src/plugins/AncestorChart.py @@ -57,7 +57,7 @@ db = None # # #------------------------------------------------------------------------ -class AncestorChart: +class AncestorReport: def __init__(self,database,person,output,doc, max): self.doc = doc @@ -211,7 +211,7 @@ def report(database,person): if no_pdf == 1: topDialog.get_widget("pdf").set_sensitive(0) - title = _("Ancestor chart for %s") % name + title = _("Ancestor Chart for %s") % name topDialog.get_widget("labelTitle").set_text(title) topDialog.signal_autoconnect({ "destroy_passed_object" : utils.destroy_passed_object, @@ -243,7 +243,7 @@ def on_save_clicked(obj): else: document = PdfDrawDoc(paper,orien) - MyReport = AncestorChart(db,active_person,outputName,document,max_gen) + MyReport = AncestorReport(db,active_person,outputName,document,max_gen) MyReport.setup() MyReport.write_report() diff --git a/src/plugins/AncestorReport.py b/src/plugins/AncestorReport.py index 0b1d8e11b..26d504038 100644 --- a/src/plugins/AncestorReport.py +++ b/src/plugins/AncestorReport.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -"Generate files/Ahnentafel Chart" +"Generate files/Ahnentafel Report" import RelLib import const @@ -163,7 +163,7 @@ class AncestorReport: name = self.start.getPrimaryName().getRegularName() self.doc.start_paragraph("Title") - title = _("Ahnentafel Chart for %s") % name + title = _("Ahnentafel Report for %s") % name self.doc.write_text(title) self.doc.end_paragraph() @@ -214,10 +214,10 @@ class AncestorReport: (name,date.getDate()) else: if place != "": - t = _("%s was born in %s in %s. ") % \ + t = _("%s was born in the year %s in %s. ") % \ (name,date.getDate(),place) else: - t = _("%s was born in %s. ") % \ + t = _("%s was born in the year %s. ") % \ (name,date.getDate()) self.doc.write_text(t) @@ -255,16 +255,16 @@ class AncestorReport: else: if male: if place != "": - t = _("He died in %s in %s") % \ + t = _("He died in the year %s in %s") % \ (date.getDate(),place) else: - t = _("He died in %s") % date.getDate() + t = _("He died in the year %s") % date.getDate() else: if place != "": - t = _("She died in %s in %s") % \ + t = _("She died in the year %s in %s") % \ (date.getDate(),place) else: - t = _("She died in %s") % date.getDate() + t = _("She died in the year %s") % date.getDate() self.doc.write_text(t) @@ -284,10 +284,10 @@ class AncestorReport: date.getDate() else: if place != "": - t = _(", and was buried in %s in %s.") % \ + t = _(", and was buried in the year %s in %s.") % \ (date.getDate(),place) else: - t = _(", and was buried in %s.") % \ + t = _(", and was buried in the year %s.") % \ date.getDate() else: t = _(" and was buried in %s." % place) @@ -397,7 +397,7 @@ def get_description(): return _("Produces a textual ancestral report") def get_name(): - return _("Generate files/Ahnentafel Chart") + return _("Generate files/Ahnentafel Report") #------------------------------------------------------------------------ # diff --git a/src/plugins/Desbrowser.py b/src/plugins/Desbrowser.py index a7c4462ff..efa9b7b29 100644 --- a/src/plugins/Desbrowser.py +++ b/src/plugins/Desbrowser.py @@ -93,5 +93,5 @@ def get_name(): # #------------------------------------------------------------------------- def get_description(): - return _("Provides a browsable hierarchy of the active person") + return _("Provides a browsable hierarchy based on the active person") diff --git a/src/plugins/HtmlReport.py b/src/plugins/HtmlReport.py index ab5d4cac9..77bf2b974 100644 --- a/src/plugins/HtmlReport.py +++ b/src/plugins/HtmlReport.py @@ -483,11 +483,11 @@ def dump_person(person,prefix,templateTop,templateBottom,targetDir): name_or_link(sp_mother,prefix)) html.write("
  • %s
    • \n" % txt) elif sp_father: - txt = _("Spouse's father: %s and %s") % \ + txt = _("Spouse's father: %s") % \ name_or_link(sp_father,prefix) html.write("
  • %s
    • \n" % txt) elif sp_mother: - txt = _("Spouse's father: %s and %s") % \ + txt = _("Spouse's mother: %s") % \ name_or_link(sp_mother,prefix) html.write("
  • %s
    • \n" % txt) diff --git a/src/plugins/ancestorchart.glade b/src/plugins/ancestorchart.glade index 576fdb1d6..a3c01e754 100644 --- a/src/plugins/ancestorchart.glade +++ b/src/plugins/ancestorchart.glade @@ -15,7 +15,7 @@ GnomeDialog dialog1 - GRAMPS - Ancestor Chart + Gramps - Ancestor Chart GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False diff --git a/src/plugins/ancestorreport.glade b/src/plugins/ancestorreport.glade index 34058a7e6..db828c314 100644 --- a/src/plugins/ancestorreport.glade +++ b/src/plugins/ancestorreport.glade @@ -15,7 +15,7 @@ GnomeDialog dialog1 - GRAMPS - Ahnentalfel Report + Gramps - Ahnentafel Report GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False @@ -97,7 +97,7 @@ GtkLabel labelTitle - + GTK_JUSTIFY_CENTER False 0.5 @@ -215,7 +215,7 @@ GtkRadioButton abiword True - + False True format diff --git a/src/plugins/merge.glade b/src/plugins/merge.glade index 6fe118491..7d788bcd8 100644 --- a/src/plugins/merge.glade +++ b/src/plugins/merge.glade @@ -1535,7 +1535,7 @@ GtkWindow message - GRAMPS - Merge People + Gramps - Merge People GTK_WINDOW_DIALOG GTK_WIN_POS_NONE True @@ -1638,7 +1638,7 @@ GtkDialog dialog - GRAMPS - Merge People + Gramps - Merge People GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False