Merge branch 't3739' into next. Incubates #3739

readme.txt

@@ -8,7 +8,7 @@ The NVDA source depends on several other packages to run correctly.
 
 === Installed Dependencies ===
 The following dependencies need to be installed on your system:
-* Python, version 2.7.5, 32 bit: http://www.python.org/
+* Python, version 2.7.6, 32 bit: http://www.python.org/
 * Microsoft Visual Studio 2012 Update 1 or later (Express for Windows Desktop, or Professional)
 	* Download for Visual Studio Express 2012 (Windows Desktop): http://www.microsoft.com/en-au/download/details.aspx?id=34673
 	* Download for Visual Studio 2012 latest update package: http://go.microsoft.com/fwlink/?LinkId=301713 
@@ -24,7 +24,7 @@ The following dependencies are included in Git submodules:
 * comtypes, version 0.6.2: http://sourceforge.net/projects/comtypes/
 * wxPython, version 2.8.12.1 unicode: http://www.wxpython.org/
 * Python Windows Extensions, build 218: http://sourceforge.net/projects/pywin32/ 
-* eSpeak, version 1.47.11: http://espeak.sourceforge.net/
+* eSpeak, version 1.47.16: http://espeak.sourceforge.net/
 * IAccessible2, version 1.3: http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2
 * ConfigObj, version 4.6.0: http://www.voidspace.org.uk/python/configobj.html
 * liblouis, version 2.5.3: http://www.liblouis.org/

sconstruct

@@ -1,7 +1,7 @@
 ###
 #This file is a part of the NVDA project.
 #URL: http://www.nvda-project.org/
-#Copyright 2010 James Teh <jamie@jantrid.net>.
+#Copyright 2010-2014 NV Access Limited.
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License version 2.0, as published by
 #the Free Software Foundation.
@@ -299,6 +299,8 @@ def makePot(target, source, env):
 			"--foreign-user",
 			"--add-comments=Translators:",
 			"--keyword=pgettext:1c,2",
+			# Needed because xgettext doesn't recognise the .pyw extension.
+			"--language=python",
 		] + [os.path.relpath(str(f), str(sourceDir)) for f in source]
 	]) != 0:
 		raise RuntimeError("xgettext failed")
@@ -341,7 +343,7 @@ env.Clean('devDocs', [devGuide, devDocs_nvda])
 pot = env.Command(outputDir.File("%s.pot" % outFilePrefix),
 	# Don't use sourceDir as the source, as this depends on comInterfaces and nvdaHelper.
 	# We only depend on the Python files.
-	[f for pattern in ("*.py", r"*\*.py", r"*\*\*.py") for f in env.Glob(os.path.join(sourceDir.path, pattern))],
+	[f for pattern in ("*.py", "*.pyw", r"*\*.py", r"*\*\*.py") for f in env.Glob(os.path.join(sourceDir.path, pattern))],
 	makePot)
 
 env.Alias("pot", pot)

source/setup.py

@@ -165,7 +165,7 @@ def getRecursiveDataFiles(dest,source,excludes=()):
 			"script": "nvda_slave.pyw",
 			"icon_resources": [(1,"images/nvda.ico")],
 			"version": "0.0.0.0",
-			"description": "NVDA slave",
+			"description": name,
 			"product_version": version,
 			"copyright": copyright,
 			"company_name": publisher,

source/versionInfo.py

@@ -1,6 +1,6 @@
 #versionInfo.py
 #A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2006-2013 NV Access Limited
+#Copyright (C) 2006-2014 NV Access Limited
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
@@ -38,7 +38,7 @@ def _updateVersionFromVCS():
 	_updateVersionFromVCS()
 description=_("A free and open source screen reader for Microsoft Windows")
 url="http://www.nvaccess.org/"
-copyrightYears="2006-2013"
+copyrightYears="2006-2014"
 copyright=_("Copyright (C) {years} NVDA Contributors").format(
 	years=copyrightYears)
 aboutMessage=_(u"""{longName} ({name})