Skip to content

Commit 4103053

Browse files
josephsljosephsl
authored
Merge de96fcb into 1b68eba 
2 parents 1b68eba + de96fcb commit 4103053

4 files changed

Lines changed: 18 additions & 19 deletions

File tree

‎source/contentRecog/uwpOcr.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
#contentRecog/uwpOcr.py
2-
#A part of NonVisual Desktop Access (NVDA)
3-
#Copyright (C) 2017 NV Access Limited
4-
#This file is covered by the GNU General Public License.
5-
#See the file COPYING for more details.
1+
# A part of NonVisual Desktop Access (NVDA)
2+
# Copyright (C) 2017-2021 NV Access Limited
3+
# This file is covered by the GNU General Public License.
4+
# See the file COPYING for more details.
65

7-
"""Recognition of text using the UWP OCR engine included in Windows 10.
6+
"""Recognition of text using the UWP OCR engine included in Windows 10 and later.
87
"""
98

109
import ctypes

‎source/globalCommands.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3119,21 +3119,21 @@ def script_interactWithMath(self, gesture):
31193119

31203120
@script(
31213121
# Translators: Describes a command.
3122-
description=_("Recognizes the content of the current navigator object with Windows 10 OCR"),
3122+
description=_("Recognizes the content of the current navigator object with Windows OCR"),
31233123
gesture="kb:NVDA+r"
31243124
)
31253125
def script_recognizeWithUwpOcr(self, gesture):
31263126
if not winVersion.isUwpOcrAvailable():
3127-
# Translators: Reported when Windows 10 OCR is not available.
3128-
ui.message(_("Windows 10 OCR not available"))
3127+
# Translators: Reported when Windows OCR is not available.
3128+
ui.message(_("Windows OCR not available"))
31293129
return
31303130
from visionEnhancementProviders.screenCurtain import ScreenCurtainProvider
31313131
screenCurtainId = ScreenCurtainProvider.getSettings().getId()
31323132
screenCurtainProviderInfo = vision.handler.getProviderInfo(screenCurtainId)
31333133
isScreenCurtainRunning = bool(vision.handler.getProviderInstance(screenCurtainProviderInfo))
31343134
if isScreenCurtainRunning:
31353135
# Translators: Reported when screen curtain is enabled.
3136-
ui.message(_("Please disable screen curtain before using Windows 10 OCR."))
3136+
ui.message(_("Please disable screen curtain before using Windows OCR."))
31373137
return
31383138
from contentRecog import uwpOcr, recogUi
31393139
recog = uwpOcr.UwpOcr()

‎source/gui/settingsDialogs.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2504,8 +2504,8 @@ def onSave(self):
25042504

25052505

25062506
class UwpOcrPanel(SettingsPanel):
2507-
# Translators: The title of the Windows 10 OCR panel.
2508-
title = _("Windows 10 OCR")
2507+
# Translators: The title of the Windows OCR panel.
2508+
title = _("Windows OCR")
25092509
helpId = "Win10OcrSettings"
25102510

25112511
def makeSettings(self, settingsSizer):
@@ -2516,7 +2516,7 @@ def makeSettings(self, settingsSizer):
25162516
languageChoices = [
25172517
languageHandler.getLanguageDescription(languageHandler.normalizeLanguage(lang))
25182518
for lang in self.languageCodes]
2519-
# Translators: Label for an option in the Windows 10 OCR dialog.
2519+
# Translators: Label for an option in the Windows OCR dialog.
25202520
languageLabel = _("Recognition &language:")
25212521
self.languageChoice = sHelper.addLabeledControl(languageLabel, wx.Choice, choices=languageChoices)
25222522
self.bindHelpEvent("Win10OcrSettingsRecognitionLanguage", self.languageChoice)

‎user_docs/en/userGuide.t2t‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -809,17 +809,17 @@ Once recognition is complete, the result will be presented in a document similar
809809
Pressing enter or space will activate (normally click) the text at the cursor if possible.
810810
Pressing escape dismisses the recognition result.
811811

812-
++ Windows 10 OCR ++[Win10Ocr]
812+
++ Windows OCR ++[Win10Ocr]
813813
Windows 10 includes OCR for many languages.
814814
NVDA can use this to recognize text from images or inaccessible applications.
815815

816-
You can set the language to use for text recognition in the [Windows 10 OCR category #Win10OcrSettings] of the [NVDA Settings #NVDASettings] dialog.
816+
You can set the language to use for text recognition in the [Windows OCR category #Win10OcrSettings] of the [NVDA Settings #NVDASettings] dialog.
817817
Additional languages can be installed by opening the Start menu, choosing Settings, selecting Time & Language -> Region & Language and then choosing Add a language.
818818

819-
Windows 10 OCR may be partially or fully incompatible with [NVDA vision enhancements #Vision] or other external visual aids. You will need to disable these aids before proceeding to a recognition.
819+
Windows OCR may be partially or fully incompatible with [NVDA vision enhancements #Vision] or other external visual aids. You will need to disable these aids before proceeding to a recognition.
820820

821821
%kc:beginInclude
822-
To recognize the text in the current navigator object using Windows 10 OCR, press NVDA+r.
822+
To recognize the text in the current navigator object using Windows OCR, press NVDA+r.
823823
%kc:endInclude
824824

825825
+ Application Specific Features +[ApplicationSpecificFeatures]
@@ -1795,8 +1795,8 @@ The tone will increase in pitch every space, and for a tab, it will increase in
17951795
- Both Speech and Tones: This option reads indentation using both of the above methods.
17961796
-
17971797

1798-
+++ Windows 10 OCR Settings +++[Win10OcrSettings]
1799-
The settings in this category allow you to configure [Windows 10 OCR #Win10Ocr].
1798+
+++ Windows OCR Settings +++[Win10OcrSettings]
1799+
The settings in this category allow you to configure [Windows OCR #Win10Ocr].
18001800
This category contains the following options:
18011801

18021802
==== Recognition language ====[Win10OcrSettingsRecognitionLanguage]

0 commit comments

Comments
 (0)