english translation fixes

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 You can also have a look on the GitHub release page: https://github.com/konradrenner/kolabnotes-android/releases
 
+## [2.3.4] - 2016-11-30
+### Fixed
+- English translations thx to Jeremy Newton!
+
 ## [2.3.3] - 2016-11-23
 ### Fixed
 - Fixed issue 144
@@ -47,7 +51,8 @@ You can also have a look on the GitHub release page: https://github.com/konradre
 ### Fixed
 - First stable release, support for all major features of the Kolab notes format
 
-[Unreleased]: https://github.com/konradrenner/kolabnotes-android/compare/2.3.3...HEAD
+[Unreleased]: https://github.com/konradrenner/kolabnotes-android/compare/2.3.4...HEAD
+[2.3.4]: https://github.com/konradrenner/kolabnotes-android/compare/2.3.3...2.3.4
 [2.3.3]: https://github.com/konradrenner/kolabnotes-android/compare/2.3.2...2.3.3
 [2.3.2]: https://github.com/konradrenner/kolabnotes-android/compare/2.3.1...2.3.2
 [2.3.1]: https://github.com/konradrenner/kolabnotes-android/compare/2.2.4...2.3.1

app/app.iml

@@ -82,7 +82,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -115,7 +114,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.kore.kolabnotes.android"
         minSdkVersion 16
         targetSdkVersion 24
-        versionCode 84
-        versionName "2.3.3"
+        versionCode 85
+        versionName "2.3.4"
 
         //Running test
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

app/src/main/res/values-fr/strings.xml

@@ -189,4 +189,13 @@
     <string name="no_preview">Aucun aperçu sélectionné</string>
     <string name="attachment_not_previewable"> Vous ne pouvez pas obtenir un aperçu de l\'attachement</string>
     <string name="attachment_now_playing"> Lecture en cours:</string>
+
+    <string name="title_activity_settings">Réglages</string>
+    <string name="title_create_notebook">Nouveau carnet de notes</string>
+    <string name="title_create_tag">Nouveau tag</string>
+    <string name="title_dialog_search">Rechercher</string>
+    <string name="title_ok">Ok</string>
+    <string name="title_share">Partager</string>
+    <string name="title_delete">Supprimer</string>
+    <string name="title_change_classification">Modifier la classification</string>
 </resources>