Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor layout/strings fixes and adjustments to the settings app #2703

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Minor layout/strings fixes and adjustments to the settings app #2703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf79076
Remove unused strings in play-services-location module
Fs00 Dec 24, 2024
d957605
Tweak app location details screen layout and make a string translatable
Fs00 Dec 24, 2024
0fa646e
Use correct colon character
Fs00 Dec 24, 2024
2018478
Fix inability to set a custom location service URL on small screens
Fs00 Dec 24, 2024
98efa43
Allow preference titles to be multi-line again
Fs00 Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion play-services-core/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ Please set up a password, PIN, or pattern lock screen."</string>
<string name="games_leaderboard_empty_text">No leaderboards for this game</string>
<string name="games_leaderboard_score_empty_text">Unbelievable! There are no public high scores for this game.</string>
<string name="games_leaderboard_list_title">Rankings</string>
<string name="games_leaderboards_score_label">Score：%1$s</string>
<string name="games_leaderboards_score_label">Score: %1$s</string>
<string name="games_snapshot_empty_text">No game saves have been saved yet</string>
<string name="games_snapshot_choose_btn_text">select</string>
<string name="games_snapshot_delete_btn_text">delete</string>
Expand Down
1 change: 1 addition & 0 deletions play-services-core/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

<style name="Theme.Base.Preference.SwitchPreferenceCompat" parent="@style/Preference.SwitchPreferenceCompat.Material">
<item name="widgetLayout">@layout/preference_material_switch</item>
<item name="singleLineTitle">false</item>
</style>

<!-- Application theme (< API23) -->
Expand Down
52 changes: 27 additions & 25 deletions play-services-location/core/src/main/res/layout/preference_location_custom_url.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,43 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:fillViewport="true">

<TextView
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_location_custom_url_summary" />
android:paddingLeft="24dp"
android:paddingRight="24dp">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_location_custom_url_details" />

<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:hint="@string/pref_location_custom_url_input_hint"
app:placeholderText="https://example.com/?key=example">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/pref_location_custom_url_summary" />

<requestFocus />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_location_custom_url_details" />

<com.google.android.material.textfield.TextInputEditText
android:id="@android:id/edit"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:hint="@string/pref_location_custom_url_input_hint"
app:placeholderText="https://example.com/?key=example">

