From bd15c3d594e565baf3b0d0bbd1c9845214828211 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Tue, 10 Feb 2015 19:50:53 +0100
Subject: [PATCH] Tag 0.17.0.

Also fix some translations
---
 AndroidManifest.xml       |  6 +++---
 res/values-en/strings.xml | 17 ++++++++++++++++-
 res/values-fr/strings.xml | 15 +++++++++++++++
 res/values/strings.xml    |  1 -
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b2e31d7..56b35a3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="fr.unix_experience.owncloud_sms"
-    android:versionCode="17"
-    android:versionName="0.16.1" >
+    android:versionCode="18"
+    android:versionName="0.17.0">
 
-    <!-- From Android 3.0 to 5.0 -->
+    <!-- From Android 4.0 to 5.0 -->
     <uses-sdk
         android:maxSdkVersion="21"
         android:minSdkVersion="14"
diff --git a/res/values-en/strings.xml b/res/values-en/strings.xml
index 45750f6..54bbf34 100644
--- a/res/values-en/strings.xml
+++ b/res/values-en/strings.xml
@@ -27,7 +27,7 @@
 -->
 <resources>
     <!-- Translation version, reference for translators -->
-	<string name="translation_version">3</string>
+	<string name="translation_version">5</string>
 	
     <!-- Translations must begin there -->
     <!-- Preferences -->
@@ -111,6 +111,20 @@
         <item>http://</item>
     </string-array>
     
+    <!-- Main activity -->
+    <string name="ma_button_rate_us">Rate us !</string>
+    <string name="ma_button_thanksto">Thanks to</string>
+    <string name="ma_title_rate_us">Rate us !</string>
+    <string name="ma_content_rate_us">If you like this application, please give rate us on Google Play Store</string>
+    <string name="ma_title_add_account">Add an account</string>
+    <string name="ma_button_goto_sync">Go to Accounts and Sync</string>
+    <string name="ma_title_change_settings">Change app settings</string>
+    <string name="ma_button_goto_settings">Go to Settings</string>
+    <string name="ma_title_welcome">Welcome</string>
+    <string name="ma_content_welcome">Welcome to ownCloud SMS application. This application let you synchronize your SMS to your ownCloud instance using SMS app.</string>
+    <string name="ma_thanksto_people">ownCloud developers\n\
+Contributors and issue\'s reporters</string>
+    
     <!-- Notifications -->
     <string name="sync_title">Sync process</string>
     <string name="sync_inprogress">Sync in progress...</string>
@@ -132,5 +146,6 @@
     <string name="err_sync_http_request_resp">Error #14: Unable to parse server response</string>
     <string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string>
     <string name="err_sync_no_connection_available">Error #16: No data connection available</string>
+    <string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string>
     
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 433b0ea..59648e8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -86,10 +86,25 @@
     <string name="error_connection_failed">Echec de connexion, assurer vous qu\'il s\'agit du bon serveur</string>
     <string name="error_http_connection_failed">Impossible d\'effectuer la connexion HTTP. Assurez vous qu\'il s\'agit d\'un serveur HTTP</string>
     
+    <!-- Main activity -->
+    <string name="ma_button_rate_us">Notez nous !</string>
+    <string name="ma_button_thanksto">Remerciements</string>
+    <string name="ma_title_rate_us">Notez nous !</string>
+    <string name="ma_content_rate_us">Si vous aimez cette application, n\'hésitez pas à nous noter sur le Google Play Store</string>
+    <string name="ma_title_add_account">Ajouter un compte</string>
+    <string name="ma_button_goto_sync">Ouvrir comptes et synchronisation</string>
+    <string name="ma_title_change_settings">Changer les paramètres de l\'application</string>
+    <string name="ma_button_goto_settings">Aller dans les paramètres</string>
+    <string name="ma_title_welcome">Bienvenue</string>
+    <string name="ma_content_welcome">Bienvenue sur l\'application ownCloud SMS. Cette application va vous permettre de synchroniser vos SMS au sein de votre instance ownCloud en utilisant l\'application dédiée.</string>
+    <string name="ma_thanksto_people">L\'équipe de développement ownCloud\n\
+Les contributeurs et rapporteurs de bugs</string>
+    
     <!-- Notifications -->
     <string name="sync_title">Processus de synchronisation</string>
     <string name="sync_inprogress">Synchonisation en cours...</string>
     <string name="fatal_error">Erreur fatale ! </string>
     
     <string name="err_sync_no_connection_available">Erreur #16: Aucune connexion data disponible</string>
+    <string name="err_sync_account_unparsable">Error #17: Compte mal configuré. Merci de bien vouloir le reconfigurer.</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b980da..7e02347 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -156,7 +156,6 @@ Contributors and issue\'s reporters</string>
     <string name="title_section1">Section 1</string>
     <string name="title_section2">Section 2</string>
     <string name="title_section3">Section 3</string>
-    <string name="hello_world">Hello world!</string>
     <string name="title_activity_main_activity2">MainActivity2</string>
 
 </resources>