Various i18n fixes

static/app-strings.json

@@ -837,7 +837,8 @@
   "Leave a Comment": "Leave a Comment",
   "Open Live Chat": "Open Live Chat",
   "%view_count% viewers": "%view_count% viewers",
-  "Dismiss Superchats": "Dismiss Superchats",
+  "Display HyperChats": "Display HyperChats",
+  "Dismiss HyperChats": "Dismiss HyperChats",
   "HyperChats": "HyperChats",
   "Recent Tips": "Recent Tips",
   "Emojis": "Emojis",
@@ -1081,7 +1082,6 @@
   "Your Wallet is Empty": "Your Wallet is Empty",
   "Buy Credits": "Buy Credits",
   "Buy/Swap Credits": "Buy/Swap Credits",
-  "LBRY, Inc. partners with Moonpay to provide the option to purchase LBRY Credits. %learn_more%.": "LBRY, Inc. partners with Moonpay to provide the option to purchase LBRY Credits. %learn_more%.",
   "Earn Rewards": "Earn Rewards",
   "This file may have been streamed, moved or deleted": "This file may have been streamed, moved or deleted",
   "LBRY takes privacy and choice seriously. Just a few questions before you enter the land of content freedom. ": "LBRY takes privacy and choice seriously. Just a few questions before you enter the land of content freedom. ",
@@ -1719,7 +1719,9 @@
   "Default Mode (t)": "Default Mode (t)",
   "Quality": "Quality",
   "Autoplay Next On": "Autoplay Next On",
+  "Autoplay Next is on.": "Autoplay Next is on.",
   "Autoplay Next Off": "Autoplay Next Off",
+  "Autoplay Next is off.": "Autoplay Next is off.",
   "Announcements, updates, and rewards specific to users of Android.": "Announcements, updates, and rewards specific to users of Android.",
   "LBRY has special programs and opportunities for people in school.": "LBRY has special programs and opportunities for people in school.",
   "Creator specific news, automated reports, and other updates.": "Creator specific news, automated reports, and other updates.",
@@ -2148,9 +2150,9 @@
   "If you're having trouble starting a stream or if your stream shows that you're live but aren't, try a reset. If the problem persists, please reach out at %SITE_HELP_EMAIL%.": "If you're having trouble starting a stream or if your stream shows that you're live but aren't, try a reset. If the problem persists, please reach out at %SITE_HELP_EMAIL%.",
   "Stickers": "Stickers",
   "Different Sticker": "Different Sticker",
+  "Switch to %tip_method%": "Switch to %tip_method%",
   "Cash": "Cash",
-  "Switch to Cash": "Switch to Cash",
-  "Switch to Credits": "Switch to Credits",
+  "Credit": "Credit",
   "Cookies": "Cookies",
   "Did someone invite you to use Odysee? Tell us who and you both get a reward!": "Did someone invite you to use Odysee? Tell us who and you both get a reward!",
   "There are unsaved settings. Exit the Settings Page to finalize them.": "There are unsaved settings. Exit the Settings Page to finalize them.",

ui/component/livestreamChatLayout/livestream-menu.jsx

@@ -89,7 +89,7 @@ export default function LivestreamMenu(props: Props) {
               <MenuItem className="comment__menu-option" onSelect={toggleSuperchats}>
                 <span className="menu__link">
                   <Icon aria-hidden icon={superchatsHidden ? ICONS.EYE : ICONS.DISMISS_ALL} size={18} />
-                  {superchatsHidden ? __('Display Superchats') : __('Dismiss Superchats')}
+                  {superchatsHidden ? __('Display HyperChats') : __('Dismiss HyperChats')}
                 </span>
               </MenuItem>
             )

ui/component/walletFiatBalance/view.jsx

@@ -5,7 +5,6 @@ import React from 'react';
 import Button from 'component/button';
 import Card from 'component/common/card';
 import Icon from 'component/common/icon';
-import I18nMessage from 'component/i18nMessage';
 import { Lbryio } from 'lbryinc';
 import { getStripeEnvironment } from 'util/stripe';
 let stripeEnvironment = getStripeEnvironment();
