diff --git a/C1Parts/res/values-fr/arrays.xml b/C1Parts/res/values-fr/arrays.xml
new file mode 100644
index 0000000..c9d223c
--- /dev/null
+++ b/C1Parts/res/values-fr/arrays.xml
@@ -0,0 +1,60 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+   <string-array name="mdnie_ui_entries">
+	<item>IU (Défaut)</item>
+	<item>Vidéo</item>
+	<item>Vidéo Chaud</item>
+	<item>Vidéo Froid</item>
+	<item>Caméra</item>
+	<item>Navigation</item>
+	<item>Galerie</item>
+    </string-array>
+
+    <!-- skipping untranslatable /resources:0/string-array:name=mdnie_ui_entries_values -->
+
+   <string-array name="mdnie_user_entries">
+	<item>Standard (Défaut)</item>
+	<item>Dynamique</item>
+	<item>Film</item>
+    </string-array>
+
+    <!-- skipping untranslatable /resources:0/string-array:name=mdnie_user_entries_values -->
+
+    <string-array name="backlight_timeout_entries">
+	<item>Toujours allumé</item>
+	<item>2 secondes</item>
+	<item>5 secondes</item>
+	<item>10 secondes</item>
+	<item>15 secondes</item>
+	<item>Toujours éteint</item>
+    </string-array>
+
+    <!-- skipping untranslatable /resources:0/string-array:name=backlight_timeout_entries_values -->
+
+    <string-array name="notification_timeout_entries">
+	<item>Jamais</item>
+	<item>5 minutes</item>
+	<item>10 minutes</item>
+	<item>15 minutes</item>
+	<item>30 minutes</item>
+	<item>60 minutes</item>
+    </string-array>
+
+    <!-- skipping untranslatable /resources:0/string-array:name=notification_timeout_entries_values -->
+
+    <string-array name="notification_enabled_entries">
+	<item>Activé</item>
+	<item>Désactivé</item>
+    </string-array>
+
+    <!-- skipping untranslatable /resources:0/string-array:name=notification_enabled_entries_values -->
+
+    <string-array name="hspa_entries">
+	<item>UMTS Seulement</item>
+	<item>HSDPA Seulement</item>
+	<item>HSDPA + HSUPA</item>
+    </string-array>
+
+    <!-- skipping untranslatable /resources:0/string-array:name=hspa_entries_values -->
+
+</resources>
diff --git a/C1Parts/res/values-fr/strings.xml b/C1Parts/res/values-fr/strings.xml
new file mode 100644
index 0000000..c11aa13
--- /dev/null
+++ b/C1Parts/res/values-fr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Paramètres Galaxy SII</string>
+
+    <string name="category_mdnie_title">Paramètres de l\'écran</string>
+    <string name="mdnie_ui_title_head">Couleur</string>
+    <string name="mdnie_ui_summary_head">Choix du mode de couleur mDNIe</string>
+    <string name="mdnie_user_title_head">Netteté</string>
+    <string name="mdnie_user_summary_head">Choix du mode de netteté mDNIe</string>
+
+    <string name="category_touchkey_title">Touches Tactiles</string>
+    <string name="backlight_timeout_title_head">Délai Rétroéclairage</string>
+    <string name="backlight_timeout_summary_head">Délai de rétroéclairage des touches tactiles avant extinction</string>
+
+    <string name="category_notify_title">Notifications par LED</string>
+    <string name="notification_enabled_title_head">Notifications</string>
+    <string name="notification_enabled_summary_head">Activer le support des notifications par LED dans le noyau.  Note: Une notification active empêche le téléphone de rentrer en veille profonde</string>
+    <string name="notification_timeout_title_head">Délai Notification</string>
+    <string name="notification_timeout_summary_head">Délai de l\'indicateur de notification avant extinction</string>
+
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Activer HSDPA/HSUPA</string>
+</resources>
diff --git a/common.mk b/common.mk
index 8a04b02..5b169ff 100644
--- a/common.mk
+++ b/common.mk
@@ -50,7 +50,7 @@ PRODUCT_PACKAGES := \
 	libexifa \
 	libjpega \
 	com.android.future.usb.accessory \
