From 0879d796ebce94d2a335d3a0adb1d33900b7f31f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 9 Jun 2017 20:26:41 +0100 Subject: [PATCH 01/13] released js-sdk --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15a903c25a..dd7ff9c11e 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "isomorphic-fetch": "^2.2.1", "linkifyjs": "^2.1.3", "lodash": "^4.13.1", - "matrix-js-sdk": "0.7.10", + "matrix-js-sdk": "0.7.11-rc.1", "optimist": "^0.6.1", "prop-types": "^15.5.8", "q": "^1.4.1", From 345661ee2ddf1a0e524bca1cb815df8c3b4f7247 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 9 Jun 2017 20:28:08 +0100 Subject: [PATCH 02/13] Prepare changelog for v0.9.3-rc.1 --- CHANGELOG.md | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66e4627afd..b217d7a0db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,154 @@ +Changes in [0.9.3-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.3-rc.1) (2017-06-09) +============================================================================================================= +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.2...v0.9.3-rc.1) + + * When ChatCreateOrReuseDialog is cancelled by a guest, go home + [\#1069](https://github.com/matrix-org/matrix-react-sdk/pull/1069) + * Update from Weblate. + [\#1065](https://github.com/matrix-org/matrix-react-sdk/pull/1065) + * Goto /home when forgetting the last room + [\#1067](https://github.com/matrix-org/matrix-react-sdk/pull/1067) + * Default to home page when settings is closed + [\#1066](https://github.com/matrix-org/matrix-react-sdk/pull/1066) + * Update from Weblate. + [\#1063](https://github.com/matrix-org/matrix-react-sdk/pull/1063) + * When joining, use a roomAlias if we have it + [\#1062](https://github.com/matrix-org/matrix-react-sdk/pull/1062) + * Control currently viewed event via RoomViewStore + [\#1058](https://github.com/matrix-org/matrix-react-sdk/pull/1058) + * Better error messages for login + [\#1060](https://github.com/matrix-org/matrix-react-sdk/pull/1060) + * Add remaining translations + [\#1056](https://github.com/matrix-org/matrix-react-sdk/pull/1056) + * Added button that copies code to clipboard + [\#1040](https://github.com/matrix-org/matrix-react-sdk/pull/1040) + * de-lint MegolmExportEncryption + test + [\#1059](https://github.com/matrix-org/matrix-react-sdk/pull/1059) + * Better RTL support + [\#1021](https://github.com/matrix-org/matrix-react-sdk/pull/1021) + * make mels emoji capable + [\#1057](https://github.com/matrix-org/matrix-react-sdk/pull/1057) + * Make travis check for lint on files which are clean to start with + [\#1055](https://github.com/matrix-org/matrix-react-sdk/pull/1055) + * Update from Weblate. + [\#1053](https://github.com/matrix-org/matrix-react-sdk/pull/1053) + * Add some logging around switching rooms + [\#1054](https://github.com/matrix-org/matrix-react-sdk/pull/1054) + * Update from Weblate. + [\#1052](https://github.com/matrix-org/matrix-react-sdk/pull/1052) + * Use user_directory endpoint to populate ChatInviteDialog + [\#1050](https://github.com/matrix-org/matrix-react-sdk/pull/1050) + * Various Analytics changes/fixes/improvements + [\#1046](https://github.com/matrix-org/matrix-react-sdk/pull/1046) + * Use an arrow function to allow `this` + [\#1051](https://github.com/matrix-org/matrix-react-sdk/pull/1051) + * New guest access + [\#937](https://github.com/matrix-org/matrix-react-sdk/pull/937) + * Translate src/components/structures + [\#1048](https://github.com/matrix-org/matrix-react-sdk/pull/1048) + * Cancel 'join room' action if 'log in' is clicked + [\#1049](https://github.com/matrix-org/matrix-react-sdk/pull/1049) + * fix copy and paste derp and rip out unused imports + [\#1015](https://github.com/matrix-org/matrix-react-sdk/pull/1015) + * Update from Weblate. + [\#1042](https://github.com/matrix-org/matrix-react-sdk/pull/1042) + * Reset 'first sync' flag / promise on log in + [\#1041](https://github.com/matrix-org/matrix-react-sdk/pull/1041) + * Remove DM-guessing code (again) + [\#1036](https://github.com/matrix-org/matrix-react-sdk/pull/1036) + * Cancel deferred actions + [\#1039](https://github.com/matrix-org/matrix-react-sdk/pull/1039) + * Merge develop, add i18n for SetMxIdDialog + [\#1034](https://github.com/matrix-org/matrix-react-sdk/pull/1034) + * Defer an intention for creating a room + [\#1038](https://github.com/matrix-org/matrix-react-sdk/pull/1038) + * Fix 'create room' button + [\#1037](https://github.com/matrix-org/matrix-react-sdk/pull/1037) + * Always show the spinner during the first sync + [\#1033](https://github.com/matrix-org/matrix-react-sdk/pull/1033) + * Only view welcome user if we are not looking at a room + [\#1032](https://github.com/matrix-org/matrix-react-sdk/pull/1032) + * Update from Weblate. + [\#1030](https://github.com/matrix-org/matrix-react-sdk/pull/1030) + * Keep deferred actions for view_user_settings and view_create_chat + [\#1031](https://github.com/matrix-org/matrix-react-sdk/pull/1031) + * Don't do a deferred start chat if user is welcome user + [\#1029](https://github.com/matrix-org/matrix-react-sdk/pull/1029) + * Introduce state `peekLoading` to avoid collision with `roomLoading` + [\#1028](https://github.com/matrix-org/matrix-react-sdk/pull/1028) + * Update from Weblate. + [\#1016](https://github.com/matrix-org/matrix-react-sdk/pull/1016) + * Fix accepting a 3pid invite + [\#1013](https://github.com/matrix-org/matrix-react-sdk/pull/1013) + * Propagate room join errors to the UI + [\#1007](https://github.com/matrix-org/matrix-react-sdk/pull/1007) + * Implement /user/@userid:domain?action=chat + [\#1006](https://github.com/matrix-org/matrix-react-sdk/pull/1006) + * Show People/Rooms emptySubListTip even when total rooms !== 0 + [\#967](https://github.com/matrix-org/matrix-react-sdk/pull/967) + * Fix to show the correct room + [\#995](https://github.com/matrix-org/matrix-react-sdk/pull/995) + * Remove cachedPassword from localStorage on_logged_out + [\#977](https://github.com/matrix-org/matrix-react-sdk/pull/977) + * Add /start to show the setMxId above HomePage + [\#964](https://github.com/matrix-org/matrix-react-sdk/pull/964) + * Allow pressing Enter to submit setMxId + [\#961](https://github.com/matrix-org/matrix-react-sdk/pull/961) + * add login link to SetMxIdDialog + [\#954](https://github.com/matrix-org/matrix-react-sdk/pull/954) + * Block user settings with view_set_mxid + [\#936](https://github.com/matrix-org/matrix-react-sdk/pull/936) + * Show "Something went wrong!" when errcode undefined + [\#935](https://github.com/matrix-org/matrix-react-sdk/pull/935) + * Reset store state when logging out + [\#930](https://github.com/matrix-org/matrix-react-sdk/pull/930) + * Set the displayname to the mxid once PWLU + [\#933](https://github.com/matrix-org/matrix-react-sdk/pull/933) + * Fix view_next_room, view_previous_room and view_indexed_room + [\#929](https://github.com/matrix-org/matrix-react-sdk/pull/929) + * Use RVS to indicate "joining" when setting a mxid + [\#928](https://github.com/matrix-org/matrix-react-sdk/pull/928) + * Don't show notif nag bar if guest + [\#932](https://github.com/matrix-org/matrix-react-sdk/pull/932) + * Show "Password" instead of "New Password" + [\#927](https://github.com/matrix-org/matrix-react-sdk/pull/927) + * Remove warm-fuzzy after setting mxid + [\#926](https://github.com/matrix-org/matrix-react-sdk/pull/926) + * Allow teamServerConfig to be missing + [\#925](https://github.com/matrix-org/matrix-react-sdk/pull/925) + * Remove GuestWarningBar + [\#923](https://github.com/matrix-org/matrix-react-sdk/pull/923) + * Make left panel better for new users (mk III) + [\#924](https://github.com/matrix-org/matrix-react-sdk/pull/924) + * Implement default welcome page and allow custom URL /w config + [\#922](https://github.com/matrix-org/matrix-react-sdk/pull/922) + * Implement a store for RoomView + [\#921](https://github.com/matrix-org/matrix-react-sdk/pull/921) + * Add prop to toggle whether new password input is autoFocused + [\#915](https://github.com/matrix-org/matrix-react-sdk/pull/915) + * Implement warm-fuzzy success dialog for SetMxIdDialog + [\#905](https://github.com/matrix-org/matrix-react-sdk/pull/905) + * Write some tests for the RTS UI + [\#893](https://github.com/matrix-org/matrix-react-sdk/pull/893) + * Make confirmation optional on ChangePassword + [\#890](https://github.com/matrix-org/matrix-react-sdk/pull/890) + * Remove "Current Password" input if mx_pass exists + [\#881](https://github.com/matrix-org/matrix-react-sdk/pull/881) + * Replace NeedToRegisterDialog /w SetMxIdDialog + [\#889](https://github.com/matrix-org/matrix-react-sdk/pull/889) + * Invite the welcome user after registration if configured + [\#882](https://github.com/matrix-org/matrix-react-sdk/pull/882) + * Prevent ROUs from creating new chats/new rooms + [\#879](https://github.com/matrix-org/matrix-react-sdk/pull/879) + * Redesign mxID chooser, add availability checking + [\#877](https://github.com/matrix-org/matrix-react-sdk/pull/877) + * Show password nag bar when user is PWLU + [\#864](https://github.com/matrix-org/matrix-react-sdk/pull/864) + * fix typo + [\#858](https://github.com/matrix-org/matrix-react-sdk/pull/858) + * Initial implementation: SetDisplayName -> SetMxIdDialog + [\#849](https://github.com/matrix-org/matrix-react-sdk/pull/849) + Changes in [0.9.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.2) (2017-06-06) =================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.1...v0.9.2) From 27592728f50dce51b1edebcc6fea38bb10f84788 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 9 Jun 2017 20:28:09 +0100 Subject: [PATCH 03/13] v0.9.3-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dd7ff9c11e..557ffe8aa4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.9.2", + "version": "0.9.3-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From c61942ed5db51b77e67aea1232acb0d484443b14 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 9 Jun 2017 21:42:34 +0100 Subject: [PATCH 04/13] We now require flux 2.1 because we use utils --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 557ffe8aa4..595bedd374 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "emojione": "2.2.3", "file-saver": "^1.3.3", "filesize": "3.5.6", - "flux": "^2.0.3", + "flux": "2.1.1", "fuse.js": "^2.2.0", "glob": "^5.0.14", "highlight.js": "^8.9.1", From d6b85c9d4dc768527c1312d18759f4f8ff0b86b5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 9 Jun 2017 22:06:43 +0100 Subject: [PATCH 05/13] Fix translations on conf call banner * You can't substitute react elements into a text string * Substituting in undefined gives the string 'undefined', so initialise it to the empty string. --- src/components/views/rooms/AuxPanel.js | 11 ++++++++--- src/i18n/strings/de_DE.json | 2 +- src/i18n/strings/en_EN.json | 2 +- src/i18n/strings/en_US.json | 2 +- src/i18n/strings/fr.json | 2 +- src/i18n/strings/pt.json | 2 +- src/i18n/strings/pt_BR.json | 2 +- src/i18n/strings/ru.json | 2 +- src/i18n/strings/zh_Hant.json | 2 +- 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js index 55b68d1eb1..acb9c76aa0 100644 --- a/src/components/views/rooms/AuxPanel.js +++ b/src/components/views/rooms/AuxPanel.js @@ -89,12 +89,13 @@ module.exports = React.createClass({ var conferenceCallNotification = null; if (this.props.displayConfCallNotification) { - var supportedText, joinText; + let supportedText = ''; + let joinNode; if (!MatrixClientPeg.get().supportsVoip()) { supportedText = _t(" (unsupported)"); } else { - joinText = ( + joinNode = ( {_tJsx( "Join as voice or video.", [/(.*?)<\/voiceText>/, /(.*?)<\/videoText>/], @@ -106,9 +107,13 @@ module.exports = React.createClass({ ); } + // XXX: the translation here isn't great: appending ' (unsupported)' is likely to not make sense in many languages, + // but there are translations for this in the languages we do have so I'm leaving it for now. conferenceCallNotification = (
- {_t("Ongoing conference call%(supportedText)s. %(joinText)s", {supportedText: supportedText, joinText: joinText})} + {_t("Ongoing conference call%(supportedText)s.", {supportedText: supportedText})} +   + {joinNode}
); } diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 15189a1372..699914d7ea 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -814,7 +814,7 @@ "Drop file here to upload": "Datei hier loslassen zum hochladen", "Idle": "Untätig", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen dir für jedes Gerät durch den Verifizierungsprozess zu gehen um zu bestätigen, dass sie ihrem legitimierten Besitzer gehören, aber du kannst die Nachrichten ohne Verifizierung erneut senden, wenn du es vorziehst.", - "Ongoing conference call%(supportedText)s. %(joinText)s": "Laufendes Konferenzgespräch%(supportedText)s. %(joinText)s", + "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)s.", "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Konto für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?", "Disable URL previews for this room (affects only you)": "URL-Vorschau für diesen Raum deaktivieren (betrifft nur dich)", "Start automatically after system login": "Starte automatisch nach System-Login", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index c7c6cd6ef3..c2fab535b0 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -887,7 +887,7 @@ "Enable URL previews for this room (affects only you)": "Enable URL previews for this room (affects only you)", "Drop file here to upload": "Drop file here to upload", " (unsupported)": " (unsupported)", - "Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s", + "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.", "for %(amount)ss": "for %(amount)ss", "for %(amount)sm": "for %(amount)sm", "for %(amount)sh": "for %(amount)sh", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 5cdfd65d27..20041ef231 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -813,7 +813,7 @@ "Enable URL previews for this room (affects only you)": "Enable URL previews for this room (affects only you)", "Drop file here to upload": "Drop file here to upload", " (unsupported)": " (unsupported)", - "Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s", + "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.", "for %(amount)ss": "for %(amount)ss", "for %(amount)sm": "for %(amount)sm", "for %(amount)sh": "for %(amount)sh", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 712ccb2a63..4b074b63ea 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -759,7 +759,7 @@ "Enable URL previews for this room (affects only you)": "Activer les aperçus d'URL pour ce salon (n'affecte que vous)", "Drop file here to upload": "Déposer le fichier ici pour le télécharger", " (unsupported)": " (non supporté)", - "Ongoing conference call%(supportedText)s. %(joinText)s": "Appel conférence en cours%(supportedText)s. %(joinText)s", + "Ongoing conference call%(supportedText)s.": "Appel conférence en cours%(supportedText)s.", "Online": "En ligne", "Offline": "Déconnecté", "Disable URL previews for this room (affects only you)": "Désactiver les aperçus d'URL pour ce salon (n'affecte que vous)", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index 850e95f61f..d366fb7e66 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -808,7 +808,7 @@ "Enable URL previews for this room (affects only you)": "Habilitar pré-visualizações de links para esta sala (afeta somente a você)", "Drop file here to upload": "Arraste um arquivo aqui para enviar", " (unsupported)": " (não suportado)", - "Ongoing conference call%(supportedText)s. %(joinText)s": "Conferência%(supportedText)s em andamento. %(joinText)s", + "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.", "Online": "Online", "Idle": "Ocioso", "Offline": "Offline", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 75d7a115b2..118c2445a6 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -808,7 +808,7 @@ "Enable URL previews for this room (affects only you)": "Habilitar pré-visualizações de links para esta sala (afeta somente a você)", "Drop file here to upload": "Arraste um arquivo aqui para enviar", " (unsupported)": " (não suportado)", - "Ongoing conference call%(supportedText)s. %(joinText)s": "Conferência%(supportedText)s em andamento. %(joinText)s", + "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.", "Online": "Online", "Idle": "Ocioso", "Offline": "Offline", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 07ab24e824..6bcfa680c6 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -853,7 +853,7 @@ "Enable URL previews for this room (affects only you)": "Включить предпросмотр URL в этой комнате (только для вас)", "Drop file here to upload": "Перетащите файл сюда для загрузки", " (unsupported)": " (не поддерживается)", - "Ongoing conference call%(supportedText)s. %(joinText)s": "Идет конференц-звонок%(supportedText)s. %(joinText)s", + "Ongoing conference call%(supportedText)s.": "Идет конференц-звонок%(supportedText)s.", "for %(amount)ss": "уже %(amount)sс", "for %(amount)sm": "уже %(amount)sм", "for %(amount)sh": "уже %(amount)sч", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index b2e1939565..140e7a7b2d 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -353,7 +353,7 @@ "This image cannot be displayed.": "這張圖片無法顯示", "Error decrypting video": "解密影片出錯", "Add an Integration": "新增整合器", - "Ongoing conference call%(supportedText)s. %(joinText)s": "%(supportedText)s. %(joinText)s 正在進行電話會議", + "Ongoing conference call%(supportedText)s.": "%(supportedText)s. 正在進行電話會議", " (unsupported)": " (不支持)", "URL Previews": "網址預覽", "Enable URL previews for this room (affects only you)": "啟用此房間的網址預覽（僅影響您）", From 8bb26073bec724e93f75dff82efd6a97aea66e5f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 9 Jun 2017 22:13:53 +0100 Subject: [PATCH 06/13] Prepare changelog for v0.9.3-rc.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b217d7a0db..651303d3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.9.3-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.3-rc.2) (2017-06-09) +============================================================================================================= +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.3-rc.1...v0.9.3-rc.2) + + * Fix flux dependency + * Fix translations on conference call bar + Changes in [0.9.3-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.3-rc.1) (2017-06-09) ============================================================================================================= [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.2...v0.9.3-rc.1) From 336b10daf11ce819afeee473e927c94ee1a5b425 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 9 Jun 2017 22:13:54 +0100 Subject: [PATCH 07/13] v0.9.3-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 595bedd374..7e2ad6d064 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.9.3-rc.1", + "version": "0.9.3-rc.2", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 29355a610f000b44a1937e4824bd0a9f6362ebd3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 12 Jun 2017 15:19:52 +0100 Subject: [PATCH 08/13] js-sdk 0.7.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e2ad6d064..1b57cc6890 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "isomorphic-fetch": "^2.2.1", "linkifyjs": "^2.1.3", "lodash": "^4.13.1", - "matrix-js-sdk": "0.7.11-rc.1", + "matrix-js-sdk": "0.7.11", "optimist": "^0.6.1", "prop-types": "^15.5.8", "q": "^1.4.1", From 613318658319160d7db2b4dfbd0d3ac3cdde1660 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 9 Jun 2017 22:19:14 +0100 Subject: [PATCH 09/13] fullstop fails --- .../views/elements/MemberEventListSummary.js | 28 +++++++++---------- src/i18n/strings/de_DE.json | 4 +-- src/i18n/strings/th.json | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js index f2f6da83e5..842b44b793 100644 --- a/src/components/views/elements/MemberEventListSummary.js +++ b/src/components/views/elements/MemberEventListSummary.js @@ -227,8 +227,7 @@ module.exports = React.createClass({ ? _t("%(severalUsers)sjoined", { severalUsers: "" }) : _t("%(oneUser)sjoined", { oneUser: "" }); } - - break; + break; case "left": if (repeats > 1) { res = (plural) @@ -238,7 +237,8 @@ module.exports = React.createClass({ res = (plural) ? _t("%(severalUsers)sleft", { severalUsers: "" }) : _t("%(oneUser)sleft", { oneUser: "" }); - } break; + } + break; case "joined_and_left": if (repeats > 1) { res = (plural) @@ -249,7 +249,7 @@ module.exports = React.createClass({ ? _t("%(severalUsers)sjoined and left", { severalUsers: "" }) : _t("%(oneUser)sjoined and left", { oneUser: "" }); } - break; + break; case "left_and_joined": if (repeats > 1) { res = (plural) @@ -259,8 +259,8 @@ module.exports = React.createClass({ res = (plural) ? _t("%(severalUsers)sleft and rejoined", { severalUsers: "" }) : _t("%(oneUser)sleft and rejoined", { oneUser: "" }); - } break; - break; + } + break; case "invite_reject": if (repeats > 1) { res = (plural) @@ -271,7 +271,7 @@ module.exports = React.createClass({ ? _t("%(severalUsers)srejected their invitations", { severalUsers: "" }) : _t("%(oneUser)srejected their invitation", { oneUser: "" }); } - break; + break; case "invite_withdrawal": if (repeats > 1) { res = (plural) @@ -282,7 +282,7 @@ module.exports = React.createClass({ ? _t("%(severalUsers)shad their invitations withdrawn", { severalUsers: "" }) : _t("%(oneUser)shad their invitation withdrawn", { oneUser: "" }); } - break; + break; case "invited": if (repeats > 1) { res = (plural) @@ -293,7 +293,7 @@ module.exports = React.createClass({ ? _t("were invited") : _t("was invited"); } - break; + break; case "banned": if (repeats > 1) { res = (plural) @@ -304,7 +304,7 @@ module.exports = React.createClass({ ? _t("were banned") : _t("was banned"); } - break; + break; case "unbanned": if (repeats > 1) { res = (plural) @@ -315,7 +315,7 @@ module.exports = React.createClass({ ? _t("were unbanned") : _t("was unbanned"); } - break; + break; case "kicked": if (repeats > 1) { res = (plural) @@ -326,7 +326,7 @@ module.exports = React.createClass({ ? _t("were kicked") : _t("was kicked"); } - break; + break; case "changed_name": if (repeats > 1) { res = (plural) @@ -337,7 +337,7 @@ module.exports = React.createClass({ ? _t("%(severalUsers)schanged their name", { severalUsers: "" }) : _t("%(oneUser)schanged their name", { oneUser: "" }); } - break; + break; case "changed_avatar": if (repeats > 1) { res = (plural) @@ -348,7 +348,7 @@ module.exports = React.createClass({ ? _t("%(severalUsers)schanged their avatar", { severalUsers: "" }) : _t("%(oneUser)schanged their avatar", { oneUser: "" }); } - break; + break; } return res; diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 699914d7ea..fbd49a6800 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -615,8 +615,8 @@ "%(actionVerb)s this person?": "Diese Person %(actionVerb)s?", "This room has no local addresses": "Dieser Raum hat keine lokale Adresse", "This room is private or inaccessible to guests. You may be able to join if you register": "Dieser Raum ist privat oder für Gäste nicht zugänglich. Du kannst jedoch eventuell beitreten, wenn du dich registrierst", - "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen", - "Tried to load a specific point in this room's timeline, but was unable to find it": "Der Versuch, einen spezifischen Punkt im Chatverlauf zu laden, ist fehlgeschlagen. Der Punkt konnte nicht gefunden werden", + "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen.", + "Tried to load a specific point in this room's timeline, but was unable to find it.": "Der Versuch, einen spezifischen Punkt im Chatverlauf zu laden, ist fehlgeschlagen. Der Punkt konnte nicht gefunden werden.", "Turn Markdown off": "Markdown deaktiveren", "Turn Markdown on": "Markdown einschalten", "Unable to load device list": "Geräteliste konnte nicht geladen werden", diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 05116953f7..a54f7fee42 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -389,7 +389,7 @@ "Who would you like to add to this room?": "คุณต้องการเพิ่มใครเข้าห้องนี้?", "Who would you like to communicate with?": "คุณต้องการสื่อสารกับใคร?", "You're not in any rooms yet! Press": "คุณยังไม่ได้อยู่ในห้องใดเลย! กด", - "You are trying to access %(roomName)s": "คุณกำลังพยายามเข้าสู่ %(roomName)s", + "You are trying to access %(roomName)s.": "คุณกำลังพยายามเข้าสู่ %(roomName)s", "You have disabled URL previews by default.": "ค่าเริ่มต้นของคุณปิดใช้งานตัวอย่าง URL เอาไว้", "You have enabled URL previews by default.": "ค่าเริ่มต้นของคุณเปิดใช้งานตัวอย่าง URL เอาไว้", "you must be a": "คุณต้องเป็น", From 6afd8952911fb8ac3dddd2d49ad93ecfe5969398 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 9 Jun 2017 22:20:09 +0100 Subject: [PATCH 10/13] broken var --- src/i18n/strings/zh_Hant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 140e7a7b2d..2d0ac27363 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -290,7 +290,7 @@ "Would you like to": "你要", "You are already in a call.": "你已在電話通話中", "You're not in any rooms yet! Press": "你尚未加入任何聊天室！請按", - "You are trying to access %(roomName)s.": "你將進入 %(roomName)聊天室", + "You are trying to access %(roomName)s.": "你將進入 %(roomName)s聊天室", "You cannot place a call with yourself.": "你不能打電話給自已", "You cannot place VoIP calls in this browser.": "在此瀏覽器下無法置入網路電話通話", "Sun": "星期日", From f98c491fddb60c8f64b71c0e287bcdcfa41dd97c Mon Sep 17 00:00:00 2001 From: Riot Translate Bot Date: Sun, 11 Jun 2017 20:40:20 +0100 Subject: [PATCH 11/13] Update from Weblate. (#1073) * Translated using Weblate (German) Currently translated at 93.4% (842 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ * Translated using Weblate (Russian) Currently translated at 100.0% (901 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ * Added translation using Weblate (Arabic) * Translated using Weblate (Greek) Currently translated at 42.2% (381 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/ * Translated using Weblate (English (United States)) Currently translated at 91.8% (828 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/ * Translated using Weblate (Russian) Currently translated at 100.0% (901 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ * Translated using Weblate (German) Currently translated at 100.0% (901 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ * Translated using Weblate (Hungarian) Currently translated at 20.0% (181 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 38.9% (351 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/ * Translated using Weblate (Arabic) Currently translated at 0.5% (5 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/ * remote entirely spurious translation progress stats :/ --- src/i18n/strings/ar.json | 7 ++ src/i18n/strings/de_DE.json | 42 ++++----- src/i18n/strings/el.json | 23 +++-- src/i18n/strings/en_US.json | 19 +++- src/i18n/strings/hu.json | 8 +- src/i18n/strings/ru.json | 31 ++++--- src/i18n/strings/zh_Hans.json | 157 ++++++++++++++++++++++++++++++++-- 7 files changed, 237 insertions(+), 50 deletions(-) create mode 100644 src/i18n/strings/ar.json diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json new file mode 100644 index 0000000000..30f0730a98 --- /dev/null +++ b/src/i18n/strings/ar.json @@ -0,0 +1,7 @@ +{ + "ar-iq": "العربية", + "Continue": "استمر", + "Username available": "اسم المستخدم متاح", + "Username not available": "الإسم المستخدم غير موجود", + "Something went wrong!": "هناك خطأ ما!" +} diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index fbd49a6800..bfdaf62399 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1,5 +1,5 @@ { - "Filter room members": "Raum-Benutzer filtern", + "Filter room members": "Raum-Mitglieder filtern", "You have no visible notifications": "Du hast keine sichtbaren Benachrichtigungen", "Invites": "Einladungen", "Favourites": "Favoriten", @@ -88,7 +88,7 @@ "Display name": "Anzeigename", "Email Address": "E-Mail-Adresse", "Email, name or matrix ID": "E-Mail, Name oder Matrix-ID", - "Encrypted messages will not be visible on clients that do not yet implement encryption": "Verschlüsselte Nachrichten werden an Clients nicht sichtbar sein, die Verschlüsselung noch nicht implementiert haben", + "Encrypted messages will not be visible on clients that do not yet implement encryption": "Verschlüsselte Nachrichten werden nicht in Matrix-Clients sichtbar sein, die die Verschlüsselung noch nicht implementiert haben", "Encrypted room": "Verschlüsselter Raum", "Encryption is enabled in this room": "Verschlüsselung ist in diesem Raum aktiviert", "Encryption is not enabled in this room": "Verschlüsselung ist in diesem Raum nicht aktiviert", @@ -193,7 +193,7 @@ "Room name (optional)": "Raumname (optional)", "Scroll to unread messages": "Zu den ungelesenen Nachrichten scrollen", "Send Invites": "Einladungen senden", - "Send Reset Email": "E-Mail für das Zurücksetzen senden", + "Send Reset Email": "E-Mail zum Zurücksetzen senden", "sent an image": "hat ein Bild gesendet", "sent an invitation to": "sandte eine Einladung an", "sent a video": "hat ein Video gesendet", @@ -270,7 +270,7 @@ "Who would you like to add to this room?": "Wen möchtest du zu diesem Raum hinzufügen?", "Who would you like to communicate with?": "Mit wem möchtest du kommunizieren?", "Would you like to": "Möchtest du", - "You do not have permission to post to this room": "Du hast keine Berechtigung an diesen Raum etwas zu senden", + "You do not have permission to post to this room": "Du hast keine Berechtigung, in diesem Raum etwas zu senden", "You have been invited to join this room by %(inviterName)s": "%(inviterName)s hat dich in diesen Raum eingeladen", "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Du wurdest auf allen Geräten abgemeldet und wirst keine Push-Benachrichtigungen mehr erhalten. Um die Benachrichtigungen zu reaktivieren, musst du dich auf jedem Gerät neu anmelden", "you must be a": "nötige Rolle", @@ -392,7 +392,7 @@ "%(senderName)s unbanned %(targetName)s.": "%(senderName)s zog Bann für %(targetName)s zurück.", "Usage": "Verwendung", "Use with caution": "Mit Vorsicht zu verwenden", - "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s zog die Einladung für %(targetName)s zurück.", + "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.", "You need to be able to invite users to do that.": "Du musst die Berechtigung haben, Nutzer einzuladen, um diese Aktion ausführen zu können.", "You need to be logged in.": "Du musst angemeldet sein.", "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum", @@ -564,7 +564,7 @@ "Click to mute audio": "Klicke um den Ton stumm zu stellen", "Click to mute video": "Klicken, um das Video stummzuschalten", "Command error": "Befehlsfehler", - "Decrypt %(text)s": "Entschlüssele %(text)s", + "Decrypt %(text)s": "%(text)s entschlüsseln", "Delete": "Löschen", "Devices": "Geräte", "Direct chats": "Direkte Chats", @@ -586,7 +586,7 @@ "Invalid alias format": "Ungültiges Alias-Format", "Invalid address format": "Ungültiges Adressformat", "'%(alias)s' is not a valid format for an address": "'%(alias)s' ist kein gültiges Adressformat", - "'%(alias)s' is not a valid format for an alias": "'%(alias)s' hat kein valides Aliasformat", + "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ist kein gültiges Alias-Format", "Join Room": "Dem Raum beitreten", "Kick": "Kicke", "Level": "Berechtigungslevel", @@ -607,7 +607,7 @@ "Server error": "Server-Fehler", "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(", "Server may be unavailable, overloaded, or the file too big": "Server ist entweder nicht verfügbar, überlastet oder die Datei ist zu groß", - "Server unavailable, overloaded, or something else went wrong.": "Server nicht verfügbar, überlastet oder etwas anderes lief falsch.", + "Server unavailable, overloaded, or something else went wrong.": "Server ist nicht verfügbar, überlastet oder ein anderer Fehler ist aufgetreten.", "Some of your messages have not been sent.": "Einige deiner Nachrichten wurden nicht gesendet.", "Submit": "Absenden", "The main address for this room is: %(canonical_alias_section)s": "Die Hauptadresse für diesen Raum ist: %(canonical_alias_section)s", @@ -626,7 +626,7 @@ "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Anruf zu sein. Bist du sicher schließen zu wollen?", "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?", "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der Nutzer dasselbe Berechtigungslevel wie du selbst erhalten wird.", - "Make Moderator": "Zum Moderator machen", + "Make Moderator": "Zum Moderator ernennen", "Room": "Raum", "(~%(searchCount)s results)": "(~%(searchCount)s Ergebnisse)", "Cancel": "Abbrechen", @@ -655,7 +655,7 @@ "%(oneUser)sjoined %(repeats)s times": "%(oneUser)shat den Raum %(repeats)s mal betreten", "%(severalUsers)sjoined": "%(severalUsers)shaben den Raum betreten", "%(oneUser)sjoined": "%(oneUser)shat den Raum betreten", - "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)sverließen %(repeats)s mal den Raum", + "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)shaben %(repeats)s mal den Raum verlassen", "%(oneUser)sleft %(repeats)s times": "%(oneUser)sging %(repeats)s mal", "%(severalUsers)sleft": "%(severalUsers)shaben den Raum verlassen", "%(oneUser)sleft": "%(oneUser)sging", @@ -674,7 +674,7 @@ "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)szogen ihre Einladungen %(repeats)s mal zurück", "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)szog seine/ihre Einladung %(repeats)s mal zurück", "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)szogen ihre Einladungen zurück", - "%(oneUser)shad their invitation withdrawn": "%(oneUser)szog seine/ihre Einladung zurück", + "%(oneUser)shad their invitation withdrawn": "%(oneUser)swurde die ursprüngliche Einladung wieder entzogen", "were invited %(repeats)s times": "wurden %(repeats)s mal eingeladen", "was invited %(repeats)s times": "wurde %(repeats)s mal eingeladen", "were invited": "wurden eingeladen", @@ -751,8 +751,8 @@ "Verify device": "Gerät verifizieren", "I verify that the keys match": "Ich bestätige, dass die Schlüssel passen", "Unable to restore session": "Sitzungswiederherstellung fehlgeschlagen", - "Continue anyway": "Fahre trotzdem fort", - "Your display name is how you'll appear to others when you speak in rooms. What would you like it to be?": "Dein Anzeigename ist der Name, der anderen Nutzern angezeigt wird, wenn du in Räumen sprichst. Welchen Anzeigenamen möchtest du wählen?", + "Continue anyway": "Trotzdem fortfahren", + "Your display name is how you'll appear to others when you speak in rooms. What would you like it to be?": "Dein Anzeigename ist der Name, der anderen Nutzern angezeigt wird, wenn du in Räumen kommunizierst. Welchen Anzeigenamen möchtest du wählen?", "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Do blockst aktuell unverifizierte Geräte. Um Nachrichten an diese Geräte zu senden musst du sie verifizieren.", "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" enthält Geräte, die du bislang noch nicht gesehen hast.", "Unknown devices": "Unbekannte Geräte", @@ -809,7 +809,7 @@ "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Wenn du zuvor eine aktuellere Version von Riot verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.", "Blacklist": "Blockieren", "Unblacklist": "Entblockieren", - "Unverify": "Entverifizieren", + "Unverify": "Verifizierung widerrufen", "This Home Server would like to make sure you are not a robot": "Dieser Heimserver möchte sicherstellen, dass du kein Roboter bist", "Drop file here to upload": "Datei hier loslassen zum hochladen", "Idle": "Untätig", @@ -841,7 +841,7 @@ "Camera": "Kamera", "Device already verified!": "Gerät bereits verifiziert!", "Export": "Export", - "Failed to register as guest:": "Registrieren als Gast schlug fehl:", + "Failed to register as guest:": "Die Registrierung als Gast ist fehlgeschlagen:", "Guest access is disabled on this Home Server.": "Gastzugang ist auf diesem Heimserver deaktivert.", "Import": "Import", "Incorrect username and/or password.": "Inkorrekter Nutzername und/oder Passwort.", @@ -862,7 +862,7 @@ "Register": "Registrieren", "Save": "Speichern", "Setting a user name will create a fresh account": "Die Eingabe eines Benutzernamens wird ein neues Konto erzeugen", - "Tagged as: ": "Getaggt als: ", + "Tagged as: ": "Markiert als: ", "This Home Server does not support login using email address.": "Dieser Heimserver unterstützt den Login mittels E-Mail-Adresse nicht.", "There was a problem logging in.": "Es gab ein Problem beim anmelden.", "Unknown (user, device) pair:": "Unbekanntes (Nutzer-/Gerät-)Paar:", @@ -880,7 +880,7 @@ "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raum-Bild für %(roomName)s geändert", "Hide removed messages": "Gelöschte Nachrichten verbergen", "Start new chat": "Neuen Chat starten", - "Disable markdown formatting": "Deaktiviere Markdown-Formatierung", + "Disable markdown formatting": "Markdown-Formatierung deaktivieren", "Add": "Hinzufügen", "%(count)s new messages.one": "%(count)s neue Nachricht", "%(count)s new messages.other": "%(count)s neue Nachrichten", @@ -900,13 +900,13 @@ "Room directory": "Raum-Verzeichnis", "Start chat": "Chat starten", "New Password": "Neues Passwort", - "Start chatting": "Starte plaudern", + "Start chatting": "Chat beginnen", "Start Chatting": "Starte Gespräche", "Click on the button below to start chatting!": "Unten auf den Button klicken, um einen Chat zu beginnen!", "Create a new chat or reuse an existing one": "Neuen Chat erstellen oder einen vorhandenen Chat fortsetzen", "You already have existing direct chats with this user:": "Du hast bereits direkte Chats mit diesem Nutzer:", - "Username available": "Nutzername verfügbar", - "Username not available": "Nutzername nicht verfügbar", + "Username available": "Benutzername ist verfügbar", + "Username not available": "Benutzername ist nicht verfügbar", "Something went wrong!": "Etwas ging schief!", "This will be your account name on the homeserver, or you can pick a different server.": "Dies wird dein zukünftiger Benutzername auf dem Heimserver. Alternativ kannst du auch einen anderen Server auswählen.", "If you already have a Matrix account you can log in instead.": "Wenn du bereits ein Matrix-Benutzerkonto hast, kannst du dich stattdessen auch direkt anmelden.", @@ -964,7 +964,7 @@ "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)", "Verified": "Verifiziert", "Would you like to accept or decline this invitation?": "Möchtest du diese Einladung akzeptieren oder ablehnen?", - "You have been banned from %(roomName)s by %(userName)s.": "Du wurdest von %(userName)s aus dem Raum %(roomName)s verbannt.", + "You have been banned from %(roomName)s by %(userName)s.": "Du wurdest von %(userName)s aus dem Raum %(roomName)s ausgeschlossen.", "You have been kicked from %(roomName)s by %(userName)s.": "Du wurdest von %(userName)s aus dem Raum %(roomName)s gekickt.", "You may wish to login with a different account, or add this email to this account.": "Du möchtest dich evtl. mit einem anderen Konto anmelden oder diese E-Mail-Adresse diesem Konto hinzufügen.", "Your home server does not support device management.": "Dein Heimserver unterstützt kein Geräte-Management.", diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index 725b5497a5..a38dddb35b 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -1,13 +1,13 @@ { "af": "Αφρικάνικα", "Error": "Σφάλμα", - "Failed to forget room %(errCode)s": "Δεν ήταν δυνατή η διαγραφή του δωματίου %(errCode)s", + "Failed to forget room %(errCode)s": "Δεν ήταν δυνατή η διαγραφή του δωματίου (%(errCode)s)", "Failed to join the room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο", "Mute": "Σίγαση", "Notifications": "Ειδοποιήσεις", "Operation failed": "Η λειτουργία απέτυχε", - "Please Register": "Παρακαλώ εγγραφείτε", - "Remove": "Αφαίρεσε", + "Please Register": "Παρακαλούμε εγγραφείτε", + "Remove": "Αφαίρεση", "Search": "Αναζήτηση", "Settings": "Ρυθμίσεις", "unknown error code": "άγνωστος κωδικός σφάλματος", @@ -195,7 +195,7 @@ "%(senderDisplayName)s removed the room name.": "Ο χρήστης %(senderDisplayName)s διέγραψε το όνομα του δωματίου.", "Changes your display nickname": "Αλλάζει το όνομα χρήστη", "Click here": "Κάνε κλικ εδώ", - "Drop here %(toAction)s": "Σύρε εδώ %(toAction)s", + "Drop here %(toAction)s": "Απόθεση εδώ %(toAction)s", "Conference call failed.": "Η κλήση συνδιάσκεψης απέτυχε.", "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix", "Confirm password": "Επιβεβαίωση κωδικού", @@ -222,7 +222,7 @@ "device id: ": "id συσκευής: ", "Device key:": "Κλειδί Συσκευής:", "Devices": "Συσκευές", - "Direct Chat": "Απευθείας Συνομιλία", + "Direct Chat": "Απευθείας συνομιλία", "Direct chats": "Απευθείας συνομιλίες", "disabled": "ανενεργό", "Disinvite": "Ανακάλεσε πρόσκληση", @@ -244,7 +244,7 @@ "Existing Call": "Υπάρχουσα Κλήση", "Export": "Εξαγωγή", "Export E2E room keys": "Εξαγωγή κλειδιών κρυπτογραφίας για το δωμάτιο", - "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού. Είναι ο κωδικός σωστός;", + "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;", "Failed to delete device": "Δεν ήταν δυνατή η διαγραφή της συσκευής", "Failed to join room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο", "Failed to leave room": "Δεν ήταν δυνατή η αποχώρηση από το δωμάτιο", @@ -330,7 +330,7 @@ "": "<δεν υποστηρίζεται>", "No more results": "Δεν υπάρχουν άλλα αποτελέσματα", "No results": "Κανένα αποτέλεσμα", - "OK": "ΟΚ", + "OK": "Εντάξει", "olm version:": "έκδοση olm:", "Password": "Κωδικός", "Password:": "Κωδικός:", @@ -364,7 +364,7 @@ "cancel all": "ακύρωση όλων", "or": "ή", "Custom Server Options": "Προσαρμοσμένες ρυθμίσεις διακομιστή", - "Dismiss": "Αγνόησε", + "Dismiss": "Απόρριψη", "Monday": "Δευτέρα", "Tuesday": "Τρίτη", "Wednesday": "Τετάρτη", @@ -382,5 +382,10 @@ "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s συνδέθηκαν και έφυγαν %(repeats)s φορές", "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s συνδέθηκε και έφυγε %(repeats)s φορές", "%(severalUsers)sjoined and left": "%(severalUsers)s συνδέθηκαν και έφυγαν", - "%(oneUser)sjoined and left": "%(oneUser)s συνδέθηκε και έφυγε" + "%(oneUser)sjoined and left": "%(oneUser)s συνδέθηκε και έφυγε", + "Close": "Κλείσιμο", + "Create new room": "Δημιουργία νέου δωματίου", + "Room directory": "Ευρετήριο", + "Start chat": "Έναρξη συνομιλίας", + "Welcome page": "Αρχική σελίδα" } diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 20041ef231..d857ff06cb 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -824,5 +824,22 @@ "Disable URL previews for this room (affects only you)": "Disable URL previews for this room (affects only you)", "$senderDisplayName changed the room avatar to ": "$senderDisplayName changed the room avatar to ", "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.", - "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s" + "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s", + "Active call (%(roomName)s)": "Active call (%(roomName)s)", + "Accept": "Accept", + "a room": "a room", + "Add": "Add", + "Admin tools": "Admin tools", + "And %(count)s more...": "And %(count)s more...", + "Alias (optional)": "Alias (optional)", + "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.", + "Click here to join the discussion!": "Click here to join the discussion!", + "Close": "Close", + "%(count)s new messages.one": "%(count)s new message", + "%(count)s new messages.other": "%(count)s new messages", + "Custom": "Custom", + "Decline": "Decline", + "Disable markdown formatting": "Disable markdown formatting", + "Disable Notifications": "Disable Notifications", + "Enable Notifications": "Enable Notifications" } diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 458d461b90..c6a86347f5 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -173,5 +173,11 @@ "Always show message timestamps": "Üzenet időbélyeg folyamatos megjelenítése", "Authentication": "Azonosítás", "Alias (optional)": "Becenév (opcionális)", - "all room members": "minden szoba tagság" + "all room members": "minden szoba tagság", + "Failed to change password. Is your password correct?": "Nem sikerült megváltoztatni a jelszót. Helyesen írtad be a jelszavadat?", + "Continue": "Folytatás", + "Create new room": "Új szoba létrehozása", + "sb": "Szorb", + "rm": "Rétoromán", + "tn": "Tswana" } diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 6bcfa680c6..f2d88bcc44 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -59,7 +59,7 @@ "Deops user with given id": "Deops пользователь с данным id", "Device ID": "Устройство ID", "Devices will not yet be able to decrypt history from before they joined the room": "Устройство еще не будет в состоянии дешифровать историю, до присоединения к комнате", - "Direct Chat": "Персональное сообщение", + "Direct Chat": "Приватный чат", "Disable inline URL previews by default": "Отключить встроенные предварительные просмотры URL по умолчанию", "Display name": "Отображаемое имя", "Displays action": "Отображение действий", @@ -75,7 +75,7 @@ "Error": "Ошибка", "Event information": "Event information", "Export E2E room keys": "Экспорт E2E ключей комнаты", - "Failed to change password. Is your password correct?": "Не удалось изменить пароль. Ваш пароль правильный?", + "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?", "Failed to forget room": "Не удалось забыть комнату", "Failed to leave room": "Не удалось выйти из комнаты", "Failed to reject invitation": "Не удалось отклонить приглашение", @@ -246,7 +246,7 @@ "Failed to set up conference call": "Не удалось установить конференц-вызов", "Failed to verify email address: make sure you clicked the link in the email": "Не удалось подтвердить email-адрес: убедитесь что вы щелкнули по ссылке электронной почты", "Failure to create room": "Не удалось создать комнату", - "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s из %(fromPowerLevel)s до %(toPowerLevel)s", + "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId) изменил %(fromPowerLevel) на %(toPowerLevel)", "Guest users can't create new rooms. Please register to create room and start a chat.": "Гостевые пользователи не могут создавать новые комнаты. Зарегистрируйтесь для создания комнаты и чата.", "click to reveal": "нажать для открытия", "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.", @@ -258,7 +258,7 @@ "Missing room_id in request": "Отсутствует room_id в запросе", "Missing user_id in request": "Отсутствует user_id в запросе", "Must be viewing a room": "Посмотреть комнату", - "New Composer & Autocomplete": "Новый автор & Авто. заполнение", + "New Composer & Autocomplete": "Новый автор & Автозаполнение", "(not supported by this browser)": "(не поддерживаемый этим браузером)", "af": "Африкаанс", "ar-ae": "Арабский (О.А.Е)", @@ -355,12 +355,12 @@ "Friday": "Пятница", "Saturday": "Суббота", "Sunday": "Воскресенье", - "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s", + "%(weekDayName)s %(time)s": "%(weekDayName) %(time)", "Upload an avatar:": "Загрузите аватар:", "You need to be logged in.": "Вы должны быть зарегистрированы.", "You need to be able to invite users to do that.": "Вам необходимо пригласить пользователей чтобы сделать это.", "You cannot place VoIP calls in this browser.": "Вы не можете сделать вызовы VoIP с этим браузером.", - "You are already in a call.": "Вы уже находитесь в разговоре.", + "You are already in a call.": "Связь уже установлена.", "You're not in any rooms yet! Press": "Вы еще не находитесь ни в каких комнатах! Нажать", "You are trying to access %(roomName)s.": "Вы пытаетесь получить доступ %(roomName)s.", "You cannot place a call with yourself.": "Вы не можете позвонить самим себе.", @@ -725,7 +725,7 @@ "Server may be unavailable, overloaded, or search timed out :(": "Сервер может быть недоступен, перегружен или поиск прекращен по тайм-ауту :(", "Server may be unavailable, overloaded, or the file too big": "Сервер может быть недоступен, перегружен или размер файла слишком большой", "Server may be unavailable, overloaded, or you hit a bug.": "Сервер может быть недоступен, перегружен или вы нашли ошибку.", - "Server unavailable, overloaded, or something else went wrong.": "Сервер может быть недоступен, перегружен или произошло что-то страшное.", + "Server unavailable, overloaded, or something else went wrong.": "Сервер может быть недоступен, перегружен или что-то пошло не так.", "Session ID": "ID сессии", "%(senderName)s set a profile picture.": "%(senderName)s установил картинку профиля.", "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s установил отображаемое имя %(displayName)s.", @@ -766,7 +766,7 @@ "You have enabled URL previews by default.": "Предпросмотр ссылок включен по-умолчанию.", "You have entered an invalid contact. Try using their Matrix ID or email address.": "Вы ввели неправильный адрес. Попробуйте использовать Matrix ID или адрес email.", "You need to enter a user name.": "Необходимо ввести имя пользователя.", - "You seem to be in a call, are you sure you want to quit?": "Вы участвуете в звонке, вы уверены, что хотите выйти?", + "You seem to be in a call, are you sure you want to quit?": "Звонок не завершен, вы уверены, что хотите выйти?", "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Вы не сможете отменить это действие так как даете пользователю такой же уровень доступа как и у вас.", "Set a Display Name": "Установить отображаемое имя", "(~%(searchCount)s results)": "(~%(searchCount)s результатов)", @@ -818,7 +818,7 @@ "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" содержит неизвестные прежде устройства.", "Unknown Address": "Неизвестный адрес", "Unblacklist": "Удалить из черного списка", - "Blacklist": "Добавить в черный список", + "Blacklist": "Черный список", "Unverify": "Убрать верификацию", "Verify...": "Верифицировать...", "ex. @bob:example.com": "например @bob:example.com", @@ -872,7 +872,7 @@ "Add": "Добавить", "%(count)s new messages.one": "%(count)s новое сообщение", "%(count)s new messages.other": "%(count)s новых сообщений", - "Error: Problem communicating with the given homeserver.": "Ошибка: проблема коммуникаций с указанным Home Server'ом.", + "Error: Problem communicating with the given homeserver.": "Ошибка: проблема связи с указанным сервером.", "Failed to fetch avatar URL": "Ошибка получения аватара", "The phone number entered looks invalid": "Введенный номер телефона выглядит неправильным", "Uploading %(filename)s and %(count)s others.zero": "Загрузка %(filename)s", @@ -925,7 +925,7 @@ "Set": "Вводить", "Start authentication": "Начать идентификацию", "This room": "Эта комната", - "(~%(count)s results).other": "(~%(count)s results)", + "(~%(count)s results).other": "(~%(count) найдено)", "Device Name": "Имя устройства", "Custom": "Пользователь", "Decline": "Отклонить", @@ -947,6 +947,11 @@ "%(user)s is a": "%(user)s является", "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (уровень доступа %(powerLevelNumber)s)", "Verified": "Подтверждён", - "Would you like to accept or decline this invitation?": "Хотели бы вы это приглашение подтвердить или отклонить?", - "(~%(count)s results).one": "(~%(count)s Результат)" + "Would you like to accept or decline this invitation?": "Хотели бы вы подтвердить это приглашение или отклонить?", + "(~%(count)s results).one": "(~%(count)s Результат)", + "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Не удается подключиться к домашнему серверу - проверьте подключение, убедитесь, что ваш сертификат SSL homeserver's SSL certificate действителен, и расширение браузера не блокирует запросы.", + "You have been banned from %(roomName)s by %(userName)s.": "%(userName) забанил Вас в % (roomName).", + "You have been kicked from %(roomName)s by %(userName)s.": "%(userName) выгнал Вас из %(roomName).", + "You may wish to login with a different account, or add this email to this account.": "Вы можете войти в систему с другой учетной записью или добавить этот адрес email в эту учетную запись.", + "Your home server does not support device management.": "Ваш домашний сервер не поддерживает управление устройствами." } diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index e6eb5f632b..ad37ce9430 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -162,9 +162,9 @@ "de-at": "德语（奥地利）", "de-ch": "德语（瑞士）", "de": "德语", - "de-lu": "德语（卢森堡）", + "de-lu": "德语 (卢森堡)", "el": "希腊语", - "en-au": "英语（澳大利亚）", + "en-au": "英语 (澳大利亚)", "en": "英语", "zh-cn": "中文（中国）", "zh-hk": "中文（香港）", @@ -199,11 +199,158 @@ "Ed25519 fingerprint": "Ed25519指纹", "Invite new room members": "邀请新的聊天室成员", "Join Room": "加入聊天室", - "joined": "加入了", - "%(targetName)s joined the room.": "%(targetName)s 加入了聊天室。.", + "joined": "已加入", + "%(targetName)s joined the room.": "%(targetName)s 已加入聊天室。", "Jump to first unread message.": "跳到第一条未读消息。", "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.", "Leave room": "离开聊天室", "Login as guest": "以游客的身份登录", - "New password": "新密码" + "New password": "新密码", + "ar-ae": "阿拉伯语 (阿联酋)", + "ar-bh": "阿拉伯语 (巴林)", + "ar-dz": "阿拉伯语 (阿尔及利亚)", + "ar-eg": "阿拉伯语 (埃及)", + "ar-iq": "阿拉伯语 (伊拉克)", + "ar-jo": "阿拉伯语 (约旦)", + "ar-kw": "阿拉伯语 (科威特)", + "ar-lb": "阿拉伯语 (黎巴嫩)", + "ar-ly": "阿拉伯语 (利比亚)", + "ar-ma": "阿拉伯语 (摩洛哥)", + "ar-ye": "阿拉伯语 (也门)", + "en-ca": "英语 (加拿大)", + "en-gb": "英语 (英国)", + "en-ie": "英语 (爱尔兰)", + "en-nz": "英语 (新西兰)", + "Add a topic": "新话题", + "Admin": "管理员", + "Admin tools": "管理工具", + "VoIP": "IP 电话", + "Missing Media Permissions, click here to request.": "没有媒体存储权限，点此获取。", + "No Microphones detected": "未检测到麦克风", + "No Webcams detected": "未检测到摄像头", + "No media permissions": "没有媒体存取权限", + "You may need to manually permit Riot to access your microphone/webcam": "你可能需要手动授权 Riot 使用你的麦克风或摄像头", + "Default Device": "默认设备", + "Microphone": "麦克风", + "Camera": "摄像头", + "Hide removed messages": "隐藏被删除的消息", + "Authentication": "认证", + "Alias (optional)": "别名 (可选)", + "%(items)s and %(remaining)s others": "%(items)s 和其它 %(remaining)s 个", + "%(items)s and one other": "%(items)s 和其它一个", + "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s", + "and %(overflowCount)s others...": "和其它 %(overflowCount)s 个...", + "and one other...": "和其它一个...", + "%(names)s and one other are typing": "%(names)s 和另一个人正在打字", + "anyone": "任何人", + "Anyone": "任何人", + "Anyone who knows the room's link, apart from guests": "任何知道聊天室链接的人，游客除外", + "Anyone who knows the room's link, including guests": "任何知道聊天室链接的人，包括游客", + "Are you sure?": "你确定吗？", + "Are you sure you want to leave the room '%(roomName)s'?": "你确定要离开聊天室 “%(roomName)s” 吗？", + "Are you sure you want to reject the invitation?": "你确定要拒绝邀请吗？", + "Are you sure you want to upload the following files?": "你确定要上传这些文件吗？", + "Bans user with given id": "封禁指定 ID 的用户", + "Blacklisted": "已列入黑名单", + "Bug Report": "反馈漏洞", + "Bulk Options": "批量操作", + "Call Timeout": "通话超时", + "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "无法连接主服务器 - 请检查网络连接，确保你的主服务器 SSL 证书被信任，且没有浏览器插件拦截请求。", + "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "当浏览器地址栏里有 HTTPS 的 URL 时，不能使用 HTTP 连接主服务器。请使用 HTTPS 或者允许不安全的脚本。", + "Can't load user settings": "无法加载用户设置", + "Change Password": "修改密码", + "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s 将昵称从 %(oldDisplayName)s 改为了 %(displayName)s。", + "%(senderName)s changed their profile picture.": "%(senderName)s 修改了头像。", + "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 将聊天室名称改为 %(roomName)s。", + "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 移除了聊天室名称。", + "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 把话题修改为 “%(topic)s”。", + "Changes to who can read history will only apply to future messages in this room": "修改阅读历史的权限仅对此聊天室以后的消息有效", + "Changes your display nickname": "修改昵称", + "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "目前，修改密码会导致所有设备上的端对端密钥被重置，使得加密的聊天记录不再可读。除非你事先导出聊天室密钥，修改密码后再导入。这个问题未来会改善。", + "Clear Cache and Reload": "清除缓存并刷新", + "Clear Cache": "清除缓存", + "Click here to join the discussion!": "点此 加入讨论！", + "Click to mute audio": "点此静音", + "Click to mute video": "点此静音", + "click to reveal": "点击展开", + "Click to unmute video": "点此打开声音", + "Click to unmute audio": "点此打开声音", + "Close": "关闭", + "Command error": "命令错误", + "Commands": "命令", + "Conference call failed.": "视频会议失败。", + "Conference calling is in development and may not be reliable.": "视频会议功能还在开发状态，可能不稳定。", + "Conference calls are not supported in encrypted rooms": "加密聊天室不支持视频会议", + "Conference calls are not supported in this client": "此客户端不支持视频会议", + "%(count)s new messages.one": "%(count)s 条新消息", + "%(count)s new messages.other": "%(count)s 新消息", + "Create a new chat or reuse an existing one": "创建新聊天或使用已有的聊天", + "Custom": "自定义", + "Custom level": "自定义级别", + "Decline": "拒绝", + "Device already verified!": "设备已经验证！", + "Device ID:": "设备 ID:", + "device id: ": "设备 ID: ", + "Device key:": "设备密钥 :", + "Disable Notifications": "关闭消息通知", + "disabled": "已禁用", + "Disable markdown formatting": "禁用 Markdown 格式", + "Drop File Here": "把文件拖拽到这里", + "Email address (optional)": "电子邮件地址 (可选)", + "Enable Notifications": "启用消息通知", + "enabled": "已启用", + "Encrypted by a verified device": "由一个已验证的设备加密", + "Encrypted by an unverified device": "由一个未经验证的设备加密", + "Encryption is enabled in this room": "此聊天室启用了加密", + "Encryption is not enabled in this room": "此聊天室未启用加密", + "Enter passphrase": "输入密码", + "Error: Problem communicating with the given homeserver.": "错误: 与指定的主服务器通信时出错。", + "Export": "导出", + "Failed to fetch avatar URL": "获取 Avatar URL 失败", + "Failed to register as guest:": "无法注册为游客:", + "Failed to upload profile picture!": "无法上传头像！", + "Guest access is disabled on this Home Server.": "此服务器禁用了游客访问。", + "Home": "主页面", + "Import": "导入", + "Incoming call from %(name)s": "来自 %(name)s 的通话", + "Incoming video call from %(name)s": "来自 %(name)s 的视频通话", + "Incoming voice call from %(name)s": "来自 %(name)s 的视频通话", + "Incorrect username and/or password.": "用户名或密码错误。", + "%(senderName)s invited %(targetName)s.": "%(senderName)s 邀请了 %(targetName)s。", + "Invited": "已邀请", + "Invites": "邀请", + "Invites user with given id to current room": "邀请指定 ID 的用户加入当前聊天室", + "'%(alias)s' is not a valid format for an address": "'%(alias)s' 不是一个合法的电子邮件地址格式", + "'%(alias)s' is not a valid format for an alias": "'%(alias)s' 不是一个合法的昵称格式", + "%(displayName)s is typing": "%(displayName)s 正在输入", + "Sign in with": "第三方登录", + "Message not sent due to unknown devices being present": "消息未发送，因为有未知的设备存在", + "Missing room_id in request": "请求中没有 room_id", + "Missing user_id in request": "请求中没有 user_id", + "Mobile phone number": "手机号码", + "Mobile phone number (optional)": "手机号码 (可选)", + "Moderator": "管理员", + "Mute": "静音", + "my Matrix ID": "我的 Matrix ID", + "Name": "姓名", + "Never send encrypted messages to unverified devices from this device": "不要从此设备向未验证的设备发送消息", + "Never send encrypted messages to unverified devices in this room": "不要在此聊天室里向未验证的设备发送消息", + "New passwords don't match": "两次输入的新密码不符", + "none": "无", + "not set": "未设置", + "not specified": "未指定", + "Notifications": "通知", + "(not supported by this browser)": "(此浏览器不支持)", + "": "<不支持>", + "NOT verified": "未验证", + "No display name": "无昵称", + "No results": "没有更多结果", + "OK": "确定", + "Once encryption is enabled for a room it cannot be turned off again (for now)": "(目前) 一旦聊天室开启加密，就不能再关闭", + "Operation failed": "操作失败", + "Password": "密码", + "Password:": "密码:", + "Passwords can't be empty": "密码不能为空", + "Permissions": "权限", + "Phone": "电话" } From a389d5a3c487f72d4bc018f3f5da638a28be6057 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 12 Jun 2017 15:50:36 +0100 Subject: [PATCH 12/13] Prepare changelog for v0.9.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 651303d3b9..16eeca8fa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.9.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.3) (2017-06-12) +=================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.3-rc.2...v0.9.3) + + * Add more translations & fix some existing ones + Changes in [0.9.3-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.3-rc.2) (2017-06-09) ============================================================================================================= [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.3-rc.1...v0.9.3-rc.2) From aef0a8025ca2c94c2a52c823d9bc7d4825b52e15 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 12 Jun 2017 15:50:37 +0100 Subject: [PATCH 13/13] v0.9.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b57cc6890..12a17900be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.9.3-rc.2", + "version": "0.9.3", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {