diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2017-01-16 13:42:03 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2017-01-16 13:47:36 +0300 |
| commit | 6f7aa7b8eb34da03873576eb9cfc70950e488ab0 (patch) | |
| tree | 7c63ba2b35ef5beb4a2b1b68c2e8a9fb7fcf8dde /main/src/core/MonoDevelop.Ide/gtk-gui | |
| parent | ed06bed9adfec359bf52253731956c5a6b21e1ae (diff) | |
| parent | ba827907e055b7832e49db54998bfc5a16dcc18b (diff) | |
Merge remote-tracking branch 'monodevelop/dotnetcore' into vNext
Conflicts:
main/external/mono-addins
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/gtk-gui')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs index 035cd9e3e6..7b7ff856ce 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs @@ -54,7 +54,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels w2.BottomAttach = ((uint)(2)); // Container child table1.Gtk.Table+TableChild this.textview1 = new global::Gtk.TextView (); - this.textview1.Buffer.Text = "If you have a parallel installation of Mono you can register it here, so you can use it for building and running projects. The <b>default runtime</b> is the .NET runtime to be used for building and running applications when none is specifically selected."; + this.textview1.Buffer.Text = global::Mono.Unix.Catalog.GetString ("If you have a parallel installation of Mono you can register it here, so you can use it for building and running projects. The <b>default runtime</b> is the .NET runtime to be used for building and running applications when none is specifically selected."); this.textview1.Sensitive = false; this.textview1.Name = "textview1"; this.textview1.Editable = false; |