-        bdaddr_read
+	bdaddr_read
 
 # These are the hardware-specific configuration files
 PRODUCT_COPY_FILES := \
@@ -67,7 +67,8 @@ PRODUCT_COPY_FILES += \
 	device/samsung/c1-common/lpm.rc:root/lpm.rc \
 	device/samsung/c1-common/init.smdkc210.rc:root/init.smdkc210.rc \
 	device/samsung/c1-common/init.smdkv310.rc:root/init.smdkv310.rc \
-	device/samsung/c1-common/ueventd.smdkv310.rc:root/ueventd.smdkv310.rc
+	device/samsung/c1-common/ueventd.smdkv310.rc:root/ueventd.smdkv310.rc \
+	device/samsung/c1-common/etc/init.d/10soundbooster:system/etc/init.d/10soundbooster
 
 # mDNIe
 PRODUCT_COPY_FILES += \
@@ -90,6 +91,7 @@ PRODUCT_COPY_FILES += \
 
 # Configuration files for audio
 PRODUCT_COPY_FILES += \
+	device/samsung/c1-common/etc/audio/soundbooster.txt:system/etc/audio/soundbooster.txt \
 	device/samsung/c1-common/etc/audio/LVVEFS_Rx_Configuration.txt:system/etc/audio/LVVEFS_Rx_Configuration.txt \
 	device/samsung/c1-common/etc/audio/LVVEFS_Tx_Configuration.txt:system/etc/audio/LVVEFS_Tx_Configuration.txt \
 	device/samsung/c1-common/etc/audio/Rx_ControlParams_EARPIECE_WIDEBAND.txt:system/etc/audio/Rx_ControlParams_EARPIECE_WIDEBAND.txt \
diff --git a/etc/audio/soundbooster.txt b/etc/audio/soundbooster.txt
new file mode 100644
index 0000000..42a6ad9
--- /dev/null
+++ b/etc/audio/soundbooster.txt
@@ -0,0 +1,4 @@
+H,0
+G,6
+C,2
+S,2
diff --git a/etc/init.d/10soundbooster b/etc/init.d/10soundbooster
new file mode 100644
index 0000000..1522582
--- /dev/null
+++ b/etc/init.d/10soundbooster
@@ -0,0 +1,7 @@
+#!/system/bin/sh
+# copy soundbooster config if not exists
+
+if [ ! -e /data/soundbooster.txt ];
+then
+    cp /system/etc/audio/soundbooster.txt /data/soundbooster.txt
+fi;
diff --git a/releasetools/c1_edify_generator.py b/releasetools/c1_edify_generator.py
index a2ccc30..95bdf48 100755
--- a/releasetools/c1_edify_generator.py
+++ b/releasetools/c1_edify_generator.py
@@ -35,3 +35,12 @@ class EdifyGenerator(edify_generator.EdifyGenerator):
             ('assert(package_extract_file("%(image)s", "/tmp/%(image)s"),\n'
              '       write_raw_image("/tmp/%(image)s", "%(partition)s"),\n'
              '       delete("/tmp/%(image)s"));') % args)
+
+    def Unmount(self, mount_point):
+      """Unmount the partition with the given mount_point."""
+      fstab = self.info.get("fstab", None)
+      if fstab:
+        p = fstab[mount_point]
+        self.script.append('unmount("%s");' %
+								(p.mount_point))
+        self.mounts.add(p.mount_point)
diff --git a/releasetools/c1_ota_from_target_files b/releasetools/c1_ota_from_target_files
index bb6b61b..358b3b2 100755
--- a/releasetools/c1_ota_from_target_files
+++ b/releasetools/c1_ota_from_target_files
@@ -68,6 +68,7 @@ def WriteFullOTAPackage(input_zip, output_zip):
   if OPTIONS.wipe_user_data:
     script.FormatPartition("/data")
 
+  script.Unmount("/system")
   script.FormatPartition("/system")
   script.Mount("/system")
   script.UnpackPackageDir("recovery", "/system")