tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
This commit is contained in:
Thibaut Girka
2020-03-08 19:38:53 +01:00
parent 13ef4d5fb0 764b89939f
commit c790ecb14d
138 changed files with 573 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/locales/bg.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Зареждане...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/br.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

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

@ -142,7 +142,7 @@
{
"descriptors": [
{
"defaultMessage": "Unhide {domain}",
"defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
}
],
@ -217,7 +217,7 @@
{
"descriptors": [
{
"defaultMessage": "Toggle visibility",
"defaultMessage": "Hide media",
"id": "media_gallery.toggle_visible"
},
{
@ -451,11 +451,11 @@
"id": "status.copy"
},
{
"defaultMessage": "Hide everything from {domain}",
"defaultMessage": "Block domain {domain}",
"id": "account.block_domain"
},
{
"defaultMessage": "Unhide {domain}",
"defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
},
{
@ -697,11 +697,11 @@
"id": "account.media"
},
{
"defaultMessage": "Hide everything from {domain}",
"defaultMessage": "Block domain {domain}",
"id": "account.block_domain"
},
{
"defaultMessage": "Unhide {domain}",
"defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
},
{
@ -1073,7 +1073,7 @@
"id": "privacy.public.short"
},
{
"defaultMessage": "Post to public timelines",
"defaultMessage": "Visible for all, shown in public timelines",
"id": "privacy.public.long"
},
{
@ -1081,7 +1081,7 @@
"id": "privacy.unlisted.short"
},
{
"defaultMessage": "Do not show in public timelines",
"defaultMessage": "Visible for all, but not in public timelines",
"id": "privacy.unlisted.long"
},
{
@ -1089,7 +1089,7 @@
"id": "privacy.private.short"
},
{
"defaultMessage": "Post to followers only",
"defaultMessage": "Visible for followers only",
"id": "privacy.private.long"
},
{
@ -1097,7 +1097,7 @@
"id": "privacy.direct.short"
},
{
"defaultMessage": "Post to mentioned users only",
"defaultMessage": "Visible for mentioned users only",
"id": "privacy.direct.long"
},
{
@ -1470,7 +1470,7 @@
"id": "column.domain_blocks"
},
{
"defaultMessage": "Unhide {domain}",
"defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
},
{
@ -2384,11 +2384,11 @@
"id": "status.copy"
},
{
"defaultMessage": "Hide everything from {domain}",
"defaultMessage": "Block domain {domain}",
"id": "account.block_domain"
},
{
"defaultMessage": "Unhide {domain}",
"defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
},
{
@ -2957,4 +2957,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
]
]

14
app/javascript/mastodon/locales/en.json
View File

@ -3,7 +3,7 @@
"account.badges.bot": "Bot",
"account.badges.group": "Group",
"account.block": "Block @{name}",
"account.block_domain": "Hide everything from {domain}",
"account.block_domain": "Block domain {domain}",
"account.blocked": "Blocked",
"account.cancel_follow_request": "Cancel follow request",
"account.direct": "Direct message @{name}",
@ -34,7 +34,7 @@
"account.share": "Share @{name}'s profile",
"account.show_reblogs": "Show boosts from @{name}",
"account.unblock": "Unblock @{name}",
"account.unblock_domain": "Unhide {domain}",
"account.unblock_domain": "Unblock domain {domain}",
"account.unendorse": "Don't feature on profile",
"account.unfollow": "Unfollow",
"account.unmute": "Unmute @{name}",
@ -258,7 +258,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",
@ -324,13 +324,13 @@
"poll_button.add_poll": "Add a poll",
"poll_button.remove_poll": "Remove poll",
"privacy.change": "Adjust status privacy",
"privacy.direct.long": "Post to mentioned users only",
"privacy.direct.long": "Visible for mentioned users only",
"privacy.direct.short": "Direct",
"privacy.private.long": "Post to followers only",
"privacy.private.long": "Visible for followers only",
"privacy.private.short": "Followers-only",
"privacy.public.long": "Post to public timelines",
"privacy.public.long": "Visible for all, shown in public timelines",
"privacy.public.short": "Public",
"privacy.unlisted.long": "Do not post to public timelines",
"privacy.unlisted.long": "Visible for all, but not in public timelines",
"privacy.unlisted.short": "Unlisted",
"refresh": "Refresh",
"regeneration_indicator.label": "Loading…",

2
app/javascript/mastodon/locales/ga.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/hi.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "लोड हो रहा है...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "नहीं मिला",
"missing_indicator.sublabel": "यह संसाधन नहीं मिल सका।",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/kn.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/lt.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/lv.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/mk.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/ml.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/mr.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/ms.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",

2
app/javascript/mastodon/locales/ur.json
View File

@ -254,7 +254,7 @@
"lists.subheading": "Your lists",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading...",
"media_gallery.toggle_visible": "Toggle visibility",
"media_gallery.toggle_visible": "Hide media",
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",