83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
2017-09-28 09:18:35 +02:00
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
e648ef0bfb
Remove web UI warnings about OStatus privacy ( #5102 )
...
* Remove web UI warnings about OStatus privacy
* yarn run manage:translations
2017-09-28 00:26:33 +02:00
3f3de38075
OC update: different emoji picker ( #5046 ) ( #5077 )
2017-09-24 12:17:47 +02:00
6dfeb64326
jsx/zh-*: Fix "pin column" for Chinese ( #5060 )
2017-09-23 22:47:15 +02:00
427beb4177
i18n: Update Polish translation ( #5058 )
2017-09-23 22:14:39 +02:00
846cd4e838
Switch from EmojiOne to Twemoji, different emoji picker ( #5046 )
...
* Switch from EmojiOne to Twemoji, different emoji picker
* Make emoji-mart use a local spritesheet
* Fix emojify test
* yarn manage:translations
2017-09-23 01:41:00 +02:00
c155d843f4
A few updates to the Spanish translation and some typos fixing ( #4997 )
...
* So Spanish. Much changes. Wow.
* Some little fixes
* Updated es.yml, and fixed some ortographical errors
* Some little changes to simple_form.es.yml
* Yeah, so much translations
* Spanish e-mail messages
* Remove unused message
2017-09-19 07:47:48 +09:00
cf14f4945a
Some improvements in the Spanish translation ( #4991 )
2017-09-18 11:52:34 +09:00
7be3131240
So Spanish. Much changes. Wow. ( #4976 )
2017-09-17 18:16:43 +09:00
c8969dca35
Minor Chinese check & jsx addition ( #4973 )
...
* zh-*: transition from "like" back to "fav"
This commit reverts the translation for the yellow-star "fav" button
back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is
deliberately used in zh-TW/HK by using the existing phrase "最爱"
(favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.),
"collect") in some instances.
Fixes #3511 .
* zh-*: apply suggestions for PR #4557
* zh-cn: de-monetize ya account
In Chinese two separate characters, 账 and 帐, can be used to spell the
word for account (账/帐户). However, the one with a 贝 on the left is
evolved from the latter specifically for monetary purposes. Since
people usually can't figure out which one to use, it might be a good
idea to use the original not-so-money one.
* zh-*: complete jsx translation
2017-09-16 18:48:38 +02:00
e77cc032c2
l10n: PT-BR translation updated ( #4953 )
...
* devise.pt-BR.yml now fully translated
* pt-BR.json now fully translated
* pt-BR.yml partially translated; 46 lines left
* pt-BR.yml now fully translated
* simple_form.pt-BR.yml fully translated
* doorkeeper.pt-BR.yml now fully translated
* E-mail instructions on app/views/user_mailer added and fully translated
* PT-BR translation for #4871
* Deleted an unwanted caracter on pt-BR.yml
* Fixing typos on pt-BR.yml
* Added translation for Pinned toots tab on pt-BR.json
* Added missing translation for navigation_bar.pins
* Fixed spelling on pt-BR.yml
* Update pt-BR.json
2017-09-15 00:02:38 +02:00
bdcc9e2ceb
Add missing Japanese translations ( #4947 )
2017-09-14 18:03:34 +02:00
b39d512ade
l10n: update Persian translation ( #4946 )
2017-09-15 00:13:38 +09:00
94fba44eec
i18n: Update Polish translation ( #4942 )
...
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Update pl.yml
2017-09-14 21:58:48 +09:00
721460a59b
Another Dutch language update ( #4944 )
...
* Update nl.json
* Update nl.yml
* Update nl.json
2017-09-14 21:52:47 +09:00
45b595cdca
Add Japanese translate for #4911 ( #4943 )
2017-09-14 18:20:04 +09:00
aad3df6afc
l10n update OC/FR video redesign ( #4938 )
...
* l10n update for Redesign video player (#4911 )
* Update videp
* Update
I hope this time format works well.
* One missing string
* Update time format
I'd like the complete name of the month in the Long format and the short one in the short format.
I hope it works now
2017-09-14 16:32:14 +09:00
2bbf987a0a
Redesign video player ( #4911 )
...
* Redesign video player
* Use new video player on static public pages too
* Use media gallery component on static public pages too
* Pause video when hiding it
* Full-screen sizing on WebKit
* Add aria labels to video player buttons
* Display link card on public status page
* Fix fullscreen from modal sizing issue
* Remove contain: strict property to fix fullscreen from columns
2017-09-14 03:39:10 +02:00
331263270b
Updating Dutch translation ( #4927 )
...
* Update doorkeeper.nl.yml
* Update nl.yml
* Update simple_form.nl.yml
* Update nl.json
* Update en.json
* Update en.json
* Update nl.json
2017-09-13 23:12:29 +09:00
c2bee07dbc
l10n: Full PT-BR translation ( #4882 )
...
* devise.pt-BR.yml now fully translated
* pt-BR.json now fully translated
* pt-BR.yml partially translated; 46 lines left
* pt-BR.yml now fully translated
* simple_form.pt-BR.yml fully translated
* doorkeeper.pt-BR.yml now fully translated
* E-mail instructions on app/views/user_mailer added and fully translated
* PT-BR translation for #4871
* Deleted an unwanted caracter on pt-BR.yml
* Fixing typos on pt-BR.yml
* Added translation for Pinned toots tab on pt-BR.json
* Added missing translation for navigation_bar.pins
2017-09-11 08:40:29 +09:00
a345479de2
l10n: update Persian translation ( #4880 )
...
* l10n: update Persian translation
* l10n: fix missing Persian translation
2017-09-11 08:35:27 +09:00
67ad453373
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00
514fc908a3
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
b9f7bc149b
Merge branch 'origin/master' into sync/upstream
...
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
dabc309ca3
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
2017-09-08 13:55:47 +02:00
7c2d84910c
i18n: Update Polish translation ( #4845 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-08 05:51:48 +09:00
b00cc4b9bd
i10n OC / FR update Pinned toots ( #4842 )
...
* Added column.pins
New strings
* Added column.pins
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update password_change.oc.html.erb
* Update password_change.oc.text.erb
* Update reset_password_instructions.oc.html.erb
* Update reset_password_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
2017-09-07 22:07:03 +02:00
85c7c42098
Add Pinned toot column ( #4817 )
...
* Add Pinned_toot_section
* Fix add frozen_string_literal
* Fix delete no need controller and tests
* Fix replace query strings to axios params
* Fix change value to accountId and disabling more button
2017-09-07 09:58:11 +02:00
be75b13d68
i10n update OC and FR files ( #4824 )
...
* Onboarding: corrections
Some missing letters and spaces or better wording
* Embed
Translated as Intégrer in FR / Embarcar in OC
2017-09-07 08:55:03 +09:00
9417c9bb8f
Update fr.json ( #4830 )
...
typo
2017-09-06 22:32:49 +02:00
aec5097d44
i18n: update Persian translation ( #4822 )
2017-09-06 17:31:54 +02:00
d3f46a77c3
Make german translation more gender neutral #4755 ( #4789 )
2017-09-03 15:17:24 +02:00
579c7a88e0
Croatian translation - updated ( #4183 )
...
* Update hr.json
* Update hr.json
2017-09-03 18:10:53 +09:00
8538170c2d
l10n Occitan update for Embed, cancel follow request, ... ( #4788 )
...
* Update: some missing strings
* Updates missing strings
* New string
* Update oc.json
* Update oc.yml
* Update oc.json
2017-09-03 18:08:37 +09:00
5d170587e3
Improve client-side German i18n ( #4785 )
2017-09-02 23:21:48 +02:00
2c3544eedd
i18n: Improve Polish translation ( #4783 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02 20:45:20 +02:00
d3b6746173
Make "unfollow" undo pending outgoing follow request too ( #4781 )
...
* Make "unfollow" undo pending outgoing follow request too
* Add cancel button to web UI when awaiting follow request approval
* Make the hourglass button do the cancelling
2017-09-02 20:44:41 +02:00
5e1e466da0
i18n: Update Polish translation ( #4775 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02 16:25:54 +02:00
ab9f1b6e50
Add japanese translations for embed modal feature. ( #4770 )
2017-09-02 14:48:51 +09:00
9c04fadec9
Finish up embed modal feature ( #4759 )
...
* Add embed button to dropdowns of in-timeline statuses
* yarn run manage:translations
2017-09-01 21:30:13 +02:00
1a0df58878
Update FR locales ( #4714 )
...
* Make the fr locales up-to-date with the last changes (new profile view, applications)
* Use the same wording for toots in fr.yml and fr.json
* Translate the pin related strings
* Translate pin-related locales on the front-end
* Add missing locales in doorkeeper.fr.yml and remove un-used ones
* Change "posts" back to "status" in the /about/more page in fr.yml
* Fix typos for "status" in fr.yml
* fix typo for "status" in fr.json
* Remove duplicate string
* Non-breaking space before punctuation
* 'Better' translation for "unpin"
* Put back 'pouet' where it was already
* Fix
* Fix
2017-09-01 14:09:01 +02:00
f92d991e52
Add japanese translations for Pinned statuses based on pawoo. ( #4717 )
...
Add japanese translations for pin_errors.
2017-08-28 00:03:27 +09:00
1cebfed23e
Added new translations of error messages, block and mute domains and users, privacy disclaimers, etc ( #4700 )
...
* Added new translations of error messages, block and mute domains and users
* Added new translations of error messages, block and mute domains and users
2017-08-26 20:45:35 +09:00
21bb4a6c3b
Fix ar.json ( #4699 )
...
Remove ! from compose_form.publish
2017-08-25 20:02:44 +02:00
04c3fb2189
i18n Updated strings ( #4675 - pinned toot) ( #4695 )
...
* Added string for pinned toots
* Pinned toot #4675 + missing string
Somehow I deleted it "enabled_success"
* update after advice
2017-08-25 23:04:52 +09:00
409051c22c
i18n: Update Polish translation #4675 ( #4692 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-25 17:58:31 +09:00
9caa90025f
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
2017-08-25 01:41:18 +02:00
c5157ef07b
Update Russian translation ( #4685 )
...
* 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
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
* Update Russian translation (sessions)
* Update Russian translation
* Update Russian translation
* Fix merge conflicts (revert)
2017-08-25 07:11:06 +09:00
e4c761f902
l18n update OC new strings ( #4664 ) ( #4680 )
...
* New strings
* Update
Thin non breaking spaces
* Update
Thin non breaking spaces
* Update
Thin non breaking spaces
2017-08-24 16:16:32 +09:00
Ondřej Hruška