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

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index 0b82e41..49cf6bc 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -1550,7 +1550,7 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas)
 			return value_node;
 	}
 
-	// If ValueBase::ident_type() recognises the name, then we know it's a ValueBase
+	// If ValueBase::ident_type() recognizes the name, then we know it's a ValueBase
 	if(element->get_name()!="canvas" && ValueBase::ident_type(element->get_name()))
 	{
 		ValueBase data=parse_value(element,canvas);
@@ -1756,7 +1756,7 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas)
 				continue;
 			}
 
-			// If we recognise the element name as a
+			// If we recognize the element name as a
 			// ValueBase, then treat is at one
 			if(/*(*iter)->get_name()!="canvas" && */ValueBase::ident_type((*iter)->get_name()) && !dynamic_cast<xmlpp::Element*>(*iter)->get_attribute("guid"))
 			{
@@ -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");