Merge pull request #53327 from Youssef1313/carrage-carriage

Fix typo: Carrage -> Carriage
dotnet · May 17, 2021 · d48ebf1 · d48ebf1
2 parents a5d841a + a8cf503
commit d48ebf1
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 90 deletions.
diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/NewLineViewModel.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/NewLineViewModel.cs
@@ -38,8 +38,8 @@ public IEnumSettingViewModel CreateViewModel(FormattingSetting setting)
     internal enum NewLineSetting
     {
         Newline,
-        CarrageReturn,
-        CarrageReturnNewline,
+        CarriageReturn,
+        CarriageReturnNewline,
         NotSet
     }
 
@@ -59,10 +59,10 @@ protected override void ChangePropertyTo(NewLineSetting newValue)
                 case NewLineSetting.Newline:
                     _setting.SetValue("\n");
                     break;
-                case NewLineSetting.CarrageReturn:
+                case NewLineSetting.CarriageReturn:
                     _setting.SetValue("\r");
                     break;
-                case NewLineSetting.CarrageReturnNewline:
+                case NewLineSetting.CarriageReturnNewline:
                     _setting.SetValue("\r\n");
                     break;
                 case NewLineSetting.NotSet:
@@ -76,8 +76,8 @@ protected override NewLineSetting GetCurrentValue()
             return _setting.GetValue() switch
             {
                 "\n" => NewLineSetting.Newline,
-                "\r" => NewLineSetting.CarrageReturn,
-                "\r\n" => NewLineSetting.CarrageReturnNewline,
+                "\r" => NewLineSetting.CarriageReturn,
+                "\r\n" => NewLineSetting.CarriageReturnNewline,
                 _ => NewLineSetting.NotSet,
             };
         }
@@ -89,8 +89,8 @@ protected override IReadOnlyDictionary<string, NewLineSetting> GetValuesAndDescr
             static IEnumerable<(string description, NewLineSetting value)> EnumerateOptions()
             {
                 yield return (ServicesVSResources.Newline_n, NewLineSetting.Newline);
-                yield return (ServicesVSResources.Carrage_Return_r, NewLineSetting.CarrageReturn);
-                yield return (ServicesVSResources.Carrage_Return_Newline_rn, NewLineSetting.CarrageReturnNewline);
+                yield return (ServicesVSResources.Carriage_Return_r, NewLineSetting.CarriageReturn);
+                yield return (ServicesVSResources.Carriage_Return_Newline_rn, NewLineSetting.CarriageReturnNewline);
             }
         }
     }

diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1662,11 +1662,11 @@ I agree to all of the foregoing:</value>
   <data name="Analyzers" xml:space="preserve">
     <value>Analyzers</value>
   </data>
-  <data name="Carrage_Return_Newline_rn" xml:space="preserve">
-    <value>Carrage Return + Newline (\\r\\n)</value>
+  <data name="Carriage_Return_Newline_rn" xml:space="preserve">
+    <value>Carriage Return + Newline (\r\n)</value>
   </data>
-  <data name="Carrage_Return_r" xml:space="preserve">
-    <value>Carrage Return (\\r)</value>
+  <data name="Carriage_Return_r" xml:space="preserve">
+    <value>Carriage Return (\r)</value>
   </data>
   <data name="Category" xml:space="preserve">
     <value>Category</value>

diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf