Commit Graph

669 Commits (17fb1c4345348da5a6f9338912824a03d348841f)

Author SHA1 Message Date
Thibaut Girka 06036081a0 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
Alix Rossi 33ec9c5095 i18n: Update Corsican front-end translation (#10884) 2019-05-29 17:57:08 +09:00
mayaeh c6e1229a82 Update Japanese translations. (#10875)
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-29 11:09:59 +09:00
Aditoo17 0c2ca1bd38 I18n: Update Czech translation (#10874) 2019-05-29 09:52:41 +09:00
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
dxwc ee0e68e97a i18n: Complete frontend Bengali translation (#10800)
* i18n: Complete frontend Bengali translation

* run yarn manage:translations
2019-05-22 10:00:58 +09:00
Thibaut Girka 2b97d9d780 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Alix Rossi 775ee63b71 i18n: Update French translations (#10747)
* Update French JSON

* i18n: Update fr.yml

* i18n: Update simple_form.fr.yml

* Update simple_form.fr.yml

* Update fr.yml
2019-05-10 18:09:46 +02:00
Alix Rossi d25e358f9f i18n: Update Corsican translations (#10746)
* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml
2019-05-10 18:09:34 +02:00
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
spla 7562602df8 i18n Update Catalan translation (#10719)
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation
2019-05-07 00:55:37 +09:00
mayaeh 1eb14ef774 i18n: Update Japanese translations (#10706)
* Update Japanese translations.

run yarn manage:translations

This commit includes translations by some users that were done at the transifex.

* Reduce translation text because it becomes two lines.
2019-05-06 04:34:32 +09:00
jeroenpraat e742bff19b 1 NL string update (#10709)
* 1 NL string update

No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language

* Update nl.json
2019-05-06 04:33:24 +09:00
Thibaut Girka 832cf92c74 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Aditoo17 b7741ed732 I18n: Update Czech translation 🇨🇿 (#10704)
* I18n: Update Czech translation

* Tiny fix
2019-05-05 15:33:33 +09:00
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
partev 5e79dd3f17 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
2019-04-22 20:40:04 +02:00
Yamagishi Kazutoshi 80c9cb0eb3 Add hi.json (#10573) 2019-04-21 04:52:20 +02:00
partev d210d0a655 Update hy.json (#10591) 2019-04-21 04:48:47 +02:00
jeroenpraat 951f8d5b44 Update NL (Dutch) translation (#10601)
* Update NL language strings

Have to do it this way, cause this file is locked on Weblate

* fix

* Update simple_form.nl.yml

* Update nl.yml
2019-04-21 04:46:08 +02:00
Thibaut Girka 268417daf3 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-19 10:44:10 +02:00
Renato "Lond" Cerqueira d305d8747d Add new pt-br translations (#10564) 2019-04-13 21:23:41 +09:00
Thibaut Girka 2f422b708f Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 21:19:21 +02:00
Evgeny Petrov 5dd14dfded i18n: Russian localization update (#10515)
* i18n: Updated ru.json for Russian language

* i18n: Updated ru.yml

* Normalize ru.yml

* i18n: Updated simple_form.ru.yml

* i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings

* Added new strings to ru.json

* Deleted unused (?) string

* i18n: Added recent strings (Settings refactor)
2019-04-10 20:43:08 +02:00
Eugen Rochko 793b0513eb
Weblate translations (2019-04-10) (#10545)
* Translated using Weblate (Occitan)

Currently translated at 95.7% (780 of 815 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Greek)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (French)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Arabic)

Currently translated at 97.4% (372 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (French)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Thai)

Currently translated at 75.4% (288 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/

* Translated using Weblate (German)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/

* Translated using Weblate (Slovak)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/

* Translated using Weblate (Kazakh)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/

* Translated using Weblate (Persian)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Kazakh)

Currently translated at 99.0% (378 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/

* i18n-tasks normalize

* yarn manage:translations

* Fix empty string in Occitan
2019-04-10 18:17:24 +02:00
Aditoo17 4e59f709aa I18n: Final Czech translation 🇨🇿 (#10542)
* I18n: Update Czech translation

* I18n: Why do you want to join translation

* I18n: Translating a bunch of more stuff
2019-04-10 14:52:08 +02:00
Marek Ľach 3dea62bfa2 Updates the grammar of the SK translation (#10541) 2019-04-10 14:50:39 +02:00
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
Yağızhan 2cb16c20a6 Fixed terrible grammar and translated the most (#10527)
The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.

I'll come back and finish the translation.
2019-04-09 20:42:01 +02:00
Quentí ba1a78d168 [i18n] Update and correction (#10511)
* [i18n] Update and correction

* Update oc.json

* Update oc.json
2019-04-09 07:39:50 +09:00
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
koyu 3f036ac6b8 Updated German locales (#10505)
* Updated German locales

* Added account approval locales (German)

* Updated JSON locales (German)
2019-04-08 21:14:08 +09:00
Alix Rossi 6e111152e0 i18n: Update Corsican translations (#10504) 2019-04-08 21:12:06 +09:00
Aditoo17 ae58bbd705 i18n: Update Czech translation (#10506) 2019-04-08 21:11:39 +09:00
Jeong Arm 619bbc23ef Translate Korean (#10499) 2019-04-08 12:35:37 +09:00
mayaeh a265696991 i18n: Update Japanese translations (#10494)
* Update Japanese translations

* Update Japanese translations.
2019-04-08 09:16:14 +09:00
Marek Ľach 78a8a99b0b Improve sk translation further (#10484)
* Further improving Slovak translation

* Update sk.json
2019-04-06 23:26:51 +09:00
marcin mikołajczak 4be7952892 i18n: Update Polish translation (#10479)
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
2019-04-06 02:51:13 +09:00
Marek Ľach e0137c5884 Updates the Slovak translation (#10477)
* Update sk.json

* Update sk.json

* Update sk.json
2019-04-05 22:16:28 +09:00
jeroenpraat 48a52c9372 Dutch (nl) translation (#10474)
* Translation Dutch

* Update activerecord.nl.yml

* Update devise.nl.yml

* Update nl.yml

* Update nl.yml

* Update devise.nl.yml

* Update nl.yml
2019-04-05 06:12:08 +09:00
Thibaut Girka 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/following_accounts_controller.rb
  Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
  Some code has been change upstream, but it has been
  moved to app/javascript/core/settings.js in glitch-soc.
  Applied the changes there.
2019-04-04 14:53:52 +02:00
spla 26bd9fa508 i18n: update Catalan translation (#10458)
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations
2019-04-04 10:25:20 +09:00
Jeong Arm f984f2ea4e Esperanto translations (#10461)
* Esperanto translations

* Translate untranslated Esperanto strings

* Normalize eo translation
2019-04-03 18:19:10 +09:00
Renato "Lond" Cerqueira 83190fffc7 Re-dd PT-br translations (#10459) 2019-04-03 07:24:39 +09:00
spla 3f75b0929e i18n: update catalan translations (#10455)
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations
2019-04-03 01:31:36 +09:00
Aditoo17 0705e4b177 I18n: Improve Czech translation (#10454) 2019-04-03 00:10:27 +09:00
Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00
mayaeh abdf225353 i18n: Update Japanese translations (#10427)
* Update Japanese translations.

run yarn manage:translations && i18n-tasks add-missing

* Update Japanese translations.

* Fix mistake

* Change to be concise.
2019-04-01 05:50:05 +02:00
Thibaut Girka 4444d8f9b3 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00