Update string resources.

data/resources/StringResources.cz.resx

@@ -1652,12 +1652,12 @@ Chcete přidat nový soubor do projektu ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Zobrazit značku EOL</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Zvýraznit párovou závorku</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Zvýrazňovat symboly</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Zvýraznit párovou závorku</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Ukázat vodorovné měřítko</value>
   </data>

data/resources/StringResources.de.resx

@@ -2341,12 +2341,12 @@ Wollen Sie die neue Datei zum Projekt ${CurrentProjectName} hinzufügen?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Markierung an Zeilen&amp;ende anzeigen</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>&amp;Passende Klammer markieren</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Symbole hervorheben</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>&amp;Passende Klammer markieren</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>&amp;Horizontales Linial</value>
   </data>

data/resources/StringResources.es-mx.resx

@@ -2349,12 +2349,12 @@ Ejemplo: "120", "MainClass", "Main.cs, 120".</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Mostrar marcas de &amp;párrafo</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Resaltar &amp;corchetes</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Resaltar símbolos</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Resaltar &amp;corchetes</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Mostrar regla &amp;horizontal</value>
   </data>
@@ -5041,6 +5041,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
     <value>Alternar Ajuste de Línea</value>
   </data>
+  <data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
+    <value>Agregar inspección</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
     <value>Puntos de interrupción</value>
   </data>

data/resources/StringResources.es.resx

@@ -2346,12 +2346,12 @@ Para crear/manipular un objeto ActiveX/COM, arrastre una clase de un Control/Bib
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Mostrar marcas de &amp;párrafo</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Resaltar &amp;corchetes</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Resaltar símbolos</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Resaltar &amp;corchetes</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Mostrar regla &amp;horizontal</value>
   </data>
@@ -5047,6 +5047,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
     <value>Alterna el Ajuste de Línea</value>
   </data>
+  <data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
+    <value>Agregar inspección</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
     <value>Puntos de interrupción</value>
   </data>

data/resources/StringResources.fi.resx

@@ -1520,12 +1520,12 @@ Llisää tiedosto projektiin ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Rivin Loppumerkit</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Väritä Sulut</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Väritä Symboolit</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Väritä Sulut</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Vaaka Viivotin</value>
   </data>

data/resources/StringResources.fr.resx

@@ -2345,12 +2345,12 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Affich&amp;er les marqueurs de fin de ligne</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Accolades en surbrillance</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Surligner symboles</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Accolades en surbrillance</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Afficher la règle &amp;horizontale</value>
   </data>
@@ -5036,6 +5036,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
     <value>Activer Retour à la Ligne</value>
   </data>
+  <data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
+    <value>Ajouter un espion</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
     <value>Points d'arrêt</value>
   </data>

data/resources/StringResources.hu.resx

@@ -1233,7 +1233,7 @@ Hozzáadja az új fáljt a ${CurrentProjectName} projekthez?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Sorvége &amp;jelek mutatása</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
     <value>Záró&amp;jelpár kiemelése</value>
   </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">

data/resources/StringResources.it.resx

@@ -2323,12 +2323,12 @@ Vuoi aggiungere il nuovo file al progetto ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Mostra marcatori &amp;EOL</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Evide&amp;nzia coppie parentesi</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Evidenzia simboli</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Evide&amp;nzia coppie parentesi</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Mostra rig&amp;hello oriz.le</value>
   </data>

data/resources/StringResources.kr.resx

@@ -1610,7 +1610,7 @@ ${CurrentProjectName} 프로젝트에 이 새 파일을 더하겠습니까?</val
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>EOL 표식 보이기(&amp;E)</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
     <value>짝이 맞는 괄호를 강조(&amp;M)</value>
   </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">

data/resources/StringResources.nl.resx

@@ -2350,12 +2350,12 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>&amp;EOL markeringen weergeven</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>&amp;Markeren passend haakje</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Markeer symbolen</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>&amp;Markeren passend haakje</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Toon &amp;horizontale lineaal</value>
   </data>
@@ -5037,6 +5037,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
     <value>Schakel woordomslag aan/uit</value>
   </data>
+  <data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
+    <value>Wacht expressie toevoegen</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
     <value>Breekpunten</value>
   </data>

data/resources/StringResources.no.resx

@@ -2079,12 +2079,12 @@ Eksempler: "120", "MainClass", "Main.cs, 120".</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Vis &amp;linjeslutt-markører</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Uthev &amp;matchende parentes</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Fargekode symboler</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Uthev &amp;matchende parentes</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Vis &amp;horisontal linjal</value>
   </data>

data/resources/StringResources.pl.resx

@@ -1494,7 +1494,7 @@ Czy chcesz dodać nowy plik do projektu ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Pokazuj mark&amp;ery końca wiersza</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
     <value>Podświetlaj &amp;pasujący nawias</value>
   </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">

