Fix incorrect localization causing crashes in RegisterCommandHandler …

…and KeyGestures (#919) Fix incorrect localization causing crashes in RegisterCommandHandler and KeyGestures (#919)
dotnet · Jun 12, 2019 · 9afa976 · 9afa976
1 parent e9953ad
commit 9afa976
Show file tree

Hide file tree

Showing 65 changed files with 131,678 additions and 141,289 deletions.
diff --git a/Documentation/localization_untranslated_strings.md b/Documentation/localization_untranslated_strings.md
@@ -0,0 +1,159 @@
+## Localization: Resource IDs moved to const strings from strings.resx files ##
+
+### PresentationBuildTasks ###
+
+| ResourceID | Value |
+| --------------|------------- |
+| FileClassifierTask | "FileClassifier" |
+| GetWinFXPathTask | "GetWinFXPath" |
+| MarkupCompilePass1Task | "MarkupCompilePass1" |
+| MarkupCompilePass2Task | "MarkupCompilePass2" |
+| MergeLocalizationDirectivesTask | "MergeLocalizationDirectives" |
+| ResourcesGeneratorTask | "ResourcesGenerator" |
+| UidManagerTask | "UidManager" |
+| UpdateManifestForBrowserApplicationTask | "UpdateManifestForBrowserApplication" |
+
+### PresentationCore ###
+
+| ResourceID | Value |
+| --------------|------------- |
+| BrowseBackKey | "Alt+Left;Backspace" |
+| BrowseForwardKey | "Alt+Right;Shift+Backspace" |
+| BrowseHomeKey | "Alt+Home;BrowserHome" |
+| BrowseStopKey | "Alt+Esc;BrowserStop" |
+| ContextMenuKey | "Shift+F10;Apps" |
+| CopyKey | "Ctrl+C;Ctrl+Insert" |
+| CutKey | "Ctrl+X;Shift+Delete" |
+| DeleteKey | "Del" |
+| ExtendSelectionDownKey | "Shift+Down" |
+| ExtendSelectionLeftKey | "Shift+Left" |
+| ExtendSelectionRightKey | "Shift+Right" |
+| ExtendSelectionUpKey | "Shift+Up" |
+| FindKey | "Ctrl+F" |
+| HelpKey | "F1" |
+| HwndTarget_HardwareNotSupportDueToProtocolMismatch | "Due to protocol mismatch hardware support is not available." |
+| MoveDownKey | "Down" |
+| MoveFocusBackKey | "Ctrl+Left" |
+| MoveFocusDownKey | "Ctrl+Down" |
+| MoveFocusForwardKey | "Ctrl+Right" |
+| MoveFocusPageDownKey | "Ctrl+PageDown" |
+| MoveFocusPageUpKey | "Ctrl+PageUp" |
+| MoveFocusUpKey | "Ctrl+Up" |
+| MoveLeftKey | "Left" |
+| MoveRightKey | "Right" |
+| MoveToEndKey | "End" |
+| MoveToHomeKey | "Home" |
+| MoveToPageDownKey | "PageDown" |
+| MoveToPageUpKey | "PageUp" |
+| MoveUpKey | "Up" |
+| NewKey | "Ctrl+N" |
+| OpenKey | "Ctrl+O" |
+| PasteKey | "Ctrl+V;Shift+Insert" |
+| PrintKey | "Ctrl+P" |
+| PrintPreviewKey | "Ctrl+F2" |
+| PropertiesKey | "F4" |
+| RedoKey | "Ctrl+Y" |
+| ReplaceKey | "Ctrl+H" |
+| SaveKey | "Ctrl+S" |
+| ScrollPageDownKey | "PageDown" |
+| ScrollPageUpKey | "PageUp" |
+| SelectAllKey | "Ctrl+A" |
+| SelectToEndKey | "Shift+End" |
+| SelectToHomeKey | "Shift+Home" |
+| SelectToPageDownKey | "Shift+PageDown" |
+| SelectToPageUpKey | "Shift+PageUp" |
+| StopKey | "Esc" |
+| UndoKey | "Ctrl+Z" |
+
+### PresentationFramework ###
+
+| ResourceID | Value |
+| --------------|------------- |
+| InkCanvasDeselectKey | "Esc" |
+| KeyAlignCenter | "Ctrl+E" |
+| KeyAlignLeft | "Ctrl+L" |
+| KeyAlignRight | "Ctrl+R" |
+| KeyAltUndo | "Alt+Backspace" |
+| KeyApplyDoubleSpace | "Ctrl+2" |
+| KeyApplyOneAndAHalfSpace | "Ctrl+5" |
+| KeyApplySingleSpace | "Ctrl+1" |
+| KeyBackspace | "Backspace" |
+| KeyCopy | "Ctrl+C" |
+| KeyCopyFormat | "Ctrl+Shift+C" |
+| KeyCtrlInsert | "Ctrl+Insert" |
+| KeyCut | "Ctrl+X" |
+| KeyDecreaseFontSize | "Ctrl+OemOpenBrackets" |
+| KeyDecreaseIndentation | "Ctrl+Shift+T" |
+| KeyDelete | "Delete" |
+| KeyDeleteColumns | "Alt+Ctrl+Shift+D" |
+| KeyDeleteNextWord | "Ctrl+Delete" |
+| KeyDeletePreviousWord | "Ctrl+Backspace" |
+| KeyEnterLineBreak | "Shift+Enter" |
+| KeyEnterParagraphBreak | "Enter" |
+| KeyIncreaseFontSize | "Ctrl+OemCloseBrackets" |
+| KeyInsertColumns | "Alt+Ctrl+Shift+C" |
+| KeyInsertRows | "Alt+Ctrl+Shift+R" |
+| KeyInsertTable | "Alt+Ctrl+Shift+T" |
+| KeyMergeCells | "Alt+Ctrl+Shift+M" |
+| KeyMoveDownByLine | "Down" |
+| KeyMoveDownByPage | "PageDown" |
+| KeyMoveDownByParagraph | "Ctrl+Down" |
+| KeyMoveLeftByCharacter | "Left" |
+| KeyMoveLeftByWord | "Ctrl+Left" |
+| KeyMoveRightByCharacter | "Right" |
+| KeyMoveRightByWord | "Ctrl+Right" |
+| KeyMoveToColumnEnd | "Alt+PageDown" |
+| KeyMoveToColumnStart | "Alt+PageUp" |
+| KeyMoveToDocumentEnd | "Ctrl+End" |
+| KeyMoveToDocumentStart | "Ctrl+Home" |
+| KeyMoveToLineEnd | "End" |
+| KeyMoveToLineStart | "Home" |
+| KeyMoveToWindowBottom | "Alt+Ctrl+PageDown" |
+| KeyMoveToWindowTop | "Alt+Ctrl+PageUp" |
+| KeyMoveUpByLine | "Up" |
+| KeyMoveUpByPage | "PageUp" |
+| KeyMoveUpByParagraph | "Ctrl+Up" |
+| KeyPasteFormat | "Ctrl+Shift+V" |
+| KeyRedo | "Ctrl+Y" |
+| KeyRemoveListMarkers | "Ctrl+Shift+R" |
+| KeyResetFormat | "Ctrl+Space" |
+| KeySelectDownByLine | "Shift+Down" |
+| KeySelectDownByPage | "Shift+PageDown" |
+| KeySelectDownByParagraph | "Ctrl+Shift+Down" |
+| KeySelectLeftByCharacter | "Shift+Left" |
+| KeySelectLeftByWord | "Ctrl+Shift+Left" |
+| KeySelectRightByCharacter | "Shift+Right" |
+| KeySelectRightByWord | "Ctrl+Shift+Right" |
+| KeySelectToColumnEnd | "Alt+Shift+PageDown" |
+| KeySelectToColumnStart | "Alt+Shift+PageUp" |
+| KeySelectToDocumentEnd | "Ctrl+Shift+End" |
+| KeySelectToDocumentStart | "Ctrl+Shift+Home" |
+| KeySelectToLineEnd | "Shift+End" |
+| KeySelectToLineStart | "Shift+Home" |
+| KeySelectToWindowBottom | "Alt+Ctrl+Shift+PageDown" |
+| KeySelectToWindowTop | "Alt+Ctrl+Shift+PageUp" |
+| KeySelectUpByLine | "Shift+Up" |
+| KeySelectUpByPage | "Shift+PageUp" |
+| KeySelectUpByParagraph | "Ctrl+Shift+Up" |
+| KeyShiftBackspace | "Shift+Backspace" |
+| KeyShiftDelete | "Shift+Delete" |
+| KeyShiftInsert | "Shift+Insert" |
+| KeyShiftSpace | "Shift+Space" |
+| KeySpace | "Space" |
+| KeySplitCell | "Alt+Ctrl+Shift+S" |
+| KeySwitchViewingMode | "Ctrl+M" |
+| KeyTabBackward | "Shift+Tab" |
+| KeyTabForward | "Tab" |
+| KeyToggleBullets | "Ctrl+Shift+L" |
+| KeyToggleInsert | "Insert" |
+| KeyToggleNumbering | "Ctrl+Shift+N" |
+| KeyToggleSubscript | "Ctrl+OemPlus" |
+| KeyToggleSuperscript | "Ctrl+Shift+OemPlus" |
+| KeyToggleUnderline | "Ctrl+U" |
+| KeyUndo | "Ctrl+Z" |
+| ListBoxSelectAllKey | "Ctrl+A" |
+| SwitchViewingMode | "_Switch ViewingMode" |
+| ToStringFormatString_Control | "{0}: {1}" |
+| ToStringFormatString_GridView | "{0} Columns.Count:{1}" |
+| ZoomPercentageConverterStringFormat | "{0:0.##}%" |
+
diff --git a/...oft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/FileClassifier.cs b/...oft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/FileClassifier.cs
@@ -82,7 +82,7 @@ public override bool Execute()
 
             try
             {
-                TaskHelper.DisplayLogo(Log, SR.Get(SRID.FileClassifierTask));
+                TaskHelper.DisplayLogo(Log, nameof(FileClassifier));
 
                 ret = VerifyTaskInputs();
 

diff --git a/...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs b/...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs
@@ -102,7 +102,7 @@ public MarkupCompilePass1( ) : base(SR.SharedResourceManager)
         /// <returns></returns>
         public override bool Execute()
         {
-            TaskHelper.DisplayLogo(Log, SR.Get(SRID.MarkupCompilePass1Task));
+            TaskHelper.DisplayLogo(Log, nameof(MarkupCompilePass1));
 
             bool bSuccess = true;
 

diff --git a/...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs b/...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs
@@ -83,7 +83,7 @@ public MarkupCompilePass2( ) : base(SR.SharedResourceManager)
         /// <returns></returns>
         public override bool Execute()
         {
-            TaskHelper.DisplayLogo(Log, SR.Get(SRID.MarkupCompilePass2Task));
+            TaskHelper.DisplayLogo(Log, nameof(MarkupCompilePass2));
 
             //
             // Create the TaskFileService instance here

diff --git a/...f/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MergeLocalizationDirectives.cs b/...f/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MergeLocalizationDirectives.cs
@@ -54,7 +54,7 @@ public MergeLocalizationDirectives() : base(SR.SharedResourceManager)
         /// </summary>
         public override bool Execute()
         {
-            TaskHelper.DisplayLogo(Log, SR.Get(SRID.MergeLocalizationDirectivesTask));
+            TaskHelper.DisplayLogo(Log, nameof(MergeLocalizationDirectives));
             if (GeneratedLocalizationFiles.Length > 0)
             {
                 try {

diff --git a/...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/ResourcesGenerator.cs b/...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/ResourcesGenerator.cs
@@ -151,7 +151,7 @@ public ResourcesGenerator ( )
 
         public override bool Execute()
         {
-            TaskHelper.DisplayLogo(Log, SR.Get(SRID.ResourcesGeneratorTask));
+            TaskHelper.DisplayLogo(Log, nameof(ResourcesGenerator));
 
             //
             // Validate the property settings

diff --git a/...crosoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs b/...crosoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs
@@ -74,7 +74,7 @@ public UidManager() : base(SR.SharedResourceManager)
         /// </summary>
         public override bool Execute()
         {
-            TaskHelper.DisplayLogo(Log, SR.Get(SRID.UidManagerTask));
+            TaskHelper.DisplayLogo(Log, nameof(UidManager));
 
             if (MarkupFiles == null || MarkupFiles.Length == 0)
             {

diff --git a/...esentationBuildTasks/Microsoft/Build/Tasks/Windows/UpdateManifestForBrowserApplication.cs b/...esentationBuildTasks/Microsoft/Build/Tasks/Windows/UpdateManifestForBrowserApplication.cs
@@ -70,7 +70,7 @@ public UpdateManifestForBrowserApplication()
         public override bool Execute()
         {
             bool successful = true;
-            TaskHelper.DisplayLogo(Log, SR.Get(SRID.UpdateManifestForBrowserApplicationTask));
+            TaskHelper.DisplayLogo(Log, nameof(UpdateManifestForBrowserApplication));
 
             if (HostInBrowser != true)
             {

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/Strings.resx b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/Strings.resx
@@ -132,30 +132,6 @@
   <data name="FileResolved" xml:space="preserve">
     <value>Input file '{0}' is resolved to new relative path '{1}' at directory '{2}'.</value>
   </data>
-  <data name="MarkupCompilePass1Task" xml:space="preserve">
-    <value>MarkupCompilePass1</value>
-  </data>
-  <data name="FileClassifierTask" xml:space="preserve">
-    <value>FileClassifier</value>
-  </data>
-  <data name="MarkupCompilePass2Task" xml:space="preserve">
-    <value>MarkupCompilePass2</value>
-  </data>
-  <data name="UidManagerTask" xml:space="preserve">
-    <value>UidManager</value>
-  </data>
-  <data name="ResourcesGeneratorTask" xml:space="preserve">
-    <value>ResourcesGenerator</value>
-  </data>
-  <data name="MergeLocalizationDirectivesTask" xml:space="preserve">
-    <value>MergeLocalizationDirectives</value>
-  </data>
-  <data name="UpdateManifestForBrowserApplicationTask" xml:space="preserve">
-    <value>UpdateManifestForBrowserApplication</value>
-  </data>
-  <data name="GetWinFXPathTask" xml:space="preserve">
-    <value>GetWinFXPath</value>
-  </data>
   <data name="CompileSucceed_Pass1" xml:space="preserve">
     <value>MarkupCompilePass1 successfully generated BAML or source code files.</value>
   </data>
@@ -858,4 +834,4 @@
   <data name="ParserMarkupExtensionMalformedBracketCharacers" xml:space="preserve">
     <value>MC8002: BracketCharacter '{0}' at Line Number '{1}' and Line Position '{2}' does not have a corresponding opening/closing BracketCharacter.</value>
   </data>
-</root>
+</root>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/xlf/Strings.cs.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/xlf/Strings.cs.xlf
@@ -97,11 +97,6 @@
         <target state="translated">MC6021: {0}: Na tomto tagu nelze specifikovat třídu FieldModifier, protože buď nemá atribut {0}: Name nebo Name atribut není nastaven, nebo je tag lokálně definován a má parametr Name nastaven, což není povoleno.</target>
         <note />
       </trans-unit>
-      <trans-unit id="FileClassifierTask">
-        <source>FileClassifier</source>
-        <target state="translated">FileClassifier</target>
-        <note />
-      </trans-unit>
       <trans-unit id="FileNotFound">
         <source>BG1002: File '{0}' cannot be found.</source>
         <target state="translated">BG1002: Soubor {0} nelze nalézt.</target>
@@ -142,11 +137,6 @@
         <target state="translated">Vygenerovaný soubor kódu: {0}.</target>
         <note />
       </trans-unit>
-      <trans-unit id="GetWinFXPathTask">
-        <source>GetWinFXPath</source>
-        <target state="translated">GetWinFXPath</target>
-        <note />
-      </trans-unit>
       <trans-unit id="IllegalCDataTextScoping">
         <source>MC6003: '{0}:{1}' contains '{2}'. '{0}:{1}' cannot contain nested content.</source>
         <target state="translated">MC6003: Soubor {0}:{1} obsahuje obsah souboru {2}. Soubor {0}:{1} nemůže obsahovat vnořený obsah.</target>
@@ -252,26 +242,11 @@
         <target state="translated">Vstup: Místní referenční soubor označení Page: {0}.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MarkupCompilePass1Task">
-        <source>MarkupCompilePass1</source>
-        <target state="translated">MarkupCompilePass1</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="MarkupCompilePass2Task">
-        <source>MarkupCompilePass2</source>
-        <target state="translated">MarkupCompilePass2</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MatchingTypeArgsNotFoundInRefType">
         <source>MC6012: '{0}' event has a generic event handler delegate type '{1}'. The type parameter '{2}' on '{1}' does not match any type parameters on the containing generic tag '{3}'.</source>
         <target state="translated">MC6012: Událost {0} má ovladač generických událostí typu {1}. Typový parametr {2} v souboru {1} neodpovídá žádným typovým parametrům generického tagu {3}, který jej obsahuje.</target>
         <note />
       </trans-unit>
-      <trans-unit id="MergeLocalizationDirectivesTask">
-        <source>MergeLocalizationDirectives</source>
-        <target state="translated">MergeLocalizationDirectives</target>
-        <note />
-      </trans-unit>
       <trans-unit id="MissingClassDefinitionForCodeTag">
         <source>MC6026: '{0}' root element requires a {1}:Class attribute because '{2}' contains a {1}:Code tag. Either remove {1}:Code and its contents, or add a {1}:Class attribute to the root element.</source>
         <target state="translated">MC6026: Kořenový prvek{0} vyžaduje atribut {1}:Class, protože prvek {2} obsahuje tag {1}:Code. Buď odstraňte {1}:Code a jeho obsah, nebo přidejte atribut {1}:Class do kořenového prvku.</target>
@@ -872,11 +847,6 @@
         <target state="translated">Generuji soubor .resources: {0}...</target>
         <note />
       </trans-unit>
-      <trans-unit id="ResourcesGeneratorTask">
-        <source>ResourcesGenerator</source>
-        <target state="translated">ResourcesGenerator</target>
-        <note />
-      </trans-unit>
       <trans-unit id="RoutedEventNotRegistered">
         <source>MC6006: {0}.{1}="{2}" is not valid. '{1}' must be a RoutedEvent registered with a name that ends with the keyword "Event".</source>
         <target state="translated">MC6006: Rovnice {0}.{1}={2} není platná. {1} musí být třída RoutedEvent registrovaná pro název, který končí klíčovým slovem Event.</target>
@@ -1032,11 +1002,6 @@
         <target state="translated">MC7001: Program narazil na předčasné ukončení řetězce.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UidManagerTask">
-        <source>UidManager</source>
-        <target state="translated">UidManager</target>
-        <note />
-      </trans-unit>
       <trans-unit id="UidMissing">
         <source>UM1003: Uid is missing for element '{0}'.</source>
         <target state="translated">UM1003: Chybí identifikátor Uid pro prvek {0}.</target>
@@ -1087,11 +1052,6 @@
         <target state="translated">LC1003: Lokalizační poznámka nemá nastavenu hodnotu pro cílovou vlastnost: {0}.</target>
         <note />
       </trans-unit>
-      <trans-unit id="UpdateManifestForBrowserApplicationTask">
-        <source>UpdateManifestForBrowserApplication</source>
-        <target state="translated">UpdateManifestForBrowserApplication</target>
-        <note />
-      </trans-unit>
       <trans-unit id="VersionNumberComponentNegative">
         <source>MC4501: Major and minor version number components cannot be negative.</source>
         <target state="translated">MC4501: Komponenty čísla hlavní verze a podverze nemohou být záporné.</target>