diff --git a/gramps/src/locale/it/LC_MESSAGES/gramps.mo b/gramps/src/locale/it/LC_MESSAGES/gramps.mo index de5bc253e..bad0276ae 100644 Binary files a/gramps/src/locale/it/LC_MESSAGES/gramps.mo and b/gramps/src/locale/it/LC_MESSAGES/gramps.mo differ diff --git a/gramps/src/plugins/Merge.py b/gramps/src/plugins/Merge.py index 58757de18..50aed53ec 100644 --- a/gramps/src/plugins/Merge.py +++ b/gramps/src/plugins/Merge.py @@ -51,7 +51,7 @@ def is_initial(name): return name[0] in string.uppercase def ancestors_of(p1,list): - if p1 == None: + if p1 == None or p1 in list: return list.append(p1) f1 = p1.getMainFamily() diff --git a/gramps/src/po/it.po b/gramps/src/po/it.po index 3f6c87fb3..7f8ea48c3 100644 --- a/gramps/src/po/it.po +++ b/gramps/src/po/it.po @@ -1,14 +1,14 @@ # Italian translation for Gramps; Traduzione italiana per Gramps. # Copyright (C) 2001-2002 the Gramps Project -# Marco Molteni , 2001-2002. +# Marco Molteni , 2001-2002. # msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2002-01-24 08:04-0700\n" -"PO-Revision-Date: 2002-01-26 15:18CET\n" -"Last-Translator: Marco Molteni\n" -"Language-Team: Italian \n" +"PO-Revision-Date: 2002-03-15 19:13CET\n" +"Last-Translator: Marco Molteni \n" +"Language-Team: italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -1959,7 +1959,7 @@ msgstr "Codifica" #: glade.c:702 msgid "Endowment" -msgstr "" +msgstr "Endowment" #: glade.c:2096 msgid "Engagement" @@ -2409,7 +2409,7 @@ msgstr "Vai a questa pagina web" #: glade.c:2122 msgid "Graduation" -msgstr "" +msgstr "Diploma" #: glade.c:2077 msgid "" @@ -3921,7 +3921,7 @@ msgstr "Salvando %s ..." #: glade.c:1608 msgid "Sealed to Parents" -msgstr "" +msgstr "Sealed to Parents" #: glade.c:2639 msgid "" @@ -4085,7 +4085,7 @@ msgstr "Dimensione" #: glade.c:2140 msgid "Social Security Number" -msgstr "" +msgstr "Numero di previdenza sociale" #: glade.c:1681 msgid "SoundEx Code" @@ -4133,7 +4133,7 @@ msgstr "Consorte" #: glade.c:1716 msgid "Spouse Sealing" -msgstr "" +msgstr "Spouse Sealing" #: glade.c:1719 msgid "Spouses"