From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 25 Oct 2013 07:44:26 +0000 (+0200)
Subject: Removed urls.xml and moved last URLs to setup.xml
X-Git-Tag: oc-android-1.5.5~140^2~14
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/56645d96407747fd77983cf3f18e03eb53098aab?hp=--cc

Removed urls.xml and moved last URLs to setup.xml
---

56645d96407747fd77983cf3f18e03eb53098aab
diff --git a/res/values/setup.xml b/res/values/setup.xml
index cc816d15..8fbd4ed3 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -9,9 +9,10 @@
     <string name ="data_folder">owncloud</string>
     <string name ="log_name">Owncloud_</string>
     
-    <!-- Server URL -->
+    <!-- URLs and flags related -->
     <string name="server_url"></string>
     <bool name="show_server_url_input">true</bool>
+	<string name="url_account_register">"https://owncloud.com/mobile/new"</string>
     
     <!-- Flags to setup the authentication methods available in the app -->
     <string name="auth_method_oauth2">off</string>
diff --git a/res/values/urls.xml b/res/values/urls.xml
deleted file mode 100644
index 98d2ddd2..00000000
--- a/res/values/urls.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  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 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
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
-    <string name="url_account_register">"https://owncloud.com/mobile/new"</string>
-</resources>
\ No newline at end of file