Merge remote-tracking branch 'cs/prod'

1 files changed, 19 insertions, 3 deletions

diff --git a/src/i18n.js b/src/i18n.js
index eff5a73..02584b2 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -198,7 +198,9 @@ const STR = {
     msgAttachFailed: 'Attachment unavailable',
     msgAttach: 'Attach a picture',
     msgAttachTooBig: 'That file is too big (20 MB max)',
-    msgUploadFailed: 'Upload failed. Try again',
+    msgUploadFailed: 'Upload failed. Check your connection and try again',
+    mediaUploadTooBig: 'That file is too big for the available media hosts',
+    mediaUploadUnsupported: 'That file format is not supported',
     msgPhoto: 'Photo',
     searchPeopleFor: 'Search people for {q}',
     msgEmojiSearch: 'Search emoji…',
@@ -242,6 +244,10 @@ const STR = {
     feedTopicsHelp: 'Posts tagged with any of these. With people set as well, only their posts on these topics.',
     feedDelete: 'Delete feed',
     feedSaveAdhoc: 'Save feed',
+    feedSaved: 'Feed saved',
+    feedPostFab: 'Post',
+    mediaShrinking: 'Shrinking video for streaming',
+    mediaUploading: 'Uploading',
     feedNoQuery: 'Add people or topics to this feed.',
     feedOfTitle: '{name}’s timeline',
     feedOfLoading: 'Reading who they follow…',
@@ -362,6 +368,10 @@ const STR = {
     postBoostedAlready: 'You already boosted that',
     postQuote: 'Quote',
     postMore: 'More',
+    postDiscardTitle: 'Discard this draft?',
+    postDiscardBody: 'You’ll lose this draft and any attachments.',
+    postKeepEditing: 'Keep editing',
+    postDiscard: 'Discard draft',
     postMute: 'Mute',
     postUnmute: 'Unmute',
     postMuted: 'Muted. Their posts are hidden',
@@ -425,6 +435,7 @@ const STR = {
     msgNoDms: 'No conversations yet.',
     msgShowAllDms: 'Show all {n} conversations',
     msgShowFewerDms: 'Show fewer',
+    msgShowAllCommunities: 'Show all {n} communities',
     msgNoDmsYet: 'No messages yet. Say hi!',
     msgDmPlaceholder: 'Message',
     msgDmEncrypted: 'Private message · end-to-end encrypted',
@@ -459,6 +470,11 @@ const STR = {
     arkFeeService: 'Service fee',
     arkCoinsExpired: 'expired',
     noteForeignKind: 'A kind {kind} event this app doesn’t show.',
+    pollVoter: '{n} vote',
+    pollVoters: '{n} votes',
+    pollMulti: 'Pick any',
+    pollEnded: 'Poll closed',
+    pollEndsAt: 'Closes {when}',
     arkExpiredDust: '{amount} has expired and is too small to renew. You can forget it from the Manage page.',
     arkCoinForget: 'Forget',
     arkCoinForgetTitle: 'Give this coin up: it has expired and is too small to renew or exit.',
@@ -999,9 +1015,9 @@ const STR = {
     onbNameWait: 'Getting things ready…',
     onbNotNow: 'Not now',
     onbAvatarTitle: 'Choose your look',
-    onbAvatarBody: 'Pick a punk or upload your own picture. You can change it anytime.',
+    onbAvatarBody: 'Choose an avatar or upload your own picture. You can change it anytime.',
     onbUpload: 'Upload a photo',
-    onbUploadFailed: 'Upload failed. Try a punk for now',
+    onbUploadFailed: 'Upload failed. Try another picture',
     onbProfileSkipped: 'Couldn’t publish your profile. Set it later from Edit profile',
     onbContinue: 'Continue',
     onbSkipAvatar: 'Continue with my default',