n7000: Sync DeviceSettings with merged galaxys2

I was a bit too lazy about translation patches...

Copy the whole thing over from GS2 and rename
to GalaxyNoteSettings.

Change-Id: Ia6ca5cbf474edecb4a77e5bb77b847829910a4a1

19 files changed, 337 insertions, 150 deletions

diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml
index 6f5dda7..3b7cd82 100644
--- a/DeviceSettings/res/values-de/arrays.xml
+++ b/DeviceSettings/res/values-de/arrays.xml
@@ -2,30 +2,30 @@
 
     <string-array name="mdnie_scenario_entries">
         <item>Kamera (Standard)</item>
-	    <item>Video</item>
-	    <item>Video warm</item>
-	    <item>Video kalt</item>
-	    <item>UI</item>
-	    <item>Navigation</item>
-	    <item>Gallerie</item>
+        <item>Video</item>
+        <item>Video warm</item>
+        <item>Video kalt</item>
+        <item>UI</item>
+        <item>Navigation</item>
+        <item>Gallerie</item>
         <item>VT</item>
     </string-array>
 
     <string-array name="mdnie_mode_entries">
-	    <item>Standard</item>
-	    <item>Dynamisch</item>
+        <item>Standard</item>
+        <item>Dynamisch</item>
         <item>Natürlich</item>
-	    <item>Film</item>
+        <item>Film</item>
     </string-array>
 
     <string-array name="mdnie_negative_entries">
-	    <item>Normal</item>
-	    <item>Invertiert</item>
+        <item>Normal</item>
+        <item>Invertiert</item>
     </string-array>
 
     <string-array name="mdnie_outdoor_entries">
-	    <item>Deaktiviert</item>
-	    <item>Aktiviert</item>
+        <item>Deaktiviert</item>
+        <item>Aktiviert</item>
     </string-array>
 
     <string-array name="panel_gamma_entries">
@@ -51,9 +51,9 @@
     </string-array>
 
     <string-array name="hspa_entries">
-	    <item>Nur UMTS</item>
-	    <item>Nur HSDPA</item>
-	    <item>HSDPA + HSUPA</item>
+        <item>Nur UMTS</item>
+        <item>Nur HSDPA</item>
+        <item>HSDPA + HSUPA</item>
     </string-array>
 
 </resources>
diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml
index 4d0589e..1528f8e 100644
--- a/DeviceSettings/res/values-de/strings.xml
+++ b/DeviceSettings/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Galaxy Note Einstellungen</string>
+    <string name="app_name">Galaxy S II Einstellungen</string>
 
     <string name="screen_colors_title">Farben</string>
     <string name="category_mdnie_title">Bildschirm</string>
diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml
index 3bc45b7..8cf4fd9 100644
--- a/DeviceSettings/res/values-es/arrays.xml
+++ b/DeviceSettings/res/values-es/arrays.xml
@@ -2,7 +2,7 @@
 
     <string-array name="hspa_entries">
         <item>Solo UMTS</item>
-        <item>solo HSDPA</item>
+        <item>Solo HSDPA</item>
         <item>HSDPA + HSUPA</item>
     </string-array>
 
@@ -48,4 +48,11 @@
         <item>100</item>
     </string-array>
 
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (Predeterminado)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
 </resources>
diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml
index 95d05ca..44d2a69 100644
--- a/DeviceSettings/res/values-es/strings.xml
+++ b/DeviceSettings/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Ajustes de Galaxy Note</string>
+    <string name="app_name">Ajustes de Galaxy S II</string>
 
     <string name="category_radio_title">Radio</string>
     <string name="hspa_title_head">HSPA</string>
@@ -27,8 +27,13 @@
     <string name="use_gyro_calibration_title_head">Usar datos de calibración</string>
     <string name="use_gyro_calibration_summary_head">Usar los datos de calibración del giroscopio. ¡Calibrar despues de activar!</string>
     <string name="calibrate_gyro_title_head">Calibrar</string>
-    <string name="calibrate_gyro_summary_head">Poner el dispositivo de una superficie plana y pulsar para calibrar</string>
+    <string name="calibrate_gyro_summary_head">Colocar el dispositivo en una superficie plana y pulsar para calibrar</string>
     <string name="touchkey_subcat_title">Botones Táctiles</string>
     <string name="touchkey_light_title_head">Activar iluminación</string>
     <string name="touchkey_light_summary_head">Iluminar los botones táctiles al encender la pantalla</string> 
