diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-08 22:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 22:09:53 +0100 |
| commit | 840b17e3444f9a68d3639f1ffeb326e8cb1e03b1 (patch) | |
| tree | 8254538ed33f4c4b974b5379f3b5a0b489ba095a /app/javascript/flavours/glitch/features/account | |
| parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
| parent | 9c2922958783f7e499cdda5bb874d6096e47eb0a (diff) | |
Merge pull request #1297 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/account')
| -rw-r--r-- | app/javascript/flavours/glitch/features/account/components/header.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js index 6b4aff616..efcb243ba 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.js +++ b/app/javascript/flavours/glitch/features/account/components/header.js @@ -30,8 +30,8 @@ const messages = defineMessages({ report: { id: 'account.report', defaultMessage: 'Report @{name}' }, share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' }, media: { id: 'account.media', defaultMessage: 'Media' }, - blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' }, - unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' }, + blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' }, + unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' }, hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' }, showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' }, pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' }, |