Setuu
9e620ca16c
Fix Japanese translation of ja.yml ( #1835 )
2017-04-15 13:18:08 +02:00
goofy-bz
a3aa9381c4
Update devise.fr.yml ( #1728 )
...
Very light grammar fix to improve gender-neutral
2017-04-15 02:55:43 +02:00
Shouko Yu
120a37a197
Add translations for zh-TW (Taiwan) ( #1794 )
2017-04-15 02:49:43 +02:00
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
2017-04-15 02:48:30 +02:00
Fjoerfoks
e806d3c3f0
Update nl.yml ( #1764 )
...
Some rewording, typos and switching to infinitve
2017-04-15 02:45:46 +02:00
Olivier Humbert
061922b38c
Update devise.fr.yml ( #1792 )
...
* Update devise.fr.yml
Consistencies across the French translation
* Update doorkeeper.fr.yml
2017-04-15 02:44:10 +02:00
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.
2017-04-15 02:33:37 +02:00
Darío Hereñú
9240ca6cef
Mispelling & minor fixes ( #1814 )
2017-04-15 02:31:16 +02:00
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.
2017-04-15 02:30:55 +02:00
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
2017-04-15 02:22:46 +02:00
Les Orchard
7609593e48
Add REDIS_DB env variable to configure Redis database ( #1366 )
2017-04-15 02:21:13 +02:00
ThibG
a9529d3b4b
Allow running mastodon on a different domain as the one used for identifying users ( #1267 )
...
* Allow running mastodon on a different domain as the one used for identifying users
* Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing
* Compare to web_domain instead of local_domain when dealing with feeds/API
* Correctly identify mentions to local accounts
Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.
2017-04-15 02:15:46 +02:00
Valentin Lorentz
5ab0ffc6c8
Custom Paperclip path. ( #778 )
...
* Custom Paperclip path.
* Document PAPERCLIP_ROOT.
* Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).
2017-04-15 02:07:21 +02:00
Kazuhiro NISHIYAMA
1616cf98a1
Add missing Japanese translations ( #1785 )
2017-04-14 19:10:12 +02:00
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.
2017-04-14 19:09:52 +02:00
Matt Jankowski
8b74aa4217
Admin reports controller improvements ( #1714 )
...
* Simplify admin/reports controller filtering for index
* Rename parameter to resolved
* Fix issue where reports view could not access filter_link_to
* Add coverage for admin/reports controller
* DRY up resolution of related reports for target account
* Clean up admin/reports routes
* Add Report#statuses method
* DRY up current account action taken params
* Rubocop styles
2017-04-14 11:10:28 +02:00
Effy Elden
c019b0acfd
Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. ( #1745 )
2017-04-14 11:02:25 +02:00
Eugen Rochko
c8be05a4a7
Fix italian translation
2017-04-13 22:26:32 +02:00
Eugen Rochko
41c697fd81
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
2017-04-13 22:25:07 +02:00
Eugen
485310a43c
Make browserify respect changes in node_modules for asset compilation ( #1722 )
2017-04-13 22:21:20 +02:00
Matteo Aquila
9aae9ae40c
Update devise.it.yml
2017-04-13 22:09:47 +02:00
Matteo Aquila
1fb125b630
Update devise.it.yml
2017-04-13 22:06:19 +02:00
Eugen
057567d548
Make boost modal off by default ( #1719 )
2017-04-13 21:53:59 +02:00
Yusuke Abe
169c68a739
Add filename extension to paperclip ( #1718 )
2017-04-13 21:52:56 +02:00
Matt Jankowski
9f182346d7
Use english in reported by translation ( #1713 )
2017-04-13 21:49:46 +02:00
spf
a58c935c3d
Fr missing strings ( #1708 )
...
* Fix missing translation for username already taken
* fr - note too long translation
2017-04-13 21:49:34 +02:00
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
2017-04-13 21:49:07 +02:00
James Moore
d9dc0fe84e
smtp delivery type fix ( #1556 )
...
* delivery fix
# Conflicts:
# config/environments/production.rb
* added stub in .env file
* reordered and added a comment
2017-04-13 19:51:49 +02:00
Eugen
9e5c1c487e
Apply `i18n-tasks normalize` to locales ( #1696 )
2017-04-13 19:18:32 +02:00
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
2017-04-13 16:02:23 +02:00
Matteo Aquila
0220f3a171
Update application.rb
2017-04-13 15:33:45 +02:00
Matteo Aquila
3f42ad7d1a
Rename simple_form.it.yml to config/locales/simple_form.it.yml
2017-04-13 15:28:30 +02:00
Matteo Aquila
f7c466c8d8
Rename devise.it.yml to config/locales/devise.it.yml
2017-04-13 15:28:15 +02:00
Matteo Aquila
245b9cb4ba
Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml
2017-04-13 15:27:56 +02:00
Matteo Aquila
9275f92972
Rename it.yml to config/locales/it.yml
2017-04-13 15:27:37 +02:00
Musee U
467d32fce3
[l10n] ja: update missing Japanese translations ( #1684 )
2017-04-13 13:40:58 +02:00
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
2017-04-13 13:38:44 +02:00
新都心(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
2017-04-13 13:23:45 +02:00
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
2017-04-13 13:23:23 +02:00
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
2017-04-13 13:16:28 +02:00
Matt Jankowski
137100dcf3
Clean up well-known routes/controllers ( #1649 )
...
* Add request spec for host meta route returning xml
* Add routing spec for xrd routes
* Update well-known routes
* Move webfinger and host-meta actions to their own controllers
2017-04-13 13:09:07 +02:00
Matt Jankowski
3a9eb81a80
Admin accounts controller cleanup ( #1664 )
...
* Remove unused account_params method in admin/accounts controller
* Introduce AccountFilter to find accounts
* Use AccountFilter in admin/accounts controller
* Use more restful routes admin silence and suspension area
* Add admin/silences and admin/suspensions controllers
2017-04-13 13:04:23 +02:00
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.
2017-04-13 02:17:26 +02:00
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>
2017-04-12 20:41:50 +02:00
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 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-12 20:19:38 +02:00
Manato Kameya
bf3e56b8ad
Fix incorrect notation in simple_form.ja.yml ( #1620 )
2017-04-12 20:19:27 +02:00
CgX
e32edd247f
Update fr.yml ( #1600 )
...
Mistake on %{link} variable
2017-04-12 19:56:09 +02:00
Matt Jankowski
c44a700252
Quick best practice cleanup of views/helpers ( #1546 )
...
* Remove trailing whitespace
* Use query methods instead of explicit .blank? checks
2017-04-12 18:24:18 +02:00
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
2017-04-12 18:20:44 +02:00
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
2017-04-12 17:16:40 +02:00