From 671039bb92543ed36109dacfa264d39e16a77523 Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Wed, 9 Jan 2013 16:22:09 +0100
Subject: support for expiration times

---
 res/values-de/expirationtimes.xml | 8 --------
 res/values-de/strings.xml         | 3 +++
 res/values/expirationtimes.xml    | 8 --------
 res/values/strings.xml            | 3 +++
 4 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 res/values-de/expirationtimes.xml
 delete mode 100644 res/values/expirationtimes.xml

(limited to 'res')

diff --git a/res/values-de/expirationtimes.xml b/res/values-de/expirationtimes.xml
deleted file mode 100644
index 97f0597..0000000
--- a/res/values-de/expirationtimes.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="expiration_array">
-	<item>Eine Stunde</item>
-	<item>Ein Tag</item>
-	<item>Eine Woche</item>
-    </string-array>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5601d0b..bea43bb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -12,4 +12,7 @@
     <string name="clear_text">Text löschen</string>
     <string name="noPermissionTitle">Keine Berechtigung</string>
     <string name="noPermissionContent">Die Anwendung hat keine Zugriffsrechte auf die gesendeten Daten.\n\n%1$s</string>
+    <string name="expiration_hour">Eine Stunde</string>
+    <string name="expiration_day">Ein Tag</string>
+    <string name="expiration_week">Eine Woche</string>
 </resources>
diff --git a/res/values/expirationtimes.xml b/res/values/expirationtimes.xml
deleted file mode 100644
index 93f233c..0000000
--- a/res/values/expirationtimes.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="expiration_array">
-	<item>One Hour</item>
-	<item>One Day</item>
-	<item>One Week</item>
-    </string-array>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c3e3acd..6885932 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12,4 +12,7 @@
     <string name="clear_text">Clear text</string>
     <string name="noPermissionTitle">Permission denied</string>
     <string name="noPermissionContent">App has no permission to access sent data.\n\n%1$s</string>
+    <string name="expiration_hour">One hour</string>
+    <string name="expiration_day">One day</string>
+    <string name="expiration_week">One week</string>
 </resources>
-- 
cgit v1.2.3