X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=93333d83b3d7a7e0c7ad65c8763e314ede282bdf;hb=515a022ac91401cac968ddf1530938773a9b9624;hp=f5b800665f08fb2acd152c99ec40bd6841fb909b;hpb=449972484abe4b99beef5ac1ed918814e76041c6;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index f5b8006..93333d8 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -271,7 +271,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 +480,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 +505,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 +546,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 +582,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 +807,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));