From 443ab1add73390176478fc7ecd1a334aa157e833 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 May 2017 18:20:48 +0100 Subject: [PATCH] Put back default strings on dialogs But make them work by calling _t in render rather than getDefaultProps(). Also sort out some 'Warning!' strings --- src/CallHandler.js | 15 +-------------- src/ContentMessages.js | 1 - src/SlashCommands.js | 1 - src/components/structures/MatrixChat.js | 3 --- src/components/structures/RoomView.js | 9 +-------- src/components/structures/TimelinePanel.js | 1 - src/components/structures/UserSettings.js | 8 -------- src/components/structures/login/ForgotPassword.js | 3 +-- src/components/views/dialogs/ChatInviteDialog.js | 4 ---- src/components/views/dialogs/ErrorDialog.js | 10 +++++++--- .../views/dialogs/InteractiveAuthDialog.js | 3 ++- .../views/dialogs/NeedToRegisterDialog.js | 5 +++-- src/components/views/dialogs/QuestionDialog.js | 3 ++- src/components/views/login/RegistrationForm.js | 2 +- .../views/room_settings/AliasSettings.js | 2 -- src/components/views/rooms/MemberInfo.js | 7 +------ src/components/views/rooms/MessageComposer.js | 1 - .../views/rooms/MessageComposerInput.js | 2 -- .../views/rooms/MessageComposerInputOld.js | 3 --- src/components/views/rooms/RoomHeader.js | 1 - src/components/views/rooms/RoomSettings.js | 5 +---- src/components/views/settings/AddPhoneNumber.js | 1 - src/components/views/settings/ChangePassword.js | 2 +- src/createRoom.js | 1 - src/i18n/strings/da.json | 2 +- src/i18n/strings/de_DE.json | 2 +- src/i18n/strings/en_EN.json | 6 +++++- src/i18n/strings/pt.json | 2 +- src/i18n/strings/pt_BR.json | 2 +- src/i18n/strings/ru.json | 2 +- 30 files changed, 31 insertions(+), 78 deletions(-) diff --git a/src/CallHandler.js b/src/CallHandler.js index 5edeba7625..c36ca382f2 100644 --- a/src/CallHandler.js +++ b/src/CallHandler.js @@ -145,7 +145,6 @@ function _setCallListeners(call) { Modal.createDialog(ErrorDialog, { title: _t('Call Timeout'), description: _t('The remote side failed to pick up') + '.', - button: _t("OK"), }); } else if (oldState === "invite_sent") { @@ -207,7 +206,6 @@ function _onAction(payload) { Modal.createDialog(ErrorDialog, { title: _t('Unable to capture screen'), description: screenCapErrorString, - button: _t("OK"), }); return; } @@ -228,7 +226,6 @@ function _onAction(payload) { Modal.createDialog(ErrorDialog, { title: _t('Existing Call'), description: _t('You are already in a call') + '.', - button: _t("OK"), }); return; // don't allow >1 call to be placed. } @@ -239,7 +236,6 @@ function _onAction(payload) { Modal.createDialog(ErrorDialog, { title: _t('VoIP is unsupported'), description: _t('You cannot place VoIP calls in this browser') + '.', - button: _t("OK"), }); return; } @@ -255,8 +251,6 @@ function _onAction(payload) { const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); Modal.createDialog(ErrorDialog, { description: _t('You cannot place a call with yourself') + '.', - title: _t("Error"), - button: _t("OK"), }); return; } @@ -283,8 +277,6 @@ function _onAction(payload) { const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); Modal.createDialog(ErrorDialog, { description: _t('Conference calls are not supported in this client'), - title: _t("Error"), - button: _t("OK"), }); } else if (!MatrixClientPeg.get().supportsVoip()) { @@ -292,7 +284,6 @@ function _onAction(payload) { Modal.createDialog(ErrorDialog, { title: _t('VoIP is unsupported'), description: _t('You cannot place VoIP calls in this browser') + '.', - button: _t("OK"), }); } else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) { @@ -304,17 +295,14 @@ function _onAction(payload) { // Therefore we disable conference calling in E2E rooms. const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); Modal.createDialog(ErrorDialog, { - title: _t("Error"), - button: _t("OK"), description: _t('Conference calls are not supported in encrypted rooms'), }); } else { var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); Modal.createDialog(QuestionDialog, { - title: _t('Warning') + '!', + title: _t('Warning!'), description: _t('Conference calling is in development and may not be reliable') + '.', - button: _t("OK"), onFinished: confirm=>{ if (confirm) { ConferenceHandler.createNewMatrixCall( @@ -327,7 +315,6 @@ function _onAction(payload) { Modal.createDialog(ErrorDialog, { title: _t('Failed to set up conference call'), description: _t('Conference call failed') + '. ' + ((err && err.message) ? err.message : ''), - button: _t("OK"), }); }); } diff --git a/src/ContentMessages.js b/src/ContentMessages.js index d4f8cae276..315c312b9f 100644 --- a/src/ContentMessages.js +++ b/src/ContentMessages.js @@ -356,7 +356,6 @@ class ContentMessages { Modal.createDialog(ErrorDialog, { title: _t('Upload Failed'), description: desc, - button: _t("OK"), }); } }).finally(() => { diff --git a/src/SlashCommands.js b/src/SlashCommands.js index 645ca6e8fe..366604eaee 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -71,7 +71,6 @@ const commands = { Modal.createDialog(ErrorDialog, { title: _t('/ddg is not a command'), description: _t('To use it, just wait for autocomplete results to load and tab through them') + '.', - button: _t("OK"), }); return success(); }), diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index a00d9c22ce..2ba1506551 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -378,7 +378,6 @@ module.exports = React.createClass({ Modal.createDialog(QuestionDialog, { title: _t('Reject invitation'), description: _t('Are you sure you want to reject the invitation?'), - button: "OK", onFinished: (confirm) => { if (confirm) { // FIXME: controller shouldn't be loading a view :( @@ -395,7 +394,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t('Failed to reject invitation'), description: err.toString(), - button: _t("OK"), }); }); } @@ -895,7 +893,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t('Signed Out'), description: _t('For security, this session has been signed out. Please sign in again.'), - button: _t("OK"), }); dis.dispatch({ action: 'logout', diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index f0b6160012..badc7cd01d 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -531,7 +531,7 @@ module.exports = React.createClass({ if (!userHasUsedEncryption) { const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); Modal.createDialog(QuestionDialog, { - title: _t("Warning") + "!", + title: _t("Warning!"), hasCancelButton: false, description: (
@@ -541,7 +541,6 @@ module.exports = React.createClass({

{ _t("Encrypted messages will not be visible on clients that do not yet implement encryption") }.

), - button: "OK", }); } if (localStorage) { @@ -882,7 +881,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Failed to join room"), description: msg, - button: _t("OK"), }); } }).done(); @@ -964,7 +962,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t('Failed to upload file'), description: ((error && error.message) ? error.message : _t("Server may be unavailable, overloaded, or the file too big")), - button: _t("OK"), }); }); }, @@ -1052,7 +1049,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Search failed"), description: ((error && error.message) ? error.message : _t("Server may be unavailable, overloaded, or search timed out :(")), - button: _t("OK"), }); }).finally(function() { self.setState({ @@ -1180,7 +1176,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Failed to save settings"), description: fails.map(function(result) { return result.reason; }).join("\n"), - button: _t("OK"), }); // still editing room settings } @@ -1220,7 +1215,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Error"), description: _t("Failed to forget room %(errCode)s", { errCode: errCode }), - button: _t("OK"), }); }); }, @@ -1243,7 +1237,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Failed to reject invite"), description: msg, - button: _t("OK"), }); self.setState({ diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js index 5719964df5..60c8c25114 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -914,7 +914,6 @@ var TimelinePanel = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Failed to load timeline position"), description: message, - button: _t("OK"), onFinished: onFinished, }); }; diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index b669898cd7..b2bf693cfe 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -249,7 +249,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Can't load user settings"), description: ((error && error.message) ? error.message : _t("Server may be unavailable or overloaded")), - button: _t("OK"), }); }); }, @@ -292,7 +291,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Failed to set avatar"), description: ((err && err.message) ? err.message : _t("Operation failed")), - button: _t("OK") }); }); }, @@ -335,7 +333,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Error"), description: errMsg, - button: _t("OK"), }); }, @@ -344,7 +341,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Success"), description: _t("Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them") + ".", - button: _t("OK"), }); }, @@ -372,7 +368,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Invalid Email Address"), description: _t("This doesn't appear to be a valid email address"), - button: _t("OK"), }); return; } @@ -392,7 +387,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Unable to add email address"), description: ((err && err.message) ? err.message : _t("Operation failed")), - button: _t("OK"), }); }); ReactDOM.findDOMNode(this.refs.add_email_input).blur(); @@ -418,7 +412,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Unable to remove contact information"), description: ((err && err.message) ? err.message : _t("Operation failed")), - button: _t("OK"), }); }).done(); } @@ -460,7 +453,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Unable to verify email address"), description: ((err && err.message) ? err.message : _t("Operation failed")), - button: _t("OK"), }); } }); diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js index 5438b123c3..c7dc35c1a8 100644 --- a/src/components/structures/login/ForgotPassword.js +++ b/src/components/structures/login/ForgotPassword.js @@ -90,7 +90,7 @@ module.exports = React.createClass({ else { var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); Modal.createDialog(QuestionDialog, { - title: _t('Warning'), + title: _t('Warning!'), description:
{ _t( @@ -157,7 +157,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: title, description: body, - button: _t("OK"), }); }, diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js index 81d032683e..ca0f10bc6b 100644 --- a/src/components/views/dialogs/ChatInviteDialog.js +++ b/src/components/views/dialogs/ChatInviteDialog.js @@ -307,7 +307,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: "Failed to invite", description: ((err && err.message) ? err.message : "Operation failed"), - button: _t("OK"), }); return null; }) @@ -321,7 +320,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: "Failed to invite user", description: ((err && err.message) ? err.message : "Operation failed"), - button: _t("OK"), }); return null; }) @@ -343,7 +341,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: "Failed to invite", description: ((err && err.message) ? err.message : "Operation failed"), - button: _t("OK"), }); return null; }) @@ -403,7 +400,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: "Failed to invite the following users to the " + room.name + " room:", description: errorList.join(", "), - button: _t("OK"), }); } return addrs; diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js index fb7286e304..bf48d1757b 100644 --- a/src/components/views/dialogs/ErrorDialog.js +++ b/src/components/views/dialogs/ErrorDialog.js @@ -27,6 +27,7 @@ limitations under the License. import React from 'react'; import sdk from '../../../index'; +import { _t } from '../../../languageHandler'; export default React.createClass({ displayName: 'ErrorDialog', @@ -44,6 +45,9 @@ export default React.createClass({ getDefaultProps: function() { return { focus: true, + title: null, + description: null, + button: null, }; }, @@ -57,13 +61,13 @@ export default React.createClass({ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); return ( + title={this.props.title || _t('Error')}>
- {this.props.description} + {this.props.description || _t('An error has occurred.')}
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js index f0eeead29a..51561270c4 100644 --- a/src/components/views/dialogs/InteractiveAuthDialog.js +++ b/src/components/views/dialogs/InteractiveAuthDialog.js @@ -20,6 +20,7 @@ import Matrix from 'matrix-js-sdk'; import React from 'react'; import sdk from '../../../index'; +import { _t } from '../../../languageHandler'; import AccessibleButton from '../elements/AccessibleButton'; @@ -99,7 +100,7 @@ export default React.createClass({ return ( {content} diff --git a/src/components/views/dialogs/NeedToRegisterDialog.js b/src/components/views/dialogs/NeedToRegisterDialog.js index 875af6a7fd..4a07a65529 100644 --- a/src/components/views/dialogs/NeedToRegisterDialog.js +++ b/src/components/views/dialogs/NeedToRegisterDialog.js @@ -26,6 +26,7 @@ limitations under the License. import React from 'react'; import dis from '../../../dispatcher'; import sdk from '../../../index'; +import { _t } from '../../../languageHandler'; module.exports = React.createClass({ displayName: 'NeedToRegisterDialog', @@ -52,10 +53,10 @@ module.exports = React.createClass({ return (
- {this.props.description} + {this.props.description || _t('A registered account is required for this action')}
{this.props.extraButtons} {cancelButton} diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js index e55a224531..7ca5de72cd 100644 --- a/src/components/views/login/RegistrationForm.js +++ b/src/components/views/login/RegistrationForm.js @@ -100,7 +100,7 @@ module.exports = React.createClass({ if (this.refs.email.value == '') { var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); Modal.createDialog(QuestionDialog, { - title: "Warning", + title: "Warning!", description:
If you don't specify an email address, you won't be able to reset your password.
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js index d8766c637d..b5ef1d8309 100644 --- a/src/components/views/room_settings/AliasSettings.js +++ b/src/components/views/room_settings/AliasSettings.js @@ -157,7 +157,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t('Invalid alias format'), description: _t('"%(alias)s" is not a valid format for an alias', { alias: alias }), - button: _t('OK'), }); } }, @@ -174,7 +173,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t('Invalid address format'), description: _t('"%(alias)s" is not a valid format for an address', { alias: alias }), - button: _t('OK'), }); } }, diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js index e76d5387d6..86d39f91ec 100644 --- a/src/components/views/rooms/MemberInfo.js +++ b/src/components/views/rooms/MemberInfo.js @@ -244,7 +244,6 @@ module.exports = WithMatrixClient(React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Failed to kick"), description: ((err && err.message) ? err.message : "Operation failed"), - button: _t("OK"), }); } ).finally(()=>{ @@ -287,7 +286,6 @@ module.exports = WithMatrixClient(React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Error"), description: _t("Failed to ban user"), - button: _t("OK"), }); } ).finally(()=>{ @@ -338,7 +336,6 @@ module.exports = WithMatrixClient(React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Error"), description: _t("Failed to mute user"), - button: _t("OK"), }); } ).finally(()=>{ @@ -388,7 +385,6 @@ module.exports = WithMatrixClient(React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Error"), description: _t("Failed to toggle moderator status"), - button: _t("OK"), }); } } @@ -410,7 +406,6 @@ module.exports = WithMatrixClient(React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Error"), description: _t("Failed to change power level"), - button: _t("OK"), }); } ).finally(()=>{ @@ -438,7 +433,7 @@ module.exports = WithMatrixClient(React.createClass({ if (parseInt(myPower) === parseInt(powerLevel)) { var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); Modal.createDialog(QuestionDialog, { - title: _t("Warning"), + title: _t("Warning!"), description:
{ _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself") }.
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index 488d3cc287..99b16413b5 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -127,7 +127,6 @@ export default class MessageComposer extends React.Component {
), - button: _t("OK"), onFinished: (shouldUpload) => { if(shouldUpload) { // MessageComposer shouldn't have to rely on its parent passing in a callback to upload a file diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index c52f9724b0..a79f71c92d 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -507,7 +507,6 @@ export default class MessageComposerInput extends React.Component { Modal.createDialog(ErrorDialog, { title: _t("Server error"), description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong") + "."), - button: _t("OK"), }); }); } @@ -517,7 +516,6 @@ export default class MessageComposerInput extends React.Component { Modal.createDialog(ErrorDialog, { title: _t("Command error"), description: cmd.error, - button: _t("OK"), }); } return true; diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js index 9b4efa272c..b664ef4bd3 100644 --- a/src/components/views/rooms/MessageComposerInputOld.js +++ b/src/components/views/rooms/MessageComposerInputOld.js @@ -297,7 +297,6 @@ export default React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Unknown command"), description: _t("Usage") + ": /markdown on|off", - button: _t("OK"), }); } return; @@ -318,7 +317,6 @@ export default React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Server error"), description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong") + "."), - button: _t("OK"), }); }); } @@ -328,7 +326,6 @@ export default React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Command error"), description: cmd.error, - button: _t("OK"), }); } return; diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js index 38bd63e019..c5e3a56922 100644 --- a/src/components/views/rooms/RoomHeader.js +++ b/src/components/views/rooms/RoomHeader.js @@ -122,7 +122,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Error"), description: _t("Failed to set avatar") + ".", - button: _t("OK"), }); }).done(); }, diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js index df70513b7a..bff668ac85 100644 --- a/src/components/views/rooms/RoomSettings.js +++ b/src/components/views/rooms/RoomSettings.js @@ -59,7 +59,6 @@ const BannedUser = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t('Error'), description: _t('Failed to unban'), - button: _t("OK"), }); }).done(); }, @@ -530,7 +529,6 @@ module.exports = React.createClass({ Modal.createDialog(ErrorDialog, { title: _t('Error'), description: _t("Failed to forget room %(errCode)s", { errCode: errCode }), - button: _t("OK"), }); }); }, @@ -540,7 +538,7 @@ module.exports = React.createClass({ var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); Modal.createDialog(QuestionDialog, { - title: _t('Warning') + '!', + title: _t('Warning!'), description: (

{ _t('End-to-end encryption is in beta and may not be reliable') }.

@@ -550,7 +548,6 @@ module.exports = React.createClass({

{ _t('Encrypted messages will not be visible on clients that do not yet implement encryption') }.

), - button: "OK", onFinished: confirm=>{ if (!confirm) { this.refs.encrypt.checked = false; diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js index 697a539bcd..1fdd06cf00 100644 --- a/src/components/views/settings/AddPhoneNumber.js +++ b/src/components/views/settings/AddPhoneNumber.js @@ -85,7 +85,6 @@ export default WithMatrixClient(React.createClass({ Modal.createDialog(ErrorDialog, { title: _t("Error"), description: msg, - button: _t("OK"), }); }).finally(() => { if (this._unmounted) return; diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js index e0fe6ce56a..33091f9c71 100644 --- a/src/components/views/settings/ChangePassword.js +++ b/src/components/views/settings/ChangePassword.js @@ -70,7 +70,7 @@ module.exports = React.createClass({ var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); Modal.createDialog(QuestionDialog, { - title: _t("Warning"), + title: _t("Warning!"), description:
{ _t( diff --git a/src/createRoom.js b/src/createRoom.js index fe148f0408..0a21f68208 100644 --- a/src/createRoom.js +++ b/src/createRoom.js @@ -107,7 +107,6 @@ function createRoom(opts) { Modal.createDialog(ErrorDialog, { title: _t("Failure to create room"), description: _t("Server may be unavailable, overloaded, or you hit a bug") + ".", - button: _t("OK"), }); return null; }); diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 26889c3bb6..2b30593a4c 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -48,7 +48,7 @@ "Create a new account": "Oprette en ny bruger", "Send an encrypted message": "Send en krypteret meddelelse", "Send a message (unencrypted)": "Send en meddelelse (ukrypteret)", - "Warning": "Advarsel", + "Warning!": "Advarsel!", "accept": "acceptere", "accepted an invitation": "Godkendt en invitation", "accepted the invitation for": "Accepteret invitationen til", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index bf55379d6d..421a8e1f41 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -48,7 +48,7 @@ "Create a new account": "Erstelle einen neuen Benutzer", "Send an encrypted message": "Sende eine verschlüsselte Nachricht", "Send a message (unencrypted)": "Sende eine Nachricht (unverschlüsselt)", - "Warning": "Warnung", + "Warning!": "Warnung!", "Direct Chat": "Privater Chat", "Error": "Fehler", "accept": "akzeptiere", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index e8fffbe80d..8f0a8018b0 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -121,6 +121,7 @@ "zh-sg":"Chinese (Singapore)", "zh-tw":"Chinese (Taiwan)", "zu":"Zulu", + "A registered account is required for this action": "A registered account is required for this action", "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains", "accept": "accept", "%(targetName)s accepted an invitation": "%(targetName)s accepted an invitation", @@ -132,6 +133,7 @@ "Admin": "Admin", "Advanced": "Advanced", "Algorithm": "Algorithm", + "Authentication": "Authentication", "all room members": "all room members", "all room members, from the point they are invited": "all room members, from the point they are invited", "all room members, from the point they joined": "all room members, from the point they joined", @@ -149,6 +151,7 @@ "A new password must be entered.": "A new password must be entered.", "%(senderName)s answered the call": "%(senderName)s answered the call", "anyone.": "anyone", + "An error has occurred.": "An error has occurred.", "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests", "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests", "Are you sure?": "Are you sure?", @@ -371,6 +374,7 @@ "Reason": "Reason", "Revoke Moderator": "Revoke Moderator", "Refer a friend to Riot": "Refer a friend to Riot", + "Registration required": "Registration required", "rejected": "rejected", "%(targetName)s rejected the invitation": "%(targetName)s rejected the invitation", "Reject invitation": "Reject invitation", @@ -513,7 +517,7 @@ "VoIP conference started": "VoIP conference started", "VoIP is unsupported": "VoIP is unsupported", "(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)", - "Warning": "Warning", + "Warning!": "Warning!", "Who can access this room?": "Who can access this room?", "Who can read history?": "Who can read history?", "Who would you like to add to this room?": "Who would you like to add to this room?", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index 60ab244401..e19d261997 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -257,7 +257,7 @@ "VoIP conference finished": "Conferência VoIP encerrada", "VoIP conference started": "Conferência VoIP iniciada", "(warning: cannot be disabled again!)": "(atenção: esta operação não poderá ser desfeita depois!)", - "Warning": "Atenção", + "Warning!": "Atenção!", "was banned": "banida/o", "was invited": "convidada/o", "was kicked": "retirada/o da sala", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 3bd74ce14f..47d9271232 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -262,7 +262,7 @@ "VoIP conference finished": "Conferência VoIP encerrada", "VoIP conference started": "Conferência VoIP iniciada", "(warning: cannot be disabled again!)": "(atenção: esta operação não poderá ser desfeita depois!)", - "Warning": "Atenção", + "Warning": "Atenção!", "was banned": "banida/o", "was invited": "convidada/o", "was kicked": "retirada/o da sala", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 001a5aca6a..6bd3773861 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -191,7 +191,7 @@ "VoIP conference finished": "VoIP конференция закончилась", "VoIP conference started": "VoIP Конференция стартовала", "(warning: cannot be disabled again!)": "(предупреждение: не может быть снова отключен!)", - "Warning": "Предупреждение", + "Warning!": "Предупреждение!", "was banned": "запрещен", "was invited": "приглашенный", "was kicked": "выброшен",