Replace 'Windows PowerShell' with 'PowerShell' in resx files #4758

iSazonov · 2017-09-06T12:02:41Z

Address #3345

Motivation

After removing FullCLR from the repo we can clean up message strings and replace 'Windows PowerShell' with 'PowerShell' in resx files.

Fix

Find and replace 'Windows PowerShell' with 'PowerShell' in .resx files. Then revert some replacements (related workflows, "Windows PowerShell 3.0 and higher" and so on).

Additional considerations

The PR doesn't address *.cs files (which have 'Windows PowerShell' strings in comments).

SteveL-MSFT · 2017-09-06T15:50:13Z

I think we should replace Windows PowerShell with just PowerShell and not PowerShell Core

dantraMSFT · 2017-09-06T16:51:17Z

@SteveL-MSFT: I agree; Core identifies an underlying technology; not PowerShell itself.

iSazonov · 2017-09-06T17:36:51Z

I agree. Will do.

dantraMSFT · 2017-09-07T00:16:05Z

src/Microsoft.PowerShell.Commands.Utility/resources/Debugger.resx

  </data>
  <data name="RunspaceDebuggingNoHostRunspaceOrDebugger" xml:space="preserve">
-    <value>Cannot debug Runspace. The host has no debugger. Try debugging the Runspace inside the Windows PowerShell console or the Windows PowerShell ISE, both of which have built-in debuggers.</value>
+    <value>Cannot debug Runspace. The host has no debugger. Try debugging the Runspace inside the PowerShell Core console or the Visual Studio Code, both of which have built-in debuggers.</value>


or the [](start = 122, length = 6)

Suggestion: 'or the Visual Studio Code' is rather cumbersome to read IMHO.
How about 'or with Visual Studio Code.'

SteveL-MSFT · 2017-09-07T06:44:26Z

src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx

  </data>
  <data name="ApartmentNotSupported" xml:space="preserve">
-    <value>{0} Please note that Single-Threaded Apartment is not supported in PowerShell Core.</value>
+    <value>{0} Please note that Single-Threaded Apartment is not supported in PowerShell.</value>


We should leave this one since it's Core specific (until I get my PR submitted)

SteveL-MSFT · 2017-09-07T06:47:57Z

src/System.Management.Automation/resources/HostInterfaceExceptionsStrings.resx

  </data>
  <data name="HostFunctionNotImplemented" xml:space="preserve">
-    <value>A command that prompts the user failed because the host program or the command type does not support user interaction. Try a host program that supports user interaction, such as the Windows PowerShell Console or Windows PowerShell ISE, and remove prompt-related commands from command types that do not support user interaction, such as Windows PowerShell workflows.</value>
+    <value>A command that prompts the user failed because the host program or the command type does not support user interaction. Try a host program that supports user interaction, such as the PowerShell Console, and remove prompt-related commands from command types that do not support user interaction, such as PowerShell workflows.</value>


Remove mention of workflows which isn't supported

SteveL-MSFT · 2017-09-07T06:48:59Z

src/System.Management.Automation/resources/Modules.resx

  </data>
  <data name="WorkflowModuleNotSupportedInPowerShellCore" xml:space="preserve">
-    <value>Cannot load the workflow module '{0}'. Workflow is not supported in PowerShell Core.</value>
+    <value>Cannot load the workflow module '{0}'. Workflow is not supported in PowerShell.</value>


Put Core back as this is specific to Core

SteveL-MSFT · 2017-09-07T06:49:48Z

src/System.Management.Automation/resources/MshSnapInCmdletResources.resx

  </data>
  <data name="CustomPSSnapInNotSupportedInPowerShellCore" xml:space="preserve">
-    <value>The custom Windows PowerShell snap-in is not supported in PowerShell Core.</value>
+    <value>The custom PowerShell snap-in is not supported in PowerShell.</value>


Put Core back as this is specific to Core not supporting PSSnapin

SteveL-MSFT · 2017-09-07T06:50:48Z

src/System.Management.Automation/resources/MshSnapinInfo.resx

  </data>
  <data name="MonadEngineRegistryAccessFailed" xml:space="preserve">
-    <value>Unable to access Windows PowerShell PowerShellEngine registry information.</value>
+    <value>Unable to access PowerShell PowerShellEngine registry information.</value>


Seems redundant, perhaps just: PowerShell Engine registry

SteveL-MSFT · 2017-09-07T06:52:31Z

src/System.Management.Automation/resources/ParserStrings.resx

  </data>
  <data name="CantActivateDocumentInPowerShellCore" xml:space="preserve">
