Merge branch 'release/1.4.0' into develop

diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss
index 996024adeb7f6d20cba4ba670972b63e442845d1..039cf7e00d3ef082b7efa245deb6bec7286284a9 100644 (file)
--- a/client/src/sass/player/peertube-skin.scss
+++ b/client/src/sass/player/peertube-skin.scss
@@ -20,11 +20,6 @@
   .vjs-dock-description {
     font-size: 11px;
 
-    .text::before, .text::after {
-      display: inline-block;
-      content: '\1F308';
-    }
-
     .text::before {
       margin-right: 4px;
     }

diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index 6ff3efef1afd6ebc551b6da4417404b253e665cd..19d2a1d023d73fb29a3c92c6e8790e656784c1eb 100644 (file)
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -239,7 +239,7 @@ export class PeerTubeEmbed {
 
       const config: ServerConfig = await configResponse.json()
       const description = config.tracker.enabled && this.warningTitle
-        ? '<span class="text">' + this.player.localize('Uses P2P, others may know your IP is downloading this video.') + '</span>'
+        ? '<span class="text">' + this.player.localize('Watching this video may reveal your IP address to others.') + '</span>'
         : undefined
 
       this.player.dock({