revert en strings, and add new ones from #740

Author: mmckegg

locales/en.json

@@ -2,11 +2,9 @@
 	"Publishing...": "Publishing...",
 	"Publish Privately": "Publish Privately",
 	"Publish": "Publish",
+	"Welcome to Patchwork": "Welcome to Patchwork",
 	"You may not be able to see new content until you follow some users or pubs.": "You may not be able to see new content until you follow some users or pubs.",
-	"You are not following anyone": "You are not following anyone",
-	"For help getting started, see the guide at ": "For help getting started, see the guide at ",
-	"Nobody will be able to see your posts until you have a follower. The easiest way to get a follower is to use a pub invite as the pub will follow you back. If you have already redeemed a pub invite and you see it has not followed you back on your profile, try another pub.": "Nobody will be able to see your posts until you have a follower. The easiest way to get a follower is to use a pub invite as the pub will follow you back. If you have already redeemed a pub invite and you see it has not followed you back on your profile, try another pub.",
-	"You have no followers": "You have no followers",
+	"For help, see the 'Getting Started' guide at ": "For help, see the 'Getting Started' guide at ",
 	"update": "update",
 	"updates": "updates",
 	"+ Join Pub": "+ Join Pub",
@@ -15,12 +13,12 @@
 	"Local": "Local",
 	"Connected Pubs": "Connected Pubs",
 	"Who to follow": "Who to follow",
-	"Write a private message": "Write a private message",
+	"Write a private message": "Write a private message \n\n\n\nThis can only be read by yourself and people you have @mentioned.",
 	"Edit Your Profile": "Edit Your Profile",
 	"Public key for this profile": "Public key for this profile",
 	"This person is blocked by %s of your friends.": {
-		"one": "This person is blocked by %s of your friends.",
-		"other": "This person is blocked by %s of your friends."
+	  "one": "This person is blocked by %s of your friends.",
+	  "other": "This person is blocked by %s of your friends."
 	},
 	"You don't follow anyone who follows this person": "You don't follow anyone who follows this person",
 	"You might not be seeing their latest messages. You could try joining a pub that they are a member of.": "You might not be seeing their latest messages. You could try joining a pub that they are a member of.",
@@ -31,13 +29,13 @@
 	"However, since you follow someone that follows them, you should be able to see their latest posts.": "However, since you follow someone that follows them, you should be able to see their latest posts.",
 	"Mutual Friends": "Mutual Friends",
 	"You share %s mutual friends with this person.": {
-		"one": "You share %s mutual friends with this person.",
-		"other": "You share %s mutual friends with this person."
+	  "one": "You share %s mutual friend with this person.",
+	  "other": "You share %s mutual friends with this person."
 	},
 	"Followed by": "Followed by",
 	"You follow %s people that follow this person.": {
-		"one": "You follow %s people that follow this person.",
-		"other": "You follow %s people that follow this person."
+	  "one": "You follow someone that follows this person.",
+	  "other": "You follow %s people that follow this person."
 	},
 	"Send Private Message": "Send Private Message",
 	"Friends": "Friends",
@@ -60,88 +58,130 @@
 	"Mentions": "Mentions",
 	" has been released.": " has been released.",
 	" Click here to download and view more info!": " Click here to download and view more info!",
-	"Force Disconnect": "Force Disconnect",
-	"View %s more": {
-		"one": "View %s more",
-		"other": "View %s more"
-	},
 	"Self Assigned": "Self Assigned",
 	"Assigned By": "Assigned By",
+	"followed ": "followed ",
 	"from now": "from now",
 	"ago": "ago",
 	"years": "years",
 	"months": "months",
 	"weeks": "weeks",
 	"days": "days",
 	"hours": "hours",
-	"minutes": "minutes",
-	"seconds": "seconds",
+	"minutes": "mins",
+	"seconds": "secs",
 	"year": "year",
 	"month": "month",
 	"week": "week",
 	"day": "day",
 	"hour": "hour",
-	"minute": "minute",
-	"second": "second",
-	"Liked by": "Liked by",
-	"likes": "likes",
-	"See less": "See less",
-	"See more": "See more",
+	"minute": "min",
+	"second": "sec",
 	"Reply": "Reply",
-	"mentioned you": "mentioned you",
 	"View full thread": "View full thread",
+	"Unsubscribe": "Unsubscribe",
+	"Subscribe": "Subscribe",
+	"Force Disconnect": "Force Disconnect",
 	"(you)": "(you)",
-	"replied to this message": "replied to this message",
 	"in reply to ": "in reply to ",
-	"mentioned in your network": "mentioned in your network",
-	"followed ": "followed ",
-	" referenced this message:": " referenced this message:",
-	"added changes": "added changes",
+	"See less": "See less",
+	"See more": "See more",
+	"mentioned you": "mentioned you",
 	" and ": " and ",
+	"Liked by": "Liked by",
+	"likes": "likes",
+	"liked this message": "liked this message",
 	"like": "like",
-	"%s people from your network replied to this message on ": {
-		"one": "%s people from your network replied to this message on ",
-		"other": "%s people from your network replied to this message on "
-	},
+	"replied to this message": "replied to this message",
 	"unfollowed ": "unfollowed ",
-	"subscribed to ": "subscribed to ",
+	" others": " others",
 	"Write a public message": "Write a public message",
