about summary refs log tree commit diff
path: root/config/locales
AgeCommit message (Collapse)Author
2017-05-05Correct typo in german locale (#2805)Milan*
2017-05-04Persian translation update (#2788)Masoud Abkenar
* Persian translation update * fix newline typo
2017-05-04Replace best_in_place editor on admin settings page (#2789)Matt Jankowski
* Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n
2017-05-04Language: update pt-BR (#2775)Eduardo Elias
2017-05-03Localize 'throttled' (#2755)alpaca-tc
2017-05-03Update of simple_forum_oc (#2745)Quent-in
* Update of simple_forum_oc * Update simple_form.oc.yml
2017-05-03i18n: Update zh-CN [ Chinese (China) ] translations. (#2699)ヨイツの賢狼ホロ | 3rd style
* Update zh-CN translations. * Update doorkeeper.zh-CN.yml * Follow @Artoria2e5 's change advices. * forget mail for text format ...... * fix some changes * mail's html version ...... * https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283 * a space..... * delete some unused keys
2017-05-03Add Thai Language (#2598)jirayudech
* Create th.yml * Update th.yml * Update thai translation * update thai translation. * Update Thai translation * Update thai translation * Update thai thanslation * Update thai translation * Update th.yml * Update th.yml
2017-05-03i18n: updated Polish translation (#2729)m4sk1n
* i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03Update simple_form.ja.yml (#2746)Masafumi Otsune
"サーバー" in Japanese is "Server", so I modified it to instance according to English.
2017-05-03Add Japanese translation for allowed languages (#2738)Yamagishi Kazutoshi
* Add Japanese translation for allowed languages * Remove duplicate expression words
2017-05-02i18n: updated Polish translation (#2727)m4sk1n
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-02Add option to disable two factor auth in admin accounts panel. (#2584)Kaylee
* Add option to disable two factor auth in admin accounts panel. Closes #2578 * Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!
2017-05-02Creation of activerecord for OC (#2721)Quent-in
* Creation of activerecord for OC * Update activerecord.oc.yml
2017-05-02i18n: Updated Polish translation (#2686)m4sk1n
#807
2017-05-02Language: update pt-BR (#2687)Eduardo Elias
2017-05-02Add Hebrew interface translation. (#2573)Ira
* follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...
2017-05-01grammar fixes (#2695)Drew Gates
“such as” should be used instead of “like” under imports->preface. Reworded imports->preface and recovery_instructions for better flow.
2017-05-01Italian translation (#2654)Giuseppe Pignataro
* Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb * Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml
2017-05-01Filter on allowed user language preferences (#2361)Matt Jankowski
* Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference
2017-04-30Updating Indonesian locale (#2644)Alvina Putri
* update id.jsx file * update id.yml for new strings and improvements * add activerecord.id.yml * improve translation that out of context * fix another ooc string * fix main key
2017-04-30Norwegian locale: Translates missing 2FA strings (#2655)Audun Larsen
* Adds missing strings to Norwegian locale * Translates missing strings. * Changes "tofaktorautentisering" to "to-faktor autentisering" According to the Norwegian National Security Authority this is the correct way to spell it. https://www.nsm.stat.no/blogg/veiledning-i-to-faktor-autentisering/
2017-04-30Update ar.jsx (#2647)ButterflyOfFire
* Update ar.jsx Updating some (ar) translation. * Update ar.yml Pushing some missing translation strings on ar.yml
2017-04-28Update Russian translation (pluralizations) (#2565)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)
2017-04-28Fix typo and wording in follower auth settings (#2544)Ratmir Karabut
2017-04-27Language: Missing keys for pt-BR (#2540)Eduardo Elias
2017-04-27Another (less urgent) Dutch string update (#2533)jeroenpraat
* Another (less urgent) update * Another (less urgent) update * Dutch strings: consistency: let's use 'voorkeuren' as a subset of 'instellingen'
2017-04-27Last minute Dutch update and fix (after checking on live 1.3RC) (#2529)jeroenpraat
* Update and fix * Update and fix Dutch strings
2017-04-26Update Russian translation (rebased) (#2503)Koala Yeung
* 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 * Update Russian translation * Fix merge conflicts Redid Works by @rkarabut
2017-04-26Updated renamed i18n keys in `de` translation (#2500)Matt Jankowski
2017-04-26fix indentation in translation file (#2498)Matthieu Paret
2017-04-26Update German translation (#2485)Benedikt Geißler
2017-04-26Update of simple_forum OC (#2486)Quent-in
Now perfectly similar to the English one.
2017-04-26Update Japanese translation for activitypub and authorized followers (#2471)anon
* Update Japanese translation for activitypub and authorized followers * Fixed Japanese translation by review
2017-04-26Move a locale files for ActiveRecord (#2461)Yamagishi Kazutoshi
ref #2162 and fix #2460
2017-04-25Missing occitan locale file (#2446)Quent-in
Based on the device.en file
2017-04-25Complete proofreading and addition for zh-CN YML translations (#2445)Mingye Wang
* proofread & update zh-CN setting form locale * Pull in new devise zh-CN translations from their wiki https://github.com/plataformatec/devise/wiki/I18n, more precisely https://gist.github.com/Artoria2e5/6d2a06ca9e92a417afc627b5000f4690 * pull in zh-CN translation for doorkeeper ... from https://github.com/doorkeeper-gem/doorkeeper-i18n/pull/31/
2017-04-25Change ActivityPub paging to match spec. Clean up ActivityPub outbox ↵Evan Minto
changes. (#2410) * Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. * Fix code style and test failures for OutboxController. * Attempt to fix CI errors.
2017-04-25Fix #2402 - Add Idempotency-Key header to PostStatusService that prevents ↵Eugen Rochko
(#2419) duplicates. Web UI regenerates UUID for that header every time the compose form is changed or successfully submitted Also, fix Farsi i18n overwriting the English one
2017-04-25Fix Persian translation (#2428) (#2432)Matt Jankowski
Settings page contained labels in Persian, when I was using English.
2017-04-24Persian translation (#2405)Masoud Abkenar
* Persian translation * adding :fa to make the site use the rtl stylesheet based on [this comment](https://github.com/tootsuite/mastodon/pull/2405#issuecomment-296721105) * fix missing quotes * add 'fa' locale
2017-04-24Run i18n-tasks normalize (#2412)Eugen
2017-04-24Language: Missing keys for pt and pt-BR (#2355)Eduardo Elias
2017-04-24Report processing improvements (#2349)Effy Elden
* Expose media attachments on reported statuses directly * Comment out unused bulk report checkbox. Add title to report comment for viewing full comment. Add 'contents' column, with icons and numerical indicators to show the number of referenced statuses and media attachments in the report * Link account name on authorize_follow card back to account * Add localisation string for report_contents * Show new admin accounts card partial on report view. Apply simple_format to report comment so newlines are preserved. * Add new admin accounts card partial, for display quick useful admin stats (e.g. report history, moderation status). * Fix localized variable
2017-04-24Followers-only post federation (#2111)Eugen
* Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers * Authorized followers controller, stub for bulk action * Soft block in the background * Add simple test for new controller * Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results, rename "private" post setting to "followers-only", fix pagination style, improve post privacy preferences style, improve warning style * Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account
2017-04-23Add link for domain in land strip (#2306)ymmtmdk
* Add link for domain in land strip * Use root_path * Avoid repeating code
2017-04-23Update Japanese translation (#2360)Yamagishi Kazutoshi
for #2181
2017-04-23Adding arabic string localization (rebased) (#1895)Koala Yeung
* Create ar.jsx * Preparing file for translation. * Create ar.yml * Preparing file for translation. * Create simple_form.ar.yml * Preparing file for translation. * Create devise.ar.yml * Preparing file for translation. * Create doorkeeper.ar.yml * Preparing file for translation. * Update index.jsx Preparing file for translation. * Update mastodon.jsx * Preparing file to translation. * Correction thanks to @Taekiro https://github.com/tootsuite/mastodon/pull/1798#pullrequestreview-32924922 * Update settings_helper.rb Preparing file to translation. * Update application.rb * Preparing file to translation. * Update simple_form.ar.yml * Update doorkeeper.ar.yml * Update devise.ar.yml * Update ar.yml * Fix i18n-tasks unused issue (ar) Remove unused translation strings * Update application.rb * Update ar.jsx * Fix various issues with Arabic translation * Fix duplication caused in merge * Fix syntax error in devise.ar.yml * Fix import error Duplicated incorrect import in mastodon.jsx * Fix duplication error in locales/index.jsx * Update ar.yml * Update ar.jsx * Update ar.yml * Update ar.jsx * Fix ar translation
2017-04-23ActivityPub: Add basic, read-only support for Outboxes, Notes, and ↵Evan Minto
Create/Announce Activities (#2197) * Clean up collapsible components * Expose user Outboxes and AS2 representations of statuses * Save work thus far. * Fix bad merge. * Save my work * Clean up pagination. * First test working. * Add tests. * Add Forbidden error template. * Revert yarn.lock changes. * Fix code style deviations and use localized instead of hardcoded English text.
2017-04-23Admin UI for confirming users (#2245)Ash Furrow
* Shows confirmed status in list. * Adds ability to confirm users in admin UI. * Added new english translations. * Addresses feedback from #2245. * More feedback.