data/resources/StringResources.pt-br.resx

@@ -2139,12 +2139,12 @@ Para criar/manipular um objeto ActiveX/COM, arraste uma classe contida em um Typ
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Mostrar marcas de &amp;EOL</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Destacar &amp;chave correspondente</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Simbolos em destaque</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Destacar &amp;chave correspondente</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Mostrar régua &amp;horizontal</value>
   </data>

data/resources/StringResources.pt.resx

@@ -1597,7 +1597,7 @@ Exemplos:"120", "MainClass", "Main.cs, 120".</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Mostrar marcadores de fim de linha (EOL)</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
     <value>Realçar chaveta correspondente</value>
   </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">

data/resources/StringResources.resx

@@ -2397,12 +2397,6 @@ system. I don't think that it needs translation.</comment>
   <data name="Dialog.Options.IDEOptions.TextEditor.General.MouseWheelZoomCheckBoxCheckBox" xml:space="preserve">
     <value>M&amp;ouse wheel zooming</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.General.HideCursorWhileTypingCheckBoxCheckBox" xml:space="preserve">
-    <value>Hide cursor while typing</value>
-  </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.General.AllowOverstrikeModeCheckBox" xml:space="preserve">
-    <value>Allow overstrike mode</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.General.ShowQuickClassBrowserCheckBox" xml:space="preserve">
     <value>Show &amp;Quick ClassBrowser Panel</value>
   </data>
@@ -2428,15 +2422,15 @@ system. I don't think that it needs translation.</comment>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Show &amp;end-of-line markers</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
-    <value>Highlight symbols</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
     <value>Highlight &amp;matching bracket</value>
   </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightCurrentLineCheckBox" xml:space="preserve">
     <value>Highlight current line</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
+    <value>Highlight symbols</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Show &amp;horizontal ruler</value>
   </data>
@@ -6446,12 +6440,12 @@ Removed the end part of the original message ", reason '${Message}'" since this
   <data name="SharpDevelop.Refactoring.ClipboardRing" xml:space="preserve">
     <value>Clipboard ring</value>
   </data>
-  <data name="SharpDevelop.Refactoring.ClipboardRingEmpty" xml:space="preserve">
-    <value>Clipboard ring is empty</value>
-  </data>
   <data name="SharpDevelop.Refactoring.ClipboardRingCommand" xml:space="preserve">
     <value>From clipboard ring</value>
   </data>
+  <data name="SharpDevelop.Refactoring.ClipboardRingEmpty" xml:space="preserve">
+    <value>Clipboard ring is empty</value>
+  </data>
   <data name="SharpDevelop.Refactoring.ConvertToAutomaticProperty" xml:space="preserve">
     <value>Convert to automatic property</value>
   </data>
@@ -6947,11 +6941,13 @@ The resources files have been renamed/moved accordingly.</value>
   <data name="StatusBarService.CursorStatusBarPanelText" xml:space="preserve">
     <value>ln ${Line} col ${Column} ch ${Character}</value>
   </data>
-  <data name="StatusBarService.SelectionStatusBarPanelTextSingle" xml:space="preserve">
-    <value>len ${Lenght}</value>
-  </data>
   <data name="StatusBarService.SelectionStatusBarPanelTextMulti" xml:space="preserve">
     <value>len ${Rows} * ${Cols} (${Total})</value>
+    <comment>shown in status bar when a rectangle selection is used in the editor</comment>
+  </data>
+  <data name="StatusBarService.SelectionStatusBarPanelTextSingle" xml:space="preserve">
+    <value>len ${Length}</value>
+    <comment>Shown in status bar when some text is selected in the editor</comment>
   </data>
   <data name="Templates.File.Categories.Misc" xml:space="preserve">
     <value>Misc</value>

data/resources/StringResources.ro.resx

@@ -903,7 +903,7 @@ Doriţi adăugarea noului fişier la proiectul ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Afişare marcaje &amp;EOL</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
     <value>Evidenţiere paranteze &amp;perechi</value>
   </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">

data/resources/StringResources.ru.resx

@@ -2016,12 +2016,12 @@
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Показывать конец строки</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Подсвечивать соответствующие фигурные скобки</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Выделенные символы</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Подсвечивать соответствующие фигурные скобки</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Показывать горизонтальную линейку</value>
   </data>

data/resources/StringResources.se.resx

@@ -1523,12 +1523,12 @@ Vill du lägga till den nya filen till projektet ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Visa &amp;EOL-markeringar</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Markera &amp;matchande parantes</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Markera symboler</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Markera &amp;matchande parantes</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Visa &amp;horisontal linjal</value>
   </data>

