Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the word 'chat' instead of 'conversation'.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-04-24 11:48:00 -04:00
committed by Alex Hart
parent a5431330d1
commit 634e4abcc1
4 changed files with 32 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/src/main/res/values/strings.xml
View File

@@ -183,7 +183,7 @@
<string name="CameraContacts_recent_contacts">Recent contacts</string>
<string name="CameraContacts_signal_contacts">Signal contacts</string>
<string name="CameraContacts_signal_groups">Signal groups</string>
<string name="CameraContacts_you_can_share_with_a_maximum_of_n_conversations">You can share with a maximum of %d conversations.</string>
<string name="CameraContacts_you_can_share_with_a_maximum_of_n_conversations">You can share with a maximum of %d chats.</string>
<string name="CameraContacts_select_signal_recipients">Select Signal recipients</string>
<string name="CameraContacts_no_signal_contacts">No Signal contacts</string>
<string name="CameraContacts_you_can_only_use_the_camera_button">You can only use the camera button to send photos to Signal contacts. </string>
@@ -369,9 +369,9 @@
<string name="ConversationActivity_new_say_it_with_stickers">New! Say it with stickers</string>
<string name="ConversationActivity_cancel">Cancel</string>
<string name="ConversationActivity_delete_conversation">Delete conversation?</string>
<string name="ConversationActivity_delete_conversation">Delete chat?</string>
<string name="ConversationActivity_delete_and_leave_group">Delete and leave group?</string>
<string name="ConversationActivity_this_conversation_will_be_deleted_from_all_of_your_devices">This conversation will be deleted from all of your devices.</string>
<string name="ConversationActivity_this_conversation_will_be_deleted_from_all_of_your_devices">This chat will be deleted from all of your devices.</string>
<string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">You will leave this group, and it will be deleted from all your devices.</string>
<string name="ConversationActivity_delete">Delete</string>
<string name="ConversationActivity_delete_and_leave">Delete and leave</string>
@@ -452,7 +452,7 @@
<string name="ConversationFragment_delete_on_this_device">Delete on this device</string>
<!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
<string name="ConversationFragment_delete_everywhere">Delete everywhere</string>
<string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">This message will be deleted for everyone in the conversation if they’re on a recent version of Signal. They will be able to see that you deleted a message.</string>
<string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">This message will be deleted for everyone in the chat if they’re on a recent version of Signal. They will be able to see that you deleted a message.</string>
<string name="ConversationFragment_quoted_message_not_found">Original message not found</string>
<string name="ConversationFragment_quoted_message_no_longer_available">Original message no longer available</string>
<string name="ConversationFragment_failed_to_open_message">Failed to open message</string>
@@ -460,7 +460,7 @@
<string name="ConversationFragment_you_can_swipe_to_the_left_reply">You can swipe to the left on any message to quickly reply</string>
<string name="ConversationFragment_outgoing_view_once_media_files_are_automatically_removed">Outgoing view-once media files are automatically removed after they are sent</string>
<string name="ConversationFragment_you_already_viewed_this_message">You already viewed this message</string>
<string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">You can add notes for yourself in this conversation.\nIf your account has any linked devices, new notes will be synced.</string>
<string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">You can add notes for yourself in this chat.\nIf your account has any linked devices, new notes will be synced.</string>
<string name="ConversationFragment__d_group_members_have_the_same_name">%1$d group members have the same name.</string>
<string name="ConversationFragment__tap_to_review">Tap to review</string>
<string name="ConversationFragment__review_requests_carefully">Review requests carefully</string>
@@ -487,23 +487,23 @@
<!-- Notice on chat list when no unread chats are available, centered on display -->
<string name="ConversationListFragment__no_unread_chats">No unread chats</string>
<plurals name="ConversationListFragment_delete_selected_conversations">
<item quantity="one">Delete selected conversation?</item>
<item quantity="other">Delete selected conversations?</item>
<item quantity="one">Delete selected chat?</item>
<item quantity="other">Delete selected chats?</item>
</plurals>
<plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
<item quantity="one">This will permanently delete the selected conversation.</item>
<item quantity="other">This will permanently delete all %1$d selected conversations.</item>
<item quantity="one">This will permanently delete the selected chat.</item>
<item quantity="other">This will permanently delete all %1$d selected chats.</item>
</plurals>
<string name="ConversationListFragment_deleting">Deleting</string>
<string name="ConversationListFragment_deleting_selected_conversations">Deleting selected conversations…</string>
<string name="ConversationListFragment_deleting_selected_conversations">Deleting selected chats…</string>
<plurals name="ConversationListFragment_conversations_archived">
<item quantity="one">Conversation archived</item>
<item quantity="other">%d conversations archived</item>
<item quantity="one">Chat archived</item>
<item quantity="other">%d chats archived</item>
</plurals>
<string name="ConversationListFragment_undo">Undo</string>
<plurals name="ConversationListFragment_moved_conversations_to_inbox">
<item quantity="one">Moved conversation to inbox</item>
<item quantity="other">Moved %d conversations to inbox</item>
<item quantity="one">Moved chat to inbox</item>
<item quantity="other">Moved %d chats to inbox</item>
</plurals>
<plurals name="ConversationListFragment_read_plural">
<item quantity="one">Read</item>
@@ -538,7 +538,7 @@
<string name="ConversationListItem_key_exchange_message">Key exchange message</string>
<!-- ConversationListItemAction -->
<string name="ConversationListItemAction_archived_conversations_d">Archived conversations (%d)</string>
<string name="ConversationListItemAction_archived_conversations_d">Archived chats (%d)</string>
<!-- ConversationTitleView -->
<string name="ConversationTitleView_verified">Verified</string>
@@ -1504,10 +1504,10 @@
<!-- Shown in message request flow. Describes what will happen if you unblock an SMS user -->
<string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them_SMS">Let %1$s message you? You won\'t receive any messages until you unblock them.</string>
<string name="MessageRequestBottomView_get_updates_and_news_from_s_you_wont_receive_any_updates_until_you_unblock_them">Get updates and news from %1$s? You won\'t receive any updates until you unblock them.</string>
<string name="MessageRequestBottomView_continue_your_conversation_with_this_group_and_share_your_name_and_photo">Continue your conversation with this group and share your name and photo with its members?</string>
<string name="MessageRequestBottomView_continue_your_conversation_with_this_group_and_share_your_name_and_photo">Continue your chat with this group and share your name and photo with its members?</string>
<string name="MessageRequestBottomView_upgrade_this_group_to_activate_new_features">Upgrade this group to activate new features like @mentions and admins. Members who have not shared their name or photo in this group will be invited to join.</string>
<string name="MessageRequestBottomView_this_legacy_group_can_no_longer_be_used">This Legacy Group can no longer be used because it is too large. The maximum group size is %1$d.</string>
<string name="MessageRequestBottomView_continue_your_conversation_with_s_and_share_your_name_and_photo">Continue your conversation with %1$s and share your name and photo with them?</string>
<string name="MessageRequestBottomView_continue_your_conversation_with_s_and_share_your_name_and_photo">Continue your chat with %1$s and share your name and photo with them?</string>
<string name="MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">Join this group and share your name and photo with its members? They won\'t know you\'ve seen their messages until you accept.</string>
<string name="MessageRequestBottomView_do_you_want_to_join_this_group_you_wont_see_their_messages">Join this group and share your name and photo with its members? You won\'t see their messages until you accept.</string>
<string name="MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">Join this group? They won’t know you’ve seen their messages until you accept.</string>
@@ -1888,7 +1888,7 @@
<!-- Search -->
<string name="SearchFragment_no_results">No results found for \'%s\'</string>
<string name="SearchFragment_header_conversations">Conversations</string>
<string name="SearchFragment_header_conversations">Chats</string>
<string name="SearchFragment_header_contacts">Contacts</string>
<string name="SearchFragment_header_messages">Messages</string>
@@ -2156,7 +2156,7 @@
<string name="MediaPreviewFragment_read_more_overflow_text">Read More</string>
<!-- MessageNotifier -->
<string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d new messages in %2$d conversations</string>
<string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d new messages in %2$d chats</string>
<string name="MessageNotifier_most_recent_from_s">Most recent from: %1$s</string>
<string name="MessageNotifier_locked_message">Locked message</string>
<string name="MessageNotifier_message_delivery_failed">Message delivery failed.</string>
@@ -2226,7 +2226,7 @@
<string name="SearchToolbar_search">Search</string>
<!-- Hint when searching filtered chat content -->
<string name="SearchToolbar_search_unread_chats">Search unread chats</string>
<string name="SearchToolbar_search_for_conversations_contacts_and_messages">Search for conversations, contacts, and messages</string>
<string name="SearchToolbar_search_for_conversations_contacts_and_messages">Search for chats, contacts, and messages</string>
<!-- Material3 Search Toolbar -->
<string name="Material3SearchToolbar__close">Close</string>
@@ -2564,7 +2564,7 @@
<!-- load_more_header -->
<string name="load_more_header__see_full_conversation">See full conversation</string>
<string name="load_more_header__see_full_conversation">See full chat</string>
<string name="load_more_header__loading">Loading</string>
<!-- media_overview_activity -->
@@ -2686,14 +2686,9 @@
<string name="AndroidManifest__message_details">Message details</string>
<string name="AndroidManifest__linked_devices">Linked devices</string>
<string name="AndroidManifest__invite_friends">Invite friends</string>
<string name="AndroidManifest_archived_conversations">Archived conversations</string>
<string name="AndroidManifest_archived_conversations">Archived chats</string>
<string name="AndroidManifest_remove_photo">Remove photo</string>
<!-- Message Requests Megaphone -->
<string name="MessageRequestsMegaphone__message_requests">Message requests</string>
<string name="MessageRequestsMegaphone__users_can_now_choose_to_accept">Users can now choose to accept a new conversation. Profile names let people know who\'s messaging them.</string>
<string name="MessageRequestsMegaphone__add_profile_name">Add profile name</string>
<!-- HelpFragment -->
<string name="HelpFragment__have_you_read_our_faq_yet">Have you read our FAQ yet?</string>
<string name="HelpFragment__next">Next</string>
@@ -2848,7 +2843,7 @@
<!-- Privacy settings payments section description -->
<string name="preferences__payment_lock">Payment lock</string>
<string name="preferences__payments_beta">Payments (Beta)</string>
<string name="preferences__conversation_length_limit">Conversation length limit</string>
<string name="preferences__conversation_length_limit">Chat length limit</string>
<string name="preferences__keep_messages">Keep messages</string>
<string name="preferences__clear_message_history">Clear message history</string>
<string name="preferences__linked_devices">Linked devices</string>
@@ -2892,7 +2887,7 @@
<string name="preferences_storage__delete_older_messages">Delete older messages?</string>
<string name="preferences_storage__clear_message_history">Clear message history?</string>
<string name="preferences_storage__this_will_permanently_delete_all_message_history_and_media">This will permanently delete all message history and media from your device that are older than %1$s.</string>
<string name="preferences_storage__this_will_permanently_trim_all_conversations_to_the_d_most_recent_messages">This will permanently trim all conversations to the %1$s most recent messages.</string>
<string name="preferences_storage__this_will_permanently_trim_all_conversations_to_the_d_most_recent_messages">This will permanently trim all chats to the %1$s most recent messages.</string>
<string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">This will permanently delete all message history and media from your device.</string>
<string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Are you sure you want to delete all message history?</string>
<string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">All message history will be permanently removed. This action cannot be undone.</string>
@@ -3242,7 +3237,7 @@
<!-- conversation_list_fragment -->
<string name="conversation_list_fragment__fab_content_description">New conversation</string>
<string name="conversation_list_fragment__fab_content_description">New chat</string>
<string name="conversation_list_fragment__open_camera_description">Open Camera</string>
<string name="conversation_list_fragment__no_chats_yet_get_started_by_messaging_a_friend">No chats yet.\nGet started by messaging a friend.</string>
@@ -3259,7 +3254,7 @@
<string name="conversation__menu_group_settings">Group settings</string>
<string name="conversation__menu_leave_group">Leave group</string>
<string name="conversation__menu_view_all_media">All media</string>
<string name="conversation__menu_conversation_settings">Conversation settings</string>
<string name="conversation__menu_conversation_settings">Chat settings</string>
<string name="conversation__menu_add_shortcut">Add to home screen</string>
<string name="conversation__menu_create_bubble">Create bubble</string>
@@ -3282,7 +3277,7 @@
<!-- conversation_group_options -->
<string name="convesation_group_options__recipients_list">Recipients list</string>
<string name="conversation_group_options__delivery">Delivery</string>
<string name="conversation_group_options__conversation">Conversation</string>
<string name="conversation_group_options__conversation">Chat</string>
<string name="conversation_group_options__broadcast">Broadcast</string>
<!-- text_secure_normal -->
@@ -3332,11 +3327,11 @@
<string name="Insights__percent">%</string>
<string name="Insights__title">Insights</string>
<string name="InsightsDashboardFragment__title">Insights</string>
<string name="InsightsDashboardFragment__signal_protocol_automatically_protected">Signal Protocol automatically protected %1$d%% of your outgoing messages over the past %2$d days. Conversations between Signal users are always end-to-end encrypted.</string>
<string name="InsightsDashboardFragment__signal_protocol_automatically_protected">Signal Protocol automatically protected %1$d%% of your outgoing messages over the past %2$d days. Chats between Signal users are always end-to-end encrypted.</string>
<string name="InsightsDashboardFragment__spread_the_word">Spread the word</string>
<string name="InsightsDashboardFragment__not_enough_data">Not enough data</string>
<string name="InsightsDashboardFragment__your_insights_percentage_is_calculated_based_on">Your Insights percentage is calculated based on outgoing messages within the past %1$d days that have not disappeared or been deleted.</string>
<string name="InsightsDashboardFragment__start_a_conversation">Start a conversation</string>
<string name="InsightsDashboardFragment__start_a_conversation">Start a chat</string>
<string name="InsightsDashboardFragment__invite_your_contacts">Start communicating securely and enable new features that go beyond the limitations of unencrypted SMS messages by inviting more contacts to join Signal.</string>
<string name="InsightsDashboardFragment__this_stat_was_generated_locally">These statistics were locally generated on your device and can only be seen by you. They are never transmitted anywhere.</string>
<string name="InsightsDashboardFragment__encrypted_messages">Encrypted messages</string>
@@ -4373,8 +4368,8 @@
<string name="ConversationSettingsFragment__group_link">Group link</string>
<string name="ConversationSettingsFragment__add_as_a_contact">Add as a contact</string>
<string name="ConversationSettingsFragment__unmute">Unmute</string>
<string name="ConversationSettingsFragment__conversation_muted_until_s">Conversation muted until %1$s</string>
<string name="ConversationSettingsFragment__conversation_muted_forever">Conversation muted forever</string>
<string name="ConversationSettingsFragment__conversation_muted_until_s">Chat muted until %1$s</string>
<string name="ConversationSettingsFragment__conversation_muted_forever">Chat muted forever</string>
<string name="ConversationSettingsFragment__copied_phone_number_to_clipboard">Copied phone number to clipboard.</string>
<string name="ConversationSettingsFragment__phone_number">Phone number</string>
<string name="ConversationSettingsFragment__get_badges">Get badges for your profile by supporting Signal. Tap on a badge to learn more.</string>
@@ -5106,7 +5101,7 @@
<!-- Displayed at the top of the signal connections sheet. Please remember to insert strong tag as required. -->
<string name="SignalConnectionsBottomSheet__signal_connections_are_people">Signal Connections are people you\'ve chosen to trust, either by:</string>
<!-- Signal connections sheet bullet point 1 -->
<string name="SignalConnectionsBottomSheet__starting_a_conversation">Starting a conversation</string>
<string name="SignalConnectionsBottomSheet__starting_a_conversation">Starting a chat</string>
<!-- Signal connections sheet bullet point 2 -->
<string name="SignalConnectionsBottomSheet__accepting_a_message_request">Accepting a message request</string>
<!-- Signal connections sheet bullet point 3 -->