OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
6,567 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

181 Commits (5295d7f0588d19e0dafd15d8e0cad5ddfc438c6c)

Author SHA1 Message Date
Luke Barnard e9fb5712bd Merge branch 'develop' into dbkr/group_userlist 2017-09-19 13:26:55 +01:00
Michael Telatynski 63ccc45551
Merge branches 'develop' and 't3chguy/i18n-1' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n-1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/nl.json
#	src/i18n/strings/zh_Hans.json
 2017-09-17 13:33:34 +01:00
Michael Telatynski ce2cdf3fa1
sanitize the i18n for fn:textForHistoryVisibilityEvent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-17 13:28:17 +01:00
David Baker 3c3328c5f1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-13 16:34:39 +01:00
Krombel 57b1b42ec6 Translated using Weblate (German) 
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-13 13:59:16 +00:00
Krombel 5a73b4c51b Translated using Weblate (German) 
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-12 10:56:26 +00:00
Krombel dc88a5ba5e Translated using Weblate (German) 
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-12 10:41:58 +00:00
Weblate 0b6d352cf4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/hu.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/ru.json
	src/i18n/strings/zh_Hant.json
 2017-09-12 09:33:58 +00:00
Bamstam cf3118fb5e Translated using Weblate (German) 
Currently translated at 100.0% (972 of 972 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-12 09:10:07 +00:00
David Baker 158e6fd9ff Merge pull request #1361 from MTRNord/patch-9 
Remove unused string "changing room on a RoomView is not supported"
 2017-09-05 17:20:26 +01:00
MTRNord da3336172f
Remove more unused translation strings 2017-09-05 18:12:00 +02:00
MTRNord 4a362c141a
Cleanup unused language code translations 2017-09-05 17:54:49 +02:00
David Baker 289c3a5fbd Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-05 14:20:02 +01:00
David Baker de2940f469 Fix plurals in translations 
Weblate doesn't understand counterpart's multi-level format for
plurals and helpfully mangles them to be dot-separated keys when it
saves the translation file. Store the source files with pipe
separators and convert to counterpart format at build time.
 2017-09-04 17:09:36 +01:00
David Baker 79ee41351c Fix typo 2017-09-04 15:45:28 +01:00
Krombel 91b547b99f Translated using Weblate (German) 
Currently translated at 100.0% (972 of 972 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-04 12:53:11 +00:00
Krombel 9de3ce67f1 Translated using Weblate (German) 
Currently translated at 100.0% (972 of 972 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-04 12:22:41 +00:00
Weblate d305f8aacb Merge remote-tracking branch 'origin/develop' into develop 2017-09-04 10:27:17 +00:00
Bamstam 05c4b042ad Translated using Weblate (German) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-04 10:27:16 +00:00
lazz0 6847dddcc4 Translated using Weblate (German) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-04 07:30:01 +00:00
Bamstam 6abb8f4464 Translated using Weblate (German) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-04 07:29:13 +00:00
lazz0 1e79fd8463 Translated using Weblate (German) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-03 14:32:16 +00:00
Bamstam 95fa0f0cb7 Translated using Weblate (German) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-09-03 14:10:19 +00:00
David Baker 9efa604706 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-30 17:39:47 +01:00
David Baker 6d5b1b7a55 Percent encoding isn't a valid thing within _t 
Just use a plain apostrophe
 2017-08-29 14:18:24 +01:00
David Baker d86fe0df6e Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-29 13:29:55 +01:00
Bamstam fdfa33b603 Translated using Weblate (German) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-28 20:51:57 +00:00
David Baker 299db845ff PR feedback 2017-08-25 12:10:13 +01:00
Krombel 1dfab49349 Translated using Weblate (German) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-23 11:08:44 +00:00
Bamstam 859bfff03f Translated using Weblate (German) 
Currently translated at 99.2% (964 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-23 11:00:41 +00:00
Krombel ca0061f7a1 Translated using Weblate (German) 
Currently translated at 99.1% (963 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-22 17:09:28 +00:00
Weblate 729d3f7608 Merge remote-tracking branch 'origin/develop' into develop 2017-08-22 16:47:01 +00:00
Krombel 45e7f1c401 Translated using Weblate (German) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-18 15:56:09 +00:00
Bamstam 4a1106de2f Translated using Weblate (German) 
Currently translated at 94.9% (914 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-18 15:32:53 +00:00
Krombel 42d9e3bc8a remove unused strings introduced by string change in bb084595 2017-08-17 20:26:34 +02:00
Weblate d443368aa3 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/en_EN.json
	src/i18n/strings/fr.json
	src/i18n/strings/ru.json
 2017-08-15 14:00:35 +00:00
Bamstam 3578234689 Translated using Weblate (German) 
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-15 13:39:10 +00:00
David Baker fa7a9818c6 Fix i19n on truncatedlist & friends to be sane 
Use the proper counterpart tool for plurals rather than if > 1.
Fix up all the translation files respectively.
 2017-07-25 15:59:06 +01:00
Luke Barnard 441954c8c1 Remove i18n for "Unknown command" 2017-07-13 09:55:11 +01:00
zottel ea68cca233 Translated using Weblate (German) 
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-07-07 16:30:08 +00:00
Bamstam b414db06e0 Translated using Weblate (German) 
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-07-07 07:27:02 +00:00
Krombel 7245ca88a4 Translated using Weblate (German) 
Currently translated at 99.8% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-27 16:23:16 +00:00
Bamstam 37f920d0b9 Translated using Weblate (German) 
Currently translated at 99.8% (915 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-27 16:23:06 +00:00
Krombel 0771987e39 Translated using Weblate (German) 
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-26 10:30:10 +00:00
Bamstam d5594c883e Translated using Weblate (German) 
Currently translated at 99.7% (914 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-26 10:29:30 +00:00
Weblate 4b5deaf17f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/fr.json
 2017-06-22 20:39:48 +00:00
zottel 81dadc9e05 Translated using Weblate (German) 
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-22 20:22:02 +00:00
Richard van der Hoff efc5cf2889 Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE 
We used to show a special error message when we got this error; however
https://github.com/matrix-org/matrix-react-sdk/pull/783 made that not work.

You'll only hit it if you're upgrading from some ancient version of Olm, and
I'm quite happy for us to fall back to the generic 'couldn't restore: vape your
storage?' flow in that case. (In any case that's preferable to dumping you at
the login prompt with no warning that we've just vaped your storage).
 2017-06-21 21:49:41 +01:00
Krombel 4fbe688f53 Translated using Weblate (German) 
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-20 16:22:05 +00:00
Bamstam 499d3b9438 Translated using Weblate (German) 
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-20 08:54:29 +00:00