diff --git a/gramps2/src/AddSpouse.py b/gramps2/src/AddSpouse.py index ae709dfd5..56dbe70e4 100644 --- a/gramps2/src/AddSpouse.py +++ b/gramps2/src/AddSpouse.py @@ -78,8 +78,6 @@ class AddSpouse: self.glade = gtk.glade.XML(const.gladeFile, "spouseDialog") - Utils.set_title_label(self.glade,_('Choose Spouse/Partner')) - self.rel_combo = self.glade.get_widget("rel_combo") self.relation_type = self.glade.get_widget("rel_type") self.spouse_list = self.glade.get_widget("spouse_list") @@ -87,7 +85,8 @@ class AddSpouse: titles = [ (_('Name'),3,200), (_('ID'),1,50), (_('Birth date'),4,50), ('',0,50), ('',0,0)] - self.slist = ListModel.ListModel(self.spouse_list, titles, self.select_row ) + self.slist = ListModel.ListModel(self.spouse_list, titles, + self.select_row ) self.relation_def = self.glade.get_widget("reldef") self.ok = self.glade.get_widget('spouse_ok') @@ -95,7 +94,10 @@ class AddSpouse: self.rel_combo.set_popdown_strings(const.familyRelations) title = _("Choose Spouse/Partner of %s") % GrampsCfg.nameof(person) - Utils.set_title_label(self.glade,title) + + Utils.set_titles(self.glade.get_widget('spouseDialog'), + self.glade.get_widget('title'),title, + _('Choose Spouse/Partner')) self.glade.signal_autoconnect({ "on_select_spouse_clicked" : self.select_spouse_clicked, diff --git a/gramps2/src/AddrEdit.py b/gramps2/src/AddrEdit.py index dedd057b8..5f9e328d5 100644 --- a/gramps2/src/AddrEdit.py +++ b/gramps2/src/AddrEdit.py @@ -79,8 +79,9 @@ class AddressEditor: text = _("Address Editor for %s") % name title_label = self.top.get_widget("title") - title_label.set_text(Utils.title(text)) - title_label.set_use_markup(gtk.TRUE) + + Utils.set_titles(self.window,title_label, + text,_('Address Editor')) if self.addr: self.srcreflist = self.addr.getSourceRefList() diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/AttrEdit.py index b86004cc2..76af9d717 100644 --- a/gramps2/src/AttrEdit.py +++ b/gramps2/src/AttrEdit.py @@ -67,7 +67,6 @@ class AttributeEditor: self.parent = parent self.attrib = attrib self.top = gtk.glade.XML(const.dialogFile, "attr_edit") - self.window = self.top.get_widget("attr_edit") self.type_field = self.top.get_widget("attr_type") self.slist = self.top.get_widget("slist") self.value_field = self.top.get_widget("attr_value") @@ -75,6 +74,8 @@ class AttributeEditor: self.attrib_menu = self.top.get_widget("attr_menu") self.source_field = self.top.get_widget("attr_source") self.priv = self.top.get_widget("priv") + + self.window = self.top.get_widget("attr_edit") if attrib: self.srcreflist = self.attrib.getSourceRefList() @@ -89,8 +90,7 @@ class AttributeEditor: title = _("Attribute Editor for %s") % title l = self.top.get_widget("title") - l.set_text(Utils.title(title)) - l.set_use_markup(gtk.TRUE) + Utils.set_titles(self.window,l,title,_('Attribute Editor')) AutoComp.AutoEntry(self.attrib_menu.entry,list) diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py index bfb1dea07..a59704d41 100644 --- a/gramps2/src/ChooseParents.py +++ b/gramps2/src/ChooseParents.py @@ -92,10 +92,12 @@ class ChooseParents: self.father = None self.glade = gtk.glade.XML(const.gladeFile,"familyDialog") + self.top = self.glade.get_widget("familyDialog") text = _("Choose the Parents of %s") % GrampsCfg.nameof(self.person) - Utils.set_title_label(self.glade,text) - self.top = self.glade.get_widget("familyDialog") + Utils.set_titles(self.top,self.glade.get_widget('title'), + text,_('Choose Parents')) + self.mother_rel = self.glade.get_widget("mrel") self.father_rel = self.glade.get_widget("frel") self.fcombo = self.glade.get_widget("prel_combo") @@ -362,13 +364,14 @@ class ModifyParents: self.mother = self.family.getMother() self.glade = gtk.glade.XML(const.gladeFile,"modparents") - - Utils.set_title_label(self.glade,_("Modify the Parents of %s") % GrampsCfg.nameof(self.person)) - self.top = self.glade.get_widget("modparents") + self.title = self.glade.get_widget("title") + + title = _("Modify the Parents of %s") % GrampsCfg.nameof(self.person) + Utils.set_titles(self.top, self.title, title, _("Modify Parents")) + self.mother_rel = self.glade.get_widget("mrel") self.father_rel = self.glade.get_widget("frel") - self.title = self.glade.get_widget("title") self.flabel = self.glade.get_widget("flabel") self.mlabel = self.glade.get_widget("mlabel") diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py index ac26e1fe9..f4ec31835 100644 --- a/gramps2/src/DbPrompter.py +++ b/gramps2/src/DbPrompter.py @@ -59,14 +59,17 @@ class DbPrompter: def show(self): opendb = gtk.glade.XML(const.gladeFile, "opendb") + top = opendb.get_widget('opendb') + title = opendb.get_widget('title') - Utils.set_title_label(opendb,_('Open a database')) + Utils.set_titles(top,title,_('Open a database')) opendb.signal_autoconnect({ "on_open_ok_clicked" : self.open_ok_clicked, "on_open_cancel_clicked" : self.open_cancel_clicked, "on_opendb_delete_event": self.open_delete_event, }) + self.new = opendb.get_widget("new") self.zodb = opendb.get_widget("zodb") if self.want_new: @@ -108,8 +111,10 @@ class DbPrompter: "destroy_passed_object": self.cancel_button_clicked, }) - Utils.set_title_label(wFs,_('Open a database')) self.fileSelector = wFs.get_widget("dbopen") + Utils.set_titles(self.fileSelector,wFs.get_widget('title'), + _('Open a database')) + self.dbname = wFs.get_widget("dbname") self.getoldrev = wFs.get_widget("getoldrev") self.dbname.set_default_path(GrampsCfg.db_dir) diff --git a/gramps2/src/DisplayTrace.py b/gramps2/src/DisplayTrace.py index c730b0710..760332961 100644 --- a/gramps2/src/DisplayTrace.py +++ b/gramps2/src/DisplayTrace.py @@ -89,7 +89,7 @@ class DisplayTrace: self.glade = gtk.glade.XML(const.pluginsFile,"plugstat") self.top = self.glade.get_widget("plugstat") window = self.glade.get_widget("text") - self.top.set_title(_('Internal Error - GRAMPS')) + self.top.set_title("%s - GRAMPS" % _('Internal Error')) window.get_buffer().set_text(msg.getvalue()) self.glade.signal_autoconnect({'on_close_clicked':self.close}) diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 45a5e1d14..4a05d67c1 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -108,6 +108,8 @@ class EditPerson: self.addr_edit_btn = self.top.get_widget('addr_edit_btn') self.window = self.get_widget("editPerson") + self.window.set_title("%s - GRAMPS" % _('Edit Person')) + self.notes_field = self.get_widget("personNotes") self.event_name_field = self.get_widget("eventName") self.event_place_field = self.get_widget("eventPlace") @@ -1041,7 +1043,6 @@ class EditPerson: store,iter = self.ptree.get_selected() if iter: addr = self.ptree.get_object(iter) - label = "%s %s %s" % (addr.getCity(),addr.getState(),addr.getCountry()) self.addr_start.set_text(addr.getDate()) self.addr_street.set_text(addr.getStreet()) self.addr_city.set_text(addr.getCity()) diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py index ae66e9a4c..a5169a327 100644 --- a/gramps2/src/EditPlace.py +++ b/gramps2/src/EditPlace.py @@ -76,11 +76,11 @@ class EditPlace: self.srcreflist = [] self.top_window = gtk.glade.XML(const.placesFile,"placeEditor") + self.top = self.top_window.get_widget("placeEditor") self.iconlist = self.top_window.get_widget('iconlist') - title_label = self.top_window.get_widget('title') - title_label.set_text(Utils.title(_('Place Editor'))) - title_label.set_use_markup(gtk.TRUE) + + Utils.set_titles(self.top,title_label,_('Place Editor')) self.glry = ImageSelect.Gallery(place, self.path, self.iconlist, self.db, self) self.title = self.top_window.get_widget("place_title") @@ -153,8 +153,6 @@ class EditPlace: "on_apply_clicked" : self.on_place_apply_clicked }) - self.top = self.top_window.get_widget("placeEditor") - self.sourcetab = Sources.SourceTab(self.srcreflist,self, self.top_window,self.slist, self.top_window.get_widget('add_src'), diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py index 4b9f6d166..4cdcf899a 100644 --- a/gramps2/src/EditSource.py +++ b/gramps2/src/EditSource.py @@ -56,12 +56,13 @@ class EditSource: self.ref_not_loaded = 1 self.top_window = gtk.glade.XML(const.gladeFile,"sourceEditor") + self.top = self.top_window.get_widget("sourceEditor") - Utils.set_title_label(self.top_window,_('Source Editor')) + Utils.set_titles(self.top,self.top_window.get_widget('title'), + _('Source Editor')) plwidget = self.top_window.get_widget("iconlist") self.gallery = ImageSelect.Gallery(source, self.path, plwidget, db, self) - self.title = self.top_window.get_widget("source_title") self.author = self.top_window.get_widget("author") self.pubinfo = self.top_window.get_widget("pubinfo") self.note = self.top_window.get_widget("source_note") @@ -69,6 +70,7 @@ class EditSource: self.refinfo = self.top_window.get_widget("refinfo") + self.title = self.top_window.get_widget("source_title") self.title.set_text(source.getTitle()) self.author.set_text(source.getAuthor()) self.pubinfo.set_text(source.getPubInfo()) @@ -84,7 +86,6 @@ class EditSource: "on_sourceapply_clicked" : self.on_source_apply_clicked }) - self.top = self.top_window.get_widget("sourceEditor") if self.source.getId() == "": self.top_window.get_widget("add_photo").set_sensitive(0) diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index 8515ddaf9..1c7cf5d38 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -78,11 +78,13 @@ class EventEditor: self.top = gtk.glade.XML(const.dialogFile, "event_edit") - title_label = self.top.get_widget('title') - title_label.set_text(Utils.title(_('Event Editor for %s') % name)) - title_label.set_use_markup(gtk.TRUE) - self.window = self.top.get_widget("event_edit") + title_label = self.top.get_widget('title') + + Utils.set_titles(self.window,title_label, + _('Event Editor for %s') % name, + _('Event Editor')) + self.name_field = self.top.get_widget("eventName") self.place_field = self.top.get_widget("eventPlace") self.cause_field = self.top.get_widget("eventCause") diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index a401360ca..36f62e293 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -95,12 +95,16 @@ class ImageSelect: self.glade = gtk.glade.XML(const.imageselFile,"imageSelect") window = self.glade.get_widget("imageSelect") + self.fname = self.glade.get_widget("fname") self.image = self.glade.get_widget("image") self.description = self.glade.get_widget("photoDescription") self.external = self.glade.get_widget("private") self.temp_name = "" + Utils.set_titles(window,self.glade.get_widget('title'), + _('Select a media object')) + self.glade.signal_autoconnect({ "on_savephoto_clicked" : self.on_savephoto_clicked, "on_name_changed" : self.on_name_changed, @@ -599,6 +603,11 @@ class LocalMediaProperties: fname = self.object.getPath() self.change_dialog = gtk.glade.XML(const.imageselFile, "change_description") + + title = _('Change local media object properties') + Utils.set_titles(self.change_dialog.get_widget('change_description'), + self.change_dialog.get_widget('title'), title) + descr_window = self.change_dialog.get_widget("description") self.pixmap = self.change_dialog.get_widget("pixmap") self.attr_type = self.change_dialog.get_widget("attr_type") @@ -714,6 +723,12 @@ class GlobalMediaProperties: self.path = self.db.getSavePath() self.change_dialog = gtk.glade.XML(const.imageselFile,"change_global") + + title = _('Change global media object properites') + + Utils.set_titles(self.change_dialog.get_widget('change_global'), + self.change_dialog.get_widget('title'),title) + self.descr_window = self.change_dialog.get_widget("description") self.notes = self.change_dialog.get_widget("notes") self.pixmap = self.change_dialog.get_widget("pixmap") diff --git a/gramps2/src/LocEdit.py b/gramps2/src/LocEdit.py index b6a951369..5c8109ae8 100644 --- a/gramps2/src/LocEdit.py +++ b/gramps2/src/LocEdit.py @@ -55,7 +55,8 @@ class LocationEditor: self.county = self.top.get_widget("county") self.country = self.top.get_widget("country") - self.top.get_widget("title").set_text(_('Location Editor')) + Utils.set_titles(self.window, self.top.get_widget('title'), + _('Location Editor')) if location != None: self.city.set_text(location.get_city()) diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index 5413c9ff7..5e2b492a8 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -77,9 +77,11 @@ class Marriage: self.pmap[p[0]] = key self.top = gtk.glade.XML(const.marriageFile,"marriageEditor") - Utils.set_title_label(self.top,_('Marriage/Relationship Editor')) - top_window = self.get_widget("marriageEditor") + + Utils.set_titles(top_window, self.top.get_window('title'), + _('Marriage/Relationship Editor')) + self.icon_list = self.get_widget('iconlist') self.gallery = ImageSelect.Gallery(family, self.path, self.icon_list, db, self) diff --git a/gramps2/src/NameEdit.py b/gramps2/src/NameEdit.py index 0efde8907..19da5f72c 100644 --- a/gramps2/src/NameEdit.py +++ b/gramps2/src/NameEdit.py @@ -76,9 +76,8 @@ class NameEditor: alt_title = self.top.get_widget("title") tmsg = _("Alternate Name Editor for %s") % full_name - - alt_title.set_text(Utils.title(tmsg)) - alt_title.set_use_markup(gtk.TRUE) + + Utils.set_titles(self.window, alt_title, tmsg, _('Alternate Name Editor')) self.sourcetab = Sources.SourceTab(self.srcreflist, self.parent, self.top, self.slist, diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py index 32c58bb0f..9b8dc80c8 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/src/Plugins.py @@ -117,6 +117,11 @@ class PluginDialog: }) self.tree = self.dialog.get_widget("tree") + self.top = self.dialog.get_widget("report") + self.title = self.dialog.get_widget("title") + + Utils.set_titles(self.top, self.title, msg ) + self.store = gtk.TreeStore(gobject.TYPE_STRING) self.selection = self.tree.get_selection() self.selection.connect('changed', self.on_node_selected) @@ -124,21 +129,18 @@ class PluginDialog: self.tree.append_column(col) self.tree.set_model(self.store) - self.top = self.dialog.get_widget("report") self.img = self.dialog.get_widget("image") self.description = self.dialog.get_widget("description") self.status = self.dialog.get_widget("report_status") Utils.set_title_label(self.dialog,msg) - self.title = self.dialog.get_widget("title") self.author_name = self.dialog.get_widget("author_name") self.author_email = self.dialog.get_widget("author_email") self.statbox = self.dialog.get_widget("statbox") self.run_tool = None self.build_tree(list) - self.title.set_text(msg) def on_apply_clicked(self,obj): """Execute the selected report""" @@ -268,6 +270,7 @@ class PluginStatus: self.glade = gtk.glade.XML(const.pluginsFile,"plugstat") self.top = self.glade.get_widget("plugstat") + self.top.set_title("%s - GRAMPS" % _('Plugin status')) window = self.glade.get_widget("text") self.glade.signal_autoconnect({ 'on_close_clicked' : self.close diff --git a/gramps2/src/QuickAdd.py b/gramps2/src/QuickAdd.py index d44fd130d..50dc58989 100644 --- a/gramps2/src/QuickAdd.py +++ b/gramps2/src/QuickAdd.py @@ -40,8 +40,9 @@ class QuickAdd: }) self.window = self.xml.get_widget("addperson") - - Utils.set_title_label(self.xml,_('Add Person')) + title = self.xml.get_widget('title') + + Utils.set_titles(self.window,title, _('Add Person')) self.c = AutoComp.AutoCombo(self.xml.get_widget("surnameCombo"), self.db.getSurnames()) diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py index f1a2cde34..d1bc8e13a 100644 --- a/gramps2/src/Report.py +++ b/gramps2/src/Report.py @@ -248,7 +248,7 @@ class ReportDialog: #------------------------------------------------------------------------ def get_title(self): """The window title for this dialog.""" - return(_("Base Report - GRAMPS")) + return('') def get_header(self, name): """The header line to put at the top of the contents of the diff --git a/gramps2/src/SelectChild.py b/gramps2/src/SelectChild.py index be818b1fd..8e0144b38 100644 --- a/gramps2/src/SelectChild.py +++ b/gramps2/src/SelectChild.py @@ -66,10 +66,9 @@ class SelectChild: self.select_child_list = {} self.top = self.xml.get_widget("select_child") - title_label = self.xml.get_widget('title') - title_label.set_text(Utils.title(_('Add Children'))) - title_label.set_use_markup(gtk.TRUE) + + Utils.set_titles(self.top,title_label,_('Add Children')) self.add_child = self.xml.get_widget("childlist") diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py index 170a823ab..5bb77fb75 100644 --- a/gramps2/src/Sources.py +++ b/gramps2/src/Sources.py @@ -53,8 +53,10 @@ class SourceSelector: self.list.append(RelLib.SourceRef(s)) self.update=update self.top = gtk.glade.XML(const.srcselFile,"sourcesel") + self.sourcesel = self.top.get_widget("sourcesel") - Utils.set_title_label(self.top,_('Source Reference Selection')) + Utils.set_titles(self.sourcesel, self.top.get_widget('title'), + _('Source Reference Selection')) self.top.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, @@ -64,7 +66,6 @@ class SourceSelector: "on_src_ok_clicked" : self.src_ok_clicked, }) - self.sourcesel = self.top.get_widget("sourcesel") self.slist = self.top.get_widget("slist") self.selection = self.slist.get_selection() self.model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) @@ -211,15 +212,16 @@ class SourceEditor: self.update = update self.source_ref = srcref self.showSource = gtk.glade.XML(const.srcselFile, "sourceDisplay") + self.sourceDisplay = self.get_widget("sourceDisplay") - Utils.set_title_label(self.showSource,_('Source Information')) + Utils.set_titles(self.sourceDisplay, self.showSource.get_widget('title'), + _('Source Information')) self.showSource.signal_autoconnect({ "on_sourceok_clicked" : self.on_sourceok_clicked, "on_source_changed" : self.on_source_changed, "destroy_passed_object" : Utils.destroy_passed_object }) - self.sourceDisplay = self.get_widget("sourceDisplay") self.source_field = self.get_widget("sourceList") self.title_menu = self.get_widget("source_title") self.title_menu.set_data("o",self) diff --git a/gramps2/src/UrlEdit.py b/gramps2/src/UrlEdit.py index fff68c546..22792404a 100644 --- a/gramps2/src/UrlEdit.py +++ b/gramps2/src/UrlEdit.py @@ -50,11 +50,11 @@ class UrlEditor: self.des = self.top.get_widget("url_des") self.addr = self.top.get_widget("url_addr") self.priv = self.top.get_widget("priv") - title_label = self.top.get_widget("title") - title_label.set_text(Utils.title(_('Internet Address Editor for %s') % name)) - title_label.set_use_markup(gtk.TRUE) + Utils.set_titles(self.window,title_label, + _('Internet Address Editor for %s') % name, + _('Internet Address Editor')) if url != None: self.des.set_text(url.get_description()) self.addr.set_text(url.get_path()) diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py index 526afd269..0498e374f 100644 --- a/gramps2/src/Utils.py +++ b/gramps2/src/Utils.py @@ -500,3 +500,11 @@ def set_title_label(xmlobj,t): title_label = xmlobj.get_widget('title') title_label.set_text('%s' % t) title_label.set_use_markup(gtk.TRUE) + +def set_titles(window,title,t,msg=None): + title.set_text('%s' % t) + title.set_use_markup(gtk.TRUE) + if msg: + window.set_title('%s - GRAMPS' % msg) + else: + window.set_title('%s - GRAMPS' % t) diff --git a/gramps2/src/dialog.glade b/gramps2/src/dialog.glade index edb618d96..e69e2378e 100644 --- a/gramps2/src/dialog.glade +++ b/gramps2/src/dialog.glade @@ -5,7 +5,7 @@ True - Event Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -887,7 +887,7 @@ True - Attribute Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -1396,7 +1396,7 @@ True - Location Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -1755,7 +1755,7 @@ True - Address Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -2491,7 +2491,7 @@ True - Internet Address Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -2738,7 +2738,7 @@ True - Alternate Name Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -3530,7 +3530,7 @@ True - Edit Witness - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps2/src/edit_person.glade b/gramps2/src/edit_person.glade index d56a3919b..9fbb722be 100644 --- a/gramps2/src/edit_person.glade +++ b/gramps2/src/edit_person.glade @@ -7,7 +7,7 @@ True True - Edit Person - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index d400d6af5..e390c4965 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -2555,7 +2555,7 @@ True - Choose Spouse - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -2876,7 +2876,7 @@ True - Choose Parents - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -3766,7 +3766,7 @@ True - Add Children - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -4405,7 +4405,7 @@ True - Source Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -4961,7 +4961,7 @@ True - Add Person - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -5297,7 +5297,7 @@ True - Open a Database - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -5453,7 +5453,7 @@ True - Modify Parents - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 92fd7b944..043b0b20f 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -982,6 +982,10 @@ class Gramps: }) fileSelector = wFs.get_widget("dbopen") + + Utils.set_titles(fileSelector, wFs.get_widget('title'), + _('Open a database')) + dbname = wFs.get_widget("dbname") getoldrev = wFs.get_widget("getoldrev") fileSelector.set_data("dbname",dbname) diff --git a/gramps2/src/imagesel.glade b/gramps2/src/imagesel.glade index e6ac5be27..ca21bd1d9 100644 --- a/gramps2/src/imagesel.glade +++ b/gramps2/src/imagesel.glade @@ -6,7 +6,7 @@ True - Select a Media Object - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -70,9 +70,9 @@ 6 - + True - <span size="larger" weight="bold">Select a Media Object</span> + False True GTK_JUSTIFY_CENTER @@ -353,7 +353,7 @@ True - Change Local Media Object Properties - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -418,9 +418,9 @@ 6 - + True - <span weight="bold" size="larger">Change Local Media Object Properties</span> + False True GTK_JUSTIFY_CENTER @@ -1099,7 +1099,7 @@ True - Change Global Media Object Properties - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -1164,9 +1164,9 @@ 6 - + True - <span size="larger" weight="bold">Change Global Media Object Properties</span> + False True GTK_JUSTIFY_CENTER diff --git a/gramps2/src/marriage.glade b/gramps2/src/marriage.glade index 8ea889fac..bb421d12b 100644 --- a/gramps2/src/marriage.glade +++ b/gramps2/src/marriage.glade @@ -6,7 +6,7 @@ True - Marriage/Relationship Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps2/src/places.glade b/gramps2/src/places.glade index 7fb2d21d4..cbf0c37a3 100644 --- a/gramps2/src/places.glade +++ b/gramps2/src/places.glade @@ -6,7 +6,7 @@ True - Place Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps2/src/plugins.glade b/gramps2/src/plugins.glade index 44cc70f3a..fad0200f3 100644 --- a/gramps2/src/plugins.glade +++ b/gramps2/src/plugins.glade @@ -5,7 +5,7 @@ True - Report Selection - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps2/src/po/template.po b/gramps2/src/po/template.po index 1c672d2be..38551366a 100644 --- a/gramps2/src/po/template.po +++ b/gramps2/src/po/template.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GRAMPS VERSION\n" -"POT-Creation-Date: Tue Mar 4 22:50:35 2003\n" +"POT-Creation-Date: Wed Mar 5 22:46:04 2003\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,20 +15,16 @@ msgstr "" "Generated-By: pygettext.py 1.4\n" -#: AddMedia.py:103 ImageSelect.py:143 +#: AddMedia.py:103 ImageSelect.py:147 msgid "Cannot import %s" msgstr "" -#: AddMedia.py:104 ImageSelect.py:144 +#: AddMedia.py:104 ImageSelect.py:148 msgid "The filename supplied could not be found." msgstr "" -#: AddSpouse.py:81 -msgid "Choose Spouse/Partner" -msgstr "" - -#: AddSpouse.py:87 ChooseParents.py:55 EditPerson.py:204 FamilyView.py:146 -#: SelectChild.py:106 gramps_main.py:91 mergedata.glade:480 +#: AddSpouse.py:85 ChooseParents.py:55 EditPerson.py:206 FamilyView.py:146 +#: SelectChild.py:105 gramps_main.py:91 mergedata.glade:480 #: mergedata.glade:1486 plugins/FilterEditor.py:123 #: plugins/IndivComplete.py:370 plugins/IndivSummary.py:211 #: plugins/RelCalc.py:322 plugins/TimeLine.py:330 plugins/WebPage.py:274 @@ -36,30 +32,30 @@ msgstr "" msgid "Name" msgstr "" -#: AddSpouse.py:87 ChooseParents.py:55 FamilyView.py:146 GenericFilter.py:133 +#: AddSpouse.py:85 ChooseParents.py:55 FamilyView.py:146 GenericFilter.py:133 #: GenericFilter.py:166 GenericFilter.py:193 GenericFilter.py:229 -#: GenericFilter.py:256 ImageSelect.py:809 MediaView.py:59 PlaceView.py:48 -#: SelectChild.py:106 SourceView.py:54 Sources.py:74 Sources.py:144 +#: GenericFilter.py:256 ImageSelect.py:824 MediaView.py:59 PlaceView.py:48 +#: SelectChild.py:105 SourceView.py:54 Sources.py:75 Sources.py:145 #: Witness.py:54 gramps_main.py:91 mergedata.glade:876 mergedata.glade:1510 #: plugins/RelCalc.py:322 msgid "ID" msgstr "" -#: AddSpouse.py:87 ChooseParents.py:55 FamilyView.py:147 SelectChild.py:106 +#: AddSpouse.py:85 ChooseParents.py:55 FamilyView.py:147 SelectChild.py:105 #: gramps_main.py:92 mergedata.glade:408 mergedata.glade:1093 msgid "Birth date" msgstr "" -#: AddSpouse.py:97 +#: AddSpouse.py:96 msgid "Choose Spouse/Partner of %s" msgstr "" -#: AddSpouse.py:109 const.py:431 const.py:439 plugins/FamilyGroup.py:299 +#: AddSpouse.py:108 const.py:431 const.py:439 plugins/FamilyGroup.py:299 #: plugins/FamilyGroup.py:301 msgid "Married" msgstr "" -#: AddSpouse.py:205 const.py:433 const.py:441 +#: AddSpouse.py:204 const.py:433 const.py:441 msgid "Partners" msgstr "" @@ -67,10 +63,18 @@ msgstr "" msgid "Address Editor for %s" msgstr "" -#: AttrEdit.py:90 +#: AddrEdit.py:84 +msgid "Address Editor" +msgstr "" + +#: AttrEdit.py:91 msgid "Attribute Editor for %s" msgstr "" +#: AttrEdit.py:93 +msgid "Attribute Editor" +msgstr "" + #: Bookmarks.py:90 Bookmarks.py:94 msgid "Edit Bookmarks" msgstr "" @@ -195,24 +199,28 @@ msgstr "" msgid "Undefined Calendar" msgstr "" -#: ChooseParents.py:96 +#: ChooseParents.py:97 msgid "Choose the Parents of %s" msgstr "" -#: ChooseParents.py:125 ChooseParents.py:126 ChooseParents.py:375 -#: ChooseParents.py:376 SelectChild.py:102 SelectChild.py:104 const.py:153 +#: ChooseParents.py:99 +msgid "Choose Parents" +msgstr "" + +#: ChooseParents.py:127 ChooseParents.py:128 ChooseParents.py:378 +#: ChooseParents.py:379 SelectChild.py:101 SelectChild.py:103 const.py:153 #: gramps.glade:3392 gramps.glade:3585 gramps.glade:4029 gramps.glade:4209 #: gramps.glade:5665 gramps.glade:5911 plugins/EventCmp.py:288 #: plugins/FamilyGroup.py:149 plugins/GraphViz.py:335 plugins/GraphViz.py:336 msgid "Birth" msgstr "" -#: ChooseParents.py:189 ChooseParents.py:190 ChooseParents.py:393 -#: ChooseParents.py:394 +#: ChooseParents.py:191 ChooseParents.py:192 ChooseParents.py:396 +#: ChooseParents.py:397 msgid "Parent" msgstr "" -#: ChooseParents.py:192 ChooseParents.py:396 FamilyView.py:377 +#: ChooseParents.py:194 ChooseParents.py:399 FamilyView.py:377 #: mergedata.glade:456 mergedata.glade:1045 plugins/FamilyGroup.py:208 #: plugins/IndivComplete.py:197 plugins/IndivComplete.py:199 #: plugins/IndivComplete.py:410 plugins/IndivSummary.py:272 @@ -220,7 +228,7 @@ msgstr "" msgid "Mother" msgstr "" -#: ChooseParents.py:193 ChooseParents.py:397 FamilyView.py:376 +#: ChooseParents.py:195 ChooseParents.py:400 FamilyView.py:376 #: mergedata.glade:678 mergedata.glade:1311 plugins/FamilyGroup.py:195 #: plugins/IndivComplete.py:189 plugins/IndivComplete.py:191 #: plugins/IndivComplete.py:405 plugins/IndivSummary.py:258 @@ -228,10 +236,14 @@ msgstr "" msgid "Father" msgstr "" -#: ChooseParents.py:366 +#: ChooseParents.py:370 msgid "Modify the Parents of %s" msgstr "" +#: ChooseParents.py:371 +msgid "Modify Parents" +msgstr "" + #: Date.py:76 msgid "(from|between|bet|bet.)" msgstr "" @@ -244,12 +256,12 @@ msgstr "" msgid "from %(start_date)s to %(stop_date)s" msgstr "" -#: DbPrompter.py:63 DbPrompter.py:111 +#: DbPrompter.py:65 DbPrompter.py:116 gramps_main.py:987 revision.glade:131 msgid "Open a database" msgstr "" -#: DbPrompter.py:102 gramps_main.py:774 gramps_main.py:1046 -#: gramps_main.py:1058 +#: DbPrompter.py:105 gramps_main.py:774 gramps_main.py:1050 +#: gramps_main.py:1062 msgid "No Comment Provided" msgstr "" @@ -263,101 +275,105 @@ msgid "" msgstr "" #: DisplayTrace.py:92 -msgid "Internal Error - GRAMPS" +msgid "Internal Error" msgstr "" -#: EditPerson.py:184 EditPerson.py:210 EditPlace.py:103 GenericFilter.py:310 +#: EditPerson.py:111 +msgid "Edit Person" +msgstr "" + +#: EditPerson.py:186 EditPerson.py:212 EditPlace.py:103 GenericFilter.py:310 #: GenericFilter.py:348 GenericFilter.py:437 GenericFilter.py:469 const.py:353 #: plugins/pafexport.glade:217 msgid "Description" msgstr "" -#: EditPerson.py:184 Marriage.py:143 filters/EventType.py:41 +#: EditPerson.py:186 Marriage.py:142 filters/EventType.py:41 msgid "Event" msgstr "" -#: EditPerson.py:185 EditPerson.py:198 GenericFilter.py:310 +#: EditPerson.py:187 EditPerson.py:200 GenericFilter.py:310 #: GenericFilter.py:348 GenericFilter.py:437 GenericFilter.py:469 -#: Marriage.py:143 filters/After.py:55 filters/Before.py:55 +#: Marriage.py:142 filters/After.py:55 filters/Before.py:55 msgid "Date" msgstr "" -#: EditPerson.py:185 GenericFilter.py:310 GenericFilter.py:348 -#: GenericFilter.py:437 GenericFilter.py:469 ImageSelect.py:830 -#: Marriage.py:143 filters/EventPlace.py:69 marriage.glade:362 +#: EditPerson.py:187 GenericFilter.py:310 GenericFilter.py:348 +#: GenericFilter.py:437 GenericFilter.py:469 ImageSelect.py:845 +#: Marriage.py:142 filters/EventPlace.py:69 marriage.glade:362 msgid "Place" msgstr "" -#: EditPerson.py:192 EditSource.py:158 GenericFilter.py:501 -#: GenericFilter.py:522 ImageSelect.py:609 ImageSelect.py:726 -#: ImageSelect.py:809 Marriage.py:144 marriage.glade:853 +#: EditPerson.py:194 EditSource.py:159 GenericFilter.py:501 +#: GenericFilter.py:522 ImageSelect.py:618 ImageSelect.py:741 +#: ImageSelect.py:824 Marriage.py:143 marriage.glade:853 #: plugins/FilterEditor.py:123 msgid "Value" msgstr "" -#: EditPerson.py:192 ImageSelect.py:609 ImageSelect.py:726 Marriage.py:144 +#: EditPerson.py:194 ImageSelect.py:618 ImageSelect.py:741 Marriage.py:143 msgid "Attribute" msgstr "" -#: EditPerson.py:198 +#: EditPerson.py:200 msgid "Address" msgstr "" -#: EditPerson.py:204 ImageSelect.py:809 MediaView.py:59 +#: EditPerson.py:206 ImageSelect.py:824 MediaView.py:59 msgid "Type" msgstr "" -#: EditPerson.py:210 EditPlace.py:103 +#: EditPerson.py:212 EditPlace.py:103 msgid "Path" msgstr "" -#: EditPerson.py:394 GrampsCfg.py:62 const.py:158 gramps.glade:3480 +#: EditPerson.py:396 GrampsCfg.py:62 const.py:158 gramps.glade:3480 #: gramps.glade:3673 gramps.glade:4095 gramps.glade:4275 gramps.glade:5753 #: gramps.glade:5999 msgid "None" msgstr "" -#: EditPerson.py:411 EditSource.py:140 +#: EditPerson.py:413 EditSource.py:141 msgid "%(father)s and %(mother)s" msgstr "" -#: EditPerson.py:419 const.py:144 plugins/FamilyGroup.py:385 +#: EditPerson.py:421 const.py:144 plugins/FamilyGroup.py:385 #: plugins/IndivComplete.py:259 plugins/IndivSummary.py:155 #: plugins/WebPage.py:537 msgid "unknown" msgstr "" -#: EditPerson.py:807 EditPerson.py:824 +#: EditPerson.py:809 EditPerson.py:826 msgid "Save Changes to %s?" msgstr "" -#: EditPerson.py:808 EditPerson.py:825 Marriage.py:406 +#: EditPerson.py:810 EditPerson.py:827 Marriage.py:405 msgid "If you close without saving, the changes you have made will be lost" msgstr "" -#: EditPerson.py:1152 +#: EditPerson.py:1154 msgid "Make the selected name the preferred name" msgstr "" -#: EditPerson.py:1215 Marriage.py:431 +#: EditPerson.py:1217 Marriage.py:430 msgid "GRAMPS ID value was not changed." msgstr "" -#: EditPerson.py:1216 +#: EditPerson.py:1218 msgid "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This value is already used by %(person)s." msgstr "" -#: EditPerson.py:1330 +#: EditPerson.py:1332 msgid "Problem changing the gender" msgstr "" -#: EditPerson.py:1331 +#: EditPerson.py:1333 msgid "" "Changing the gender caused problems with marriage information.\n" "Please check the person's marriages." msgstr "" -#: EditPlace.py:82 +#: EditPlace.py:83 msgid "Place Editor" msgstr "" @@ -377,72 +393,76 @@ msgstr "" msgid "Country" msgstr "" -#: EditPlace.py:288 EditPlace.py:312 UrlEdit.py:55 +#: EditPlace.py:286 EditPlace.py:310 UrlEdit.py:56 msgid "Internet Address Editor for %s" msgstr "" -#: EditPlace.py:290 EditPlace.py:314 +#: EditPlace.py:288 EditPlace.py:312 UrlEdit.py:57 msgid "Internet Address Editor" msgstr "" -#: EditPlace.py:359 gramps.glade:683 plugins/gedcomexport.glade:644 +#: EditPlace.py:357 gramps.glade:683 plugins/gedcomexport.glade:644 #: plugins/pkgexport.glade:272 msgid "People" msgstr "" -#: EditPlace.py:361 EditPlace.py:369 +#: EditPlace.py:359 EditPlace.py:367 msgid "" "%s [%s]: event %s\n" msgstr "" -#: EditPlace.py:367 plugins/gedcomexport.glade:618 plugins/pkgexport.glade:249 +#: EditPlace.py:365 plugins/gedcomexport.glade:618 plugins/pkgexport.glade:249 msgid "Families" msgstr "" -#: EditSource.py:60 +#: EditSource.py:62 msgid "Source Editor" msgstr "" -#: EditSource.py:158 +#: EditSource.py:159 msgid "Object" msgstr "" -#: EditSource.py:158 +#: EditSource.py:159 msgid "Source Type" msgstr "" -#: EditSource.py:163 +#: EditSource.py:164 msgid "Individual Events" msgstr "" -#: EditSource.py:167 +#: EditSource.py:168 msgid "Individual Attributes" msgstr "" -#: EditSource.py:171 +#: EditSource.py:172 msgid "Individual Names" msgstr "" -#: EditSource.py:174 +#: EditSource.py:175 msgid "Family Events" msgstr "" -#: EditSource.py:178 +#: EditSource.py:179 msgid "Family Attributes" msgstr "" -#: EditSource.py:182 GrampsCfg.py:97 plugins/Summary.py:117 +#: EditSource.py:183 GrampsCfg.py:97 plugins/Summary.py:117 msgid "Media Objects" msgstr "" -#: EditSource.py:185 gramps.glade:867 +#: EditSource.py:186 gramps.glade:867 msgid "Places" msgstr "" -#: EventEdit.py:82 +#: EventEdit.py:85 msgid "Event Editor for %s" msgstr "" +#: EventEdit.py:86 +msgid "Event Editor" +msgstr "" + #: FamilyView.py:147 gramps_main.py:91 plugins/IndivComplete.py:381 #: plugins/IndivSummary.py:225 plugins/WebPage.py:284 plugins/WebPage.py:286 #: plugins/WebPage.py:288 @@ -475,11 +495,11 @@ msgstr "" msgid "%s: unknown" msgstr "" -#: FamilyView.py:432 Plugins.py:406 Plugins.py:407 Plugins.py:408 -#: Plugins.py:420 Plugins.py:421 Plugins.py:422 Witness.py:72 const.py:159 +#: FamilyView.py:432 Plugins.py:409 Plugins.py:410 Plugins.py:411 +#: Plugins.py:423 Plugins.py:424 Plugins.py:425 Witness.py:71 const.py:159 #: const.py:434 const.py:442 gramps.glade:3502 gramps.glade:3695 #: gramps.glade:4117 gramps.glade:4297 gramps.glade:5775 gramps.glade:6021 -#: gramps_main.py:1220 plugins/WebPage.py:288 +#: gramps_main.py:1224 plugins/WebPage.py:288 msgid "Unknown" msgstr "" @@ -575,8 +595,8 @@ msgstr "" msgid "Suffix" msgstr "" -#: GenericFilter.py:547 MediaView.py:59 SourceView.py:54 Sources.py:74 -#: Sources.py:144 plugins/TimeLine.py:341 +#: GenericFilter.py:547 MediaView.py:59 SourceView.py:54 Sources.py:75 +#: Sources.py:145 plugins/TimeLine.py:341 msgid "Title" msgstr "" @@ -812,44 +832,56 @@ msgstr "" msgid "Hebrew" msgstr "" -#: ImageSelect.py:346 +#: ImageSelect.py:106 +msgid "Select a media object" +msgstr "" + +#: ImageSelect.py:350 msgid "Thumbnail %s could not be found" msgstr "" -#: ImageSelect.py:436 RelImage.py:56 plugins/ReadGedcom.py:902 +#: ImageSelect.py:440 RelImage.py:56 plugins/ReadGedcom.py:902 #: plugins/ReadGedcom.py:937 plugins/ReadGedcom.py:972 msgid "Could not import %s" msgstr "" -#: ImageSelect.py:539 MediaView.py:166 +#: ImageSelect.py:543 MediaView.py:166 msgid "Media Object" msgstr "" -#: ImageSelect.py:544 +#: ImageSelect.py:548 msgid "Open in %s" msgstr "" -#: ImageSelect.py:547 MediaView.py:170 +#: ImageSelect.py:551 MediaView.py:170 msgid "Edit with the GIMP" msgstr "" -#: ImageSelect.py:549 MediaView.py:172 +#: ImageSelect.py:553 MediaView.py:172 msgid "Edit Object Properties" msgstr "" -#: ImageSelect.py:552 MediaView.py:175 +#: ImageSelect.py:556 MediaView.py:175 msgid "Convert to local copy" msgstr "" -#: ImageSelect.py:816 plugins/EventCmp.py:288 +#: ImageSelect.py:607 +msgid "Change local media object properties" +msgstr "" + +#: ImageSelect.py:727 +msgid "Change global media object properites" +msgstr "" + +#: ImageSelect.py:831 plugins/EventCmp.py:288 msgid "Person" msgstr "" -#: ImageSelect.py:820 gramps.glade:729 +#: ImageSelect.py:835 gramps.glade:729 msgid "Family" msgstr "" -#: ImageSelect.py:825 Utils.py:181 Utils.py:183 +#: ImageSelect.py:840 Utils.py:181 Utils.py:183 msgid "Source" msgstr "" @@ -857,24 +889,24 @@ msgstr "" msgid "Julian" msgstr "" -#: LocEdit.py:58 +#: LocEdit.py:59 msgid "Location Editor" msgstr "" -#: Marriage.py:81 +#: Marriage.py:83 msgid "Marriage/Relationship Editor" msgstr "" -#: Marriage.py:107 Marriage.py:567 Marriage.py:585 Utils.py:132 +#: Marriage.py:107 Marriage.py:566 Marriage.py:584 Utils.py:132 #: plugins/Check.py:161 plugins/Check.py:180 msgid "%s and %s" msgstr "" -#: Marriage.py:405 +#: Marriage.py:404 msgid "Save Changes?" msgstr "" -#: Marriage.py:432 +#: Marriage.py:431 msgid "The GRAMPS ID that you chose for this relationship is already being used." msgstr "" @@ -898,6 +930,10 @@ msgstr "" msgid "Alternate Name Editor for %s" msgstr "" +#: NameEdit.py:80 +msgid "Alternate Name Editor" +msgstr "" + #: NoteEdit.py:50 NoteEdit.py:57 msgid "Edit Note" msgstr "" @@ -950,19 +986,23 @@ msgstr "" msgid "No description was provided" msgstr "" -#: Plugins.py:239 +#: Plugins.py:241 msgid "Report Selection" msgstr "" -#: Plugins.py:255 +#: Plugins.py:257 msgid "Tool Selection" msgstr "" -#: Plugins.py:277 +#: Plugins.py:273 +msgid "Plugin status" +msgstr "" + +#: Plugins.py:280 msgid "The following modules could not be loaded:" msgstr "" -#: Plugins.py:403 Plugins.py:417 +#: Plugins.py:406 Plugins.py:420 msgid "Uncategorized" msgstr "" @@ -970,7 +1010,7 @@ msgstr "" msgid "Error" msgstr "" -#: QuickAdd.py:44 +#: QuickAdd.py:45 msgid "Add Person" msgstr "" @@ -1174,10 +1214,6 @@ msgstr "" msgid "Working" msgstr "" -#: Report.py:251 -msgid "Base Report - GRAMPS" -msgstr "" - #: Report.py:265 msgid "Save Report As - GRAMPS" msgstr "" @@ -1287,7 +1323,7 @@ msgstr "" msgid "Add Children" msgstr "" -#: SelectChild.py:82 SelectChild.py:87 SelectChild.py:91 +#: SelectChild.py:81 SelectChild.py:86 SelectChild.py:90 #: plugins/RelCalc.py:319 msgid "Relationship to %s" msgstr "" @@ -1308,11 +1344,11 @@ msgstr "" msgid "Delete Source" msgstr "" -#: Sources.py:57 +#: Sources.py:59 msgid "Source Reference Selection" msgstr "" -#: Sources.py:215 +#: Sources.py:218 msgid "Source Information" msgstr "" @@ -1356,7 +1392,7 @@ msgstr "" msgid "Witness" msgstr "" -#: Witness.py:61 +#: Witness.py:133 msgid "Witness Editor" msgstr "" @@ -1788,10 +1824,6 @@ msgstr "" msgid "Other Name" msgstr "" -#: dialog.glade:8 -msgid "Event Editor - GRAMPS" -msgstr "" - #: dialog.glade:34 msgid "Close window without changes" msgstr "" @@ -1884,10 +1916,6 @@ msgstr "" msgid "Witnesses" msgstr "" -#: dialog.glade:890 -msgid "Attribute Editor - GRAMPS" -msgstr "" - #: dialog.glade:998 msgid "_Attribute:" msgstr "" @@ -1896,10 +1924,6 @@ msgstr "" msgid "_Value:" msgstr "" -#: dialog.glade:1399 -msgid "Location Editor - GRAMPS" -msgstr "" - #: dialog.glade:1494 places.glade:147 preferences.glade:1426 msgid "_City:" msgstr "" @@ -1920,10 +1944,6 @@ msgstr "" msgid "Church _Parish:" msgstr "" -#: dialog.glade:1758 -msgid "Address Editor - GRAMPS" -msgstr "" - #: dialog.glade:1794 dialog.glade:2531 dialog.glade:2778 gramps.glade:4447 #: marriage.glade:48 msgid "Accept and close" @@ -1941,10 +1961,6 @@ msgstr "" msgid "_ZIP/Postal code:" msgstr "" -#: dialog.glade:2494 -msgid "Internet Address Editor - GRAMPS" -msgstr "" - #: dialog.glade:2591 msgid "_Web address:" msgstr "" @@ -1957,27 +1973,23 @@ msgstr "" msgid "_Private record" msgstr "" -#: dialog.glade:2741 -msgid "Alternate Name Editor - GRAMPS" -msgstr "" - #: dialog.glade:2764 gramps.glade:4433 marriage.glade:34 msgid "Reject changes and close" msgstr "" -#: dialog.glade:2850 edit_person.glade:130 gramps.glade:5192 -msgid "_Given:" +#: dialog.glade:2850 edit_person.glade:130 +msgid "_Given name:" msgstr "" -#: dialog.glade:2878 edit_person.glade:155 -msgid "_Last:" +#: dialog.glade:2878 +msgid "_Family Name:" msgstr "" -#: dialog.glade:2906 -msgid "_Suffix:" +#: dialog.glade:2906 edit_person.glade:205 +msgid "Suffi_x:" msgstr "" -#: dialog.glade:2934 edit_person.glade:280 +#: dialog.glade:2934 msgid "T_ype:" msgstr "" @@ -1990,12 +2002,8 @@ msgstr "" msgid "P_rivate record" msgstr "" -#: dialog.glade:3011 edit_person.glade:180 -msgid "_Prefix:" -msgstr "" - -#: dialog.glade:3533 -msgid "Edit Witness - GRAMPS" +#: dialog.glade:3011 +msgid "Family _Prefix:" msgstr "" #: dialog.glade:3627 preferences.glade:2380 @@ -2069,10 +2077,6 @@ msgstr "" msgid "SVG (Scalable Vector Graphics)" msgstr "" -#: edit_person.glade:10 -msgid "Edit Person - GRAMPS" -msgstr "" - #: edit_person.glade:34 msgid "Abandon changes and close window" msgstr "" @@ -2081,14 +2085,22 @@ msgstr "" msgid "Accept changes and close dialog" msgstr "" -#: edit_person.glade:205 -msgid "Suffi_x:" +#: edit_person.glade:155 +msgid "_Family name:" +msgstr "" + +#: edit_person.glade:180 +msgid "Family _prefix:" msgstr "" #: edit_person.glade:255 msgid "_Nickname:" msgstr "" +#: edit_person.glade:280 +msgid "T_ype" +msgstr "" + #: edit_person.glade:373 msgid "Invoke birth event editor" msgstr "" @@ -2150,8 +2162,8 @@ msgstr "" msgid "_male" msgstr "" -#: edit_person.glade:740 gramps.glade:5163 -msgid "_female" +#: edit_person.glade:740 +msgid "fema_le" msgstr "" #: edit_person.glade:759 @@ -2845,10 +2857,6 @@ msgstr "" msgid "Select File - GRAMPS" msgstr "" -#: gramps.glade:2558 -msgid "Choose Spouse - GRAMPS" -msgstr "" - #: gramps.glade:2734 msgid "_Relationship type:" msgstr "" @@ -2858,10 +2866,6 @@ msgid "" "Relationship definition\n" msgstr "" -#: gramps.glade:2879 -msgid "Choose Parents - GRAMPS" -msgstr "" - #: gramps.glade:2982 msgid "_Father's relationship to child:" msgstr "" @@ -2894,10 +2898,6 @@ msgstr "" msgid "Show _all" msgstr "" -#: gramps.glade:3769 -msgid "Add Children - GRAMPS" -msgstr "" - #: gramps.glade:4350 msgid "Relationship to father:" msgstr "" @@ -2906,10 +2906,6 @@ msgstr "" msgid "Relationship to mother:" msgstr "" -#: gramps.glade:4408 -msgid "Source Editor - GRAMPS" -msgstr "" - #: gramps.glade:4549 msgid "_Author:" msgstr "" @@ -2922,10 +2918,6 @@ msgstr "" msgid "References" msgstr "" -#: gramps.glade:4964 -msgid "Add Person - GRAMPS" -msgstr "" - #: gramps.glade:5059 msgid "_Surname:" msgstr "" @@ -2934,8 +2926,12 @@ msgstr "" msgid "Gender:" msgstr "" -#: gramps.glade:5300 -msgid "Open a Database - GRAMPS" +#: gramps.glade:5163 +msgid "_female" +msgstr "" + +#: gramps.glade:5192 +msgid "_Given:" msgstr "" #: gramps.glade:5391 @@ -2950,10 +2946,6 @@ msgstr "" msgid "Create a new _ZODB database" msgstr "" -#: gramps.glade:5456 -msgid "Modify Parents - GRAMPS" -msgstr "" - #: gramps.glade:5605 msgid "_Relationship:" msgstr "" @@ -3076,82 +3068,74 @@ msgstr "" msgid "Delete Person" msgstr "" -#: gramps_main.py:996 +#: gramps_main.py:1000 msgid "Do you wish to abandon your changes and revert to the last saved database?" msgstr "" -#: gramps_main.py:999 +#: gramps_main.py:1003 msgid "Revert to last saved database?" msgstr "" -#: gramps_main.py:1000 +#: gramps_main.py:1004 msgid "Reverting to the last saved database will cause all unsaved changes to be lost, and the last saved database will be loaded." msgstr "" -#: gramps_main.py:1003 +#: gramps_main.py:1007 msgid "Revert" msgstr "" -#: gramps_main.py:1006 +#: gramps_main.py:1010 msgid "Cannot revert to a previous database, since one does not exist" msgstr "" -#: gramps_main.py:1008 +#: gramps_main.py:1012 msgid "Could Not Revert to the Previous Database." msgstr "" -#: gramps_main.py:1009 +#: gramps_main.py:1013 msgid "GRAMPS could not find a previous version of the database" msgstr "" -#: gramps_main.py:1311 +#: gramps_main.py:1315 msgid "Loading %s..." msgstr "" -#: gramps_main.py:1406 +#: gramps_main.py:1410 msgid "No home person has been set." msgstr "" -#: gramps_main.py:1407 +#: gramps_main.py:1411 msgid "The home person may be set from the Settings menu." msgstr "" -#: gramps_main.py:1413 +#: gramps_main.py:1417 msgid "%s has been bookmarked" msgstr "" -#: gramps_main.py:1416 +#: gramps_main.py:1420 msgid "Could Not Set a Bookmark." msgstr "" -#: gramps_main.py:1417 +#: gramps_main.py:1421 msgid "A bookmark could not be set because no one was selected." msgstr "" -#: gramps_main.py:1429 +#: gramps_main.py:1433 msgid "Do you wish to set %s as the home person?" msgstr "" -#: gramps_main.py:1431 +#: gramps_main.py:1435 msgid "Set %s as the Home Person" msgstr "" -#: gramps_main.py:1432 +#: gramps_main.py:1436 msgid "Once a Home Person is defined, pressing the Home button on the toolbar will make the home person the active person." msgstr "" -#: gramps_main.py:1435 +#: gramps_main.py:1439 msgid "Set Home Person" msgstr "" -#: imagesel.glade:9 -msgid "Select a Media Object - GRAMPS" -msgstr "" - -#: imagesel.glade:75 -msgid "Select a Media Object" -msgstr "" - #: imagesel.glade:206 msgid "_File:" msgstr "" @@ -3164,14 +3148,6 @@ msgstr "" msgid "_Do not make a local copy" msgstr "" -#: imagesel.glade:356 -msgid "Change Local Media Object Properties - GRAMPS" -msgstr "" - -#: imagesel.glade:423 -msgid "Change Local Media Object Properties" -msgstr "" - #: imagesel.glade:553 imagesel.glade:1299 msgid "Object type:" msgstr "" @@ -3180,14 +3156,6 @@ msgstr "" msgid "Creates a new object attribute from the above data" msgstr "" -#: imagesel.glade:1102 -msgid "Change Global Media Object Properties - GRAMPS" -msgstr "" - -#: imagesel.glade:1169 -msgid "Change Global Media Object Properties" -msgstr "" - #: imagesel.glade:1509 msgid "Copies the object into the database" msgstr "" @@ -3200,10 +3168,6 @@ msgstr "" msgid "Creates a new attribute from the above data" msgstr "" -#: marriage.glade:9 -msgid "Marriage/Relationship Editor - GRAMPS" -msgstr "" - #: marriage.glade:127 msgid "_Relationship Type:" msgstr "" @@ -3304,10 +3268,6 @@ msgstr "" msgid "Keep other death event as an alternate death event" msgstr "" -#: places.glade:9 -msgid "Place Editor - GRAMPS" -msgstr "" - #: places.glade:231 msgid "Co_untry:" msgstr "" @@ -3344,10 +3304,6 @@ msgstr "" msgid "Web address:" msgstr "" -#: plugins.glade:8 -msgid "Report Selection - GRAMPS" -msgstr "" - #: plugins.glade:179 msgid "Select a report from those available on the left." msgstr "" @@ -5480,18 +5436,10 @@ msgstr "" msgid "Customization" msgstr "" -#: revision.glade:10 -msgid "Open a database - GRAMPS" -msgstr "" - #: revision.glade:104 msgid "_Database:" msgstr "" -#: revision.glade:131 -msgid "Open a GRAMPS Database" -msgstr "" - #: revision.glade:162 msgid "_Revert to an older version from revision control" msgstr "" @@ -5576,10 +5524,6 @@ msgstr "" msgid "Test Filter - GRAMPS" msgstr "" -#: srcsel.glade:8 -msgid "Source Information - GRAMPS" -msgstr "" - #: srcsel.glade:110 msgid "_Confidence:" msgstr "" @@ -5608,10 +5552,6 @@ msgstr "" msgid "Source Selection" msgstr "" -#: srcsel.glade:682 -msgid "Source Reference Selection - GRAMPS" -msgstr "" - #: srcsel.glade:783 msgid "Double click will edit the selected source" msgstr "" diff --git a/gramps2/src/revision.glade b/gramps2/src/revision.glade index 3447c2afe..36e7ab645 100644 --- a/gramps2/src/revision.glade +++ b/gramps2/src/revision.glade @@ -7,7 +7,7 @@ 450 True - Open a database - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -128,7 +128,7 @@ True recentdbs 10 - Open a GRAMPS Database + Open a database True False diff --git a/gramps2/src/srcsel.glade b/gramps2/src/srcsel.glade index 0fd180af2..1929a83df 100644 --- a/gramps2/src/srcsel.glade +++ b/gramps2/src/srcsel.glade @@ -5,7 +5,7 @@ True - Source Information - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -679,7 +679,7 @@ True - Source Reference Selection - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False