mastofe

commit: 1c15329cce07adeeb9e2abf670b3eb37e8d36e95
parent: b2a4ffd3a91abc5030baf2ede97c0867924d8fbc
Author: Marcin Mikołajczak <me@m4sk.in>
Date:   Sat, 24 Mar 2018 12:51:51 +0100

Change “Toots with replies” to “Toots and replies” (#6875)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Diffstat:
M
app/javascript/mastodon/features/account_timeline/components/header.js
2
+-
M
app/javascript/mastodon/locales/defaultMessages.json
5
++---
M
app/javascript/mastodon/locales/en.json
2
+-

3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -99,7 +99,7 @@ export default class Header extends ImmutablePureComponent {
         {!hideTabs && (
           <div className='account__section-headline'>
             <NavLink exact to={`/accounts/${account.get('id')}`}><FormattedMessage id='account.posts' defaultMessage='Toots' /></NavLink>
-            <NavLink exact to={`/accounts/${account.get('id')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots with replies' /></NavLink>
+            <NavLink exact to={`/accounts/${account.get('id')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots and replies' /></NavLink>
             <NavLink exact to={`/accounts/${account.get('id')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
           </div>
         )}
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
@@ -326,7 +326,7 @@
         "id": "account.posts"
       },
       {
-        "defaultMessage": "Toots with replies",
+        "defaultMessage": "Toots and replies",
         "id": "account.posts_with_replies"
       },
       {
@@ -1748,4 +1748,4 @@
     ],
     "path": "app/javascript/mastodon/middleware/errors.json"
   }
-]-
\ No newline at end of file
+]
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
@@ -17,7 +17,7 @@
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
   "account.posts": "Toots",
-  "account.posts_with_replies": "Toots with replies",
+  "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
   "account.share": "Share @{name}'s profile",