Merge branch 'develop' into oauth_login

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index a4868a4..ae3624c 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -6,9 +6,8 @@
   Copyright (C) 2012-2013 ownCloud Inc.
 \r
   This program is free software: you can redistribute it and/or modify\r
-  it under the terms of the GNU General Public License as published by\r
-  the Free Software Foundation, either version 2 of the License, or\r
-  (at your option) any later version.\r
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.\r
 \r
   This program is distributed in the hope that it will be useful,\r
   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
@@ -119,8 +118,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:ems="10"
-                android:enabled="false"
-                android:text="@string/oauth_url_endpoint_auth"
+                android:text="@string/oauth2_url_endpoint_auth"
                 android:singleLine="true"
                 android:visibility="gone" >
 
@@ -133,8 +131,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:ems="10"
-                android:enabled="false"
-                   android:text="@string/oauth_url_endpoint_access"
+                   android:text="@string/oauth2_url_endpoint_access"
                 android:singleLine="true"
                 android:visibility="gone" >