diff --git a/maoni-sample/src/main/play/af-ZA/listing/title b/maoni-sample/src/main/play/af-ZA/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/af-ZA/listing/title
+++ b/maoni-sample/src/main/play/af-ZA/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/ar-SA/listing/title b/maoni-sample/src/main/play/ar-SA/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/ar-SA/listing/title
+++ b/maoni-sample/src/main/play/ar-SA/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/ca-ES/listing/title b/maoni-sample/src/main/play/ca-ES/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/ca-ES/listing/title
+++ b/maoni-sample/src/main/play/ca-ES/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/cs-CZ/listing/title b/maoni-sample/src/main/play/cs-CZ/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/cs-CZ/listing/title
+++ b/maoni-sample/src/main/play/cs-CZ/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/da-DK/listing/title b/maoni-sample/src/main/play/da-DK/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/da-DK/listing/title
+++ b/maoni-sample/src/main/play/da-DK/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/de-DE/listing/title b/maoni-sample/src/main/play/de-DE/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/de-DE/listing/title
+++ b/maoni-sample/src/main/play/de-DE/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/el-GR/listing/title b/maoni-sample/src/main/play/el-GR/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/el-GR/listing/title
+++ b/maoni-sample/src/main/play/el-GR/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/en-US/listing/title b/maoni-sample/src/main/play/en-US/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/en-US/listing/title
+++ b/maoni-sample/src/main/play/en-US/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/es-ES/listing/title b/maoni-sample/src/main/play/es-ES/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/es-ES/listing/title
+++ b/maoni-sample/src/main/play/es-ES/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/fi-FI/listing/title b/maoni-sample/src/main/play/fi-FI/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/fi-FI/listing/title
+++ b/maoni-sample/src/main/play/fi-FI/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/fr-FR/listing/fulldescription b/maoni-sample/src/main/play/fr-FR/listing/fulldescription
index 87e7725e..1faf1f81 100644
--- a/maoni-sample/src/main/play/fr-FR/listing/fulldescription
+++ b/maoni-sample/src/main/play/fr-FR/listing/fulldescription
@@ -1,6 +1,6 @@
-Maoni is a lightweight Open-Source library for integrating a way to collect user feedback from within Android applications, and increase your customer satisfaction.
+Maoni est une bibliothèque Open-Source légère permettant de recueillir les commentaires des utilisateurs dans les applications Android et d'accroître ainsi votre satisfaction client.
 
-Built from the ground up with the Material Design principles in mind, it allows to capture a screenshot of the activity the user is currently viewing and attach it to the feedback.
+Construit de zéro avec le pattern Material Design à l’esprit, il permet de capturer une capture d’écran de l’activité que l’utilisateur visualise et de la joindre au feedback.
 
 Just provide callbacks implementations and you're good to go.
 Maoni will take care of collecting your users' feedback and call those implementations.
diff --git a/maoni-sample/src/main/play/fr-FR/listing/shortdescription b/maoni-sample/src/main/play/fr-FR/listing/shortdescription
index cdc6844c..aa7a86c0 100644
--- a/maoni-sample/src/main/play/fr-FR/listing/shortdescription
+++ b/maoni-sample/src/main/play/fr-FR/listing/shortdescription
@@ -1 +1 @@
-Demo app for Maoni, an Open-Source library for collecting in-app user feedback.
\ No newline at end of file
+Application de démo pour Maoni, une bibliothèque Open-Source pour recueillir les feedbacks de vos utilisateurs sans quitter votre application.
\ No newline at end of file
diff --git a/maoni-sample/src/main/play/fr-FR/listing/title b/maoni-sample/src/main/play/fr-FR/listing/title
index 5d1baf82..5ccb234a 100644
--- a/maoni-sample/src/main/play/fr-FR/listing/title
+++ b/maoni-sample/src/main/play/fr-FR/listing/title
@@ -1,5 +1,6 @@
 #X-Generator: crowdin.com
-Maoni=In-App Feedback library
+Maoni=Librairie de collecte de feedback Utilisateur
+
 
 
 
