Commit Graph

582 Commits (3bc8924940ac37b1efa458e160e51f4f0e328d6b)

Author SHA1 Message Date
Jakob Kramer e6c9756fa9 Update German translation (#5425) 7 years ago
Yamagishi Kazutoshi 5050719fac Add Japanese translations (#5427)
* yarn manage:translations

* Add Japanese translation for #5410

* Add Japanese translation for #5393
7 years ago
Yamagishi Kazutoshi 989553c69a Normalize locale files (#5429) 7 years ago
Håkan Eriksson a2b600428c Swedish translation (#5406)
* Swedish file added

* Swedish file added

* Swedish file updated

* Swedish languagefile added

* Add Swedish translation

* Add Swedish translation

* Started the Swedish translation

* Added Swedish lang settings

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Swedish language completed and added

* Swedish language Simple_form added

* Swedish language Divise added

* Swedish language doorkeeper added

* Swedish language - now all file complete
7 years ago
Jeroen df1a9c5ab5 Small update Dutch (nl) strings (#5424)
* Update Dutch strings

* Update Dutch
7 years ago
Marcin Mikołajczak 3c530d95f6 i18n: Update Polish translation (#5416)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
JeanGauthier 1e7b3bf625 i18n ultim hour «More» dropdown title + reduce motion (#5415)
* Correction fem. form

* More dropdown title

* More dropdown title

* More dropdown title

* Add option to reduce motion (#5393)
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
* Add option to reduce motion

* Use HOC to wrap all Motion calls

* fix case-sensitive issue

* Avoid updating too frequently

* Get rid of unnecessary change to _simple_status.html.haml
7 years ago
voidSatisfaction 3e2f793948 Add up-to-date korean translation on serverside (#5400)
* chore: add korean translation on ko.yml

* feat: add simple form korean translation up-to-date
7 years ago
JeanGauthier 8eb7d30a6c l10n Occitan: finishing touches (#5404)
* Update oc.json

* Update oc.yml
7 years ago
Yannick A 7fe1428cc4 Update French translation (#5401) 7 years ago
spla f63a40e7c2 Updated Catalan strings (#5323)
* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Update ca.json

Removed :

<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master

* Syncing to master

* Added new Catalan strings

* removed config.secret_key line

* Corrected <sotrong> tag to <strong>

Line 515

* Removed extra line

* Reverted

* yarn.lock reverted

* Updated Catalan strings

* Updated Catalan strings
7 years ago
Yannick A c6f76db2e1 Update French translation (#5384)
Update French translation
7 years ago
Masoud Abkenar 2c704ca9c6 l10n: update Persian translation for 2.0 (#5391) 7 years ago
Mathias B c1a2707ecf Correct some misspellings (#5381)
* Correct some misspellings 

Remove some english language and put the proper french words in place.

* Forgot some shit

Buurps'
7 years ago
Anna e só ad917cda10 l10n: PT-BR translation updated (#5362)
* PT-BR translation updated

* Testing

* Indentation error fixed

* More indentation errors fixed
7 years ago
Jeroen f398ad1994 Updating more Dutch strings for 2.0 (#5359) 7 years ago
Alda Marteau-Hardi 3cfcc7a50e Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350) 7 years ago
JohnD28 691e9112f3 Update fr.yml (#5330)
* Update fr.yml

Update of french translation and reformatting Privacy Policy for better maintenance.

* Update fr.yml

* Update fr.yml

* Update fr.yml

Corrections suivant les remarques d'Alda.

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

I have replaced my proposals with those accepted here to reduce the conflict.

https://github.com/tootsuite/mastodon/pull/5340

J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit.

Comment dois-je faire à l'avenir pour éviter ce genre de situations ?

* Update fr.yml

Conflict reduction.
7 years ago
Marcin Mikołajczak 9d84b6e606 i18n: Update Polish translation (#5346)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
JeanGauthier bf0f7e8846 Moderation notes (#5344) 7 years ago
nullkal 4817744b87 Update ja.yml (#5342)
* Update ja.yml

* Update simple_form.ja.yml
7 years ago
Sylvhem 3ebe03b729 Fixes and updates for the French translation (#5340)
* Ajout du support des thèmes multiples

Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples.

Add translations for the new strings allowing support for multiple themes.

* Mise à jour de la traduction

Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas.

Update modified strings and add new translations for the ones who are missing them.

* Remplace « ' » par « ’ »

Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux.

Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.
7 years ago
JohnD28 fe6941e28e Update doorkeeper.fr.yml (#5317) 7 years ago
Jakob Kramer 616f53eea8 Update German translation (#5302) 7 years ago
m4sk1n f0c939c431 i18n: Update Polish translation (#5270)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Jeong Arm ebadfe0ab7 Translate some Esperanto (#5252)
* Translate some Esperanto

* More translation

* More Esperanto translation

* Esperanto translation

* Fix mistaken format
7 years ago
JeanGauthier 94f15338c3 i18n update Occitan (#5263)
* Update oc.json

* Update oc.yml

* Update oc.yml

* Update oc.json
7 years ago
nullkal 633426b261 Add moderation note (#5240)
* Add moderation note

* Add frozen_string_literal

* Make rspec pass
7 years ago
Eugen Rochko f486ef2666 Redesign public hashtag pages (#5237) 7 years ago
Jeong Arm 0e0a9e716c Korean translation (#5244)
* [i18n] Korean translation

Add missing Korean translations.

[skip ci]

* start ci
7 years ago
m4sk1n 4413d81d7f i18n: Update Polish translation (#5255)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Eugen Rochko 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231) 7 years ago
Jakob Kramer 636acb5712 Update German translation (#5221) 7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
* Implement BlacklistedEmailDomain

* Use Faker::Internet.domain_name

* Remove note column

* Add frozen_string_literal comment

* Delete unnecessary codes

* Sort alphabetically

* Change of wording

* Rename BlacklistedEmailDomain to EmailDomainBlock
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
* Separate notifications preferences from general preferences

* Refine settings/notifications/show

* remove preferences.notifications
7 years ago
Yamagishi Kazutoshi eb6ec3d068 Add missing Japanese translations (#5193)
* yarn manage:translations

* Add Japanese translations for #5170

* Add Japanese translations for #5123

* Add Japanese translations for #5046

* Add Japanese translations for #5099

* Add Japanese translations for #5161

* "項目" -> "絵文字"
7 years ago
Jakob Kramer 395a57d03d Update German translation (#5189) 7 years ago
m4sk1n a767ef85fa i18n: Update translation files and Polish translation (#5180)
* Update translation files

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* i18n: Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Jeong Arm c30e492587 Korean translation (#5185)
* Add missing Korean translations

* Add Korean email confirmation template

* Fix Korean typo
7 years ago
JeanGauthier 04fa4eb7f9 l10n Update OC: reorganization pref. page (#5168) 7 years ago
Eugen Rochko 0b3f1ec62a Reorganize preferences page (#5161) 7 years ago
roikale 1df453aff6 Change wording on landing page. (#4805)
"Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa".
https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto
7 years ago
Jakob Kramer 1a72813b53 Updated German translation (#5151)
Translate "about" page, several settings pages, data export/import,
sessions overview, authorized followers page, account deletion page.

More consistent use of words:
- A toot is a Beitrag.
- An account is a Konto.

Some small improvements.
7 years ago
Yanaken c3f9c74719 Better Japanese translations (#5142) 7 years ago
Jakob Kramer d0b4709b2a Update German translation (#5133)
Create activerecord.de.yml (50%)
Update devise.de.yml
Update doorkeeper.de.yml (100%)
Update simple_form.de.yml (100%)
7 years ago
JeanGauthier 3406e30526 OC 500 error (#5110) 7 years ago
m4sk1n 9d53a38a44 i18n: Update Polish translation (#5106)
* i18n: Update Polish translation

* i18n: Update Polish translation
7 years ago
Eugen Rochko 3b60832214 New error page graphic. Other error page improvements (#5099)
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
  correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>)
- 500 content appended with "on our end" to make clear it's
  not user's fault
7 years ago
Eugen Rochko 2c8e3fbbfb Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067) 7 years ago