From 94c34ff8906935cf0a9ef5ad82c6755ee21bbd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 19 May 2016 00:08:12 +0200 Subject: i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there. --- tools/editor/plugins/spatial_editor_plugin.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tools/editor/plugins/spatial_editor_plugin.cpp') 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 &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); } -- cgit v1.2.3 From 00d8f8604476b525869787f0962bf41b4b591061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 21 May 2016 01:18:35 +0200 Subject: i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated. --- tools/editor/plugins/spatial_editor_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/editor/plugins/spatial_editor_plugin.cpp') diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 7baabd9899..30296100d0 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -2482,7 +2482,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed view_menu->get_popup()->add_check_item(TTR("Orthogonal (Num5)"),VIEW_ORTHOGONAL); view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE),true); view_menu->get_popup()->add_separator(); - view_menu->get_popup()->add_check_item("Environment",VIEW_ENVIRONMENT); + view_menu->get_popup()->add_check_item(TTR("Environment"),VIEW_ENVIRONMENT); view_menu->get_popup()->set_item_checked( view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT),true); view_menu->get_popup()->add_separator(); view_menu->get_popup()->add_check_item(TTR("Audio Listener"),VIEW_AUDIO_LISTENER); -- cgit v1.2.3 From 33403d91f77f1f34b19bff763391500bc9c2616c Mon Sep 17 00:00:00 2001 From: Hubert Jarosz Date: Sat, 21 May 2016 15:29:25 +0200 Subject: remove trailing whitespace --- tools/editor/plugins/spatial_editor_plugin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/editor/plugins/spatial_editor_plugin.cpp') diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 30296100d0..fa99a3d335 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1229,7 +1229,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { case InputEvent::MOUSE_MOTION: { const InputEventMouseMotion &m=p_event.mouse_motion; _edit.mouse_pos=Point2(p_event.mouse_motion.x,p_event.mouse_motion.y); - + if (spatial_editor->get_selected()) { @@ -1265,7 +1265,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { NavigationScheme nav_scheme = _get_navigation_schema("3d_editor/navigation_scheme"); NavigationMode nav_mode = NAVIGATION_NONE; - + if (_edit.gizmo.is_valid()) { Plane plane=Plane(_edit.gizmo_initial_pos,_get_camera_normal()); @@ -1591,7 +1591,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { mod=KEY_CONTROL; if (m.mod.meta) mod=KEY_META; - + if(mod){ if (mod == _get_key_modifier("3d_editor/pan_modifier")) nav_mode = NAVIGATION_PAN; @@ -1815,7 +1815,7 @@ void SpatialEditorViewport::_notification(int p_what) { if (visible) _update_camera(); - + call_deferred("update_transform_gizmo_view"); } -- cgit v1.2.3 From be053e62860a6b9d712e6ece4cde025569ff2efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 21 May 2016 16:34:56 +0200 Subject: i18n: Use %d instead of %i in vformat Fixes #4742. --- tools/editor/plugins/spatial_editor_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/editor/plugins/spatial_editor_plugin.cpp') diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index fa99a3d335..55485d8c92 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1353,7 +1353,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { scale = Math::stepify(scale,spatial_editor->get_scale_snap()); } - set_message(vformat(TTR("Scaling to %s\%."),String::num(scale,1))); + set_message(vformat(TTR("Scaling to %s%%."),String::num(scale,1))); scale/=100.0; Transform r; -- cgit v1.2.3