diff --git a/.gradle/4.6/fileHashes/fileHashes.bin b/.gradle/4.6/fileHashes/fileHashes.bin
index a7fb765f..ec9ce92b 100644
Binary files a/.gradle/4.6/fileHashes/fileHashes.bin and b/.gradle/4.6/fileHashes/fileHashes.bin differ
diff --git a/.gradle/4.6/fileHashes/fileHashes.lock b/.gradle/4.6/fileHashes/fileHashes.lock
index 37e5a944..aa92bb61 100644
Binary files a/.gradle/4.6/fileHashes/fileHashes.lock and b/.gradle/4.6/fileHashes/fileHashes.lock differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626c..ae78c113 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,29 +1,113 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
+    <codeStyleSettings language="XML">
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 07ff2075..ce81f965 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,21 +6,17 @@
     </shared>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d3e5e63e-7eaa-4774-b12a-5187f17d8b03" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dfuLibrary/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/dfuLibrary/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dfuLibrary/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dfuLibrary/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
-    </list>
+    <list default="true" id="d3e5e63e-7eaa-4774-b12a-5187f17d8b03" name="Default Changelist" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DefaultGradleProjectSettings">
+    <option name="isMigrated" value="true" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="HA0Z9SDM" />
   <component name="ExternalProjectsManager">
     <system id="GRADLE">
       <state>
@@ -28,77 +24,18 @@
       </state>
     </system>
   </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="-760573567">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="7" />
-          <entry key="project.open.time.0" value="2" />
-          <entry key="project.open.time.3" value="1" />
-          <entry key="project.open.time.5" value="1" />
-          <entry key="project.open.time.6" value="2" />
-          <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="7" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="gradle" value="11" />
-          <entry key="java" value="7" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="4" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Groovy" value="11" />
-          <entry key="JAVA" value="7" />
-          <entry key="Properties" value="8" />
-          <entry key="XML" value="4" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="gradle" value="10" />
-          <entry key="java" value="1" />
-          <entry key="xml" value="10" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="Groovy" value="10" />
-          <entry key="JAVA" value="1" />
-          <entry key="XML" value="10" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gradle.properties">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/settings.gradle">
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
+        <entry file="file://$PROJECT_DIR$/dfuLibrary/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="5" column="77" selection-start-line="5" selection-start-column="77" selection-end-line="5" selection-end-column="77" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/.gradle/gradle.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="10" selection-start-line="10" selection-end-line="10" />
+            <state relative-caret-position="112">
+              <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -106,53 +43,52 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="7" column="52" selection-start-line="7" selection-start-column="52" selection-end-line="7" selection-end-column="52" />
+            <state relative-caret-position="112">
+              <caret line="7" column="51" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/build.gradle">
+        <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="54">
-              <caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
-            </state>
+            <state relative-caret-position="-5526" />
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-          <provider editor-type-id="android-manifest" />
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="342">
-              <caret line="19" selection-start-line="19" selection-end-line="19" />
-            </state>
-          </provider>
+        <entry file="android-dummy:///home/asthro/Projects/15-Code/android/microbit/app/Translations Editor">
+          <provider selected="true" editor-type-id="string-resource-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/samsung/microbit/presentation/IncomingSMSPresenter.java">
+        <entry file="file://$PROJECT_DIR$/app/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="27" column="73" selection-start-line="27" selection-start-column="73" selection-end-line="27" selection-end-column="73" />
+            <state relative-caret-position="131">
+              <caret line="24" column="5" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/samsung/microbit/service/IPCService.java">
+        <entry file="file://$PROJECT_DIR$/android-gif-drawable-1.1.13/build.gradle">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="558">
-              <caret line="52" selection-start-line="52" selection-end-line="52" />
+            <state relative-caret-position="238">
+              <caret line="19" selection-start-line="19" selection-end-line="19" />
             </state>
           </provider>
+          <provider editor-type-id="android-manifest" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/samsung/microbit/plugin/TelephonyPlugin.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
+            <state relative-caret-position="176">
               <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
             </state>
           </provider>
@@ -160,6 +96,13 @@
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="valueResourceFile" />
+      </list>
+    </option>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>SMS</find>
@@ -198,44 +141,132 @@
     <ConfirmationsSetting value="1" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane" />
-      <pane id="AndroidView">
+      <pane id="AndroidView" />
+      <pane id="Scope" />
+      <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="microbit" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+              <item name="outputs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+              <item name="outputs" type="462c0819:PsiDirectoryNode" />
+              <item name="logs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="release" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="microbit" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="manifests" type="f94875db:AndroidManifestsGroupNode" />
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="462c0819:PsiDirectoryNode" />
+              <item name="values" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="microbit" type="1abcf292:AndroidViewProjectNode" />
-              <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="462c0819:PsiDirectoryNode" />
+              <item name="xml" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+              <item name="intermediates" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microbit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microbit" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+              <item name="intermediates" type="462c0819:PsiDirectoryNode" />
+              <item name="lint-cache" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="ExportApk.ApkPath" value="$USER_HOME$/Documents/Micro-bit-apk-release" />
     <property name="ExportApk.BuildVariants" value="release" />
     <property name="ExportApk.SignV1" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="android.project.structure.last.selected" value="app" />
     <property name="android.project.structure.proportion" value="0.15" />
     <property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" />
     <property name="device.picker.selection" value="19586e0610037ece" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Documents/Micro-bit-apk-release" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../microbit_sam" />
     <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
     <property name="sync.plugin.last.upgrade.timestamp" value="1552049254439" />
   </component>
@@ -252,15 +283,6 @@
     </option>
   </component>
   <component name="RunManager">
-    <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="" />
@@ -286,6 +308,7 @@
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
     </configuration>
     <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
+      <option name="TEST_OBJECT" value="class" />
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
       <method v="2">
         <option name="Android.Gradle.BeforeRunTask" enabled="true" />
@@ -344,13 +367,20 @@
         <option name="Android.Gradle.BeforeRunTask" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="Applet">
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
+    <configuration default="true" type="TestNG">
+      <option name="TEST_OBJECT" value="CLASS" />
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
       <properties />
       <listeners />
@@ -373,10 +403,11 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="25" width="1920" height="1055" extended-state="6" />
+    <frame x="-2" y="-18" width="1370" height="788" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
-      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.20811099" />
+      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.24811463" />
       <window_info id="Structure" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info id="Build Variants" order="4" side_tool="true" />
@@ -400,17 +431,14 @@
       <window_info anchor="right" id="Palette&#9;" order="4" />
     </layout>
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/dfuLibrary/src/main/AndroidManifest.xml">
-      <provider editor-type-id="android-manifest" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="5" selection-start-line="5" selection-end-line="5" />
         </state>
       </provider>
+      <provider editor-type-id="android-manifest" />
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/samsung/microbit/core/bluetooth/BluetoothUtils.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -427,7 +455,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/dfuLibrary/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-22">
+        <state relative-caret-position="112">
           <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
         </state>
       </provider>
@@ -445,24 +473,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.gradle/gradle.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/.gradle/gradle.properties" />
     <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="7" column="52" selection-start-line="7" selection-start-column="52" selection-end-line="7" selection-end-column="52" />
+        <state relative-caret-position="112">
+          <caret line="7" column="51" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
+        <state relative-caret-position="131">
+          <caret line="24" column="5" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
         </state>
       </provider>
     </entry>
@@ -482,18 +504,26 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/samsung/microbit/plugin/TelephonyPlugin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
+        <state relative-caret-position="176">
           <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-      <provider editor-type-id="android-manifest" />
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
+        <state relative-caret-position="238">
           <caret line="19" selection-start-line="19" selection-end-line="19" />
         </state>
       </provider>
+      <provider editor-type-id="android-manifest" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5526" />
+      </provider>
+    </entry>
+    <entry file="android-dummy:///home/asthro/Projects/15-Code/android/microbit/app/Translations Editor">
+      <provider selected="true" editor-type-id="string-resource-editor" />
     </entry>
   </component>
   <component name="masterDetails">
diff --git a/android-gif-drawable-1.1.13/android-gif-drawable-1.1.13.iml b/android-gif-drawable-1.1.13/android-gif-drawable-1.1.13.iml
index 6297ecdc..6c193b2f 100644
--- a/android-gif-drawable-1.1.13/android-gif-drawable-1.1.13.iml
+++ b/android-gif-drawable-1.1.13/android-gif-drawable-1.1.13.iml
@@ -4,6 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":android-gif-drawable-1.1.13" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
diff --git a/app/app.iml b/app/app.iml
index 28b8a35f..5aec70b5 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -4,6 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 00000000..f45bef87
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,345 @@
+<resources>
+
+    <!-- Generated by Automatic String Resource Translation
+--><!--          https://asrt.gluege.boerde.de
+--><string name="app_name">micro: bit</string>
+    <string name="app_name_without_colon">microbit</string>
+    <string name="home_activity_name" />
+    <string name="poweredBy">Propulsé par \ r \ n SAMSUNG</string>
+    <string name="copyright">Copyright © 1995–2015 SAMSUNG</string>
+    <string name="developed_by">Développé par</string>
+
+
+    <string name="create_code_url" translatable="false">http://microbit.org/code</string>
+    <string name="discover_url" translatable="false">http://microbit.org/</string>
+    <string name="my_scripts_url" translatable="false">https://www.microbit.co.uk/app/</string>
+    <string name="privacy_policy_url" translatable="false">http://microbit.org/privacy</string>
+    <string name="terms_of_use_url" translatable="false">http://microbit.org/terms-of-use</string>
+    <string name="about_url" translatable="false">http://microbit.org/about</string>
+    <string name="feedback_email_address" translatable="false">rohit.ail@samsung.com</string>
+
+
+    <string name="user_agent" translatable="false">SamsungBrowser/microbit Profile/OTA-DFU1.0</string>
+
+    <string name="search_BLE_activity">Recherche micro: bit</string>
+    <string name="device_details">Détails de l\'appareil</string>
+    <string formatted="false" name="dummy_section_text">La section est juste une section factice.</string>
+    <string name="ble_not_supported">BLE n\'est pas pris en charge</string>
+    <string name="phase1_complete_ok">Phase 1 terminée. appuyez sur le bouton 1 suivi du bouton à l\'écran</string>
+    <string name="phase2_complete_ok">Phase 2 terminée. L\'appareil doit être flashé</string>
+    <string name="phase1_complete_not_ok">Appareil introuvable ou en mode correct ou erreur de connexion</string>
+
+    <string name="downloading_file">Téléchargement du fichier</string>
+
+    <string name="label_data">Les données:</string>
+    <string name="label_device_address">Adresse de l\'appareil:</string>
+    <string name="label_state">Etat:</string>
+    <string name="no_data">Pas de données</string>
+    <string name="connected">Connecté</string>
+    <string name="disconnected">Débranché</string>
+    <string name="title_devices">analyse de périphérique micro: bit</string>
+    <string name="title_activity_ledgrid">Rechercher micro: bit</string>
+    <string name="title_activity_connect">Relier</string>
+    <string name="title_activity_gamepad">GamePad</string>
+    <string name="error_bluetooth_not_supported">Bluetooth non pris en charge.</string>
+    <string name="microbit_not_found">micro: bit introuvable. Veuillez rechercher.</string>
+    <string name="microbit_found">Utiliser le micro: bit existant?</string>
+    <string name="error_bluetooth_not_enabled">Bluetooth non activé.</string>
+    <string name="devices_bluetooth_not_enabled">Cliquez pour activer Bluetooth.</string>
+    <string name="devices_initiate_process">Cliquez pour commencer.</string>
+    <string name="devices_find_microbit">Chercher</string>
+    <string name="devices_generate_code">Cliquez pour générer du code.</string>
+    <string name="devices_scanning">Vous recherchez micro: bit, cliquez pour arrêter.</string>
+    <string name="devices_ble_unsupported">BLE Non pris en charge sur votre appareil</string>
+    <string name="unknown_device">Périphérique inconnu</string>
+    <string name="unknown_characteristic">Caractéristique inconnue</string>
+    <string name="unknown_service">Service inconnu</string>
+
+    <string name="pattern_to_flash">Entrez le motif affiché sur votre micro: bit à flasher</string>
+    <string name="pattern_to_pair">Entrez le motif affiché sur votre micro: bit à associer</string>
+
+    <string name="pairing_failed_message">Impossible d\'appairer avec le micro: bit. \ N Réessayer?</string>
+    <string name="pairing_failed_title">Jumelage infructueux</string>
+    <string name="pairing_success_message_1">Vous avez réussi l\'appairage avec micro: bit</string>
+    <string name="pairing_success_title">micro: bit apparié</string>
+    <string name="run_code_button_name">Continuez à flasher</string>
+    <string name="flashing_failed_not_found">Échec du flashage! Impossible de lire le fichier</string>
+    <string name="flashing_failed_io_error">Échec du flashage! Impossible de trouver le fichier. Veuillez réinitialiser micro: bit et réessayer.</string>
+    <string name="flashing_failed_message">Échec du flashage! Aucun programme trouvé</string>
+    <string name="flashing_aborted">flashage interrompu! Service requis introuvable sur l\'appareil. Veuillez réinitialiser micro: bit et réessayer.</string>
+
+    <string name="flashing_verifcation_failed">Échec du flashage</string>
+    <string name="flashing_verifcation_failed_title">Impossible de vérifier le code. Veuillez réinitialiser micro: bit et réessayer.</string>
+
+
+    <string name="flashing_aborted_title">Avorté</string>
+    <string name="flashing_failed_title">flashage échoué</string>
+    <string name="flashing_progress_message">Veuillez ne pas interagir avec micro: bit avant la fin du processus de flashage</string>
+    <string name="flashing_success_message">Vous avez téléchargé avec succès le programme sur micro: bit</string>
+    <string name="flashing_success_title">flashage réussi</string>
+    <string name="flashing_error">Erreur</string>
+    <string name="flashing_failed_no_microbit">Au moins un micro: bit doit être couplé avant de clignoter</string>
+    <string name="flashing_tip_title">Mettre le micro: bit en mode clignotant</string>
+    <string name="pairing_tip">Maintenez les boutons A et B enfoncés, puis appuyez sur RESET. \ N Attendez que "BLUEZONE" apparaisse sur micro: bit avant de relâcher les boutons</string>
+    <string name="flash_start_message">Voulez-vous flasher le programme sur %s?</string>
+
+
+    <string name="menu_connect">Relier</string>
+    <string name="menu_disconnect">Déconnecter</string>
+    <string name="menu_live">Vivre</string>
+    <string name="menu_stage">Étape</string>
+    <string name="menu_test">Tester</string>
+    <string name="menu_refresh">Rafraîchir</string>
+    <string name="action_settings">Réglages</string>
+
+    <string name="menu_main_menu">Menu</string>
+    <string name="menu_main_explore">Explorer</string>
+    <string name="menu_main_about">Sur</string>
+    <string name="menu_main_help">Aidez-moi</string>
+    <string name="menu_main_privacy_cookies">Intimité</string>
+    <string name="menu_main_terms_conditions">termes</string>
+    <string name="menu_main_send_feedback">Envoyez-nous vos commentaires</string>
+    <string name="menu_main_share_statistics">Partager les statistiques</string>
+
+
+    <string name="picture">Image</string>
+    <string name="record">Record</string>
+    <string name="stop">Arrêtez</string>
+    <string name="description_info">Info</string>
+    <string name="intro_message">Appareil photo activé!</string>
+    <string name="camera_not_found">Caméra introuvable</string>
+
+    <string name="title_activity_about_us">à propos de nous</string>
+    <string name="back_button">Reprends moi</string>
+    <string name="about_us">C\'est tout !! Happy Coding</string>
+
+
+    <string name="vibrating_via_microbit">Vibrant via micro: bit!</string>
+    <string name="findphone_via_microbit">Trouver mon alerte téléphonique via micro: bit!</string>
+    <string name="ringtone_via_microbit">Jouer la sonnerie via micro: bit!</string>
+    <string name="sound_via_microbit">Lecture du son via micro: bit!</string>
+    <string name="alert">Alerte…</string>
+
+
+    <string name="previous_devices">Connectez le micro: bit précédemment couplé</string>
+    <string name="desc_previous_devices">Aucun micro: bits précédemment couplé</string>
+    <string name="new_devices_pattern_null">Entrez le motif</string>
+    <string name="new_devices">Se connecter à un nouvel appareil</string>
+    <string name="name_device">Nom du périphérique</string>
+    <string name="name_empty_error">Veuillez saisir le nom de l\'appareil.</string>
+    <string name="connect">Relier</string>
+    <string name="gamepad">Gamepad</string>
+    <string name="connectNew">Associer un nouveau micro: bit</string>
+    <string name="connect_tip_title">Comment coupler votre micro: bit</string>
+    <string name="step_connect_tip_text_step_three">Étape 3</string>
+    <string name="step_connect_tip_text_step_four_text">Lorsque vous voyez le message de réussite, \ nappuyez sur RESET et vous avez terminé!</string>
+    <string name="connect_tip_text_step">Étape 1</string>
+    <string name="step_connect_tip_text_step_four">Étape 4</string>
+    <string name="desc_step_connect_tip_text_step_four_text">Lorsque vous voyez le message de réussite, appuyez sur RESET et vous avez terminé!</string>
+    <string name="desc_step_connect_tip_text_step_three">Étape 3</string>
+    <string name="step_connect_tip_text_step_three_text">Lorsque vous y êtes invité, appuyez sur le bouton A \ net entrez votre code PIN</string>
+    <string name="step_connect_tip_text_step_three_text_one_line">Lorsque vous y êtes invité, appuyez sur le bouton A et entrez votre code PIN</string>
+    <string name="desc_step_connect_tip_text_step_three_text">Lorsque vous y êtes invité, appuyez sur le bouton A et entrez votre code PIN</string>
+    <string name="desc_step_connect_tip_text_step_four">Étape 4</string>
+    <string name="searching_microbit_found_message">Ouvrez votre tiroir de notification \ net entrez votre code PIN</string>
+    <string name="searching_microbit_found_message_one_line">Ouvrez votre tiroir de notification et entrez votre code PIN</string>
+    <string name="desc_searching_microbit_found_message">Ouvrez votre tiroir de notification et entrez votre code PIN</string>
+    <string name="step_connect_tip_text_step_two">Étape 2</string>
+    <string name="connect_tip_text">Maintenez les boutons A et B, puis APPUYEZ SUR RESET</string>
+    <string name="desc_connect_tip_text">Maintenez les boutons A et B, puis APPUYEZ SUR RESET</string>
+    <string name="desc_connect_tip_text_step">La première étape</string>
+    <string name="connect_tip_text_step_text">Maintenez les boutons A et B, \ npuis appuyez sur RESET</string>
+    <string name="desc_connect_tip_text_step_two">Deuxième étape</string>
+    <string name="connect_tip_text_step_two_text">Lorsqu\'on vous le demande, entrez votre PIP \ n (modèle d\'identification personnel)</string>
+    <string name="desc_connect_tip_text_step_two_text">Lorsqu\'on vous le demande, entrez votre modèle d\'identification personnel</string>
+    <string name="step_enter_pattern_tip_text">Étape 2</string>
+    <string name="enter_pattern_tip_text_one_line">Copiez le motif de votre micro: bit sur cette grille</string>
+    <string name="desc_enter_pattern_tip_step_two">Deuxième étape</string>
+    <string name="desc_enter_pattern_tip_text">Copiez le motif de votre micro: bit sur cette grille</string>
+    <string name="searching_tip_text_instructions">(vous n\'avez que 30 secondes)</string>
+    <string name="desc_searching_tip_text">Vous n\'avez que 30 secondes</string>
+    <string name="desc_searching_tip_step_three">Lorsqu\'on vous demande un code PIN, appuyez sur le bouton A</string>
+    <string name="enter_pin_to_pair_text">Appuyez sur le bouton A et \ nentrez le code PIN à 6 chiffres</string>
+    <string name="step_enter_pin_to_pair_text">Étape 4</string>
+    <string name="desc_enterPinToPairText">Appuyez sur le bouton A et entrez le code PIN à 6 chiffres</string>
+
+    <string name="connectSearchingTitle">De liaison…</string>
+    <string name="desc_connectSearchingTitle">De liaison…</string>
+    <string name="searchingTitle">Recherche de micro: bit</string>
+    <string name="pairing_msg_1">Micro: bit trouvé</string>
+
+
+    <string name="pairingErrorTitle">Erreur</string>
+    <string name="timeOut">Temps libre</string>
+    <string name="pairingErrorMessage">Nous ne pouvons pas trouver ce micro: bit \ nRetry?</string>
+    <string name="pairing_successful_tip_message">Veuillez appuyer sur le bouton RESET et vous avez terminé!</string>
+    <string name="deleteMicrobitTitle">Supprimer micro: bit?</string>
+    <string name="deleteMicrobitMessage">Voulez-vous vraiment supprimer cet appareil?</string>
+
+    <string name="your_projects">Tes projets</string>
+    <string name="saved_projects">projets enregistrés</string>
+    <string name="start_new_project">Lancer un nouveau projet</string>
+    <string name="new_project">Nouveau projet</string>
+    <string name="loading_page_msg">S\'il vous plaît, attendez. La page se charge…</string>
+
+
+    <string name="delete_project_message">Voulez-vous vraiment supprimer ce fichier? \ R \ nLe fichier sera définitivement supprimé de cette application.</string>
+    <string name="delete_project_title">Supprimer le projet?</string>
+    <string name="record_audio">Enregistrement audio?</string>
+    <string name="audio_recorder_notification">enregistreur audio micro: bit</string>
+
+    <string name="create_new_project">Créer \ na un nouveau projet</string>
+    <string name="my_scripts">Mes scripts</string>
+
+    <string name="download_existing">Télécharger existant</string>
+    <string name="downloading">Téléchargement…</string>
+
+    <string name="q_overwrite_existing">Un fichier du même nom existe déjà. Remplacer le fichier existant?</string>
+    <string name="rename_file">Renommer le fichier de téléchargement</string>
+
+    <string name="download_complete">Téléchargement complet. Flash sur micro: bit?</string>
+    <string name="download_failed_msg">Réessayez plus tard</string>
+    <string name="download_failed_title">Réessayez plus tard</string>
+    <string name="projects">Projets</string>
+    <string name="pair_my_device">Relier</string>
+    <string name="connect_my_device">Relier</string>
+    <string name="flash">Flasher</string>
+    <string name="view">Vue</string>
+    <string name="no_projects">Aucun projet trouvé!</string>
+    <string name="connected_to">Connecté à</string>
+    <string name="not_connected">Pas connecté</string>
+    <string name="micro_bit_reset_msg">Veuillez réinitialiser votre micro: bit et réessayer.</string>
+    <string name="flashing_title">Flashing</string>
+    <string name="pairing_title">Jumelage</string>
+    <string name="flashing_error_msg">micro: bit pas en bon état</string>
+    <string name="flashing_phase1_msg">Recherche de l\'appareil…</string>
+    <string name="pairing_phase2_msg">Appuyez sur le bouton "A" sur micro: bit pour réussir l\'appairage. \ n \ n En attente de la clé secrète</string>
+    <string name="pairing_phase2_msg_New">Entrez le code PIN</string>
+
+    <string name="web_view_demo">Démo Web View</string>
+    <string formatted="false" name="flashing_project">Flashage de  \' %s \'</string>
+    <string name="sending_project">Flashage du Projet </string>
+    <string name="send_project">Envoi du prmgramme sur micro: bit</string>
+    <string name="validating_microbit">Vérification des services nécessaires au flashage</string>
+    <string name="waiting_reboot">En attente de micro: bit pour redémarrer</string>
+    <string name="init_connection">Connexion à micro: bit</string>
+    <string name="disconnecting">Déconnexion de micro: bit</string>
+    <string name="dfu_status_starting_msg">Initialisation du processus de flashage…</string>
+    <string name="multple_flashing_session_msg">Un projet est en cours de flash. Attendez qu\'il se termine!</string>
+    <string name="internal_error_msg">Erreur interne. Veuillez réessayer</string>
+    <string name="no_device_paired">Peut pas se connecter. Pas de micro: bit apparié</string>
+
+    <string name="send">Changer l\'ID en FLASH</string>
+    <string name="code">Changer l\'ID en VOIR</string>
+
+    <string name="connect_to_mbit">Connectez-vous à votre micro: bit</string>
+    <string name="title_activity_new_device">Nouvel appareil</string>
+
+    <string name="turn_on_bluetooth">Allumez votre Bluetooth?</string>
+    <string name="bluetooth_off_cannot_continue">Impossible de continuer sans activer Bluetooth</string>
+    <string name="bluetooth_turn_on_guide">Veuillez cliquer sur la coche verte pour activer votre Bluetooth</string>
+    <string name="tray_notification_failure">micro: bit Déconnecté. Cliquez pour vous connecter</string>
+    <string name="tray_notification_sucsess">micro: bit Connecté. Cliquez pour vous déconnecter</string>
+
+    <string name="title_activity_splash_screen">SplashScreenActivity</string>
+    <string name="dummy_button">Bouton factice</string>
+    <string name="dummy_content">DUMMY \ nCONTENT</string>
+
+    <string name="navigation_drawer_open">Ouvrir le menu</string>
+    <string name="navigation_drawer_close">Fermer le menu</string>
+    <string name="create_code">Créer du code</string>
+    <string name="flash_microbit">Flasher</string>
+    <string name="connect_device">Relier</string>
+    <string name="discover">Découvrir</string>
+
+    <string formatted="false" name="email_body">&lt;p&gt; &lt;b&gt; À propos de mon appareil * &lt;/b&gt; &lt;/p&gt;             &lt;p&gt; micro: bit %s &lt;/p&gt;             &lt;p&gt; %s Android %s &lt;/p&gt;              &lt;p&gt; * Ces informations sont très utiles pour identifier les problèmes.             Aucune donnée personnelle ou sensible ne nous est transmise par l\'envoi de ces informations.             Pour plus d\'informations sur la politique de confidentialité de micro: bit, veuillez cliquer &lt;a href=\"%s\"&gt; ici &lt;/a&gt;             &lt;/p&gt;</string>
+    <string name="prefs_share_stats_status">share_stats</string>
+    <string name="content_description_toolbar_home">Ouvrir le menu</string>
+    <string name="content_description_toolbar_logo">Micro: bit</string>
+    <string name="manage_microbit_txt">Pour supprimer un micro: bit jumelé, \ nvous accédez à la section Bluetooth \ nin les paramètres de votre appareil</string>
+    <string name="manage_microbit_txt_one_line">Pour supprimer un micro: bit couplé, accédez à la section Bluetooth dans les paramètres de votre appareil</string>
+    <string name="desc_manage_microbit_txt">Pour supprimer un micro: bit couplé, accédez à la section Bluetooth dans les paramètres de votre appareil</string>
+    <string name="desc_connect_microbit_problems_message">Avoir des problèmes? Essayez la page d\'aide.</string>
+    <string name="connect_microbit_problems_message_two_lines">Avoir des problèmes? \ nEssayez la page d\'aide.</string>
+    <string name="connect_microbit_problems_message">Avoir des problèmes? Essayez la page d\'aide.</string>
+    <string name="desc_manage_microbits">Pour supprimer un micro: bit couplé, accédez à la section Bluetooth dans les paramètres de votre appareil</string>
+    <string name="desc_manage_and_remove_microbits_label">Comment supprimer un micro: bit couplé?</string>
+    <string name="subtitle_manage_and_remove_microbits_label">Suivez les instructions à l\'écran pour</string>
+    <string name="desc_subtitle_manage_and_remove_microbits_label">Suivez les instructions à l\'écran pour</string>
+    <string name="manage_and_remove_microbit">Comment supprimer un micro: bit couplé?</string>
+    <string name="desc_homescreen_logo_img">Bonjour</string>
+    <string name="desc_connect_btn">Relier</string>
+    <string name="desc_flash_btn">Flasher</string>
+    <string name="desc_create_code">Programmer !</string>
+    <string name="desc_discover">Découvrir</string>
+    <string name="desc_back_to_home_from_flash_btn">Retour au menu</string>
+    <string name="desc_flash_toolbar_header">Flasher</string>
+    <string name="desc_go_to_bluetooth_settings">Accédez aux paramètres Bluetooth</string>
+    <string name="tv_go_to_bluetooth_Settings">Accédez aux paramètres Bluetooth</string>
+    <string name="desc_connect_back_to_home_btn">Retour au menu</string>
+    <string name="nav_draw_menu">Menu</string>
+    <string name="nav_draw_about">Sur</string>
+    <string name="nav_draw_help">Aidez-moi</string>
+    <string name="nav_draw_privacy_cookies">Intimité</string>
+    <string name="nav_draw_terms_conditions">termes</string>
+    <string name="nav_draw_send_feedback">Envoyez-nous vos commentaires</string>
+    <string name="nav_draw_share_statistics">Partager les statistiques</string>
+    <string name="txt_my_scripts_btn">Mes scripts</string>
+    <string name="desc_nav_drawer_menu">Fermer le menu</string>
+    <string name="desc_share_statistics_description">Ces informations ne seront utilisées que pour analyser et améliorer les services offerts via cette application. Pour plus d\'informations, consultez notre politique de confidentialité</string>
+    <string name="txt_pair_btn">Paire</string>
+    <string name="txt_how_to_pair_next_btn">Prochain</string>
+    <string name="txt_cancel_btn">Annuler</string>
+    <string name="desc_connection_status_flash_text">État de connexion Micro: Bit</string>
+    <string name="desc_send_project_btn">Code Flash sur votre Micro: bit</string>
+    <string name="desc_delete_project_btn">Supprimer le code</string>
+    <string name="searching_tip_step_text">Lorsqu\'on vous demande un code PIN, \ nappuyez sur le bouton A</string>
+    <string name="searching_tip_step_text_one_line">Lorsqu\'on vous demande un code PIN, appuyez sur le bouton A</string>
+    <string name="desc_connect_pair_micro_bit">Associer un nouveau micro: bit</string>
+    <string name="most_recent_device_status">Micro: bit le plus récemment utilisé</string>
+    <string name="device_connected_device_status">Micro: bit actuellement connecté</string>
+
+    <string name="general_error_title">Erreur</string>
+    <string name="general_error_msg">Erreur d\'application. Veuillez contacter le développeur</string>
+    <string name="pair_new_device_dialog_title">Associer un nouvel appareil?</string>
+    <string name="pair_new_device_dialog_message">Le couplage avec un nouvel appareil supprimera tous les Mircobits précédemment couplés.</string>
+    <string name="ok_button_label">D\'accord</string>
+    <string name="toolbar_title">Menu</string>
+    <string name="step_enter_pattern_text">Étape 2</string>
+    <string name="popup_title">Titre</string>
+    <string name="pop_up_subtitle_text">Message A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Message</string>
+
+    <string name="cancel_searching_btn_txt">Annuler</string>
+
+
+
+    <string name="permissions_needed_title">Plus de permission nécessaire</string>
+    <string name="storage_permission_for_samples">Nous avons besoin d\'une autorisation de stockage pour copier des exemples de fichiers de programme sur votre appareil. Cela vous aidera à essayer immédiatement votre micro: bit. \ N Continuer?</string>
+    <string name="storage_permission_for_samples_error">Aucun exemple de fichier ne sera installé.</string>
+    <string name="storage_permission_for_programs">Nous avons besoin d\'une autorisation de stockage pour répertorier tous les fichiers de programme enregistrés sur votre appareil. \ N Continuer?</string>
+    <string name="storage_permission_for_programs_error">Impossible d\'afficher les fichiers de programme.</string>
+
+    <string name="location_permission_pairing">Nous avons besoin d\'une autorisation de localisation pour rechercher et trouver votre micro: bit. \ N Continuer?</string>
+    <string name="location_permission_error">Impossible d\'associer un nouveau micro: bit sans autorisation de localisation.</string>
+
+    <string name="camera_permission">micro: bit tente de lancer Camera. Nous avons besoin des autorisations de caméra pour effectuer cette action. \ n Continuer?</string>
+    <string name="camera_permission_error">Nous ne pouvons pas répondre à la demande de micro: bit sans l\'autorisation de la caméra</string>
+    <string name="title_activity_camera_activity_permission_checker">Vérificateur d\'autorisation de caméra</string>
+
+    <string name="dnd_error_title">Impossible de terminer l\'action</string>
+    <string name="dnd_error_msg">Veuillez désactiver le mode Ne pas déranger. La fonction appareil photo ne peut pas être utilisée dans ce mode</string>
+
+    <string name="telephony_permission">Le programme micro: bit connecté doit connaître l\'état de l\'appel entrant. Nous avons besoin de l\'autorisation État du téléphone pour effectuer cette action. \ n Continuer?</string>
+    <string name="sms_permission">Le programme micro: bit connecté doit connaître l\'état du SMS entrant. Nous avons besoin de l\'autorisation SMS pour terminer cette action. REMARQUE: l\'application n\'enverra aucun SMS. \ n Continuer?</string>
+    <string name="telephony_permission_error">Votre micro: bit connecté ne recevra aucune notification d\'appel entrant</string>
+    <string name="sms_permission_error">Votre micro: bit connecté ne recevra aucune notification SMS entrante</string>
+    <string name="bluetooth_pairing_internal_error">Une erreur d\'appairage Bluetooth s\'est produite. Se déconnecter maintenant…</string>
+
+    <string name="samples_are_about_to_be_copied">Les échantillons seront désormais copiés sur votre appareil. Vous pouvez les consulter dans la section Flash.</string>
+    <string name="reconnect_title">Se reconnecter</string>
+    <string name="reconnect_text">Vous avez été déconnecté de la carte micro: bit. Voulez-vous vous reconnecter?</string>
+    <string name="reconnect_ok_button">Se reconnecter</string>
+    <string name="reset_microbit_because_of_hex_file_wrong">. Veuillez appuyer sur le bouton RESET!</string>
+    <!-- Generated by Automatic String Resource Translation
+    --><!--          https://asrt.gluege.boerde.de
+--></resources>
diff --git a/dfuLibrary/dfuLibrary.iml b/dfuLibrary/dfuLibrary.iml
index 144bb7d1..8b7858b1 100644
--- a/dfuLibrary/dfuLibrary.iml
+++ b/dfuLibrary/dfuLibrary.iml
@@ -4,6 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":dfuLibrary" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/local.properties b/local.properties
index c4a00437..be473678 100644
--- a/local.properties
+++ b/local.properties
@@ -4,6 +4,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Feb 14 16:18:16 GMT 2019
+#Fri Feb 07 15:01:45 CET 2020
 ndk.dir=/home/SERILOCAL/s.kondu/Android/Sdk/ndk-bundle
-sdk.dir=/home/SERILOCAL/s.kondu/Android/Sdk
+sdk.dir=/home/asthro/Android/Sdk