-	"Click to unsubscribe": "Click to unsubscribe",
-	"Subscribed": "Subscribed",
-	"Subscribe": "Subscribe",
-	"You follow %s people that subscribe to this channel.": {
-		"one": "You follow %s people that subscribe to this channel.",
-		"other": "You follow %s people that subscribe to this channel."
+	"New Message": "New Message",
+	"%s people from your network replied to this message on ": {
+	  "one": "%s person from your network replied to this message on ",
+	  "other": "%s people from your network replied to this message on "
 	},
-	"Write a message in this channel": "Write a message in this channel",
-	"You may not be able to see new channel content until you follow some users or pubs.": "You may not be able to see new channel content until you follow some users or pubs.",
-	"mentioned this channel": "mentioned this channel",
-	" others": " others",
+	"mentioned in your network": "mentioned in your network",
+	"Channels": "Channels",
+	"Browse All": "Browse All",
+	"$name": "English",
+	"Theme": "Theme",
+	"Language": "Language",
+	"Default": "Default",
+	"de": "German",
+	"en": "en",
+	"es": "Spanish",
+	"ki": "Kashmiri",
+	"pt": "pt",
+	"pt-BR": "Brazillian Portuguese",
+	"Public Feed Options": "Public Feed Options",
+	"Hide following messages": "Hide following messages",
+	"This is you.": "This is you.",
 	"Click to unblock": "Click to unblock",
 	"Blocked": "Blocked",
 	"Click to unfollow": "Click to unfollow",
 	"Follow Back": "Follow Back",
 	"Follow": "Follow",
 	"Click to block syncing with this person and hide their posts": "Click to block syncing with this person and hide their posts",
 	"Block": "Block",
-	"This is you.": "This is you.",
-	"assigned a display image to ": "assigned a display image to ",
-	"Close": "Close",
-	"self identifies as ": "self identifies as ",
-	"New Message": "New Message",
 	"Write a private reply": "Write a private reply",
 	"Write a public reply": "Write a public reply",
-	"self assigned a description": "self assigned a description",
-	"liked this message": "liked this message",
-	"Confirm": "Confirm",
-	"Cancel": "Cancel",
-	"self assigned a display image": "self assigned a display image",
+	"External Link": "External Link",
+	"subscribed to ": "subscribed to ",
+	"unsubscribed from ": "unsubscribed from ",
+	"Click to unsubscribe": "Click to unsubscribe",
+	"Subscribed": "Subscribed",
+	"Write a message in this channel": "Write a message in this channel\n\n\n\nPeople who follow you or subscribe to this channel will also see this message in their main feed.\n\nTo create a new channel, type the channel name (preceded by a #) into the search box above. e.g #cat-pics",
+	"mentioned this channel": "mentioned this channel",
+	"You may not be able to see new channel content until you follow some users or pubs.": "You may not be able to see new channel content until you follow some users or pubs.",
 	"Search Results:": "Search Results:",
 	"Search completed.": "Search completed.",
 	"result found": "result found",
 	"results found": "results found",
+	"blocked ": "blocked ",
+	"Confirm": "Confirm",
+	"Cancel": "Cancel",
 	"Unread Message": "Unread Message",
+	"Font Size": "Font Size",
+	"Hide posts in channels that are not subscribed": "Hide posts in channels that are not subscribed",
+	"Information": "Information",
+	"Hide channel (un)subcribe messages": "Hide channel (un)subcribe messages",
+	"Channel Feed Options": "Channel Feed Options",
 	" forked this discussion:": " forked this discussion:",
+	"You are not following anyone": "You are not following anyone",
+	"For help getting started, see the guide at ": "For help getting started, see the guide at ",
+	"added changes": "added changes",
+	"Your Profile": "Your Profile",
+	"Choose Profile Image...": "Choose Profile Image...",
+	"Choose a name": "Choose a name",
+	"Describe yourself (if you want)": "Describe yourself (if you want)",
+	"Missing message": "Missing message",
+	" via ": " via ",
+	"The author of this message could be outside of your follow range or they may be blocked.": "The author of this message could be outside of your follow range or they may be blocked.",
+	"Close": "Close",
+	" referenced this message:": " referenced this message:",
 	"on ": "on ",
-	"External Link": "External Link"
-}
+	"You follow %s people that subscribe to this channel.": {
+	  "one": "You follow %s person that subscribes to this channel.",
+	  "other": "You follow %s people that subscribe to this channel."
+	},
+	"People you follow that subscribe to this channel": "People you follow that subscribe to this channel",
+	" from your extended network": " from your extended network",
+	"+ Add Gathering": "+ Add Gathering",
+	"View %s more": {
+	  "one": "View %s more",
+	  "other": "View %s more"
+	},
+	"self identifies as ": "self identifies as ",
+	"self assigned a description": "self assigned a description",
+	"self assigned a display image": "self assigned a display image",
+	"assigned a display image to ": "assigned a display image to ",
+	"Browse Channels": "Browse Channels",
+	"identifies ": "identifies ",
+	" as \"": " as \"",
+	"unblocked ": "unblocked ",
+	"identified ": "identified ",
+	"All Posts from Your ": "All Posts from Your ",
+	"You have no followers": "You have no followers",
+	"Nobody will be able to see your posts until you have a follower. The easiest way to get a follower is to use a pub invite as the pub will follow you back. If you have already redeemed a pub invite and you see it has not followed you back on your profile, try another pub.": "Nobody will be able to see your posts until you have a follower. The easiest way to get a follower is to use a pub invite as the pub will follow you back. If you have already redeemed a pub invite and you see it has not followed you back on your profile, try another pub."
+  }