autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v2.6.0rc1' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2018-10-23 08:32:55 +02:00
parent d42a06fc74 f468bfb830
commit fde9668bae
570 changed files with 11506 additions and 5693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -312,6 +312,10 @@
},
{
"descriptors": [
{
"defaultMessage": "Read more",
"id": "status.read_more"
},
{
"defaultMessage": "Show more",
"id": "status.show_more"
@ -401,6 +405,14 @@
"defaultMessage": "Block",
"id": "confirmations.block.confirm"
},
{
"defaultMessage": "Reply",
"id": "confirmations.reply.confirm"
},
{
"defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
"id": "confirmations.reply.message"
},
{
"defaultMessage": "Are you sure you want to block {name}?",
"id": "confirmations.block.message"
@ -614,6 +626,10 @@
"defaultMessage": "Edit profile",
"id": "account.edit_profile"
},
{
"defaultMessage": "Ownership of this link was checked on {date}",
"id": "account.link_verified_on"
},
{
"defaultMessage": "Follows you",
"id": "account.follows_you"
@ -1060,6 +1076,15 @@
],
"path": "app/javascript/mastodon/features/compose/index.json"
},
{
"descriptors": [
{
"defaultMessage": "Last message:",
"id": "conversation.last_message"
}
],
"path": "app/javascript/mastodon/features/direct_timeline/components/conversation.json"
},
{
"descriptors": [
{
@ -1566,10 +1591,6 @@
"defaultMessage": "Push notifications",
"id": "notifications.column_settings.push"
},
{
"defaultMessage": "This device",
"id": "notifications.column_settings.push_meta"
},
{
"defaultMessage": "New followers:",
"id": "notifications.column_settings.follow"
@ -1805,6 +1826,14 @@
"defaultMessage": "Detailed conversation view",
"id": "status.detailed_status"
},
{
"defaultMessage": "Reply",
"id": "confirmations.reply.confirm"
},
{
"defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
"id": "confirmations.reply.message"
},
{
"defaultMessage": "Are you sure you want to block {name}?",
"id": "confirmations.block.message"
@ -1859,6 +1888,15 @@
],
"path": "app/javascript/mastodon/features/ui/components/bundle_modal_error.json"
},
{
"descriptors": [
{
"defaultMessage": "Toot",
"id": "compose_form.publish"
}
],
"path": "app/javascript/mastodon/features/ui/components/columns_area.json"
},
{
"descriptors": [
{
@ -2146,6 +2184,10 @@
"defaultMessage": "Sensitive content",
"id": "status.sensitive_warning"
},
{
"defaultMessage": "Media hidden",
"id": "status.media_hidden"
},
{
"defaultMessage": "Click to view",
"id": "status.sensitive_toggle"