data/resources/StringResources.tr.resx

@@ -2183,12 +2183,12 @@ Yeni dosyayı, ${CurrentProjectName} projesine eklemek istiyor musunuz?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Satır sonu işaretçilerini göster</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>Eşleşen parantezleri vurgula</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>Sembolleri vurgula</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>Eşleşen parantezleri vurgula</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>Yatay cetveli göster</value>
   </data>

data/resources/StringResources.zh.resx

@@ -2102,12 +2102,12 @@
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>显示行尾标记</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
+    <value>突出显示匹配的括号</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
     <value>高亮显示符号</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
-    <value>突出显示匹配的括号</value>
-  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
     <value>显示横向标尺</value>
   </data>

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/BehaviorOptions.xaml

@@ -35,7 +35,7 @@
 					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.MouseWheelZoomCheckBoxCheckBox}" />
 				<CheckBox
 					IsChecked="{core:OptionBinding local:CodeEditorOptions.HideCursorWhileTyping}"
-					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.HideCursorWhileTypingCheckBoxCheckBox}" />
+					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Behaviour.HideMouseCheckBox}" />
 				<CheckBox
 					IsChecked="{core:OptionBinding local:CodeEditorOptions.CutCopyWholeLine}"
 					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Behaviour.CutCopyWholeLine}" />

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml

@@ -29,7 +29,7 @@
 					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.ShowHiddenDefinitionsCheckBox}" />
 				<CheckBox 
 					IsChecked="{core:OptionBinding local:CodeEditorOptions.AllowOverstrikeMode}" 
-					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.AllowOverstrikeModeCheckBox}" />
+					Content="Allow Overstrike mode" />
 			</widgets:StackPanelWithSpacing>
 		</GroupBox>
 	</StackPanel>

src/Main/Base/Project/Src/Services/StatusBar/StatusBarService.cs

@@ -41,10 +41,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 		//void SetInsertMode(bool insertMode);
 		
 		/// <summary>
-		/// Sets the selection lenght in the status bar.
+		/// Sets the selection length in the status bar.
 		/// </summary>
-		/// <param name="lenght">selection lenght</param>
+		/// <param name="length">selection length</param>
-		void SetSelectionSingle(int lenght);
+		void SetSelectionSingle(int length);
 		
 		/// <summary>
 		/// Sets rect selection size in the status bar.

src/Main/SharpDevelop/Workbench/StatusBarService.cs

@@ -57,12 +57,12 @@ namespace ICSharpCode.SharpDevelop.Workbench
 			);
 		}
 		
-		public void SetSelectionSingle(int lenght)
+		public void SetSelectionSingle(int length)
 		{
-			if (lenght > 0) {
+			if (length > 0) {
 				statusBar.SelectionStatusBarPanel.Content = StringParser.Parse(
 					"${res:StatusBarService.SelectionStatusBarPanelTextSingle}",
-					new StringTagPair("Lenght", String.Format("{0,-10}", lenght)));
+					new StringTagPair("Length", String.Format("{0,-10}", length)));
 			} else {
 				statusBar.SelectionStatusBarPanel.Content = null;
 			}

src/Tools/StringResourceToolAddIn/Src/Command.cs

@@ -35,14 +35,11 @@ namespace StringResourceToolAddIn
 		{
 			// Here an example that shows how to access the current text document:
 			
-			ITextEditorProvider tecp = WorkbenchSingleton.Workbench.ActiveContent as ITextEditorProvider;
+			var textEditor = SD.GetActiveViewContentService<ITextEditor>();
-			if (tecp == null) {
+			if (textEditor == null) {
 				// active content is not a text editor control
 				return;
 			}
-			
-			// Get the active text area from the control:
-			ITextEditor textEditor = tecp.TextEditor;
 			if (textEditor.SelectionLength == 0)
 				return;
 			// get the selected text:
@@ -64,7 +61,7 @@ namespace StringResourceToolAddIn
 			}
 			
 			string resourceName = MessageService.ShowInputBox("Add Resource", "Please enter the name for the new resource.\n" +
-			                                                  "This should be a namespace-like construct, please see what the names of resources in the same component are.", PropertyService.Get("ResourceToolLastResourceName"));
+			                                                  "This should be a namespace-like construct, please see what the names of resources in the same component are.", SD.PropertyService.Get("ResourceToolLastResourceName", ""));
 			if (resourceName == null || resourceName.Length == 0) return;
 			PropertyService.Set("ResourceToolLastResourceName", resourceName);
 			

src/Tools/StringResourceToolAddIn/StringResourceToolAddIn.csproj

@@ -36,6 +36,10 @@
     <OutputPath>bin\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.NRefactory">
+      <HintPath>..\..\..\bin\ICSharpCode.NRefactory.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />