Commit Graph

3432 Commits

Author SHA1 Message Date
Michael Telatynski 53b7b6cb14 Merge branch 't3chguy/electron_settings' of github.com:vector-im/riot-web into t3chguy/electron_settings 2017-05-30 12:34:05 +01:00
Michael Telatynski 662ce3c4b4 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings 2017-05-30 12:33:41 +01:00
Michael Telatynski c54e2a30b6 explicitly hide because setApplicationMenu on Linux otherwise shows...
https://github.com/electron/electron/issues/9621

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 12:33:32 +01:00
Michael Telatynski b27600adbe Improve for Mac - Tested on 10.10.5 2017-05-30 10:53:01 +01:00
Luke Barnard 543f4efc37 Merge pull request #3925 from vector-im/t3chguy/show_redact_if_can
show redact in context menu only if has PL to/sent message
2017-05-30 10:13:20 +01:00
RiotTranslate b3426a1268 Update from Weblate. (#4064)
* Added translation using Weblate (Ukrainian)

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-05-30 04:00:36 +01:00
Michael Telatynski 17c4e7a748 check PL on change as well as on comp load, that way it'll show remove button if PL increases later.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 23:49:56 +01:00
Michael Telatynski d3f9304598 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/show_redact_if_can 2017-05-29 23:17:44 +01:00
Michael Telatynski 9c25aab509 Fix bad merge (3993 before 4021 broke things)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 22:12:36 +01:00
Michael Telatynski 1d2bd68200 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings 2017-05-29 22:12:06 +01:00
Matthew Hodgson 8ef7dda7bd fixing missing OK button on TextInputDialog 2017-05-29 16:43:28 +01:00
Matthew Hodgson fabae2f19f Merge pull request #3722 from turt2live/travis/redact-to-remove
Change redact -> remove to improve clarity
2017-05-28 22:41:52 +01:00
Matthew Hodgson da7c6ca856 Merge branch 'develop' into travis/redact-to-remove 2017-05-28 22:41:38 +01:00
Matthew Hodgson 47d412df73 Merge pull request #4058 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-28 21:46:38 +01:00
Matthew Hodgson ab9ecc4f64 remove duplicate i18n keys 2017-05-28 21:35:47 +01:00
Radium 3df6ecfe84 Added translation using Weblate (Chinese (Traditional)) 2017-05-28 16:11:35 +00:00
Chazy Chaz 0bdbdc2d1c Translated using Weblate (Spanish)
Currently translated at 95.0% (114 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/es/
2017-05-28 15:43:24 +00:00
Chazy Chaz 367585cf6f Translated using Weblate (Spanish)
Currently translated at 18.3% (22 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/es/
2017-05-28 13:35:30 +00:00
RiotTranslate 7b00be7f57 remove wrong generated file 2017-05-28 13:34:53 +00:00
Chazy Chaz efe3c239e1 Added translation using Weblate (Spanish) 2017-05-28 12:41:24 +00:00
Chazy Chaz 44e58d2eff Added translation using Weblate (_ES (generated)) 2017-05-28 12:40:43 +00:00
PureTryOut c238fe6605 Translated using Weblate (Dutch)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/
2017-05-28 12:33:35 +00:00
PureTryOut c02ee7a0dd Translated using Weblate (Dutch)
Currently translated at 5.0% (6 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/
2017-05-28 11:18:32 +00:00
PureTryOut 03f698ce8c Translated using Weblate (Dutch)
Currently translated at 4.1% (5 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/
2017-05-28 11:17:54 +00:00
RiotTranslate fb523fd613 [WEBLATE] fix merge issue 2017-05-28 11:17:13 +00:00
Thomas Juberg 46bca69321 Translated using Weblate (Norwegian Bokmål)
Currently translated at 9.1% (11 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nb_NO/
2017-05-28 11:04:08 +00:00
PureTryOut 6039e5a2be Added translation using Weblate (Dutch) 2017-05-28 11:04:06 +00:00
Matthew Hodgson 0c140df789 Merge pull request #3688 from t3chguy/forward_message
Message Forwarding
2017-05-28 02:37:24 +01:00
Matthew Hodgson 2f71dc9fe5 Merge branch 'develop' into forward_message 2017-05-28 02:37:10 +01:00
RiotTranslate 73a811aa91 Update from Weblate. (#4057)
* Added translation using Weblate (Norwegian Bokmål)

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Hungarian)

Currently translated at 55.0% (66 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-05-27 23:28:44 +01:00
RiotTranslate bbdfe39745 Merge remote-tracking branch 'origin/develop' into develop 2017-05-27 22:13:01 +00:00
Szimszon 918aa01ee5 Translated using Weblate (Hungarian)
Currently translated at 55.0% (66 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-05-27 22:13:00 +00:00
Bamstam c83188be51 Translated using Weblate (German)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-05-27 22:13:00 +00:00
Thomas Juberg 664b5c29c3 Added translation using Weblate (Norwegian Bokmål) 2017-05-27 22:12:59 +00:00
Matthew Hodgson 4a3480b935 fix broken vars in i18n 2017-05-27 20:17:19 +01:00
Matthew Hodgson 85e6cbe0c7 oops, fix var names 2017-05-27 19:28:54 +01:00
Matthew Hodgson 4293273e55 fix a bunch of i18n fails picked up by check-i18n.pl 2017-05-27 19:26:19 +01:00
Matthew Hodgson 29653e88f7 Merge pull request #4053 from ollieh/issues/3927
Fixed an input field's background color in dark theme
2017-05-27 17:21:31 +01:00
Oliver Hunt a526bd95aa Fixed an input field's background color in dark theme 2017-05-27 15:15:45 +01:00
Matthew Hodgson ded2f95003 Merge pull request #4051 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-27 12:32:18 +01:00
RiotTranslate 94dd41f34e Merge remote-tracking branch 'origin/develop' into develop 2017-05-27 11:30:15 +00:00
nouts b33eab0188 Translated using Weblate (French)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/fr/
2017-05-27 11:30:14 +00:00
Tulir Asokan 4ff09199d7 Translated using Weblate (Finnish)
Currently translated at 0.8% (1 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/fi/
2017-05-27 11:30:14 +00:00
Matthew Hodgson 59a6879db9 Merge pull request #4049 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-27 11:21:54 +01:00
Tulir Asokan a60ab42ee3 Added translation using Weblate (Finnish) 2017-05-27 07:33:17 +00:00
Matthew Hodgson 1a3c09dc1b Merge pull request #4048 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-27 01:08:21 +01:00
RiotTranslate 012cdf590a Merge remote-tracking branch 'origin/develop' into develop 2017-05-26 23:21:48 +00:00
Max Sandholm ac42fbbd49 Translated using Weblate (Swedish)
Currently translated at 31.6% (38 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
2017-05-26 23:21:48 +00:00
dambador 0074fa00ac Translated using Weblate (Russian)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
2017-05-26 23:21:48 +00:00
Szimszon 8e250531ce Translated using Weblate (Hungarian)
Currently translated at 11.6% (14 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-05-26 23:21:48 +00:00