may

./configure
+tar -xzf gtksourceview-0.7.0.tar.gz
+cd gtksourceview-0.7.0
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0`
+make
+make install
+
/usr
+export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
+tar -xjf monodevelop-0.2.tar.gz
+cd monodevelop-0.2
+./autogen.sh --prefix=/usr
+make
+make install
+
-tar -xzf icu-2.8.tgz
-cd icu/source
-chmod +x runConfigureICU configure install-sh
-./runConfigureICU LinuxRedHat --disable-64bit-libs
-make
-make install
-
-tar -xzf ORBit2-2.8.3.tar.gz
-cd ORBit2-2.8.3
-./configure
-make
-make install
-
-tar -xzf gtksourceview-0.7.0.tar.gz
-cd gtksourceview-0.7.0
-./configure --prefix=`pkg-config --variable=prefix ORBit-2.0`
-make
-make install
-
/usr
-export CVSROOT=:pserver:anonymous at anoncvs.go-mono.com:/mono
-cvs login
-cvs -z3 co mcs mono gtk-sharp monodoc gtksourceview-sharp gtkmozembed-sharp debugger
-
$PREFIX/lib
/usr/local/lib
-su
-echo "/usr/local/lib" >> /etc/ld.so.conf
-/sbin/ldconfig
-
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
-
-cd mono
-./autogen.sh --prefix=/usr/local
-make fullbuild
-
-cd ../gtk-sharp
-./autogen.sh --prefix=/usr/local
-make
-make install
-
-cd ../monodoc
-./autogen.sh --prefix=/usr/local
-make
-make install
-
-cd ../gtksourceview-sharp
-./autogen.sh --prefix=/usr/local
-make
-make install
-
-cd ../gtkmozembed-sharp
-./autogen.sh --prefix=/usr/local
-make
-make install
-
-cd ../debugger
-./autogen.sh --prefix=/usr/local
-make
-make install
-
      
-export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
-tar -xjf MonoDevelop-rXXXX.tar.bz2
-cd MonoDevelop-rXXXX
-./autogen.sh --prefix=/usr/local
-make
-make run &
-
make install
make run
make run
/usr
+tar -xzf mypackage.tar.gz
+cd mypackage
+./configure --prefix=/usr
+make
+make install
+
./configure
./configure
 tar -xzf gtksourceview-0.7.0.tar.gz
 cd gtksourceview-0.7.0
@@ -40,6 +40,7 @@
 make
 make install
 
 tar -xzf mypackage.tar.gz
 cd mypackage



From commit-watcher at mono-cvs.ximian.com  Thu Apr  1 03:00:28 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  1 Apr 2004 03:00:28 -0500 (EST)
Subject: [Monodevelop-patches-list] r1332 - trunk/md-website/tutorials
Message-ID: <20040401080028.7C3A494749@mono-cvs.ximian.com>

Author: deboald
Date: 2004-04-01 03:00:28 -0500 (Thu, 01 Apr 2004)
New Revision: 1332

Added:
   trunk/md-website/tutorials/snapshot_install.aspx
Log:
stub to avoid 404's


Added: trunk/md-website/tutorials/snapshot_install.aspx
===================================================================

--- trunk/md-website/tutorials/snapshot_install.aspx	2004-04-01 07:53:47 UTC (rev 1331)
+++ trunk/md-website/tutorials/snapshot_install.aspx	2004-04-01 08:00:28 UTC (rev 1332)
@@ -0,0 +1,15 @@
+<%@ Register TagPrefix="ccms" TagName="PageHeader" src="/include/header.ascx" %>
+<%@ Register TagPrefix="ccms" TagName="PageFooter" src="/include/footer.ascx" %>
+
+      
+
+      Snapshot Installation Tutorial
+      
+      

+      Coming soon.
+     
+      


+      
+      
+
+



From commit-watcher at mono-cvs.ximian.com  Thu Apr  1 14:24:17 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  1 Apr 2004 14:24:17 -0500 (EST)
Subject: [Monodevelop-patches-list] r1333 - in trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor: . CodeCompletion
Message-ID: <20040401192417.83BA594749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-01 14:24:17 -0500 (Thu, 01 Apr 2004)
New Revision: 1333

Modified:
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TextUtilities.cs
Log:
cleanup text utilities a bit


Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-04-01 08:00:28 UTC (rev 1332)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-04-01 19:24:17 UTC (rev 1333)
@@ -1,3 +1,8 @@
+2004-04-01  Todd Berman  
+
+	* CodeCompletion/TextUtilities.cs: if we are already caching the string
+	might as well use it.
+
 2004-03-29  Todd Berman  
 
 	* Gui/SourceEditorDisplayBinding.cs: second half of the double clicking

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TextUtilities.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TextUtilities.cs	2004-04-01 08:00:28 UTC (rev 1332)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TextUtilities.cs	2004-04-01 19:24:17 UTC (rev 1333)
@@ -248,14 +248,14 @@
 		{
 			// FIXME: use iters
 			string text = document.Buffer.Text;
-			while (offset > 0 && offset < document.Buffer.Text.Length) {
+			while (offset > 0 && offset < text.Length) {
 				char ch = text [offset];
 				switch (ch) {
 					case '\r':
 					case '\n':
 						return false;
 					case '/':
-						if (document.Buffer.Text[offset + 1] == '/') {
+						if (text[offset + 1] == '/') {
 							return true;
 						}
 						break;
@@ -271,10 +271,10 @@
 			string text = document.Buffer.Text;			
 			int brackets = -1;		
 			bool inString = false;
-			bool inChar   = false;			
+			bool inChar   = false;	
 			bool blockComment = false;
 			
-			while (offset >= 0 && offset < document.Buffer.Text.Length) {
+			while (offset >= 0 && offset < text.Length) {
 				char ch = text [offset];
 				switch (ch) {
 					case '/':



From commit-watcher at mono-cvs.ximian.com  Thu Apr  1 16:07:31 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  1 Apr 2004 16:07:31 -0500 (EST)
Subject: [Monodevelop-patches-list] r1334 - in trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding: . Gui
Message-ID: <20040401210731.EC1AC94749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-01 16:07:31 -0500 (Thu, 01 Apr 2004)
New Revision: 1334

Modified:
   trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs
Log:
close bug, fix strings


Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-04-01 19:24:17 UTC (rev 1333)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-04-01 21:07:31 UTC (rev 1334)
@@ -1,3 +1,7 @@
+2004-04-01  Todd Berman  
+
+	* Gui/OutputOptionsPanel.cs: parse resource string, closes bug #56325
+
 2004-03-31  Todd Berman  
 
 	* CSharpBindingExecutionManager.cs: dont test CompileTarget, for now

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs	2004-04-01 19:24:17 UTC (rev 1333)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs	2004-04-01 21:07:31 UTC (rev 1334)
@@ -94,8 +94,9 @@
 			
 			void SelectFolder(object sender, EventArgs e)
 			{
+				ResourceService res = (ResourceService)ServiceManager.Services.GetService (typeof (ResourceService));
 				using (FileSelection fdiag = new FileSelection (
-					"${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}")) {
+					res.GetString ("${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}"))) {
 					if (fdiag.Run () == (int) ResponseType.Ok) {
 						outputDirectoryEntry.Text = fdiag.Filename;
 					}



From commit-watcher at mono-cvs.ximian.com  Thu Apr  1 16:30:30 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  1 Apr 2004 16:30:30 -0500 (EST)
Subject: [Monodevelop-patches-list] r1335 - in trunk/MonoDevelop/samples: . RecentFiles
Message-ID: <20040401213030.ECE7994749@mono-cvs.ximian.com>

Author: jluke
Date: 2004-04-01 16:30:30 -0500 (Thu, 01 Apr 2004)
New Revision: 1335

Added:
   trunk/MonoDevelop/samples/RecentFiles/
   trunk/MonoDevelop/samples/RecentFiles/Makefile
   trunk/MonoDevelop/samples/RecentFiles/test.cmbx
   trunk/MonoDevelop/samples/RecentFiles/test.cs
Log:
add a test for recent files work


Added: trunk/MonoDevelop/samples/RecentFiles/Makefile
===================================================================
--- trunk/MonoDevelop/samples/RecentFiles/Makefile	2004-04-01 21:07:31 UTC (rev 1334)
+++ trunk/MonoDevelop/samples/RecentFiles/Makefile	2004-04-01 21:30:30 UTC (rev 1335)
@@ -0,0 +1,18 @@
+
+CSC = mcs /debug
+EXE = ../../build/bin/RecentFilesTest.exe
+
+DLLS = /r:../../build/bin/MonoDevelop.Gui.Utils.dll
+
+FILES = test.cs \
+../../src/Main/Base/Services/File/FdoRecentFiles.cs \
+../../src/Main/Base/Services/File/RecentItem.cs
+
+all: $(FILES)
+	$(CSC) $(DLLS) $(FILES) /out:$(EXE)
+
+clean:
+	rm -f $(EXE)
+
+run:
+	mono --debug $(EXE)

Added: trunk/MonoDevelop/samples/RecentFiles/test.cmbx
===================================================================

Added: trunk/MonoDevelop/samples/RecentFiles/test.cs
===================================================================
--- trunk/MonoDevelop/samples/RecentFiles/test.cs	2004-04-01 21:07:31 UTC (rev 1334)
+++ trunk/MonoDevelop/samples/RecentFiles/test.cs	2004-04-01 21:30:30 UTC (rev 1335)
@@ -0,0 +1,21 @@
+using System;
+using MonoDevelop.Services;
+
+class T
+{
+	static void Main ()
+	{
+		MonoDevelop.Gui.Utils.Vfs.Init ();
+		FdoRecentFiles frf = new FdoRecentFiles ();	
+		frf.AddFile ("test.cs");
+		frf.AddProject ("test.cmbx");
+
+		Console.WriteLine ("Recent Files:");
+		foreach (RecentItem ri in frf.RecentFiles)
+			Console.WriteLine ("{0} {1} {2}", ri.Uri, ri.Group, ri.Timestamp);
+
+		Console.WriteLine ("Recent Projects:");
+		foreach (RecentItem ri in frf.RecentProjects)
+			Console.WriteLine ("{0} {1} {2}", ri.Uri, ri.Group, ri.Timestamp);
+	}
+}



From commit-watcher at mono-cvs.ximian.com  Thu Apr  1 16:30:51 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  1 Apr 2004 16:30:51 -0500 (EST)
Subject: [Monodevelop-patches-list] r1336 - trunk/MonoDevelop/src/Main/Base/Services/File
Message-ID: <20040401213051.3794494749@mono-cvs.ximian.com>

Author: jluke
Date: 2004-04-01 16:30:51 -0500 (Thu, 01 Apr 2004)
New Revision: 1336

Modified:
   trunk/MonoDevelop/src/Main/Base/Services/File/FdoRecentFiles.cs
   trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs
Log:
update


Modified: trunk/MonoDevelop/src/Main/Base/Services/File/FdoRecentFiles.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/File/FdoRecentFiles.cs	2004-04-01 21:30:30 UTC (rev 1335)
+++ trunk/MonoDevelop/src/Main/Base/Services/File/FdoRecentFiles.cs	2004-04-01 21:30:51 UTC (rev 1336)
@@ -17,32 +17,26 @@
 {
 	public class FdoRecentFiles
 	{
-		// The document should be stored in "~/.recently-used",
-
-		// and it should contain no more than 500 items.
-		int totalMaxLength = 500;
-
 		// MD only wants to save last 10 in its group
-		int maxLength = 10;                                            
-        ArrayList lastfile = new ArrayList();
-        ArrayList lastproject = new ArrayList();
+        ArrayList lastFiles = new ArrayList (10); // max 10
+        ArrayList lastProjects = new ArrayList (10); // max 10
+        ArrayList allRecents = new ArrayList (10); // max 500
 
-		XmlDocument doc;
+		XPathDocument doc;
 
 		public event EventHandler RecentFileChanged;
         public event EventHandler RecentProjectChanged;
 
 		public FdoRecentFiles ()
 		{
-			string recentFile = Environment.GetEnvironmentVariable ("HOME");
-			recentFile = Path.Combine (recentFile, ".recently_used");
-			Console.WriteLine (recentFile);
+			// The document should be stored in "~/.recently-used",
+			string recentFile = Path.Combine (Environment.GetEnvironmentVariable ("HOME"), ".recently_used");
+			//Console.WriteLine (recentFile);
 
 			if (File.Exists (recentFile))
 			{
 				// use POSIX lockf ()
-				doc = new XmlDocument ();
-				doc.Load (recentFile);
+				doc = new XPathDocument (recentFile);
 
 				XPathNavigator nav = doc.CreateNavigator ();
 				XPathNodeIterator xni = nav.Select ("/RecentFiles/RecentItem");
@@ -55,8 +49,8 @@
 				// create it
 			}
 
-			FileSystemWatcher watcher = new FileSystemWatcher (recentFile);
-			watcher.Changed += new FileSystemEventHandler (OnWatcherChanged);
+			//FileSystemWatcher watcher = new FileSystemWatcher (recentFile);
+			//watcher.Changed += new FileSystemEventHandler (OnWatcherChanged);
 		}
 
 		void OnWatcherChanged (object o, FileSystemEventArgs args)
@@ -86,7 +80,7 @@
 		{
             get
 			{
-				return lastfile;
+				return lastFiles;
             }
         }
                                                                        
@@ -94,7 +88,7 @@
 		{
             get
 			{
-                return lastproject;
+                return lastProjects;
             }
         }
 
@@ -104,24 +98,54 @@
 		{
 			// uri must be unique
 			// or just update timestamp and group
+			foreach (RecentItem recentItem in allRecents)
+			{
+				if (recentItem.Uri == file_uri)
+				{
+					recentItem.Update (false);
+					lastFiles.Add (recentItem);
+					return;
+				}
+			}
+
 			RecentItem ri = new RecentItem (file_uri);
+			ri.Group = "MonoDevelop Files";
+			lastFiles.Add (ri);
 		}
 
 		public void AddProject (string file_uri)
 		{
 			// uri must be unique
 			// or just update timestamp and group
+			foreach (RecentItem recentItem in allRecents)
+			{
+				if (recentItem.Uri == file_uri)
+				{
+					recentItem.Update (true);
+					lastProjects.Add (recentItem);
+					return;
+				}
+			}
+
 			RecentItem ri = new RecentItem (file_uri);
+			ri.Group = "MonoDevelop Projects";
+			lastProjects.Add (ri);
 		}
 
 		// spec doesn't mention removal
 		public void ClearFiles ()
 		{
+			lastFiles.Clear ();
+			// remove from allRecents
+			// write the file
 		}
 
 		// spec doesn't mention removal
 		public void ClearProjects ()
 		{
+			lastProjects.Clear ();
+			// remove from allRecents
+			// write the file
 		}
 	}
 }

Modified: trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs	2004-04-01 21:30:30 UTC (rev 1335)
+++ trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs	2004-04-01 21:30:51 UTC (rev 1336)
@@ -33,6 +33,17 @@
 			this.timestamp = ((int) (now - epoch).TotalSeconds).ToString ();
 		}
 
+		// update the group and timestamp
+		public void Update (bool project)
+		{
+			DateTime now = DateTime.UtcNow;
+			this.timestamp = ((int) (now - epoch).TotalSeconds).ToString ();
+			if (project)
+				this.group = "MonoDevelop Projects";
+			else
+				this.group = "MonoDevelop Files";
+		}
+
 		public string Mime
 		{
 			get { return mime; }
@@ -51,6 +62,7 @@
 		public string Group
 		{
 			get { return group; }
+			set { group = value; }
 		}
 	}
 }



From commit-watcher at mono-cvs.ximian.com  Thu Apr  1 18:31:21 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  1 Apr 2004 18:31:21 -0500 (EST)
Subject: [Monodevelop-patches-list] r1337 - in trunk/MonoDevelop/src/Main/Base: . Commands
Message-ID: <20040401233121.0229594749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-01 18:31:21 -0500 (Thu, 01 Apr 2004)
New Revision: 1337

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
Log:
dont show ToTD by default


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-01 21:30:51 UTC (rev 1336)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-01 23:31:21 UTC (rev 1337)
@@ -1,3 +1,7 @@
+2004-04-01  Todd Berman  
+
+	* Commands/AutostartCommands.cs: default to false for ShowToTD
+
 2004-03-31  Todd Berman  
 
 	* Gui/Dialogs/CommonAboutDialog.cs: fixing the string stuff.

Modified: trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-04-01 21:30:51 UTC (rev 1336)
+++ trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-04-01 23:31:21 UTC (rev 1337)
@@ -137,7 +137,7 @@
 			isCalled = true;
 			// show tip of the day
 			PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-			if (propertyService.GetProperty("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", true)) {
+			if (propertyService.GetProperty("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", false)) {
 				ViewTipOfTheDay dview = new ViewTipOfTheDay();
 				dview.Run();
 			}



From commit-watcher at mono-cvs.ximian.com  Thu Apr  1 19:08:27 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  1 Apr 2004 19:08:27 -0500 (EST)
Subject: [Monodevelop-patches-list] r1338 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs
Message-ID: <20040402000827.5410794749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-01 19:08:27 -0500 (Thu, 01 Apr 2004)
New Revision: 1338

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
Log:
make the same mod here


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-01 23:31:21 UTC (rev 1337)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 00:08:27 UTC (rev 1338)
@@ -1,5 +1,9 @@
 2004-04-01  Todd Berman  
 
+	* Gui/Dialogs/TipOfTheDay.cs: make same change here.
+
+2004-04-01  Todd Berman  
+
 	* Commands/AutostartCommands.cs: default to false for ShowToTD
 
 2004-03-31  Todd Berman  

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs	2004-04-01 23:31:21 UTC (rev 1337)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs	2004-04-02 00:08:27 UTC (rev 1338)
@@ -42,7 +42,7 @@
 					
 			tipOfTheDayWindow.TypeHint = Gdk.WindowTypeHint.Dialog;
 
-			noshowCheckbutton.Active = propertyService.GetProperty ("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", true);
+			noshowCheckbutton.Active = propertyService.GetProperty ("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", false);
 			noshowCheckbutton.Toggled += new EventHandler (OnNoshow);
 			nextButton.Clicked += new EventHandler (OnNext);
 			closeButton.Clicked += new EventHandler (OnClose);



From commit-watcher at mono-cvs.ximian.com  Thu Apr  1 19:55:12 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  1 Apr 2004 19:55:12 -0500 (EST)
Subject: [Monodevelop-patches-list] r1339 - in trunk/MonoDevelop/src/Main/Base: . Internal/ExternalTool
Message-ID: <20040402005512.5EA0194749@mono-cvs.ximian.com>

Author: jluke
Date: 2004-04-01 19:55:12 -0500 (Thu, 01 Apr 2004)
New Revision: 1339

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ExternalTool.cs
   trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
Log:
+       * Internal/ExternalTool/ExternalTool.cs:
+       store UseOutputPad in xml file

part of bug #56293


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 00:08:27 UTC (rev 1338)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 00:55:12 UTC (rev 1339)
@@ -1,3 +1,8 @@
+2004-04-01  John Luke  
+	
+	* Internal/ExternalTool/ExternalTool.cs:
+	store UseOutputPad in xml file
+
 2004-04-01  Todd Berman  
 
 	* Gui/Dialogs/TipOfTheDay.cs: make same change here.

Modified: trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ExternalTool.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ExternalTool.cs	2004-04-02 00:08:27 UTC (rev 1338)
+++ trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ExternalTool.cs	2004-04-02 00:55:12 UTC (rev 1339)
@@ -117,7 +117,7 @@
 		public XmlElement ToXmlElement(XmlDocument doc)
 		{
 			if (doc == null) {
-				throw new ArgumentNullException("ExternalTool.ToXmlElement(XmlDocument doc) : doc can't be null");
+				throw new ArgumentNullException("ExternalTool.ToXmlElement(XmlDocument doc) : doc can not be null");
 			}
 			
 			XmlElement el = doc.CreateElement("TOOL");
@@ -141,6 +141,10 @@
 			x = doc.CreateElement("PROMPTFORARGUMENTS");
 			x.InnerText = PromptForArguments.ToString();
 			el.AppendChild(x);
+
+			x = doc.CreateElement("USEOUTPUTPAD");
+			x.InnerText = UseOutputPad.ToString();
+			el.AppendChild(x);
 			
 			return el;
 		}

Modified: trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs	2004-04-02 00:08:27 UTC (rev 1338)
+++ trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs	2004-04-02 00:55:12 UTC (rev 1339)
@@ -79,7 +79,7 @@
 			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
 		
 			if (!LoadToolsFromStream(propertyService.ConfigDirectory + TOOLFILE)) {
-				Console.WriteLine("Tools: can't load user defaults, reading system defaults");
+				//Console.WriteLine("Tools: can't load user defaults, reading system defaults");
 				if (!LoadToolsFromStream(propertyService.DataDirectory +
 				                         Path.DirectorySeparatorChar + "options" + 
 				                         Path.DirectorySeparatorChar + TOOLFILE)) {



From commit-watcher at mono-cvs.ximian.com  Fri Apr  2 04:37:27 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  2 Apr 2004 04:37:27 -0500 (EST)
Subject: [Monodevelop-patches-list] r1340 - in trunk/MonoDevelop: . build/AddIns libmonodevelop po src/Main/Base src/Main/Base/Gui/Dialogs src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions src/Main/Base/Services
Message-ID: <20040402093727.AD90F94749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-02 04:37:27 -0500 (Fri, 02 Apr 2004)
New Revision: 1340

Added:
   trunk/MonoDevelop/build/AddIns/ChangeLog
   trunk/MonoDevelop/libmonodevelop/
   trunk/MonoDevelop/libmonodevelop/ChangeLog
   trunk/MonoDevelop/libmonodevelop/Makefile.am
   trunk/MonoDevelop/libmonodevelop/gettext-utils.c
   trunk/MonoDevelop/libmonodevelop/gettext-utils.h
   trunk/MonoDevelop/po/
   trunk/MonoDevelop/po/ChangeLog
   trunk/MonoDevelop/po/Makefile.in.in
   trunk/MonoDevelop/po/POTFILES.in
   trunk/MonoDevelop/po/POTFILES.skip
   trunk/MonoDevelop/po/en_CA.po
   trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs
Modified:
   trunk/MonoDevelop/
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/Makefile.am
   trunk/MonoDevelop/autogen.sh
   trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
   trunk/MonoDevelop/src/Main/Base/Makefile.am
Log:
committing the beginning of gettextification of MD.

this is going to take at least a week to get working properly (fully translateable)

if anything breaks

let me know

also, you have to make install to see new and updated translations (i think)



Property changes on: trunk/MonoDevelop
___________________________________________________________________
Name: svn:ignore
   - depcomp
install-sh
aclocal.m4
missing
autom4te.cache
libtool
config.status
mkinstalldirs
Makefile
COPYING
INSTALL
ltmain.sh
config.sub
config.guess
monodevelop
config.log
Makefile.in
configure
monodevelop*.tar.gz
monodevelop*.spec
*.diff
FixmeTodo.list

   + depcomp
install-sh
aclocal.m4
missing
autom4te.cache
libtool
config.status
mkinstalldirs
Makefile
COPYING
INSTALL
ltmain.sh
config.sub
config.guess
monodevelop
config.log
Makefile.in
configure
monodevelop*.tar.gz
monodevelop*.spec
*.diff
FixmeTodo.list
intltool-*


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/ChangeLog	2004-04-02 09:37:27 UTC (rev 1340)
@@ -1,3 +1,10 @@
+2004-04-02  Todd Berman  
+
+	* configure.in: added po/Makefile.in.in, and other gettext related
+	stuff. added libmonodevelop/Makefile
+	* Makefile.am: added po and libmonodevelop to subdirs
+	* autogen.sh: added intltoolize to autogen.sh
+
 2004-03-31  Todd Berman  
 
 	* configure.in: bumping to 0.3

Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/Makefile.am	2004-04-02 09:37:27 UTC (rev 1340)
@@ -1,6 +1,6 @@
 # leave gdldock first
 # (mkdir ../../build/bin/ hack)
-SUBDIRS = gdldock src build data
+SUBDIRS = gdldock libmonodevelop src build data po
 
 bin_SCRIPTS = monodevelop
 

Modified: trunk/MonoDevelop/autogen.sh
===================================================================
--- trunk/MonoDevelop/autogen.sh	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/autogen.sh	2004-04-02 09:37:27 UTC (rev 1340)
@@ -36,7 +36,13 @@
   NO_AUTOMAKE=yes
 }
 
+(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`intltoolize' installed to compile MonoDevelop."
+  DIE=1
+}
 