+
+    <string name="category_haptic_title">Háptica</string>
+    <string name="vibrator_subcat_title">Vibración</string>
+    <string name="vibrator_intensity_title_head">Intensidad de vibración</string>
+    <string name="vibrator_intensity_summary_head">Establecer la intensidad de la vibración</string>
 </resources>
diff --git a/DeviceSettings/res/values-fi/arrays.xml b/DeviceSettings/res/values-fi/arrays.xml
index eeebd7a..aaa4d82 100644
--- a/DeviceSettings/res/values-fi/arrays.xml
+++ b/DeviceSettings/res/values-fi/arrays.xml
@@ -48,4 +48,13 @@
         <item>HSDPA + HSUPA</item>
     </string-array>
 
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (Oletus)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+
 </resources>
diff --git a/DeviceSettings/res/values-fi/strings.xml b/DeviceSettings/res/values-fi/strings.xml
index 188371d..88e234a 100644
--- a/DeviceSettings/res/values-fi/strings.xml
+++ b/DeviceSettings/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Galaxy Note-asetukset</string>
+    <string name="app_name">Galaxy S II-asetukset</string>
 
     <string name="screen_colors_title">Värit</string>
     <string name="category_mdnie_title">Näyttö</string>
@@ -29,6 +29,11 @@
     <string name="touchkey_light_title_head">Ota näppäinvalot käyttöön</string>
     <string name="touchkey_light_summary_head">Valot syttyvät kun näyttö on päällä</string>
 
+    <string name="category_haptic_title">Haptinen</string>
+    <string name="vibrator_subcat_title">Värinä</string>
+    <string name="vibrator_intensity_title_head">Värinän voimakkuus</string>
+    <string name="vibrator_intensity_summary_head">Säädä värinän voimakkuutta</string>
+
     <string name="category_radio_title">Radio</string>
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">Ota HSDPA/HSUPA käyttöön</string>
diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml
index 124f531..d421873 100644
--- a/DeviceSettings/res/values-fr/arrays.xml
+++ b/DeviceSettings/res/values-fr/arrays.xml
@@ -1,36 +1,36 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-   <string-array name="mdnie_scenario_entries">
-	<item>Caméra (Par défaut)</item>
-	<item>Vidéo</item>
-	<item>Vidéo (chaud)</item>
-	<item>Video (froid)</item>
-	<item>UI</item>
-	<item>Navigation</item>
-	<item>Gallerie</item>
-    <item>VT</item>
+    <string-array name="mdnie_scenario_entries">
+        <item>Caméra (Par défaut)</item>
+        <item>Vidéo</item>
+        <item>Vidéo (chaud)</item>
+        <item>Video (froid)</item>
+        <item>UI</item>
+        <item>Navigation</item>
+        <item>Gallerie</item>
+        <item>VT</item>
     </string-array>
 
-   <string-array name="mdnie_mode_entries">
-	<item>Standard (Par défaut)</item>
-	<item>Dynamique</item>
-    <item>Naturel</item>
-	<item>Vidéo</item>
+    <string-array name="mdnie_mode_entries">
+        <item>Standard (Par défaut)</item>
+        <item>Dynamique</item>
+        <item>Naturel</item>
+        <item>Vidéo</item>
     </string-array>
 
-   <string-array name="mdnie_negative_entries">
-	<item>Normal</item>
-	<item>Inversé</item>
+    <string-array name="mdnie_negative_entries">
+        <item>Normal</item>
+        <item>Inversé</item>
     </string-array>
 
-   <string-array name="mdnie_outdoor_entries">
-	<item>Inactif (Par défaut)</item>
-	<item>Actif</item>
+    <string-array name="mdnie_outdoor_entries">
+        <item>Inactif (Par défaut)</item>
+        <item>Actif</item>
     </string-array>
 
     <string-array name="panel_gamma_entries">
-    <item>2.2 (Par défaut)</item>
-    <item>1.9</item>
+        <item>2.2 (Par défaut)</item>
+        <item>1.9</item>
     </string-array>
 
     <string-array name="touchscreen_sensitivity_entries">
@@ -43,9 +43,9 @@
     </string-array>
         
     <string-array name="hspa_entries">
