Merge branch 'master' of ssh://git.code.sf.net/p/gramps/source

This commit is contained in:
Doug Blank 2013-12-19 22:50:34 -05:00
commit 870f776fa5
3 changed files with 7 additions and 3 deletions

View File

@ -50,7 +50,7 @@ else:
def display_help(webpage='', section=''):
"""
Display the specified webpage and section from the Gramps 3.0 wiki.
Display the specified webpage and section from the Gramps wiki.
"""
if not webpage:
link = URL_WIKISTRING + URL_MANUAL_PAGE + EXTENSION

View File

@ -156,7 +156,9 @@ class EditName(EditSecondary):
def _connect_signals(self):
self.define_cancel_button(self.top.get_object('button119'))
self.define_help_button(self.top.get_object('button131'))
self.define_help_button(self.top.get_object('button131'),
_('Gramps_4.1_Wiki_Manual_-_Entering_and_editing_data:_detailed_-_part_3'),
_('manpage section id|Name_Editor'))
self.define_ok_button(self.top.get_object('button118'), self.save)
def _validate_call(self, widget, text):

View File

@ -234,7 +234,9 @@ class EditPerson(EditPrimary):
"""
self.define_cancel_button(self.top.get_object("button15"))
self.define_ok_button(self.top.get_object("ok"), self.save)
self.define_help_button(self.top.get_object("button134"))
self.define_help_button(self.top.get_object("button134"),
_('Gramps_4.1_Wiki_Manual_-_Entering_and_editing_data:_detailed_-_part_1'),
_('manpage section id|Editing_information_about_people'))
self.given.connect("focus_out_event", self._given_focus_out_event)
self.top.get_object("editnamebtn").connect("clicked",