LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

so much discovery I can't take it #2617

Merged
neb-b merged 20 commits from fixes into master 2019-07-23 01:45:30 +02:00
Conversation 1 Commits 20 Files changed 47 +2 -23
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dfcb80ac56 - Show all commits

21
static/locales/en.json
View file

@ -542,7 +542,6 @@
"Upgrade is ready to install": "Upgrade is ready to install", "Upgrade is ready to install": "Upgrade is ready to install",
"Upgrade is ready": "Upgrade is ready", "Upgrade is ready": "Upgrade is ready",
"Abandon the claim for this URI": "Abandon the claim for this URI", "Abandon the claim for this URI": "Abandon the claim for this URI",
<<<<<<< HEAD
"For video content, use MP4s in H264/AAC format for best compatibility.": "For video content, use MP4s in H264/AAC format for best compatibility.", "For video content, use MP4s in H264/AAC format for best compatibility.": "For video content, use MP4s in H264/AAC format for best compatibility.",
"Read the App Basics FAQ": "Read the App Basics FAQ", "Read the App Basics FAQ": "Read the App Basics FAQ",
"View all LBRY FAQs": "View all LBRY FAQs", "View all LBRY FAQs": "View all LBRY FAQs",
@ -578,23 +577,3 @@
"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.", "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.",
"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." "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."
} }
=======
"View Tag": "View Tag",
"Invalid claim ID %s.": "Invalid claim ID %s.",
"Invalid character %s in name: %s.": "Invalid character %s in name: %s.",
"LBRY names cannot contain spaces or reserved symbols ($#@;/\"<>%{}|^~[]`)": "LBRY names cannot contain spaces or reserved symbols ($#@;/\"<>%{}|^~[]`)",
"No transactions.": "No transactions.",
"Today": "Today",
"This": "This",
"All time": "All time",
"Thumbnail (300 x 300)": "Thumbnail (300 x 300)",
"Cover (1000 x 160)": "Cover (1000 x 160)",
"No path provided after /": "No path provided after /",
"Connection Failure": "Connection Failure",
"Try closing all LBRY processes and starting again. If this still happens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.com if you think this is a software bug.": "Try closing all LBRY processes and starting again. If this still happens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.com if you think this is a software bug.",
"Unable to Authenticate": "Unable to Authenticate",
"Authentication Failure": "Authentication Failure",
"Reload": "Reload",
"If reloading does not fix this, or you see this at every start up, please email help@lbry.com.": "If reloading does not fix this, or you see this at every start up, please email help@lbry.com."
}
>>>>>>> restore that shit

4
yarn.lock
View file

@ -6653,9 +6653,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
yargs "^13.2.2" yargs "^13.2.2"
zstd-codec "^0.1.1" zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#6406f184e8c87d79f4adb2b8792ff3643f4527ea: lbry-redux@lbryio/lbry-redux#122acf2266f6ef554d797e107fd06fb02bccd750:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/6406f184e8c87d79f4adb2b8792ff3643f4527ea" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/122acf2266f6ef554d797e107fd06fb02bccd750"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"