+
 # if no automake, don't bother testing for aclocal
 test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
   echo
@@ -90,6 +96,11 @@
 echo "Running automake --gnu $am_opt ..."
 automake --add-missing --gnu $am_opt ||
   { echo "**Error**: automake failed."; exit 1; }
+
+echo "Running intltoolize ..."
+intltoolize --force ||
+  { echo "**Error**: intltoolize failed."; exit 1; }
+
 echo "Running autoconf ..."
 WANT_AUTOCONF="2.5" autoconf || { echo "**Error**: autoconf failed."; exit 1; }
 

Added: trunk/MonoDevelop/build/AddIns/ChangeLog
===================================================================
--- trunk/MonoDevelop/build/AddIns/ChangeLog	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/build/AddIns/ChangeLog	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,3 @@
+2004-04-02  Todd Berman  
+
+	* SharpDevelopCore.addin: adding GettextCatalog as a service.

Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-04-02 09:37:27 UTC (rev 1340)
@@ -30,6 +30,8 @@
 	
 	
 	
+		
 		
 		
+
+	* *: Creation of libmonodevelop.so. Right now it is used to bind to
+	gettext. Copied from muine.

Added: trunk/MonoDevelop/libmonodevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/libmonodevelop/Makefile.am	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/libmonodevelop/Makefile.am	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,13 @@
+INCLUDES =							\
+	-I$(top_srcdir)						\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+
+monodeveloplibdir = $(prefix)/lib/monodevelop/bin
+monodeveloplib_LTLIBRARIES = libmonodevelop.la
+
+libmonodevelop_la_SOURCES =		\
+	gettext-utils.c			\
+	gettext-utils.h	
+
+all-local:
+	$(LIBTOOL) --mode=install $(INSTALL) libmonodevelop.la `pwd`/$(top_builddir)/build/bin

