mastodon

Commit Graph

Author	SHA1	Message	Date
Patrick Figel	df4ff9a8e1	Add recovery code support for two-factor auth (#1773 ) * Add recovery code support for two-factor auth When users enable two-factor auth, the app now generates ten single-use recovery codes. Users are encouraged to print the codes and store them in a safe place. The two-factor prompt during login now accepts both OTP codes and recovery codes. The two-factor settings UI allows users to regenerated lost recovery codes. Users who have set up two-factor auth prior to this feature being added can use it to generate recovery codes for the first time. Fixes #563 and fixes #987 * Set OTP_SECRET in test enviroment * add missing .html to view file names	8 years ago
luigi	67ad84b7eb	Add some missing Spanish translations (#1818 ) * Add missing spanish translations on user settings simple_form.es.yml * Fix typo: Aute/ción. should be Autenticación	8 years ago
Setuu	9e620ca16c	Fix Japanese translation of ja.yml (#1835 )	8 years ago
goofy-bz	a3aa9381c4	Update devise.fr.yml (#1728 ) Very light grammar fix to improve gender-neutral	8 years ago
Shouko Yu	120a37a197	Add translations for zh-TW (Taiwan) (#1794 )	8 years ago
Koala Yeung	ec9999cdfe	Update Traditional Chinese, HK (zh-HK) translation (#1759 ) * Fix missing string in javascript locale (zh-HK) * Change javascript locale (zh-HK) * Fix some other strings that were still English. * Improve `search.status_by`. * Fix `notification.follow`. ("開始開始你") * Changes according to user feedback. * "Back": "較前顯示" -> "返回" * "Home": "家" -> "主頁" * Update ruby locale (zh-HK) * Fix missing translation * Normalize yml * Update translation strings	8 years ago
Fjoerfoks	e806d3c3f0	Update nl.yml (#1764 ) Some rewording, typos and switching to infinitve	8 years ago
Olivier Humbert	061922b38c	Update devise.fr.yml (#1792 ) * Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml	8 years ago
Thor Harald Johansen	4bebeb27d3	More Norwegian translations (#1805 ) * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation. * Yet more improvements to the Norwegian translation. * More Norwegian translations. Better terminology.	8 years ago
Darío Hereñú	9240ca6cef	Mispelling & minor fixes (#1814 )	8 years ago
Matt Jankowski	619817d29e	Remove unused will_paginate.page_gap key from i18n (#1815 ) This value was changed recently, and every locale which had it set was using the same value as the default. This value is still the default in the new location.	8 years ago
rysiekpl	ade004b5ee	Polish translation (needs more love though) (#807 ) * Polish translation (needs more love though) * Polish translation bugfix * bugfix for new colon-containing texts * another bugfix. yaml is evil * minor fix * fixing issues pointed out by reviewers * Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer * Etyczny dizajn zbyt sarkastyczny, to będą założenia	8 years ago
Kazuhiro NISHIYAMA	1616cf98a1	Add missing Japanese translations (#1785 )	8 years ago
Takayuki KUSANO	5aae6384ff	Fix Japanese translation for remote_follow (#1771 ) Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.	8 years ago
Eugen Rochko	c8be05a4a7	Fix italian translation	8 years ago
Eugen Rochko	41c697fd81	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	8 years ago
Matteo Aquila	9aae9ae40c	Update devise.it.yml	8 years ago
Matteo Aquila	1fb125b630	Update devise.it.yml	8 years ago
Eugen	057567d548	Make boost modal off by default (#1719 )	8 years ago
Matt Jankowski	9f182346d7	Use english in reported by translation (#1713 )	8 years ago
spf	a58c935c3d	Fr missing strings (#1708 ) * Fix missing translation for username already taken * fr - note too long translation	8 years ago
Thomas Citharel	c0c56db0fa	Translate admin (#1702 ) * Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n	8 years ago
Eugen	9e5c1c487e	Apply `i18n-tasks normalize` to locales (#1696 )	8 years ago
Koala Yeung	1206627c59	Add Dutch translation (nl) (#1682 ) * Dutch language files for Ruby code * Created RoR translation ymls: * config/locales/devise.nl.yml * config/locales/doorkeeper.nl.yml * config/locales/nl.yml * config/locales/simple_form.nl.yml * Modified RoR config and helper * app/helpers/settings_helper.rb * config/application.rb * Dutch language javascript locale * Created javascript locale files: * app/assets/javascripts/components/locales/index.jsx * app/assets/javascripts/components/locales/nl.jsx * Reference the newly created locale files: * app/assets/javascripts/components/containers/mastodon.jsx * Fix syntax error in locale file (nl) * Fix missing translate in js locale (nl) * Convert all ruby Dutch locale (nl) file to utf8 Fix yml conversion issues. * Fix duplicated key in devise.nl.yml * Fix indentation error in doorkeeper.nl.yml	8 years ago
Matteo Aquila	3f42ad7d1a	Rename simple_form.it.yml to config/locales/simple_form.it.yml	8 years ago
Matteo Aquila	f7c466c8d8	Rename devise.it.yml to config/locales/devise.it.yml	8 years ago
Matteo Aquila	245b9cb4ba	Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml	8 years ago
Matteo Aquila	9275f92972	Rename it.yml to config/locales/it.yml	8 years ago
Musee U	467d32fce3	[l10n] ja: update missing Japanese translations (#1684 )	8 years ago
May Kittens Devour Your Soul	90d0018fd5	Adds Croatian language [Hrvatski] (#1000 ) * Create simple.form.hr.yml * Create hr.yml * Update hr.yml * Update hr.yml * Create doorkeeper.hr.yml * Create devise.hr.yml	8 years ago
新都心(Neet Shin)	0e4479bb3a	Update Japanese translation files (#1640 ) * [l10n] ja: Improve Japanese Translations * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com> * Update ja.jsx * Update doorkeeper.ja.yml * Update ja.yml * Update ja.jsx * Update ja.jsx	8 years ago
Ratmir Karabut	af7e880df5	Update Russian translation (#1570 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error	8 years ago
Svetlozar Todorov	aa7bf1515c	Fix #624 - Add localization for Bulgarian (#645 ) * Add translation files and declarations for Bulgarian * Add a bunch of translations to bg.jsx * Add rest of translations to bg.jsx * Add devise translations * Fix devise translations	8 years ago
Thor Harald Johansen	ccaf3dbc5a	Adjustments to the Norwegian translation (#1648 ) * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation.	8 years ago
lindwurm	9966bd27c2	[l10n] ja: Improve Japanese Translations (#1631 ) * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com>	8 years ago
pinfort	38e24a699b	fix Japanese translation (#1623 ) * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx * fix translations 翻訳の誤りの修正と改善 * freeの訳修正 * いいねをお気に入りに統一 * Revert "いいねをお気に入りに統一" This reverts commit `568d5cccfa`. 間違ってtranslateブランチにコミットしたため取り消し * Revert "freeの訳修正" This reverts commit `565658a605`. * revertでミスったので戻す * Revert "ミスったので戻す" This reverts commit `00be7a748a`, reversing changes made to `b4e1e06503`. * freeの訳修正 * いいねをお気に入りに統一 * 一回戻す * 戻しきれてなかった * 再度変更 * 戻す * 再度変更 * 再度変更 * Update doorkeeper.ja.yml Fixed a lot of unnatural translations * Update ja.yml 資格情報 isn't easy to understanding. so fixed to ログイン情報. * Update ja.yml fixed some unnatural translations * Update simple_form.ja.yml Fixed wrong translate 「アカウント」 to 「アイコン画像」 * Update simple_form.ja.yml * Update doorkeeper.ja.yml * Revert "多くの不自然な翻訳を解消しました。" * Update ja.jsx fixed typo * 文字化け修正	8 years ago
Manato Kameya	bf3e56b8ad	Fix incorrect notation in simple_form.ja.yml (#1620 )	8 years ago
CgX	e32edd247f	Update fr.yml (#1600 ) Mistake on %{link} variable	8 years ago
Matt Jankowski	7f0a865b05	Allow import/export of mutes list (#1541 ) * Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code	8 years ago
Carlos A. Escobar	3064ef96a1	Added missing Spanish translations strings (#1292 ) * Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings	8 years ago
Thomas Citharel	d90d23699c	Make Reporting admin section translatable (#1549 ) * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
Thor Harald Johansen	1f5ff46fd9	Working translation for Norwegian. (#1611 )	8 years ago
Koala Yeung	24eb45425e	Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544 ) * Added Chinese Traditional Hong Kong (zh-HK) for Ruby * Added translations for Ruby. * Added Chinese Traditional Hong Kong (zh-HK) for JS * Added translations for javascript code. * Rearrange language references in mastodon.jsx * Break `addLocaleData` into multiple lines. Make future commit more readable. * Roughly re-sort the languages in alphabetical orders (only manually put English on top because it is default). * Sort application.rb locale with alphabetical order With exception that English (default language) goes first. Improve code readability. * Resort language selection box alphabetically Sort HUMAN_LOCALES in the alphabetical order of display name (except English, the default language, come first). Improve usability.	8 years ago
Thomas Citharel	327a6e166f	Update french locale (#1525 ) * Update devise.fr.yml fixing minor typos * add missing strings * Fix a translation and add translation for devise part Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
pinfort	6f5268b02d	Add Japanese translation (#1552 ) * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx	8 years ago
jukper	4964433190	Revised finnish translation (#1537 )	8 years ago
Jantso Porali	9e3c4fd2d7	Update language files (#1516 ) * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation * fix for Amazon S3/Minio instance setups If you were using S3 or Minio for your files, this will fix the Import issue :) * update translation according to issue #1515 See issue #1515 * update translation for issue #1515 see issue #1515	8 years ago
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	8 years ago
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	8 years ago
Matt Jankowski	4ada50985a	Pagination improvements (#1445 ) * Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views	8 years ago
Ratmir Karabut	9043b32183	Add Russian translation (ru) (#1023 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency	8 years ago
Olivier Humbert	082bef3027	French translation update (#1271 ) * Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)	8 years ago
spf	e6b48a7048	French typo (#1257 ) * French typo * Datetime french translation	8 years ago
Eugen	9acdb166e8	Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled (#1278 ) * Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up	8 years ago
Thomas Citharel	41f8fde83e	Update french translation (#1148 ) Add french translation for emails sent Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add non-breaking spaces Signed-off-by: Thomas Citharel <tcit@tcit.fr> changes and fixes to the nbsps Signed-off-by: Thomas Citharel <tcit@tcit.fr> French update a few fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr> fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
Sebastian Hübner	f860eb7d71	Fixed two translation errors (#1139 ) Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx	8 years ago
Korbinian	8f9a11b642	Update simple_form.de.yml (#971 )	8 years ago
Jantso Porali	01d8003867	Updated about page in Finnish language (#1170 ) * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation	8 years ago
Olivier Humbert	ed3dfd0bee	French translation update (#1188 ) * Update fr.yml one typo fix * Update simple_form.fr.yml one translation consistency	8 years ago
Shel R	fef478781d	Merge branch 'master' into master	8 years ago
Chad Pytel	ad5ddd5e95	Use I18n for media attachment validation errors These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.	8 years ago
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954 )	8 years ago
André Lewin	bf7cefa516	Merge branch 'master' into master	8 years ago
Jantso Porali	837030db98	updated blocking translation	8 years ago
Jantso Porali	deb001bba8	updated two-way auth and preferences translation	8 years ago
Jantso Porali	d3bf0307db	updated translation for about page	8 years ago
JantsoP	20b53e6add	Merge branch 'master' into master	8 years ago
JantsoP	3ec221d3b7	updated reblog to boost translation Since it is that :D	8 years ago
JantsoP	473e4f7813	udpdated display_name translation	8 years ago
JantsoP	b845ef395d	updated reblog translation	8 years ago
Eugen Rochko	667ffafef8	Fix spec	8 years ago
Eugen	086a88f3bb	Merge pull request #863 from Eychics/master Add closed_registrations message on French language	8 years ago
Eugen	e76dd52b08	Merge pull request #818 from JantsoP/master Updated Finnish Translation	8 years ago
Eugen	c12214963e	Merge pull request #866 from kklleemm/patch-1 Fix typos on french translations	8 years ago
Eugen	aa8dacbc8a	Merge pull request #792 from chapeaumeinfreund/master Updated and fixed german orthography	8 years ago
Eugen	ce524cbb49	Merge pull request #790 from chapeaumeinfreund/patch-1 Updated and fixed german orthography	8 years ago
Eugen	57466d542b	Merge pull request #805 from nevillepark/master Changed "reblogs" to "boosts"	8 years ago
Clément D	350958babf	Fix typos on french translations	8 years ago
Thibaut (Eychics)	9a5d6e9715	Add closed_registrations message on French language	8 years ago
Eugen Rochko	5f54981846	New admin setting: open/close registrations, with custom message, from the admin UI	8 years ago
JantsoP	db4a41cf58	Merge branch 'master' into master	8 years ago
JantsoP	dc89fc17cc	updated translation	8 years ago
Neville Park	ce1ca28594	Changed "reblogs" to "boosts"	8 years ago
axolotl	0700521ef3	added Esperanto (eo)	8 years ago
Eugen Rochko	98a93aa07e	Fix norwegian translation being malformed	8 years ago
Korbinian	ec8029a955	Updated and fixed orthography	8 years ago
Korbinian	7dd5ba42a3	Updated and fixed german orthography	8 years ago
Eugen Rochko	b7c1b12367	Make default admin UI page reports. Add admin UI for creating a domain block	8 years ago
Christopher Kolstad	5cb011b66b	Add Norwegian locale	8 years ago
JantsoP	65d667dc6c	another typo. fuck me	8 years ago
JantsoP	d3fde60297	fixed an sneaky peaky tpy	8 years ago
JantsoP	85a8b62ca2	add finnish translation add finnish translation	8 years ago
JantsoP	97803600ed	add finnish translation add finnish translation	8 years ago
JantsoP	bfa99981e5	Merge branch 'master' into master	8 years ago
JantsoP	b0f4c9b91f	finnish translation finnish translation	8 years ago
JantsoP	f9b4f30de6	updated final translation updated final translation	8 years ago
JantsoP	87854745e9	Create new translation file Still in progress. Should be done shortly	8 years ago
Angristan	c97fc5c1f4	Improve french translation	8 years ago
Valentin Lorentz	fbcba65f81	Improve French translation Fix typos and typography. Make vocabulary and grammar more uniform.	8 years ago
Damien Erambert	71cf9d0608	Fix typo in simple_form.fr.yml	8 years ago

1 2 3 4 5 ...

255 Commits (501514960a9de238e23cd607d2e8f4c1ff9f16c1)