Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/piwik

docs/translating.md

@@ -6,24 +6,29 @@
 - 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 register check if you got a email to verify your account and click the link (if there is none head to step 1.4)
+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 in all 3 sub projects if your language is listed.
+Go to https://translate.nordgedanken.de/projects/riot-web/ and visit the 2 sub-projects.
-If it is listed go to Step 2a if not go to Step 2b
+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.
+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
 
@@ -31,7 +36,7 @@ Head to the explanations under Steb 2b
 
 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 our language
+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
 
@@ -41,16 +46,19 @@ The green button let you save our translations directly. Please only use it if y
 
 ### 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 ads a new suggestion to the string which can than be reviewed by others.
+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 filled inside the code. They can be room names, usernames or similiar. If you find one use it for changing the word order but do not delete it as thing are missing if you do so.
+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. `<a href="/somewhere">` and `</a>`.  You must keep these markers surrounding the equivalent string in your language that needs to be hyperlinked.
 
 ### "I want to come back to this string. How?"
 
 You can use inside the translation field "Review needed" checkbox. It will be shown as Strings that need to be reviewed.
 
+
 ### Further reading
 
-The official Doc provides some more in-deepth explanation on how to do translations and talks about do and don't's. You can find it at: https://docs.weblate.org/en/latest/user/translating.html
+The official Weblate doc provides some more in-deepth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html

package.json

@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.8",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "0.8.9",
+    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",
@@ -104,6 +104,7 @@
     "emojione": "^2.2.7",
     "eslint": "^3.14.0",
     "eslint-config-google": "^0.7.1",
+    "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-react": "^6.9.0",
     "expect": "^1.16.0",

scripts/fetch-develop.deps.sh

@@ -40,11 +40,13 @@ dodep matrix-org matrix-react-sdk
 mkdir -p node_modules
 cd node_modules
 
+rm -r matrix-js-sdk 2> /dev/null
 ln -s ../matrix-js-sdk ./
 pushd matrix-js-sdk
 npm install
 popd
 
+rm -r matrix-react-sdk 2> /dev/null
 ln -s ../matrix-react-sdk ./
 pushd matrix-react-sdk
 mkdir -p node_modules

scripts/jenkins.sh

@@ -34,11 +34,9 @@ npm run lintall -- -f checkstyle -o eslint.xml || true
 
 rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
 