Added: trunk/MonoDevelop/libmonodevelop/gettext-utils.c
===================================================================
--- trunk/MonoDevelop/libmonodevelop/gettext-utils.c	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/libmonodevelop/gettext-utils.c	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2004 Jorn Baayen 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include 
+
+#include "gettext-utils.h"
+
+void
+intl_init (const char *package)
+{
+#ifdef ENABLE_NLS
+	bindtextdomain (package, GNOMELOCALEDIR);
+	bind_textdomain_codeset (package, "UTF-8");
+	textdomain (package);
+#endif
+}
+
+const char *
+intl_get_string (const char *string)
+{
+#ifdef ENABLE_NLS
+	return gettext (string);
+#else
+	return string;
+#endif
+}
+
+const char *
+intl_get_plural_string (const char *singular,
+			const char *plural,
+			long n)
+{
+#ifdef ENABLE_NLS
+	return ngettext (singular, plural, n);
+#else
+	if (n == 1)
+		return singular;
+	else
+		return plural;
+#endif
+}

Added: trunk/MonoDevelop/libmonodevelop/gettext-utils.h
===================================================================
--- trunk/MonoDevelop/libmonodevelop/gettext-utils.h	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/libmonodevelop/gettext-utils.h	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2004 Jorn Baayen 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+void        intl_init              (const char *package);
+
+const char *intl_get_string        (const char *string);
+const char *intl_get_plural_string (const char *singular,
+				    const char *plural,
+				    long n);


