Repository: nvaccess/nvda

Issue:
Rename Windows 10 OCR to Windows OCR
Hi,

Preparations to broaden support for Windows 11:

### Is your feature request related to a problem? Please describe.
Currently NVDA says Windows 10 OCR is available in Windows 10 only. As noted in PR #12683, Windows 10 OCR can be uased in Windows 11 as well (implied in the user guide pull request).

### Describe the solution you'd like
As pointed out by @LeonarddeR, rename Windows 10 OCR to Windows OCR. This allows the feature to be seen as a generic feature and covers future Windows releases.

### Describe alternatives you've considered
None

### Additional context
This change requires editing docs (see the PR linked above) and the user interface (no need to change code apart from comments). Ideally it should be part of beta 1, therefore the accompanying PR will target beta branch unless nV Access says it should be renamed in 2021.3 (master branch).

Thanks.


Discussion:

Resolving patch:
diff --git a/source/contentRecog/uwpOcr.py b/source/contentRecog/uwpOcr.py
--- a/source/contentRecog/uwpOcr.py
+++ b/source/contentRecog/uwpOcr.py
@@ -1,10 +1,9 @@
-#contentRecog/uwpOcr.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2017 NV Access Limited
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2017-2021 NV Access Limited
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
-"""Recognition of text using the UWP OCR engine included in Windows 10.
+"""Recognition of text using the UWP OCR engine included in Windows 10 and later.
 """
 
 import ctypes
diff --git a/source/globalCommands.py b/source/globalCommands.py
--- a/source/globalCommands.py
+++ b/source/globalCommands.py
@@ -3098,13 +3098,13 @@ def script_interactWithMath(self, gesture):
 
 	@script(
 		# Translators: Describes a command.
-		description=_("Recognizes the content of the current navigator object with Windows 10 OCR"),
+		description=_("Recognizes the content of the current navigator object with Windows OCR"),
 		gesture="kb:NVDA+r"
 	)
 	def script_recognizeWithUwpOcr(self, gesture):
 		if not winVersion.isUwpOcrAvailable():
-			# Translators: Reported when Windows 10 OCR is not available.
-			ui.message(_("Windows 10 OCR not available"))
+			# Translators: Reported when Windows OCR is not available.
+			ui.message(_("Windows OCR not available"))
 			return
 		from visionEnhancementProviders.screenCurtain import ScreenCurtainProvider
 		screenCurtainId = ScreenCurtainProvider.getSettings().getId()
@@ -3112,7 +3112,7 @@ def script_recognizeWithUwpOcr(self, gesture):
 		isScreenCurtainRunning = bool(vision.handler.getProviderInstance(screenCurtainProviderInfo))
 		if isScreenCurtainRunning:
 			# Translators: Reported when screen curtain is enabled.
-			ui.message(_("Please disable screen curtain before using Windows 10 OCR."))
+			ui.message(_("Please disable screen curtain before using Windows OCR."))
 			return
 		from contentRecog import uwpOcr, recogUi
 		recog = uwpOcr.UwpOcr()
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
--- a/source/gui/settingsDialogs.py
+++ b/source/gui/settingsDialogs.py
@@ -2493,8 +2493,8 @@ def onSave(self):
 
 
 class UwpOcrPanel(SettingsPanel):
-	# Translators: The title of the Windows 10 OCR panel.
-	title = _("Windows 10 OCR")
+	# Translators: The title of the Windows OCR panel.
+	title = _("Windows OCR")
 	helpId = "Win10OcrSettings"
 
 	def makeSettings(self, settingsSizer):
@@ -2505,7 +2505,7 @@ def makeSettings(self, settingsSizer):
 		languageChoices = [
 			languageHandler.getLanguageDescription(languageHandler.normalizeLanguage(lang))
 			for lang in self.languageCodes]
-		# Translators: Label for an option in the Windows 10 OCR dialog.
+		# Translators: Label for an option in the Windows OCR dialog.
 		languageLabel = _("Recognition &language:")
 		self.languageChoice = sHelper.addLabeledControl(languageLabel, wx.Choice, choices=languageChoices)
 		self.bindHelpEvent("Win10OcrSettingsRecognitionLanguage", self.languageChoice)


Test patch: