diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml index a520c4aaf..7f91bd550 100644 --- a/client/src/locale/source/angular_en_US.xml +++ b/client/src/locale/source/angular_en_US.xml @@ -244,7 +244,7 @@ app/videos/+video-edit/shared/video-edit.component.html - 160 + 161 app/videos/+video-watch/video-watch.component.html @@ -299,8 +299,8 @@ app/shared/user-subscription/subscribe-button.component.html 18 - - Using an ActivityPub-compatible account + + Using an ActivityPub account app/shared/user-subscription/subscribe-button.component.html 36 @@ -309,31 +309,31 @@ Subscribe with an account on <x id="INTERPOLATION" equiv-text="{{ videoChannel.host }}"/> app/shared/user-subscription/subscribe-button.component.html - 40 + 39 Subscribe with your local account app/shared/user-subscription/subscribe-button.component.html - 41 + 40 - - Subscribe with a remote account: + + Subscribe with a Mastodon account: app/shared/user-subscription/subscribe-button.component.html - 44 + 43 Using a syndication feed app/shared/user-subscription/subscribe-button.component.html - 49 + 48 Subscribe via RSS app/shared/user-subscription/subscribe-button.component.html - 50 + 49 @@ -478,6 +478,16 @@ app/login/login.component.html 44 + + Login + + app/login/login.component.html + 51 + + + app/menu/menu.component.html + 38 + Forgot your password @@ -692,12 +702,6 @@ app/menu/menu.component.html 30 - - Login - - app/menu/menu.component.html - 38 - Create an account @@ -842,7 +846,7 @@ app/videos/+video-edit/shared/video-edit.component.html - 47 + 48 app/videos/+video-watch/video-watch.component.html @@ -856,7 +860,7 @@ app/videos/+video-edit/shared/video-edit.component.html - 61 + 62 app/videos/+video-watch/video-watch.component.html @@ -874,7 +878,7 @@ app/videos/+video-edit/shared/video-edit.component.html - 75 + 76 app/videos/+video-watch/video-watch.component.html @@ -940,9 +944,9 @@ app/videos/video-list/video-overview.component.html 6 - + - <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ object.tag }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>#<x id="INTERPOLATION" equiv-text="{{ object.tag }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> app/videos/video-list/video-overview.component.html @@ -1016,7 +1020,7 @@ app/videos/+video-edit/shared/video-edit.component.html - 26 + 27 Terms @@ -2191,6 +2195,10 @@ app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html 3 + + app/+my-account/my-account-videos/my-account-videos.component.html + 46 + Select the next owner @@ -2403,19 +2411,25 @@ When you will upload a video in this channel, the video support field will be au app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html - 22 + 30 + + + Current password + + app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html + 7 New password app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html - 7 + 15 Confirm new password app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html - 15 + 23 Default policy on videos containing sensitive content @@ -2459,6 +2473,18 @@ When you will upload a video in this channel, the video support field will be au app/+my-account/shared/actor-avatar-info.component.html 18 + + Once you delete your account, there is no going back. Please be certain. + + app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html + 2 + + + Delete your account + + app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html + 4 + Sorry, but we couldn't find the page you were looking for. @@ -2553,7 +2579,7 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/shared/video-edit.component.html - 38 + 39 Privacy @@ -2571,7 +2597,7 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/shared/video-edit.component.html - 89 + 90 app/videos/+video-watch/video-watch.component.html @@ -2633,6 +2659,12 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/video-add-components/video-import-torrent.component.html 6 + + Or + + app/videos/+video-edit/video-add-components/video-import-torrent.component.html + 11 + Paste magnet URI @@ -2731,47 +2763,59 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/shared/video-edit.component.html 18 + + + Tag + + app/videos/+video-edit/shared/video-edit.component.html + 21 + + + Enter a new tag + + app/videos/+video-edit/shared/video-edit.component.html + 21 + Video descriptions are truncated by default and require manual action to expand them. app/videos/+video-edit/shared/video-edit.component.html - 27 + 28 Schedule publication (<x id="INTERPOLATION" equiv-text="{{ calendarTimezone }}"/>) app/videos/+video-edit/shared/video-edit.component.html - 104 + 105 This video contains mature or explicit content app/videos/+video-edit/shared/video-edit.component.html - 118 + 119 Some instances do not list videos containing mature or explicit content by default. app/videos/+video-edit/shared/video-edit.component.html - 119 + 120 Enable video comments app/videos/+video-edit/shared/video-edit.component.html - 124 + 125 Wait transcoding before publishing the video app/videos/+video-edit/shared/video-edit.component.html - 129 + 130 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. app/videos/+video-edit/shared/video-edit.component.html - 130 + 131 Basic info @@ -2783,43 +2827,43 @@ When you will upload a video in this channel, the video support field will be au Add another caption app/videos/+video-edit/shared/video-edit.component.html - 145 + 146 See the subtitle file app/videos/+video-edit/shared/video-edit.component.html - 154 + 155 Already uploaded ✔ app/videos/+video-edit/shared/video-edit.component.html - 158 + 159 Will be created on update app/videos/+video-edit/shared/video-edit.component.html - 166 + 167 Cancel create app/videos/+video-edit/shared/video-edit.component.html - 168 + 169 Will be deleted on update app/videos/+video-edit/shared/video-edit.component.html - 174 + 175 Cancel deletion app/videos/+video-edit/shared/video-edit.component.html - 176 + 177 @@ -2827,31 +2871,31 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/shared/video-edit.component.html - 181 + 182 Captions app/videos/+video-edit/shared/video-edit.component.html - 138 + 139 Upload thumbnail app/videos/+video-edit/shared/video-edit.component.html - 194 + 195 Upload preview app/videos/+video-edit/shared/video-edit.component.html - 201 + 202 Support app/videos/+video-edit/shared/video-edit.component.html - 207 + 208 app/videos/+video-watch/modal/video-support.component.html @@ -2865,13 +2909,13 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). app/videos/+video-edit/shared/video-edit.component.html - 208 + 209 Advanced settings app/videos/+video-edit/shared/video-edit.component.html - 189 + 190 @@ -2915,7 +2959,7 @@ 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 - 42 + 47 Download @@ -3239,14 +3283,24 @@ 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 35 - + - Otherwise you can comment using an account on an ActivityPub-compatible instance: + Otherwise you can comment using an account on any ActivityPub-compatible instance. + On most platforms, you can find the video by typing its URL in the search bar and then comment it + from within the software's interface. app/videos/+video-watch/comment/video-comment-add.component.html 36 + + + If you have an account on Mastodon or Pleroma, you can open it directly in their interface: + + + app/videos/+video-watch/comment/video-comment-add.component.html + 41 + Highlighted comment @@ -4056,6 +4110,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Moderator + + src/app/+admin/users/shared/user.service.ts + 1 + + User <x id="INTERPOLATION" equiv-text="{{username}}"/> created. @@ -4158,6 +4219,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + You current password is invalid. + + src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts + 1 + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. @@ -4172,13 +4240,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Delete your account - - src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts - 1 - - Delete my account