Merge remote-tracking branch 'origin/threshold' into threshold_py3_st…

…aging

 Conflicts:
	source/gui/settingsDialogs.py

source/NVDAObjects/UIA/winConsoleUIA.py

@@ -34,7 +34,7 @@ def collapse(self,end=False):
 		# textRange back one character.
 		# Correct this by bringing the start back up to where the end is.
 		oldInfo=self.copy()
-		super(consoleUIATextInfo,self).collapse()
+		super(consoleUIATextInfo,self).collapse(end=end)
 		if not end:
 			self._rangeObj.MoveEndpointByRange(
 				UIAHandler.TextPatternRangeEndpoint_Start,

source/appModules/kindle.py

@@ -137,7 +137,7 @@ def script_showSelectionOptions(self, gesture):
 		# so retrieve and report the selection from Kindle.
 		# we can't just use self.makeTextInfo, as that will use our fake selection.
 		realSel = self.rootNVDAObject.makeTextInfo(textInfos.POSITION_SELECTION)
-		speech.speakSelectedText(realSel.text)
+		speech.speakTextSelected(realSel.text)
 		# Remove our virtual selection and move the caret to the active end.
 		fakeSel.innerTextInfo = realSel
 		fakeSel.collapse(end=not self._lastSelectionMovedStart)

source/appModules/powerpnt.py

@@ -1081,7 +1081,7 @@ def event_treeInterceptor_gainFocus(self):
 		else:
 			info = self.selection
 			if not info.isCollapsed:
-				speech.speakSelectedText(info.text)
+				speech.speakPreselectedText(info.text)
 			else:
 				info.expand(textInfos.UNIT_LINE)
 				speech.speakTextInfo(info, reason=controlTypes.REASON_CARET, unit=textInfos.UNIT_LINE)

source/browseMode.py

@@ -1220,7 +1220,7 @@ def event_treeInterceptor_gainFocus(self):
 						speech.speakObject(self.rootNVDAObject, reason=controlTypes.REASON_FOCUS)
 				info = self.selection
 				if not info.isCollapsed:
-					speech.speakSelectedText(info.text)
+					speech.speakPreselectedText(info.text)
 				else:
 					info.expand(textInfos.UNIT_LINE)
 					speech.speakTextInfo(info, reason=controlTypes.REASON_CARET, unit=textInfos.UNIT_LINE)

source/buildVersion.py

@@ -65,7 +65,7 @@ def formatVersionForGUI(year, major, minor):
 
 name="NVDA"
 version_year=2019
-version_major=3
+version_major=2
 version_minor=0
 version_build=0
 version=_formatDevVersionString()

source/compoundDocuments.py

@@ -457,7 +457,7 @@ def event_treeInterceptor_gainFocus(self):
 				info.expand(textInfos.UNIT_LINE)
 				speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.REASON_CARET)
 			else:
-				speech.speakSelectedText(info.text)
+				speech.speakPreselectedText(info.text)
 			braille.handler.handleGainFocus(self)
 			self.initAutoSelectDetection()
 

source/globalCommands.py

@@ -210,7 +210,7 @@ def script_reportCurrentSelection(self,gesture):
 		if not info or info.isCollapsed:
 			speech.speakMessage(_("No selection"))
 		else:
-			speech.speakSelectedText(info.text)
+			speech.speakTextSelected(info.text)
 	# Translators: Input help mode message for report current selection command.
 	script_reportCurrentSelection.__doc__=_("Announces the current selection in edit controls and documents. If there is no selection it says so.")
 	script_reportCurrentSelection.category=SCRCAT_SYSTEMCARET

source/gui/settingsDialogs.py

@@ -48,7 +48,6 @@
 import time
 import keyLabels
 from .dpiScalingHelper import DpiScalingHelperMixin
