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

Commit a2adddc4 authored by Eug89's avatar Eug89
Browse files

Merge branch 'eclair' of git://github.com/cyanogen/android_packages_apps_Settings into eclair

parents b242cceb c29fc13f

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ 
            </intent-filter>

        </activity>



        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time">

            android:screenOrientation="portrait"

        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time"

            android:screenOrientation="portrait">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

res/layout/master_clear_primary.xml

+20 −16
Original line number Diff line number Diff line
@@ -17,20 +17,24 @@ 
** limitations under the License.

*/

-->



<LinearLayout

            xmlns:android="http://schemas.android.com/apk/res/android"

            style="@style/info_layout">



    <ScrollView

            android:layout_width="fill_parent"

            android:layout_height="0dip"

            android:layout_weight="1">

        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textSize="18sp"

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



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

    </ScrollView>

    <Button

            android:id="@+id/initiate_master_clear"

            android:layout_gravity="center_horizontal"

        android:layout_marginTop="40dip"

            android:layout_marginTop="20dip"

            android:layout_width="150dip"

            android:layout_height="wrap_content"

            android:text="@string/master_clear_button_text"

res/values-de/arrays.xml

+9 −8
Original line number Diff line number Diff line
@@ -15,18 +15,19 @@ 
-->

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string-array name="lockpattern_pin_check_timeout_entries">

    <item>0.5 Sekunden</item>

  <string-array name="incorrect_delay_entries">

    <item>Keine</item>

    <item>0,5 Sekunden</item>

    <item>1 Sekunde</item>

    <item>1.5 Sekunden</item>

    <item>1,5 Sekunden</item>

    <item>2 Sekunden</item>

  </string-array>



  <string-array name="lockpattern_pin_check_timeout_values">

    <item>500</item>

    <item>1000</item>

    <item>1500</item>

    <item>2000</item>

  <string-array name="lockpattern_pin_check_timeout_entries">

    <item>0,5 Sekunden</item>

    <item>1 Sekunde</item>

    <item>1,5 Sekunden</item>

    <item>2 Sekunden</item>

  </string-array>



  <string-array name="timezone_filters">

res/values-de/strings.xml

+20 −13
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ 
    <!-- Sound settings screen, notification light while screen on title -->

    <string name="notification_screen_on_title">Pulsieren wenn Anzeige an</string>

    <!-- Sound settings screen, notification light while screen on summary -->

    <string name="notification_screen_on_summary">Trackball-Licht pulsieren auch wenn Anzeigr an ist</string>

    <string name="notification_screen_on_summary">Trackball-Licht pulsieren auch wenn Anzeige an ist</string>

    <!-- Sound settings screen, breathing light color title -->

    <string name="breathing_light_color_title">Pulsierendes Licht</string>

    <!-- Sound settings screen, breathing light color summary TODO: find a better way to say this...-->
@@ -502,7 +502,7 @@ 
    <string name="build_number" msgid="3075795840572241758">"Build-Nummer"</string>



    <!-- About phone screen,  setting option name-->

    <string name="mod_version">Mod Version</string>

    <string name="mod_version">Mod-Version</string>

    <string name="mod_version_default">Unbekannt</string>

    <string name="device_info_not_available" msgid="8062521887156825182">"Nicht verfügbar"</string>

    <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
@@ -645,6 +645,13 @@ 
    <string name="lockpattern_settings_enable_pin_based_locking">PIN-Sperre einschalten</string>

    <string name="lockpattern_settings_set_pin_check_timeout">Zeitlimit für PIN-Abfrage</string>

    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Muster sichtbar"</string>

    <string name="lockpattern_settings_enable_visible_dots_title">Punkte sichtbar</string>

    <string name="lockpattern_settings_show_error_path">Zeige fehlerhaften Pfad bei Fehler</string>

    <string name="lockpattern_settings_show_custom_msg">Zeige eigene Nachricht</string>

    <string name="lockpattern_settings_show_sliders">Zeige Schieber</string>

    <string name="lockpattern_settings_custom_msg">Eigene Nachricht</string>

    <string name="lockpattern_settings_custom_msg_dialog">Gib eine eigene Nachricht ein</string>

    <string name="lockpattern_settings_incorrect_delay_title">Stelle Verzögerung bei fehlerhaftem Muster ein</string>

    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Haptisches Feedback"</string>

    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Entsperrungsmuster"</string>

    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Muster ändern"</string>
