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

Commit 72ed6fea authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake_rel/...@138607

parent 80a7a1db

res/layout-land/choose_lock_pattern.xml

+18 −12
Original line number Diff line number Diff line
@@ -43,29 +43,35 @@ 
                android:layout_height="0dip"

                android:layout_weight="1.0">



            <!-- left button: skip, or re-try -->

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentLeft="true"

                android:layout_alignParentBottom="true"

                android:text="@string/lockpattern_restart_button_text"/>



            <!-- right button: confirm or ok -->

            <!-- right / bottom button: confirm or ok -->

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentRight="true"

                android:layout_width="140dip"

                android:layout_alignParentBottom="true"

                android:layout_centerHorizontal="true"

                android:ellipsize="marquee"

                android:singleLine="true"

                android:drawableRight="@drawable/ic_btn_next"

                android:drawablePadding="3dip"

                android:text="@string/lockpattern_confirm_button_text"/>





            <!-- left / top button: skip, or re-try -->

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

                android:layout_height="wrap_content"

                android:layout_width="140dip"

                android:layout_above="@id/footerRightButton"

                android:layout_centerHorizontal="true"

                android:ellipsize="marquee"

                android:singleLine="true"

                android:text="@string/lockpattern_restart_button_text"/>





            <!-- message above buttons -->

            <TextView android:id="@+id/footerText"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_above="@+id/footerRightButton"

                android:layout_above="@+id/footerLeftButton"

                android:layout_centerHorizontal="true"

                android:layout_marginBottom="4dip"

                android:textSize="14sp"/>

res/layout/choose_lock_pattern.xml

+6 −4
Original line number Diff line number Diff line
@@ -56,8 +56,9 @@ 
        <!-- left button: skip, or retry -->

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

            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/lockpattern_restart_button_text"/>



        <!-- Placeholder to get blank space between the two buttons -->
@@ -70,8 +71,9 @@ 
        <!-- right button: confirm or ok -->

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

            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/lockpattern_confirm_button_text"/>

res/values-cs/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -417,8 +417,6 @@ 
    <string name="status_wifi_mac_address">"Adresa MAC sítě WiFi"</string>

    <string name="status_bt_address">"Adresa zařízení Bluetooth"</string>

    <string name="status_unavailable">"Nedostupný údaj"</string>

    <string name="status_network_traffic_stats">"Využití sítě"</string>

    <string name="status_network_traffic_summary">"Odesláno: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Přijato: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>

    <string name="status_up_time">"Doba provozu"</string>

    <string name="status_awake_time">"Doba provozu"</string>

    <string name="internal_memory">"Interní paměť telefonu"</string>

res/values-de/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -417,8 +417,6 @@ 
    <string name="status_wifi_mac_address">"WLAN-MAC-Adresse"</string>

    <string name="status_bt_address">"Bluetooth-Adresse"</string>

    <string name="status_unavailable">"Nicht verfügbar"</string>

    <string name="status_network_traffic_stats">"Netzwerknutzung"</string>

    <string name="status_network_traffic_summary">"Gesendet: \n<xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Erhalt: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>

    <string name="status_up_time">"Betriebszeit"</string>

    <string name="status_awake_time">"Aktivzeit"</string>

    <string name="internal_memory">"Interner Telefonspeicher"</string>

res/values-es/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -416,8 +416,6 @@ 
    <string name="status_wifi_mac_address">"Dirección MAC de la red Wi-Fi"</string>

    <string name="status_bt_address">"Dirección de Bluetooth"</string>

    <string name="status_unavailable">"No disponible"</string>

    <string name="status_network_traffic_stats">"Uso de red"</string>

    <string name="status_network_traffic_summary">"Enviado: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Recibido: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>

    <string name="status_up_time">"Tiempo de actividad"</string>

    <string name="status_awake_time">"Tiempo de actividad"</string>

    <string name="internal_memory">"Almacenamiento interno del teléfono"</string>