](https://translate.nordgedanken.de/engage/riot-web/?utm_source=widget)
+
+
+Head to the [translating doc](docs/translating.md)
+
+Adding Strings to the translations (Developer Guide)
+====================================================
+
+Head to the [translating dev doc](docs/translating-dev.md)
+
Triaging issues
===============
@@ -292,7 +313,7 @@ bug or feature:
* feature
bug severity:
-
+
* cosmetic - feature works functionally but UI/UX is broken
* critical - whole app doesn't work
* major - entire feature doesn't work
diff --git a/docs/translating-dev.md b/docs/translating-dev.md
new file mode 100644
index 0000000000..80d4b64a3a
--- /dev/null
+++ b/docs/translating-dev.md
@@ -0,0 +1,26 @@
+# How to translate riot-web (Dev Guide)
+
+## Requirements
+
+- A working [Development Setup](../../#setting-up-a-dev-environment)
+- Be able to understand English
+- Be able to understand the language you want to translate riot-web into
+
+## Adding new strings
+
+1. Check if the import ``import _t from 'counterpart-riot'`` is present. If not add it to the other import statements.
+2. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method)
+3. Add the String to the ``en_EN.json`` file in ``src/i18n`` or if you are working in matrix-react-sdk you can find the json file in ``src/i18n/strings``
+
+## Adding variables inside a string.
+
+1. Extend your ``_t()`` call. Instead of ``_t(STRING)`` use ``_t(STRING, {})``
+2. Decide how to name it. Please think about if the person who has to translate it can understand what it does.
+3. Add it to the array in ``_t`` for example ``_t(STRING, {variable: this.variable})``
+4. Add the variable inside the string. The syntax for variables is ``%(variable)s``. Please note the s at the end. The name of the variable has to match the previous used name.
+
+## Things to know/Style Guides
+
+- Do not use it inside ``getDefaultProps`` at the point where ``getDefaultProps`` is initialized the translations aren't loaded yet and it causes missing translations.
+- If using translated strings as constants, translated strings can't be in constants loaded at class-load time since the translations won't be loaded.
+- If a string is presented in the UI with punctuation like a full stop, include this in the translation strings, since punctuation varies between languages too.
diff --git a/docs/translating.md b/docs/translating.md
new file mode 100644
index 0000000000..ca9920d323
--- /dev/null
+++ b/docs/translating.md
@@ -0,0 +1,64 @@
+# How to translate riot-web
+
+## Requirements
+
+- Web Browser
+- Be able to understand English
+- Be able to understand the language you want to translate riot-web into
+
+## Step 0: Join #riotweb-translations:matrix.org
+
+1. Come and join https://riot.im/develop/#/room/#riotweb-translations:matrix.org
+2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed. In general little-or-no coordination is needed though :)
+
+## Step 1: Preparing your Weblate Profile
+
+1. Head to https://translate.nordgedanken.de and register either via Github or email
+2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4)
+3. Log into weblate
+4. Head to https://translate.nordgedanken.de/accounts/profile/ and select the languages you know and maybe another language you know too.
+6. Head to https://translate.nordgedanken.de/accounts/profile/#subscriptions and select Riot Web as Project
+
+## How to check if your language already is being translated
+
+Go to https://translate.nordgedanken.de/projects/riot-web/ and visit the 2 sub-projects.
+If your language is listed go to Step 2a and if not go to Step 2b
+
+## Step 2a: Helping on existing languages.
+
+1. Head to one of the projects listed https://translate.nordgedanken.de/projects/riot-web/
+2. Click on the ``translate`` button on the right side of your language
+3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.
+
+Head to the explanations under Steb 2b
+
+## Step 2b: Adding a new language
+
+1. Go to one of the projects listed https://translate.nordgedanken.de/projects/riot-web/
+2. Click the ``Start new language`` button at the bottom
+3. Select a language
+4. Start translating like in 2a.3
+5. Repeat these steps for the other projects which are listed at the link of step 2b.1
+
+### What means the green button under the text field?
+
+The green button let you save our translations directly. Please only use it if you are 100% sure about that translation. If you do not know a translation please DO NOT click that button. Use the arrows above the translations field and click to the right.
+
+### What means the yellow button under the text field?
+
+The yellow button has to be used if you are unsure about the translation but you have a rough idea. It adds a new suggestion to the string which can than be reviewed by others.
+
+### What are "%(something)s"?
+
+These things are variables that are expanded when displayed by Riot. They can be room names, usernames or similar. If you find one, you can move to the right place for your language, but not delete it as the variable will be missing if you do.
+
+A special case is `%(urlStart)s` and `%(urlEnd)s` which are used to mark the beginning of a hyperlink (i.e. `
-
- 
- All messages (loud)
+ { _t('All messages (loud)') }
- All messages
+ { _t('All messages') }
- Mentions only
+ { _t('Mentions only') }
- Mute
+ { _t('Mute') }
);
@@ -306,16 +307,16 @@ module.exports = React.createClass({
switch (membership) {
case "join":
leaveClickHandler = this._onClickLeave;
- leaveText = "Leave";
+ leaveText = _t('Leave');
break;
case "leave":
case "ban":
leaveClickHandler = this._onClickForget;
- leaveText = "Forget";
+ leaveText = _t('Forget');
break;
case "invite":
leaveClickHandler = this._onClickReject;
- leaveText = "Reject";
+ leaveText = _t('Reject');
break;
}
@@ -353,17 +354,17 @@ module.exports = React.createClass({
- Favourite
+ { _t('Favourite') }
- Low Priority
+ { _t('Low Priority') }
- Direct Chat
+ { _t('Direct Chat') }
);
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index ab3e9ee8f0..dd0490ac0c 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -25,6 +25,7 @@ var filesize = require('filesize');
var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
const Modal = require('matrix-react-sdk/lib/Modal');
const sdk = require('matrix-react-sdk');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
module.exports = React.createClass({
displayName: 'ImageView',
@@ -76,8 +77,8 @@ module.exports = React.createClass({
// display error message stating you couldn't delete this.
var code = e.errcode || e.statusCode;
Modal.createDialog(ErrorDialog, {
- title: "Error",
- description: "You cannot delete this image. (" + code + ")"
+ title: _t('Error'),
+ description: _t('You cannot delete this image. (%(code)s)', {code: code})
});
}).done();
}
@@ -150,14 +151,14 @@ module.exports = React.createClass({
var eventMeta;
if(showEventMeta) {
eventMeta = (
@@ -713,7 +714,7 @@ module.exports = React.createClass({
{masterPushRuleDiv}
);
@@ -723,13 +724,13 @@ module.exports = React.createClass({
let emailNotificationsRow;
if (emailThreepids.length === 0) {
emailNotificationsRow = more
+ { _t("more") }
{ content }
);
@@ -509,8 +510,8 @@ var RoomSubList = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to add tag " + self.props.tagName + " to room" + err);
Modal.createDialog(ErrorDialog, {
- title: "Failed to add tag " + self.props.tagName + " to room",
- description: ((err && err.message) ? err.message : "Operation failed"),
+ title: _t('Failed to add tag %(tagName)s to room', {tagName: self.props.tagName}),
+ description: ((err && err.message) ? err.message : _t('Operation failed')),
});
});
break;
@@ -530,7 +531,7 @@ var RoomSubList = React.createClass({
var target;
if (this.state.sortedList.length == 0 && this.props.editable) {
- target =
- Resend
+ { _t('Resend') }
);
}
@@ -138,7 +139,7 @@ module.exports = React.createClass({
if (!eventStatus && !this.props.mxEvent.isRedacted()) { // sent and not redacted
redactButton = (
- Redact
+ { _t('Redact') }
);
}
@@ -146,7 +147,7 @@ module.exports = React.createClass({
if (eventStatus === "queued" || eventStatus === "not_sent") {
cancelButton = (
- Cancel Sending
+ { _t('Cancel Sending') }
);
}
@@ -164,14 +165,14 @@ module.exports = React.createClass({
viewSourceButton = (
- View Source
+ { _t('View Source') }
);
if (this.props.mxEvent.getType() !== this.props.mxEvent.getWireType()) {
viewClearSourceButton = (
- View Decrypted Source
+ { _t('View Decrypted Source') }
);
}
@@ -180,7 +181,7 @@ module.exports = React.createClass({
if (this.props.eventTileOps.isWidgetHidden()) {
unhidePreviewButton = (
- Unhide Preview
+ { _t('Unhide Preview') }
);
}
@@ -190,13 +191,13 @@ module.exports = React.createClass({
permalinkButton = (
Permalink
+ target="_blank" rel="noopener" onClick={ this.closeMenu }>{ _t('Permalink') }
);
const quoteButton = (
- Quote
+ { _t('Quote') }
);
@@ -205,7 +206,7 @@ module.exports = React.createClass({
externalURLButton = (
Source URL
+ rel="noopener" target="_blank" onClick={ this.closeMenu }>{ _t('Source URL') }
);
}
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index 7efa68485c..a7b19689fe 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -21,6 +21,7 @@ import q from 'q';
import React from 'react';
import classNames from 'classnames';
import sdk from 'matrix-react-sdk';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import dis from 'matrix-react-sdk/lib/dispatcher';
import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap';
@@ -70,8 +71,8 @@ module.exports = React.createClass({
}).fail(function(err) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
- title: "Failed to remove tag " + tagNameOff + " from room",
- description: ((err && err.message) ? err.message : "Operation failed"),
+ title: _t('Failed to remove tag %(tagName)s from room', {tagName: tagNameOff}),
+ description: ((err && err.message) ? err.message : _t('Operation failed')),
});
});
}
@@ -87,8 +88,8 @@ module.exports = React.createClass({
}).fail(function(err) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
- title: "Failed to add tag " + tagNameOn + " to room",
- description: ((err && err.message) ? err.message : "Operation failed"),
+ title: _t('Failed to remove tag %(tagName)s from room', {tagName: tagNameOn}),
+ description: ((err && err.message) ? err.message : _t('Operation failed')),
});
});
}
@@ -148,8 +149,8 @@ module.exports = React.createClass({
}, (err) => {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
- title: "Failed to set Direct Message status of room",
- description: ((err && err.message) ? err.message : "Operation failed"),
+ title: _t('Failed to set Direct Message status of room'),
+ description: ((err && err.message) ? err.message : _t('Operation failed')),
});
});
},
@@ -187,8 +188,8 @@ module.exports = React.createClass({
var errCode = err.errcode || "unknown error code";
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
- title: `Failed to forget room (${errCode})`,
- description: ((err && err.message) ? err.message : "Operation failed"),
+ title: _t('Failed to forget room %(errCode)s', {errCode: errCode}),
+ description: ((err && err.message) ? err.message : _t('Operation failed')),
});
});
@@ -274,22 +275,22 @@ module.exports = React.createClass({
- All messages (loud)
+ { _t('All messages (loud)') }
- All messages
+ { _t('All messages') }
- Mentions only
+ { _t('Mentions only') }
- Mute
+ { _t('Mute') }
- Favourite
+ { _t('Favourite') }
- Low Priority
+ { _t('Low Priority') }
- Direct Chat
+ { _t('Direct Chat') }
- Uploaded on { DateUtils.formatDate(new Date(this.props.mxEvent.getTs())) } by { this.props.mxEvent.getSender() }
+ { _t('Uploaded on %(date)s by %(user)s', {date: DateUtils.formatDate(new Date(this.props.mxEvent.getTs())), user: this.props.mxEvent.getSender()}) }
);
}
var eventRedact;
if(showEventMeta) {
eventRedact = (
- Redact
+ { _t('Redact') }
);
}
@@ -169,7 +170,7 @@ module.exports = React.createClass({
- 
@@ -178,7 +179,7 @@ module.exports = React.createClass({
{ eventMeta }
);
}
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index 89cc44db89..7acc9bd61e 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -14,19 +14,21 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
+import React from 'react';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import DateUtils from 'matrix-react-sdk/lib/DateUtils';
-var React = require('react');
-
-var days = [
- "Sunday",
- "Monday",
- "Tuesday",
- "Wednesday",
- "Thursday",
- "Friday",
- "Saturday"
-];
+function getdaysArray() {
+ return [
+ _t('Sunday'),
+ _t('Monday'),
+ _t('Tuesday'),
+ _t('Wednesday'),
+ _t('Thursday'),
+ _t('Friday'),
+ _t('Saturday'),
+ ];
+}
module.exports = React.createClass({
displayName: 'DateSeparator',
@@ -34,19 +36,20 @@ module.exports = React.createClass({
var date = new Date(this.props.ts);
var today = new Date();
var yesterday = new Date();
+ var days = getdaysArray();
yesterday.setDate(today.getDate() - 1);
var label;
if (date.toDateString() === today.toDateString()) {
- label = "Today";
+ label = _t('Today');
}
else if (date.toDateString() === yesterday.toDateString()) {
- label = "Yesterday";
+ label = _t('Yesterday');
}
else if (today.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
label = days[date.getDay()];
}
else {
- label = date.toDateString();
+ label = DateUtils.formatFullDate(date);
}
return (
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index a97f54b173..dacfad925a 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -16,19 +16,23 @@ limitations under the License.
'use strict';
-var React = require('react');
-var DateUtils = require('matrix-react-sdk/lib/DateUtils');
+import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
+const React = require('react');
+const DateUtils = require('matrix-react-sdk/lib/DateUtils');
module.exports = React.createClass({
displayName: 'MessageTimestamp',
+ propTypes: {
+ showTwelveHour: React.PropTypes.bool,
+ },
+
render: function() {
- var date = new Date(this.props.ts);
+ const date = new Date(this.props.ts);
return (
- { DateUtils.formatTime(date) }
+ { DateUtils.formatTime(date, this.props.showTwelveHour) }
);
},
});
-
diff --git a/src/components/views/rooms/DNDRoomTile.js b/src/components/views/rooms/DNDRoomTile.js
index 4bcf29ed9a..6abb5bd06c 100644
--- a/src/components/views/rooms/DNDRoomTile.js
+++ b/src/components/views/rooms/DNDRoomTile.js
@@ -23,6 +23,7 @@ import {DropTarget} from 'react-dnd';
import dis from 'matrix-react-sdk/lib/dispatcher';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import sdk from 'matrix-react-sdk';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
import RoomTile from 'matrix-react-sdk/lib/components/views/rooms/RoomTile';
import * as Rooms from 'matrix-react-sdk/lib/Rooms';
import Modal from 'matrix-react-sdk/lib/Modal';
@@ -90,8 +91,8 @@ var roomTileSource = {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to set direct chat tag " + err);
Modal.createDialog(ErrorDialog, {
- title: "Failed to set direct chat tag",
- description: ((err && err.message) ? err.message : "Operation failed"),
+ title: _t('Failed to set direct chat tag'),
+ description: ((err && err.message) ? err.message : _t('Operation failed')),
});
});
return;
@@ -115,8 +116,8 @@ var roomTileSource = {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to remove tag " + prevTag + " from room: " + err);
Modal.createDialog(ErrorDialog, {
- title: "Failed to remove tag " + prevTag + " from room",
- description: ((err && err.message) ? err.message : "Operation failed"),
+ title: _t('Failed to remove tag %(tagName)s from room', {tagName: prevTag}),
+ description: ((err && err.message) ? err.message : _t('Operation failed')),
});
});
}
@@ -137,8 +138,8 @@ var roomTileSource = {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to add tag " + newTag + " to room: " + err);
Modal.createDialog(ErrorDialog, {
- title: "Failed to add tag " + newTag + " to room",
- description: ((err && err.message) ? err.message : "Operation failed"),
+ title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
+ description: ((err && err.message) ? err.message : _t('Operation failed')),
});
});
}
@@ -241,4 +242,3 @@ DragSource('RoomTile', roomTileSource, function(connect, monitor) {
isDragging: monitor.isDragging()
};
})(RoomTile));
-
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 11dc79ac20..11948acebe 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -16,6 +16,7 @@ limitations under the License.
'use strict';
var React = require('react');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
var q = require("q");
var sdk = require('matrix-react-sdk');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
@@ -131,8 +132,8 @@ module.exports = React.createClass({
}, (error) => {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
- title: "Error saving email notification preferences",
- description: "An error occurred whilst saving your email notification preferences.",
+ title: _t('Error saving email notification preferences'),
+ description: _t('An error occurred whilst saving your email notification preferences.'),
});
});
},
@@ -175,8 +176,8 @@ module.exports = React.createClass({
var TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
Modal.createDialog(TextInputDialog, {
- title: "Keywords",
- description: "Enter keywords separated by a comma:",
+ title: _t('Keywords'),
+ description: _t('Enter keywords separated by a comma:'),
value: keywords,
onFinished: function onFinished(should_leave, newValue) {
@@ -240,8 +241,8 @@ module.exports = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to change settings: " + error);
Modal.createDialog(ErrorDialog, {
- title: "Failed to change settings",
- description: ((error && error.message) ? error.message : "Operation failed"),
+ title: _t('Failed to change settings'),
+ description: ((error && error.message) ? error.message : _t('Operation failed')),
onFinished: self._refreshFromServer
});
});
@@ -310,8 +311,8 @@ module.exports = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Can't update user notification settings: " + error);
Modal.createDialog(ErrorDialog, {
- title: "Can't update user notification settings",
- description: ((error && error.message) ? error.message : "Operation failed"),
+ title: _t('Can\'t update user notification settings'),
+ description: ((error && error.message) ? error.message : _t('Operation failed')),
onFinished: self._refreshFromServer
});
});
@@ -352,8 +353,8 @@ module.exports = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to update keywords: " + error);
Modal.createDialog(ErrorDialog, {
- title: "Failed to update keywords",
- description: ((error && error.message) ? error.message : "Operation failed"),
+ title: _t('Failed to update keywords'),
+ description: ((error && error.message) ? error.message : _t('Operation failed')),
onFinished: self._refreshFromServer
});
}
@@ -562,8 +563,8 @@ module.exports = React.createClass({
// Build the rules not managed by Vector UI
var otherRulesDescriptions = {
- '.m.rule.message': "Notify for all other messages/rooms",
- '.m.rule.fallback': "Notify me for anything else"
+ '.m.rule.message': _t('Notify for all other messages/rooms'),
+ '.m.rule.fallback': _t('Notify me for anything else'),
};
for (var i in defaultRules.others) {
@@ -698,7 +699,7 @@ module.exports = React.createClass({
- Download this file
+ { _t('Download this file') }
{ size_res }
diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
index dbe4196aad..6d47ad1b9e 100644
--- a/src/components/views/globals/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -17,6 +17,7 @@ limitations under the License.
'use strict';
var React = require('react');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
var Notifier = require("matrix-react-sdk/lib/Notifier");
var sdk = require('matrix-react-sdk')
var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
@@ -37,7 +38,7 @@ module.exports = React.createClass({
+ { _t('Download this file') }
{ size_res }
- You are not receiving desktop notifications. Enable them now
+ { _t('You are not receiving desktop notifications') } { _t('Enable them now') }
- Custom Server Options
+ { _t('Custom Server Options') }
-
- You can use the custom server options to sign into other Matrix
- servers by specifying a different Home server URL.
-
- This allows you to use Riot with an existing Matrix account on - a different home server. -
-
- You can also set a custom identity server but you won't be able to - invite users by email address, or be invited by email address yourself. - +
- This allows you to use Riot with an existing Matrix account on - a different home server. -
-
- You can also set a custom identity server but you won't be able to - invite users by email address, or be invited by email address yourself. - +
- All notifications are currently disabled for all targets.
+ { _t('All notifications are currently disabled for all targets.') }.
- Add an email address above to configure email notifications
+ { _t('Add an email address above to configure email notifications') }
;
} else {
// This only supports the first email address in your profile for now
emailNotificationsRow = this.emailNotificationsRow(
emailThreepids[0].address,
- "Enable email notifications ("+emailThreepids[0].address+")"
+ _t('Enable email notifications') + ' (' + emailThreepids[0].address + ')'
);
}
@@ -737,7 +738,7 @@ module.exports = React.createClass({
var externalRules = [];
for (var i in this.state.externalPushRules) {
var rule = this.state.externalPushRules[i];
- externalRules.push(Unable to fetch notification target list
+ devicesSection = { _t('Unable to fetch notification target list') }
} else if (this.state.pushers.length == 0) {
devicesSection = null;
} else {
@@ -774,7 +775,7 @@ module.exports = React.createClass({
}
if (devicesSection) {
devicesSection = (
-
);
}
@@ -783,9 +784,9 @@ module.exports = React.createClass({
if (externalRules.length) {
advancedSettings = (
Notification targets
+{ _t('Notification targets') }
{ devicesSection }
-
- You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply. +
+ { _t('You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply') }.
Advanced notifications settings
- There are advanced notifications which are not shown here.- You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply. +
{ _t('Advanced notification settings') }
+ { _t('There are advanced notifications which are not shown here') }.+ { _t('You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply') }.
-
{ externalRules }
Dies erlaubt dir Riot mit einem existierendem Konto auf einem anderen Heimserver zu nutzen.
Du kannst auch einen benutzerdefinierten Identitäts-Server setzen, aber du wirst dann nicht in der Lage sein, Nutzer per E-Mail-Adresse einzuladen oder selbst mit E-Mail-Adresse eingeladen zu werden." +} diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json new file mode 100644 index 0000000000..039f5b76d3 --- /dev/null +++ b/src/i18n/strings/en_EN.json @@ -0,0 +1,122 @@ +{ + "Add an email address above to configure email notifications": "Add an email address above to configure email notifications", + "Advanced notification settings": "Advanced notification settings", + "All messages": "All messages", + "All messages (loud)": "All messages (loud)", + "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.", + "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.", + "Call invitation": "Call invitation", + "Cancel Sending": "Cancel Sending", + "Can't update user notification settings": "Can't update user notification settings", + "Close": "Close", + "Create new room": "Create new room", + "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room", + "Custom Server Options": "Custom Server Options", + "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.
You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.", + "delete the alias": "delete the alias", + "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?", + "Direct Chat": "Direct Chat", + "Directory": "Directory", + "Dismiss": "Dismiss", + "Download this file": "Download this file", + "Drop here %(toAction)s": "Drop here %(toAction)s", + "Enable audible notifications in web client": "Enable audible notifications in web client", + "Enable desktop notifications": "Enable desktop notifications", + "Enable email notifications": "Enable email notifications", + "Enable notifications for this account": "Enable notifications for this account", + "Enable them now": "Enable them now", + "Enter keywords separated by a comma:": "Enter keywords separated by a comma:", + "Error": "Error", + "Error saving email notification preferences": "Error saving email notification preferences", + "#example": "#example", + "Failed to": "Failed to", + "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", + "Failed to change settings": "Failed to change settings", + "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s", + "Failed to update keywords": "Failed to update keywords", + "Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server", + "Failed to get public room list": "Failed to get public room list", + "Failed to join the room": "Failed to join the room", + "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", + "Failed to set direct chat tag": "Failed to set direct chat tag", + "Failed to set Direct Message status of room": "Failed to set Direct Message status of room", + "Favourite": "Favourite", + "Fetching third party location failed": "Fetching third party location failed", + "Files": "Files", + "Filter room names": "Filter room names", + "Forget": "Forget", + " from room": " from room", + "Guests can join": "Guests can join", + "Guest users can't invite users. Please register to invite": "Guest users can't invite users. Please register to invite", + "Invite to this room": "Invite to this room", + "Keywords": "Keywords", + "Leave": "Leave", + "Low Priority": "Low Priority", + "Members": "Members", + "Mentions only": "Mentions only", + "Messages containing my display name": "Messages containing my display name", + "Messages containing my user name": "Messages containing my user name", + "Messages in group chats": "Messages in group chats", + "Messages in one-to-one chats": "Messages in one-to-one chats", + "Messages sent by bot": "Messages sent by bot", + "more": "more", + "Mute": "Mute", + "No rooms to show": "No rooms to show", + "Noisy": "Noisy", + "Notification targets": "Notification targets", + "Notifications": "Notifications", + "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:", + "Notify for all other messages/rooms": "Notify for all other messages/rooms", + "Notify me for anything else": "Notify me for anything else", + "Off": "Off", + "On": "On", + "Operation failed": "Operation failed", + "Permalink": "Permalink", + "Please Register": "Please Register", + "powered by Matrix": "powered by Matrix", + "Quote": "Quote", + "Redact": "Redact", + "Reject": "Reject", + "Remove %(name)s from the directory?": "Remove %(name)s from the directory?", + "Remove": "Remove", + "remove %(name)s from the directory": "remove %(name)s from the directory", + "Remove from Directory": "Remove from Directory", + "Resend": "Resend", + "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network", + "Room directory": "Room directory", + "Room not found": "Room not found", + "Search for a room": "Search for a room", + "Settings": "Settings", + "Source URL": "Source URL", + "Start chat": "Start chat", + "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks", + "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here", + "The server may be unavailable or overloaded": "The server may be unavailable or overloaded", + "This room is inaccessible to guests. You may be able to join if you register": "This room is inaccessible to guests. You may be able to join if you register", + " to room": " to room", + "Unable to fetch notification target list": "Unable to fetch notification target list", + "Unable to join network": "Unable to join network", + "Unable to look up room ID from server": "Unable to look up room ID from server", + "Unhide Preview": "Unhide Preview", + "unknown error code": "unknown error code", + "Unnamed room": "Unnamed room", + "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s", + "View Decrypted Source": "View Decrypted Source", + "View Source": "View Source", + "When I'm invited to a room": "When I'm invited to a room", + "World readable": "World readable", + "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)", + "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)", + "You are not receiving desktop notifications": "You are not receiving desktop notifications", + "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply", + "Sunday": "Sunday", + "Monday": "Monday", + "Tuesday": "Tuesday", + "Wednesday": "Wednesday", + "Thursday": "Thursday", + "Friday": "Friday", + "Saturday": "Saturday", + "Today": "Today", + "Yesterday": "Yesterday", + "Welcome page": "Welcome page" +} diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json new file mode 100644 index 0000000000..d2e594327d --- /dev/null +++ b/src/i18n/strings/fi.json @@ -0,0 +1,3 @@ +{ + "Sunday": "Sunnuntai" +} diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json new file mode 100644 index 0000000000..dfd38e868a --- /dev/null +++ b/src/i18n/strings/fr.json @@ -0,0 +1,124 @@ +{ + "Add an email address above to configure email notifications": "Ajouter une adresse email pour la configuration des notifications par email", + "All messages": "Tous les messages", + "All messages (loud)": "Tous les messages (fort)", + "All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.", + "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications par e-mail", + "Cancel Sending": "Annuler l'envoi", + "Can't update user notification settings": "Impossible de mettre à jour les notifications utilisateur", + "Close": "Fermer", + "Create new room": "Créer un nouveau salon", + "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix", + "Custom Server Options": "Options de Serveur Personnalisé", + "delete the alias": "Supprimer l'alias", + "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?", + "Direct Chat": "Conversation Directe", + "Directory": "Répertoire", + "Dismiss": "Rejeter", + "Download this file": "Télécharger ce fichier", + "Drop here %(toAction)s": "Déposer ici pour %(toAction)s", + "Enable audible notifications in web client": "Activer les notifications sonores pour le client web", + "Enable desktop notifications": "Activer les notifications de bureau", + "Enable email notifications": "Activer les notifications par e-mail", + "Enable notifications for this account": "Activer les notifications pour ce compte", + "Enable them now": "Les activer maintenant", + "Enter keywords separated by a comma:": "Entrez les mots clés séparés par une virgule", + "Error": "Erreur", + "Error saving email notification preferences": "Erreur lors de la sauvegarde des notifications par email", + "#example": "#exemple", + "Failed to": "Echec pour", + "Failed to add tag %(tagName)s to room": "Echec lors de l'ajout du tag %(tagName)s pour le salon", + "Failed to change settings": "Changement de configuration échouée", + "Failed to forget room %(errCode)s": "Echec lors de l'oublie du salon %(errCode)s", + "Failed to update keywords": "Échec dans la mise à jour des mots clés", + "Failed to get protocol list from Home Server": "Echec lors de la récupération depuis le serveur maison", + "Failed to get public room list": "Echec lors de la récupération de la liste des salons publics", + "Failed to join the room": "Échec de l'adhésion au salon", + "Failed to remove tag %(tagName)s from room": "Échec dans la suppression de l’étiquette %(tagName)s du salon", + "Failed to set direct chat tag": "Échec dans l'attribution d'une étiquette dans le chat direct", + "Favourite": "Favoris", + "Operation failed": "L'opération a échoué", + "Please Register": "Veuillez vous enregistrer", + "powered by Matrix": "propulsé par Matrix", + "Quote": "Citer", + "Redact": "Rédiger", + "Reject": "Rejeter", + "Remove %(name)s from the directory?": "Supprimer %(name)s du répertoire ?", + "Remove": "Supprimer", + "Resend": "Renvoyer", + "Settings": "Paramètres", + "Start chat": "Démarrer une discussion", + "unknown error code": "Code erreur inconnu", + "View Source": "Voir la source", + "You cannot delete this image. (%(code)s)": "Vous ne pouvez pas supprimer cette image. (%(code)s)", + "You cannot delete this message. (%(code)s)": "Vous ne pouvez pas supprimer ce message. (%(code)s)", + "You are not receiving desktop notifications": "Vous ne recevez pas les notifications sur votre bureau", + "Sunday": "Dimanche", + "Monday": "Lundi", + "Tuesday": "Mardi", + "Wednesday": "Mercredi", + "Thursday": "Jeudi", + "Friday": "Vendredi", + "Saturday": "Samedi", + "Today": "Aujourd'hui", + "Yesterday": "Hier", + "Welcome page": "Page d'accueil", + "Call invitation": "Appel entrant", + "Failed to set Direct Message status of room": "Échec de la configuration de l'état de Message Direct du salon", + "Fetching third party location failed": "Échec de la récupération de la localisation tierce", + "Files": "Fichiers", + "Filter room names": "Filtrer les noms des salons", + "Forget": "Oublier", + " from room": " du salon", + "Guest users can't invite users. Please register to invite": "Les invités ne peuvent démarrer une discussion. Merci de vous enregistrer pour pouvoir démarrer une discussion", + "Invite to this room": "Inviter dans ce salon", + "Keywords": "Mots-clés", + "Leave": "Quitter", + "Low Priority": "Priorité Basse", + "Members": "Membres", + "Mentions only": "Seulement les mentions", + "Messages containing my display name": "Messages contenant mon nom", + "Messages containing my user name": "Message contenant mon nom d'utilisateur", + "Messages in group chats": "Messages dans les conversations de groupe", + "Messages in one-to-one chats": "Messages dans les conversations directes", + "Messages sent by bot": "Messages envoyés par des robots", + "more": "plus", + "Mute": "Muet", + "No rooms to show": "Aucun salon à afficher", + "Noisy": "Sonore", + "Notification targets": "Appareils recevant les notifications", + "Notifications": "Notifications", + "Notifications on the following keywords follow rules which can’t be displayed here": "Les mots-clés suivants suivent des règles de notification qui ne peuvent être affichées ici", + "Notify for all other messages/rooms": "Me notifier pour tous les autres messages/salons", + "Notify me for anything else": "Me notifier pour tout le reste", + "Off": "Désactivé", + "On": "Activé", + "Permalink": "Permalien", + "remove %(name)s from the directory": "supprimer %(name)s du répertoire", + "Remove from Directory": "Supprimer du répertoire", + "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau", + "Room directory": "Répertoire des salons", + "Room not found": "Salon non trouvé", + "Search for a room": "Chercher un salon", + "Source URL": "URL source", + "The Home Server may be too old to support third party networks": "Le Home Server semble trop ancien pour supporter des réseaux tiers", + "There are advanced notifications which are not shown here": "Il existe une configuration avancée des notifications qui ne peut être affichée ici", + "The server may be unavailable or overloaded": "Le serveur est indisponible ou surchargé", + "This room is inaccessible to guests. You may be able to join if you register": "Ce salon n'est pas ouvert aux invités. Vous pourrez peut-être le rejoindre si vous vous enregistrez", + "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications", + "Unable to join network": "Impossible de rejoindre le réseau", + "Unable to look up room ID from server": "Impossible de récupérer l'ID du salon sur le serveur", + "Unhide Preview": "Dévoiler l'aperçu", + "Unnamed room": "Salon anonyme", + "Uploaded on %(date)s by %(user)s": "Téléchargé le %(date)s par %(user)s", + "View Decrypted Source": "Voir la source décryptée", + "When I'm invited to a room": "Quand je suis invité dans un salon", + "World readable": "Visible par tout le monde", + "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vous les avez probablement configurées dans un autre client que Riot. Vous ne pouvez pas les configurer dans Riot mais elles s'appliquent quand même", + "Guests can join": "Ouvert aux invités", + " to room": " au salon", + "Advanced notification settings": "Paramètres de notifications avancés", + "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications mail.", + "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse différente pour Home serveur.
Cela permet d'utiliser Riot avec un compte existant sur un Home serveur différent.
Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.", + "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots clés suivant répondent à des critères qui ne peuvent pas être affichés ici :" +} diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json new file mode 100644 index 0000000000..09fa3df9e0 --- /dev/null +++ b/src/i18n/strings/hu.json @@ -0,0 +1,68 @@ +{ + "Add an email address above to configure email notifications": "E-mail értesítés beállításához írd be az e-mail címed", + "Advanced notification settings": "Haladó értesítési beállítások", + "All messages": "Minden üzenet", + "All messages (loud)": "Minden üzenet (hangos)", + "All notifications are currently disabled for all targets.": "Minden céleszközön minden értesítés tiltva van.", + "An error occurred whilst saving your email notification preferences.": "Hiba történt az e-mail értesítés beállításánál.", + "Call invitation": "Hívás meghívó", + "Cancel Sending": "Küldés megszakítása", + "Can't update user notification settings": "Nem sikerül frissíteni az értesítési beállításokat", + "Close": "Bezár", + "Create new room": "Új szoba készítés", + "Couldn't find a matching Matrix room": "Nem található a keresett Matrix szoba", + "Custom Server Options": "Egyedi szerver beállítások", + "delete the alias": "becenév törlése", + "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Törlöd a(z) %(alias)s szobát és kiveszed a könyvtárból ezt: %(name)s?", + "Direct Chat": "Közvetlen csevegés", + "Directory": "Könyvtár", + "Dismiss": "Eltűntet", + "Download this file": "Fájl letöltése", + "Drop here %(toAction)s": "%(toAction)s -t húzd ide", + "Enable audible notifications in web client": "Hallható értesítések engedélyezése a webes kliensben", + "Enable desktop notifications": "Asztali értesítések engedélyezése", + "Enable email notifications": "E-mail értesítések engedélyezése", + "Enable notifications for this account": "Értesítések engedélyezése a fiókhoz", + "Enable them now": "Engedélyezés most", + "Enter keywords separated by a comma:": "Kulcsszavak vesszővel elválasztva:", + "Error": "Hiba", + "Error saving email notification preferences": "Hiba email értesítés beállításának mentésénél", + "#example": "#példa", + "Failed to": "Nem lehet", + "Failed to add tag %(tagName)s to room": "Nem lehet a címkét hozzáadni a szobához: %(tagName)s", + "Failed to change settings": "Nem lehet a beállítást megváltoztatni", + "Failed to forget room %(errCode)s": "Nem lehet eltávolítani a szobát: %(errCode)s", + "Failed to update keywords": "Nem lehet a kulcsszavakat frissíteni", + "Failed to get protocol list from Home Server": "Nem lehet a protokoll listát lekérni a Saját szerverről", + "Failed to get public room list": "Nem lehet lekérdezni a nyílt szobák listáját", + "Failed to join the room": "Nem lehet csatlakozni a szobához", + "Failed to remove tag %(tagName)s from room": "Nem lehet törölni a(z) %(tagName)s címkét a szobáról", + "Failed to set direct chat tag": "Nem lehet a címkét beállítani a közvetlen beszélgetéshez", + "Failed to set Direct Message status of room": "Nem lehet beállítani a Közvetlen beszélgetés státuszt a szobához", + "Favourite": "Kedvenc", + "Fetching third party location failed": "Nem sikerült lekérdezni a harmadik felet", + "Files": "Fájlok", + "Filter room names": "Szoba nevek szűrése", + "Forget": "Elfelejt", + " from room": " szobából", + "Guests can join": "Vendégek csatlakozhatnak", + "Guest users can't invite users. Please register to invite": "Vendég felhasználó nem küldhet meghívót. Kérlek regisztrálj meghívó küldéshez", + "Invite to this room": "Meghívás a szobába", + "Keywords": "Kulcsszavak", + "Leave": "Elhagy", + "Low Priority": "Alacsony priorítás", + "Members": "Résztvevők", + "Mentions only": "Csak ha megemlítenek", + "Messages containing my display name": "Az üzenet tartalmazza a nevem", + "Messages containing my user name": "Az üzenet tartalmazza a felhasználói nevem", + "Messages in group chats": "Üzenetek a csoportszobában", + "Messages in one-to-one chats": "Üzenetek közvetlen beszélgetésekben", + "Messages sent by bot": "Botok által küldött üzenetek", + "more": "további", + "Mute": "Elnémít", + "No rooms to show": "Nincs megjeleníthető szoba", + "Noisy": "Hangos", + "Notification targets": "Értesítések célpontja", + "Notifications": "Értesítések", + "Notify for all other messages/rooms": "Értesítés minden más üzenethez/szobához" +} diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json new file mode 100644 index 0000000000..e67ece484c --- /dev/null +++ b/src/i18n/strings/ml.json @@ -0,0 +1,5 @@ +{ + "Add an email address above to configure email notifications": "ഇ മെയില് അറിയിപ്പുകൾ ലഭിക്കാന് മുകളില് ഇ-മെയില് വിലാസം നല്കൂ", + "All messages": "എല്ലാ സന്ദേശങ്ങളും", + "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)" +} \ No newline at end of file diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/src/i18n/strings/nb_NO.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/src/i18n/strings/pl.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json new file mode 100644 index 0000000000..44041bc8fc --- /dev/null +++ b/src/i18n/strings/pt.json @@ -0,0 +1,116 @@ +{ + "Add an email address above to configure email notifications": "Adicione um endereço de email acima para configurar as notificações por email", + "All messages": "Todas as mensagens", + "All messages (loud)": "Todas as mensagens (alto)", + "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desativadas para todos os destinos", + "An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto salvava suas preferências de notificação por email.", + "Cancel Sending": "Cancelar o envio", + "Can't update user notification settings": "Não é possível atualizar as preferências de notificação", + "Close": "Fechar", + "Create new room": "Criar nova sala", + "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix", + "Custom Server Options": "Opções de customização do servidor", + "delete the alias": "apagar o apelido da sala", + "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?", + "Direct Chat": "Conversa pessoal", + "Directory": "Diretório", + "Dismiss": "Encerrar", + "Download this file": "Baixar este arquivo", + "Drop here %(toAction)s": "Arraste aqui para %(toAction)s", + "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web", + "Enable desktop notifications": "Ativar notificações no desktop", + "Enable email notifications": "Ativar notificações por email", + "Enable notifications for this account": "Ativar notificações para esta conta", + "Enable them now": "Habilitar agora", + "Enter keywords separated by a comma:": "Coloque cada palavras-chave separada por vírgula:", + "Error": "Erro", + "Error saving email notification preferences": "Erro ao salvar as preferências de notificação por email", + "#example:": "#exemplo", + "Failed to": "Falha ao", + "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala", + "Failed to change settings": "Falha ao mudar as preferências", + "Failed to forget room %(errCode)s": "Falha ao esquecer a sala %(errCode)s", + "Failed to update keywords": "Falha ao alterar as palavras-chave", + "Failed to get protocol list from Home Server": "Falha em acessar a lista de protocolos do servidor padrão", + "Failed to get public room list": "Falha ao acessar a lista pública de salas", + "Failed to join the room": "Falha ao entrar na sala", + "Failed to remove tag %(tag)s from room": "Falha ao remover a palavra-chave %(tag)s da sala", + "Failed to set direct chat tag": "Falha ao definir conversa como pessoal", + "Failed to set Direct Message status of room": "Falha em definr a mensagem de status da sala", + "Favourite": "Favorito", + "Fetching third party location failed": "Falha ao acessar localização de terceiros", + "Files": "Arquivos", + "Filter room names": "Filtrar salas por título", + "Forget": "Esquecer", + " from room": " da sala", + "Guests can join": "Convidados podem entrar", + "Guest users can't invite users. Please register to invite": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites", + "Invite to this room": "Convidar para esta sala", + "Keywords": "Palavras-chave", + "Leave": "Sair", + "Low Priority": "Baixa prioridade", + "Members": "Membros", + "Mentions only": "Apenas menções", + "Mute": "Mudo", + "No rooms to show": "Não existem salas a serem exibidas", + "Noisy": "Barulhento", + "Notification targets": "Alvos de notificação", + "Notifications": "Notificações", + "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificações sobre as seguintes palavras-chave seguem regras que não podem ser exibidas aqui:", + "Notify for all other messages/rooms": "Notificar para todas as outras mensagens e salas", + "Notify me for anything else": "Notificar-me sobre qualquer outro evento", + "Off": "Desativado", + "On": "Ativado", + "Operation failed": "A operação falhou", + "Permalink": "Link permanente", + "Please Register": "Por favor, cadastre-se", + "powered by Matrix": "distribuído por Matrix", + "Quote": "Citar", + "Redact": "Remover", + "Reject": "Rejeitar", + "Remove": "Remover", + "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?", + "remove %(name)s from the directory": "remover %(name)s da lista pública de salas", + "Remove from Directory": "Remover da lista pública de salas", + "Resend": "Reenviar", + "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede", + "Room directory": "Lista de salas públicas", + "Room not found": "Sala não encontrada", + "Search for a room": "Procurar por uma sala", + "Settings": "Configurações", + "Source URL": "URL fonte", + "Start chat": "Começar conversa", + "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros", + "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui", + "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado", + "This room is inaccessible to guests. You may be able to join if you register": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre", + " to room": " na sala", + "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação", + "Unable to join network": "Não foi possível conectar na rede", + "Unable to look up room ID from server": "Não foi possivel buscar identificação da sala no servidor", + "Unhide Preview": "Mostrar a pré-visualização novamente", + "unknown error code": "código de erro desconhecido", + "Unnamed room": "Sala sem nome", + "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s", + "View Decrypted Source": "Ver a fonte descriptografada", + "View Source": "Ver a fonte", + "World readable": "Público", + "You cannot delete this image. (%(code)s)": "Você não pode apagar esta imagem. (%(code)s)", + "You cannot delete this message. (%(code)s)": "Você não pode apagar esta mensagem. (%(code)s)", + "You are not receiving desktop notifications": "Você não está recebendo notificações desktop", + "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Você pode te-las configurado em outro cliente além do Riot. Você não pode ajustá-las no Riot, mas ainda assim elas se aplicam aqui", + "Sunday": "Domingo", + "Monday": "Segunda", + "Tuesday": "Terça", + "Wednesday": "Quarta", + "Thursday": "Quinta", + "Friday": "Sexta", + "Saturday": "Sábado", + "Today": "Hoje", + "Yesterday": "Ontem", + "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os recipientes.", + "#example": "#exemplo", + "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala", + "Notifications on the following keywords follow rules which can’t be displayed here": "As notificações sobre as palavras-chave abaixo seguem regras que não podem ser mostradas aqui", + "Welcome page": "Página de boas vindas" +} diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json new file mode 100644 index 0000000000..545ed11a3d --- /dev/null +++ b/src/i18n/strings/pt_BR.json @@ -0,0 +1,123 @@ +{ + "Add an email address above to configure email notifications": "Insira um endereço de email no campo acima para configurar suas notificações por email", + "All messages": "Todas as mensagens", + "All messages (loud)": "Todas as mensagens (alto)", + "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desativadas para todos os destinos", + "An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto o sistema estava salvando suas preferências de notificação por email.", + "Call invitation": "Convite para chamada", + "Cancel Sending": "Cancelar o envio", + "Can't update user notification settings": "Não é possível atualizar as preferências de notificação", + "Close": "Fechar", + "Create new room": "Criar nova sala", + "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix", + "Custom Server Options": "Opções de personalização do servidor", + "delete the alias": "apagar o apelido da sala", + "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?", + "Direct Chat": "Conversa pessoal", + "Directory": "Diretório", + "Dismiss": "Encerrar", + "Download this file": "Baixar este arquivo", + "Drop here %(toAction)s": "Arraste aqui para %(toAction)s", + "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web", + "Enable desktop notifications": "Ativar notificações no desktop", + "Enable email notifications": "Ativar notificações por email", + "Enable notifications for this account": "Ativar notificações para esta conta", + "Enable them now": "Habilitar agora", + "Enter keywords separated by a comma:": "Coloque cada palavras-chave separada por vírgula:", + "Error": "Erro", + "Error saving email notification preferences": "Erro ao salvar as preferências de notificação por email", + "#example:": "#exemplo", + "Failed to": "Falha ao", + "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala", + "Failed to change settings": "Falhou ao mudar as preferências", + "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s", + "Failed to update keywords": "Falhou ao alterar as palavras-chave", + "Failed to get protocol list from Home Server": "Falha em acessar a lista de protocolos do servidor padrão", + "Failed to get public room list": "Falha ao acessar a lista pública de salas", + "Failed to join the room": "Falhou ao entrar na sala", + "Failed to remove tag %(tag)s from room": "Falha ao remover a palavra-chave %(tag)s da sala", + "Failed to set direct chat tag": "Falha ao definir conversa como pessoal", + "Failed to set Direct Message status of room": "Falha em definir a mensagem de status da sala", + "Favourite": "Favorito", + "Fetching third party location failed": "Falha ao acessar localização de terceiros", + "Files": "Arquivos", + "Filter room names": "Filtrar salas por título", + "Forget": "Esquecer", + " from room": " da sala", + "Guests can join": "Convidados podem entrar", + "Guest users can't invite users. Please register to invite": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites", + "Invite to this room": "Convidar para esta sala", + "Keywords": "Palavras-chave", + "Leave": "Sair", + "Low Priority": "Baixa prioridade", + "Members": "Membros", + "Mentions only": "Apenas menções", + "Messages containing my display name": "Mensagens contendo meu nome público", + "Messages containing my user name": "Mensagens contendo meu nome de usuário", + "Messages in group chats": "Mensagens em salas", + "Messages in one-to-one chats": "Mensagens em conversas pessoais", + "Messages sent by bot": "Mensagens enviadas por bots", + "more": "ver mais", + "Mute": "Mudo", + "No rooms to show": "Não existem salas a serem exibidas", + "Noisy": "Barulhento", + "Notification targets": "Alvos de notificação", + "Notifications": "Notificações", + "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificações sobre as seguintes palavras-chave seguem regras que não podem ser exibidas aqui:", + "Notify for all other messages/rooms": "Notificar para todas as outras mensagens e salas", + "Notify me for anything else": "Notificar-me sobre qualquer outro evento", + "Off": "Desativado", + "On": "Ativado", + "Operation failed": "A operação falhou", + "Permalink": "Link permanente", + "Please Register": "Por favor, cadastre-se", + "powered by Matrix": "distribuído por Matrix", + "Quote": "Citar", + "Redact": "Remover", + "Reject": "Rejeitar", + "Remove": "Remover", + "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?", + "remove %(name)s from the directory": "remover %(name)s da lista pública de salas", + "Remove from Directory": "Remover da lista pública de salas", + "Resend": "Reenviar", + "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede", + "Room directory": "Lista de salas públicas", + "Room not found": "Sala não encontrada", + "Search for a room": "Procurar por uma sala", + "Settings": "Configurações", + "Source URL": "URL fonte", + "Start chat": "Começar conversa", + "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros", + "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui", + "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado", + "This room is inaccessible to guests. You may be able to join if you register": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre", + " to room": " para sala", + "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação", + "Unable to join network": "Não foi possível conectar na rede", + "Unable to look up room ID from server": "Não foi possível buscar identificação da sala no servidor", + "Unhide Preview": "Mostrar a pré-visualização novamente", + "unknown error code": "código de erro desconhecido", + "Unnamed room": "Sala sem nome", + "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s", + "View Decrypted Source": "Ver a fonte descriptografada", + "View Source": "Ver a fonte", + "When I'm invited to a room": "Quando sou convidada(o) a uma sala", + "World readable": "Público", + "You cannot delete this image. (%(code)s)": "Você não pode apagar esta imagem. (%(code)s)", + "You cannot delete this message. (%(code)s)": "Você não pode apagar esta mensagem. (%(code)s)", + "You are not receiving desktop notifications": "Você não está recebendo notificações desktop", + "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Você pode te-las configurado em outro cliente além do Riot. Você não pode ajustá-las no Riot, mas ainda assim elas se aplicam aqui", + "Sunday": "Domingo", + "Monday": "Segunda", + "Tuesday": "Terça", + "Wednesday": "Quarta", + "Thursday": "Quinta", + "Friday": "Sexta", + "Saturday": "Sábado", + "Today": "Hoje", + "Yesterday": "Ontem", + "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os destinatários.", + "#example": "#exemplo", + "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala", + "Welcome page": "Página de boas vindas" +} diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json new file mode 100644 index 0000000000..fe5196ae3f --- /dev/null +++ b/src/i18n/strings/ru.json @@ -0,0 +1,130 @@ +{ + "Add an email address above to configure email notifications": "Добавьте email адрес для оповещений", + "All notifications are currently disabled for all targets.": "Все оповещения отключены.", + "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек оповещения по электронной почте.", + "and remove": "и удалить", + "Can't update user notification settings": "Не возможно обновить пользовательские настройки оповещения", + "Create new room": "Создать комнату", + "Couldn't find a matching Matrix room": "Не возможно найти подходящую Матрикс комнату", + "Custom Server Options": "Настройки пользовательского сервера", + "delete the alias": "удалить привязку", + "Delete the room alias": "Удалить привязку комнаты", + "Direct Chat": "Персональное сообщение", + "Directory": "Каталог", + "Dismiss": "Отмена", + "Drop here to": "Перетащите сюда", + "Enable audible notifications in web client": "Включить звуковые оповещения в веб клиенте", + "Enable desktop notifications": "Включить оповещения на рабочем столе", + "Enable email notifications": "Включить оповещения по электронной почте", + "Enable notifications for this account": "Включить оповещения для этого аккаунта", + "Enable them now": "Включить сейчас", + "Enter keywords separated by a comma:": "Введите ключевые слова, разделенные запятой:", + "Error": "Ошибка", + "Error saving email notification preferences": "Ошибка сохранения настроек оповещений по электронной почте", + "#example": "#пример", + "Failed to": "Не удалось", + "Failed to add tag ": "Не удалось добавить тег ", + "Failed to change settings": "Не удалось изменить настройки", + "Failed to update keywords": "Не удалось обновить ключевые слова", + "Failed to get protocol list from Home Server": "Не удалось получить список протоколов с Пользовательского Сервера", + "Failed to get public room list": "Не удалось получить список общих комнат", + "Failed to join the room": "Не удалось войти в комнату", + "Failed to remove tag ": "Не удалось удалить тег ", + "Failed to set Direct Message status of room": "Не удалось задать статус комнаты Персональное Сообщение", + "Favourite": "Избранное", + "Fetching third party location failed": "Не удалось получить местоположение", + "Files": "Файлы", + "Filter room names": "Отфильтровать по названию комнаты", + "Forget": "Забыть", + "from the directory": "из каталога", + " from room": " из комнаты", + "Guests can join": "Гость может присоединиться", + "Guest users can't invite users. Please register to invite": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглошений", + "Invite to this room": "Пригласить в эту комнату", + "Keywords": "Ключевые слова", + "Leave": "Покинуть", + "Low Priority": "Низкий приоритет", + "Members": "Пользователи", + "No rooms to show": "Нет комнат для отображения", + "Noisy": "Звук", + "Notification targets": "Цели уведомления", + "Notifications": "Уведомления", + "Notifications on the following keywords follow rules which can’t be displayed here:": "Уведомления по следующим ключевым словам соответствуют правилам, которые нельзя отобразить здесь", + "Notify for all other messages/rooms": "Уведомить обо всех других сообщениях/комнатах", + "Notify me for anything else": "Уведомить меня обо всем кроме", + "Off": "Выключить", + "On": "Включить", + "Operation failed": "Операция не удалась", + "Please Register": "Пожалуйста, зарегистрируйтесь", + "powered by Matrix": "разработано в Matrix", + "Reject": "Отклонить", + "Remove": "Удалить", + "remove": "удалить", + "Remove from Directory": "Удалить из каталога", + "Riot does not know how to join a room on this network": "Riot не знает как войти в комнату в этой сети", + "Room directory": "Каталог комнат", + "Room not found": "Комната не найдена", + "Search for a room": "Искать комнату", + "Settings": "Настройки", + "Start chat": "Начать чат", + "The Home Server may be too old to support third party networks": "Пользовательский сервер может быть слишком старым для поддержки сторонних сетей", + "There are advanced notifications which are not shown here": "Здесь расширенные уведомления, которые здесь не показаны", + "The server may be unavailable or overloaded": "Возможно сервер недоступен или перегружен", + "This room is inaccessible to guests. You may be able to join if you register": "Эта комната недоступна для гостей. Вы можете присоединиться, если зарегистрируетесь", + " to room": " к комнате", + "Unable to fetch notification target list": "Не удалось получить список целей уведомления", + "Unable to join network": "Не возможно присоединиться к сети", + "Unable to look up room ID from server": "Не возможно найти ID комнаты на сервере", + "unknown error code": "неизвестная ошибка", + "Unnamed room": "Комната без названия", + "World readable": "Доступно всем", + "You are not receiving desktop notifications": "Вы не получаете уведомления на рабочем столе", + "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Вы могли настроить их в клиенте, отличном от Riot. Вы не можете настроить их в Riot, но они все еще применяются", + "All messages": "Все сообщения", + "All messages (loud)": "Все сообщения (громко)", + "Cancel Sending": "Отмена отправки", + "Close": "Закрыть", + "Download this file": "Скачать этот файл", + "Drop here %(toAction)s": "Вставить сюда для %(toAction)s", + "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и очистить %(name)s из каталога?", + "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату", + "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s", + "Failed to remove tag %(tagName)s from room": "Не удалось убрать пометку %(tagName)s из комнаты", + "Failed to set direct chat tag": "Не удалось пометить прямую беседу", + "Unhide Preview": "Показать предпросмотр", + "Uploaded on %(date)s by %(user)s": "Загружено %(date)s %(user)s", + "View Decrypted Source": "Просмотр зашыфрованного источника", + "View Source": "Просмотр источника", + "You cannot delete this image. (%(code)s)": "Вы не можете удалить это изображение. (%(code)s)", + "You cannot delete this message. (%(code)s)": "Вы не можете удалить это сообщение. (%(code)s)", + "Sunday": "Воскресенье", + "Monday": "Понедельник", + "Tuesday": "Вторник", + "Wednesday": "Среда", + "Thursday": "Четверг", + "Friday": "Пятница", + "Saturday": "Суббота", + "Today": "Сегодня", + "Yesterday": "Вчера", + "Mentions only": "Только упоминание", + "Mute": "Беззвучный", + "Permalink": "Пстоянная ссылка", + "Quote": "Цитата", + "Redact": "Удалить", + "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?", + "remove %(name)s from the directory": "удалить %(name)s из каталога", + "Resend": "Переслать снова", + "Source URL": "Исходный URL", + "Welcome page": "Домашняя страница", + "Advanced notification settings": "Настройки уведомлений", + "Call invitation": "Звонок", + "customServer_text": "Вы можете войти с помощью вашего сервера.
Это позволяет вам использовать Riot с уже существующей учетной записью на другом сервере.
Вы также можете задать свой сервер идентификации, но тогда вы не можете приглашать пользователей с помощью email-адреса и не можете быть приглашены по нему.", + "Enter keywords separated by a comma:": "Введите ключевые слова, разделенные запятой", + "Messages containing my display name": "Сообщения, содержащие мое отображаемое имя", + "Messages containing my user name": "Сообщение, содержащие мое имя пользователя", + "Messages in group chats": "Сообщения в групповых чатах", + "Messages in one-to-one chats": "Сообщения в приватных чатах", + "Messages sent by bot": "Сообщения, отправленные ботом", + "more": "больше", + "When I'm invited to a room": "Когда я приглашен в комнату" +} diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json new file mode 100644 index 0000000000..0d03a87806 --- /dev/null +++ b/src/i18n/strings/sv.json @@ -0,0 +1,40 @@ +{ + "Add an email address above to configure email notifications": "Lägg till en epostadress här för att konfigurera epostaviseringar", + "Advanced notification settings": "Avancerade aviseringsinställingar", + "All messages": "Alla meddelanden", + "All messages (loud)": "Alla meddelanden (högljudd)", + "All notifications are currently disabled for all targets.": "Alla aviseringar är för tillfället avstängda för alla mål.", + "An error occurred whilst saving your email notification preferences.": "Ett fel uppstod då epostaviseringsinställningarna sparades.", + "Call invitation": "Inbjudan till samtal", + "Cancel Sending": "Avbryt sändning", + "Can't update user notification settings": "Kan inte uppdatera aviseringsinställningarna", + "Close": "Stäng", + "Create new room": "Nytt rum", + "Couldn't find a matching Matrix room": "Kunde inte hitta ett matchande Matrix-rum", + "Custom Server Options": "Egna serverinställningar", + "customServer_text": "Du kan använda serverinställningarna för att logga in i en annan Matrix-server genom att specifiera en URL till en annan hemserver.
Så här kan du använda Riot med ett existerande Matrix-konto på en annan hemserver.
Du kan också specifiera en egen identitetsserver, men du kommer inte att kunna bjuda in andra via epostadress, eller bli inbjuden via epostadress.", + "delete the alias": "radera adressen", + "Direct Chat": "Direkt chatt", + "Directory": "Katalog", + "Dismiss": "Avvisa", + "Download this file": "Ladda ner filen", + "Drop here %(toAction)s": "Dra hit för att %(toAction)s", + "Enable audible notifications in web client": "Sätt på högljudda aviseringar i webbklienten", + "Enable desktop notifications": "Sätt på skrivbordsaviseringar", + "Enable email notifications": "Sätt på epostaviseringar", + "Enable notifications for this account": "Sätt på aviseringar för det här kontot", + "Enable them now": "Sätt på nu", + "Enter keywords separated by a comma:": "Skriv in nyckelord, separerade med kommatecken", + "Error": "Fel", + "Error saving email notification preferences": "Ett fel uppstod då epostaviseringsinställningarna sparades", + "Failed to": "Det gick inte att", + "Failed to add tag %(tagName)s to room": "Det gick inte att lägga till \"%(tagName)s\" till rummet", + "Failed to change settings": "Det gick inte att spara inställningarna", + "Failed to forget room %(errCode)s": "Det gick inte att glömma bort rummet: %(errCode)s", + "Failed to update keywords": "Det gick inte att uppdatera nyckelorden", + "Failed to get protocol list from Home Server": "Det gick inte att hämta protokollistan från hemservern", + "Failed to get public room list": "Det gick inte att hämta listan över offentliga rum", + "Failed to join the room": "Det gick inte att ansluta till rummet", + "Failed to remove tag %(tagName)s from room": "Det gick inte att radera taggen %(tagName)s från rummet", + "Failed to set direct chat tag": "Det gick inte att markera rummet som direkt chatt" +} diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_FilePanel.scss b/src/skins/vector/css/matrix-react-sdk/structures/_FilePanel.scss index 872085b66b..58e090645f 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_FilePanel.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_FilePanel.scss @@ -112,4 +112,3 @@ limitations under the License. .mx_FilePanel .mx_EventTile_selected .mx_EventTile_line { padding-left: 0px; } - diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss index fe60aacb9f..f72a6f0858 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss @@ -131,6 +131,10 @@ limitations under the License. position: absolute; } +.mx_UserSettings_language { + width: 200px; +} + .mx_UserSettings_profileTable { display: table; diff --git a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss index ebd59a1c24..b81f3979a9 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss @@ -175,7 +175,8 @@ limitations under the License. } .mx_Login_type_dropdown { - width: 125px; + display: inline-block; + min-width: 125px; align-self: flex-end; } diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss index abd4e9c164..d12bcd3712 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss @@ -37,6 +37,7 @@ limitations under the License. font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-size: 14px; color: $primary-fg-color; + background-color: $primary-bg-color; border-radius: 3px; border: solid 1px $input-border-color; diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss index cbd7142285..9d970ad454 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss @@ -183,6 +183,10 @@ limitations under the License. visibility: visible; } +.mx_MessagePanel_alwaysShowTimestamps .mx_MessageTimestamp { + visibility: visible; +} + .mx_EventTile_selected .mx_MessageTimestamp { left: 3px; } @@ -263,6 +267,14 @@ limitations under the License. cursor: pointer; } +.mx_EventTile_12hr .mx_EventTile_e2eIcon { + padding-left: 5px; +} + +.mx_EventTile_12hr .mx_MessageTimestamp { + text-align: center; +} + .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line, .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line { padding-left: 60px; diff --git a/src/skins/vector/img/logos/riot-logo-1.svg b/src/skins/vector/img/logos/riot-logo-1.svg index 6b79dd9e8a..297608b899 100644 --- a/src/skins/vector/img/logos/riot-logo-1.svg +++ b/src/skins/vector/img/logos/riot-logo-1.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-logo-2.svg b/src/skins/vector/img/logos/riot-logo-2.svg index 96e0bbb189..757f62309e 100644 --- a/src/skins/vector/img/logos/riot-logo-2.svg +++ b/src/skins/vector/img/logos/riot-logo-2.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-logo-3.svg b/src/skins/vector/img/logos/riot-logo-3.svg index 985b9c9f72..d71b489a44 100644 --- a/src/skins/vector/img/logos/riot-logo-3.svg +++ b/src/skins/vector/img/logos/riot-logo-3.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-logo-4.svg b/src/skins/vector/img/logos/riot-logo-4.svg index 24a7ddabe6..aa5522f609 100644 --- a/src/skins/vector/img/logos/riot-logo-4.svg +++ b/src/skins/vector/img/logos/riot-logo-4.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-logo-5.svg b/src/skins/vector/img/logos/riot-logo-5.svg index 6a2c61dfec..6cbc259257 100644 --- a/src/skins/vector/img/logos/riot-logo-5.svg +++ b/src/skins/vector/img/logos/riot-logo-5.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-logo-bw.svg b/src/skins/vector/img/logos/riot-logo-bw.svg index cb6d77d63b..e7d6e869ba 100644 --- a/src/skins/vector/img/logos/riot-logo-bw.svg +++ b/src/skins/vector/img/logos/riot-logo-bw.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/vector/index.js b/src/vector/index.js index 02713afca7..14f8bb4b36 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -62,6 +62,8 @@ var VectorConferenceHandler = require('../VectorConferenceHandler'); var UpdateChecker = require("./updater"); var q = require('q'); var request = require('browser-request'); +import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore'; +import * as languageHandler from 'matrix-react-sdk/lib/languageHandler'; import url from 'url'; @@ -228,8 +230,9 @@ function onLoadCompleted() { } } - async function loadApp() { + await loadLanguage(); + const fragparts = parseQsFromFragment(window.location); const params = parseQs(window.location); @@ -309,4 +312,22 @@ async function loadApp() { } } +async function loadLanguage() { + const prefLang = UserSettingsStore.getLocalSetting('language'); + let langs = []; + + if (!prefLang) { + languageHandler.getLanguagesFromBrowser().forEach((l) => { + langs.push(...languageHandler.getNormalizedLanguageKeys(l)); + }); + } else { + langs = [prefLang]; + } + try { + await languageHandler.setLanguage(langs); + } catch (e) { + console.error("Unable to set language", e); + } +} + loadApp(); diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index 82ef0b5168..bf930a674f 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -20,7 +20,7 @@ limitations under the License. import VectorBasePlatform from './VectorBasePlatform'; import dis from 'matrix-react-sdk/lib/dispatcher'; import q from 'q'; -import electron, {remote} from 'electron'; +import electron, {remote, ipcRenderer} from 'electron'; remote.autoUpdater.on('update-downloaded', onUpdateDownloaded); @@ -54,20 +54,24 @@ function platformFriendlyName(): string { } } +function _onAction(payload: Object) { + // Whitelist payload actions, no point sending most across + if (['call_state'].includes(payload.action)) { + ipcRenderer.send('app_onAction', payload); + } +} + export default class ElectronPlatform extends VectorBasePlatform { + constructor() { + super(); + dis.register(_onAction); + } + setNotificationCount(count: number) { if (this.notificationCount === count) return; super.setNotificationCount(count); - // this sometimes throws because electron is made of fail: - // https://github.com/electron/electron/issues/7351 - // For now, let's catch the error, but I suspect it may - // continue to fail and we might just have to accept that - // electron's remote RPC is a non-starter for now and use IPC - try { - remote.app.setBadgeCount(count); - } catch (e) { - console.error('Failed to set notification count', e); - } + + ipcRenderer.send('setBadgeCount', count); } supportsNotifications(): boolean { @@ -79,7 +83,6 @@ export default class ElectronPlatform extends VectorBasePlatform { } displayNotification(title: string, msg: string, avatarUrl: string, room: Object): Notification { - // GNOME notification spec parses HTML tags for styling... // Electron Docs state all supported linux notification systems follow this markup spec // https://github.com/electron/electron/blob/master/docs/tutorial/desktop-environment-integration.md#linux diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index 1466b76ae3..00c9c47c30 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -17,12 +17,57 @@ See the License for the specific language governing permissions and limitations under the License. */ -import BasePlatform from 'matrix-react-sdk/lib/BasePlatform' +import BasePlatform from 'matrix-react-sdk/lib/BasePlatform'; +import Favico from 'favico.js'; /** * Vector-specific extensions to the BasePlatform template */ export default class VectorBasePlatform extends BasePlatform { + constructor() { + super(); + + // The 'animations' are really low framerate and look terrible. + // Also it re-starts the animationb every time you set the badge, + // and we set the state each time, even if the value hasn't changed, + // so we'd need to fix that if enabling the animation. + this.favicon = new Favico({animation: 'none'}); + this._updateFavicon(); + } + + _updateFavicon() { + try { + // This needs to be in in a try block as it will throw + // if there are more than 100 badge count changes in + // its internal queue + let bgColor = "#d00", + notif = this.notificationCount; + + if (this.errorDidOccur) { + notif = notif || "×"; + bgColor = "#f00"; + } + + this.favicon.badge(notif, { + bgColor: bgColor, + }); + } catch (e) { + console.warn(`Failed to set badge count: ${e.message}`); + } + } + + setNotificationCount(count: number) { + if (this.notificationCount === count) return; + super.setNotificationCount(count); + this._updateFavicon(); + } + + setErrorStatus(errorDidOccur: boolean) { + if (this.errorDidOccur === errorDidOccur) return; + super.setErrorStatus(errorDidOccur); + this._updateFavicon(); + } + /** * Check for the availability of an update to the version of the * app that's currently running. diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js index 72ca19f06c..cdff7344a6 100644 --- a/src/vector/platform/WebPlatform.js +++ b/src/vector/platform/WebPlatform.js @@ -18,7 +18,6 @@ limitations under the License. */ import VectorBasePlatform from './VectorBasePlatform'; -import Favico from 'favico.js'; import request from 'browser-request'; import dis from 'matrix-react-sdk/lib/dispatcher.js'; import q from 'q'; @@ -30,45 +29,6 @@ export default class WebPlatform extends VectorBasePlatform { constructor() { super(); this.runningVersion = null; - // The 'animations' are really low framerate and look terrible. - // Also it re-starts the animationb every time you set the badge, - // and we set the state each time, even if the value hasn't changed, - // so we'd need to fix that if enabling the animation. - this.favicon = new Favico({animation: 'none'}); - this._updateFavicon(); - } - - _updateFavicon() { - try { - // This needs to be in in a try block as it will throw - // if there are more than 100 badge count changes in - // its internal queue - let bgColor = "#d00", - notif = this.notificationCount; - - if (this.errorDidOccur) { - notif = notif || "×"; - bgColor = "#f00"; - } - - this.favicon.badge(notif, { - bgColor: bgColor, - }); - } catch (e) { - console.warn(`Failed to set badge count: ${e.message}`); - } - } - - setNotificationCount(count: number) { - if (this.notificationCount === count) return; - super.setNotificationCount(count); - this._updateFavicon(); - } - - setErrorStatus(errorDidOccur: boolean) { - if (this.errorDidOccur === errorDidOccur) return; - super.setErrorStatus(errorDidOccur); - this._updateFavicon(); } /** diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js index 22daa39503..86fad11866 100644 --- a/test/app-tests/loading.js +++ b/test/app-tests/loading.js @@ -28,6 +28,7 @@ import jssdk from 'matrix-js-sdk'; import sdk from 'matrix-react-sdk'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; +import * as languageHandler from 'matrix-react-sdk/lib/languageHandler'; import test_utils from '../test-utils'; import MockHttpBackend from '../mock-request'; @@ -61,6 +62,10 @@ describe('loading:', function () { windowLocation = null; matrixChat = null; + + languageHandler.setMissingEntryGenerator(function(key) { + return key.split('|', 2)[1]; + }); }); afterEach(function() { @@ -115,9 +120,9 @@ describe('loading:', function () { } function routeUrl(location, matrixChat) { - console.log(Date.now() + "Routing URL " + location); + console.log(Date.now() + ` routing URL '${location}'`); const s = getScreenFromLocation(location); - console.log("Showing screen", s); + console.log("Showing screen "+ s); matrixChat.showScreen(s.screen, s.params); } @@ -136,6 +141,7 @@ describe('loading:', function () { enableGuest={true} onLoadCompleted={loadCompleteDefer.resolve} initialScreenAfterLogin={getScreenFromLocation(windowLocation)} + makeRegistrationUrl={() => {throw new Error('Not implemented');}} />, parentDiv ); @@ -151,6 +157,27 @@ describe('loading:', function () { }, 0); } + // set an expectation that we will get a call to /sync, then flush + // http requests until we do. + // + // returns a promise resolving to the received request + async function expectAndAwaitSync(response) { + response = response || {}; + let syncRequest = null; + httpBackend.when('GET', '/sync') + .check((r) => {syncRequest = r;}) + .respond(200, response); + + console.log("waiting for /sync"); + for (let attempts = 10; attempts > 0; attempts--) { + if (syncRequest) { + return syncRequest; + } + await httpBackend.flush(); + } + throw new Error("Gave up waiting for /sync"); + } + describe("Clean load with no stored credentials:", function() { it('gives a login panel by default', function (done) { loadApp(); @@ -221,8 +248,7 @@ describe('loading:', function () { httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' }); - httpBackend.when('GET', '/sync').respond(200, {}); - return httpBackend.flush(); + return expectAndAwaitSync(); }).then(() => { // once the sync completes, we should have a room view return awaitRoomView(matrixChat); @@ -250,13 +276,12 @@ describe('loading:', function () { it('shows a directory by default if we have no joined rooms', function(done) { httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' }); - httpBackend.when('GET', '/sync').respond(200, {}); loadApp(); return awaitSyncingSpinner(matrixChat).then(() => { // we got a sync spinner - let the sync complete - return httpBackend.flush(); + return expectAndAwaitSync(); }).then(() => { // once the sync completes, we should have a directory httpBackend.verifyNoOutstandingExpectation(); @@ -269,7 +294,6 @@ describe('loading:', function () { it('shows a room view if we followed a room link', function(done) { httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' }); - httpBackend.when('GET', '/sync').respond(200, {}); loadApp({ uriFragment: "#/room/!room:id", @@ -277,7 +301,7 @@ describe('loading:', function () { return awaitSyncingSpinner(matrixChat).then(() => { // we got a sync spinner - let the sync complete - return httpBackend.flush(); + return expectAndAwaitSync(); }).then(() => { // once the sync completes, we should have a room view return awaitRoomView(matrixChat); @@ -310,8 +334,7 @@ describe('loading:', function () { return awaitSyncingSpinner(matrixChat); }).then(() => { // we got a sync spinner - let the sync complete - httpBackend.when('GET', '/sync').respond(200, {}); - return httpBackend.flush(); + return expectAndAwaitSync(); }).then(() => { // once the sync completes, we should have a directory httpBackend.verifyNoOutstandingExpectation(); @@ -344,11 +367,10 @@ describe('loading:', function () { }).then(() => { return awaitSyncingSpinner(matrixChat); }).then(() => { - httpBackend.when('GET', '/sync').check(function(req) { - expect(req.path).toMatch(new RegExp("^https://homeserver/")); - }).respond(200, {}); - return httpBackend.flush(); - }).then(() => { + return expectAndAwaitSync(); + }).then((req) => { + expect(req.path).toMatch(new RegExp("^https://homeserver/")); + // once the sync completes, we should have a directory httpBackend.verifyNoOutstandingExpectation(); ReactTestUtils.findRenderedComponentWithType( @@ -379,8 +401,7 @@ describe('loading:', function () { }).then(() => { return awaitSyncingSpinner(matrixChat); }).then(() => { - httpBackend.when('GET', '/sync').respond(200, {}); - return httpBackend.flush(); + return expectAndAwaitSync(); }).then(() => { // once the sync completes, we should have a room view return awaitRoomView(matrixChat); @@ -450,7 +471,7 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) { retryCount = 0; } - if (matrixChat.state.loading) { + if (matrixChat.state.loading || matrixChat.state.loggingIn) { console.log(Date.now() + " Awaiting sync spinner: still loading."); if (retryCount >= retryLimit) { throw new Error("MatrixChat still not loaded after " + diff --git a/test/skin-sdk.js b/test/skin-sdk.js index a5a7233c31..3421d5d07d 100644 --- a/test/skin-sdk.js +++ b/test/skin-sdk.js @@ -5,4 +5,4 @@ */ var sdk = require('matrix-react-sdk'); -sdk.loadSkin(require('component-index')); +sdk.loadSkin(require('../src/component-index')); diff --git a/test/unit-tests/notifications/ContentRules-test.js b/test/unit-tests/notifications/ContentRules-test.js index e7928147f6..c1cdc40a8b 100644 --- a/test/unit-tests/notifications/ContentRules-test.js +++ b/test/unit-tests/notifications/ContentRules-test.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -var notifications = require('notifications'); +var notifications = require('../../../src/notifications'); var ContentRules = notifications.ContentRules; var PushRuleVectorState = notifications.PushRuleVectorState; diff --git a/test/unit-tests/notifications/PushRuleVectorState-test.js b/test/unit-tests/notifications/PushRuleVectorState-test.js index 6b0f81c60c..68e7044f60 100644 --- a/test/unit-tests/notifications/PushRuleVectorState-test.js +++ b/test/unit-tests/notifications/PushRuleVectorState-test.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -var notifications = require('notifications'); +var notifications = require('../../../src/notifications'); var prvs = notifications.PushRuleVectorState;