Merge commit 'korg/cupcake'
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 92f30c4..aa1b709 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -338,8 +338,7 @@
<string name="sound_and_display_settings_summary">"Umožňuje nastavit vyzváněcí tón, oznámení a jas obrazovky"</string>
<string name="silent_mode_title">"Tichý režim"</string>
<string name="silent_mode_summary">"Ztiší všechny zvuky kromě médií a upozornění"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"Všechny zvuky kromě médií jsou ztišeny."</string>
<string name="ringtone_title">"Vyzváněcí tón telefonu"</string>
<string name="ringtone_summary">"Umožňuje nastavit výchozí vyzváněcí tón příchozího hovoru"</string>
<string name="ring_volume_title">"Hlasitost vyzvánění"</string>
@@ -488,9 +487,13 @@
<string name="location_network_based">"Zaměření přes bezdrátové sítě"</string>
<string name="location_networks_disabled">"Zobrazuje polohu v aplikacích (jako Mapy) pomocí bezdrátových sítí"</string>
<string name="location_neighborhood_level">"Poloha je zaměřena pomocí WiFi nebo mobilních sítí"</string>
- <string name="location_gps">"Zapnout přijímač systému GPS"</string>
+ <string name="location_gps">"Zapnout GPS"</string>
<string name="location_street_level">"Zaměření je s přesností na úrovni ulic (zrušením této volby lze šetřit baterii)"</string>
<string name="location_gps_disabled">"Umožňuje zaměřit na úrovni ulic (vetší spotřeba baterie a nutný výhled na oblohu)"</string>
+ <string name="location_warning_title">"Svolení se sběrem dat o poloze"</string>
+ <string name="location_warning_message">"Povolit službě určování polohy společnosti Google sběr anonymních a sdružených dat o poloze. Data budou sbírána bez ohledu na to, zda je nějaká aplikace aktivní."</string>
+ <string name="agree">"Souhlasím"</string>
+ <string name="disagree">"Nesouhlasím"</string>
<string name="about_settings">"Info o telefonu"</string>
<string name="about_settings_summary">"Zobrazuje právní informace, stav telefonu a verzi softwaru"</string>
<string name="legal_information">"Právní informace"</string>
@@ -498,6 +501,8 @@
<string name="copyright_title">"Autorská práva"</string>
<string name="license_title">"Licence"</string>
<string name="terms_title">"Smluvní podmínky"</string>
+ <string name="system_tutorial_list_item_title">"Výukový program o systému"</string>
+ <string name="system_tutorial_list_item_summary">"Informace o používání telefonu."</string>
<string name="settings_license_activity_title">"Licence open source"</string>
<string name="settings_license_activity_unavailable">"Při načítání licencí došlo k chybě."</string>
<string name="settings_license_activity_loading">"Načítání..."</string>
@@ -594,8 +599,7 @@
<string name="auto_punctuate_summary">"Znak „.“ lze vložit dvěma stisky klávesy Mezerník."</string>
<string name="show_password">"Zobrazování hesel"</string>
<string name="show_password_summary">"Zadávané heslo je zobrazováno"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"Prostřednictví této metody zadávání dat lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla kreditních karet. Metoda je součástí aplikace <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete povolit tuto metodu zadávání dat?"</string>
<string name="user_dict_settings_titlebar">"Uživatelský slovník"</string>
<string name="user_dict_settings_title">"Uživatelský slovník"</string>
<string name="user_dict_settings_summary">"Přidat nebo odebrat slova z uživatelského slovníku"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 743a4f1..8e8c5c5 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -51,8 +51,8 @@
<item>"WEP hexadezimal"</item>
</string-array>
<string-array name="wifi_sleep_policy_entries">
- <item>"Wenn Bildschirm abschaltet"</item>
- <item>"Niemals im Netzbetrieb"</item>
+ <item>"Wenn Bildschirm sich abschaltet"</item>
+ <item>"Niemals, wenn im Netzbetrieb"</item>
<item>"Niemals"</item>
</string-array>
<string-array name="battery_history_type_spinner">
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 39e6b33..bd89ac3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,12 +16,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="device_info_default">"Unbekannt"</string>
- <string name="turn_on_radio">"Radio einschalten"</string>
- <string name="turn_off_radio">"Radio ausschalten"</string>
+ <string name="turn_on_radio">"Mobilfunkverbindung aktivieren"</string>
+ <string name="turn_off_radio">"Mobilfunkverbindung deaktivieren"</string>
<string name="turn_on_qxdm">"QXDM-SD-Protokoll aktivieren"</string>
<string name="turn_off_qxdm">"QXDM-SD-Protokoll deaktivieren"</string>
<string name="radioInfo_menu_viewADN">"SIM-Adressbuch anzeigen"</string>
- <string name="radioInfo_menu_viewFDN">"Feste Rufnummern anzeigen"</string>
+ <string name="radioInfo_menu_viewFDN">"Begrenzte Rufnummern anzeigen"</string>
<string name="radioInfo_menu_viewSDN">"Servicerufnummern anzeigen"</string>
<string name="radioInfo_menu_getPDP">"PDP-Liste abrufen"</string>
<string name="radioInfo_menu_enableData">"Datenverbindung aktivieren"</string>
@@ -31,7 +31,7 @@
<string name="radioInfo_service_in">"In Betrieb"</string>
<string name="radioInfo_service_out">"Außer Betrieb"</string>
<string name="radioInfo_service_emergency">"Nur Notrufe"</string>
- <string name="radioInfo_service_off">"Radio aus"</string>
+ <string name="radioInfo_service_off">"Mobilfunkverbindung aus"</string>
<string name="radioInfo_roaming_in">"Roaming"</string>
<string name="radioInfo_roaming_not">"Kein Roaming"</string>
<string name="radioInfo_phone_idle">"Inaktiv"</string>
@@ -82,7 +82,7 @@
<string name="battery_info_health_over_voltage">"Überspannung"</string>
<string name="battery_info_health_unspecified_failure">"Unbekannter Fehler"</string>
<string name="bluetooth">"Bluetooth"</string>
- <string name="bluetooth_visibility">"Erkennbar"</string>
+ <string name="bluetooth_visibility">"Sichtbar"</string>
<string name="bluetooth_is_discoverable">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden sichtbar..."</string>
<string name="bluetooth_not_discoverable">"Geräteerkennung deaktivieren"</string>
<string name="bluetooth_devices">"Bluetooth-Geräte"</string>
@@ -107,6 +107,9 @@
<string name="date_and_time">"Einstellungen"</string>
<string name="date_time_12_hour_sample">"1:00"</string>
<string name="date_time_24_hour_sample">"13:00"</string>
+ <string name="date_time_changeTime_text">"Change time"</string>
+ <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->
+ <skip />
<string name="choose_timezone">"Zeitzone auswählen"</string>
<string name="display_preview_label">"Vorschau:"</string>
<string name="display_font_size_label">"Schriftgröße:"</string>
@@ -144,7 +147,7 @@
<string name="radio_info_signal_strength_label">"Signalstärke:"</string>
<string name="radio_info_call_status_label">"Rufstatus:"</string>
<string name="radio_info_ppp_sent_label">"PPP gesendet:"</string>
- <string name="radio_info_radio_resets_label">"Radiozurücksetzung:"</string>
+ <string name="radio_info_radio_resets_label">"Verbindungszurücksetzung"</string>
<string name="radio_info_message_waiting_label">"Nachricht liegt vor:"</string>
<string name="radio_info_phone_number_label">"Telefonnummer:"</string>
<string name="radio_info_band_mode_label">"Frequenzbereich auswählen"</string>
@@ -333,13 +336,12 @@
<string name="status_disconnecting">"Verbindung wird getrennt..."</string>
<string name="status_disconnected">"Nicht verbunden"</string>
<string name="status_failed">"Fehlgeschlagen"</string>
- <string name="sound_and_display_settings">"Töne und Display"</string>
+ <string name="sound_and_display_settings">"Sound und Display"</string>
<string name="sound_settings">"Toneinstellungen"</string>
<string name="sound_and_display_settings_summary">"Klingeltöne, Benachrichtigungen und Helligkeit festlegen"</string>
<string name="silent_mode_title">"Lautlosmodus"</string>
<string name="silent_mode_summary">"Alle Töne außer für Medien und Warnungen sind stummgeschaltet"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"Alle Sounds außer Medien sind stumm geschaltet"</string>
<string name="ringtone_title">"Klingelton"</string>
<string name="ringtone_summary">"Standardklingelton für eingehende Anrufe festlegen"</string>
<string name="ring_volume_title">"Klingeltonlautstärke"</string>
@@ -360,7 +362,7 @@
<string name="sound_effects_enable_title">"Akustische Auswahl"</string>
<string name="sound_effects_enable_summary_on">"Ton bei Auswahl auf Display"</string>
<string name="sound_effects_enable_summary_off">"Ton bei Auswahl auf Display"</string>
- <string name="play_media_notification_sounds_enable_title">"SD-Karten-Benachrichtigungen"</string>
+ <string name="play_media_notification_sounds_enable_title">"SD-Karten-Nachricht"</string>
<string name="play_media_notification_sounds_enable_summary_on">"SD-Karten-Benachrichtigungston deaktivieren"</string>
<string name="play_media_notification_sounds_enable_summary_off">"SD-Karten-Benachrichtigungston aktivieren"</string>
<string name="sync_settings">"Datensynchronisierung"</string>
@@ -377,7 +379,7 @@
<string name="screen_timeout">"Display-Timeout"</string>
<string name="screen_timeout_summary">"Verzögerung vor automatischer Bildschirmabschaltung anpassen"</string>
<string name="sim_lock_settings">"Einstellungen"</string>
- <string name="sim_lock_settings_category">"SIM-Kartensperrung einrichten"</string>
+ <string name="sim_lock_settings_category">"SIM-Sperrung einrichten"</string>
<string name="sim_lock_settings_title">"SIM-Kartensperrung"</string>
<string name="sim_pin_toggle">"SIM-Karte sperren"</string>
<string name="sim_lock_on">"PIN zur Verwendung des Telefons erforderlich"</string>
@@ -402,7 +404,7 @@
<string name="system_update_settings_list_item_summary">"Nach Systemaktualisierungen suchen"</string>
<string name="firmware_version">"Firmware-Version"</string>
<string name="model_number">"Modellnummer"</string>
- <string name="baseband_version">"Basisband-Version"</string>
+ <string name="baseband_version">"Baseband-Version"</string>
<string name="kernel_version">"Kernel-Version"</string>
<string name="build_number">"Build-Nummer"</string>
<string name="device_info_not_available">"Nicht verfügbar"</string>
@@ -413,7 +415,7 @@
<string name="storage_settings_summary">"SD-Karte entnehmen, verfügbaren Speicher anzeigen"</string>
<string name="status_number">"Telefonnummer"</string>
<string name="status_network_type">"Mobiler Netzwerktyp"</string>
- <string name="status_data_state">"Status des mobilen Netzwerks"</string>
+ <string name="status_data_state">"Mobiler Netzwerkstatus"</string>
<string name="status_service_state">"Servicestatus"</string>
<string name="status_signal_strength">"Signalstärke"</string>
<string name="status_roaming">"Roaming"</string>
@@ -481,7 +483,7 @@
<string name="media_format_gesture_prompt">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
<string name="media_format_gesture_explanation">"Sie müssen Ihr Entsperrungsmuster eingeben, um eine SD-Karten-Formatierung zu bestätigen."</string>
<string name="call_settings_title">"Anrufeinstellungen"</string>
- <string name="call_settings_summary">"Mailbox, Anrufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
+ <string name="call_settings_summary">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
<string name="network_settings_title">"Mobile Netzwerke"</string>
<string name="network_settings_summary">"Optionen für Roaming, Netzwerke, APNs festlegen"</string>
<string name="location_title">"Standortquellen"</string>
@@ -491,6 +493,10 @@
<string name="location_gps">"GPS-Satelliten aktivieren"</string>
<string name="location_street_level">"Auf Straßenebene lokalisieren (deaktivieren, um Akku zu sparen)"</string>
<string name="location_gps_disabled">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
+ <string name="location_warning_title">"Standortgenehmigung"</string>
+ <string name="location_warning_message">"Erlauben Sie dem Google-Standortservice, anonyme und aggregierte Standortdaten zu erfassen. Die Erfassung wird unabhängig davon durchgeführt, ob Anwendungen aktiv sind oder nicht."</string>
+ <string name="agree">"Zustimmen"</string>
+ <string name="disagree">"Ablehnen"</string>
<string name="about_settings">"Telefoninfo"</string>
<string name="about_settings_summary">"Rechtliche Hinweise, Telefonstatus und Softwareversion anzeigen"</string>
<string name="legal_information">"Rechtliche Hinweise"</string>
@@ -498,6 +504,8 @@
<string name="copyright_title">"Urheberrecht"</string>
<string name="license_title">"Lizenz"</string>
<string name="terms_title">"Nutzungsbedingungen"</string>
+ <string name="system_tutorial_list_item_title">"Systemanleitung"</string>
+ <string name="system_tutorial_list_item_summary">"So verwenden Sie Ihr Telefon"</string>
<string name="settings_license_activity_title">"Open Source-Lizenzen"</string>
<string name="settings_license_activity_unavailable">"Beim Laden der Lizenzen ist ein Problem aufgetreten."</string>
<string name="settings_license_activity_loading">"Wird geladen..."</string>
@@ -520,7 +528,7 @@
<string name="lockpattern_settings_enable_title">"Muster erforderlich"</string>
<string name="lockpattern_settings_enable_summary">"Zum Entsperren muss ein Muster gezeichnet werden"</string>
<string name="lockpattern_settings_enable_visible_pattern_title">"Muster sichtbar"</string>
- <string name="lockpattern_settings_enable_tactile_feedback_title">"Haptisches Feedback verwenden"</string>
+ <string name="lockpattern_settings_enable_tactile_feedback_title">"Haptisches Feedback"</string>
<string name="lockpattern_settings_choose_lock_pattern">"Entsperrungsmuster"</string>
<string name="lockpattern_settings_change_lock_pattern">"Muster ändern"</string>
<string name="lockpattern_settings_help_how_to_record">"Zeichnen eines Entsperrungsmusters"</string>
@@ -535,7 +543,7 @@
<string name="manageapplications_settings_title">"Anwendungen verwalten"</string>
<string name="manageapplications_settings_summary">"Installierte Anwendungen verwalten und entfernen"</string>
<string name="applications_settings">"Anwendungen"</string>
- <string name="applications_settings_summary">"Anwendungen verwalten, Tastenkombinationen für Schnellstart einrichten"</string>
+ <string name="applications_settings_summary">"Anwendungen verwalten, Tastenkombinationen für Schnellstart"</string>
<string name="applications_settings_header">"Anwendungen"</string>
<string name="install_applications">"Unbekannte Quellen"</string>
<string name="install_unknown_applications">"Installation von Nicht-Market-Anwendungen zulassen"</string>
@@ -556,7 +564,7 @@
<string name="clear_user_data_text">"Daten löschen"</string>
<string name="auto_launch_enable_text">"Sie haben diese Anwendung für einige Aktionen als Standard festgelegt."</string>
<string name="auto_launch_disable_text">"Kein Standard"</string>
- <string name="clear_activities">"Standardeinstellungen löschen"</string>
+ <string name="clear_activities">"Standardeinstellung löschen"</string>
<string name="unknown">"Unbekannt"</string>
<string name="sort_order_alpha">"Sortieren"</string>
<string name="sort_order_size">"Nach Größe sortieren"</string>
@@ -580,7 +588,7 @@
<string name="invalid_size_value">"Paketgröße kann nicht berechnet werden"</string>
<string name="empty_list_msg">"Sie haben keine Anwendungen von Drittanbietern installiert."</string>
<string name="language_settings">"Gebietsschema und Text"</string>
- <string name="language_settings_summary">"Optionen für Gebietsschema (Sprache und Region), Texteingabe und Autokorrektur festlegen"</string>
+ <string name="language_settings_summary">"Optionen für Sprache und Region, Texteingabe und Autokorrektur festlegen"</string>
<string name="language_category">"Ländereinstellung"</string>
<string name="text_category">"Texteinstellungen"</string>
<string name="phone_language">"Sprache wählen"</string>
@@ -594,8 +602,7 @@
<string name="auto_punctuate_summary">"Leertaste zweimal drücken, um \".\" hinzuzufügen"</string>
<string name="show_password">"Sichtbare Passwörter"</string>
<string name="show_password_summary">"Passwort bei der Eingabe anzeigen"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der Anwendung <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Soll diese Eingabemethode aktiviert werden?"</string>
<string name="user_dict_settings_titlebar">"Wörterbuch des Nutzers"</string>
<string name="user_dict_settings_title">"Wörterbuch des Nutzers"</string>
<string name="user_dict_settings_summary">"Hinzufügen & Entfernen von Wörtern im Wörterbuch des Nutzers"</string>
@@ -632,7 +639,7 @@
<string name="enable_adb_summary">"Debugmodus bei Anschluss eines USB-Geräts"</string>
<string name="keep_screen_on">"Aktiv bleiben"</string>
<string name="keep_screen_on_summary">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
- <string name="allow_mock_location">"Falsche Standorte zulassen"</string>
+ <string name="allow_mock_location">"Falsche Standorte"</string>
<string name="allow_mock_location_summary">"Falsche Standorte zulassen"</string>
<string name="gadget_picker_title">"Gadget auswählen"</string>
<string name="widget_picker_title">"Widget auswählen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cc0f857..ad277d4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -107,6 +107,10 @@
<string name="date_and_time">"Configuración de fecha y hora"</string>
<string name="date_time_12_hour_sample">"1:00 p.m."</string>
<string name="date_time_24_hour_sample">"13:00"</string>
+ <!-- no translation found for date_time_changeTime_text (7037437020000867740) -->
+ <skip />
+ <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->
+ <skip />
<string name="choose_timezone">"Seleccionar zona horaria"</string>
<string name="display_preview_label">"Vista previa:"</string>
<string name="display_font_size_label">"Tamaño de fuente:"</string>
@@ -199,7 +203,7 @@
<string name="date_time_auto">"Automático"</string>
<string name="date_time_auto_summaryOn">"Utilizar valores proporcionados por la red"</string>
<string name="date_time_auto_summaryOff">"Utilizar valores proporcionados por la red"</string>
- <string name="date_time_24hour">"Utilizar formato de 24 horas"</string>
+ <string name="date_time_24hour">"Formato de 24 horas"</string>
<string name="date_time_set_time">"Establecer hora"</string>
<string name="date_time_set_timezone">"Seleccionar zona horaria"</string>
<string name="date_time_set_date">"Establecer fecha"</string>
@@ -338,8 +342,7 @@
<string name="sound_and_display_settings_summary">"Establecer tonos, notificaciones, brillo de la pantalla"</string>
<string name="silent_mode_title">"Modo silencio"</string>
<string name="silent_mode_summary">"Silencio de todos los sonidos (excepto los multimedia y las alarmas)"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"Todos los sonidos excepto los multimedia están silenciados."</string>
<string name="ringtone_title">"Tono del teléfono"</string>
<string name="ringtone_summary">"Establecer el tono de llamada entrante predeterminado"</string>
<string name="ring_volume_title">"Volumen del timbre"</string>
@@ -360,7 +363,7 @@
<string name="sound_effects_enable_title">"Selección sonora"</string>
<string name="sound_effects_enable_summary_on">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
<string name="sound_effects_enable_summary_off">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
- <string name="play_media_notification_sounds_enable_title">"Notificaciones de la tarjeta SD"</string>
+ <string name="play_media_notification_sounds_enable_title">"Notificaciones tarjeta SD"</string>
<string name="play_media_notification_sounds_enable_summary_on">"Inhabilitar sonidos de notificación de la tarjeta SD"</string>
<string name="play_media_notification_sounds_enable_summary_off">"Habilitar sonidos de notificación de la tarjeta SD"</string>
<string name="sync_settings">"Sincronización de datos"</string>
@@ -374,10 +377,10 @@
<string name="accelerometer_summary_off">"Cambiar orientación automáticamente al girar el teléfono"</string>
<string name="brightness">"Brillo"</string>
<string name="brightness_summary">"Ajustar el brillo de la pantalla"</string>
- <string name="screen_timeout">"Tiempo de espera de pantalla"</string>
+ <string name="screen_timeout">"Tiempo espera pantalla"</string>
<string name="screen_timeout_summary">"Ajustar el tiempo de retraso antes de que la pantalla se apague automáticamente"</string>
<string name="sim_lock_settings">"Configuración de bloqueo de tarjeta SIM"</string>
- <string name="sim_lock_settings_category">"Configurar bloqueo de tarjeta SIM"</string>
+ <string name="sim_lock_settings_category">"Bloqueo de tarjeta SIM"</string>
<string name="sim_lock_settings_title">"Bloqueo de tarjeta SIM"</string>
<string name="sim_pin_toggle">"Bloquear tarjeta SIM"</string>
<string name="sim_lock_on">"Solicitar PIN para utilizar el teléfono"</string>
@@ -418,7 +421,7 @@
<string name="status_signal_strength">"Intensidad de la señal"</string>
<string name="status_roaming">"Itinerancia"</string>
<string name="status_operator">"Red"</string>
- <string name="status_wifi_mac_address">"Dirección MAC de la red Wi-Fi"</string>
+ <string name="status_wifi_mac_address">"Dirección MAC de Wi-Fi"</string>
<string name="status_bt_address">"Dirección de Bluetooth"</string>
<string name="status_unavailable">"No disponible"</string>
<string name="status_up_time">"Tiempo de actividad"</string>
@@ -463,7 +466,7 @@
<string name="restore_default_apn">"Restaurando la configuración de APN predeterminada"</string>
<string name="menu_restore">"Restablecer valores predeterminados"</string>
<string name="restore_default_apn_completed">"Restablecimiento de la configuración de APN predeterminada completado"</string>
- <string name="master_clear_title">"Restablecer datos de fábrica"</string>
+ <string name="master_clear_title">"Rest. datos de fábrica"</string>
<string name="master_clear_summary">"Borrar todos los datos del teléfono"</string>
<string name="master_clear_desc">"Esta acción restablecerá el teléfono a su estado de fábrica inicial y borrará todos los datos y todas las aplicaciones descargadas."</string>
<string name="master_clear_button_text">"Reiniciar teléfono"</string>
@@ -484,13 +487,17 @@
<string name="call_settings_summary">"Configurar buzón, llamada en espera, desvío e identificador"</string>
<string name="network_settings_title">"Redes móviles"</string>
<string name="network_settings_summary">"Establecer opciones para itinerancia, redes, APN"</string>
- <string name="location_title">"Fuentes de Mi Ubicación"</string>
+ <string name="location_title">"Mis fuentes de ubicación"</string>
<string name="location_network_based">"Usar redes inalámbricas"</string>
<string name="location_networks_disabled">"Para ver una ubicación en aplicaciones (por ejemplo, Google Maps)"</string>
<string name="location_neighborhood_level">"Ubicación determinada por redes móviles o Wi-Fi"</string>
<string name="location_gps">"Habilitar satélites GPS"</string>
<string name="location_street_level">"Preciso en el nivel de calle (anula la selección para ahorrar batería)"</string>
<string name="location_gps_disabled">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
+ <string name="location_warning_title">"Consentimiento de ubicación"</string>
+ <string name="location_warning_message">"Permite que el servicio de ubicación de Google recopile los datos de ubicación anónimos y globales. La recopilación tiene lugar aunque otras aplicaciones estén activas."</string>
+ <string name="agree">"Acepto"</string>
+ <string name="disagree">"No acepto"</string>
<string name="about_settings">"Acerca del teléfono"</string>
<string name="about_settings_summary">"Ver información legal, estado del teléfono, versión del software"</string>
<string name="legal_information">"Información legal"</string>
@@ -498,7 +505,9 @@
<string name="copyright_title">"Derechos de autor"</string>
<string name="license_title">"Licencia"</string>
<string name="terms_title">"Términos y condiciones"</string>
- <string name="settings_license_activity_title">"Licencias de software libre"</string>
+ <string name="system_tutorial_list_item_title">"Tutorial del sistema"</string>
+ <string name="system_tutorial_list_item_summary">"Aprende a utilizar tu teléfono"</string>
+ <string name="settings_license_activity_title">"Licencias de SW libre"</string>
<string name="settings_license_activity_unavailable">"Se ha producido un problema al intentar cargar las licencias."</string>
<string name="settings_license_activity_loading">"Cargando..."</string>
<string name="lock_settings_title">"Patrón de desbloqueo de pantalla"</string>
@@ -506,7 +515,7 @@
<string name="lockpattern_need_to_unlock">"Confirmar patrón guardado"</string>
<string name="lockpattern_need_to_unlock_wrong">"Inténtalo de nuevo:"</string>
<string name="lockpattern_recording_intro_header">"Crear un patrón de desbloqueo"</string>
- <string name="lockpattern_recording_intro_footer">"Pulsa la tecla de menú para obtener ayuda."</string>
+ <string name="lockpattern_recording_intro_footer">"Pulsa la tecla Menu para obtener ayuda."</string>
<string name="lockpattern_recording_inprogress">"Levanta el dedo cuando termines."</string>
<string name="lockpattern_recording_incorrect_too_short">"Une al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Inténtalo de nuevo:"</string>
<string name="lockpattern_pattern_entered_header">"Patrón grabado"</string>
@@ -520,8 +529,8 @@
<string name="lockpattern_settings_enable_title">"Patrón obligatorio"</string>
<string name="lockpattern_settings_enable_summary">"Se debe crear un patrón para desbloquear la pantalla."</string>
<string name="lockpattern_settings_enable_visible_pattern_title">"Utilizar patrón visible"</string>
- <string name="lockpattern_settings_enable_tactile_feedback_title">"Utilizar comentarios al crear patrón"</string>
- <string name="lockpattern_settings_choose_lock_pattern">"Establecer patrón de desbloqueo"</string>
+ <string name="lockpattern_settings_enable_tactile_feedback_title">"Comentarios al crear patrón"</string>
+ <string name="lockpattern_settings_choose_lock_pattern">"Patrón de desbloqueo"</string>
<string name="lockpattern_settings_change_lock_pattern">"Cambiar patrón de desbloqueo"</string>
<string name="lockpattern_settings_help_how_to_record">"Cómo crear un patrón de desbloqueo"</string>
<string name="lockpattern_too_many_failed_confirmation_attempts_header">"Se han realizado demasiados intentos incorrectos."</string>
@@ -583,7 +592,7 @@
<string name="language_settings_summary">"Configuración local, opciones de autocorrección e introducción de texto"</string>
<string name="language_category">"Configuración local"</string>
<string name="text_category">"Configuración de texto"</string>
- <string name="phone_language">"Seleccionar configuración local"</string>
+ <string name="phone_language">"Configuración local"</string>
<string name="phone_language_summary">"Seleccionar idioma y región"</string>
<string name="auto_replace">"Corrección automática"</string>
<string name="auto_replace_summary">"Corregir palabras con errores de escritura"</string>
@@ -594,13 +603,12 @@
<string name="auto_punctuate_summary">"Pulsa la barra espaciadora dos veces para insertar el carácter \".\""</string>
<string name="show_password">"Contraseñas visibles"</string>
<string name="show_password_summary">"Mostrar contraseña mientras se escribe"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"Este método de introducción de texto puede registrar todo lo que escribas, incluidos datos personales como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas habilitar este método de introducción?"</string>
<string name="user_dict_settings_titlebar">"Diccionario del usuario"</string>
<string name="user_dict_settings_title">"Diccionario del usuario"</string>
<string name="user_dict_settings_summary">"Añadir y eliminar palabras del diccionario del usuario"</string>
<string name="user_dict_settings_add_menu_title">"Añadir"</string>
- <string name="user_dict_settings_add_dialog_title">"Añadir al usuario"</string>
+ <string name="user_dict_settings_add_dialog_title">"Añadir al diccionario"</string>
<string name="user_dict_settings_edit_dialog_title">"Editar palabra"</string>
<string name="user_dict_settings_context_menu_edit_title">"Editar"</string>
<string name="user_dict_settings_context_menu_delete_title">"Suprimir"</string>
@@ -632,7 +640,7 @@
<string name="enable_adb_summary">"Modo de depuración cuando está conectado el dispositivo USB"</string>
<string name="keep_screen_on">"Pantalla activa"</string>
<string name="keep_screen_on_summary">"La pantalla nunca entra en modo de suspensión durante la carga"</string>
- <string name="allow_mock_location">"Permitir ubicaciones simuladas"</string>
+ <string name="allow_mock_location">"Ubicaciones simuladas"</string>
<string name="allow_mock_location_summary">"Permitir ubicaciones simuladas"</string>
<string name="gadget_picker_title">"Seleccionar gadget"</string>
<string name="widget_picker_title">"Seleccionar widget"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c1299d5..2cb371c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -107,6 +107,10 @@
<string name="date_and_time">"Paramètres d\'heure et de date"</string>
<string name="date_time_12_hour_sample">"13:00 h"</string>
<string name="date_time_24_hour_sample">"13:00"</string>
+ <!-- no translation found for date_time_changeTime_text (7037437020000867740) -->
+ <skip />
+ <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->
+ <skip />
<string name="choose_timezone">"Choisir fuseau horaire"</string>
<string name="display_preview_label">"Aperçu :"</string>
<string name="display_font_size_label">"Taille de police :"</string>
@@ -198,10 +202,10 @@
<string name="date_and_time_settings_summary">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
<string name="date_time_auto">"Automatique"</string>
<string name="date_time_auto_summaryOn">"Utiliser les valeurs du réseau"</string>
- <string name="date_time_auto_summaryOff">"Utiliser les valeurs fournies par le réseau"</string>
+ <string name="date_time_auto_summaryOff">"Utiliser les valeurs du réseau"</string>
<string name="date_time_24hour">"Utiliser format sur 24 h"</string>
<string name="date_time_set_time">"Définir l\'heure"</string>
- <string name="date_time_set_timezone">"Choisir un fuseau horaire"</string>
+ <string name="date_time_set_timezone">"Définir fuseau horaire"</string>
<string name="date_time_set_date">"Définir la date"</string>
<string name="date_time_date_format">"Sélectionner format de date"</string>
<string name="zone_list_menu_sort_alphabetically">"Trier par ordre alphabétique"</string>
@@ -335,11 +339,10 @@
<string name="status_failed">"Échec"</string>
<string name="sound_and_display_settings">"Sons et affichage"</string>
<string name="sound_settings">"Paramètres sonores"</string>
- <string name="sound_and_display_settings_summary">"Configurer les sonneries, les notifications et la luminosité de l\'écran"</string>
+ <string name="sound_and_display_settings_summary">"Configurer les sonneries, les notifications et la luminosité"</string>
<string name="silent_mode_title">"Mode silencieux"</string>
<string name="silent_mode_summary">"Aucun son sauf pour le multimédia et le réveil"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"Toutes les sonneries seront définies sur Silencieux, sauf les fichiers multimédia."</string>
<string name="ringtone_title">"Sonnerie du téléphone"</string>
<string name="ringtone_summary">"Configurer la sonnerie par défaut pour les appels entrants"</string>
<string name="ring_volume_title">"Volume de la sonnerie"</string>
@@ -358,19 +361,19 @@
<string name="dtmf_tone_enable_summary_on">"Activer la tonalité des touches du clavier"</string>
<string name="dtmf_tone_enable_summary_off">"Activer la tonalité des touches du clavier"</string>
<string name="sound_effects_enable_title">"Sélections audibles"</string>
- <string name="sound_effects_enable_summary_on">"Lire les sons lors des sélections à l\'écran"</string>
+ <string name="sound_effects_enable_summary_on">"Jouer un son lors des sélections à l\'écran"</string>
<string name="sound_effects_enable_summary_off">"Jouer un son lors des sélections à l\'écran"</string>
- <string name="play_media_notification_sounds_enable_title">"Notifications de la carte SD"</string>
+ <string name="play_media_notification_sounds_enable_title">"Notifications carte SD"</string>
<string name="play_media_notification_sounds_enable_summary_on">"Désactiver les notifications sonores de la carte SD"</string>
<string name="play_media_notification_sounds_enable_summary_off">"Activer les notifications sonores de la carte SD"</string>
- <string name="sync_settings">"Synchronisation des données"</string>
+ <string name="sync_settings">"Synchro. des données"</string>
<string name="sync_settings_summary">"Sélectionner les applications à synchroniser"</string>
- <string name="display_settings">"Afficher les paramètres"</string>
+ <string name="display_settings">"Paramètres d\'affichage"</string>
<string name="animations_title">"Animation"</string>
- <string name="animations_summary_on">"Afficher l\'animation lors de l\'ouverture et de la fermeture des fenêtres"</string>
- <string name="animations_summary_off">"Afficher l\'animation lors de l\'ouverture et de la fermeture des fenêtres"</string>
+ <string name="animations_summary_on">"Animation lors de l\'ouverture et de la fermeture des fenêtres"</string>
+ <string name="animations_summary_off">"Animation lors de l\'ouverture et de la fermeture des fenêtres"</string>
<string name="accelerometer_title">"Orientation"</string>
- <string name="accelerometer_summary_on">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
+ <string name="accelerometer_summary_on">"Changer automatiquement d\'orientation lors de la rotation"</string>
<string name="accelerometer_summary_off">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
<string name="brightness">"Luminosité"</string>
<string name="brightness_summary">"Régler la luminosité de l\'écran"</string>
@@ -486,11 +489,15 @@
<string name="network_settings_summary">"Définir les options d\'itinérance, réseaux, noms de points d\'accès"</string>
<string name="location_title">"Sources pour Ma position"</string>
<string name="location_network_based">"Utiliser réseaux sans fil"</string>
- <string name="location_networks_disabled">"Afficher la position géographique dans les applications (comme Google Maps) lors de l\'utilisation de réseaux sans fil"</string>
+ <string name="location_networks_disabled">"Afficher position dans les applications (comme Google Maps)"</string>
<string name="location_neighborhood_level">"Position géographique déterminée par réseaux Wi-Fi et/ou mobile"</string>
<string name="location_gps">"Activer les satellites GPS"</string>
<string name="location_street_level">"Localisation précise au niveau de la rue lors du positionnement géographique (désélectionner pour économiser la batterie)"</string>
<string name="location_gps_disabled">"Localiser au niveau rue (requiert + de batterie et une vue dégagée)"</string>
+ <string name="location_warning_title">"Votre lieu va être enregistré."</string>
+ <string name="location_warning_message">"Autoriser le service de positionnement géographique de Google à collecter des données de lieu ne permettant pas de vous identifier personnellement. Les données seront collectées, quelles que soient les applications activées."</string>
+ <string name="agree">"Accepter"</string>
+ <string name="disagree">"Refuser"</string>
<string name="about_settings">"À propos du téléphone"</string>
<string name="about_settings_summary">"Informations légales, état du téléphone et version du logiciel"</string>
<string name="legal_information">"Informations légales"</string>
@@ -498,7 +505,9 @@
<string name="copyright_title">"Copyright"</string>
<string name="license_title">"Licence"</string>
<string name="terms_title">"Conditions d\'utilisation"</string>
- <string name="settings_license_activity_title">"Ouvrir licences source"</string>
+ <string name="system_tutorial_list_item_title">"Didacticiel"</string>
+ <string name="system_tutorial_list_item_summary">"Comment utiliser votre téléphone ?"</string>
+ <string name="settings_license_activity_title">"Licences open source"</string>
<string name="settings_license_activity_unavailable">"Un problème est survenu lors du chargement des licences."</string>
<string name="settings_license_activity_loading">"Chargement..."</string>
<string name="lock_settings_title">"Motif de déverrouillage de l\'écran"</string>
@@ -536,7 +545,7 @@
<string name="manageapplications_settings_summary">"Gérer et supprimer les applications installées"</string>
<string name="applications_settings">"Applications"</string>
<string name="applications_settings_summary">"Gérer les applications, configurer des raccourcis de lancement rapide"</string>
- <string name="applications_settings_header">"Paramètres de l\'application"</string>
+ <string name="applications_settings_header">"Paramètres des applications"</string>
<string name="install_applications">"Sources inconnues"</string>
<string name="install_unknown_applications">"Autoriser l\'installation d\'applications ne provenant pas d\'Android Market"</string>
<string name="install_all_warning">"Votre téléphone et vos données personnelles sont très vulnérables face à des applications provenant de sources inconnues. Vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
@@ -584,18 +593,17 @@
<string name="language_category">"Paramètres régionaux"</string>
<string name="text_category">"Paramètres du texte"</string>
<string name="phone_language">"Langue et région"</string>
- <string name="phone_language_summary">"Sélectionner une langue et un pays"</string>
+ <string name="phone_language_summary">"Sélectionner la langue et le pays"</string>
<string name="auto_replace">"Remplacement auto"</string>
<string name="auto_replace_summary">"Corriger les mots mal saisis"</string>
- <string name="auto_caps">"Majuscule auto"</string>
+ <string name="auto_caps">"Majuscules automatiques"</string>
<string name="auto_caps_summary">"Mettre une majuscule en début de phrase"</string>
- <string name="auto_punctuate">"Ponctuation auto"</string>
+ <string name="auto_punctuate">"Ponctuation automatique"</string>
<string name="hardkeyboard_category">"Paramètres du clavier physique"</string>
<string name="auto_punctuate_summary">"Appuyez deux fois sur la touche Espace pour insérer \".\""</string>
<string name="show_password">"Mots de passe visibles"</string>
<string name="show_password_summary">"Afficher le mot de passe lors de la saisie"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"Ce mode de saisie pourrait collecter le texte que vous saisissez, y compris vos données personnelles telles que les mots de passe et les numéros de carte de crédit. Ce mode est propre à l\'application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voulez-vous vraiment activer ce mode de saisie ?"</string>
<string name="user_dict_settings_titlebar">"Dictionnaire personnel"</string>
<string name="user_dict_settings_title">"Dictionnaire personnel"</string>
<string name="user_dict_settings_summary">"Ajouter et retirer des mots du dictionnaire personnel"</string>
@@ -632,8 +640,8 @@
<string name="enable_adb_summary">"Mode débogage lorsqu\'un câble USB est connecté"</string>
<string name="keep_screen_on">"Rester activé"</string>
<string name="keep_screen_on_summary">"L\'écran ne se met jamais en veille lors du chargement"</string>
- <string name="allow_mock_location">"Autoriser les positions géographiques fictives"</string>
- <string name="allow_mock_location_summary">"Positions fictives"</string>
+ <string name="allow_mock_location">"Positions fictives"</string>
+ <string name="allow_mock_location_summary">"Autoriser les positions fictives"</string>
<string name="gadget_picker_title">"Choisir un gadget"</string>
<string name="widget_picker_title">"Choisir un widget"</string>
<string name="battery_history_details_for">"Détails de l\'UID %d"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c1433d9..2796d66 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -338,8 +338,7 @@
<string name="sound_and_display_settings_summary">"Imposta suonerie, notifiche e luminosità dello schermo"</string>
<string name="silent_mode_title">"Modalità silenziosa"</string>
<string name="silent_mode_summary">"Tutti i suoni eccetto quelli multimediali verranno disattivati"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"Tutti i suoni eccetto quelli multimediali verranno disattivati"</string>
<string name="ringtone_title">"Suoneria telefono"</string>
<string name="ringtone_summary">"Imposta la suoneria predefinita delle chiamate in entrata"</string>
<string name="ring_volume_title">"Volume suoneria"</string>
@@ -371,7 +370,7 @@
<string name="animations_summary_off">"Mostra l\'animazione durante l\'apertura e la chiusura di finestre"</string>
<string name="accelerometer_title">"Orientamento"</string>
<string name="accelerometer_summary_on">"Cambia automaticamente l\'orientamento quando il cellulare viene ruotato"</string>
- <string name="accelerometer_summary_off">"Cambia automaticamente l\'orientamento quando il cellulare viene ruotato"</string>
+ <string name="accelerometer_summary_off">"Cambia automatic. l\'orientamento quando il cell. viene ruotato"</string>
<string name="brightness">"Luminosità"</string>
<string name="brightness_summary">"Regola la luminosità dello schermo"</string>
<string name="screen_timeout">"Timeout schermo"</string>
@@ -491,6 +490,10 @@
<string name="location_gps">"Attiva satelliti GPS"</string>
<string name="location_street_level">"Accuratezza a livello stradale (deseleziona per risparmiare batteria)"</string>
<string name="location_gps_disabled">"Localizza a livello stradale (richiede più batteria e la vista del cielo)"</string>
+ <string name="location_warning_title">"Consenso alla localizzazione"</string>
+ <string name="location_warning_message">"Consenti al servizio di localizzazione di Google di raccogliere dati anonimi e aggregati sulla posizione. La raccolta dei dati verrà effettuata a prescindere dal fatto che ci siano o meno applicazioni attive."</string>
+ <string name="agree">"Accetto"</string>
+ <string name="disagree">"Non accetto"</string>
<string name="about_settings">"Info sul telefono"</string>
<string name="about_settings_summary">"Visualizza informazioni legali, stato del telefono, versione del software"</string>
<string name="legal_information">"Informazioni legali"</string>
@@ -498,6 +501,8 @@
<string name="copyright_title">"Copyright"</string>
<string name="license_title">"Licenza"</string>
<string name="terms_title">"Termini e condizioni"</string>
+ <string name="system_tutorial_list_item_title">"Esercitazione sul sistema"</string>
+ <string name="system_tutorial_list_item_summary">"Impara a utilizzare il tuo cellulare"</string>
<string name="settings_license_activity_title">"Licenze open source"</string>
<string name="settings_license_activity_unavailable">"Errore durante il caricamento delle licenze."</string>
<string name="settings_license_activity_loading">"Caricamento..."</string>
@@ -594,8 +599,7 @@
<string name="auto_punctuate_summary">"Premi due volte la barra spaziatrice per inserire \".\""</string>
<string name="show_password">"Password visibili"</string>
<string name="show_password_summary">"Mostra la password durante la digitazione"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"Questo metodo di inserimento potrebbe riuscire a raccogliere tutto il testo digitato, compresi i dati personali come password e numeri di carte di credito. Si tratta del metodo dell\'applicazione <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Attivare questo metodo di inserimento?"</string>
<string name="user_dict_settings_titlebar">"Dizionario utente"</string>
<string name="user_dict_settings_title">"Dizionario utente"</string>
<string name="user_dict_settings_summary">"Aggiungi e rimuovi parole dal dizionario utente"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f74b17f..58c9761 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -30,7 +30,7 @@
<item>"1分"</item>
<item>"2分"</item>
<item>"10分"</item>
- <item>"減光しない"</item>
+ <item>"常時点灯"</item>
</string-array>
<string-array name="wifi_security_entries">
<item>"自動"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e8f612c..40529ad 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -204,8 +204,8 @@
<string name="date_time_set_timezone">"タイムゾーンの選択"</string>
<string name="date_time_set_date">"日付設定"</string>
<string name="date_time_date_format">"日付形式"</string>
- <string name="zone_list_menu_sort_alphabetically">"アルファベット順に並べ替え"</string>
- <string name="zone_list_menu_sort_by_timezone">"タイムゾーン順に並べ替え"</string>
+ <string name="zone_list_menu_sort_alphabetically">"アルファベット順"</string>
+ <string name="zone_list_menu_sort_by_timezone">"タイムゾーン順"</string>
<string name="security_settings_title">"セキュリティ & 位置情報"</string>
<string name="security_settings_summary">"現在地情報、画面ロック、SIMカードロック"</string>
<string name="security_passwords_title">"パスワード"</string>
@@ -338,8 +338,7 @@
<string name="sound_and_display_settings_summary">"着信音、操作音、画面の明るさなど"</string>
<string name="silent_mode_title">"マナーモード"</string>
<string name="silent_mode_summary">"音楽、動画メディア、アラーム以外は消音"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"音楽と動画メディア以外は消音"</string>
<string name="ringtone_title">"着信音"</string>
<string name="ringtone_summary">"端末の基本着信音を選択"</string>
<string name="ring_volume_title">"着信音量"</string>
@@ -375,7 +374,7 @@
<string name="brightness">"画面の明るさ"</string>
<string name="brightness_summary">"画面の明るさを調整する"</string>
<string name="screen_timeout">"バックライト消灯"</string>
- <string name="screen_timeout_summary">"画面のバックライトを自動消灯するまでの時間"</string>
+ <string name="screen_timeout_summary">"画面バックライトを自動消灯するまでの時間"</string>
<string name="sim_lock_settings">"SIMカードロック設定"</string>
<string name="sim_lock_settings_category">"SIMカードロック設定"</string>
<string name="sim_lock_settings_title">"SIMカードロック"</string>
@@ -481,7 +480,7 @@
<string name="media_format_gesture_prompt">"ロック解除パターンを入力してください"</string>
<string name="media_format_gesture_explanation">"ロック解除パターンを入力してSDカードのフォーマット実行を確認する必要があります。"</string>
<string name="call_settings_title">"通話設定"</string>
- <string name="call_settings_summary">"ボイスメール、電話転送、発信者番号などの設定"</string>
+ <string name="call_settings_summary">"ボイスメール、着信転送、発信者番号など"</string>
<string name="network_settings_title">"モバイルネットワーク"</string>
<string name="network_settings_summary">"ローミング、ネットワーク、APN設定"</string>
<string name="location_title">"位置情報の検出"</string>
@@ -491,6 +490,10 @@
<string name="location_gps">"GPS機能をONにする"</string>
<string name="location_street_level">"高精度測位（電池の消費を節約する場合はOFFにしてください）"</string>
<string name="location_gps_disabled">"高精度測位（電池消費増、電波が良好な場所で使用）"</string>
+ <string name="location_warning_title">"位置情報についての同意"</string>
+ <string name="location_warning_message">"Googleの位置情報サービスによる匿名化された位置データの収集および集計を許可します。データ収集はアプリケーション起動の有無にかかわらず行われます。"</string>
+ <string name="agree">"同意する"</string>
+ <string name="disagree">"同意しない"</string>
<string name="about_settings">"端末情報"</string>
<string name="about_settings_summary">"端末情報、規約、バージョン情報"</string>
<string name="legal_information">"法的情報"</string>
@@ -498,10 +501,8 @@
<string name="copyright_title">"著作権"</string>
<string name="license_title">"ライセンス"</string>
<string name="terms_title">"利用規約"</string>
- <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
- <skip />
- <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
- <skip />
+ <string name="system_tutorial_list_item_title">"システムチュートリアル"</string>
+ <string name="system_tutorial_list_item_summary">"携帯電話の使用方法"</string>
<string name="settings_license_activity_title">"オープンソースライセンス"</string>
<string name="settings_license_activity_unavailable">"ライセンスの読み込み中に問題が発生しました。"</string>
<string name="settings_license_activity_loading">"読み込み中..."</string>
@@ -563,7 +564,7 @@
<string name="clear_activities">"設定を消去"</string>
<string name="unknown">"不明"</string>
<string name="sort_order_alpha">"並べ替え"</string>
- <string name="sort_order_size">"サイズ順に並べ替え"</string>
+ <string name="sort_order_size">"サイズ順"</string>
<string name="manage_space_text">"容量を管理"</string>
<string name="filter">"フィルタ"</string>
<string name="filter_dlg_title">"フィルタオプションを選択"</string>
@@ -598,8 +599,7 @@
<string name="auto_punctuate_summary">"英語: Spaceキー2回でピリオド(.)を挿入"</string>
<string name="show_password">"パスワードを表示"</string>
<string name="show_password_summary">"入力時にパスワードを表示する"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"この入力方法では入力したすべてのテキストの収集を許可します。収集されるテキストには個人情報データやクレジットカード番号などが含まれます。これはアプリケーション<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>によるものです。この入力方法を有効にしますか？"</string>
<string name="user_dict_settings_titlebar">"ユーザー辞書"</string>
<string name="user_dict_settings_title">"ユーザー辞書"</string>
<string name="user_dict_settings_summary">"ユーザー辞書への語句の追加と削除"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e716393..3bd2a3c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -338,8 +338,7 @@
<string name="sound_and_display_settings_summary">"벨소리, 알림, 화면 밝기 설정"</string>
<string name="silent_mode_title">"무음 모드"</string>
<string name="silent_mode_summary">"미디어 및 알람 외의 모든 소리가 나지 않습니다."</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"미디어를 제외하고 모두 무음 모드로 전환됩니다."</string>
<string name="ringtone_title">"전화 벨소리"</string>
<string name="ringtone_summary">"수신전화 기본 벨소리 설정"</string>
<string name="ring_volume_title">"벨소리 볼륨"</string>
@@ -491,6 +490,10 @@
<string name="location_gps">"GPS 위성 사용"</string>
<string name="location_street_level">"도로 수준으로 정확하게 탐색(배터리를 절약하려면 선택 취소)"</string>
<string name="location_gps_disabled">"도로 수준으로 탐색(항공사진이 더해져 배터리 추가로 필요)"</string>
+ <string name="location_warning_title">"위치 정보 수집에 동의"</string>
+ <string name="location_warning_message">"Google의 위치 서비스가 익명의 위치 데이터를 광범위하게 수집합니다. 사용 중인 응용프로그램에 관계 없이 정보가 수집됩니다."</string>
+ <string name="agree">"동의"</string>
+ <string name="disagree">"동의하지 않음"</string>
<string name="about_settings">"전화기 정보"</string>
<string name="about_settings_summary">"법률 정보, 전화기 상태, 소프트웨어 버전 보기"</string>
<string name="legal_information">"법률정보"</string>
@@ -498,6 +501,8 @@
<string name="copyright_title">"저작권"</string>
<string name="license_title">"라이센스"</string>
<string name="terms_title">"약관"</string>
+ <string name="system_tutorial_list_item_title">"시스템 안내서"</string>
+ <string name="system_tutorial_list_item_summary">"휴대전화 사용법 알아보기"</string>
<string name="settings_license_activity_title">"오픈소스 라이센스"</string>
<string name="settings_license_activity_unavailable">"라이센스를 로드하는 동안 문제가 발생했습니다."</string>
<string name="settings_license_activity_loading">"로드 중..."</string>
@@ -594,8 +599,7 @@
<string name="auto_punctuate_summary">"스페이스바를 두 번 눌러 \'.\' 삽입"</string>
<string name="show_password">"비밀번호 표시"</string>
<string name="show_password_summary">"입력 시 비밀번호 표시"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 응용프로그램에서 지원하는 이 입력 방법을 사용하면 비밀번호 및 신용카드 번호와 같은 개인 정보를 비롯하여 입력한 모든 텍스트가 수집될 수 있습니다. 사용하시겠습니까?"</string>
<string name="user_dict_settings_titlebar">"사용자 사전"</string>
<string name="user_dict_settings_title">"사용자 사전"</string>
<string name="user_dict_settings_summary">"사용자 사전에서 단어 추가 및 삭제"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6a3727a..6271e4d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -493,6 +493,14 @@
<string name="location_gps">"Bruk GPS-satellitter"</string>
<string name="location_street_level">"Nøyaktig til gatenivå (slå av for å spare batteri)"</string>
<string name="location_gps_disabled">"Finn plassering på gatenivå (bruker mer batteri, og trenger fri sikt til himmelen)"</string>
+ <!-- no translation found for location_warning_title (788624242969337259) -->
+ <skip />
+ <!-- no translation found for location_warning_message (2455390825908728808) -->
+ <skip />
+ <!-- no translation found for agree (6288718671527758326) -->
+ <skip />
+ <!-- no translation found for disagree (6221069272309799230) -->
+ <skip />
<string name="about_settings">"Om telefonen"</string>
<string name="about_settings_summary">"Vis juridisk informasjon, telefonstatus, programvareversjon"</string>
<string name="legal_information">"Juridisk informasjon"</string>
@@ -500,6 +508,10 @@
<string name="copyright_title">"Opphavsrett"</string>
<string name="license_title">"Lisens"</string>
<string name="terms_title">"Betingelser"</string>
+ <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+ <skip />
+ <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+ <skip />
<string name="settings_license_activity_title">"Åpen kildekode-lisenser"</string>
<string name="settings_license_activity_unavailable">"Kunne ikke hente lisensene."</string>
<string name="settings_license_activity_loading">"henter…"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 46adabe..2134258 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -207,7 +207,7 @@
<string name="zone_list_menu_sort_alphabetically">"Alfabetisch sorteren"</string>
<string name="zone_list_menu_sort_by_timezone">"Sorteren op tijdzone"</string>
<string name="security_settings_title">"Beveiliging en locatie"</string>
- <string name="security_settings_summary">"Mijn locatie\' instellen, scherm ontgrendelen en SIM-kaart blokkeren"</string>
+ <string name="security_settings_summary">"Mijn locatie instellen, scherm ontgrendelen en SIM-kaart vergrendelen"</string>
<string name="security_passwords_title">"Wachtwoorden"</string>
<string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
<string name="bluetooth_quick_toggle_summary">"Bluetooth inschakelen"</string>
@@ -338,8 +338,7 @@
<string name="sound_and_display_settings_summary">"Beltonen, meldingen, schermhelderheid instellen"</string>
<string name="silent_mode_title">"Stille modus"</string>
<string name="silent_mode_summary">"Alle geluiden worden uitgeschakeld, behalve media- en alarmtonen"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"Alle geluiden, behalve media, worden uitgeschakeld"</string>
<string name="ringtone_title">"Beltoon telefoon"</string>
<string name="ringtone_summary">"Standaardbeltoon voor inkomende oproepen instellen"</string>
<string name="ring_volume_title">"Belvolume"</string>
@@ -376,15 +375,15 @@
<string name="brightness_summary">"Helderheid van het scherm aanpassen"</string>
<string name="screen_timeout">"Time-out scherm"</string>
<string name="screen_timeout_summary">"De vertraging voor het automatisch uitschakelen van het scherm aanpassen"</string>
- <string name="sim_lock_settings">"Instellingen SIM-kaartblokkering"</string>
- <string name="sim_lock_settings_category">"SIM-kaartblokkering instellen"</string>
- <string name="sim_lock_settings_title">"SIM-kaartblokkering"</string>
- <string name="sim_pin_toggle">"SIM-kaart blokkeren"</string>
+ <string name="sim_lock_settings">"Instellingen SIM-kaartvergrendeling"</string>
+ <string name="sim_lock_settings_category">"SIM-kaartvergrendeling instellen"</string>
+ <string name="sim_lock_settings_title">"SIM-kaartvergrendeling"</string>
+ <string name="sim_pin_toggle">"SIM-kaart vergrendelen"</string>
<string name="sim_lock_on">"PIN-code vereist voor gebruik van telefoon"</string>
<string name="sim_lock_off">"PIN-code vereist voor gebruik van telefoon"</string>
<string name="sim_pin_change">"SIM PIN-code wijzigen"</string>
<string name="sim_enter_pin">"SIM PIN-code"</string>
- <string name="sim_enable_sim_lock">"SIM-kaart blokkeren"</string>
+ <string name="sim_enable_sim_lock">"SIM-kaart vergrendelen"</string>
<string name="sim_disable_sim_lock">"SIM-kaart ontgrendelen"</string>
<string name="sim_enter_old">"Oude SIM PIN-code"</string>
<string name="sim_enter_new">"Nieuwe SIM PIN-code"</string>
@@ -394,7 +393,7 @@
<string name="sim_pins_dont_match">"PIN-codes komen niet overeen!"</string>
<string name="sim_change_failed">"Kan PIN-code niet wijzigen."\n"PIN-code mogelijk onjuist."</string>
<string name="sim_change_succeeded">"SIM PIN-code gewijzigd"</string>
- <string name="sim_lock_failed">"Kan status van SIM-kaartblokkering niet wijzigen."\n"PIN-code mogelijk onjuist."</string>
+ <string name="sim_lock_failed">"Kan status van SIM-kaartvergrendeling niet wijzigen."\n"PIN-code mogelijk onjuist."</string>
<string name="sim_enter_ok">"OK"</string>
<string name="sim_enter_cancel">"Annuleren"</string>
<string name="device_info_settings">"Telefoonstatus"</string>
@@ -478,10 +477,10 @@
<string name="media_format_button_text">"SD-kaart formatteren"</string>
<string name="media_format_final_desc">"Wilt u de SD-kaart formatteren en al uw mediabestanden wissen? Deze actie kan niet ongedaan worden gemaakt."</string>
<string name="media_format_final_button_text">"Alles wissen"</string>
- <string name="media_format_gesture_prompt">"Teken uw deblokkeringspatroon"</string>
- <string name="media_format_gesture_explanation">"U moet uw deblokkeringspatroon tekenen om het formatteren van een SD-kaart te bevestigen."</string>
+ <string name="media_format_gesture_prompt">"Teken uw ontgrendelingspatroon"</string>
+ <string name="media_format_gesture_explanation">"U moet uw ontgrendelingspatroon tekenen om het formatteren van een SD-kaart te bevestigen."</string>
<string name="call_settings_title">"Oproepinstellingen"</string>
- <string name="call_settings_summary">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen."</string>
+ <string name="call_settings_summary">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen"</string>
<string name="network_settings_title">"Mobiele netwerken"</string>
<string name="network_settings_summary">"Opties voor roaming, netwerken, APN\'s instellen"</string>
<string name="location_title">"Mijn locatiebronnen"</string>
@@ -489,8 +488,12 @@
<string name="location_networks_disabled">"Locatie in toepassingen (zoals Maps) bekijken via draadloze netwerken"</string>
<string name="location_neighborhood_level">"Locatie bepaald door Wi-Fi en/of mobiele netwerken"</string>
<string name="location_gps">"GPS-satellieten inschakelen"</string>
- <string name="location_street_level">"Bij locatie bepalen nauwkeurig tot op straatniveau (deselecteren om acculading te sparen)"</string>
- <string name="location_gps_disabled">"Locatie bepalen tot op straatniveau (meer stroom nodig en weergave van lucht)"</string>
+ <string name="location_street_level">"Locatie tot op straatniveau (uit om acculading te sparen)"</string>
+ <string name="location_gps_disabled">"Locatie bepalen tot op straatniveau (meer stroom nodig en luchtweergave)"</string>
+ <string name="location_warning_title">"Locatietoestemming"</string>
+ <string name="location_warning_message">"Toestaan dat de locatieservice van Google anonieme, getotaliseerde locatiegegevens verzameld. De gegevens worden verzameld, ongeacht of er toepassingen actief zijn."</string>
+ <string name="agree">"Akkoord"</string>
+ <string name="disagree">"Niet akkoord"</string>
<string name="about_settings">"Over de telefoon"</string>
<string name="about_settings_summary">"Juridische info, telefoonstatus, softwareversie weergeven"</string>
<string name="legal_information">"Juridische informatie"</string>
@@ -498,6 +501,8 @@
<string name="copyright_title">"Auteursrecht"</string>
<string name="license_title">"Licentie"</string>
<string name="terms_title">"Algemene voorwaarden"</string>
+ <string name="system_tutorial_list_item_title">"Systeemzelfstudie"</string>
+ <string name="system_tutorial_list_item_summary">"Meer informatie over het gebruik van uw telefoon"</string>
<string name="settings_license_activity_title">"Open-sourcelicenties"</string>
<string name="settings_license_activity_unavailable">"Er is een probleem bij het laden van de licenties."</string>
<string name="settings_license_activity_loading">"Laden..."</string>
@@ -516,7 +521,7 @@
<string name="lockpattern_restart_button_text">"Opnieuw tekenen"</string>
<string name="lockpattern_retry_button_text">"Opnieuw proberen"</string>
<string name="lockpattern_continue_button_text">"Doorgaan"</string>
- <string name="lockpattern_settings_title">"Deblokkeringspatroon"</string>
+ <string name="lockpattern_settings_title">"Ontgrendelingspatroon"</string>
<string name="lockpattern_settings_enable_title">"Patroon vereist"</string>
<string name="lockpattern_settings_enable_summary">"U moet een patroon tekenen om het scherm te ontgrendelen"</string>
<string name="lockpattern_settings_enable_visible_pattern_title">"Zichtbaar patroon gebruiken"</string>
@@ -591,14 +596,13 @@
<string name="auto_caps_summary">"Eerste letters in zinnen met hoofdletter"</string>
<string name="auto_punctuate">"Automatische interpunctie"</string>
<string name="hardkeyboard_category">"Instellingen voor vast toetsenbord"</string>
- <string name="auto_punctuate_summary">"Druk twee keer op de spatiebalk om \'.\' in te voegen"</string>
+ <string name="auto_punctuate_summary">"Druk twee keer op de spatiebalk om een punt (.) in te voegen"</string>
<string name="show_password">"Zichtbare wachtwoorden"</string>
<string name="show_password_summary">"Wachtwoord weergeven tijdens het typen"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"Deze invoermethode verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De methode is afkomstig uit de toepassing <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Deze invoermethode inschakelen?"</string>
<string name="user_dict_settings_titlebar">"Gebruikerswoordenboek"</string>
<string name="user_dict_settings_title">"Gebruikerswoordenboek"</string>
- <string name="user_dict_settings_summary">"Woorden toevoegen aan en verwijderen uit gebruikerswoordenboek"</string>
+ <string name="user_dict_settings_summary">"Woorden toevoegen en verwijderen"</string>
<string name="user_dict_settings_add_menu_title">"Toevoegen"</string>
<string name="user_dict_settings_add_dialog_title">"Toevoegen aan woordenboek"</string>
<string name="user_dict_settings_edit_dialog_title">"Woord bewerken"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7ccff23..9495494 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -197,8 +197,8 @@
<string name="date_and_time_settings_title">"Data i czas"</string>
<string name="date_and_time_settings_summary">"Ustaw format daty, czasu i strefę czasową"</string>
<string name="date_time_auto">"Automatycznie"</string>
- <string name="date_time_auto_summaryOn">"Skorzystaj z wartości dostarczonych przez sieć"</string>
- <string name="date_time_auto_summaryOff">"Skorzystaj z informacji dostarczonych przez operatora"</string>
+ <string name="date_time_auto_summaryOn">"Używaj wartości dostarczonych przez sieć"</string>
+ <string name="date_time_auto_summaryOff">"Używaj informacji dostarczonych przez operatora"</string>
<string name="date_time_24hour">"Format 24-godzinny"</string>
<string name="date_time_set_time">"Ustaw czas"</string>
<string name="date_time_set_timezone">"Wybierz strefę czasową"</string>
@@ -290,7 +290,7 @@
<string name="wifi_save_config">"Zapisz"</string>
<string name="wifi_password_unchanged">"(niezmienione)"</string>
<string name="wifi_add_other_network">"Dodaj sieć Wi-Fi"</string>
- <string name="wifi_notify_open_networks">"Powiadomienie sieciowe"</string>
+ <string name="wifi_notify_open_networks">"Powiadomienie o sieci"</string>
<string name="wifi_notify_open_networks_summary">"Powiadom mnie, gdy będę w zasięgu otwartej sieci"</string>
<string name="wifi_password_incorrect_error">"Wprowadzone hasło sieci jest nieprawidłowe. Spróbuj ponownie."</string>
<string name="wifi_generic_connection_error">"Wystąpił problem podczas łączenia z siecią. Spróbuj ponownie."</string>
@@ -338,8 +338,7 @@
<string name="sound_and_display_settings_summary">"Ustaw dzwonki, powiadomienia, jasność ekranu"</string>
<string name="silent_mode_title">"Tryb cichy"</string>
<string name="silent_mode_summary">"Wszystkie dźwięki oprócz multimediów i alarmów są wyciszone"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"Wszystkie dźwięki za wyjątkiem multimediów są wyciszone"</string>
<string name="ringtone_title">"Dzwonek telefonu"</string>
<string name="ringtone_summary">"Ustaw domyślny dzwonek dla połączeń przychodzących"</string>
<string name="ring_volume_title">"Głośność dzwonka"</string>
@@ -426,9 +425,9 @@
<string name="internal_memory">"Pamięć wewnętrzna telefonu"</string>
<string name="sd_memory">"Karta SD"</string>
<string name="memory_available">"Dostępne miejsce"</string>
- <string name="memory_size">"Łączna pojemność"</string>
- <string name="sd_eject">"Odmontuj kartę SD"</string>
- <string name="sd_eject_summary">"Odmontuj kartę SD, aby bezpiecznie ją usunąć"</string>
+ <string name="memory_size">"Całkowita pojemność"</string>
+ <string name="sd_eject">"Odłącz kartę SD"</string>
+ <string name="sd_eject_summary">"Odłącz kartę SD, aby bezpiecznie ją usunąć"</string>
<string name="sd_format">"Formatuj kartę SD"</string>
<string name="sd_format_summary">"Formatuj (wymaż) kartę SD"</string>
<string name="sd_unavailable">"Niedostępna"</string>
@@ -487,10 +486,14 @@
<string name="location_title">"Źródło Mojej lokalizacji"</string>
<string name="location_network_based">"Użyj sieci Wi-Fi"</string>
<string name="location_networks_disabled">"Zobacz położenie w aplikacjach (takich jak Mapy), korzystając z sieci bezprzewodowych"</string>
- <string name="location_neighborhood_level">"Położenie określane jest za pomocą Wi-Fi i/lub sieci komórkowych."</string>
+ <string name="location_neighborhood_level">"Położenie określane jest za pomocą Wi-Fi i/lub sieci komórkowych"</string>
<string name="location_gps">"Użyj satelit GPS"</string>
<string name="location_street_level">"Ustalanie położenia z dokładnością do ulicy (wyłącz, aby oszczędzać baterię)"</string>
<string name="location_gps_disabled">"Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)"</string>
+ <string name="location_warning_title">"Zgoda na usługę lokalizacji"</string>
+ <string name="location_warning_message">"Zezwól usłudze lokalizacji Google na zbieranie anonimowych, zbiorczych danych o lokalizacji. Zbieranie danych będzie się odbywać bez względu na to, czy aktywne są aplikacje."</string>
+ <string name="agree">"Zgadzam się"</string>
+ <string name="disagree">"Nie zgadzam się"</string>
<string name="about_settings">"Informacje o telefonie"</string>
<string name="about_settings_summary">"Wyświetl informacje prawne, stan telefonu, wersję oprogramowania"</string>
<string name="legal_information">"Informacje prawne"</string>
@@ -498,6 +501,8 @@
<string name="copyright_title">"Prawa autorskie"</string>
<string name="license_title">"Licencja"</string>
<string name="terms_title">"Warunki i zasady korzystania"</string>
+ <string name="system_tutorial_list_item_title">"Samouczek systemu"</string>
+ <string name="system_tutorial_list_item_summary">"Dowiedz się, jak korzystać z telefonu"</string>
<string name="settings_license_activity_title">"Licencje open source"</string>
<string name="settings_license_activity_unavailable">"Wystąpił problem podczas ładowania licencji."</string>
<string name="settings_license_activity_loading">"Ładowanie..."</string>
@@ -529,7 +534,7 @@
<string name="skip_button_label">"Anuluj"</string>
<string name="next_button_label">"Dalej"</string>
<string name="lock_title">"Zabezpieczanie telefonu"</string>
- <string name="lock_intro_message"><font size="17">"Chroń swój telefon przed nieuprawnionym użyciem przez stworzenie osobistego wzoru odblokowania ekranu. "\n<font height="17">\n</font><b>"1"</b>" Obejrzyj rysowanie przykładowego wzoru na następnym ekranie. "\n<font height="17">\n</font><b>"2"</b>" Następnie narysuj swój własny wzór odblokowania. Eksperymentuj z różnymi wzorami, ale połącz co najmniej 4 punkty. "\n<font height="17">\n</font><b>"3"</b>" Narysuj swój wzór ponownie dla potwierdzenia. "\n<font height="17">\n</font><b>"Możemy zaczynać? Wybierz „Dalej”"</b>". "\n<font height="3">\n</font>"Aby zrezygnować z ustawiania blokady, wybierz „Anuluj”."</font></string>
+ <string name="lock_intro_message"><font size="17">"Chroń swój telefon przed nieuprawnionym użyciem przez utworzenie osobistego wzoru odblokowania ekranu. "\n<font height="17">\n</font><b>"1"</b>" Obejrzyj rysowanie przykładowego wzoru na następnym ekranie. "\n<font height="17">\n</font><b>"2"</b>" Następnie narysuj swój własny wzór odblokowania. Eksperymentuj z różnymi wzorami, ale połącz co najmniej 4 punkty. "\n<font height="17">\n</font><b>"3"</b>" Narysuj swój wzór ponownie dla potwierdzenia. "\n<font height="17">\n</font><b>"Możemy zaczynać? Wybierz „Dalej”"</b>". "\n<font height="3">\n</font>"Aby zrezygnować z ustawiania blokady, wybierz „Anuluj”."</font></string>
<string name="lock_example_title">"Przykładowy wzór"</string>
<string name="lock_example_message">"Połącz co najmniej cztery kropki."\n" "\n"Wybierz polecenie „Dalej”, aby narysować własny wzór."</string>
<string name="manageapplications_settings_title">"Zarządzaj aplikacjami"</string>
@@ -588,14 +593,13 @@
<string name="auto_replace">"Autokorekta"</string>
<string name="auto_replace_summary">"Poprawiaj błędnie wpisane słowa"</string>
<string name="auto_caps">"Wielka litera po kropce"</string>
- <string name="auto_caps_summary">"Zdanie zaczynaj wielką literą"</string>
+ <string name="auto_caps_summary">"Zaczynaj zdania wielką literą"</string>
<string name="auto_punctuate">"Łatwa interpunkcja"</string>
<string name="hardkeyboard_category">"Ustawienia klawiatury fizycznej"</string>
- <string name="auto_punctuate_summary">"Naciśnij klawisz spacji dwukrotnie, aby wstawić kropkę."</string>
+ <string name="auto_punctuate_summary">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
<string name="show_password">"Widoczne hasła"</string>
<string name="show_password_summary">"Pokazuj hasło podczas wpisywania"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste, takie jak hasła i numery kart kredytowych. Ta metoda pochodzi z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Włączyć tę metodę wprowadzania?"</string>
<string name="user_dict_settings_titlebar">"Słownik użytkownika"</string>
<string name="user_dict_settings_title">"Słownik użytkownika"</string>
<string name="user_dict_settings_summary">"Dodaj i usuń słowa w słowniku użytkownika"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cc6a901..283f640 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -338,8 +338,7 @@
<string name="sound_and_display_settings_summary">"Установка мелодий звонка, уведомлений, яркости экрана"</string>
<string name="silent_mode_title">"Беззвучный режим"</string>
<string name="silent_mode_summary">"Отключение всех звуков, кроме мультимедиа и будильников"</string>
- <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
- <skip />
+ <string name="silent_mode_incl_alarm_summary">"Все звуки, кроме аудио и видео, отключены"</string>
<string name="ringtone_title">"Мелодия звонка телефона"</string>
<string name="ringtone_summary">"Установить мелодию звонка для входящих вызовов по умолчанию"</string>
<string name="ring_volume_title">"Громкость звонка"</string>
@@ -491,6 +490,10 @@
<string name="location_gps">"Включить спутники GPS"</string>
<string name="location_street_level">"Определение местоположения с точностью до улицы (для экономии заряда батареи отмените выбор)"</string>
<string name="location_gps_disabled">"Находить меня до уровня улицы (требуется больше заряда батареи, а также прямая видимость неба)"</string>
+ <string name="location_warning_title">"Разрешение на отслеживание местоположения"</string>
+ <string name="location_warning_message">"Разрешить Google собирать данные о местоположении без идентификации личной информации. Данные будут собираться, даже если не будет запущено ни одного приложения."</string>
+ <string name="agree">"Принимаю"</string>
+ <string name="disagree">"Не принимаю"</string>
<string name="about_settings">"О телефоне"</string>
<string name="about_settings_summary">"Просмотреть юридические сведения, состояние телефона, версию ПО"</string>
<string name="legal_information">"Юридическая информация"</string>
@@ -498,6 +501,8 @@
<string name="copyright_title">"Авторские права"</string>
<string name="license_title">"Лицензия"</string>
<string name="terms_title">"Условия предоставления услуг"</string>
+ <string name="system_tutorial_list_item_title">"Руководство по работе с системой"</string>
+ <string name="system_tutorial_list_item_summary">"Узнайте, как пользоваться телефоном"</string>
<string name="settings_license_activity_title">"Лицензии Open Source"</string>
<string name="settings_license_activity_unavailable">"При загрузке лицензий произошла ошибка."</string>
<string name="settings_license_activity_loading">"Идет загрузка…"</string>
@@ -594,8 +599,7 @@
<string name="auto_punctuate_summary">"Чтобы вставить символ \".\", дважды нажмите пробел."</string>
<string name="show_password">"Показывать пароли"</string>
<string name="show_password_summary">"Показывать пароль при вводе"</string>
- <!-- no translation found for ime_security_warning (3458652708716006477) -->
- <skip />
+ <string name="ime_security_warning">"Возможно, при использовании этого метода будут собираться все вводимые данные, в том числе такие личные сведения, как пароли или номера кредитных карт. Метод обеспечивается программой <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Разрешить этот метод ввода?"</string>
<string name="user_dict_settings_titlebar">"Пользовательский словарь"</string>
<string name="user_dict_settings_title">"Пользовательский словарь"</string>
<string name="user_dict_settings_summary">"Добавить или удалить слова из пользовательского словаря"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 5b3b651..5f3ec45 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -55,15 +55,19 @@
<item>"插入后从不进入休眠状态"</item>
<item>"从不"</item>
</string-array>
- <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
- <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
- <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
- <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
- <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
- <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
- <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
- <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
- <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
+ <string-array name="battery_history_type_spinner">
+ <item>"CPU 使用率"</item>
+ <item>"网络使用率"</item>
+ <item>"GPS 使用率"</item>
+ <item>"传感器使用率"</item>
+ <item>"部分激活使用率"</item>
+ <item>"其他使用率"</item>
+ </string-array>
+ <string-array name="battery_history_which_spinner">
+ <item>"自上次拔出后"</item>
+ <item>"自启动以来的总时间"</item>
+ <item>"所有时间总计"</item>
+ </string-array>
<string-array name="usage_stats_display_order_types">
<item>"使用时间"</item>
<item>"启动次数"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3be275a..c4cb2dd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -491,6 +491,14 @@
<string name="location_gps">"启用 GPS 卫星设置"</string>
<string name="location_street_level">"定位时，精确到街道级别（取消选择可节约电量）"</string>
<string name="location_gps_disabled">"定位到街道级别（需要更多电量来观看天空）"</string>
+ <!-- no translation found for location_warning_title (788624242969337259) -->
+ <skip />
+ <!-- no translation found for location_warning_message (2455390825908728808) -->
+ <skip />
+ <!-- no translation found for agree (6288718671527758326) -->
+ <skip />
+ <!-- no translation found for disagree (6221069272309799230) -->
+ <skip />
<string name="about_settings">"关于手机"</string>
<string name="about_settings_summary">"查看法律信息、手机状态和软件版本"</string>
<string name="legal_information">"法律信息"</string>
@@ -498,6 +506,10 @@
<string name="copyright_title">"版权"</string>
<string name="license_title">"许可"</string>
<string name="terms_title">"条款"</string>
+ <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+ <skip />
+ <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+ <skip />
<string name="settings_license_activity_title">"开源许可"</string>
<string name="settings_license_activity_unavailable">"载入许可时出现问题。"</string>
<string name="settings_license_activity_loading">"正在载入..."</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 2ec9ed2..a399602 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -55,15 +55,19 @@
<item>"插入時絕不"</item>
<item>"從不"</item>
</string-array>
- <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
- <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
- <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
- <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
- <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
- <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
- <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
- <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
- <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
+ <string-array name="battery_history_type_spinner">
+ <item>"CPU 使用率"</item>
+ <item>"網路使用率"</item>
+ <item>"GPS 使用率"</item>
+ <item>"感應器使用率"</item>
+ <item>"部分喚醒使用率"</item>
+ <item>"其他使用率"</item>
+ </string-array>
+ <string-array name="battery_history_which_spinner">
+ <item>"自上次拔除插頭後的時間"</item>
+ <item>"開機後總時間"</item>
+ <item>"所有時間的總計"</item>
+ </string-array>
<string-array name="usage_stats_display_order_types">
<item>"使用時間"</item>
<item>"啟動計數"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b8ffcbc..1c94683 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -491,6 +491,14 @@
<string name="location_gps">"啟用 GPS 衛星接收器"</string>
<string name="location_street_level">"定位時，精準度設定為街道層級 (不選此項較省電)"</string>
<string name="location_gps_disabled">"切換到街道檢視 (需要更多電力及天候允許)"</string>
+ <!-- no translation found for location_warning_title (788624242969337259) -->
+ <skip />
+ <!-- no translation found for location_warning_message (2455390825908728808) -->
+ <skip />
+ <!-- no translation found for agree (6288718671527758326) -->
+ <skip />
+ <!-- no translation found for disagree (6221069272309799230) -->
+ <skip />
<string name="about_settings">"關於手機"</string>
<string name="about_settings_summary">"檢視法律資訊、手機狀態、軟體版本"</string>
<string name="legal_information">"法律資訊"</string>
@@ -498,6 +506,10 @@
<string name="copyright_title">"版權"</string>
<string name="license_title">"授權"</string>
<string name="terms_title">"條款及細則"</string>
+ <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+ <skip />
+ <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+ <skip />
<string name="settings_license_activity_title">"開啟原始授權"</string>
<string name="settings_license_activity_unavailable">"載入授權時發生問題"</string>
<string name="settings_license_activity_loading">"載入中..."</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b126ec1..7d1e380 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1078,6 +1078,14 @@
<string name="location_street_level">When locating, accurate to street level (deselect to conserve battery)</string>
<!-- Security & location settings screen, setting summary when Enable GPS satellites check box is clear -->
<string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string>
+ <!-- Title of warning dialog to user that location information will be logged -->
+ <string name="location_warning_title">Location consent</string>
+ <!-- Warning text to user that location information will be logged -->
+ <string name="location_warning_message">"Allow Google's location service to collect anonymous and aggregate location data. Collection will occur regardless of whether any applications are active."</string>
+ <!-- Agree button-->
+ <string name="agree">Agree</string>
+ <!-- Disagree button-->
+ <string name="disagree">Disagree</string>
<!-- About -->
<!-- Main settings screen, setting title for the user to go into the About phone screen -->
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 867bce3..6858fd3 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -18,7 +18,9 @@
import android.app.Activity;
+import android.app.AlertDialog;
import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.location.LocationManager;
@@ -38,7 +40,7 @@
* Gesture lock pattern settings.
*/
public class SecuritySettings extends PreferenceActivity
- implements SharedPreferences.OnSharedPreferenceChangeListener {
+ implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
// Lock Settings
@@ -63,6 +65,9 @@
private CheckBoxPreference mNetwork;
private CheckBoxPreference mGps;
private LocationManager mLocationManager;
+
+ // To track whether Agree was clicked in the Network location warning dialog
+ private boolean mOkClicked;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -79,7 +84,6 @@
mNetwork = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_NETWORK);
mGps = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_GPS);
- getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
updateToggles();
}
@@ -184,11 +188,46 @@
} else if (preference == mShowPassword) {
Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
mShowPassword.isChecked() ? 1 : 0);
+ } else if (preference == mNetwork) {
+ //normally called on the toggle click
+ if (mNetwork.isChecked()) {
+ // Show a warning to the user that location data will be shared
+ mOkClicked = false;
+ new AlertDialog.Builder(this).setMessage(
+ getResources().getString(R.string.location_warning_message))
+ .setTitle(R.string.location_warning_title)
+ .setIcon(android.R.drawable.ic_dialog_alert)
+ .setPositiveButton(R.string.agree, this)
+ .setNegativeButton(R.string.disagree, this)
+ .show()
+ .setOnDismissListener(this);
+ } else {
+ updateProviders();
+ }
+ } else if (preference == mGps) {
+ updateProviders();
}
-
+
return false;
}
+ public void onClick(DialogInterface dialog, int which) {
+ if (which == DialogInterface.BUTTON_POSITIVE) {
+ updateProviders();
+ mOkClicked = true;
+ } else {
+ // Reset the toggle
+ mNetwork.setChecked(false);
+ }
+ }
+
+ public void onDismiss(DialogInterface dialog) {
+ // Assuming that onClick gets called first
+ if (!mOkClicked) {
+ mNetwork.setChecked(false);
+ }
+ }
+
/*
* Creates toggles for each available location provider
*/
@@ -233,12 +272,6 @@
return allowedProviders;
}
- public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
- if (LOCATION_NETWORK.equals(key) || LOCATION_GPS.equals(key)) {
- updateProviders();
- }
- }
-
private boolean isToggled(Preference pref) {
return ((CheckBoxPreference) pref).isChecked();
}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
index 199a422..86b1d69 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
@@ -575,8 +575,9 @@
*/
private void fetchBtClass() {
mBtClass = mLocalManager.getBluetoothManager().getRemoteClass(mAddress);
- mProfiles.clear();
- LocalBluetoothProfileManager.fill(mBtClass, mProfiles);
+ if (mBtClass != BluetoothClass.ERROR) {
+ LocalBluetoothProfileManager.fill(mBtClass, mProfiles);
+ }
}
/**