From 5f937f1d74ccc6dc54f876e62cdea574e7cb56bf Mon Sep 17 00:00:00 2001 From: dooglus Date: Tue, 30 Oct 2007 10:53:22 +0000 Subject: [PATCH] Use American spelling of 'initialise'. git-svn-id: http://svn.voria.com/code@1004 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp | 2 +- synfig-core/trunk/src/synfig/activepoint.h | 2 +- synfig-core/trunk/src/synfig/color.h | 2 +- synfig-core/trunk/src/synfig/layer_shape.cpp | 2 +- synfig-core/trunk/src/synfig/target_scanline.cpp | 2 +- synfig-core/trunk/src/synfig/target_tile.cpp | 2 +- synfig-studio/trunk/src/gtkmm/app.cpp | 4 ++-- synfig-studio/trunk/src/gtkmm/canvasview.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dialog_setup.cpp | 2 +- synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp | 2 +- synfig-studio/trunk/src/gtkmm/render.cpp | 2 +- synfig-studio/trunk/src/gtkmm/state_draw.cpp | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp index fd54c7a..2ef7eae 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp @@ -381,7 +381,7 @@ Layer_Freetype::new_face(const String &newfont) FcResult result; if( !FcInit() ) { - synfig::warning("Layer_Freetype: fontconfig: %s",_("unable to initialise")); + synfig::warning("Layer_Freetype: fontconfig: %s",_("unable to initialize")); error = 1; } else { FcPattern* pat = FcNameParse((FcChar8 *) newfont.c_str()); diff --git a/synfig-core/trunk/src/synfig/activepoint.h b/synfig-core/trunk/src/synfig/activepoint.h index daee5c7..74e2edc 100644 --- a/synfig-core/trunk/src/synfig/activepoint.h +++ b/synfig-core/trunk/src/synfig/activepoint.h @@ -63,7 +63,7 @@ public: bool operator<(const Time& rhs) { return timeerror(_("Target initialisation failure")); + if(cb) cb->error(_("Target initialization failure")); return false; } diff --git a/synfig-core/trunk/src/synfig/target_tile.cpp b/synfig-core/trunk/src/synfig/target_tile.cpp index 69e12ed..24674bc 100644 --- a/synfig-core/trunk/src/synfig/target_tile.cpp +++ b/synfig-core/trunk/src/synfig/target_tile.cpp @@ -308,7 +308,7 @@ synfig::Target_Tile::render(ProgressCallback *cb) curr_frame_=0; init(); if( !init() ){ - if(cb) cb->error(_("Target initialisation failure")); + if(cb) cb->error(_("Target initialization failure")); return false; } diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index 55ac541..2730a4a 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -1124,8 +1124,8 @@ App::App(int *argc, char ***argv): gdk_rgb_init(); - // don't call thread_init() if threads are already initialised - // on some machines bonobo_init() initialised threads before we get here + // don't call thread_init() if threads are already initialized + // on some machines bonobo_init() initialized threads before we get here if (!g_thread_supported()) Glib::thread_init(); diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index deb9567..ac2b165 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -802,7 +802,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handle // WorkArea::set_zoom(float) => // WorkArea::async_update_preview() => - // desc.set_time(cur_time), where cur_time isn't initialised + // desc.set_time(cur_time), where cur_time isn't initialized work_area->set_time(0); work_area->zoom_out(); w=round_to_int(get_canvas()->rend_desc().get_w()*work_area->get_zoom()+70); diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp index 88ca532..bb12d26 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp @@ -264,7 +264,7 @@ void Dialog_Setup::refresh() { // Refresh the temporary gamma; do this before adjusting the sliders, - // or variables will be used before their initialisation. + // or variables will be used before their initialization. gamma_pattern.set_gamma_r(App::gamma.get_gamma_r()); gamma_pattern.set_gamma_g(App::gamma.get_gamma_g()); gamma_pattern.set_gamma_b(App::gamma.get_gamma_b()); diff --git a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp index 04ef675..095ec2c 100644 --- a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp @@ -346,7 +346,7 @@ KeyframeTreeStore::set_value_impl(const Gtk::TreeModel::iterator& row, int colum // Bad old delta return; } - // row(row) on the next line is bad - don't use it, because it leaves 'row' uninitialised + // row(row) on the next line is bad - don't use it, because it leaves 'row' uninitialized //Gtk::TreeModel::iterator row(row); //row++; //if(!row)return; diff --git a/synfig-studio/trunk/src/gtkmm/render.cpp b/synfig-studio/trunk/src/gtkmm/render.cpp index 6ce562e..95243be 100644 --- a/synfig-studio/trunk/src/gtkmm/render.cpp +++ b/synfig-studio/trunk/src/gtkmm/render.cpp @@ -298,7 +298,7 @@ RenderSettings::on_render_pressed() target->set_rend_desc(&rend_desc); target->set_quality((int)adjustment_quality.get_value()); if( !target->init() ){ - canvas_interface_->get_ui_interface()->error(_("Target initialisation failure")); + canvas_interface_->get_ui_interface()->error(_("Target initialization failure")); return; } diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index c2afdf5..56f5c97 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -758,7 +758,7 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline bool extend_start=false,extend_finish=false,complete_loop=false; bool extend_start_join_same=false,extend_start_join_different=false; bool extend_finish_join_same=false,extend_finish_join_different=false; - int start_duck_index = 0,finish_duck_index = 0; // initialised to keep the compiler happy; shouldn't be needed though + int start_duck_index = 0,finish_duck_index = 0; // initialized to keep the compiler happy; shouldn't be needed though ValueNode_BLine::Handle start_duck_value_node_bline=NULL,finish_duck_value_node_bline=NULL; // Find any ducks at the start or end that we might attach to -- 2.7.4