From 9112fc231af6cf9d7bb913b321bacf70fda87e5a Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 May 2017 17:35:18 +0100 Subject: [PATCH] More translation string fixups --- src/components/structures/UserSettings.js | 12 ++++++------ src/i18n/strings/en_EN.json | 10 +++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index 279920eeb7..b669898cd7 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -724,7 +724,7 @@ module.exports = React.createClass({

{ _t("Found a bug?") }

@@ -1031,10 +1031,10 @@ module.exports = React.createClass({
- { _t("Logged in as") } {this._me} + { _t("Logged in as:") } {this._me}
- Access Token: <{ _t("click to reveal") }> + {_t('Access Token:')} <{ _t("click to reveal") }>
{ _t("Homeserver is") } { MatrixClientPeg.get().getHomeserverUrl() } @@ -1043,15 +1043,15 @@ module.exports = React.createClass({ { _t("Identity Server is") } { MatrixClientPeg.get().getIdentityServerUrl() }
- matrix-react-sdk version: {(REACT_SDK_VERSION !== '') + {_t('matrix-react-sdk version:')} {(REACT_SDK_VERSION !== '') ? gHVersionLabel('matrix-org/matrix-react-sdk', REACT_SDK_VERSION) : REACT_SDK_VERSION }
- riot-web version: {(this.state.vectorVersion !== undefined) + {_t('riot-web version:')} {(this.state.vectorVersion !== undefined) ? gHVersionLabel('vector-im/riot-web', this.state.vectorVersion) : 'unknown' }
- { _t("olm version: ") } {olmVersionString}
+ { _t("olm version:") } {olmVersionString}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index fcbd3d737f..e8fffbe80d 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -126,6 +126,7 @@ "%(targetName)s accepted an invitation": "%(targetName)s accepted an invitation", "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepted the invitation for %(displayName)s", "Account": "Account", + "Access Token:": "Access Token:", "Add email address": "Add email address", "Add phone number": "Add phone number", "Admin": "Admin", @@ -283,7 +284,7 @@ "I have verified my email address": "I have verified my email address", "Import E2E room keys": "Import E2E room keys", "Incorrect verification code": "Incorrect verification code", - "Interface language": "Interface language", + "Interface Language": "Interface Language", "Invalid alias format": "Invalid alias format", "Invalid address format": "Invalid address format", "Invalid Email Address": "Invalid Email Address", @@ -311,7 +312,7 @@ "%(targetName)s left the room": "%(targetName)s left the room", "Level": "Level", "Local addresses for this room:": "Local addresses for this room:", - "Logged in as": "Logged in as", + "Logged in as:": "Logged in as:", "Login as guest": "Login as guest", "Logout": "Logout", "Low priority": "Low priority", @@ -319,6 +320,7 @@ "Manage Integrations": "Manage Integrations", "Markdown is disabled": "Markdown is disabled", "Markdown is enabled": "Markdown is enabled", + "matrix-react-sdk version:": "matrix-react-sdk version:", "Members only": "Members only", "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present", "Missing room_id in request": "Missing room_id in request", @@ -348,7 +350,7 @@ "No results": "No results", "No users have specific privileges in this room": "No users have specific privileges in this room", "OK": "OK", - "olm version": "olm version", + "olm version:": "olm version:", "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)", "Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below", "Only people who have been invited": "Only people who have been invited", @@ -377,12 +379,14 @@ "%(senderName)s removed their profile picture": "%(senderName)s removed their profile picture", "Remove": "Remove", "%(senderName)s requested a VoIP conference": "%(senderName)s requested a VoIP conference", + "Report it": "Report it", "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved", "restore": "restore", "Return to app": "Return to app", "Return to login screen": "Return to login screen", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again", + "riot-web version:": "riot-web version:", "Room %(roomId)s not visible": "Room %(roomId)s not visible", "Room Colour": "Room Colour", "Room name (optional)": "Room name (optional)",