-	<item>UMTS seulement</item>
-	<item>HSDPA seulement</item>
-	<item>HSDPA + HSUPA</item>
+        <item>UMTS seulement</item>
+        <item>HSDPA seulement</item>
+        <item>HSDPA + HSUPA</item>
     </string-array>
 
 </resources>
diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml
index c11f8cf..25dd5ad 100644
--- a/DeviceSettings/res/values-fr/strings.xml
+++ b/DeviceSettings/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Paramètres GalaxyNote</string>
+    <string name="app_name">Paramètres Galaxy S II</string>
 
     <string name="category_mdnie_title">Ecran</string>
     <string name="screen_colors_title">Couleurs</string>
diff --git a/DeviceSettings/res/values-hu/arrays.xml b/DeviceSettings/res/values-hu/arrays.xml
index ab52e04..ee1f831 100644
--- a/DeviceSettings/res/values-hu/arrays.xml
+++ b/DeviceSettings/res/values-hu/arrays.xml
@@ -1,51 +1,51 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-  <string-array name="mdnie_scenario_entries">
-    <item>Kamera (Alapbeállítás)</item>
-    <item>Videó</item>
-    <item>Videó (Meleg árnyalat)</item>
-    <item>Videó (Hideg árnyalat)</item>
-    <item>Felhasználói felület</item>
-    <item>Navigáció</item>
-    <item>Galéria</item>
-    <item>VT</item>
-  </string-array>
-
-  <string-array name="mdnie_mode_entries">
-    <item>Hagyományos (Alapbeállítás)</item>
-    <item>Dinamikus</item>
-    <item>Természetes</item>
-    <item>Film</item>
-  </string-array>
-
-  <string-array name="mdnie_negative_entries">
-    <item>Hagyományos</item>
-    <item>Fordított</item>
-  </string-array>
-
-  <string-array name="mdnie_outdoor_entries">
-    <item>Kikapcsolva (Alapbeállítás)</item>
-    <item>Bekapcsolva</item>
-  </string-array>
-
-  <string-array name="panel_gamma_entries">
-    <item>2.2 (Alapbeállítás)</item>
-    <item>1.9</item>
-  </string-array>
-
-  <string-array name="touchscreen_sensitivity_entries">
-    <item>10</item>
-    <item>20</item>
-    <item>30</item>
-    <item>50 (Alapbeállítás)</item>
-    <item>70</item>
-    <item>100</item>
-  </string-array>
-
-  <string-array name="hspa_entries">
-    <item>UMTS</item>
-    <item>HSDPA</item>
-    <item>HSDPA + HSUPA</item>
-  </string-array>
+    <string-array name="mdnie_scenario_entries">
+        <item>Kamera (Alapbeállítás)</item>
+        <item>Videó</item>
+        <item>Videó (Meleg árnyalat)</item>
+        <item>Videó (Hideg árnyalat)</item>
+        <item>Felhasználói felület</item>
+        <item>Navigáció</item>
+        <item>Galéria</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Hagyományos (Alapbeállítás)</item>
+        <item>Dinamikus</item>
+        <item>Természetes</item>
+        <item>Film</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries">
+        <item>Hagyományos</item>
+        <item>Fordított</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries">
+        <item>Kikapcsolva (Alapbeállítás)</item>
+        <item>Bekapcsolva</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (Alapbeállítás)</item>
+        <item>1.9</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (Alapbeállítás)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <string-array name="hspa_entries">
+        <item>UMTS</item>
+        <item>HSDPA</item>
+        <item>HSDPA + HSUPA</item>
+    </string-array>
 
 </resources>
diff --git a/DeviceSettings/res/values-hu/strings.xml b/DeviceSettings/res/values-hu/strings.xml
index 54197e0..d6a5f8c 100644
--- a/DeviceSettings/res/values-hu/strings.xml
+++ b/DeviceSettings/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Galaxy Note Beállítások</string>
+    <string name="app_name">Galaxy S II Beállítások</string>
 
     <string name="screen_colors_title">Színek</string>
     <string name="category_mdnie_title">Kijelző</string>
@@ -17,18 +17,23 @@
 
     <string name="touchscreen_subcat_title">Érintőképernyő</string>
     <string name="touchscreen_sensitivity_title_head">Érzékenység</string>
