beatrix-bitrot
cdcb74ffb6
Merge remote-tracking branch 'upstream/master'
2017-06-27 20:46:13 +00:00
m4sk1n
f01327d859
i18n: Turn report screen into a modal (pl) ( #3974 )
2017-06-27 22:14:31 +02:00
Eugen Rochko
0d316bcfd2
Turn report screen into a modal ( #3965 )
2017-06-27 18:07:21 +02:00
Alda Marteau-Hardi
103f87f9ae
Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )
2017-06-26 13:04:36 +02:00
Shel Raphen
97f99bca98
Glitchsocification
2017-06-25 19:21:51 +00:00
kibigo!
cf1a103ee7
OKAY THIS WORKS THIS WORKS
2017-06-24 20:04:46 -07:00
kibigo!
744917179b
Collapsable toots [1/??] ☕ ️
2017-06-23 21:50:45 +00:00
Charlotte Fields
a7a7613e71
cybre cleanup
2017-06-23 21:45:14 +00:00
Chronister
2edadd7fe7
All cybrespace changes through 5/28
2017-06-23 21:45:14 +00:00
Eugen Rochko
9ba171309b
Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org ( #3725 )
2017-06-13 03:55:28 +02:00
m4sk1n
5b0518ada5
i18n: minor fix in Polish translation ( #3726 )
...
* i18n: minor fix in Polish translation
* i18n
2017-06-12 23:55:32 +02:00
Ratmir Karabut
a7426cd173
Update Russian translation (pin) ( #3712 )
...
* Update Russian translation (pin)
2017-06-12 12:53:20 +02:00
Yamagishi Kazutoshi
ef29596d2d
Regenerate defaultMessages.json ( #3709 )
...
follow up #3564
2017-06-12 12:41:19 +02:00
Yamagishi Kazutoshi
5f19b8e900
Re-add clear notifications button ( #3708 )
...
* Re-add clear notifications button
* remove connect() in column_settings
* one line
* remove unused props
2017-06-12 12:26:23 +02:00
Jeroen
8309f094df
Update NL for 1.4.2 ( #3685 )
2017-06-10 17:26:01 +02:00
m4sk1n
8ceff751e2
i18n: Minor fixes in Polish translation ( #3674 )
...
* i18n
* i18n
* i18n
* i18n
* i18n
2017-06-09 23:08:09 +02:00
Yamagishi Kazutoshi
270213c858
Small changes to japanese translation ( #3620 )
2017-06-07 10:15:35 +02:00
ふぁぼ原
f6fddd95d4
Add regex filters on the community timeline and the public timeline. ( #3564 )
...
* Add regex filter on the community timeline and the public timeline
* correcting
* Adjust the height of header buttons
* Remove trailing spaces
* Remove trailing spaces
* Solve some code duplication
* reset the state of the locale files in app/javascript/mastodon/locales
* adjust to upstream
* adjust to upstream
* change keys of locale settings
2017-06-06 16:56:10 +02:00
May Kittens Devour Your Soul
32f3af68c0
Update hr.json ( #3609 )
2017-06-06 13:19:05 +02:00
Yamagishi Kazutoshi
615c580665
Add quotes ESLint rules ( #3602 )
...
* Add quotes ESLint rule
* Add jsx-quotes ESlint rule
* Sort ESLint rules
2017-06-06 03:56:36 +02:00
Shunsuke Michii
faf082cb8f
Add th.json. ( #3588 )
2017-06-05 17:02:41 +02:00
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
2017-06-05 01:31:10 +02:00
m4sk1n
b6063a5e90
i18n: Updated Polish translation ( #3555 )
2017-06-04 15:18:42 +02:00
lindwurm
fdb376a293
l10n: ja: Change about/more link text ( #3539 )
...
ref: #3538 ("Extended information" -> "About this instance") and #3519
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-06-04 15:00:15 +02:00
Yamagishi Kazutoshi
ff642a096a
Add Japanese translations (pin) ( #3551 )
...
* Add Japanese translations (pin)
* "ピン留め" is more general
2017-06-04 14:51:35 +02:00
Mingye Wang
2d981b4f86
en.json: change about/more link text to "About this instance" ( #3538 )
...
This change follows #3519 , which does the same for the Chinese variants. Or should it be simply "About"?
2017-06-04 04:25:18 +02:00
Mingye Wang
e7479e996a
zh-cn&tw.json: "extended info" -> "about this site" ( #3519 )
...
* zh-cn.json: "additional info" -> "more info"
This commit changes the "extended info" (about/more) text to something that translates to "more info", as "additional info" in zh can sound like appending things to the (ugh) navbar, I guess.
Or should I just change it to "about this site" (关于本站)?
* zh-cn.json: navbar.info -> "about this site"
* zh-臺灣.json: navbar.info -> "about this site"
2017-06-03 14:42:47 +02:00
caasi Huang
741d7a71fc
Update zh-TW.json ( #3480 )
...
* Update zh-TW.json
* Update `search_results.total`
2017-05-31 18:46:57 +02:00
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
2017-05-31 02:14:52 +02:00
Yamagishi Kazutoshi
f99cd7d9f4
Add zh-TW.json ( #3459 )
2017-05-30 23:09:02 +02:00
lindwurm
a51e331cf0
l10n: Fix Japanese translation ( #3410 )
...
* "メデイア" -> "メディア"
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-05-29 17:52:02 +02:00
ster
63a8bc1a24
Ukrainian translation: fix typo ( #3393 )
2017-05-28 19:11:29 +02:00
Masoud Abkenar
c463765f31
Persian translation fixes and updates ( #3380 )
...
* Persian translation fix
* Persian translation of new strings
2017-05-28 16:25:45 +02:00
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
2017-05-27 16:28:32 +02:00
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
2017-05-27 15:50:40 +02:00
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
2017-05-26 19:59:46 +02:00
Audun Larsen
c0491db444
Norwegian translation of the onboarding page ( #3303 )
...
* Fixes translation placeholder
* Translates onboarding page
2017-05-25 14:06:10 +02:00
Audun Larsen
5c7e4ba765
Updates Norwegian translation ( #3252 )
2017-05-23 13:09:53 +02:00
Ira
f103e5fc65
i18n: Latest Hebew strings translated ( #3250 )
2017-05-23 13:08:16 +02:00
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
2017-05-22 16:03:50 +02:00
Nolan Lawson
2d7aacf747
Only load Intl data for current language ( #3130 )
...
* Only load Intl data for current language
* Extract common chunk only from application.js and public.js
* Generate locale packs, avoid caching on window object
2017-05-22 15:06:06 +02:00
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
2017-05-22 00:20:13 +02:00
ster
0dfe09d630
Update Ukrainian translation ( #3203 )
2017-05-21 18:52:50 +02:00
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
2017-05-21 11:23:59 +02:00
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
2017-05-20 17:50:11 +02:00
Yamagishi Kazutoshi
e4ed0b155c
Improve eslint rules ( #3147 )
...
* Add semi to ESLint rules
* Add padded-blocks to ESLint rules
* Add comma-dangle to ESLint rules
* add config/webpack and storyboard
* add streaming/
* yarn test:lint -- --fix
2017-05-20 17:31:47 +02:00
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
2017-05-20 13:39:03 +02:00
June Sallou
1596329b26
Updating the French translations for the web client ( #3164 )
2017-05-20 13:38:26 +02:00
Eugen Rochko
94b26e90fa
Add account media gallery view to web UI ( #3120 )
...
* Add account media gallery view to web UI
* Link media view from account dropdown
* Adjust link
2017-05-20 01:28:25 +02:00
Eugen Rochko
5695449335
Add buttons to block and unblock domain ( #3127 )
...
* Add buttons to block and unblock domain
* Relationship API now returns "domain_blocking" status for accounts,
rename "block entire domain" to "hide entire domain", fix unblocking domain,
do not block notifications from domain-blocked-but-followed people, do
not send Salmons to domain blocked users
* Add test
* Personal domain blocks shouldn't affect Salmon after all, since in this
direction of communication the control is very thin when it comes to
public stuff. Best stay consistent and not affect federation in this way
* Ignore followers and follow request from domain blocked folks,
ensure account domain blocks are not created for empty domain,
and avoid duplicates in validation
* Purge followers when blocking domain (without soft-blocks, since they
are useless here)
* Add tests, fix local timeline being empty when having any domain blocks
2017-05-19 21:05:32 +02:00
