[Monodevelop-patches-list] r1360 - in trunk/MonoDevelop: po src/Main/Base/Commands src/Main/Base/Internal/Project/Combine

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Sat Apr 3 13:33:53 EST 2004


Author: tberman
Date: 2004-04-03 13:33:53 -0500 (Sat, 03 Apr 2004)
New Revision: 1360

Modified:
   trunk/MonoDevelop/po/POTFILES.in
   trunk/MonoDevelop/po/POTFILES.skip
   trunk/MonoDevelop/po/en_CA.po
   trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
Log:
thanks lluis! :)


Modified: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in	2004-04-03 04:58:42 UTC (rev 1359)
+++ trunk/MonoDevelop/po/POTFILES.in	2004-04-03 18:33:53 UTC (rev 1360)
@@ -3,18 +3,6 @@
 data/resources/glade/CSharp.glade
 data/resources/glade/EditorBindings.glade
 data/resources/glade/texteditoraddin.glade
-gdldock/sources/gdl/gdl-dock-bar.c
-gdldock/sources/gdl/gdl-dock-item-grip.c
-gdldock/sources/gdl/gdl-dock-item.c
-gdldock/sources/gdl/gdl-dock-layout.c
-gdldock/sources/gdl/gdl-dock-master.c
-gdldock/sources/gdl/gdl-dock-notebook.c
-gdldock/sources/gdl/gdl-dock-object.c
-gdldock/sources/gdl/gdl-dock-paned.c
-gdldock/sources/gdl/gdl-dock-placeholder.c
-gdldock/sources/gdl/gdl-dock-tablabel.c
-gdldock/sources/gdl/gdl-dock.c
-gdldock/sources/gdl/layout.glade
 src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
 src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
 src/Main/Base/Gui/Dialogs/NewFileDialog.cs
@@ -84,3 +72,6 @@
 src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
 src/Libraries/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs
 src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNodeCollection.cs
+src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs
+src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
+src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs

Modified: trunk/MonoDevelop/po/POTFILES.skip
===================================================================
--- trunk/MonoDevelop/po/POTFILES.skip	2004-04-03 04:58:42 UTC (rev 1359)
+++ trunk/MonoDevelop/po/POTFILES.skip	2004-04-03 18:33:53 UTC (rev 1360)
@@ -0,0 +1,12 @@
+gdldock/sources/gdl/gdl-dock-bar.c
+gdldock/sources/gdl/gdl-dock-item-grip.c
+gdldock/sources/gdl/gdl-dock-item.c
+gdldock/sources/gdl/gdl-dock-layout.c
+gdldock/sources/gdl/gdl-dock-master.c
+gdldock/sources/gdl/gdl-dock-notebook.c
+gdldock/sources/gdl/gdl-dock-object.c
+gdldock/sources/gdl/gdl-dock-paned.c
+gdldock/sources/gdl/gdl-dock-placeholder.c
+gdldock/sources/gdl/gdl-dock-tablabel.c
+gdldock/sources/gdl/gdl-dock.c
+gdldock/sources/gdl/layout.glade

Modified: trunk/MonoDevelop/po/en_CA.po
===================================================================
--- trunk/MonoDevelop/po/en_CA.po	2004-04-03 04:58:42 UTC (rev 1359)
+++ trunk/MonoDevelop/po/en_CA.po	2004-04-03 18:33:53 UTC (rev 1360)
@@ -1231,7 +1231,7 @@
 msgid ""
 "---------------------- Done ----------------------\n"
 "\n"
-"Build: ${0} succeeded, ${1} failed\n"
+"Build: {0} succeeded, {1} failed\n"
 msgstr ""
 
 #: src/Main/Base/Commands/RunCommands.cs:96

Modified: trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs	2004-04-03 04:58:42 UTC (rev 1359)
+++ trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs	2004-04-03 18:33:53 UTC (rev 1360)
@@ -90,8 +90,9 @@
 							}
 						}
 					}
-					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: ${0} succeeded, ${1} failed\n"), CombineEntry.BuildProjects.ToString (), CombineEntry.BuildErrors.ToString ());
+					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString (), CombineEntry.BuildErrors.ToString ());
 				} catch (Exception e) {
+					Console.WriteLine (e);
 					IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 					messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
 				}
@@ -164,8 +165,9 @@
 							}
 						}
 					}
-					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: ${0} succeeded, ${1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
+					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
 				} catch (Exception e) {
+					Console.WriteLine (e);
 					IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 					messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
 				}
@@ -277,7 +279,7 @@
 			
 						projectService.OnStartBuild();
 						projectService.CompileProject(projectService.CurrentSelectedProject);
-						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: ${0} succeeded, ${1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
+						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
 					} catch (Exception e) {
 						IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 						messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
@@ -311,7 +313,7 @@
 				
 						projectService.OnStartBuild();
 						projectService.RecompileProject(projectService.CurrentSelectedProject);
-						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: ${0} succeeded, ${1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
+						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
 					} catch (Exception e) {
 						IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 						messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs	2004-04-03 04:58:42 UTC (rev 1359)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs	2004-04-03 18:33:53 UTC (rev 1360)
@@ -129,7 +129,7 @@
 				
 				AbstractProjectConfiguration conf = project.ActiveConfiguration as AbstractProjectConfiguration;
 
-				taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("------ Build started: Project: ${Project} Configuration: ${Config} ------\n\nPerforming main compilation...\n"), Project.Name, Project.ActiveConfiguration.Name);
+				taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("------ Build started: Project: {0} Configuration: {1} ------\n\nPerforming main compilation...\n"), Project.Name, Project.ActiveConfiguration.Name);
 				
 				if (conf != null && File.Exists(conf.ExecuteBeforeBuild)) {
 					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Execute : {0}"), conf.ExecuteBeforeBuild);
@@ -171,7 +171,7 @@
 					++BuildProjects;
 				}
 				
-				taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Build complete -- ${0} errors, ${1} warnings\n\n"), taskService.Errors.ToString (), taskService.Warnings.ToString ());
+				taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Build complete -- {0} errors, {1} warnings\n\n"), taskService.Errors.ToString (), taskService.Warnings.ToString ());
 			}
 		}
 		




More information about the Monodevelop-patches-list mailing list