about summary refs log tree commit diff
path: root/config/locales
AgeCommit message (Collapse)Author
2017-10-17Small update Dutch (nl) strings (#5424)Jeroen
* Update Dutch strings * Update Dutch
2017-10-16i18n: Update Polish translation (#5416)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-16i18n ultim hour «More» dropdown title + reduce motion (#5415)JeanGauthier
* Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)
2017-10-16Add option to reduce motion (#5393)Nolan Lawson
* 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
2017-10-15Add up-to-date korean translation on serverside (#5400)voidSatisfaction
* chore: add korean translation on ko.yml * feat: add simple form korean translation up-to-date
2017-10-15l10n Occitan: finishing touches (#5404)JeanGauthier
* Update oc.json * Update oc.yml
2017-10-15Update French translation (#5401)Yannick A
2017-10-14Updated Catalan strings (#5323)spla
* 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
2017-10-14Update French translation (#5384)Yannick A
Update French translation
2017-10-14l10n: update Persian translation for 2.0 (#5391)Masoud Abkenar
2017-10-14Correct some misspellings (#5381)Mathias B
* Correct some misspellings Remove some english language and put the proper french words in place. * Forgot some shit Buurps'
2017-10-13l10n: PT-BR translation updated (#5362)Anna e só
* PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed
2017-10-12Updating more Dutch strings for 2.0 (#5359)Jeroen
2017-10-12Fix some consistance errors in gender neutral formulations. Add some missing ↵Alda Marteau-Hardi
ones. (#5350)
2017-10-12Update fr.yml (#5330)JohnD28
* 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.
2017-10-12i18n: Update Polish translation (#5346)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-12Moderation notes (#5344)JeanGauthier
2017-10-12Update ja.yml (#5342)nullkal
* Update ja.yml * Update simple_form.ja.yml
2017-10-12Fixes and updates for the French translation (#5340)Sylvhem
* 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.
2017-10-11Update doorkeeper.fr.yml (#5317)JohnD28
2017-10-10Update German translation (#5302)Jakob Kramer
2017-10-08i18n: Update Polish translation (#5270)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-08Translate some Esperanto (#5252)Jeong Arm
* Translate some Esperanto * More translation * More Esperanto translation * Esperanto translation * Fix mistaken format
2017-10-08i18n update Occitan (#5263)JeanGauthier
* Update oc.json * Update oc.yml * Update oc.yml * Update oc.json
2017-10-07Add moderation note (#5240)nullkal
* Add moderation note * Add frozen_string_literal * Make rspec pass
2017-10-07Redesign public hashtag pages (#5237)Eugen Rochko
2017-10-07Korean translation (#5244)Jeong Arm
* [i18n] Korean translation Add missing Korean translations. [skip ci] * start ci
2017-10-06i18n: Update Polish translation (#5255)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-05Improve admin UI for custom emojis, add copy/disable/enable (#5231)Eugen Rochko
2017-10-04Update German translation (#5221)Jakob Kramer
2017-10-04Implement EmailBlackList (#5109)utam0k
* 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
2017-10-04Separate notifications preferences from general preferences (#4447)Yamagishi Kazutoshi
* Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications
2017-10-03Add missing Japanese translations (#5193)Yamagishi Kazutoshi
* 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 * "項目" -> "絵文字"
2017-10-03Update German translation (#5189)Jakob Kramer
2017-10-02i18n: Update translation files and Polish translation (#5180)m4sk1n
* 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>
2017-10-02Korean translation (#5185)Jeong Arm
* Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo
2017-10-01l10n Update OC: reorganization pref. page (#5168)JeanGauthier
2017-10-01Reorganize preferences page (#5161)Eugen Rochko
2017-09-30Change wording on landing page. (#4805)roikale
"Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa". https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto
2017-09-29Updated German translation (#5151)Jakob Kramer
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.
2017-09-29Better Japanese translations (#5142)Yanaken
2017-09-28Update German translation (#5133)Jakob Kramer
Create activerecord.de.yml (50%) Update devise.de.yml Update doorkeeper.de.yml (100%) Update simple_form.de.yml (100%)
2017-09-28OC 500 error (#5110)JeanGauthier
2017-09-26i18n: Update Polish translation (#5106)m4sk1n
* i18n: Update Polish translation * i18n: Update Polish translation
2017-09-25New error page graphic. Other error page improvements (#5099)Eugen Rochko
- 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
2017-09-25Generate 500.html with assets:precompile, remove loading from Google Fonts ↵Eugen Rochko
(#5067)
2017-09-20Fix theme translations alphabetically (#5031)Lynx Kotoura
2017-09-21Better Japanese translations (#5030)Lynx Kotoura
2017-09-20Add Japanese translations for multiple themes, custom emoji (#5026)mayaeh
* Add Japanese translations for multiple themes * Change Japanese translation for custom emoji's created_msg.
2017-09-20l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... ↵JeanGauthier
(#5023) * Oauto code string * Theme, custom emoji and more * Site theme * added two spaces wierdly gone away * Update oc.yml Changes adviced