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

Commit 78cbbb64 authored by Matthias Büchner's avatar Matthias Büchner
Browse files

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

parents 7b24545b 8ceb87f6

res/values-it/arrays.xml

+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>

res/values-it/strings.xml

+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>

res/values-ja/arrays.xml

+14 −0
Original line number Diff line number Diff line
@@ -129,6 +129,20 @@ 
    <item msgid="8383098660619805783">"PAPまたはCHAP"</item>

  </string-array>



    <!-- Display settings. Available colors for breathing LED -->

    <string-array name="led_color_entries">

        <item>"白 (デフォルト)"</item>

        <item>"緑"</item>

        <item>"赤"</item>

        <item>"青"</item>

        <item>"黄"</item>

        <item>"シアン"</item>

        <item>"マゼンタ"</item>

        <item>"ピンク"</item>

        <item>"オレンジ"</item>

        <item>"ライトブルー"</item>

    </string-array>



    <!-- Display settings. The type of accelerometer orientation to use. -->

    <string-array name="accelerometer_mode_entries">

        <item>"オフ"</item>

res/values-ja/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -405,6 +405,8 @@ 
    <string name="notification_sound_summary" msgid="7628081155578496618">"端末の基本通知音を選択"</string>

    <string name="notification_pulse_title" msgid="1247988024534030629">"光を点滅させて通知"</string>

    <string name="notification_pulse_summary" msgid="6899220780534617152">"新しい通知が届くとカーソルボタンが点滅します"</string>

    <string name="notification_pulse_blend_title">"ブレンド点滅"</string>

    <string name="notification_pulse_blend_summary">"複数の通知がある場合トラックボールのLED色を混ぜる"</string>

    <string name="incoming_call_volume_title" msgid="6144314834963494752">"着信音量"</string>

    <string name="notification_volume_title" msgid="3363351773121138717">"通知音量"</string>

    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音にも着信音量を適用"</string>

res/values/arrays.xml

+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>