diff --git a/maoni-sample/src/main/play/fr-FR/whatsnew b/maoni-sample/src/main/play/fr-FR/whatsnew
index 46f081be..20b36148 100644
--- a/maoni-sample/src/main/play/fr-FR/whatsnew
+++ b/maoni-sample/src/main/play/fr-FR/whatsnew
@@ -1,7 +1,8 @@
-- New features
--- Sample App: include maoni-github, and display a popup allowing to pick any callback implementation for sending the feedback
+- Nouvelles fonctionnalités
+-- Application de démonstration: inclusion de maoni-github et affichage d'une fenêtre permettant de sélectionner n'importe quelle implémentation de callback pour l'envoi de feedbacks
 
-- Bug fixes
--- Proguard may obfuscate certain device information data
--- Potential crash if the file provider authority supplied by the app could not be resolved by Android System
--- Memory leaks fixes and memory footprint reduced.
+- Correction de bugs
+-- Problème avec Proguard, qui peut masquer en anonymiser certaines infos collectées
+-- Crash potential de l'application si le Provider Authority fourni par l
+ application utilisatrice de maoni ne peut être résolu par Android
+-- Réduction de l'utilisation mémoire de la librairie
diff --git a/maoni-sample/src/main/play/he-IL/listing/title b/maoni-sample/src/main/play/he-IL/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/he-IL/listing/title
+++ b/maoni-sample/src/main/play/he-IL/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/hu-HU/listing/title b/maoni-sample/src/main/play/hu-HU/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/hu-HU/listing/title
+++ b/maoni-sample/src/main/play/hu-HU/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/it-IT/listing/title b/maoni-sample/src/main/play/it-IT/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/it-IT/listing/title
+++ b/maoni-sample/src/main/play/it-IT/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/ja-JP/listing/title b/maoni-sample/src/main/play/ja-JP/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/ja-JP/listing/title
+++ b/maoni-sample/src/main/play/ja-JP/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/ko-KR/listing/title b/maoni-sample/src/main/play/ko-KR/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/ko-KR/listing/title
+++ b/maoni-sample/src/main/play/ko-KR/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/nl-NL/listing/title b/maoni-sample/src/main/play/nl-NL/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/nl-NL/listing/title
+++ b/maoni-sample/src/main/play/nl-NL/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/no-NO/listing/title b/maoni-sample/src/main/play/no-NO/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/no-NO/listing/title
+++ b/maoni-sample/src/main/play/no-NO/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/pl-PL/listing/title b/maoni-sample/src/main/play/pl-PL/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/pl-PL/listing/title
+++ b/maoni-sample/src/main/play/pl-PL/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/pt-BR/listing/title b/maoni-sample/src/main/play/pt-BR/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/pt-BR/listing/title
+++ b/maoni-sample/src/main/play/pt-BR/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/pt-PT/listing/title b/maoni-sample/src/main/play/pt-PT/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/pt-PT/listing/title
+++ b/maoni-sample/src/main/play/pt-PT/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/ro-RO/listing/title b/maoni-sample/src/main/play/ro-RO/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/ro-RO/listing/title
+++ b/maoni-sample/src/main/play/ro-RO/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/ru-RU/listing/title b/maoni-sample/src/main/play/ru-RU/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/ru-RU/listing/title
+++ b/maoni-sample/src/main/play/ru-RU/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/sr-SP/listing/title b/maoni-sample/src/main/play/sr-SP/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/sr-SP/listing/title
+++ b/maoni-sample/src/main/play/sr-SP/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/sv-SE/listing/title b/maoni-sample/src/main/play/sv-SE/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/sv-SE/listing/title
+++ b/maoni-sample/src/main/play/sv-SE/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/tr-TR/listing/title b/maoni-sample/src/main/play/tr-TR/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/tr-TR/listing/title
+++ b/maoni-sample/src/main/play/tr-TR/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/uk-UA/listing/title b/maoni-sample/src/main/play/uk-UA/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/uk-UA/listing/title
+++ b/maoni-sample/src/main/play/uk-UA/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/vi-VN/listing/title b/maoni-sample/src/main/play/vi-VN/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/vi-VN/listing/title
+++ b/maoni-sample/src/main/play/vi-VN/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/zh-CN/listing/title b/maoni-sample/src/main/play/zh-CN/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/zh-CN/listing/title
+++ b/maoni-sample/src/main/play/zh-CN/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni-sample/src/main/play/zh-TW/listing/title b/maoni-sample/src/main/play/zh-TW/listing/title
index 5d1baf82..9ce43f45 100644
--- a/maoni-sample/src/main/play/zh-TW/listing/title
+++ b/maoni-sample/src/main/play/zh-TW/listing/title
@@ -63,5 +63,6 @@ Maoni=In-App Feedback library
 
 
 
