Commit Graph

4389 Commits (117e6b8fc3b16244c4e9fee8e9cb94a4d5492d44)

Author SHA1 Message Date
Radium e1e2d83361 Added translation using Weblate (Chinese (Simplified)) 2017-05-29 15:18:55 +00:00
Juorder Gonzalez 949077db00 Translated using Weblate (Spanish)
Currently translated at 3.2% (22 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:08:33 +00:00
Juorder Gonzalez 9ea8e2c459 Translated using Weblate (Spanish)
Currently translated at 2.8% (19 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:08:05 +00:00
Juorder Gonzalez 578e10d972 Translated using Weblate (Spanish)
Currently translated at 2.8% (19 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:07:11 +00:00
RiotTranslate 245a2793ed Merge remote-tracking branch 'origin/develop' into develop 2017-05-29 14:33:58 +00:00
Bamstam 6ccf55b425 Translated using Weblate (German)
Currently translated at 100.0% (675 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-29 14:33:58 +00:00
Juorder Gonzalez 4a712a443c Added translation using Weblate (Spanish) 2017-05-29 14:33:56 +00:00
Michael Telatynski 42e20c38f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-29 15:23:05 +01:00
Michael Telatynski 9b8dcaf274 make analytics setting use new thing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:11:37 +01:00
Michael Telatynski 97d0c41d30 fix ugly special casing in generic settings renderer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:08:11 +01:00
Michael Telatynski 75e386e0ee fix async behaviour, tracking should maybe use Async Piwik tracker
events before piwik loads are lost currently
blocking for piwik would be stupid.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:56:41 +01:00
Michael Telatynski f5d336103e add opt out / un opt out toggle
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:36:50 +01:00
Michael Telatynski 7e8123e5fe move all init/enable/disable logic to Analytics/MatrixChat
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:26:29 +01:00
Matthew Hodgson 229eef4624 fix missing translation 2017-05-29 13:29:27 +01:00
RiotTranslate 93b958419a Merge remote-tracking branch 'origin/develop' into develop 2017-05-28 23:08:11 +00:00
Bamstam d325582344 Translated using Weblate (German)
Currently translated at 100.0% (675 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-28 23:08:09 +00:00
Matthew Hodgson 776712995f Merge pull request #831 from turt2live/travis/redact-to-remove
Change redact -> remove for clarity
2017-05-28 22:48:19 +01:00
Travis Ralston 1b6685c5da Merge branch 'develop' into travis/redact-to-remove 2017-05-28 17:45:32 -04:00
Matthew Hodgson e60885eac8 Merge pull request #950 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-05-28 21:46:22 +01:00
Matthew Hodgson 4fa454ed45 Merge branch 'develop' into weblate-riot-web-matrix-react-sdk 2017-05-28 21:46:17 +01:00
Matthew Hodgson 0acfe7eddd Merge pull request #952 from matrix-org/t3chguy/fix_slashcommands
fix mis-linting - missed it in code review :(
2017-05-28 21:45:25 +01:00
Matthew Hodgson 51c3c121d4 fix dup i18n keys found by check-i18n.pl 2017-05-28 21:32:24 +01:00
Matthew Hodgson 85f830db71 warn for duplicate translation keys 2017-05-28 21:28:11 +01:00
Matthew Hodgson 67323e3690 fix vars in RU translation (how did i not commit this yesterday?) 2017-05-28 21:28:03 +01:00
Matthew Hodgson d452284d9c Merge pull request #951 from t3chguy/forward_message
i18n fixes
2017-05-28 20:41:15 +01:00
Michael Telatynski 3ecd9964ec fix vector-im/riot-web#4059 - missed it in code review :(
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 20:24:33 +01:00
Radium 4e2e1d3d51 Translated using Weblate (Chinese (Traditional))
Currently translated at 3.2% (22 of 674 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-05-28 16:38:35 +00:00
Radium dc710f4644 Added translation using Weblate (Chinese (Traditional)) 2017-05-28 16:07:47 +00:00
Rinat b709c981c0 Translated using Weblate (Russian)
Currently translated at 91.0% (614 of 674 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-28 13:35:29 +00:00
PureTryOut 00a6d218a5 Translated using Weblate (Dutch)
Currently translated at 0.2% (2 of 674 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/nl/
2017-05-28 13:35:29 +00:00
Michael Telatynski 3a8288bf34 remove identical duplicates in fr
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:43:44 +01:00
Michael Telatynski 8d64bf27af fix weird mangled key vals (and dups)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:38:37 +01:00
PureTryOut 38abda3c56 Added translation using Weblate (Dutch) 2017-05-28 12:35:34 +00:00
Michael Telatynski c8732582d3 remove most duplicate keys in en_EN
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:35:30 +01:00
Michael Telatynski b55503e67f i18n the forwarding aux panel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:27:57 +01:00
Michael Telatynski fb3187b58e change event wording
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:26:33 +01:00
Michael Telatynski 0a1b361141 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-28 13:21:33 +01:00
Michael Telatynski 7cebfc1ff1 change analytics to set custom url rather than custom title
this way exit/entry/page transition will work better

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:19:03 +01:00
RiotTranslate f08d40fb7b Merge remote-tracking branch 'origin/develop' into develop 2017-05-28 11:10:16 +00:00
Bamstam b1f21f7d4e Translated using Weblate (German)
Currently translated at 99.7% (672 of 674 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-28 11:10:16 +00:00
Michael Telatynski eb6136b957 remove dispatcher
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 11:26:41 +01:00
Matthew Hodgson accc17a39a Merge pull request #812 from t3chguy/forward_message
Message Forwarding
2017-05-28 02:37:31 +01:00
Matthew Hodgson 10a9313bba Merge pull request #944 from matrix-org/t3chguy/fix-focus-steal
don't focus_composer on window focus
2017-05-27 23:30:00 +01:00
Matthew Hodgson 02c2930531 Merge pull request #947 from MTRNord/patch-1
Fix vector-im/riot-web#4042
2017-05-27 23:29:15 +01:00
Michael Telatynski f93fd1c408 remove unrelated comment, my copy pasting is way too obvious xD
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 21:08:00 +01:00
Michael Telatynski 45cd80dedb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-27 20:59:35 +01:00
Michael Telatynski 98c2f9201b initial piwik stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 20:47:09 +01:00
Marcel 8935e9706e Change variable name as mentioned by t3chguy 2017-05-27 21:21:23 +02:00
Matthew Hodgson dba35f4901 extend script to check for broken variables 2017-05-27 20:14:52 +01:00
Marcel a30110b5d3 Fix vector-im/riot-web#4042 2017-05-27 21:11:00 +02:00