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/editor_settings.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/editor/editor_settings.cpp') 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 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); -- 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/editor_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/editor/editor_settings.cpp') diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index a83125d0bb..91d7e7ebd4 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -464,7 +464,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { set("2d_editor/bone_color2",Color(0.75,0.75,0.75,0.9)); set("2d_editor/bone_selected_color",Color(0.9,0.45,0.45,0.9)); set("2d_editor/bone_ik_color",Color(0.9,0.9,0.45,0.9)); - + set("2d_editor/keep_margins_when_changing_anchors", false); set("game_window_placement/rect",0); -- cgit v1.2.3