Merge branch 'develop' into release-1.5.5

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f6d3472..3067a40 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2012-2014 ownCloud Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="105004"
-    android:versionName="1.5.4" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="105005"
+    android:versionName="1.5.5" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index 4bc25ba..640b6ab 100644 (file)
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100013"
-    android:versionName="1.0.13" >
+    android:versionCode="0100014"
+    android:versionName="1.0.14" >
 
     <uses-sdk
         android:minSdkVersion="16"

diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml
index 253c829..cddd1ff 100644 (file)
--- a/res/layout/preview_image_fragment.xml
+++ b/res/layout/preview_image_fragment.xml
@@ -26,13 +26,12 @@
     android:background="@color/background_color" 
     android:gravity="center_horizontal"
 -->
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/top"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/background_color"
+    android:background="#000000"
     tools:context=".ui.fragment.PreviewImageFragment" >
 
     <ProgressBar 

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2223c6e..a73f906 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -166,7 +166,7 @@
        <string name="auth_connecting_auth_server">Connecting to authentication server…</string>
        <string name="auth_unsupported_auth_method">The server does not support this authentication method</string>    
        <string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
-       <string name="auth_fail_get_user_name">Your server is not returning a correct user id, contact with your admin please</string>
+       <string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator</string>
        <string name="auth_can_not_auth_against_server">Can not authenticate against this server</string>
     
     <string name="fd_keep_in_sync">Keep file up to date</string>