+
 
 
diff --git a/maoni/src/main/res/values-af/strings.xml b/maoni/src/main/res/values-af/strings.xml
index 700ec5a0..11a4b358 100644
--- a/maoni/src/main/res/values-af/strings.xml
+++ b/maoni/src/main/res/values-af/strings.xml
@@ -1,2 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2016 Armel Soro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<resources>
+  <string name="maoni_app_name">Maoni Library</string>
+  <string name="maoni_screenshot">Screenshot</string>
+  <string name="maoni_feedback_message">Hey! Love or hate this app? Would you like to suggest a new feature, file a bug or simply say hello?\nWe would love to hear from you.</string>
+  <string name="maoni_feedback_content_hint">Write your feedback here</string>
+  <string name="maoni_feedback_include_screenshot_checkbox_title">Include screenshot</string>
+  <string name="maoni_feedback_include_logs_title">Include logs</string>
+  <string name="maoni_touch_to_preview">Touch to preview and edit</string>
+  <string name="maoni_screenshot_informational_text">The screenshot allows us to have more contextual information about your feedback.</string>
+  <string name="maoni_send_feedback">Send Feedback</string>
+  <string name="maoni_action_settings">Settings</string>
+  <string name="maoni_validate_must_not_be_blank">Must not be blank</string>
+  <string name="maoni_header">Header</string>
+  <string name="maoni_screenshot_preview_internal_error">Internal Error. Please try again later.</string>
+  <string name="maoni_screenshot_preview">Preview</string>
+  <string name="maoni_highlight">Highlight</string>
+  <string name="maoni_blackout">Blackout</string>
+  <string name="maoni_undo">Undo</string>
+  <string name="maoni_save">Save</string>
+  <string name="maoni_close">Close</string>
+</resources>
diff --git a/maoni/src/main/res/values-zh-rTW/strings.xml b/maoni/src/main/res/values-zh-rTW/strings.xml
index 700ec5a0..11a4b358 100644
--- a/maoni/src/main/res/values-zh-rTW/strings.xml
+++ b/maoni/src/main/res/values-zh-rTW/strings.xml
@@ -1,2 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2016 Armel Soro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<resources>
+  <string name="maoni_app_name">Maoni Library</string>
+  <string name="maoni_screenshot">Screenshot</string>
+  <string name="maoni_feedback_message">Hey! Love or hate this app? Would you like to suggest a new feature, file a bug or simply say hello?\nWe would love to hear from you.</string>
+  <string name="maoni_feedback_content_hint">Write your feedback here</string>
+  <string name="maoni_feedback_include_screenshot_checkbox_title">Include screenshot</string>
+  <string name="maoni_feedback_include_logs_title">Include logs</string>
+  <string name="maoni_touch_to_preview">Touch to preview and edit</string>
+  <string name="maoni_screenshot_informational_text">The screenshot allows us to have more contextual information about your feedback.</string>
+  <string name="maoni_send_feedback">Send Feedback</string>
+  <string name="maoni_action_settings">Settings</string>
+  <string name="maoni_validate_must_not_be_blank">Must not be blank</string>
+  <string name="maoni_header">Header</string>
+  <string name="maoni_screenshot_preview_internal_error">Internal Error. Please try again later.</string>
+  <string name="maoni_screenshot_preview">Preview</string>
+  <string name="maoni_highlight">Highlight</string>
+  <string name="maoni_blackout">Blackout</string>
+  <string name="maoni_undo">Undo</string>
+  <string name="maoni_save">Save</string>
+  <string name="maoni_close">Close</string>
+</resources>