Fix Transifex string name clash.

signalapp · Apr 22, 2020 · 9742a21 · 9742a21
1 parent fd21fc1
commit 9742a21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
@@ -211,7 +211,7 @@ void bind(@NonNull GroupMemberEntry memberEntry) {
         popupMenu.setMenu(R.menu.others_invite_pending_menu,
                           item -> {
                             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()));
                               return true;
                             }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -467,7 +467,7 @@
 
     <string name="PendingMembersActivity_cancel_invite">Cancel invite</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="other">Cancel %1$d invites</item>
     </plurals>
@@ -811,8 +811,8 @@
     <string name="PinRestoreEntryFragment_cancel">Cancel</string>
     <string name="PinRestoreEntryFragment_skip">Skip</string>
     <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="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="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="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>
     <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>