Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortherzok <marius.ungureanu@xamarin.com>2018-11-06 18:15:17 +0300
committertherzok <marius.ungureanu@xamarin.com>2018-11-12 22:33:18 +0300
commit06d7316b9a169b59462f05602415ff0df1f1eb10 (patch)
tree5d442311666d100f92532aba1c1f55d155ce4868 /main/src/addins
parent59f68edbc8642a480113768c32bbae3fd8a2bcd1 (diff)
[Dev] Add analyzer which picks up strings which should be localized
Also fix up instances of said strings throughout the codebase. First version is really robust: * Only offers GettextCatalog.GetString as an option * Only works on Gtk.Widget and special cased functions Future versions will provide: a) Configuration of catalog via attribute b) Cocoa/Atk support c) Detection of string.Format patterns. Fixes VSTS #683875 - Enable MD specific analyzers in the repository and build
Diffstat (limited to 'main/src/addins')
-rw-r--r--main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs8
-rw-r--r--main/src/addins/ChangeLogAddIn/Gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs2
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs1
-rw-r--r--main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs4
-rw-r--r--main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs4
-rw-r--r--main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs10
-rw-r--r--main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs2
-rw-r--r--main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs1
-rw-r--r--main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionGroupEditor.cs2
-rw-r--r--main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Translatable.cs14
-rw-r--r--main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuBar.cs6
-rw-r--r--main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyGrid.cs2
-rw-r--r--main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs4
-rw-r--r--main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs1
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.MergeDialog.cs1
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs2
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs6
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs2
20 files changed, 32 insertions, 44 deletions
diff --git a/main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs b/main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs
index 39ff9e1f25..6f4a5e40b8 100644
--- a/main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs
+++ b/main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs
@@ -62,15 +62,19 @@ namespace MonoDevelop.AspNet.Execution
//index should be equivalent to XspSslProtocol enum
((ListStore) sslProtocol.Model).Clear ();
sslProtocol.AppendText (GettextCatalog.GetString ("Default"));
+#pragma warning disable MD0005
sslProtocol.AppendText ("TLS");
sslProtocol.AppendText ("SSL 2");
sslProtocol.AppendText ("SSL 3");
-
+#pragma warning restore MD0005
+
((ListStore) keyType.Model).Clear ();
keyType.AppendText (GettextCatalog.GetString ("None"));
+#pragma warning disable MD0005
keyType.AppendText ("Pkcs12");
keyType.AppendText ("PVK");
-
+#pragma warning restore MD0005
+
((ListStore) passwordOptions.Model).Clear ();
passwordOptions.AppendText (GettextCatalog.GetString ("None"));
passwordOptions.AppendText (GettextCatalog.GetString ("Ask"));
diff --git a/main/src/addins/ChangeLogAddIn/Gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs b/main/src/addins/ChangeLogAddIn/Gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs
index 93c39e3318..df261c4c99 100644
--- a/main/src/addins/ChangeLogAddIn/Gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs
+++ b/main/src/addins/ChangeLogAddIn/Gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs
@@ -41,7 +41,7 @@ namespace MonoDevelop.ChangeLogAddIn
this.vbox2.Spacing = 6;
this.vbox2.BorderWidth = ((uint)(6));
// Container child vbox2.Gtk.Box+BoxChild
- this.noneRadioButton = new global::Gtk.RadioButton ("radiobutton1");
+ this.noneRadioButton = new global::Gtk.RadioButton ("1");
this.noneRadioButton.CanFocus = true;
this.noneRadioButton.Name = "noneRadioButton";
this.noneRadioButton.Active = true;
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs
index 84c2f49d8d..f1b850eb01 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs
@@ -26,7 +26,6 @@ namespace MonoDevelop.Deployment.Linux
this.label6 = new global::Gtk.Label ();
this.label6.CanFocus = true;
this.label6.Name = "label6";
- this.label6.LabelProp = "page1";
this.notebook2.SetTabLabel (w1, this.label6);
this.label6.ShowAll ();
this.Add (this.notebook2);
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
index 470a2685c8..3ddd74709a 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
@@ -203,7 +203,6 @@ namespace MonoDevelop.Deployment.Gui
// Notebook tab
this.label2 = new global::Gtk.Label ();
this.label2.Name = "label2";
- this.label2.LabelProp = "page5";
this.notebook.SetTabLabel (this.vbox3, this.label2);
this.label2.ShowAll ();
// Container child notebook.Gtk.Notebook+NotebookChild
@@ -252,7 +251,6 @@ namespace MonoDevelop.Deployment.Gui
// Notebook tab
this.label3 = new global::Gtk.Label ();
this.label3.Name = "label3";
- this.label3.LabelProp = "page3";
this.notebook.SetTabLabel (this.pageSelectProject, this.label3);
this.label3.ShowAll ();
// Container child notebook.Gtk.Notebook+NotebookChild
@@ -319,7 +317,6 @@ namespace MonoDevelop.Deployment.Gui
// Notebook tab
this.label6 = new global::Gtk.Label ();
this.label6.Name = "label6";
- this.label6.LabelProp = "page2";
this.notebook.SetTabLabel (this.vbox4, this.label6);
this.label6.ShowAll ();
// Container child notebook.Gtk.Notebook+NotebookChild
@@ -556,7 +553,6 @@ namespace MonoDevelop.Deployment.Gui
// Notebook tab
this.label8 = new global::Gtk.Label ();
this.label8.Name = "label8";
- this.label8.LabelProp = "page4";
this.notebook.SetTabLabel (this.pageSave, this.label8);
this.label8.ShowAll ();
this.hbox1.Add (this.notebook);
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
index 2b8e9474df..894cc96443 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
@@ -354,7 +354,7 @@ namespace MonoDevelop.Autotools
foreach (string s in MakefileData.CompilerMessageRegex.Keys)
comboMessageType.AppendText (s);
- comboMessageType.AppendText ("Custom");
+ comboMessageType.AppendText (GettextCatalog.GetString ("Custom"));
comboMessageType.Active = 0;
}
@@ -720,7 +720,7 @@ namespace MonoDevelop.Autotools
List<string> list = new List<string> (vars);
list.Sort ();
- comboFilesVar.AppendText ("(None)");
+ comboFilesVar.AppendText (GettextCatalog.GetString ("(None)"));
foreach (string item in list)
combos [0].AppendText (item);
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
index bafd6278f6..2e5e08f885 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
@@ -218,11 +218,11 @@ namespace MonoDevelop.Debugger.Soft
table.BorderWidth = 6;
VBox.PackStart (table, true, true, 0);
- table.Attach (new Gtk.Label ("Command:") { Xalign = 0 }, 0, 1, 0, 1);
- table.Attach (new Gtk.Label ("Arguments:") { Xalign = 0 }, 0, 1, 1, 2);
- table.Attach (new Gtk.Label ("IP:") { Xalign = 0 }, 0, 1, 2, 3);
- table.Attach (new Gtk.Label ("Port:") { Xalign = 0 }, 0, 1, 3, 4);
- table.Attach (new Gtk.Label ("Output:") { Xalign = 0 }, 0, 1, 4, 5);
+ table.Attach (new Gtk.Label (GettextCatalog.GetString ("Command:")) { Xalign = 0 }, 0, 1, 0, 1);
+ table.Attach (new Gtk.Label (GettextCatalog.GetString ("Arguments:")) { Xalign = 0 }, 0, 1, 1, 2);
+ table.Attach (new Gtk.Label (GettextCatalog.GetString ("IP:")) { Xalign = 0 }, 0, 1, 2, 3);
+ table.Attach (new Gtk.Label (GettextCatalog.GetString ("Port:")) { Xalign = 0 }, 0, 1, 3, 4);
+ table.Attach (new Gtk.Label (GettextCatalog.GetString ("Output:")) { Xalign = 0 }, 0, 1, 4, 5);
table.Attach (commandEntry, 1, 2, 0, 1);
table.Attach (argsEntry, 1, 2, 1, 2);
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
index 34c46e6f5b..34b7907cd6 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
@@ -81,7 +81,7 @@ namespace MonoDevelop.Debugger
if (DebuggingService.HasValueVisualizers (val)) {
var openButton = new Button ();
- openButton.Label = "Open";
+ openButton.Label = GettextCatalog.GetString ("Open");
openButton.Relief = ReliefStyle.Half;
openButton.Clicked += delegate {
PreviewWindowManager.DestroyWindow ();
diff --git a/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs b/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs
index 5980943369..640dfa8a5e 100644
--- a/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs
+++ b/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs
@@ -189,7 +189,6 @@ namespace MonoDevelop.Gettext
this.labelInitString = new global::Gtk.Label ();
this.labelInitString.Name = "labelInitString";
this.labelInitString.Xalign = 0F;
- this.labelInitString.LabelProp = "Mono.Unix.Catalog.Init (\"i18n\", \"./locale\");";
this.GtkAlignment4.Add (this.labelInitString);
this.frame3.Add (this.GtkAlignment4);
this.vbox4.Add (this.frame3);
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionGroupEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionGroupEditor.cs
index dc94b834c6..83c7ae666f 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionGroupEditor.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionGroupEditor.cs
@@ -41,7 +41,7 @@ namespace Stetic.Editor
Gtk.VBox vbox = new Gtk.VBox ();
Gtk.Label grpLabel = new Gtk.Label ();
grpLabel.Xalign = 0;
- grpLabel.Markup = "<small><i>Action Group</i></small>";
+ grpLabel.Markup = string.Format ("<small><i>{0}</i></small>", Catalog.GetString ("Action Group"));
// vbox.PackStart (grpLabel, false, false, 0);
vbox.PackStart (headerLabel, false, false, 3);
vbox.BorderWidth = 12;
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Translatable.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Translatable.cs
index c04192620f..975c3f4302 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Translatable.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Translatable.cs
@@ -45,27 +45,27 @@ namespace Stetic.Editor {
menu = new Gtk.Menu ();
- markItem = new Gtk.CheckMenuItem ("Mark for Translation");
+ markItem = new Gtk.CheckMenuItem (Mono.Unix.Catalog.GetString ("Mark for Translation"));
markItem.Toggled += ToggleMark;
markItem.Show ();
menu.Add (markItem);
- addContextItem = new Gtk.MenuItem ("Add Translation Context Hint");
+ addContextItem = new Gtk.MenuItem (Mono.Unix.Catalog.GetString ("Add Translation Context Hint"));
addContextItem.Activated += AddContext;
menu.Add (addContextItem);
- remContextItem = new Gtk.MenuItem ("Remove Translation Context Hint");
+ remContextItem = new Gtk.MenuItem (Mono.Unix.Catalog.GetString ("Remove Translation Context Hint"));
remContextItem.Activated += RemoveContext;
menu.Add (remContextItem);
- addCommentItem = new Gtk.MenuItem ("Add Comment for Translators");
+ addCommentItem = new Gtk.MenuItem (Mono.Unix.Catalog.GetString ("Add Comment for Translators"));
addCommentItem.Activated += AddComment;
menu.Add (addCommentItem);
- remCommentItem = new Gtk.MenuItem ("Remove Comment for Translators");
+ remCommentItem = new Gtk.MenuItem (Mono.Unix.Catalog.GetString ("Remove Comment for Translators"));
remCommentItem.Activated += RemoveComment;
menu.Add (remCommentItem);
contextBox = new Gtk.HBox (false, 6);
- Gtk.Label contextLabel = new Gtk.Label ("Translation context");
+ Gtk.Label contextLabel = new Gtk.Label (Mono.Unix.Catalog.GetString ("Translation context"));
contextLabel.Xalign = 0.0f;
contextBox.PackStart (contextLabel, false, false, 0);
contextEntry = new Gtk.Entry ();
@@ -75,7 +75,7 @@ namespace Stetic.Editor {
contextEntry.Changed += ContextChanged;
commentBox = new Gtk.VBox (false, 3);
- Gtk.Label commentLabel = new Gtk.Label ("Comment for Translators:");
+ Gtk.Label commentLabel = new Gtk.Label (Mono.Unix.Catalog.GetString ("Comment for Translators:"));
commentLabel.Xalign = 0.0f;
commentBox.PackStart (commentLabel, false, false, 0);
commentText = new TextBox (3);
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuBar.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuBar.cs
index fec2f29509..91e47f584e 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuBar.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuBar.cs
@@ -233,15 +233,15 @@ namespace Stetic.Wrapper
this.node = node;
Spacing = 3;
if (node.Type == Gtk.UIManagerItemType.Menu) {
- PackStart (new Gtk.Label ("Menu"), true, true, 0);
+ PackStart (new Gtk.Label (Mono.Unix.Catalog.GetString ("Menu")), true, true, 0);
} else if (node.Action != null && node.Action.GtkAction != null) {
if (node.Action.GtkAction.StockId != null)
PackStart (node.Action.CreateIcon (Gtk.IconSize.Menu), true, true, 0);
PackStart (new Gtk.Label (node.Action.GtkAction.Label), true, true, 0);
} else if (node.Type == Gtk.UIManagerItemType.Separator) {
- PackStart (new Gtk.Label ("Separator"), true, true, 0);
+ PackStart (new Gtk.Label (Mono.Unix.Catalog.GetString ("Separator")), true, true, 0);
} else {
- PackStart (new Gtk.Label ("Empty Action"), true, true, 0);
+ PackStart (new Gtk.Label (Mono.Unix.Catalog.GetString ("Empty Action")), true, true, 0);
}
ShowAll ();
}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyGrid.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyGrid.cs
index fe8ca717bd..da6582b26d 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyGrid.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyGrid.cs
@@ -26,7 +26,7 @@ namespace Stetic {
PackStart (header, false, false, 0);
Label lab = new Label ();
- lab.Markup = "<i>No selection</i>";
+ lab.Markup = Mono.Unix.Catalog.GetString ("<i>No selection</i>");
PackStart (lab, false, false, 0);
noSelection = lab;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
index 471fa7d3fc..25d2369f76 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
@@ -66,7 +66,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
this.vbox5.Spacing = 6;
// Container child vbox5.Gtk.Box+BoxChild
this.autoCodeCompletionCheckbutton = new global::Gtk.CheckButton ();
- this.autoCodeCompletionCheckbutton.TooltipMarkup = "Automatic Completion with Enter or Tab keys";
+ this.autoCodeCompletionCheckbutton.TooltipMarkup = global::Mono.Unix.Catalog.GetString ("Automatic Completion with Enter or Tab keys");
this.autoCodeCompletionCheckbutton.CanFocus = true;
this.autoCodeCompletionCheckbutton.Name = "autoCodeCompletionCheckbutton";
this.autoCodeCompletionCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show completion list after a character is typed");
@@ -92,7 +92,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
w2.Padding = ((uint)(6));
// Container child hbox6.Gtk.Box+BoxChild
this.automaticCompletionModeCheckbutton = new global::Gtk.CheckButton ();
- this.automaticCompletionModeCheckbutton.TooltipMarkup = "Enables automatic completion with the Space key or Punctuation";
+ this.automaticCompletionModeCheckbutton.TooltipMarkup = global::Mono.Unix.Catalog.GetString ("Enables automatic completion with the Space key or Punctuation");
this.automaticCompletionModeCheckbutton.CanFocus = true;
this.automaticCompletionModeCheckbutton.Name = "automaticCompletionModeCheckbutton";
this.automaticCompletionModeCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Complete with Space or Punctuation");
diff --git a/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs b/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs
index 64a41202be..c1836d12a0 100644
--- a/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs
@@ -34,7 +34,6 @@ namespace MonoDevelop.WebReferences.Dialogs
this.labelServer = new global::Gtk.Label ();
this.labelServer.Name = "labelServer";
this.labelServer.Xalign = 0F;
- this.labelServer.LabelProp = "Server info";
this.vbox2.Add (this.labelServer);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelServer]));
w2.Position = 0;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.MergeDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.MergeDialog.cs
index 74785d5db7..386241d793 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.MergeDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.MergeDialog.cs
@@ -63,7 +63,6 @@ namespace MonoDevelop.VersionControl.Git
this.labelOper.WidthRequest = 443;
this.labelOper.Name = "labelOper";
this.labelOper.Xalign = 0F;
- this.labelOper.LabelProp = "The remote branch <b>origin/blablabla</b> will be merged into the branch <b>master</b>.";
this.labelOper.UseMarkup = true;
this.labelOper.Wrap = true;
this.vbox2.Add (this.labelOper);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs
index 49822420b1..39dfca47f3 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs
@@ -66,7 +66,6 @@ namespace MonoDevelop.VersionControl.Git
this.labelMD = new global::Gtk.Label ();
this.labelMD.Name = "labelMD";
this.labelMD.Xalign = 0F;
- this.labelMD.LabelProp = "name <email>";
this.alignment1.Add (this.labelMD);
this.vbox2.Add (this.alignment1);
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.alignment1]));
@@ -108,7 +107,6 @@ namespace MonoDevelop.VersionControl.Git
this.labelGit = new global::Gtk.Label ();
this.labelGit.Name = "labelGit";
this.labelGit.Xalign = 0F;
- this.labelGit.LabelProp = "name <email>";
this.alignment2.Add (this.labelGit);
this.vbox2.Add (this.alignment2);
global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.alignment2]));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
index a705e69754..0757b76d5c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
@@ -47,7 +47,7 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelRealm = new global::Gtk.Label ();
this.labelRealm.Name = "labelRealm";
this.labelRealm.Xalign = 0F;
- this.labelRealm.LabelProp = "Realm";
+ this.labelRealm.LabelProp = global::Mono.Unix.Catalog.GetString ("Realm");
this.vbox2.Add (this.labelRealm);
global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelRealm]));
w3.Position = 1;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
index 8159e90b85..9f0a4b2c72 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
@@ -47,7 +47,7 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelRealm = new global::Gtk.Label ();
this.labelRealm.Name = "labelRealm";
this.labelRealm.Xalign = 0F;
- this.labelRealm.LabelProp = "Realm";
+ this.labelRealm.LabelProp = global::Mono.Unix.Catalog.GetString ("Realm");
this.vbox2.Add (this.labelRealm);
global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelRealm]));
w3.Position = 1;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
index eb3b77f035..91d8390b1b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
@@ -207,7 +207,6 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelFprint = new global::Gtk.Label ();
this.labelFprint.Name = "labelFprint";
this.labelFprint.Xalign = 0F;
- this.labelFprint.LabelProp = "label14";
this.table1.Add (this.labelFprint);
global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.labelFprint]));
w13.TopAttach = ((uint)(5));
@@ -220,7 +219,6 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelFrom = new global::Gtk.Label ();
this.labelFrom.Name = "labelFrom";
this.labelFrom.Xalign = 0F;
- this.labelFrom.LabelProp = "label12";
this.table1.Add (this.labelFrom);
global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.labelFrom]));
w14.TopAttach = ((uint)(3));
@@ -233,7 +231,6 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelHost = new global::Gtk.Label ();
this.labelHost.Name = "labelHost";
this.labelHost.Xalign = 0F;
- this.labelHost.LabelProp = "label10";
this.table1.Add (this.labelHost);
global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.labelHost]));
w15.TopAttach = ((uint)(1));
@@ -246,7 +243,6 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelIssuer = new global::Gtk.Label ();
this.labelIssuer.Name = "labelIssuer";
this.labelIssuer.Xalign = 0F;
- this.labelIssuer.LabelProp = "label11";
this.table1.Add (this.labelIssuer);
global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1 [this.labelIssuer]));
w16.TopAttach = ((uint)(2));
@@ -259,7 +255,6 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelRealm = new global::Gtk.Label ();
this.labelRealm.Name = "labelRealm";
this.labelRealm.Xalign = 0F;
- this.labelRealm.LabelProp = "label9";
this.table1.Add (this.labelRealm);
global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 [this.labelRealm]));
w17.LeftAttach = ((uint)(1));
@@ -269,7 +264,6 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelUntil = new global::Gtk.Label ();
this.labelUntil.Name = "labelUntil";
this.labelUntil.Xalign = 0F;
- this.labelUntil.LabelProp = "label13";
this.table1.Add (this.labelUntil);
global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1 [this.labelUntil]));
w18.TopAttach = ((uint)(4));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
index 8f5bab1d1e..a0393db383 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
@@ -51,7 +51,7 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
this.labelRealm = new global::Gtk.Label ();
this.labelRealm.Name = "labelRealm";
this.labelRealm.Xalign = 0F;
- this.labelRealm.LabelProp = "Realm";
+ this.labelRealm.LabelProp = global::Mono.Unix.Catalog.GetString ("Realm");
this.vbox2.Add (this.labelRealm);
global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelRealm]));
w3.Position = 1;