<com.google.android.material.textfield.TextInputEditText
android:id="@android:id/edit"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</ScrollView>
6 changes: 0 additions & 6 deletions play-services-location/core/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@
<string name="prefcat_location_apps_title">الوصول الأخير</string>
<string name="prefcat_location_cell_title">موقع شبكة الجوال</string>
<string name="prefcat_geocoder_title">محلل العناوين</string>
<string name="pref_location_wifi_mls_enabled_title">طلب من موزيلا</string>
<string name="prefcat_location_wifi_title">موقع شبكة الـ Wi-Fi</string>
<string name="pref_location_wifi_online_enabled_title">طلب من خدمة عبر الإنترنت</string>
<string name="pref_location_wifi_mls_enabled_summary">حصول على موقع شبكة الـ Wi-Fi من خدمة تحديد الموقع من موزيلا.</string>
<string name="pref_location_wifi_online_enabled_summary">حصول على موقع شبكة الـ Wi-Fi من خدمة تحديد الموقع عبر الإنترنت.</string>
<string name="pref_location_wifi_moving_enabled_title">طلب من نقطة الاتصال</string>
<string name="pref_location_wifi_learning_enabled_summary">تخزين مواقع الـ Wi-Fi محلياً عند استخدام GPS.</string>
<string name="pref_location_cell_mls_enabled_title">طلب من موزيلا</string>
<string name="pref_location_cell_mls_enabled_summary">حصول على مواقع الأبراج الخلوية لشبكة الجوال من خدمة تحديد الموقع من موزيلا.</string>
<string name="pref_location_wifi_learning_enabled_title">تذكُّر من GPS</string>
<string name="pref_location_cell_online_enabled_title">طلب من خدمة عبر الإنترنت</string>
<string name="pref_location_cell_online_enabled_summary">حصول على مواقع الأبراج الخلوية لشبكة الجوال من خدمة تحديد الموقع من خدمة عبر اﻹنترنت.</string>
Expand All @@ -31,9 +27,7 @@
<string name="location_settings_dialog_message_grant_permissions">منح أذونات الموقع لخدمة مايكرو-جي</string>
<string name="location_settings_dialog_btn_cancel">لا شكرًا</string>
<string name="location_settings_dialog_btn_sure">موافق</string>
<string name="pref_location_custom_url_reset">إعادة الضبط</string>
<string name="location_settings_dialog_message_gls_consent">استخدام خدمة تحديد الموقع لمايكرو-جي؛ كجزء من هذه الخدمة، قد يقوم مايكرو-جي بجمع بيانات الموقع بشكل دوري ومُخفي للمصدر واستخدام هذه البيانات لتحسين دقة الموقع والخدمات القائمة على الموقع.</string>
<string name="pref_location_custom_url_title">تعيين رابط الخدمة</string>
<string name="pref_location_source_title">اختر خدمة تحديد الموقع عبر الإنترنت</string>
<string name="pref_location_custom_url_input_hint">رابط مخصص للخدمة</string>
<string name="pref_location_custom_source_title">مخصص</string>
Expand Down
4 changes: 0 additions & 4 deletions play-services-location/core/src/main/res/values-ast/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pref_location_wifi_mls_enabled_summary">Recupera la llocalización basada nes redes Wi-Fi dende\'l serviciu de llocalización de Mozilla.</string>
<string name="pref_location_wifi_learning_enabled_summary">Atroxa llocalmente la llocalización de les redes Wi-Fi al usar el GPS.</string>
<string name="location_app_last_access_at">Últimu accesu: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
<string name="pref_location_cell_mls_enabled_title">Solicitar a Mozilla</string>
<string name="pref_location_cell_learning_enabled_summary">Atroxa la llocalización de la rede móvil cuando s\'usa\'l GPS.</string>
<string name="fragment_location_apps_title">Aplicaciones con accesu a la llocalización</string>
<string name="pref_location_app_force_coarse_summary">Siempres devuelve llocalizaciones aproximaes a esta aplicación, inorando\'l so nivel de permisos.</string>
<string name="pref_location_wifi_moving_enabled_summary">Recupera direutamente la llocalización de los puntos Wi-Fi compatibles al conectase.</string>
<string name="prefcat_location_cell_title">Llocalización pela rede móvil</string>
<string name="pref_location_wifi_mls_enabled_title">Solicitar a Mozilla</string>
<string name="pref_location_wifi_moving_enabled_title">Solicitar al puntu Wi-Fi</string>
<string name="pref_location_app_force_coarse_title">Forciar la llocalización aproximada</string>
<string name="pref_geocoder_nominatim_enabled_title">Usar Nominatim</string>
Expand All @@ -18,5 +15,4 @@
<string name="pref_geocoder_nominatim_enabled_summary">Resuelve direiciones con OpenStreetMap Nominatim.</string>
<string name="prefcat_location_wifi_title">Llocalización per Wi-Fi</string>
<string name="prefcat_geocoder_title">Resolvedor de direiciones</string>
<string name="pref_location_cell_mls_enabled_summary">Consigue la llocalización de les torres de telecomunicación móvil dende\'l serviciu de llocalización de Mozilla.</string>
</resources>
6 changes: 0 additions & 6 deletions play-services-location/core/src/main/res/values-az/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@
<string name="prefcat_location_wifi_title">Wi-Fi məkanı</string>
<string name="prefcat_location_cell_title">Mobil şəbəkə məkanı</string>
<string name="prefcat_geocoder_title">Ünvan qəbuledici</string>
<string name="pref_location_wifi_mls_enabled_title">Mozilla-dan sorğu</string>
<string name="pref_location_wifi_mls_enabled_summary">Mozilla Məkan Xidmətindən Wi-Fi əsaslı yeri əldə edin.</string>
<string name="pref_location_wifi_moving_enabled_title">Hotspot-dan sorğu</string>
<string name="pref_location_wifi_moving_enabled_summary">Qoşulduqda Wi-Fi məkanını birbaşa dəstəklənən Hotspots-dan əldə edin.</string>
<string name="pref_location_wifi_learning_enabled_title">GPS-dən xatırla</string>
<string name="pref_location_wifi_learning_enabled_summary">GPS istifadə edildikdə Wi-Fi məkanların yerli olaraq saxla.</string>
<string name="pref_location_cell_mls_enabled_summary">Mozilla Məkan Xidmətindən mobil şəbəkə qülləsinin yerlərini əldə edin.</string>
<string name="pref_location_cell_learning_enabled_title">GPS-dən xatırla</string>
<string name="pref_location_cell_learning_enabled_summary">GPS istifadə edildikdə mobil şəbəkə yerlərin yerli olaraq saxla.</string>
<string name="pref_geocoder_nominatim_enabled_title">Nominatim istifadə et</string>
Expand All @@ -26,13 +23,10 @@
<string name="location_settings_dialog_message_details_end_paragraph">Təfərrüatlar üçün məkan tənzimləmələrinə keçin.</string>
<string name="location_settings_dialog_btn_cancel">Xeyr, təşəkkür</string>
<string name="location_settings_dialog_btn_sure">Oldu</string>
<string name="pref_location_custom_url_reset">Sıfırla</string>
<string name="pref_location_custom_url_details">/v1/geolocate yolu avtomatik olaraq əlavə olunur. Məkan təminatçısı açar tələb edirsə, o, kök URL-ə sorğu faktoru kimi əlavə edilə bilər.</string>
<string name="pref_location_custom_url_input_hint">Fərdi xidmət URL-i</string>
<string name="pref_location_cell_mls_enabled_title">Mozilla-dan sorğu</string>
<string name="pref_geocoder_nominatim_enabled_summary">OpenStreetMap Nominatim istifadə edərək ünvanları qəbul et.</string>
<string name="location_settings_dialog_message_title_for_better_experience">Daha yaxşı təcrübə üçün microG-nin məkan xidmətin istifadə edən cihazın məkanın aktiv et</string>
<string name="pref_location_custom_url_title">Xidmət URL-ni konfiqurasiya et</string>
<string name="pref_location_custom_url_summary">Bu, fərdi xidmət URL-i təyin etməyə imkan verir. Yanlış dəyərlər məkan xidmətlərinin cavab verməməsi və ya tamamilə əlçatan olmaması ilə nəticələnə bilər.</string>
<string name="location_settings_dialog_message_gls_consent">microG məkan xidmətin istifadə edin; bu xidmətin bir hissəsi kimi microG məkan məlumatını vaxtaşırı toplaya və məkan dəqiqliyini və məkan əsaslı xidmətləri təkmilləşdirmək üçün bu məlumatı gizli şəkildə istifadə edə bilər.</string>
</resources>
6 changes: 0 additions & 6 deletions play-services-location/core/src/main/res/values-be/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@
<string name="prefcat_geocoder_title">Апрацоўшчык адраса</string>
<string name="pref_location_wifi_learning_enabled_title">Запамінаць каардынаты GPS</string>
<string name="pref_location_wifi_learning_enabled_summary">Запамінаць размяшчэнне кропак Wi-Fi грунтуючыся на дадзеных GPS.</string>
<string name="pref_location_cell_mls_enabled_summary">Вызначаць месцазнаходжанне засноўваючыся на базах сотавых вышак ад Mozilla Location Service.</string>
<string name="pref_geocoder_nominatim_enabled_summary">Вызначаць адрасы выкарыстоўваючы сэрвіс OpenStreetMap Nominatim.</string>
<string name="service_name_location">Месцазнаходжанне</string>
<string name="prefcat_location_apps_title">Нядаўнія запыты</string>
<string name="pref_location_wifi_mls_enabled_title">Апытваць сэрвэры Mozilla</string>
<string name="pref_location_wifi_mls_enabled_summary">Вызначаць месцазнаходжанне засноўваючыся на базах Wi-Fi ад Mozilla Location Service.</string>
<string name="pref_location_wifi_moving_enabled_title">Апытваць кропкі Hotspot</string>
<string name="pref_location_wifi_moving_enabled_summary">Атрымліваць месцазнаходжанне напрамую ад падтрымліваемых Wi-Fi кропак (Hotspot).</string>
<string name="pref_location_cell_mls_enabled_title">Апытваць серверы Mozilla</string>
<string name="pref_location_cell_learning_enabled_title">Запамінаць каардынаты GPS</string>
<string name="pref_location_cell_learning_enabled_summary">Захоўваць размяшчэнне вышак сотавай сувязі падчас працы GPS.</string>
<string name="pref_geocoder_nominatim_enabled_title">Выкарыстоўваць Nominatim</string>
Expand All @@ -29,8 +25,6 @@
<string name="location_settings_dialog_btn_cancel">Не, дзякуй</string>
<string name="location_settings_dialog_btn_sure">ОК</string>
<string name="location_settings_dialog_message_title_for_better_experience">Для паляпшэння вынікаў, уключыце вызначэнне месцазнаходжання, якое выкарыстоўвае службу вызначэння месцазнаходжання microG</string>
<string name="pref_location_custom_url_title">Наладзіць URL-адрас службы</string>
<string name="pref_location_custom_url_reset">Скінуць</string>
<string name="pref_location_custom_url_summary">Гэты параметр дазваляе наладзіць URL-адрас службы. Няправільныя значэнні могуць прывесці да таго, што службы вызначэння месцазнаходжання перастануць адказваць на запыты або будуць цалкам недаступныя.</string>
<string name="pref_location_custom_url_details">Шлях /v1/geocate будзе дададзены аўтаматычна. Калі правайдэру месцазнаходжання патрабуецца ключ, яго можна дадаць да каранёвага URL-адрасу ў якасці параметра запыту.</string>
<string name="pref_location_custom_url_input_hint">Карыстальніцкі адрас службы</string>
Expand Down
6 changes: 0 additions & 6 deletions play-services-location/core/src/main/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
<string name="service_name_location">Poloha</string>
<string name="prefcat_location_apps_title">Nedávný přístup</string>
<string name="prefcat_location_wifi_title">Poloha pomocí Wi-Fi</string>
<string name="pref_location_wifi_mls_enabled_summary">Získat polohu založenou na Wi-Fi ze služby Mozilla Location Service.</string>
<string name="pref_location_wifi_moving_enabled_summary">Získat polohu založenou na Wi-Fi přímo z podporovaných hotspotů po jejich připojení.</string>
<string name="pref_location_wifi_learning_enabled_summary">Lokálně ukládat polohy Wi-Fi při použití GPS.</string>
<string name="pref_location_cell_mls_enabled_title">Vyžádat od společnosti Mozilla</string>
<string name="pref_location_cell_mls_enabled_summary">Získat polohu věží mobilních sítí ze služby Mozilla Location Service.</string>
<string name="pref_location_cell_learning_enabled_summary">Lokálně ukládat polohy mobilních sítí při použití GPS.</string>
<string name="pref_geocoder_nominatim_enabled_title">Použít službu Nominatim</string>
<string name="fragment_location_apps_title">Aplikace s přístupem k poloze</string>
Expand All @@ -21,14 +18,11 @@
<string name="location_settings_dialog_message_details_end_paragraph">Pro více informací viz nastavení polohy.</string>
<string name="location_settings_dialog_btn_cancel">Ne, díky</string>
<string name="location_settings_dialog_btn_sure">OK</string>
<string name="pref_location_custom_url_title">Nastavit adresu služby</string>
<string name="pref_location_custom_url_reset">Resetovat</string>
<string name="pref_location_custom_url_summary">Tato možnost umožní nastavení vlastní adresy služby. Neplatné hodnoty mohou způsobit, že služby umístění nebudou odpovídat nebo zcela nedostupné.</string>
<string name="pref_location_custom_url_details">Cesta /v1/geolocate je přidána automaticky. Pokud poskytovatel polohy vyžaduje klíč, přidejte jej jako parametr dotazu k základní adrese URL.</string>
<string name="prefcat_location_cell_title">Poloha pomocí mobilní sítě</string>
<string name="prefcat_geocoder_title">Překladač adres</string>
<string name="pref_location_wifi_moving_enabled_title">Vyžádat z hotspotu</string>
<string name="pref_location_wifi_mls_enabled_title">Vyžádat od společnosti Mozilla</string>
<string name="pref_location_wifi_learning_enabled_title">Zapamatovat z GPS</string>
<string name="pref_location_cell_learning_enabled_title">Zapamatovat z GPS</string>
<string name="pref_geocoder_nominatim_enabled_summary">Překládat adresy pomocí služby OpenStreetMap Nominatim.</string>
Expand Down
Loading
Loading