@@ -777,9 +784,9 @@ 
    <string name="enable_adb" msgid="7982306934419797485">"USB-Debugging"</string>

    <string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss eines USB-Geräts"</string>

    <!-- Setting checkbox title for displaying USB debugging notification -->

    <string name="adb_notify">USB Debugging Benachrichtigung</string>

    <string name="adb_notify">USB-Debugging Benachrichtigung</string>

    <!-- Setting checkbox summary for displaying USB debugging notification -->

    <string name="adb_notify_summary">Zeige Benachrichtigung wenn USB Debugging verbunden ist</string>

    <string name="adb_notify_summary">Zeige Benachrichtigung, wenn USB-Debugging verbunden ist</string>

    <string name="keep_screen_on" msgid="1146389631208760344">"Aktiv bleiben"</string>

    <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>

    <string name="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
@@ -995,15 +1002,15 @@ 
    <string name="vpn_openvpn_protocol">Protokoll</string>

    <string name="vpn_openvpn_userauth">Benutzer Authentifizierung</string>

    <string name="vpn_openvpn_userauth_summary">Einschalten, wenn zusätzliche Name/Passwort Authentifizierung benutzt werden soll.</string>

    <string name="vpn_openvpn_advanced_titlebar">Erweiterte OpenVPN Einstellungen</string>

    <string name="vpn_openvpn_comp_lzo">LZO Kompression</string>

    <string name="vpn_openvpn_comp_lzo_summary">LZO Kompression erzwingen</string>

    <string name="vpn_openvpn_advanced_titlebar">Erweiterte OpenVPN-Einstellungen</string>

    <string name="vpn_openvpn_comp_lzo">LZO-Kompression</string>

    <string name="vpn_openvpn_comp_lzo_summary">LZO-Kompression erzwingen</string>

    <string name="vpn_openvpn_redirect_gateway_title">Gateway Weiterleitung</string>

    <string name="vpn_openvpn_redirect_gateway_summary">Erzwingen, den gesamten Verkehr durch den VPN Tunnel zu leiten.</string>

    <string name="vpn_openvpn_redirect_gateway_summary">Erzwingen, den gesamten Verkehr durch den VPN-Tunnel zu leiten.</string>

    <string name="vpn_openvpn_set_addr">Entfernter Server setzt Adressen</string>

    <string name="vpn_openvpn_set_addr_summary">Abwählen, um Tunneladressen manuell einzustellen.</string>

    <string name="vpn_openvpn_set_local_addr">Lokale IP Addresse</string>

    <string name="vpn_openvpn_set_remote_addr">Entfernte IP Addresse</string>

    <string name="vpn_openvpn_set_local_addr">Lokale IP-Addresse</string>

    <string name="vpn_openvpn_set_remote_addr">Entfernte IP-Addresse</string>

    <string name="credentials_category" msgid="8536992056377271234">"Anmeldeinformationsspeicher"</string>

    <string name="credentials_access" msgid="4843187230913860492">"Sichere Anmeldeinformationen verwenden"</string>

    <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen können sichere Zertifikate und Anmeldeinformationen abrufen."</string>
@@ -1042,9 +1049,9 @@ 
    <string name="backup_erase_dialog_message" msgid="9096433810456900531">"Möchten Sie wirklich die Sicherung Ihrer Einstellungen beenden und alle Kopien auf den Google-Servern löschen?"</string>

    <string name="untitled_apn" msgid="1230060359198685513">"Unbenannt"</string>

    <!-- Tethering settings -->

    <string name="internet_tethering">Internet Tethering</string>

    <string name="internet_tethering_summary_on">Internet Tethering über USB ist eingeschaltet</string>

    <string name="internet_tethering_summary_off">Internet Tethering über USB ist ausgeschaltet</string>

    <string name="internet_tethering">Internet-Tethering</string>

    <string name="internet_tethering_summary_on">Internet-Tethering über USB ist eingeschaltet</string>

    <string name="internet_tethering_summary_off">Internet-Tethering über USB ist ausgeschaltet</string>



    <!-- Apps2SD -->

    <!-- Text for the "Move" button. -->

res/values-ja/arrays.xml

+8 −0
Original line number Diff line number Diff line
@@ -159,6 +159,14 @@ 
        <item>"携帯電話を回転させると360度の範囲(逆回転も含む)で画面を回転させる"</item>

    </string-array>



    <string-array name="incorrect_delay_entries">

        <item>"遅延なし"</item>

        <item>"0.5 秒"</item>

        <item>"1 秒</item>

        <item>"1.5 秒"</item>

        <item>"2 秒"</item>

    </string-array>



    <string-array name="lockpattern_pin_check_timeout_entries">

        <item>0.5 秒</item>

        <item>1 秒</item>