TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace all strings containing 'TextSecure' with 'Signal'

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-09-23 13:35:18 -07:00
parent 7377e6c7da
commit 4044da849e
21 changed files with 98 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/import_fragment.xml
View File

@ -85,7 +85,7 @@
<TextView android:layout_width="match_parent" <TextView android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/import_fragment__restore_a_previously_exported_encrypted_textsecure_backup"/> android:text="@string/import_fragment__restore_a_previously_exported_encrypted_signal_backup"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
res/layout/key_caching_notification.xml
View File

@ -28,7 +28,7 @@
android:singleLine="true" android:singleLine="true"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:ellipsize="marquee" android:ellipsize="marquee"
android:text="@string/KeyCachingService_textsecure_passphrase_cached_with_lock" android:text="@string/KeyCachingService_signal_passphrase_cached_with_lock"
/> />
</LinearLayout> </LinearLayout>

2
res/layout/prompt_apn_activity.xml
View File

@ -23,7 +23,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dip" android:layout_marginBottom="16dip"
android:text="@string/prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages"/> android:text="@string/prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages"/>
<TextView style="@style/Registration.Description" <TextView style="@style/Registration.Description"
android:layout_width="fill_parent" android:layout_width="fill_parent"

2
res/layout/registration_activity.xml
View File

@ -62,7 +62,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_marginBottom="8dip" android:layout_marginBottom="8dip"
android:layout_marginTop="16dip" android:layout_marginTop="16dip"
android:text="@string/registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users"/> android:text="@string/registration_activity__verify_your_number_to_connect_with_signal"/>
<TextView style="@style/Registration.Description" <TextView style="@style/Registration.Description"
android:layout_width="fill_parent" android:layout_width="fill_parent"

2
res/layout/registration_problems.xml
View File

@ -100,7 +100,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingRight="10dip" android:paddingRight="10dip"
android:text="@string/registration_problems__textsecure_will_not_work_with_google_voice_numbers" /> android:text="@string/registration_problems__signal_will_not_work_with_google_voice_numbers" />
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>
</TableLayout> </TableLayout>

8
res/layout/registration_progress_activity.xml
View File

@ -57,7 +57,7 @@
android:layout_below="@+id/alert" android:layout_below="@+id/alert"
android:paddingLeft="4dip" android:paddingLeft="4dip"
android:paddingRight="4dip" android:paddingRight="4dip"
android:text="@string/registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message" /> android:text="@string/registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message" />
</RelativeLayout> </RelativeLayout>
@ -94,7 +94,7 @@
android:paddingLeft="4dip" android:paddingLeft="4dip"
android:paddingRight="4dip" android:paddingRight="4dip"
android:paddingBottom="10dip" android:paddingBottom="10dip"
android:text="@string/registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number"/> android:text="@string/registration_progress_activity__signal_can_also_call_you_to_verify_your_number"/>
<LinearLayout android:id="@+id/code_container" <LinearLayout android:id="@+id/code_container"
android:orientation="horizontal" android:orientation="horizontal"
@ -188,7 +188,7 @@
android:layout_below="@+id/connectivity_alert" android:layout_below="@+id/connectivity_alert"
android:paddingLeft="4dip" android:paddingLeft="4dip"
android:paddingRight="4dip" android:paddingRight="4dip"
android:text="@string/registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service" /> android:text="@string/registration_progress_activity__signal_was_unable_to_connect_to_the_push_service" />
</RelativeLayout> </RelativeLayout>
<Button <Button
@ -289,7 +289,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
android:paddingLeft="5dip" android:paddingLeft="5dip"
android:text="@string/registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message" /> android:text="@string/registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message" />
<TableLayout <TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"

