Reworked translation system

-Label and Button reload translation on the fly
-Resources are loaded and reload depending on locale

core/io/resource_format_binary.cpp

@@ -689,6 +689,7 @@ Error ResourceInteractiveLoaderBinary::poll() {
 
 		f->close();
 		resource = res;
+		resource->set_as_translation_remapped(translation_remapped);
 		error = ERR_FILE_EOF;
 
 	} else {
@@ -706,6 +707,11 @@ int ResourceInteractiveLoaderBinary::get_stage_count() const {
 	return external_resources.size() + internal_resources.size();
 }
 
+void ResourceInteractiveLoaderBinary::set_translation_remapped(bool p_remapped) {
+
+	translation_remapped = p_remapped;
+}
+
 static void save_ustring(FileAccess *f, const String &p_string) {
 
 	CharString utf8 = p_string.utf8();
@@ -920,6 +926,7 @@ ResourceInteractiveLoaderBinary::ResourceInteractiveLoaderBinary() {
 	endian_swap = false;
 	use_real64 = false;
 	error = OK;
+	translation_remapped = false;
 }
 
 ResourceInteractiveLoaderBinary::~ResourceInteractiveLoaderBinary() {

core/io/resource_format_binary.h

@@ -36,6 +36,7 @@
 
 class ResourceInteractiveLoaderBinary : public ResourceInteractiveLoader {
 
+	bool translation_remapped;
 	String local_path;
 	String res_path;
 	String type;
@@ -87,6 +88,7 @@ public:
 	virtual Error poll();
 	virtual int get_stage() const;
 	virtual int get_stage_count() const;
+	virtual void set_translation_remapped(bool p_remapped);
 
 	void set_remaps(const Map<String, String> &p_remaps) { remaps = p_remaps; }
 	void open(FileAccess *p_f);

core/io/resource_loader.cpp

@@ -29,10 +29,12 @@
 /*************************************************************************/
 #include "resource_loader.h"
 #include "global_config.h"
+#include "io/resource_import.h"
 #include "os/file_access.h"
 #include "os/os.h"
 #include "path_remap.h"
 #include "print_string.h"
+#include "translation.h"
 ResourceFormatLoader *ResourceLoader::loader[MAX_LOADERS];
 
 int ResourceLoader::loader_count = 0;
@@ -102,6 +104,7 @@ public:
 	virtual Error poll() { return ERR_FILE_EOF; }
 	virtual int get_stage() const { return 1; }
 	virtual int get_stage_count() const { return 1; }
+	virtual void set_translation_remapped(bool p_remapped) { resource->set_as_translation_remapped(p_remapped); }
 
 	ResourceInteractiveLoaderDefault() {}
 };
@@ -165,38 +168,45 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p
 	else
 		local_path = GlobalConfig::get_singleton()->localize_path(p_path);
 
-	ERR_FAIL_COND_V(local_path == "", RES());
+	bool xl_remapped = false;
+	String path = _path_remap(local_path, &xl_remapped);
 
-	if (!p_no_cache && ResourceCache::has(local_path)) {
+	ERR_FAIL_COND_V(path == "", RES());
+
+	if (!p_no_cache && ResourceCache::has(path)) {
 
 		if (OS::get_singleton()->is_stdout_verbose())
-			print_line("load resource: " + local_path + " (cached)");
+			print_line("load resource: " + path + " (cached)");
 
-		return RES(ResourceCache::get(local_path));
+		return RES(ResourceCache::get(path));
 	}
 
 	if (OS::get_singleton()->is_stdout_verbose())
-		print_line("load resource: " + local_path);
+		print_line("load resource: " + path);
 	bool found = false;
 
 	// Try all loaders and pick the first match for the type hint
 	for (int i = 0; i < loader_count; i++) {
 
-		if (!loader[i]->recognize_path(local_path, p_type_hint)) {
+		if (!loader[i]->recognize_path(path, p_type_hint)) {
 			continue;
 		}
 		found = true;
-		RES res = loader[i]->load(local_path, local_path, r_error);
+		RES res = loader[i]->load(path, path, r_error);
 		if (res.is_null()) {
 			continue;
 		}
 		if (!p_no_cache)
 			res->set_path(local_path);
+
+		if (xl_remapped)
+			res->set_as_translation_remapped(true);
+
 #ifdef TOOLS_ENABLED
 
 		res->set_edited(false);
 		if (timestamp_on_load) {
-			uint64_t mt = FileAccess::get_modified_time(local_path);
+			uint64_t mt = FileAccess::get_modified_time(path);
 			//printf("mt %s: %lli\n",remapped_path.utf8().get_data(),mt);
 			res->set_last_modified_time(mt);
 		}
@@ -206,9 +216,9 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p
 	}
 
 	if (found) {
-		ERR_EXPLAIN("Failed loading resource: " + p_path);
+		ERR_EXPLAIN("Failed loading resource: " + path);
 	} else {
-		ERR_EXPLAIN("No loader found for resource: " + p_path);
+		ERR_EXPLAIN("No loader found for resource: " + path);
 	}
 	ERR_FAIL_V(RES());
 	return RES();
@@ -225,14 +235,17 @@ Ref<ResourceInteractiveLoader> ResourceLoader::load_interactive(const String &p_
 	else
 		local_path = GlobalConfig::get_singleton()->localize_path(p_path);
 
-	ERR_FAIL_COND_V(local_path == "", Ref<ResourceInteractiveLoader>());
+	bool xl_remapped = false;
+	String path = _path_remap(local_path, &xl_remapped);
+
+	ERR_FAIL_COND_V(path == "", Ref<ResourceInteractiveLoader>());
 
-	if (!p_no_cache && ResourceCache::has(local_path)) {
+	if (!p_no_cache && ResourceCache::has(path)) {
 
 		if (OS::get_singleton()->is_stdout_verbose())
-			print_line("load resource: " + local_path + " (cached)");
+			print_line("load resource: " + path + " (cached)");
 
-		Ref<Resource> res_cached = ResourceCache::get(local_path);
+		Ref<Resource> res_cached = ResourceCache::get(path);
 		Ref<ResourceInteractiveLoaderDefault> ril = Ref<ResourceInteractiveLoaderDefault>(memnew(ResourceInteractiveLoaderDefault));
 
 		ril->resource = res_cached;
@@ -246,22 +259,24 @@ Ref<ResourceInteractiveLoader> ResourceLoader::load_interactive(const String &p_
 
 	for (int i = 0; i < loader_count; i++) {
 
-		if (!loader[i]->recognize_path(local_path, p_type_hint))
+		if (!loader[i]->recognize_path(path, p_type_hint))
 			continue;
 		found = true;
-		Ref<ResourceInteractiveLoader> ril = loader[i]->load_interactive(local_path, r_error);
+		Ref<ResourceInteractiveLoader> ril = loader[i]->load_interactive(path, r_error);
 		if (ril.is_null())
 			continue;
 		if (!p_no_cache)
 			ril->set_local_path(local_path);
+		if (xl_remapped)
+			ril->set_translation_remapped(true);
 
 		return ril;
 	}
 
 	if (found) {
-		ERR_EXPLAIN("Failed loading resource: " + p_path);
+		ERR_EXPLAIN("Failed loading resource: " + path);
 	} else {
-		ERR_EXPLAIN("No loader found for resource: " + p_path);
+		ERR_EXPLAIN("No loader found for resource: " + path);
 	}
 	ERR_FAIL_V(Ref<ResourceInteractiveLoader>());
 	return Ref<ResourceInteractiveLoader>();
@@ -283,11 +298,13 @@ void ResourceLoader::add_resource_format_loader(ResourceFormatLoader *p_format_l
 
 void ResourceLoader::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
 
+	String path = _path_remap(p_path);
+
 	String local_path;
-	if (p_path.is_rel_path())
-		local_path = "res://" + p_path;
+	if (path.is_rel_path())
+		local_path = "res://" + path;
 	else
-		local_path = GlobalConfig::get_singleton()->localize_path(p_path);
+		local_path = GlobalConfig::get_singleton()->localize_path(path);
 
 	for (int i = 0; i < loader_count; i++) {
 
@@ -304,11 +321,13 @@ void ResourceLoader::get_dependencies(const String &p_path, List<String> *p_depe
 
 Error ResourceLoader::rename_dependencies(const String &p_path, const Map<String, String> &p_map) {
 
+	String path = _path_remap(p_path);
+
 	String local_path;
-	if (p_path.is_rel_path())
-		local_path = "res://" + p_path;
+	if (path.is_rel_path())
+		local_path = "res://" + path;
 	else
-		local_path = GlobalConfig::get_singleton()->localize_path(p_path);
+		local_path = GlobalConfig::get_singleton()->localize_path(path);
 
 	for (int i = 0; i < loader_count; i++) {
 
@@ -342,6 +361,95 @@ String ResourceLoader::get_resource_type(const String &p_path) {
 
 	return "";
 }
+
+String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_remapped) {
+
+	if (translation_remaps.has(p_path)) {
+
+		Vector<String> &v = *translation_remaps.getptr(p_path);
+		String locale = TranslationServer::get_singleton()->get_locale();
+		if (r_translation_remapped) {
+			*r_translation_remapped = true;
+		}
+		for (int i = 0; i < v.size(); i++) {
+
+			int split = v[i].find_last(":");
+			if (split == -1)
+				continue;
+			String l = v[i].right(split + 1).strip_edges();
+			if (l == String())
+				continue;
+
+			if (l.begins_with(locale)) {
+				return v[i].left(split);
+			}
+		}
+	}
+
+	return p_path;
+}
+
+String ResourceLoader::import_remap(const String &p_path) {
+
+	if (ResourceFormatImporter::get_singleton()->recognize_path(p_path)) {
+
+		return ResourceFormatImporter::get_singleton()->get_internal_resource_path(p_path);
+	}
+
+	return p_path;
+}
+
+String ResourceLoader::path_remap(const String &p_path) {
+	return _path_remap(p_path);
+}
+
+void ResourceLoader::reload_translation_remaps() {
+
+	if (ResourceCache::lock) {
+		ResourceCache::lock->read_lock();
+	}
+
+	List<Resource *> to_reload;
+	SelfList<Resource> *E = remapped_list.first();
+
+	while (E) {
+		to_reload.push_back(E->self());
+		E = E->next();
+	}
+
+	if (ResourceCache::lock) {
+		ResourceCache::lock->read_unlock();
+	}
+
+	//now just make sure to not delete any of these resources while changing locale..
+	while (to_reload.front()) {
+		to_reload.front()->get()->reload_from_file();
+		to_reload.pop_front();
+	}
+}
+
+void ResourceLoader::load_translation_remaps() {
+
+	Dictionary remaps = GlobalConfig::get_singleton()->get("locale/translation_remaps");
+	List<Variant> keys;
+	remaps.get_key_list(&keys);
+	for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
+
+		Array langs = remaps[E->get()];
+		Vector<String> lang_remaps;
+		lang_remaps.resize(langs.size());
+		for (int i = 0; i < langs.size(); i++) {
+			lang_remaps[i] = langs[i];
+		}
+
+		translation_remaps[String(E->get())] = lang_remaps;
+	}
+}
+
+void ResourceLoader::clear_translation_remaps() {
+	translation_remaps.clear();
+}
+
 ResourceLoadErrorNotify ResourceLoader::err_notify = NULL;
 void *ResourceLoader::err_notify_ud = NULL;
 
@@ -350,3 +458,6 @@ void *ResourceLoader::dep_err_notify_ud = NULL;
 
 bool ResourceLoader::abort_on_missing_resource = true;
 bool ResourceLoader::timestamp_on_load = false;
+
+SelfList<Resource>::List ResourceLoader::remapped_list;
+HashMap<String, Vector<String> > ResourceLoader::translation_remaps;

core/io/resource_loader.h

@@ -49,6 +49,7 @@ public:
 	virtual Error poll() = 0;
 	virtual int get_stage() const = 0;
 	virtual int get_stage_count() const = 0;
+	virtual void set_translation_remapped(bool p_remapped) = 0;
 	virtual Error wait();
 
 	ResourceInteractiveLoader() {}
@@ -87,6 +88,12 @@ class ResourceLoader {
 	static void *dep_err_notify_ud;
 	static DependencyErrorNotify dep_err_notify;
 	static bool abort_on_missing_resource;
+	static HashMap<String, Vector<String> > translation_remaps;
+
+	static String _path_remap(const String &p_path, bool *r_translation_remapped = NULL);
+	friend class Resource;
+
+	static SelfList<Resource>::List remapped_list;
 
 public:
 	static Ref<ResourceInteractiveLoader> load_interactive(const String &p_path, const String &p_type_hint = "", bool p_no_cache = false, Error *r_error = NULL);
@@ -118,6 +125,13 @@ public:
 
 	static void set_abort_on_missing_resources(bool p_abort) { abort_on_missing_resource = p_abort; }
 	static bool get_abort_on_missing_resources() { return abort_on_missing_resource; }
+
+	static String path_remap(const String &p_path);
+	static String import_remap(const String &p_path);
+
+	static void reload_translation_remaps();
+	static void load_translation_remaps();
+	static void clear_translation_remaps();
 };
 
 #endif

core/resource.cpp

@@ -31,9 +31,9 @@
 
 #include "core_string_names.h"
 #include "io/resource_loader.h"
+#include "io/resource_loader.h"
 #include "os/file_access.h"
 #include "script_language.h"
-
 #include <stdio.h>
 
 void Resource::emit_changed() {
@@ -127,7 +127,7 @@ void Resource::reload_from_file() {
 	if (!path.is_resource_file())
 		return;
 
-	Ref<Resource> s = ResourceLoader::load(path, get_class(), true);
+	Ref<Resource> s = ResourceLoader::load(ResourceLoader::path_remap(path), get_class(), true);
 
 	if (!s.is_valid())
 		return;
@@ -302,6 +302,31 @@ void Resource::setup_local_to_scene() {
 
 Node *(*Resource::_get_local_scene_func)() = NULL;
 
+void Resource::set_as_translation_remapped(bool p_remapped) {
+
+	if (remapped_list.in_list() == p_remapped)
+		return;
+
+	if (ResourceCache::lock) {
+		ResourceCache::lock->write_lock();
+	}
+
+	if (p_remapped) {
+		ResourceLoader::remapped_list.add(&remapped_list);
+	} else {
+		ResourceLoader::remapped_list.remove(&remapped_list);
+	}
+
+	if (ResourceCache::lock) {
+		ResourceCache::lock->write_unlock();
+	}
+}
+
+bool Resource::is_translation_remapped() const {
+
+	return remapped_list.in_list();
+}
+
 void Resource::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_path", "path"), &Resource::_set_path);
@@ -325,7 +350,8 @@ void Resource::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_setup_local_to_scene"));
 }
 
-Resource::Resource() {
+Resource::Resource()
+	: remapped_list(this) {
 
 #ifdef TOOLS_ENABLED
 	last_modified_time = 0;

core/resource.h

@@ -35,6 +35,7 @@
 #include "ref_ptr.h"
 #include "reference.h"
 #include "safe_refcount.h"
+#include "self_list.h"
 
 /**
 	@author Juan Linietsky <[email protected]>
@@ -74,6 +75,8 @@ class Resource : public Reference {
 	friend class SceneState;
 	Node *local_scene;
 
+	SelfList<Resource> remapped_list;
+
 protected:
 	void emit_changed();
 
@@ -127,6 +130,9 @@ public:
 
 #endif
 
+	void set_as_translation_remapped(bool p_remapped);
+	bool is_translation_remapped() const;
+
 	virtual RID get_rid() const; // some resources may offer conversion to RID
 
 	Resource();
@@ -137,6 +143,7 @@ typedef Ref<Resource> RES;
 
 class ResourceCache {
 	friend class Resource;
+	friend class ResourceLoader; //need the lock
 	static RWLock *lock;
 	static HashMap<String, Resource *> resources;
 	friend void unregister_core_types();

core/translation.cpp

@@ -870,6 +870,10 @@ void Translation::set_locale(const String &p_locale) {
 	} else {
 		locale = univ_locale;
 	}
+
+	if (OS::get_singleton()->get_main_loop()) {
+		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_TRANSLATION_CHANGED);
+	}
 }
 
 void Translation::add_message(const StringName &p_src_text, const StringName &p_xlated_text) {
@@ -945,6 +949,8 @@ void TranslationServer::set_locale(const String &p_locale) {
 	if (OS::get_singleton()->get_main_loop()) {
 		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_TRANSLATION_CHANGED);
 	}
+
+	ResourceLoader::reload_translation_remaps();
 }
 
 String TranslationServer::get_locale() const {

core/variant_op.cpp

@@ -2148,7 +2148,7 @@ void Variant::get_property_list(List<PropertyInfo> *p_list) const {
 
 		} break; // 10
 		case RECT3: {
-			p_list->push_back(PropertyInfo(Variant::VECTOR3, "pos"));
+			p_list->push_back(PropertyInfo(Variant::VECTOR3, "position"));
 			p_list->push_back(PropertyInfo(Variant::VECTOR3, "size"));
 			p_list->push_back(PropertyInfo(Variant::VECTOR3, "end"));
 		} break;

editor/editor_node.cpp

@@ -5026,6 +5026,7 @@ EditorNode::EditorNode() {
 
 	EditorHelp::generate_doc(); //before any editor classes are crated
 	SceneState::set_disable_placeholders(true);
+	ResourceLoader::clear_translation_remaps(); //no remaps using during editor
 	editor_initialize_certificates(); //for asset sharing
 
 	InputDefault *id = Input::get_singleton()->cast_to<InputDefault>();

main/main.cpp

@@ -1013,6 +1013,7 @@ Error Main::setup2() {
 		translation_server->set_locale(locale);
 	}
 	translation_server->load_translations();
+	ResourceLoader::load_translation_remaps(); //load remaps for resources
 
 	audio_server->load_default_bus_layout();
 

scene/3d/particles.cpp

@@ -627,7 +627,7 @@ void ParticlesMaterial::_update_shader() {
 
 	if (flags[FLAG_DISABLE_Z]) {
 
-		code += "    float angle1 = rand_from_seed(alt_seed)*spread*3.1416;\n";
+		code += "    float angle1 = (rand_from_seed(alt_seed)*2.0-1.0)*spread/180.0*3.1416;\n";
 		code += "    vec3 rot=vec3( cos(angle1), sin(angle1),0.0 );\n";
 		code += "    VELOCITY=(rot*initial_linear_velocity+rot*initial_linear_velocity_random*rand_from_seed(alt_seed));\n";
 

scene/gui/label.cpp

@@ -65,7 +65,12 @@ void Label::_notification(int p_what) {
 
 	if (p_what == NOTIFICATION_TRANSLATION_CHANGED) {
 
-		xl_text = XL_MESSAGE(text);
+		String new_text = XL_MESSAGE(text);
+		if (new_text == xl_text)
+			return; //nothing new
+		xl_text = new_text;
+
+		regenerate_word_cache();
 		minimum_size_changed();
 		update();
 	}

scene/main/scene_tree.cpp

@@ -687,7 +687,9 @@ void SceneTree::_notification(int p_notification) {
 			get_root()->propagate_notification(p_notification);
 		} break;
 		case NOTIFICATION_TRANSLATION_CHANGED: {
-			get_root()->propagate_notification(Node::NOTIFICATION_TRANSLATION_CHANGED);
+			if (!is_editor_hint()) {
+				get_root()->propagate_notification(Node::NOTIFICATION_TRANSLATION_CHANGED);
+			}
 		} break;
 		case NOTIFICATION_WM_UNFOCUS_REQUEST: {
 

scene/resources/audio_stream_sample.cpp

@@ -39,8 +39,6 @@ void AudioStreamPlaybackSample::start(float p_from_pos) {
 		ima_adpcm[i].last_nibble = -1;
 		ima_adpcm[i].loop_pos = 0x7FFFFFFF;
 		ima_adpcm[i].window_ofs = 0;
-		ima_adpcm[i].ptr = (const uint8_t *)base->data;
-		ima_adpcm[i].ptr += AudioStreamSample::DATA_PAD;
 	}
 
 	seek_pos(p_from_pos);
@@ -122,7 +120,8 @@ void AudioStreamPlaybackSample::do_resample(const Depth *p_src, AudioFrame *p_ds
 					int16_t nibble, diff, step;
 
 					ima_adpcm[i].last_nibble++;
-					const uint8_t *src_ptr = ima_adpcm[i].ptr;
+					const uint8_t *src_ptr = (const uint8_t *)base->data;
+					src_ptr += AudioStreamSample::DATA_PAD;
 
 					uint8_t nbb = src_ptr[(ima_adpcm[i].last_nibble >> 1) * (is_stereo ? 2 : 1) + i];
 					nibble = (ima_adpcm[i].last_nibble & 1) ? (nbb >> 4) : (nbb & 0xF);

scene/resources/audio_stream_sample.h

@@ -53,7 +53,6 @@ class AudioStreamPlaybackSample : public AudioStreamPlayback {
 		int32_t last_nibble;
 		int32_t loop_pos;
 		int32_t window_ofs;
-		const uint8_t *ptr;
 	} ima_adpcm[2];
 
 	int64_t offset;

scene/resources/curve.cpp

@@ -730,7 +730,7 @@ void Curve::set_data(Array input) {
 	// Validate input
 	for (int i = 0; i < input.size(); i += ELEMS) {
 		ERR_FAIL_COND(input[i].get_type() != Variant::VECTOR2);
-		ERR_FAIL_COND(input[i + 1].get_type() != Variant::REAL);
+		ERR_FAIL_COND(!input[i + 1].is_num());
 		ERR_FAIL_COND(input[i + 2].get_type() != Variant::REAL);
 
 		ERR_FAIL_COND(input[i + 3].get_type() != Variant::INT);

scene/resources/material.cpp

@@ -49,7 +49,7 @@ Material::~Material() {
 
 bool ShaderMaterial::_set(const StringName &p_name, const Variant &p_value) {
 
-	if (p_name == SceneStringNames::get_singleton()->shader_shader) {
+	if (p_name == SceneStringNames::get_singleton()->shader) {
 		set_shader(p_value);
 		return true;
 	} else {
@@ -75,7 +75,7 @@ bool ShaderMaterial::_set(const StringName &p_name, const Variant &p_value) {
 
 bool ShaderMaterial::_get(const StringName &p_name, Variant &r_ret) const {
 
-	if (p_name == SceneStringNames::get_singleton()->shader_shader) {
+	if (p_name == SceneStringNames::get_singleton()->shader) {
 
 		r_ret = get_shader();
 		return true;
@@ -97,7 +97,7 @@ bool ShaderMaterial::_get(const StringName &p_name, Variant &r_ret) const {
 
 void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 
-	p_list->push_back(PropertyInfo(Variant::OBJECT, "shader/shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader,ShaderGraph"));
+	p_list->push_back(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader,ShaderGraph"));
 
 	if (!shader.is_null()) {
 

scene/resources/material.h

@@ -42,9 +42,9 @@
 
 class Material : public Resource {
 
-	GDCLASS(Material, Resource);
-	RES_BASE_EXTENSION("material");
-	OBJ_SAVE_TYPE(Material);
+	GDCLASS(Material, Resource)
+	RES_BASE_EXTENSION("material")
+	OBJ_SAVE_TYPE(Material)
 
 	RID material;
 

scene/resources/scene_format_text.cpp

@@ -332,6 +332,7 @@ Error ResourceInteractiveLoaderText::poll() {
 					if (!ResourceCache::has(res_path)) {
 						resource->set_path(res_path);
 					}
+					resource->set_as_translation_remapped(translation_remapped);
 				}
 				return error;
 			}
@@ -606,6 +607,15 @@ int ResourceInteractiveLoaderText::get_stage_count() const {
 	return resources_total; //+ext_resources;
 }
 
+void ResourceInteractiveLoaderText::set_translation_remapped(bool p_remapped) {
+
+	translation_remapped = p_remapped;
+}
+
+ResourceInteractiveLoaderText::ResourceInteractiveLoaderText() {
+	translation_remapped = false;
+}
+
 ResourceInteractiveLoaderText::~ResourceInteractiveLoaderText() {
 
 	memdelete(f);

scene/resources/scene_format_text.h

@@ -38,6 +38,7 @@
 
 class ResourceInteractiveLoaderText : public ResourceInteractiveLoader {
 
+	bool translation_remapped;
 	String local_path;
 	String res_path;
 	String error_text;
@@ -94,12 +95,14 @@ public:
 	virtual Error poll();
 	virtual int get_stage() const;
 	virtual int get_stage_count() const;
+	virtual void set_translation_remapped(bool p_remapped);
 
 	void open(FileAccess *p_f, bool p_skip_first_tag = false);
 	String recognize(FileAccess *p_f);
 	void get_dependencies(FileAccess *p_f, List<String> *p_dependencies, bool p_add_types);
 	Error rename_dependencies(FileAccess *p_f, const String &p_path, const Map<String, String> &p_map);
 
+	ResourceInteractiveLoaderText();
 	~ResourceInteractiveLoaderText();
 };
 

scene/resources/texture.cpp

@@ -91,7 +91,7 @@ Texture::Texture() {
 
 void ImageTexture::reload_from_file() {
 
-	String path = get_path();
+	String path = ResourceLoader::path_remap(get_path());
 	if (!path.is_resource_file())
 		return;
 
@@ -710,13 +710,16 @@ void StreamTexture::set_flags(uint32_t p_flags) {
 
 void StreamTexture::reload_from_file() {
 
-#ifdef TOOLS_ENABLED
-	String ipath = get_import_path();
-	if (ipath.is_resource_file() && ipath != path_to_file) {
-		path_to_file = ipath;
-	}
-#endif
-	load(path_to_file);
+	String path = get_path();
+	if (!path.is_resource_file())
+		return;
+
+	path = ResourceLoader::path_remap(path); //remap for translation
+	path = ResourceLoader::import_remap(path); //remap for import
+	if (!path.is_resource_file())
+		return;
+
+	load(path);
 }
 
 void StreamTexture::_bind_methods() {

scene/scene_string_names.cpp

@@ -44,7 +44,7 @@ SceneStringNames::SceneStringNames() {
 	hide = StaticCString::create("hide");
 	visibility_changed = StaticCString::create("visibility_changed");
 	input_event = StaticCString::create("input_event");
-	shader_shader = StaticCString::create("shader/shader");
+	shader = StaticCString::create("shader");
 	shader_unshaded = StaticCString::create("shader/unshaded");
 	shading_mode = StaticCString::create("shader/shading_mode");
 	tree_entered = StaticCString::create("tree_entered");

scene/scene_string_names.h

@@ -64,7 +64,7 @@ public:
 	StringName gui_input;
 	StringName _gui_input;
 	StringName item_rect_changed;
-	StringName shader_shader;
+	StringName shader;
 	StringName shader_unshaded;
 	StringName shading_mode;
 	StringName tree_entered;