From 8376abf0b82330c6589414c8648f86418722ed91 Mon Sep 17 00:00:00 2001 From: Aman Jain Date: Wed, 1 Jul 2020 11:06:50 -0400 Subject: [PATCH] Create strings.xml files to mimic behavior of _fix_resources method --- platform/android/export/export.cpp | 18 ++++++-- platform/android/export/gradle_export_util.h | 44 +++++++++++++++++++ .../values-ar/godot_project_name_string.xml} | 3 +- .../values-bg/godot_project_name_string.xml} | 3 +- .../values-ca/godot_project_name_string.xml} | 3 +- .../values-cs/godot_project_name_string.xml} | 3 +- .../values-da/godot_project_name_string.xml} | 3 +- .../values-de/godot_project_name_string.xml} | 3 +- .../values-el/godot_project_name_string.xml} | 3 +- .../values-en/godot_project_name_string.xml} | 3 +- .../godot_project_name_string.xml} | 3 +- .../values-es/godot_project_name_string.xml} | 3 +- .../values-fa/godot_project_name_string.xml | 5 +++ .../values-fi/godot_project_name_string.xml} | 3 +- .../values-fr/godot_project_name_string.xml} | 3 +- .../values-hi/godot_project_name_string.xml} | 3 +- .../values-hr/godot_project_name_string.xml} | 3 +- .../values-hu/godot_project_name_string.xml} | 3 +- .../values-in/godot_project_name_string.xml | 5 +++ .../values-it/godot_project_name_string.xml} | 3 +- .../values-iw/godot_project_name_string.xml | 5 +++ .../values-ja/godot_project_name_string.xml} | 3 +- .../values-ko/godot_project_name_string.xml | 5 +++ .../values-lt/godot_project_name_string.xml} | 3 +- .../values-lv/godot_project_name_string.xml} | 3 +- .../values-nb/godot_project_name_string.xml} | 3 +- .../values-nl/godot_project_name_string.xml} | 3 +- .../values-pl/godot_project_name_string.xml} | 3 +- .../values-pt/godot_project_name_string.xml} | 3 +- .../values-ro/godot_project_name_string.xml} | 3 +- .../values-ru/godot_project_name_string.xml} | 3 +- .../values-sk/godot_project_name_string.xml} | 3 +- .../values-sl/godot_project_name_string.xml} | 3 +- .../values-sr/godot_project_name_string.xml} | 3 +- .../values-sv/godot_project_name_string.xml} | 3 +- .../values-th/godot_project_name_string.xml} | 3 +- .../values-tl/godot_project_name_string.xml} | 3 +- .../values-tr/godot_project_name_string.xml} | 3 +- .../values-uk/godot_project_name_string.xml} | 3 +- .../values-vi/godot_project_name_string.xml} | 3 +- .../godot_project_name_string.xml} | 1 + .../godot_project_name_string.xml} | 1 + .../values-zh/godot_project_name_string.xml} | 1 + .../res/values/godot_project_name_string.xml | 5 +++ .../java/lib/res/values-fa/strings.xml | 1 - .../java/lib/res/values-in/strings.xml | 4 -- .../java/lib/res/values-iw/strings.xml | 4 -- .../java/lib/res/values-ko/strings.xml | 1 - 48 files changed, 155 insertions(+), 47 deletions(-) rename platform/android/java/{lib/res/values-ar/strings.xml => app/res/values-ar/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-bg/strings.xml => app/res/values-bg/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-ca/strings.xml => app/res/values-ca/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-cs/strings.xml => app/res/values-cs/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-da/strings.xml => app/res/values-da/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-de/strings.xml => app/res/values-de/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-el/strings.xml => app/res/values-el/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-en/strings.xml => app/res/values-en/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-es-rES/strings.xml => app/res/values-es-rES/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-es/strings.xml => app/res/values-es/godot_project_name_string.xml} (63%) create mode 100644 platform/android/java/app/res/values-fa/godot_project_name_string.xml rename platform/android/java/{lib/res/values-fi/strings.xml => app/res/values-fi/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-fr/strings.xml => app/res/values-fr/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-hi/strings.xml => app/res/values-hi/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-hr/strings.xml => app/res/values-hr/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-hu/strings.xml => app/res/values-hu/godot_project_name_string.xml} (63%) create mode 100644 platform/android/java/app/res/values-in/godot_project_name_string.xml rename platform/android/java/{lib/res/values-it/strings.xml => app/res/values-it/godot_project_name_string.xml} (63%) create mode 100644 platform/android/java/app/res/values-iw/godot_project_name_string.xml rename platform/android/java/{lib/res/values-ja/strings.xml => app/res/values-ja/godot_project_name_string.xml} (63%) create mode 100644 platform/android/java/app/res/values-ko/godot_project_name_string.xml rename platform/android/java/{lib/res/values-lt/strings.xml => app/res/values-lt/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-lv/strings.xml => app/res/values-lv/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-nb/strings.xml => app/res/values-nb/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-nl/strings.xml => app/res/values-nl/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-pl/strings.xml => app/res/values-pl/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-pt/strings.xml => app/res/values-pt/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-ro/strings.xml => app/res/values-ro/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-ru/strings.xml => app/res/values-ru/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-sk/strings.xml => app/res/values-sk/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-sl/strings.xml => app/res/values-sl/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-sr/strings.xml => app/res/values-sr/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-sv/strings.xml => app/res/values-sv/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-th/strings.xml => app/res/values-th/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-tl/strings.xml => app/res/values-tl/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-tr/strings.xml => app/res/values-tr/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-uk/strings.xml => app/res/values-uk/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-vi/strings.xml => app/res/values-vi/godot_project_name_string.xml} (63%) rename platform/android/java/{lib/res/values-zh-rHK/strings.xml => app/res/values-zh-rHK/godot_project_name_string.xml} (70%) rename platform/android/java/{lib/res/values-zh-rTW/strings.xml => app/res/values-zh-rTW/godot_project_name_string.xml} (70%) rename platform/android/java/{lib/res/values-zh-rCN/strings.xml => app/res/values-zh/godot_project_name_string.xml} (69%) create mode 100644 platform/android/java/app/res/values/godot_project_name_string.xml delete mode 100644 platform/android/java/lib/res/values-in/strings.xml delete mode 100644 platform/android/java/lib/res/values-iw/strings.xml diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index be919013956c..fab96fe68446 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" @@ -2363,9 +2364,10 @@ class EditorExportPlatformAndroid : public EditorExportPlatform { 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) { @@ -2378,6 +2380,14 @@ class EditorExportPlatformAndroid : public EditorExportPlatform { 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"); @@ -2566,7 +2576,9 @@ class EditorExportPlatformAndroid : public EditorExportPlatform { } 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 603ff5d0c2b7..622860c30713 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)) { @@ -98,4 +105,41 @@ Error rename_and_store_file_in_gradle_project(void *p_userdata, const String &p_ 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 63% 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 9f3dc6d6ac93..23aa5cf3e126 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 - \ No newline at end of file + 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 63% 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 bd8109277ee3..dbb7e04ae5c7 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 - \ No newline at end of file + 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 63% 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 494cb8846856..709d0961e6f9 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 - \ No newline at end of file + 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 63% 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 30ce00f89524..ab248a8032a9 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 - \ No newline at end of file + 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 63% 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 4c2a1cf0f459..906bf44f57a2 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 - \ No newline at end of file + 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 63% 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 52946d4cceb6..0cacb0175f85 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 - \ No newline at end of file + 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 63% 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 181dc5176282..047de616a546 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 - \ No newline at end of file + 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 63% 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 976a56501365..bb3a5dbef37e 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 - \ No newline at end of file + 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 63% 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 73f63a08f8b3..d4537f349690 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 - \ No newline at end of file + 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 63% 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 07b718a6414b..d63a16022e9f 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 - \ No newline at end of file + 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 000000000000..c303f13d5fb4 --- /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 63% 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 323d82aff147..bd6005574a07 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 - \ No newline at end of file + 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 63% 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 32bead26615b..2e94b65a20de 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 - \ No newline at end of file + 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 63% 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 8aab2a8c63d3..0bf75dcd563b 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 - \ No newline at end of file + 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 63% 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 caf55e2241ff..d3f75910f924 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 - \ No newline at end of file + 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 63% 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 e7f9e51226fc..012b613af3d8 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 - \ No newline at end of file + 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 000000000000..eedecff7a116 --- /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 63% 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 1f5e5a049e62..7e734047c475 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 - \ No newline at end of file + 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 000000000000..03893f0cbb8c --- /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 63% 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 7f85f57df751..f9dd4fab0d56 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 - \ No newline at end of file + 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 000000000000..26f5dac176c3 --- /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 63% 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 6e3677fde74b..1c2e976cc50c 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 - \ No newline at end of file + 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 63% 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 701fc271ac2f..b5e638ed736c 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 - \ No newline at end of file + 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 63% 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 73147ca1af31..e6d89d6a3f31 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 - \ No newline at end of file + 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 63% 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 e501928a354c..93cb3a3878d5 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 - \ No newline at end of file + 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 63% 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 ea5da73b6f3b..e5d6ac74fb4d 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 - \ No newline at end of file + 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 63% 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 bdda7cd2c7f4..a4624655c5bf 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 - \ No newline at end of file + 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 63% 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 3686da4c192f..19e026637e01 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 - \ No newline at end of file + 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 63% 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 954067658bc9..284845241f0f 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 - \ No newline at end of file + 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 63% 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 37d1283124be..f8ab4a5b594e 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 - \ No newline at end of file + 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 63% 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 0bb249c3756d..98bd53e8d218 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 - \ No newline at end of file + 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 63% 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 0e83cab1a13c..3f400f2a4d4f 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 - \ No newline at end of file + 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 63% 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 e3a04ac2ec3a..8670b7c9aaf6 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 - \ No newline at end of file + 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 63% 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 0aa893b8bf0c..a1cc1bcd495c 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 - \ No newline at end of file + 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 63% 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 e7e2af490905..6d66d114cf4d 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 - \ No newline at end of file + 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 63% 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 97af1243a63f..ba3bd7de36f1 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 - \ No newline at end of file + 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 63% 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 3dea6908a9eb..5f14ab25a08a 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 - \ No newline at end of file + 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 63% 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 a6552130b08d..295378e111d9 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 - \ No newline at end of file + 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 8a6269da0f4a..40ab0f285a37 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 b1bb39d5d642..095bd564e28e 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 6668c56bd918..31aa8c273ab7 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 000000000000..7ec273889664 --- /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 f1e29013c46f..60b01accf139 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 9e9a8b0c03f5..000000000000 --- a/platform/android/java/lib/res/values-in/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - godot-project-name-id - \ No newline at end of file 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 f52ede20855e..000000000000 --- a/platform/android/java/lib/res/values-iw/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - godot-project-name-he - \ No newline at end of file diff --git a/platform/android/java/lib/res/values-ko/strings.xml b/platform/android/java/lib/res/values-ko/strings.xml index fab0bdd753aa..8e3e3039e80c 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 모바일 네트워크를 사용하여 다운로드 하시겠습니까? 남은 데이터 사용량에 따라, 요금이 부과될 수 있습니다. 모바일 네트워크를 사용하여 다운로드 하지 않을 경우, 와이파이 연결이 가능할 때 자동적으로 다운로드가 이루어집니다. 다운로드 계속하기