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

Commit 92a2538f authored by Matthias Büchner's avatar Matthias Büchner
Browse files

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

parents 30c56ba5 ea617a9c

AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -235,6 +235,14 @@ 
            </intent-filter>

        </activity>



        <activity android:name="SilentChannels" android:label="@string/silent_channels_label">

            <intent-filter>

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

                <action android:name="com.android.settings.SILENT_CHANNELS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity android:name="DockSettings"

                android:label="@string/dock_settings_title"

                android:clearTaskOnLaunch="true"

res/values-de/strings.xml

+36 −0
Original line number Diff line number Diff line
@@ -439,6 +439,42 @@ 
    <string name="play_media_notification_sounds_enable_summary_off" msgid="8672617597028744693">"Ton bei SD-Karten-Benachrichtigungen"</string>

    <string name="audio_record_proc_title" msgid="4271091199976457534">"Geräuschunterdrückung"</string>

    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Geräusche beim Sprechen oder Aufnehmen unterdrücken"</string>



    <!-- Sound settings screen, setting screen option name to enter menu to choose what silent mode affects -->

    <string name="silent_mode_settings_title">Lautlos-Modus Einstellungen</string>

    <!-- Sound settings screen, setting option summary text -->

    <string name="silent_mode_settings_summary">Auswählen, welche Klänge stummgeschaltet werden sollen.</string>



    <!-- Sound and alerts settings, silent mode submenu -->

    <!-- Screen title -->

    <string name="silent_channels_label">Wähle Klänge, die stummgeschaltet werden sollen</string>

    <string name="silent_mode_settings_reset_to_default_title">Zurücksetzen</string>

    <string name="silent_mode_settings_reset_to_default_summary"></string>

    <string name="silent_mode_settings_mute_all_title">Alle Klänge aus</string>

    <string name="silent_mode_settings_mute_all_summary"></string>



    <string name="silent_mode_settings_voice_call_title">Voice-Anrufe</string>

    <string name="silent_mode_settings_system_title">Systemklänge</string>

    <string name="silent_mode_settings_ring_title">Klingeltöne</string>

    <string name="silent_mode_settings_music_title">Musik</string>

    <string name="silent_mode_settings_alarm_title">Alarme</string>

    <string name="silent_mode_settings_notification_title">Benachrichtigungen</string>

    <string name="silent_mode_settings_bluetooth_title">Bluetooth Ausgabe</string>

    <string name="silent_mode_settings_system_enforced_title">Erzwungene Systemklänge</string>

    <string name="silent_mode_settings_dtmf_title">DTMF Töne</string>

    <string name="silent_mode_settings_tts_title">Text-in-Sprache</string>



    <string name="silent_mode_settings_voice_call_summary">Stummschalten aktiver Anrufe im Lautlos-Modus.</string>

    <string name="silent_mode_settings_system_summary">Keine Systemklänge im Lautlos-Modus.</string>

    <string name="silent_mode_settings_ring_summary">Nicht klingeln bei ankommenden Anrufen im Lautlos-Modus.</string>

    <string name="silent_mode_settings_music_summary">Keine Musik im Lautlos-Modus.</string>

    <string name="silent_mode_settings_alarm_summary">Keine Alarme im Lautlos-Modus.</string>

    <string name="silent_mode_settings_notification_summary">Keine Benachrichtigungen im Lautlos-Modus.</string>

    <string name="silent_mode_settings_bluetooth_summary">Keine Bluetooth-Ausgabe im Lautlos-Modus.</string>

    <string name="silent_mode_settings_system_enforced_summary">Keine erzwungenen Systemklänge im Lautlos-Modus.</string>

    <string name="silent_mode_settings_dtmf_summary">Keine Wähltöne im Lautlos-Modus.</string>

    <string name="silent_mode_settings_tts_summary">Keine Text-in-Sprache-Ausgabe im Lautlos-Modus.</string>



    <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>

    <string name="dock_settings_title" msgid="9161438664257429372">"Dock-Einstellungen"</string>

    <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>

