From 117eab66070330cc57d0baf209ed801506870a97 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gdev@live.de>
Date: Mon, 21 Mar 2016 00:50:56 +0100
Subject: [PATCH] Delete/Merge strings (#1)

---
 app/src/main/res/values-w820dp/strings.xml | 21 ---------------------
 app/src/main/res/values/strings.xml        |  5 ++++-
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 app/src/main/res/values-w820dp/strings.xml

diff --git a/app/src/main/res/values-w820dp/strings.xml b/app/src/main/res/values-w820dp/strings.xml
deleted file mode 100644
index 03fdcf71..00000000
--- a/app/src/main/res/values-w820dp/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<resources>
-    <string name="app_name" translatable="false">Diaspora Native WebApp</string>
-    <string name="reload">Reload</string>
-    <string name="title_activity_pods">Select Pod</string>
-    <string name="filter_hint">Enter pod domain</string>
-    <string name="exit_app">Exit app</string>
-    <string name="confirm_url">Confirm pod url</string>
-    <string name="diaspora" translatable="false">Diaspora</string>
-    <string name="podlist_source_note">Note: This list is populated with only the secure pods from podupti.me</string>
-    <string name="valid_pod">Please enter a valid domain name</string>
-    <string name="podlist_error">Error: Could not retrieve list of pods!</string>
-    <string name="loading_podlist">Loading pod list ...</string>
-    <string name="no_internet">Sorry, you must be connected to the Internet to proceed</string>
-    <string name="confirmation">Confirmation</string>
-    <string name="confirm_pod">Do you want to use the pod: </string>
-    <string name="confirm_exit">Are you sure you want to exit?</string>
-    <string name="yes">YES</string>
-    <string name="no">NO</string>
-    <string name="change_pod_warning">This will erase all cookies and session data. Do you really want to change pods?</string>
-    <string name="new_post">New post</string>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a21237d..c1bbad4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,4 +196,7 @@
         <item>@drawable/splashscreen5</item>
         <item>@drawable/splashscreen6</item>
     </array>
-</resources>
\ No newline at end of file
+
+    <string name="exit_app">Exit app</string>
+    <string name="diaspora" translatable="false">Diaspora</string>
+</resources>