[Monodevelop-patches-list] r1347 - in trunk/MonoDevelop: . po src/Main/Base/Gui src/Main/Base/Gui/BrowserDisplayBinding src/Main/Base/Gui/CompletionDatabaseWizard src/Main/Base/Gui/Components/StatusBar src/Main/Base/Gui/ErrorHandlers src/Main/Base/Gui/Pads src/Main/Base/Gui/Pads/ClassScout src/Main/Base/Gui/Pads/HelpBrowser src/Main/Base/Gui/Pads/ProjectBrowser src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder src/Main/Base/Gui/Workbench src/Main/Base/Gui/Workbench/Layouts
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Apr 2 09:00:21 EST 2004
Author: tberman
Date: 2004-04-02 09:00:21 -0500 (Fri, 02 Apr 2004)
New Revision: 1347
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/po/POTFILES.in
trunk/MonoDevelop/src/Main/Base/Gui/AbstractBaseViewContent.cs
trunk/MonoDevelop/src/Main/Base/Gui/AbstractPadContent.cs
trunk/MonoDevelop/src/Main/Base/Gui/AbstractViewContent.cs
trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs
trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs
trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs
trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
trunk/MonoDevelop/src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs
trunk/MonoDevelop/src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
Log:
more i18n lovin
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/ChangeLog 2004-04-02 14:00:21 UTC (rev 1347)
@@ -1,5 +1,33 @@
2004-04-02 Todd Berman <tberman at sevenl.net>
+ * Gui/CompletionDatabaseWizard/DownloadGenerator.cs:
+ * Gui/CompletionDatabaseWizard/UseExistingGenerator.cs:
+ * Gui/CompletionDatabaseWizard/GenerateDatabase.cs:
+ * Gui/CompletionDatabaseWizard/druid.cs:
+ * Gui/Workbench/Layouts/SdiWorkspaceWindow.cs:
+ * Gui/Workbench/DefaultWorkbench.cs:
+ * Gui/Components/StatusBar/SdStatusBar.cs:
+ * Gui/AbstractPadContent.cs:
+ * Gui/Pads/FileScout.cs:
+ * Gui/Pads/ClassScout/ClassScout.cs:
+ * Gui/Pads/OpenTaskView.cs:
+ * Gui/Pads/ProjectBrowser/ProjectBrowserView.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs:
+ * Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs:
+ * Gui/Pads/HelpBrowser/MonodocTreePad.cs:
+ * Gui/Pads/HelpBrowser/HelpViewer.cs:
+ * Gui/AbstractBaseViewContent.cs:
+ * Gui/AbstractViewContent.cs:
+ * Gui/BrowserDisplayBinding/HtmlViewPane.cs:
+ * Gui/ErrorHandlers/CombineLoadError.cs:
+ gettextify
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
* configure.in: added po/Makefile.in.in, and other gettext related
stuff. added libmonodevelop/Makefile
* Makefile.am: added po and libmonodevelop to subdirs
Modified: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/po/POTFILES.in 2004-04-02 14:00:21 UTC (rev 1347)
@@ -16,3 +16,25 @@
src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
src/Main/Base/Gui/Dialogs/TreeViewOptions.cs
src/Main/Base/Gui/Dialogs/WordCountDialog.cs
+src/Main/Base/Gui/AbstractBaseViewContent.cs
+src/Main/Base/Gui/AbstractViewContent.cs
+src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
+src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs
+src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
+src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs
+src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs
+src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs
+src/Main/Base/Gui/Pads/FileScout.cs
+src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs
+src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs
+src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
+src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
+src/Main/Base/Gui/Pads/OpenTaskView.cs
+src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
+src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
+src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
+src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
+src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
+src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
+src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
+src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
Modified: trunk/MonoDevelop/src/Main/Base/Gui/AbstractBaseViewContent.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/AbstractBaseViewContent.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/AbstractBaseViewContent.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -8,6 +8,8 @@
using System;
//using System.Windows.Forms;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui
{
public abstract class AbstractBaseViewContent : IBaseViewContent
@@ -30,7 +32,7 @@
public virtual string TabPageLabel {
get {
- return "Abstract Content";
+ return GettextCatalog.GetString ("Abstract Content");
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/AbstractPadContent.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/AbstractPadContent.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/AbstractPadContent.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -23,8 +23,7 @@
public virtual string Title {
get {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- return stringParserService.Parse(title);
+ return title;
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/AbstractViewContent.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/AbstractViewContent.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/AbstractViewContent.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -7,6 +7,8 @@
using System;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui
{
public abstract class AbstractViewContent : AbstractBaseViewContent, IViewContent
@@ -21,7 +23,7 @@
bool hasproject = false;
public override string TabPageLabel {
- get { return "Change me"; }
+ get { return GettextCatalog.GetString ("Change me"); }
}
public virtual string UntitledName {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -18,6 +18,7 @@
using MonoDevelop.Core.AddIns.Codons;
using MonoDevelop.Gui;
using MonoDevelop.Gui.HtmlControl;
+using MonoDevelop.Services;
namespace MonoDevelop.BrowserDisplayBinding
{
@@ -42,7 +43,7 @@
public override string TabPageLabel
{
get {
- return "Web Browser";
+ return GettextCatalog.GetString ("Web Browser");
}
}
@@ -99,7 +100,6 @@
void onFocused (object o, EventArgs e)
{
- Console.WriteLine ("aa");
}
public BrowserPane(bool showNavigation) //: base (type)
@@ -197,11 +197,11 @@
toolBar.ToolbarStyle = ToolbarStyle.Icons;
toolBar.IconSize = IconSize.SmallToolbar;
- toolBar.AppendWidget (toolBarBack, "Go Back", "");
- toolBar.AppendWidget (toolBarForward, "Go Forward", "");
- toolBar.AppendWidget (toolBarStop, "Stop Loading", "");
- toolBar.AppendWidget (toolBarRefresh, "Reload page", "");
- toolBar.AppendWidget (urlTextBox, "Location", "");
+ toolBar.AppendWidget (toolBarBack, GettextCatalog.GetString ("Go Back"), "");
+ toolBar.AppendWidget (toolBarForward, GettextCatalog.GetString ("Go Forward"), "");
+ toolBar.AppendWidget (toolBarStop, GettextCatalog.GetString ("Stop Loading"), "");
+ toolBar.AppendWidget (toolBarRefresh, GettextCatalog.GetString ("Reload page"), "");
+ toolBar.AppendWidget (urlTextBox, GettextCatalog.GetString ("Location"), "");
topPanel.PackStart (toolBar);
mainbox.PackStart (topPanel, false, false, 2);
@@ -250,12 +250,12 @@
private void OnNetStart (object o, EventArgs args)
{
- status.Push (1, "Loading...");
+ status.Push (1, GettextCatalog.GetString ("Loading..."));
}
private void OnNetStop (object o, EventArgs args)
{
- status.Push (1, "Done.");
+ status.Push (1, GettextCatalog.GetString ("Done."));
}
private void OnBackClicked (object o, EventArgs args)
Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -24,7 +24,7 @@
{
ProgressHolder holder = (ProgressHolder)arg;
holder.currentProgress = holder.startProgress + holder.s.Position;
- holder.progressBar.Worked ((int)((double)holder.currentProgress/holder.maxAmount * int.MaxValue), "Extracted more of the archive");
+ holder.progressBar.Worked ((int)((double)holder.currentProgress/holder.maxAmount * int.MaxValue), GettextCatalog.GetString ("Extracted more of the archive"));
while (Gtk.Application.EventsPending ())
Gtk.Application.RunIteration ();
@@ -56,7 +56,7 @@
maxAmount = dataResp.ContentLength * 2;
- progress.BeginTask("Downloading database", int.MaxValue);
+ progress.BeginTask(GettextCatalog.GetString ("Downloading database"), int.MaxValue);
DownloadFile (dataResp.GetResponseStream (),
compressedFile,
maxAmount, progress);
@@ -96,7 +96,7 @@
amountRead = s.Read(buffer, 0, buffer.Length);
amountDownloaded += amountRead;
outstream.Write(buffer, 0, amountRead);
- progress.Worked ((int)((float)amountDownloaded/maxAmount * int.MaxValue), "Downloaded more of " + fileName);
+ progress.Worked ((int)((float)amountDownloaded/maxAmount * int.MaxValue), String.Format (GettextCatalog.GetString ("Downloaded more of {0}"), fileName));
// make sure we let the GTK events happen at least every second
long nowticks = DateTime.Now.Ticks;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -41,7 +41,7 @@
IDatabaseGenerator generator;
ProgressMonitorBar progress;
- public GeneratorProgress (IDatabaseGenerator generator) : base("Code completion database generator")
+ public GeneratorProgress (IDatabaseGenerator generator) : base(GettextCatalog.GetString ("Code completion database generator"))
{
try {
this.generator = generator;
@@ -49,18 +49,18 @@
Gtk.VBox vb = new Gtk.VBox(false, 6);
this.Add(vb);
- vb.Add(new Gtk.Label("Creating database..."));
+ vb.Add(new Gtk.Label(GettextCatalog.GetString ("Creating database...")));
progress = new ProgressMonitorBar();
vb.Add(progress);
- cancel = new Gtk.Button("Cancel");
+ cancel = new Gtk.Button(GettextCatalog.GetString ("Cancel"));
cancel.Clicked += new EventHandler(DoCancel);
if (!generator.Cancelable) {
cancel.Sensitive = false;
Tooltips t = new Tooltips();
- t.SetTip(cancel, "Cancelling not available",
- "This type of code completion database generator can not be canceled");
+ t.SetTip(cancel, GettextCatalog.GetString ("Cancelling not available"),
+ GettextCatalog.GetString ("This type of code completion database generator can not be canceled"));
}
vb.Add(cancel);
this.ShowAll();
@@ -86,7 +86,7 @@
public void Start()
{
CodeCompletionDruid druid = new CodeCompletionDruid();
- druidHost = new Gtk.Window("Code completion database druid");
+ druidHost = new Gtk.Window(GettextCatalog.GetString ("Code completion database druid"));
druidHost.Add(druid);
druid.Finished += new DruidFinished(GotDruidData);
druid.Canceled += new DruidCanceled(DruidCanceled);
@@ -115,9 +115,8 @@
// restart & exit
ServiceManager.Services.UnloadAllServices();
// FIXME: handle this elegantly
- // is it really necessary to restart here?
Console.WriteLine ("******************************************************************************");
- Console.WriteLine ("Attempting to restart MonoDevelop, if you get any exceptions, restart manually");
+ Console.WriteLine (GettextCatalog.GetString ("Attempting to restart MonoDevelop, if you get any exceptions, restart manually"));
Console.WriteLine ("******************************************************************************");
// not everyone can run .exe's directly
System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo ("mono", "MonoDevelop.exe");
Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -18,7 +18,7 @@
// changed to work during GLib.Idle
public void Generate(IProgressMonitor progress)
{
- progress.BeginTask("Referencing existing database", 2);
+ progress.BeginTask(GettextCatalog.GetString ("Referencing existing database"), 2);
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
if (!fileUtilityService.IsValidFileName(Path))
@@ -31,7 +31,7 @@
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
propertyService.SetProperty ("SharpDevelop.CodeCompletion.DataDirectory", Path);
propertyService.SaveProperties ();
- progress.Worked(2, "Referenced existing database");
+ progress.Worked(2, GettextCatalog.GetString ("Referenced existing database"));
}
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -4,6 +4,7 @@
using MonoDevelop.Gui.Widgets;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard {
class MethodSelectionPage : DruidPageStandard {
@@ -12,10 +13,10 @@
internal RadioButton download;
internal MethodSelectionPage(CodeCompletionDruid druid) : base() {
- Title = "Generation Method";
- generateDatabase = new RadioButton("Generate a code completion database");
- useExisting = new RadioButton(generateDatabase, "Use a code completion database already on this computer");
- download = new RadioButton(generateDatabase, "Download a code completion database");
+ Title = GettextCatalog.GetString ("Generation Method");
+ generateDatabase = new RadioButton(GettextCatalog.GetString ("Generate a code completion database"));
+ useExisting = new RadioButton(generateDatabase, GettextCatalog.GetString ("Use a code completion database already on this computer"));
+ download = new RadioButton(generateDatabase, GettextCatalog.GetString ("Download a code completion database"));
this.NextClicked += new NextClickedHandler(druid.GoToMethodPage);
AppendItem("", generateDatabase, "");
AppendItem("", useExisting, "");
@@ -29,12 +30,12 @@
internal RadioButton light;
internal GenerateDatabasePage(CodeCompletionDruid druid) : base(druid) {
- Title = "Select Generation Style";
- heavy = new RadioButton("Heavy process");
- light = new RadioButton(heavy, "Light process");
+ Title = GettextCatalog.GetString ("Select Generation Style");
+ heavy = new RadioButton(GettextCatalog.GetString ("Heavy process"));
+ light = new RadioButton(heavy, GettextCatalog.GetString ("Light process"));
- AppendItem("", heavy, "This process is slower and more memory-intensive than the light process, but will enable faster code completion");
- AppendItem("", light, "This process will take less time and memory to produce the code completion database, but code completion will be slower");
+ AppendItem("", heavy, GettextCatalog.GetString ("This process is slower and more memory-intensive than the light process, but will enable faster code completion"));
+ AppendItem("", light, GettextCatalog.GetString ("This process will take less time and memory to produce the code completion database, but code completion will be slower"));
}
}
@@ -42,10 +43,10 @@
internal MonoDevelop.Gui.Widgets.FolderEntry filename;
internal UseExistingPage(CodeCompletionDruid druid) : base(druid) {
- Title = "Existing Database Location";
- filename = new FolderEntry("Select code completion database");
+ Title = GettextCatalog.GetString ("Existing Database Location");
+ filename = new FolderEntry(GettextCatalog.GetString ("Select code completion database"));
filename.DefaultPath = System.IO.Directory.GetCurrentDirectory();
- AppendItem("Where is the code completion database you would like to copy", filename, "");
+ AppendItem(GettextCatalog.GetString ("Where is the code completion database you would like to copy"), filename, "");
}
}
@@ -54,9 +55,9 @@
internal DownloadPage(CodeCompletionDruid druid) : base(druid)
{
- Title = "Download Database";
+ Title = GettextCatalog.GetString ("Download Database");
uri = new Gtk.Entry();
- AppendItem("Where would you like to download the code completion database from?", uri, "");
+ AppendItem(GettextCatalog.GetString ("Where would you like to download the code completion database from?"), uri, "");
}
protected override string GetError (object sender)
@@ -64,13 +65,13 @@
try {
Uri u = new Uri(this.uri.Text);
} catch (UriFormatException ex) {
- return "That Uri is invalid: " + ex.Message;
+ return String.Format (GettextCatalog.GetString ("That Uri is invalid: {0}"), ex.Message);
}
int compressionType = (int)MonoDevelop.Gui.Utils.DirectoryArchive.Decompressor.GetTypeFromString(this.uri.Text, false);
if (compressionType == -1){
- return "That Uri appears not to refer to a file with a known compression type";
+ return GettextCatalog.GetString ("That Uri appears not to refer to a file with a known compression type");
}
return null;
@@ -158,14 +159,14 @@
internal static DruidPageEdge GetStartPage()
{
DruidPageEdge page = new DruidPageEdge(EdgePosition.Start);
- page.Text = "This druid will guide you through the process of creating a code completion database";
+ page.Text = GettextCatalog.GetString ("This druid will guide you through the process of creating a code completion database");
return page;
}
internal DruidPageEdge GetEndPage()
{
DruidPageEdge page = new DruidPageEdge(EdgePosition.Finish);
- page.Text = "Click Apply to start the database creation process";
+ page.Text = GettextCatalog.GetString("Click Apply to start the database creation process");
page.BackClicked += new BackClickedHandler(GoToPrev);
page.FinishClicked += new FinishClickedHandler(EndOfWizard);
return page;
@@ -220,7 +221,7 @@
internal void HandleCancel(object sender, EventArgs args)
{
MessageService messageService = (MessageService)ServiceManager.Services.GetService(typeof(MessageService));
- bool really = messageService.AskQuestion("Are you sure you want to skip database creation? You will not have code completion functionality.", "Are you sure?");
+ bool really = messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to skip database creation? You will not have code completion functionality."), GettextCatalog.GetString ("Are you sure?"));
if (really) {
this.Destroy();
this.Canceled(this);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -70,19 +70,17 @@
public void ShowErrorMessage(string message)
{
- txtStatusBarPanel.Push (ctx, "Error : " + message);
+ txtStatusBarPanel.Push (ctx, String.Format (GettextCatalog.GetString ("Error : {0}"), message));
}
public void ShowErrorMessage(Image image, string message)
{
- txtStatusBarPanel.Push (ctx, "Error : " + message);
+ txtStatusBarPanel.Push (ctx, String.Format (GettextCatalog.GetString ("Error : {0}"), message));
}
public void SetCursorPosition (int ln, int col, int ch)
{
- // FIXME: I18N
- // FIXME: Properly space, perhaps 3 seperate Labels
- cursorStatusBarPanel.Push (ctx, String.Format ("ln {0} col {1} ch {2}", ln, col, ch));
+ cursorStatusBarPanel.Push (ctx, String.Format (GettextCatalog.GetString ("ln {0} col {1} ch {2}"), ln, col, ch));
}
public void SetMessage (string message)
Modified: trunk/MonoDevelop/src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -8,6 +8,8 @@
using System;
using System.IO;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui.ErrorHandlers
{
public class CombineLoadError
@@ -23,9 +25,9 @@
bool isProject = filename.ToLower().EndsWith(".prjx");
string errorMessage = string.Format
- ("Could not load the {0} '{1}'.\n\n{2}",
+ (String.Format (GettextCatalog.GetString ("Could not load the {0} '{1}'.\n\n{2}"),
isProject ? "project" : "combine",
- filename, e.Message);
+ filename, e.Message));
GenericError.DisplayError(errorMessage);
} else {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -79,7 +79,7 @@
public string Title {
get {
- return resourceService.GetString("MainWindow.Windows.ClassScoutLabel");
+ return GettextCatalog.GetString("Classes");
}
}
@@ -139,7 +139,7 @@
void OnCombineOpen(object sender, CombineEventArgs e)
{
Nodes.Clear();
- Nodes.Add(new TreeNode("Loading..."));
+ Nodes.Add(new TreeNode(GettextCatalog.GetString ("Loading...")));
StartCombineparse(e.Combine);
}
@@ -341,7 +341,7 @@
IconService iconService = (IconService)ServiceManager.Services.GetService(typeof(IconService));
//prjNode.SelectedImageIndex = prjNode.ImageIndex = imageIndexOffset + iconService.GetImageIndexForProjectType(p.ProjectType);
prjNode.Image = iconService.GetImageForProjectType(p.ProjectType);
- prjNode.Nodes.Add(new TreeNode("No class builder found"));
+ prjNode.Nodes.Add(new TreeNode(GettextCatalog.GetString ("No class builder found")));
prjNode.Tag = p;
nodes.Add(prjNode);
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -51,13 +51,13 @@
RulesHint = true;
Gtk.TreeViewColumn name_column = new Gtk.TreeViewColumn ();
- name_column.Title = "Files";
+ name_column.Title = GettextCatalog.GetString ("Files");
Gtk.TreeViewColumn size_column = new Gtk.TreeViewColumn ();
- size_column.Title = "Size";
+ size_column.Title = GettextCatalog.GetString ("Size");
Gtk.TreeViewColumn modi_column = new Gtk.TreeViewColumn ();
- modi_column.Title = "Last modified";
+ modi_column.Title = GettextCatalog.GetString ("Last modified");
Gtk.CellRendererPixbuf pix_render = new Gtk.CellRendererPixbuf ();
name_column.PackStart (pix_render, false);
@@ -125,7 +125,6 @@
if(fileItem.FullName.ToLower() == e.FullPath.ToLower()) {
FileInfo info = new FileInfo(e.FullPath);
-
fileItem.Size = Math.Round((double)info.Length / 1024).ToString() + " KB";
fileItem.LastModified = info.LastWriteTime.ToString();
break;
@@ -170,7 +169,7 @@
{
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion("Are you sure you want to delete this file?", "Delete files"))
+ if (messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to delete this file?"), GettextCatalog.GetString ("Delete files")))
{
/* try
{
@@ -198,11 +197,11 @@
{
Gtk.Menu menu = new Gtk.Menu ();
- Gtk.MenuItem deleteFile = new Gtk.MenuItem ("Delete file");
+ Gtk.MenuItem deleteFile = new Gtk.MenuItem (GettextCatalog.GetString ("Delete file"));
deleteFile.Activated += new EventHandler (OnDeleteFiles);
deleteFile.Sensitive = false;
- Gtk.MenuItem renameFile = new Gtk.MenuItem ("Rename file");
+ Gtk.MenuItem renameFile = new Gtk.MenuItem (GettextCatalog.GetString ("Rename file"));
renameFile.Activated += new EventHandler (OnRenameFile);
renameFile.Sensitive = false;
@@ -329,7 +328,7 @@
public string Title {
get {
- return resourceService.GetString ("MainWindow.Windows.FileScoutLabel");
+ return GettextCatalog.GetString ("Files");
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -27,7 +27,7 @@
}
public override string ContentName {
- get { return "Documentation"; }
+ get { return GettextCatalog.GetString ("Documentation"); }
}
public HelpViewer ()
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -27,7 +27,7 @@
ScrolledWindow scroller;
TreeIter root_iter;
- public HelpTree () : base ("Help", Gtk.Stock.Help)
+ public HelpTree () : base (GettextCatalog.GetString ("Help"), Gtk.Stock.Help)
{
mds = (MonodocService)ServiceManager.Services.GetService (typeof (MonodocService));
tree_view = new TreeView ();
@@ -37,7 +37,7 @@
tree_view.Selection.Changed += new EventHandler (RowActivated);
store = new TreeStore (typeof (string), typeof (Node));
- root_iter = store.AppendValues ("Mono Documentation", mds.HelpTree);
+ root_iter = store.AppendValues (GettextCatalog.GetString ("Mono Documentation"), mds.HelpTree);
PopulateNode (root_iter);
@@ -105,7 +105,7 @@
void ShowDocs (string text, Node matched_node, string url)
{
foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
- if (content.ContentName == "Documentation") {
+ if (content.ContentName == GettextCatalog.GetString ("Documentation")) {
((HelpViewer)content).Render (text, matched_node, url);
return;
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -35,7 +35,7 @@
public string Title {
get {
- return resourceService.GetString ("MainWindow.Windows.TaskList");
+ return GettextCatalog.GetString ("Task List");
}
}
@@ -86,11 +86,6 @@
view.RowActivated += new RowActivatedHandler (OnRowActivated);
}
- string res (string s)
- {
- return resourceService.GetString (s);
- }
-
void MarkupCol (Gtk.TreeViewColumn col)
{
}
@@ -108,10 +103,10 @@
view.AppendColumn ("!" , iconRender , "stock-id", COL_TYPE);
view.AppendColumn ("" , toggleRender , "active" , COL_MARKED, "activatable", COL_READ);
- view.AppendColumn (res ("CompilerResultView.LineText") , line , "text" , COL_LINE, "weight", COL_READ_WEIGHT);
- view.AppendColumn (res ("CompilerResultView.DescriptionText") , desc , "text" , COL_DESC, "weight", COL_READ_WEIGHT, "strikethrough", COL_MARKED);
- view.AppendColumn (res ("CompilerResultView.PathText") , path , "text" , COL_PATH, "weight", COL_READ_WEIGHT);
- view.AppendColumn (res ("CompilerResultView.FileText") , file , "text" , COL_FILE, "weight", COL_READ_WEIGHT);
+ view.AppendColumn (GettextCatalog.GetString ("Line") , line , "text" , COL_LINE, "weight", COL_READ_WEIGHT);
+ view.AppendColumn (GettextCatalog.GetString ("Description") , desc , "text" , COL_DESC, "weight", COL_READ_WEIGHT, "strikethrough", COL_MARKED);
+ view.AppendColumn (GettextCatalog.GetString ("Path") , path , "text" , COL_PATH, "weight", COL_READ_WEIGHT);
+ view.AppendColumn (GettextCatalog.GetString ("File") , file , "text" , COL_FILE, "weight", COL_READ_WEIGHT);
}
void OnCombineOpen(object sender, CombineEventArgs e)
@@ -166,11 +161,21 @@
foreach (Task t in taskService.Tasks) {
string stock;
switch (t.TaskType) {
- case TaskType.Warning : stock = Gtk.Stock.DialogWarning ; break;
- case TaskType.Error : stock = Gtk.Stock.DialogError ; break;
- case TaskType.Comment : stock = Gtk.Stock.DialogInfo ; break;
- case TaskType.SearchResult : stock = Gtk.Stock.DialogQuestion ; break;
- default : stock = null ; break;
+ case TaskType.Warning:
+ stock = Gtk.Stock.DialogWarning;
+ break;
+ case TaskType.Error:
+ stock = Gtk.Stock.DialogError;
+ break;
+ case TaskType.Comment:
+ stock = Gtk.Stock.DialogInfo;
+ break;
+ case TaskType.SearchResult:
+ stock = Gtk.Stock.DialogQuestion;
+ break;
+ default:
+ stock = null;
+ break;
}
string tmpPath = t.FileName;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -15,6 +15,7 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
using MonoDevelop.Internal.Project;
using MonoDevelop.Gui.Components;
using Stock = MonoDevelop.Gui.Stock;
@@ -70,13 +71,13 @@
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
switch (combine.Entries.Count) {
case 0:
- Text = stringParserService.Parse(resourceService.GetString("ProjectComponent.CombineNameStringNoEntry"), new string[,] { {"Combinename", combine.Name}, {"Entries", combine.Entries.Count.ToString()}});
+ Text = String.Format (GettextCatalog.GetString ("Solution {0}"), combine.Name);
break;
case 1:
- Text = stringParserService.Parse(resourceService.GetString("ProjectComponent.CombineNameStringSingleEntry"), new string[,] { {"Combinename", combine.Name}, {"Entries", combine.Entries.Count.ToString()}});
+ Text = String.Format (GettextCatalog.GetString ("Solution {0} (1 entry)"), combine.Name);
break;
default:
- Text = stringParserService.Parse(resourceService.GetString("ProjectComponent.CombineNameString"), new string[,] { {"Combinename", combine.Name}, {"Entries", combine.Entries.Count.ToString()}});
+ Text = String.Format (GettextCatalog.GetString ("Solution {0} ({1} entries)"), combine.Name, combine.Entries.Count.ToString ());
break;
}
}
@@ -95,7 +96,7 @@
CombineBrowserNode cmbNode = (CombineBrowserNode)Parent;
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, stringParserService.Parse(resourceService.GetString("ProjectComponent.RemoveCombine.Question"), new string[,] { {"COMBINE", combine.Name}, {"PARENTCOMBINE", cmbNode.Combine.Name}}));
+ Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you really want to remove solution {0} from solution {1}?"), combine.Name, cmbNode.Combine.Name));
if (dialog.Run() != (int)Gtk.ResponseType.Ok) {
dialog.Destroy ();
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -107,10 +107,10 @@
}
} catch (System.IO.IOException) { // assume duplicate file
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("${res:Gui.ProjectBrowser.FileInUseError}");
+ messageService.ShowError(GettextCatalog.GetString ("File or directory name is already in use, choose a different one."));
} catch (System.ArgumentException) { // new file name with wildcard (*, ?) characters in it
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("${res:Gui.ProjectBrowser.IllegalCharactersInFileNameError}");
+ messageService.ShowError(GettextCatalog.GetString ("The file name you have chosen contains illegal characters. Please choose a different file name."));
}
}
}
@@ -128,8 +128,8 @@
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, stringParserService.Parse(resourceService.GetString("ProjectComponent.RemoveFolder.Question"), new string[,] { {"FOLDER", Text}, {"PROJECT", Project.Name}}));
-
+ Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you want to remove folder {0} from project {1}?"), Text, Project.Name));
+
if (dialog.Run() != (int)Gtk.ResponseType.Ok) {
dialog.Destroy ();
return false;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -124,10 +124,10 @@
}
} catch (System.IO.IOException) { // assume duplicate file
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("${res:Gui.ProjectBrowser.FileInUseError}");
+ messageService.ShowError(GettextCatalog.GetString ("File or directory name is already in use, choose a different one."));
} catch (System.ArgumentException) { // new file name with wildcard (*, ?) characters in it
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("${res:Gui.ProjectBrowser.IllegalCharactersInFileNameError}");
+ messageService.ShowError(GettextCatalog.GetString ("The file name you have chosen contains illegal characters. Please choose a different file name."));
}
}
}
@@ -142,9 +142,7 @@
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- //FIXME: bug #55185
- //Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, stringParserService.Parse(resourceService.GetString("ProjectComponent.RemoveFile.Question"), new string[,] { {"FILE", Path.GetFileName (((ProjectFile)userData).Name)}, {"PROJECT", Project.Name}}));
- using (MessageDialog dialog = new Gtk.MessageDialog ((Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.YesNo, String.Format ("Are you sure you want to remove {0} from the {1}?", Path.GetFileName (((ProjectFile)userData).Name), Project.Name))) {
+ using (MessageDialog dialog = new Gtk.MessageDialog ((Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.YesNo, String.Format (GettextCatalog.GetString ("Are you sure you want to remove file {0} from project {1}?"), Path.GetFileName (((ProjectFile)userData).Name), Project.Name))) {
if (dialog.Run() != (int)Gtk.ResponseType.Yes) {
dialog.Hide ();
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -35,7 +35,7 @@
}
- public NamedFolderNode(string resourceReference, int sortPriority) : base(((ResourceService)ServiceManager.Services.GetService(typeof(ResourceService))).GetString(resourceReference))
+ public NamedFolderNode(string resourceReference, int sortPriority) : base(resourceReference)
{
this.resourceReference = resourceReference;
this.sortPriority = sortPriority;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -107,7 +107,7 @@
CombineEntry removeEntry = null;
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, stringParserService.Parse(resourceService.GetString("ProjectComponent.RemoveProject.Question"), new string[,] { {"COMBINE", cmb.Name}, {"PROJECT", project.Name}}));
+ Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you really want to remove project {0} from solution {1}"), project.Name, cmb.Name));
if (dialog.Run() != (int)Gtk.ResponseType.Ok) {
dialog.Destroy ();
return false;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -38,7 +38,7 @@
if (node != null) {
if (node is ProjectBrowserNode)
return false;
- if (node.Text == "Web References")
+ if (node.Text == GettextCatalog.GetString ("Web References"))
return true;
return IsWebReference((AbstractBrowserNode)node.Parent);
}
@@ -54,13 +54,13 @@
projectNode.Image = iconService.GetImageForProjectType (project.ProjectType);
- FolderNode resourceNode = new NamedFolderNode("ProjectComponent.ResourceFilesString", 0);
+ FolderNode resourceNode = new NamedFolderNode(GettextCatalog.GetString ("Resource Files (*.resources;*.resx)"), 0);
resourceNode.ContextmenuAddinTreePath = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ResourceFolderNode";
resourceNode.OpenedImage = Stock.OpenResourceFolder;
resourceNode.ClosedImage = Stock.ClosedResourceFolder;
projectNode.Nodes.Add (resourceNode);
- FolderNode referenceNode = new NamedFolderNode("ProjectComponent.ReferencesString", 1);
+ FolderNode referenceNode = new NamedFolderNode(GettextCatalog.GetString ("References"), 1);
referenceNode.ContextmenuAddinTreePath = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceFolderNode";
referenceNode.OpenedImage = Stock.OpenReferenceFolder;
referenceNode.ClosedImage = Stock.ClosedReferenceFolder;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -56,7 +56,7 @@
public string Title {
get {
- return "Combine";
+ return GettextCatalog.GetString ("Solution");
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -533,7 +533,7 @@
void SetStandardStatusBar(object sender, EventArgs e)
{
IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
- statusBarService.SetMessage("${res:MainWindow.StatusBar.ReadyMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Ready"));
}
void OnActiveWindowChanged(object sender, EventArgs e)
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2004-04-02 11:58:33 UTC (rev 1346)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2004-04-02 14:00:21 UTC (rev 1347)
@@ -217,7 +217,7 @@
if (!force && ViewContent != null && ViewContent.IsDirty) {
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- bool response = messageService.AskQuestion (resourceService.GetString ("MainWindow.SaveChangesMessage"));
+ bool response = messageService.AskQuestion (GettextCatalog.GetString ("Do you want to save the current changes"));
switch (response) {
case true:
@@ -225,7 +225,7 @@
while (true) {
new MonoDevelop.Commands.SaveFileAs().Run();
if (ViewContent.IsDirty) {
- if (messageService.AskQuestion("Do you really want to discard your changes ?")) {
+ if (messageService.AskQuestion(GettextCatalog.GetString ("Do you really want to discard your changes ?"))) {
break;
}
} else {
More information about the Monodevelop-patches-list
mailing list