Merge branch 'develop' into automationTest

diff --git a/owncloud-android-library b/owncloud-android-library
index 2b2fc91..9e76138 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 2b2fc9171f2cf2c4701a74e4a564148584aab33a
+Subproject commit 9e761387a0b406402684571f28c36c2d6d2b6301

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f26c02f..5179fbb 100644 (file)
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -168,7 +168,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="auth_connection_established">Connexion établie</string>
   <string name="auth_testing_connection">Test de connexion</string>
   <string name="auth_not_configured_title">Configuration du serveur erronée</string>
-  <string name="auth_account_not_new">Un compte pour le même utilisateur et serveur existe déjà sur cet appareil</string>
+  <string name="auth_account_not_new">Un compte pour les même utilisateur et serveur existe déjà sur cet appareil</string>
   <string name="auth_account_not_the_same">L\'utilisateur entré ne correspond pas à l\'utilisateur de ce compte</string>
   <string name="auth_unknown_error_title">Une erreur inconnue s\'est produite.</string>
   <string name="auth_unknown_host_title">Impossible de trouver l\'hôte</string>

diff --git a/res/values-sr-rSP/strings.xml b/res/values-sr-rSP/strings.xml
index 4a959c0..bee87c7 100644 (file)
--- a/res/values-sr-rSP/strings.xml
+++ b/res/values-sr-rSP/strings.xml
@@ -12,6 +12,7 @@
   <string name="prefs_accounts">Nalozi</string>
   <string name="prefs_manage_accounts">Upravljaj nalozima</string>
   <string name="prefs_help">Pomoć</string>
+  <string name="prefs_imprint">Žig</string>
   <string name="auth_username">Korisničko ime</string>
   <string name="auth_password">Lozinka</string>
   <string name="sync_string_files">Fajlovi</string>

diff --git a/res/values/setup.xml b/res/values/setup.xml
index 0c341bd..524aa2a 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -9,7 +9,7 @@
     <string name ="data_folder">owncloud</string>
     <string name ="log_name">Owncloud_</string>
     <string name ="default_display_name_for_root_folder">ownCloud</string>
-    <string name ="user_agent">Mozilla/5.0 (Android) ownCloud</string>
+    <string name ="user_agent">Mozilla/5.0 (Android) ownCloud-android/%1$s</string>
     
     <!-- URLs and flags related -->
     <string name="server_url"></string>

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 76ecc5e..760a5e7 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -29,6 +29,7 @@ import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
 import com.owncloud.android.lib.common.utils.Log_OC;
+
 /**
  * Main Application of the project
  * 
@@ -131,14 +132,14 @@ public class MainApp extends Application {
         try {
             pInfo = getAppContext().getPackageManager().getPackageInfo(packageName, 0);
             if (pInfo != null) {
-                version = "/" + pInfo.versionName;
+                version = pInfo.versionName;
             }
         } catch (PackageManager.NameNotFoundException e) {
             Log_OC.e(TAG, "Trying to get packageName", e.getCause());
         }
 
-       // Mozilla/5.0 (Android) ownCloud /1.7.0
-        String userAgent = appString + version;
+        // Mozilla/5.0 (Android) ownCloud-android/1.7.0
+        String userAgent = String.format(appString, version);
 
         return userAgent;
     }