-    <value>Cannot run a document in PowerShell Core: {0}.</value>
+    <value>Cannot run a document in PowerShell: {0}.</value>


I thought we fixed this so this error should no longer come up? If it's still applicable, put back Core

I don't know about applicable but CantActivateDocumentInPowerShellCore is still used in NativeCommandProcessor.cs for Nano and IoT.

Reverted.

SteveL-MSFT · 2017-09-07T06:55:37Z

src/System.Management.Automation/resources/RemotingErrorIdStrings.resx

 </data>
  <data name="CSCmdsPowerShellCoreShellNotModifiable" xml:space="preserve">
-    <value>Session configuration "{0}" is a PowerShell Core-based shell. Please use PowerShell Core to modify it.</value>
+    <value>Session configuration "{0}" is a PowerShell-based shell. Please use PowerShell to modify it.</value>


This error seems Core specific, please revert

SteveL-MSFT · 2017-09-07T06:55:57Z

src/System.Management.Automation/resources/RemotingErrorIdStrings.resx

  </data>
  <data name="CSCmdsWindowsPowerShellCoreNotModifiable" xml:space="preserve">
-    <value>Session configuration "{0}" is a Windows PowerShell-based shell. Please use Windows PowerShell to modify it.</value>
+    <value>Session configuration "{0}" is a PowerShell-based shell. Please use PowerShell to modify it.</value>


This error seems Windows PS specific, please revert

SteveL-MSFT · 2017-09-07T06:57:31Z

src/System.Management.Automation/resources/RemotingErrorIdStrings.resx

  </data>
  <data name="NetFrameWorkV2NotInstalled" xml:space="preserve">
-    <value>The Microsoft .NET Framework 2.0, which is required for Windows PowerShell 2.0, is not installed. Install the .NET Framework 2.0 and retry.</value>
+    <value>The Microsoft .NET Framework 2.0, which is required for PowerShell 2.0, is not installed. Install the .NET Framework 2.0 and retry.</value>


Windows PS specific, please revert although PS2.0 is deprecated, so maybe this error and code should be removed in another PR

SteveL-MSFT · 2017-09-07T06:58:35Z

src/System.Management.Automation/resources/RemotingErrorIdStrings.resx

  </data>
  <data name="InvalidProcessorArchitecture" xml:space="preserve">
-    <value>PowerShell Core does not support WOW64. The binary must match the architecture of the processor.</value>
+    <value>PowerShell does not support WOW64. The binary must match the architecture of the processor.</value>


Core specific, please revert

SteveL-MSFT

LGTM

iSazonov · 2017-09-08T03:57:14Z

@SteveL-MSFT Thanks for fast review!

Replace 'Windows PowerShell' with 'PowerShell Core' in resx files

c8954b3

iSazonov requested review from JamesWTruher, PaulHigin, adityapatwardhan, anmenaga, dantraMSFT, daxian-dbw and lzybkr as code owners September 6, 2017 12:02

msftclas added the cla-already-signed label Sep 6, 2017

iSazonov assigned daxian-dbw Sep 6, 2017

Fix test

7fca929

dantraMSFT reviewed Sep 7, 2017

View reviewed changes

Replace 'PowerShell Core' with 'PowerShell'

49c08c3

iSazonov changed the title ~~Replace 'Windows PowerShell' with 'PowerShell Core' in resx files~~ Replace 'Windows PowerShell' with 'PowerShell' in resx files Sep 7, 2017

SteveL-MSFT requested changes Sep 7, 2017

View reviewed changes

Revert 'Core' in some messages

2f09673

SteveL-MSFT approved these changes Sep 7, 2017

View reviewed changes

daxian-dbw merged commit 3c59736 into PowerShell:master Sep 7, 2017

iSazonov deleted the remove-windows-powershell branch September 8, 2017 03:57

iSazonov mentioned this pull request Oct 7, 2017

Question: Are module manifest keys (other than marked) specific to Windows? #2064

Closed

Replace 'Windows PowerShell' with 'PowerShell' in resx files #4758

Replace 'Windows PowerShell' with 'PowerShell' in resx files #4758

Uh oh!

Conversation

iSazonov commented Sep 6, 2017 • edited by daxian-dbw Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation

Fix

Additional considerations

Uh oh!

SteveL-MSFT commented Sep 6, 2017

Uh oh!

dantraMSFT commented Sep 6, 2017

Uh oh!

iSazonov commented Sep 6, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SteveL-MSFT left a comment

Choose a reason for hiding this comment

Uh oh!

iSazonov commented Sep 8, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

iSazonov commented Sep 6, 2017 •

edited by daxian-dbw

Loading