res/values-it/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1060,5 +1060,7 @@ 
    <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>

    <string name="lockpattern_settings_show_unlock_msg">Mostra messaggio di sblocco</string>

    <string name="lockpattern_settings_show_unlock_error_msg">Mostra messaggio di errore</string>



</resources>

res/values-ja/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -628,7 +628,9 @@ 
    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"指の軌跡を線で表示"</string>

    <string name="lockpattern_settings_enable_visible_dots_title">"ドットを表示"</string>

    <string name="lockpattern_settings_show_error_path">"失敗時に誤った軌跡を表示"</string>

    <string name="lockpattern_settings_show_custom_msg">"カスタムメッセージ表示"</string>

    <string name="lockpattern_settings_show_unlock_msg">"アンロックメッセージを表示"</string>

    <string name="lockpattern_settings_show_unlock_error_msg">"アンロックエラーメッセージを表示"</string>

    <string name="lockpattern_settings_show_custom_msg">"カスタムメッセージを表示"</string>

    <string name="lockpattern_settings_show_sliders">"スライダーを表示"</string>

    <string name="lockpattern_settings_custom_msg">"カスタムメッセージ"</string>

    <string name="lockpattern_settings_custom_msg_dialog">"カスタムメッセージを入力してください"</string>

res/values/strings.xml

+34 −0
Original line number Diff line number Diff line
@@ -950,6 +950,40 @@ 
    <string name="audio_record_proc_title">Noise cancellation</string>

    <!-- Sound settings screen, setting option summary text -->

    <string name="audio_record_proc_summary">Suppress background noise when speaking or recording.</string>

    <!-- Sound settings screen, setting screen option name to enter menu to choose what silent mode affects -->

    <string name="silent_mode_settings_title">Silent mode settings</string>

    <!-- Sound settings screen, setting option summary text -->

    <string name="silent_mode_settings_summary">Select which sounds are muted in silent mode.</string>



    <!-- Sound and alerts settings, silent mode submenu -->

    <!-- Screen title -->

    <string name="silent_channels_label">Select sounds muted in silent mode</string>

    <string name="silent_mode_settings_reset_to_default_title">Reset to defaults</string>

    <string name="silent_mode_settings_reset_to_default_summary"></string>

    <string name="silent_mode_settings_mute_all_title">Mute all</string>

    <string name="silent_mode_settings_mute_all_summary"></string>



    <string name="silent_mode_settings_voice_call_title">Voice calls</string>

    <string name="silent_mode_settings_system_title">System sounds</string>

    <string name="silent_mode_settings_ring_title">Call rings</string>

    <string name="silent_mode_settings_music_title">Music</string>

    <string name="silent_mode_settings_alarm_title">Alarms</string>

    <string name="silent_mode_settings_notification_title">Notifications</string>

    <string name="silent_mode_settings_bluetooth_title">Bluetooth output</string>

    <string name="silent_mode_settings_system_enforced_title">System-enforced</string>

    <string name="silent_mode_settings_dtmf_title">DTMF tones</string>

    <string name="silent_mode_settings_tts_title">Text-to-speech</string>



    <string name="silent_mode_settings_voice_call_summary">Don\'t hear active calls in silent mode.</string>

    <string name="silent_mode_settings_system_summary">Silent mode silences system sounds.</string>

    <string name="silent_mode_settings_ring_summary">Don\'t ring for incoming calls in silent mode.</string>

    <string name="silent_mode_settings_music_summary">Don\'t play music in silent mode.</string>

    <string name="silent_mode_settings_alarm_summary">Don\'t play alarms in silent mode.</string>

    <string name="silent_mode_settings_notification_summary">Don\'t play notifications in silent mode.</string>

    <string name="silent_mode_settings_bluetooth_summary">Don\'t play to bluetooth in silent mode.</string>

    <string name="silent_mode_settings_system_enforced_summary">Don\'t play required sounds in silent mode.</string>

    <string name="silent_mode_settings_dtmf_summary">Don\'t play dialing sounds in silent mode.</string>

    <string name="silent_mode_settings_tts_summary">Don\'t play text-to-speech in silent mode.</string>



    <!-- Dock settings title, top level -->

    <string name="dock_settings">Dock</string>