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

Commit 58654e83 authored by takuo's avatar takuo
Browse files

Merge remote branch 'cyanogen/eclair' into eclair

parents d0a49ad1 59f62c80
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@
<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>
    <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>

+19 −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,12 @@
    <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_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 +783,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 +1001,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 +1048,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. -->
+8 −0
Original line number Diff line number Diff line
@@ -170,6 +170,14 @@
        <item>2 secondi</item>
    </string-array>
    
    <string-array name="incorrect_delay_entries">
        <item>Nessun ritardo</item>
        <item>0.5 secondi</item>
        <item>1 secondo</item>
        <item>1.5 secondi</item>
        <item>2 secondi</item>
    </string-array>

   

</resources>
+7 −0
Original line number Diff line number Diff line
@@ -1052,5 +1052,12 @@
    
    <string name="notification_pulse_blend_title">Mischia luci di notifica</string>
    <string name="notification_pulse_blend_summary">Mischia i colori della trackball in caso di notifiche multiple</string>
    <string name="lockpattern_settings_enable_visible_dots_title">Visualizza i punti</string>
    <string name="lockpattern_settings_show_error_path">Mostra sequenza errata</string>
    <string name="lockpattern_settings_show_custom_msg">Visualizza messaggio</string>
    <string name="lockpattern_settings_show_sliders">Mostra slider</string>
    <string name="lockpattern_settings_custom_msg">Messaggio personalizzato</string>
    <string name="lockpattern_settings_custom_msg_dialog">Inserisci messaggio</string>
    <string name="lockpattern_settings_incorrect_delay_title">Imposta ritardo sequenza errata</string>

</resources>
+16 −0
Original line number Diff line number Diff line
@@ -18,6 +18,22 @@
*/
-->
<resources>
    <string-array name="incorrect_delay_entries">
        <item>No delay</item>
        <item>0.5 seconds</item>
        <item>1 second</item>
        <item>1.5 seconds</item>
        <item>2 seconds</item>
    </string-array>

    <string-array name="incorrect_delay_values">
        <item>0</item>
        <item>500</item>
        <item>1000</item>
        <item>1500</item>
        <item>2000</item>
    </string-array>

    <string-array name="lockpattern_pin_check_timeout_entries">
        <item>0.5 seconds</item>
        <item>1 second</item>
Loading