Merge branch 'develop' into regular_authentication_in_saml_server

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

diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 89d49ab..ff27429 100644 (file)
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -6,9 +6,8 @@
   Copyright (C) 2012-2013 ownCloud Inc.
 
   This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,7 +21,7 @@
        android:layout_height="wrap_content" android:orientation="vertical"
        android:layout_width="wrap_content" android:background="#fefefe"
        android:gravity="center">
-       <TextView android:layout_width="fill_parent" android:text="Choose upload directory"
+       <TextView android:layout_width="fill_parent" android:text="@string/uploader_top_message"
                android:layout_height="wrap_content" android:id="@+id/textView1" android:textColor="@android:color/black"
                android:gravity="center_horizontal"></TextView>
        <FrameLayout android:layout_height="fill_parent"
@@ -36,6 +35,6 @@
                android:layout_width="fill_parent" android:layout_alignParentBottom="true" android:layout_height="wrap_content" android:orientation="vertical">
                <Button android:layout_gravity="bottom" android:layout_height="wrap_content"
                        android:layout_width="fill_parent" android:id="@+id/uploader_choose_folder"
-                       android:text="@string/uploader_btn_upload_text"></Button>
+                       android:text="@string/uploader_btn_upload_text"/>
        </LinearLayout>
 </RelativeLayout>