Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23c9158d authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'korg/donut'

parents 607aa1a7 43f027a0

res/layout/choose_lock_pattern_example.xml

+10 −8
Original line number Diff line number Diff line
@@ -67,22 +67,24 @@ 
        

        <Button android:id="@+id/skip_button"

            android:layout_height="wrap_content"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_width="140dip"

            android:ellipsize="marquee"

            android:singleLine="true"

            android:text="@string/skip_button_label"

        />

      

        <!-- Placeholder to get blank space between the two buttons -->

        <View

            android:visibility="invisible"

            android:layout_height="0dip"

            android:layout_width="0dip"

            android:layout_weight="1"

        />

            android:layout_width="1dip"

            android:layout_weight="1" />

            

        <Button android:id="@+id/next_button"

            android:layout_height="wrap_content"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_width="140dip"

            android:ellipsize="marquee"

            android:singleLine="true"

            android:drawableRight="@drawable/ic_btn_next"

            android:drawablePadding="3dip"

            android:text="@string/next_button_label"

res/layout/choose_lock_pattern_tutorial.xml

+10 −8
Original line number Diff line number Diff line
@@ -59,24 +59,26 @@ 


        <Button android:id="@+id/skip_button"

            android:layout_height="wrap_content"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_width="140dip"

            android:ellipsize="marquee"

            android:singleLine="true"

            android:text="@string/skip_button_label"

        />

        

        <!-- Placeholder to get blank space between the two buttons -->

        <View

            android:visibility="invisible"

            android:layout_height="0dip"

            android:layout_width="0dip"

            android:layout_weight="1"

        />

            android:layout_width="1dip"

            android:layout_weight="1" />

        

        <Button android:id="@+id/next_button"

            android:layout_height="wrap_content"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_width="140dip"

            android:drawableRight="@drawable/ic_btn_next"

            android:drawablePadding="3dip"

            android:ellipsize="marquee"

            android:singleLine="true"

            android:text="@string/next_button_label"

        />

res/values-cs/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,10 @@ 
    <string name="date_and_time">"Nastavení data a času"</string>

    <string name="date_time_12_hour_sample">"13:00"</string>

    <string name="date_time_24_hour_sample">"13:00"</string>

    <!-- no translation found for date_time_changeTime_text (7037437020000867740) -->

    <skip />

    <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->

    <skip />

    <string name="choose_timezone">"Volba časového pásma"</string>

    <string name="display_preview_label">"Náhled:"</string>

    <string name="display_font_size_label">"Velikost písma:"</string>

res/values-de/strings.xml

+6 −7
Original line number Diff line number Diff line
@@ -107,9 +107,8 @@ 
    <string name="date_and_time">"Einstellungen"</string>

    <string name="date_time_12_hour_sample">"1:00"</string>

    <string name="date_time_24_hour_sample">"13:00"</string>

    <string name="date_time_changeTime_text">"Change time"</string>

    <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->

    <skip />

    <string name="date_time_changeTime_text">"Zeit einstellen"</string>

    <string name="date_time_changeDate_text">"Datum"</string>

    <string name="choose_timezone">"Zeitzone auswählen"</string>

    <string name="display_preview_label">"Vorschau:"</string>

    <string name="display_font_size_label">"Schriftgröße:"</string>
@@ -247,7 +246,7 @@ 
    <string name="bluetooth_headset_profile_summary_use_for">"Für Audiosystem des Telefons verwenden"</string>

    <string name="wifi">"WLAN"</string>

    <string name="wifi_quick_toggle_title">"WLAN"</string>

    <string name="wifi_quick_toggle_summary">"Wi-Fi aktivieren"</string>

    <string name="wifi_quick_toggle_summary">"WLAN aktivieren"</string>

    <string name="wifi_settings">"WLAN-Einstellungen"</string>

    <string name="wifi_settings_category">"WLAN-Einstellungen"</string>

    <string name="wifi_settings_summary">"Wireless-Zugangspunkte festlegen und verwalten"</string>
@@ -292,7 +291,7 @@ 
    <string name="wifi_security">"Sicherheit"</string>

    <string name="wifi_save_config">"Speichern"</string>

    <string name="wifi_password_unchanged">"(nicht geändert)"</string>

    <string name="wifi_add_other_network">"Wi-Fi-Netzwerk hinzufügen"</string>

    <string name="wifi_add_other_network">"WLAN-Netzwerk hinzufügen"</string>

    <string name="wifi_notify_open_networks">"Netzwerkhinweis"</string>

    <string name="wifi_notify_open_networks_summary">"Benachrichtigen, wenn ein offenes Netzwerk verfügbar ist"</string>

    <string name="wifi_password_incorrect_error">"Das eingegebene Netzwerkpasswort ist falsch. Bitte versuchen Sie es erneut."</string>
@@ -316,8 +315,8 @@ 
    <string name="wifi_setting_num_channels_summary">"Anzahl an zu verwendenden Kanälen festlegen"</string>

    <string name="wifi_setting_num_channels_error">"Beim Einrichten der Domain ist ein Problem aufgetreten."</string>

    <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> Kanäle"</string>

    <string name="wifi_setting_sleep_policy_title">"Wi-Fi Standby-Richtlinie"</string>

    <string name="wifi_setting_sleep_policy_summary">"Festlegen, wann von Wi-Fi auf mobile Daten umgeschaltet werden soll"</string>

    <string name="wifi_setting_sleep_policy_title">"WLAN Standby-Richtlinie"</string>

    <string name="wifi_setting_sleep_policy_summary">"Festlegen, wann von WLAN auf mobile Daten umgeschaltet werden soll"</string>

    <string name="wifi_setting_sleep_policy_error">"Beim Einrichten der Standby-Richtlinie ist ein Problem aufgetreten."</string>

    <string name="wifi_advanced_mac_address_title">"MAC-Adresse"</string>

    <string name="fragment_status_scanning">"Scannen…"</string>

res/values-es/strings.xml

+3 −5
Original line number Diff line number Diff line
@@ -107,10 +107,8 @@ 
    <string name="date_and_time">"Configuración de fecha y hora"</string>

    <string name="date_time_12_hour_sample">"1:00 p.m."</string>

    <string name="date_time_24_hour_sample">"13:00"</string>

    <!-- no translation found for date_time_changeTime_text (7037437020000867740) -->

    <skip />

    <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->

    <skip />

    <string name="date_time_changeTime_text">"Cambiar hora"</string>

    <string name="date_time_changeDate_text">"Fecha"</string>

    <string name="choose_timezone">"Seleccionar zona horaria"</string>

    <string name="display_preview_label">"Vista previa:"</string>

    <string name="display_font_size_label">"Tamaño de fuente:"</string>
@@ -515,7 +513,7 @@ 
    <string name="lockpattern_need_to_unlock">"Confirmar patrón guardado"</string>

    <string name="lockpattern_need_to_unlock_wrong">"Inténtalo de nuevo:"</string>

    <string name="lockpattern_recording_intro_header">"Crear un patrón de desbloqueo"</string>

    <string name="lockpattern_recording_intro_footer">"Pulsa la tecla Menu para obtener ayuda."</string>

    <string name="lockpattern_recording_intro_footer">"Pulsa la tecla de menú para obtener ayuda."</string>

    <string name="lockpattern_recording_inprogress">"Levanta el dedo cuando termines."</string>

    <string name="lockpattern_recording_incorrect_too_short">"Une al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Inténtalo de nuevo:"</string>

    <string name="lockpattern_pattern_entered_header">"Patrón grabado"</string>