Merge pull request #449 from thoughtbox/patch-4

Update strings.xml
This commit is contained in:
Moxie Marlinspike 2013-12-03 07:56:18 -08:00
commit 3a5f9748ff

View File

@ -280,7 +280,7 @@
<string name="SmsReceiver_currently_unable_to_send_your_sms_message">Currently unable to send your SMS message. It will be sent once service becomes available.</string>
<!-- QuickResponseService -->
<string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Sorry, Quick Response is not yet supported by TextSecure! =(</string>
<string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Sorry, Quick Response is not yet supported by TextSecure!</string>
<!-- auto_initiate_activity -->
<string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">You have received a message from someone who supports TextSecure encrypted sessions. Would you like to initiate a secure session?</string>
@ -485,8 +485,8 @@
<string name="preferences__theme">Theme</string>
<string name="preferences__default">Default</string>
<string name="preferences__language">Language</string>
<string name="preferences__make_default_sms_app">Make default SMS app</string>
<string name="preferences__make_textsecure_the_default_sms_mms_app">Make TextSecure the default SMS/MMS app for your system.</string>
<string name="preferences__make_default_sms_app">Set as default SMS app</string>
<string name="preferences__make_textsecure_the_default_sms_mms_app">Make TextSecure the default SMS/MMS application for your system.</string>
<!-- **************************************** -->
<!-- menus -->