Property changes on: trunk/MonoDevelop/po
___________________________________________________________________
Name: svn:ignore
   + *.gmo
monodevelop.pot
POTFILES


Added: trunk/MonoDevelop/po/ChangeLog
===================================================================
--- trunk/MonoDevelop/po/ChangeLog	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/po/ChangeLog	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,3 @@
+2004-04-02  Todd Berman  
+
+	* *: Initial creation of po/ and adding en_CA.po

Added: trunk/MonoDevelop/po/Makefile.in.in
===================================================================
--- trunk/MonoDevelop/po/Makefile.in.in	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/po/Makefile.in.in	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,254 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper 
+#
+# This file file be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+#
+# - Modified by Owen Taylor  to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman  to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+ at SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = ..
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+libdir = @libdir@
+localedir = $(libdir)/locale
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+subdir = po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+
+CC = @CC@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+DEFS = @DEFS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+
+INCLUDES = -I.. -I$(top_srcdir)/intl
+
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+SOURCES = 
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
+$(POFILES) $(GMOFILES) $(SOURCES)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+INSTOBJEXT = @INSTOBJEXT@
+
+.SUFFIXES:
+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+
+.c.o:
+	$(COMPILE) $<
+
+.po.pox:
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*pox
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && $(GENCAT) $@ $*.msg
+
+
+all: all- at USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-exec install-data
+install-exec:
+install-data: install-data- at USE_NLS@
+install-data-no: all
+install-data-yes: all
+	if test -r "$(MKINSTALLDIRS)"; then \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+	else \
+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+	fi
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  case "$$cat" in \
+	    *.gmo) destdir=$(gnulocaledir);; \
+	    *)     destdir=$(localedir);; \
+	  esac; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+	  if test -r "$(MKINSTALLDIRS)"; then \
+	    $(MKINSTALLDIRS) $$dir; \
+	  else \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+	  fi; \
+	  if test -r $$cat; then \
+	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	    echo "installing $(srcdir)/$$cat as" \
+		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	  fi; \
+	  if test -r $$cat.m; then \
+	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	  else \
+	    if test -r $(srcdir)/$$cat.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
+		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	      echo "installing $(srcdir)/$$cat as" \
+		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+	if test "$(PACKAGE)" = "glib"; then \
+	  if test -r "$(MKINSTALLDIRS)"; then \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+	  else \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+	  fi; \
+	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	else \
+	  : ; \
+	fi
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	done
+	if test "$(PACKAGE)" = "glib"; then \
+	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	fi
+
+check: all
+
+dvi info tags TAGS ID:
+
+mostlyclean:
+	rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
+	rm -fr *.o
+	rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f $(GMOFILES)
+
+distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: update-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	for file in $$dists; do \
+	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+	    || cp -p $(srcdir)/$$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	tmpdir=`pwd`; \
+	cd $(srcdir); \
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  echo "$$lang:"; \
+	  if $$tmpdir/$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -o $$tmpdir/$$lang.new.po $$lang; then \
+	    if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	      rm -f $$tmpdir/$$lang.new.po; \
+            else \
+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	        :; \
+	      else \
+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	        rm -f $$tmpdir/$$lang.new.po; \
+	        exit 1; \
+	      fi; \
+	    fi; \
+	  else \
+	    echo "msgmerge for $$cat failed!"; \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  fi; \
+	done
+
+# POTFILES is created from POTFILES.in by stripping comments, empty lines
+# and Intltool tags (enclosed in square brackets), and appending a full
+# relative path to them
+POTFILES: POTFILES.in
+	( if test 'x$(srcdir)' != 'x.'; then \
+	    posrcprefix='$(top_srcdir)/'; \
+	  else \
+	    posrcprefix="../"; \
+	  fi; \
+	  rm -f $@-t $@ \
+	    && (sed -e '/^#/d' 						\
+		    -e "s/^\[.*\] +//" 					\
+		    -e '/^[ 	]*$$/d' 				\
+		    -e "s at .*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
+		| sed -e '$$s/\\$$//') > $@-t \
+	    && chmod a-w $@-t \
+	    && mv $@-t $@ )
+
+Makefile: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/po/POTFILES.in	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,3 @@
+[encoding: UTF-8]
+data/resources/glade/Base.glade
+src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs

Added: trunk/MonoDevelop/po/POTFILES.skip
===================================================================

Added: trunk/MonoDevelop/po/en_CA.po
===================================================================
--- trunk/MonoDevelop/po/en_CA.po	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/po/en_CA.po	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,365 @@
+# MonoDevelop en_CA translation
+# Copyright (C) 2004 Todd Berman
+# This file is distributed under the same license as the PACKAGE package.
+# Todd Berman , 2004.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: MonoDevelop 0.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-02 04:24-0500\n"
+"PO-Revision-Date: 2004-04-02 03:31-0500\n"
+"Last-Translator: Todd Berman \n"
+"Language-Team: Todd Berman \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: data/resources/glade/Base.glade.h:1
+msgid "   "
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:2
+msgid "    "
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:3
+msgid " > "
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:4
+msgid "*"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:5
+msgid "..."
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:6
+msgid "Code generation options"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:7
+msgid "Comment generation options"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:8
+msgid "Include"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:9
+msgid "Load-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:10
+msgid "Location"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:11
+msgid "On Project Load- "
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:12
+msgid "Project Information-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:13
+msgid "Save-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:14
+msgid "Template"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:15
+msgid "Title"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:16
+msgid "Action-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:17
+msgid "Allways create backup copy-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:18
+msgid "Automaticly _include found files-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:19
+msgid "Browse"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:20
+msgid "Build and run options"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:21
+msgid "BuildPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:22
+msgid "Cat_egories:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:23
+msgid "CombineStartupPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:24
+msgid "Compilation _target"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:25
+msgid "CompileFileOptionsPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:26
+msgid "Create seperate c_ombine subdirectory"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:27
+msgid "Creates a new C# Project"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:28
+msgid "Default _combine location-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:29
+msgid "DeployFileOptionsPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:30
+msgid "Did you know that you can design lots of cool things with glade?"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:31
+msgid "Did you know?"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:32
+msgid "Enable _viewstate-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:33
+msgid "ExternalToolPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:34
+msgid "GNU GENERAL PUBLIC LICENSE"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:35
+msgid "GeneralProjectOptionsPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:36
+msgid "Generate _additional comments"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:37
+msgid "Generate _documentation comments"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:38
+msgid "Include Found Files"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:39
+msgid "Layout name:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:40
+msgid "Line Terminator Style-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:41
+msgid "Load user-specific settings with the document-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:42
+msgid "LoadSavePanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:43
+msgid "Macintosh-"
+msgstr "Mac, eh?"
+
+#: data/resources/glade/Base.glade.h:44
+msgid "New Combine"
+msgstr "New Combine, eh?"
+
+#: data/resources/glade/Base.glade.h:45
+msgid "New layout"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:46
+msgid "Project _Subdirectory:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:47
+msgid "Project will be saved in: /dev/null"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:48
+msgid "Search for new _files on load-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:49
+msgid "Show Extensions in project scout"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:50
+msgid "Show _output pad when build starts-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:51
+msgid "Show _task list pad if build finished with errors-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:52
+msgid "Show hidden files and directories"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:53
+msgid "Tip of the day"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:54
+msgid "Unix-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:55
+msgid "Use _Output Window"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:56
+msgid "Windows-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:57
+msgid "With _scriptfile"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:58
+msgid "_Arguments"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:59
+msgid "_Command"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:60
+msgid "_Deploy target:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:61
+msgid "_Description-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:62
+msgid "_Don't save changes to open documents -"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:63
+msgid "_Else on same line as closing bracket"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:64
+msgid "_Include files in compile run-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:65
+msgid "_Insert blank lines between members"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:66
+msgid "_Load previous combine on startup-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:67
+msgid "_Location:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:68
+msgid "_Multiple Startup Project-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:69
+msgid "_Name-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:70
+msgid "_Name:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:71
+msgid "_Next Tip"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:72
+msgid "_Project Files"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:73
+msgid "_Prompt for Arguments"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:74
+msgid "_Prompt to save changes to open documents-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:75
+msgid "_Save Changes to open documents-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:76
+msgid "_Show at startup"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:77
+msgid "_Single Startup Project-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:78
+msgid "_Start code block on the same line"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:79
+msgid "_Title"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:80
+msgid "_Use full type names"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:81
+msgid "_Working Dir."
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:82
+msgid "button1"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:83
+msgid "button3"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:84
+msgid "dialog1"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:85
+msgid "radiobutton1"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:86
+msgid "radiobutton2"
+msgstr ""
+
+#: src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs:129
+msgid "About MonoDevelop"
+msgstr "Aboot MonoDevelop"

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 09:37:27 UTC (rev 1340)
@@ -1,3 +1,12 @@
+2004-04-02  Todd Berman  
+
+	* Makefile.am: Added GettextCatalog.cs
+	* Services/GettextCatalog.cs: imported from muine, modified a bit.
+	* Gui/Dialogs/CommonAboutDialog.cs: added gettext translatable title
+	to test .cs translations.
+	* Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs: modified to 
+	test .glade translations 
+
 2004-04-01  John Luke  
 	
 	* Internal/ExternalTool/ExternalTool.cs:

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 09:37:27 UTC (rev 1340)
@@ -10,6 +10,7 @@
 using MonoDevelop.Gui;
 using MonoDevelop.Core.Properties;
 using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
 //using MonoDevelop.Gui.HtmlControl;
 
 using Gdk;