-    <string name="touchscreen_sensitivity_summary_head">Állítsd be az érintőképernyő érzékenységét</string>
+    <string name="touchscreen_sensitivity_summary_head">Érintőképernyő érzékenységének beállítása</string>
 
     <string name="category_sensors_title">Szenzorok</string>
     <string name="gyro_subcat_title">Giroszkóp</string>
-    <string name="use_gyro_calibration_title_head">Használd a kalibrálási értékeket</string>
-    <string name="use_gyro_calibration_summary_head">Használd a kalibrálási értékeket. Készíts kalibrációt ha ezt bepipálod!</string>
+    <string name="use_gyro_calibration_title_head">Kalibrálási érték használata</string>
+    <string name="use_gyro_calibration_summary_head">Kalibrálási érték használata. Érdemes újra kalibrálni, ha ez a funkció használatban van!</string>
     <string name="calibrate_gyro_title_head">Kalibrálás</string>
-    <string name="calibrate_gyro_summary_head">Tedd a telefont egy vízszintes felületre, és nyomd meg ezt a gombot a kalibráláshoz</string>
+    <string name="calibrate_gyro_summary_head">Kalibráláshoz a telefont vízszintes felületre kell helyezni, és megérinteni ezt a gombot</string>
     <string name="touchkey_subcat_title">Érintőgombok</string>
     <string name="touchkey_light_title_head">Érintőgombok háttérvilágítása</string>
     <string name="touchkey_light_summary_head">Bekapcsolja az érintőgombok háttérvilágítását bekapcsolt képernyőnél</string>
 
+    <string name="category_haptic_title">Érintési visszajelzés</string>
+    <string name="vibrator_subcat_title">Rezgés</string>
+    <string name="vibrator_intensity_title_head">Rezgés erőssége</string>
+    <string name="vibrator_intensity_summary_head">Rezgés erősségének beállítása</string>
+
     <string name="category_radio_title">GSM rádió</string>
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">HSDPA/HSUPA engedélyezése</string>
diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml
new file mode 100644
index 0000000..ab28dc7
--- /dev/null
+++ b/DeviceSettings/res/values-nl/arrays.xml
@@ -0,0 +1,50 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="mdnie_scenario_entries">
+        <item>Camera (standaard)</item>
+        <item>Video</item>
+        <item>Video (warm)</item>
+        <item>Video (koud)</item>
+        <item>Uiterlijk</item>
+        <item>Navigatie</item>
+        <item>Galerij</item>
+        <item>VT</item>
+    </string-array>
+    <string-array name="mdnie_mode_entries">
+        <item>Standaard</item>
+        <item>Dynamisch</item>
+        <item>Natuurlijk</item>
+        <item>Film</item>
+    </string-array>
+    <string-array name="mdnie_negative_entries">
+        <item>Normaal</item>
+        <item>Omgedraaid</item>
+    </string-array>
+    <string-array name="mdnie_outdoor_entries">
+        <item>Uit (standaard)</item>
+        <item>Aan</item>
+    </string-array>
+    <string-array name="panel_gamma_entries">
+        <item>2,2 (standaard)</item>
+        <item>1,9</item>
+    </string-array>
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (standaard)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (standaard)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+    <string-array name="hspa_entries">
+        <item>Alleen UMTS</item>
+        <item>Alleen HSDPA</item>
+        <item>HSDPA &amp; HSUPA</item>
+    </string-array>
+</resources>
diff --git a/DeviceSettings/res/values-nl/strings.xml b/DeviceSettings/res/values-nl/strings.xml
new file mode 100644
index 0000000..bd7e50b
--- /dev/null
+++ b/DeviceSettings/res/values-nl/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Galaxy S II-instellingen</string>
+
+    <string name="screen_colors_title">Kleuren</string>
+    <string name="category_mdnie_title">Scherm</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">mDNIe-scenario instellen</string>
+    <string name="mdnie_mode_title_head">Modus</string>
+    <string name="mdnie_mode_summary_head">mDNIe-modus instellen</string>
+    <string name="mdnie_negative_title_head">Negatieve modus</string>
+    <string name="mdnie_negative_summary_head">Negatieve kleuren in-/uitschakelen</string>
+    <string name="mdnie_outdoor_title_head">Buitenmodus</string>
+    <string name="mdnie_outdoor_summary_head">Buitenmodus in-/uitschakelen</string>
+    <string name="panel_gamma_title_head">Schermgamma</string>
+    <string name="panel_gamma_summary_head">Schermgammawaarden instellen</string>
+
+    <string name="touchscreen_subcat_title">Aanraakscherm</string>
+    <string name="touchscreen_sensitivity_title_head">Aanraakgevoeligheid</string>
+    <string name="touchscreen_sensitivity_summary_head">Gevoeligheid aanraakscherm instellen</string>
+
+    <string name="category_sensors_title">Sensoren</string>
+    <string name="gyro_subcat_title">Gyroscoop</string>
+    <string name="use_gyro_calibration_title_head">Kalibratiegegevens gebruiken</string>
+    <string name="use_gyro_calibration_summary_head">Gebruik de kalibratiewaarden van de gyroscoop. Gelieve hierna een kalibratie te doen.</string>
+    <string name="calibrate_gyro_title_head">Kalibreren</string>
+    <string name="calibrate_gyro_summary_head">Plaats de telefoon op een vlakke ondergrond en tik hier om te kalibreren</string>
+    <string name="touchkey_subcat_title">Aanraakknop</string>
+    <string name="touchkey_light_title_head">Achtergrondlicht bij knoppen inschakelen</string>
+    <string name="touchkey_light_summary_head">Aanraakknoppen oplichten indien scherm aan is</string>
+
+    <string name="category_haptic_title">Haptisch</string>
+    <string name="vibrator_subcat_title">Trillen</string>
+    <string name="vibrator_intensity_title_head">Trilintensiteit</string>
+    <string name="vibrator_intensity_summary_head">Trilintensiteit instellen</string>
+
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">HSDPA/HSUPA inschakelen</string>
+</resources>
diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml
index 75c3ac5..e98a6c6 100755
--- a/DeviceSettings/res/values-pt-rBR/arrays.xml
+++ b/DeviceSettings/res/values-pt-rBR/arrays.xml
@@ -48,4 +48,4 @@
         <item>HSDPA + HSUPA</item>

     </string-array>

 

