Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

present perfect for some English strings #13424

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions app/src/main/res/values/strings.xml
Expand Up @@ -320,7 +320,7 @@
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<string name="ConversationItem_this_message_was_deleted">This message was deleted.</string>
<string name="ConversationItem_this_message_was_deleted">This message has been deleted.</string>
<string name="ConversationItem_you_deleted_this_message">You deleted this message.</string>
<!-- Dialog error message shown when user can\'t download a message from someone else due to a permanent failure (e.g., unable to decrypt), placeholder is other\'s name -->
<string name="ConversationItem_cant_download_message_s_will_need_to_send_it_again">Can\'t download message. %1$s will need to send it again.</string>
Expand Down Expand Up @@ -878,8 +878,8 @@
<item quantity="other">These members will need to accept an invite to join this group again and will not receive group messages until they accept:</item>
</plurals>
<plurals name="GroupsV1MigrationLearnMore_these_members_were_removed_from_the_group">
<item quantity="one">This member was removed from the group and will not be able to rejoin until they upgrade:</item>
<item quantity="other">These members were removed from the group and will not be able to rejoin until they upgrade:</item>
<item quantity="one">This member has been removed from the group and will not be able to rejoin until they upgrade:</item>
<item quantity="other">These members have been removed from the group and will not be able to rejoin until they upgrade:</item>
</plurals>

<!-- GroupsV1MigrationInitiationBottomSheetDialogFragment -->
Expand Down Expand Up @@ -1333,7 +1333,7 @@
<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 update to the most recent version and resend the message.</string>
<string name="MessageRecord_left_group">You have left the group.</string>
<string name="MessageRecord_you_updated_group">You updated the group.</string>
<string name="MessageRecord_the_group_was_updated">The group was updated.</string>
<string name="MessageRecord_the_group_was_updated">The group has been updated.</string>
<!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
<string name="MessageRecord_outgoing_voice_call">Outgoing voice call</string>
<!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
Expand Down Expand Up @@ -1367,7 +1367,7 @@
<string name="MessageRecord_you_set_disappearing_message_time_to_s">You set the disappearing message timer to %1$s.</string>
<string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s set the disappearing message timer to %2$s.</string>
<string name="MessageRecord_disappearing_message_time_set_to_s">The disappearing message timer has been set to %1$s.</string>
<string name="MessageRecord_this_group_was_updated_to_a_new_group">This group was updated to a New Group.</string>
<string name="MessageRecord_this_group_was_updated_to_a_new_group">This group has been updated to a New Group.</string>
<string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">You couldn\'t be added to the New Group and have been invited to join.</string>
<string name="MessageRecord_chat_session_refreshed">Chat session refreshed</string>
<plurals name="MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited">
Expand Down Expand Up @@ -1427,7 +1427,7 @@
</plurals>
<string name="MessageRecord_you_were_invited_to_the_group">You were invited to the group.</string>
<plurals name="MessageRecord_d_people_were_invited_to_the_group">
<item quantity="one">1 person was invited to the group.</item>
<item quantity="one">1 person has been invited to the group.</item>
<item quantity="other">%1$d people were invited to the group.</item>
</plurals>

Expand All @@ -1445,7 +1445,7 @@
<string name="MessageRecord_s_revoked_your_invitation_to_the_group">%1$s revoked your invitation to the group.</string>
<string name="MessageRecord_an_admin_revoked_your_invitation_to_the_group">An admin revoked your invitation to the group.</string>
<plurals name="MessageRecord_d_invitations_were_revoked">
<item quantity="one">An invitation to the group was revoked.</item>
<item quantity="one">An invitation to the group has been revoked.</item>
<item quantity="other">%1$d invitations to the group were revoked.</item>
</plurals>