@@ -118,13 +119,14 @@
 		ScrollBox aboutPictureScrollBox;
 		
 		static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+		static GettextCatalog gettext = (GettextCatalog)ServiceManager.Services.GetService (typeof (GettextCatalog));
 		
 		static CommonAboutDialog ()
 		{
 			type = RegisterGType (typeof (CommonAboutDialog));
 		}
 		
-		public CommonAboutDialog() : base ("About MonoDevelop", (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
+		public CommonAboutDialog() : base (gettext.GetString ("About MonoDevelop"), (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
 		{
 			ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof (IResourceService));
 			aboutPictureScrollBox = new ScrollBox ();

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs	2004-04-02 09:37:27 UTC (rev 1340)
@@ -94,8 +94,8 @@
  					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.LineTerminatorStyleGroupBox}");
  				windowsRadioButton.Label = StringParserService.Parse(
  					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.WindowsRadioButton}");
- 				macintoshRadioButton.Label = StringParserService.Parse(
- 					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.MacintoshRadioButton}");
+ 				//macintoshRadioButton.Label = StringParserService.Parse(
+ 				//	"${res:Dialog.Options.IDEOptions.LoadSaveOptions.MacintoshRadioButton}");
  				unixRadioButton.Label = StringParserService.Parse(
  					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.UnixRadioButton}");
 				

Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am	2004-04-02 09:37:27 UTC (rev 1340)
@@ -215,6 +215,7 @@
 ./Services/Toolbar/ToolbarService.cs \
 ./Services/MonodocService.cs \
 ./Services/IDebuggerService.cs \
+./Services/GettextCatalog.cs \
 ./Internal/Undo/IUndoableOperation.cs \
 ./Internal/Undo/UndoStack.cs \
 ./Internal/Undo/UndoQueue.cs \

Added: trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs	2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs	2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2004 Jorn Baayen 
+ * 
+ * Modified by Todd Berman  to fit with MonoDevelop.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * !!! Note that this class has to have the same API as the one
+ *     from GNU.Gettext.dll, because otherwise the strings won't
+ *     be picked up by update-po.
+ */
+
+using System.Runtime.InteropServices;
+
+using MonoDevelop.Core.Services;
+using MonoDevelop.Core.AddIns;
+
+namespace MonoDevelop.Services
+{
+
+	public class GettextCatalog : AbstractService
+	{
+
+		public GettextCatalog () : this ("monodevelop")
+		{
+		}
+
+		[DllImport ("libmonodevelop")]
+		private static extern void intl_init (string package);
+	
+		public GettextCatalog (string package)
+		{
+			intl_init (package);
+		}
+	
+		[DllImport ("libmonodevelop")]
+		private static extern string intl_get_string (string str);
+	
+		public string GetString (string str)
+		{
+			return intl_get_string (str);
+		}
+	
+		[DllImport ("libmonodevelop")]
+		private static extern string intl_get_plural_string (string singular,
+								     string plural,
+								     int n);
+	
+		public string GetPluralString (string singular,
+					       string plural,
+					       int n)
+		{
+			return intl_get_plural_string (singular, plural, n);
+		}
+	}
+}



From commit-watcher at mono-cvs.ximian.com  Fri Apr  2 04:53:49 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  2 Apr 2004 04:53:49 -0500 (EST)
Subject: [Monodevelop-patches-list] r1341 - in trunk/MonoDevelop: build/AddIns po src/Main/Base src/Main/Base/Gui/Dialogs src/Main/Base/Services
Message-ID: <20040402095349.6099094749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-02 04:53:49 -0500 (Fri, 02 Apr 2004)
New Revision: 1341

Modified:
   trunk/MonoDevelop/build/AddIns/ChangeLog
   trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
   trunk/MonoDevelop/po/
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs
Log:
fixing metadata, removing service, moved to static methods...
remove abstraction goood.


Modified: trunk/MonoDevelop/build/AddIns/ChangeLog
===================================================================
--- trunk/MonoDevelop/build/AddIns/ChangeLog	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/build/AddIns/ChangeLog	2004-04-02 09:53:49 UTC (rev 1341)
@@ -1,3 +1,7 @@
 2004-04-02  Todd Berman  
 
+	* SharpDevelopCore.addin: removing, moving to static methods.
+
+2004-04-02  Todd Berman  
+
 	* SharpDevelopCore.addin: adding GettextCatalog as a service.

Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-04-02 09:53:49 UTC (rev 1341)
@@ -30,8 +30,6 @@
 	
 	
 	
-		
 		
 		
 
+	* Services/GettextCatalog.cs: changed to use static methods.
+	* Gui/Dialogs/CommonAboutDialog.cs: reflecting above change.
+
+2004-04-02  Todd Berman  
+
 	* Makefile.am: Added GettextCatalog.cs
 	* Services/GettextCatalog.cs: imported from muine, modified a bit.
 	* Gui/Dialogs/CommonAboutDialog.cs: added gettext translatable title

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 09:53:49 UTC (rev 1341)
@@ -119,14 +119,13 @@
 		ScrollBox aboutPictureScrollBox;
 		
 		static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-		static GettextCatalog gettext = (GettextCatalog)ServiceManager.Services.GetService (typeof (GettextCatalog));
 		
 		static CommonAboutDialog ()
 		{
 			type = RegisterGType (typeof (CommonAboutDialog));
 		}
 		
-		public CommonAboutDialog() : base (gettext.GetString ("About MonoDevelop"), (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
+		public CommonAboutDialog() : base (GettextCatalog.GetString ("About MonoDevelop"), (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
 		{
 			ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof (IResourceService));
 			aboutPictureScrollBox = new ScrollBox ();

Modified: trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs	2004-04-02 09:53:49 UTC (rev 1341)
@@ -31,25 +31,21 @@
 namespace MonoDevelop.Services
 {
 
-	public class GettextCatalog : AbstractService
+	public class GettextCatalog
 	{
 
-		public GettextCatalog () : this ("monodevelop")
-		{
-		}
-
 		[DllImport ("libmonodevelop")]
 		private static extern void intl_init (string package);
 	
-		public GettextCatalog (string package)
+		static GettextCatalog ()
 		{
-			intl_init (package);
+			intl_init ("monodevelop");
 		}
 	
 		[DllImport ("libmonodevelop")]
 		private static extern string intl_get_string (string str);
 	
-		public string GetString (string str)
+		public static string GetString (string str)
 		{
 			return intl_get_string (str);
 		}
@@ -59,9 +55,9 @@
 								     string plural,
 								     int n);
 	
-		public string GetPluralString (string singular,
-					       string plural,
-					       int n)
+		public static string GetPluralString (string singular,
+			    	 	              string plural,
+					              int n)
 		{
 			return intl_get_plural_string (singular, plural, n);
 		}



From commit-watcher at mono-cvs.ximian.com  Fri Apr  2 05:09:34 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  2 Apr 2004 05:09:34 -0500 (EST)
Subject: [Monodevelop-patches-list] r1342 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs Gui/Dialogs/OptionPanels
Message-ID: <20040402100934.047E994749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-02 05:09:34 -0500 (Fri, 02 Apr 2004)
New Revision: 1342

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
Log:
gettextification


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 10:09:34 UTC (rev 1342)
@@ -1,5 +1,12 @@
 2004-04-02  Todd Berman  
 
+	* Gui/Dialogs/NewProjectDialog.cs:
+	* Gui/Dialogs/CommonAboutDialog.cs:
+	* Gui/Dialogs/OptionPanels/EditTemplateDialog.cs:
+	* Gui/Dialogs/NewFileDialog.cs: gettextified
+
+2004-04-02  Todd Berman  
+
 	* Services/GettextCatalog.cs: changed to use static methods.
 	* Gui/Dialogs/CommonAboutDialog.cs: reflecting above change.
 

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 10:09:34 UTC (rev 1342)
@@ -142,10 +142,10 @@
 			//changelog = new ChangeLogTabPage ();
 			VersionInformationTabPage vinfo = new VersionInformationTabPage ();
 			
-			nb.AppendPage (new AboutMonoDevelopTabPage (), new Label ("About MonoDevelop"));
+			nb.AppendPage (new AboutMonoDevelopTabPage (), new Label (GettextCatalog.GetString ("About MonoDevelop")));
 			//nb.AppendPage (aatp, new Label ("Authors"));
 			//nb.AppendPage (changelog, new Label ("ChangeLog"));
-			nb.AppendPage (vinfo, new Label ("Version Info"));
+			nb.AppendPage (vinfo, new Label (GettextCatalog.GetString ("Version Info")));
 			this.VBox.PackStart (nb);
 			this.AddButton (Gtk.Stock.Close, (int) ResponseType.Close);
 			this.ShowAll ();

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs	2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs	2004-04-02 10:09:34 UTC (rev 1342)
@@ -48,7 +48,6 @@
 		
 		public NewFileDialog () : base ()
 		{
-			this.Title = "New file";
 			this.TransientFor = (Window) WorkbenchSingleton.Workbench;
 			this.BorderWidth = 6;
 			this.HasSeparator = false;
@@ -82,7 +81,7 @@
 					imglist.Add(bitmap);
 					tmp[entry.Key] = ++i;
 				} else {
-					Console.WriteLine("can't load bitmap " + entry.Key.ToString() + " using default");
+					Console.WriteLine(GettextCatalog.GetString ("Can't load bitmap {0} using default"), entry.Key.ToString ());
 				}
 			}
 			

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs	2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs	2004-04-02 10:09:34 UTC (rev 1342)
@@ -158,7 +158,7 @@
 		void PathChanged (object sender, EventArgs e)
 		{
 			ActivateIfReady ();
-			lbl_will_save_in.Text = resourceService.GetString("Dialog.NewProject.ProjectAtDescription") + " " + ProjectSolution;
+			lbl_will_save_in.Text = GettextCatalog.GetString("Dialog.NewProject.ProjectAtDescription") + " " + ProjectSolution;
 		}
 		
 		public bool IsFilenameAvailable(string fileName)
@@ -203,7 +203,7 @@
 			
 			//The one below seemed to be failing sometimes.
 			if(solution.IndexOfAny("$#@!%^&*/?\\|'\";:}{".ToCharArray()) > -1) {
-				messageService.ShowError("Illegal project name. \nOnly use letters, digits, space, '.' or '_'.");
+				messageService.ShowError(GettextCatalog.GetString ("Illegal project name. \nOnly use letters, digits, space, '.' or '_'."));
 				dialog.Respond(Gtk.ResponseType.Reject);
 				dialog.Hide();
 				return;
@@ -213,14 +213,14 @@
 				&& (!fileUtilityService.IsValidFileName (solution) || solution.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0)) ||
 			    !fileUtilityService.IsValidFileName(name)     || name.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0 ||
 			    !fileUtilityService.IsValidFileName(location)) {
-				messageService.ShowError("Illegal project name.\nOnly use letters, digits, space, '.' or '_'.");
+				messageService.ShowError(GettextCatalog.GetString ("Illegal project name.\nOnly use letters, digits, space, '.' or '_'."));
 				dialog.Respond(Gtk.ResponseType.Reject);
 				dialog.Hide();
 				return;
 			}
 
 			if(projService.ExistsEntryWithName(name)) {
-				messageService.ShowError("A Project with that name is already in your Project Space");
+				messageService.ShowError(GettextCatalog.GetString ("A Project with that name is already in your Project Space"));
 				dialog.Respond(Gtk.ResponseType.Reject);
 				dialog.Hide();
 				return;
@@ -277,7 +277,7 @@
 					NewCombineLocation = fileUtilityService.GetDirectoryNameWithSeparator(ProjectLocation) + ((TextBox)ControlDictionary["nameTextBox"]).Text + ".cmbx";
 					
 					if (File.Exists(NewCombineLocation)) {
-						DialogResult result = MessageBox.Show("Combine file " + NewCombineLocation + " already exists, do you want to overwrite\nthe existing file ?", "File already exists", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
+						DialogResult result = MessageBox.Show(String.Format (Gettext.GetString ("Combine file {0} already exists, do you want to overwrite\nthe existing file ?"), NewCombineLocation), Gettext.GetString ("File already exists"), MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
 						switch(result) {
 							case DialogResult.Yes:
 								cmb.SaveCombine(NewCombineLocation);
@@ -289,7 +289,7 @@
 						cmb.SaveCombine(NewCombineLocation);
 					}
 				} else {
-					MessageBox.Show(resourceService.GetString("Dialog.NewProject.EmptyProjectFieldWarning"), "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					MessageBox.Show(GettextCatalog.GetString ("The project or source entry is empty, can't create project."), GettextCatalog.GetString ("Warning"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				}
 #endif
 			}
@@ -347,12 +347,7 @@
 			TemplateView = new IconView ();
 			hbox_template.PackStart (TemplateView, true, true, 0);
 
-			//string label = stringParserService.Parse ("${res:Dialog.NewProject.NewSolutionLabelText}");
-			//label = stringParserService.Parse ("${res:Dialog.NewProject.LocationLabelText}");
-			//label = stringParserService.Parse ("${res:Dialog.NewProject.NameLabelText}");
-			//label = stringParserService.Parse ("${res:Dialog.NewProject.checkBox1Text}");
-			//label = stringParserService.Parse ("${res:Dialog.NewProject.autoCreateSubDirCheckBox}");
-			entry_location = new FolderEntry ("Combine Location");
+			entry_location = new FolderEntry (GettextCatalog.GetString ("Combine Location"));
 			hbox_for_browser.PackStart (entry_location, true, true, 0);
 			
 			

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs	2004-04-02 09:53:49 UTC (rev 1341)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs	2004-04-02 10:09:34 UTC (rev 1342)
@@ -10,6 +10,7 @@
 
 using MonoDevelop.Internal.Templates;
 using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
 
 namespace MonoDevelop.Gui.Dialogs
 {
@@ -55,14 +56,13 @@
 		{
 			// set up this actual dialog
 			this.Modal = true;
-			this.Title = StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.DialogName}");
 			
 			// set up the dialog fields and add them
 			templateTextBox = new Gtk.Entry();
 			descriptionTextBox = new Gtk.Entry();
 			descriptionTextBox.ActivatesDefault = true;
-			Gtk.Label label1 = new Gtk.Label(StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.DescriptionLabel}"));
-			Gtk.Label label2 = new Gtk.Label(StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.TemplateLabel}"));
+			Gtk.Label label1 = new Gtk.Label(GettextCatalog.GetString ("_Description"));
+			Gtk.Label label2 = new Gtk.Label(GettextCatalog.GetString ("_Template"));
 			label1.Xalign = 0;
 			label2.Xalign = 0;
 			templateTextBox.Text    = codeTemplate.Shortcut;



From commit-watcher at mono-cvs.ximian.com  Fri Apr  2 05:14:24 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  2 Apr 2004 05:14:24 -0500 (EST)
Subject: [Monodevelop-patches-list] r1343 - in trunk/MonoDevelop: po src/Main/Base/Gui/Dialogs
Message-ID: <20040402101424.5315E94749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-02 05:14:24 -0500 (Fri, 02 Apr 2004)
New Revision: 1343

Modified:
   trunk/MonoDevelop/po/POTFILES.in
   trunk/MonoDevelop/po/en_CA.po
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
Log:
gonna have to get used to updating po/POTFILES.in


Modified: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in	2004-04-02 10:09:34 UTC (rev 1342)
+++ trunk/MonoDevelop/po/POTFILES.in	2004-04-02 10:14:24 UTC (rev 1343)
@@ -1,3 +1,6 @@
 [encoding: UTF-8]
 data/resources/glade/Base.glade
 src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
+src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
+src/Main/Base/Gui/Dialogs/NewFileDialog.cs
+src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs

Modified: trunk/MonoDevelop/po/en_CA.po
===================================================================
--- trunk/MonoDevelop/po/en_CA.po	2004-04-02 10:09:34 UTC (rev 1342)
+++ trunk/MonoDevelop/po/en_CA.po	2004-04-02 10:14:24 UTC (rev 1343)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: MonoDevelop 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-02 04:24-0500\n"
+"POT-Creation-Date: 2004-04-02 05:41-0500\n"
 "PO-Revision-Date: 2004-04-02 03:31-0500\n"
 "Last-Translator: Todd Berman \n"
 "Language-Team: Todd Berman \n"
@@ -360,6 +360,13 @@
 msgid "radiobutton2"
 msgstr ""
 
-#: src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs:129
+#: src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs:128
+#: src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs:145
 msgid "About MonoDevelop"
 msgstr "Aboot MonoDevelop"
+
+#. nb.AppendPage (aatp, new Label ("Authors"));
+#. nb.AppendPage (changelog, new Label ("ChangeLog"));
+#: src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs:148
+msgid "Version Info"
+msgstr ""

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 10:09:34 UTC (rev 1342)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 10:14:24 UTC (rev 1343)
@@ -145,6 +145,7 @@
 			nb.AppendPage (new AboutMonoDevelopTabPage (), new Label (GettextCatalog.GetString ("About MonoDevelop")));
 			//nb.AppendPage (aatp, new Label ("Authors"));
 			//nb.AppendPage (changelog, new Label ("ChangeLog"));
+
 			nb.AppendPage (vinfo, new Label (GettextCatalog.GetString ("Version Info")));
 			this.VBox.PackStart (nb);
 			this.AddButton (Gtk.Stock.Close, (int) ResponseType.Close);



From commit-watcher at mono-cvs.ximian.com  Fri Apr  2 05:52:01 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  2 Apr 2004 05:52:01 -0500 (EST)
Subject: [Monodevelop-patches-list] r1344 - in trunk/MonoDevelop: po src/Main/Base src/Main/Base/Gui/Dialogs/OptionPanels src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions
Message-ID: <20040402105201.A249F94749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-02 05:52:01 -0500 (Fri, 02 Apr 2004)
New Revision: 1344

Modified:
   trunk/MonoDevelop/po/POTFILES.in
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
Log:
gettextify, didnt add all the files to POTFILES.in because some have no translation calls. removing old i18n calls, need to go through the glade file now and make sure they all still look fine.


Modified: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in	2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/po/POTFILES.in	2004-04-02 10:52:01 UTC (rev 1344)
@@ -4,3 +4,5 @@
 src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
 src/Main/Base/Gui/Dialogs/NewFileDialog.cs
 src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
+src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
+src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 10:52:01 UTC (rev 1344)
@@ -1,3 +1,13 @@
+2004-04-02  Todd berman  
+
+	* Gui/Dialogs/OptionPanels/ExternalToolPanel.cs:
+	* Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs:
+	* Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs:
+	* Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs:
+	* Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs:
+	gettextify
+
+
 2004-04-02  Todd Berman  
 
 	* Gui/Dialogs/NewProjectDialog.cs:

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs	2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs	2004-04-02 10:52:01 UTC (rev 1344)
@@ -40,41 +40,41 @@
 		public class ExternalToolPanelWidget :  GladeWidgetExtract 
 		{
 			static string[,] argumentQuickInsertMenu = new string[,] {
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullItemPath}",      "${ItemPath}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullItemDirectory}", "${ItemDir}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ItemFileName}",      "${ItemFileName}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ItemExtension}",     "${ItemExt}"},
+				{GettextCatalog.GetString ("Item Path"), "${ItemPath}"},
+				{GettextCatalog.GetString ("_Item Directory"), "${ItemDir}"},
+				{GettextCatalog.GetString ("Item file name"), "${ItemFileName}"},
+				{GettextCatalog.GetString ("Item extension"), "${ItemExt}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CurrentLine}",   "${CurLine}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CurrentColumn}", "${CurCol}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CurrentText}",   "${CurText}"},
+				{GettextCatalog.GetString ("Current line"), "${CurLine}"},
+				{GettextCatalog.GetString ("Current column"), "${CurCol}"},
+				{GettextCatalog.GetString ("Current text"), "${CurText}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullTargetPath}",  "${TargetPath}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetDirectory}", "${TargetDir}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetName}",      "${TargetName}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetExtension}", "${TargetExt}"},
+				{GettextCatalog.GetString ("Target Path"), "${TargetPath}"},
+				{GettextCatalog.GetString ("_Target Directory"), "${TargetDir}"},
+				{GettextCatalog.GetString ("Target Name"), "${TargetName}"},
+				{GettextCatalog.GetString ("Target Extension"), "${TargetExt}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ProjectDirectory}", "${ProjectDir}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ProjectFileName}",  "${ProjectFileName}"},
+				{GettextCatalog.GetString ("_Project Directory"), "${ProjectDir}"},
+				{GettextCatalog.GetString ("Project file name"), "${ProjectFileName}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineDirectory}", "${CombineDir}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineFileName}",  "${CombineFileName}"},
+				{GettextCatalog.GetString ("_Solution Directory"), "${CombineDir}"},
+				{GettextCatalog.GetString ("Solution File Name"), "${CombineFileName}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.SharpDevelopStartupPath}",  "${StartupPath}"},
+				{GettextCatalog.GetString ("MonoDevelop Startup Directory"), "${StartupPath}"},
 			};
 
 			static string[,] workingDirInsertMenu = new string[,] {
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullItemDirectory}", "${ItemDir}"},
+				{GettextCatalog.GetString ("_Item Directory"), "${ItemDir}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetDirectory}", "${TargetDir}"},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetName}",      "${TargetName}"},
+				{GettextCatalog.GetString ("_Target Directory"), "${TargetDir}"},
+				{GettextCatalog.GetString ("Target Name"), "${TargetName}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ProjectDirectory}", "${ProjectDir}"},
+				{GettextCatalog.GetString ("_Project Directory"), "${ProjectDir}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineDirectory}", "${CombineDir}"},
+				{GettextCatalog.GetString ("_Solution Directory"), "${CombineDir}"},
 				{"-", ""},
-				{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.SharpDevelopStartupPath}",  "${StartupPath}"},
-			};			 
+				{GettextCatalog.GetString ("MonoDevelop Startup Directory"), "${StartupPath}"},
+			};
 			 
 			// Services
 			FileUtilityService FileUtilityService = (FileUtilityService) ServiceManager.Services.GetService(
@@ -119,30 +119,6 @@
 			{
 				// instantiate controls			
 				toolListBoxStore = new ListStore (typeof (string), typeof (ExternalTool));
-				promptArgsCheckBox.Label = StringParserService.Parse(
-					"${res:Dialog.Options.ExternalTool.PromptForArgsCheckBox}"); 
-				useOutputPadCheckBox.Label = StringParserService.Parse(
-					"${res:Dialog.Options.ExternalTool.UseOutputWindow}"); 
-				titleLabel.TextWithMnemonic = StringParserService.Parse(
-					"${res:Dialog.Options.ExternalTool.TitleLabel}"); 
-				argumentLabel.TextWithMnemonic = StringParserService.Parse(
-					"${res:Dialog.Options.ExternalTool.ArgumentLabel}"); 
-				commandLabel.TextWithMnemonic = StringParserService.Parse(
-					"${res:Dialog.Options.ExternalTool.CommandLabel}"); 
-				workingDirLabel.TextWithMnemonic = StringParserService.Parse(
-					"${res:Dialog.Options.ExternalTool.WorkingDirLabel}");
-// 				moveUpButton.Label = StringParserService.Parse(
-// 					 "${res:Dialog.Options.ExternalTool.MoveUpButton}"); 
-// 				 moveUpButton.UseUnderline = true;
-// 				 moveDownButton.Label = StringParserService.Parse(
-// 					 "${res:Dialog.Options.ExternalTool.MoveDownButton}");
-// 				 moveDownButton.UseUnderline = true;
-// 				 removeButton.Label = StringParserService.Parse(
-// 					 "${res:Global.RemoveButtonText}");
-// 				 removeButton.UseUnderline = true;
-// 				 addButton.Label = StringParserService.Parse(
-// 					 "${res:Global.AddButtonText}");
-// 				 addButton.UseUnderline = true;
 
 				dependendControls = new Widget[] {
 					titleTextBox, commandTextBox, argumentTextBox, 
@@ -158,14 +134,10 @@
 					 
 				toolListBox.Reorderable = false;
 				toolListBox.HeadersVisible = true;
-		       	toolListBox.Selection.Mode = SelectionMode.Multiple;
+				toolListBox.Selection.Mode = SelectionMode.Multiple;
 				toolListBox.Model = toolListBoxStore;
 					 
-				toolListBox.AppendColumn (
-		       		StringParserService.Parse("${res:Dialog.Options.ExternalTool.ToolsLabel}"),
-					new CellRendererText (), 
-					"text", 
-					0);
+				toolListBox.AppendColumn (GettextCatalog.GetString ("_Tools"), new CellRendererText (), "text", 0);
 
 				MenuService.CreateQuickInsertMenu (argumentTextBox,
 						argumentQuickInsertButton,
@@ -187,7 +159,7 @@
 	         
 			void browseEvent (object sender, EventArgs e)
 			{
-				using (Gtk.FileSelection fs = new Gtk.FileSelection ("File to Open")) {
+				using (Gtk.FileSelection fs = new Gtk.FileSelection (GettextCatalog.GetString ("File to Open"))) {
 					int response = fs.Run ();
 					string name = fs.Filename;
 					fs.Hide ();
@@ -337,7 +309,7 @@
 			 
 			void addEvent (object sender, EventArgs e)
 			{
-				TreeIter itr = toolListBoxStore.AppendValues ("New Tool", new ExternalTool());
+				TreeIter itr = toolListBoxStore.AppendValues (GettextCatalog.GetString ("New Tool"), new ExternalTool());
 				toolListBoxItemCount ++;
 				toolListBox.Selection.UnselectAll ();
 				toolListBox.Selection.SelectIter (itr);
@@ -376,7 +348,7 @@
 			{
 				foreach (Widget control in controls) {				
 					if (control == null) {
-						MessageService.ShowError ("Control not found!");
+						MessageService.ShowError (GettextCatalog.GetString ("Control not found!"));
 					} else {
 						control.Sensitive = enabled;
 					}
@@ -397,14 +369,13 @@
 					ExternalTool tool = toolListBox.Model.GetValue (current, 1) as ExternalTool;
 					
 					if (!FileUtilityService.IsValidFileName (tool.Command)) {
-						MessageService.ShowError (String.Format(
-										 "The command of tool \"{0}\" is invalid.", 
+						MessageService.ShowError (String.Format(GettextCatalog.GetString ("The command of tool \"{0}\" is invalid."), 
 										 tool.MenuCommand));
 						return false;
 					}
 					
 					if ((tool.InitialDirectory != "") && (!FileUtilityService.IsValidFileName(tool.InitialDirectory))) {
-						MessageService.ShowError (String.Format("The working directory of tool \"{0}\" is invalid.",
+						MessageService.ShowError (String.Format(GettextCatalog.GetString ("The working directory of tool \"{0}\" is invalid.") ,
 											 tool.MenuCommand));
 						return false;
 					}

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs	2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs	2004-04-02 10:52:01 UTC (rev 1344)
@@ -69,17 +69,6 @@
 			        // getting internationalized strings
 			        //
 				// FIXME i8n the following line
-				buildAndRunOptionsLabel.Text = "Build and run options";
-				saveChangesRadioButton.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.SaveChangesRadioButton}");
-				promptChangesRadioButton.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.PromptToSaveRadioButton}");
-				noSaveRadioButton.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.DontSaveRadioButton}");
-				showOutputCheckBox.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowOutputPadCheckBox}");
-				showTaskListCheckBox.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowTaskListPadCheckBox}");
 				//
 				// reading properties
 				//

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs	2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs	2004-04-02 10:52:01 UTC (rev 1344)
@@ -43,17 +43,6 @@
 			
 			public CodeGenerationPanelWidget () : base ("Base.glade", "CodeGenerationOptionsPanel")
 			{
-				i18nizeHeader (hdr_code_generation_options, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.CodeGenerationOptionsGroupBox}");
-				i18nizeHeader (hdr_comment_generation_options, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.CommentGenerationOptionsGroupBox}");
-				
-				i18nize (chk_blk_on_same_line, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.StartBlockOnTheSameLineCheckBox}");
-				i18nize (chk_else_on_same_line, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.ElseOnClosingCheckBox}");
-				i18nize (chk_blank_lines, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.BlankLinesBetweenMembersCheckBox}");
-				i18nize (chk_full_type_names, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.UseFullTypeNamesCheckBox}");
-				
-				i18nize (chk_doc_comments, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.GenerateDocCommentsCheckBox}");
-				i18nize (chk_other_comments, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.GenerateAdditionalCommentsCheckBox}");
-				
 				chk_blk_on_same_line.Active   = p.GetProperty("StartBlockOnSameLine", true);
 				chk_else_on_same_line.Active  = p.GetProperty("ElseOnClosing", true);
 				chk_blank_lines.Active        = p.GetProperty("BlankLinesBetweenMembers", true);
@@ -80,19 +69,6 @@
 				p.SetProperty ("GenerateDocumentComments",   chk_doc_comments.Active);
 				p.SetProperty ("GenerateAdditionalComments", chk_other_comments.Active);
 			}
-			
-			void i18nizeHeader (Label l, string key)
-			{
-				// TODO: use the real pango stuff
-				// otherwise, excaping is a problem
-				l.Markup = "" + StringParserService.Parse (key) + "";
-				
-			}
-			
-			void i18nize (CheckButton c, string key)
-			{
-				c.Label = StringParserService.Parse (key);
-			}
 		}
 		
 		CodeGenerationPanelWidget widget;

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs	2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs	2004-04-02 10:52:01 UTC (rev 1344)
@@ -78,34 +78,11 @@
 				//
 				// load the internationalized strings.
 				//
-				loadLabel.Markup = " " + StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.LoadLabel}") + " ";
-				saveLabel.Markup = " " + StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.SaveLabel}")+ "";
-				
-				loadUserDataCheckButton.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.LoadUserDataCheckBox}");
-				loadPrevProjectCheckButton.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.LoadPrevProjectCheckBox}");
-				createBackupCopyCheckButton.Label =StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.CreateBackupCopyCheckBox}");
-				
- 				terminatorLabel.TextWithMnemonic  = StringParserService.Parse(
- 					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.LineTerminatorStyleGroupBox}");
- 				windowsRadioButton.Label = StringParserService.Parse(
- 					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.WindowsRadioButton}");
- 				//macintoshRadioButton.Label = StringParserService.Parse(
- 				//	"${res:Dialog.Options.IDEOptions.LoadSaveOptions.MacintoshRadioButton}");
- 				unixRadioButton.Label = StringParserService.Parse(
- 					"${res:Dialog.Options.IDEOptions.LoadSaveOptions.UnixRadioButton}");
-				
 				projectLocationTextBox.GtkEntry.Text = PropertyService.GetProperty(
 					"MonoDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath", 
 					System.IO.Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal),
 							"MonoDevelopProjects")).ToString();
 				projectLocationTextBox.DirectoryEntry = true;
-				locationLabel.TextWithMnemonic = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ProjectLocationLabel}");
 				//
 				// setup the properties
 				//
@@ -161,7 +138,7 @@
 				
 				return true;
 			}
-		}		
+		}
 	}
 }
 

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs	2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs	2004-04-02 10:52:01 UTC (rev 1344)
@@ -66,19 +66,6 @@
 
 			public  ProjectAndCombinePanelWidget () : base ("Base.glade", "ProjectAndCombinePanel")
 			{
-			        //
-			        // getting internationalized strings
-			        //
-				saveChangesRadioButton.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.SaveChangesRadioButton}");
-				promptChangesRadioButton.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.PromptToSaveRadioButton}");
-				noSaveRadioButton.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.DontSaveRadioButton}");
-				showOutputCheckBox.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowOutputPadCheckBox}");
-				showTaskListCheckBox.Label = StringParserService.Parse(
-					"${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowTaskListPadCheckBox}");
 				//
 				// reading properties
 				//



