diff --git a/app/src/main/java/org/solovyev/android/calculator/buttons/CppSpecialButton.java b/app/src/main/java/org/solovyev/android/calculator/buttons/CppSpecialButton.java index fba551b7..ca43934a 100644 --- a/app/src/main/java/org/solovyev/android/calculator/buttons/CppSpecialButton.java +++ b/app/src/main/java/org/solovyev/android/calculator/buttons/CppSpecialButton.java @@ -24,13 +24,12 @@ package org.solovyev.android.calculator.buttons; import org.solovyev.android.Check; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -// see values/text_glyphs.xml for glyph constants +// see values/strings_glyphs.xml for glyph constants public enum CppSpecialButton { history("history", '\ue005'), diff --git a/app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesFragment.java b/app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesFragment.java index e0fef339..cb499180 100644 --- a/app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesFragment.java +++ b/app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesFragment.java @@ -137,9 +137,6 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc }); } - private void prepareFloatingCalculatorPreferences() { - } - private void prepareReportBug() { final Preference reportBug = findPreference("prefs.reportBug"); reportBug.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { diff --git a/app/src/main/res/values-ar/text_strings.xml b/app/src/main/res/values-ar/strings.xml similarity index 100% rename from app/src/main/res/values-ar/text_strings.xml rename to app/src/main/res/values-ar/strings.xml diff --git a/app/src/main/res/values-ar/text_about.xml b/app/src/main/res/values-ar/strings_about.xml similarity index 100% rename from app/src/main/res/values-ar/text_about.xml rename to app/src/main/res/values-ar/strings_about.xml diff --git a/app/src/main/res/values-ar/text_converter.xml b/app/src/main/res/values-ar/strings_converter.xml similarity index 100% rename from app/src/main/res/values-ar/text_converter.xml rename to app/src/main/res/values-ar/strings_converter.xml diff --git a/app/src/main/res/values-ar/text_functions.xml b/app/src/main/res/values-ar/strings_functions.xml similarity index 100% rename from app/src/main/res/values-ar/text_functions.xml rename to app/src/main/res/values-ar/strings_functions.xml diff --git a/app/src/main/res/values-ar/text_imported_aosp.xml b/app/src/main/res/values-ar/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-ar/text_imported_aosp.xml rename to app/src/main/res/values-ar/strings_imported_aosp.xml diff --git a/app/src/main/res/values-ar/text_imported_other.xml b/app/src/main/res/values-ar/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-ar/text_imported_other.xml rename to app/src/main/res/values-ar/strings_imported_other.xml diff --git a/app/src/main/res/values-ar/text_imported_other1.xml b/app/src/main/res/values-ar/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-ar/text_imported_other1.xml rename to app/src/main/res/values-ar/strings_imported_other1.xml diff --git a/app/src/main/res/values-ar/text_microsoft.xml b/app/src/main/res/values-ar/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-ar/text_microsoft.xml rename to app/src/main/res/values-ar/strings_microsoft.xml diff --git a/app/src/main/res/values-ar/text_operators.xml b/app/src/main/res/values-ar/strings_operators.xml similarity index 100% rename from app/src/main/res/values-ar/text_operators.xml rename to app/src/main/res/values-ar/strings_operators.xml diff --git a/app/src/main/res/values-ar/text_preferences.xml b/app/src/main/res/values-ar/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-ar/text_preferences.xml rename to app/src/main/res/values-ar/strings_preferences.xml diff --git a/app/src/main/res/values-ar/text_vars.xml b/app/src/main/res/values-ar/strings_vars.xml similarity index 100% rename from app/src/main/res/values-ar/text_vars.xml rename to app/src/main/res/values-ar/strings_vars.xml diff --git a/app/src/main/res/values-ar/text_wizard.xml b/app/src/main/res/values-ar/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-ar/text_wizard.xml rename to app/src/main/res/values-ar/strings_wizard.xml diff --git a/app/src/main/res/values-cs/text_strings.xml b/app/src/main/res/values-cs/strings.xml similarity index 100% rename from app/src/main/res/values-cs/text_strings.xml rename to app/src/main/res/values-cs/strings.xml diff --git a/app/src/main/res/values-cs/text_about.xml b/app/src/main/res/values-cs/strings_about.xml similarity index 100% rename from app/src/main/res/values-cs/text_about.xml rename to app/src/main/res/values-cs/strings_about.xml diff --git a/app/src/main/res/values-cs/text_converter.xml b/app/src/main/res/values-cs/strings_converter.xml similarity index 100% rename from app/src/main/res/values-cs/text_converter.xml rename to app/src/main/res/values-cs/strings_converter.xml diff --git a/app/src/main/res/values-cs/text_functions.xml b/app/src/main/res/values-cs/strings_functions.xml similarity index 100% rename from app/src/main/res/values-cs/text_functions.xml rename to app/src/main/res/values-cs/strings_functions.xml diff --git a/app/src/main/res/values-cs/text_imported_aosp.xml b/app/src/main/res/values-cs/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-cs/text_imported_aosp.xml rename to app/src/main/res/values-cs/strings_imported_aosp.xml diff --git a/app/src/main/res/values-cs/text_imported_other.xml b/app/src/main/res/values-cs/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-cs/text_imported_other.xml rename to app/src/main/res/values-cs/strings_imported_other.xml diff --git a/app/src/main/res/values-cs/text_imported_other1.xml b/app/src/main/res/values-cs/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-cs/text_imported_other1.xml rename to app/src/main/res/values-cs/strings_imported_other1.xml diff --git a/app/src/main/res/values-cs/text_microsoft.xml b/app/src/main/res/values-cs/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-cs/text_microsoft.xml rename to app/src/main/res/values-cs/strings_microsoft.xml diff --git a/app/src/main/res/values-cs/text_operators.xml b/app/src/main/res/values-cs/strings_operators.xml similarity index 100% rename from app/src/main/res/values-cs/text_operators.xml rename to app/src/main/res/values-cs/strings_operators.xml diff --git a/app/src/main/res/values-cs/text_preferences.xml b/app/src/main/res/values-cs/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-cs/text_preferences.xml rename to app/src/main/res/values-cs/strings_preferences.xml diff --git a/app/src/main/res/values-cs/text_vars.xml b/app/src/main/res/values-cs/strings_vars.xml similarity index 100% rename from app/src/main/res/values-cs/text_vars.xml rename to app/src/main/res/values-cs/strings_vars.xml diff --git a/app/src/main/res/values-cs/text_wizard.xml b/app/src/main/res/values-cs/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-cs/text_wizard.xml rename to app/src/main/res/values-cs/strings_wizard.xml diff --git a/app/src/main/res/values-de/text_strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from app/src/main/res/values-de/text_strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/app/src/main/res/values-de/text_about.xml b/app/src/main/res/values-de/strings_about.xml similarity index 100% rename from app/src/main/res/values-de/text_about.xml rename to app/src/main/res/values-de/strings_about.xml diff --git a/app/src/main/res/values-de/text_converter.xml b/app/src/main/res/values-de/strings_converter.xml similarity index 100% rename from app/src/main/res/values-de/text_converter.xml rename to app/src/main/res/values-de/strings_converter.xml diff --git a/app/src/main/res/values-de/text_functions.xml b/app/src/main/res/values-de/strings_functions.xml similarity index 100% rename from app/src/main/res/values-de/text_functions.xml rename to app/src/main/res/values-de/strings_functions.xml diff --git a/app/src/main/res/values-de/text_imported_aosp.xml b/app/src/main/res/values-de/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-de/text_imported_aosp.xml rename to app/src/main/res/values-de/strings_imported_aosp.xml diff --git a/app/src/main/res/values-de/text_imported_other.xml b/app/src/main/res/values-de/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-de/text_imported_other.xml rename to app/src/main/res/values-de/strings_imported_other.xml diff --git a/app/src/main/res/values-de/text_imported_other1.xml b/app/src/main/res/values-de/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-de/text_imported_other1.xml rename to app/src/main/res/values-de/strings_imported_other1.xml diff --git a/app/src/main/res/values-de/text_microsoft.xml b/app/src/main/res/values-de/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-de/text_microsoft.xml rename to app/src/main/res/values-de/strings_microsoft.xml diff --git a/app/src/main/res/values-de/text_operators.xml b/app/src/main/res/values-de/strings_operators.xml similarity index 100% rename from app/src/main/res/values-de/text_operators.xml rename to app/src/main/res/values-de/strings_operators.xml diff --git a/app/src/main/res/values-de/text_preferences.xml b/app/src/main/res/values-de/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-de/text_preferences.xml rename to app/src/main/res/values-de/strings_preferences.xml diff --git a/app/src/main/res/values-de/text_vars.xml b/app/src/main/res/values-de/strings_vars.xml similarity index 100% rename from app/src/main/res/values-de/text_vars.xml rename to app/src/main/res/values-de/strings_vars.xml diff --git a/app/src/main/res/values-de/text_wizard.xml b/app/src/main/res/values-de/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-de/text_wizard.xml rename to app/src/main/res/values-de/strings_wizard.xml diff --git a/app/src/main/res/values-es/text_strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from app/src/main/res/values-es/text_strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/app/src/main/res/values-es/text_about.xml b/app/src/main/res/values-es/strings_about.xml similarity index 100% rename from app/src/main/res/values-es/text_about.xml rename to app/src/main/res/values-es/strings_about.xml diff --git a/app/src/main/res/values-es/text_converter.xml b/app/src/main/res/values-es/strings_converter.xml similarity index 100% rename from app/src/main/res/values-es/text_converter.xml rename to app/src/main/res/values-es/strings_converter.xml diff --git a/app/src/main/res/values-es/text_functions.xml b/app/src/main/res/values-es/strings_functions.xml similarity index 100% rename from app/src/main/res/values-es/text_functions.xml rename to app/src/main/res/values-es/strings_functions.xml diff --git a/app/src/main/res/values-es/text_imported_aosp.xml b/app/src/main/res/values-es/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-es/text_imported_aosp.xml rename to app/src/main/res/values-es/strings_imported_aosp.xml diff --git a/app/src/main/res/values-es/text_imported_other.xml b/app/src/main/res/values-es/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-es/text_imported_other.xml rename to app/src/main/res/values-es/strings_imported_other.xml diff --git a/app/src/main/res/values-es/text_imported_other1.xml b/app/src/main/res/values-es/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-es/text_imported_other1.xml rename to app/src/main/res/values-es/strings_imported_other1.xml diff --git a/app/src/main/res/values-es/text_microsoft.xml b/app/src/main/res/values-es/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-es/text_microsoft.xml rename to app/src/main/res/values-es/strings_microsoft.xml diff --git a/app/src/main/res/values-es/text_operators.xml b/app/src/main/res/values-es/strings_operators.xml similarity index 100% rename from app/src/main/res/values-es/text_operators.xml rename to app/src/main/res/values-es/strings_operators.xml diff --git a/app/src/main/res/values-es/text_preferences.xml b/app/src/main/res/values-es/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-es/text_preferences.xml rename to app/src/main/res/values-es/strings_preferences.xml diff --git a/app/src/main/res/values-es/text_vars.xml b/app/src/main/res/values-es/strings_vars.xml similarity index 100% rename from app/src/main/res/values-es/text_vars.xml rename to app/src/main/res/values-es/strings_vars.xml diff --git a/app/src/main/res/values-es/text_wizard.xml b/app/src/main/res/values-es/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-es/text_wizard.xml rename to app/src/main/res/values-es/strings_wizard.xml diff --git a/app/src/main/res/values-fi/text_strings.xml b/app/src/main/res/values-fi/strings.xml similarity index 100% rename from app/src/main/res/values-fi/text_strings.xml rename to app/src/main/res/values-fi/strings.xml diff --git a/app/src/main/res/values-fi/text_about.xml b/app/src/main/res/values-fi/strings_about.xml similarity index 100% rename from app/src/main/res/values-fi/text_about.xml rename to app/src/main/res/values-fi/strings_about.xml diff --git a/app/src/main/res/values-fi/text_converter.xml b/app/src/main/res/values-fi/strings_converter.xml similarity index 100% rename from app/src/main/res/values-fi/text_converter.xml rename to app/src/main/res/values-fi/strings_converter.xml diff --git a/app/src/main/res/values-fi/text_functions.xml b/app/src/main/res/values-fi/strings_functions.xml similarity index 100% rename from app/src/main/res/values-fi/text_functions.xml rename to app/src/main/res/values-fi/strings_functions.xml diff --git a/app/src/main/res/values-fi/text_imported_aosp.xml b/app/src/main/res/values-fi/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-fi/text_imported_aosp.xml rename to app/src/main/res/values-fi/strings_imported_aosp.xml diff --git a/app/src/main/res/values-fi/text_imported_other.xml b/app/src/main/res/values-fi/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-fi/text_imported_other.xml rename to app/src/main/res/values-fi/strings_imported_other.xml diff --git a/app/src/main/res/values-fi/text_imported_other1.xml b/app/src/main/res/values-fi/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-fi/text_imported_other1.xml rename to app/src/main/res/values-fi/strings_imported_other1.xml diff --git a/app/src/main/res/values-fi/text_microsoft.xml b/app/src/main/res/values-fi/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-fi/text_microsoft.xml rename to app/src/main/res/values-fi/strings_microsoft.xml diff --git a/app/src/main/res/values-fi/text_operators.xml b/app/src/main/res/values-fi/strings_operators.xml similarity index 100% rename from app/src/main/res/values-fi/text_operators.xml rename to app/src/main/res/values-fi/strings_operators.xml diff --git a/app/src/main/res/values-fi/text_preferences.xml b/app/src/main/res/values-fi/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-fi/text_preferences.xml rename to app/src/main/res/values-fi/strings_preferences.xml diff --git a/app/src/main/res/values-fi/text_vars.xml b/app/src/main/res/values-fi/strings_vars.xml similarity index 100% rename from app/src/main/res/values-fi/text_vars.xml rename to app/src/main/res/values-fi/strings_vars.xml diff --git a/app/src/main/res/values-fi/text_wizard.xml b/app/src/main/res/values-fi/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-fi/text_wizard.xml rename to app/src/main/res/values-fi/strings_wizard.xml diff --git a/app/src/main/res/values-fr/text_strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from app/src/main/res/values-fr/text_strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/app/src/main/res/values-fr/text_about.xml b/app/src/main/res/values-fr/strings_about.xml similarity index 100% rename from app/src/main/res/values-fr/text_about.xml rename to app/src/main/res/values-fr/strings_about.xml diff --git a/app/src/main/res/values-fr/text_converter.xml b/app/src/main/res/values-fr/strings_converter.xml similarity index 100% rename from app/src/main/res/values-fr/text_converter.xml rename to app/src/main/res/values-fr/strings_converter.xml diff --git a/app/src/main/res/values-fr/text_functions.xml b/app/src/main/res/values-fr/strings_functions.xml similarity index 100% rename from app/src/main/res/values-fr/text_functions.xml rename to app/src/main/res/values-fr/strings_functions.xml diff --git a/app/src/main/res/values-fr/text_imported_aosp.xml b/app/src/main/res/values-fr/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-fr/text_imported_aosp.xml rename to app/src/main/res/values-fr/strings_imported_aosp.xml diff --git a/app/src/main/res/values-fr/text_imported_other.xml b/app/src/main/res/values-fr/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-fr/text_imported_other.xml rename to app/src/main/res/values-fr/strings_imported_other.xml diff --git a/app/src/main/res/values-fr/text_imported_other1.xml b/app/src/main/res/values-fr/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-fr/text_imported_other1.xml rename to app/src/main/res/values-fr/strings_imported_other1.xml diff --git a/app/src/main/res/values-fr/text_microsoft.xml b/app/src/main/res/values-fr/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-fr/text_microsoft.xml rename to app/src/main/res/values-fr/strings_microsoft.xml diff --git a/app/src/main/res/values-fr/text_operators.xml b/app/src/main/res/values-fr/strings_operators.xml similarity index 100% rename from app/src/main/res/values-fr/text_operators.xml rename to app/src/main/res/values-fr/strings_operators.xml diff --git a/app/src/main/res/values-fr/text_preferences.xml b/app/src/main/res/values-fr/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-fr/text_preferences.xml rename to app/src/main/res/values-fr/strings_preferences.xml diff --git a/app/src/main/res/values-fr/text_vars.xml b/app/src/main/res/values-fr/strings_vars.xml similarity index 100% rename from app/src/main/res/values-fr/text_vars.xml rename to app/src/main/res/values-fr/strings_vars.xml diff --git a/app/src/main/res/values-fr/text_wizard.xml b/app/src/main/res/values-fr/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-fr/text_wizard.xml rename to app/src/main/res/values-fr/strings_wizard.xml diff --git a/app/src/main/res/values-it/text_strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from app/src/main/res/values-it/text_strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/app/src/main/res/values-it/text_about.xml b/app/src/main/res/values-it/strings_about.xml similarity index 100% rename from app/src/main/res/values-it/text_about.xml rename to app/src/main/res/values-it/strings_about.xml diff --git a/app/src/main/res/values-it/text_converter.xml b/app/src/main/res/values-it/strings_converter.xml similarity index 100% rename from app/src/main/res/values-it/text_converter.xml rename to app/src/main/res/values-it/strings_converter.xml diff --git a/app/src/main/res/values-it/text_functions.xml b/app/src/main/res/values-it/strings_functions.xml similarity index 100% rename from app/src/main/res/values-it/text_functions.xml rename to app/src/main/res/values-it/strings_functions.xml diff --git a/app/src/main/res/values-it/text_imported_aosp.xml b/app/src/main/res/values-it/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-it/text_imported_aosp.xml rename to app/src/main/res/values-it/strings_imported_aosp.xml diff --git a/app/src/main/res/values-it/text_imported_other.xml b/app/src/main/res/values-it/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-it/text_imported_other.xml rename to app/src/main/res/values-it/strings_imported_other.xml diff --git a/app/src/main/res/values-it/text_imported_other1.xml b/app/src/main/res/values-it/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-it/text_imported_other1.xml rename to app/src/main/res/values-it/strings_imported_other1.xml diff --git a/app/src/main/res/values-it/text_microsoft.xml b/app/src/main/res/values-it/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-it/text_microsoft.xml rename to app/src/main/res/values-it/strings_microsoft.xml diff --git a/app/src/main/res/values-it/text_operators.xml b/app/src/main/res/values-it/strings_operators.xml similarity index 100% rename from app/src/main/res/values-it/text_operators.xml rename to app/src/main/res/values-it/strings_operators.xml diff --git a/app/src/main/res/values-it/text_preferences.xml b/app/src/main/res/values-it/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-it/text_preferences.xml rename to app/src/main/res/values-it/strings_preferences.xml diff --git a/app/src/main/res/values-it/text_vars.xml b/app/src/main/res/values-it/strings_vars.xml similarity index 100% rename from app/src/main/res/values-it/text_vars.xml rename to app/src/main/res/values-it/strings_vars.xml diff --git a/app/src/main/res/values-it/text_wizard.xml b/app/src/main/res/values-it/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-it/text_wizard.xml rename to app/src/main/res/values-it/strings_wizard.xml diff --git a/app/src/main/res/values-ja/text_strings.xml b/app/src/main/res/values-ja/strings.xml similarity index 100% rename from app/src/main/res/values-ja/text_strings.xml rename to app/src/main/res/values-ja/strings.xml diff --git a/app/src/main/res/values-ja/text_about.xml b/app/src/main/res/values-ja/strings_about.xml similarity index 100% rename from app/src/main/res/values-ja/text_about.xml rename to app/src/main/res/values-ja/strings_about.xml diff --git a/app/src/main/res/values-ja/text_converter.xml b/app/src/main/res/values-ja/strings_converter.xml similarity index 100% rename from app/src/main/res/values-ja/text_converter.xml rename to app/src/main/res/values-ja/strings_converter.xml diff --git a/app/src/main/res/values-ja/text_functions.xml b/app/src/main/res/values-ja/strings_functions.xml similarity index 100% rename from app/src/main/res/values-ja/text_functions.xml rename to app/src/main/res/values-ja/strings_functions.xml diff --git a/app/src/main/res/values-ja/text_imported_aosp.xml b/app/src/main/res/values-ja/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-ja/text_imported_aosp.xml rename to app/src/main/res/values-ja/strings_imported_aosp.xml diff --git a/app/src/main/res/values-ja/text_imported_other.xml b/app/src/main/res/values-ja/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-ja/text_imported_other.xml rename to app/src/main/res/values-ja/strings_imported_other.xml diff --git a/app/src/main/res/values-ja/text_imported_other1.xml b/app/src/main/res/values-ja/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-ja/text_imported_other1.xml rename to app/src/main/res/values-ja/strings_imported_other1.xml diff --git a/app/src/main/res/values-ja/text_microsoft.xml b/app/src/main/res/values-ja/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-ja/text_microsoft.xml rename to app/src/main/res/values-ja/strings_microsoft.xml diff --git a/app/src/main/res/values-ja/text_operators.xml b/app/src/main/res/values-ja/strings_operators.xml similarity index 100% rename from app/src/main/res/values-ja/text_operators.xml rename to app/src/main/res/values-ja/strings_operators.xml diff --git a/app/src/main/res/values-ja/text_preferences.xml b/app/src/main/res/values-ja/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-ja/text_preferences.xml rename to app/src/main/res/values-ja/strings_preferences.xml diff --git a/app/src/main/res/values-ja/text_vars.xml b/app/src/main/res/values-ja/strings_vars.xml similarity index 100% rename from app/src/main/res/values-ja/text_vars.xml rename to app/src/main/res/values-ja/strings_vars.xml diff --git a/app/src/main/res/values-ja/text_wizard.xml b/app/src/main/res/values-ja/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-ja/text_wizard.xml rename to app/src/main/res/values-ja/strings_wizard.xml diff --git a/app/src/main/res/values-nl/text_strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 100% rename from app/src/main/res/values-nl/text_strings.xml rename to app/src/main/res/values-nl/strings.xml diff --git a/app/src/main/res/values-nl/text_about.xml b/app/src/main/res/values-nl/strings_about.xml similarity index 100% rename from app/src/main/res/values-nl/text_about.xml rename to app/src/main/res/values-nl/strings_about.xml diff --git a/app/src/main/res/values-nl/text_converter.xml b/app/src/main/res/values-nl/strings_converter.xml similarity index 100% rename from app/src/main/res/values-nl/text_converter.xml rename to app/src/main/res/values-nl/strings_converter.xml diff --git a/app/src/main/res/values-nl/text_functions.xml b/app/src/main/res/values-nl/strings_functions.xml similarity index 100% rename from app/src/main/res/values-nl/text_functions.xml rename to app/src/main/res/values-nl/strings_functions.xml diff --git a/app/src/main/res/values-nl/text_imported_aosp.xml b/app/src/main/res/values-nl/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-nl/text_imported_aosp.xml rename to app/src/main/res/values-nl/strings_imported_aosp.xml diff --git a/app/src/main/res/values-nl/text_imported_other.xml b/app/src/main/res/values-nl/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-nl/text_imported_other.xml rename to app/src/main/res/values-nl/strings_imported_other.xml diff --git a/app/src/main/res/values-nl/text_imported_other1.xml b/app/src/main/res/values-nl/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-nl/text_imported_other1.xml rename to app/src/main/res/values-nl/strings_imported_other1.xml diff --git a/app/src/main/res/values-nl/text_microsoft.xml b/app/src/main/res/values-nl/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-nl/text_microsoft.xml rename to app/src/main/res/values-nl/strings_microsoft.xml diff --git a/app/src/main/res/values-nl/text_operators.xml b/app/src/main/res/values-nl/strings_operators.xml similarity index 100% rename from app/src/main/res/values-nl/text_operators.xml rename to app/src/main/res/values-nl/strings_operators.xml diff --git a/app/src/main/res/values-nl/text_preferences.xml b/app/src/main/res/values-nl/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-nl/text_preferences.xml rename to app/src/main/res/values-nl/strings_preferences.xml diff --git a/app/src/main/res/values-nl/text_vars.xml b/app/src/main/res/values-nl/strings_vars.xml similarity index 100% rename from app/src/main/res/values-nl/text_vars.xml rename to app/src/main/res/values-nl/strings_vars.xml diff --git a/app/src/main/res/values-nl/text_wizard.xml b/app/src/main/res/values-nl/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-nl/text_wizard.xml rename to app/src/main/res/values-nl/strings_wizard.xml diff --git a/app/src/main/res/values-pl/text_strings.xml b/app/src/main/res/values-pl/strings.xml similarity index 100% rename from app/src/main/res/values-pl/text_strings.xml rename to app/src/main/res/values-pl/strings.xml diff --git a/app/src/main/res/values-pl/text_about.xml b/app/src/main/res/values-pl/strings_about.xml similarity index 100% rename from app/src/main/res/values-pl/text_about.xml rename to app/src/main/res/values-pl/strings_about.xml diff --git a/app/src/main/res/values-pl/text_converter.xml b/app/src/main/res/values-pl/strings_converter.xml similarity index 100% rename from app/src/main/res/values-pl/text_converter.xml rename to app/src/main/res/values-pl/strings_converter.xml diff --git a/app/src/main/res/values-pl/text_functions.xml b/app/src/main/res/values-pl/strings_functions.xml similarity index 100% rename from app/src/main/res/values-pl/text_functions.xml rename to app/src/main/res/values-pl/strings_functions.xml diff --git a/app/src/main/res/values-pl/text_imported_aosp.xml b/app/src/main/res/values-pl/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-pl/text_imported_aosp.xml rename to app/src/main/res/values-pl/strings_imported_aosp.xml diff --git a/app/src/main/res/values-pl/text_imported_other.xml b/app/src/main/res/values-pl/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-pl/text_imported_other.xml rename to app/src/main/res/values-pl/strings_imported_other.xml diff --git a/app/src/main/res/values-pl/text_imported_other1.xml b/app/src/main/res/values-pl/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-pl/text_imported_other1.xml rename to app/src/main/res/values-pl/strings_imported_other1.xml diff --git a/app/src/main/res/values-pl/text_microsoft.xml b/app/src/main/res/values-pl/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-pl/text_microsoft.xml rename to app/src/main/res/values-pl/strings_microsoft.xml diff --git a/app/src/main/res/values-pl/text_operators.xml b/app/src/main/res/values-pl/strings_operators.xml similarity index 100% rename from app/src/main/res/values-pl/text_operators.xml rename to app/src/main/res/values-pl/strings_operators.xml diff --git a/app/src/main/res/values-pl/text_preferences.xml b/app/src/main/res/values-pl/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-pl/text_preferences.xml rename to app/src/main/res/values-pl/strings_preferences.xml diff --git a/app/src/main/res/values-pl/text_vars.xml b/app/src/main/res/values-pl/strings_vars.xml similarity index 100% rename from app/src/main/res/values-pl/text_vars.xml rename to app/src/main/res/values-pl/strings_vars.xml diff --git a/app/src/main/res/values-pl/text_wizard.xml b/app/src/main/res/values-pl/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-pl/text_wizard.xml rename to app/src/main/res/values-pl/strings_wizard.xml diff --git a/app/src/main/res/values-pt-rBR/text_strings.xml b/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_strings.xml rename to app/src/main/res/values-pt-rBR/strings.xml diff --git a/app/src/main/res/values-pt-rBR/text_about.xml b/app/src/main/res/values-pt-rBR/strings_about.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_about.xml rename to app/src/main/res/values-pt-rBR/strings_about.xml diff --git a/app/src/main/res/values-pt-rBR/text_converter.xml b/app/src/main/res/values-pt-rBR/strings_converter.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_converter.xml rename to app/src/main/res/values-pt-rBR/strings_converter.xml diff --git a/app/src/main/res/values-pt-rBR/text_functions.xml b/app/src/main/res/values-pt-rBR/strings_functions.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_functions.xml rename to app/src/main/res/values-pt-rBR/strings_functions.xml diff --git a/app/src/main/res/values-pt-rBR/text_imported_aosp.xml b/app/src/main/res/values-pt-rBR/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_imported_aosp.xml rename to app/src/main/res/values-pt-rBR/strings_imported_aosp.xml diff --git a/app/src/main/res/values-pt-rBR/text_imported_other.xml b/app/src/main/res/values-pt-rBR/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_imported_other.xml rename to app/src/main/res/values-pt-rBR/strings_imported_other.xml diff --git a/app/src/main/res/values-pt-rBR/text_imported_other1.xml b/app/src/main/res/values-pt-rBR/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_imported_other1.xml rename to app/src/main/res/values-pt-rBR/strings_imported_other1.xml diff --git a/app/src/main/res/values-pt-rBR/text_microsoft.xml b/app/src/main/res/values-pt-rBR/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_microsoft.xml rename to app/src/main/res/values-pt-rBR/strings_microsoft.xml diff --git a/app/src/main/res/values-pt-rBR/text_operators.xml b/app/src/main/res/values-pt-rBR/strings_operators.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_operators.xml rename to app/src/main/res/values-pt-rBR/strings_operators.xml diff --git a/app/src/main/res/values-pt-rBR/text_preferences.xml b/app/src/main/res/values-pt-rBR/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_preferences.xml rename to app/src/main/res/values-pt-rBR/strings_preferences.xml diff --git a/app/src/main/res/values-pt-rBR/text_vars.xml b/app/src/main/res/values-pt-rBR/strings_vars.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_vars.xml rename to app/src/main/res/values-pt-rBR/strings_vars.xml diff --git a/app/src/main/res/values-pt-rBR/text_wizard.xml b/app/src/main/res/values-pt-rBR/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/text_wizard.xml rename to app/src/main/res/values-pt-rBR/strings_wizard.xml diff --git a/app/src/main/res/values-pt-rPT/text_strings.xml b/app/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_strings.xml rename to app/src/main/res/values-pt-rPT/strings.xml diff --git a/app/src/main/res/values-pt-rPT/text_about.xml b/app/src/main/res/values-pt-rPT/strings_about.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_about.xml rename to app/src/main/res/values-pt-rPT/strings_about.xml diff --git a/app/src/main/res/values-pt-rPT/text_converter.xml b/app/src/main/res/values-pt-rPT/strings_converter.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_converter.xml rename to app/src/main/res/values-pt-rPT/strings_converter.xml diff --git a/app/src/main/res/values-pt-rPT/text_functions.xml b/app/src/main/res/values-pt-rPT/strings_functions.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_functions.xml rename to app/src/main/res/values-pt-rPT/strings_functions.xml diff --git a/app/src/main/res/values-pt-rPT/text_imported_aosp.xml b/app/src/main/res/values-pt-rPT/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_imported_aosp.xml rename to app/src/main/res/values-pt-rPT/strings_imported_aosp.xml diff --git a/app/src/main/res/values-pt-rPT/text_imported_other.xml b/app/src/main/res/values-pt-rPT/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_imported_other.xml rename to app/src/main/res/values-pt-rPT/strings_imported_other.xml diff --git a/app/src/main/res/values-pt-rPT/text_imported_other1.xml b/app/src/main/res/values-pt-rPT/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_imported_other1.xml rename to app/src/main/res/values-pt-rPT/strings_imported_other1.xml diff --git a/app/src/main/res/values-pt-rPT/text_microsoft.xml b/app/src/main/res/values-pt-rPT/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_microsoft.xml rename to app/src/main/res/values-pt-rPT/strings_microsoft.xml diff --git a/app/src/main/res/values-pt-rPT/text_operators.xml b/app/src/main/res/values-pt-rPT/strings_operators.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_operators.xml rename to app/src/main/res/values-pt-rPT/strings_operators.xml diff --git a/app/src/main/res/values-pt-rPT/text_preferences.xml b/app/src/main/res/values-pt-rPT/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_preferences.xml rename to app/src/main/res/values-pt-rPT/strings_preferences.xml diff --git a/app/src/main/res/values-pt-rPT/text_vars.xml b/app/src/main/res/values-pt-rPT/strings_vars.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_vars.xml rename to app/src/main/res/values-pt-rPT/strings_vars.xml diff --git a/app/src/main/res/values-pt-rPT/text_wizard.xml b/app/src/main/res/values-pt-rPT/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/text_wizard.xml rename to app/src/main/res/values-pt-rPT/strings_wizard.xml diff --git a/app/src/main/res/values-ru/text_strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from app/src/main/res/values-ru/text_strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/app/src/main/res/values-ru/text_about.xml b/app/src/main/res/values-ru/strings_about.xml similarity index 100% rename from app/src/main/res/values-ru/text_about.xml rename to app/src/main/res/values-ru/strings_about.xml diff --git a/app/src/main/res/values-ru/text_converter.xml b/app/src/main/res/values-ru/strings_converter.xml similarity index 100% rename from app/src/main/res/values-ru/text_converter.xml rename to app/src/main/res/values-ru/strings_converter.xml diff --git a/app/src/main/res/values-ru/text_converter_units.xml b/app/src/main/res/values-ru/strings_converter_units.xml similarity index 100% rename from app/src/main/res/values-ru/text_converter_units.xml rename to app/src/main/res/values-ru/strings_converter_units.xml diff --git a/app/src/main/res/values-ru/text_functions.xml b/app/src/main/res/values-ru/strings_functions.xml similarity index 100% rename from app/src/main/res/values-ru/text_functions.xml rename to app/src/main/res/values-ru/strings_functions.xml diff --git a/app/src/main/res/values-ru/text_imported_aosp.xml b/app/src/main/res/values-ru/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-ru/text_imported_aosp.xml rename to app/src/main/res/values-ru/strings_imported_aosp.xml diff --git a/app/src/main/res/values-ru/text_imported_other.xml b/app/src/main/res/values-ru/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-ru/text_imported_other.xml rename to app/src/main/res/values-ru/strings_imported_other.xml diff --git a/app/src/main/res/values-ru/text_imported_other1.xml b/app/src/main/res/values-ru/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-ru/text_imported_other1.xml rename to app/src/main/res/values-ru/strings_imported_other1.xml diff --git a/app/src/main/res/values-ru/text_microsoft.xml b/app/src/main/res/values-ru/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-ru/text_microsoft.xml rename to app/src/main/res/values-ru/strings_microsoft.xml diff --git a/app/src/main/res/values-ru/text_operators.xml b/app/src/main/res/values-ru/strings_operators.xml similarity index 100% rename from app/src/main/res/values-ru/text_operators.xml rename to app/src/main/res/values-ru/strings_operators.xml diff --git a/app/src/main/res/values-ru/text_preferences.xml b/app/src/main/res/values-ru/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-ru/text_preferences.xml rename to app/src/main/res/values-ru/strings_preferences.xml diff --git a/app/src/main/res/values-ru/text_release_notes.xml b/app/src/main/res/values-ru/strings_release_notes.xml similarity index 100% rename from app/src/main/res/values-ru/text_release_notes.xml rename to app/src/main/res/values-ru/strings_release_notes.xml diff --git a/app/src/main/res/values-ru/text_vars.xml b/app/src/main/res/values-ru/strings_vars.xml similarity index 100% rename from app/src/main/res/values-ru/text_vars.xml rename to app/src/main/res/values-ru/strings_vars.xml diff --git a/app/src/main/res/values-ru/text_wizard.xml b/app/src/main/res/values-ru/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-ru/text_wizard.xml rename to app/src/main/res/values-ru/strings_wizard.xml diff --git a/app/src/main/res/values-tr/text_strings.xml b/app/src/main/res/values-tr/strings.xml similarity index 100% rename from app/src/main/res/values-tr/text_strings.xml rename to app/src/main/res/values-tr/strings.xml diff --git a/app/src/main/res/values-tr/text_about.xml b/app/src/main/res/values-tr/strings_about.xml similarity index 100% rename from app/src/main/res/values-tr/text_about.xml rename to app/src/main/res/values-tr/strings_about.xml diff --git a/app/src/main/res/values-tr/text_converter.xml b/app/src/main/res/values-tr/strings_converter.xml similarity index 100% rename from app/src/main/res/values-tr/text_converter.xml rename to app/src/main/res/values-tr/strings_converter.xml diff --git a/app/src/main/res/values-tr/text_functions.xml b/app/src/main/res/values-tr/strings_functions.xml similarity index 100% rename from app/src/main/res/values-tr/text_functions.xml rename to app/src/main/res/values-tr/strings_functions.xml diff --git a/app/src/main/res/values-tr/text_imported_aosp.xml b/app/src/main/res/values-tr/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-tr/text_imported_aosp.xml rename to app/src/main/res/values-tr/strings_imported_aosp.xml diff --git a/app/src/main/res/values-tr/text_imported_other.xml b/app/src/main/res/values-tr/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-tr/text_imported_other.xml rename to app/src/main/res/values-tr/strings_imported_other.xml diff --git a/app/src/main/res/values-tr/text_imported_other1.xml b/app/src/main/res/values-tr/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-tr/text_imported_other1.xml rename to app/src/main/res/values-tr/strings_imported_other1.xml diff --git a/app/src/main/res/values-tr/text_microsoft.xml b/app/src/main/res/values-tr/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-tr/text_microsoft.xml rename to app/src/main/res/values-tr/strings_microsoft.xml diff --git a/app/src/main/res/values-tr/text_operators.xml b/app/src/main/res/values-tr/strings_operators.xml similarity index 100% rename from app/src/main/res/values-tr/text_operators.xml rename to app/src/main/res/values-tr/strings_operators.xml diff --git a/app/src/main/res/values-tr/text_preferences.xml b/app/src/main/res/values-tr/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-tr/text_preferences.xml rename to app/src/main/res/values-tr/strings_preferences.xml diff --git a/app/src/main/res/values-tr/text_vars.xml b/app/src/main/res/values-tr/strings_vars.xml similarity index 100% rename from app/src/main/res/values-tr/text_vars.xml rename to app/src/main/res/values-tr/strings_vars.xml diff --git a/app/src/main/res/values-tr/text_wizard.xml b/app/src/main/res/values-tr/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-tr/text_wizard.xml rename to app/src/main/res/values-tr/strings_wizard.xml diff --git a/app/src/main/res/values-uk/text_strings.xml b/app/src/main/res/values-uk/strings.xml similarity index 100% rename from app/src/main/res/values-uk/text_strings.xml rename to app/src/main/res/values-uk/strings.xml diff --git a/app/src/main/res/values-uk/text_about.xml b/app/src/main/res/values-uk/strings_about.xml similarity index 100% rename from app/src/main/res/values-uk/text_about.xml rename to app/src/main/res/values-uk/strings_about.xml diff --git a/app/src/main/res/values-uk/text_converter.xml b/app/src/main/res/values-uk/strings_converter.xml similarity index 100% rename from app/src/main/res/values-uk/text_converter.xml rename to app/src/main/res/values-uk/strings_converter.xml diff --git a/app/src/main/res/values-uk/text_functions.xml b/app/src/main/res/values-uk/strings_functions.xml similarity index 100% rename from app/src/main/res/values-uk/text_functions.xml rename to app/src/main/res/values-uk/strings_functions.xml diff --git a/app/src/main/res/values-uk/text_imported_aosp.xml b/app/src/main/res/values-uk/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-uk/text_imported_aosp.xml rename to app/src/main/res/values-uk/strings_imported_aosp.xml diff --git a/app/src/main/res/values-uk/text_imported_other.xml b/app/src/main/res/values-uk/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-uk/text_imported_other.xml rename to app/src/main/res/values-uk/strings_imported_other.xml diff --git a/app/src/main/res/values-uk/text_imported_other1.xml b/app/src/main/res/values-uk/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-uk/text_imported_other1.xml rename to app/src/main/res/values-uk/strings_imported_other1.xml diff --git a/app/src/main/res/values-uk/text_microsoft.xml b/app/src/main/res/values-uk/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-uk/text_microsoft.xml rename to app/src/main/res/values-uk/strings_microsoft.xml diff --git a/app/src/main/res/values-uk/text_operators.xml b/app/src/main/res/values-uk/strings_operators.xml similarity index 100% rename from app/src/main/res/values-uk/text_operators.xml rename to app/src/main/res/values-uk/strings_operators.xml diff --git a/app/src/main/res/values-uk/text_preferences.xml b/app/src/main/res/values-uk/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-uk/text_preferences.xml rename to app/src/main/res/values-uk/strings_preferences.xml diff --git a/app/src/main/res/values-uk/text_vars.xml b/app/src/main/res/values-uk/strings_vars.xml similarity index 100% rename from app/src/main/res/values-uk/text_vars.xml rename to app/src/main/res/values-uk/strings_vars.xml diff --git a/app/src/main/res/values-uk/text_wizard.xml b/app/src/main/res/values-uk/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-uk/text_wizard.xml rename to app/src/main/res/values-uk/strings_wizard.xml diff --git a/app/src/main/res/values-vi/text_strings.xml b/app/src/main/res/values-vi/strings.xml similarity index 100% rename from app/src/main/res/values-vi/text_strings.xml rename to app/src/main/res/values-vi/strings.xml diff --git a/app/src/main/res/values-vi/text_about.xml b/app/src/main/res/values-vi/strings_about.xml similarity index 100% rename from app/src/main/res/values-vi/text_about.xml rename to app/src/main/res/values-vi/strings_about.xml diff --git a/app/src/main/res/values-vi/text_converter.xml b/app/src/main/res/values-vi/strings_converter.xml similarity index 100% rename from app/src/main/res/values-vi/text_converter.xml rename to app/src/main/res/values-vi/strings_converter.xml diff --git a/app/src/main/res/values-vi/text_functions.xml b/app/src/main/res/values-vi/strings_functions.xml similarity index 100% rename from app/src/main/res/values-vi/text_functions.xml rename to app/src/main/res/values-vi/strings_functions.xml diff --git a/app/src/main/res/values-vi/text_imported_aosp.xml b/app/src/main/res/values-vi/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-vi/text_imported_aosp.xml rename to app/src/main/res/values-vi/strings_imported_aosp.xml diff --git a/app/src/main/res/values-vi/text_imported_other.xml b/app/src/main/res/values-vi/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-vi/text_imported_other.xml rename to app/src/main/res/values-vi/strings_imported_other.xml diff --git a/app/src/main/res/values-vi/text_imported_other1.xml b/app/src/main/res/values-vi/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-vi/text_imported_other1.xml rename to app/src/main/res/values-vi/strings_imported_other1.xml diff --git a/app/src/main/res/values-vi/text_microsoft.xml b/app/src/main/res/values-vi/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-vi/text_microsoft.xml rename to app/src/main/res/values-vi/strings_microsoft.xml diff --git a/app/src/main/res/values-vi/text_operators.xml b/app/src/main/res/values-vi/strings_operators.xml similarity index 100% rename from app/src/main/res/values-vi/text_operators.xml rename to app/src/main/res/values-vi/strings_operators.xml diff --git a/app/src/main/res/values-vi/text_preferences.xml b/app/src/main/res/values-vi/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-vi/text_preferences.xml rename to app/src/main/res/values-vi/strings_preferences.xml diff --git a/app/src/main/res/values-vi/text_vars.xml b/app/src/main/res/values-vi/strings_vars.xml similarity index 100% rename from app/src/main/res/values-vi/text_vars.xml rename to app/src/main/res/values-vi/strings_vars.xml diff --git a/app/src/main/res/values-vi/text_wizard.xml b/app/src/main/res/values-vi/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-vi/text_wizard.xml rename to app/src/main/res/values-vi/strings_wizard.xml diff --git a/app/src/main/res/values-zh-rCN/text_strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/app/src/main/res/values-zh-rCN/text_about.xml b/app/src/main/res/values-zh-rCN/strings_about.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_about.xml rename to app/src/main/res/values-zh-rCN/strings_about.xml diff --git a/app/src/main/res/values-zh-rCN/text_converter.xml b/app/src/main/res/values-zh-rCN/strings_converter.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_converter.xml rename to app/src/main/res/values-zh-rCN/strings_converter.xml diff --git a/app/src/main/res/values-zh-rCN/text_functions.xml b/app/src/main/res/values-zh-rCN/strings_functions.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_functions.xml rename to app/src/main/res/values-zh-rCN/strings_functions.xml diff --git a/app/src/main/res/values-zh-rCN/text_imported_aosp.xml b/app/src/main/res/values-zh-rCN/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_imported_aosp.xml rename to app/src/main/res/values-zh-rCN/strings_imported_aosp.xml diff --git a/app/src/main/res/values-zh-rCN/text_imported_other.xml b/app/src/main/res/values-zh-rCN/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_imported_other.xml rename to app/src/main/res/values-zh-rCN/strings_imported_other.xml diff --git a/app/src/main/res/values-zh-rCN/text_imported_other1.xml b/app/src/main/res/values-zh-rCN/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_imported_other1.xml rename to app/src/main/res/values-zh-rCN/strings_imported_other1.xml diff --git a/app/src/main/res/values-zh-rCN/text_microsoft.xml b/app/src/main/res/values-zh-rCN/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_microsoft.xml rename to app/src/main/res/values-zh-rCN/strings_microsoft.xml diff --git a/app/src/main/res/values-zh-rCN/text_operators.xml b/app/src/main/res/values-zh-rCN/strings_operators.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_operators.xml rename to app/src/main/res/values-zh-rCN/strings_operators.xml diff --git a/app/src/main/res/values-zh-rCN/text_preferences.xml b/app/src/main/res/values-zh-rCN/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_preferences.xml rename to app/src/main/res/values-zh-rCN/strings_preferences.xml diff --git a/app/src/main/res/values-zh-rCN/text_vars.xml b/app/src/main/res/values-zh-rCN/strings_vars.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_vars.xml rename to app/src/main/res/values-zh-rCN/strings_vars.xml diff --git a/app/src/main/res/values-zh-rCN/text_wizard.xml b/app/src/main/res/values-zh-rCN/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/text_wizard.xml rename to app/src/main/res/values-zh-rCN/strings_wizard.xml diff --git a/app/src/main/res/values-zh-rTW/text_strings.xml b/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_strings.xml rename to app/src/main/res/values-zh-rTW/strings.xml diff --git a/app/src/main/res/values-zh-rTW/text_about.xml b/app/src/main/res/values-zh-rTW/strings_about.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_about.xml rename to app/src/main/res/values-zh-rTW/strings_about.xml diff --git a/app/src/main/res/values-zh-rTW/text_converter.xml b/app/src/main/res/values-zh-rTW/strings_converter.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_converter.xml rename to app/src/main/res/values-zh-rTW/strings_converter.xml diff --git a/app/src/main/res/values-zh-rTW/text_functions.xml b/app/src/main/res/values-zh-rTW/strings_functions.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_functions.xml rename to app/src/main/res/values-zh-rTW/strings_functions.xml diff --git a/app/src/main/res/values-zh-rTW/text_imported_aosp.xml b/app/src/main/res/values-zh-rTW/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_imported_aosp.xml rename to app/src/main/res/values-zh-rTW/strings_imported_aosp.xml diff --git a/app/src/main/res/values-zh-rTW/text_imported_other.xml b/app/src/main/res/values-zh-rTW/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_imported_other.xml rename to app/src/main/res/values-zh-rTW/strings_imported_other.xml diff --git a/app/src/main/res/values-zh-rTW/text_imported_other1.xml b/app/src/main/res/values-zh-rTW/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_imported_other1.xml rename to app/src/main/res/values-zh-rTW/strings_imported_other1.xml diff --git a/app/src/main/res/values-zh-rTW/text_microsoft.xml b/app/src/main/res/values-zh-rTW/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_microsoft.xml rename to app/src/main/res/values-zh-rTW/strings_microsoft.xml diff --git a/app/src/main/res/values-zh-rTW/text_operators.xml b/app/src/main/res/values-zh-rTW/strings_operators.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_operators.xml rename to app/src/main/res/values-zh-rTW/strings_operators.xml diff --git a/app/src/main/res/values-zh-rTW/text_preferences.xml b/app/src/main/res/values-zh-rTW/strings_preferences.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_preferences.xml rename to app/src/main/res/values-zh-rTW/strings_preferences.xml diff --git a/app/src/main/res/values-zh-rTW/text_vars.xml b/app/src/main/res/values-zh-rTW/strings_vars.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_vars.xml rename to app/src/main/res/values-zh-rTW/strings_vars.xml diff --git a/app/src/main/res/values-zh-rTW/text_wizard.xml b/app/src/main/res/values-zh-rTW/strings_wizard.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/text_wizard.xml rename to app/src/main/res/values-zh-rTW/strings_wizard.xml diff --git a/app/src/main/res/values/text_strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/text_strings.xml rename to app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/text_about.xml b/app/src/main/res/values/strings_about.xml similarity index 100% rename from app/src/main/res/values/text_about.xml rename to app/src/main/res/values/strings_about.xml diff --git a/app/src/main/res/values/text_converter.xml b/app/src/main/res/values/strings_converter.xml similarity index 100% rename from app/src/main/res/values/text_converter.xml rename to app/src/main/res/values/strings_converter.xml diff --git a/app/src/main/res/values/text_converter_units.xml b/app/src/main/res/values/strings_converter_units.xml similarity index 100% rename from app/src/main/res/values/text_converter_units.xml rename to app/src/main/res/values/strings_converter_units.xml diff --git a/app/src/main/res/values/text_functions.xml b/app/src/main/res/values/strings_functions.xml similarity index 100% rename from app/src/main/res/values/text_functions.xml rename to app/src/main/res/values/strings_functions.xml diff --git a/app/src/main/res/values/text_glyphs.xml b/app/src/main/res/values/strings_glyphs.xml similarity index 100% rename from app/src/main/res/values/text_glyphs.xml rename to app/src/main/res/values/strings_glyphs.xml diff --git a/app/src/main/res/values/text_imported_aosp.xml b/app/src/main/res/values/strings_imported_aosp.xml similarity index 100% rename from app/src/main/res/values/text_imported_aosp.xml rename to app/src/main/res/values/strings_imported_aosp.xml diff --git a/app/src/main/res/values/text_imported_other.xml b/app/src/main/res/values/strings_imported_other.xml similarity index 100% rename from app/src/main/res/values/text_imported_other.xml rename to app/src/main/res/values/strings_imported_other.xml diff --git a/app/src/main/res/values/text_imported_other1.xml b/app/src/main/res/values/strings_imported_other1.xml similarity index 100% rename from app/src/main/res/values/text_imported_other1.xml rename to app/src/main/res/values/strings_imported_other1.xml diff --git a/app/src/main/res/values/text_microsoft.xml b/app/src/main/res/values/strings_microsoft.xml similarity index 100% rename from app/src/main/res/values/text_microsoft.xml rename to app/src/main/res/values/strings_microsoft.xml diff --git a/app/src/main/res/values/text_non_translatable.xml b/app/src/main/res/values/strings_non_translatable.xml similarity index 100% rename from app/src/main/res/values/text_non_translatable.xml rename to app/src/main/res/values/strings_non_translatable.xml diff --git a/app/src/main/res/values/text_operators.xml b/app/src/main/res/values/strings_operators.xml similarity index 100% rename from app/src/main/res/values/text_operators.xml rename to app/src/main/res/values/strings_operators.xml diff --git a/app/src/main/res/values/text_preferences.xml b/app/src/main/res/values/strings_preferences.xml similarity index 100% rename from app/src/main/res/values/text_preferences.xml rename to app/src/main/res/values/strings_preferences.xml diff --git a/app/src/main/res/values/text_release_notes.xml b/app/src/main/res/values/strings_release_notes.xml similarity index 100% rename from app/src/main/res/values/text_release_notes.xml rename to app/src/main/res/values/strings_release_notes.xml diff --git a/app/src/main/res/values/text_vars.xml b/app/src/main/res/values/strings_vars.xml similarity index 100% rename from app/src/main/res/values/text_vars.xml rename to app/src/main/res/values/strings_vars.xml diff --git a/app/src/main/res/values/text_wizard.xml b/app/src/main/res/values/strings_wizard.xml similarity index 100% rename from app/src/main/res/values/text_wizard.xml rename to app/src/main/res/values/strings_wizard.xml diff --git a/translations/src/main/java/org/solovyev/android/translations/Android.java b/translations/src/main/java/org/solovyev/android/translations/Android.java index a4297790..67bb7c81 100644 --- a/translations/src/main/java/org/solovyev/android/translations/Android.java +++ b/translations/src/main/java/org/solovyev/android/translations/Android.java @@ -129,7 +129,7 @@ public class Android { for (TranslationDef def : translationDefs) { translate(readResources(def.project, languageLocale), translations, def.links); } - Utils.saveTranslations(translations, languageLocale, outDir, "text_imported_" + outPostfix + ".xml"); + Utils.saveTranslations(translations, languageLocale, outDir, "strings_imported_" + outPostfix + ".xml"); } } diff --git a/translations/src/main/java/org/solovyev/android/translations/Microsoft.java b/translations/src/main/java/org/solovyev/android/translations/Microsoft.java index 46e805f8..e1d04aaa 100644 --- a/translations/src/main/java/org/solovyev/android/translations/Microsoft.java +++ b/translations/src/main/java/org/solovyev/android/translations/Microsoft.java @@ -54,7 +54,7 @@ public class Microsoft { private static final String xmlNoVersion = xmlPre + xmlPost; public static void main(String... args) throws Exception { - final String inFileName = "app/src/main/res/values/text_microsoft.xml"; + final String inFileName = "app/src/main/res/values/strings_microsoft.xml"; final File inFile = new File(inFileName); final File outDir = new File("build/translations/res"); diff --git a/translations/src/main/java/org/solovyev/android/translations/Wiki.java b/translations/src/main/java/org/solovyev/android/translations/Wiki.java index da5f90c6..8ec77092 100644 --- a/translations/src/main/java/org/solovyev/android/translations/Wiki.java +++ b/translations/src/main/java/org/solovyev/android/translations/Wiki.java @@ -19,7 +19,7 @@ import java.util.Map; public class Wiki { public static void main(String... args) throws Exception { - final String inFileName = "app/src/main/res/values/text_converter.xml"; + final String inFileName = "app/src/main/res/values/strings_converter.xml"; final File inFile = new File(inFileName); final File outDir = new File("build/translations/res");