X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=0e2ed36ea31abc040d78e89672c40878ce3ff0f2;hb=fac9dc0a044a6529e474a325332ba17502d6e7b2;hp=65c63d8f4fa3eba10079c9f60bcb2d481b394cb4;hpb=4c343e415bc02343d7b65322240fe758a1d992e4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 65c63d8..0e2ed36 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007, 2008 Chris Moore
+**  Copyright (c) 2008 Carlos López
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -229,8 +230,8 @@ studio::Instance::save()
 		App::add_recent_file(etl::handle<Instance>(this));
 		return STATUS_OK;
 	}
-
-	App::dialog_error_blocking("Save - Error","Unable to save to '" + get_file_name() + "'");
+	string msg(strprintf(_("Unable to save to '%s'"), get_file_name().c_str()));
+	App::dialog_error_blocking(_("Save - Error"), msg.c_str());
 	return STATUS_ERROR;
 }
 
@@ -240,7 +241,7 @@ studio::Instance::save()
 bool
 studio::Instance::has_real_filename()
 {
-	return get_file_name().find(DEFAULT_FILENAME_PREFIX) != 0;
+	return get_file_name().find(App::custom_filename_prefix.c_str()) != 0;
 }
 
 bool
@@ -260,12 +261,11 @@ studio::Instance::dialog_save_as()
 				Layer::Handle parent_layer(dynamic_cast<Layer*>(node));
 				if(parent_layer && parent_layer->get_canvas()->get_root()!=get_canvas())
 				{
-					App::dialog_error_blocking("SaveAs - Error",
-						"There is currently a bug when using \"SaveAs\"\n"
+					string msg(strprintf(_("There is currently a bug when using \"SaveAs\"\n"
 						"on a composition that is being referenced by other\n"
 						"files that are currently open. Close these\n"
-						"other files first before trying to use \"SaveAs\"."
-					);
+						"other files first before trying to use \"SaveAs\".")));
+					App::dialog_error_blocking(_("SaveAs - Error"), msg.c_str());
 
 					return false;
 				}
@@ -315,17 +315,16 @@ studio::Instance::dialog_save_as()
 			if (stat_return == -1 && errno != ENOENT)
 			{
 				perror(filename.c_str());
-				App::dialog_error_blocking("SaveAs - Error","Unable to check whether '" + filename + "' exists.");
+				string msg(strprintf(_("Unable to check whether '%s' exists."), filename.c_str()));
+				App::dialog_error_blocking(_("SaveAs - Error"),msg.c_str());
 				continue;
 			}
 
 			// if the file exists and the user doesn't want to overwrite it, keep prompting for a filename
+			string msg(strprintf(_("A file named '%s' already exists.\n\n"
+									"Do you want to replace it with the file you are saving?"), filename.c_str()));
 			if ((stat_return == 0) &&
-				!App::dialog_yes_no("File exists",
-									"A file named '" +
-									filename +
-									"' already exists.\n\n"
-									"Do you want to replace it with the file you are saving?"))
+				!App::dialog_yes_no(_("File exists"),msg.c_str()))
 				continue;
 		}
 
@@ -334,8 +333,8 @@ studio::Instance::dialog_save_as()
 			synfig::set_file_version(ReleaseVersion(RELEASE_VERSION_END-1));
 			return true;
 		}
-
-		App::dialog_error_blocking("SaveAs - Error","Unable to save to '" + filename + "'");
+		string msg(strprintf(_("Unable to save to '%s'"), filename.c_str()));
+		App::dialog_error_blocking(_("SaveAs - Error"),msg.c_str());
 	}
 
 	return false;
@@ -980,7 +979,7 @@ Instance::process_action(synfig::String name, synfigapp::Action::ParamList param
 			case synfigapp::Action::Param::TYPE_STRING:
 			{
 				String str;
-				if(!studio::App::dialog_entry(entry.local_name, iter->get_local_name()+":"+iter->get_desc(),str))
+				if(!studio::App::dialog_entry(entry.local_name, iter->get_local_name()+": "+iter->get_desc(),str))
 					return;
 				action->set_param(iter->get_name(),str);
 				break;