From 6f26a9b9b9c78b4c8649903e8642bc1d7c76fccc Mon Sep 17 00:00:00 2001 From: Callum Stott Date: Tue, 18 Jun 2024 16:37:09 +0100 Subject: [PATCH 1/2] Rename reference to offline in strings --- strings/src/main/res/values/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/strings/src/main/res/values/strings.xml b/strings/src/main/res/values/strings.xml index fbc1a138feb..95198f604b2 100644 --- a/strings/src/main/res/values/strings.xml +++ b/strings/src/main/res/values/strings.xml @@ -479,25 +479,25 @@ Positron Dark Matter - - Reference layer + + Offline layers - + Layer - - Select reference layer + + Select offline layer - - Select the reference layer to use for all maps in this project. You can add options to the list by selecting an MBTile file from your device. + + Select the offline layer to use for all maps in this project. You can add options to the list by selecting an MBTile file from your device. - + Learn more about adding MBTiles. - + Add layers - + Delete layer From ccd0530fa5effe87b86cda1fbbbcf73c17fdc0df Mon Sep 17 00:00:00 2001 From: Callum Stott Date: Tue, 18 Jun 2024 16:38:03 +0100 Subject: [PATCH 2/2] Rename string names --- collect_app/src/main/res/xml/maps_preferences.xml | 4 ++-- maps/src/main/res/layout/offline_map_layers_picker.xml | 6 +++--- .../odk/collect/maps/layers/OfflineMapLayersPickerTest.kt | 4 ++-- strings/src/main/res/values-ar/strings.xml | 2 +- strings/src/main/res/values-cs/strings.xml | 2 +- strings/src/main/res/values-da/strings.xml | 2 +- strings/src/main/res/values-de/strings.xml | 2 +- strings/src/main/res/values-es/strings.xml | 2 +- strings/src/main/res/values-fa-rAF/strings.xml | 2 +- strings/src/main/res/values-fa/strings.xml | 2 +- strings/src/main/res/values-fi/strings.xml | 8 ++++---- strings/src/main/res/values-fr/strings.xml | 8 ++++---- strings/src/main/res/values-in/strings.xml | 2 +- strings/src/main/res/values-it/strings.xml | 2 +- strings/src/main/res/values-ja/strings.xml | 2 +- strings/src/main/res/values-pl/strings.xml | 2 +- strings/src/main/res/values-pt/strings.xml | 6 +++--- strings/src/main/res/values-ru/strings.xml | 2 +- strings/src/main/res/values-rw/strings.xml | 2 +- strings/src/main/res/values-sl/strings.xml | 2 +- strings/src/main/res/values-sv-rSE/strings.xml | 2 +- strings/src/main/res/values-sw/strings.xml | 2 +- strings/src/main/res/values-te/strings.xml | 2 +- strings/src/main/res/values-ur/strings.xml | 2 +- strings/src/main/res/values-zh/strings.xml | 2 +- strings/src/main/res/values/strings.xml | 8 ++++---- 26 files changed, 41 insertions(+), 41 deletions(-) diff --git a/collect_app/src/main/res/xml/maps_preferences.xml b/collect_app/src/main/res/xml/maps_preferences.xml index 2b5b76d4c1e..7e4c776fe71 100644 --- a/collect_app/src/main/res/xml/maps_preferences.xml +++ b/collect_app/src/main/res/xml/maps_preferences.xml @@ -9,14 +9,14 @@ app:iconSpaceReserved="false" /> diff --git a/maps/src/main/res/layout/offline_map_layers_picker.xml b/maps/src/main/res/layout/offline_map_layers_picker.xml index 2c407c36d13..27413f894d7 100644 --- a/maps/src/main/res/layout/offline_map_layers_picker.xml +++ b/maps/src/main/res/layout/offline_map_layers_picker.xml @@ -30,7 +30,7 @@ android:id="@+id/title" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="@string/reference_layer_dialog_title" + android:text="@string/offline_layer_dialog_title" android:textAppearance="?textAppearanceTitleLarge" app:layout_constraintStart_toEndOf="@id/guideline_start" app:layout_constraintEnd_toStartOf="@id/guideline_end" @@ -41,7 +41,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_small" - android:text="@string/reference_layer_dialog_description" + android:text="@string/offline_layer_dialog_description" android:textAppearance="?textAppearanceBodyMedium" app:layout_constraintStart_toEndOf="@id/guideline_start" app:layout_constraintEnd_toStartOf="@id/guideline_end" @@ -62,7 +62,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_standard" - android:text="@string/get_help_with_reference_layers" + android:text="@string/get_help_with_offline_layers" android:textAppearance="?textAppearanceLabelLarge" android:textColor="?colorAccent" app:layout_constraintBottom_toBottomOf="@id/mbtiles_info_icon" diff --git a/maps/src/test/java/org/odk/collect/maps/layers/OfflineMapLayersPickerTest.kt b/maps/src/test/java/org/odk/collect/maps/layers/OfflineMapLayersPickerTest.kt index 8704b0b0d44..bef58b15496 100644 --- a/maps/src/test/java/org/odk/collect/maps/layers/OfflineMapLayersPickerTest.kt +++ b/maps/src/test/java/org/odk/collect/maps/layers/OfflineMapLayersPickerTest.kt @@ -229,7 +229,7 @@ class OfflineMapLayersPickerTest { fun `the 'learn more' button should be enabled during loading layers`() { launchFragment() - onView(withText(string.get_help_with_reference_layers)).check(matches(isEnabled())) + onView(withText(string.get_help_with_offline_layers)).check(matches(isEnabled())) } @Test @@ -238,7 +238,7 @@ class OfflineMapLayersPickerTest { scheduler.flush() - EspressoHelpers.clickOnText(string.get_help_with_reference_layers) + EspressoHelpers.clickOnText(string.get_help_with_offline_layers) verify(externalWebPageHelper).openWebPageInCustomTab(any(), eq(Uri.parse("https://docs.getodk.org/collect-offline-maps/#transferring-offline-tilesets-to-devices"))) } diff --git a/strings/src/main/res/values-ar/strings.xml b/strings/src/main/res/values-ar/strings.xml index 520a76779b1..7b887314850 100644 --- a/strings/src/main/res/values-ar/strings.xml +++ b/strings/src/main/res/values-ar/strings.xml @@ -381,7 +381,7 @@ بوزيترون المادة المظلمة - الطبقة المرجعية + الطبقة المرجعية diff --git a/strings/src/main/res/values-cs/strings.xml b/strings/src/main/res/values-cs/strings.xml index 9df2d8ad86f..8ab7e0f7a75 100644 --- a/strings/src/main/res/values-cs/strings.xml +++ b/strings/src/main/res/values-cs/strings.xml @@ -386,7 +386,7 @@ Positron Temná hmota - Referenční vrstva + Referenční vrstva diff --git a/strings/src/main/res/values-da/strings.xml b/strings/src/main/res/values-da/strings.xml index 5372b09ce4c..d82eea9261b 100644 --- a/strings/src/main/res/values-da/strings.xml +++ b/strings/src/main/res/values-da/strings.xml @@ -223,7 +223,7 @@ Topografisk Positron - Referencelag + Referencelag diff --git a/strings/src/main/res/values-de/strings.xml b/strings/src/main/res/values-de/strings.xml index f242796b497..57276f51117 100644 --- a/strings/src/main/res/values-de/strings.xml +++ b/strings/src/main/res/values-de/strings.xml @@ -392,7 +392,7 @@ Positron Dunkle Materie - Referenzebene + Referenzebene diff --git a/strings/src/main/res/values-es/strings.xml b/strings/src/main/res/values-es/strings.xml index ade205894a1..1358a425726 100644 --- a/strings/src/main/res/values-es/strings.xml +++ b/strings/src/main/res/values-es/strings.xml @@ -388,7 +388,7 @@ Positrón Materia oscura - Capa de referencia + Capa de referencia diff --git a/strings/src/main/res/values-fa-rAF/strings.xml b/strings/src/main/res/values-fa-rAF/strings.xml index ce2b2f013d6..fd83acbdeed 100644 --- a/strings/src/main/res/values-fa-rAF/strings.xml +++ b/strings/src/main/res/values-fa-rAF/strings.xml @@ -358,7 +358,7 @@ پوزیترون ماده تاریک - مرجع به لایه + مرجع به لایه diff --git a/strings/src/main/res/values-fa/strings.xml b/strings/src/main/res/values-fa/strings.xml index ce2b2f013d6..fd83acbdeed 100644 --- a/strings/src/main/res/values-fa/strings.xml +++ b/strings/src/main/res/values-fa/strings.xml @@ -358,7 +358,7 @@ پوزیترون ماده تاریک - مرجع به لایه + مرجع به لایه diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml index 4d91b42dc8c..0738b66ab5c 100644 --- a/strings/src/main/res/values-fi/strings.xml +++ b/strings/src/main/res/values-fi/strings.xml @@ -392,15 +392,15 @@ Positroni Pimeä aine - Viitekerros + Viitekerros Kerros - Valitse viitekerros + Valitse viitekerros - Valitse viitekerros jota käytetään kaikissa tämän projektin kartoissa. Voit lisätä vaihtoehtoja listaan valitsemalla MBTile-tiedoston laitteeltasi. + Valitse viitekerros jota käytetään kaikissa tämän projektin kartoissa. Voit lisätä vaihtoehtoja listaan valitsemalla MBTile-tiedoston laitteeltasi. - Opi lisää MBTile-tiedostojen lisäämisestä. + Opi lisää MBTile-tiedostojen lisäämisestä. Lisää kerros diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml index 04dafa8cd3a..3d84e3b746e 100644 --- a/strings/src/main/res/values-fr/strings.xml +++ b/strings/src/main/res/values-fr/strings.xml @@ -392,15 +392,15 @@ Positron Matière Sombre - Couche de référence + Couche de référence Couche - Sélectionnez la couche de référence + Sélectionnez la couche de référence - Sélectionnez la couche de référence à utiliser pour toutes les cartes de ce projet. Vous pouvez ajouter des options à la liste en sélectionnant un fichier MBTile sur votre appareil. + Sélectionnez la couche de référence à utiliser pour toutes les cartes de ce projet. Vous pouvez ajouter des options à la liste en sélectionnant un fichier MBTile sur votre appareil. - En apprendre plus à propos de l\'ajout de MBTiles. + En apprendre plus à propos de l\'ajout de MBTiles. Ajouter une couche diff --git a/strings/src/main/res/values-in/strings.xml b/strings/src/main/res/values-in/strings.xml index 0b8627c888d..95b9f1e89b5 100644 --- a/strings/src/main/res/values-in/strings.xml +++ b/strings/src/main/res/values-in/strings.xml @@ -385,7 +385,7 @@ Positron Dark Matter - Lapisan referensi + Lapisan referensi diff --git a/strings/src/main/res/values-it/strings.xml b/strings/src/main/res/values-it/strings.xml index 9e30c5fd8e6..6837fae019b 100644 --- a/strings/src/main/res/values-it/strings.xml +++ b/strings/src/main/res/values-it/strings.xml @@ -389,7 +389,7 @@ Posizione Scuro è importante - Livello di riferimento + Livello di riferimento diff --git a/strings/src/main/res/values-ja/strings.xml b/strings/src/main/res/values-ja/strings.xml index 3f33a30eee5..376b92f9133 100644 --- a/strings/src/main/res/values-ja/strings.xml +++ b/strings/src/main/res/values-ja/strings.xml @@ -351,7 +351,7 @@ 位置 ダークマター - 参照レイヤー + 参照レイヤー diff --git a/strings/src/main/res/values-pl/strings.xml b/strings/src/main/res/values-pl/strings.xml index e2f0c257ca0..28bf991572f 100644 --- a/strings/src/main/res/values-pl/strings.xml +++ b/strings/src/main/res/values-pl/strings.xml @@ -331,7 +331,7 @@ Pozyton Ciemna Materia - Warstwa referencyjna + Warstwa referencyjna diff --git a/strings/src/main/res/values-pt/strings.xml b/strings/src/main/res/values-pt/strings.xml index aa214326086..a683232a479 100644 --- a/strings/src/main/res/values-pt/strings.xml +++ b/strings/src/main/res/values-pt/strings.xml @@ -392,14 +392,14 @@ Positron Matéria escura - Camada de referência + Camada de referência Camada - Selecionar camada de referência + Selecionar camada de referência - Saber mais sobre adicionar MBTiles. + Saber mais sobre adicionar MBTiles. Adicionar camada diff --git a/strings/src/main/res/values-ru/strings.xml b/strings/src/main/res/values-ru/strings.xml index de5e650790d..fb7e91ebe50 100644 --- a/strings/src/main/res/values-ru/strings.xml +++ b/strings/src/main/res/values-ru/strings.xml @@ -370,7 +370,7 @@ Топографический Не удалось получить доступ к Google картам. Установлен ли Google Play Services? - Базовый слой + Базовый слой diff --git a/strings/src/main/res/values-rw/strings.xml b/strings/src/main/res/values-rw/strings.xml index eb837dfa80d..b08f0c84591 100644 --- a/strings/src/main/res/values-rw/strings.xml +++ b/strings/src/main/res/values-rw/strings.xml @@ -354,7 +354,7 @@ N\'ukomea guhura n\'iki kibazo, wakigeza kuwa gusabye gukusanya amakuru.Utunyangingo. Ibibazo bidasobanutse cg byijimye. - Indangakitegererezo. + Indangakitegererezo. diff --git a/strings/src/main/res/values-sl/strings.xml b/strings/src/main/res/values-sl/strings.xml index 887e13cf676..5738f864e94 100644 --- a/strings/src/main/res/values-sl/strings.xml +++ b/strings/src/main/res/values-sl/strings.xml @@ -392,7 +392,7 @@ Positron Dark Matter - Referenčni sloj + Referenčni sloj diff --git a/strings/src/main/res/values-sv-rSE/strings.xml b/strings/src/main/res/values-sv-rSE/strings.xml index 14b97dfd22f..100a78d5702 100644 --- a/strings/src/main/res/values-sv-rSE/strings.xml +++ b/strings/src/main/res/values-sv-rSE/strings.xml @@ -310,7 +310,7 @@ Positron Mörk materia - Referenslager + Referenslager diff --git a/strings/src/main/res/values-sw/strings.xml b/strings/src/main/res/values-sw/strings.xml index 8e2755e2d34..1b9334cea2e 100644 --- a/strings/src/main/res/values-sw/strings.xml +++ b/strings/src/main/res/values-sw/strings.xml @@ -344,7 +344,7 @@ Positron Jambo la Giza - Safu ya Kumbukumbu + Safu ya Kumbukumbu diff --git a/strings/src/main/res/values-te/strings.xml b/strings/src/main/res/values-te/strings.xml index e028d66b2ab..b54a5050433 100644 --- a/strings/src/main/res/values-te/strings.xml +++ b/strings/src/main/res/values-te/strings.xml @@ -331,7 +331,7 @@ Positron Dark Matter - రిఫరెన్స్ లేయర్ + రిఫరెన్స్ లేయర్ diff --git a/strings/src/main/res/values-ur/strings.xml b/strings/src/main/res/values-ur/strings.xml index 07e0b2e2f21..8778a8563c8 100644 --- a/strings/src/main/res/values-ur/strings.xml +++ b/strings/src/main/res/values-ur/strings.xml @@ -390,7 +390,7 @@ Positron Dark Matter - ریفرنس Layer + ریفرنس Layer diff --git a/strings/src/main/res/values-zh/strings.xml b/strings/src/main/res/values-zh/strings.xml index a4901ae3f2e..1ada24ddd74 100644 --- a/strings/src/main/res/values-zh/strings.xml +++ b/strings/src/main/res/values-zh/strings.xml @@ -371,7 +371,7 @@ Positron Dark Matter - 应用图层 + 应用图层 diff --git a/strings/src/main/res/values/strings.xml b/strings/src/main/res/values/strings.xml index 95198f604b2..57d22f7b6d4 100644 --- a/strings/src/main/res/values/strings.xml +++ b/strings/src/main/res/values/strings.xml @@ -480,19 +480,19 @@ Dark Matter - Offline layers + Offline layers Layer - Select offline layer + Select offline layer - Select the offline layer to use for all maps in this project. You can add options to the list by selecting an MBTile file from your device. + Select the offline layer to use for all maps in this project. You can add options to the list by selecting an MBTile file from your device. - Learn more about adding MBTiles. + Learn more about adding MBTiles. Add layers