From commit-watcher at mono-cvs.ximian.com  Fri Apr  2 06:03:56 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  2 Apr 2004 06:03:56 -0500 (EST)
Subject: [Monodevelop-patches-list] r1345 - trunk/MonoDevelop/data/resources/glade
Message-ID: <20040402110356.0CA7594749@mono-cvs.ximian.com>

Author: tberman
Date: 2004-04-02 06:03:55 -0500 (Fri, 02 Apr 2004)
New Revision: 1345

Added:
   trunk/MonoDevelop/data/resources/glade/ChangeLog
Modified:
   trunk/MonoDevelop/data/resources/glade/Base.glade
Log:
updating glade file to remove the -'s and make sure everythingwill still look good using gettext


Modified: trunk/MonoDevelop/data/resources/glade/Base.glade
===================================================================
--- trunk/MonoDevelop/data/resources/glade/Base.glade	2004-04-02 10:52:01 UTC (rev 1344)
+++ trunk/MonoDevelop/data/resources/glade/Base.glade	2004-04-02 11:03:55 UTC (rev 1345)
@@ -8,7 +8,7 @@
   640
   480
   True
-  dialog1
+  Options
   GTK_WINDOW_TOPLEVEL
   GTK_WIN_POS_NONE
   False
@@ -301,7 +301,7 @@
 
 
 
