diff options
Diffstat (limited to 'tools')
62 files changed, 423 insertions, 421 deletions
diff --git a/tools/editor/addon_editor_plugin.cpp b/tools/editor/addon_editor_plugin.cpp index 3b74330c1e..ee0b4b595f 100644 --- a/tools/editor/addon_editor_plugin.cpp +++ b/tools/editor/addon_editor_plugin.cpp @@ -1085,7 +1085,7 @@ EditorAddonLibrary::EditorAddonLibrary() { - search_hb->add_child( memnew( Label(TTR("Search: ")))); + search_hb->add_child( memnew( Label(TTR("Search:")+" "))); filter =memnew( LineEdit ); search_hb->add_child(filter); filter->set_h_size_flags(SIZE_EXPAND_FILL); @@ -1112,7 +1112,7 @@ EditorAddonLibrary::EditorAddonLibrary() { HBoxContainer *search_hb2 = memnew( HBoxContainer ); library_main->add_child(search_hb2); - search_hb2->add_child( memnew( Label("Sort: "))); + search_hb2->add_child( memnew( Label(TTR("Sort:")+" "))); sort = memnew( OptionButton ); for(int i=0;i<SORT_MAX;i++) { sort->add_item(sort_text[i]); @@ -1123,26 +1123,26 @@ EditorAddonLibrary::EditorAddonLibrary() { sort->set_h_size_flags(SIZE_EXPAND_FILL); reverse = memnew( CheckBox); - reverse->set_text("Reverse"); + reverse->set_text(TTR("Reverse")); search_hb2->add_child(reverse); search_hb2->add_child(memnew(VSeparator)); //search_hb2->add_spacer(); - search_hb2->add_child( memnew( Label("Category: "))); + search_hb2->add_child( memnew( Label(TTR("Category:")+" "))); categories = memnew( OptionButton ); - categories->add_item("All"); + categories->add_item(TTR("All")); search_hb2->add_child(categories); categories->set_h_size_flags(SIZE_EXPAND_FILL); //search_hb2->add_spacer(); search_hb2->add_child(memnew(VSeparator)); - search_hb2->add_child( memnew( Label("Site: "))); + search_hb2->add_child( memnew( Label(TTR("Site:")+" "))); repository = memnew( OptionButton ); - repository->add_item(TTR("Godot")); + repository->add_item("Godot"); search_hb2->add_child(repository); repository->set_h_size_flags(SIZE_EXPAND_FILL); @@ -1232,7 +1232,7 @@ EditorAddonLibrary::EditorAddonLibrary() { asset_open = memnew( EditorFileDialog ); asset_open->set_access(EditorFileDialog::ACCESS_FILESYSTEM); - asset_open->add_filter("*.zip ; Assets ZIP File"); + asset_open->add_filter("*.zip ; "+TTR("Assets ZIP File")); asset_open->set_mode(EditorFileDialog::MODE_OPEN_FILE); add_child(asset_open); asset_open->connect("file_selected",this,"_asset_file_selected"); diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index f4fda7ba6e..1c17077f92 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -889,7 +889,7 @@ void AnimationKeyEditor::_menu_track(int p_type) { case TRACK_MENU_SET_ALL_TRANS_OUTIN: t=-2.0; break; } - undo_redo->create_action(TTR("Set Transitions to: ")+rtos(t)); + undo_redo->create_action(TTR("Set Transitions to:")+" "+rtos(t)); for(Map<SelectedKey,KeyInfo>::Element *E=selection.back();E;E=E->prev()) { @@ -2893,7 +2893,7 @@ void AnimationKeyEditor::_notification(int p_what) { optimize_dialog->connect("confirmed",this,"_animation_optimize"); menu_track->get_popup()->add_child(tpp); - //menu_track->get_popup()->add_submenu_item(TTR("Set Transitions.."),"Transitions"); + //menu_track->get_popup()->add_submenu_item("Set Transitions..","Transitions"); //menu_track->get_popup()->add_separator(); menu_track->get_popup()->add_item(TTR("Optimize Animation"),TRACK_MENU_OPTIMIZE); menu_track->get_popup()->add_item(TTR("Clean-Up Animation"),TRACK_MENU_CLEAN_UP); @@ -3113,9 +3113,9 @@ void AnimationKeyEditor::_query_insert(const InsertData& p_id) { if (bool(EDITOR_DEF("animation/confirm_insert_track",true))) { //potential new key, does not exist if (insert_data.size()==1) - insert_confirm->set_text(TTR("Create NEW track for ")+p_id.query+TTR(" and insert key?")); + insert_confirm->set_text(vformat(TTR("Create NEW track for %s and insert key?"),p_id.query)); else - insert_confirm->set_text(TTR("Create ")+itos(insert_data.size())+TTR(" NEW tracks and insert keys?")); + insert_confirm->set_text(vformat(TTR("Create %i NEW tracks and insert keys?"),insert_data.size())); insert_confirm->get_ok()->set_text(TTR("Create")); insert_confirm->popup_centered_minsize(); @@ -3510,7 +3510,7 @@ void AnimationKeyEditor::_insert_delay() { return; } - undo_redo->create_action(TTR("Anim Insert")); + undo_redo->create_action(TTR("Anim Insert")); int last_track = animation->get_track_count(); bool advance=false; @@ -3818,7 +3818,7 @@ AnimationKeyEditor::AnimationKeyEditor() { hb->add_child( memnew( VSeparator ) ); Label *l = memnew( Label ); - l->set_text(TTR("Len(s):")); + l->set_text(TTR("Length (s):")); hb->add_child(l); length = memnew( SpinBox ); @@ -3833,7 +3833,7 @@ AnimationKeyEditor::AnimationKeyEditor() { length->connect("value_changed",this,"_animation_len_changed"); l = memnew( Label ); - l->set_text(TTR("Step(s):")); + l->set_text(TTR("Step (s):")); hb->add_child(l); step = memnew( SpinBox ); @@ -3929,7 +3929,7 @@ AnimationKeyEditor::AnimationKeyEditor() { /*keying = memnew( Button ); keying->set_toggle_mode(true); - //keying->set_text(TTR("Keys")); + //keying->set_text("Keys"); keying->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_END,60); keying->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,10); keying->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_BEGIN,55); @@ -3939,7 +3939,7 @@ AnimationKeyEditor::AnimationKeyEditor() { */ /* l = memnew( Label ); - l->set_text(TTR("Base: ")); + l->set_text("Base: "); l->set_pos(Point2(0,3)); // dr_panel->add_child(l);*/ @@ -4089,10 +4089,10 @@ AnimationKeyEditor::AnimationKeyEditor() { cleanup_vb->add_child(cleanup_tracks); cleanup_all = memnew( CheckButton ); - cleanup_all->set_text(TTR("Clean-Up all animations")); + cleanup_all->set_text(TTR("Clean-up all animations")); cleanup_vb->add_child(cleanup_all); - cleanup_dialog->set_title(TTR("Clean up Animation(s) (NO UNDO!)")); + cleanup_dialog->set_title(TTR("Clean-Up Animation(s) (NO UNDO!)")); cleanup_dialog->get_ok()->set_text(TTR("Clean-Up")); cleanup_dialog->connect("confirmed",this,"_menu_track",varray(TRACK_MENU_CLEAN_UP_CONFIRM)); diff --git a/tools/editor/call_dialog.cpp b/tools/editor/call_dialog.cpp index 2ab9a79d3b..a376169a78 100644 --- a/tools/editor/call_dialog.cpp +++ b/tools/editor/call_dialog.cpp @@ -239,7 +239,7 @@ void CallDialog::set_object(Object *p_object,StringName p_selected) { return_value->clear(); _update_method_list(); - method_label->set_text(TTR("Method List For ' ")+p_object->get_type()+" ':"); + method_label->set_text(vformat(TTR("Method List For '%s':"),p_object->get_type())); } CallDialog::CallDialog() { diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp index 970a0477c1..24c763a58f 100644 --- a/tools/editor/code_editor.cpp +++ b/tools/editor/code_editor.cpp @@ -216,7 +216,7 @@ void FindReplaceDialog::_replace() { text_edit->set_v_scroll(vsval); // text_edit->set_h_scroll(hsval); - error_label->set_text(TTR("Replaced ")+itos(rc)+TTR(" ocurrence(s).")); + error_label->set_text(vformat(TTR("Replaced %i ocurrence(s)."),rc)); //hide(); @@ -274,7 +274,7 @@ bool FindReplaceDialog::_search() { return true; } else { - set_error(TTR("Not Found!")); + set_error(TTR("Not found!")); return false; } @@ -498,7 +498,7 @@ FindReplaceDialog::FindReplaceDialog() { void CodeTextEditor::_line_col_changed() { - String text = String()+TTR("Line: ")+itos(text_editor->cursor_get_line()+1)+TTR(", Col: ")+itos(text_editor->cursor_get_column()); + String text = String()+TTR("Line:")+" "+itos(text_editor->cursor_get_line()+1)+", "+TTR("Col:")+" "+itos(text_editor->cursor_get_column()); line_col->set_text(text); } diff --git a/tools/editor/connections_dialog.cpp b/tools/editor/connections_dialog.cpp index 3795860472..d74c6bb7c6 100644 --- a/tools/editor/connections_dialog.cpp +++ b/tools/editor/connections_dialog.cpp @@ -429,7 +429,7 @@ ConnectDialog::ConnectDialog() { make_callback = memnew( CheckButton ); make_callback->set_toggle_mode(true); make_callback->set_pressed( EDITOR_DEF("text_editor/create_signal_callbacks",true)); - make_callback->set_text(TTR("Make Function ")); + make_callback->set_text(TTR("Make Function")); dstm_hb->add_child(make_callback); deferred = memnew( CheckButton ); @@ -447,7 +447,7 @@ ConnectDialog::ConnectDialog() { realtime->set_anchor( MARGIN_RIGHT, ANCHOR_END ); realtime->set_begin( Point2( 120, button_margin-10 ) ); realtime->set_end( Point2( 80, margin ) ); - realtime->set_text(TTR("Realtime")); + realtime->set_text("Realtime"); add_child(realtime); */ @@ -511,7 +511,7 @@ void ConnectionsDialog::_connect() { StringArray args = it->get_metadata(0).operator Dictionary()["args"]; int flags = CONNECT_PERSIST | (defer?CONNECT_DEFERRED:0) | (oshot?CONNECT_ONESHOT:0); - undo_redo->create_action(TTR("Connect '")+signal+"' to '"+String(dst_method)+"'"); + undo_redo->create_action(vformat(TTR("Connect '%s' to '%s'"),signal,String(dst_method))); undo_redo->add_do_method(node,"connect",signal,target,dst_method,binds,flags); undo_redo->add_undo_method(node,"disconnect",signal,target,dst_method); undo_redo->add_do_method(this,"update_tree"); diff --git a/tools/editor/create_dialog.cpp b/tools/editor/create_dialog.cpp index c156b1b2de..b295909648 100644 --- a/tools/editor/create_dialog.cpp +++ b/tools/editor/create_dialog.cpp @@ -251,7 +251,7 @@ void CreateDialog::_notification(int p_what) { void CreateDialog::set_base_type(const String& p_base) { base_type=p_base; - set_title(TTR("Create New ")+p_base); + set_title(TTR("Create New")+" "+p_base); _update_search(); } @@ -541,7 +541,7 @@ void CreateDialog::_bind_methods() { void CreateDialog::set_base_type(const String& p_base) { - set_title(TTR("Create ")+p_base+" Type"); + set_title(vformat(TTR("Create %s Type"),p_base)); if (base==p_base) return; diff --git a/tools/editor/dependency_editor.cpp b/tools/editor/dependency_editor.cpp index 784315522c..eeb08e8e45 100644 --- a/tools/editor/dependency_editor.cpp +++ b/tools/editor/dependency_editor.cpp @@ -27,7 +27,7 @@ void DependencyEditor::_load_pressed(Object* p_item,int p_cell,int p_button){ String fname = ti->get_text(0); replacing = ti->get_text(1); - search->set_title(TTR("Search Replacement For: ")+replacing.get_file()); + search->set_title(TTR("Search Replacement For:")+" "+replacing.get_file()); search->clear_filters(); List<String> ext; @@ -180,7 +180,7 @@ void DependencyEditor::_update_list() { String name = path.get_file(); Ref<Texture> icon; - if (has_icon(type,TTR("EditorIcons"))) { + if (has_icon(type,"EditorIcons")) { icon=get_icon(type,"EditorIcons"); } else { icon=get_icon("Object","EditorIcons"); @@ -209,15 +209,15 @@ void DependencyEditor::edit(const String& p_path) { editing=p_path; - set_title(TTR("Dependencies For: ")+p_path.get_file()); + set_title(TTR("Dependencies For:")+" "+p_path.get_file()); _update_list(); popup_centered_ratio(); if (EditorNode::get_singleton()->is_scene_open(p_path)) { - EditorNode::get_singleton()->show_warning(TTR("Scene '")+p_path.get_file()+"' is currently being edited.\nChanges will not take effect unless reloaded."); + EditorNode::get_singleton()->show_warning(vformat(TTR("Scene '%s' is currently being edited.\nChanges will not take effect unless reloaded."),p_path.get_file())); } else if (ResourceCache::has(p_path)) { - EditorNode::get_singleton()->show_warning(TTR("Resource '")+p_path.get_file()+"' is in use.\nChanges will take effect when reloaded."); + EditorNode::get_singleton()->show_warning(vformat(TTR("Resource '%s' is in use.\nChanges will take effect when reloaded."),p_path.get_file())); } } @@ -301,7 +301,7 @@ void DependencyEditorOwners::_fill_owners(EditorFileSystemDirectory *efsd) { Ref<Texture> icon; String type=efsd->get_file_type(i); - if (!has_icon(type,TTR("EditorIcons"))) { + if (!has_icon(type,"EditorIcons")) { icon=get_icon("Object","EditorIcons"); } else { icon=get_icon(type,"EditorIcons"); @@ -319,7 +319,7 @@ void DependencyEditorOwners::show(const String& p_path) { _fill_owners(EditorFileSystem::get_singleton()->get_filesystem()); popup_centered_ratio(); - set_title(TTR("Owners Of: ")+p_path.get_file()); + set_title(TTR("Owners Of:")+" "+p_path.get_file()); } @@ -362,7 +362,7 @@ void DependencyRemoveDialog::_fill_owners(EditorFileSystemDirectory *efsd) { Ref<Texture> icon; String type=efsd->get_file_type(i); - if (!has_icon(type,TTR("EditorIcons"))) { + if (!has_icon(type,"EditorIcons")) { icon=get_icon("Object","EditorIcons"); } else { icon=get_icon(type,"EditorIcons"); @@ -448,7 +448,7 @@ void DependencyErrorDialog::show(const String& p_for_file,const Vector<String> & for_file=p_for_file; - set_title(TTR("Error loading: ")+p_for_file.get_file()); + set_title(TTR("Error loading:")+" "+p_for_file.get_file()); files->clear(); TreeItem *root = files->create_item(NULL); @@ -461,7 +461,7 @@ void DependencyErrorDialog::show(const String& p_for_file,const Vector<String> & type=report[i].get_slice("::",1); Ref<Texture> icon; - if (!has_icon(type,TTR("EditorIcons"))) { + if (!has_icon(type,"EditorIcons")) { icon=get_icon("Object","EditorIcons"); } else { icon=get_icon(type,"EditorIcons"); @@ -523,7 +523,7 @@ void OrphanResourcesDialog::ok_pressed() { if (paths.empty()) return; - delete_confirm->set_text(TTR("Permanently Delete ")+itos(paths.size())+" Item(s) ? (No Undo!!)"); + delete_confirm->set_text(vformat(TTR("Permanently delete %i item(s)? (No undo!)"),paths.size())); delete_confirm->popup_centered_minsize(); } @@ -580,7 +580,7 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd,HashMap String type=efsd->get_file_type(i); Ref<Texture> icon; - if (has_icon(type,TTR("EditorIcons"))) { + if (has_icon(type,"EditorIcons")) { icon=get_icon(type,"EditorIcons"); } else { icon=get_icon("Object","EditorIcons"); diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp index 8c16955d9f..b9d4949018 100644 --- a/tools/editor/editor_file_dialog.cpp +++ b/tools/editor/editor_file_dialog.cpp @@ -677,7 +677,7 @@ void EditorFileDialog::update_filters() { if (max_filters<filters.size()) all_filters+=", ..."; - filter->add_item(TTR("All Recognized ( ")+all_filters+" )"); + filter->add_item(TTR("All Recognized")+" ( "+all_filters+" )"); } for(int i=0;i<filters.size();i++) { diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp index 6423b75abc..1062417fec 100644 --- a/tools/editor/editor_file_system.cpp +++ b/tools/editor/editor_file_system.cpp @@ -314,7 +314,7 @@ void EditorFileSystem::_scan_filesystem() { - EditorProgressBG scan_progress("efs",TTR("ScanFS"),1000); + EditorProgressBG scan_progress("efs","ScanFS",1000); ScanProgress sp; sp.low=0; @@ -609,7 +609,7 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess da->change_dir(".."); } else { - ERR_PRINTS(TTR("Can't go into subdir: ")+E->get()); + ERR_PRINTS(TTR("Cannot go into subdir:")+" "+E->get()); } p_progress.update(idx,total); diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp index a8cb1a5730..616037c545 100644 --- a/tools/editor/editor_help.cpp +++ b/tools/editor/editor_help.cpp @@ -519,7 +519,7 @@ EditorHelpIndex::EditorHelpIndex() { search_box->connect("input_event", this, "_sbox_input"); class_list = memnew( Tree ); - vbc->add_margin_child(TTR("Class List: "), class_list, true); + vbc->add_margin_child(TTR("Class List:")+" ", class_list, true); class_list->set_v_size_flags(SIZE_EXPAND_FILL); class_list->connect("item_activated",this,"_tree_item_selected"); @@ -710,7 +710,7 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) { class_desc->push_font(doc_title_font); class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color")); - class_desc->add_text(TTR("Class: ")); + class_desc->add_text(TTR("Class:")+" "); class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/base_type_color")); _add_text(p_class); class_desc->pop(); @@ -722,7 +722,7 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) { class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color")); class_desc->push_font(doc_title_font); - class_desc->add_text(TTR("Inherits: ")); + class_desc->add_text(TTR("Inherits:")+" "); class_desc->pop(); class_desc->pop(); @@ -756,7 +756,7 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) { if (!found) { class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color")); class_desc->push_font(doc_title_font); - class_desc->add_text("Inherited by: "); + class_desc->add_text(TTR("Inherited by:")+" "); class_desc->pop(); class_desc->pop(); diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index 91357e0f80..25dced4745 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -240,12 +240,12 @@ static void _edit_files_with_filter(DirAccess *da,const List<String>& p_filters, for(const List<String>::Element *F=p_filters.front();F;F=F->next()) { if (fullpath.matchn(F->get())) { - String act = TTR("Added: "); + String act = TTR("Added:")+" "; if (!exclude) { r_list.insert(fullpath); } else { - act = TTR("Removed: "); + act = TTR("Removed:")+" "; r_list.erase(fullpath); } @@ -866,7 +866,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func Error err = plugin->import2(dst_file,imd,get_image_compression(),true); if (err) { - EditorNode::add_io_error(TTR("Error saving atlas! ")+dst_file.get_file()); + EditorNode::add_io_error(TTR("Error saving atlas:")+" "+dst_file.get_file()); return ERR_CANT_CREATE; } @@ -916,7 +916,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func String path = EditorSettings::get_singleton()->get_settings_path()+"/tmp/tmpatlas.atex"; Error err = ResourceSaver::save(path,atex); if (err!=OK) { - EditorNode::add_io_error(TTR("Could not save atlas subtexture: ")+path); + EditorNode::add_io_error(TTR("Could not save atlas subtexture:")+" "+path); return ERR_CANT_CREATE; } Vector<uint8_t> data = FileAccess::get_file_as_array(path); @@ -1157,7 +1157,7 @@ Error EditorExportPlatform::save_pack_file(void *p_userdata,const String& p_path MD5Final(&ctx); pd->f->store_buffer(ctx.digest,16); } - pd->ep->step(TTR("Storing File: ")+p_path,2+p_file*100/p_total,false); + pd->ep->step(TTR("Storing File:")+" "+p_path,2+p_file*100/p_total,false); pd->count++; pd->ftmp->store_buffer(p_data.ptr(),p_data.size()); if (pd->alignment > 1) { @@ -1195,7 +1195,7 @@ Error EditorExportPlatform::save_zip_file(void *p_userdata,const String& p_path, zipWriteInFileInZip(zip,p_data.ptr(),p_data.size()); zipCloseFileInZip(zip); - zd->ep->step(TTR("Storing File: ")+p_path,2+p_file*100/p_total,false); + zd->ep->step(TTR("Storing File:")+" "+p_path,2+p_file*100/p_total,false); zd->count++; return OK; @@ -1309,7 +1309,7 @@ Error EditorExportPlatformPC::export_project(const String& p_path, bool p_debug, - EditorProgress ep("export",TTR("Exporting for ")+get_name(),102); + EditorProgress ep("export",vformat(TTR("Exporting for %s"),get_name()),102); const int BUFSIZE = 32768; diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index fc676bda7e..6a8778567a 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -432,7 +432,7 @@ void EditorNode::_rebuild_import_menu() { PopupMenu* p = import_menu->get_popup(); p->clear(); - p->add_item(TTR("Node from scene"), FILE_IMPORT_SUBSCENE); + p->add_item(TTR("Node From Scene"), FILE_IMPORT_SUBSCENE); p->add_separator(); for (int i = 0; i < editor_import_export->get_import_plugin_count(); i++) { p->add_item(editor_import_export->get_import_plugin(i)->get_visible_name(), IMPORT_PLUGIN_BASE + i); @@ -606,15 +606,15 @@ void EditorNode::_dialog_display_file_error(String p_file,Error p_error) { case ERR_FILE_CANT_WRITE: { - accept->set_text(TTR("Can't open file for writing: ")+p_file.extension()); + accept->set_text(TTR("Can't open file for writing:")+" "+p_file.extension()); } break; case ERR_FILE_UNRECOGNIZED: { - accept->set_text(TTR("File format requested unknown: ")+p_file.extension()); + accept->set_text(TTR("Requested file format unknown:")+" "+p_file.extension()); } break; default: { - accept->set_text(TTR("Error Saving.")); + accept->set_text(TTR("Error while saving.")); }break; } @@ -1251,7 +1251,7 @@ void EditorNode::_dialog_action(String p_file) { current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Can't load MeshLibrary for merging!.")); + accept->set_text(TTR("Can't load MeshLibrary for merging!")); accept->popup_centered_minsize(); return; } @@ -1268,7 +1268,7 @@ void EditorNode::_dialog_action(String p_file) { if (err) { accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Error saving MeshLibrary!.")); + accept->set_text(TTR("Error saving MeshLibrary!")); accept->popup_centered_minsize(); return; } @@ -1286,7 +1286,7 @@ void EditorNode::_dialog_action(String p_file) { current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Can't load TileSet for merging!.")); + accept->set_text(TTR("Can't load TileSet for merging!")); accept->popup_centered_minsize(); return; } @@ -1304,7 +1304,7 @@ void EditorNode::_dialog_action(String p_file) { if (err) { accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Error saving TileSet!.")); + accept->set_text(TTR("Error saving TileSet!")); accept->popup_centered_minsize(); return; } @@ -1328,7 +1328,7 @@ void EditorNode::_dialog_action(String p_file) { } int ret = unzGoToFirstFile(pkg); - int fc=0; //coun them + int fc=0; //count them while(ret==UNZ_OK) { fc++; @@ -1368,7 +1368,7 @@ void EditorNode::_dialog_action(String p_file) { file=file.get_file(); - p.step(TTR("Importing: ")+file,fc); + p.step(TTR("Importing:")+" "+file,fc); print_line("IMPORT "+file); FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_settings_path()+"/templates/"+file,FileAccess::WRITE); @@ -1454,7 +1454,7 @@ void EditorNode::_dialog_action(String p_file) { _update_layouts_menu(); if (p_file=="Default") { - show_warning(TTR("Restored Default layout to base settings.")); + show_warning(TTR("Restored default layout to base settings.")); } } break; @@ -1832,7 +1832,7 @@ void EditorNode::_run(bool p_current,const String& p_custom) { current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("No scene to run exists.")); + accept->set_text(TTR("There is no defined scene to run.")); accept->popup_centered_minsize(); return; } @@ -1896,7 +1896,7 @@ void EditorNode::_run(bool p_current,const String& p_custom) { current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Current scene was never saved, please save scene before running.")); + accept->set_text(TTR("Current scene was never saved, please save it prior to running.")); accept->popup_centered_minsize(); return; } @@ -1998,11 +1998,12 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { switch( p_option ) { case FILE_NEW_SCENE: { + // TODO: Drop such obsolete commented code /* if (!p_confirmed) { confirmation->get_ok()->set_text(TTR("Yes")); //confirmation->get_cancel()->show(); - confirmation->set_text(TTR("Start a New Scene? (Current will be lost)")); + confirmation->set_text("Start a New Scene? (Current will be lost)"); confirmation->popup_centered_minsize(); break; }*/ @@ -2259,7 +2260,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { String target = export_db->get_current_platform(); Ref<EditorExporter> exporter = export_db->get_exporter(target); if (exporter.is_null()) { - accept->set_text(TTR("No exporter for platform '")+target+"' yet."); + accept->set_text("No exporter for platform '"+target+"' yet."); accept->popup_centered(Size2(300,70));; return; } @@ -2343,7 +2344,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { confirmation->get_ok()->set_text(TTR("Quit")); //confirmation->get_cancel()->show(); - confirmation->set_text(TTR("Exit the Editor?")); + confirmation->set_text(TTR("Exit the editor?")); confirmation->popup_centered(Size2(180,70)); break; } @@ -2411,7 +2412,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { String filename = scene->get_filename(); if (filename==String()) { - show_warning(TTR("Can't reload a scene that was never saved..")); + show_warning(TTR("Can't reload a scene that was never saved.")); break; } @@ -2440,7 +2441,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { current_option=-1; //accept->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("I see..")); + accept->get_ok()->set_text("I see.."); accept->set_text("This operation can't be done without a selected node."); accept->popup_centered(Size2(300,70));; break; @@ -2452,7 +2453,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { current_option=-1; //confirmation->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("I see..")); + accept->get_ok()->set_text("I see.."); accept->set_text("This operation can't be done without a selected node."); accept->popup_centered(Size2(300,70));; break; @@ -2464,8 +2465,8 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { current_option=-1; //accept->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("Ugh")); - accept->set_text(String(TTR("Error loading scene from "))+external_file); + accept->get_ok()->set_text("Ugh"); + accept->set_text("Error loading scene from "+external_file); accept->popup_centered(Size2(300,70));; return; } @@ -2473,7 +2474,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { instanced_scene->generate_instance_state(); instanced_scene->set_filename( Globals::get_singleton()->localize_path(external_file) ); - editor_data.get_undo_redo().create_action(TTR("Instance Scene")); + editor_data.get_undo_redo().create_action("Instance Scene"); editor_data.get_undo_redo().add_do_method(parent,"add_child",instanced_scene); editor_data.get_undo_redo().add_do_method(instanced_scene,"set_owner",edited_scene); editor_data.get_undo_redo().add_do_reference(instanced_scene); @@ -2824,9 +2825,9 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { if (!p_confirmed) { - confirmation->get_ok()->set_text(TTR("Open")); + confirmation->get_ok()->set_text("Open"); //confirmation->get_cancel()->show(); - confirmation->set_text(TTR("Current scene changed, save and re-import ?")); + confirmation->set_text("Current scene changed, save and re-import ?"); confirmation->popup_centered(Size2(300,70)); break; @@ -2839,8 +2840,8 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { current_option=-1; //accept->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Can't import if edited scene was not saved.")); //i dont think this code will ever run + accept->get_ok()->set_text("I see.."); + accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run accept->popup_centered(Size2(300,70));; break; @@ -3256,7 +3257,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres if (!get_edited_scene()) { get_scene()->quit(); - ERR_EXPLAIN(TTR("No scene to optimize (loading failed?")); + ERR_EXPLAIN("No scene to optimize (loading failed?)"); ERR_FAIL_V(ERR_FILE_NOT_FOUND); } @@ -3281,10 +3282,10 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres if (!Globals::get_singleton()->has(preset)) { //accept->"()->hide(); - accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Optimizer preset not found: ")+p_preset); + accept->get_ok()->set_text("I see.."); + accept->set_text("Optimizer preset not found: "+p_preset); accept->popup_centered(Size2(300,70));; - ERR_EXPLAIN(TTR("Optimizer preset not found: ")+p_preset); + ERR_EXPLAIN("Optimizer preset not found: "+p_preset); ERR_FAIL_V(ERR_INVALID_PARAMETER); } @@ -3304,7 +3305,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres } } - ERR_EXPLAIN(TTR("Preset '")+p_preset+"' references nonexistent saver: "+type); + ERR_EXPLAIN("Preset '"+p_preset+"' references nonexistent saver: "+type); ERR_FAIL_COND_V(saver.is_null(),ERR_INVALID_DATA); List<Variant> keys; @@ -3339,8 +3340,8 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres current_option=-1; //accept->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied.")); + accept->get_ok()->set_text("I see.."); + accept->set_text("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied."); accept->popup_centered(Size2(300,70));; return ERR_INVALID_DATA; @@ -3350,8 +3351,8 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres if (err) { //accept->"()->hide(); - accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Error saving optimized scene: ")+path); + accept->get_ok()->set_text("I see.."); + accept->set_text("Error saving optimized scene: "+path); accept->popup_centered(Size2(300,70));; ERR_FAIL_COND_V(err,err); @@ -3640,7 +3641,7 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo for (Map<String,Set<String> >::Element *E=dependency_errors.front();E;E=E->next()) { - String txt=TTR("Scene '")+E->key()+"' has broken dependencies:\n"; + String txt=vformat(TTR("Scene '%s' has broken dependencies:"),E->key())+"\n"; for(Set<String>::Element *F=E->get().front();F;F=F->next()) { txt+="\t"+F->get()+"\n"; } @@ -3922,7 +3923,7 @@ void EditorNode::_save_optimized() { //accept->"()->hide(); accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Error saving optimized scene: ")+path); + accept->set_text("Error saving optimized scene: "+path); accept->popup_centered(Size2(300,70));; return; @@ -4954,7 +4955,7 @@ Variant EditorNode::drag_files(const Vector<String>& p_files, Control *p_from){ if (p_files.size()>max_files) { Label* label=memnew( Label ); - label->set_text(itos(p_files.size()-max_files)+" "+TTR("More File(s)")); + label->set_text(vformat(TTR("%i more file(s)"), p_files.size()-max_files)); files->add_child(label); } @@ -4985,7 +4986,7 @@ Variant EditorNode::drag_files_and_dirs(const Vector<String>& p_files, Control * if (p_files.size()>max_files) { Label* label=memnew( Label ); - label->set_text(itos(p_files.size()-max_files)+" "+TTR("More File(s) and/or Directory(s)")); + label->set_text(vformat(TTR("%i more file(s) or folder(s)"), p_files.size()-max_files)); files->add_child(label); } @@ -5156,7 +5157,7 @@ EditorNode::EditorNode() { ObjectTypeDB::set_type_enabled("CollisionShape",true); ObjectTypeDB::set_type_enabled("CollisionShape2D",true); ObjectTypeDB::set_type_enabled("CollisionPolygon2D",true); - //ObjectTypeDB::set_type_enabled(TTR("BodyVolumeConvexPolygon"),true); + //ObjectTypeDB::set_type_enabled("BodyVolumeConvexPolygon",true); gui_base = memnew( Panel ); add_child(gui_base); @@ -5548,7 +5549,7 @@ EditorNode::EditorNode() { p->connect("item_pressed",this,"_menu_option"); tool_menu = memnew( MenuButton ); - tool_menu->set_tooltip(TTR("Miscelaneous project or scene wide tools.")); + tool_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools.")); tool_menu->set_text(TTR("Tools")); //tool_menu->set_icon(gui_base->get_icon("Save","EditorIcons")); @@ -5639,7 +5640,7 @@ EditorNode::EditorNode() { play_custom_scene_button->set_focus_mode(Control::FOCUS_NONE); play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom","EditorIcons")); play_custom_scene_button->connect("pressed", this,"_menu_option",make_binds(RUN_PLAY_CUSTOM_SCENE)); - play_custom_scene_button->set_tooltip(TTR("Play custom scene (")+keycode_get_string(KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_F5)+")."); + play_custom_scene_button->set_tooltip(TTR("Play custom scene")+" ("+keycode_get_string(KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_F5)+")."); debug_button = memnew( MenuButton ); debug_button->set_flat(true); @@ -5648,7 +5649,7 @@ EditorNode::EditorNode() { debug_button->set_focus_mode(Control::FOCUS_NONE); debug_button->set_icon(gui_base->get_icon("Remote","EditorIcons")); //debug_button->connect("pressed", this,"_menu_option",make_binds(RUN_LIVE_DEBUG)); - debug_button->set_tooltip(TTR("Debug Options")); + debug_button->set_tooltip(TTR("Debug options")); p=debug_button->get_popup(); p->add_check_item(TTR("Live Editing"),RUN_LIVE_DEBUG); @@ -5820,21 +5821,21 @@ EditorNode::EditorNode() { prop_editor_base->add_child(prop_editor_hb); resource_new_button = memnew( ToolButton ); - resource_new_button->set_tooltip(TTR("Create a new resource in memory and edit it")); + resource_new_button->set_tooltip(TTR("Create a new resource in memory and edit it.")); resource_new_button->set_icon(gui_base->get_icon("New","EditorIcons")); prop_editor_hb->add_child(resource_new_button); resource_new_button->connect("pressed",this,"_menu_option",varray(RESOURCE_NEW)); resource_new_button->set_focus_mode(Control::FOCUS_NONE); resource_load_button = memnew( ToolButton ); - resource_load_button->set_tooltip(TTR("Load an existing resource from disk and edit it")); + resource_load_button->set_tooltip(TTR("Load an existing resource from disk and edit it.")); resource_load_button->set_icon(gui_base->get_icon("Load","EditorIcons")); prop_editor_hb->add_child(resource_load_button); resource_load_button->connect("pressed",this,"_menu_option",varray(RESOURCE_LOAD)); resource_load_button->set_focus_mode(Control::FOCUS_NONE); resource_save_button = memnew( MenuButton ); - resource_save_button->set_tooltip(TTR("Save the currently edited resource")); + resource_save_button->set_tooltip(TTR("Save the currently edited resource.")); resource_save_button->set_icon(gui_base->get_icon("Save","EditorIcons")); prop_editor_hb->add_child(resource_save_button); resource_save_button->get_popup()->add_item(TTR("Save"),RESOURCE_SAVE); @@ -5863,7 +5864,7 @@ EditorNode::EditorNode() { editor_history_menu = memnew( MenuButton ); - editor_history_menu->set_tooltip(TTR("History of recently edited objects")); + editor_history_menu->set_tooltip(TTR("History of recently edited objects.")); editor_history_menu->set_icon( gui_base->get_icon("History","EditorIcons")); prop_editor_hb->add_child(editor_history_menu); editor_history_menu->connect("about_to_show",this,"_prepare_history"); @@ -5899,7 +5900,7 @@ EditorNode::EditorNode() { prop_editor_base->add_child(search_bar); search_bar->hide(); - Label *l = memnew( Label(TTR("Search: ")) ); + Label *l = memnew( Label(TTR("Search:")+" ") ); search_bar->add_child(l); search_box = memnew( LineEdit ); @@ -6084,7 +6085,7 @@ EditorNode::EditorNode() { about = memnew( AcceptDialog ); - about->set_title(TTR("Thanks so Much!")); + about->set_title(TTR("Thanks from the Godot community!")); //about->get_cancel()->hide(); about->get_ok()->set_text(TTR("Thanks!")); about->set_hide_on_ok(true); @@ -6104,7 +6105,7 @@ EditorNode::EditorNode() { file_templates = memnew( FileDialog ); - file_templates->set_title(TTR("Import Templates from ZIP file")); + file_templates->set_title(TTR("Import Templates From ZIP File")); gui_base->add_child( file_templates ); file_templates->set_mode(FileDialog::MODE_OPEN_FILE); diff --git a/tools/editor/editor_run_script.cpp b/tools/editor/editor_run_script.cpp index 65aaf3d734..d34cac1530 100644 --- a/tools/editor/editor_run_script.cpp +++ b/tools/editor/editor_run_script.cpp @@ -9,12 +9,12 @@ void EditorScript::add_root_node(Node *p_node) { if (!editor) { - EditorNode::add_io_error(TTR("EditorScript::add_root_node : Write your logic in the _run() method.")); + EditorNode::add_io_error("EditorScript::add_root_node: "+TTR("Write your logic in the _run() method.")); return; } if (editor->get_edited_scene()) { - EditorNode::add_io_error(TTR("EditorScript::add_root_node : There is an edited scene already.")); + EditorNode::add_io_error("EditorScript::add_root_node: "+TTR("There is an edited scene already.")); return; } @@ -24,7 +24,7 @@ void EditorScript::add_root_node(Node *p_node) { Node *EditorScript::get_scene() { if (!editor) { - EditorNode::add_io_error(TTR("EditorScript::get_scene : Write your logic in the _run() method.")); + EditorNode::add_io_error("EditorScript::get_scene: "+TTR("Write your logic in the _run() method.")); return NULL; } @@ -36,7 +36,7 @@ void EditorScript::_run() { Ref<Script> s = get_script(); ERR_FAIL_COND(!s.is_valid()); if (!get_script_instance()) { - EditorNode::add_io_error("Couldn't instance script:\n "+s->get_path()+"\nDid you forget the 'tool' keyword?"); + EditorNode::add_io_error(TTR("Couldn't instance script:")+"\n "+s->get_path()+"\n"+TTR("Did you forget the 'tool' keyword?")); return; } @@ -46,7 +46,7 @@ void EditorScript::_run() { get_script_instance()->call("_run",NULL,0,ce); if (ce.error!=Variant::CallError::CALL_OK) { - EditorNode::add_io_error("Couldn't run script:\n "+s->get_path()+"\nDid you forget the '_run' method?"); + EditorNode::add_io_error(TTR("Couldn't run script:")+"\n "+s->get_path()+"\n"+TTR("Did you forget the '_run' method?")); } } diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 1d79dddac9..a83125d0bb 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -263,7 +263,7 @@ void EditorSettings::create() { memdelete(dir); - singleton = ResourceLoader::load(config_file_path,TTR("EditorSettings")); + singleton = ResourceLoader::load(config_file_path,"EditorSettings"); if (singleton.is_null()) { WARN_PRINT("Could not open config file."); goto fail; @@ -505,7 +505,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { #else hints["import/pvrtc_texture_tool"]=PropertyInfo(Variant::STRING,"import/pvrtc_texture_tool",PROPERTY_HINT_GLOBAL_FILE,""); #endif - set(TTR("PVRTC/fast_conversion"),false); + // TODO: Rename to "import/pvrtc_fast_conversion" to match other names? + set("PVRTC/fast_conversion",false); set("run/auto_save_before_running",true); diff --git a/tools/editor/editor_sub_scene.cpp b/tools/editor/editor_sub_scene.cpp index 941ff6be1c..d32dbcd2e6 100644 --- a/tools/editor/editor_sub_scene.cpp +++ b/tools/editor/editor_sub_scene.cpp @@ -198,7 +198,7 @@ EditorSubScene::EditorSubScene() { scene=NULL; - set_title(TTR("Select Sub-Scene..")); + set_title(TTR("Select Node(s) to Import")); set_hide_on_ok(false); VBoxContainer *vb = memnew( VBoxContainer ); diff --git a/tools/editor/import_settings.cpp b/tools/editor/import_settings.cpp index 3b3ebb0ad7..92f6129e51 100644 --- a/tools/editor/import_settings.cpp +++ b/tools/editor/import_settings.cpp @@ -278,7 +278,7 @@ ImportSettingsDialog::ImportSettingsDialog(EditorNode *p_editor) { set_child_rect(tree); set_title(TTR("Imported Resources")); - texformat=TTR("Keep,None,Disk,VRAM"); +// texformat="Keep,None,Disk,VRAM"; tree->set_hide_root(true); tree->set_columns(2); diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp index 970b8fe0ca..296439c39e 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp @@ -527,7 +527,7 @@ class EditorFontImportDialog : public ConfirmationDialog { Ref<ResourceImportMetadata> rimd = get_rimd(); if (rimd.is_null()) { - error_dialog->set_text(TTR("Can't load/process source font")); + error_dialog->set_text(TTR("Can't load/process source font.")); error_dialog->popup_centered(Size2(200,100)); return; } @@ -657,7 +657,7 @@ public: testhb->add_child(test_color); vbl->add_spacer(); - vbl->add_margin_child(TTR("Test: "),testhb); + vbl->add_margin_child(TTR("Test:")+" ",testhb); /* HBoxContainer *upd_hb = memnew( HBoxContainer ); // vbl->add_child(upd_hb); @@ -887,7 +887,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe if (src_path.extension().to_lower()=="fnt") { if (ResourceLoader::load(src_path).is_valid()) { - EditorNode::get_singleton()->show_warning(TTR("Path: ")+src_path+"\nIs a Godot font file, please supply a BMFont type file instead."); + EditorNode::get_singleton()->show_warning(TTR("Path:")+" "+src_path+"\n"+TTR("This file is already a Godot font file, please supply a BMFont type file instead.")); return Ref<BitmapFont>(); } @@ -895,7 +895,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe font.instance(); Error err = font->create_from_fnt(src_path); if (err) { - EditorNode::get_singleton()->show_warning(TTR("Path: ")+src_path+"\nFailed opening as BMFont file."); + EditorNode::get_singleton()->show_warning(TTR("Path:")+" "+src_path+"\n"+TTR("Failed opening as BMFont file.")); return Ref<BitmapFont>(); } @@ -939,7 +939,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe if ( error ) { FT_Done_FreeType( library ); - ERR_EXPLAIN(TTR("Invalid font size. ")); + ERR_EXPLAIN(TTR("Invalid font size.")); ERR_FAIL_COND_V( error,Ref<BitmapFont>() ); } @@ -986,7 +986,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe if ( !fa ) { FT_Done_FreeType( library ); - ERR_EXPLAIN(TTR("Invalid font custom source. ")); + ERR_EXPLAIN(TTR("Invalid font custom source.")); ERR_FAIL_COND_V( !fa,Ref<BitmapFont>() ); } diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp index 49d35220d4..7341ccb99f 100644 --- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp @@ -362,7 +362,7 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp if (mesh->surface_get_name(i)!="") name=mesh->surface_get_name(i); else - name=TTR("Surface ")+itos(i+1); + name=vformat(TTR("Surface %i"),i+1); name_map[name]=mesh->surface_get_material(i); } @@ -498,7 +498,7 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp surf_tool->index(); mesh = surf_tool->commit(mesh); if (name=="") - name=TTR("Surface ")+itos(mesh->get_surface_count()-1); + name=vformat(TTR("Surface %i"),mesh->get_surface_count()-1); mesh->surface_set_name(mesh->get_surface_count()-1,name); name=""; surf_tool->clear(); diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.cpp b/tools/editor/io_plugins/editor_sample_import_plugin.cpp index d2939cd556..212ef93316 100644 --- a/tools/editor/io_plugins/editor_sample_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_sample_import_plugin.cpp @@ -262,7 +262,7 @@ public: } if (!save_path->get_text().begins_with("res://")) { - error_dialog->set_text(TTR("Target path must be full resource path.")); + error_dialog->set_text(TTR("Target path must be a complete resource path.")); error_dialog->popup_centered_minsize(); return; } diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp index 1843fbf612..01ae0150ec 100644 --- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp @@ -686,7 +686,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) { } if (!save_path->get_text().begins_with("res://")) { - error_dialog->set_text(TTR("Target path must be full resource path.")); + error_dialog->set_text(TTR("Target path must be a complete resource path.")); error_dialog->popup_centered_minsize(); return; } @@ -721,7 +721,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) { if (script_path->get_text()!="") { Ref<Script> scr = ResourceLoader::load(script_path->get_text()); if (!scr.is_valid()) { - error_dialog->set_text(TTR("Couldn't load Post-Import Script.")); + error_dialog->set_text(TTR("Couldn't load post-import script.")); error_dialog->popup_centered(Size2(200,100)); return; } @@ -730,7 +730,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) { pi->set_script(scr.get_ref_ptr()); if (!pi->get_script_instance()) { - error_dialog->set_text(TTR("Invalid/Broken Script for Post-Import.")); + error_dialog->set_text(TTR("Invalid/broken script for post-import.")); error_dialog->popup_centered(Size2(200,100)); return; } @@ -2735,13 +2735,13 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c post_import_script_path = post_import_script_path; Ref<Script> scr = ResourceLoader::load(post_import_script_path); if (!scr.is_valid()) { - EditorNode::add_io_error(TTR("Couldn't load post-import script: '")+post_import_script_path); + EditorNode::add_io_error(TTR("Couldn't load post-import script:")+" "+post_import_script_path); } else { post_import_script = Ref<EditorScenePostImport>( memnew( EditorScenePostImport ) ); post_import_script->set_script(scr.get_ref_ptr()); if (!post_import_script->get_script_instance()) { - EditorNode::add_io_error(TTR("Invalid/Broken Script for Post-Import: '")+post_import_script_path); + EditorNode::add_io_error(TTR("Invalid/broken script for post-import:")+" "+post_import_script_path); post_import_script.unref(); } } @@ -2751,7 +2751,7 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c if (post_import_script.is_valid()) { scene = post_import_script->post_import(scene); if (!scene) { - EditorNode::add_io_error(TTR("Error running Post-Import script: '")+post_import_script_path); + EditorNode::add_io_error(TTR("Error running post-import script:")+" "+post_import_script_path); return err; } @@ -2780,18 +2780,18 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c String path = texture->get_path(); String fname= path.get_file(); String target_path = Globals::get_singleton()->localize_path(target_res_path.plus_file(fname)); - progress.step(TTR("Import Img: ")+fname,3+(idx)*100/imagemap.size()); + progress.step(TTR("Import Image:")+" "+fname,3+(idx)*100/imagemap.size()); idx++; if (path==target_path) { - EditorNode::add_io_error(TTR("Can't import a file over itself: '")+target_path); + EditorNode::add_io_error(TTR("Can't import a file over itself:")+" "+target_path); continue; } if (!target_path.begins_with("res://")) { - EditorNode::add_io_error(TTR("Couldn't localize path: '")+target_path+"' (already local)"); + EditorNode::add_io_error(vformat(TTR("Couldn't localize path: %s (already local)"),target_path)); continue; } diff --git a/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp b/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp index 9cedf1c70a..0c388b91ca 100644 --- a/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp +++ b/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp @@ -507,15 +507,15 @@ void EditorSceneImporterFBXConv::_parse_materials(State& state) { if (tex.is_valid() && texture.has("type")) { String type=texture["type"]; - if (type==TTR("DIFFUSE")) + if (type=="DIFFUSE") mat->set_texture(FixedMaterial::PARAM_DIFFUSE,tex); - else if (type==TTR("SPECULAR")) + else if (type=="SPECULAR") mat->set_texture(FixedMaterial::PARAM_SPECULAR,tex); - else if (type==TTR("SHININESS")) + else if (type=="SHININESS") mat->set_texture(FixedMaterial::PARAM_SPECULAR_EXP,tex); else if (type=="NORMAL") mat->set_texture(FixedMaterial::PARAM_NORMAL,tex); - else if (type==TTR("EMISSIVE")) + else if (type=="EMISSIVE") mat->set_texture(FixedMaterial::PARAM_EMISSION,tex); } @@ -570,13 +570,13 @@ void EditorSceneImporterFBXConv::_parse_surfaces(State& state) { exists[Mesh::ARRAY_COLOR]=true; ofs[Mesh::ARRAY_COLOR]=stride; stride+=4; - } else if (attr==TTR("COLORPACKED")) { + } else if (attr=="COLORPACKED") { stride+=1; //ignore - } else if (attr==TTR("TANGENT")) { + } else if (attr=="TANGENT") { exists[Mesh::ARRAY_TANGENT]=true; ofs[Mesh::ARRAY_TANGENT]=stride; stride+=3; - } else if (attr==TTR("BINORMAL")) { + } else if (attr=="BINORMAL") { binormal_ofs=stride; stride+=3; } else if (attr=="TEXCOORD0") { @@ -587,10 +587,10 @@ void EditorSceneImporterFBXConv::_parse_surfaces(State& state) { exists[Mesh::ARRAY_TEX_UV2]=true; ofs[Mesh::ARRAY_TEX_UV2]=stride; stride+=2; - } else if (attr.begins_with(TTR("TEXCOORD"))) { + } else if (attr.begins_with("TEXCOORD")) { stride+=2; - } else if (attr.begins_with(TTR("BLENDWEIGHT"))) { - int idx=attr.replace(TTR("BLENDWEIGHT"),"").to_int(); + } else if (attr.begins_with("BLENDWEIGHT")) { + int idx=attr.replace("BLENDWEIGHT","").to_int(); if (idx==0) { exists[Mesh::ARRAY_BONES]=true; ofs[Mesh::ARRAY_BONES]=stride; @@ -799,13 +799,13 @@ void EditorSceneImporterFBXConv::_parse_surfaces(State& state) { if (part.has("type")) { String type=part["type"]; - if (type==TTR("LINES")) + if (type=="LINES") pt=Mesh::PRIMITIVE_LINES; - else if (type==TTR("POINTS")) + else if (type=="POINTS") pt=Mesh::PRIMITIVE_POINTS; - else if (type==TTR("TRIANGLE_STRIP")) + else if (type=="TRIANGLE_STRIP") pt=Mesh::PRIMITIVE_TRIANGLE_STRIP; - else if (type==TTR("LINE_STRIP")) + else if (type=="LINE_STRIP") pt=Mesh::PRIMITIVE_LINE_STRIP; } @@ -1056,7 +1056,7 @@ Error EditorSceneImporterFBXConv::_parse_fbx(State& state,const String& p_path) } args.push_back("-o"); - args.push_back(TTR("G3DJ")); + args.push_back("G3DJ"); args.push_back(path); int res; diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp index 713b92b037..0e2d35b9f2 100644 --- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp @@ -53,17 +53,17 @@ static const char *flag_names[]={ #if 0 // not used static const char *flag_short_names[]={ - TTR("Stream"), - TTR("FixBorder"), - TTR("AlphBit"), - TTR("ExtComp"), - TTR("NoMipMap"), - TTR("Repeat"), - TTR("Filter"), - TTR("PMAlpha"), - TTR("ToLinear"), - TTR("ToRG"), - TTR("Anisoropic"), + "Stream", + "FixBorder", + "AlphBit", + "ExtComp", + "NoMipMap", + "Repeat", + "Filter", + "PMAlpha", + "ToLinear", + "ToRG", + "Anisoropic", NULL }; #endif @@ -343,7 +343,7 @@ void EditorTextureImportDialog::_import() { } if (!save_path->get_text().begins_with("res://")) { - error_dialog->set_text(TTR("Target path must be full resource path.")); + error_dialog->set_text(TTR("Target path must be a complete resource path.")); error_dialog->popup_centered_minsize(); return; } @@ -382,7 +382,7 @@ void EditorTextureImportDialog::_import() { Error err = plugin->import(dst_file,imd); if (err) { - error_dialog->set_text(TTR("Error importing: ")+dst_file.get_file()); + error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file()); error_dialog->popup_centered(Size2(200,100)); return; @@ -391,7 +391,7 @@ void EditorTextureImportDialog::_import() { if (files.size()!=1) { - error_dialog->set_text(TTR("Only one file is required for large texture")); + error_dialog->set_text(TTR("Only one file is required for large texture.")); error_dialog->popup_centered(Size2(200,100)); return; @@ -414,7 +414,7 @@ void EditorTextureImportDialog::_import() { Error err = plugin->import(dst_file,imd); if (err) { - error_dialog->set_text(TTR("Error importing: ")+dst_file.get_file()); + error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file()); error_dialog->popup_centered(Size2(200,100)); return; @@ -438,7 +438,7 @@ void EditorTextureImportDialog::_import() { Error err = plugin->import(dst_file,imd); if (err) { - error_dialog->set_text(TTR("Error importing: ")+dst_file.get_file()); + error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file()); error_dialog->popup_centered(Size2(200,100)); return; @@ -499,7 +499,7 @@ void EditorTextureImportDialog::_notification(int p_what) { List<String> extensions; ImageLoader::get_recognized_extensions(&extensions); - // ResourceLoader::get_recognized_extensions_for_type(TTR("PackedTexture"),&extensions); + // ResourceLoader::get_recognized_extensions_for_type("PackedTexture",&extensions); file_select->clear_filters(); for(int i=0;i<extensions.size();i++) { @@ -579,7 +579,7 @@ EditorTextureImportDialog::EditorTextureImportDialog(EditorTextureImportPlugin* if (p_atlas) { size->set_val(2048); - vbc->add_margin_child(TTR("Max Texture size:"),size); + vbc->add_margin_child(TTR("Max Texture Size:"),size); } else { size->set_val(256); vbc->add_margin_child(TTR("Cell Size:"),size); @@ -612,9 +612,9 @@ EditorTextureImportDialog::EditorTextureImportDialog(EditorTextureImportPlugin* save_file_select->set_mode(EditorFileDialog::MODE_SAVE_FILE); save_file_select->clear_filters(); if (large) - save_file_select->add_filter("*.ltex;Large Texture"); + save_file_select->add_filter("*.ltex;"+TTR("Large Texture")); else - save_file_select->add_filter("*.tex;Base Atlas Texture"); + save_file_select->add_filter("*.tex;"+TTR("Base Atlas Texture")); save_file_select->connect("file_selected", this,"_choose_save_dir"); save_select = memnew( EditorDirDialog ); @@ -1057,7 +1057,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc err = ResourceSaver::save(p_path,existing); if (err!=OK) { - EditorNode::add_io_error(TTR("Couldn't save large texture: ")+p_path); + EditorNode::add_io_error(TTR("Couldn't save large texture:")+" "+p_path); return err; } @@ -1072,7 +1072,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc bool alpha=false; bool crop = from->get_option("crop"); - EditorProgress ep("make_atlas",TTR("Build Atlas For: ")+p_path.get_file(),from->get_source_count()+3); + EditorProgress ep("make_atlas",TTR("Build Atlas For:")+" "+p_path.get_file(),from->get_source_count()+3); print_line("sources: "+itos(from->get_source_count())); @@ -1081,12 +1081,12 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc String path = EditorImportPlugin::expand_source_path(from->get_source_path(i)); String md5 = FileAccess::get_md5(path); from->set_source_md5(i,FileAccess::get_md5(path)); - ep.step(TTR("Loading Image: ")+path,i); + ep.step(TTR("Loading Image:")+" "+path,i); print_line("source path: "+path+" md5 "+md5); Image src; Error err = ImageLoader::load_image(path,&src); if (err) { - EditorNode::add_io_error(TTR("Couldn't load image: ")+path); + EditorNode::add_io_error(TTR("Couldn't load image:")+" "+path); return err; } @@ -1176,7 +1176,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc Size2i dst_size; EditorAtlas::fit(src_sizes,dst_positions,dst_size); - print_line("size that workeD: "+itos(dst_size.width)+","+itos(dst_size.height)); + print_line("size that worked: "+itos(dst_size.width)+","+itos(dst_size.height)); ep.step(TTR("Blitting Images"),sources.size()+2); @@ -1291,7 +1291,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc atlases[i]->set_atlas(texture); Error err = ResourceSaver::save(apath,atlases[i]); if (err) { - EditorNode::add_io_error(TTR("Couldn't save atlas image: ")+apath); + EditorNode::add_io_error(TTR("Couldn't save atlas image:")+" "+apath); return err; } //from->set_source_md5(i,FileAccess::get_md5(apath)); @@ -1433,7 +1433,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc Error err = ResourceSaver::save(p_path,texture,save_flags); if (err!=OK) { - EditorNode::add_io_error(TTR("Couldn't save converted texture: ")+p_path); + EditorNode::add_io_error(TTR("Couldn't save converted texture:")+" "+p_path); return err; } diff --git a/tools/editor/io_plugins/editor_translation_import_plugin.cpp b/tools/editor/io_plugins/editor_translation_import_plugin.cpp index 03abc3a82b..b57e4cb84c 100644 --- a/tools/editor/io_plugins/editor_translation_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_translation_import_plugin.cpp @@ -236,7 +236,7 @@ public: } if (!save_path->get_text().begins_with("res://")) { - error_dialog->set_text(TTR("No target path!!")); + error_dialog->set_text(TTR("No target path!")); error_dialog->popup_centered(Size2(200,100)); } @@ -258,7 +258,7 @@ public: String savefile = save_path->get_text().plus_file(import_path->get_text().get_file().basename()+"."+locale+".xl"); Error err = plugin->import(savefile,imd); if (err!=OK) { - error_dialog->set_text(TTR("Couldnt import!")); + error_dialog->set_text(TTR("Couldn't import!")); error_dialog->popup_centered(Size2(200,100)); } else if (add_to_project->is_pressed()) { diff --git a/tools/editor/multi_node_edit.cpp b/tools/editor/multi_node_edit.cpp index 54697d41ab..b5bae82ae0 100644 --- a/tools/editor/multi_node_edit.cpp +++ b/tools/editor/multi_node_edit.cpp @@ -9,7 +9,7 @@ bool MultiNodeEdit::_set(const StringName& p_name, const Variant& p_value){ UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo(); - ur->create_action(TTR("MultiNode Set ")+String(p_name)); + ur->create_action(TTR("MultiNode Set")+" "+String(p_name)); for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) { if (!es->has_node(E->get())) diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index 77bd5d0fef..343fcce5cd 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -496,7 +496,7 @@ void AnimationPlayerEditor::_animation_name_edited() { } if (player->has_animation(new_name)) { - error_dialog->set_text(TTR("ERROR: Animation Name Already Exists!")); + error_dialog->set_text(TTR("ERROR: Animation name already exists!")); error_dialog->popup_centered_minsize(); return; } @@ -1022,7 +1022,7 @@ void AnimationPlayerEditor::_editor_store() { return; //already there - undo_redo->create_action(TTR("Store anim in editor")); + undo_redo->create_action("Store anim in editor"); undo_redo->add_do_method(key_editor,"set_animation",anim); undo_redo->add_undo_method(key_editor,"remove_animation",anim); undo_redo->commit_action(); @@ -1044,7 +1044,7 @@ void AnimationPlayerEditor::_editor_load(){ String base=anim->get_name(); bool noname=false; if (base=="") { - base=TTR("New Anim"); + base="New Anim"; noname=true; } @@ -1063,7 +1063,7 @@ void AnimationPlayerEditor::_editor_load(){ if (noname) anim->set_name(base); - undo_redo->create_action(TTR("Add Animation From Editor")); + undo_redo->create_action("Add Animation From Editor"); undo_redo->add_do_method(player,"add_animation",base,anim); undo_redo->add_undo_method(player,"remove_animation",base); undo_redo->add_do_method(this,"_animation_player_changed",player); @@ -1298,7 +1298,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { Label * l; /*l= memnew( Label ); - l->set_text(TTR("Animation Player:")); + l->set_text("Animation Player:"); add_child(l);*/ HBoxContainer *hb = memnew( HBoxContainer ); @@ -1306,11 +1306,11 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { play_bw_from = memnew( ToolButton ); - play_bw_from->set_tooltip(TTR("Play backwards selected animation from current pos. (A)")); + play_bw_from->set_tooltip(TTR("Play selected animation backwards from current pos. (A)")); hb->add_child(play_bw_from); play_bw = memnew( ToolButton ); - play_bw->set_tooltip(TTR("Play backwards selected animation from end. (Shift+A)")); + play_bw->set_tooltip(TTR("Play selected animation backwards from end. (Shift+A)")); hb->add_child(play_bw); stop = memnew( ToolButton ); @@ -1391,7 +1391,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { autoplay = memnew( ToolButton ); hb->add_child(autoplay); - autoplay->set_tooltip(TTR("Autoplay On Load")); + autoplay->set_tooltip(TTR("Autoplay on Load")); @@ -1405,7 +1405,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { tool_anim->get_popup()->add_item(TTR("Copy Animation"),TOOL_COPY_ANIM); tool_anim->get_popup()->add_item(TTR("Paste Animation"),TOOL_PASTE_ANIM); //tool_anim->get_popup()->add_separator(); - //tool_anim->get_popup()->add_item(TTR("Edit Anim Resource"),TOOL_PASTE_ANIM); + //tool_anim->get_popup()->add_item("Edit Anim Resource",TOOL_PASTE_ANIM); hb->add_child(tool_anim); nodename = memnew( Button ); @@ -1444,7 +1444,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { error_dialog = memnew( ConfirmationDialog ); error_dialog->get_ok()->set_text(TTR("Close")); - //error_dialog->get_cancel()->set_text(TTR("Close")); + //error_dialog->get_cancel()->set_text("Close"); error_dialog->set_text(TTR("Error!")); add_child(error_dialog); @@ -1459,7 +1459,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { blend_editor.dialog->set_child_rect(blend_vb); blend_editor.tree = memnew( Tree ); blend_editor.tree->set_columns(2); - blend_vb->add_margin_child(TTR("Blend Times: "),blend_editor.tree,true); + blend_vb->add_margin_child(TTR("Blend Times:"),blend_editor.tree,true); blend_editor.next = memnew( OptionButton ); blend_vb->add_margin_child(TTR("Next (Auto Queue):"),blend_editor.next); blend_editor.dialog->set_title(TTR("Cross-Animation Blend Times")); diff --git a/tools/editor/plugins/animation_player_editor_plugin.h b/tools/editor/plugins/animation_player_editor_plugin.h index 9583f3e663..3f3cda25b2 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.h +++ b/tools/editor/plugins/animation_player_editor_plugin.h @@ -203,7 +203,7 @@ public: virtual Dictionary get_state() const { return anim_editor->get_state(); } virtual void set_state(const Dictionary& p_state) { anim_editor->set_state(p_state); } - virtual String get_name() const { return TTR("Anim"); } + virtual String get_name() const { return "Anim"; } bool has_main_screen() const { return false; } virtual void edit(Object *p_node); virtual bool handles(Object *p_node) const; diff --git a/tools/editor/plugins/animation_tree_editor_plugin.cpp b/tools/editor/plugins/animation_tree_editor_plugin.cpp index dc857bfacb..a381ec4678 100644 --- a/tools/editor/plugins/animation_tree_editor_plugin.cpp +++ b/tools/editor/plugins/animation_tree_editor_plugin.cpp @@ -990,12 +990,12 @@ void AnimationTreeEditor::_notification(int p_what) { case AnimationTreePlayer::CONNECT_OK: { Ref<Font> f = get_font("font","Label"); - f->draw(get_canvas_item(),Point2(5,25+f->get_ascent()),TTR("Animation Tree is Valid."),Color(0,1,0.6,0.8)); + f->draw(get_canvas_item(),Point2(5,25+f->get_ascent()),TTR("Animation tree is valid."),Color(0,1,0.6,0.8)); } break; default: { Ref<Font> f = get_font("font","Label"); - f->draw(get_canvas_item(),Point2(5,25+f->get_ascent()),TTR("Animation Tree is Invalid."),Color(1,0.6,0.0,0.8)); + f->draw(get_canvas_item(),Point2(5,25+f->get_ascent()),TTR("Animation tree is invalid."),Color(1,0.6,0.0,0.8)); } break; } @@ -1369,7 +1369,7 @@ AnimationTreeEditor::AnimationTreeEditor() { p->add_item(TTR("TimeSeek Node"),AnimationTreePlayer::NODE_TIMESEEK); p->add_item(TTR("Transition Node"),AnimationTreePlayer::NODE_TRANSITION); p->add_separator(); - p->add_item(TTR("Import Animations..."), MENU_IMPORT_ANIMATIONS); // wtf + p->add_item(TTR("Import Animations.."), MENU_IMPORT_ANIMATIONS); // wtf p->add_separator(); p->add_item(TTR("Clear"),MENU_GRAPH_CLEAR); @@ -1524,7 +1524,7 @@ AnimationTreeEditorPlugin::AnimationTreeEditorPlugin(EditorNode *p_node) { anim_tree_editor = memnew( AnimationTreeEditor ); anim_tree_editor->set_custom_minimum_size(Size2(0,300)); - button=editor->add_bottom_panel_item(TTR("AnimationTree"),anim_tree_editor); + button=editor->add_bottom_panel_item("AnimationTree",anim_tree_editor); button->hide(); diff --git a/tools/editor/plugins/animation_tree_editor_plugin.h b/tools/editor/plugins/animation_tree_editor_plugin.h index 989a6b0b04..4884a22d90 100644 --- a/tools/editor/plugins/animation_tree_editor_plugin.h +++ b/tools/editor/plugins/animation_tree_editor_plugin.h @@ -180,7 +180,7 @@ class AnimationTreeEditorPlugin : public EditorPlugin { public: - virtual String get_name() const { return TTR("AnimTree"); } + virtual String get_name() const { return "AnimTree"; } bool has_main_screen() const { return false; } virtual void edit(Object *p_node); virtual bool handles(Object *p_node) const; diff --git a/tools/editor/plugins/baked_light_baker.cpp b/tools/editor/plugins/baked_light_baker.cpp index c7ae98e919..6023f2567a 100644 --- a/tools/editor/plugins/baked_light_baker.cpp +++ b/tools/editor/plugins/baked_light_baker.cpp @@ -728,14 +728,14 @@ void BakedLightBaker::_make_octree() { for(int i=0;i<8;i++) root->children[i]=0; - EditorProgress ep("bake_octree",TTR("Parsing ")+itos(triangles.size())+" Triangles:",triangles.size()); + EditorProgress ep("bake_octree",vformat(TTR("Parsing %i Triangles:"), triangles.size()),triangles.size()); for(int i=0;i<triangles.size();i++) { _octree_insert(0,&triangles[i],octree_depth-1); if ((i%1000)==0) { - ep.step(TTR("Triangle# ")+itos(i),i); + ep.step(TTR("Triangle #")+itos(i),i); } } diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 0213dbda59..3b7186f18a 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -1906,7 +1906,7 @@ void CanvasItemEditor::_viewport_draw() { if (h_scroll->is_visible()) size.height-=h_scroll->get_size().height; - get_stylebox(TTR("EditorFocus"),"EditorStyles")->draw(ci,Rect2(Point2(),size)); + get_stylebox("EditorFocus","EditorStyles")->draw(ci,Rect2(Point2(),size)); } Ref<Texture> lock = get_icon("Lock","EditorIcons"); @@ -3285,7 +3285,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { hb->add_child(select_button); select_button->connect("pressed",this,"_tool_select",make_binds(TOOL_SELECT)); select_button->set_pressed(true); - select_button->set_tooltip("Select Mode (Q)\n"+keycode_get_string(KEY_MASK_CMD)+"Drag: Rotate\nAlt+Drag: Move\nPress 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving).\nAlt+RMB: Depth list selection"); + select_button->set_tooltip(TTR("Select Mode (Q)")+"\n"+keycode_get_string(KEY_MASK_CMD)+TTR("Drag: Rotate")+"\n"+TTR("Alt+Drag: Move")+"\n"+TTR("Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving).")+"\n"+TTR("Alt+RMB: Depth list selection")); move_button = memnew( ToolButton ); @@ -3306,13 +3306,13 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { list_select_button->set_toggle_mode(true); hb->add_child(list_select_button); list_select_button->connect("pressed",this,"_tool_select",make_binds(TOOL_LIST_SELECT)); - list_select_button->set_tooltip("Show a list of all objects at the position clicked\n(same as Alt+RMB in selet mode)."); + list_select_button->set_tooltip(TTR("Show a list of all objects at the position clicked\n(same as Alt+RMB in select mode).")); pivot_button = memnew( ToolButton ); pivot_button->set_toggle_mode(true); hb->add_child(pivot_button); pivot_button->connect("pressed",this,"_tool_select",make_binds(TOOL_EDIT_PIVOT)); - pivot_button->set_tooltip(TTR("Click to change object's rotation pivot")); + pivot_button->set_tooltip(TTR("Click to change object's rotation pivot.")); pan_button = memnew( ToolButton ); pan_button->set_toggle_mode(true); @@ -3326,7 +3326,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { hb->add_child(lock_button); lock_button->connect("pressed",this,"_popup_callback",varray(LOCK_SELECTED)); - lock_button->set_tooltip("Lock the selected object in-place (can't be moved)."); + lock_button->set_tooltip(TTR("Lock the selected object in place (can't be moved).")); unlock_button = memnew( ToolButton ); hb->add_child(unlock_button); @@ -3336,12 +3336,12 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { group_button = memnew( ToolButton ); hb->add_child(group_button); group_button->connect("pressed",this,"_popup_callback",varray(GROUP_SELECTED)); - group_button->set_tooltip("Makes sure the object's' children are not selectable."); + group_button->set_tooltip(TTR("Makes sure the object's children are not selectable.")); ungroup_button = memnew( ToolButton ); hb->add_child(ungroup_button); ungroup_button->connect("pressed",this,"_popup_callback",varray(UNGROUP_SELECTED)); - ungroup_button->set_tooltip("Restores the object's' children ability to be selected."); + ungroup_button->set_tooltip(TTR("Restores the object's children's ability to be selected.")); hb->add_child(memnew(VSeparator)); @@ -3375,10 +3375,10 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { /* - p->add_item(TTR("Align Horizontal"),ALIGN_HORIZONTAL); - p->add_item(TTR("Align Vertical"),ALIGN_VERTICAL); - p->add_item(TTR("Space Horizontal"),SPACE_HORIZONTAL); - p->add_item(TTR("Space Vertical"),SPACE_VERTICAL);*/ + p->add_item("Align Horizontal",ALIGN_HORIZONTAL); + p->add_item("Align Vertical",ALIGN_VERTICAL); + p->add_item("Space Horizontal",SPACE_HORIZONTAL); + p->add_item("Space Vertical",SPACE_VERTICAL);*/ view_menu = memnew( MenuButton ); view_menu->set_text(TTR("View")); @@ -3436,7 +3436,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { key_insert_button = memnew( Button ); key_insert_button->set_focus_mode(FOCUS_NONE); key_insert_button->connect("pressed",this,"_popup_callback",varray(ANIM_INSERT_KEY)); - key_insert_button->set_tooltip(TTR("Insert Keys (Insert)")); + key_insert_button->set_tooltip(TTR("Insert Keys (Ins)")); animation_hb->add_child(key_insert_button); diff --git a/tools/editor/plugins/control_editor_plugin.h b/tools/editor/plugins/control_editor_plugin.h index 67db981c0d..6234698ee8 100644 --- a/tools/editor/plugins/control_editor_plugin.h +++ b/tools/editor/plugins/control_editor_plugin.h @@ -125,7 +125,7 @@ class ControlEditorPlugin : public EditorPlugin { public: - virtual String get_name() const { return TTR("GUI"); } + virtual String get_name() const { return "GUI"; } bool has_main_screen() const { return true; } virtual void edit(Object *p_object); virtual bool handles(Object *p_object) const; diff --git a/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp b/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp index 788e3c61f1..8dbd383a3b 100644 --- a/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp +++ b/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp @@ -256,7 +256,7 @@ void MeshLibraryEditor::_menu_cbk(int p_option) { if (p.begins_with("/MeshLibrary/item") && p.get_slice_count("/")>=3) { to_erase = p.get_slice("/",3).to_int(); - cd->set_text(TTR("Remove Item ")+itos(to_erase)+"?"); + cd->set_text(vformat(TTR("Remove item %i?"),to_erase)); cd->popup_centered(Size2(300,60)); } } break; diff --git a/tools/editor/plugins/item_list_editor_plugin.cpp b/tools/editor/plugins/item_list_editor_plugin.cpp index 9f47d26492..72b39d6e5f 100644 --- a/tools/editor/plugins/item_list_editor_plugin.cpp +++ b/tools/editor/plugins/item_list_editor_plugin.cpp @@ -129,7 +129,7 @@ int ItemListOptionButtonPlugin::get_flags() const { void ItemListOptionButtonPlugin::add_item() { - ob->add_item( TTR("Item ")+itos(ob->get_item_count())); + ob->add_item( vformat(TTR("Item %i"),ob->get_item_count())); _change_notify(); } @@ -171,7 +171,7 @@ int ItemListPopupMenuPlugin::get_flags() const { void ItemListPopupMenuPlugin::add_item() { - pp->add_item( TTR("Item ")+itos(pp->get_item_count())); + pp->add_item( vformat(TTR("Item %i"),pp->get_item_count())); _change_notify(); } diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp index e22dfb3d13..f7462db20f 100644 --- a/tools/editor/plugins/multimesh_editor_plugin.cpp +++ b/tools/editor/plugins/multimesh_editor_plugin.cpp @@ -73,7 +73,7 @@ void MultiMeshEditor::_populate() { if (!ms_node) { - err_dialog->set_text(TTR("Mesh source is invalid (Invalid Path).")); + err_dialog->set_text(TTR("Mesh source is invalid (invalid path).")); err_dialog->popup_centered_minsize(); return; } @@ -82,7 +82,7 @@ void MultiMeshEditor::_populate() { if (!ms_instance) { - err_dialog->set_text(TTR("Mesh source is invalid (Not a MeshInstance).")); + err_dialog->set_text(TTR("Mesh source is invalid (not a MeshInstance).")); err_dialog->popup_centered_minsize(); return; } @@ -91,7 +91,7 @@ void MultiMeshEditor::_populate() { if (mesh.is_null()) { - err_dialog->set_text(TTR("Mesh source is invalid (Contains no Mesh resource).")); + err_dialog->set_text(TTR("Mesh source is invalid (contains no Mesh resource).")); err_dialog->popup_centered_minsize(); return; } @@ -109,7 +109,7 @@ void MultiMeshEditor::_populate() { if (!ss_node) { - err_dialog->set_text(TTR("Surface source is invalid (Invalid Path).")); + err_dialog->set_text(TTR("Surface source is invalid (invalid path).")); err_dialog->popup_centered_minsize(); return; } @@ -118,7 +118,7 @@ void MultiMeshEditor::_populate() { if (!ss_instance) { - err_dialog->set_text(TTR("Surface source is invalid (Not Geometry).")); + err_dialog->set_text(TTR("Surface source is invalid (no geometry).")); err_dialog->popup_centered_minsize(); return; } @@ -129,7 +129,7 @@ void MultiMeshEditor::_populate() { if (geometry.size()==0) { - err_dialog->set_text(TTR("Surface source is invalid (No Faces).")); + err_dialog->set_text(TTR("Surface source is invalid (no faces).")); err_dialog->popup_centered_minsize(); return; } @@ -156,7 +156,7 @@ void MultiMeshEditor::_populate() { ERR_EXPLAIN(TTR("Parent is not of type VisualInstance.")); ERR_FAIL_COND(!get_parent() || !get_parent()->is_type("VisualInstance")); - ERR_EXPLAIN(TTR("Multimesh not present")); + ERR_EXPLAIN(TTR("Multimesh not present.")); ERR_FAIL_COND(multimesh.is_null()); VisualInstance *vi = get_parent()->cast_to<VisualInstance>(); @@ -184,9 +184,9 @@ void MultiMeshEditor::_populate() { area_accum+=area; } - ERR_EXPLAIN(TTR("Couldn't map area")); + ERR_EXPLAIN(TTR("Couldn't map area.")); ERR_FAIL_COND(triangle_area_map.size()==0); - ERR_EXPLAIN(TTR("Couldn't map area")); + ERR_EXPLAIN(TTR("Couldn't map area.")); ERR_FAIL_COND(area_accum==0); diff --git a/tools/editor/plugins/particles_2d_editor_plugin.cpp b/tools/editor/plugins/particles_2d_editor_plugin.cpp index 8892950feb..ce25f34c1f 100644 --- a/tools/editor/plugins/particles_2d_editor_plugin.cpp +++ b/tools/editor/plugins/particles_2d_editor_plugin.cpp @@ -66,7 +66,7 @@ void Particles2DEditorPlugin::_file_selected(const String& p_file) { Image img; Error err = ImageLoader::load_image(p_file,&img); - ERR_EXPLAIN(TTR("Error loading image: ")+p_file); + ERR_EXPLAIN(TTR("Error loading image:")+" "+p_file); ERR_FAIL_COND(err!=OK); img.convert(Image::FORMAT_GRAYSCALE_ALPHA); diff --git a/tools/editor/plugins/particles_editor_plugin.cpp b/tools/editor/plugins/particles_editor_plugin.cpp index b7ba987622..93e2fb2f38 100644 --- a/tools/editor/plugins/particles_editor_plugin.cpp +++ b/tools/editor/plugins/particles_editor_plugin.cpp @@ -249,7 +249,7 @@ void ParticlesEditor::_generate_emission_points() { if (gcount==0) { - err_dialog->set_text(TTR("No Faces!")); + err_dialog->set_text(TTR("No faces!")); err_dialog->popup_centered_minsize(); return; } diff --git a/tools/editor/plugins/path_2d_editor_plugin.cpp b/tools/editor/plugins/path_2d_editor_plugin.cpp index 079ca3a339..0fab183902 100644 --- a/tools/editor/plugins/path_2d_editor_plugin.cpp +++ b/tools/editor/plugins/path_2d_editor_plugin.cpp @@ -622,7 +622,7 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) { options = memnew( MenuButton ); add_child(options); options->set_area_as_parent_rect(); - options->set_text(TTR("Polygon")); + options->set_text("Polygon"); //options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE); options->get_popup()->connect("item_pressed", this,"_menu_option"); #endif @@ -636,7 +636,7 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) { curve_edit->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveEdit","EditorIcons")); curve_edit->set_toggle_mode(true); curve_edit->set_focus_mode(Control::FOCUS_NONE); - curve_edit->set_tooltip("Select Points\nShift+Drag: Select Control Points\n"+keycode_get_string(KEY_MASK_CMD)+"Click: Add Point\nRight Click: Delete Point."); + curve_edit->set_tooltip(TTR("Select Points")+"\n"+TTR("Shift+Drag: Select Control Points")+"\n"+keycode_get_string(KEY_MASK_CMD)+TTR("Click: Add Point")+"\n"+TTR("Right Click: Delete Point")); curve_edit->connect("pressed",this,"_mode_selected",varray(MODE_EDIT)); base_hb->add_child(curve_edit); curve_edit_curve = memnew( ToolButton ); @@ -650,14 +650,14 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) { curve_create->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveCreate","EditorIcons")); curve_create->set_toggle_mode(true); curve_create->set_focus_mode(Control::FOCUS_NONE); - curve_create->set_tooltip("Add Point (in empty space)\nSplit Segment (in curve)."); + curve_create->set_tooltip(TTR("Add Point (in empty space)")+"\n"+TTR("Split Segment (in curve)")); curve_create->connect("pressed",this,"_mode_selected",varray(MODE_CREATE)); base_hb->add_child(curve_create); curve_del = memnew( ToolButton ); curve_del->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveDelete","EditorIcons")); curve_del->set_toggle_mode(true); curve_del->set_focus_mode(Control::FOCUS_NONE); - curve_del->set_tooltip(TTR("Delete Point.")); + curve_del->set_tooltip(TTR("Delete Point")); curve_del->connect("pressed",this,"_mode_selected",varray(MODE_DELETE)); base_hb->add_child(curve_del); curve_close = memnew( ToolButton ); diff --git a/tools/editor/plugins/path_editor_plugin.cpp b/tools/editor/plugins/path_editor_plugin.cpp index 6820eed297..d7cc2bd157 100644 --- a/tools/editor/plugins/path_editor_plugin.cpp +++ b/tools/editor/plugins/path_editor_plugin.cpp @@ -546,21 +546,21 @@ PathEditorPlugin::PathEditorPlugin(EditorNode *p_node) { curve_edit->set_toggle_mode(true); curve_edit->hide(); curve_edit->set_focus_mode(Control::FOCUS_NONE); - curve_edit->set_tooltip("Select Points\nShift+Drag: Select Control Points\n"+keycode_get_string(KEY_MASK_CMD)+"Click: Add Point\nRight Click: Delete Point."); + curve_edit->set_tooltip(TTR("Select Points")+"\n"+TTR("Shift+Drag: Select Control Points")+"\n"+keycode_get_string(KEY_MASK_CMD)+TTR("Click: Add Point")+"\n"+TTR("Right Click: Delete Point")); SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_edit); curve_create = memnew( ToolButton ); curve_create->set_icon(SpatialEditor::get_singleton()->get_icon("CurveCreate","EditorIcons")); curve_create->set_toggle_mode(true); curve_create->hide(); curve_create->set_focus_mode(Control::FOCUS_NONE); - curve_create->set_tooltip("Add Point (in empty space)\nSplit Segment (in curve)."); + curve_create->set_tooltip(TTR("Add Point (in empty space)")+"\n"+TTR("Split Segment (in curve)")); SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_create); curve_del = memnew( ToolButton ); curve_del->set_icon(SpatialEditor::get_singleton()->get_icon("CurveDelete","EditorIcons")); curve_del->set_toggle_mode(true); curve_del->hide(); curve_del->set_focus_mode(Control::FOCUS_NONE); - curve_del->set_tooltip(TTR("Delete Point.")); + curve_del->set_tooltip(TTR("Delete Point")); SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_del); curve_close = memnew( ToolButton ); curve_close->set_icon(SpatialEditor::get_singleton()->get_icon("CurveClose","EditorIcons")); diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.cpp b/tools/editor/plugins/resource_preloader_editor_plugin.cpp index cc9aca1a25..dfe667dd02 100644 --- a/tools/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/tools/editor/plugins/resource_preloader_editor_plugin.cpp @@ -206,11 +206,11 @@ void ResourcePreloaderEditor::_delete_pressed() { _delete_confirm_pressed(); //it has undo.. why bother with a dialog.. /* - dialog->set_title(TTR("Confirm...")); - dialog->set_text(TTR("Remove Resource '")+tree->get_selected()->get_text(0)+"' ?"); - //dialog->get_cancel()->set_text(TTR("Cancel")); + dialog->set_title("Confirm..."); + dialog->set_text("Remove Resource '"+tree->get_selected()->get_text(0)+"' ?"); + //dialog->get_cancel()->set_text("Cancel"); //dialog->get_ok()->show(); - dialog->get_ok()->set_text(TTR("Remove")); + dialog->get_ok()->set_text("Remove"); dialog->popup_centered(Size2(300,60));*/ } diff --git a/tools/editor/plugins/rich_text_editor_plugin.cpp b/tools/editor/plugins/rich_text_editor_plugin.cpp index 99d75dff1d..bec48ca293 100644 --- a/tools/editor/plugins/rich_text_editor_plugin.cpp +++ b/tools/editor/plugins/rich_text_editor_plugin.cpp @@ -106,8 +106,8 @@ RichTextEditor::RichTextEditor() { CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options); options->set_area_as_parent_rect(); - options->set_text(TTR("RichText")); - options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE); + options->set_text("RichText"); + options->get_popup()->add_item(TTR("Parse BBCode"),PARSE_BBCODE); options->get_popup()->add_item(TTR("Clear"),CLEAR); options->get_popup()->connect("item_pressed", this,"_menu_option"); diff --git a/tools/editor/plugins/rich_text_editor_plugin.h b/tools/editor/plugins/rich_text_editor_plugin.h index 0196a30332..ae1d04be01 100644 --- a/tools/editor/plugins/rich_text_editor_plugin.h +++ b/tools/editor/plugins/rich_text_editor_plugin.h @@ -77,7 +77,7 @@ class RichTextEditorPlugin : public EditorPlugin { public: - virtual String get_name() const { return TTR("RichText"); } + virtual String get_name() const { return "RichText"; } bool has_main_screen() const { return false; } virtual void edit(Object *p_node); virtual bool handles(Object *p_node) const; diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/tools/editor/plugins/sample_editor_plugin.cpp index 8c5036b424..733e894bac 100644 --- a/tools/editor/plugins/sample_editor_plugin.cpp +++ b/tools/editor/plugins/sample_editor_plugin.cpp @@ -328,7 +328,7 @@ void SampleEditor::_update_sample() { return; //bye or unsupported generate_preview_texture(sample,peakdisplay); - info_label->set_text(TTR("Length: ")+itos(sample->get_length())+" frames ("+String::num(sample->get_length()/(float)sample->get_mix_rate(),2)+" s), "+(sample->get_format()==Sample::FORMAT_PCM16?"16 Bits, ":"8 bits, ")+(sample->is_stereo()?"Stereo.":"Mono.")); + info_label->set_text(TTR("Length:")+" "+vformat(TTR("%i frames"), sample->get_length())+" ("+String::num(sample->get_length()/(float)sample->get_mix_rate(),2)+" s), "+(sample->get_format()==Sample::FORMAT_PCM16?TTR("16 Bits"):TTR("8 Bits"))+", "+(sample->is_stereo()?TTR("Stereo"):TTR("Mono"))+"."); library->add_sample("default",sample); } diff --git a/tools/editor/plugins/sample_library_editor_plugin.cpp b/tools/editor/plugins/sample_library_editor_plugin.cpp index 8b03c4651d..93db7fdc6a 100644 --- a/tools/editor/plugins/sample_library_editor_plugin.cpp +++ b/tools/editor/plugins/sample_library_editor_plugin.cpp @@ -248,7 +248,7 @@ void SampleLibraryEditor::_update_library() { ti->set_cell_mode(2,TreeItem::CELL_MODE_STRING); ti->set_editable(2,false); ti->set_selectable(2,false); - ti->set_text(2,String()+/*itos(smp->get_length())+" frames ("+String::num(smp->get_length()/(float)smp->get_mix_rate(),2)+" smp), "+*/(smp->get_format()==Sample::FORMAT_PCM16?"16 Bits, ":(smp->get_format()==Sample::FORMAT_PCM8?"8 bits, ":TTR("IMA-ADPCM,")))+(smp->is_stereo()?"Stereo":"Mono")); + ti->set_text(2,String()+(smp->get_format()==Sample::FORMAT_PCM16?"16 Bits, ":(smp->get_format()==Sample::FORMAT_PCM8?"8 bits, ":"IMA-ADPCM,"))+(smp->is_stereo()?TTR("Stereo"):TTR("Mono"))); // Volume dB ti->set_cell_mode(3,TreeItem::CELL_MODE_RANGE); diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index d8d5fddfe9..581017a4ac 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -2523,7 +2523,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { site_search->set_text(TTR("Tutorials")); site_search->connect("pressed",this,"_menu_option",varray(SEARCH_WEBSITE)); menu_hb->add_child(site_search); - site_search->set_tooltip(TTR("Open http://www.godotengine.org at tutorials section.")); + site_search->set_tooltip(TTR("Open https://godotengine.org at tutorials section.")); class_search = memnew( ToolButton ); class_search->set_text(TTR("Classes")); diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index f618f41cf8..14db214260 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -743,7 +743,7 @@ void ShaderGraphView::_vec_op_changed(int p_op, int p_id){ void ShaderGraphView::_vec_scalar_op_changed(int p_op, int p_id){ UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo(); - ur->create_action(TTR("Change VecxScalar Operator")); + ur->create_action(TTR("Change Vec Scalar Operator")); ur->add_do_method(graph.ptr(),"vec_scalar_op_node_set_op",type,p_id,p_op); ur->add_undo_method(graph.ptr(),"vec_scalar_op_node_set_op",type,p_id,graph->vec_scalar_op_node_get_op(type,p_id)); ur->add_do_method(this,"_update_graph"); @@ -902,7 +902,7 @@ void ShaderGraphView::_variant_edited() { break; } UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo(); - ur->create_action(TTR("Change default value")); + ur->create_action(TTR("Change Default Value")); ur->add_do_method(graph.ptr(),"default_set_value",type,edited_id,edited_def, v); ur->add_undo_method(graph.ptr(),"default_set_value",type,edited_id,edited_def, v2); ur->add_do_method(this,"_update_graph"); @@ -1427,7 +1427,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // all inputs (case Shader type dependent) case ShaderGraph::NODE_SCALAR_CONST: { - gn->set_title(TTR("Scalar")); + gn->set_title("Scalar"); SpinBox *sb = memnew( SpinBox ); sb->set_min(-100000); sb->set_max(100000); @@ -1440,7 +1440,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; //scalar constant case ShaderGraph::NODE_VEC_CONST: { - gn->set_title(TTR("Vector")); + gn->set_title("Vector"); Array v3p(true); for(int i=0;i<3;i++) { HBoxContainer *hbc = memnew( HBoxContainer ); @@ -1469,11 +1469,11 @@ void ShaderGraphView::_create_node(int p_id) { cpb->connect("color_changed",this,"_rgb_const_changed",varray(p_id)); gn->add_child(cpb); Label *l = memnew( Label ); - l->set_text(TTR("RGB")); + l->set_text("RGB"); l->set_align(Label::ALIGN_RIGHT); gn->add_child(l); l = memnew( Label ); - l->set_text(TTR("Alpha")); + l->set_text("Alpha"); l->set_align(Label::ALIGN_RIGHT); gn->add_child(l); @@ -1482,7 +1482,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; //rgb constant (shows a color picker instead) case ShaderGraph::NODE_XFORM_CONST: { - gn->set_title(TTR("XForm")); + gn->set_title("XForm"); ToolButton *edit = memnew( ToolButton ); edit->set_text("edit.."); edit->connect("pressed",this,"_xform_const_changed",varray(p_id,edit)); @@ -1492,7 +1492,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // 4x4 matrix constant case ShaderGraph::NODE_TIME: { - gn->set_title(TTR("Time")); + gn->set_title("Time"); Label *l = memnew( Label ); l->set_text("(s)"); l->set_align(Label::ALIGN_RIGHT); @@ -1502,24 +1502,24 @@ void ShaderGraphView::_create_node(int p_id) { } break; // time in seconds case ShaderGraph::NODE_SCREEN_TEX: { - gn->set_title(TTR("ScreenTex")); + gn->set_title("ScreenTex"); HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); if (!graph->is_slot_connected(type,p_id,0)) { Vector3 v = graph->default_get_value(type, p_id, 0); - hbc->add_child(make_editor(TTR("UV: ") + v,gn,p_id,0,Variant::VECTOR3)); + hbc->add_child(make_editor("UV: " + v,gn,p_id,0,Variant::VECTOR3)); } else { - hbc->add_child(make_label(TTR("UV"),Variant::VECTOR3)); + hbc->add_child(make_label("UV",Variant::VECTOR3)); } hbc->add_spacer(); - hbc->add_child( memnew(Label(TTR("RGB")))); + hbc->add_child( memnew(Label("RGB"))); gn->add_child(hbc); gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]); } break; // screen texture sampler (takes UV) (only usable in fragment case Shader) case ShaderGraph::NODE_SCALAR_OP: { - gn->set_title(TTR("ScalarOp")); + gn->set_title("ScalarOp"); static const char* op_name[ShaderGraph::SCALAR_MAX_OP]={ ("Add"), ("Sub"), @@ -1567,7 +1567,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // scalar vs scalar op (mul: { } break; add: { } break; div: { } break; etc) case ShaderGraph::NODE_VEC_OP: { - gn->set_title(TTR("VecOp")); + gn->set_title("VecOp"); static const char* op_name[ShaderGraph::VEC_MAX_OP]={ ("Add"), ("Sub"), @@ -1615,7 +1615,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // vec3 vs vec3 op (mul: { } break;ad: { } break;div: { } break;crossprod: { } break;etc) case ShaderGraph::NODE_VEC_SCALAR_OP: { - gn->set_title(TTR("VecScalarOp")); + gn->set_title("VecScalarOp"); static const char* op_name[ShaderGraph::VEC_SCALAR_MAX_OP]={ ("Mul"), ("Div"), @@ -1657,7 +1657,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // vec3 vs scalar op (mul: { } break; add: { } break; div: { } break; etc) case ShaderGraph::NODE_RGB_OP: { - gn->set_title(TTR("RGB Op")); + gn->set_title("RGB Op"); static const char* op_name[ShaderGraph::RGB_MAX_OP]={ ("Screen"), ("Difference"), @@ -1702,7 +1702,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // vec3 vs vec3 rgb op (with scalar amount): { } break; like brighten: { } break; darken: { } break; burn: { } break; dodge: { } break; multiply: { } break; etc. case ShaderGraph::NODE_XFORM_MULT: { - gn->set_title(TTR("XFMult")); + gn->set_title("XFMult"); HBoxContainer *hbc = memnew( HBoxContainer ); if (graph->is_slot_connected(type, p_id, 0)) { hbc->add_child(make_label("a",Variant::TRANSFORM)); @@ -1725,9 +1725,9 @@ void ShaderGraphView::_create_node(int p_id) { } break; // mat4 x mat4 case ShaderGraph::NODE_XFORM_VEC_MULT: { - gn->set_title(TTR("XFVecMult")); + gn->set_title("XFVecMult"); - CheckBox *button = memnew (CheckBox(TTR("RotOnly"))); + CheckBox *button = memnew (CheckBox("RotOnly")); button->set_pressed(graph->xform_vec_mult_node_get_no_translation(type,p_id)); button->connect("toggled",this,"_xform_inv_rev_changed",varray(p_id)); @@ -1758,10 +1758,10 @@ void ShaderGraphView::_create_node(int p_id) { } break; case ShaderGraph::NODE_XFORM_VEC_INV_MULT: { - gn->set_title(TTR("XFVecInvMult")); + gn->set_title("XFVecInvMult"); - CheckBox *button = memnew( CheckBox(TTR("RotOnly"))); + CheckBox *button = memnew( CheckBox("RotOnly")); button->set_pressed(graph->xform_vec_mult_node_get_no_translation(type,p_id)); button->connect("toggled",this,"_xform_inv_rev_changed",varray(p_id)); @@ -1793,7 +1793,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // mat4 x vec3 inverse mult (with no-translation option) case ShaderGraph::NODE_SCALAR_FUNC: { - gn->set_title(TTR("ScalarFunc")); + gn->set_title("ScalarFunc"); static const char* func_name[ShaderGraph::SCALAR_MAX_FUNC]={ ("Sin"), ("Cos"), @@ -1846,7 +1846,7 @@ void ShaderGraphView::_create_node(int p_id) { - gn->set_title(TTR("VecFunc")); + gn->set_title("VecFunc"); static const char* func_name[ShaderGraph::VEC_MAX_FUNC]={ ("Normalize"), ("Saturate"), @@ -1882,7 +1882,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // vector function (normalize: { } break; negate: { } break; reciprocal: { } break; rgb2hsv: { } break; hsv2rgb: { } break; etc: { } break; etc) case ShaderGraph::NODE_VEC_LEN: { - gn->set_title(TTR("VecLength")); + gn->set_title("VecLength"); HBoxContainer *hbc = memnew( HBoxContainer ); if (graph->is_slot_connected(type, p_id, 0)) { hbc->add_child(make_label("in", Variant::VECTOR3)); @@ -1899,7 +1899,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // vec3 length case ShaderGraph::NODE_DOT_PROD: { - gn->set_title(TTR("DotProduct")); + gn->set_title("DotProduct"); HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); if (graph->is_slot_connected(type, p_id, 0)) { @@ -1924,7 +1924,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // vec3 . vec3 (dot product -> scalar output) case ShaderGraph::NODE_VEC_TO_SCALAR: { - gn->set_title(TTR("Vec2Scalar")); + gn->set_title("Vec2Scalar"); HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); if (graph->is_slot_connected(type, p_id, 0)) { @@ -1955,7 +1955,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // 1 vec3 input: { } break; 3 scalar outputs case ShaderGraph::NODE_SCALAR_TO_VEC: { - gn->set_title(TTR("Scalar2Vec")); + gn->set_title("Scalar2Vec"); HBoxContainer *hbc = memnew( HBoxContainer ); if (graph->is_slot_connected(type, p_id, 0)) { hbc->add_child(make_label("x", Variant::REAL)); @@ -1986,7 +1986,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // 3 scalar input: { } break; 1 vec3 output case ShaderGraph::NODE_VEC_TO_XFORM: { - gn->set_title(TTR("Vec2XForm")); + gn->set_title("Vec2XForm"); HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); if (graph->is_slot_connected(type, p_id, 0)) { @@ -2025,7 +2025,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // 3 vec input: { } break; 1 xform output case ShaderGraph::NODE_XFORM_TO_VEC: { - gn->set_title(TTR("XForm2Vec")); + gn->set_title("XForm2Vec"); HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); @@ -2057,7 +2057,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // 3 vec input: { } break; 1 xform output case ShaderGraph::NODE_SCALAR_INTERP: { - gn->set_title(TTR("ScalarInterp")); + gn->set_title("ScalarInterp"); HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); if (graph->is_slot_connected(type, p_id, 0)) { @@ -2090,7 +2090,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // scalar interpolation (with optional curve) case ShaderGraph::NODE_VEC_INTERP: { - gn->set_title(TTR("VecInterp")); + gn->set_title("VecInterp"); HBoxContainer *hbc = memnew( HBoxContainer ); if (graph->is_slot_connected(type, p_id, 0)) { hbc->add_child(make_label("a", Variant::VECTOR3)); @@ -2174,7 +2174,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // scalar interpolation (with optional curve) case ShaderGraph::NODE_CURVE_MAP: { - gn->set_title(TTR("CurveMap")); + gn->set_title("CurveMap"); GraphCurveMapEdit * map = memnew( GraphCurveMapEdit ); DVector<Vector2> points = graph->curve_map_node_get_points(type,p_id); @@ -2221,7 +2221,7 @@ void ShaderGraphView::_create_node(int p_id) { case ShaderGraph::NODE_SCALAR_INPUT: { - gn->set_title(TTR("ScalarUniform")); + gn->set_title("ScalarUniform"); LineEdit *le = memnew( LineEdit ); gn->add_child(le); le->set_text(graph->input_node_get_name(type,p_id)); @@ -2238,7 +2238,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // scalar uniform (assignable in material) case ShaderGraph::NODE_VEC_INPUT: { - gn->set_title(TTR("VectorUniform")); + gn->set_title("VectorUniform"); LineEdit *le = memnew( LineEdit ); gn->add_child(le); le->set_text(graph->input_node_get_name(type,p_id)); @@ -2265,7 +2265,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // vec3 uniform (assignable in material) case ShaderGraph::NODE_RGB_INPUT: { - gn->set_title(TTR("ColorUniform")); + gn->set_title("ColorUniform"); LineEdit *le = memnew( LineEdit ); gn->add_child(le); le->set_text(graph->input_node_get_name(type,p_id)); @@ -2275,11 +2275,11 @@ void ShaderGraphView::_create_node(int p_id) { cpb->connect("color_changed",this,"_rgb_input_changed",varray(p_id)); gn->add_child(cpb); Label *l = memnew( Label ); - l->set_text(TTR("RGB")); + l->set_text("RGB"); l->set_align(Label::ALIGN_RIGHT); gn->add_child(l); l = memnew( Label ); - l->set_text(TTR("Alpha")); + l->set_text("Alpha"); l->set_align(Label::ALIGN_RIGHT); gn->add_child(l); @@ -2289,7 +2289,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // color uniform (assignable in material) case ShaderGraph::NODE_XFORM_INPUT: { - gn->set_title(TTR("XFUniform")); + gn->set_title("XFUniform"); LineEdit *le = memnew( LineEdit ); gn->add_child(le); le->set_text(graph->input_node_get_name(type,p_id)); @@ -2303,7 +2303,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // mat4 uniform (assignable in material) case ShaderGraph::NODE_TEXTURE_INPUT: { - gn->set_title(TTR("TexUniform")); + gn->set_title("TexUniform"); LineEdit *le = memnew( LineEdit ); gn->add_child(le); le->set_text(graph->input_node_get_name(type,p_id)); @@ -2321,18 +2321,18 @@ void ShaderGraphView::_create_node(int p_id) { HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); if (graph->is_slot_connected(type, p_id, 0)) { - hbc->add_child(make_label(TTR("UV"), Variant::VECTOR3)); + hbc->add_child(make_label("UV", Variant::VECTOR3)); } else { Vector3 v = graph->default_get_value(type,p_id,0); - hbc->add_child(make_editor(String(TTR("UV: "))+v,gn,p_id,0,Variant::VECTOR3)); + hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3)); } hbc->add_spacer(); - Label *l=memnew(Label(TTR("RGB"))); + Label *l=memnew(Label("RGB")); l->set_align(Label::ALIGN_RIGHT); hbc->add_child(l); gn->add_child(hbc); l = memnew( Label ); - l->set_text(TTR("Alpha")); + l->set_text("Alpha"); l->set_align(Label::ALIGN_RIGHT); gn->add_child(l); @@ -2342,7 +2342,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // texture input (assignable in material) case ShaderGraph::NODE_CUBEMAP_INPUT: { - gn->set_title(TTR("TexUniform")); + gn->set_title("TexUniform"); LineEdit *le = memnew( LineEdit ); gn->add_child(le); le->set_text(graph->input_node_get_name(type,p_id)); @@ -2357,18 +2357,18 @@ void ShaderGraphView::_create_node(int p_id) { HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); if (graph->is_slot_connected(type, p_id, 0)) { - hbc->add_child(make_label(TTR("UV"), Variant::VECTOR3)); + hbc->add_child(make_label("UV", Variant::VECTOR3)); } else { Vector3 v = graph->default_get_value(type,p_id,0); - hbc->add_child(make_editor(String(TTR("UV: "))+v,gn,p_id,0,Variant::VECTOR3)); + hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3)); } hbc->add_spacer(); - Label *l=memnew(Label(TTR("RGB"))); + Label *l=memnew(Label("RGB")); l->set_align(Label::ALIGN_RIGHT); hbc->add_child(l); gn->add_child(hbc); l = memnew( Label ); - l->set_text(TTR("Alpha")); + l->set_text("Alpha"); l->set_align(Label::ALIGN_RIGHT); gn->add_child(l); @@ -2378,22 +2378,22 @@ void ShaderGraphView::_create_node(int p_id) { } break; // cubemap input (assignable in material) case ShaderGraph::NODE_DEFAULT_TEXTURE: { - gn->set_title(TTR("CanvasItemTex")); + gn->set_title("CanvasItemTex"); HBoxContainer *hbc = memnew( HBoxContainer ); hbc->add_constant_override("separation",0); if (graph->is_slot_connected(type, p_id, 0)) { - hbc->add_child(make_label(TTR("UV"), Variant::VECTOR3)); + hbc->add_child(make_label("UV", Variant::VECTOR3)); } else { Vector3 v = graph->default_get_value(type,p_id,0); - hbc->add_child(make_editor(String(TTR("UV: "))+v,gn,p_id,0,Variant::VECTOR3)); + hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3)); } hbc->add_spacer(); - Label *l=memnew(Label(TTR("RGB"))); + Label *l=memnew(Label("RGB")); l->set_align(Label::ALIGN_RIGHT); hbc->add_child(l); gn->add_child(hbc); l = memnew( Label ); - l->set_text(TTR("Alpha")); + l->set_text("Alpha"); l->set_align(Label::ALIGN_RIGHT); gn->add_child(l); @@ -2404,7 +2404,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // screen texture sampler (takes UV) (only usable in fragment case Shader) case ShaderGraph::NODE_OUTPUT: { - gn->set_title(TTR("Output")); + gn->set_title("Output"); gn->set_show_close_button(false); List<ShaderGraph::SlotInfo> si; @@ -2412,22 +2412,22 @@ void ShaderGraphView::_create_node(int p_id) { Array colors; colors.push_back("Color"); - colors.push_back(TTR("LightColor")); + colors.push_back("LightColor"); colors.push_back("Light"); - colors.push_back(TTR("Diffuse")); - colors.push_back(TTR("Specular")); - colors.push_back(TTR("Emmision")); + colors.push_back("Diffuse"); + colors.push_back("Specular"); + colors.push_back("Emmision"); Array reals; - reals.push_back(TTR("Alpha")); - reals.push_back(TTR("DiffuseAlpha")); - reals.push_back(TTR("NormalMapDepth")); - reals.push_back(TTR("SpecExp")); - reals.push_back(TTR("Glow")); - reals.push_back(TTR("ShadeParam")); - reals.push_back(TTR("SpecularExp")); - reals.push_back(TTR("LightAlpha")); - reals.push_back(TTR("PointSize")); - reals.push_back(TTR("Discard")); + reals.push_back("Alpha"); + reals.push_back("DiffuseAlpha"); + reals.push_back("NormalMapDepth"); + reals.push_back("SpecExp"); + reals.push_back("Glow"); + reals.push_back("ShadeParam"); + reals.push_back("SpecularExp"); + reals.push_back("LightAlpha"); + reals.push_back("PointSize"); + reals.push_back("Discard"); int idx=0; for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) { @@ -2448,7 +2448,7 @@ void ShaderGraphView::_create_node(int p_id) { } break; // output (case Shader type dependent) case ShaderGraph::NODE_COMMENT: { - gn->set_title(TTR("Comment")); + gn->set_title("Comment"); TextEdit *te = memnew(TextEdit); te->set_custom_minimum_size(Size2(100,100)); gn->add_child(te); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index fa709eb0cb..7baabd9899 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -561,7 +561,7 @@ void SpatialEditorViewport::_select_region() { void SpatialEditorViewport::_update_name() { - String ortho = orthogonal?TTR("Orthogonal"):"Perspective"; + String ortho = orthogonal?TTR("Orthogonal"):TTR("Perspective"); if (name!="") view_menu->set_text("[ "+name+" "+ortho+" ]"); @@ -1353,7 +1353,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { scale = Math::stepify(scale,spatial_editor->get_scale_snap()); } - set_message(TTR("Scaling to ")+String::num(scale,1)+"%."); + set_message(vformat(TTR("Scaling to %s\%."),String::num(scale,1))); scale/=100.0; Transform r; @@ -1431,7 +1431,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { motion.snap(snap); } - //set_message(TTR("Translating: ")+motion); + //set_message("Translating: "+motion); List<Node*> &selection = editor_selection->get_selected_node_list(); @@ -1493,13 +1493,13 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { if (snap) { angle=Math::rad2deg(angle)+snap*0.5; //else it wont reach +180 angle-=Math::fmod(angle,snap); - set_message(TTR("Rotating ")+rtos(angle)+" degrees."); + set_message(vformat(TTR("Rotating %s degrees."),rtos(angle))); angle=Math::deg2rad(angle); } else - set_message(TTR("Rotating ")+rtos(Math::rad2deg(angle))+" degrees."); + set_message(vformat(TTR("Rotating %s degrees."),rtos(Math::rad2deg(angle)))); } else { - set_message(TTR("Rotating ")+rtos(Math::rad2deg(angle))+" degrees."); + set_message(vformat(TTR("Rotating %s degrees."),rtos(Math::rad2deg(angle)))); } @@ -1967,7 +1967,7 @@ void SpatialEditorViewport::_draw() { if (surface->has_focus()) { Size2 size = surface->get_size(); Rect2 r =Rect2(Point2(),size); - get_stylebox(TTR("EditorFocus"),"EditorStyles")->draw(surface->get_canvas_item(),r); + get_stylebox("EditorFocus","EditorStyles")->draw(surface->get_canvas_item(),r); } diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.cpp b/tools/editor/plugins/sprite_frames_editor_plugin.cpp index b2f10ccaae..abd316ff30 100644 --- a/tools/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/tools/editor/plugins/sprite_frames_editor_plugin.cpp @@ -333,11 +333,11 @@ void SpriteFramesEditor::_delete_pressed() { _delete_confirm_pressed(); //it has undo.. why bother with a dialog.. /* - dialog->set_title(TTR("Confirm...")); - dialog->set_text(TTR("Remove Resource '")+tree->get_selected()->get_text(0)+"' ?"); - //dialog->get_cancel()->set_text(TTR("Cancel")); + dialog->set_title("Confirm..."); + dialog->set_text("Remove Resource '"+tree->get_selected()->get_text(0)+"' ?"); + //dialog->get_cancel()->set_text("Cancel"); //dialog->get_ok()->show(); - dialog->get_ok()->set_text(TTR("Remove")); + dialog->get_ok()->set_text("Remove"); dialog->popup_centered(Size2(300,60));*/ } @@ -530,7 +530,7 @@ void SpriteFramesEditor::_update_library(bool p_skip_selector) { if (frames->get_frame(edited_anim,i).is_null()) { - name=itos(i)+TTR(": (empty)"); + name=itos(i)+": "+TTR("(empty)"); } else { name=itos(i)+": "+frames->get_frame(edited_anim,i)->get_name(); diff --git a/tools/editor/plugins/sprite_region_editor_plugin.h b/tools/editor/plugins/sprite_region_editor_plugin.h index 6fe235c2ea..47cb210863 100644 --- a/tools/editor/plugins/sprite_region_editor_plugin.h +++ b/tools/editor/plugins/sprite_region_editor_plugin.h @@ -119,7 +119,7 @@ class SpriteRegionEditorPlugin : public EditorPlugin EditorNode *editor; public: - virtual String get_name() const { return TTR("SpriteRegion"); } + virtual String get_name() const { return "SpriteRegion"; } bool has_main_screen() const { return false; } virtual void edit(Object *p_node); virtual bool handles(Object *p_node) const; diff --git a/tools/editor/plugins/stream_editor_plugin.h b/tools/editor/plugins/stream_editor_plugin.h index 90046a5fdf..5730612d61 100644 --- a/tools/editor/plugins/stream_editor_plugin.h +++ b/tools/editor/plugins/stream_editor_plugin.h @@ -69,7 +69,7 @@ class StreamEditorPlugin : public EditorPlugin { public: - virtual String get_name() const { return TTR("Stream"); } + virtual String get_name() const { return "Stream"; } bool has_main_screen() const { return false; } virtual void edit(Object *p_node); virtual bool handles(Object *p_node) const; diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp index 3c394ab6ac..7d839bea2f 100644 --- a/tools/editor/plugins/theme_editor_plugin.cpp +++ b/tools/editor/plugins/theme_editor_plugin.cpp @@ -199,7 +199,7 @@ void ThemeEditor::_save_template_cbk(String fname) { if (!file) { - ERR_EXPLAIN(TTR("Can't save theme to file: ")+filename); + ERR_EXPLAIN(TTR("Can't save theme to file:")+" "+filename); return; } file->store_line("; ******************* "); diff --git a/tools/editor/plugins/tile_set_editor_plugin.cpp b/tools/editor/plugins/tile_set_editor_plugin.cpp index b77d3fb5b3..a2c7147bf3 100644 --- a/tools/editor/plugins/tile_set_editor_plugin.cpp +++ b/tools/editor/plugins/tile_set_editor_plugin.cpp @@ -175,7 +175,7 @@ void TileSetEditor::_name_dialog_confirm(const String& name) { if (tileset->has_tile(id)) { tileset->remove_tile(id); } else { - err_dialog->set_text(TTR("Could not find tile: ") + name); + err_dialog->set_text(TTR("Could not find tile:")+" " + name); err_dialog->popup_centered(Size2(300, 60)); } } break; diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index adb15c1f00..5bf70b4d7d 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -505,7 +505,7 @@ void ProjectExportDialog::_export_action_pck(const String& p_file) { if (p_file.ends_with(".pck")) { FileAccess *f = FileAccess::open(p_file,FileAccess::WRITE); if (!f) { - error->set_text(TTR("Error exporting project PCK! Can't write")); + error->set_text(TTR("Error writing the project PCK!")); error->popup_centered_minsize(); } ERR_FAIL_COND(!f); @@ -586,7 +586,7 @@ void ProjectExportDialog::custom_action(const String&) { Ref<EditorExportPlatform> exporter = EditorImportExport::get_singleton()->get_export_platform(platform); if (exporter.is_null()) { - error->set_text(TTR("No exporter for platform '")+platform+"' yet."); + error->set_text(vformat(TTR("No exporter for platform '%s' yet."),platform)); error->popup_centered_minsize(); return; } @@ -858,17 +858,17 @@ void ProjectExportDialog::_group_add() { if (name=="") { group_new_name_error->show(); - group_new_name_error->set_text(TTR("Group Name Can't be Empty!")); + group_new_name_error->set_text(TTR("Group name can't be empty!")); return; } if (name.find("/")!=-1 || name.find(":")!=-1 || name.find(",")!=-1 || name.find("-")!=-1) { - group_new_name_error->set_text(TTR("Invalid Character in Group Name!")); + group_new_name_error->set_text(TTR("Invalid character in group name!")); group_new_name_error->show(); return; } if (EditorImportExport::get_singleton()->image_export_has_group(name)) { - group_new_name_error->set_text(TTR("Group Name Already Exists!")); + group_new_name_error->set_text(TTR("Group name already exists!")); group_new_name_error->show(); return; } @@ -1061,13 +1061,13 @@ void ProjectExportDialog::_group_atlas_preview() { Error err = plugin->import2(dst_file,imd,EditorExportPlatform::IMAGE_COMPRESSION_NONE,true); if (err) { - EditorNode::add_io_error(TTR("Error saving atlas! ")+dst_file.get_file()); + EditorNode::add_io_error(TTR("Error saving atlas:")+" "+dst_file.get_file()); return; } Ref<Texture> tex = ResourceLoader::load(dst_file); atlas_preview_frame->set_texture(tex); //clear previous - atlas_preview_dialog->set_title(TTR("Atlas Preview (")+itos(tex->get_width())+"x"+itos(tex->get_height())+")"); + atlas_preview_dialog->set_title(TTR("Atlas Preview")+" ("+itos(tex->get_width())+"x"+itos(tex->get_height())+")"); atlas_preview_dialog->popup_centered_ratio(0.9); } @@ -1211,10 +1211,10 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) { tree->set_column_min_width(1,90); filters = memnew( LineEdit ); - vb->add_margin_child(TTR("Filters to export non-resource files (Comma Separated, eg: *.json, *.txt):"),filters); + vb->add_margin_child(TTR("Filters to export non-resource files (comma-separated, e.g.: *.json, *.txt):"),filters); filters->connect("text_changed",this,"_filters_edited"); filters_exclude = memnew( LineEdit ); - vb->add_margin_child(TTR("Filters to exclude from export (Comma Separated, eg: *.json, *.txt):"),filters_exclude); + vb->add_margin_child(TTR("Filters to exclude from export (comma-separated, e.g.: *.json, *.txt):"),filters_exclude); filters_exclude->connect("text_changed",this,"_filters_exclude_edited"); convert_text_scenes = memnew( CheckButton ); @@ -1260,7 +1260,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) { fmt->set_editable(0,true); formats.push_back(fmt); } - image_vb->add_margin_child(TTR("Compress Formats: "),image_formats,true); + image_vb->add_margin_child(TTR("Compress Formats:")+" ",image_formats,true); /// groups HBoxContainer *group_hb = memnew( HBoxContainer ); @@ -1421,7 +1421,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) { sample_max_hz = memnew( SpinBox ); sample_max_hz->set_max(192000); sample_max_hz->set_min(8000); - sample_vbox->add_margin_child(TTR("Sampling Rate Limit: (hz)"),sample_max_hz); + sample_vbox->add_margin_child(TTR("Sampling Rate Limit (Hz):"),sample_max_hz); sample_trim = memnew( CheckButton ); sample_trim->set_text(TTR("Trim")); sample_vbox->add_margin_child(TTR("Trailing Silence:"),sample_trim); @@ -1529,7 +1529,7 @@ Error ProjectExport::export_project(const String& p_preset) { String preset_path=Globals::get_singleton()->get("export_presets_path/"+selected); if (preset_path=="") { - error->set_text(TTR("Export path empty, see export options")); + error->set_text("Export path empty, see export options"); error->popup_centered_minsize(Size2(300,100)); ERR_FAIL_V(ERR_INVALID_DATA); } @@ -1551,9 +1551,9 @@ Error ProjectExport::export_project(const String& p_preset) { } if (pc%3 != 0 ) { memdelete(d); - error->set_text(TTR("Corrupted export data..")); + error->set_text("Corrupted export data.."); error->popup_centered_minsize(Size2(300,100)); - ERR_EXPLAIN(TTR("Corrupted export data...")); + ERR_EXPLAIN("Corrupted export data..."); ERR_FAIL_V(ERR_INVALID_DATA); } @@ -1706,7 +1706,7 @@ Error ProjectExport::export_project(const String& p_preset) { if (err!=OK) { memdelete(da); memdelete(d); - ERR_EXPLAIN(TTR("Cannot make dir: ")+cwd+"/"+p); + ERR_EXPLAIN("Cannot make dir: "+cwd+"/"+p); ERR_FAIL_V(ERR_CANT_CREATE); } @@ -1714,7 +1714,7 @@ Error ProjectExport::export_project(const String& p_preset) { memdelete(da); memdelete(d); - ERR_EXPLAIN(TTR("Cannot change to dir: ")+cwd+"/"+p); + ERR_EXPLAIN("Cannot change to dir: "+cwd+"/"+p); ERR_FAIL_V(ERR_CANT_CREATE); } @@ -1742,7 +1742,7 @@ Error ProjectExport::export_project(const String& p_preset) { if (!Globals::get_singleton()->has("optimizer_presets/"+preset)) { memdelete(d); - ERR_EXPLAIN(TTR("Unknown optimizer preset: ")+preset); + ERR_EXPLAIN("Unknown optimizer preset: "+preset); ERR_FAIL_V(ERR_INVALID_DATA); } @@ -1763,7 +1763,7 @@ Error ProjectExport::export_project(const String& p_preset) { if (saver.is_null()) { memdelete(d); - ERR_EXPLAIN(TTR("Preset '")+preset+"' references nonexistent saver: "+type); + ERR_EXPLAIN("Preset '"+preset+"' references nonexistent saver: "+type); ERR_FAIL_COND_V(saver.is_null(),ERR_INVALID_DATA); } @@ -1807,7 +1807,7 @@ Error ProjectExport::export_project(const String& p_preset) { if (res.is_null()) { memdelete(d); - ERR_EXPLAIN(TTR("Errr loading resource to optimize: ")+path); + ERR_EXPLAIN("Error loading resource to optimize: "+path); ERR_FAIL_V(ERR_INVALID_DATA); } @@ -1830,7 +1830,7 @@ Error ProjectExport::export_project(const String& p_preset) { Error err = ResourceSaver::save(write_file,res,flags,saver); if (err) { memdelete(d); - ERR_EXPLAIN(TTR("Errr saving optimized resource: ")+write_file); + ERR_EXPLAIN("Error saving optimized resource: "+write_file); ERR_FAIL_COND_V(err,ERR_CANT_OPEN); } source_file=write_file; @@ -1853,7 +1853,7 @@ Error ProjectExport::export_project(const String& p_preset) { if (err) { - ERR_EXPLAIN(TTR("Error copying from: ")+source_file+" to "+dst_file+"."); + ERR_EXPLAIN("Error copying from: "+source_file+" to "+dst_file+"."); ERR_FAIL_COND_V(err,err); } diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index abc64cd9cb..395760fb52 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -66,7 +66,7 @@ class NewProjectDialog : public ConfirmationDialog { get_ok()->set_disabled(true); DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); if (project_path->get_text() != "" && d->change_dir(project_path->get_text())!=OK) { - error->set_text(TTR("Invalid Path for Project, Path Must Exist!")); + error->set_text(TTR("Invalid project path, the path must exist!")); memdelete(d); return false; } @@ -75,7 +75,7 @@ class NewProjectDialog : public ConfirmationDialog { if (d->file_exists("engine.cfg")) { - error->set_text(TTR("Invalid Project Path (engine.cfg must not exist).")); + error->set_text(TTR("Invalid project path, engine.cfg must not exist.")); memdelete(d); return false; } @@ -84,7 +84,7 @@ class NewProjectDialog : public ConfirmationDialog { if (project_path->get_text() != "" && !d->file_exists("engine.cfg")) { - error->set_text(TTR("Invalid Project Path (engine.cfg must exist).")); + error->set_text(TTR("Invalid project path, engine.cfg must exist.")); memdelete(d); return false; } @@ -170,7 +170,7 @@ class NewProjectDialog : public ConfirmationDialog { DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); if (d->change_dir(project_path->get_text())!=OK) { - error->set_text(TTR("Invalid Path for Project (changed anything?)")); + error->set_text(TTR("Invalid project path (changed anything?).")); memdelete(d); return; } @@ -180,7 +180,7 @@ class NewProjectDialog : public ConfirmationDialog { FileAccess *f = FileAccess::open(dir.plus_file("/engine.cfg"),FileAccess::WRITE); if (!f) { - error->set_text(TTR("Couldn't create engine.cfg in project path")); + error->set_text(TTR("Couldn't create engine.cfg in project path.")); } else { f->store_line("; Engine configuration file."); @@ -247,7 +247,7 @@ public: if (import_mode) { set_title(TTR("Import Existing Project")); get_ok()->set_text(TTR("Import")); - pp->set_text(TTR("Project Path: (Must exist)")); + pp->set_text(TTR("Project Path (Must Exist):")); pn->set_text(TTR("Project Name:")); pn->hide(); project_name->hide(); @@ -788,7 +788,7 @@ void ProjectManager::_erase_project() { return; - erase_ask->set_text(TTR("Remove project from list?? (Folder contents will not be modified)")); + erase_ask->set_text(TTR("Remove project from the list? (Folder contents will not be modified)")); erase_ask->popup_centered_minsize(); } diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index d69d565795..e484b94c5c 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -139,7 +139,7 @@ void ProjectSettings::_action_edited() { ti->set_text(0,old_name); add_at="input/"+old_name; - message->set_text(TTR("Invalid Action (Anything goes but / or :).")); + message->set_text(TTR("Invalid action (anything goes but '/' or ':').")); message->popup_centered(Size2(300,100)); return; } @@ -151,7 +151,7 @@ void ProjectSettings::_action_edited() { ti->set_text(0,old_name); add_at="input/"+old_name; - message->set_text(TTR("Action '")+new_name+"' already exists!."); + message->set_text(vformat(TTR("Action '%s' already exists!"),new_name)); message->popup_centered(Size2(300,100)); return; } @@ -357,7 +357,7 @@ void ProjectSettings::_add_item(int p_item){ for(int i=0;i<JOY_AXIS_MAX*2;i++) { String desc = _axis_names[i]; - device_index->add_item(TTR("Axis ")+itos(i/2)+" "+(i&1?"+":"-")+desc); + device_index->add_item(TTR("Axis")+" "+itos(i/2)+" "+(i&1?"+":"-")+desc); } device_input->popup_centered(Size2(350,95)); @@ -517,7 +517,7 @@ void ProjectSettings::_update_actions() { } break; case InputEvent::JOYSTICK_BUTTON: { - String str = TTR("Device ")+itos(ie.device)+", Button "+itos(ie.joy_button.button_index); + String str = TTR("Device")+" "+itos(ie.device)+", "+TTR("Button")+" "+itos(ie.joy_button.button_index); if (ie.joy_button.button_index>=0 && ie.joy_button.button_index<JOY_BUTTON_MAX) str+=String()+" ("+_button_names[ie.joy_button.button_index]+")."; else @@ -528,14 +528,14 @@ void ProjectSettings::_update_actions() { } break; case InputEvent::MOUSE_BUTTON: { - String str = TTR("Device ")+itos(ie.device)+", "; + String str = TTR("Device")+" "+itos(ie.device)+", "; switch (ie.mouse_button.button_index) { case BUTTON_LEFT: str+=TTR("Left Button."); break; case BUTTON_RIGHT: str+=TTR("Right Button."); break; case BUTTON_MIDDLE: str+=TTR("Middle Button."); break; case BUTTON_WHEEL_UP: str+=TTR("Wheel Up."); break; case BUTTON_WHEEL_DOWN: str+=TTR("Wheel Down."); break; - default: str+=TTR("Button ")+itos(ie.mouse_button.button_index)+"."; + default: str+=TTR("Button")+" "+itos(ie.mouse_button.button_index)+"."; } action->set_text(0,str); @@ -546,7 +546,7 @@ void ProjectSettings::_update_actions() { int ax = ie.joy_motion.axis; int n = 2*ax + (ie.joy_motion.axis_value<0 ? 0:1); String desc = _axis_names[n]; - String str = TTR("Device ")+itos(ie.device)+", Axis "+itos(ax)+" "+(ie.joy_motion.axis_value<0?"-":"+")+desc +"."; + String str = TTR("Device")+" "+itos(ie.device)+", "+TTR("Axis")+" "+itos(ax)+" "+(ie.joy_motion.axis_value<0?"-":"+")+desc +"."; action->set_text(0,str); action->set_icon(0,get_icon("JoyAxis","EditorIcons")); } break; @@ -650,13 +650,13 @@ void ProjectSettings::_action_add() { String action = action_name->get_text(); if (action.find("/")!=-1 || action.find(":")!=-1 || action=="") { - message->set_text(TTR("Invalid Action (Anything goes but / or :).")); + message->set_text(TTR("Invalid action (anything goes but '/' or ':').")); message->popup_centered(Size2(300,100)); return; } if (Globals::get_singleton()->has("input/"+action)) { - message->set_text(TTR("Action '")+action+"' already exists!."); + message->set_text(vformat(TTR("Action '%s' already exists!"),action)); message->popup_centered(Size2(300,100)); return; } @@ -710,7 +710,7 @@ void ProjectSettings::_item_checked(const String& p_item, bool p_check) { void ProjectSettings::_save() { Error err = Globals::get_singleton()->save(); - message->set_text(err!=OK?TTR("Error saving settings."):"Settings Saved OK."); + message->set_text(err!=OK?TTR("Error saving settings."):TTR("Settings saved OK.")); message->popup_centered(Size2(300,100)); } @@ -851,7 +851,7 @@ void ProjectSettings::_autoload_edited() { if (checked) path="*"+path; - undo_redo->create_action(TTR("Toggle Autoload GlobalVar")); + undo_redo->create_action(TTR("Toggle AutoLoad Globals")); undo_redo->add_do_property(Globals::get_singleton(),base,path); undo_redo->add_undo_property(Globals::get_singleton(),base,Globals::get_singleton()->get(base)); undo_redo->add_do_method(Globals::get_singleton(),"set_order",base,order); // keep order, as config order matters for these @@ -869,7 +869,7 @@ void ProjectSettings::_autoload_add() { String name = autoload_add_name->get_text(); if (!name.is_valid_identifier()) { - message->set_text("Invalid Name.\nValid characters: a-z,A-Z,0-9 or _"); + message->set_text(TTR("Invalid name.")+"\n"+TTR("Valid characters:")+" a-z, A-Z, 0-9 or _"); message->popup_centered(Size2(300,100)); return; @@ -877,7 +877,7 @@ void ProjectSettings::_autoload_add() { if (ObjectTypeDB::type_exists(name)) { - message->set_text(TTR("Invalid Name.Must not collide with an existing engine class name.")); + message->set_text(TTR("Invalid name. Must not collide with an existing engine class name.")); message->popup_centered(Size2(300,100)); return; @@ -886,7 +886,7 @@ void ProjectSettings::_autoload_add() { for(int i=0;i<Variant::VARIANT_MAX;i++) { if (Variant::get_type_name(Variant::Type(i))==name) { - message->set_text(TTR("Invalid Name.Must not collide with an existing buit-in type name.")); + message->set_text(TTR("Invalid name. Must not collide with an existing buit-in type name.")); message->popup_centered(Size2(300,100)); return; @@ -897,7 +897,7 @@ void ProjectSettings::_autoload_add() { if (GlobalConstants::get_global_constant_name(i)==name) { - message->set_text(TTR("Invalid Name.Must not collide with an existing global constant name.")); + message->set_text(TTR("Invalid name. Must not collide with an existing global constant name.")); message->popup_centered(Size2(300,100)); return; } diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index c4f54e04cb..b6e090472b 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -691,10 +691,10 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty int id = TYPE_BASE_ID+idx; if (has_icon(t,"EditorIcons")) { - menu->add_icon_item(get_icon(t,"EditorIcons"),"New "+t,id); + menu->add_icon_item(get_icon(t,"EditorIcons"),TTR("New")+" "+t,id); } else { - menu->add_item(TTR("New ")+t,id); + menu->add_item(TTR("New")+" "+t,id); } idx++; @@ -936,7 +936,7 @@ void CustomPropertyEditor::_node_path_selected(NodePath p_path) { if (owner->is_type("Node")) node = owner->cast_to<Node>(); - else if (owner->is_type(TTR("ArrayPropertyEdit"))) + else if (owner->is_type("ArrayPropertyEdit")) node = owner->cast_to<ArrayPropertyEdit>()->get_node(); if (!node) { @@ -1732,7 +1732,7 @@ CustomPropertyEditor::CustomPropertyEditor() { add_child(checks20[i]); checks20[i]->hide(); checks20[i]->connect("pressed",this,"_action_pressed",make_binds(i)); - checks20[i]->set_tooltip(TTR("Bit ")+itos(i)+", val "+itos(1<<i)+"."); + checks20[i]->set_tooltip(vformat(TTR("Bit %i, val %i."), i, 1<<i)); } text_edit = memnew( TextEdit ); @@ -2658,11 +2658,11 @@ void PropertyEditor::update_tree() { TreeItem *title = tree->create_item(root); title->set_custom_bg_color(0,get_color("prop_section","Editor")); - title->set_text(0,TTR("Property")); // todo, fetch name if ID exists in database + title->set_text(0,"Property"); // todo, fetch name if ID exists in database title->set_editable(0,false); title->set_selectable(0,false); title->set_custom_bg_color(1,get_color("prop_section","Editor")); - title->set_text(1,TTR("Value")); // todo, fetch name if ID exists in database + title->set_text(1,"Value"); // todo, fetch name if ID exists in database title->set_editable(1,false); title->set_selectable(1,false); */ @@ -2671,7 +2671,7 @@ void PropertyEditor::update_tree() { if (obj->cast_to<Node>() || obj->cast_to<Resource>()) { TreeItem *type = tree->create_item(root); - type->set_text(0,TTR("Type")); // todo, fetch name if ID exists in database + type->set_text(0,"Type"); // todo, fetch name if ID exists in database type->set_text(1,obj->get_type()); // todo, fetch name if ID exists in database if (has_icon(obj->get_type(),"EditorIcons")) type->set_icon(1,get_icon(obj->get_type(),"EditorIcons") ); @@ -2684,7 +2684,7 @@ void PropertyEditor::update_tree() { TreeItem *name = tree->create_item(root); - name->set_text(0,TTR("Name")); // todo, fetch name if ID exists in database + name->set_text(0,"Name"); // todo, fetch name if ID exists in database if (obj->is_type("Resource")) name->set_text(1,obj->cast_to<Resource>()->get_name()); else if (obj->is_type("Node")) @@ -2767,7 +2767,7 @@ void PropertyEditor::update_tree() { } - sep->set_tooltip(0,TTR("Class: ")+p.name+":\n\n"+class_descr_cache[type]); + sep->set_tooltip(0,TTR("Class:")+" "+p.name+":\n\n"+class_descr_cache[type]); } //sep->set_custom_color(0,Color(1,1,1)); @@ -2864,7 +2864,7 @@ void PropertyEditor::update_tree() { descr_cache[type][setter]=descr; } - item->set_tooltip(0, TTR("Property: ")+p.name+"\n\n"+descr); + item->set_tooltip(0, TTR("Property:")+" "+p.name+"\n\n"+descr); } } //EditorHelp::get_doc_data(); @@ -3433,7 +3433,7 @@ void PropertyEditor::_edit_set(const String& p_name, const Variant& p_value) { } else { - undo_redo->create_action(TTR("Set ")+p_name,true); + undo_redo->create_action(TTR("Set")+" "+p_name,true); undo_redo->add_do_property(obj,p_name,p_value); undo_redo->add_undo_property(obj,p_name,obj->get(p_name)); undo_redo->add_do_method(this,"_changed_callback",obj,p_name); diff --git a/tools/editor/pvrtc_compress.cpp b/tools/editor/pvrtc_compress.cpp index fcb3c7abc8..8626c632e3 100644 --- a/tools/editor/pvrtc_compress.cpp +++ b/tools/editor/pvrtc_compress.cpp @@ -93,13 +93,13 @@ static void _compress_image(Image::CompressMode p_mode,Image *p_image) { ResourceSaver::save(src_img,t); Error err = OS::get_singleton()->execute(ttpath,args,true); - ERR_EXPLAIN(TTR("Could not execute PVRTC Tool: ")+ttpath); + ERR_EXPLAIN(TTR("Could not execute PVRTC tool:")+" "+ttpath); ERR_FAIL_COND(err!=OK); t=ResourceLoader::load(dst_img,"Texture"); - ERR_EXPLAIN(TTR("Can't load back converted image using PVRTC Tool: ")+dst_img); + ERR_EXPLAIN(TTR("Can't load back converted image using PVRTC tool:")+" "+dst_img); ERR_FAIL_COND(t.is_null()); *p_image=t->get_data(); diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index d0569920bd..88307bcace 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -66,7 +66,7 @@ void SceneTreeDock::instance(const String& p_file) { current_option=-1; //accept->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("Ok :( ")); + accept->get_ok()->set_text(TTR("OK :(")); accept->set_text(TTR("No parent to instance a child at.")); accept->popup_centered_minsize(); return; @@ -98,7 +98,7 @@ void SceneTreeDock::instance_scenes(const Vector<String>& p_files,Node* parent,i current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text(TTR("Ugh")); - accept->set_text(String(TTR("Error loading scene from "))+p_files[i]); + accept->set_text(vformat(TTR("Error loading scene from %s"),p_files[i])); accept->popup_centered_minsize(); error=true; break; @@ -110,7 +110,7 @@ void SceneTreeDock::instance_scenes(const Vector<String>& p_files,Node* parent,i current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text(TTR("Ugh")); - accept->set_text(String(TTR("Error instancing scene from "))+p_files[i]); + accept->set_text(vformat(TTR("Error instancing scene from %s"),p_files[i])); accept->popup_centered_minsize(); error=true; break; @@ -122,7 +122,7 @@ void SceneTreeDock::instance_scenes(const Vector<String>& p_files,Node* parent,i if (_cyclical_dependency_exists(edited_scene->get_filename(), instanced_scene)) { accept->get_ok()->set_text(TTR("Ok")); - accept->set_text(String(TTR("Cannot instance the scene '"))+p_files[i]+String(TTR("' because the current scene exists within one of its' nodes."))); + accept->set_text(vformat(TTR("Cannot instance the scene '%s' because the current scene exists within one of its nodes."),p_files[i])); accept->popup_centered_minsize(); error=true; break; diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index 7332bbb8b0..09a5e7860f 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -293,13 +293,13 @@ bool SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) { if (p_node==get_scene_node() && p_node->get_scene_inherited_state().is_valid()) { item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE); - item->set_tooltip(0,TTR("Inherits: ")+p_node->get_scene_inherited_state()->get_path()+"\nType: "+p_node->get_type()); + item->set_tooltip(0,TTR("Inherits:")+" "+p_node->get_scene_inherited_state()->get_path()+"\n"+TTR("Type:")+" "+p_node->get_type()); } else if (p_node!=get_scene_node() && p_node->get_filename()!="" && can_open_instance) { item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE); - item->set_tooltip(0,TTR("Instance: ")+p_node->get_filename()+"\nType: "+p_node->get_type()); + item->set_tooltip(0,TTR("Instance:")+" "+p_node->get_filename()+"\n"+TTR("Type:")+" "+p_node->get_type()); } else { - item->set_tooltip(0,String(p_node->get_name())+"\nType: "+p_node->get_type()); + item->set_tooltip(0,String(p_node->get_name())+"\n"+TTR("Type:")+" "+p_node->get_type()); } if (can_open_instance) { @@ -684,7 +684,7 @@ void SceneTreeEditor::_renamed() { String new_name=which->get_text(0); if (new_name.find(".") != -1 || new_name.find("/") != -1) { - error->set_text(TTR("Invalid node name, the following characters are not allowed:\n \".\", \"/\"")); + error->set_text(TTR("Invalid node name, the following characters are not allowed:")+"\n \".\", \"/\""); error->popup_centered_minsize(); new_name=n->get_name(); } diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp index e00f470bc4..fdee470057 100644 --- a/tools/editor/scenes_dock.cpp +++ b/tools/editor/scenes_dock.cpp @@ -859,7 +859,7 @@ void ScenesDock::_move_operation(const String& p_to_path) { for(int i=0;i<move_dirs.size();i++) { if (p_to_path.begins_with(move_dirs[i])) { - EditorNode::get_singleton()->show_warning(TTR("Can't move directories to within themselves")); + EditorNode::get_singleton()->show_warning(TTR("Can't move directories to within themselves.")); return; } @@ -1036,7 +1036,7 @@ void ScenesDock::_file_option(int p_option) { rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE); rename_dialog->set_current_path(move_files[0]); rename_dialog->popup_centered_ratio(); - rename_dialog->set_title(TTR("Pick New Name and Location For: ")+move_files[0].get_file()); + rename_dialog->set_title(TTR("Pick New Name and Location For:")+" "+move_files[0].get_file()); } else { diff --git a/tools/editor/script_create_dialog.cpp b/tools/editor/script_create_dialog.cpp index 8d410f6fa3..e88d603b30 100644 --- a/tools/editor/script_create_dialog.cpp +++ b/tools/editor/script_create_dialog.cpp @@ -74,17 +74,17 @@ bool ScriptCreateDialog::_validate(const String& p_string) { void ScriptCreateDialog::_class_name_changed(const String& p_name) { if (!_validate(parent_name->get_text())) { - error_label->set_text(TTR("Invaild parent class name")); + error_label->set_text(TTR("Invalid parent class name")); error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8)); } else if (class_name->is_editable()) { if (class_name->get_text()=="") { - error_label->set_text(TTR("Valid Chars: a-z A-Z 0-9 _")); + error_label->set_text(TTR("Valid chars:")+" a-z A-Z 0-9 _"); error_label->add_color_override("font_color",Color(1,1,1,0.6)); } else if (!_validate(class_name->get_text())) { error_label->set_text(TTR("Invalid class name")); error_label->add_color_override("font_color",Color(1,0.2,0.2,0.8)); } else { - error_label->set_text(TTR("Valid Name")); + error_label->set_text(TTR("Valid name")); error_label->add_color_override("font_color",Color(0,1.0,0.8,0.8)); } } else { @@ -98,12 +98,12 @@ void ScriptCreateDialog::ok_pressed() { if (class_name->is_editable() && !_validate(class_name->get_text())) { - alert->set_text(TTR("Class Name is Invalid!")); + alert->set_text(TTR("Class name is invalid!")); alert->popup_centered_minsize(); return; } if (!_validate(parent_name->get_text())) { - alert->set_text(TTR("Parent Class Name is Invalid!")); + alert->set_text(TTR("Parent class name is invalid!")); alert->popup_centered_minsize(); return; @@ -133,7 +133,7 @@ void ScriptCreateDialog::ok_pressed() { script->set_path(lpath); if (!path_valid) { - alert->set_text(TTR("Path is Invalid!")); + alert->set_text(TTR("Invalid path!")); alert->popup_centered_minsize(); return; @@ -141,7 +141,7 @@ void ScriptCreateDialog::ok_pressed() { Error err = ResourceSaver::save(lpath,scr,ResourceSaver::FLAG_CHANGE_PATH); if (err!=OK) { - alert->set_text(TTR("Could not create script in filesystem: ")+String("")); + alert->set_text(TTR("Could not create script in filesystem.")); alert->popup_centered_minsize(); return; } @@ -215,7 +215,7 @@ void ScriptCreateDialog::_path_changed(const String& p_path) { if (p=="") { - path_error_label->set_text(TTR("Path is Empty")); + path_error_label->set_text(TTR("Path is empty")); path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8)); return; @@ -234,7 +234,7 @@ void ScriptCreateDialog::_path_changed(const String& p_path) { if (d->change_dir(p.get_base_dir())!=OK) { - path_error_label->set_text(TTR("Base Path Invalid")); + path_error_label->set_text(TTR("Invalid base path")); path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8)); memdelete(d); return; @@ -249,7 +249,7 @@ void ScriptCreateDialog::_path_changed(const String& p_path) { if (f->file_exists(p)) { - path_error_label->set_text(TTR("File Exists")); + path_error_label->set_text(TTR("File exists")); path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8)); memdelete(f); return; @@ -273,13 +273,13 @@ void ScriptCreateDialog::_path_changed(const String& p_path) { if (!found) { - path_error_label->set_text(TTR("Invalid Extension")); + path_error_label->set_text(TTR("Invalid extension")); path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8)); return; } - path_error_label->set_text(TTR("Path is Valid")); + path_error_label->set_text(TTR("Valid path")); path_error_label->add_color_override("font_color",Color(0,1.0,0.8,0.8)); path_valid=true; @@ -363,7 +363,7 @@ ScriptCreateDialog::ScriptCreateDialog() { set_size(Size2(200,150)); set_hide_on_ok(false); - set_title(TTR("Create Script for Node")); + set_title(TTR("Create Node Script")); file_browse = memnew( EditorFileDialog ); file_browse->connect("file_selected",this,"_file_selected"); diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp index 325eadc1e5..0dedbe245a 100644 --- a/tools/editor/script_editor_debugger.cpp +++ b/tools/editor/script_editor_debugger.cpp @@ -279,7 +279,7 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat it->set_icon(0,get_icon(type,"EditorIcons")); } - vmem_total->set_tooltip(TTR("Bytes: ")+itos(total)); + vmem_total->set_tooltip(TTR("Bytes:")+" "+itos(total)); vmem_total->set_text(String::humanize_size(total)); } else if (p_msg=="stack_dump") { @@ -399,12 +399,12 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat String time = String("%d:%02d:%02d:%04d").sprintf(vals,&e); String txt=time+" - "+String(err[8]); - String tooltip=TTR("Type:")+String(warning?"Warning":"Error"); - tooltip+="\nDescription: "+String(err[8]); - tooltip+="\nTime: "+time; - tooltip+="\nC Error: "+String(err[7]); - tooltip+="\nC Source: "+String(err[5])+":"+String(err[6]); - tooltip+="\nC Function: "+String(err[4]); + String tooltip=TTR("Type:")+String(warning?TTR("Warning"):TTR("Error")); + tooltip+="\n"+TTR("Description:")+" "+String(err[8]); + tooltip+="\n"+TTR("Time:")+" "+time; + tooltip+="\nC "+TTR("Error:")+" "+String(err[7]); + tooltip+="\nC "+TTR("Source:")+" "+String(err[5])+":"+String(err[6]); + tooltip+="\nC "+TTR("Function:")+" "+String(err[4]); @@ -558,8 +558,8 @@ void ScriptEditorDebugger::_notification(int p_what) { debugger_button->set_icon(Ref<Texture>()); tabs->set_tab_icon(error_split->get_index(),Ref<Texture>()); } else { - error_split->set_name(TTR("Errors (")+itos(error_count)+")"); - debugger_button->set_text(TTR("Debugger (")+itos(error_count)+")"); + error_split->set_name(TTR("Errors")+" ("+itos(error_count)+")"); + debugger_button->set_text(TTR("Debugger")+" ("+itos(error_count)+")"); debugger_button->set_icon(get_icon("Error","EditorIcons")); tabs->set_tab_icon(error_split->get_index(),get_icon("Error","EditorIcons")); } @@ -1151,7 +1151,7 @@ void ScriptEditorDebugger::_error_selected(int p_idx) { error_stack->add_item(str); error_stack->set_item_metadata(error_stack->get_item_count()-1,md); - error_stack->set_item_tooltip(error_stack->get_item_count()-1,TTR("File: ")+String(st[i])+"\nLine: "+itos(line)); + error_stack->set_item_tooltip(error_stack->get_item_count()-1,TTR("File:")+" "+String(st[i])+"\n"+TTR("Line:")+" "+itos(line)); } } @@ -1265,7 +1265,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){ forward = memnew( Button ); hbc->add_child(forward); - back->set_tooltip(TTR("Inspect Next Instance")); + forward->set_tooltip(TTR("Inspect Next Instance")); HSplitContainer *sc = memnew( HSplitContainer ); @@ -1366,10 +1366,10 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){ VBoxContainer *vmem_vb = memnew( VBoxContainer ); HBoxContainer *vmem_hb = memnew( HBoxContainer ); - Label *vmlb = memnew(Label(TTR("List of Video Memory Usage by Resource: ")) ); + Label *vmlb = memnew(Label(TTR("List of Video Memory Usage by Resource:")+" ") ); vmlb->set_h_size_flags(SIZE_EXPAND_FILL); vmem_hb->add_child( vmlb ); - vmem_hb->add_child( memnew(Label(TTR("Total: "))) ); + vmem_hb->add_child( memnew(Label(TTR("Total:")+" ")) ); vmem_total = memnew( LineEdit ); vmem_total->set_editable(false); vmem_total->set_custom_minimum_size(Size2(100,1)); diff --git a/tools/editor/settings_config_dialog.cpp b/tools/editor/settings_config_dialog.cpp index 2a871efb18..7d369d7262 100644 --- a/tools/editor/settings_config_dialog.cpp +++ b/tools/editor/settings_config_dialog.cpp @@ -122,7 +122,7 @@ EditorSettingsDialog::EditorSettingsDialog() { vbc->add_child(hbc); Label *l = memnew( Label ); - l->set_text(TTR("Search: ")); + l->set_text(TTR("Search:")+" "); hbc->add_child(l); search_box = memnew( LineEdit ); @@ -146,16 +146,16 @@ EditorSettingsDialog::EditorSettingsDialog() { hbc = memnew( HBoxContainer ); vbc->add_child(hbc); - hbc->add_child( memnew( Label(TTR("Plugin List: ")))); + hbc->add_child( memnew( Label(TTR("Plugin List:")+" ") )); hbc->add_spacer(); //Button *load = memnew( Button ); - //load->set_text(TTR("Load..")); + //load->set_text("Load.."); //hbc->add_child(load); - //get_ok()->set_text(TTR("Apply")); + //get_ok()->set_text("Apply"); set_hide_on_ok(true); - //get_cancel()->set_text(TTR("Close")); + //get_cancel()->set_text("Close"); timer = memnew( Timer ); timer->set_wait_time(1.5); |