124
res/values/strings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">TextSecure</string> <string name="app_name">Signal</string>
<string name="yes">Yes</string> <string name="yes">Yes</string>
<string name="no">No</string> <string name="no">No</string>
<string name="delete">Delete</string> <string name="delete">Delete</string>
@ -19,17 +19,17 @@
</string> </string>
<string name="ApplicationPreferencesActivity_disable">Disable</string> <string name="ApplicationPreferencesActivity_disable">Disable</string>
<string name="ApplicationPreferencesActivity_unregistering">Unregistering</string> <string name="ApplicationPreferencesActivity_unregistering">Unregistering</string>
<string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Unregistering from TextSecure messages...</string> <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">Unregistering from Signal messages...</string>
<string name="ApplicationPreferencesActivity_disable_textsecure_messages">Disable TextSecure messages?</string> <string name="ApplicationPreferencesActivity_disable_signal_messages">Disable Signal messages?</string>
<string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages"> <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">
This will disable TextSecure messages by unregistering you from the server. This will disable Signal messages by unregistering you from the server.
You will need to re-register your phone number to use TextSecure messages again in the future. You will need to re-register your phone number to use Signal messages again in the future.
</string> </string>
<string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connecting to server!</string> <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connecting to server!</string>
<string name="ApplicationPreferencesActivity_sms_enabled">SMS Enabled</string> <string name="ApplicationPreferencesActivity_sms_enabled">SMS Enabled</string>
<string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Touch to change your default SMS app</string> <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Touch to change your default SMS app</string>
<string name="ApplicationPreferencesActivity_sms_disabled">SMS Disabled</string> <string name="ApplicationPreferencesActivity_sms_disabled">SMS Disabled</string>
<string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Touch to make TextSecure your default SMS app</string> <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Touch to make Signal your default SMS app</string>
<string name="ApplicationPreferencesActivity_on">on</string> <string name="ApplicationPreferencesActivity_on">on</string>
<string name="ApplicationPreferencesActivity_On">On</string> <string name="ApplicationPreferencesActivity_On">On</string>
<string name="ApplicationPreferencesActivity_off">off</string> <string name="ApplicationPreferencesActivity_off">off</string>
@ -60,7 +60,7 @@
<!-- ConfirmIdentityDialog --> <!-- ConfirmIdentityDialog -->
<string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">The <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">The
identifying key material for %1$s has changed. This could either mean that someone is trying to identifying key material for %1$s has changed. This could either mean that someone is trying to
intercept your communication, or that %2$s simply re-installed TextSecure and now has a new intercept your communication, or that %2$s simply re-installed Signal and now has a new
identity key. identity key.
</string> </string>
<string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">You may wish to verify <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">You may wish to verify
@ -84,7 +84,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Tap for unsecured fallback</string> <string name="ConversationItem_click_to_approve_unencrypted">Tap for unsecured fallback</string>
<string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Fallback to unencrypted SMS?</string> <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Fallback to unencrypted SMS?</string>
<string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Fallback to unencrypted MMS?</string> <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Fallback to unencrypted MMS?</string>
<string name="ConversationItem_click_to_approve_unencrypted_dialog_message">This message will <b>not</b> be encrypted because the recipient is no longer a TextSecure user.\n\nSend unsecured message?</string> <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">This message will <b>not</b> be encrypted because the recipient is no longer a Signal user.\n\nSend unsecured message?</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string> <string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<!-- ConversationActivity --> <!-- ConversationActivity -->
@ -116,7 +116,7 @@
<string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Are you sure you want to leave this group?</string> <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Are you sure you want to leave this group?</string>
<string name="ConversationActivity_transport_insecure_sms">Insecure SMS</string> <string name="ConversationActivity_transport_insecure_sms">Insecure SMS</string>
<string name="ConversationActivity_transport_insecure_mms">Insecure MMS</string> <string name="ConversationActivity_transport_insecure_mms">Insecure MMS</string>
<string name="ConversationActivity_transport_textsecure">TextSecure</string> <string name="ConversationActivity_transport_signal">Signal</string>
<string name="ConversationActivity_get_with_it">Get with it: %s</string> <string name="ConversationActivity_get_with_it">Get with it: %s</string>
<string name="ConversationActivity_lets_use_this_to_chat">Let\'s use this to chat: %s</string> <string name="ConversationActivity_lets_use_this_to_chat">Let\'s use this to chat: %s</string>
<string name="ConversationActivity_error_leaving_group">Error leaving group...</string> <string name="ConversationActivity_error_leaving_group">Error leaving group...</string>
@ -142,7 +142,7 @@
<string name="ConversationFragment_saving_attachment">Saving attachment</string> <string name="ConversationFragment_saving_attachment">Saving attachment</string>
<string name="ConversationFragment_saving_attachment_to_sd_card">Saving attachment to storage...</string> <string name="ConversationFragment_saving_attachment_to_sd_card">Saving attachment to storage...</string>
<string name="ConversationFragment_pending">Pending...</string> <string name="ConversationFragment_pending">Pending...</string>
<string name="ConversationFragment_push">Data (TextSecure)</string> <string name="ConversationFragment_push">Data (Signal)</string>
<string name="ConversationFragment_mms">MMS</string> <string name="ConversationFragment_mms">MMS</string>
<string name="ConversationFragment_sms">SMS</string> <string name="ConversationFragment_sms">SMS</string>
<string name="ConversationFragment_deleting">Deleting</string> <string name="ConversationFragment_deleting">Deleting</string>
@ -190,7 +190,7 @@
<string name="ExportFragment_export">Export</string> <string name="ExportFragment_export">Export</string>
<string name="ExportFragment_export_plaintext_to_sd_card">Export plaintext to SD card?</string> <string name="ExportFragment_export_plaintext_to_sd_card">Export plaintext to SD card?</string>
<string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Warning, this will <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Warning, this will
export the plaintext contents of your TextSecure messages to the SD card. export the plaintext contents of your Signal messages to the SD card.
</string> </string>
<string name="ExportFragment_cancel">Cancel</string> <string name="ExportFragment_cancel">Cancel</string>
<string name="ExportFragment_exporting">Exporting</string> <string name="ExportFragment_exporting">Exporting</string>
@ -200,16 +200,16 @@
<string name="ExportFragment_success">Success!</string> <string name="ExportFragment_success">Success!</string>
<!-- GcmRefreshJob --> <!-- GcmRefreshJob -->
<string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Permanent TextSecure communication failure!</string> <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Signal communication failure!</string>
<string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure was unable to register with Google Play Services. Communication over the data channel has been disabled, please try re-registering from the TextSecure settings menu.</string> <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal was unable to register with Google Play Services. Communication over the data channel has been disabled, please try re-registering from the Signal settings menu.</string>
<!-- GroupCreateActivity --> <!-- GroupCreateActivity -->
<string name="GroupCreateActivity_actionbar_title">New group</string> <string name="GroupCreateActivity_actionbar_title">New group</string>
<string name="GroupCreateActivity_actionbar_update_title">Update group</string> <string name="GroupCreateActivity_actionbar_update_title">Update group</string>
<string name="GroupCreateActivity_group_name_hint">Group name</string> <string name="GroupCreateActivity_group_name_hint">Group name</string>
<string name="GroupCreateActivity_actionbar_mms_title">New MMS group</string> <string name="GroupCreateActivity_actionbar_mms_title">New MMS group</string>
<string name="GroupCreateActivity_contacts_dont_support_push">You have selected a contact that doesn\'t support TextSecure groups, so this group will be MMS.</string> <string name="GroupCreateActivity_contacts_dont_support_push">You have selected a contact that doesn\'t support Signal groups, so this group will be MMS.</string>
<string name="GroupCreateActivity_you_dont_support_push">You\'re not registered for using the data channel, so TextSecure groups are disabled.</string> <string name="GroupCreateActivity_you_dont_support_push">You\'re not registered for using the data channel, so Signal groups are disabled.</string>
<string name="GroupCreateActivity_contacts_mms_exception">An unexpected error happened that has made group creation fail.</string> <string name="GroupCreateActivity_contacts_mms_exception">An unexpected error happened that has made group creation fail.</string>
<string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string> <string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string>
<string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string> <string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string>
@ -217,7 +217,7 @@
<string name="GroupCreateActivity_menu_create_title">Create group</string> <string name="GroupCreateActivity_menu_create_title">Create group</string>
<string name="GroupCreateActivity_creating_group">Creating %1$s&#8230;</string> <string name="GroupCreateActivity_creating_group">Creating %1$s&#8230;</string>
<string name="GroupCreateActivity_updating_group">Updating %1$s...</string> <string name="GroupCreateActivity_updating_group">Updating %1$s...</string>
<string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Cannot add non-TextSecure contacts to an existing TextSecure group</string> <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Cannot add non-Signal contacts to an existing Signal group</string>
<string name="GroupCreateActivity_loading_group_details">Loading group details...</string> <string name="GroupCreateActivity_loading_group_details">Loading group details...</string>
<!-- GroupMembersDialog --> <!-- GroupMembersDialog -->
@ -230,7 +230,7 @@
<!-- ImportFragment --> <!-- ImportFragment -->
<string name="ImportFragment_import_system_sms_database">Import system SMS database?</string> <string name="ImportFragment_import_system_sms_database">Import system SMS database?</string>
<string name="ImportFragment_this_will_import_messages_from_the_system">This will import <string name="ImportFragment_this_will_import_messages_from_the_system">This will import
messages from the system\'s default SMS database to TextSecure. If you\'ve previously messages from the system\'s default SMS database to Signal. If you\'ve previously
imported the system\'s SMS database, importing again will result in duplicated messages. imported the system\'s SMS database, importing again will result in duplicated messages.
</string> </string>
<string name="ImportFragment_import">Import</string> <string name="ImportFragment_import">Import</string>
@ -238,7 +238,7 @@
<string name="ImportFragment_restore_encrypted_backup">Restore encrypted backup?</string> <string name="ImportFragment_restore_encrypted_backup">Restore encrypted backup?</string>
<string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys"> <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
Restoring an encrypted backup will completely replace your existing keys, preferences, and Restoring an encrypted backup will completely replace your existing keys, preferences, and
messages. You will lose any information that\'s in your current TextSecure install but not messages. You will lose any information that\'s in your current Signal install but not
in the backup. in the backup.
</string> </string>
<string name="ImportFragment_restore">Restore</string> <string name="ImportFragment_restore">Restore</string>
@ -260,7 +260,7 @@
<!-- KeyScanningActivity --> <!-- KeyScanningActivity -->
<string name="KeyScanningActivity_no_scanned_key_found_exclamation">No scanned key found!</string> <string name="KeyScanningActivity_no_scanned_key_found_exclamation">No scanned key found!</string>
<string name="KeyScanningActivity_install_barcode_Scanner">Install Barcode Scanner?</string> <string name="KeyScanningActivity_install_barcode_Scanner">Install Barcode Scanner?</string>
<string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure needs Barcode Scanner for QR codes.</string> <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Signal needs Barcode Scanner for QR codes.</string>
<!-- MessageDetailsRecipient --> <!-- MessageDetailsRecipient -->
<string name="MessageDetailsRecipient_failed_to_send">Failed to send</string> <string name="MessageDetailsRecipient_failed_to_send">Failed to send</string>
@ -275,7 +275,7 @@
<string name="NotificationMmsMessageRecord_multimedia_message">Multimedia message</string> <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia message</string>
<!-- MessageRecord --> <!-- MessageRecord -->
<string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Received a message encrypted using an old version of TextSecure that is no longer supported. Please ask the sender to upgrade to the most recent version and resend the message.</string> <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Received a message encrypted using an old version of Signal that is no longer supported. Please ask the sender to upgrade to the most recent version and resend the message.</string>
<string name="MessageRecord_left_group">You have left the group.</string> <string name="MessageRecord_left_group">You have left the group.</string>
<string name="MessageRecord_updated_group">Updated the group.</string> <string name="MessageRecord_updated_group">Updated the group.</string>
@ -304,7 +304,7 @@
<!-- PassphrasePromptActivity --> <!-- PassphrasePromptActivity -->
<string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string> <string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
<string name="PassphrasePromptActivity_watermark_content_description">TextSecure icon</string> <string name="PassphrasePromptActivity_watermark_content_description">Signal icon</string>
<string name="PassphrasePromptActivity_ok_button_content_description">Submit passphrase</string> <string name="PassphrasePromptActivity_ok_button_content_description">Submit passphrase</string>
<string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Invalid passphrase!</string> <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Invalid passphrase!</string>
@ -329,7 +329,7 @@
<string name="RecipientPreferenceActivity_disabled">Disabled</string> <string name="RecipientPreferenceActivity_disabled">Disabled</string>
<!-- RegistrationActivity --> <!-- RegistrationActivity -->
<string name="RegistrationActivity_connect_with_textsecure">Connect With TextSecure</string> <string name="RegistrationActivity_connect_with_signal">Connect With Signal</string>
<string name="RegistrationActivity_select_your_country">Select your country</string> <string name="RegistrationActivity_select_your_country">Select your country</string>
<string name="RegistrationActivity_you_must_specify_your_country_code">You must specify your <string name="RegistrationActivity_you_must_specify_your_country_code">You must specify your
country code country code
@ -376,13 +376,13 @@
<string name="RegistrationProgressActivity_too_many_requests">Too many requests!</string> <string name="RegistrationProgressActivity_too_many_requests">Too many requests!</string>
<string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">You\'ve already recently requested a voice call. You can request another in 20 minutes.</string> <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">You\'ve already recently requested a voice call. You can request another in 20 minutes.</string>
<string name="RegistrationProgressActivity_registration_conflict">Registration conflict</string> <string name="RegistrationProgressActivity_registration_conflict">Registration conflict</string>
<string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">This number is already registered on a different TextSecure server (CyanogenMod?). You must unregister there before registering here.</string> <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">This number is already registered on a different Signal server (CyanogenMod?). You must unregister there before registering here.</string>
<!-- RegistrationService --> <!-- RegistrationService -->
<string name="RegistrationService_registration_complete">Registration complete</string> <string name="RegistrationService_registration_complete">Registration complete</string>
<string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registration has successfully completed.</string> <string name="RegistrationService_signal_registration_has_successfully_completed">Signal registration has successfully completed.</string>
<string name="RegistrationService_registration_error">Registration error</string> <string name="RegistrationService_registration_error">Registration error</string>
<string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure registration has encountered a problem.</string> <string name="RegistrationService_signal_registration_has_encountered_a_problem">Signal registration has encountered a problem.</string>
<!-- Slide --> <!-- Slide -->
<string name="Slide_image">Image</string> <string name="Slide_image">Image</string>
@ -467,9 +467,9 @@
<string name="ApplicationMigrationService_importing_text_messages">Importing text messages</string> <string name="ApplicationMigrationService_importing_text_messages">Importing text messages</string>
<!-- KeyCachingService --> <!-- KeyCachingService -->
<string name="KeyCachingService_textsecure_passphrase_cached">Touch to open.</string> <string name="KeyCachingService_signal_passphrase_cached">Touch to open.</string>
<string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Touch to open, or touch the lock to close.</string> <string name="KeyCachingService_signal_passphrase_cached_with_lock">Touch to open, or touch the lock to close.</string>
<string name="KeyCachingService_passphrase_cached">TextSecure is unlocked</string> <string name="KeyCachingService_passphrase_cached">Signal is unlocked</string>
<string name="KeyCachingService_lock">Lock with passphrase</string> <string name="KeyCachingService_lock">Lock with passphrase</string>
<!-- MessageNotifier --> <!-- MessageNotifier -->
@ -487,11 +487,11 @@
<string name="MessageNotifier_reply">Reply</string> <string name="MessageNotifier_reply">Reply</string>
<!-- QuickResponseService --> <!-- QuickResponseService -->
<string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Quick response unavailable when TextSecure is locked!</string> <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Quick response unavailable when Signal is locked!</string>
<string name="QuickResponseService_problem_sending_message">Problem sending message!</string> <string name="QuickResponseService_problem_sending_message">Problem sending message!</string>
<!-- SingleRecipientNotificationBuilder --> <!-- SingleRecipientNotificationBuilder -->
<string name="SingleRecipientNotificationBuilder_new_textsecure_message">New TextSecure message</string> <string name="SingleRecipientNotificationBuilder_new_signal_message">New Signal message</string>
<string name="SingleRecipientNotificationBuilder_contents_hidden">Contents hidden</string> <string name="SingleRecipientNotificationBuilder_contents_hidden">Contents hidden</string>
<!-- change_passphrase_activity --> <!-- change_passphrase_activity -->
@ -522,7 +522,7 @@
<string name="conversation_title_view__conversation_muted">Conversation muted</string> <string name="conversation_title_view__conversation_muted">Conversation muted</string>
<!-- conversation_activity --> <!-- conversation_activity -->
<string name="conversation_activity__type_message_push">Send TextSecure message</string> <string name="conversation_activity__type_message_push">Send Signal message</string>
<string name="conversation_activity__type_message_sms_insecure">Send unsecured SMS</string> <string name="conversation_activity__type_message_sms_insecure">Send unsecured SMS</string>
<string name="conversation_activity__type_message_mms_insecure">Send unsecured MMS</string> <string name="conversation_activity__type_message_mms_insecure">Send unsecured MMS</string>
<string name="conversation_activity__send">Send</string> <string name="conversation_activity__send">Send</string>
@ -568,7 +568,7 @@
<string name="log_submit_activity__posting_logs">Posting logs to gist&#8230;</string> <string name="log_submit_activity__posting_logs">Posting logs to gist&#8230;</string>
<!-- database_migration_activity --> <!-- 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 Signal\'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__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__skip">Skip</string>
<string name="database_migration_activity__import">Import</string> <string name="database_migration_activity__import">Import</string>
@ -586,8 +586,8 @@
from the default system messenger app. from the default system messenger app.
</string> </string>
<string name="import_fragment__import_encrypted_backup">Import encrypted backup</string> <string name="import_fragment__import_encrypted_backup">Import encrypted backup</string>
<string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup"> <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">
Restore a previously exported encrypted TextSecure backup. Restore a previously exported encrypted Signal backup.
</string> </string>
<string name="import_fragment__import_plaintext_backup">Import plaintext backup</string> <string name="import_fragment__import_plaintext_backup">Import plaintext backup</string>
<string name="import_fragment__import_a_plaintext_backup_file"> <string name="import_fragment__import_a_plaintext_backup_file">
@ -617,7 +617,7 @@
<string name="prompt_passphrase_activity__unlock">Unlock</string> <string name="prompt_passphrase_activity__unlock">Unlock</string>
<!-- prompt_mms_activity --> <!-- prompt_mms_activity -->
<string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure requires MMS settings to deliver media and group messages through your wireless carrier. Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string> <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal requires MMS settings to deliver media and group messages through your wireless carrier. Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
<string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">To send media and group messages, click \'OK\' and complete the requested settings. The MMS settings for your carrier can generally be located by searching for \'your carrier APN\'. You will only need to do this once.</string> <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">To send media and group messages, click \'OK\' and complete the requested settings. The MMS settings for your carrier can generally be located by searching for \'your carrier APN\'. You will only need to do this once.</string>
<!-- recipient_preferences_activity --> <!-- recipient_preferences_activity -->
@ -633,8 +633,8 @@
<string name="recipient_preferences__color_for_this_contact">Color for this contact</string> <string name="recipient_preferences__color_for_this_contact">Color for this contact</string>
<!-- registration_activity --> <!-- registration_activity -->
<string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users"> <string name="registration_activity__verify_your_number_to_connect_with_signal">
Verify your phone number to connect with TextSecure. Verify your phone number to connect with Signal.
</string> </string>
<string name="registration_activity__your_country">YOUR COUNTRY</string> <string name="registration_activity__your_country">YOUR COUNTRY</string>
<string name="registration_activity__your_country_code_and_phone_number">YOUR COUNTRY CODE AND <string name="registration_activity__your_country_code_and_phone_number">YOUR COUNTRY CODE AND
@ -653,7 +653,7 @@
<string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent"> <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
Some third party text messaging clients, such as Handcent or GoSMS, behave poorly and Some third party text messaging clients, such as Handcent or GoSMS, behave poorly and
intercept all incoming SMS messages. Check to see if you received a text message that starts intercept all incoming SMS messages. Check to see if you received a text message that starts
with \'Your TextSecure verification code:\', in which case you\'ll need to configure your with \'Your Signal verification code:\', in which case you\'ll need to configure your
third party text messaging app to let text messages through. third party text messaging app to let text messages through.
</string> </string>
<string name="registration_problems__incorrect_number">Incorrect number.</string> <string name="registration_problems__incorrect_number">Incorrect number.</string>
@ -662,22 +662,22 @@
your region. your region.
</string> </string>
<string name="registration_problems__google_voice">Google Voice.</string> <string name="registration_problems__google_voice">Google Voice.</string>
<string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers"> <string name="registration_problems__signal_will_not_work_with_google_voice_numbers">
TextSecure will not work with Google Voice numbers. Signal will not work with Google Voice numbers.
</string> </string>
<!-- registration_progress_activity --> <!-- registration_progress_activity -->
<string name="registration_progress_activity__voice_verification">Voice verification</string> <string name="registration_progress_activity__voice_verification">Voice verification</string>
<string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number"> <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
TextSecure can also call you to verify your number. Tap \'Call Me\' and enter the six digit Signal can also call you to verify your number. Tap \'Call Me\' and enter the six digit
code that you hear below. code that you hear below.
</string> </string>
<string name="registration_progress_activity__verify">Verify</string> <string name="registration_progress_activity__verify">Verify</string>
<string name="registration_progress_activity__call_me">Call me</string> <string name="registration_progress_activity__call_me">Call me</string>
<string name="registration_progress_activity__edit_number">Edit number</string> <string name="registration_progress_activity__edit_number">Edit number</string>
<string name="registration_progress_activity__connectivity_error">Connectivity error.</string> <string name="registration_progress_activity__connectivity_error">Connectivity error.</string>
<string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service"> <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
TextSecure was unable to connect to the push service. Signal was unable to connect to the push service.
</string> </string>
<string name="registration_progress_activity__some_possible_problems_include">Some possible <string name="registration_progress_activity__some_possible_problems_include">Some possible
problems include: problems include:
@ -686,17 +686,17 @@
connectivity. connectivity.
</string> </string>
<string name="registration_progress_activity__your_device_needs_network_connectivity">Your <string name="registration_progress_activity__your_device_needs_network_connectivity">Your
device needs network connectivity in order to use this TextSecure feature. Check to ensure device needs network connectivity in order to use this Signal feature. Check to ensure
that it is connected to 3G or Wi-Fi. that it is connected to 3G or Wi-Fi.
</string> </string>
<string name="registration_progress_activity__restrictive_firewall">Restrictive firewall. <string name="registration_progress_activity__restrictive_firewall">Restrictive firewall.
</string> </string>
<string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall"> <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
If you are connected via Wi-Fi, it\'s possible that there is a firewall blocking access to If you are connected via Wi-Fi, it\'s possible that there is a firewall blocking access to
the TextSecure server. Try another network or mobile data. the Signal server. Try another network or mobile data.
</string> </string>
<string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message"> <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
TextSecure will now automatically verify your number with a confirmation SMS message. Signal will now automatically verify your number with a confirmation SMS message.
</string> </string>
<string name="registration_progress_activity__connecting">Connecting...</string> <string name="registration_progress_activity__connecting">Connecting...</string>
<string name="registration_progress_activity__waiting_for_sms_verification">Waiting for SMS <string name="registration_progress_activity__waiting_for_sms_verification">Waiting for SMS
@ -706,8 +706,8 @@
<string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">This <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">This
could take a moment. Please be patient, we\'ll notify you when verification is complete. could take a moment. Please be patient, we\'ll notify you when verification is complete.
</string> </string>
<string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message"> <string name="registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message">
TextSecure timed out while waiting for a verification SMS message. Signal timed out while waiting for a verification SMS message.
</string> </string>
<string name="registration_progress_activity__sms_verification_failed">SMS verification <string name="registration_progress_activity__sms_verification_failed">SMS verification
failed. failed.
@ -738,7 +738,7 @@
<string name="AndroidManifest__create_passphrase">Create passphrase</string> <string name="AndroidManifest__create_passphrase">Create passphrase</string>
<string name="AndroidManifest__enter_passphrase">Enter passphrase</string> <string name="AndroidManifest__enter_passphrase">Enter passphrase</string>
<string name="AndroidManifest__select_contacts">Select contacts</string> <string name="AndroidManifest__select_contacts">Select contacts</string>
<string name="AndroidManifest__textsecure_detected">TextSecure detected</string> <string name="AndroidManifest__signal_detected">Signal detected</string>
<string name="AndroidManifest__public_identity_key">Public identity key</string> <string name="AndroidManifest__public_identity_key">Public identity key</string>
<string name="AndroidManifest__change_passphrase">Change passphrase</string> <string name="AndroidManifest__change_passphrase">Change passphrase</string>
<string name="AndroidManifest__verify_identity">Verify identity</string> <string name="AndroidManifest__verify_identity">Verify identity</string>
@ -783,8 +783,8 @@
<string name="preferences__sms_mms">SMS and MMS</string> <string name="preferences__sms_mms">SMS and MMS</string>
<string name="preferences__pref_all_sms_title">Receive all SMS</string> <string name="preferences__pref_all_sms_title">Receive all SMS</string>
<string name="preferences__pref_all_mms_title">Receive all MMS</string> <string name="preferences__pref_all_mms_title">Receive all MMS</string>
<string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Use TextSecure for all incoming text messages</string> <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_text_messages">Use Signal for all incoming text messages</string>
<string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Use TextSecure for all incoming multimedia messages</string> <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_multimedia_messages">Use Signal for all incoming multimedia messages</string>
<string name="preferences__input_settings">Input Settings</string> <string name="preferences__input_settings">Input Settings</string>
<string name="preferences__enable_enter_key_title">Enable Enter key</string> <string name="preferences__enable_enter_key_title">Enable Enter key</string>
<string name="preferences__replace_smiley_with_enter_key">Replace the smiley key with an Enter key</string> <string name="preferences__replace_smiley_with_enter_key">Replace the smiley key with an Enter key</string>
@ -869,9 +869,9 @@
<string name="preferences__default">Default</string> <string name="preferences__default">Default</string>
<string name="preferences__language">Language</string> <string name="preferences__language">Language</string>
<string name="preferences__language_summary">Language %s</string> <string name="preferences__language_summary">Language %s</string>
<string name="preferences__textsecure_messages">TextSecure messages</string> <string name="preferences__signal_messages">Signal messages</string>
<string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users"> <string name="preferences__use_the_data_channel_for_communication_with_other_signal_users">
Free private messaging to TextSecure and Signal users Free private messaging to Signal and Signal users
</string> </string>
<string name="preferences__submit_debug_log">Submit debug log</string> <string name="preferences__submit_debug_log">Submit debug log</string>
<string name="preferences__support_wifi_calling">\'WiFi Calling\' compatibility mode</string> <string name="preferences__support_wifi_calling">\'WiFi Calling\' compatibility mode</string>
@ -884,7 +884,7 @@
<string name="preferences_chats__media_auto_download">Media auto-download</string> <string name="preferences_chats__media_auto_download">Media auto-download</string>
<string name="preferences_chats__message_trimming">Message trimming</string> <string name="preferences_chats__message_trimming">Message trimming</string>
<string name="preferences_advanced__use_system_emoji">Use system emoji</string> <string name="preferences_advanced__use_system_emoji">Use system emoji</string>
<string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Disable TextSecure\'s built-in emoji support</string> <string name="preferences_advanced__disable_signal_built_in_emoji_support">Disable Signal\'s built-in emoji support</string>
<!-- **************************************** --> <!-- **************************************** -->
<!-- menus --> <!-- menus -->
@ -893,7 +893,7 @@
<!-- contact_selection_list --> <!-- contact_selection_list -->
<string name="contact_selection_list__menu_select_all">Select all</string> <string name="contact_selection_list__menu_select_all">Select all</string>
<string name="contact_selection_list__menu_unselect_all">Unselect all</string> <string name="contact_selection_list__menu_unselect_all">Unselect all</string>
<string name="contact_selection_list__header_textsecure_users">TEXTSECURE USERS</string> <string name="contact_selection_list__header_signal_users">SIGNAL USERS</string>
<string name="contact_selection_list__header_other">ALL CONTACTS</string> <string name="contact_selection_list__header_other">ALL CONTACTS</string>
<string name="contact_selection_list__unknown_contact">New message to...</string> <string name="contact_selection_list__unknown_contact">New message to...</string>
@ -981,13 +981,13 @@
<string name="text_secure_normal__mark_all_as_read">Mark all read</string> <string name="text_secure_normal__mark_all_as_read">Mark all read</string>
<!-- reminder_header --> <!-- reminder_header -->
<string name="reminder_header_expired_build">Your build of TextSecure has expired!</string> <string name="reminder_header_expired_build">Your build of Signal has expired!</string>
<string name="reminder_header_expired_build_details">Messages will no longer send successfully, please update to the most recent version.</string> <string name="reminder_header_expired_build_details">Messages will no longer send successfully, please update to the most recent version.</string>
<string name="reminder_header_sms_default_title">Use as default SMS app?</string> <string name="reminder_header_sms_default_title">Use as default SMS app?</string>
<string name="reminder_header_sms_default_text">Tap to make TextSecure your default SMS app.</string> <string name="reminder_header_sms_default_text">Tap to make Signal your default SMS app.</string>
<string name="reminder_header_sms_import_title">Import system SMS?</string> <string name="reminder_header_sms_import_title">Import system SMS?</string>
<string name="reminder_header_sms_import_text">Tap to copy your phone\'s SMS messages into its encrypted database.</string> <string name="reminder_header_sms_import_text">Tap to copy your phone\'s SMS messages into its encrypted database.</string>
<string name="reminder_header_push_title">Enable TextSecure messages?</string> <string name="reminder_header_push_title">Enable Signal messages?</string>
<string name="reminder_header_push_text">Tap for instant delivery, stronger privacy, and no SMS fees.</string> <string name="reminder_header_push_text">Tap for instant delivery, stronger privacy, and no SMS fees.</string>
<!-- MediaPreviewActivity --> <!-- MediaPreviewActivity -->

