425 Commits (38520329535b14a13bdef229a8a0d9190f2fde2a)

Author	SHA1	Message	Date
Eugen Rochko	b90a44b6d0	Fix #3910 - Require OTP authentication to disable 2FA (#3935) ... * Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability to generate new OTP backup codes *after* initial backup codes were handed out during activation * Restore recovery code re-generation * Improve display of some 2FA elements	7 years ago
Eugen Rochko	7814133f0a	Rename "Credentials" page to "Security" for clarity (#3941) ... * Rename "Credentials" page to "Security" for clarity * Change "security" icon from cog to lock	7 years ago
Eugen Rochko	c465c5b3a8	Add overview of active sessions (#3929) ... * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test	7 years ago
Ratmir Karabut	d9eeb1340d	Update Russian translation (#3902) ... * 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	7 years ago
Quent-in	b0debe35d6	Update of doorkeeper.oc.yml (#3896) ... Just some adjustements	7 years ago
m4sk1n	3c355ed26b	i18n: Fixed typo in Polish translation (#3864)	7 years ago
のら	8b65b64428	Add Japanese translation "Action taken by" (#3850)	7 years ago
spla	7a96f422db	Added new Catalan strings (#3843) ... * 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	7 years ago
Quent-in	d792a958fb	l10n update for account deletion (#3820) ... * l10n update for acount deletion * l10n little change * l10n little changes Less passive voice, more natural. * Update oc.yml Correction, " added	7 years ago
m4sk1n	a15a1827ab	updated Polish translation (#3751) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
unarist	54addd93c5	Add Japanese translation for Account deletion (#3747)	8 years ago
m4sk1n	cc22f75a94	i18n: updated Polish translation (#3744)	8 years ago
Eugen Rochko	1c7e2ddd65	Account deletion (#3728) ... * Add form for account deletion * If avatar or header are gone from source, remove them * Add option to have SuspendAccountService remove user record, add tests * Exclude suspended accounts from search	8 years ago
Ratmir Karabut	0962301493	Update Russian translation (#3692)	8 years ago
m4sk1n	8ceff751e2	i18n: Minor fixes in Polish translation (#3674) ... * i18n * i18n * i18n * i18n * i18n	8 years ago
m4sk1n	caa3d4acbd	i18n: updated Polish translation (#3670)	8 years ago
Yamagishi Kazutoshi	7f99456ab0	Refactor views/admin/reports/show.html.haml (#3656)	8 years ago
unarist	6c2359ce87	Add Japanese translation for #3640 (#3650)	8 years ago
Eugen Rochko	9eefd60136	Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640) ... * Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks	8 years ago
Yamagishi Kazutoshi	26e4a2cc3c	Add Japanese translations (#3635)	8 years ago
m4sk1n	28c83a27f3	i18n: Update Polish translation (#3637)	8 years ago
Sorin Davidoi	4ce6597e3a	fix: Warn if JavaScript is disabled (#3634)	8 years ago
jeroenpraat	fa04340b99	Rest of 2FA translated + small fix (#3630)	8 years ago
m4sk1n	3d1ea01df1	i18n: updated Polish translation (#3597) ... * i18n: updated Polish translation * i18n: updated Polish translation btw it would be nice to have master-based Mastodon instance (even isolated from others) to test translation.	8 years ago
Quent-in	f4d830d5ec	l10n update for occitan language (#3557) ... * i18n Update : Add preference setting for delete toot modal Adding a line for "Add preference setting for delete toot modal" * i18n update for pin/unpin Update to add two more translations * i18n update to have the dates in plain occitan * Removed the blank line * %{selft} back in the translation	8 years ago
Eugen Rochko	4a6ceb24c9	Added support for configurable reserved usernames (fix of #1382) (#3566) ... * Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames	8 years ago
Matt Jankowski	81ce4e4318	Move admin/pubsubhubbub controller to admin/subscriptions (#3442)	8 years ago
spla	52f48030a6	Catalan language updates (#3454) ... * 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	8 years ago
Atsushi Yamamoto	4547e3585a	Add preference setting for delete toot modal (#3368) ... * Set delete_modal preference to true by default * Does not show confirmation modal if delete_modal is false * Add ja translation for preference setting page	8 years ago
vidarlee	aac63ca344	i18n: Add some tags for Chinese translation (#3379) ... * Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175 * i18n: Add some tags for Chinese translation * i18n: Add some tags for Chinese translation	8 years ago
Masoud Abkenar	c463765f31	Persian translation fixes and updates (#3380) ... * Persian translation fix * Persian translation of new strings	8 years ago
jeroenpraat	b62295117e	Update Dutch strings for 1.4 (#3363) ... * Update nl strings for 1.4 * Update nl strings for 1.4 * Update nl strings for 1.4 * nl strings (+1) More new OTP strings will be translated another time	8 years ago
Quent-in	8b906782a2	i18n update for Occitan language (#3362) ... * Update simple_form.oc.yml * Added check spam folder * Update oc.json abonats => seguidors * Update oc.yml * Update oc.json Added translations + corrections * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * i18n mailer * Update reset_password_instructions.oc.html.erb	8 years ago
m4sk1n	fb95094b02	i18n: pl: pluralized (#3344) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
m4sk1n	a72c7b01ec	Updated Polish translation (#3335) ... * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: corrected Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update simple_form.pl.yml * Update simple_form.pl.yml * updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml	8 years ago
Ira	bdfb59666f	i18n: New strings translated to Hebrew (#3282)	8 years ago
alpaca-tc	46ca699d72	Toggle sensitive from admin page (#3261)	8 years ago
Ira	f103e5fc65	i18n: Latest Hebew strings translated (#3250)	8 years ago
Eugen Rochko	04304e6538	Fix more locale regressions from #3055 (#3242)	8 years ago
Eugen Rochko	a2f664f763	Fix locale regression from #3055 (#3231)	8 years ago
Ratmir Karabut	bb40976006	Update Russian translation (#3225) ... * 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	8 years ago
m4sk1n	d316260e92	Updated Polish translation (#3204) ... * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: corrected Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update simple_form.pl.yml * Update simple_form.pl.yml	8 years ago
Yamagishi Kazutoshi	901a36039e	Add translations for counter of profile (#3214) ... ref #3101	8 years ago
Masoud Abkenar	9ce65dd7dc	Persian translation update (#3206) ... * Persian translation update * Persian translation update: new files * Persian translation update * activerecord.fa.yml language code * Persian translation update * fix indent	8 years ago
vidarlee	601c3668e3	Enhance for the Chinese translation (#3198) ... * Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175	8 years ago
Daigo 3 Dango	05ab5dfb31	Add a Japanese translation for PR #3175 (#3192)	8 years ago
spla	d4e99f6efa	Catalan translation update (#3177) ... * 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	8 years ago
Matt Jankowski	1122249e51	Filter languages with opt out (#3175) ... * Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages	8 years ago
Yamagishi Kazutoshi	5202908017	Add Japanese translations (domain block & admin page) (#3160) ... https://github.com/tootsuite/mastodon/pull/3100 https://github.com/tootsuite/mastodon/pull/3127	8 years ago
Ira	010ea2a786	i18n: Hebrew Spam folder check warning added (#3134)	8 years ago
Ira	105b93ba94	i18l: Hebrew translation updates (#3109)	8 years ago
Quent-in	7484d37cbf	Update oc.yml (#3112) ... Normally fully complete	8 years ago
Eugen Rochko	ae6984de48	Fix character counter not updating for bio (#3101)	8 years ago
Eugen Rochko	4faf1e3d73	Add reset button to admin accounts search, improve looks a little (#3100)	8 years ago
alpaca-tc	c0791aa647	Add filter to AccountFilter (#2968)	8 years ago
jeroenpraat	e389bbcee8	Added a warning to look into the spam folder (#2921) ... Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.	8 years ago
spla	6bf6a21658	Add catalan language (#3084) ... * 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	8 years ago
Hiroaki Ninomiya	2cc685192e	feat(ja): add missing ja translation. (#3083) ... ref: https://github.com/tootsuite/mastodon/pull/2584	8 years ago
Hiroaki Ninomiya	ba3fa2bb28	chore(landing_strip): hide signup path unless the instance allows registration. (#3055)	8 years ago
Hiroaki Ninomiya	bb2e46668a	Improve ja translation (#3071) ... * chore(ja): replace with reasonable word. * chore(ja): add periods.	8 years ago
Stephen Burgess	095c99fb53	feat(count): Just yml count syntax to provide different rule for 1 (#2685) ... Update all translation forms that use this "counter" element.	8 years ago
Ira	2e07e3acf3	i18n: Hebrew string updates (#3037)	8 years ago
Bastien	d08ead739a	Small FR localisation enhancements (#3033) ... * Small localisation enhancement. Be consistent regarding "e-mail" vs "courriel": I suggest using "courriel" to refer to the electronic message and "e-mail" when used in "adresse e-mail". This reflects the usage I generally observe, but I may be wrong. * Localisation enhancements. Omit some commas: "..., ..., ou ..." should be "..., ... ou ..." since "ou" already articulates the sentence. Also replace "demande" by "requête" when it makes sense.	8 years ago
Eugen Rochko	777f28e06b	Fix locales again (#3010) ... * Normalize locales * Restore "mention" locale key	8 years ago
ButterflyOfFire	7690e877fe	Update doorkeeper.ar.yml (#3006) ... * Update doorkeeper.ar.yml - Remodelling doorkeeper.ar.yml and adding missing strings from english version to arabic version. - Translating max strings - Reviewing some translations - Other strings to be translated later (complicated somehow) * Update doorkeeper.ar.yml Updating translations from lines : 88 to 91	8 years ago
Koala Yeung	f448606096	Update Norwegian translations (#2937) ... * Update Norwegian translations * Updated no.json * Updated activerecord.no.yml * Updated no.yml * Updated simple_form.no.yml * i18n: fix Unicode character error in no.yml * Javascript escaping code "\uD83D\uDC18" should be "\U0001f418" in Ruby / yml * i18n: remove unused keys in Norwegian translation * Remove unused keys in no.yml and activerecord.no.yml by running: `bundle exec i18n-tasks remove-unused no` * Add missing keys in activerecord.no.yml and no.yml by running: `bundle exec i18n-tasks add-missing no` * i18n: escape the key 'no' in activerecord.no.yml	8 years ago
jeroenpraat	02ca71c7bf	Updating and extending Dutch strings (#2930) ... * Update nl * Update nl * Update nl * Create confirmation_instructions.nl.html.erb * Create confirmation_instructions.nl.text.erb * Create password_change.nl.html.erb * Create password_change.nl.text.erb * Create reset_password_instructions.nl.html.erb * Create reset_password_instructions.nl.text.erb	8 years ago
ButterflyOfFire	df87636834	Update simple_form.ar.yml (#2908) ... * Update simple_form.ar.yml Added missing strings that were introduced to simple_form.ar.yml and completing translation. * Create confirmation_instructions.ar.html.erb * Create confirmation_instructions.ar.text.erb * Create password_change.ar.html.erb * Create password_change.ar.text.erb * Create reset_password_instructions.ar.text.erb * Create reset_password_instructions.ar.html.erb	8 years ago
Koala Yeung	3f61d4e01c	Add Thai langauge (#2903) ... * Updated Thai language * locale: remove unused translation in Thai * locale: add Thai to settings menu and application * locale: fix activerecord.th.yml format	8 years ago
Eugen Rochko	9fb4654be5	Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896)	8 years ago
ster	4e4fb24662	Update Ukrainian, Russian translations (#2893) ... * Update Ukrainian translation (rebased off Russian translation) * Update Ukrainian, Russian translations	8 years ago
Özcan Zafer AYAN	93690f66f6	Add Turkish yml file (#2878) ... * Add Turkish yml file * Add translation files for Turkish * Deleted click_to_edit key and val Deleted click_to_edit: Düzenlemek için ilgili ayara tıklayınız line	8 years ago
Ira	5649d15a71	i18n: Update Hebrew interface translation. (#2880) ... * 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...	8 years ago
Koala Yeung	c9a83b57fc	Fix unused key issue in zh-HK (#2870) ... * locale: remove unused keys in zh-HK * locale: update json translations * handled the untranslated strings. * removed unused keys.	8 years ago
m4sk1n	f0ea743fdb	i18n: corrected Polish translation (#2841)	8 years ago
Koala Yeung	79d3ce1408	Update Locale zh-HK (#2818) ... * locale: Add missing translation in zh-HK.yml * locale: fix consistancy in zh-HK.yml translation * locale: Improve zh-HK yml translations * Use "PuSH" in all "PubSubHubBub" occurances. * Simplify text on front page. * Improve doorkeeper authorization table translations. * Simplify setting form text for better layout. * Improve "Business Email" translation. * locale: Update zh-HK.json * Fix untranslated text. * Improve translations.	8 years ago
Milan*	5c68c8cedd	Correct typo in german locale (#2805)	8 years ago
Masoud Abkenar	1bced91edb	Persian translation update (#2788) ... * Persian translation update * fix newline typo	8 years ago
Matt Jankowski	232b822d86	Replace best_in_place editor on admin settings page (#2789) ... * 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	8 years ago
Eduardo Elias	8afb756f6f	Language: update pt-BR (#2775)	8 years ago
alpaca-tc	62738bf1a9	Localize 'throttled' (#2755)	8 years ago
Quent-in	5cb8f0c0b2	Update of simple_forum_oc (#2745) ... * Update of simple_forum_oc * Update simple_form.oc.yml	8 years ago
ヨイツの賢狼ホロ | 3rd style	e57cd022a1	i18n: Update zh-CN [ Chinese (China) ] translations. (#2699) ... * 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	8 years ago
jirayudech	4bf8410aad	Add Thai Language (#2598) ... * 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	8 years ago
m4sk1n	6eaaa3bec5	i18n: updated Polish translation (#2729) ... * 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>	8 years ago
Masafumi Otsune	274fe58b3e	Update simple_form.ja.yml (#2746) ... "サーバー" in Japanese is "Server", so I modified it to instance according to English.	8 years ago
Yamagishi Kazutoshi	19346e7992	Add Japanese translation for allowed languages (#2738) ... * Add Japanese translation for allowed languages * Remove duplicate expression words	8 years ago
m4sk1n	c3ceaf837f	i18n: updated Polish translation (#2727) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	8 years ago
Kaylee	fae1ed48e3	Add option to disable two factor auth in admin accounts panel. (#2584) ... * 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!	8 years ago
Quent-in	2d05f32766	Creation of activerecord for OC (#2721) ... * Creation of activerecord for OC * Update activerecord.oc.yml	8 years ago
m4sk1n	0644a97ee0	i18n: Updated Polish translation (#2686) ... #807	8 years ago
Eduardo Elias	f3cb4b2fcc	Language: update pt-BR (#2687)	8 years ago
Ira	534eb92c2f	Add Hebrew interface translation. (#2573) ... * 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...	8 years ago
Drew Gates	94229ad27b	grammar fixes (#2695) ... “such as” should be used instead of “like” under imports->preface. Reworded imports->preface and recovery_instructions for better flow.	8 years ago
Giuseppe Pignataro	5f7801fb93	Italian translation (#2654) ... * 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	8 years ago
Matt Jankowski	c44ef23e50	Filter on allowed user language preferences (#2361) ... * 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	8 years ago
Alvina Putri	89ba2f0cbf	Updating Indonesian locale (#2644) ... * 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	8 years ago
Audun Larsen	fe42d21a24	Norwegian locale: Translates missing 2FA strings (#2655) ... * 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/	8 years ago
ButterflyOfFire	1e81faeb45	Update ar.jsx (#2647) ... * Update ar.jsx Updating some (ar) translation. * Update ar.yml Pushing some missing translation strings on ar.yml	8 years ago
Ratmir Karabut	2a16eaf19b	Update Russian translation (pluralizations) (#2565) ... * 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)	8 years ago