diff --git a/package.json b/package.json index 6da2a2dd3..797b97589 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "jsmediatags": "^3.8.1", "json-loader": "^0.5.4", "lbry-format": "https://github.com/lbryio/lbry-format.git", - "lbry-redux": "lbryio/lbry-redux#3c862e72b36e620155b9c968be9b2bcbd9e0580c", + "lbry-redux": "lbryio/lbry-redux#141593500693a93db74c62ef5a9fe67b43896603", "lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845", "lint-staged": "^7.0.2", "localforage": "^1.7.1", diff --git a/static/locales/en.json b/static/locales/en.json index ed603704b..ea9c355a8 100644 --- a/static/locales/en.json +++ b/static/locales/en.json @@ -285,36 +285,13 @@ "Downloading stream... not long left now!": "Downloading stream... not long left now!", "Downloading: ": "Downloading: ", "% complete": "% complete", -<<<<<<< HEAD "Updates published": "Updates published", "Your updates have been published to LBRY at the address": "Your updates have been published to LBRY at the address", - "The updates will take a few minutes to appear for other LBRY users. Until then your file will be listed as \"pending\" under your published files.": "The updates will take a few minutes to appear for other LBRY users. Until then your file will be listed as \"pending\" under your published files." -} -======= - "Incompatible Daemon": "Incompatible Daemon", - "Incompatible daemon running": "Incompatible daemon running", - "Close App and LBRY Processes": "Close App and LBRY Processes", - "Continue Anyway": "Continue Anyway", - "This app is running with an incompatible version of the LBRY protocol. You can still use it, but there may be issues. Re-run the installation package for best results.": "This app is running with an incompatible version of the LBRY protocol. You can still use it, but there may be issues. Re-run the installation package for best results.", - "Update ready to install": "Update ready to install", - "Install now": "Install now", - "Upgrade available": "Upgrade available", - "LBRY Leveled Up": "LBRY Leveled Up", - "Upgrade": "Upgrade", - "Skip": "Skip", - "An updated version of LBRY is now available.": "An updated version of LBRY is now available.", - "Your version is out of date and may be unreliable or insecure.": "Your version is out of date and may be unreliable or insecure.", - "Want to know what has changed?": "Want to know what has changed?", - "release notes": "release notes", + "The updates will take a few minutes to appear for other LBRY users. Until then your file will be listed as \"pending\" under your published files.": "The updates will take a few minutes to appear for other LBRY users. Until then your file will be listed as \"pending\" under your published files.", + "Comments": "Comments", + "Comment": "Comment", "Your comment": "Your comment", "Post": "Post", - "Uh oh. The flux in our Retro Encabulator must be out of whack. Try refreshing to fix it.": "Uh oh. The flux in our Retro Encabulator must be out of whack. Try refreshing to fix it.", - "If you still have issues, your anti-virus software or firewall may be preventing startup.": "If you still have issues, your anti-virus software or firewall may be preventing startup.", - "Reach out to hello@lbry.com for help, or check out": "Reach out to hello@lbry.com for help, or check out", - "Got it!": "Got it!", - "URI does not include name.": "URI does not include name.", - "Invalid claim ID %s.": "Invalid claim ID %s.", - "Comment": "Comment", "Channel": "Channel", - "Comments": "Comments" -}>>>>>>> comments cleanup + "No modifier provided after separator %s.": "No modifier provided after separator %s." +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index cafcd5f58..d233c5a2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6641,9 +6641,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4: yargs "^13.2.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#3c862e72b36e620155b9c968be9b2bcbd9e0580c: +lbry-redux@lbryio/lbry-redux#141593500693a93db74c62ef5a9fe67b43896603: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/3c862e72b36e620155b9c968be9b2bcbd9e0580c" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/141593500693a93db74c62ef5a9fe67b43896603" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0"