-</resources>
\ No newline at end of file
+</resources>

diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml
index 5208649..fad81b2 100755
--- a/DeviceSettings/res/values-pt-rBR/strings.xml
+++ b/DeviceSettings/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Config. Galaxy Note</string>
+    <string name="app_name">Config. Galaxy S II</string>
     <string name="screen_colors_title">Cores</string>
     <string name="category_mdnie_title">Tela</string>
     <string name="mdnie_scenario_title_head">Cenário</string>
@@ -12,10 +12,10 @@
     <string name="mdnie_outdoor_title_head">Modo Ao Ar Livre</string>
     <string name="mdnie_outdoor_summary_head">Ativar/Desativar modo ao ar livre</string>
     <string name="panel_gamma_title_head">Gama da Tela</string>
-    <string name="panel_gamma_summary_head">Define valor da gama da tela</string>
+    <string name="panel_gamma_summary_head">Definir valor da gama da tela</string>
     <string name="touchscreen_subcat_title">Tela sensível ao toque</string>
     <string name="touchscreen_sensitivity_title_head">Sensitividade do toque</string>
-    <string name="touchscreen_sensitivity_summary_head">Definir a sensitividade do toque na tela</string>
+    <string name="touchscreen_sensitivity_summary_head">Define a sensitividade do toque na tela</string>
     <string name="category_sensors_title">Sensores</string>
     <string name="gyro_subcat_title">Giroscópio</string>
     <string name="use_gyro_calibration_title_head">Usar dados de calibração</string>
@@ -24,12 +24,12 @@
     <string name="calibrate_gyro_summary_head">Coloque seu telefone em uma superfície plana, e pressione isto para calibrar</string>
     <string name="touchkey_subcat_title">Tecla sensível ao toque</string>
     <string name="touchkey_light_title_head">Ativar luz de fundo das teclas</string>
-    <string name="touchkey_light_summary_head">Acende as teclas sensíveis ao toque quando a tela estiver ligada</string>
+    <string name="touchkey_light_summary_head">Acender as teclas sensíveis ao toque quando a tela estiver ligada</string>
     <string name="category_radio_title">Rádio</string>
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">Ativar HSDPA/HSUPA</string>
     <string name="category_haptic_title">Resposta Tátil</string>
     <string name="vibrator_subcat_title">Vibração</string>