- # node_modules deps from 'npm install' don't have a .git dir so can't
+# Since the deps are fetched from git, we can rev-parse
- # rev-parse; but they do set the commit in package.json under 'gitHead' which
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
- # we're grabbing here.
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
-REACT_SHA=$(grep 'gitHead' node_modules/matrix-react-sdk/package.json | cut -d \" -f 4 | head -c 12)
-JSSDK_SHA=$(grep 'gitHead' node_modules/matrix-js-sdk/package.json | cut -d \" -f 4 | head -c 12)
 
 VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
 

src/components/views/settings/Notifications.js

@@ -714,7 +714,7 @@ module.exports = React.createClass({
                     {masterPushRuleDiv}
 
                     <div className="mx_UserSettings_notifTable">
-                        { _t('All notifications are currently disabled for all targets') }.
+                        { _t('All notifications are currently disabled for all targets.') }.
                     </div>
                 </div>
             );

src/i18n/strings/be.json

@@ -16,7 +16,7 @@
     "Directory": "Каталог",
     "Dismiss": "Aдхіліць",
     "Download this file": "Спампаваць гэты файл",
-    "Drop here to %(verb)s": "Перацягнуць сюды %(verb)s",
+    "Drop here %(toAction)s": "Перацягнуць сюды %(toAction)s",
     "Enable audible notifications in web client": "Ўключыць гукавыя апавяшчэнні ў вэб-кліенце",
     "Enable desktop notifications": "Ўключыць апавяшчэнні на працоўным стале",
     "Enable email notifications": "Ўключыць паведамлення па электроннай пошце",
@@ -34,7 +34,7 @@
     "Failed to get protocol list from Home Server": "Не ўдалося атрымаць спіс пратаколаў ад хатняга сервера",
     "Failed to get public room list": "Не ўдалося атрымаць спіс агульных пакояў",
     "Failed to join the room": "Не ўдалося далучыцца да пакоя",
-    "Failed to remove tag %(prevTag)s from room": "Не ўдалося выдаліць %(prevTag)s з пакоя",
+    "Failed to remove tag %(tagName)s from room": "Не ўдалося выдаліць %(tagName)s з пакоя",
     "Failed to set direct chat tag": "Не ўдалося ўсталяваць тэг прамога чата",
     "Failed to set Direct Message status of room": "Не ўдалося ўсталяваць статут прамога паведамлення пакою",
     "Favourite": "Улюбёнае",

src/i18n/strings/de_DE.json

@@ -81,7 +81,7 @@
     "On": "An",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Client als Riot konfiguriert. Sie sind in Riot nicht anpassbar gelten aber trotzdem",
     " to room": " an Raum",
-    "Drop here to %(verb)s": "%(verb)s hierher ziehen",
+    "Drop here %(toAction)s": "%(toAction)s hierher ziehen",
     "All messages": "Alle Nachrichten",
     "All messages (loud)": "Alle Nachrichten (laut)",
     "Cancel Sending": "Senden abbrechen",
@@ -90,7 +90,7 @@
     "Download this file": "Datei Herunterladen",
     "Failed to add tag %(tagName)s to room": "Das Hinzufügen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums %(errCode)s aus deiner Liste ist fehlgeschlagen",
-    "Failed to remove tag %(prevTag)s from room": "Das Entfernen des Tags %(prevTag)s für den Raum ist fehlgeschlagen",
+    "Failed to remove tag %(tagName)s from room": "Das Entfernen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
     "Failed to set direct chat tag": "Fehler beim setzen der Direct Chat Kennzeichnung",
     "Mentions only": "Nur, wenn du erwähnt wirst",
     "Mute": "Lautlos",
@@ -117,5 +117,16 @@
     "Sunday": "Sonntag",
     "Monday": "Montag",
     "Yesterday": "Gestern",
-    "Welcome page": "Willkommensseite"
+    "Welcome page": "Willkommensseite",
+    "Advanced notification settings": "Erweiterte Benachrichtigungs-Einstellungen",
+    "Call invitation": "Anruf-Einladung",
+    "Enter keywords separated by a comma:": "Trage Schlagworte, mit Komma getrennt, ein",
+    "Messages containing my display name": "Nachrichten, die meinen Anzeigenamen enthalten",
+    "Messages containing my user name": "Nachrichten, die meinen Nutzernamen enthalten",
+    "Messages in group chats": "Nachrichten in Chat-Gruppen",
+    "Messages in one-to-one chats": "Nachrichten in Eins-zu-Eins-Chats",
+    "Messages sent by bot": "Nachrichten von Bots",
+    "more": "mehr",
+    "When I'm invited to a room": "Wenn ich in einen Raum eingeladen werde",
+    "customServer_text": "Du kannst die erweiterten Server-Optioen nutzen um dich an anderen Matrix-Servern mittels anderer Heimserver-URL anzumelden. <br/>Dies erlaubt dir Riot mit einem existierendem Konto auf einem anderen Heimserver zu nutzen.<br/><br/>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."
 }

src/i18n/strings/en_EN.json

@@ -19,13 +19,13 @@
   "Directory": "Directory",
   "Dismiss": "Dismiss",
   "Download this file": "Download this file",
-  "Drop here to %(verb)s": "Drop here to %(verb)s",
+  "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",
+  "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",
@@ -37,7 +37,7 @@
   "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 %(prevTag)s from room": "Failed to remove tag %(prevTag)s from 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",

src/i18n/strings/fi.json

@@ -0,0 +1,3 @@
+{
+    "Sunday": "Sunnuntai"
+}

src/i18n/strings/fr.json

@@ -3,7 +3,7 @@
     "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",
+    "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",
@@ -16,13 +16,13 @@
     "Directory": "Répertoire",
     "Dismiss": "Rejeter",
     "Download this file": "Télécharger ce fichier",
-    "Drop here to %(verb)s": "Déposer ici pour %(verb)s",
+    "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",
+    "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",
@@ -34,7 +34,7 @@
     "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 %(prevTag)s from room": "Échec dans la suppression de l’étiquette %(prevTag)s du 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é",
@@ -116,5 +116,9 @@
     "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"
+    " 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.<br/>Cela permet d'utiliser Riot avec un compte existant sur un Home serveur différent.<br/><br/>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 :"
 }

src/i18n/strings/hu.json

@@ -0,0 +1,16 @@
+{
+    "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"
+}

src/i18n/strings/pt.json

@@ -2,7 +2,7 @@
     "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",
+    "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",
@@ -11,12 +11,12 @@
     "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 %(nome)s da lista pública?",
+    "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 to %(verb)s": "Arraste aqui para %(verb)s",
+    "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",
@@ -110,7 +110,7 @@
     "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 %(prevTag)s from room": "Não foi possível remover a marcação %(prevTag)s desta sala",
+    "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"
 }

src/i18n/strings/pt_BR.json

@@ -2,7 +2,7 @@
     "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",
+    "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",
@@ -12,12 +12,12 @@
     "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 %(nome)s da lista pública?",
+    "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 to %(verb)s": "Arraste aqui para %(verb)s",
+    "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",
@@ -118,6 +118,6 @@
     "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 %(prevTag)s from room": "Não foi possível remover a marcação %(prevTag)s desta sala",
+    "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"
 }

src/i18n/strings/ru.json

