From b4b6a752214c5f56f51788b78f3b71fcfdec2492 Mon Sep 17 00:00:00 2001 From: Firas Hanife Date: Feb 13 2020 13:38:55 +0000 Subject: Fix some typos and some non translatable strings (#1159) * Make menu entry consistent Change menu entry to group layers into Switch to make it consistent with Group and Filter (layer is plural) * Fix ellipsis * Fix articles * Fix spacing * Fix typo * Fix non translatable strings --- diff --git a/synfig-core/src/synfig/layers/layer_switch.cpp b/synfig-core/src/synfig/layers/layer_switch.cpp index 81b1541..8b1ba7e 100644 --- a/synfig-core/src/synfig/layers/layer_switch.cpp +++ b/synfig-core/src/synfig/layers/layer_switch.cpp @@ -101,7 +101,7 @@ Layer_Switch::get_param_vocab()const ret.push_back(ParamDesc("layer_depth") .set_local_name(_("Active Layer Depth")) - .set_description(_("Uses when layer name is empty. Only layer with specified depth are visible")) + .set_description(_("Used when layer name is empty. Only layer with specified depth is visible")) ); return ret; diff --git a/synfig-core/src/synfig/target_cairo.cpp b/synfig-core/src/synfig/target_cairo.cpp index 2a48263..6b63c34 100644 --- a/synfig-core/src/synfig/target_cairo.cpp +++ b/synfig-core/src/synfig/target_cairo.cpp @@ -181,7 +181,7 @@ synfig::Target_Cairo::render(ProgressCallback *cb) } catch(const String& str) { - if(cb)cb->error(_("Caught string :")+str); + if(cb)cb->error(_("Caught string: ")+str); return false; } catch(std::bad_alloc&) diff --git a/synfig-core/src/synfig/target_cairo_tile.cpp b/synfig-core/src/synfig/target_cairo_tile.cpp index 54a53f3..e7ec6f8 100644 --- a/synfig-core/src/synfig/target_cairo_tile.cpp +++ b/synfig-core/src/synfig/target_cairo_tile.cpp @@ -165,7 +165,7 @@ synfig::Target_Cairo_Tile::render_frame_(Context context,ProgressCallback *cb) // Add the tile to the target if(!add_tile(cairo_surface_reference(surface), x,y)) { - if(cb)cb->error(_("add_tile():Unable to put surface on target")); + if(cb)cb->error(_("add_tile(): Unable to put surface on target")); return false; } cairo_destroy(cr); @@ -261,7 +261,7 @@ synfig::Target_Cairo_Tile::render(ProgressCallback *cb) } catch (const String& str) { - if (cb) cb->error(_("Caught string :")+str); + if (cb) cb->error(_("Caught string: ")+str); return false; } catch (std::bad_alloc&) diff --git a/synfig-core/src/synfig/target_scanline.cpp b/synfig-core/src/synfig/target_scanline.cpp index 1d298ff..1daa971 100644 --- a/synfig-core/src/synfig/target_scanline.cpp +++ b/synfig-core/src/synfig/target_scanline.cpp @@ -463,7 +463,7 @@ synfig::Target_Scanline::render(ProgressCallback *cb) } catch(const String& str) { - if (cb) cb->error(_("Caught string :")+str); + if (cb) cb->error(_("Caught string: ")+str); return false; } catch (std::bad_alloc&) diff --git a/synfig-core/src/synfig/target_tile.cpp b/synfig-core/src/synfig/target_tile.cpp index 9060461..7951cab 100644 --- a/synfig-core/src/synfig/target_tile.cpp +++ b/synfig-core/src/synfig/target_tile.cpp @@ -276,7 +276,7 @@ synfig::Target_Tile::async_render_tile( // Add the tile to the target if (!add_tile(s, rect.minx, rect.miny)) { - if(cb)cb->error(_("add_tile():Unable to put surface on target")); + if(cb)cb->error(_("add_tile(): Unable to put surface on target")); return false; } @@ -370,7 +370,7 @@ synfig::Target_Tile::render(ProgressCallback *cb) } catch (const String& str) { - if (cb) cb->error(_("Caught string :")+str); + if (cb) cb->error(_("Caught string: ")+str); return false; } catch (std::bad_alloc&) diff --git a/synfig-core/src/synfig/valuenodes/valuenode_bone.cpp b/synfig-core/src/synfig/valuenodes/valuenode_bone.cpp index b75c858..6c0925c 100644 --- a/synfig-core/src/synfig/valuenodes/valuenode_bone.cpp +++ b/synfig-core/src/synfig/valuenodes/valuenode_bone.cpp @@ -600,7 +600,7 @@ ValueNode_Bone::get_children_vocab_vfunc() const ret.push_back(ParamDesc(ValueBase(),"scalelx") .set_local_name(_("Local Length Scale")) - .set_description(_("The scale of the bone aligned its length")) + .set_description(_("The scale of the bone aligned to its length")) ); ret.push_back(ParamDesc(ValueBase(),"width") diff --git a/synfig-studio/src/gui/dialogs/dialog_setup.cpp b/synfig-studio/src/gui/dialogs/dialog_setup.cpp index c614340..38f0f9d 100644 --- a/synfig-studio/src/gui/dialogs/dialog_setup.cpp +++ b/synfig-studio/src/gui/dialogs/dialog_setup.cpp @@ -422,19 +422,19 @@ Dialog_Setup::create_editing_page(PageInfo pi) pi.grid->attach(toggle_restrict_radius_ducks, 1, row, 1, 1); toggle_restrict_radius_ducks.set_halign(Gtk::ALIGN_START); toggle_restrict_radius_ducks.set_hexpand(false); - toggle_restrict_radius_ducks.set_tooltip_text("Restrict the position of the handle \ + toggle_restrict_radius_ducks.set_tooltip_text(_("Restrict the position of the handle \ (especially for radius) to be in the top right quadrant of the 2D space. Allow to set \ the real value to any number and also easily reach the value of 0.0 just \ -dragging the handle to the left bottom part of your 2D space."); +dragging the handle to the left bottom part of your 2D space.")); attach_label_section(pi.grid, _("Edit in external"), ++row); attach_label(pi.grid,_("Preferred image editor"), ++row); //create a button that will open the filechooserdialog to select image editor - Gtk::Button *choose_button(manage(new class Gtk::Button(Gtk::StockID(_("Choose.."))))); + Gtk::Button *choose_button(manage(new class Gtk::Button(Gtk::StockID(_("Choose..."))))); choose_button->show(); - choose_button->set_tooltip_text("Choose the preferred Image editor for Edit in external tool option"); + choose_button->set_tooltip_text(_("Choose the preferred Image editor for Edit in external tool option")); //create a function to launch the dialog choose_button->signal_clicked().connect(sigc::mem_fun(*this,&Dialog_Setup::on_choose_editor_pressed)); @@ -451,7 +451,7 @@ Dialog_Setup::on_choose_editor_pressed() { //set the image editor path = filepath from dialog String filepath = image_editor_path_entry.get_text(); - if (select_path_dialog("Select Editor", filepath)) { + if (select_path_dialog(_("Select Editor"), filepath)) { image_editor_path_entry.set_text(filepath); App::image_editor_path = filepath; } @@ -473,8 +473,8 @@ Dialog_Setup::select_path_dialog(const std::string &title, std::string &filepath #endif //Add response buttons the the dialog: - dialog->add_button("_Cancel", Gtk::RESPONSE_CANCEL); - dialog->add_button("Select", Gtk::RESPONSE_OK); + dialog->add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); + dialog->add_button(_("Select"), Gtk::RESPONSE_OK); if(dialog->run() == Gtk::RESPONSE_OK) { filepath = dialog->get_filename(); filepath = absolute_path(filepath); //get the absolute path diff --git a/synfig-studio/src/gui/renddesc.cpp b/synfig-studio/src/gui/renddesc.cpp index 44f7711..422bf38 100644 --- a/synfig-studio/src/gui/renddesc.cpp +++ b/synfig-studio/src/gui/renddesc.cpp @@ -263,7 +263,7 @@ Widget_RendDesc::refresh() int w_ratio, h_ratio; rend_desc_.get_pixel_ratio_reduced(w_ratio, h_ratio); std::ostringstream px_ratio_str; - px_ratio_str << _("Image Size Ratio : ") << w_ratio << '/' << h_ratio; + px_ratio_str << _("Image Size Ratio: ") << w_ratio << '/' << h_ratio; pixel_ratio_label->set_label(px_ratio_str.str()); entry_tl->set_value(rend_desc_.get_tl()); diff --git a/synfig-studio/src/gui/states/state_bline.cpp b/synfig-studio/src/gui/states/state_bline.cpp index f34cb3a..880dcc2 100644 --- a/synfig-studio/src/gui/states/state_bline.cpp +++ b/synfig-studio/src/gui/states/state_bline.cpp @@ -532,10 +532,10 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view): ("synfig-layer_geometry_region"), _("Create a region layer")); LAYER_CREATION(layer_outline_togglebutton, - ("synfig-layer_geometry_outline"), _("Create a outline layer")); + ("synfig-layer_geometry_outline"), _("Create an outline layer")); LAYER_CREATION(layer_advanced_outline_togglebutton, - ("synfig-layer_geometry_advanced_outline"), _("Create a advanced outline layer")); + ("synfig-layer_geometry_advanced_outline"), _("Create an advanced outline layer")); LAYER_CREATION(layer_plant_togglebutton, ("synfig-layer_other_plant"), _("Create a plant layer")); diff --git a/synfig-studio/src/gui/states/state_circle.cpp b/synfig-studio/src/gui/states/state_circle.cpp index 3fbcf8e..e99c104 100644 --- a/synfig-studio/src/gui/states/state_circle.cpp +++ b/synfig-studio/src/gui/states/state_circle.cpp @@ -564,10 +564,10 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view): ("synfig-layer_geometry_region"), _("Create a region layer")); LAYER_CREATION(layer_outline_togglebutton, - ("synfig-layer_geometry_outline"), _("Create a outline layer")); + ("synfig-layer_geometry_outline"), _("Create an outline layer")); LAYER_CREATION(layer_advanced_outline_togglebutton, - ("synfig-layer_geometry_advanced_outline"), _("Create a advanced outline layer")); + ("synfig-layer_geometry_advanced_outline"), _("Create an advanced outline layer")); LAYER_CREATION(layer_plant_togglebutton, ("synfig-layer_other_plant"), _("Create a plant layer")); diff --git a/synfig-studio/src/gui/states/state_draw.cpp b/synfig-studio/src/gui/states/state_draw.cpp index 0de211a..9563d84 100644 --- a/synfig-studio/src/gui/states/state_draw.cpp +++ b/synfig-studio/src/gui/states/state_draw.cpp @@ -642,10 +642,10 @@ StateDraw_Context::StateDraw_Context(CanvasView* canvas_view): ("synfig-layer_geometry_region"), _("Create a region layer")); LAYER_CREATION(layer_outline_togglebutton, - ("synfig-layer_geometry_outline"), _("Create a outline layer")); + ("synfig-layer_geometry_outline"), _("Create an outline layer")); LAYER_CREATION(layer_advanced_outline_togglebutton, - ("synfig-layer_geometry_advanced_outline"), _("Create a advanced outline layer")); + ("synfig-layer_geometry_advanced_outline"), _("Create an advanced outline layer")); SPACING(layer_types_indent, INDENTATION); diff --git a/synfig-studio/src/gui/states/state_polygon.cpp b/synfig-studio/src/gui/states/state_polygon.cpp index 704e508..106f3b7 100644 --- a/synfig-studio/src/gui/states/state_polygon.cpp +++ b/synfig-studio/src/gui/states/state_polygon.cpp @@ -496,10 +496,10 @@ StatePolygon_Context::StatePolygon_Context(CanvasView* canvas_view): ("synfig-layer_geometry_region"), _("Create a region layer")); LAYER_CREATION(layer_outline_togglebutton, - ("synfig-layer_geometry_outline"), _("Create a outline layer")); + ("synfig-layer_geometry_outline"), _("Create an outline layer")); LAYER_CREATION(layer_advanced_outline_togglebutton, - ("synfig-layer_geometry_advanced_outline"), _("Create a advanced outline layer")); + ("synfig-layer_geometry_advanced_outline"), _("Create an advanced outline layer")); LAYER_CREATION(layer_plant_togglebutton, ("synfig-layer_other_plant"), _("Create a plant layer")); diff --git a/synfig-studio/src/gui/states/state_rectangle.cpp b/synfig-studio/src/gui/states/state_rectangle.cpp index 4927fcc..83e4522 100644 --- a/synfig-studio/src/gui/states/state_rectangle.cpp +++ b/synfig-studio/src/gui/states/state_rectangle.cpp @@ -510,10 +510,10 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view): ("synfig-layer_geometry_region"), _("Create a region layer")); LAYER_CREATION(layer_outline_togglebutton, - ("synfig-layer_geometry_outline"), _("Create a outline layer")); + ("synfig-layer_geometry_outline"), _("Create an outline layer")); LAYER_CREATION(layer_advanced_outline_togglebutton, - ("synfig-layer_geometry_advanced_outline"), _("Create a advanced outline layer")); + ("synfig-layer_geometry_advanced_outline"), _("Create an advanced outline layer")); LAYER_CREATION(layer_plant_togglebutton, ("synfig-layer_other_plant"), _("Create a plant layer")); diff --git a/synfig-studio/src/gui/states/state_star.cpp b/synfig-studio/src/gui/states/state_star.cpp index f6f5499..bb0e493 100644 --- a/synfig-studio/src/gui/states/state_star.cpp +++ b/synfig-studio/src/gui/states/state_star.cpp @@ -632,10 +632,10 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view): ("synfig-layer_geometry_region"), _("Create a region layer")); LAYER_CREATION(layer_outline_togglebutton, - ("synfig-layer_geometry_outline"), _("Create a outline layer")); + ("synfig-layer_geometry_outline"), _("Create an outline layer")); LAYER_CREATION(layer_advanced_outline_togglebutton, - ("synfig-layer_geometry_advanced_outline"), _("Create a advanced outline layer")); + ("synfig-layer_geometry_advanced_outline"), _("Create an advanced outline layer")); LAYER_CREATION(layer_plant_togglebutton, ("synfig-layer_other_plant"), _("Create a plant layer")); diff --git a/synfig-studio/src/synfigapp/actions/layerencapsulateswitch.cpp b/synfig-studio/src/synfigapp/actions/layerencapsulateswitch.cpp index caa7143..4d2a56f 100644 --- a/synfig-studio/src/synfigapp/actions/layerencapsulateswitch.cpp +++ b/synfig-studio/src/synfigapp/actions/layerencapsulateswitch.cpp @@ -50,7 +50,7 @@ using namespace Action; ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerEncapsulateSwitch); ACTION_SET_NAME(Action::LayerEncapsulateSwitch,"LayerEncapsulateSwitch"); -ACTION_SET_LOCAL_NAME(Action::LayerEncapsulateSwitch,N_("Group Layer into Switch")); +ACTION_SET_LOCAL_NAME(Action::LayerEncapsulateSwitch,N_("Group Layers into Switch")); ACTION_SET_TASK(Action::LayerEncapsulateSwitch,"encapsulate_switch"); ACTION_SET_CATEGORY(Action::LayerEncapsulateSwitch,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerEncapsulateSwitch,0);