diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html index 9441edfb1..4a48f4649 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html +++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html @@ -28,7 +28,7 @@ -
+
If you have an account on this instance, you can login: diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml index 592d81a42..a520c4aaf 100644 --- a/client/src/locale/source/angular_en_US.xml +++ b/client/src/locale/source/angular_en_US.xml @@ -278,29 +278,84 @@ app/shared/misc/help.component.html 19 - + - <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span>"/>Subscribe<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> - <x id="START_TAG_SPAN_1" ctype="x-span" equiv-text="<span>"/> - <x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount | myNumberFormatter }}"/> - <x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> - + <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span>"/> + Subscribe + <x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> + <x id="START_TAG_SPAN_1" ctype="x-span" equiv-text="<span>"/> + <x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount | myNumberFormatter }}"/> + <x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> + app/shared/user-subscription/subscribe-button.component.html - 1 + 5 - - Subscribed + + + Unsubscribe + app/shared/user-subscription/subscribe-button.component.html - 9 + 18 - - Unsubscribe + + Using an ActivityPub-compatible account app/shared/user-subscription/subscribe-button.component.html + 36 + + + Subscribe with an account on <x id="INTERPOLATION" equiv-text="{{ videoChannel.host }}"/> + + app/shared/user-subscription/subscribe-button.component.html + 40 + + + Subscribe with your local account + + app/shared/user-subscription/subscribe-button.component.html + 41 + + + Subscribe with a remote account: + + app/shared/user-subscription/subscribe-button.component.html + 44 + + + Using a syndication feed + + app/shared/user-subscription/subscribe-button.component.html + 49 + + + Subscribe via RSS + + app/shared/user-subscription/subscribe-button.component.html + 50 + + + + <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span>"/>Remote subscribe<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> + <x id="START_TAG_SPAN_1" ctype="x-span" equiv-text="<span>"/>Remote interact<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/> + + + app/shared/user-subscription/remote-subscribe.component.html 10 + + You can subscribe to the channel via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there. + + app/shared/user-subscription/remote-subscribe.component.html + 17 + + + You can interact with this via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there. + + app/shared/user-subscription/remote-subscribe.component.html + 22 + Video quota @@ -719,11 +774,17 @@ app/+video-channels/video-channels.component.html 25 + + Show keyboard shortcuts + + app/menu/menu.component.html + 91 + Toggle dark interface app/menu/menu.component.html - 91 + 94 Search... @@ -785,7 +846,7 @@ app/videos/+video-watch/video-watch.component.html - 166 + 164 Licence @@ -799,7 +860,7 @@ app/videos/+video-watch/video-watch.component.html - 175 + 173 Language @@ -817,7 +878,7 @@ app/videos/+video-watch/video-watch.component.html - 184 + 182 All of these tags @@ -1713,6 +1774,26 @@ app/+my-account/my-account-video-imports/my-account-video-imports.component.html 11 + + Accepted + + app/+admin/follows/followers-list/followers-list.component.html + 23 + + + app/+admin/follows/following-list/following-list.component.html + 21 + + + Pending + + app/+admin/follows/followers-list/followers-list.component.html + 24 + + + app/+admin/follows/following-list/following-list.component.html + 22 + Redundancy allowed @@ -2494,7 +2575,7 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/video-watch.component.html - 161 + 159 @@ -2642,7 +2723,7 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/video-watch.component.html - 193 + 191 Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. @@ -2832,6 +2913,10 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/modal/video-download.component.html 43 + + app/videos/+video-watch/comment/video-comment-add.component.html + 42 + Download @@ -3032,29 +3117,23 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/video-watch.component.html 133 - - You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@<x id="INTERPOLATION" equiv-text="{{video.account.name}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/></strong> and subscribe there. - - app/videos/+video-watch/video-watch.component.html - 138 - Show more app/videos/+video-watch/video-watch.component.html - 148 + 146 Show less app/videos/+video-watch/video-watch.component.html - 154 + 152 Friendly Reminder: app/videos/+video-watch/video-watch.component.html - 210 + 208 @@ -3062,19 +3141,19 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/video-watch.component.html - 211 + 209 More information app/videos/+video-watch/video-watch.component.html - 214 + 212 Get more information app/videos/+video-watch/video-watch.component.html - 214 + 212 @@ -3082,7 +3161,7 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/video-watch.component.html - 217 + 215 @@ -3110,13 +3189,13 @@ When you will upload a video in this channel, the video support field will be au No comments. app/videos/+video-watch/comment/video-comments.component.html - 19 + 18 View all <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> replies app/videos/+video-watch/comment/video-comments.component.html - 56 + 55 @@ -3124,7 +3203,7 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/comment/video-comments.component.html - 65 + 64 Add comment... @@ -3138,7 +3217,35 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/comment/video-comment-add.component.html - 18 + 20 + + + You are one step away from commenting + + app/videos/+video-watch/comment/video-comment-add.component.html + 28 + + + + If you have an account on this instance, you can login: + + + app/videos/+video-watch/comment/video-comment-add.component.html + 32 + + + login to comment + + app/videos/+video-watch/comment/video-comment-add.component.html + 35 + + + + Otherwise you can comment using an account on an ActivityPub-compatible instance: + + + app/videos/+video-watch/comment/video-comment-add.component.html + 36 Highlighted comment @@ -3193,6 +3300,48 @@ When you will upload a video in this channel, the video support field will be au 1 + + 240p + + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts + 1 + + + + 360p + + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts + 1 + + + + 480p + + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts + 1 + + + + 720p + + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts + 1 + + + + 1080p + + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts + 1 + + + + Auto (via ffmpeg) + + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts + 1 + + Error @@ -3665,6 +3814,100 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unlimited + + src/app/+admin/config/shared/config.service.ts + 1 + + + src/app/+admin/config/shared/config.service.ts + 1 + + + src/app/+admin/users/shared/user.service.ts + 1 + + + src/app/+my-account/my-account-settings/my-account-settings.component.ts + 1 + + + + 100MB + + src/app/+admin/config/shared/config.service.ts + 1 + + + src/app/+admin/config/shared/config.service.ts + 1 + + + + 500MB + + src/app/+admin/config/shared/config.service.ts + 1 + + + src/app/+admin/config/shared/config.service.ts + 1 + + + + 1GB + + src/app/+admin/config/shared/config.service.ts + 1 + + + + 5GB + + src/app/+admin/config/shared/config.service.ts + 1 + + + src/app/+admin/config/shared/config.service.ts + 1 + + + + 20GB + + src/app/+admin/config/shared/config.service.ts + 1 + + + + 50GB + + src/app/+admin/config/shared/config.service.ts + 1 + + + + 10MB + + src/app/+admin/config/shared/config.service.ts + 1 + + + + 50MB + + src/app/+admin/config/shared/config.service.ts + 1 + + + + 2GB + + src/app/+admin/config/shared/config.service.ts + 1 + + <x id="INTERPOLATION" equiv-text="{{host}}"/> is not valid @@ -3813,17 +4056,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Unlimited - - src/app/+admin/users/shared/user.service.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-settings.component.ts - 1 - - User <x id="INTERPOLATION" equiv-text="{{username}}"/> created. @@ -5397,6 +5629,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Subscribed + + src/app/shared/user-subscription/subscribe-button.component.ts + 1 + + Subscribed to <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>