@@ -1,7 +1,7 @@
 {
-    "Add an email address above to configure email notifications": "Добавьте email адресс для настройки оповещений",
+    "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.": "Возникла ошибка при сохранении настроек оповещения вашего email.",
+    "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек оповещения по электронной почте.",
     "and remove": "и удалить",
     "Can't update user notification settings": "Не возможно обновить пользовательские настройки оповещения",
     "Create new room": "Создать комнату",
@@ -11,27 +11,27 @@
     "Delete the room alias": "Удалить привязку комнаты",
     "Direct Chat": "Персональное сообщение",
     "Directory": "Каталог",
-    "Dismiss": "Отелонено",
+    "Dismiss": "Отмена",
     "Drop here to": "Перетащите сюда",
     "Enable audible notifications in web client": "Включить звуковые оповещения в веб клиенте",
     "Enable desktop notifications": "Включить оповещения на рабочем столе",
-    "Enable email notifications": "Включить email оповещения",
+    "Enable email notifications": "Включить оповещения по электронной почте",
     "Enable notifications for this account": "Включить оповещения для этого аккаунта",
     "Enable them now": "Включить сейчас",
     "Enter keywords separated by a comma:": "Введите ключевые слова, разделенные запятой:",
     "Error": "Ошибка",
-    "Error saving email notification preferences": "Ошибка сохранения настроек email оповещений",
+    "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 get public room list": "Не удалось получить список общих комнат",
-    "Failed to join the room": "Не удалось присоединиться к комнате",
+    "Failed to join the room": "Не удалось войти в комнату",
     "Failed to remove tag ": "Не удалось удалить тег ",
     "Failed to set Direct Message status of room": "Не удалось задать статус комнаты Персональное Сообщение",
-    "Favourite": "Фаворит",
+    "Favourite": "Избранное",
     "Fetching third party location failed": "Не удалось получить местоположение",
     "Files": "Файлы",
     "Filter room names": "Отфильтровать по названию комнаты",
@@ -46,7 +46,7 @@
     "Low Priority": "Низкий приоритет",
     "Members": "Пользователи",
     "No rooms to show": "Нет комнат для отображения",
-    "Noisy": "Шумный",
+    "Noisy": "Звук",
     "Notification targets": "Цели уведомления",
     "Notifications": "Уведомления",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Уведомления по следующим ключевым словам соответствуют правилам, которые нельзя отобразить здесь",
@@ -55,29 +55,29 @@
     "Off": "Выключить",
     "On": "Включить",
     "Operation failed": "Операция не удалась",
-    "Please Register": "Пожалуйста зарегистрируйтесь",
+    "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 не знает как присоединиться к этой сети",
+    "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": "TЗдесь представлены расширенные уведомления, которые здесь не показаны",
+    "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": "Эта комната недоступна для гостей. Вы можете присоединиться, если зарегистрируетесь",
     " to room": " к комнате",
-    "Unable to fetch notification target list": "Не удалось получить список целевых уведомлений",
+    "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": "Читаем мир",
+    "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": "Все сообщения",
@@ -85,13 +85,13 @@
     "Cancel Sending": "Отмена отправки",
     "Close": "Закрыть",
     "Download this file": "Скачать этот файл",
-    "Drop here to %(verb)s": "Вставить сюда для %(verb)s",
+    "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 %(prevTag)s from room": "Не удалось удалить тег %(prevTag)s из комнаты",
+    "Failed to remove tag %(tagName)s from room": "Не удалось убрать пометку %(tagName)s из комнаты",
-    "Failed to set direct chat tag": "Не удалось установить прямой чат тег",
+    "Failed to set direct chat tag": "Не удалось пометить прямую беседу",
-    "Unhide Preview": "Показать пред. просмотр",
+    "Unhide Preview": "Показать предпросмотр",
     "Uploaded on %(date)s by %(user)s": "Загружено %(date)s  %(user)s",
     "View Decrypted Source": "Просмотр зашыфрованного источника",
     "View Source": "Просмотр источника",
@@ -103,7 +103,7 @@
     "Wednesday": "Среда",
     "Thursday": "Четверг",
     "Friday": "Пятница",
-    "Saturday": "Субота",
+    "Saturday": "Суббота",
     "Today": "Сегодня",
     "Yesterday": "Вчера",
     "Mentions only": "Только упоминание",
@@ -114,6 +114,17 @@
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
     "remove %(name)s from the directory": "удалить %(name)s из каталога",
     "Resend": "Переслать снова",
-    "Source URL": "Источник URL",
+    "Source URL": "Исходный URL",
-    "Welcome page": "Домашняя страница"
+    "Welcome page": "Домашняя страница",
+    "Advanced notification settings": "Настройки уведомлений",
+    "Call invitation": "Звонок",
+    "customServer_text": "Вы можете войти с помощью вашего сервера.<br/>Это позволяет вам использовать Riot с уже существующей учетной записью на другом сервере.<br/><br/>Вы также можете задать свой сервер идентификации, но тогда вы не можете приглашать пользователей с помощью 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": "Когда я приглашен в комнату"
 }

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.<br/>Så här kan du använda Riot med ett existerande Matrix-konto på en annan hemserver.<br/><br/>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"
+}

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;

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;
 }