Skip to content

Commit b9480af

Browse files
codeofduskcodeofdusk
authored
Merge 9b2dc03 into 16ec967 
2 parents 16ec967 + 9b2dc03 commit b9480af

4 files changed

Lines changed: 29 additions & 22 deletions

File tree

‎source/gui/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ def __init__(self, parent):
703703
self.capsAsNVDAModifierCheckBox = sHelper.addItem(wx.CheckBox(self, label=capsAsNVDAModifierText))
704704
self.capsAsNVDAModifierCheckBox.SetValue(config.conf["keyboard"]["useCapsLockAsNVDAModifierKey"])
705705
# Translators: The label of a checkbox in the Welcome dialog.
706-
startAfterLogonText = _("&Automatically start NVDA after I log on to Windows")
706+
startAfterLogonText = _("St&art NVDA after I sign in")
707707
self.startAfterLogonCheckBox = sHelper.addItem(wx.CheckBox(self, label=startAfterLogonText))
708708
self.startAfterLogonCheckBox.Value = config.getStartAfterLogon()
709709
if globalVars.appArgs.secure or config.isAppX or not config.isInstalledCopy():

‎source/gui/installerGui.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def __init__(self, parent, isUpdate):
157157
)))
158158

159159
# Translators: The label of a checkbox option in the Install NVDA dialog.
160-
startOnLogonText = _("Use NVDA on the Windows &logon screen")
160+
startOnLogonText = _("Start NVDA during sign-in")
161161
self.startOnLogonCheckbox = optionsSizer.addItem(wx.CheckBox(self, label=startOnLogonText))
162162
if globalVars.appArgs.enableStartOnLogon is not None:
163163
self.startOnLogonCheckbox.Value = globalVars.appArgs.enableStartOnLogon

‎source/gui/settingsDialogs.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -713,21 +713,29 @@ def makeSettings(self, settingsSizer):
713713
# Translators: The label for a setting in general settings to allow NVDA to start after logging onto
714714
# Windows (if checked, NVDA will start automatically after logging into Windows; if not, user must
715715
# start NVDA by pressing the shortcut key (CTRL+Alt+N by default).
716-
self.startAfterLogonCheckBox = wx.CheckBox(self, label=_("St&art NVDA after Windows sign in"))
716+
self.startAfterLogonCheckBox = wx.CheckBox(self, label=_("St&art NVDA after I sign in"))
717717
self.startAfterLogonCheckBox.SetValue(config.getStartAfterLogon())
718718
if globalVars.appArgs.secure or not config.isInstalledCopy():
719719
self.startAfterLogonCheckBox.Disable()
720720
settingsSizerHelper.addItem(self.startAfterLogonCheckBox)
721721

722722
# Translators: The label for a setting in general settings to allow NVDA to come up in Windows login screen (useful if user needs to enter passwords or if multiple user accounts are present to allow user to choose the correct account).
723-
self.startOnLogonScreenCheckBox = wx.CheckBox(self, label=_("Use NVDA on the Windows logon screen (requires administrator privileges)"))
723+
self.startOnLogonScreenCheckBox = wx.CheckBox(
724+
self,
725+
label=_("Start NVDA during sign-in (requires administrator privileges)")
726+
)
724727
self.startOnLogonScreenCheckBox.SetValue(config.getStartOnLogonScreen())
725728
if globalVars.appArgs.secure or not config.canStartOnSecureScreens():
726729
self.startOnLogonScreenCheckBox.Disable()
727730
settingsSizerHelper.addItem(self.startOnLogonScreenCheckBox)
728731

729732
# Translators: The label for a button in general settings to copy current user settings to system settings (to allow current settings to be used in secure screens such as User Account Control (UAC) dialog).
730-
self.copySettingsButton= wx.Button(self, label=_("Use currently saved settings on the logon and other secure screens (requires administrator privileges)"))
733+
self.copySettingsButton = wx.Button(
734+
self,
735+
label=_(
736+
"Use currently saved settings before sign-in and on secure screens (requires administrator privileges)"
737+
)
738+
)
731739
self.copySettingsButton.Bind(wx.EVT_BUTTON,self.onCopySettings)
732740
if globalVars.appArgs.secure or not config.canStartOnSecureScreens():
733741
self.copySettingsButton.Disable()

