empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix Transifex string name clash.

Browse source
This commit is contained in:
Alan Evans 2020-04-22 12:58:23 -03:00 • committed by Greyson Parrelli
parent fd21fc1a31
commit 9742a212a2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
View file

@ -211,7 +211,7 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
popupMenu.setMenu(R.menu.others_invite_pending_menu, popupMenu.setMenu(R.menu.others_invite_pending_menu,
item -> { item -> {
if (item.getItemId() == R.id.cancel_invites) { if (item.getItemId() == R.id.cancel_invites) {
item.setTitle(context.getResources().getQuantityString(R.plurals.PendingMembersActivity_cancel_invites, pendingMembers.getInviteCount(), item.setTitle(context.getResources().getQuantityString(R.plurals.PendingMembersActivity_cancel_d_invites, pendingMembers.getInviteCount(),
pendingMembers.getInviteCount())); pendingMembers.getInviteCount()));
return true; return true;
} }

6
app/src/main/res/values/strings.xml
View file

@ -467,7 +467,7 @@
<string name="PendingMembersActivity_cancel_invite">Cancel invite</string> <string name="PendingMembersActivity_cancel_invite">Cancel invite</string>
<string name="PendingMembersActivity_cancel_invites">Cancel invites</string> <string name="PendingMembersActivity_cancel_invites">Cancel invites</string>
<plurals name="PendingMembersActivity_cancel_invites"> <plurals name="PendingMembersActivity_cancel_d_invites">
<item quantity="one">Cancel invite</item> <item quantity="one">Cancel invite</item>
<item quantity="other">Cancel %1$d invites</item> <item quantity="other">Cancel %1$d invites</item>
</plurals> </plurals>
@ -811,8 +811,8 @@
<string name="PinRestoreEntryFragment_cancel">Cancel</string> <string name="PinRestoreEntryFragment_cancel">Cancel</string>
<string name="PinRestoreEntryFragment_skip">Skip</string> <string name="PinRestoreEntryFragment_skip">Skip</string>
<plurals name="PinRestoreEntryFragment_you_have_d_attempt_remaining"> <plurals name="PinRestoreEntryFragment_you_have_d_attempt_remaining">
<item quantity="one">You have %1$d attempt remaining. If you run out of attempts, you can create a new PIN. You can register and use your account but you’ll lose some saved settings like your profile information.</item> <item quantity="one">You have %1$d attempt remaining. If you run out of attempts, you can create a new PIN. You can register and use your account but you\'ll lose some saved settings like your profile information.</item>
<item quantity="many">You have %1$d attempts remaining. If you run out of attempts, you can create a new PIN. You can register and use your account but you’ll lose some saved settings like your profile information.</item> <item quantity="other">You have %1$d attempts remaining. If you run out of attempts, you can create a new PIN. You can register and use your account but you\'ll lose some saved settings like your profile information.</item>
</plurals> </plurals>
<string name="PinRestoreEntryFragment_support_email" translatable="false">support@signal.org</string> <string name="PinRestoreEntryFragment_support_email" translatable="false">support@signal.org</string>
<string name="PinRestoreEntryFragment_signal_registration_need_help_with_pin">Signal Registration - Need Help with PIN for Android</string> <string name="PinRestoreEntryFragment_signal_registration_need_help_with_pin">Signal Registration - Need Help with PIN for Android</string>