From 0e0d6d56bff6182c1adb11ab8be663d09773cba4 Mon Sep 17 00:00:00 2001
From: Jakob Nixdorf <flocke@shadowice.org>
Date: Sun, 30 Jul 2017 21:44:58 +0200
Subject: [PATCH] Move the non-translatable settings values to a new file

---
 app/src/main/res/values/settings.xml         | 14 ++++++++++++++
 app/src/main/res/values/strings_settings.xml | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index 847424ba..5cde0994 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Keys -->
+    <string name="settings_key_tap_to_reveal" translatable="false">pref_tap_to_reveal</string>
+    <string name="settings_key_auth_device" translatable="false">pref_auth_device</string>
+    <string name="settings_key_backup_password" translatable="false">pref_backup_password</string>
+
+    <string name="settings_key_label_size" translatable="false">pref_label_size</string>
+
+    <string name="settings_key_openpgp_provider" translatable="false">pref_openpgp_provider</string>
+    <string name="settings_key_openpgp_keyid" translatable="false">pref_openpgp_keyid</string>
+    <string name="settings_key_openpgp_sign" translatable="false">pref_openpgp_sign</string>
+    <string name="settings_key_openpgp_verify" translatable="false">pref_openpgp_verify</string>
+
+    <string name="settings_key_security_backup_warning" translatable="false">pref_security_backup_warning_shown</string>
+
     <!-- Default values -->
     <integer name="settings_default_label_size">8</integer>
 
diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml
index 8a622f52..92bfb67c 100644
--- a/app/src/main/res/values/strings_settings.xml
+++ b/app/src/main/res/values/strings_settings.xml
@@ -37,19 +37,4 @@
         your key (requires password)</string>
     <string name="settings_desc_openpgp_verify">Encrypted backups are only imported if they are
         signed with a valid key</string>
-
-    <!-- Keys -->
-    <string name="settings_key_tap_to_reveal" translatable="false">pref_tap_to_reveal</string>
-    <string name="settings_key_auth_device" translatable="false">pref_auth_device</string>
-    <string name="settings_key_backup_password" translatable="false">pref_backup_password</string>
-
-    <string name="settings_key_label_size" translatable="false">pref_label_size</string>
-
-    <string name="settings_key_openpgp_provider">pref_openpgp_provider</string>
-    <string name="settings_key_openpgp_keyid">pref_openpgp_keyid</string>
-    <string name="settings_key_openpgp_sign">pref_openpgp_sign</string>
-    <string name="settings_key_openpgp_verify">pref_openpgp_verify</string>
-
-    <string name="settings_key_security_backup_warning">pref_security_backup_warning_shown</string>
-
 </resources>
\ No newline at end of file