From 19d3fcec7a669d54e65ffa399dec5bbd9ae4e22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 18 Apr 2014 20:41:39 +0200
Subject: Remove unused strings, fix some lint errors, fix some language
 confusions

---
 OpenKeychain/src/main/res/xml/gen_preferences.xml  |  2 +-
 .../src/main/res/xml/searchable_public_keys.xml    | 22 ----------------------
 .../src/main/res/xml/searchable_secret_keys.xml    | 22 ----------------------
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/xml/searchable_public_keys.xml
 delete mode 100644 OpenKeychain/src/main/res/xml/searchable_secret_keys.xml

(limited to 'OpenKeychain/src/main/res/xml')

diff --git a/OpenKeychain/src/main/res/xml/gen_preferences.xml b/OpenKeychain/src/main/res/xml/gen_preferences.xml
index 5d7dcd65f..10be61b6a 100644
--- a/OpenKeychain/src/main/res/xml/gen_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/gen_preferences.xml
@@ -27,6 +27,6 @@
         <PreferenceScreen
             android:key="keyServers"
             android:persistent="false"
-            android:title="@string/label_key_servers" />
+            android:title="@string/label_keyservers" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/OpenKeychain/src/main/res/xml/searchable_public_keys.xml b/OpenKeychain/src/main/res/xml/searchable_public_keys.xml
deleted file mode 100644
index 6636e0d94..000000000
--- a/OpenKeychain/src/main/res/xml/searchable_public_keys.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    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 3 of the License, or
-    (at your option) any later version.
-
-    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/>.
--->
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:hint="@string/hint_public_keys"
-    android:label="@string/app_name" >
-
-</searchable>
diff --git a/OpenKeychain/src/main/res/xml/searchable_secret_keys.xml b/OpenKeychain/src/main/res/xml/searchable_secret_keys.xml
deleted file mode 100644
index ba0553494..000000000
--- a/OpenKeychain/src/main/res/xml/searchable_secret_keys.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    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 3 of the License, or
-    (at your option) any later version.
-
-    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/>.
--->
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:hint="@string/hint_secret_keys"
-    android:label="@string/app_name" >
-
-</searchable>
-- 
cgit v1.2.3