Skip to content

Commit

Permalink
Merge pull request #6208 from seadowg/offline-layers-strings
Browse files Browse the repository at this point in the history
Rename "reference layers" to "offline layers"
  • Loading branch information
seadowg authored Jun 18, 2024
2 parents f7eb09b + ccd0530 commit bb7e3f6
Show file tree
Hide file tree
Showing 26 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions collect_app/src/main/res/xml/maps_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
app:iconSpaceReserved="false" />
<PreferenceCategory
android:key="category_reference_layer"
android:title="@string/reference_layer"
android:title="@string/offline_layer"
app:allowDividerAbove="false"
app:allowDividerBelow="false"
app:iconSpaceReserved="false">
<Preference
android:key="reference_layer"
android:title="@string/layer_data_file"
android:dialogTitle="@string/reference_layer_dialog_title"
android:dialogTitle="@string/offline_layer_dialog_title"
android:negativeButtonText="@string/cancel"
android:positiveButtonText="@string/ok"
app:iconSpaceReserved="false" />
Expand Down
6 changes: 3 additions & 3 deletions maps/src/main/res/layout/offline_map_layers_picker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")))
}
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
<string name="carto_map_style_positron">بوزيترون</string>
<string name="carto_map_style_dark_matter">المادة المظلمة</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">الطبقة المرجعية</string>
<string name="offline_layer">الطبقة المرجعية</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Temná hmota</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Referenční vrstva</string>
<string name="offline_layer">Referenční vrstva</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<string name="topographic">Topografisk</string>
<string name="carto_map_style_positron">Positron</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Referencelag</string>
<string name="offline_layer">Referencelag</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Dunkle Materie</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Referenzebene</string>
<string name="offline_layer">Referenzebene</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
<string name="carto_map_style_positron">Positrón</string>
<string name="carto_map_style_dark_matter">Materia oscura</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Capa de referencia</string>
<string name="offline_layer">Capa de referencia</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-fa-rAF/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
<string name="carto_map_style_positron">پوزیترون</string>
<string name="carto_map_style_dark_matter">ماده تاریک</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer"> مرجع به لایه</string>
<string name="offline_layer"> مرجع به لایه</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
<string name="carto_map_style_positron">پوزیترون</string>
<string name="carto_map_style_dark_matter">ماده تاریک</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer"> مرجع به لایه</string>
<string name="offline_layer"> مرجع به لایه</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
8 changes: 4 additions & 4 deletions strings/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -392,15 +392,15 @@
<string name="carto_map_style_positron">Positroni</string>
<string name="carto_map_style_dark_matter">Pimeä aine</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Viitekerros</string>
<string name="offline_layer">Viitekerros</string>
<!--Label for the reference layer setting-->
<string name="layer_data_file">Kerros</string>
<!--Title for the screen that allows the user to select a reference layer for maps-->
<string name="reference_layer_dialog_title">Valitse viitekerros</string>
<string name="offline_layer_dialog_title">Valitse viitekerros</string>
<!--Description of how to add reference layers to the project-->
<string name="reference_layer_dialog_description" tools:ignore="UnusedResources">Valitse viitekerros jota käytetään kaikissa tämän projektin kartoissa. Voit lisätä vaihtoehtoja listaan valitsemalla MBTile-tiedoston laitteeltasi.</string>
<string name="offline_layer_dialog_description" tools:ignore="UnusedResources">Valitse viitekerros jota käytetään kaikissa tämän projektin kartoissa. Voit lisätä vaihtoehtoja listaan valitsemalla MBTile-tiedoston laitteeltasi.</string>
<!--Text of button user can press to get help when setting up Reference Layers-->
<string name="get_help_with_reference_layers">Opi lisää MBTile-tiedostojen lisäämisestä.</string>
<string name="get_help_with_offline_layers">Opi lisää MBTile-tiedostojen lisäämisestä.</string>
<!--Text for button that lets the user select a reference layer on their device to add-->
<string name="add_layer" tools:ignore="UnusedResources">Lisää kerros</string>
<!--Text for button that lets the user delete a reference layer-->
Expand Down
8 changes: 4 additions & 4 deletions strings/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -392,15 +392,15 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Matière Sombre</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Couche de référence</string>
<string name="offline_layer">Couche de référence</string>
<!--Label for the reference layer setting-->
<string name="layer_data_file">Couche</string>
<!--Title for the screen that allows the user to select a reference layer for maps-->
<string name="reference_layer_dialog_title">Sélectionnez la couche de référence</string>
<string name="offline_layer_dialog_title">Sélectionnez la couche de référence</string>
<!--Description of how to add reference layers to the project-->
<string name="reference_layer_dialog_description" tools:ignore="UnusedResources">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.</string>
<string name="offline_layer_dialog_description" tools:ignore="UnusedResources">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.</string>
<!--Text of button user can press to get help when setting up Reference Layers-->
<string name="get_help_with_reference_layers">En apprendre plus à propos de l\'ajout de MBTiles.</string>
<string name="get_help_with_offline_layers">En apprendre plus à propos de l\'ajout de MBTiles.</string>
<!--Text for button that lets the user select a reference layer on their device to add-->
<string name="add_layer" tools:ignore="UnusedResources">Ajouter une couche</string>
<!--Text for button that lets the user delete a reference layer-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Dark Matter</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Lapisan referensi</string>
<string name="offline_layer">Lapisan referensi</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
<string name="carto_map_style_positron">Posizione</string>
<string name="carto_map_style_dark_matter">Scuro è importante</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Livello di riferimento</string>
<string name="offline_layer">Livello di riferimento</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
<string name="carto_map_style_positron">位置</string>
<string name="carto_map_style_dark_matter">ダークマター</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">参照レイヤー</string>
<string name="offline_layer">参照レイヤー</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
<string name="carto_map_style_positron">Pozyton</string>
<string name="carto_map_style_dark_matter">Ciemna Materia</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Warstwa referencyjna</string>
<string name="offline_layer">Warstwa referencyjna</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
6 changes: 3 additions & 3 deletions strings/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -392,14 +392,14 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Matéria escura</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Camada de referência</string>
<string name="offline_layer">Camada de referência</string>
<!--Label for the reference layer setting-->
<string name="layer_data_file">Camada</string>
<!--Title for the screen that allows the user to select a reference layer for maps-->
<string name="reference_layer_dialog_title">Selecionar camada de referência</string>
<string name="offline_layer_dialog_title">Selecionar camada de referência</string>
<!--Description of how to add reference layers to the project-->
<!--Text of button user can press to get help when setting up Reference Layers-->
<string name="get_help_with_reference_layers">Saber mais sobre adicionar MBTiles.</string>
<string name="get_help_with_offline_layers">Saber mais sobre adicionar MBTiles.</string>
<!--Text for button that lets the user select a reference layer on their device to add-->
<string name="add_layer" tools:ignore="UnusedResources">Adicionar camada</string>
<!--Text for button that lets the user delete a reference layer-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
<string name="topographic">Топографический</string>
<string name="google_play_services_error_occured">Не удалось получить доступ к Google картам. Установлен ли Google Play Services?</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Базовый слой</string>
<string name="offline_layer">Базовый слой</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-rw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ N\'ukomea guhura n\'iki kibazo, wakigeza kuwa gusabye gukusanya amakuru.</strin
<string name="carto_map_style_positron">Utunyangingo.</string>
<string name="carto_map_style_dark_matter">Ibibazo bidasobanutse cg byijimye.</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Indangakitegererezo.</string>
<string name="offline_layer">Indangakitegererezo.</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-sl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Dark Matter</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Referenčni sloj</string>
<string name="offline_layer">Referenčni sloj</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-sv-rSE/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Mörk materia</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Referenslager</string>
<string name="offline_layer">Referenslager</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-sw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Jambo la Giza</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">Safu ya Kumbukumbu</string>
<string name="offline_layer">Safu ya Kumbukumbu</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-te/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Dark Matter</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">రిఫరెన్స్ లేయర్</string>
<string name="offline_layer">రిఫరెన్స్ లేయర్</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-ur/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Dark Matter</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">ریفرنس Layer</string>
<string name="offline_layer">ریفرنس Layer</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
2 changes: 1 addition & 1 deletion strings/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
<string name="carto_map_style_positron">Positron</string>
<string name="carto_map_style_dark_matter">Dark Matter</string>
<!--Title for the reference layer section of settings-->
<string name="reference_layer">应用图层</string>
<string name="offline_layer">应用图层</string>
<!--Label for the reference layer setting-->
<!--Title for the screen that allows the user to select a reference layer for maps-->
<!--Description of how to add reference layers to the project-->
Expand Down
Loading

0 comments on commit bb7e3f6

Please sign in to comment.