You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-10-31 01:45:39 +03:00 
			
		
		
		
	Remove duplicate translated string (#10139)
This commit is contained in:
		| @@ -1042,7 +1042,7 @@ export const Commands = [ | |||||||
|                                     throw newTranslatableError("Session already verified!"); |                                     throw newTranslatableError("Session already verified!"); | ||||||
|                                 } else { |                                 } else { | ||||||
|                                     throw newTranslatableError( |                                     throw newTranslatableError( | ||||||
|                                         "WARNING: Session already verified, but keys do NOT MATCH!", |                                         "WARNING: session already verified, but keys do NOT MATCH!", | ||||||
|                                     ); |                                     ); | ||||||
|                                 } |                                 } | ||||||
|                             } |                             } | ||||||
|   | |||||||
| @@ -239,7 +239,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent<IProps, I | |||||||
|             <form onSubmit={this.onPassPhraseNextClick}> |             <form onSubmit={this.onPassPhraseNextClick}> | ||||||
|                 <p> |                 <p> | ||||||
|                     {_t( |                     {_t( | ||||||
|                         "<b>Warning</b>: You should only set up key backup from a trusted computer.", |                         "<b>Warning</b>: you should only set up key backup from a trusted computer.", | ||||||
|                         {}, |                         {}, | ||||||
|                         { b: (sub) => <b>{sub}</b> }, |                         { b: (sub) => <b>{sub}</b> }, | ||||||
|                     )} |                     )} | ||||||
|   | |||||||
| @@ -339,7 +339,7 @@ export default class SoftLogout extends React.Component<IProps, IState> { | |||||||
|                     <h2>{_t("Clear personal data")}</h2> |                     <h2>{_t("Clear personal data")}</h2> | ||||||
|                     <p> |                     <p> | ||||||
|                         {_t( |                         {_t( | ||||||
|                             "Warning: Your personal data (including encryption keys) is still stored " + |                             "Warning: your personal data (including encryption keys) is still stored " + | ||||||
|                                 "in this session. Clear it if you're finished using this session, or want to sign " + |                                 "in this session. Clear it if you're finished using this session, or want to sign " + | ||||||
|                                 "in to another account.", |                                 "in to another account.", | ||||||
|                         )} |                         )} | ||||||
|   | |||||||
| @@ -480,7 +480,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps, | |||||||
|                 <div> |                 <div> | ||||||
|                     <p> |                     <p> | ||||||
|                         {_t( |                         {_t( | ||||||
|                             "<b>Warning</b>: You should only set up key backup " + "from a trusted computer.", |                             "<b>Warning</b>: you should only set up key backup " + "from a trusted computer.", | ||||||
|                             {}, |                             {}, | ||||||
|                             { b: (sub) => <b>{sub}</b> }, |                             { b: (sub) => <b>{sub}</b> }, | ||||||
|                         )} |                         )} | ||||||
|   | |||||||
| @@ -81,7 +81,7 @@ export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, I | |||||||
|                     </p> |                     </p> | ||||||
|                     <p> |                     <p> | ||||||
|                         {_t( |                         {_t( | ||||||
|                             "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members " + |                             "<b>Warning</b>: upgrading a room will <i>not automatically migrate room members " + | ||||||
|                                 "to the new version of the room.</i> We'll post a link to the new room in the old " + |                                 "to the new version of the room.</i> We'll post a link to the new room in the old " + | ||||||
|                                 "version of the room - room members will have to click this link to join the new room.", |                                 "version of the room - room members will have to click this link to join the new room.", | ||||||
|                             {}, |                             {}, | ||||||
|   | |||||||
| @@ -113,7 +113,7 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt | |||||||
|                 <div> |                 <div> | ||||||
|                     <p className="mx_SettingsTab_warningText"> |                     <p className="mx_SettingsTab_warningText"> | ||||||
|                         {_t( |                         {_t( | ||||||
|                             "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members " + |                             "<b>Warning</b>: upgrading a room will <i>not automatically migrate room members " + | ||||||
|                                 "to the new version of the room.</i> We'll post a link to the new room in the old " + |                                 "to the new version of the room.</i> We'll post a link to the new room in the old " + | ||||||
|                                 "version of the room - room members will have to click this link to join the new room.", |                                 "version of the room - room members will have to click this link to join the new room.", | ||||||
|                             {}, |                             {}, | ||||||
|   | |||||||
| @@ -458,7 +458,7 @@ | |||||||
|     "Verifies a user, session, and pubkey tuple": "Verifies a user, session, and pubkey tuple", |     "Verifies a user, session, and pubkey tuple": "Verifies a user, session, and pubkey tuple", | ||||||
|     "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)": "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)", |     "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)": "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)", | ||||||
|     "Session already verified!": "Session already verified!", |     "Session already verified!": "Session already verified!", | ||||||
|     "WARNING: Session already verified, but keys do NOT MATCH!": "WARNING: Session already verified, but keys do NOT MATCH!", |     "WARNING: session already verified, but keys do NOT MATCH!": "WARNING: session already verified, but keys do NOT MATCH!", | ||||||
|     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!", |     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!", | ||||||
|     "Verified key": "Verified key", |     "Verified key": "Verified key", | ||||||
|     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.", |     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.", | ||||||
| @@ -1669,7 +1669,7 @@ | |||||||
|     "Voice processing": "Voice processing", |     "Voice processing": "Voice processing", | ||||||
|     "Connection": "Connection", |     "Connection": "Connection", | ||||||
|     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers", |     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers", | ||||||
|     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.", |     "<b>Warning</b>: upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.", | ||||||
|     "Upgrade this space to the recommended room version": "Upgrade this space to the recommended room version", |     "Upgrade this space to the recommended room version": "Upgrade this space to the recommended room version", | ||||||
|     "Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version", |     "Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version", | ||||||
|     "View older version of %(spaceName)s.": "View older version of %(spaceName)s.", |     "View older version of %(spaceName)s.": "View older version of %(spaceName)s.", | ||||||
| @@ -3141,7 +3141,6 @@ | |||||||
|     "Enter Security Key": "Enter Security Key", |     "Enter Security Key": "Enter Security Key", | ||||||
|     "This looks like a valid Security Key!": "This looks like a valid Security Key!", |     "This looks like a valid Security Key!": "This looks like a valid Security Key!", | ||||||
|     "Not a valid Security Key": "Not a valid Security Key", |     "Not a valid Security Key": "Not a valid Security Key", | ||||||
|     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.", |  | ||||||
|     "Access your secure message history and set up secure messaging by entering your Security Key.": "Access your secure message history and set up secure messaging by entering your Security Key.", |     "Access your secure message history and set up secure messaging by entering your Security Key.": "Access your secure message history and set up secure messaging by entering your Security Key.", | ||||||
|     "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "If you've forgotten your Security Key you can <button>set up new recovery options</button>", |     "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "If you've forgotten your Security Key you can <button>set up new recovery options</button>", | ||||||
|     "There are no active polls in this room": "There are no active polls in this room", |     "There are no active polls in this room": "There are no active polls in this room", | ||||||
| @@ -3571,7 +3570,7 @@ | |||||||
|     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.", |     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.", | ||||||
|     "You're signed out": "You're signed out", |     "You're signed out": "You're signed out", | ||||||
|     "Clear personal data": "Clear personal data", |     "Clear personal data": "Clear personal data", | ||||||
|     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.", |     "Warning: your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.", | ||||||
|     "Follow the instructions sent to <b>%(email)s</b>": "Follow the instructions sent to <b>%(email)s</b>", |     "Follow the instructions sent to <b>%(email)s</b>": "Follow the instructions sent to <b>%(email)s</b>", | ||||||
|     "Wrong email address?": "Wrong email address?", |     "Wrong email address?": "Wrong email address?", | ||||||
|     "Re-enter email address": "Re-enter email address", |     "Re-enter email address": "Re-enter email address", | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user