-import warnings
 
 class SettingsDialog(wx.Dialog, DpiScalingHelperMixin, metaclass=guiHelper.SIPABCMeta):
 	"""A settings dialog.
@@ -3365,11 +3364,3 @@ def onOk(self, evt):
 					_("Error"), wx.OK | wx.ICON_ERROR)
 
 		super(InputGesturesDialog, self).onOk(evt)
-
-class VoiceSettingsSlider(nvdaControls.EnhancedInputSlider):
-	"""@Deprecated: use L{gui.NVDAControls.EnhancedInputSlider} instead."""
-
-	def __init__(self,*args, **kwargs):
-		warnings.warn("gui.settingsDialogs.VoiceSettingsSlider is deprecated. Use gui.NVDAControls.EnhancedInputSlider instead",
-			DeprecationWarning, stacklevel=2)
-		super(VoiceSettingsSlider,self).__init__(*args,**kwargs)

source/locale/ar/LC_MESSAGES/nvda.po

@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: master-10703,53a09c4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-14 00:10+1000\n"
-"PO-Revision-Date: 2019-06-19 13:01+0300\n"
+"POT-Creation-Date: 2019-07-11 23:26+1000\n"
+"PO-Revision-Date: 2019-07-08 14:57+0300\n"
 "Last-Translator: \n"
 "Language-Team: AR <arabictranslationteam@googlegroups.com>\n"
 "Language: ar\n"
@@ -1760,12 +1760,6 @@ msgstr "%s علامة دليلية"
 msgid "lmk %s"
 msgstr "lmk %s"
 
-#. Translators: This is spoken to indicate what has been selected. for example 'selected hello world'
-#. Translators: Announces selected text. %s is replaced with the text.
-#, python-format
-msgid "selected %s"
-msgstr "%s محدد"
-
 #. Translators: the message presented when the activateLongDescription script cannot locate a long description to activate.
 msgid "No long description"
 msgstr "لا يوجد وصف تفصيليالإعلام عن &وصف الكائن"
@@ -3116,10 +3110,6 @@ msgstr "تثبيت زر الفأرة الأيمن"
 msgid "Locks or unlocks the right mouse button"
 msgstr "تثبيت أو تحرير زر الفأرة الأيمن"
 
-#, python-format
-msgid "Selected %s"
-msgstr "%s محدد"
-
 #. Translators: Input help mode message for report current selection command.
 msgid ""
 "Announces the current selection in edit controls and documents. If there is "
@@ -3781,6 +3771,30 @@ msgid ""
 "situated in the current navigator object and speaks it"
 msgstr "استعراض آخر حرف بالسطر"
 
+#. Translators: Input help mode message for Review Current Symbol command.
+msgid ""
+"Reports the symbol where the review cursor is positioned. Pressed twice, "
+"shows the symbol and the text used to speak it in browse mode"
+msgstr ""
+"نُطق النص البديل للرمز الحالي. ينطق الرمز الذي يقع عنده مؤشّر الاستعراض. "
+"بالضغط عليه مرتين، يعرض الرمز والنص المستخدم لنُطقه في نمط الاستعراض."
+
+#. Translators: Reported when there is no replacement for the symbol at the position of the review cursor.
+msgid "No symbol replacement"
+msgstr "لا يوجد نص بديل للرمز"
+
+#. Translators: Character and its replacement used from the "Review current Symbol" command. Example: "Character: ? Replacement: question"
+msgid ""
+"Character: {}\n"
+"Replacement: {}"
+msgstr ""
+"الحرف: {}\n"
+"النصّ البديل: {}"
+
+#. Translators: title for expanded symbol dialog. Example: "Expanded symbol (English)"
+msgid "Expanded symbol ({})"
+msgstr "الرمز الموسَّع ({})"
+
 #. Translators: A speech mode which disables speech output.
 msgid "Speech mode off"
 msgstr "نمط النطق تعطيل"
@@ -5989,16 +6003,25 @@ msgstr "cap %s"
 msgid "no indent"
 msgstr "لا توجد إزاحة"
 
-#. Translators: This is spoken when the user has selected a large portion of text. Example output "1000 characters"
+#. Translators: This is spoken to indicate that some text is already selected.
+#. 'selected' preceding text is intentional.
+#. For example 'selected hello world'
 #, python-format
-msgid "%d characters"
-msgstr "%d أحرف"
+msgid "selected %s"
+msgstr "%s محدد"
 
-#. Translators: This is spoken while the user is in the process of selecting something, For example: "hello selected"
+#. Translators: This is spoken to indicate what has just been selected.
+#. The text preceding 'selected' is intentional.
+#. For example 'hello world selected'
 #, python-format
 msgid "%s selected"
 msgstr "%s محدد"
 
+#. Translators: This is spoken when the user has selected a large portion of text. Example output "1000 characters"
+#, python-format
+msgid "%d characters"
+msgstr "%d أحرف"
+
 #. Translators: This is spoken to indicate what has been unselected. for example 'hello unselected'
 #, python-format
 msgid "%s unselected"
@@ -9317,6 +9340,17 @@ msgstr ""
 "استخدام UI Automation للوصول إلى تحكمات المستند في Microsoft &Word  عندما "
 "يكون متاحا"
 
+#. Translators: This is the label for a checkbox in the
+#. Advanced settings panel.
+msgid "Use UI Automation to access the Windows Console when available"
+msgstr "استخدام UI Automation للوصول ل Windows Console عندما يكون متاحا"
+
+#. Translators: This is the label for a checkbox in the
+#. Advanced settings panel.
+msgid "Speak &passwords in UIA consoles (may improve performance)"
+msgstr ""
+"نُطق &كلمات المرور في وحدات التحكّم عند تفعيل UIA (قد يُسهِمُ في تحسين الأداء)"
+
 #. Translators: This is the label for a checkbox in the
 #. Advanced settings panel.
 msgid "Automatically set system &focus to focusable elements"
@@ -11151,6 +11185,9 @@ msgstr "تباعد الأسطر بمسافة مزدوجة"
 msgid "1.5 line spacing"
 msgstr "1.5 تباعد السطر"
 
+#~ msgid "Selected %s"
+#~ msgstr "%s محدد"
+
 #~ msgid "Currently running application is %s"
 #~ msgstr "البرنامج المستخدم حاليا هو %s"
 

source/locale/da/LC_MESSAGES/nvda.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NVDA bzr main:5884\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-31 00:10+1000\n"
+"POT-Creation-Date: 2019-07-11 23:26+1000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Nicolai Svendsen <chojiro1990@gmail.com>\n"
 "Language-Team: Dansk NVDA <dansk@nvda.dk>\n"
@@ -1762,12 +1762,6 @@ msgstr "%s landmærke"
 msgid "lmk %s"
 msgstr "lmk %s"
 
-#. Translators: This is spoken to indicate what has been selected. for example 'selected hello world'
-#. Translators: Announces selected text. %s is replaced with the text.
-#, python-format
-msgid "selected %s"
-msgstr "valgt %s"
-
 #. Translators: the message presented when the activateLongDescription script cannot locate a long description to activate.
 msgid "No long description"
 msgstr "Ingen lang beskrivelse tilgængelig"
@@ -3126,10 +3120,6 @@ msgstr "Lås højre museknap"
 msgid "Locks or unlocks the right mouse button"
 msgstr "Låser højre museknap eller låser den op"
 
-#, python-format
-msgid "Selected %s"
-msgstr "Valgt %s"
-
 #. Translators: Input help mode message for report current selection command.
 msgid ""
 "Announces the current selection in edit controls and documents. If there is "
@@ -3827,6 +3817,30 @@ msgstr ""
 "Flytter læsemarkøren til sidste tegn på linjen i det aktuelle "
 "navigatorobjekt og læser det op.  "
 
+#. Translators: Input help mode message for Review Current Symbol command.
+msgid ""
+"Reports the symbol where the review cursor is positioned. Pressed twice, "
+"shows the symbol and the text used to speak it in browse mode"
+msgstr ""
+"Oplyser symbolet under læsemarkøren. Ved et dobbelttryk, vil symbolet samt "
+"teksten der bruges til at udtale symbolet vises i gennemsynstilstand."
+
+#. Translators: Reported when there is no replacement for the symbol at the position of the review cursor.
+msgid "No symbol replacement"
+msgstr "Ingen symbolerstatning"
+
+#. Translators: Character and its replacement used from the "Review current Symbol" command. Example: "Character: ? Replacement: question"
+msgid ""
+"Character: {}\n"
+"Replacement: {}"
+msgstr ""
+"Tegn: {}\n"
+"Erstatning: {}"
+
+#. Translators: title for expanded symbol dialog. Example: "Expanded symbol (English)"
+msgid "Expanded symbol ({})"
+msgstr "Udvidet symbol ({})"
+
 #. Translators: A speech mode which disables speech output.
 msgid "Speech mode off"
 msgstr "Tale tilstand fra"
@@ -6072,16 +6086,25 @@ msgstr "stort %s"
 msgid "no indent"
 msgstr "Ingen indrykning"
 
-#. Translators: This is spoken when the user has selected a large portion of text. Example output "1000 characters"
+#. Translators: This is spoken to indicate that some text is already selected.
+#. 'selected' preceding text is intentional.
+#. For example 'selected hello world'
 #, python-format
-msgid "%d characters"
-msgstr "%d tegn"
+msgid "selected %s"
+msgstr "valgt %s"
 
-#. Translators: This is spoken while the user is in the process of selecting something, For example: "hello selected"
+#. Translators: This is spoken to indicate what has just been selected.
+#. The text preceding 'selected' is intentional.
+#. For example 'hello world selected'
 #, python-format
 msgid "%s selected"
 msgstr "%s valgt"
 
+#. Translators: This is spoken when the user has selected a large portion of text. Example output "1000 characters"
+#, python-format
+msgid "%d characters"
+msgstr "%d tegn"
+
 #. Translators: This is spoken to indicate what has been unselected. for example 'hello unselected'
 #, python-format
 msgid "%s unselected"
@@ -9433,6 +9456,16 @@ msgstr ""
 "Benyt UI Automation til at få adgang til kontrolelementer for Microsoft "
 "&Word-dokumenter, når disse er tilgængelige"
 
+#. Translators: This is the label for a checkbox in the
+#. Advanced settings panel.
+msgid "Use UI Automation to access the Windows Console when available"
+msgstr "Benyt UI Automation i Windows-konsollen når tilgængelig"
+
+#. Translators: This is the label for a checkbox in the
+#. Advanced settings panel.
+msgid "Speak &passwords in UIA consoles (may improve performance)"
+msgstr "Udtal &adgangskoder i UIA-konsoller (kan forbedre ydeevnen)"
+
 #. Translators: This is the label for a checkbox in the
 #. Advanced settings panel.
 msgid "Automatically set system &focus to focusable elements"
@@ -11283,6 +11316,9 @@ msgstr "dobbelt linjeafstand"
 msgid "1.5 line spacing"
 msgstr "1.5 linjeafstand"
 
+#~ msgid "Selected %s"
+#~ msgstr "Valgt %s"
+
 #~ msgid "Currently running application is %s"
 #~ msgstr "Den aktuelle applikation er %s"