From 70bc9672197b3dd69b5d7fa466b42f65935e31cc Mon Sep 17 00:00:00 2001
From: Arjun Balgovind <32061677+arjunbalgovind@users.noreply.github.com>
Date: Wed, 14 Oct 2020 09:03:45 -0700
Subject: [PATCH] Updated double quotes logic (#7268)
---
src/modules/keyboardmanager/dll/Resources.resx | 4 ++--
.../cs/src/modules/keyboardmanager/dll/Resources.resx.lcl | 4 ++--
.../de/src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../es/src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../fr/src/modules/keyboardmanager/dll/Resources.resx.lcl | 4 ++--
.../hu/src/modules/keyboardmanager/dll/Resources.resx.lcl | 4 ++--
.../it/src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../ja/src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../ko/src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../nl/src/modules/keyboardmanager/dll/Resources.resx.lcl | 4 ++--
.../pl/src/modules/keyboardmanager/dll/Resources.resx.lcl | 4 ++--
.../src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../src/modules/keyboardmanager/dll/Resources.resx.lcl | 4 ++--
.../ru/src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../sv/src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../tr/src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
.../src/modules/keyboardmanager/dll/Resources.resx.lcl | 4 ++--
.../src/modules/keyboardmanager/dll/Resources.resx.lcl | 8 ++++----
tools/build/convert-resx-to-rc.ps1 | 4 ++--
19 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/src/modules/keyboardmanager/dll/Resources.resx b/src/modules/keyboardmanager/dll/Resources.resx
index a226598fa0..7bb610b383 100644
--- a/src/modules/keyboardmanager/dll/Resources.resx
+++ b/src/modules/keyboardmanager/dll/Resources.resx
@@ -178,13 +178,13 @@
Select the key you want to change (Key) and then the key or shortcut you want it to become (Mapped To).
- For example, if you want to press A and get ""Ctrl+C"", key ""A"" would be your ""Key"" column and the shortcut ""Ctrl+C"" would be your ""Mapped To"" column.
+ For example, if you want to press A and get "Ctrl+C", key "A" would be your "Key" column and the shortcut "Ctrl+C" would be your "Mapped To" column.
Select the shortcut you want to change (Shortcut) and then the key or shortcut you want it to invoke (Mapped To).
- For example, if you want to press ""Ctrl+C"" and get ""Alt"" only on Microsoft Edge, ""Ctrl+C"" would be your ""Shortcut"" column, the key ""Alt"" would be your ""Mapped To"" column, and ""MSEdge"" would be your ""Target App"" column. If no target app is entered, it will apply globally. The name must be the process name and not the app name.
+ For example, if you want to press "Ctrl+C" and get "Alt" only on Microsoft Edge, "Ctrl+C" would be your "Shortcut" column, the key "Alt" would be your "Mapped To" column, and "MSEdge" would be your "Target App" column. If no target app is entered, it will apply globally. The name must be the process name and not the app name.
Type
diff --git a/src/modules/keyboardmanager/dll/loc/cs/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/cs/src/modules/keyboardmanager/dll/Resources.resx.lcl
index d67e2e27c1..0a0a06ad4b 100644
--- a/src/modules/keyboardmanager/dll/loc/cs/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/cs/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,7 +102,7 @@
-
-
+
@@ -174,7 +174,7 @@
-
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/de/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/de/src/modules/keyboardmanager/dll/Resources.resx.lcl
index fa00800342..ee32c9c112 100644
--- a/src/modules/keyboardmanager/dll/loc/de/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/de/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/es/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/es/src/modules/keyboardmanager/dll/Resources.resx.lcl
index a462da484b..6e0943237a 100644
--- a/src/modules/keyboardmanager/dll/loc/es/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/es/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/fr/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/fr/src/modules/keyboardmanager/dll/Resources.resx.lcl
index a4919280fe..6ce4a30903 100644
--- a/src/modules/keyboardmanager/dll/loc/fr/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/fr/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,7 +102,7 @@
-
-
+
@@ -174,7 +174,7 @@
-
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/hu/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/hu/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 3d8b0042b4..af0471f9e3 100644
--- a/src/modules/keyboardmanager/dll/loc/hu/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/hu/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,7 +102,7 @@
-
-
+
@@ -174,7 +174,7 @@
-
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/it/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/it/src/modules/keyboardmanager/dll/Resources.resx.lcl
index bebf3856c5..26ceee6b61 100644
--- a/src/modules/keyboardmanager/dll/loc/it/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/it/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/ja/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/ja/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 8e63090d16..8e07cb2ea9 100644
--- a/src/modules/keyboardmanager/dll/loc/ja/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/ja/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/ko/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/ko/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 7292739578..47d4174e99 100644
--- a/src/modules/keyboardmanager/dll/loc/ko/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/ko/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl
index adfb47f061..5a8d9fa496 100644
--- a/src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,7 +102,7 @@
-
-
+
@@ -174,7 +174,7 @@
-
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl
index a9c2712ac1..386a4cfa1c 100644
--- a/src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,7 +102,7 @@
-
-
+
@@ -174,7 +174,7 @@
-
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/pt-BR/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/pt-BR/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 88091d18c5..bd687d2d07 100644
--- a/src/modules/keyboardmanager/dll/loc/pt-BR/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/pt-BR/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/pt-PT/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/pt-PT/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 2b4f7a703f..f165e5e2fd 100644
--- a/src/modules/keyboardmanager/dll/loc/pt-PT/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/pt-PT/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,7 +102,7 @@
-
-
+
@@ -174,7 +174,7 @@
-
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/ru/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/ru/src/modules/keyboardmanager/dll/Resources.resx.lcl
index edcec90002..491cecb7f9 100644
--- a/src/modules/keyboardmanager/dll/loc/ru/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/ru/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/sv/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/sv/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 797e9b2c96..8106738860 100644
--- a/src/modules/keyboardmanager/dll/loc/sv/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/sv/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/tr/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/tr/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 7f7387118f..975c423038 100644
--- a/src/modules/keyboardmanager/dll/loc/tr/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/tr/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/zh-Hans/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/zh-Hans/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 8d88b55487..c3b4d28a86 100644
--- a/src/modules/keyboardmanager/dll/loc/zh-Hans/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/zh-Hans/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,7 +102,7 @@
-
-
+
@@ -174,7 +174,7 @@
-
-
+
diff --git a/src/modules/keyboardmanager/dll/loc/zh-Hant/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/zh-Hant/src/modules/keyboardmanager/dll/Resources.resx.lcl
index cb208596f2..b1bb91cb98 100644
--- a/src/modules/keyboardmanager/dll/loc/zh-Hant/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/zh-Hant/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,9 +102,9 @@
-
-
+
-
+
@@ -174,9 +174,9 @@
-
-
+
-
+
diff --git a/tools/build/convert-resx-to-rc.ps1 b/tools/build/convert-resx-to-rc.ps1
index 071b80907f..6a6fab526b 100644
--- a/tools/build/convert-resx-to-rc.ps1
+++ b/tools/build/convert-resx-to-rc.ps1
@@ -110,8 +110,8 @@ Foreach-Object {
$content = $line -split "=", 2
$culture = [System.Globalization.CultureInfo]::GetCultureInfo('en-US')
- # Each resource is named as IDS_ResxResourceName, in uppercase
- $lineInRCFormat = "IDS_" + $content[0].ToUpper($culture) + " L`"" + $content[1] + "`""
+ # Each resource is named as IDS_ResxResourceName, in uppercase. Escape occurrences of double quotes in the string
+ $lineInRCFormat = "IDS_" + $content[0].ToUpper($culture) + " L`"" + $content[1].Replace("`"", "`"`"") + "`""
$newLinesForRCFile = $newLinesForRCFile + "`r`n " + $lineInRCFormat
# Resource header file needs to be updated only for one language