From fa0d98d6982bcc2fc503cf7c0f4c05df30a5c370 Mon Sep 17 00:00:00 2001 From: pabs Date: Fri, 16 Nov 2007 04:19:10 +0000 Subject: [PATCH] Mark some more strings for translation git-svn-id: http://svn.voria.com/code@1156 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/about.cpp | 4 +- synfig-studio/trunk/src/gtkmm/app.cpp | 102 ++++++++++----------- synfig-studio/trunk/src/gtkmm/canvasproperties.cpp | 2 +- synfig-studio/trunk/src/gtkmm/canvasview.cpp | 64 ++++++------- synfig-studio/trunk/src/gtkmm/childrentree.cpp | 8 +- synfig-studio/trunk/src/gtkmm/compview.cpp | 36 ++++---- synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dock_canvases.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dock_history.cpp | 6 +- synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dock_layers.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dock_metadata.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dockable.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dockdialog.cpp | 2 +- synfig-studio/trunk/src/gtkmm/preview.cpp | 16 ++-- synfig-studio/trunk/src/gtkmm/renddesc.cpp | 4 +- synfig-studio/trunk/src/gtkmm/toolbox.cpp | 36 ++++---- synfig-studio/trunk/src/gtkmm/zoomdial.h | 8 +- .../src/synfigapp/actions/layerencapsulate.cpp | 2 +- .../trunk/src/synfigapp/actions/valuedescset.cpp | 2 +- .../trunk/src/synfigapp/canvasinterface.cpp | 2 +- 22 files changed, 154 insertions(+), 154 deletions(-) diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp index 21d3d9a..e978dc1 100644 --- a/synfig-studio/trunk/src/gtkmm/about.cpp +++ b/synfig-studio/trunk/src/gtkmm/about.cpp @@ -218,7 +218,7 @@ About::About(): CopyrightLabel->modify_font(fd); // Create the Version information label - Gtk::Label *VersionLabel = manage(new class Gtk::Label("Version")); + Gtk::Label *VersionLabel = manage(new class Gtk::Label(_("Version"))); VersionLabel->set_size_request(image_w,80); VersionLabel->set_flags(Gtk::CAN_FOCUS); VersionLabel->set_alignment(0.5,0.5); @@ -271,7 +271,7 @@ About::About(): CloseButton = manage(new class Gtk::Button()); CloseButton->set_size_request(24,24); CloseButton->set_flags(Gtk::CAN_FOCUS); - _tooltips.set_tip(*CloseButton, "Close", ""); + _tooltips.set_tip(*CloseButton, _("Close"), ""); CloseButton->set_relief(Gtk::RELIEF_NONE); CloseButton->add(*image2); diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index 52b93fb..aa161fd 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -718,18 +718,18 @@ init_ui_manager() Glib::RefPtr actions_action_group = Gtk::ActionGroup::create(); - menus_action_group->add( Gtk::Action::create("menu-file", "_File") ); - menus_action_group->add( Gtk::Action::create("menu-edit", "_Edit") ); - menus_action_group->add( Gtk::Action::create("menu-view", "_View") ); - menus_action_group->add( Gtk::Action::create("menu-canvas", "_Canvas") ); - menus_action_group->add( Gtk::Action::create("menu-layer", "_Layer") ); - menus_action_group->add( Gtk::Action::create("menu-duck-mask", "Show/Hide Ducks") ); - menus_action_group->add( Gtk::Action::create("menu-preview-quality", "Preview Quality") ); - menus_action_group->add( Gtk::Action::create("menu-layer-new", "New Layer") ); - menus_action_group->add( Gtk::Action::create("menu-keyframe", "Keyframe") ); - menus_action_group->add( Gtk::Action::create("menu-group", "Group") ); - menus_action_group->add( Gtk::Action::create("menu-state", "State") ); - menus_action_group->add( Gtk::Action::create("menu-toolbox", "Toolbox") ); + menus_action_group->add( Gtk::Action::create("menu-file", _("_File")) ); + menus_action_group->add( Gtk::Action::create("menu-edit", _("_Edit")) ); + menus_action_group->add( Gtk::Action::create("menu-view", _("_View")) ); + menus_action_group->add( Gtk::Action::create("menu-canvas", _("_Canvas")) ); + menus_action_group->add( Gtk::Action::create("menu-layer", _("_Layer")) ); + menus_action_group->add( Gtk::Action::create("menu-duck-mask", _("Show/Hide Ducks")) ); + menus_action_group->add( Gtk::Action::create("menu-preview-quality", _("Preview Quality")) ); + menus_action_group->add( Gtk::Action::create("menu-layer-new", _("New Layer")) ); + menus_action_group->add( Gtk::Action::create("menu-keyframe", _("Keyframe")) ); + menus_action_group->add( Gtk::Action::create("menu-group", _("Group")) ); + menus_action_group->add( Gtk::Action::create("menu-state", _("State")) ); + menus_action_group->add( Gtk::Action::create("menu-toolbox", _("Toolbox")) ); // Add the synfigapp actions... synfigapp::Action::Book::iterator iter; @@ -1186,7 +1186,7 @@ App::App(int *argc, char ***argv): try { synfigapp_main=etl::smart_ptr(new synfigapp::Main(etl::dirname((*argv)[0]),&synfig_init_cb)); } catch(...) { - get_ui_interface()->error("Failed to initialize synfig!"); + get_ui_interface()->error(_("Failed to initialize synfig!")); throw; } @@ -1195,82 +1195,82 @@ App::App(int *argc, char ***argv): try { - studio_init_cb.task("Init UI Manager..."); + studio_init_cb.task(_("Init UI Manager...")); App::ui_manager_=studio::UIManager::create(); init_ui_manager(); - studio_init_cb.task("Init Dock Manager..."); + studio_init_cb.task(_("Init Dock Manager...")); dock_manager=new studio::DockManager(); - studio_init_cb.task("Init State Manager..."); + studio_init_cb.task(_("Init State Manager...")); state_manager=new StateManager(); - studio_init_cb.task("Init Toolbox..."); + studio_init_cb.task(_("Init Toolbox...")); toolbox=new studio::Toolbox(); - studio_init_cb.task("Init Tool Options..."); + studio_init_cb.task(_("Init Tool Options...")); dialog_tool_options=new studio::Dialog_ToolOptions(); dock_manager->register_dockable(*dialog_tool_options); - studio_init_cb.task("Init History..."); + studio_init_cb.task(_("Init History...")); dock_history=new studio::Dock_History(); dock_manager->register_dockable(*dock_history); - studio_init_cb.task("Init Canvases..."); + studio_init_cb.task(_("Init Canvases...")); dock_canvases=new studio::Dock_Canvases(); dock_manager->register_dockable(*dock_canvases); - studio_init_cb.task("Init Keyframes..."); + studio_init_cb.task(_("Init Keyframes...")); dock_keyframes=new studio::Dock_Keyframes(); dock_manager->register_dockable(*dock_keyframes); - studio_init_cb.task("Init Layers..."); + studio_init_cb.task(_("Init Layers...")); dock_layers=new studio::Dock_Layers(); dock_manager->register_dockable(*dock_layers); - studio_init_cb.task("Init Params..."); + studio_init_cb.task(_("Init Params...")); dock_params=new studio::Dock_Params(); dock_manager->register_dockable(*dock_params); - studio_init_cb.task("Init MetaData..."); + studio_init_cb.task(_("Init MetaData...")); dock_meta_data=new studio::Dock_MetaData(); dock_manager->register_dockable(*dock_meta_data); - studio_init_cb.task("Init Children..."); + studio_init_cb.task(_("Init Children...")); dock_children=new studio::Dock_Children(); dock_manager->register_dockable(*dock_children); - studio_init_cb.task("Init Info..."); + studio_init_cb.task(_("Init Info...")); dock_info = new studio::Dock_Info(); dock_manager->register_dockable(*dock_info); - studio_init_cb.task("Init Navigator..."); + studio_init_cb.task(_("Init Navigator...")); dock_navigator = new studio::Dock_Navigator(); dock_manager->register_dockable(*dock_navigator); - studio_init_cb.task("Init Timetrack..."); + studio_init_cb.task(_("Init Timetrack...")); dock_timetrack = new studio::Dock_Timetrack(); dock_manager->register_dockable(*dock_timetrack); - studio_init_cb.task("Init Curve Editor..."); + studio_init_cb.task(_("Init Curve Editor...")); dock_curves = new studio::Dock_Curves(); dock_manager->register_dockable(*dock_curves); - studio_init_cb.task("Init Layer Groups..."); + studio_init_cb.task(_("Init Layer Groups...")); dock_layer_groups = new studio::Dock_LayerGroups(); dock_manager->register_dockable(*dock_layer_groups); - studio_init_cb.task("Init Color Dialog..."); + studio_init_cb.task(_("Init Color Dialog...")); dialog_color=new studio::Dialog_Color(); - studio_init_cb.task("Init Gradient Dialog..."); + studio_init_cb.task(_("Init Gradient Dialog...")); dialog_gradient=new studio::Dialog_Gradient(); - studio_init_cb.task("Init DeviceTracker..."); + studio_init_cb.task(_("Init DeviceTracker...")); device_tracker=new studio::DeviceTracker(); - studio_init_cb.task("Init Tools..."); + studio_init_cb.task(_("Init Tools...")); state_manager->add_state(&state_normal); state_manager->add_state(&state_smooth_move); state_manager->add_state(&state_scale); @@ -1299,28 +1299,28 @@ App::App(int *argc, char ***argv): // Disabled by default - it doesn't work properly? if(getenv("SYNFIG_ENABLE_WIDTH" )) state_manager->add_state(&state_width); - studio_init_cb.task("Init ModPalette..."); + studio_init_cb.task(_("Init ModPalette...")); module_list_.push_back(new ModPalette()); module_list_.back()->start(); - studio_init_cb.task("Init ModMirror..."); + studio_init_cb.task(_("Init ModMirror...")); module_list_.push_back(new ModMirror()); module_list_.back()->start(); - studio_init_cb.task("Init Setup Dialog..."); + studio_init_cb.task(_("Init Setup Dialog...")); dialog_setup=new studio::Dialog_Setup(); - studio_init_cb.task("Init Input Dialog..."); + studio_init_cb.task(_("Init Input Dialog...")); dialog_input=new Gtk::InputDialog(); dialog_input->get_close_button()->signal_clicked().connect( sigc::mem_fun( *dialog_input, &Gtk::InputDialog::hide ) ); dialog_input->get_save_button()->signal_clicked().connect( sigc::ptr_fun(studio::App::dialog_not_implemented) ); - studio_init_cb.task("Init auto recovery..."); + studio_init_cb.task(_("Init auto recovery...")); auto_recover=new AutoRecover(); studio_init_cb.amount_complete(9250,10000); - studio_init_cb.task("Loading Settings..."); + studio_init_cb.task(_("Loading Settings...")); load_settings(); - studio_init_cb.task("Checking auto-recover..."); + studio_init_cb.task(_("Checking auto-recover...")); studio_init_cb.amount_complete(9900,10000); @@ -1329,11 +1329,11 @@ App::App(int *argc, char ***argv): about_window.hide(); if( get_ui_interface()->yes_no( - "Auto Recovery", - "Synfig Studio seems to have crashed\n" + _("Auto Recovery"), + _("Synfig Studio seems to have crashed\n" "before you could save all your files.\n" "Would you like to re-open those files\n" - "and recover your unsaved changes?" + "and recover your unsaved changes?") )==synfigapp::UIInterface::RESPONSE_YES ) { @@ -1357,13 +1357,13 @@ App::App(int *argc, char ***argv): for(;*argc>=1;(*argc)--) if((*argv)[*argc] && (*argv)[*argc][0]!='-') { - studio_init_cb.task("Loading files..."); + studio_init_cb.task(_("Loading files...")); about_window.hide(); open((*argv)[*argc]); about_window.show(); } - studio_init_cb.task("Done."); + studio_init_cb.task(_("Done.")); studio_init_cb.amount_complete(10000,10000); toolbox->present(); @@ -1603,10 +1603,10 @@ App::quit() if(shutdown_in_progress)return; - get_ui_interface()->task("Quit Request"); + get_ui_interface()->task(_("Quit Request")); if(Busy::count) { - dialog_error_blocking("Cannot quit!","Tasks are currently running.\nPlease cancel the current tasks and try again"); + dialog_error_blocking(_("Cannot quit!"),_("Tasks are currently running.\nPlease cancel the current tasks and try again")); return; } @@ -1674,7 +1674,7 @@ App::quit() Gtk::Main::quit(); auto_recover->normal_shutdown(); - get_ui_interface()->task("Quit Request sent"); + get_ui_interface()->task(_("Quit Request sent")); } void @@ -1953,8 +1953,8 @@ App::dialog_yes_no_cancel(const std::string &title, const std::string &message) void App::dialog_not_implemented() { - Gtk::MessageDialog dialog("Feature not available", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true); - dialog.set_secondary_text("Sorry, this feature has not yet been implemented."); + Gtk::MessageDialog dialog(_("Feature not available"), false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true); + dialog.set_secondary_text(_("Sorry, this feature has not yet been implemented.")); dialog.run(); } diff --git a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp index 132d6ee..63e5dae 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp @@ -177,7 +177,7 @@ void CanvasProperties::on_button_meta_data_add() { synfig::String key; - if(App::dialog_entry("New MetaData Entry", "Please enter the name of the key",key) && !key.empty()) + if(App::dialog_entry(_("New MetaData Entry"), _("Please enter the name of the key"),key) && !key.empty()) { canvas_interface_->set_meta_data(key," "); } diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 626374b..9cf3aad 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -244,7 +244,7 @@ public: view(view) { - view->statusbar->push("Idle"); + view->statusbar->push(_("Idle")); } ~CanvasViewUIInterface() @@ -334,7 +334,7 @@ public: virtual bool error(const std::string &err) { - view->statusbar->push("ERROR"); + view->statusbar->push(_("ERROR")); // If we are in the process of canceling, // then just go ahead and return false -- @@ -383,7 +383,7 @@ public: void not_implemented() { - error("Feature not yet implemented"); + error(_("Feature not yet implemented")); } }; @@ -711,9 +711,9 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handleshow(); - //notebook->append_page(*create_layer_tree(),"Layers"); - //notebook->append_page(*create_children_tree(),"Children"); - //notebook->append_page(*create_keyframe_tree(),"Keyframes"); + //notebook->append_page(*create_layer_tree(),_("Layers")); + //notebook->append_page(*create_children_tree(),_("Children")); + //notebook->append_page(*create_keyframe_tree(),_("Keyframes")); //synfig::info("Canvasview: Before big chunk of allocation and tabling stuff"); //create all allocated stuff for this canvas @@ -949,11 +949,11 @@ CanvasView::create_time_bar() //time_scroll->signal_value_changed().connect(sigc::mem_fun(*work_area, &studio::WorkArea::render_preview_hook)); //time_scroll->set_update_policy(Gtk::UPDATE_DISCONTINUOUS); - NORMAL_BUTTON(animatebutton,"gtk-yes","Animate"); + NORMAL_BUTTON(animatebutton,"gtk-yes",_("Animate")); animatebutton->signal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasView::on_animate_button_pressed)); animatebutton->show(); - NORMAL_BUTTON(keyframebutton,"synfig-keyframe_lock_all","All Keyframes Locked"); + NORMAL_BUTTON(keyframebutton,"synfig-keyframe_lock_all",_("All Keyframes Locked")); keyframebutton->signal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasView::on_keyframe_button_pressed)); keyframebutton->show(); @@ -1008,11 +1008,11 @@ CanvasView::create_status_bar() Gtk::Table *statusbartable= manage(new class Gtk::Table(7, 1, false)); // statusbar = manage(new class Gtk::Statusbar()); // This is already done at construction progressbar =manage(new class Gtk::ProgressBar()); - SMALL_BUTTON(stopbutton,"gtk-stop","Stop"); - SMALL_BUTTON(refreshbutton,"gtk-refresh","Refresh"); - //SMALL_BUTTON(treetogglebutton,"gtk-go-down","Toggle Layer Tree"); -// NEW_SMALL_BUTTON(raisebutton,"gtk-go-up","Raise Layer"); -// NEW_SMALL_BUTTON(lowerbutton,"gtk-go-down","Lower Layer"); + SMALL_BUTTON(stopbutton,"gtk-stop",_("Stop")); + SMALL_BUTTON(refreshbutton,"gtk-refresh",_("Refresh")); + //SMALL_BUTTON(treetogglebutton,"gtk-go-down",_("Toggle Layer Tree")); +// NEW_SMALL_BUTTON(raisebutton,"gtk-go-up",_("Raise Layer")); +// NEW_SMALL_BUTTON(lowerbutton,"gtk-go-down",_("Lower Layer")); //statusbartable->attach(*treetogglebutton, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); // statusbartable->attach(*lowerbutton, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); // statusbartable->attach(*raisebutton, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); @@ -1102,9 +1102,9 @@ CanvasView::create_keyframe_tree() Gtk::Image *icon; Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon")); - NEW_SMALL_BUTTON(button_add,"gtk-add","New Keyframe"); - NEW_SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate Keyframe"); - NEW_SMALL_BUTTON(button_delete,"gtk-delete","Delete Keyframe"); + NEW_SMALL_BUTTON(button_add,"gtk-add",_("New Keyframe")); + NEW_SMALL_BUTTON(button_duplicate,"synfig-duplicate",_("Duplicate Keyframe")); + NEW_SMALL_BUTTON(button_delete,"gtk-delete",_("Delete Keyframe")); Gtk::HBox *hbox(manage(new Gtk::HBox())); layout_table->attach(*hbox, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0); @@ -1186,7 +1186,7 @@ CanvasView::init_menus() */ action_group = Gtk::ActionGroup::create(); - //action_group->add( Gtk::Action::create("MenuFile", "_File") ); + //action_group->add( Gtk::Action::create("MenuFile", _("_File")) ); action_group->add( Gtk::Action::create("save", Gtk::Stock::SAVE), hide_return(sigc::mem_fun(*get_instance().get(), &studio::Instance::save)) ); @@ -1269,7 +1269,7 @@ CanvasView::init_menus() ); for(i=1;i<=10;i++) { - Glib::RefPtr action(Gtk::RadioAction::create(quality_group,strprintf("quality-%02d",i), strprintf("Set Quality to %d",i))); + Glib::RefPtr action(Gtk::RadioAction::create(quality_group,strprintf("quality-%02d",i), strprintf(_("Set Quality to %d"),i))); if(i==10) { action->set_active(); @@ -1493,7 +1493,7 @@ CanvasView::init_menus() )); build_new_layer_menu(newlayermenu); - layermenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New",newlayermenu)); + layermenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New"),newlayermenu)); { @@ -1504,7 +1504,7 @@ CanvasView::init_menus() } - //canvasmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Keyframe Dialog",sigc::mem_fun(keyframe_dialog,&studio::Dialog_Keyframe::present))); + //canvasmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Keyframe Dialog"),sigc::mem_fun(keyframe_dialog,&studio::Dialog_Keyframe::present))); // Duck Mask Menu if(1) @@ -1636,21 +1636,21 @@ CanvasView::init_menus() sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::jump_to_prev_keyframe))); mainmenu.items().push_back(Gtk::Menu_Helpers::TearoffMenuElem()); - mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_File",filemenu)); - mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_Edit",editmenu)); - mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_View",viewmenu)); - mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_Canvas",canvasmenu)); - mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_Layer",layermenu)); + mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_File"),filemenu)); + mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Edit"),editmenu)); + mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_View"),viewmenu)); + mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Canvas"),canvasmenu)); + mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Layer"),layermenu)); mainmenu.accelerate(*this); { - trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Waypoint",NOT_IMPLEMENTED_SLOT)); - trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Delete Waypoint",NOT_IMPLEMENTED_SLOT)); - trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Export",NOT_IMPLEMENTED_SLOT)); + trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New Waypoint"),NOT_IMPLEMENTED_SLOT)); + trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Delete Waypoint"),NOT_IMPLEMENTED_SLOT)); + trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Export"),NOT_IMPLEMENTED_SLOT)); trackmenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem()); - trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Properties",NOT_IMPLEMENTED_SLOT)); + trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Properties"),NOT_IMPLEMENTED_SLOT)); } mainmenu.show(); filemenu.show(); @@ -2202,7 +2202,7 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col // newlayers->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), newlayers)); build_new_layer_menu(*newlayers); - parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Layer",*newlayers)); + parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New Layer"),*newlayers)); if(!multiple_selected && layer->get_name()=="PasteCanvas") { parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"), @@ -2239,10 +2239,10 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col #warning update me! #if 0 parammenu.items().clear(); - parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Connect", + parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Connect"), hide_return(sigc::mem_fun(*canvas_interface().get(),&synfigapp::CanvasInterface::connect_selected_layer_params)) )); - parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Disconnect", + parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Disconnect"), hide_return(sigc::mem_fun(*canvas_interface().get(),&synfigapp::CanvasInterface::disconnect_selected_layer_params)) )); parammenu.popup(0,0); diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.cpp b/synfig-studio/trunk/src/gtkmm/childrentree.cpp index c4177a3..18efcca 100644 --- a/synfig-studio/trunk/src/gtkmm/childrentree.cpp +++ b/synfig-studio/trunk/src/gtkmm/childrentree.cpp @@ -186,10 +186,10 @@ ChildrenTree::ChildrenTree() //Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon")); Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR); - SMALL_BUTTON(button_raise,"gtk-go-up","Raise"); - SMALL_BUTTON(button_lower,"gtk-go-down","Lower"); - SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate"); - SMALL_BUTTON(button_delete,"gtk-delete","Delete"); + SMALL_BUTTON(button_raise,"gtk-go-up",_("Raise")); + SMALL_BUTTON(button_lower,"gtk-go-down",_("Lower")); + SMALL_BUTTON(button_duplicate,"synfig-duplicate",_("Duplicate")); + SMALL_BUTTON(button_delete,"gtk-delete",_("Delete")); hbox->pack_start(*button_raise,Gtk::PACK_SHRINK); hbox->pack_start(*button_lower,Gtk::PACK_SHRINK); diff --git a/synfig-studio/trunk/src/gtkmm/compview.cpp b/synfig-studio/trunk/src/gtkmm/compview.cpp index 161cde5..3c2f73a 100644 --- a/synfig-studio/trunk/src/gtkmm/compview.cpp +++ b/synfig-studio/trunk/src/gtkmm/compview.cpp @@ -85,8 +85,8 @@ CompView::CompView(): table->attach(*notebook, 0, 1, 1,2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - notebook->append_page(*create_canvas_tree(),"Canvases"); - notebook->append_page(*create_action_tree(),"History"); + notebook->append_page(*create_canvas_tree(),_("Canvases")); + notebook->append_page(*create_action_tree(),_("History")); @@ -94,7 +94,7 @@ CompView::CompView(): studio::Instance::ImageColumnModel image_column_model; image_list=manage(new class Gtk::TreeView()); - image_list->append_column("Name",image_column_model.name); + image_list->append_column(_("Name"),image_column_model.name); image_list->signal_row_activated().connect(sigc::mem_fun(*this,&CompView::on_image_activate)); image_list->set_rules_hint(); @@ -106,10 +106,10 @@ CompView::CompView(): image_page->attach(*image_list_scroll, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); Gtk::HBox *image_buttons=manage(new class Gtk::HBox()); image_page->attach(*image_buttons, 0, 1, 1,2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0); - ADD_TOOLBOX_BUTTON(button_image_new,"gtk-new","Create a new image"); - ADD_TOOLBOX_BUTTON(button_image_delete,"gtk-delete","Delete image"); - ADD_TOOLBOX_BUTTON(button_image_rename,"gtk-rename","Rename image"); - ADD_TOOLBOX_BUTTON(button_image_copy,"gtk-copy","Duplicate image"); + ADD_TOOLBOX_BUTTON(button_image_new,"gtk-new",_("Create a new image")); + ADD_TOOLBOX_BUTTON(button_image_delete,"gtk-delete",_("Delete image")); + ADD_TOOLBOX_BUTTON(button_image_rename,"gtk-rename",_("Rename image")); + ADD_TOOLBOX_BUTTON(button_image_copy,"gtk-copy",_("Duplicate image")); button_image_new->signal_clicked().connect(sigc::mem_fun(*this,&CompView::new_image)); button_image_delete->signal_clicked().connect(sigc::mem_fun(*this,&CompView::delete_image)); button_image_rename->signal_clicked().connect(sigc::mem_fun(*this,&CompView::rename_image)); @@ -121,7 +121,7 @@ CompView::CompView(): studio::Instance::ValueNodeColumnModel valuenode_column_model; valuenode_list=manage(new class Gtk::TreeView()); - valuenode_list->append_column("Name",valuenode_column_model.name); + valuenode_list->append_column(_("Name"),valuenode_column_model.name); valuenode_list->signal_row_activated().connect(sigc::mem_fun(*this,&CompView::on_valuenode_activate)); valuenode_list->set_rules_hint(); @@ -133,10 +133,10 @@ CompView::CompView(): valuenode_page->attach(*valuenode_list_scroll, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); Gtk::HBox *valuenode_buttons=manage(new class Gtk::HBox()); valuenode_page->attach(*valuenode_buttons, 0, 1, 1,2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0); - ADD_TOOLBOX_BUTTON(button_valuenode_new,"gtk-new","Create a new value_node"); - ADD_TOOLBOX_BUTTON(button_valuenode_delete,"gtk-delete","Delete value_node"); - ADD_TOOLBOX_BUTTON(button_valuenode_rename,"gtk-rename","Rename value_node"); - ADD_TOOLBOX_BUTTON(button_valuenode_copy,"gtk-copy","Duplicate value_node"); + ADD_TOOLBOX_BUTTON(button_valuenode_new,"gtk-new",_("Create a new value_node")); + ADD_TOOLBOX_BUTTON(button_valuenode_delete,"gtk-delete",_("Delete value_node")); + ADD_TOOLBOX_BUTTON(button_valuenode_rename,"gtk-rename",_("Rename value_node")); + ADD_TOOLBOX_BUTTON(button_valuenode_copy,"gtk-copy",_("Duplicate value_node")); button_valuenode_new->signal_clicked().connect(sigc::mem_fun(*this,&CompView::new_value_node)); button_valuenode_delete->signal_clicked().connect(sigc::mem_fun(*this,&CompView::delete_value_node)); button_valuenode_rename->signal_clicked().connect(sigc::mem_fun(*this,&CompView::rename_value_node)); @@ -147,8 +147,8 @@ CompView::CompView(): valuenode_buttons->pack_start(*button_valuenode_copy); - notebook->append_page(*image_page,"Images"); - notebook->append_page(*valuenode_page,"ValueNodes"); + notebook->append_page(*image_page,_("Images")); + notebook->append_page(*valuenode_page,_("ValueNodes")); image_page->show_all(); valuenode_page->show_all(); @@ -163,7 +163,7 @@ CompView::CompView(): add(*table); - set_title("Canvas Browser"); + set_title(_("Canvas Browser")); set_modal(false); set_resizable(true); property_window_position().set_value(Gtk::WIN_POS_NONE); @@ -186,7 +186,7 @@ CompView::create_canvas_tree() studio::Instance::CanvasTreeModel canvas_tree_model; canvas_tree=manage(new class Gtk::TreeView()); { - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("ID") ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ID")) ); // Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() ); //column->pack_start(*icon_cellrenderer,false); @@ -235,7 +235,7 @@ CompView::create_action_tree() action_tree->append_column(*column); } /*{ - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("Canvas") ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Canvas")) ); Gtk::CellRendererText *text_cr=Gtk::manage(new Gtk::CellRendererText()); text_cr->property_foreground()=Glib::ustring("#7f7f7f"); @@ -263,7 +263,7 @@ CompView::create_action_tree() //column->clicked(); } { - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("Action") ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Action")) ); Gtk::CellRendererText *text_cr=Gtk::manage(new Gtk::CellRendererText()); text_cr->property_foreground()=Glib::ustring("#7f7f7f"); diff --git a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp index 8cff502..648a7b8 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp @@ -72,7 +72,7 @@ Dialog_Gradient::Dialog_Gradient(): set_role("gradient_editor"); // Setup the buttons - Gtk::Button *grab_button(manage(new class Gtk::Button(Gtk::StockID("Grab")))); + Gtk::Button *grab_button(manage(new class Gtk::Button(Gtk::StockID(_("Grab"))))); grab_button->show(); add_action_widget(*grab_button,2); grab_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Gradient::on_grab_pressed)); diff --git a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp index 79962e6..0a5351e 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp @@ -86,7 +86,7 @@ Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent,handlepack_start(*table); - entry_description.set_text("Not yet implemented"); + entry_description.set_text(_("Not yet implemented")); //table->attach(*manage(new Gtk::Label(_("Description"))), 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); //table->attach(entry_description, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); diff --git a/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp b/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp index cecf5f6..1e39a0a 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp @@ -105,7 +105,7 @@ Dock_Canvases::create_canvas_tree() studio::Instance::CanvasTreeModel canvas_tree_model; canvas_tree=manage(new class Gtk::TreeView()); { - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("ID") ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ID")) ); // Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() ); //column->pack_start(*icon_cellrenderer,false); diff --git a/synfig-studio/trunk/src/gtkmm/dock_history.cpp b/synfig-studio/trunk/src/gtkmm/dock_history.cpp index 3aeaa11..73658d9 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_history.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_history.cpp @@ -111,7 +111,7 @@ Dock_History::Dock_History(): sigc::ptr_fun(studio::App::redo) ); - action_group->add( Gtk::Action::create("toolbar-history", "History") ); + action_group->add( Gtk::Action::create("toolbar-history", _("History")) ); App::ui_manager()->insert_action_group(action_group); Glib::ustring ui_info = @@ -185,7 +185,7 @@ Dock_History::create_action_tree() action_tree->append_column(*column); } /*{ - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("Canvas") ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Canvas")) ); Gtk::CellRendererText *text_cr=Gtk::manage(new Gtk::CellRendererText()); text_cr->property_foreground()=Glib::ustring("#7f7f7f"); @@ -213,7 +213,7 @@ Dock_History::create_action_tree() //column->clicked(); } { - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("Action") ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Action")) ); Gtk::CellRendererText *text_cr=Gtk::manage(new Gtk::CellRendererText()); text_cr->property_foreground()=Glib::ustring("#7f7f7f"); diff --git a/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp b/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp index d831317..1598a83 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp @@ -71,7 +71,7 @@ Dock_LayerGroups::Dock_LayerGroups(): { group_action_manager->set_ui_manager(App::ui_manager()); - action_group_group_ops->add( Gtk::Action::create("toolbar-groups", "Group Ops") ); + action_group_group_ops->add( Gtk::Action::create("toolbar-groups", _("Group Ops")) ); action_group_add=Gtk::Action::create("action-group_add", Gtk::Stock::ADD,_("Add a New Group"),_("Add a New Group")); action_group_group_ops->add(action_group_add); diff --git a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp index 2df3b43..766f4a2 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp @@ -131,7 +131,7 @@ Dock_Layers::Dock_Layers(): } - action_group_layer_ops->add( Gtk::Action::create("toolbar-layer", "Layer Ops") ); + action_group_layer_ops->add( Gtk::Action::create("toolbar-layer", _("Layer Ops")) ); App::ui_manager()->insert_action_group(action_group_layer_ops); diff --git a/synfig-studio/trunk/src/gtkmm/dock_metadata.cpp b/synfig-studio/trunk/src/gtkmm/dock_metadata.cpp index 66798d6..3dce59a 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_metadata.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_metadata.cpp @@ -131,7 +131,7 @@ Dock_MetaData::on_add_pressed() if(get_canvas_interface()) { synfig::String key; - if(App::dialog_entry("New MetaData Entry", "Please enter the name of the key",key) && !key.empty()) + if(App::dialog_entry(_("New MetaData Entry"), _("Please enter the name of the key"),key) && !key.empty()) { get_canvas_interface()->set_meta_data(key," "); } diff --git a/synfig-studio/trunk/src/gtkmm/dockable.cpp b/synfig-studio/trunk/src/gtkmm/dockable.cpp index cedaa39..692316d 100644 --- a/synfig-studio/trunk/src/gtkmm/dockable.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockable.cpp @@ -118,7 +118,7 @@ Dockable::Dockable(const synfig::String& name,const synfig::String& local_name,G // event_box->set_events(Gdk::ALL_EVENTS_MASK); //!< \todo change this to only allow what is necessary for DnD - Gtk::Button* bttn_close(manage(new Gtk::Button("X"))); + Gtk::Button* bttn_close(manage(new Gtk::Button(_("X")))); //table->attach(*bttn_close, 1, 2, 0,1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); header_box_.pack_end(*bttn_close,false,false); bttn_close->show(); diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp index 2257a2c..672f06b 100644 --- a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp @@ -112,7 +112,7 @@ DockDialog::DockDialog(): // Set up the window //set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY); - set_title("Dock Dialog"); + set_title(_("Dock Dialog")); // Register with the dock manager App::dock_manager->dock_dialog_list_.push_back(this); diff --git a/synfig-studio/trunk/src/gtkmm/preview.cpp b/synfig-studio/trunk/src/gtkmm/preview.cpp index ee6ecf8..4f5bef1 100644 --- a/synfig-studio/trunk/src/gtkmm/preview.cpp +++ b/synfig-studio/trunk/src/gtkmm/preview.cpp @@ -349,19 +349,19 @@ playing(false) hbox = manage(new Gtk::HBox); button = &b_loop; - IMAGIFY_BUTTON(button,Gtk::Stock::REFRESH,"Toggle Looping"); + IMAGIFY_BUTTON(button,Gtk::Stock::REFRESH,_("Toggle Looping")); hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0); //attach(b_loop,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK); button = manage(new Gtk::Button(/*_("Play")*/)); button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::play)); - IMAGIFY_BUTTON(button,Gtk::Stock::GO_FORWARD,"Play"); + IMAGIFY_BUTTON(button,Gtk::Stock::GO_FORWARD,_("Play")); hbox->pack_start(*button,Gtk::PACK_SHRINK,0); //attach(*button,1,2,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK); button = manage(new Gtk::Button(/*_("Stop")*/)); button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stop)); - IMAGIFY_BUTTON(button,Gtk::Stock::NO,"Stop"); + IMAGIFY_BUTTON(button,Gtk::Stock::NO,_("Stop")); hbox->pack_start(*button,Gtk::PACK_SHRINK,0); //attach(*button,2,3,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK); @@ -373,19 +373,19 @@ playing(false) button = manage(new Gtk::Button(/*_("Halt Render")*/)); button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stoprender)); - IMAGIFY_BUTTON(button,Gtk::Stock::STOP,"Halt Render"); + IMAGIFY_BUTTON(button,Gtk::Stock::STOP,_("Halt Render")); hbox->pack_start(*button,Gtk::PACK_SHRINK,0); //attach(*button,2,3,3,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK); button = manage(new Gtk::Button(/*_("Re-Preview")*/)); button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::repreview)); - IMAGIFY_BUTTON(button,Gtk::Stock::CONVERT,"Re-Preview"); + IMAGIFY_BUTTON(button,Gtk::Stock::CONVERT,_("Re-Preview")); hbox->pack_start(*button,Gtk::PACK_SHRINK,0); //attach(*button,0,2,4,5,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK); button = manage(new Gtk::Button(/*_("Erase All")*/)); button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::eraseall)); - IMAGIFY_BUTTON(button,Gtk::Stock::DELETE,"Erase All"); + IMAGIFY_BUTTON(button,Gtk::Stock::DELETE,_("Erase All")); hbox->pack_start(*button,Gtk::PACK_SHRINK,0); //attach(*button,2,3,4,5,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK); @@ -395,10 +395,10 @@ playing(false) //3rd row hbox = manage(new Gtk::HBox); { - Gtk::Label *label = manage(new Gtk::Label("Last Rendered: ")); + Gtk::Label *label = manage(new Gtk::Label(_("Last Rendered: "))); //label->show(); hbox->pack_start(*label,Gtk::PACK_SHRINK,10); - //attach(*manage(new Gtk::Label("Last Rendered: ")),0,1,3,4,Gtk::SHRINK,Gtk::SHRINK); + //attach(*manage(new Gtk::Label(_("Last Rendered: "))),0,1,3,4,Gtk::SHRINK,Gtk::SHRINK); } //l_lasttime.show(); hbox->pack_start(l_lasttime,Gtk::PACK_SHRINK,0); diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.cpp b/synfig-studio/trunk/src/gtkmm/renddesc.cpp index 4eae765..a57efc9 100644 --- a/synfig-studio/trunk/src/gtkmm/renddesc.cpp +++ b/synfig-studio/trunk/src/gtkmm/renddesc.cpp @@ -530,9 +530,9 @@ Widget_RendDesc::create_time_tab() Gtk::VBox *panelBox = manage(new Gtk::VBox(false, 12)); // for future widgets paddedPanel->add(*panelBox); - Gtk::Frame *time_frame = manage(new Gtk::Frame("Time Settings")); + Gtk::Frame *time_frame = manage(new Gtk::Frame(_("Time Settings"))); time_frame->set_shadow_type(Gtk::SHADOW_NONE); - ((Gtk::Label *) time_frame->get_label_widget())->set_markup("Time Settings"); + ((Gtk::Label *) time_frame->get_label_widget())->set_markup(_("Time Settings")); panelBox->pack_start(*time_frame, false, false, 0); Gtk::Alignment *timeFramePadding = manage(new Gtk::Alignment(0, 0, 1, 1)); diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp index 7bcdd14..9eea233 100644 --- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp @@ -130,7 +130,7 @@ save_selected_instance() { if(!studio::App::get_selected_instance()) { - App::dialog_error_blocking("Cannot save","Nothing to save"); + App::dialog_error_blocking(_("Cannot save"),_("Nothing to save")); return; } @@ -142,7 +142,7 @@ save_as_selected_instance() { if(!studio::App::get_selected_instance()) { - App::dialog_error_blocking("Cannot save as","Nothing to save"); + App::dialog_error_blocking(_("Cannot save as"),_("Nothing to save")); return; } @@ -164,7 +164,7 @@ close_selected_instance() if(!instance) { - App::dialog_error_blocking("Cannot close","Nothing to close"); + App::dialog_error_blocking(_("Cannot close"),_("Nothing to close")); return; } @@ -217,10 +217,10 @@ Toolbox::Toolbox(): dock_dialogs=manage(new class Gtk::Menu()); - dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem("Canvases, History",sigc::ptr_fun(_create_stock_dialog1))); - dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem("Layers, Children, Params",sigc::ptr_fun(_create_stock_dialog2))); + dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Canvases, History"),sigc::ptr_fun(_create_stock_dialog1))); + dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Layers, Children, Params"),sigc::ptr_fun(_create_stock_dialog2))); dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); - dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem("Reset Windows to Original Layout",sigc::ptr_fun(App::reset_initial_window_configuration))); + dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Reset Windows to Original Layout"),sigc::ptr_fun(App::reset_initial_window_configuration))); dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem()); @@ -265,22 +265,22 @@ Toolbox::Toolbox(): sigc::ptr_fun(studio::App::dialog_about))); Gtk::MenuBar *menubar1 = manage(new class Gtk::MenuBar()); - menubar1->items().push_back(Gtk::Menu_Helpers::MenuElem("_File",*filemenu)); - menubar1->items().push_back(Gtk::Menu_Helpers::MenuElem("_Help",*helpmenu)); + menubar1->items().push_back(Gtk::Menu_Helpers::MenuElem(_("_File"),*filemenu)); + menubar1->items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Help"),*helpmenu)); menubar1->show(); Gtk::Image *icon; - ADD_TOOLBOX_BUTTON(button_new,"gtk-new","New..."); - ADD_TOOLBOX_BUTTON(button_open,"gtk-open","Open..."); - ADD_TOOLBOX_BUTTON(button_save,"gtk-save","Save"); - ADD_TOOLBOX_BUTTON(button_saveas,"gtk-save-as","Save as..."); - ADD_TOOLBOX_BUTTON(button_save_all,"synfig-saveall","Save All"); - TOOLBOX_BUTTON(button_undo,"gtk-undo","Undo"); - TOOLBOX_BUTTON(button_redo,"gtk-redo","Redo"); - ADD_TOOLBOX_BUTTON(button_about,"synfig-about","About Synfig Studio"); + ADD_TOOLBOX_BUTTON(button_new,"gtk-new",_("New...")); + ADD_TOOLBOX_BUTTON(button_open,"gtk-open",_("Open...")); + ADD_TOOLBOX_BUTTON(button_save,"gtk-save",_("Save")); + ADD_TOOLBOX_BUTTON(button_saveas,"gtk-save-as",_("Save as...")); + ADD_TOOLBOX_BUTTON(button_save_all,"synfig-saveall",_("Save All")); + TOOLBOX_BUTTON(button_undo,"gtk-undo",_("Undo")); + TOOLBOX_BUTTON(button_redo,"gtk-redo",_("Redo")); + ADD_TOOLBOX_BUTTON(button_about,"synfig-about",_("About Synfig Studio")); button_about->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_about)); button_new->signal_clicked().connect(sigc::ptr_fun(studio::App::new_instance)); @@ -337,7 +337,7 @@ Toolbox::Toolbox(): // Set the parameters for this window add(*table1); - set_title("Synfig Studio"); + set_title(_("Synfig Studio")); set_modal(false); property_window_position().set_value(Gtk::WIN_POS_NONE); signal_delete_event().connect(sigc::ptr_fun(App::shutdown_request)); @@ -379,7 +379,7 @@ Toolbox::Toolbox(): Toolbox::~Toolbox() { hide(); - //studio::App::cb.task("Toolbox: I was nailed!"); + //studio::App::cb.task(_("Toolbox: I was nailed!")); //studio::App::quit(); if(studio::App::toolbox==this) diff --git a/synfig-studio/trunk/src/gtkmm/zoomdial.h b/synfig-studio/trunk/src/gtkmm/zoomdial.h index cd7a983..f073a84 100644 --- a/synfig-studio/trunk/src/gtkmm/zoomdial.h +++ b/synfig-studio/trunk/src/gtkmm/zoomdial.h @@ -66,10 +66,10 @@ public: { Gtk::Image *icon; - SMALL_BUTTON(zoom_in,"gtk-add","Zoom In"); - SMALL_BUTTON(zoom_out,"gtk-remove","Zoom Out"); - SMALL_BUTTON(zoom_fit,"gtk-zoom-fit","Zoom Fit"); - SMALL_BUTTON(zoom_norm,"gtk-zoom-100","Zoom to 100%"); + SMALL_BUTTON(zoom_in,"gtk-add",_("Zoom In")); + SMALL_BUTTON(zoom_out,"gtk-remove",_("Zoom Out")); + SMALL_BUTTON(zoom_fit,"gtk-zoom-fit",_("Zoom Fit")); + SMALL_BUTTON(zoom_norm,"gtk-zoom-100",_("Zoom to 100%")); attach(*zoom_out, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); attach(*zoom_norm, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp index e548ab4..85ee470 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp @@ -132,7 +132,7 @@ Action::LayerEncapsulate::prepare() return; if(layers.empty()) - throw Error("No layers to encapsulate"); + throw Error(_("No layers to encapsulate")); // First create the new canvas and layer if(!child_canvas) diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp index 3e2e3dd..4ed9286 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp @@ -348,7 +348,7 @@ Action::ValueDescSet::prepare() n_components=4; break; default: - throw Error("Bad type for radial composite (%s)",ValueBase::type_name(value.get_type()).c_str()); + throw Error(_("Bad type for radial composite (%s)"),ValueBase::type_name(value.get_type()).c_str()); break; } for(int i=0;ierror("Filename must have an extension!"); + get_ui_interface()->error(_("Filename must have an extension!")); return false; } -- 2.7.4