diff --git a/ChangeLog b/ChangeLog index cd7d92c67..23b762678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-06-24 Don Allingham + * configure.in: add files + * src/DataViews/_RelationView.py: fix translation argument + * src/RelLib/Makefile.am: Add missing files + * src/plugins/Makefile.am: Add missing files + * src/DbManager.py: fix translation argument + * src/Utils.py: fix translation argument + * src/Filters/Rules/Person/Makefile.am: Add missing files + * src/Makefile.am: Add missing files + 2007-06-24 Alex Roitman * src/plugins/ReadGrdb.py (importData): Rework to upgrade and import a copy of grdb file, leaving the original file untouched. diff --git a/config.guess b/config.guess index 0f0fe712a..396482d6c 100644 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -781,7 +780,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -791,15 +790,12 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -954,9 +950,6 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1215,15 +1208,6 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/config.sub b/config.sub index 5defff65a..fab0aa355 100644 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ case $basic_machine in | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ case $basic_machine in | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -925,9 +925,6 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1222,7 +1219,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1417,9 +1414,6 @@ case $basic_machine in m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;; diff --git a/configure.in b/configure.in index 417a847ec..a80a99378 100644 --- a/configure.in +++ b/configure.in @@ -238,7 +238,6 @@ src/images/scalable/Makefile src/images/16x16/Makefile src/images/22x22/Makefile src/images/48x48/Makefile -src/data/templates/Makefile data/Makefile data/man/Makefile data/man/fr/Makefile diff --git a/src/DataViews/_RelationView.py b/src/DataViews/_RelationView.py index 3bc6a2262..dda1f6de5 100644 --- a/src/DataViews/_RelationView.py +++ b/src/DataViews/_RelationView.py @@ -844,7 +844,10 @@ class RelationshipView(PageView.PersonNavView): ddate = "" if bdate and ddate: - value = _("b. %s, d. %s") % (bdate, ddate) + value = _("b. %{birthdate}s, d. %{deathdate}s") % { + 'birthdate' : bdate, + 'deathdate' : ddate + } elif bdate: value = _("b. %s") % (bdate) elif ddate: diff --git a/src/DbManager.py b/src/DbManager.py index d4e480d37..30e4ad98f 100644 --- a/src/DbManager.py +++ b/src/DbManager.py @@ -473,7 +473,10 @@ class DbManager: rev = self.data_to_delete[0] parent = store[(path[0],)][0] QuestionDialog.QuestionDialog( - _("Remove the '%s' version of %s") % (rev, parent), + _("Remove the '%{revision}s' version of %{database}s") % { + 'revision' : rev, + 'database' : parent + }, _("Removing this version will prevent you from " "extracting it in the future."), _("Remove version"), diff --git a/src/Filters/Rules/Person/Makefile.am b/src/Filters/Rules/Person/Makefile.am index 91ef8c16c..4d3d27370 100644 --- a/src/Filters/Rules/Person/Makefile.am +++ b/src/Filters/Rules/Person/Makefile.am @@ -49,7 +49,7 @@ pkgdata_PYTHON = \ _IsSpouseOfFilterMatch.py \ _IsWitness.py \ _MatchesFilter.py \ - _PissingParent.py \ + _MissingParent.py \ _MultipleMarriages.py \ _NeverMarried.py \ _NoBirthdate.py \ diff --git a/src/Makefile.am b/src/Makefile.am index f5daa38da..e8907c00c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,7 @@ gdir_PYTHON = \ DateEdit.py\ Date.py\ DbLoader.py\ + DbManager.py\ DbState.py\ DdTargets.py\ DisplayState.py\ diff --git a/src/RelLib/Makefile.am b/src/RelLib/Makefile.am index 2a512f1dc..4a616c162 100644 --- a/src/RelLib/Makefile.am +++ b/src/RelLib/Makefile.am @@ -30,6 +30,7 @@ pkgdata_PYTHON = \ _MediaRef.py\ _Name.py\ _NameType.py\ + _NoteType.py\ _NoteBase.py\ _Note.py\ _Person.py\ diff --git a/src/Utils.py b/src/Utils.py index 3ed062aab..a791eda43 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -181,7 +181,10 @@ def family_upper_name(family, db): if father and mother: fname = father.get_primary_name().get_upper_name() mname = mother.get_primary_name().get_upper_name() - name = _("%s and %s") % (fname,mname) + name = _("%{father}s and %{mother}s") % { + 'father' : fname, + 'mother' : mname + } elif father: name = father.get_primary_name().get_upper_name() else: diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index f6ca99572..88fefe7d3 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -31,6 +31,7 @@ pkgdata_PYTHON = \ NarrativeWeb.py\ PatchNames.py\ ReadPkg.py\ + ReadGrdb.py\ Rebuild.py\ RelCalc.py\ ReorderIds.py\ @@ -42,6 +43,7 @@ pkgdata_PYTHON = \ WriteFtree.py\ WritePkg.py\ WriteCD.py\ + OwnerEditor.py\ rel_ru.py\ Eval.py\ Leak.py\ @@ -84,6 +86,7 @@ GLADEFILES = \ eval.glade\ leak.glade\ book.glade\ + ownereditor.glade\ writeftree.glade\ genewebexport.glade\ vcardexport.glade\