190 Commits (41c697fd8190ffef517404b4a4fdef805517166d)

Author	SHA1	Message	Date
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