about summary refs log tree commit diff
path: root/config/locales
AgeCommit message (Collapse)Author
2017-04-15Polish translation (needs more love though) (#807)rysiekpl
* 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
2017-04-14Add missing Japanese translations (#1785)Kazuhiro NISHIYAMA
2017-04-14Fix Japanese translation for remote_follow (#1771)Takayuki KUSANO
Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.
2017-04-13Fix italian translationEugen Rochko
2017-04-13Merge branch 'master' of git://github.com/matteoaquila/mastodon into ↵Eugen Rochko
matteoaquila-master
2017-04-13Update devise.it.ymlMatteo Aquila
2017-04-13Update devise.it.ymlMatteo Aquila
2017-04-13Make boost modal off by default (#1719)Eugen
2017-04-13Use english in reported by translation (#1713)Matt Jankowski
2017-04-13Fr missing strings (#1708)spf
* Fix missing translation for username already taken * fr - note too long translation
2017-04-13Translate admin (#1702)Thomas Citharel
* 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
2017-04-13Apply `i18n-tasks normalize` to locales (#1696)Eugen
2017-04-13Add Dutch translation (nl) (#1682)Koala Yeung
* 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
2017-04-13Rename simple_form.it.yml to config/locales/simple_form.it.ymlMatteo Aquila
2017-04-13Rename devise.it.yml to config/locales/devise.it.ymlMatteo Aquila
2017-04-13Rename doorkeeper.it.yml to config/locales/doorkeeper.it.ymlMatteo Aquila
2017-04-13Rename it.yml to config/locales/it.ymlMatteo Aquila
2017-04-13[l10n] ja: update missing Japanese translations (#1684)Musee U
2017-04-13Adds Croatian language [Hrvatski] (#1000)May Kittens Devour Your Soul
* Create simple.form.hr.yml * Create hr.yml * Update hr.yml * Update hr.yml * Create doorkeeper.hr.yml * Create devise.hr.yml
2017-04-13Update Japanese translation files (#1640)新都心(Neet Shin)
* [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
2017-04-13Update Russian translation (#1570)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
2017-04-13Fix #624 - Add localization for Bulgarian (#645)Svetlozar Todorov
* 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
2017-04-13Adjustments to the Norwegian translation (#1648)Thor Harald Johansen
* Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation.
2017-04-12[l10n] ja: Improve Japanese Translations (#1631)lindwurm
* ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-12fix Japanese translation (#1623)pinfort
* 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 568d5cccfa0b6620ccb6c9db8346c52c0396d99f. 間違ってtranslateブランチにコミットしたため取り消し * Revert "freeの訳修正" This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf. * revertでミスったので戻す * Revert "ミスったので戻す" This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116. * 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 * 文字化け修正
2017-04-12Fix incorrect notation in simple_form.ja.yml (#1620)Manato Kameya
2017-04-12Update fr.yml (#1600)CgX
Mistake on %{link} variable
2017-04-12Allow import/export of mutes list (#1541)Matt Jankowski
* Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code
2017-04-12Added missing Spanish translations strings (#1292)Carlos A. Escobar
* Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings
2017-04-12Make Reporting admin section translatable (#1549)Thomas Citharel
* 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>
2017-04-12Working translation for Norwegian. (#1611)Thor Harald Johansen
2017-04-12Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)Koala Yeung
* 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.
2017-04-11Update french locale (#1525)Thomas Citharel
* 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>
2017-04-11Add Japanese translation (#1552)pinfort
* 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
2017-04-11Revised finnish translation (#1537)jukper
2017-04-11Update language files (#1516)Jantso Porali
* 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
2017-04-11Merge branch 'master' of https://github.com/blackle/mastodon into blackle-masterEugen Rochko
2017-04-11Allow user to disable the boost confirm dialog in preferencesblackle
2017-04-11Pagination improvements (#1445)Matt Jankowski
* 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
2017-04-10Add Russian translation (ru) (#1023)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency
2017-04-09French translation update (#1271)Olivier Humbert
* 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)
2017-04-09French typo (#1257)spf
* French typo * Datetime french translation
2017-04-08Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)Eugen
* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up
2017-04-08Update french translation (#1148)Thomas Citharel
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>
2017-04-08Fixed two translation errors (#1139)Sebastian Hübner
Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx
2017-04-08Update simple_form.de.yml (#971)Korbinian
2017-04-08Updated about page in Finnish language (#1170)Jantso Porali
* 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
2017-04-08French translation update (#1188)Olivier Humbert
* Update fr.yml one typo fix * Update simple_form.fr.yml one translation consistency
2017-04-07Merge branch 'master' into masterShel R
2017-04-07Use I18n for media attachment validation errorsChad Pytel
These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.