diff --git a/src/AppInstallerCLICore/Workflows/PortableFlow.cpp b/src/AppInstallerCLICore/Workflows/PortableFlow.cpp index d2df70bd90..3526d4d12f 100644 --- a/src/AppInstallerCLICore/Workflows/PortableFlow.cpp +++ b/src/AppInstallerCLICore/Workflows/PortableFlow.cpp @@ -262,7 +262,7 @@ namespace AppInstaller::CLI::Workflow else { context.Reporter.Warn() << Resource::String::PortableHashMismatchOverrideRequired << std::endl; - AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_PORTABLE_UNINSTALL_FAILED); + AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_PORTABLE_INSTALL_FAILED); } } @@ -279,7 +279,7 @@ namespace AppInstaller::CLI::Workflow context.Reporter.Warn() << Resource::String::PortableInstallFailed << std::endl; portableInstaller.PrepareForCleanUp(); ; portableInstaller.Uninstall(); - AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_PORTABLE_UNINSTALL_FAILED); + AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_PORTABLE_INSTALL_FAILED); } } } diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw index 0557ede2c3..d59ef931ef 100644 --- a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw +++ b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw @@ -139,7 +139,7 @@ Available - As in "a new version is available to upgrade to". + As in "a new version is available to upgrade to". Used as a table header. The following options are available: @@ -150,22 +150,24 @@ Message displayed to inform the user about the available nested commands that run in context of the selected command. - {0} upgrades available. + {0} upgrades are available. {Locked="{0}"} Message displayed to inform the user about available package upgrades. {0} is a placeholder replaced by the number of package upgrades. - Use the specified channel; default is general audience + Use the specified channel; the default is general audience + Help text for a command line argument. The argument specifies the "release channel" to install (e.g. release / preview / beta). command - Label displayed for a command to give the software. + Used as a placeholder in help text to represent a command to give to the software. Like "usage: winget [command]" Filter results by command - Description message displayed to inform the user about filtering the search results by a package command. + Help text for a command line argument. The argument filters search results to packages that provide the given command. The full command line for completion + Help text for a command line argument. The argument provides a command line command (e.g. "winget install foo") for which we want auto-complete suggestions This command requires administrator privileges to execute. @@ -185,13 +187,13 @@ Find package using exact match - Description message displayed to inform the user about finding an application package using an exact matching criteria. + Help text for a command line argument. The argument makes the search for packages use an exact matching criteria. Experimental argument for demonstration purposes - This command is an example on how to implement an experimental feature. To turn on go to 'winget settings' and enable experimentalCmd or experimentalArg features. + This command is an example on how to implement an experimental feature. To turn on, go to 'winget settings' and enable experimentalCmd or experimentalArg features. {Locked="winget settings"} @@ -202,7 +204,7 @@ {Locked="{0}"} Error message displayed when the user provides an extra positional argument when none was expected. {0} is a placeholder replaced by the user's extra argument input. - This feature is a work in progress, and may be changed dramatically or removed altogether in the future. To enable it, edit your settings ('winget settings') to include the experimental feature: '{0}' + This feature is a work in progress, and may be changed dramatically or removed altogether in the future. To turn it on, edit your settings ('winget settings') to include the experimental feature '{0}' {Locked="winget settings","{0}"}. Error message displayed when the user uses an experimental feature that is disabled. {0} is a placeholder replaced by the experimental feature name. @@ -214,29 +216,36 @@ Disabled + Value used in a table to indicate that a feature is turned off Enabled + Value used in a table to indicate that a feature is turned on Feature + Header in a table that lists product features Link + Header in a table for a column containing hyperlinks The following experimental features are in progress. -They can be configured through the settings file 'winget settings'. +Use 'winget settings' to open the settings file and configure them. {Locked="winget settings"} Property + Header in a table for a column containing the names of properties in a JSON object Status + Header in a table for a column indicating whether a feature is on or off File to be hashed + Help text for a command line argument. The argument is the path to a file for which we calculate a cryptographic hash/digest. Flag argument cannot contain adjoined value: '{0}' @@ -282,14 +291,14 @@ They can be configured through the settings file 'winget settings'. Installs the given package - Installer hash does not match; this cannot be overridden when running as admin + Installer hash does not match. This cannot be overridden when running as admin. - Installer hash does not match; proceeding due to --ignore-security-hash + Installer hash does not match. Proceeding due to --ignore-security-hash. {Locked="--ignore-security-hash"} - Installer hash does not match; to override this check use --ignore-security-hash + Installer hash does not match. To override this check, use --ignore-security-hash. {Locked="--ignore-security-hash"} @@ -405,7 +414,7 @@ They can be configured through the settings file 'winget settings'. Filter results by name - No applicable installer found; see logs for more details. + No applicable installer was found. See the logs for more details. There are currently no experimental features available. @@ -425,6 +434,7 @@ They can be configured through the settings file 'winget settings'. options + Used as a placeholder in help text to represent options that change how a command works. Like "usage: winget install [options]" Options to change how a command works @@ -598,11 +608,11 @@ They can be configured through the settings file 'winget settings'. Name of the source - Failed when opening source(s); try the 'source reset' command if the problem persists. + There was a problem opening a source. Try the 'source reset' command if the problem persists. {Locked="source reset"} - Failed to open the predefined source; please report to winget maintainers. + There was a problem opening the predefined source. Please report this to winget's maintainers. {Locked="winget"} @@ -694,7 +704,7 @@ They can be configured through the settings file 'winget settings'. Upgrade all installed packages to latest if available - No applicable upgrade found. + No applicable upgrade was found. A newer package version is available in a configured source, but it does not apply to your system or requirements. @@ -752,7 +762,7 @@ They can be configured through the settings file 'winget settings'. The configured sources are: - No sources defined; add one with 'source add' or reset to defaults with 'source reset' + No sources are defined. Add one with 'source add' or reset the defaults with 'source reset'. {Locked="source add","source reset"} @@ -878,7 +888,7 @@ They can be configured through the settings file 'winget settings'. {Locked="user","machine"} This argument allows the user to select between installing for just the user or for the entire machine. - The value provided for the `{0}` argument is invalid; valid values are: {1} + The value provided for the `{0}` argument is invalid. The valid values are: {1} {Locked="{0}","{1}"} Error message displayed when the user provides an invalid command line argument value. {0} is a placeholder replaced by the argument name. {1} is a placeholder replaced by a list of valid options. @@ -1341,7 +1351,7 @@ Please specify one of them using the --source option to proceed. Upgrade packages even if their current version cannot be determined - List packages even if their current version cannot be determined. Can only be used with the --upgrade-available argument + List packages even if their current version cannot be determined; can only be used with the --upgrade-available argument {Locked="--upgrade-available"} @@ -1385,13 +1395,14 @@ Please specify one of them using the --source option to proceed. The installer cannot be run from an administrator context. - Path environment variable modified; restart your shell to use the new value. + The PATH environment variable was modified. Restart your shell to use the new value. + {Locked="PATH"} Filters using the product code - A portable package with the same name but from a different source already exists; proceeding due to --force + A portable package with the same name but from a different source already exists. Proceeding due to --force. {Locked="--force"} @@ -1405,7 +1416,7 @@ Please specify one of them using the --source option to proceed. {Locked="{0}"} Warning message displayed to inform the user that an existing file is being overwritten. {0} is a placeholder replaced by the file system path. - No package selection argument was provided; see the help for details about finding a package. + No package selection argument was provided. See the help for details about finding a package. Command line alias added: @@ -1426,14 +1437,14 @@ Please specify one of them using the --source option to proceed. Portable Package Root (x86) - Portable install failed; Cleaning up... + Portable install failed. Cleaning up... - Portable package has been modified; proceeding due to --force + Portable package has been modified. Proceeding due to --force. {Locked="--force"} - Unable to remove Portable package as it has been modified; to override this check use --force + Unable to remove Portable package as it has been modified. To override this check, use --force. {Locked="--force"} @@ -1470,10 +1481,10 @@ Please specify one of them using the --source option to proceed. {Locked="{0}"} Error message displayed when nested installer file does not exist. {0} is a placeholder replaced by the nested installer file path. - Invalid relative file path to the nested installer; path points to a location outside of the install directory + Invalid relative file path to the nested installer. The path points to a location outside of the install directory. - No nested installers specified for this package + No nested installers are specified for this package Only one non-portable nested installer can be specified for an archive installer @@ -1541,7 +1552,7 @@ Please specify one of them using the --source option to proceed. Extracting archive... - Archive scan detected malware. To override this check use --ignore-local-archive-malware-scan + Archive scan detected malware. To override this check, use --ignore-local-archive-malware-scan {Locked="--ignore-local-archive-malware-scan"} @@ -1594,7 +1605,7 @@ Please specify one of them using the --source option to proceed. Reset pins - Version to which to pin the package. The wildcard '*' can be used as the last version part + Version to which to pin the package; the wildcard '*' can be used as the last version part Block from upgrading until the pin is removed, preventing override arguments @@ -1713,7 +1724,7 @@ Please specify one of them using the --source option to proceed. Upgrade packages even if they have a non-blocking pin - List packages even if they have a pin that prevents upgrade. Can only be used with the --upgrade-available argument + List packages even if they have a pin that prevents upgrade; can only be used with the --upgrade-available argument {Locked="--upgrade-available"} @@ -1838,11 +1849,11 @@ Please specify one of them using the --source option to proceed. {Locked="--force"} - Reboot required to fully enable the Windows Feature(s); to override this check use '--force'. + Reboot required to fully enable the Windows Feature(s). To override this check, use '--force'. "Windows Feature(s)" is the name of the options Windows features setting. - Failed to enable Windows Feature dependencies; proceeding due to --force + Failed to enable Windows Feature dependencies. Proceeding due to --force. "Windows Feature(s)" is the name of the options Windows features setting. {Locked="--force"} @@ -1856,7 +1867,7 @@ Please specify one of them using the --source option to proceed. {1} is a placeholder for the unrecognized error code. - Reboot required to fully enable the Windows Feature(s); proceeding due to --force + Reboot required to fully enable the Windows Feature(s). Proceeding due to --force. "Windows Feature(s)" is the name of the options Windows features setting. @@ -1933,7 +1944,7 @@ Please specify one of them using the --source option to proceed. Loading the module for the configuration unit failed. - Multiple matches were found for the configuration unit; specify the module to select the correct one. + Multiple matches were found for the configuration unit. Specify the module to select the correct one. The configuration unit could not be found. @@ -2047,7 +2058,7 @@ Please specify one of them using the --source option to proceed. The configuration unit was found locally, but could not be found in any configured catalog. Ensure that it is present on any system before applying the configuration. - The configuration unit is not available publicly; ensure that anyone who will use this configuration has access to it. + The configuration unit is not available publicly. Ensure that anyone who will use this configuration has access to it. The module was not provided. Specifying the module improves performance and prevents future name collisions. @@ -2108,205 +2119,205 @@ Please specify one of them using the --source option to proceed. Unknown error code - Internal Error + Internal Error. - Invalid command line arguments + Invalid command line arguments. - Executing command failed + Executing command failed. - Opening manifest failed + Opening manifest failed. - Cancellation signal received + Cancellation signal received. - Running ShellExecute failed + Running ShellExecute failed. Cannot process manifest. The manifest version is higher than supported. Please update the client. - Downloading installer failed + Downloading installer failed. - Cannot write to index; it is a higher schema version + Cannot write to index. It is a higher schema version. - The index is corrupt + The index is corrupt. - The configured source information is corrupt + The configured source information is corrupt. - The source name is already configured + The source name is already configured. - The source type is invalid + The source type is invalid. - The MSIX file is a bundle, not a package + The MSIX file is a bundle, not a package. - Data required by the source is missing + Data required by the source is missing. - None of the installers are applicable for the current system + None of the installers are applicable for the current system. - The installer file's hash does not match the manifest + The installer file's hash does not match the manifest. - The source name does not exist + The source name does not exist. - The source location is already configured under another name + The source location is already configured under another name. - No packages found + No packages found. - No sources are configured + No sources are configured. - Multiple packages found matching the criteria + Multiple packages found matching the criteria. - No manifest found matching the criteria + No manifest found matching the criteria. - Failed to get Public folder from source package + Failed to get Public folder from source package. - Command requires administrator privileges to run + Command requires administrator privileges to run. - The source location is not secure + The source location is not secure. - The Microsoft Store client is blocked by policy + The Microsoft Store client is blocked by policy. - The Microsoft Store app is blocked by policy + The Microsoft Store app is blocked by policy. The feature is currently under development. It can be enabled using winget settings. - Failed to install the Microsoft Store app + Failed to install the Microsoft Store app. - Failed to perform auto complete + Failed to perform auto complete. - Failed to initialize YAML parser + Failed to initialize YAML parser. - Encountered an invalid YAML key + Encountered an invalid YAML key. - Encountered a duplicate YAML key + Encountered a duplicate YAML key. - Invalid YAML operation + Invalid YAML operation. - Failed to build YAML doc + Failed to build YAML doc. - Invalid YAML emitter state + Invalid YAML emitter state. - Invalid YAML data + Invalid YAML data. - LibYAML error + LibYAML error. - Manifest validation succeeded with warning + Manifest validation succeeded with warning. - Manifest validation failed + Manifest validation failed. - Manifest is invalid + Manifest is invalid. - No applicable update found + No applicable update was found. - winget upgrade --all completed with failures + winget upgrade --all completed with failures. - Installer failed security check + Installer failed security check. - Download size does not match expected content length + Download size does not match expected content length. - Uninstall command not found + Uninstall command not found. - Running uninstall command failed + Running uninstall command failed. - ICU break iterator error + ICU break iterator error. - ICU casemap error + ICU casemap error. - ICU regex error + ICU regex error. - Failed to install one or more imported packages + Failed to install one or more imported packages. - Could not find one or more requested packages + Could not find one or more requested packages. - Json file is invalid + Json file is invalid. - The source location is not remote + The source location is not remote. - The configured rest source is not supported + The configured rest source is not supported. - Invalid data returned by rest source + Invalid data returned by rest source. - Operation is blocked by Group Policy + Operation is blocked by Group Policy. - Rest API internal error + Rest API internal error. - Invalid rest source url + Invalid rest source url. - Unsupported MIME type returned by rest API + Unsupported MIME type returned by rest API. - Invalid rest source contract version + Invalid rest source contract version. - The source data is corrupted or tampered + The source data is corrupted or tampered. - Error reading from the stream + Error reading from the stream. - Package agreements were not agreed to + Package agreements were not agreed to. - Error reading input in prompt + Error reading input in prompt. - The search request is not supported by one or more sources + The search request is not supported by one or more sources. The rest API endpoint is not found. @@ -2315,46 +2326,46 @@ Please specify one of them using the --source option to proceed. Failed to open the source. - Source agreements were not agreed to + Source agreements were not agreed to. Header size exceeds the allowable limit of 1024 characters. Please reduce the size and try again. - Missing resource file + Missing resource file. - Running MSI install failed + Running MSI install failed. - Arguments for msiexec are invalid + Arguments for msiexec are invalid. - Failed to open one or more sources + Failed to open one or more sources. - Failed to validate dependencies + Failed to validate dependencies. - One or more package is missing + One or more package is missing. - Invalid table column + Invalid table column. - The upgrade version is not newer than the installed version + The upgrade version is not newer than the installed version. - Upgrade version is unknown and override is not specified + Upgrade version is unknown and override is not specified. - ICU conversion error + An ICU conversion error occurred. - Failed to install portable package + Failed to install portable package. - Volume does not support reparse points + Volume does not support reparse points. Portable package from a different source already exists. @@ -2366,7 +2377,7 @@ Please specify one of them using the --source option to proceed. The installer cannot be run from an administrator context. - Failed to uninstall portable package + Failed to uninstall portable package. Failed to validate DisplayVersion values against index. @@ -2375,7 +2386,7 @@ Please specify one of them using the --source option to proceed. One or more arguments are not supported. - Embedded null characters are disallowed for SQLite + Embedded null characters are disallowed for SQLite. Failed to find the nested installer in the archive. @@ -2408,22 +2419,22 @@ Please specify one of them using the --source option to proceed. Unable to open the pin database. - One or more applications failed to install + One or more applications failed to install. - One or more applications failed to uninstall + One or more applications failed to uninstall. - One or more queries did not return exactly one match + One or more queries did not return exactly one match. The package has a pin that prevents upgrade. - The package currently installed is the stub package + The package currently installed is the stub package. - Application shutdown signal received + Application shutdown signal received. Failed to download package dependencies. @@ -2606,7 +2617,7 @@ Please specify one of them using the --source option to proceed. The configuration unit could not be found. - Multiple matches were found for the configuration unit; specify the module to select the correct one. + Multiple matches were found for the configuration unit. Specify the module to select the correct one. The configuration unit failed while attempting to get the current system state. @@ -2869,7 +2880,7 @@ Please specify one of them using the --source option to proceed. Name of the setting to modify - Value to set for the setting. + Value to set for the setting Resets an admin setting to its default value. @@ -3018,10 +3029,10 @@ Please specify one of them using the --source option to proceed. {Locked="{0}"} - Some of the data present in the configuration file was truncated for this output; inspect the file contents for the complete content. + Some of the data present in the configuration file was truncated for this output. Inspect the file for the complete content. - <this value has been truncated; inspect the file contents for the complete text> + <this value has been truncated; inspect the file for the complete text> Keep some form of separator like the "<>" around the text so that it stands out from the preceding text. @@ -3079,7 +3090,7 @@ Please specify one of them using the --source option to proceed. The state of processing an item. - Monitor configuration status. + Monitor configuration status As in "to monitor the status of a configuration being applied". @@ -3150,10 +3161,10 @@ Please specify one of them using the --source option to proceed. Parameter cannot be passed across integrity boundary. - Downloaded zero byte installer; ensure that your network connection is working properly. + Downloaded zero byte installer. Ensure that your network connection is working properly. - Downloaded zero byte installer; ensure that your network connection is working properly. + Downloaded zero byte installer. Ensure that your network connection is working properly. Manage fonts