Expand Down Expand Up @@ -2218,7 +2218,7 @@
<string name="ThreadRecord_view_once_photo">View-once photo</string>
<string name="ThreadRecord_view_once_video">View-once video</string>
<string name="ThreadRecord_view_once_media">View-once media</string>
<string name="ThreadRecord_this_message_was_deleted">This message was deleted.</string>
<string name="ThreadRecord_this_message_was_deleted">This message has been deleted.</string>
<string name="ThreadRecord_you_deleted_this_message">You deleted this message.</string>
<!-- Displayed in the notification when the user sends a request to activate payments -->
<string name="ThreadRecord_you_sent_request">You sent a request to activate Payments</string>
Expand Down Expand Up @@ -2436,7 +2436,7 @@
<!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
<string name="MessageNotifier_reacted_s_to_your_payment">Reacted %1$s to your payment.</string>
<string name="MessageNotifier_reacted_s_to_your_sticker">Reacted %1$s to your sticker.</string>
<string name="MessageNotifier_this_message_was_deleted">This message was deleted.</string>
<string name="MessageNotifier_this_message_was_deleted">This message has been deleted.</string>

<string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Turn off contact joined Signal notifications? You can enable them again in Signal > Settings > Notifications.</string>

Expand Down Expand Up @@ -3705,7 +3705,7 @@
<string name="ConfirmKbsPinFragment__re_enter_the_pin_you_just_created">Re-enter the PIN you just created.</string>
<string name="ConfirmKbsPinFragment__confirm_your_pin">Confirm your PIN.</string>
<string name="ConfirmKbsPinFragment__pin_creation_failed">PIN creation failed</string>
<string name="ConfirmKbsPinFragment__your_pin_was_not_saved">Your PIN was not saved. We\'ll prompt you to create a PIN later.</string>
<string name="ConfirmKbsPinFragment__your_pin_was_not_saved">Your PIN has not been saved. We\'ll prompt you to create a PIN later.</string>
<string name="ConfirmKbsPinFragment__pin_created">PIN created.</string>
<string name="ConfirmKbsPinFragment__re_enter_your_pin">Re-enter your PIN</string>
<string name="ConfirmKbsPinFragment__creating_pin">Creating PIN…</string>
Expand Down Expand Up @@ -5017,11 +5017,11 @@
<string name="ExpiredBadgeBottomSheetDialogFragment__add_a_boost">Add a Boost</string>
<string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Not now</string>
<!-- Copy displayed when badge expires after user inactivity -->
<string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically">Your recurring monthly donation was automatically cancelled because you were inactive for too long. Your %1$s badge is no longer visible on your profile.</string>
<string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically">Your recurring monthly donation has been automatically cancelled because you were inactive for too long. Your %1$s badge is no longer visible on your profile.</string>
<!-- Copy displayed when badge expires after payment failure -->
<string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled">Your recurring monthly donation was cancelled because we couldn\'t process your payment. Your badge is no longer visible on your profile.</string>
<string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled">Your recurring monthly donation has been cancelled because we couldn\'t process your payment. Your badge is no longer visible on your profile.</string>
<!-- Copy displayed when badge expires after a payment failure and we have a displayable charge failure reason -->
<string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s">Your recurring monthly donation was cancelled. %1$s Your %2$s badge is no longer visible on your profile.</string>
<string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s">Your recurring monthly donation has been cancelled. %1$s Your %2$s badge is no longer visible on your profile.</string>
<string name="ExpiredBadgeBottomSheetDialogFragment__you_can">You can keep using Signal but to support the app and reactivate your badge, renew now.</string>
<string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">Renew subscription</string>
<!-- Button label to send user to Google Pay website -->
Expand Down Expand Up @@ -5053,7 +5053,7 @@
<!-- Displayed as title when some generic error happens during sending donation on behalf of another user -->
<string name="DonationsErrors__donation_failed">Donation failed</string>
<!-- Displayed as message when some generic error happens during sending donation on behalf of another user -->
<string name="DonationsErrors__your_payment_was_processed_but">Your donation was processed but Signal could not send your donation message. Please contact support.</string>
<string name="DonationsErrors__your_payment_was_processed_but">Your donation has been processed but Signal could not send your donation message. Please contact support.</string>
<string name="DonationsErrors__your_badge_could_not">Your badge could not be added to your account, but you may have been charged. Please contact support.</string>
<string name="DonationsErrors__your_payment_is_still">Your donation is still being processed. This can take a few minutes depending on your connection.</string>
<string name="DonationsErrors__failed_to_cancel_subscription">Failed to cancel subscription</string>
Expand Down Expand Up @@ -5137,7 +5137,7 @@
<!-- Failure code text for insufficient funds, displayed in a dialog or notification -->
<string name="StripeFailureCode__the_bank_account_provided">The bank account provided has insufficient funds to complete this purchase, try again or contact your bank for more information.</string>
<!-- Failure code text for revoked authorization of payment, displayed in a dialog or notification -->
<string name="StripeFailureCode__this_payment_was_revoked">This donation was revoked by the account holder and could not be processed. You haven\'t been charged.</string>
<string name="StripeFailureCode__this_payment_was_revoked">This donation has been revoked by the account holder and could not be processed. You haven\'t been charged.</string>
<!-- Failure code text for a payment lacking an authorized mandate or incorrect mandate, displayed in a dialog or notification -->
<string name="StripeFailureCode__an_error_occurred_while_processing_this_payment">An error occurred while processing this donation, please try again.</string>
<!-- Failure code text for a closed account, deceased recipient, or one with blocked direct debits, displayed in a dialog or notification -->
Expand Down Expand Up @@ -6098,7 +6098,7 @@
<!-- Title of \'Donation Complete\' sheet displayed after a bank transfer completes and the badge is redeemed -->
<string name="DonationCompletedBottomSheet__donation_complete">Donation Complete</string>
<!-- Text block of \'Donation Complete\' sheet displayed after a bank transfer completes and the badge is redeemed -->
<string name="DonationCompleteBottomSheet__your_bank_transfer_was_received">Your bank transfer was received. You can choose to display this badge on your profile to show off your support.</string>
<string name="DonationCompleteBottomSheet__your_bank_transfer_was_received">Your bank transfer has been received. You can choose to display this badge on your profile to show off your support.</string>
<!-- Button text of \'Donation Complete\' sheet displayed after a bank transfer completes and the badge is redeemed to dismiss sheet -->
<string name="DonationCompleteBottomSheet__done">Done</string>

