From 719d791962eb5ad527707ce85181afaa520596de Mon Sep 17 00:00:00 2001
From: joeykrim <joeykrim@gmail.com>
Date: Fri, 12 Jul 2013 23:11:27 -0400
Subject: [PATCH 1/2] Added Disable Passphrase title and summary strings from
 Preference.xml

---
 res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3699a7c274..9d0d384358 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -399,6 +399,8 @@
     <string name="preferences__change_passphrase">Change passphrase</string>
     <string name="preferences__change_my_passphrase">Change my passphrase</string>
     <string name="preferences__complete_key_exchanges">Complete key exchanges</string>
+    <string name="preferences__disable_passphrase">Disable passphrase</string>
+    <string name="preferences__disable_local_encryption_of_messages_and_keys">Disable local encryption of messages and keys</string>
     <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatically complete key exchanges for new sessions or for existing sessions with the same identity key</string>
     <string name="preferences__forget_passphrase_from_memory_after_some_interval">Forget passphrase from memory after some interval</string>
     <string name="preferences__timeout_passphrase">Timeout passphrase</string>

From 10fd757cb4b66799bd86f95fced0e23e70ffb95d Mon Sep 17 00:00:00 2001
From: joeykrim <joeykrim@gmail.com>
Date: Fri, 12 Jul 2013 23:15:40 -0400
Subject: [PATCH 2/2] Changed Disable passphrase summary and title text to
 reference strings.xml

---
 res/xml/preferences.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c5d79c3e40..7ce0ffdb30 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -122,14 +122,14 @@
 
        <CheckBoxPreference android:key="pref_disable_passphrase"
                            android:defaultValue="false"
-                           android:title="Disable Passphrase"
-                           android:disableDependentsState="true"
-                           android:summary="Disable local encryption of messages and keys"/>
+                           android:title="@string/preferences__disable_passphrase"
+                           android:summary="@string/preferences__disable_local_encryption_of_messages_and_keys"
+                           android:disableDependentsState="true"/>
 
        <CheckBoxPreference android:defaultValue="false"
                            android:key="pref_timeout_passphrase"
-                           android:summary="@string/preferences__forget_passphrase_from_memory_after_some_interval"
                            android:title="@string/preferences__timeout_passphrase"
+                           android:summary="@string/preferences__forget_passphrase_from_memory_after_some_interval"
                            android:dependency="pref_disable_passphrase"/>
 
        <org.thoughtcrime.securesms.preferences.PassphraseTimeoutPreference