Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update

[pub/Android/ownCloud.git] / res / layout / generic_explanation.xml

diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index be98f3b..e684397 100644 (file)
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -2,7 +2,7 @@
 <!-- 
   ownCloud Android client application
 
-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2015 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,
@@ -19,7 +19,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/owncloud_white" 
+    android:background="@color/background_color" 
     android:id="@+id/explanation"
     android:orientation="vertical">
 
@@ -30,7 +30,7 @@
                android:layout_weight="2"
            android:padding="10dip"
            android:scrollbarAlwaysDrawVerticalTrack="true"
-               android:text="@string/text_placeholder" 
+               android:text="@string/placeholder_sentence" 
                />
     
        <ListView