git ssb

0+

alanz / patchwork



forked from Matt McKegg / patchwork

Commit 6e47bd5db740207b5ec4d5f46bc07a5c92db134d

Merge remote-tracking branch 'upstream/master' into no_followers_2

Gordon Martin committed on 2/13/2018, 11:54:56 PM
Parent: 899535c72ab24b5e7ae0e1494a2294297e31c4a4
Parent: 5dbc66f7b875bcfef824e722165d4867da177675

Files changed

locales/en.jsonchanged
locales/en.jsonView
@@ -1,11 +1,13 @@
11 {
22 "Publishing...": "Publishing...",
33 "Publish Privately": "Publish Privately",
44 "Publish": "Publish",
5- "Welcome to Patchwork": "Welcome to Patchwork",
65 "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.",
7- "For help, see the 'Getting Started' guide at ": "For help, see the 'Getting Started' guide at ",
6+ "You are not following anyone": "You are not following anyone",
7+ "For help getting started, see the guide at ": "For help getting started, see the guide at ",
8+ "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.",
9+ "You have no followers": "You have no followers",
810 "update": "update",
911 "updates": "updates",
1012 "+ Join Pub": "+ Join Pub",
1113 "Active Channels": "Active Channels",
@@ -33,9 +35,9 @@
3335 "other": "You share %s mutual friends with this person."
3436 },
3537 "Followed by": "Followed by",
3638 "You follow %s people that follow this person.": {
37- "one": "You follow %s person that follows this person.",
39+ "one": "You follow %s people that follow this person.",
3840 "other": "You follow %s people that follow this person."
3941 },
4042 "Send Private Message": "Send Private Message",
4143 "Friends": "Friends",
@@ -57,11 +59,16 @@
5759 "Profile": "Profile",
5860 "Mentions": "Mentions",
5961 " has been released.": " has been released.",
6062 " Click here to download and view more info!": " Click here to download and view more info!",
63+ "Force Disconnect": "Force Disconnect",
64+ "View %s more": {
65+ "one": "View %s more",
66+ "other": "View %s more"
67+ },
6168 "Self Assigned": "Self Assigned",
6269 "Assigned By": "Assigned By",
63- "followed ": "followed ",
70+ "(you)": "(you)",
6471 "from now": "from now",
6572 "ago": "ago",
6673 "years": "years",
6774 "months": "months",
@@ -76,112 +83,22 @@
7683 "day": "day",
7784 "hour": "hour",
7885 "minute": "minute",
7986 "second": "second",
87+ "See less": "See less",
88+ "See more": "See more",
8089 "Reply": "Reply",
8190 "View full thread": "View full thread",
82- "Unsubscribe": "Unsubscribe",
83- "Subscribe": "Subscribe",
84- "Force Disconnect": "Force Disconnect",
85- "(you)": "(you)",
91+ "mentioned you": "mentioned you",
92+ "followed ": "followed ",
8693 "in reply to ": "in reply to ",
87- "See less": "See less",
88- "See more": "See more",
89- "mentioned you": "mentioned you",
94+ "replied to this message": "replied to this message",
9095 " and ": " and ",
96+ "identifies ": "identifies ",
97+ " as \"": " as \"",
9198 "Liked by": "Liked by",
9299 "likes": "likes",
93- "liked this message": "liked this message",
100+ " others": " others",
94101 "like": "like",
95- "replied to this message": "replied to this message",
96- "unfollowed ": "unfollowed ",
97- " others": " others",
98- "Write a public message": "Write a public message",
99- "New Message": "New Message",
100- "%s people from your network replied to this message on ": {
101- "one": "%s person from your network replied to this message on ",
102- "other": "%s people from your network replied to this message on "
103- },
104- "mentioned in your network": "mentioned in your network",
105- "Channels": "Channels",
106- "Browse All": "Browse All",
107- "$name": "$name",
108- "Theme": "Theme",
109- "Language": "Language",
110- "Default": "Default",
111- "de": "de",
112- "en": "en",
113- "es": "es",
114- "ki": "ki",
115- "pt": "pt",
116- "pt-BR": "pt-BR",
117- "Public Feed Options": "Public Feed Options",
118- "Hide following messages": "Hide following messages",
119- "This is you.": "This is you.",
120- "Click to unblock": "Click to unblock",
121- "Blocked": "Blocked",
122- "Click to unfollow": "Click to unfollow",
123- "Follow Back": "Follow Back",
124- "Follow": "Follow",
125- "Click to block syncing with this person and hide their posts": "Click to block syncing with this person and hide their posts",
126- "Block": "Block",
127- "Write a private reply": "Write a private reply",
128- "Write a public reply": "Write a public reply",
129- "External Link": "External Link",
130102 "subscribed to ": "subscribed to ",
131- "unsubscribed from ": "unsubscribed from ",
132- "Click to unsubscribe": "Click to unsubscribe",
133- "Subscribed": "Subscribed",
134- "Write a message in this channel": "Write a message in this channel",
135- "mentioned this channel": "mentioned this channel",
136- "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.",
137- "Search Results:": "Search Results:",
138- "Search completed.": "Search completed.",
139- "result found": "result found",
140- "results found": "results found",
141- "blocked ": "blocked ",
142- "Confirm": "Confirm",
143- "Cancel": "Cancel",
144- "Unread Message": "Unread Message",
145- "Font Size": "Font Size",
146- "Hide posts in channels that are not subscribed": "Hide posts in channels that are not subscribed",
147- "Information": "Information",
148- "Hide channel (un)subcribe messages": "Hide channel (un)subcribe messages",
149- "Channel Feed Options": "Channel Feed Options",
150- " forked this discussion:": " forked this discussion:",
151- "You are not following anyone": "You are not following anyone",
152- "For help getting started, see the guide at ": "For help getting started, see the guide at ",
153- "added changes": "added changes",
154- "Your Profile": "Your Profile",
155- "Choose Profile Image...": "Choose Profile Image...",
156- "Choose a name": "Choose a name",
157- "Describe yourself (if you want)": "Describe yourself (if you want)",
158- "Missing message": "Missing message",
159- " via ": " via ",
160- "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.",
161- "Close": "Close",
162- " referenced this message:": " referenced this message:",
163- "on ": "on ",
164- "You follow %s people that subscribe to this channel.": {
165- "one": "You follow %s person that subscribes to this channel.",
166- "other": "You follow %s people that subscribe to this channel."
167- },
168- "People you follow that subscribe to this channel": "People you follow that subscribe to this channel",
169- " from your extended network": " from your extended network",
170- "+ Add Gathering": "+ Add Gathering",
171- "View %s more": {
172- "one": "View %s more",
173- "other": "View %s more"
174- },
175- "self identifies as ": "self identifies as ",
176- "self assigned a description": "self assigned a description",
177- "self assigned a display image": "self assigned a display image",
178- "assigned a display image to ": "assigned a display image to ",
179- "Browse Channels": "Browse Channels",
180- "identifies ": "identifies ",
181- " as \"": " as \"",
182- "unblocked ": "unblocked ",
183- "identified ": "identified ",
184- "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 it has not followed you back, 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 it has not followed you back, try another pub.",
185- "You have no followers": "You have no followers",
186- "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."
103+ "liked this message": "liked this message"
187104 }

Built with git-ssb-web