diff --git a/gramps2/src/get_strings b/gramps2/src/get_strings index 634cf94d3..010efe8dd 100755 --- a/gramps2/src/get_strings +++ b/gramps2/src/get_strings @@ -147,16 +147,16 @@ class GladeExtractor: def __init__(self,msgs): self.strings = msgs - def add_string(self, string, lineno): - if string == "": + def add_string(self, str, lineno): + if str.strip() == "": return - if _ignore.has_key(string): + if _ignore.has_key(str): return entry = (self.file, lineno) - if self.strings.has_key(string): - self.strings[string][entry] = 0 + if self.strings.has_key(str): + self.strings[str][entry] = 0 else: - self.strings[string] = {entry: 0} + self.strings[str] = {entry: 0} def parse(self,file): self.p = make_parser() diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index a690ab272..7918feee1 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -1886,7 +1886,7 @@ True - Make the selected child the active family + Make the selected child the active person True GTK_RELIEF_NORMAL diff --git a/gramps2/src/gramps.py b/gramps2/src/gramps.py index 18e8c02ed..29b7b4fb4 100755 --- a/gramps2/src/gramps.py +++ b/gramps2/src/gramps.py @@ -1,5 +1,11 @@ #! /usr/bin/python -O +import const +import sys +import os +import locale +import intl + #------------------------------------------------------------------------- # # Cope with versioned pygtk installation. @@ -11,54 +17,36 @@ try: except ImportError: pass +import gtk + #------------------------------------------------------------------------- # # Load internationalization setup # #------------------------------------------------------------------------- -import os -import locale -import gtk.glade -import intl - if os.environ.has_key("GRAMPSI18N"): loc = os.environ["GRAMPSI18N"] else: loc = "locale" - -intl.bindtextdomain("gramps",loc) -intl.bind_textdomain_codeset("gramps",'UTF-8') -intl.textdomain("gramps") -locale.setlocale(locale.LC_NUMERIC,"C") - -#------------------------------------------------------------------------- -# -# Standard python modules -# -#------------------------------------------------------------------------- -import sys - -#------------------------------------------------------------------------- -# -# GNOME/GTK libraries -# -#------------------------------------------------------------------------- -import gtk -import gnome.ui - #------------------------------------------------------------------------- # # gramps libraries # #------------------------------------------------------------------------- import gramps_main +import const if len(sys.argv) > 1: arg = sys.argv[1] else: arg = None +intl.bindtextdomain("gramps",loc) +intl.bind_textdomain_codeset("gramps",'UTF-8') +intl.textdomain("gramps") +locale.setlocale(locale.LC_NUMERIC,"C") + try: import StartupDialog diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 5504d4c6a..b61891a47 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -41,6 +41,7 @@ from intl import gettext as _ #------------------------------------------------------------------------- import gobject import gtk +import gnome import gnome.ui import gtk.glade @@ -49,7 +50,6 @@ import gtk.glade # gramps modules # #------------------------------------------------------------------------- -#from RelLib import * import RelLib import PedView import MediaView @@ -527,19 +527,24 @@ class Gramps: def on_contents_activate(self,obj): """Display the GRAMPS manual""" - import gnome.help - url = gnome.help.file_find_file("gramps-manual","gramps-manual.sgml") - if url: - url = "gnome-help:"+url - gnome.help.goto(url) + + WarningDialog('HELP currently not available') +# url = gnome.help_display_with_doc_id(self.program, +# "", +# "gramps-manual.sgml", +# "") +# if url: +# url = "gnome-help:"+url +# gnome.help.goto(url) def on_writing_extensions_activate(self,obj): """Display the Extending GRAMPS manual""" - import gnome.help - url = gnome.help.file_find_file("extending-gramps","extending-gramps.sgml") - if url: - url = "gnome-help:"+url - gnome.help.goto(url) + WarningDialog('HELP currently not available') +# import gnome.help +# url = gnome.help.file_find_file("extending-gramps","extending-gramps.sgml") +# if url: +# url = "gnome-help:"+url +# gnome.help.goto(url) def on_new_clicked(self,obj): """Prompt for permission to close the current database""" @@ -1431,5 +1436,8 @@ def set_panel(obj): # #------------------------------------------------------------------------- if __name__ == '__main__': + import gnome + import sys + Gramps(None) gtk.mainloop() diff --git a/gramps2/src/plugins/TimeLine.py b/gramps2/src/plugins/TimeLine.py index f6dc3d95c..12272e6db 100644 --- a/gramps2/src/plugins/TimeLine.py +++ b/gramps2/src/plugins/TimeLine.py @@ -19,7 +19,7 @@ # """ -TimeLine report +Timeline report """ #------------------------------------------------------------------------ @@ -63,8 +63,8 @@ class TimeLine: def __init__(self,database,person,output,document,filter,title,sort_func): """ - Creates the TimeLine object that produces the report. This class - is used by the TimeLineDialog class. The arguments are: + Creates the Timeline object that produces the report. This class + is used by the TimelineDialog class. The arguments are: database - the GRAMPS database person - currently selected person @@ -312,7 +312,7 @@ class TimeLineDialog(Report.DrawReportDialog): def get_target_browser_title(self): """The title of the window created when the 'browse' button is clicked in the 'Save As' frame.""" - return _("TimeLine File") + return _("Timeline File") def get_report_generations(self): """No generation options.""" @@ -443,7 +443,7 @@ def get_description(): register_report( task=report, - name=_("TimeLine Graph"), + name=_("Timeline Graph"), status=(_("Beta")), category=_("Graphical Reports"), author_name="Donald N. Allingham", diff --git a/gramps2/src/po/template.po b/gramps2/src/po/template.po index c9c260833..1d03fec44 100644 --- a/gramps2/src/po/template.po +++ b/gramps2/src/po/template.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Tue Feb 11 21:17:51 2003\n" +"Project-Id-Version: GRAMPS VERSION\n" +"POT-Creation-Date: Wed Feb 12 22:07:04 2003\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -237,7 +237,7 @@ msgstr "" msgid "from %(start_date)s to %(stop_date)s" msgstr "" -#: DbPrompter.py:99 gramps_main.py:730 gramps_main.py:983 gramps_main.py:995 +#: DbPrompter.py:99 gramps_main.py:735 gramps_main.py:988 gramps_main.py:1000 msgid "No Comment Provided" msgstr "" @@ -329,7 +329,7 @@ msgid "unknown" msgstr "" #: EditPerson.py:802 EditPerson.py:813 Marriage.py:399 gramps_main.py:497 -#: gramps_main.py:943 +#: gramps_main.py:948 msgid "Abandon Changes" msgstr "" @@ -457,7 +457,7 @@ msgstr "" #: FamilyView.py:412 Plugins.py:404 Plugins.py:405 Plugins.py:406 #: Plugins.py:418 Plugins.py:419 Plugins.py:420 const.py:137 const.py:412 #: const.py:420 gramps.glade:3534 gramps.glade:3729 gramps.glade:4283 -#: gramps.glade:4489 gramps.glade:6211 gramps.glade:6477 gramps_main.py:1156 +#: gramps.glade:4489 gramps.glade:6211 gramps.glade:6477 gramps_main.py:1161 #: plugins/WebPage.py:288 msgid "Unknown" msgstr "" @@ -977,7 +977,7 @@ msgid "" msgstr "" #: RelImage.py:70 RelImage.py:73 RelImage.py:134 RelImage.py:137 -#: gramps_main.py:751 gramps_main.py:755 gramps_main.py:763 +#: gramps_main.py:756 gramps_main.py:760 gramps_main.py:768 #: plugins/AncestorChart.py:113 plugins/DesGraph.py:210 #: plugins/DesGraph.py:219 plugins/WriteGedcom.py:486 #: plugins/WriteGedcom.py:491 @@ -2370,7 +2370,7 @@ msgid "Children" msgstr "" #: gramps.glade:1889 -msgid "Make the selected child the active family" +msgid "Make the selected child the active person" msgstr "" #: gramps.glade:1915 @@ -2621,85 +2621,85 @@ msgid "" "Do you wish to save the changes?" msgstr "" -#: gramps_main.py:547 +#: gramps_main.py:552 msgid "Do you want to close the current database and create a new one?" msgstr "" -#: gramps_main.py:548 +#: gramps_main.py:553 msgid "New Database" msgstr "" -#: gramps_main.py:676 +#: gramps_main.py:681 msgid "" "An autosave file exists for %s.\n" "Should this be loaded instead of the last saved version?" msgstr "" -#: gramps_main.py:681 +#: gramps_main.py:686 msgid "Autosave File" msgstr "" -#: gramps_main.py:709 gramps_main.py:745 +#: gramps_main.py:714 gramps_main.py:750 msgid "%s is not a directory" msgstr "" -#: gramps_main.py:712 +#: gramps_main.py:717 msgid "Loading %s ..." msgstr "" -#: gramps_main.py:738 +#: gramps_main.py:743 msgid "Saving %s ..." msgstr "" -#: gramps_main.py:797 +#: gramps_main.py:802 msgid "autosaving..." msgstr "" -#: gramps_main.py:800 +#: gramps_main.py:805 msgid "autosave complete" msgstr "" -#: gramps_main.py:802 +#: gramps_main.py:807 msgid "autosave failed" msgstr "" -#: gramps_main.py:829 +#: gramps_main.py:834 msgid "Do you really wish to delete %s?" msgstr "" -#: gramps_main.py:831 +#: gramps_main.py:836 msgid "Delete Person" msgstr "" -#: gramps_main.py:940 +#: gramps_main.py:945 msgid "Do you wish to abandon your changes and revert to the last saved database?" msgstr "" -#: gramps_main.py:945 +#: gramps_main.py:950 msgid "Cannot revert to a previous database, since one does not exist" msgstr "" -#: gramps_main.py:1247 +#: gramps_main.py:1252 msgid "Loading %s..." msgstr "" -#: gramps_main.py:1342 +#: gramps_main.py:1347 msgid "No default/home person has been set" msgstr "" -#: gramps_main.py:1348 +#: gramps_main.py:1353 msgid "%s has been bookmarked" msgstr "" -#: gramps_main.py:1351 +#: gramps_main.py:1356 msgid "Bookmark could not be set because no one was selected" msgstr "" -#: gramps_main.py:1363 +#: gramps_main.py:1368 msgid "Do you wish to set %s as the home person?" msgstr "" -#: gramps_main.py:1365 +#: gramps_main.py:1370 msgid "Set Home Person" msgstr "" @@ -4161,7 +4161,7 @@ msgid "Timeline" msgstr "" #: plugins/TimeLine.py:315 -msgid "TimeLine File" +msgid "Timeline File" msgstr "" #: plugins/TimeLine.py:337 @@ -4173,7 +4173,7 @@ msgid "Generates a timeline graph." msgstr "" #: plugins/TimeLine.py:446 -msgid "TimeLine Graph" +msgid "Timeline Graph" msgstr "" #: plugins/Verify.py:290