f8a3c00755
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
aee82e3b73
[i18n] Update for Occitan language ( #10548 )
...
* Update activerecord.oc.yml
* Update simple_form.oc.yml
* Fix typo
* Update simple_form.oc.yml
* Remove trailing whitespace
6 years ago
5a24934449
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4c19204392
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)
6 years ago
a0000b9a94
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
6 years ago
020c6ae72f
i18n: Update Japanese translations ( #10536 )
...
* run i18n-tasks add-missing
* Update Japanese translations.
6 years ago
7568f716a1
I18n: Add one more string ( #10543 )
6 years ago
db70d35c3f
I18n: Final Czech translation 🇨🇿 ( #10542 )
...
* I18n: Update Czech translation
* I18n: Why do you want to join translation
* I18n: Translating a bunch of more stuff
6 years ago
fc14f14e20
Updated German translation ( #10539 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
* Updated German translation
* Fixed grammar error (German)
* New strings and adjustments (German)
6 years ago
70a6a8aabc
Translation - Korean ( #10540 )
6 years ago
73bbfcb482
i18n: Update Corsican translations ( #10538 )
6 years ago
cde0ac1aa7
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.
6 years ago
75ab8cef8f
Change the groupings of menu items in settings navigation ( #10533 )
...
* Change the groupings of menu items in settings navigation
Fix #10307
* Remove unused translations
6 years ago
13c1b5bac8
Add preference to disable e-mails about new pending accounts ( #10529 )
6 years ago
7eb05b8724
Add "why do you want to join" field to invite requests ( #10524 )
...
* Add "why do you want to join" field to invite requests
Fix #10512
* Remove unused translations
* Fix broken registrations when no invite request text is submitted
6 years ago
fb93400e7d
i18n: Update Corsican translations ( #10510 )
...
* i18n: Update Corsican translations
* i18n: Update Corsican translations
6 years ago
a604f766e0
Fix batch actions not working on pending accounts ( #10508 )
6 years ago
5c8f9a3220
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.
6 years ago
c66a043591
Updated German locales ( #10505 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
6 years ago
a5a7780ad1
i18n: Update Corsican translations ( #10504 )
6 years ago
20040927fc
i18n: Update Czech translation ( #10506 )
6 years ago
d035f4af41
Translate Korean ( #10499 )
6 years ago
5858035e39
Updated french translations ( #10498 )
...
* updated "Invalid email or password" french translation
* Updated FR translations ("instance" in now "serveur")
6 years ago
4f8beb3717
i18n: Update Japanese translations ( #10494 )
...
* Update Japanese translations
* Update Japanese translations.
6 years ago
6893b404f2
i18n: Update Corsican translations ( #10496 )
...
* Update Corsican translation
* Fix brackets typo
6 years ago
c84c30c542
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 0317f37c6f#10442 )"
This reverts commit 4cd944d364
6 years ago
12ebe48505
I18n: Update Czech translation ( #10489 )
6 years ago
59de320605
Updated German locales ( #10488 )
6 years ago
c34a7f5bd2
Add batch actions for approving and rejecting pending accounts ( #10469 )
6 years ago
0e7c4d0c69
i18n: Update Polish translation ( #10479 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
6 years ago
4c20f5376a
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
6 years ago
a835ea0e8f
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.
6 years ago
f46cd7f002
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
6 years ago
e09e68b656
Translate Korean (devise) ( #10464 )
6 years ago
7deedcc0cf
Esperanto translations ( #10461 )
...
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
6 years ago
a0eaf51ad4
Re-dd PT-br translations ( #10459 )
6 years ago
8cc94c38cf
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
6 years ago
445568eff3
I18n: Improve Czech translation ( #10454 )
6 years ago
5eb2632410
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
6 years ago
0615bc56aa
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.
6 years ago
99336afaff
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
0c334481cc
I18n: Update Czech translation ( #10419 )
6 years ago
6c39082e87
Add missing Korean translations ( #10416 )
...
* Fix Korean translation
* Add missing translation
6 years ago
1ce9bd86b3
Update Corsican translations ( #10418 )
...
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
6 years ago
1600aeb6cb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2a740c3e9a
I18n: Update Czech translation ( #10410 )
6 years ago
be7c92061c
squashed identity proof updates ( #10375 )
6 years ago
0117de0a01
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
6 years ago
364e49ae1f
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status ( #10401 )
...
Also, fix some n+1 queries
Resolve #10365
6 years ago
7aeb50cc89
Add order options to relationship manager UI ( #10404 )
6 years ago
Thibaut Girka
Quentí
Evgeny Petrov
Eugen Rochko
mayaeh
Aditoo17
koyu
Jeong Arm
Alix Rossi
Hugo "Slaynash" Flores
marcin mikołajczak
jeroenpraat
spla
Renato "Lond" Cerqueira
Alex Gessner