Expand Down Expand Up @@ -6470,7 +6470,7 @@
<!-- Body of a dialog that is displayed when we experienced a network error when looking up a username. -->
<string name="UsernameLinkSettings_qr_result_network_error">Experienced a network error. Please try again.</string>
<!-- Body of a dialog that is displayed when we failed to reset your username link because you had no internet. -->
<string name="UsernameLinkSettings_reset_link_result_network_unavailable">You do not have network access. Your link was not reset. Try again later.</string>
<string name="UsernameLinkSettings_reset_link_result_network_unavailable">You do not have network access. Your link has not been reset. Try again later.</string>
<!-- Body of a dialog that is displayed when we failed to reset your username link because of a transient network issue. -->
<string name="UsernameLinkSettings_reset_link_result_network_error">A network error occurred while trying to reset your link. Try again later.</string>
<!-- Shown on the generated username qr code image to explain how to use it. -->
Expand Down Expand Up @@ -6523,7 +6523,7 @@
<!-- Bottom sheet dialog shown when a monthly donation fails to renew, title for dialog -->
<string name="MonthlyDonationCanceled__title">Monthly donation canceled</string>
<!-- Bottom sheet dialog shown when a monthly donation fails to renew, body for dialog. First placeholder is a payment related error message. Second placeholder is \'learn more\' -->
<string name="MonthlyDonationCanceled__message">Your recurring monthly donation was canceled. %1$s\n\nYour badge will no longer be visible on your profile. %2$s</string>
<string name="MonthlyDonationCanceled__message">Your recurring monthly donation has been canceled. %1$s\n\nYour badge will no longer be visible on your profile. %2$s</string>
<!-- Bottom sheet dialog shown when a monthly donation fails to renew, learn more used in placeholder for body for dialog. -->
<string name="MonthlyDonationCanceled__learn_more">Learn more</string>
<!-- Bottom sheet dialog shown when a monthly donation fails to renew, primary button to renew subscription with new data -->
Expand Down