diff options
| -rw-r--r-- | res/values-hu/strings.xml | 14 | ||||
| -rw-r--r-- | res/values-nl/arrays.xml | 10 | ||||
| -rw-r--r-- | res/values-nl/strings.xml | 110 | ||||
| -rw-r--r-- | res/values-ru/strings.xml | 17 | ||||
| -rwxr-xr-x | res/values/config.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 9 | ||||
| -rw-r--r-- | res/xml/development_prefs.xml | 5 | ||||
| -rw-r--r-- | res/xml/sound_settings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 28 | ||||
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/SoundSettings.java | 20 | ||||
| -rw-r--r-- | src/com/android/settings/Utils.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 16 |
13 files changed, 194 insertions, 54 deletions
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index a6beb60..b570987 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -1386,7 +1386,7 @@ <string name="power_idle" product="tablet" msgid="4612478572401640759">"Táblagép - tétlen"</string> <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string> <string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string> - <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string> + <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU előtérben"</string> <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ébren tartás"</string> <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string> <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi használat"</string> @@ -1396,7 +1396,7 @@ <string name="usage_type_data_recv" msgid="7251090882025234185">"Fogadott adatok"</string> <string name="usage_type_audio" msgid="6957269406840886290">"Hang"</string> <string name="usage_type_video" msgid="4295357792078579944">"Videó"</string> - <string name="usage_type_on_time" msgid="3351200096173733159">"Bekapcsolva eltöltött idő"</string> + <string name="usage_type_on_time" msgid="3351200096173733159">"Használati idő"</string> <string name="usage_type_no_coverage" msgid="3797004252954385053">"Jel nélkül eltelt idő"</string> <string name="battery_action_stop" msgid="649958863744041872">"Kényszerített leállítás"</string> <string name="battery_action_app_details" msgid="7861051816778419018">"Alkalmazásinformáció"</string> @@ -1774,7 +1774,7 @@ <string name="vpn_routes" msgid="3818655448226312232">"Átirányítási útvonalak (pl. 10.0.0.0/8)"</string> <string name="vpn_username" msgid="1863901629860867849">"Felhasználónév"</string> <string name="vpn_password" msgid="6756043647233596772">"Jelszó"</string> - <string name="vpn_save_login" msgid="6350322456427484881">"Számlainformáció mentése"</string> + <string name="vpn_save_login" msgid="6350322456427484881">"Fiókadatok mentése"</string> <string name="vpn_not_used" msgid="9094191054524660891">"(nem használják)"</string> <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ne ellenőrizze a szervereket)"</string> <string name="vpn_no_server_cert" msgid="2167487440231913330">"(szervertől fogadva)"</string> @@ -2591,6 +2591,14 @@ <string name="auto_brightness_menu_split">Felosztás</string> <string name="auto_brightness_menu_remove">Eltávolítás</string> + <!-- Volume adjust sound preference --> + <string name="volume_adjust_sounds_enable_title">Hang lejátszás beállításkor</string> + <string name="volume_adjust_sounds_enable_summary">Hang lejátszása a hangerő beállítása közben</string> + + <!-- Advanced reboot options --> + <string name="advanced_reboot_title">Speciális újraindítás</string> + <string name="advanced_reboot_summary">Recovery és Bootloader újraindítási mód megjelenítése a kikapcsoló menüben (feloldott kijelzőnél)</string> + <!-- **** CYANOGENMOD ADDITIONS END **** --> </resources> diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml index 8788742..bc7b47b 100644 --- a/res/values-nl/arrays.xml +++ b/res/values-nl/arrays.xml @@ -319,13 +319,13 @@ <item>Uitschakelen</item> </string-array> <string-array name="entries_network_widget"> - <item>2G/3G+2G</item> - <item>2G/alleen 3G</item> - <item>2G/alleen 3G/3G+2G</item> + <item>2G, 2G+3G</item> + <item>2G, 3G</item> + <item>2G, 3G, 3G+2G</item> </string-array> <string-array name="entries_screentimeout_widget"> - <item>15 sec./1 min./5 min.</item> - <item>30 sec./2 min./5 min.</item> + <item>15 sec., 1 min., 5 min.</item> + <item>30 sec., 2 min., 5 min.</item> </string-array> <string-array name="entries_flash_widget"> <item>Normaal</item> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 3e10e45..b9f9d4c 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -258,10 +258,10 @@ <string name="settings_label" msgid="1626402585530130914">"Instellingen"</string> <string name="settings_label_launcher" msgid="8344735489639482340">"Instellingen"</string> <string name="settings_shortcut" msgid="3936651951364030415">"Snelkoppeling voor instellingen"</string> - <string name="airplane_mode" msgid="8837269988154128601">"Vliegtuigmodus"</string> + <string name="airplane_mode" msgid="8837269988154128601">"Vliegmodus"</string> <string name="radio_controls_title" msgid="6889937359495515769">"Meer\u2026"</string> <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerken"</string> - <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, bluetooth, vliegtuigmodus, mobiele netwerken en VPN\'s beheren"</string> + <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string> <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string> <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met gegevensservices tijdens roaming"</string> <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met gegevensservices tijdens roaming"</string> @@ -527,7 +527,7 @@ <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi inschakelen\u2026"</string> <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi uitschakelen\u2026"</string> <string name="wifi_error" msgid="3207971103917128179">"Fout"</string> - <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In vliegtuigmodus"</string> + <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In vliegmodus"</string> <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan niet scannen naar netwerken"</string> <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netwerkmelding"</string> <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Melden wanneer een open netwerk beschikbaar is"</string> @@ -668,8 +668,8 @@ <string name="media_volume_summary" msgid="5363248930648849974">"Volume voor muziek en video\'s instellen"</string> <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string> <string name="dock_settings_summary" msgid="455802113668982481">"Audio-instellingen voor het gekoppelde dockstation"</string> - <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Aanraaktonen van toetsenblok"</string> - <string name="sound_effects_enable_title" msgid="1171590821131077296">"Touch-geluiden"</string> + <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Aanraaktonen toetsenblok"</string> + <string name="sound_effects_enable_title" msgid="1171590821131077296">"Aanraakgeluiden"</string> <string name="lock_sounds_enable_title" msgid="450098505659399520">"Geluid voor schermvergrendeling"</string> <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Trillen bij aanraking"</string> <string name="audio_record_proc_title" msgid="4271091199976457534">"Geluidsdemping"</string> @@ -1375,7 +1375,7 @@ <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Accu gebruikt wanneer tablet inactief is"</string> <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Accu gebruikt wanneer telefoon inactief is"</string> <string name="battery_desc_radio" msgid="5479196477223185367">"Accu gebruikt door radio"</string> - <string name="battery_sugg_radio" msgid="8211336978326295047">"Schakel over naar de vliegtuigmodus om energie te besparen in gebieden zonder mobiel bereik"</string> + <string name="battery_sugg_radio" msgid="8211336978326295047">"Schakel over naar de vliegmodus om energie te besparen in gebieden zonder mobiel bereik"</string> <string name="battery_desc_display" msgid="5432795282958076557">"Accu gebruikt door scherm en achtergrondverlichting"</string> <string name="battery_sugg_display" msgid="3370202402045141760">"Verlaag de helderheid van het scherm en/of geef een kortere time-out voor het scherm op"</string> <string name="battery_desc_wifi" msgid="1702486494565080431">"Accu gebruikt door Wi-Fi"</string> @@ -1698,7 +1698,7 @@ <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Hiermee beperkt u gegevens- en accugebruik. U moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. U ontvangt geen meldingen wanneer er updates zijn."</string> <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Herzieningsdatum voor gebruikscyclus"</string> <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string> - <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ingesteld"</string> + <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Instellen"</string> <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Waarschuwing voor gegevensverbruik instellen"</string> <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limiet voor gegevensverbruik instellen"</string> <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Gegevensgebruik beperken"</string> @@ -1890,12 +1890,12 @@ <string name="system_settings_title">Systeem</string> <string name="system_interface_title">Systeemuiterlijk</string> <string name="notification_drawer_title">Meldingspaneel</string> - <string name="lock_screen_title">Vergrendelscherm</string> + <string name="lock_screen_title">Schermvergrendeling</string> <string name="lockscreen_target_info">Sleep de schijf naar een plaats om een snelkoppeling toe te wijzen</string> <string name="lockscreen_target_title">Snelkoppelingen</string> - <string name="lockscreen_target_summary">Snelkoppelingen op het vergrendelscherm beheren</string> - <string name="lockscreen_target_reset">Vergrendelschermsnelkoppelingen hersteld naar standaardwaarden</string> - <string name="lockscreen_target_save">Vergrendelschermsnelkoppelingen opgeslagen</string> + <string name="lockscreen_target_summary">Snelkoppelingen op vergrendelscherm beheren</string> + <string name="lockscreen_target_reset">Snelkoppelingen hersteld naar standaardwaarden</string> + <string name="lockscreen_target_save">Snelkoppelingen opgeslagen</string> <string name="lockscreen_target_reset_title">Herstellen</string> <string name="lockscreen_target_reset_message">Alle gemaakte snelkoppelingen verwijderen en standaardwaarden herstellen?</string> <string name="lockscreen_target_empty">Niet toegewezen</string> @@ -1961,15 +1961,15 @@ <string name="profile_choose_app">App kiezen</string> <string name="profile_settings_header">Profielinstellingen</string> <string name="profile_system_settings_title">Systeeminstellingen</string> - <string name="profile_lockmode_title">Vergrendelschermtype</string> + <string name="profile_lockmode_title">Type schermvergrendeling</string> <string name="profile_lockmode_default">Standaard</string> <string name="profile_lockmode_insecure">Onveilig</string> <string name="profile_lockmode_disabled">Uitgeschakeld</string> <string name="profile_lockmode_default_summary">Systeemstandaard gebruiken</string> - <string name="profile_lockmode_insecure_summary">Onveilig vergrendelscherm gebruiken</string> - <string name="profile_lockmode_disabled_summary">Vergrendelscherm uitgeschakeld</string> - <string name="profile_airplanemode_title">Vliegtuigmodus</string> - <string name="profile_disable_screen_lock_summary">Vergrendelschermbeveiliging uitschakelen bij dit profiel</string> + <string name="profile_lockmode_insecure_summary">Onveilige schermvergrendeling gebruiken</string> + <string name="profile_lockmode_disabled_summary">Schermvergrendeling uitgeschakeld</string> + <string name="profile_airplanemode_title">Vliegmodus</string> + <string name="profile_disable_screen_lock_summary">Schermvergrendelingsbeveiliging uitschakelen bij dit profiel</string> <string name="vibrator_type_ringer">Oproepen</string> <string name="vibrator_type_notification">Meldingen</string> <string name="possibleButtons">Mogelijke knoppen</string> @@ -1984,13 +1984,13 @@ <string name="toggleBrightness">Helderheid</string> <string name="toggleAutoRotate">Scherm automatisch draaien</string> <string name="toggleScreenTimeout">Schermtime-out</string> - <string name="toggleAirplane">Vliegtuigmodus</string> + <string name="toggleAirplane">Vliegmodus</string> <string name="toggleFlashlight">Zaklamp</string> - <string name="toggleLockScreen">Vergrendelscherm</string> + <string name="toggleLockScreen">Schermvergrendeling</string> <string name="toggleWimax">WiMAX</string> <string name="screen_security_category">Schermbeveiliging</string> - <string name="screen_security_title">Vergrendelscherm</string> - <string name="screen_security_summary">Vergrendelschermbeveiliging en -vertragingen beheren</string> + <string name="screen_security_title">Schermvergrendeling</string> + <string name="screen_security_summary">Schermvergrendelingsbeveiliging en -vertragingen beheren</string> <string name="additional_options_title">Extra opties</string> <string name="unlock_menu_unlock_title">Menu-ontgrendeling</string> <string name="unlock_menu_unlock_summary">Ontgrendelen door op de menuknop te drukken</string> @@ -2147,7 +2147,8 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="volume_overlay_title">Volumepaneel</string> <string name="volbtn_music_controls_title">Muziek beheren met volumeknoppen</string> <string name="volbtn_music_controls_summary">Als het scherm uit is springen de volumeknoppen, indien lang ingedrukt, naar het vorige/volgende nummer</string> - <string name="headset_connect_player_title">Muziek-app openen bij aansluiten</string> + <string name="headset_connect_player_title">Muziek-app openen</string> + <string name="headset_connect_player_summary">Standaardmuziek-app openen indien headset wordt aangesloten</string> <string name="volume_ring_only_description">Beltonen</string> <string name="ring_mode_title">Belmodus</string> <string name="ring_mode_normal">Normaal</string> @@ -2192,10 +2193,10 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="title_toggle_sync">Synchronisatie</string> <string name="title_toggle_wifiap">Draagbare Wi-Fi-hotspot</string> <string name="title_toggle_mobiledata">Mobiele gegevens</string> - <string name="title_toggle_lockscreen">Vergrendelscherm</string> + <string name="title_toggle_lockscreen">Schermvergrendeling</string> <string name="title_toggle_networkmode">Netwerkmodus</string> <string name="title_toggle_autorotate">Scherm automatisch draaien</string> - <string name="title_toggle_airplane">Vliegtuigmodus</string> + <string name="title_toggle_airplane">Vliegmodus</string> <string name="title_toggle_flashlight">Zaklamp</string> <string name="title_toggle_sleep">Slaapstand</string> <string name="title_toggle_media_play_pause">Media: afspelen/pauzeren</string> @@ -2230,7 +2231,7 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="power_menu_screenshot_title">Schermafdruk</string> <string name="power_menu_expanded_desktop">Uitgebreid bureaublad</string> <string name="power_menu_profiles_title">Profielen</string> - <string name="power_menu_airplane_title">Vliegtuigmodus</string> + <string name="power_menu_airplane_title">Vliegmodus</string> <string name="power_menu_user_title">Gebruiker wisselen</string> <string name="power_menu_sound_title">Geluidspaneel</string> <string name="cmupdate_settings_title">CyanogenMod-updates</string> @@ -2267,7 +2268,7 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="adb_over_network_summary">TCP/IP-foutopsporing inschakelen over netwerkinterfaces (Wi-Fi, USB-netwerken etc.). Wordt hersteld bij opstarten</string> <string name="adb_over_network_warning">Let op: als ADB over netwerk is ingeschakeld, kan op uw apparaat worden ingebroken via alle aangesloten netwerken, inclusief via uw GSM-gegevensnetwerk!\n\nGebruik deze functie alleen indien u verbonden bent met vertrouwde netwerken.\n\nWeet u zeker dat u deze functie wilt inschakelen?</string> <string name="lockscreen_buttons_title">Knopacties</string> - <string name="lockscreen_buttons_summary">Knopacties op vergrendelscherm beheren</string> + <string name="lockscreen_buttons_summary">Knopacties bij schermvergrendeling beheren</string> <string name="lockscreen_long_press_back_title">Terugknop lang ingedrukt</string> <string name="lockscreen_long_press_home_title">Thuisknop lang ingedrukt</string> <string name="lockscreen_long_press_menu_title">Menuknop lang ingedrukt</string> @@ -2283,14 +2284,14 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="tile_picker_title">Tegels en indeling</string> <string name="tile_picker_summary">Indeling van te tonen tegels beheren</string> <string name="tile_choose_title">Tegel kiezen</string> - <string name="title_tile_airplane">Vliegtuigmodus</string> + <string name="title_tile_airplane">Vliegmodus</string> <string name="title_tile_battery">Batterijstatus</string> <string name="title_tile_bluetooth">Bluetooth</string> <string name="title_tile_brightness">Helderheid</string> <string name="title_tile_sleep">Slaapstand</string> <string name="title_tile_gps">GPS</string> <string name="title_tile_torch">Zaklamp</string> - <string name="title_tile_lockscreen">Vergrendelscherm</string> + <string name="title_tile_lockscreen">Schermvergrendeling</string> <string name="title_tile_lte">LTE</string> <string name="title_tile_mobiledata">Mobiele gegevens</string> <string name="title_tile_profile">Profiel</string> @@ -2316,9 +2317,9 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="title_dynamic_wifi">Draadloze display</string> <string name="title_general">Algemeen</string> <string name="title_quick_pulldown">Snel openen</string> - <string name="summary_quick_pulldown">%1$s rand van statusbalk opent Snelle instellingenpaneel</string> - <string name="quick_pulldown_summary_left">Links</string> - <string name="quick_pulldown_summary_right">Rechts</string> + <string name="summary_quick_pulldown">%1$s van statusbalk opent Snelle instellingenpaneel</string> + <string name="quick_pulldown_summary_left">Linkerkant</string> + <string name="quick_pulldown_summary_right">Rechterkant</string> <string name="quick_pulldown_off">Uit</string> <string name="quick_pulldown_left">Links</string> <string name="quick_pulldown_right">Rechts</string> @@ -2334,7 +2335,7 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="pref_wifi_disable_hdcp_summary">Gebruiken indien verbonden, maar zonder uitvoer</string> <string name="app_security_title">App-beveiliging</string> <string name="sms_security_check_limit_title">Limiet sms-berichten</string> - <string name="sms_security_check_limit_summary">Melden wanneer apps te vaak sms-berichten verzenden. Huidig limiet: %d berichten in 15 minuten</string> + <string name="sms_security_check_limit_summary">Apps kunnen %d berichten versturen in 30 minuten zonder bevestiging</string> <string name="sms_security_check_limit_default">30 (standaard)</string> <string name="title_toggle_screentimeout">Schermtime-out</string> <string name="lock_clock_title">Klokwidget</string> @@ -2342,7 +2343,7 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="stylus_icon_enabled_title">Pictogram bij stylusgebruik</string> <string name="stylus_icon_enabled_summary">Cursor tonen als een stylus wordt gebruikt</string> <string name="navigation_bar_title">Navigatiebalk</string> - <string name="navigation_bar_help_text">1 - Kies het vergrendelicoon om te beginnen\n\n2 - Kies een knop om een functie aan toe te wijzen of te wijzigen\n\n3 - Druk lang op een knop om de positie te wijzigen\n\n4 - Druk nogmaals op het vergrendelicoon om op te slaan\n\n5 - Druk op herstel om de standaardinstellingen te herstellen\n\n</string> + <string name="navigation_bar_help_text">1 - Kies het vergrendelingspictogram om te beginnen\n\n2 - Kies een knop om een functie aan toe te wijzen of te wijzigen\n\n3 - Raak een knop lang aan om de positie te wijzigen\n\n4 - Tik nogmaals op het vergrendelingspictogram om op te slaan\n\n5 - Tik op \'Herstellen\' om de standaardinstellingen te herstellen\n\n</string> <string name="navigation_bar_tips">• Acties kunnen slechts aan één knop worden toegewezen\n\n• De thuisknop kan niet opnieuw worden toegewezen\n\n• Randknoppen kunnen niet worden herschikt</string> <string name="navigation_bar_tips_title">Snelle tips</string> <string name="navigation_bar_reset_message">Huidige instellingen verwijderen en standaardinstellingen herstellen?</string> @@ -2354,4 +2355,49 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="headset_category_title">Headset</string> <string name="lockscreen_maximize_widgets_title">Widgets maximaliseren</string> <string name="lockscreen_maximize_widgets_summary">Widgets gemaximaliseerd en ontgrendeling geminimaliseerd tonen indien het scherm wordt ingeschakeld</string> + <string name="bluetooth_mas_request">Verzoek tot berichtentoegang</string> + <string name="bluetooth_mas_acceptance_dialog_text">%1$s wil toegang tot uw berichten. Toegang toestaan aan %2$s?</string> + <string name="bluetooth_mas_remember_choice">Niet meer vragen</string> + <string name="wifi_setting_priority_title">Wi-Fi-prioriteit</string> + <string name="wifi_setting_priority_summary">Prioriteit instellen van Wi-Fi-netwerken</string> + <string name="notification_convert_sound_to_vibration_title">Trillen bij melding</string> + <string name="notification_convert_sound_to_vibration_summary">Apparaat laten trillen bij melding in trilstand, ongeacht de app-instelling</string> + <string name="usb_mass_storage_title">Massaopslag</string> + <string name="usb_mass_storage_summary">USB-massaopslag inschakelen</string> + <string name="lockscreen_custom_background_title">Achtergrond</string> + <string name="lockscreen_custom_background_dialog_title">Kies een kleur</string> + <string name="lockscreen_background_result_successful">Achtergrond succesvol gewijzigd</string> + <string name="lockscreen_background_result_not_successful">Kan achtergrond niet wijzigen</string> + <string name="lockscreen_background_color_fill">Vullen met een kleur</string> + <string name="lockscreen_background_custom_image">Aangepaste afbeelding</string> + <string name="lockscreen_background_default_wallpaper">Standaardachtergrond</string> + <string name="title_tile_quiet_hours">Stille uren</string> + <string name="safe_headset_volume_title">Veilig headsetvolume</string> + <string name="safe_headset_volume_summary">Hoog volume voorkomen als de headset voor het eerst wordt aangesloten</string> + <string name="cyanogenmod_waiver_title">Afstandsverklaring</string> + <string name="cyanogenmod_waiver_body">Het wijzigen van deze instelling kan in overtreding zijn met de regelgeving in uw staat/land.\n\nDoor te tikken op \'OK\' erkent u deze waarschuwing en doet u afstand van en vrijwaart u CyanogenMod en/of haar bijdragers van alle wettelijke verplichtingen</string> + <string name="expanded_desktop_disabled">Uitgeschakeld</string> + <string name="expanded_desktop_status_bar">Statusbalk zichtbaar</string> + <string name="expanded_desktop_no_status_bar">Statusbalk verborgen</string> + <string name="light_sensor_current_value">Huidige lichtsensorwaarde: <xliff:g id="light_level">%d</xliff:g> lux</string> + <string name="auto_brightness_dialog_title">Autom. helderheidsstanden</string> + <string name="auto_brightness_level_format"><xliff:g id="start_level">%1$s</xliff:g> -\n<xliff:g id="end_level">%2$s</xliff:g> lux</string> + <string name="auto_brightness_brightness_format"><xliff:g id="percent">%s</xliff:g>%%</string> + <string name="auto_brightness_adjust_button">Aanpassen</string> + <string name="auto_brightness_reset_button">Herstellen</string> + <string name="auto_brightness_lux_dialog_title">Bereik omgevingslichtsterkte</string> + <string name="auto_brightness_split_dialog_title">Helderheidsniveau opsplitsen</string> + <string name="auto_brightness_start_lux">Begin bereik (lux)</string> + <string name="auto_brightness_end_lux">Einde bereik (lux)</string> + <string name="auto_brightness_reset_dialog_title">Niveaus herstellen?</string> + <string name="auto_brightness_reset_confirmation">Alle helderheidsniveaus worden hersteld naar standaard</string> + <string name="auto_brightness_split_lux_format">Plaats van opsplitsing (tussen <xliff:g id="min">%1$d</xliff:g> en <xliff:g id="max">%2$d</xliff:g> lux)</string> + <string name="auto_brightness_level_options">Lichtniveau</string> + <string name="auto_brightness_menu_edit_lux">Bereik omgevingslichtsterkte</string> + <string name="auto_brightness_menu_split">Opsplitsen</string> + <string name="auto_brightness_menu_remove">Verwijderen</string> + <string name="volume_adjust_sounds_enable_title">Aanpassingsgeluid volume</string> + <string name="volume_adjust_sounds_enable_summary">Geluid afspelen bij het aanpassen van de volume met de volumeknoppen</string> + <string name="advanced_reboot_title">Geavanceerd herstarten</string> + <string name="advanced_reboot_summary">Indien ontgrendeld opties tonen in het aan/uit-knopmenu voor het herstarten naar de recovery of de bootloader</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 543d6ee..ddc2ac4 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -2261,7 +2261,6 @@ <string name="volume_overlay_title">Панель громкости</string> <string name="volbtn_music_controls_title">Управление музыкой кнопками громкости</string> <string name="volbtn_music_controls_summary">Когда экран выключен, долгое нажатие кнопок громкости переключает музыкальные треки</string> - <string name="headset_connect_player_title">Запускать проигрыватель при подключении</string> <string name="volume_ring_only_description">Рингтон</string> <string name="ring_mode_title">Режим звонка</string> <string name="ring_mode_normal">Обычный</string> @@ -2537,16 +2536,24 @@ <string name="lockscreen_background_custom_image">Пользоват. изображение</string> <string name="lockscreen_background_default_wallpaper">Обои по умолчанию</string> + <!-- Launch music player when headset is connected --> + <string name="headset_connect_player_title">Запуск проигрывателя</string> + <string name="headset_connect_player_summary">Запускать проигрыватель при подключении наушников</string> + <!-- Safe headset volume restore checkbox --> - <string name="safe_headset_volume_title">Безопасная громкость наушников</string> + <string name="safe_headset_volume_title">Ограничение громкости</string> <string name="safe_headset_volume_summary">Понижать громкость при первом подключении наушников</string> + <!-- Volume adjust sound preference --> + <string name="volume_adjust_sounds_enable_title">Звук при регулировке громкости</string> + <string name="volume_adjust_sounds_enable_summary">Воспроизводить звук при изменении громкости кнопками \"+\" или \"-\"</string> + <!-- Waiver --> <string name="cyanogenmod_waiver_title">Отказ от ответственности</string> <string name="cyanogenmod_waiver_body">Изменение этих настроек может противоречить законам Вашего государства.\n\nНажимая \"OK\" Вы соглашаетесь с этим предупреждением и освобождаете CyanogenMod и всех его разработчиков от любых юридических обязательств.</string> <!-- Automatic brightness customization --> - <string name="light_sensor_current_value">Текущее значение датчика: <xliff:g id="light_level">%d</xliff:g> лк</string> + <string name="light_sensor_current_value">Текущее показание датчика: <xliff:g id="light_level">%d</xliff:g> лк</string> <string name="auto_brightness_dialog_title">Уровни автоматической подсветки</string> <string name="auto_brightness_level_format"><xliff:g id="start_level">%1$s</xliff:g> -\n<xliff:g id="end_level">%2$s</xliff:g> лк</string> <string name="auto_brightness_adjust_button">Регулировка</string> @@ -2563,6 +2570,10 @@ <string name="auto_brightness_menu_split">Разделить</string> <string name="auto_brightness_menu_remove">Удалить</string> + <!-- Advanced reboot options --> + <string name="advanced_reboot_title">Расширенная перезагрузка</string> + <string name="advanced_reboot_summary">Включить варианты перезагрузки (recovery или bootloader) в меню \"Параметры устройства\"</string> + <!-- **** CYANOGENMOD ADDITIONS END **** --> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 9bad6cb..5ce3b9a 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -35,10 +35,12 @@ <!-- Volume Rocker Wake Support. Some devices do not support (PMU) this. Setting to false will disable Volume Rocker Wake support --> - <bool name="config_show_volumeRockerWake">true</bool> + <bool name="config_show_volumeRockerWake">false</bool> <!-- Show Expanded Desktop preference --> <bool name="config_show_expandedDesktop">false</bool> + <!-- Volume rocker support. Some devices does not have volume rocker. --> + <bool name="has_volume_rocker">true</bool> <!-- **** CYANOGENMOD ADDITIONS END **** --> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index c4b5ab0..9d848fc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1714,6 +1714,10 @@ <string name="lock_sounds_enable_title">Screen lock sound</string> <!-- Sound settings screen, setting check box label --> <string name="haptic_feedback_enable_title">Vibrate on touch</string> + <!-- Sound settings screen, setting check box label --> + <string name="volume_adjust_sounds_enable_title">Volume adjustment sound</string> + <!-- Sound settings screen, setting check box summary --> + <string name="volume_adjust_sounds_enable_summary">Play sound when adjusting volume with volume rocker</string> <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments --> <string name="audio_record_proc_title">Noise cancellation</string> <!-- Volume description for media volume --> @@ -5161,5 +5165,10 @@ <string name="auto_brightness_menu_edit_lux">Ambient brightness range</string> <string name="auto_brightness_menu_split">Split</string> <string name="auto_brightness_menu_remove">Remove</string> + + <!-- Advanced reboot options --> + <string name="advanced_reboot_title">Advanced reboot</string> + <string name="advanced_reboot_summary">When unlocked, include options in the power menu for rebooting into recovery or bootloader</string> + <!-- **** CYANOGENMOD ADDITIONS END **** --> </resources> diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index f36b891..11db677 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -17,6 +17,11 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/development_settings_title"> + <CheckBoxPreference + android:key="advanced_reboot" + android:title="@string/advanced_reboot_title" + android:summary="@string/advanced_reboot_summary" /> + <PreferenceScreen android:key="development_tools" android:title="@string/development_tools_title" diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index 32c9c12..58750ee 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -105,6 +105,12 @@ android:defaultValue="true" /> <CheckBoxPreference + android:key="volume_adjust_sounds" + android:title="@string/volume_adjust_sounds_enable_title" + android:summary="@string/volume_adjust_sounds_enable_summary" + android:persistent="false" /> + + <CheckBoxPreference android:key="volbtn_music_controls" android:title="@string/volbtn_music_controls_title" android:summary="@string/volbtn_music_controls_summary" diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 5ebc287..7796c5e 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -148,6 +148,8 @@ public class DevelopmentSettings extends PreferenceFragment private static final String DEVELOPMENT_TOOLS = "development_tools"; + private static final String ADVANCED_REBOOT_KEY = "advanced_reboot"; + private static final int RESULT_DEBUG_APP = 1000; private IWindowManager mWindowManager; @@ -204,6 +206,8 @@ public class DevelopmentSettings extends PreferenceFragment private Object mSelectedRootValue; private PreferenceScreen mDevelopmentTools; + private CheckBoxPreference mAdvancedReboot; + private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>(); private final ArrayList<CheckBoxPreference> mResetCbPrefs = new ArrayList<CheckBoxPreference>(); @@ -238,10 +242,12 @@ public class DevelopmentSettings extends PreferenceFragment mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION); mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD); mAllPrefs.add(mPassword); + mAdvancedReboot = findAndInitCheckboxPref(ADVANCED_REBOOT_KEY); if (!android.os.Process.myUserHandle().equals(UserHandle.OWNER)) { disableForUser(mEnableAdb); disableForUser(mPassword); + disableForUser(mAdvancedReboot); } mDebugAppPref = findPreference(DEBUG_APP_KEY); @@ -488,6 +494,23 @@ public class DevelopmentSettings extends PreferenceFragment updateVerifyAppsOverUsbOptions(); updateBugreportOptions(); updateRootAccessOptions(); + updateAdvancedRebootOptions(); + } + + private void resetAdvancedRebootOptions() { + Settings.Secure.putInt(getActivity().getContentResolver(), + Settings.Secure.ADVANCED_REBOOT, 0); + } + + private void writeAdvancedRebootOptions() { + Settings.Secure.putInt(getActivity().getContentResolver(), + Settings.Secure.ADVANCED_REBOOT, + mAdvancedReboot.isChecked() ? 1 : 0); + } + + private void updateAdvancedRebootOptions() { + mAdvancedReboot.setChecked(Settings.Secure.getInt(getActivity().getContentResolver(), + Settings.Secure.ADVANCED_REBOOT, 0) != 0); } private void updateAdbOverNetwork() { @@ -529,6 +552,7 @@ public class DevelopmentSettings extends PreferenceFragment } resetDebuggerOptions(); resetRootAccessOptions(); + resetAdvancedRebootOptions(); writeAnimationScaleOption(0, mWindowAnimationScale, null); writeAnimationScaleOption(1, mTransitionAnimationScale, null); writeAnimationScaleOption(2, mAnimatorDurationScale, null); @@ -604,7 +628,7 @@ public class DevelopmentSettings extends PreferenceFragment mKillAppLongpressBack.setChecked(Settings.Secure.getInt( getActivity().getContentResolver(), Settings.Secure.KILL_APP_LONGPRESS_BACK, 0) != 0); } - + private void updatePasswordSummary() { try { if (mBackupManager.hasBackupPassword()) { @@ -1242,6 +1266,8 @@ public class DevelopmentSettings extends PreferenceFragment writeDebugLayoutOptions(); } else if (preference == mKillAppLongpressBack) { writeKillAppLongpressBackOptions(); + } else if (preference == mAdvancedReboot) { + writeAdvancedRebootOptions(); } return false; diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index aeb1325..60e5931 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -45,6 +45,7 @@ import android.util.Log; import com.android.internal.view.RotationPolicy; import com.android.settings.cyanogenmod.DisplayRotation; +import com.android.settings.Utils; import java.util.ArrayList; @@ -142,7 +143,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements mVolumeWake = (CheckBoxPreference) findPreference(KEY_VOLUME_WAKE); if (mVolumeWake != null) { - if (!getResources().getBoolean(R.bool.config_show_volumeRockerWake)) { + if (!getResources().getBoolean(R.bool.config_show_volumeRockerWake) + && !Utils.hasVolumeRocker(getActivity())) { getPreferenceScreen().removePreference(mVolumeWake); getPreferenceScreen().removePreference((PreferenceCategory) findPreference(KEY_WAKEUP_CATEGORY)); } else { diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index 5e91a72..a6e0abd 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -17,6 +17,7 @@ package com.android.settings; import com.android.settings.bluetooth.DockEventReceiver; +import com.android.settings.Utils; import android.app.AlertDialog; import android.app.Dialog; @@ -88,6 +89,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements private static final String KEY_HEADSET_CONNECT_PLAYER = "headset_connect_player"; private static final String KEY_CONVERT_SOUND_TO_VIBRATE = "notification_convert_sound_to_vibration"; private static final String KEY_SAFE_HEADSET_VOLUME = "safe_headset_volume"; + private static final String KEY_VOLUME_ADJUST_SOUNDS = "volume_adjust_sounds"; private static final String RING_MODE_NORMAL = "normal"; private static final String RING_MODE_VIBRATE = "vibrate"; @@ -107,6 +109,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements private CheckBoxPreference mDtmfTone; private CheckBoxPreference mSoundEffects; private CheckBoxPreference mHapticFeedback; + private CheckBoxPreference mVolumeAdjustSounds; private Preference mMusicFx; private CheckBoxPreference mLockSounds; private CheckBoxPreference mVolBtnMusicCtrl; @@ -221,14 +224,23 @@ public class SoundSettings extends SettingsPreferenceFragment implements mHapticFeedback.setPersistent(false); mHapticFeedback.setChecked(Settings.System.getInt(resolver, Settings.System.HAPTIC_FEEDBACK_ENABLED, 1) != 0); + mVolumeAdjustSounds = (CheckBoxPreference) findPreference(KEY_VOLUME_ADJUST_SOUNDS); + mVolumeAdjustSounds.setChecked(Settings.System.getInt(resolver, + Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED, 1) != 0); mLockSounds = (CheckBoxPreference) findPreference(KEY_LOCK_SOUNDS); mLockSounds.setPersistent(false); mLockSounds.setChecked(Settings.System.getInt(resolver, Settings.System.LOCKSCREEN_SOUNDS_ENABLED, 1) != 0); mVolBtnMusicCtrl = (CheckBoxPreference) findPreference(KEY_VOLBTN_MUSIC_CTRL); - mVolBtnMusicCtrl.setChecked(Settings.System.getInt(resolver, - Settings.System.VOLBTN_MUSIC_CONTROLS, 1) != 0); + if (mVolBtnMusicCtrl != null) { + if (!Utils.hasVolumeRocker(getActivity())) { + getPreferenceScreen().removePreference(mVolBtnMusicCtrl); + } else { + mVolBtnMusicCtrl.setChecked(Settings.System.getInt(resolver, + Settings.System.VOLBTN_MUSIC_CONTROLS, 1) != 0); + } + } mHeadsetConnectPlayer = (CheckBoxPreference) findPreference(KEY_HEADSET_CONNECT_PLAYER); mHeadsetConnectPlayer.setChecked(Settings.System.getInt(resolver, @@ -414,6 +426,10 @@ public class SoundSettings extends SettingsPreferenceFragment implements Settings.System.putInt(getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, mHapticFeedback.isChecked() ? 1 : 0); + } else if (preference == mVolumeAdjustSounds) { + Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED, + mVolumeAdjustSounds.isChecked() ? 1 : 0); + } else if (preference == mLockSounds) { Settings.System.putInt(getContentResolver(), Settings.System.LOCKSCREEN_SOUNDS_ENABLED, mLockSounds.isChecked() ? 1 : 0); diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 3bc244c..49d2af3 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -681,4 +681,9 @@ public class Utils { public static boolean isTablet(Context con) { return getScreenType(con) == DEVICE_TABLET; } + + /* returns whether the device has volume rocker or not. */ + public static boolean hasVolumeRocker(Context con) { + return con.getResources().getBoolean(R.bool.has_volume_rocker); + } } diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index 5ce6644..146562e 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -61,7 +61,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment private static final String KEY_INPUT_METHOD_SELECTOR = "input_method_selector"; private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings"; private static final String KEY_IME_SWITCHER = "status_bar_ime_switcher"; - private static final String VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control"; + private static final String KEY_VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control"; private static final String KEY_STYLUS_ICON_ENABLED = "stylus_icon_enabled"; // false: on ICS or later private static final boolean SHOW_INPUT_METHOD_SWITCHER_SETTINGS = false; @@ -196,12 +196,16 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment scp.setFragmentIntent(this, intent); } - mVolumeKeyCursorControl = (ListPreference) findPreference(VOLUME_KEY_CURSOR_CONTROL); + mVolumeKeyCursorControl = (ListPreference) findPreference(KEY_VOLUME_KEY_CURSOR_CONTROL); if(mVolumeKeyCursorControl != null) { - mVolumeKeyCursorControl.setOnPreferenceChangeListener(this); - mVolumeKeyCursorControl.setValue(Integer.toString(Settings.System.getInt(getActivity() - .getContentResolver(), Settings.System.VOLUME_KEY_CURSOR_CONTROL, 0))); - mVolumeKeyCursorControl.setSummary(mVolumeKeyCursorControl.getEntry()); + if (Utils.hasVolumeRocker(getActivity())) { + mVolumeKeyCursorControl.setOnPreferenceChangeListener(this); + mVolumeKeyCursorControl.setValue(Integer.toString(Settings.System.getInt(getActivity() + .getContentResolver(), Settings.System.VOLUME_KEY_CURSOR_CONTROL, 0))); + mVolumeKeyCursorControl.setSummary(mVolumeKeyCursorControl.getEntry()); + } else { + getPreferenceScreen().removePreference(mVolumeKeyCursorControl); + } } mHandler = new Handler(); |