‎user_docs/en/userGuide.t2t‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Major highlights include:
2727
- Easy to use talking installer
2828
- Translated into 54 languages
2929
- Support for modern Windows Operating Systems including both 32 and 64 bit variants
30-
- Ability to run on Windows logon and other secure screens
30+
- Ability to run during Windows sign-in and at secure screens
3131
- Announcing controls and text while using touch gestures
3232
- Support for common accessibility interfaces such as Microsoft Active Accessibility, Java Access Bridge, IAccessible2 and UI Automation
3333
- Support for Windows Command Prompt and console applications
@@ -79,7 +79,7 @@ Running the file you have just downloaded will start a temporary copy of NVDA.
7979
You will then be asked if you want to install NVDA, create a portable copy or just continue using the temporary copy.
8080

8181
If you plan to always use NVDA on this computer, you will want to choose to install NVDA.
82-
Installing NVDA will allow for additional functionality such as automatic starting after logon, the ability to read the Windows Logon and Windows security screens (which cannot be done with portable and temporary copies) and creation of Start Menu and desktop shortcuts.
82+
Installing NVDA will allow for additional functionality such as automatic starting after sign-in, the ability to read the Windows sign-in and security screens (which cannot be done with portable and temporary copies) and creation of Start Menu and desktop shortcuts.
8383
The installed copy is also able to create a portable copy itself at any time.
8484

