X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=61dbabc3ffbb7f37e3bb37268b9300c053f43561;hb=047740653043b7fa79a042152a70e158f4d3ab97;hp=4b6dda545e63ec0d0e5b99dabe84be9a34210f45;hpb=99b75ef1bb279e2314516f922f05696263d5bd27;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 4b6dda5..61dbabc 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -50,10 +50,12 @@
 #include <synfig/valuenode_composite.h>
 #include "widget_waypointmodel.h"
 #include <gtkmm/actiongroup.h>
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 #include <sys/stat.h>
 #include <errno.h>
 
+#include "general.h"
+
 #endif
 
 using namespace std;
@@ -271,7 +273,7 @@ studio::Instance::dialog_save_as()
 		{
 			String ext(filename_extension(filename));
 			if(ext!=".sif" && ext!=".sifz" && !App::dialog_yes_no(_("Unknown extension"),
-				_("You have given the file name an extension\nwhich I do not recognise. Are you sure this is what you want?")))
+				_("You have given the file name an extension\nwhich I do not recognize. Are you sure this is what you want?")))
 				continue;
 		}
 		catch(...)
@@ -480,7 +482,7 @@ Instance::dialog_cvs_commit()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to COMMIT"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to COMMIT"));
 	}
 	update_all_titles();
 }
@@ -505,7 +507,7 @@ Instance::dialog_cvs_add()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to ADD"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to ADD"));
 	}
 	update_all_titles();
 }
@@ -546,7 +548,7 @@ Instance::dialog_cvs_update()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to UPDATE"));
 	}
 	//update_all_titles();
 }
@@ -582,7 +584,7 @@ Instance::dialog_cvs_revert()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to UPDATE"));
 	}
 	//update_all_titles();
 }
@@ -807,7 +809,7 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
 	if(candidate_list2.empty())
 		synfig::warning("%s:%d Action CandidateList2 is empty!", __FILE__, __LINE__);
 
-	// Seperate out the candidate lists so that there are no conflicts
+	// Separate out the candidate lists so that there are no conflicts
 	for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
 	{
 		synfigapp::Action::CandidateList::iterator iter2(candidate_list2.find(iter->name));