From 1e2adadae2cdc5f1ac8bf9d0cbf46201169d6ecb Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 19 Feb 2013 10:36:48 -0800
Subject: [PATCH] Resource cleanup

---
 res/drawable-mdpi/ic_lock_message_sms.png  | Bin 636 -> 0 bytes
 res/drawable-xhdpi/ic_lock_message_sms.png | Bin 954 -> 0 bytes
 res/values/strings.xml                     |  15 ++-------------
 3 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 res/drawable-mdpi/ic_lock_message_sms.png
 delete mode 100644 res/drawable-xhdpi/ic_lock_message_sms.png

diff --git a/res/drawable-mdpi/ic_lock_message_sms.png b/res/drawable-mdpi/ic_lock_message_sms.png
deleted file mode 100644
index 5ff3654d317252ce95b4d62b168cf9893dfe9487..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 636
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE&~H&i>HfYh{y4}S2yNe4iI5`@cx!xRA+|^kAb4$
zb51RZNF$NXx$F-ZjTAPPuL-&K#ZVx~TrF-v@HD?fCytfgft@+VH@3<gH-C8`s4wND
z)$<?w|JVOpoGn+=^6yK{=BPt2YZ+(t3s=td5;dHlb4Vxf6tB%e{cOiYFY@15+iUd9
z-LYj$$;%@ViY9Nq8E|-=kDZ~VQt@W-_Ovi3)fDw+E3svHx-!<=3bL~<-rsRnVQO_|
z8^4|B$D@~K&J5q@Is2fSB#X?$Q<g%U=VGtk)V=;o)#mW2-h^D;9UBi_wiSvxU0m*$
z(RM3j)w;`e4O*7^p|itn%Y*Zc?uNcHl92fQQh>RiXDY`(i3b9ce{L;pX$*O{_58Zt
zf+y9h%??$+@7Y^;@!O*8#{p?du4$K6%AQ!#7Rb3^#nkqw;@fw!l#b>#oNB(XC;!@^
zGP7-`zW4oSSYUnR?BC1LcR4SVC0bX-ykL6rL${aViQC=Z3a@MaT<w1Kt=q%n&kF1R
zp<B+adf!~TPvl6Q5x>blCLfRZmHW3GXah!!YKdz^NlIc#s#S7PDv)9@GB7mMH89aN
zGz>AYv@$fZGPTq-Ft;)=sC@s^5=BF9eoAIqC2kEIn;ct#8YDqB1m~xflqVLYGB~E>
hC#5QQ<|d}62BjvZR2H60wE-$(@O1TaS?83{1OQG10{;L2

diff --git a/res/drawable-xhdpi/ic_lock_message_sms.png b/res/drawable-xhdpi/ic_lock_message_sms.png
deleted file mode 100644
index 086a0ca0aac4ed2493d0605bd7456dc3d8027b94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 954
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfwTh{zxw<m0jTYer;B4q#=W;U?ECMyNF4uo{>HuC1??G%e>8&v
zTEizy_9!&nW!AMqfS1+dge`~5M2#qctEDC%*aT8rT$ot2thB5+c6Ln;;1bwqEAs8_
z+qb#b9zR{Q_=EqatX%u^#_{&X^D1q6q)fA}SZec>Yx+)A->d91b(z0Z!nJ~BnX^k@
zoigZPWO#aUz7MmRNZf(<TL0(lFlJaJF=w-n^7iMZ;d@p%Jl$8l@6*y>5)aQ92gsT4
ze{H*7&v55!=XiO=CC?P(uhgvj*mpiQsC&_@oB1UtOY46H>J=U3_ng>X;<)VFx_;NG
zG0N{h6kjo#dS`jje4dvbB@HoeS4m4fX}Y6d_f0yk=;rAYt`~XjcPfW3Z}pX8PR*9Q
zvvu(_&VQfw>C2R`iSK>K?B6N1^L=b?{K+YW6I7Sm-`c9owW$5uouY(A0W&NLPS0z<
zdslXMQr43ahIO4%DS5lrPN-ZGRH+iY<Lxq@-WO3-PfRv1*z{1;af;;@{ow2w+cNX6
z82#o;UG!iRZ)nu_WlRMZH{ZRvo$vYY3a-G%7s}@zEuJ^sV&5gkZMJJ;%ie7d?`yyD
z<;1h==aOz;yU8>o=uF(r{nOd_@5*Y3tTax1rEtae_D5m;W}fb8>D(V&O5QPOFMG7^
z6K6o%&p3T%r=1!0_Igf|yR-{SmtNT~=5pok#Z`jSzZ9k9ajx1O`e}a(L+;hfdM>v&
z%jDder0c-qm|R@8Eq8VFguYcvO&PeRt~3wfN-;A$7=5p%=lBxqc^`Y(rXEVa7q;Ts
z*#oT6-m_+YsbCd<rnDwR-a&cQQ$Ii3{_6AMxmlI*nV0N2nhUb-dCyF7etvs#@qBi-
z2Ehat2}UsG!Pwz!XVUiTD<ezF>zwqg?|jwW)Ax0)2wEAmeUsnHxX`|D%vXM#*jIIy
zN8stdgsb9C8!ydems@l5N752ghKOwAYLCy0-Fl_I+F#f|^UFbjg;plgz+|mj;u=ws
zl30>zm0Xkxq!^403=MS+OmqzmLkujf42`TzEp-jdtqcq*-~Y5k(U6;;l9^VCTLZ@?
z$5x;QNstY}`DrEPiAAXljw$&`sS2LCiRr09sfj6-g(p*OfQlGAUHx3vIVCg!0Ci@T
A%>V!Z

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2abd6556aa..48a2d8eadb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,15 +20,7 @@
     <string name="ApplicationExportManager_export_successful_exclamation">Export Successful!</string>
     <string name="ApplicationExportManager_import">Import</string>
     <string name="ApplicationExportManager_export">Export</string>
-    
-    <!-- ApplicationMigrationManager -->
-    <string name="ApplicationMigrationManager_migrating_database">Migrating Database</string>
-    <string name="ApplicationMigrationManager_migrating_text_message_database">Migrating text message database...</string>
-    <string name="ApplicationMigrationManager_copy_system_text_message_database_question">Copy System Text Message Database?</string>
-    <string name="ApplicationMigrationManager_copy_system_text_message_database_explanation">TextSecure uses an encrypted database that is separate from the default system database.  Would you like to copy your existing text messages into TextSecure\'s encrypted database?  Your default system database will be unaffected.</string>
-    <string name="ApplicationMigrationManager_copy">Copy</string>
-    <string name="ApplicationMigrationManager_dont_copy">Don\'t copy</string>
-    
+        
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferencesActivity_currently_s">Currently: %s</string>    
     <string name="ApplicationPreferenceActivity_not_found_exclamation">Not found!</string>
@@ -39,7 +31,6 @@
     <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">You need to have entered your passphrase before importing keys...</string>
     <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">You need to have entered your passphrase before managing keys...</string>
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">You haven\'t set a passphrase yet!</string>
-    <string name="ApplicationPreferencesActivity_conversation_length_limit">Conversation length limit</string>
     <string name="ApplicationPreferencesActivity_messages_per_conversation">messages per conversation</string>
     <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Delete all old messages now?</string>
     <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Are you sure you would like to immediately trim all conversation threads to the %s most recent messages?</string>
@@ -226,7 +217,6 @@
     <!-- ApplicationMigrationService -->
     <string name="ApplicationMigrationService_import_in_progress">Import in progress</string>
     <string name="ApplicationMigrationService_importing_text_messages">Importing Text Messages</string>
-    <string name="ApplicationMigrationService_import_complete">Import complete!</string>
     
     <!-- KeyCachingService -->
     <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Passphrase Cached</string>
@@ -289,7 +279,7 @@
     <string name="create_passphrase_activity__generating_secrets">GENERATING SECRETS</string>
     
     <!-- database_migration_activity -->
-    <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Would you like to import your existing text messages into TextSecure\\\'s encrypted database?</string>
+    <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Would you like to import your existing text messages into TextSecure\'s encrypted database?</string>
     <string name="database_migration_activity__the_default_system_database_will_not_be_modified">The default system database will not be modified or altered in any way.</string>
     <string name="database_migration_activity__skip">Skip</string>
     <string name="database_migration_activity__import">Import</string>
@@ -467,7 +457,6 @@
     <!-- conversation -->
     <string name="conversation__menu_add_attachment">Add attachment</string>
     <string name="conversation__menu_delete_thread">Delete thread</string>
-    <string name="conversation__menu_compare">Compare</string>
     
     <!-- conversation_group_options -->
     <string name="convesation_group_options__recipients_list">Recipients list</string>