diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 71d05bd7326..ed852566953 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -43,6 +43,7 @@ #include "editor/editor_log.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" +#include "platform/android/export/gradle_export_util.h" #include "platform/android/logo.gen.h" #include "platform/android/plugin/godot_plugin_config.h" #include "platform/android/run_icon.gen.h" @@ -2003,9 +2004,10 @@ public: EditorProgress ep("export", "Exporting for Android", 105, true); - if (bool(p_preset->get("custom_template/use_custom_build"))) { //custom build - //re-generate build.gradle and AndroidManifest.xml + bool use_custom_build = bool(p_preset->get("custom_template/use_custom_build")); + if (use_custom_build) { + //re-generate build.gradle and AndroidManifest.xml { //test that installed build version is alright FileAccessRef f = FileAccess::open("res://android/.build_version", FileAccess::READ); if (!f) { @@ -2018,6 +2020,14 @@ public: return ERR_UNCONFIGURED; } } + + // TODO: should we use "package/name" or "application/config/name"? + String project_name = get_project_name(p_preset->get("package/name")); + // instead of calling _fix_resources + Error err = _create_project_name_strings_files(p_preset, project_name); + if (err != OK) { + EditorNode::add_io_error("Unable to overwrite res://android/build/res/*.xml files with project name"); + } //build project if custom build is enabled String sdk_path = EDITOR_GET("export/android/custom_build_sdk_path"); @@ -2202,7 +2212,9 @@ public: } if (file == "resources.arsc") { - _fix_resources(p_preset, data); + if (!use_custom_build) { + _fix_resources(p_preset, data); + } } for (int i = 0; i < icon_densities_count; ++i) { diff --git a/platform/android/export/gradle_export_util.h b/platform/android/export/gradle_export_util.h index f988047483a..622860c3071 100644 --- a/platform/android/export/gradle_export_util.h +++ b/platform/android/export/gradle_export_util.h @@ -37,6 +37,13 @@ #include "core/os/os.h" #include "editor/editor_export.h" +const String godot_project_name_xml_string = R"( + + + %s + +)"; + // Utility method used to create a directory. Error create_directory(const String &p_dir) { if (!DirAccess::exists(p_dir)) { @@ -94,8 +101,45 @@ Error store_string_at_path(const String &p_path, const String &p_data) { // This method will be called ONLY when custom build is enabled. Error rename_and_store_file_in_gradle_project(void *p_userdata, const String &p_path, const Vector &p_data, int p_file, int p_total) { String dst_path = p_path.replace_first("res://", "res://android/build/assets/"); - Error err = store_file_at_path(dst_path, p_data, Z_NO_COMPRESSION); + Error err = store_file_at_path(dst_path, p_data); return err; } +// Creates strings.xml files inside the gradle project for different locales. +Error _create_project_name_strings_files(const Ref &p_preset, const String &project_name) { + // Stores the string into the default values directory. + String processed_default_xml_string = vformat(godot_project_name_xml_string, project_name.xml_escape(true)); + store_string_at_path("res://android/build/res/values/godot_project_name_string.xml", processed_default_xml_string); + + // Searches the Gradle project res/ directory to find all supported locales + DirAccessRef da = DirAccess::open("res://android/build/res"); + if (!da) { + return ERR_CANT_OPEN; + } + da->list_dir_begin(); + while (true) { + String file = da->get_next(); + if (file == "") { + break; + } + if (!file.begins_with("values-")) { + // NOTE: This assumes all directories that start with "values-" are for localization. + continue; + } + String locale = file.replace("values-", "").replace("-r", "_"); + String property_name = "application/config/name_" + locale; + String locale_directory = "res://android/build/res/" + file + "/godot_project_name_string.xml"; + if (ProjectSettings::get_singleton()->has_setting(property_name)) { + String locale_project_name = ProjectSettings::get_singleton()->get(property_name); + String processed_xml_string = vformat(godot_project_name_xml_string, locale_project_name.xml_escape(true)); + store_string_at_path(locale_directory, processed_xml_string); + } else { + // TODO: Once the legacy build system is deprecated we don't need to have xml files for this else branch + store_string_at_path(locale_directory, processed_default_xml_string); + } + } + da->list_dir_end(); + return OK; +} + #endif //GODOT_GRADLE_EXPORT_UTIL_H diff --git a/platform/android/java/lib/res/values-ar/strings.xml b/platform/android/java/app/res/values-ar/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-ar/strings.xml rename to platform/android/java/app/res/values-ar/godot_project_name_string.xml index 77cd61ea51d..23aa5cf3e12 100644 --- a/platform/android/java/lib/res/values-ar/strings.xml +++ b/platform/android/java/app/res/values-ar/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-ar diff --git a/platform/android/java/lib/res/values-bg/strings.xml b/platform/android/java/app/res/values-bg/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-bg/strings.xml rename to platform/android/java/app/res/values-bg/godot_project_name_string.xml index 0f42d1f22b6..dbb7e04ae5c 100644 --- a/platform/android/java/lib/res/values-bg/strings.xml +++ b/platform/android/java/app/res/values-bg/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-bg diff --git a/platform/android/java/lib/res/values-ca/strings.xml b/platform/android/java/app/res/values-ca/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-ca/strings.xml rename to platform/android/java/app/res/values-ca/godot_project_name_string.xml index 291a44d5e2e..709d0961e6f 100644 --- a/platform/android/java/lib/res/values-ca/strings.xml +++ b/platform/android/java/app/res/values-ca/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-ca diff --git a/platform/android/java/lib/res/values-cs/strings.xml b/platform/android/java/app/res/values-cs/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-cs/strings.xml rename to platform/android/java/app/res/values-cs/godot_project_name_string.xml index 83ff73e12a3..ab248a8032a 100644 --- a/platform/android/java/lib/res/values-cs/strings.xml +++ b/platform/android/java/app/res/values-cs/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-cs diff --git a/platform/android/java/lib/res/values-da/strings.xml b/platform/android/java/app/res/values-da/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-da/strings.xml rename to platform/android/java/app/res/values-da/godot_project_name_string.xml index fd251a7c90f..906bf44f57a 100644 --- a/platform/android/java/lib/res/values-da/strings.xml +++ b/platform/android/java/app/res/values-da/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-da diff --git a/platform/android/java/lib/res/values-de/strings.xml b/platform/android/java/app/res/values-de/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-de/strings.xml rename to platform/android/java/app/res/values-de/godot_project_name_string.xml index f6e80b0b1ab..0cacb0175f8 100644 --- a/platform/android/java/lib/res/values-de/strings.xml +++ b/platform/android/java/app/res/values-de/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-de diff --git a/platform/android/java/lib/res/values-el/strings.xml b/platform/android/java/app/res/values-el/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-el/strings.xml rename to platform/android/java/app/res/values-el/godot_project_name_string.xml index adcdf13eb1c..047de616a54 100644 --- a/platform/android/java/lib/res/values-el/strings.xml +++ b/platform/android/java/app/res/values-el/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-el diff --git a/platform/android/java/lib/res/values-en/strings.xml b/platform/android/java/app/res/values-en/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-en/strings.xml rename to platform/android/java/app/res/values-en/godot_project_name_string.xml index 1b251c9ab65..bb3a5dbef37 100644 --- a/platform/android/java/lib/res/values-en/strings.xml +++ b/platform/android/java/app/res/values-en/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-en diff --git a/platform/android/java/lib/res/values-es-rES/strings.xml b/platform/android/java/app/res/values-es-rES/godot_project_name_string.xml similarity index 70% rename from platform/android/java/lib/res/values-es-rES/strings.xml rename to platform/android/java/app/res/values-es-rES/godot_project_name_string.xml index b580a8270b1..d4537f34969 100644 --- a/platform/android/java/lib/res/values-es-rES/strings.xml +++ b/platform/android/java/app/res/values-es-rES/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-es_ES diff --git a/platform/android/java/lib/res/values-es/strings.xml b/platform/android/java/app/res/values-es/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-es/strings.xml rename to platform/android/java/app/res/values-es/godot_project_name_string.xml index 6aedd6870bc..d63a16022e9 100644 --- a/platform/android/java/lib/res/values-es/strings.xml +++ b/platform/android/java/app/res/values-es/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-es diff --git a/platform/android/java/app/res/values-fa/godot_project_name_string.xml b/platform/android/java/app/res/values-fa/godot_project_name_string.xml new file mode 100644 index 00000000000..c303f13d5fb --- /dev/null +++ b/platform/android/java/app/res/values-fa/godot_project_name_string.xml @@ -0,0 +1,5 @@ + + + + godot-project-name-fa + diff --git a/platform/android/java/lib/res/values-fi/strings.xml b/platform/android/java/app/res/values-fi/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-fi/strings.xml rename to platform/android/java/app/res/values-fi/godot_project_name_string.xml index bd7ef059ab6..bd6005574a0 100644 --- a/platform/android/java/lib/res/values-fi/strings.xml +++ b/platform/android/java/app/res/values-fi/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-fi diff --git a/platform/android/java/lib/res/values-fr/strings.xml b/platform/android/java/app/res/values-fr/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-fr/strings.xml rename to platform/android/java/app/res/values-fr/godot_project_name_string.xml index 03994099cf8..2e94b65a20d 100644 --- a/platform/android/java/lib/res/values-fr/strings.xml +++ b/platform/android/java/app/res/values-fr/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-fr diff --git a/platform/android/java/lib/res/values-hi/strings.xml b/platform/android/java/app/res/values-hi/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-hi/strings.xml rename to platform/android/java/app/res/values-hi/godot_project_name_string.xml index 60d3b468618..0bf75dcd563 100644 --- a/platform/android/java/lib/res/values-hi/strings.xml +++ b/platform/android/java/app/res/values-hi/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-hi diff --git a/platform/android/java/lib/res/values-hr/strings.xml b/platform/android/java/app/res/values-hr/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-hr/strings.xml rename to platform/android/java/app/res/values-hr/godot_project_name_string.xml index e552a6f6ec2..d3f75910f92 100644 --- a/platform/android/java/lib/res/values-hr/strings.xml +++ b/platform/android/java/app/res/values-hr/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-hr diff --git a/platform/android/java/lib/res/values-hu/strings.xml b/platform/android/java/app/res/values-hu/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-hu/strings.xml rename to platform/android/java/app/res/values-hu/godot_project_name_string.xml index ed21411acbd..012b613af3d 100644 --- a/platform/android/java/lib/res/values-hu/strings.xml +++ b/platform/android/java/app/res/values-hu/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-hu diff --git a/platform/android/java/app/res/values-in/godot_project_name_string.xml b/platform/android/java/app/res/values-in/godot_project_name_string.xml new file mode 100644 index 00000000000..eedecff7a11 --- /dev/null +++ b/platform/android/java/app/res/values-in/godot_project_name_string.xml @@ -0,0 +1,5 @@ + + + + godot-project-name-in + diff --git a/platform/android/java/lib/res/values-it/strings.xml b/platform/android/java/app/res/values-it/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-it/strings.xml rename to platform/android/java/app/res/values-it/godot_project_name_string.xml index 880b87e030b..7e734047c47 100644 --- a/platform/android/java/lib/res/values-it/strings.xml +++ b/platform/android/java/app/res/values-it/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-it diff --git a/platform/android/java/app/res/values-iw/godot_project_name_string.xml b/platform/android/java/app/res/values-iw/godot_project_name_string.xml new file mode 100644 index 00000000000..03893f0cbb8 --- /dev/null +++ b/platform/android/java/app/res/values-iw/godot_project_name_string.xml @@ -0,0 +1,5 @@ + + + + godot-project-name-iw + diff --git a/platform/android/java/lib/res/values-ja/strings.xml b/platform/android/java/app/res/values-ja/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-ja/strings.xml rename to platform/android/java/app/res/values-ja/godot_project_name_string.xml index 27d3ba521ee..f9dd4fab0d5 100644 --- a/platform/android/java/lib/res/values-ja/strings.xml +++ b/platform/android/java/app/res/values-ja/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-ja diff --git a/platform/android/java/app/res/values-ko/godot_project_name_string.xml b/platform/android/java/app/res/values-ko/godot_project_name_string.xml new file mode 100644 index 00000000000..26f5dac176c --- /dev/null +++ b/platform/android/java/app/res/values-ko/godot_project_name_string.xml @@ -0,0 +1,5 @@ + + + + godot-project-name-ko + diff --git a/platform/android/java/lib/res/values-lt/strings.xml b/platform/android/java/app/res/values-lt/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-lt/strings.xml rename to platform/android/java/app/res/values-lt/godot_project_name_string.xml index 10a93926db0..1c2e976cc50 100644 --- a/platform/android/java/lib/res/values-lt/strings.xml +++ b/platform/android/java/app/res/values-lt/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-lt diff --git a/platform/android/java/lib/res/values-lv/strings.xml b/platform/android/java/app/res/values-lv/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-lv/strings.xml rename to platform/android/java/app/res/values-lv/godot_project_name_string.xml index 4f230b97f87..b5e638ed736 100644 --- a/platform/android/java/lib/res/values-lv/strings.xml +++ b/platform/android/java/app/res/values-lv/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-lv diff --git a/platform/android/java/lib/res/values-nb/strings.xml b/platform/android/java/app/res/values-nb/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-nb/strings.xml rename to platform/android/java/app/res/values-nb/godot_project_name_string.xml index a85a3da39a4..e6d89d6a3f3 100644 --- a/platform/android/java/lib/res/values-nb/strings.xml +++ b/platform/android/java/app/res/values-nb/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-nb diff --git a/platform/android/java/lib/res/values-nl/strings.xml b/platform/android/java/app/res/values-nl/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-nl/strings.xml rename to platform/android/java/app/res/values-nl/godot_project_name_string.xml index c459f643976..93cb3a3878d 100644 --- a/platform/android/java/lib/res/values-nl/strings.xml +++ b/platform/android/java/app/res/values-nl/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-nl diff --git a/platform/android/java/lib/res/values-pl/strings.xml b/platform/android/java/app/res/values-pl/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-pl/strings.xml rename to platform/android/java/app/res/values-pl/godot_project_name_string.xml index 34a846cc78b..e5d6ac74fb4 100644 --- a/platform/android/java/lib/res/values-pl/strings.xml +++ b/platform/android/java/app/res/values-pl/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-pl diff --git a/platform/android/java/lib/res/values-pt/strings.xml b/platform/android/java/app/res/values-pt/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-pt/strings.xml rename to platform/android/java/app/res/values-pt/godot_project_name_string.xml index 5f7a875eb54..a4624655c5b 100644 --- a/platform/android/java/lib/res/values-pt/strings.xml +++ b/platform/android/java/app/res/values-pt/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-pt diff --git a/platform/android/java/lib/res/values-ro/strings.xml b/platform/android/java/app/res/values-ro/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-ro/strings.xml rename to platform/android/java/app/res/values-ro/godot_project_name_string.xml index de990e789be..19e026637e0 100644 --- a/platform/android/java/lib/res/values-ro/strings.xml +++ b/platform/android/java/app/res/values-ro/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-ro diff --git a/platform/android/java/lib/res/values-ru/strings.xml b/platform/android/java/app/res/values-ru/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-ru/strings.xml rename to platform/android/java/app/res/values-ru/godot_project_name_string.xml index 73d8a27443c..284845241f0 100644 --- a/platform/android/java/lib/res/values-ru/strings.xml +++ b/platform/android/java/app/res/values-ru/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-ru diff --git a/platform/android/java/lib/res/values-sk/strings.xml b/platform/android/java/app/res/values-sk/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-sk/strings.xml rename to platform/android/java/app/res/values-sk/godot_project_name_string.xml index 053960efeda..f8ab4a5b594 100644 --- a/platform/android/java/lib/res/values-sk/strings.xml +++ b/platform/android/java/app/res/values-sk/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-sk diff --git a/platform/android/java/lib/res/values-sl/strings.xml b/platform/android/java/app/res/values-sl/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-sl/strings.xml rename to platform/android/java/app/res/values-sl/godot_project_name_string.xml index d6dff8289a0..98bd53e8d21 100644 --- a/platform/android/java/lib/res/values-sl/strings.xml +++ b/platform/android/java/app/res/values-sl/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-sl diff --git a/platform/android/java/lib/res/values-sr/strings.xml b/platform/android/java/app/res/values-sr/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-sr/strings.xml rename to platform/android/java/app/res/values-sr/godot_project_name_string.xml index b7e79e89ea8..3f400f2a4d4 100644 --- a/platform/android/java/lib/res/values-sr/strings.xml +++ b/platform/android/java/app/res/values-sr/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-sr diff --git a/platform/android/java/lib/res/values-sv/strings.xml b/platform/android/java/app/res/values-sv/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-sv/strings.xml rename to platform/android/java/app/res/values-sv/godot_project_name_string.xml index 9436c3870ac..8670b7c9aaf 100644 --- a/platform/android/java/lib/res/values-sv/strings.xml +++ b/platform/android/java/app/res/values-sv/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-sv diff --git a/platform/android/java/lib/res/values-th/strings.xml b/platform/android/java/app/res/values-th/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-th/strings.xml rename to platform/android/java/app/res/values-th/godot_project_name_string.xml index 629d77b9c25..a1cc1bcd495 100644 --- a/platform/android/java/lib/res/values-th/strings.xml +++ b/platform/android/java/app/res/values-th/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-th diff --git a/platform/android/java/lib/res/values-tl/strings.xml b/platform/android/java/app/res/values-tl/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-tl/strings.xml rename to platform/android/java/app/res/values-tl/godot_project_name_string.xml index f8832d6b1fb..6d66d114cf4 100644 --- a/platform/android/java/lib/res/values-tl/strings.xml +++ b/platform/android/java/app/res/values-tl/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-tl diff --git a/platform/android/java/lib/res/values-tr/strings.xml b/platform/android/java/app/res/values-tr/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-tr/strings.xml rename to platform/android/java/app/res/values-tr/godot_project_name_string.xml index f3a8f57de46..ba3bd7de36f 100644 --- a/platform/android/java/lib/res/values-tr/strings.xml +++ b/platform/android/java/app/res/values-tr/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-tr diff --git a/platform/android/java/lib/res/values-uk/strings.xml b/platform/android/java/app/res/values-uk/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-uk/strings.xml rename to platform/android/java/app/res/values-uk/godot_project_name_string.xml index 8ba2bf86aa6..5f14ab25a08 100644 --- a/platform/android/java/lib/res/values-uk/strings.xml +++ b/platform/android/java/app/res/values-uk/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-uk diff --git a/platform/android/java/lib/res/values-vi/strings.xml b/platform/android/java/app/res/values-vi/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-vi/strings.xml rename to platform/android/java/app/res/values-vi/godot_project_name_string.xml index 8bf063ed823..295378e111d 100644 --- a/platform/android/java/lib/res/values-vi/strings.xml +++ b/platform/android/java/app/res/values-vi/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-vi diff --git a/platform/android/java/lib/res/values-zh-rHK/strings.xml b/platform/android/java/app/res/values-zh-rHK/godot_project_name_string.xml similarity index 70% rename from platform/android/java/lib/res/values-zh-rHK/strings.xml rename to platform/android/java/app/res/values-zh-rHK/godot_project_name_string.xml index 8a6269da0f4..40ab0f285a3 100644 --- a/platform/android/java/lib/res/values-zh-rHK/strings.xml +++ b/platform/android/java/app/res/values-zh-rHK/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-zh_HK diff --git a/platform/android/java/lib/res/values-zh-rTW/strings.xml b/platform/android/java/app/res/values-zh-rTW/godot_project_name_string.xml similarity index 70% rename from platform/android/java/lib/res/values-zh-rTW/strings.xml rename to platform/android/java/app/res/values-zh-rTW/godot_project_name_string.xml index b1bb39d5d64..095bd564e28 100644 --- a/platform/android/java/lib/res/values-zh-rTW/strings.xml +++ b/platform/android/java/app/res/values-zh-rTW/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-zh_TW diff --git a/platform/android/java/lib/res/values-zh-rCN/strings.xml b/platform/android/java/app/res/values-zh/godot_project_name_string.xml similarity index 69% rename from platform/android/java/lib/res/values-zh-rCN/strings.xml rename to platform/android/java/app/res/values-zh/godot_project_name_string.xml index 6668c56bd91..31aa8c273ab 100644 --- a/platform/android/java/lib/res/values-zh-rCN/strings.xml +++ b/platform/android/java/app/res/values-zh/godot_project_name_string.xml @@ -1,4 +1,5 @@ + godot-project-name-zh diff --git a/platform/android/java/app/res/values/godot_project_name_string.xml b/platform/android/java/app/res/values/godot_project_name_string.xml new file mode 100644 index 00000000000..7ec27388966 --- /dev/null +++ b/platform/android/java/app/res/values/godot_project_name_string.xml @@ -0,0 +1,5 @@ + + + + godot-project-name + diff --git a/platform/android/java/lib/res/values-fa/strings.xml b/platform/android/java/lib/res/values-fa/strings.xml index f1e29013c46..60b01accf13 100644 --- a/platform/android/java/lib/res/values-fa/strings.xml +++ b/platform/android/java/lib/res/values-fa/strings.xml @@ -1,6 +1,5 @@ - godot-project-name-fa آیا می خواهید بر روی اتصال داده همراه دانلود را شروع کنید؟ بر اساس نوع سطح داده شما این ممکن است برای شما هزینه مالی داشته باشد. اگر نمی خواهید بر روی اتصال داده همراه دانلود را شروع کنید ، دانلود به صورت خودکار در زمان دسترسی به وای-فای شروع می شود. ادامه دانلود diff --git a/platform/android/java/lib/res/values-in/strings.xml b/platform/android/java/lib/res/values-in/strings.xml deleted file mode 100644 index 169b65decb7..00000000000 --- a/platform/android/java/lib/res/values-in/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - godot-project-name-id - diff --git a/platform/android/java/lib/res/values-iw/strings.xml b/platform/android/java/lib/res/values-iw/strings.xml deleted file mode 100644 index b4826798c7e..00000000000 --- a/platform/android/java/lib/res/values-iw/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - godot-project-name-he - diff --git a/platform/android/java/lib/res/values-ko/strings.xml b/platform/android/java/lib/res/values-ko/strings.xml index efc5c7e015d..7b62345977a 100644 --- a/platform/android/java/lib/res/values-ko/strings.xml +++ b/platform/android/java/lib/res/values-ko/strings.xml @@ -1,6 +1,5 @@ - godot-project-name-ko 모바일 네트워크를 사용하여 다운로드 하시겠습니까? 남은 데이터 사용량에 따라, 요금이 부과될 수 있습니다. 모바일 네트워크를 사용하여 다운로드 하지 않을 경우, 와이파이 연결이 가능할 때 자동적으로 다운로드가 이루어집니다. 다운로드 계속하기