additional copy changes

.env.defaults

@@ -16,7 +16,7 @@ DOMAIN=lbry.tv
 URL=https://lbry.tv
 # UI
 SITE_TITLE=lbry.tv
-SITE_NAME=LBRY
+SITE_NAME=lbry.tv
 SITE_DESCRIPTION=Meet LBRY, an open, free, and community-controlled content wonderland.
 LOGO_TITLE=lbry.tv
 SIMPLE_SITE=false

static/app-strings.json

@@ -506,7 +506,7 @@
   "Create a new account or sign in.": "Create a new account or sign in.",
   "Terms of Service": "Terms of Service",
   "Learn More": "Learn More",
-  "Confirm Your Email": "Confirm Your Email",
+  "Confirm your account": "Confirm your account",
   "Start Over": "Start Over",
   "Your YouTube Channel": "Your YouTube Channel",
   "Your YouTube Channels": "Your YouTube Channels",
@@ -575,7 +575,7 @@
   "earned and bound in tips": "earned and bound in tips",
   "currently staked": "currently staked",
   "Sync balance and preferences across devices.": "Sync balance and preferences across devices.",
-  "By continuing, I agree to the %terms% and confirm I am over the age of 13.": "By continuing, I agree to the %terms% and confirm I am over the age of 13.",
+  "By creating an account, you agree to our %terms% and confirm you're over the age of 13.": "By creating an account, you agree to our %terms% and confirm you're over the age of 13.",
   "Advanced Editor": "Advanced Editor",
   "If you bid more than %amount% LBC, when someone navigates to %uri%, it will load your published content. However, you can get a longer version of this URL for any bid.": "If you bid more than %amount% LBC, when someone navigates to %uri%, it will load your published content. However, you can get a longer version of this URL for any bid.",
   "%nameOrTitle% has been published to lbry://%name%. Click here to view it.": "%nameOrTitle% has been published to lbry://%name%. Click here to view it.",
@@ -590,8 +590,7 @@
   "Sign In to LBRY": "Sign In to LBRY",
   "Check Your Email": "Check Your Email",
   "sign in": "sign in",
-  "An email was sent to %email%. Follow the link to %verify_text%.": "An email was sent to %email%. Follow the link to %verify_text%.",
+  "Resend link": "Resend link",
-  "Resend Email": "Resend Email",
   "Sync your balance and preferences across devices.": "Sync your balance and preferences across devices.",
   "Add Email": "Add Email",
   "New email sent.": "New email sent.",
@@ -640,7 +639,7 @@
   "Awesome! You just subscribed to your first channel.": "Awesome! You just subscribed to your first channel.",
   "Sign in": "Sign in",
   "with lbry.tv to receive notifications related to new content.": "with lbry.tv to receive notifications related to new content.",
-  "An email was sent to %email%. Follow the link to %verify_text%. After, this page will update automatically.": "An email was sent to %email%. Follow the link to %verify_text%. After, this page will update automatically.",
+  "We just sent an email to %email% with a link for you to %verify_text%.": "We just sent an email to %email% with a link for you to %verify_text%.",
   "Your email preferences": "Your email preferences",
   "allow you to receive notifications related to new content.": "allow you to receive notifications related to new content.",
   "files": "files",
@@ -776,8 +775,7 @@
   "Find Channels to Follow": "Find Channels to Follow",
   "Sign in with lbry.tv to receive notifications about new content.": "Sign in with lbry.tv to receive notifications about new content.",
   "Find new channels to follow": "Find new channels to follow",
-  "You aren't currently following any channels. %discover_channels_link%.": "You aren't currently following any channels. %discover_channels_link%.",
+  "%SITE_NAME% is more fun if you're following channels": "%SITE_NAME% is more fun if you're following channels",
-  "LBRY Works Better If You Are Following Channels": "LBRY Works Better If You Are Following Channels",
   "Saved zip archive to %outputPath%": "Saved zip archive to %outputPath%",
   "Share Usage and Diagnostic Data": "Share Usage and Diagnostic Data",
   "This is information like error logging, performance tracking, and usage statistics. It includes your IP address and basic system details, but no other identifying information (unless you sign in to lbry.tv)": "This is information like error logging, performance tracking, and usage statistics. It includes your IP address and basic system details, but no other identifying information (unless you sign in to lbry.tv)",