6
res/xml/preferences_advanced.xml
View File

@ -4,8 +4,8 @@
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="pref_toggle_push_messaging" android:key="pref_toggle_push_messaging"
android:title="@string/preferences__textsecure_messages" android:title="@string/preferences__signal_messages"
android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_textsecure_users"/> android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_signal_users"/>
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
@ -16,7 +16,7 @@
<CheckBoxPreference android:defaultValue="false" <CheckBoxPreference android:defaultValue="false"
android:key="pref_system_emoji" android:key="pref_system_emoji"
android:title="@string/preferences_advanced__use_system_emoji" android:title="@string/preferences_advanced__use_system_emoji"
android:summary="@string/preferences_advanced__disable_textsecures_built_in_emoji_support" /> android:summary="@string/preferences_advanced__disable_signal_built_in_emoji_support" />
<Preference android:key="pref_choose_identity" <Preference android:key="pref_choose_identity"
android:title="@string/preferences__choose_identity" android:title="@string/preferences__choose_identity"

6
res/xml/preferences_sms_mms.xml
View File

@ -4,18 +4,18 @@
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="true"
android:key="pref_all_sms" android:key="pref_all_sms"
android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages" android:summary="@string/preferences__use_signal_for_viewing_and_storing_all_incoming_text_messages"
android:title="@string/preferences__pref_all_sms_title" /> android:title="@string/preferences__pref_all_sms_title" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="true"
android:key="pref_all_mms" android:key="pref_all_mms"
android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages" android:summary="@string/preferences__use_signal_for_viewing_and_storing_all_incoming_multimedia_messages"
android:title="@string/preferences__pref_all_mms_title" /> android:title="@string/preferences__pref_all_mms_title" />
<Preference android:key="pref_set_default" <Preference android:key="pref_set_default"
android:title="@string/ApplicationPreferencesActivity_sms_disabled" android:title="@string/ApplicationPreferencesActivity_sms_disabled"
android:summary="@string/ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app" /> android:summary="@string/ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"

