Fix strings that cannot be merged by xlf-merge

diff --git a/client/src/app/+admin/follows/following-list/follow-modal.component.ts b/client/src/app/+admin/follows/following-list/follow-modal.component.ts
index bac7b2b0186d8605dfba9a862962597de2ba44c8..07cc75d779864e4143091047391ebbfb55b8341d 100644 (file)
--- a/client/src/app/+admin/follows/following-list/follow-modal.component.ts
+++ b/client/src/app/+admin/follows/following-list/follow-modal.component.ts
@@ -62,7 +62,7 @@ export class FollowModalComponent extends FormReactive implements OnInit {
       .subscribe({
         next: () => {
           this.notifier.success(
-            prepareIcu($localize`{count, plural, =1 {Follow request} other {Follow requests}} sent!`)(
+            prepareIcu($localize`{count, plural, =1 {Follow request sent!} other {Follow requests sent!}}`)(
               { count: hostsOrHandles.length },
               $localize`Follow request(s) sent!`
             )

diff --git a/client/src/app/+admin/overview/comments/video-comment-list.component.ts b/client/src/app/+admin/overview/comments/video-comment-list.component.ts
index f1b27d846d70ce8e38ec7567d81bc7efe73eee0c..f01a1629b6c92fb48bf64353a4c63dbd63ddefbc 100644 (file)
--- a/client/src/app/+admin/overview/comments/video-comment-list.component.ts
+++ b/client/src/app/+admin/overview/comments/video-comment-list.component.ts
@@ -147,7 +147,7 @@ export class VideoCommentListComponent extends RestTable implements OnInit {
       .subscribe({
         next: () => {
           this.notifier.success(
-            prepareIcu($localize`{count, plural, =1 {1 comment} other {{count} comments}} deleted.`)(
+            prepareIcu($localize`{count, plural, =1 {1 comment deleted.} other {{count} comments deleted.}}`)(
               { count: commentArgs.length },
               $localize`${commentArgs.length} comment(s) deleted.`
             )

diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
index c3a7646cc8b7da97c9884e96261e9cdc1b513c8e..91f42546b2594b7b35ad4aec150685ce5f09c36d 100644 (file)
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
@@ -224,7 +224,7 @@ export class UserListComponent extends RestTable implements OnInit {
         .subscribe({
           next: () => {
             this.notifier.success(
-              prepareIcu($localize`{count, plural, =1 {1 user} other {{count} users}} unbanned.`)(
+              prepareIcu($localize`{count, plural, =1 {1 user unbanned.} other {{count} users unbanned.}}`)(
                 { count: users.length },
                 $localize`${users.length} users unbanned.`
               )
@@ -253,7 +253,7 @@ export class UserListComponent extends RestTable implements OnInit {
       .subscribe({
         next: () => {
           this.notifier.success(
-            prepareIcu($localize`{count, plural, =1 {1 user} other {{count} users}} deleted.`)(
+            prepareIcu($localize`{count, plural, =1 {1 user deleted.} other {{count} users deleted.}}`)(
               { count: users.length },
               $localize`${users.length} users deleted.`
             )
@@ -271,7 +271,7 @@ export class UserListComponent extends RestTable implements OnInit {
       .subscribe({
         next: () => {
           this.notifier.success(
-            prepareIcu($localize`{count, plural, =1 {1 user} other {{count} users}} email set as verified.`)(
+            prepareIcu($localize`{count, plural, =1 {1 user email set as verified.} other {{count} user emails set as verified.}}`)(
               { count: users.length },
               $localize`${users.length} users email set as verified.`
             )

diff --git a/client/src/app/shared/shared-moderation/user-ban-modal.component.ts b/client/src/app/shared/shared-moderation/user-ban-modal.component.ts
index 8b483499a6c63aa592c16f255e16fe2f48b85d27..617408f2a641b389c3138c45702863cc0aac16d5 100644 (file)
--- a/client/src/app/shared/shared-moderation/user-ban-modal.component.ts
+++ b/client/src/app/shared/shared-moderation/user-ban-modal.component.ts
@@ -67,7 +67,7 @@ export class UserBanModalComponent extends FormReactive implements OnInit {
           let message: string
 
           if (Array.isArray(this.usersToBan)) {
-            message = prepareIcu($localize`{count, plural, =1 {1 user} other {{count} users}} banned.`)(
+            message = prepareIcu($localize`{count, plural, =1 {1 user banned.} other {{count} users banned.}}`)(
               { count: this.usersToBan.length },
               $localize`${this.usersToBan.length} users banned.`
             )

diff --git a/client/src/app/shared/shared-moderation/video-block.component.ts b/client/src/app/shared/shared-moderation/video-block.component.ts
index e14473b89cb4fe220958dee90593714e8eaec826..f8b22a3f61175be55cccab06dda85a0f162184f5 100644 (file)
--- a/client/src/app/shared/shared-moderation/video-block.component.ts
+++ b/client/src/app/shared/shared-moderation/video-block.component.ts
@@ -81,7 +81,7 @@ export class VideoBlockComponent extends FormReactive implements OnInit {
     this.videoBlocklistService.blockVideo(options)
         .subscribe({
           next: () => {
-            const message = prepareIcu($localize`{count, plural, =1 {Blocked {videoName}} other {Blocked {count} videos}}.`)(
+            const message = prepareIcu($localize`{count, plural, =1 {Blocked {videoName}.} other {Blocked {count} videos.}}`)(
               { count: this.videos.length, videoName: this.getSingleVideo().name },
               $localize`Blocked ${this.videos.length} videos.`
             )