@@ -849,7 +847,7 @@
   "Rewards validation is optional.": "Rewards validation is optional.",
   "Continue Without Rewards": "Continue Without Rewards",
   "If you'd like to participate our %rewards_program% to earn credits, please complete one of the steps below to be validated. %Refresh% or %Skip%.": "If you'd like to participate our %rewards_program% to earn credits, please complete one of the steps below to be validated. %Refresh% or %Skip%.",
-  "verify your email": "verify your email",
+  "verify your account": "verify your account",
   "rename your existing wallet in the lbry/wallets directory": "rename your existing wallet in the lbry/wallets directory",
   "Your wallet data will remain intact. If you sign in with a different account, the wallets will be merged. To prevent this, you need to %rename_wallet_instructions%": "Your wallet data will remain intact. If you sign in with a different account, the wallets will be merged. To prevent this, you need to %rename_wallet_instructions%",
   "rename your existing wallet": "rename your existing wallet",

ui/component/sideNavigation/view.jsx

@@ -13,6 +13,18 @@ import { IS_MAC } from 'component/app/view';
 const ESCAPE_KEY_CODE = 27;
 const BACKSLASH_KEY_CODE = 220;
 
+const HOME = {
+  label: 'Home',
+  navigate: `/`,
+  icon: ICONS.HOME,
+};
+
+const RECENT_FROM_FOLLOWING = {
+  label: 'Following',
+  navigate: `/$/${PAGES.CHANNELS_FOLLOWING}`,
+  icon: ICONS.SUBSCRIBE,
+};
+
 type Props = {
   subscriptions: Array<Subscription>,
   email: ?string,
@@ -50,16 +62,8 @@ function SideNavigation(props: Props) {
     extra?: Node,
     hideForUnauth?: boolean,
   }> = [
-    {
+    HOME,
-      label: 'Home',
+    RECENT_FROM_FOLLOWING,
-      navigate: `/`,
-      icon: ICONS.HOME,
-    },
-    {
-      label: 'Following',
-      navigate: `/$/${PAGES.CHANNELS_FOLLOWING}`,
-      icon: ICONS.SUBSCRIBE,
-    },
     {
       label: 'Your Tags',
       navigate: `/$/${PAGES.TAGS_FOLLOWING}`,

ui/component/userEmailNew/view.jsx

@@ -1,6 +1,6 @@
 // @flow
 import * as PAGES from 'constants/pages';
-import { DOMAIN } from 'config';
+import { SITE_NAME } from 'config';
 import React, { useState } from 'react';
 import { FormField, Form } from 'component/common/form';
 import Button from 'component/button';
@@ -89,7 +89,7 @@ function UserEmailNew(props: Props) {
   return (
     <div className="main__sign-up">
       <Card
-        title={__('Sign Up with lbry.tv', { DOMAIN })}
+        title={__('Join %SITE_NAME%', { SITE_NAME })}
         // @if TARGET='app'
         subtitle={__('An account with lbry.tv allows you to earn rewards and backup your data.')}
         // @endif
@@ -154,15 +154,13 @@ function UserEmailNew(props: Props) {
                 />
                 <Button button="link" onClick={handleChangeToSignIn} label={__('Sign In')} />
               </div>
-              <p className="help">
+              <p className="help--card-actions">
                 <I18nMessage
                   tokens={{
-                    terms: (
+                    terms: <Button button="link" href="https://www.lbry.com/termsofservice" label={__('terms')} />,
-                      <Button button="link" href="https://www.lbry.com/termsofservice" label={__('Terms of Service')} />
-                    ),
                   }}
                 >
-                  By continuing, I agree to the %terms% and confirm I am over the age of 13.
+                  By creating an account, you agree to our %terms% and confirm you're over the age of 13.
                 </I18nMessage>
               </p>
             </Form>

ui/component/userEmailVerify/view.jsx

@@ -63,16 +63,13 @@ class UserEmailVerify extends React.PureComponent<Props> {
     return (
       <div className="main__sign-up">
         <Card
-          title={isReturningUser ? __('Check Your Email') : __('Confirm Your Email')}
+          title={isReturningUser ? __('Check Your Email') : __('Confirm your account')}
           subtitle={
             <p>
-              {__(
+              {__('We just sent an email to %email% with a link for you to %verify_text%.', {
-                'An email was sent to %email%. Follow the link to %verify_text%. After, this page will update automatically.',
+                email,
-                {
+                verify_text: isReturningUser ? __('sign in') : __('verify your account'),
-                  email,
+              })}
-                  verify_text: isReturningUser ? __('sign in') : __('verify your email'),
-                }
-              )}
             </p>
           }
           actions={
@@ -80,17 +77,17 @@ class UserEmailVerify extends React.PureComponent<Props> {
               <div className="section__actions">
                 <Button
                   button="primary"
-                  label={__('Resend Email')}
+                  label={__('Resend link')}
                   onClick={this.handleResendVerificationEmail}
                   disabled={resendingEmail}
                 />
                 <UserSignOutButton label={__('Start Over')} />
               </div>
-              <p className="help">
+              <p className="help--card-actions">
                 <I18nMessage
                   tokens={{
                     help_link: <Button button="link" href="mailto:help@lbry.com" label="help@lbry.com" />,
-                    chat_link: <Button button="link" href="https://chat.lbry.com" label={__("chat")} />,
+                    chat_link: <Button button="link" href="https://chat.lbry.com" label={__('chat')} />,
                   }}
                 >
                   Email %help_link% or join our %chat_link% if you encounter any trouble verifying.

ui/page/home/view.jsx

@@ -1,11 +1,11 @@
 // @flow
 import * as ICONS from 'constants/icons';
 import * as PAGES from 'constants/pages';
+import { SITE_NAME } from 'config';
 import React from 'react';
 import Page from 'component/page';
 import Button from 'component/button';
 import ClaimTilesDiscover from 'component/claimTilesDiscover';
-import I18nMessage from 'component/i18nMessage';
 import getHomepage from 'homepage';
 
 type Props = {
@@ -40,21 +40,15 @@ function HomePage(props: Props) {
     <Page>
       {(authenticated || !IS_WEB) && !subscribedChannels.length && (
         <div className="notice-message">
-          <h1 className="section__title">{__('LBRY Works Better If You Are Following Channels')}</h1>
+          <h1 className="section__title">
-          <p className="section__subtitle">
+            {__("%SITE_NAME% is more fun if you're following channels", { SITE_NAME })}
-            <I18nMessage
+          </h1>
-              tokens={{
+          <p className="section__actions">
-                discover_channels_link: (
+            <Button
-                  <Button
+              button="primary"
-                    button="link"
+              navigate={`/$/${PAGES.CHANNELS_FOLLOWING_DISCOVER}`}
-                    navigate={`/$/${PAGES.CHANNELS_FOLLOWING_DISCOVER}`}
+              label={__('Find new channels to follow')}
-                    label={__('Find new channels to follow')}
+            />
-                  />
-                ),
-              }}
-            >
-              You aren't currently following any channels. %discover_channels_link%.
-            </I18nMessage>
           </p>
         </div>
       )}

ui/page/signInVerify/view.jsx

@@ -98,7 +98,7 @@ function SignInVerifyPage(props: Props) {
                 {isAuthenticationSuccess
                   ? __('You can now close this tab.')
                   : needsRecaptcha
-                  ? __('Click below to sign in to lbry.tv')
+                  ? null
                   : __('Welcome back! You are automatically being signed in.')}
               </p>
               {showCaptchaMessage && !isAuthenticationSuccess && (

ui/scss/init/_gui.scss

@@ -228,6 +228,11 @@ textarea {
   margin-bottom: 0;
 }
 
+.help--card-actions {
+  @extend .help;
+  margin-top: var(--spacing-l);
+}
+
 .empty {
   color: var(--color-text-empty);
   font-style: italic;