2
src/org/thoughtcrime/securesms/RegistrationActivity.java
View File

@ -58,7 +58,7 @@ public class RegistrationActivity extends BaseActionBarActivity {
super.onCreate(icicle); super.onCreate(icicle);
setContentView(R.layout.registration_activity); setContentView(R.layout.registration_activity);
getSupportActionBar().setTitle(getString(R.string.RegistrationActivity_connect_with_textsecure)); getSupportActionBar().setTitle(getString(R.string.RegistrationActivity_connect_with_signal));
initializeResources(); initializeResources();
initializeSpinner(); initializeSpinner();

2
src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
View File

@ -165,7 +165,7 @@ public class RegistrationProgressActivity extends BaseActionBarActivity {
private void initializeLinks() { private void initializeLinks() {
TextView failureText = (TextView) findViewById(R.id.sms_failed_text); TextView failureText = (TextView) findViewById(R.id.sms_failed_text);
String pretext = getString(R.string.registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message); String pretext = getString(R.string.registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message);
String link = getString(R.string.RegistrationProblemsActivity_possible_problems); String link = getString(R.string.RegistrationProblemsActivity_possible_problems);
SpannableString spannableString = new SpannableString(pretext + " " + link); SpannableString spannableString = new SpannableString(pretext + " " + link);

3
src/org/thoughtcrime/securesms/TransportOptions.java
View File

@ -1,7 +1,6 @@
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray;
import org.thoughtcrime.securesms.util.MmsCharacterCalculator; import org.thoughtcrime.securesms.util.MmsCharacterCalculator;
import org.thoughtcrime.securesms.util.PushCharacterCalculator; import org.thoughtcrime.securesms.util.PushCharacterCalculator;
@ -100,7 +99,7 @@ public class TransportOptions {
results.add(new TransportOption(Type.TEXTSECURE, R.drawable.ic_send_push_white_24dp, results.add(new TransportOption(Type.TEXTSECURE, R.drawable.ic_send_push_white_24dp,
context.getResources().getColor(R.color.textsecure_primary), context.getResources().getColor(R.color.textsecure_primary),
context.getString(R.string.ConversationActivity_transport_textsecure), context.getString(R.string.ConversationActivity_transport_signal),
context.getString(R.string.conversation_activity__type_message_push), context.getString(R.string.conversation_activity__type_message_push),
new PushCharacterCalculator())); new PushCharacterCalculator()));

2
src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
View File

@ -107,7 +107,7 @@ public class ContactSelectionListAdapter extends CursorAdapter
int contactType = cursor.getInt(cursor.getColumnIndexOrThrow(ContactsDatabase.CONTACT_TYPE_COLUMN)); int contactType = cursor.getInt(cursor.getColumnIndexOrThrow(ContactsDatabase.CONTACT_TYPE_COLUMN));
if (contactType == ContactsDatabase.PUSH_TYPE) holder.text.setText(R.string.contact_selection_list__header_textsecure_users); if (contactType == ContactsDatabase.PUSH_TYPE) holder.text.setText(R.string.contact_selection_list__header_signal_users);
else holder.text.setText(R.string.contact_selection_list__header_other); else holder.text.setText(R.string.contact_selection_list__header_other);
return convertView; return convertView;

6
src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
View File

@ -90,9 +90,9 @@ public class GcmRefreshJob extends ContextJob {
builder.setSmallIcon(R.drawable.icon_notification); builder.setSmallIcon(R.drawable.icon_notification);
builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(),
R.drawable.ic_action_warning_red)); R.drawable.ic_action_warning_red));
builder.setContentTitle(context.getString(R.string.GcmRefreshJob_Permanent_TextSecure_communication_failure)); builder.setContentTitle(context.getString(R.string.GcmRefreshJob_Permanent_Signal_communication_failure));
builder.setContentText(context.getString(R.string.GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services)); builder.setContentText(context.getString(R.string.GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services));
builder.setTicker(context.getString(R.string.GcmRefreshJob_Permanent_TextSecure_communication_failure)); builder.setTicker(context.getString(R.string.GcmRefreshJob_Permanent_Signal_communication_failure));
builder.setVibrate(new long[] {0, 1000}); builder.setVibrate(new long[] {0, 1000});
builder.setContentIntent(pendingIntent); builder.setContentIntent(pendingIntent);

6
src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
View File

@ -67,7 +67,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
.asDrawable(context, recipient.getColor() .asDrawable(context, recipient.getColor()
.toConversationColor(context))); .toConversationColor(context)));
} else { } else {
setContentTitle(context.getString(R.string.SingleRecipientNotificationBuilder_new_textsecure_message)); setContentTitle(context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message));
setLargeIcon(Recipient.getUnknownRecipient() setLargeIcon(Recipient.getUnknownRecipient()
.getContactPhoto() .getContactPhoto()
.asDrawable(context, Recipient.getUnknownRecipient() .asDrawable(context, Recipient.getUnknownRecipient()
@ -133,9 +133,9 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
if (privacy.isDisplayMessage()) { if (privacy.isDisplayMessage()) {
setTicker(getStyledMessage(recipient, message)); setTicker(getStyledMessage(recipient, message));
} else if (privacy.isDisplayContact()) { } else if (privacy.isDisplayContact()) {
setTicker(getStyledMessage(recipient, context.getString(R.string.SingleRecipientNotificationBuilder_new_textsecure_message))); setTicker(getStyledMessage(recipient, context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message)));
} else { } else {
setTicker(context.getString(R.string.SingleRecipientNotificationBuilder_new_textsecure_message)); setTicker(context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message));
} }
} }

