Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/main.js

src/main/main.js

@@ -135,6 +135,8 @@ function createWindow () {
     ? new BrowserWindow({backgroundColor: '#155B4A', minWidth: 800, minHeight: 600, webPreferences: {webSecurity: false}})
     : new BrowserWindow({backgroundColor: '#155B4A', minWidth: 800, minHeight: 600});
 
+  win.webContents.session.setUserAgent(`LBRY/${localVersion}`);
+
   win.maximize()
   if (isDevelopment) {
     win.webContents.openDevTools();

src/renderer/redux/actions/content.js

@@ -280,13 +280,17 @@ export function doLoadVideo(uri) {
           dispatch(doDownloadFile(uri, streamInfo));
         }
       })
-      .catch(error => {
+      .catch(() => {
         dispatch(doSetPlayingUri(null));
         dispatch({
           type: types.LOADING_VIDEO_FAILED,
           data: { uri },
         });
-        dispatch(doAlertError(error));
+        dispatch(
+          doAlertError(
+            `Failed to download ${uri}, please try again. If this problem persists, visit https://lbry.io/faq/support for support.`
+          )
+        );
       });
   };
 }