-  New Combine
+  New Solution
   GTK_WINDOW_TOPLEVEL
   GTK_WIN_POS_CENTER
   False
@@ -794,7 +794,7 @@
 
 
   True
-  dialog1
+  Add References
   GTK_WINDOW_TOPLEVEL
   GTK_WIN_POS_NONE
   False
@@ -1439,7 +1439,7 @@
 	  
 	    
 	      True
-	      Default _combine location-
+	      Default _combine location
 	      True
 	      False
 	      GTK_JUSTIFY_LEFT
@@ -1501,7 +1501,7 @@
 	  
 	    
 	      True
-	      <b>Load</b>-
+	      <b>Load</b>
 	      False
 	      True
 	      GTK_JUSTIFY_LEFT
@@ -1562,7 +1562,7 @@
 			
 			  True
 			  True
-			  Load user-specific settings with the document-
+			  Load user-specific settings with the document
 			  True
 			  GTK_RELIEF_NORMAL
 			  False
@@ -1580,7 +1580,7 @@
 			
 			  True
 			  True
-			  _Load previous combine on startup-
+			  _Load previous solution on startup
 			  True
 			  GTK_RELIEF_NORMAL
 			  False
@@ -1631,7 +1631,7 @@
 	  
 	    
 	      True
-	      <b>Save</b>-
+	      <b>Save</b>
 	      False
 	      True
 	      GTK_JUSTIFY_LEFT