6
src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
View File

@ -154,7 +154,7 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
private final CheckBoxPreference checkBoxPreference; private final CheckBoxPreference checkBoxPreference;
public DisablePushMessagesTask(final CheckBoxPreference checkBoxPreference) { public DisablePushMessagesTask(final CheckBoxPreference checkBoxPreference) {
super(getActivity(), R.string.ApplicationPreferencesActivity_unregistering, R.string.ApplicationPreferencesActivity_unregistering_from_textsecure_messages); super(getActivity(), R.string.ApplicationPreferencesActivity_unregistering, R.string.ApplicationPreferencesActivity_unregistering_from_signal_messages);
this.checkBoxPreference = checkBoxPreference; this.checkBoxPreference = checkBoxPreference;
} }
@ -204,8 +204,8 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
if (((CheckBoxPreference)preference).isChecked()) { if (((CheckBoxPreference)preference).isChecked()) {
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity()); AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
builder.setIconAttribute(R.attr.dialog_info_icon); builder.setIconAttribute(R.attr.dialog_info_icon);
builder.setTitle(R.string.ApplicationPreferencesActivity_disable_textsecure_messages); builder.setTitle(R.string.ApplicationPreferencesActivity_disable_signal_messages);
builder.setMessage(R.string.ApplicationPreferencesActivity_this_will_disable_textsecure_messages); builder.setMessage(R.string.ApplicationPreferencesActivity_this_will_disable_signal_messages);
builder.setNegativeButton(android.R.string.cancel, null); builder.setNegativeButton(android.R.string.cancel, null);
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override @Override

2
src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
View File

@ -61,7 +61,7 @@ public class SmsMmsPreferenceFragment extends PreferenceFragment {
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, getActivity().getPackageName()); intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, getActivity().getPackageName());
defaultPreference.setIntent(intent); defaultPreference.setIntent(intent);
defaultPreference.setTitle(getString(R.string.ApplicationPreferencesActivity_sms_disabled)); defaultPreference.setTitle(getString(R.string.ApplicationPreferencesActivity_sms_disabled));
defaultPreference.setSummary(getString(R.string.ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app)); defaultPreference.setSummary(getString(R.string.ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app));
} }
} else if (defaultPreference != null) { } else if (defaultPreference != null) {
preferenceScreen.removePreference(defaultPreference); preferenceScreen.removePreference(defaultPreference);

8
src/org/thoughtcrime/securesms/service/KeyCachingService.java
View File

@ -44,9 +44,7 @@ import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
import org.thoughtcrime.securesms.jobs.MasterSecretDecryptJob; import org.thoughtcrime.securesms.jobs.MasterSecretDecryptJob;
import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.ParcelUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.jobqueue.EncryptionKeys;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -240,7 +238,7 @@ public class KeyCachingService extends Service {
NotificationCompat.Builder builder = new NotificationCompat.Builder(this); NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
builder.setContentTitle(getString(R.string.KeyCachingService_passphrase_cached)); builder.setContentTitle(getString(R.string.KeyCachingService_passphrase_cached));
builder.setContentText(getString(R.string.KeyCachingService_textsecure_passphrase_cached)); builder.setContentText(getString(R.string.KeyCachingService_signal_passphrase_cached));
builder.setSmallIcon(R.drawable.icon_cached); builder.setSmallIcon(R.drawable.icon_cached);
builder.setWhen(0); builder.setWhen(0);
builder.setPriority(Notification.PRIORITY_MIN); builder.setPriority(Notification.PRIORITY_MIN);
@ -268,11 +266,11 @@ public class KeyCachingService extends Service {
private void foregroundServiceLegacy() { private void foregroundServiceLegacy() {
Notification notification = new Notification(R.drawable.icon_cached, Notification notification = new Notification(R.drawable.icon_cached,
getString(R.string.KeyCachingService_textsecure_passphrase_cached), getString(R.string.KeyCachingService_signal_passphrase_cached),
System.currentTimeMillis()); System.currentTimeMillis());
notification.setLatestEventInfo(getApplicationContext(), notification.setLatestEventInfo(getApplicationContext(),
getString(R.string.KeyCachingService_passphrase_cached), getString(R.string.KeyCachingService_passphrase_cached),
getString(R.string.KeyCachingService_textsecure_passphrase_cached), getString(R.string.KeyCachingService_signal_passphrase_cached),
buildLaunchIntent()); buildLaunchIntent());
notification.tickerText = null; notification.tickerText = null;

2
src/org/thoughtcrime/securesms/service/QuickResponseService.java
View File

@ -38,7 +38,7 @@ public class QuickResponseService extends MasterSecretIntentService {
if (masterSecret == null) { if (masterSecret == null) {
Log.w(TAG, "Got quick response request when locked..."); Log.w(TAG, "Got quick response request when locked...");
Toast.makeText(this, R.string.QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.QuickResponseService_quick_response_unavailable_when_Signal_is_locked, Toast.LENGTH_LONG).show();
return; return;
} }

4
src/org/thoughtcrime/securesms/service/RegistrationService.java
View File

@ -319,10 +319,10 @@ public class RegistrationService extends Service {
if (success) { if (success) {
intent.putExtra(NOTIFICATION_TITLE, getString(R.string.RegistrationService_registration_complete)); intent.putExtra(NOTIFICATION_TITLE, getString(R.string.RegistrationService_registration_complete));
intent.putExtra(NOTIFICATION_TEXT, getString(R.string.RegistrationService_textsecure_registration_has_successfully_completed)); intent.putExtra(NOTIFICATION_TEXT, getString(R.string.RegistrationService_signal_registration_has_successfully_completed));
} else { } else {
intent.putExtra(NOTIFICATION_TITLE, getString(R.string.RegistrationService_registration_error)); intent.putExtra(NOTIFICATION_TITLE, getString(R.string.RegistrationService_registration_error));
intent.putExtra(NOTIFICATION_TEXT, getString(R.string.RegistrationService_textsecure_registration_has_encountered_a_problem)); intent.putExtra(NOTIFICATION_TEXT, getString(R.string.RegistrationService_signal_registration_has_encountered_a_problem));
} }
this.sendOrderedBroadcast(intent, null); this.sendOrderedBroadcast(intent, null);

2
test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentTest.java
View File

@ -97,7 +97,7 @@ public class AdvancedPreferenceFragmentTest extends TextSecureEspressoTestCase<C
loadActivity(ConversationListActivity.class, STATE_REGISTERED); loadActivity(ConversationListActivity.class, STATE_REGISTERED);
clickAdvancedSettingAndCheckState(); clickAdvancedSettingAndCheckState();
AdvancedPreferenceFragmentActions.clickTextSecureMessages(); AdvancedPreferenceFragmentActions.clickTextSecureMessages();
onView(withText(R.string.ApplicationPreferencesActivity_disable_textsecure_messages)) onView(withText(R.string.ApplicationPreferencesActivity_disable_signal_messages))
.check(matches(isDisplayed())); .check(matches(isDisplayed()));
onView(withText(android.R.string.cancel)).perform(click()); onView(withText(android.R.string.cancel)).perform(click());
} }