Commit graph

87 commits

Author SHA1 Message Date
David Baker
00a13c780f Run prunei18n 2017-10-20 11:39:01 +01:00
Stefan Parviainen
45137f030b Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 22:18:50 +02:00
Weblate
11b4ffe302 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/cs.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/fr.json
	src/i18n/strings/it.json
	src/i18n/strings/nl.json
	src/i18n/strings/ru.json
	src/i18n/strings/th.json
2017-10-12 16:20:59 +00:00
Stefan Parviainen
f694fb24ff Fix merge-conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 20:02:14 +02:00
Travis Ralston
f874fc1203 Merge branch 'develop' into travis/pl_enhancements 2017-10-11 08:42:45 -06:00
Stefan Parviainen
581abcb4b7 Consistent subsitution variable in translations
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 09:15:24 +02:00
David Baker
80ad7d4ad6 Update translations 2017-10-10 19:27:51 +01:00
Danilo Resende
00a89f8263 Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.3% (790 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-10-04 09:09:14 +00:00
Travis Ralston
2e1b2178a1 Remove assumptions on how languages work in the power levels section
This does mean that the strings will need to be re-translated, but now they may be more accurate because the comma is not assumed in the code.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 14:35:49 -06:00
Luke Barnard
1f66baca4b Remove "You have entered an invalid contact..." from translations 2017-09-27 17:55:09 +01:00
Stefan Parviainen
411a67c6b0 Remove unneeded strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-21 18:25:45 +02:00
Luke Barnard
e9fb5712bd Merge branch 'develop' into dbkr/group_userlist 2017-09-19 13:26:55 +01:00
Michael Telatynski
e565882ba2
add missing comma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:40:18 +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
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
7ba8aa95c5
readd translations that got removed by accident 2017-09-05 18:00:57 +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
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
299db845ff PR feedback 2017-08-25 12:10:13 +01: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
daniel tygel
2f373de574 Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
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
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
daniel tygel
fcc42c7b60 Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2017-06-22 09:57:14 +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
Weblate
1ba8acc095 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 16:53:10 +00:00
daniel tygel
c418076c32 add two strings to translation 2017-06-19 13:20:16 -03:00
daniel tygel
05810fa83b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-19 13:22:07 +00:00
David Baker
7b0565e9d1 Merge branch 'master' into develop 2017-06-12 15:53:04 +01:00
Richard van der Hoff
cc74a09abd Remove start_upgrade_registration dispatch handler
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
2017-06-12 08:38:29 +01:00
Richard van der Hoff
e6d7eedbe6 Remove NeedToRegisterDialog
- since it's no longer used anywhere
2017-06-12 08:36:41 +01:00
David Baker
d6b85c9d4d 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.
2017-06-09 22:06:43 +01:00
dtygel
d6da5c6494 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-09 13:33:11 +00:00
RiotTranslate
c764b96378 [WEBLATE] merge develop 2017-06-08 17:49:06 +00:00
dtygel
80dba43b41 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-08 17:30:50 +00:00
Matthew Hodgson
74e4260556 fix fullstops 2017-06-08 15:14:46 +01:00
dtygel
f6051f663d Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-08 13:33:01 +00:00
David Baker
f7ab6a574c Remove unused string 2017-06-07 18:32:52 +01:00
Matthew Hodgson
ef2fedc3a9 fix missing translations and typos in i18n 2017-06-07 18:24:35 +01:00
Matthew Hodgson
74d680a952 sync fullstops everywhere 2017-06-07 18:15:56 +01:00
Matthew Hodgson
d48258e825 Merge pull request #1012 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-02 21:59:05 +01:00
Michael Telatynski
31d94f32f0 fix casing in other langs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:14:45 +01:00
dtygel
0d0b8022d2 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-02 15:40:45 +00:00