update language

package.json

@@ -124,7 +124,7 @@
     "jsmediatags": "^3.8.1",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#5080eb3ea1f09ce03c4f50d9224feddf737628d3",
+    "lbry-redux": "lbryio/lbry-redux#e550f0ff0448fcad5f3d0365ec7ad744376b41cf",
     "lbryinc": "lbryio/lbryinc#a93596c51c8fb0a226cb84df04c26a6bb60a45fb",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",

src/ui/modal/modalSendTip/view.jsx

@@ -22,7 +22,13 @@ class ModalSendTip extends React.PureComponent<Props> {
         type="custom"
         title={
           <React.Fragment>
-            {claimIsMine ? __('Add support to') : __('Send a tip')} <UriIndicator uri={uri} />
+            {claimIsMine || isSupport ? (
+              __('Add support to this claim')
+            ) : (
+              <span>
+                {__('Send a tip to')} <UriIndicator uri={uri} />
+              </span>
+            )}
           </React.Fragment>
         }
       >

static/locales/en.json

@@ -575,61 +575,22 @@
   "Confirm Claim Revoke": "Confirm Claim Revoke",
   "Are you sure you want to remove this support?": "Are you sure you want to remove this support?",
   "These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance.": "These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance.",
-<<<<<<< HEAD
   "Invalid character %s in name: %s.": "Invalid character %s in name: %s.",
   "The better your tags are, the easier it will be for people to discover your channel.": "The better your tags are, the easier it will be for people to discover your channel.",
   "Thumbnail (300 x 300)": "Thumbnail (300 x 300)",
-  "Cover (1000 x 160)": "Cover (1000 x 160)"
+  "Cover (1000 x 160)": "Cover (1000 x 160)",
-=======
-  "Enable option to support claims.": "Enable option to support claims.",
-  "Similar to tipping, but a deposit is held in your own wallet. Still affects trending and top calculations, as well as ": "Similar to tipping, but a deposit is held in your own wallet. Still affects trending and top calculations, as well as ",
-  "vanity names": "vanity names",
-  "Can be undone at any time via the transactions page.": "Can be undone at any time via the transactions page.",
-  "Learn more about discovery and trending": "Learn more about discovery and trending",
-  "Similar to tipping, but a deposit is held in your own wallet. Still affects discovery (trending and top calculations) and ": "Similar to tipping, but a deposit is held in your own wallet. Still affects discovery (trending and top calculations) and ",
-  "hello": "hello",
-  "Show mature content": "Show mature content",
-  "mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction.  ": "mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction.  ",
-  " Can be undone at any time via the transactions page.": " Can be undone at any time via the transactions page.",
-  " Can be undone at any time via the transactions page. ": " Can be undone at any time via the transactions page. ",
-  "Similar to tipping, but a deposit is held in your own wallet. Still affects ": "Similar to tipping, but a deposit is held in your own wallet. Still affects ",
-  " discovery (trending and top calculations)": " discovery (trending and top calculations)",
-  " and ": " and ",
-  " discovery via trending and top calculations)": " discovery via trending and top calculations)",
-  " as well as ": " as well as ",
-  " discovery via trending and top calculations": " discovery via trending and top calculations",
-  "This will appear as a tip for ": "This will appear as a tip for ",
-  "This will increase the overall bid amount for ": "This will increase the overall bid amount for ",
-  "Similar to tipping, except the LBC remains yours and can be withdrawn at any time. Still affects ": "Similar to tipping, except the LBC remains yours and can be withdrawn at any time. Still affects ",
   "The tags you follow will change what's trending for you. ": "The tags you follow will change what's trending for you. ",
-  "Are you sure want to revoke this claim?": "Are you sure want to revoke this claim?",
+  "Mature": "Mature",
-  "This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee.": "This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee.",
+  "This will increase the overall bid amount for ": "This will increase the overall bid amount for ",
-  "Enable claim support.": "Enable claim support.",
+  "This will appear as a tip for ": "This will appear as a tip for ",
-  "Similar to tipping, except the LBC remains yours and can be withdrawn at any time. Supports influence ": "Similar to tipping, except the LBC remains yours and can be withdrawn at any time. Supports influence ",
+  "Show mature content": "Show mature content",
+  "Mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction.  ": "Mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction.  ",
   "Encrypt my wallet with a custom password": "Encrypt my wallet with a custom password",
   "Enable claim support": "Enable claim support",
-  "Similar to tipping, supports help": "Similar to tipping, supports help",
-  " discovery, trending and top calculations": " discovery, trending and top calculations",
-  "but the LBC remains yours and can be withdrawn at any time. ": "but the LBC remains yours and can be withdrawn at any time. ",
-  " Both also help secure ": " Both also help secure ",
-  "Similar to tipping, supports help ": "Similar to tipping, supports help ",
-  " discovery, trending and top calculations ": " discovery, trending and top calculations ",
-  "Mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction.  ": "Mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction.  ",
-  " but the LBC remains yours and can be withdrawn at any time. ": " but the LBC remains yours and can be withdrawn at any time. ",
-  " but the LBC is returned to you when revoked.": " but the LBC is returned to you when revoked.",
-  " but the LBC is returned to you if revoked.": " but the LBC is returned to you if revoked.",
-  " but the LBC is returned to your wallet if revoked.": " but the LBC is returned to your wallet if revoked.",
-  " but the LBC is returned to youself if revoked.": " but the LBC is returned to youself if revoked.",
-  " but the LBC is returned to youself, if revoked.": " but the LBC is returned to youself, if revoked.",
-  " but the LBC is returned to yourself if revoked.": " but the LBC is returned to yourself if revoked.",
-  "This will add a Support button next to the tipping option. Similar to tipping, supports help ": "This will add a Support button next to the tipping option. Similar to tipping, supports help ",
-  "This will add a Support button next to the tipping option. Similar to tips, supports help ": "This will add a Support button next to the tipping option. Similar to tips, supports help ",
-  "This will add a Support button next to `Send a Tip`. Similar to tips, supports help ": "This will add a Support button next to `Send a Tip`. Similar to tips, supports help ",
-  "This will add a Support button next to \"Send a Tip\". Similar to tips, supports help ": "This will add a Support button next to \"Send a Tip\". Similar to tips, supports help ",
   "This will add a Support button along side tipping. Similar to tips, supports help ": "This will add a Support button along side tipping. Similar to tips, supports help ",
-  "Invalid character %s in name: %s.": "Invalid character %s in name: %s.",
   " discovery ": " discovery ",
-  "This will add a Support button along side Tips. Similar to tips, supports help ": "This will add a Support button along side Tips. Similar to tips, supports help ",
+  " but the LBC is returned to your wallet if revoked.": " but the LBC is returned to your wallet if revoked.",
-  "This will add a Support button along side Tip. Similar to tips, supports help ": "This will add a Support button along side Tip. Similar to tips, supports help "
+  " Both also help secure ": " Both also help secure ",
->>>>>>> feat: experimental support option
+  "vanity names": "vanity names",
+  "Add support to this claim": "Add support to this claim"
 }

yarn.lock

@@ -6653,15 +6653,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
-<<<<<<< HEAD
+lbry-redux@lbryio/lbry-redux#e550f0ff0448fcad5f3d0365ec7ad744376b41cf:
-lbry-redux@lbryio/lbry-redux#5080eb3ea1f09ce03c4f50d9224feddf737628d3:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/5080eb3ea1f09ce03c4f50d9224feddf737628d3"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/e550f0ff0448fcad5f3d0365ec7ad744376b41cf"
-=======
-lbry-redux@lbryio/lbry-redux#ee93a47f893052d6a94b6439eb09eb3fb976f90c:
-  version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/ee93a47f893052d6a94b6439eb09eb3fb976f90c"
->>>>>>> feat: experimental support option
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"