about summary refs log tree commit diff
path: root/config/locales
AgeCommit message (Collapse)Author
2017-08-10Added new catalan strings (#4574)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
2017-08-09i18n: Improve admin panel translation (pl) (#4559)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-08It makes no sense to try using invalid or expired link again (#4521)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-07i18n: Update Polish translation (#4545)m4sk1n
2017-08-06i18n: update Persian translation (#4540)Masoud Abkenar
2017-08-06Fix #4531 (#4533)Komic
wrong character, sorry about that~
2017-08-06fr.yml update (#4531)Komic
Translation for https://github.com/tootsuite/mastodon/pull/4523
2017-08-06Translate 'Signed in as' into Japanese (#4530)Daigo 3 Dango
2017-08-06l10n OC - Added #4523 "signed in as" (#4529)Quent-in
Neutral form used.
2017-08-05Add "signed in as" header to some pages (#4523)Eugen Rochko
2017-08-05l10n update Occitan (#4522)Quent-in
Salutation mailer + invalid reset link.
2017-08-04Fix some mistakes in Polish translation (#4495)Krzysztof Jurewicz
2017-08-04Dutch strings: typo (#4489)Jeroen
2017-08-03i18n: Update Polish translation (#4479)m4sk1n
* i18n: Update Polish translation * Update Polish translation
2017-08-03Redirect to PasswordController#new when reset_password_token is invalid (#4506)nullkal
2017-08-02Update Japanese Translation (authorize_follow) (#4481)asria-jp
* Update Japanese Translation * preserve "Unfortunately"("残念ながら") preserve "Unfortunately"("残念ながら")
2017-07-31i18n: update Persian translation (#4470)Masoud Abkenar
* i18n: update Persian translation * i18n: fix quotes
2017-07-31Make salutation of email localizable (#4454)unarist
2017-07-30Update Japanese translations (#4453)unarist
2017-07-29Dutch: Small fix (#4441)Jeroen
2017-07-29i18n update of OC version (#4425)Quent-in
* Correction of misspellings * Improve the OC version * Improve of the OC version * Improvement of OC version
2017-07-28i18n: Update Polish translation (#4414)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-28feat(web_push_notifications): Group notifications (#4388)Sorin Davidoi
2017-07-28Update Russian translation (#4407)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation
2017-07-26s/PubSubHubbub/WebSub/g (#4372)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-25Update Japanese translations for landing page (for Mobile). (#4362)Clworld
2017-07-25Update and (almost) completing Dutch strings for 1.5 (#4351)Jeroen
* Update and expanding Dutch strings for 1.5 Only privacy policy is not translated, but is included. Hopefully I have time to translate this another time (you can set your own privacy policy now anyway). * Missing file * A few changes cause of changes in another file * Fix * Update Dutch strings for 1.5 * nl * fix don't know how that ended up there * Update nl.yml
2017-07-24i18n: @2374d63 (pl) (#4340)m4sk1n
* i18n: @2374d63 (pl) * i18n: fixed typo on Polish translation
2017-07-24Redesign /terms page (#4338)Eugen Rochko
* Redesign /terms page * Fix tests * Remove unused keys
2017-07-24Redesign extended information page (#4322)Eugen Rochko
* Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS
2017-07-24Run i18n-tasks normalize (#4335)Eugen Rochko
2017-07-24Allow domain blocks that only reject media without silencing or suspending ↵sdukhovni
(#4325) * Allow domain blocks to reject media without silencing or suspending * Fix typo * Hide 'Reject media' button when superfluous, instead of disabling it * Properly hide 'reject media' checkbox on page load if needed This may happen when resubmitting the domain block form after an error. * Don't ask whether undoing a media-only block should be retroactive * Rename :media_only block to :noop * Display :noop block as None in frontend, allow blocks that do nothing * Remove 'coding' line auto-added by emacs
2017-07-23i18n: Update Polish translation (#4327)m4sk1n
* i18n: Update Polish translation * i18n: Update Polish translation
2017-07-23Change about_mastodon to about_mastodon_html for all locales (#4326)Yamagishi Kazutoshi
2017-07-23Update Japanese translations for #4313 and #4315 (#4323)Yamagishi Kazutoshi
* Update Japanese translations for #4313 * Update Japanese translations for #4315
2017-07-23Improve noscript message and style (#4315)Eugen Rochko
2017-07-23i10n Update for Occitan (#4301)Quent-in
* Update to translate new strings * Update * Update * Indend added * Update oc.yml
2017-07-23Run yarn run manage:translations and i18n-tasks normalize (#4302)Eugen Rochko
2017-07-22Update French locales (settings, ToS, & co) (#4261)Damien Erambert
* add fr-FR locales to the landing page * moar french locales * terms of service/privacy policy * remove un-used locales in the client (yarn manage:translations) * update french locales in the client * remove duplicate locales in fr.yml * fix typos per PR comments in fr.yml * put back default messages * translate untranslated keys on the client * add "push" after notifications * correctly ident ToS in fr.yml
2017-07-22Mise à jour de la traduction de la page d’accueil (#4294)Sylvhem
* Mise à jour de la traduction de la page d’accueil Met à jour les traductions et ajoute les chaînes manquantes suite à la refonte de la page d’accueil. Update translations and add the strings introduced by the landing page's redesign. * Correction d’erreurs Corrige l’indentation de certaines clefs et supprime admin.settings.setting qui n’existe plus dans le projet original. Fix some indentations and delete admin.settings.setting, which have been removed upstream.
2017-07-19i18n: @716f4cb (pl) (#4266)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-19fix missing closing <p> tag in ToS in en.yml (#4262)Damien Erambert
2017-07-19Fix missing closing <p> tag in ToS in .yml files (#4264)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-19Add feature to revoke sessions (#4259)Yamagishi Kazutoshi
2017-07-18Update Japanese translation (chase #4249) (#4251)lindwurm
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18i18n: Update Polish translation (#4252)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-18Update Japanese translations for new landing page (#4159)lindwurm
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18Add Japanese translation for #4199 (#4247)unarist
2017-07-18Add unfollow modal (optional) (#4246)Yamagishi Kazutoshi
* Add unfollow modal * unfollowing someone * remove unnecessary prop
2017-07-18Improve admin page (#4121)abcang
* Improve admin page * Fix test * Add spec * Improve select style