CHANGELOG.md

@@ -5,21 +5,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased for Desktop]
 
-## [0.52.1-alpha.3] - [2021-12-31]
+## [0.52.1-alpha.4] - [2021-12-31]
 
 ### Added
 
 - Reenabled generating thumbs from video ([#7384](https://github.com/lbryio/lbry-desktop/pull/7409))
+- Brought in playlist drag and drop playlist reordering _odysee team!_ ([#7442](https://github.com/lbryio/lbry-desktop/pull/7442))
+- Added duration overlays to ClaimPreview component ([#7420](https://github.com/lbryio/lbry-desktop/pull/7420))
+- Some Horizontal Scroll groundwork from _odysee team!_ 
+- Comment Emotes and Stickers and Mentions refactors from _odysee team!_ ([#7435](https://github.com/lbryio/lbry-desktop/pull/7435))
 
 ### Changed
 
 - Upgraded Electron to v15 ([#7384](https://github.com/lbryio/lbry-desktop/pull/7384))
 - Performance improvements in some selectors ([#7370](https://github.com/lbryio/lbry-desktop/pull/7370))
+- More Header refactoring from _odysee team!_ ([#7441](https://github.com/lbryio/lbry-desktop/pull/7441))
+- Header refactoring from _odysee team!_ ([#7440](https://github.com/lbryio/lbry-desktop/pull/7440))
+- Clearer data hosting ui _incomplete_ ([#7438](https://github.com/lbryio/lbry-desktop/pull/7438))
+- Updated c: control tags from _odysee team!_ ([#7433](https://github.com/lbryio/lbry-desktop/pull/7433))
 
 ### Fixed
 
 - Several fallout bugs from recent changes
-- Added duration overlays to ClaimPreview component ([#7420](https://github.com/lbryio/lbry-desktop/pull/7420))
 
 ## [0.52.0] - [2021-12-31]
 

static/app-strings.json

@@ -2255,5 +2255,19 @@
   "Move Bottom": "Move Bottom",
   "Move Up": "Move Up",
   "Move Down": "Move Down",
+  "Trending for #Game": "Trending for #Game",
+  "Help the P2P data network by hosting data.": "Help the P2P data network by hosting data.",
+  "History hosting lets you choose how much storage to use helping content you've consumed.": "History hosting lets you choose how much storage to use helping content you've consumed.",
+  "Automatic hosting lets you delegate some amount of storage for the network to automatically download ad host.": "Automatic hosting lets you delegate some amount of storage for the network to automatically download ad host.",
+  "Playing videos may exceed your history hosting limit until cleanup runs every 30 minutes.": "Playing videos may exceed your history hosting limit until cleanup runs every 30 minutes.",
+  "History: Limit (GB)": "History: Limit (GB)",
+  "Automatic: Allow (GB)": "Automatic: Allow (GB)",
+  "Automatic hosting lets you delegate some amount of storage for the network to automatically download and host.": "Automatic hosting lets you delegate some amount of storage for the network to automatically download and host.",
+  "History Hosting": "History Hosting",
+  "Automatic Hosting": "Automatic Hosting",
+  "History Hosting lets you choose how much storage to use helping content you've consumed.": "History Hosting lets you choose how much storage to use helping content you've consumed.",
+  "Automatic Hosting lets you delegate some amount of storage for the network to automatically download and host.": "Automatic Hosting lets you delegate some amount of storage for the network to automatically download and host.",
+  "Help improve the P2P data network (and make LBRY happy) by hosting data.": "Help improve the P2P data network (and make LBRY happy) by hosting data.",
+  "Limit Hosting of Content History": "Limit Hosting of Content History",
   "--end--": "--end--"
 }

ui/component/settingSystem/view.jsx

@@ -220,11 +220,14 @@ export default function SettingSystem(props: Props) {
               multirow
               subtitle={
                 <React.Fragment>
-                  {__('Content Data Hosting helps to seed things that you watch and download.')}{' '}
-                  {__('Network Data Hosting allows the p2p network to store blobs unrelated to your browsing.')}{' '}
-                  {__("If disabled, LBRY will be very sad and you won't be helping improve the network.")}{' '}
-                  {__('If you set a limit, playing videos may exceed your limit until cleanup runs every 30 minutes.')}{' '}
-                  <Button button="link" label={__('Learn more')} href="https://lbry.com/faq/host-content" />.
+                  {__('Help improve the P2P data network (and make LBRY happy) by hosting data.')}{' '}
+                  {__("History Hosting lets you choose how much storage to use helping content you've consumed.")}{' '}
+                  {__(
+                    'Automatic Hosting lets you delegate some amount of storage for the network to automatically download and host.'
+                  )}{' '}
+                  {__('Playing videos may exceed your history hosting limit until cleanup runs every 30 minutes.')}
+                  <br />
+                  <Button button="link" label={__('Learn more')} href="https://lbry.com/faq/host-content" />
                 </React.Fragment>
               }
             >
@@ -239,9 +242,9 @@ export default function SettingSystem(props: Props) {
               </fieldset-section>
               {daemonSettings.save_blobs && (
                 <fieldset-section>
-                  <div className={'settings__row-section-title'}>{__('Hosting for content you have downloaded')}</div>
+                  <div className={'settings__row-section-title'}>{__('History Hosting')}</div>
                   <p className={'help'}>
-                    {`Content Hosting using ${formatBytes(contentSpaceUsed * BYTES_PER_MB)} of ${
+                    {`History Hosting using ${formatBytes(contentSpaceUsed * BYTES_PER_MB)} of ${
                       daemonSettings[DAEMON_SETTINGS.BLOB_STORAGE_LIMIT_MB]
                         ? formatBytes(daemonSettings[DAEMON_SETTINGS.BLOB_STORAGE_LIMIT_MB] * BYTES_PER_MB)
                         : 'Unlimited'
@@ -256,7 +259,7 @@ export default function SettingSystem(props: Props) {
                     name="limit_space_used"
                     onChange={() => handleLimitSpace(!limitSpace)}
                     checked={limitSpace}
-                    label={__('Limit Hosting for Content you Use')}
+                    label={__('Limit Hosting of Content History')}
                   />
                 </fieldset-section>
               )}
@@ -265,7 +268,7 @@ export default function SettingSystem(props: Props) {
                 <FormField
                   name="content_blob_limit_gb"
                   type="text"
-                  label={__(`Content: Limit (GB)`)}
+                  label={__(`Limit (GB)`)}
                   disabled={!daemonSettings.save_blobs}
                   onChange={(e) => updateContentBlobLimitField(e.target.value)}
                   value={contentBlobSpaceLimitGB}
@@ -281,9 +284,9 @@ export default function SettingSystem(props: Props) {
               )}
               {daemonSettings.save_blobs && (
                 <fieldset-section>
-                  <div className={'settings__row-section-title'}>{__('Hosting content selected by the network')}</div>
+                  <div className={'settings__row-section-title'}>{__('Automatic Hosting')}</div>
                   <p className={'help'}>
-                    {`Network Hosting using ${formatBytes(networkSpaceUsed * BYTES_PER_MB)} of ${formatBytes(
+                    {`Automatic Hosting using ${formatBytes(networkSpaceUsed * BYTES_PER_MB)} of ${formatBytes(
                       daemonSettings[DAEMON_SETTINGS.NETWORK_STORAGE_LIMIT_MB] * BYTES_PER_MB
                     )}`}
                   </p>
@@ -293,7 +296,7 @@ export default function SettingSystem(props: Props) {
                 <FormField
                   name="network_blob_limit_gb"
                   type="text"
-                  label={__(`Network: Allow (GB)`)}
+                  label={__(`Allow (GB)`)}
                   disabled={!daemonSettings.save_blobs}
                   onChange={(e) => updateNetworkBlobLimitField(e.target.value)}
                   value={networkBlobSpaceLimitGB}