@@ -1686,7 +1686,7 @@
 		    
 		      True
 		      True
-		      Allways create backup copy-
+		      Always create backup copy
 		      True
 		      GTK_RELIEF_NORMAL
 		      False
@@ -1703,7 +1703,7 @@
 		  
 		    
 		      True
-		      Line Terminator Style-
+		      Line Terminator Style
 		      False
 		      True
 		      GTK_JUSTIFY_LEFT
@@ -1764,7 +1764,7 @@
 				
 				  True
 				  True
-				  Windows-
+				  Windows
 				  True
 				  GTK_RELIEF_NORMAL
 				  False
@@ -1782,7 +1782,7 @@
 				
 				  True
 				  True
-				  Macintosh-
+				  Macintosh
 				  True
 				  GTK_RELIEF_NORMAL
 				  False
@@ -1801,7 +1801,7 @@
 				
 				  True
 				  True
-				  Unix-
+				  Unix
 				  True
 				  GTK_RELIEF_NORMAL
 				  False
@@ -2118,7 +2118,7 @@
 	
 	  True
 	  True
-	  Show _output pad when build starts-
+	  Show _output pad when build starts
 	  True
 	  GTK_RELIEF_NORMAL
 	  False
@@ -2136,7 +2136,7 @@
 	
 	  True
 	  True
-	  Show _task list pad if build finished with errors-
+	  Show _task list pad if build finished with errors
 	  True
 	  GTK_RELIEF_NORMAL
 	  False
@@ -2208,7 +2208,7 @@
 		
 		  True
 		  True
-		  _Save Changes to open documents-
+		  _Save Changes to open documents
 		  True
 		  GTK_RELIEF_NORMAL
 		  False
@@ -2226,7 +2226,7 @@
 		
 		  True
 		  True
-		  _Prompt to save changes to open documents-
+		  _Prompt to save changes to open documents
 		  True
 		  GTK_RELIEF_NORMAL
 		  False
@@ -2245,7 +2245,7 @@
 		
 		  True
 		  True
-		  _Don't save changes to open documents -
+		  _Don't save changes to open documents 
 		  True
 		  GTK_RELIEF_NORMAL
 		  False
@@ -2833,7 +2833,7 @@
 	  
 	    
 	      True
-	      <b>Project Information-</b>
+	      <b>Project Information</b>
 	      True
 	      True
 	      GTK_JUSTIFY_LEFT
@@ -2899,7 +2899,7 @@
 			  
 			    
 			      True
-			      _Name-
+			      _Name
 			      True
 			      False
 			      GTK_JUSTIFY_LEFT
@@ -2993,7 +2993,7 @@
 		      