@@ -54,18 +53,15 @@ const WalletBalance = () => {
             </>
           }
           subtitle={
-            accountStatusResponse && accountStatusResponse.total_received_unpaid > 0 ? (
-              <I18nMessage>
-                This is your pending balance that will be automatically sent to your bank account.
-              </I18nMessage>
-            ) : (
-              <I18nMessage>When you begin to receive tips your balance will be updated here.</I18nMessage>
-            )
+            accountStatusResponse && accountStatusResponse.total_received_unpaid > 0
+              ? __('This is your pending balance that will be automatically sent to your bank account.')
+              : __('When you begin to receive tips your balance will be updated here.')
           }
           actions={
             <>
               <h2 className="section__title--small">
-                ${(accountStatusResponse && accountStatusResponse.total_received_unpaid / 100) || 0} {__('Total Received Tips')}
+                ${(accountStatusResponse && accountStatusResponse.total_received_unpaid / 100) || 0}{' '}
+                {__('Total Received Tips')}
               </h2>
 
               <h2 className="section__title--small">

ui/component/walletSend/view.jsx

@@ -6,8 +6,6 @@ import { Form, FormField } from 'component/common/form';
 import { Formik } from 'formik';
 import validateSendTx from 'util/form-validation';
 import Card from 'component/common/card';
-import I18nMessage from 'component/i18nMessage';
-import LbcSymbol from 'component/common/lbc-symbol';
 import WalletSpendableBalanceHelp from 'component/walletSpendableBalanceHelp';
 import classnames from 'classnames';
 import ChannelSelector from 'component/channelSelector';
@@ -88,9 +86,7 @@ class WalletSend extends React.PureComponent<Props> {
     return (
       <Card
         title={__('Send Credits')}
-        subtitle={
-          <I18nMessage tokens={{ lbc: <LbcSymbol /> }}>Send Credits to your friends or favorite creators.</I18nMessage>
-        }
+        subtitle={__('Send Credits to your friends or favorite creators.')}
         actions={
           <Formik
             initialValues={{

ui/page/buy/view.jsx

@@ -12,7 +12,6 @@ import { SUPPORTED_MOONPAY_COUNTRIES } from 'constants/moonpay';
 import { useHistory } from 'react-router';
 import Button from 'component/button';
 import Nag from 'component/common/nag';
-import I18nMessage from 'component/i18nMessage';
 import LbcSymbol from 'component/common/lbc-symbol';
 import { SIMPLE_SITE } from 'config';
 // import classnames from 'classnames';
@@ -97,19 +96,7 @@ export default function BuyPage(props: Props) {
 
   const title = __('Buy Credits');
   const subtitle = (
-    <I18nMessage
-      tokens={{
-        learn_more: (
-          <Button
-            button="link"
-            label={__('Learn more')}
-            href="https://odysee.com/@OdyseeHelp:b/BuyingSellingLBRYCredits:b"
-          />
-        ),
-      }}
-    >
-      %learn_more%.
-    </I18nMessage>
+    <Button button="link" label={__('Learn more')} href="https://odysee.com/@OdyseeHelp:b/BuyingSellingLBRYCredits:b" />
   );
 
   if (MOONPAY_DOWN) {

ui/page/top/view.jsx

@@ -7,7 +7,6 @@ import ClaimEffectiveAmount from 'component/claimEffectiveAmount';
 import SearchTopClaim from 'component/searchTopClaim';
 import * as CS from 'constants/claim_search';
 import Button from 'component/button';
-import I18nMessage from 'component/i18nMessage';
 import * as PAGES from 'constants/pages';
 import { SIMPLE_SITE } from 'config';
 
@@ -31,22 +30,8 @@ function TopPage(props: Props) {
         streamType={SIMPLE_SITE ? CS.CONTENT_ALL : undefined}
         meta={
           <div className="search__top-links">
-            <I18nMessage
-              tokens={{
-                repost: (
-                  <Button
-                    button="secondary"
-                    navigate={`/$/${PAGES.REPOST_NEW}?to=${queryName}`}
-                    label={__('Repost Here')}
-                  />
-                ),
-                publish: (
-                  <Button button="secondary" onClick={() => beginPublish(queryName)} label={__('Publish Here')} />
-                ),
-              }}
-            >
-              %repost% %publish%
-            </I18nMessage>
+            <Button button="secondary" navigate={`/$/${PAGES.REPOST_NEW}?to=${queryName}`} label={__('Repost Here')} />
+            <Button button="secondary" onClick={() => beginPublish(queryName)} label={__('Publish Here')} />
           </div>
         }
         includeSupportAction