0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
a2a189819e
Remove web UI warnings about OStatus privacy ( #5102 )
...
* Remove web UI warnings about OStatus privacy
* yarn run manage:translations
7 years ago
91fa75997a
OC update: different emoji picker ( #5046 ) ( #5077 )
7 years ago
213b828014
jsx/zh-*: Fix "pin column" for Chinese ( #5060 )
7 years ago
6cf48c427b
i18n: Update Polish translation ( #5058 )
7 years ago
16a5d1450c
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
7 years ago
f4d0774877
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
7 years ago
6e94d02de6
Some improvements in the Spanish translation ( #4991 )
7 years ago
dd1dbde112
So Spanish. Much changes. Wow. ( #4976 )
7 years ago
9b85c3a13f
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
7 years ago
584d2d8e02
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
7 years ago
175c2a9df2
Add missing Japanese translations ( #4947 )
7 years ago
d08cf543a3
l10n: update Persian translation ( #4946 )
7 years ago
4d80e3c550
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
7 years ago
8cd10e7df6
Another Dutch language update ( #4944 )
...
* Update nl.json
* Update nl.yml
* Update nl.json
7 years ago
da2b2cfa70
Add Japanese translate for #4911 ( #4943 )
7 years ago
6279f70e60
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
7 years ago
fbec33df62
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
7 years ago
00b28a45b0
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
7 years ago
d639474d8c
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
7 years ago
04183a9675
l10n: update Persian translation ( #4880 )
...
* l10n: update Persian translation
* l10n: fix missing Persian translation
7 years ago
017738c604
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
7 years ago
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
da3f22ee7d
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
7 years ago
df9c7584c9
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
7 years ago
1a4beb3122
i18n: Update Polish translation ( #4845 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
cbe9eb3f2e
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
7 years ago
d766cb0c3c
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
7 years ago
e489378e22
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
7 years ago
efef36447f
Update fr.json ( #4830 )
...
typo
7 years ago
add644eeb0
i18n: update Persian translation ( #4822 )
7 years ago
20c0118cad
Make german translation more gender neutral #4755 ( #4789 )
7 years ago
9b20434874
Croatian translation - updated ( #4183 )
...
* Update hr.json
* Update hr.json
7 years ago
8d459da1f8
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
7 years ago
abf2179b22
Improve client-side German i18n ( #4785 )
7 years ago
e472b79b1e
i18n: Improve Polish translation ( #4783 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
23682c8593
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
7 years ago
139f297c01
i18n: Update Polish translation ( #4775 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
136c347b0b
Add japanese translations for embed modal feature. ( #4770 )
7 years ago
9ed764519b
Finish up embed modal feature ( #4759 )
...
* Add embed button to dropdowns of in-timeline statuses
* yarn run manage:translations
7 years ago
ce91ed1322
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
7 years ago
9b75d0e730
Add japanese translations for Pinned statuses based on pawoo. ( #4717 )
...
Add japanese translations for pin_errors.
7 years ago
dd72c55902
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
7 years ago
e0191a22c0
Fix ar.json ( #4699 )
...
Remove ! from compose_form.publish
7 years ago
9e60ec3c7d
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
7 years ago
8728b1b7c1
i18n: Update Polish translation #4675 ( #4692 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
3e20cb7025
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
7 years ago
4850d6bd1e
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)
7 years ago
62d93b1215
l18n update OC new strings ( #4664 ) ( #4680 )
...
* New strings
* Update
Thin non breaking spaces
* Update
Thin non breaking spaces
* Update
Thin non breaking spaces
7 years ago
Ondřej Hruška
Eugen Rochko
JeanGauthier
Mingye Wang
m4sk1n
BruWalfas
febrezo
Anna e só
Yamagishi Kazutoshi
Masoud Abkenar
Jeroen
Naf
Quent-in
David Yip
voidSatisfaction
Olivier Humbert
Andreas Drop
May Kittens Devour Your Soul
mayaeh
Damien Erambert
Lynx Kotoura
Ratmir Karabut