Merge branch 'master' into geps/gep-032-database-backend
This commit is contained in:
commit
56796d57b4
@ -150,7 +150,7 @@ register('behavior.surname-guessing', 0)
|
||||
register('behavior.use-tips', False)
|
||||
register('behavior.welcome', 100)
|
||||
register('behavior.web-search-url', 'http://google.com/#&q=%(text)s')
|
||||
register('behavior.addons-url', "https://raw.githubusercontent.com/gramps-project/addons/master/gramps42")
|
||||
register('behavior.addons-url', "https://raw.githubusercontent.com/gramps-project/addons/master/gramps50")
|
||||
|
||||
register('export.proxy-order', [
|
||||
["privacy", 0],
|
||||
|
@ -18,7 +18,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -19,7 +19,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -18,7 +18,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -21,7 +21,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -18,7 +18,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -18,7 +18,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -19,7 +19,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -18,7 +18,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -19,7 +19,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -19,7 +19,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#
|
||||
# Relationship calculators
|
||||
|
@ -19,7 +19,7 @@
|
||||
#
|
||||
# $Id: sidebar.gpr.py 20634 2012-11-07 17:53:14Z bmcage $
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -19,7 +19,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -22,7 +22,7 @@
|
||||
GRAMPS registration file
|
||||
"""
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -22,7 +22,7 @@
|
||||
GRAMPS registration file
|
||||
"""
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -25,7 +25,7 @@
|
||||
#
|
||||
#------------------------------------------------------------------------
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
from gi import Repository
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -18,7 +18,7 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
# plugins/webstuff/webstuff.gpr.py
|
||||
|
||||
MODULE_VERSION="4.2"
|
||||
MODULE_VERSION="5.0"
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
@ -18,6 +18,6 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
VERSION_TUPLE = (4, 2, 0)
|
||||
VERSION_TUPLE = (5, 0, 0)
|
||||
VERSION = '.'.join(map(str,VERSION_TUPLE))
|
||||
major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1])
|
||||
|
488
po/en_GB.po
488
po/en_GB.po
File diff suppressed because it is too large
Load Diff
438
po/gramps.pot
438
po/gramps.pot
File diff suppressed because it is too large
Load Diff
505
po/pt_BR.po
505
po/pt_BR.po
File diff suppressed because it is too large
Load Diff
505
po/pt_PT.po
505
po/pt_PT.po
File diff suppressed because it is too large
Load Diff
488
po/sr_Latn.po
488
po/sr_Latn.po
File diff suppressed because it is too large
Load Diff
494
po/zh_CN.po
494
po/zh_CN.po
File diff suppressed because it is too large
Load Diff
494
po/zh_HK.po
494
po/zh_HK.po
File diff suppressed because it is too large
Load Diff
494
po/zh_TW.po
494
po/zh_TW.po
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user