-    <string name="vibrator_intensity_title_head">Intesidade da Vibração</string>
+    <string name="vibrator_intensity_title_head">Intensidade da Vibração</string>
     <string name="vibrator_intensity_summary_head">Define a intensidade da vibração</string>
 </resources>
\ No newline at end of file
diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml
index e75ee6e..a86899a 100644
--- a/DeviceSettings/res/values/arrays.xml
+++ b/DeviceSettings/res/values/arrays.xml
@@ -1,59 +1,59 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-	    <item>Camera (Default)</item>
-	    <item>Video</item>
-	    <item>Video Warm</item>
-	    <item>Video Cold</item>
-	    <item>UI</item>
-	    <item>Navigation</item>
-	    <item>Gallery</item>
+        <item>Camera (Default)</item>
+        <item>Video</item>
+        <item>Video Warm</item>
+        <item>Video Cold</item>
+        <item>UI</item>
+        <item>Navigation</item>
+        <item>Gallery</item>
         <item>VT</item>
     </string-array>
 
     <string-array name="mdnie_scenario_entries_values" translatable="false">
-	    <item>4</item>
-	    <item>1</item>
-	    <item>2</item>
-	    <item>3</item>
-	    <item>0</item>
-	    <item>5</item>
-	    <item>6</item>
+        <item>4</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>0</item>
+        <item>5</item>
+        <item>6</item>
         <item>7</item>
     </string-array>
 
     <string-array name="mdnie_mode_entries">
-	    <item>Standard (Default)</item>
-	    <item>Dynamic</item>
+        <item>Standard (Default)</item>
+        <item>Dynamic</item>
         <item>Natural</item>
-	    <item>Movie</item>
+        <item>Movie</item>
     </string-array>
 
     <string-array name="mdnie_mode_entries_values" translatable="false">
-	    <item>1</item>
-	    <item>0</item>
+        <item>1</item>
+        <item>0</item>
         <item>2</item>
-	    <item>3</item>
+        <item>3</item>
     </string-array>
 
     <string-array name="mdnie_negative_entries">
-	    <item>Normal</item>
-	    <item>Inverted</item>
+        <item>Normal</item>
+        <item>Inverted</item>
     </string-array>
 
     <string-array name="mdnie_negative_entries_values" translatable="false">
         <item>0</item>
-	    <item>1</item>
+        <item>1</item>
     </string-array>
 
     <string-array name="mdnie_outdoor_entries">
-	    <item>Off (Default)</item>
-	    <item>On</item>
+        <item>Off (Default)</item>
+        <item>On</item>
     </string-array>
 
     <string-array name="mdnie_outdoor_entries_values" translatable="false">
-	    <item>0</item>
-	    <item>1</item>
+        <item>0</item>
+        <item>1</item>
     </string-array>
 
     <string-array name="panel_gamma_entries">
@@ -101,13 +101,13 @@
     </string-array>
 
     <string-array name="hspa_entries">
-	    <item>UMTS Only</item>
-	    <item>HSDPA Only</item>
-	    <item>HSDPA + HSUPA</item>
+        <item>UMTS Only</item>
+        <item>HSDPA Only</item>
+        <item>HSDPA + HSUPA</item>
     </string-array>
 
     <string-array name="hspa_entries_values" translatable="false">
-	    <item>21</item>
+        <item>21</item>
         <item>22</item>
         <item>23</item>
     </string-array>
diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
index 5c38440..08ee90c 100644
--- a/DeviceSettings/res/values/strings.xml
+++ b/DeviceSettings/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Galaxy Note Settings</string>
+    <string name="app_name">Galaxy S II Settings</string>
 
     <string name="screen_colors_title">Colors</string>
     <string name="category_mdnie_title">Screen</string>
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
index 015dd7b..bc42a95 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
@@ -80,14 +80,15 @@ public class SensorsFragmentActivity extends PreferenceFragment {
 
     public static void restore(Context context) {
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String gyroCalib = sharedPrefs.getString(DeviceSettings.KEY_USE_GYRO_CALIBRATION, "1");
+        boolean gyroCalib = sharedPrefs.getBoolean(DeviceSettings.KEY_USE_GYRO_CALIBRATION, true);
 
         // When use gyro calibration value is set to 1, calibration is done at the same time, which
         // means it is reset at each boot, providing wrong calibration most of the time at each reboot.
         // So we only set it to "0" if user wants it, as it defaults to 1 at boot
-        if (gyroCalib.compareTo("1") != 0)
-            Utils.writeValue(FILE_USE_GYRO_CALIB, gyroCalib);
+        if (!gyroCalib)
+            Utils.writeValue(FILE_USE_GYRO_CALIB, "0");
 
-        Utils.writeValue(FILE_TOUCHKEY_LIGHT, sharedPrefs.getString(DeviceSettings.KEY_TOUCHKEY_LIGHT, "1"));
+        boolean light = sharedPrefs.getBoolean(DeviceSettings.KEY_TOUCHKEY_LIGHT, true);
+        Utils.writeValue(FILE_TOUCHKEY_LIGHT, light);
     }
 }
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java b/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java
index 7566273..a3b5135 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java
@@ -31,6 +31,7 @@ public class Startup extends BroadcastReceiver {
         RadioFragmentActivity.restore(context);
         HapticFragmentActivity.restore(context);
         VibratorIntensity.restore(context);
+        SensorsFragmentActivity.restore(context);
     }
 
 }
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java b/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java
index 9d4176c..237ea0f 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java
@@ -16,32 +16,96 @@
 
 package com.cyanogenmod.settings.device;
 
+import android.util.Log;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.SyncFailedException;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Context;
 
 public class Utils {
 
+    private static final String TAG = "GalaxyNoteSettings_Utils";
+    private static final String TAG_READ = "GalaxyNoteSettings_Utils_Read";
+    private static final String TAG_WRITE = "GalaxyNoteSettings_Utils_Write";
+
     /**
      * Write a string value to the specified file.
-     * @param filename      The filename
-     * @param value         The value
+     * 
+     * @param filename The filename
+     * @param value The value
      */
     public static void writeValue(String filename, String value) {
+        FileOutputStream fos = null;
         try {
-            FileOutputStream fos = new FileOutputStream(new File(filename));
+            fos = new FileOutputStream(new File(filename), false);
             fos.write(value.getBytes());
             fos.flush();
-            fos.getFD().sync();
-            fos.close();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
+            // fos.getFD().sync();
+        } catch (FileNotFoundException ex) {
+            Log.w(TAG, "file " + filename + " not found: " + ex);
+        } catch (SyncFailedException ex) {
+            Log.w(TAG, "file " + filename + " sync failed: " + ex);
+        } catch (IOException ex) {
+            Log.w(TAG, "IOException trying to sync " + filename + ": " + ex);
+        } catch (RuntimeException ex) {
+            Log.w(TAG, "exception while syncing file: ", ex);
+        } finally {
+            if (fos != null) {
+                try {
+                    Log.w(TAG_WRITE, "file " + filename + ": " + value);
+                    fos.close();
+                } catch (IOException ex) {
+                    Log.w(TAG, "IOException while closing synced file: ", ex);
+                } catch (RuntimeException ex) {
+                    Log.w(TAG, "exception while closing file: ", ex);
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Write a string value to the specified file.
+     * 
+     * @param filename The filename
+     * @param value The value
+     */
+    public static void writeValue(String filename, Boolean value) {
+        FileOutputStream fos = null;
+        String sEnvia;
+        try {
+            fos = new FileOutputStream(new File(filename), false);
+            if (value)
+                sEnvia = "1";
+            else
+                sEnvia = "0";
+            fos.write(sEnvia.getBytes());
+            fos.flush();
+            // fos.getFD().sync();
+        } catch (FileNotFoundException ex) {
+            Log.w(TAG, "file " + filename + " not found: " + ex);
+        } catch (SyncFailedException ex) {
+            Log.w(TAG, "file " + filename + " sync failed: " + ex);
+        } catch (IOException ex) {
+            Log.w(TAG, "IOException trying to sync " + filename + ": " + ex);
+        } catch (RuntimeException ex) {
+            Log.w(TAG, "exception while syncing file: ", ex);
+        } finally {
+            if (fos != null) {
+                try {
+                    Log.w(TAG_WRITE, "file " + filename + ": " + value);
+                    fos.close();
+                } catch (IOException ex) {
+                    Log.w(TAG, "IOException while closing synced file: ", ex);
+                } catch (RuntimeException ex) {
+                    Log.w(TAG, "exception while closing file: ", ex);
+                }
+            }
         }
     }