8585
If you want to take NVDA with you on a USB thumb drive or other writable media, then you should choose to create a portable copy.
@@ -114,8 +114,8 @@ Before you're able to press the Continue button you will have to use the checkbo
114114
There will also be a button present to review the add-ons that will be disabled.
115115
Refer to the [incompatible add-ons dialog section #incompatibleAddonsManager] for more help on this button.
116116

117-
+++ Start at Windows Logon +++[StartAtWindowsLogon]
118-
This option allows you to choose whether or not NVDA should automatically start while on the Windows Logon screen, before you have entered a password.
117+
+++ Start NVDA during sign-in +++[StartAtWindowsLogon]
118+
This option allows you to choose whether or not NVDA should automatically start while at the Windows sign-in screen, before you have entered a password.
119119
This also includes User Account Control and other secure screens.
120120
This option is enabled by default for fresh installations.
121121

@@ -125,7 +125,7 @@ If created, this shortcut will also be assigned a shortcut key of control+alt+n
125125

126126
+++ Copy Portable Configuration to Current User Account +++[CopyPortableConfigurationToCurrentUserAccount]
127127
This option allows you to choose whether or not NVDA should copy the user configuration from the currently running NVDA into the configuration for the currently logged on user, for the installed copy of NVDA.
128-
This will not copy the configuration for any other users of this system nor to the system configuration for use at Windows Logon and other secure screens.
128+
This will not copy the configuration for any other users of this system nor to the system configuration for use during Windows sign-in and other secure screens.
129129
This option is only available when installing from a portable copy, not when installing directly from the downloaded Launcher package.
130130

131131
++ Creating a Portable Copy ++[CreatingAPortableCopy]
@@ -1054,19 +1054,18 @@ The available logging levels are:
10541054
- If you are concerned about privacy, do not set the logging level to this option.
10551055
- Debug: In addition to info, warning, and input/output messages, additional debug messages will be logged.
10561056
- Just like input/output, if you are concerned about privacy, you should not set the logging level to this option.
1057-
-
1058-
-
10591057

1060-
==== Automatically start NVDA after I log on to Windows ====[GeneralSettingsStartAfterLogOn]
1061-
If this option is enabled, NVDA will start automatically as soon as you log on to Windows.
1058+
1059+
==== Start NVDA after I sign in ====[GeneralSettingsStartAfterLogOn]
1060+
If this option is enabled, NVDA will start automatically as soon as you sign into Windows.
10621061
This option is only available for installed copies of NVDA.
10631062

1064-
==== Use NVDA on the Windows Logon screen (requires administrator privileges) ====[GeneralSettingsStartOnLogOnScreen]
1065-
If you log on to Windows by providing a user name and password, then enabling this option will make NVDA start automatically at the logon screen when Windows starts.
1063+
==== Start NVDA during sign-in (requires administrator privileges) ====[GeneralSettingsStartOnLogOnScreen]
1064+
If you sign into Windows by providing a user name and password, then enabling this option will make NVDA start automatically at the sign-in screen when Windows starts.
10661065
This option is only available for installed copies of NVDA.
10671066

1068-
==== Use currently saved settings on the logon and other secure screens (requires administrator privileges) ====[GeneralSettingsCopySettings]
1069-
Pressing this button copies your currently saved NVDA user configuration to NVDA's system configuration directory, so that NVDA will use it when running on the logon, User Account Control (UAC) and other secure Windows screens.
1067+
==== Use currently saved settings during sign-in and on secure screens (requires administrator privileges) ====[GeneralSettingsCopySettings]
1068+
Pressing this button copies your currently saved NVDA user configuration to NVDA's system configuration directory, so that NVDA will use it during sign-in and when running on User Account Control (UAC) and other secure Windows screens.
10701069
To make sure that all your settings are transferred, make sure to save your configuration first with control+NVDA+c or Save configuration in the NVDA menu.
10711070
This option is only available for installed copies of NVDA.
10721071

@@ -1999,9 +1998,9 @@ This means that each user on the system can have their own NVDA settings.
19991998
To open your settings directory from anywhere you can use [Input Gestures dialog #InputGestures] to add a custom gesture.
20001999
In addition for an installed version of NVDA, on the start menu you can go to programs -> NVDA -> explore user configuration directory.
20012000

2002-
Settings for NVDA when running on the logon or UAC screens are stored in the systemConfig directory in NVDA's installation directory.
2001+
Settings for NVDA when running during sign-in or on UAC screens are stored in the systemConfig directory in NVDA's installation directory.
20032002
Usually, this configuration should not be touched.
2004-
To change NVDA's configuration on the logon/UAC screens, configure NVDA as you wish while logged into Windows, save the configuration, and then press the "Use currently saved settings on the logon and other secure screens" button in the General category of the [NVDA Settings #NVDASettings] dialog.
2003+
To change NVDA's configuration during sign-in or on UAC screens, configure NVDA as you wish while logged into Windows, save the configuration, and then press the "" button in the General category of the [NVDA Settings #NVDASettings] dialog.
20052004

20062005
+ Extra Tools +[ExtraTools]
20072006

@@ -3055,14 +3054,14 @@ Following are the command line options for NVDA:
30553054
| -l LOGLEVEL | --log-level=LOGLEVEL | The lowest level of message logged (debug 10, input/output 12, debug warning 15, info 20, warning 30, error 40, critical 50, disabled 100), default is warning |
30563055
| -c CONFIGPATH | --config-path=CONFIGPATH | The path where all settings for NVDA are stored |
30573056
| -m | --minimal | No sounds, no interface, no start message, etc. |
3058-
| -s | --secure | Secure mode: disables Python console, profile features such as creation, deletion, renaming profiles etc., update check, some checkboxes in the welcome dialog and in general settings category (e.g. start NVDA after logon, save configuration after exit etc.), as well as logviewer and logging features (used often in secure screens). Note also that this command will disable the possibility to save settings in system config and the gesture map will not be saved on the disk. |
3057+
| -s | --secure | Secure mode: disables Python console, profile features such as creation, deletion, renaming profiles etc., update check, some checkboxes in the welcome dialog and in general settings category (e.g. start NVDA after sign-in, save configuration after exit etc.), as well as logviewer and logging features (used often in secure screens). Note also that this command will disable the possibility to save settings in system config and the gesture map will not be saved on the disk. |
30593058
| None | --disable-addons | Addons will have no effect |
30603059
| None | --debug-logging | Enable debug level logging just for this run. This setting will override any other log level ( ""--loglevel"", -l) argument given, including no logging option. |
30613060
| None | --no-logging | Disable logging altogether while using NVDA. This setting can be overwritten if a log level ( ""--loglevel"", -l) is specified from command line or if debug logging is turned on. |
30623061
| None | --no-sr-flag | Don't change the global system screen reader flag |
30633062
| None | --install | Installs NVDA (starting the newly installed copy) |
30643063
| None | --install-silent | Silently installs NVDA (does not start the newly installed copy) |
3065-
| None | --enable-start-on-logon=True|False | When installing, enable NVDA's [start on the logon screen #StartAtWindowsLogon] |
3064+
| None | --enable-start-on-logon=True|False | When installing, enable NVDA's [start during Windows sign-in #StartAtWindowsLogon] |
30663065
| None | --create-portable | Creates a portable copy of NVDA (starting the newly created copy). Requires --portable-path to be specified |
30673066
| None | --create-portable-silent | Creates a portable copy of NVDA (does not start the newly installed copy). Requires --portable-path to be specified |
30683067
| None | --portable-path=PORTABLEPATH | The path where a portable copy will be created |

0 commit comments

Comments
 (0)