X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=49cf6bcc131fbbc0bccc9e16035afd43df91603b;hb=75d9450af83a2fc392104c537aab2aed2f3d1142;hp=539f838afeca44740b0748bfb230896cc51485c3;hpb=bd8367952ea2be0ab1e94922922409bf5f9a0be8;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index 539f838..49cf6bc 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -1989,7 +1989,7 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in
 
 				// If we don't have any name, warn
 				if(list.empty())
-					warning(child,_("blank \"name\" entitity"));
+					warning(child,_("blank \"name\" entity"));
 
 				string tmp;
 				for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter)
@@ -2004,7 +2004,7 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in
 
 				// If we don't have any description, warn
 				if(list.empty())
-					warning(child,_("blank \"desc\" entitity"));
+					warning(child,_("blank \"desc\" entity"));
 
 				string tmp;
 				for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter)
@@ -2019,7 +2019,7 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in
 
 				// If we don't have any description, warn
 				if(list.empty())
-					warning(child,_("blank \"author\" entitity"));
+					warning(child,_("blank \"author\" entity"));
 
 				string tmp;
 				for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter)
@@ -2069,7 +2069,6 @@ CanvasParser::parse_from_file(const String &file)
 Canvas::Handle
 CanvasParser::parse_from_file_as(const String &file_,const String &as_)
 {
-	CHECK_EXPIRE_TIME();
 	try
 	{
         ChangeLocale change_locale(LC_NUMERIC, "C");
@@ -2130,8 +2129,6 @@ CanvasParser::parse_from_file_as(const String &file_,const String &as_)
 Canvas::Handle
 CanvasParser::parse_from_string(const String &data)
 {
-	CHECK_EXPIRE_TIME();
-
 	try
 	{
         ChangeLocale change_locale(LC_NUMERIC, "C");