From 1b5c92f9484342da0d3d5b7093f95bc2412408fe Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Thu, 19 Sep 2024 16:21:15 +0200
Subject: [PATCH 01/11] [PM-11503] Organization Automatic Sync verbiage is
 misleading

---
 .../billing/organizations/billing-sync-key.component.html   | 2 +-
 .../organization-subscription-selfhost.component.html       | 6 +++---
 apps/web/src/locales/en/messages.json                       | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/billing-sync-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-key.component.html
index 808cd83ec67..5f6b8482875 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-key.component.html
+++ b/apps/web/src/app/billing/organizations/billing-sync-key.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog>
     <h1 bitDialogTitle>
-      {{ "manageBillingSync" | i18n }}
+      {{ "manageBillingTokenSync" | i18n }}
     </h1>
     <div bitDialogContent>
       <p>{{ "billingSyncKeyDesc" | i18n }}</p>
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
index 0a029de79dc..5a1ccc0768a 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
@@ -90,7 +90,7 @@ <h2 class="mt-5">
             </a>
           </bit-label>
           <bit-hint>
-            {{ "billingSyncDesc" | i18n }}
+            {{ "automaticBillingSyncDesc" | i18n }}
           </bit-hint>
         </bit-radio-button>
         <ng-container *ngIf="updateMethod === licenseOptions.SYNC">
@@ -100,7 +100,7 @@ <h2 class="mt-5">
             type="button"
             (click)="manageBillingSyncSelfHosted()"
           >
-            {{ "manageBillingSync" | i18n }}
+            {{ "manageBillingTokenSync" | i18n }}
           </button>
           <button
             bitButton
@@ -121,7 +121,7 @@ <h2 class="mt-5">
         >
           <bit-label>{{ "manualUpload" | i18n }}</bit-label>
           <bit-hint>
-            {{ "manualUploadDesc" | i18n }}
+            {{ "manualBillingTokenUploadDesc" | i18n }}
           </bit-hint>
         </bit-radio-button>
         <ng-container *ngIf="updateMethod === licenseOptions.UPLOAD">
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 87c0ad654fd..61ea5f57ad6 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -5984,6 +5984,9 @@
   "manageBillingSync": {
     "message": "Manage billing sync"
   },
+  "manageBillingTokenSync": {
+    "message": "Manage Billing Token"
+  },
   "setUpBillingSync": {
     "message": "Set up billing sync"
   },
@@ -6050,6 +6053,9 @@
   "billingSyncKey": {
     "message": "Billing sync token"
   },
+  "billingTokenSyncDesc": {
+    "message": "Billing sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
+  },
   "active": {
     "message": "Active"
   },

From 572c1db94fee0c3c706e1b7230002dae36507616 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Thu, 19 Sep 2024 16:52:25 +0200
Subject: [PATCH 02/11] [PM-11503] Remove old translations

---
 apps/web/src/locales/en/messages.json | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 61ea5f57ad6..164d9fccd52 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -5981,9 +5981,6 @@
   "billingSyncCanAccess": {
     "message": "Your billing sync token can access and edit this organization's subscription settings."
   },
-  "manageBillingSync": {
-    "message": "Manage billing sync"
-  },
   "manageBillingTokenSync": {
     "message": "Manage Billing Token"
   },
@@ -6044,9 +6041,6 @@
   "billingSyncApiKeyRotated": {
     "message": "Token rotated"
   },
-  "billingSyncDesc": {
-    "message": "Billing sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
-  },
   "billingSyncKeyDesc": {
     "message": "A billing sync token from your cloud organization's subscription settings is required to complete this form."
   },
@@ -7444,9 +7438,6 @@
   "manualUpload": {
     "message": "Manual upload"
   },
-  "manualUploadDesc": {
-    "message": "If you do not want to opt into billing sync, manually upload your license here."
-  },
   "syncLicense": {
     "message": "Sync license"
   },

From 96eef6dc8bac7a28a1abcca73702a40cd7516179 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Fri, 20 Sep 2024 09:32:34 +0200
Subject: [PATCH 03/11] [PM-11503] Forgot translation

---
 apps/web/src/locales/en/messages.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 164d9fccd52..a0e6b2e91c6 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7438,6 +7438,9 @@
   "manualUpload": {
     "message": "Manual upload"
   },
+  "manualBillingTokenUploadDesc": {
+    "message": "If you do not want to opt into billing sync, manually upload your license here. This will not automatically unlock Families sponsorships."
+  },
   "syncLicense": {
     "message": "Sync license"
   },

From 393db25a87ded024cef517aab8a0dbde2fb585a1 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Fri, 20 Sep 2024 16:29:50 +0200
Subject: [PATCH 04/11] [PM-11503] Forgot translation

---
 apps/web/src/locales/en/messages.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index a0e6b2e91c6..344efad8276 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7456,6 +7456,9 @@
   "billingSyncHelp": {
     "message": "Billing Sync help"
   },
+  "automaticBillingSyncDesc": {
+    "message": "Automatic sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
+  },
   "licensePaidFeaturesHelp": {
     "message": "License paid features help"
   },

From de60607bd027bb634f455a9040e95f918a68af86 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Mon, 23 Sep 2024 12:18:16 +0200
Subject: [PATCH 05/11] f

---
 .../organization-subscription-selfhost.component.html          | 2 +-
 apps/web/src/locales/en/messages.json                          | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
index 5a1ccc0768a..c650c60521c 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
@@ -90,7 +90,7 @@ <h2 class="mt-5">
             </a>
           </bit-label>
           <bit-hint>
-            {{ "automaticBillingSyncDesc" | i18n }}
+            {{ "billingTokenSyncDesc" | i18n }}
           </bit-hint>
         </bit-radio-button>
         <ng-container *ngIf="updateMethod === licenseOptions.SYNC">
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 344efad8276..a0e6b2e91c6 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7456,9 +7456,6 @@
   "billingSyncHelp": {
     "message": "Billing Sync help"
   },
-  "automaticBillingSyncDesc": {
-    "message": "Automatic sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
-  },
   "licensePaidFeaturesHelp": {
     "message": "License paid features help"
   },

From 26885c986e11b4fdef856db749ddb26f7ba5e4e5 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Mon, 23 Sep 2024 12:32:49 +0200
Subject: [PATCH 06/11] f

---
 .../organization-subscription-selfhost.component.html         | 2 +-
 apps/web/src/locales/en/messages.json                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
index c650c60521c..5a1ccc0768a 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
@@ -90,7 +90,7 @@ <h2 class="mt-5">
             </a>
           </bit-label>
           <bit-hint>
-            {{ "billingTokenSyncDesc" | i18n }}
+            {{ "automaticBillingSyncDesc" | i18n }}
           </bit-hint>
         </bit-radio-button>
         <ng-container *ngIf="updateMethod === licenseOptions.SYNC">
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index a0e6b2e91c6..303478684cc 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -6047,8 +6047,8 @@
   "billingSyncKey": {
     "message": "Billing sync token"
   },
-  "billingTokenSyncDesc": {
-    "message": "Billing sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
+  "automaticBillingSyncDesc": {
+    "message": "Automatic sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
   },
   "active": {
     "message": "Active"

From 446c610c1807c24637a2ebf7f21948051c8aabf3 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <hendrickx.jonas.pvt@gmail.com>
Date: Mon, 23 Sep 2024 17:41:53 +0200
Subject: [PATCH 07/11] Update messages.json

---
 apps/web/src/locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 303478684cc..488d050b94c 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -6048,7 +6048,7 @@
     "message": "Billing sync token"
   },
   "automaticBillingSyncDesc": {
-    "message": "Automatic sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
+    "message": "Automatic sync unlocks Families sponsorships and allows you to sync your license without uploading a file. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
   },
   "active": {
     "message": "Active"

From 674b7055434899fd682e3729971c96a260d9eae5 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Wed, 25 Sep 2024 10:56:55 +0200
Subject: [PATCH 08/11] wip

---
 .../organization-subscription-cloud.component.html           | 2 +-
 apps/web/src/locales/en/messages.json                        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index 341324c4a2a..643eeb93bad 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -280,7 +280,7 @@ <h2 bitTypography="h2" *ngIf="shownSelfHost()" class="tw-mt-7">
         (click)="manageBillingSync()"
         *ngIf="canManageBillingSync"
       >
-        {{ (hasBillingSyncToken ? "manageBillingSync" : "setUpBillingSync") | i18n }}
+        {{ (hasBillingSyncToken ? "viewBillingToken" : "setUpBillingSync") | i18n }}
       </button>
     </div>
     <ng-container *ngIf="userOrg.canEditSubscription">
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 303478684cc..5181b9bc8bc 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2542,6 +2542,9 @@
   "downloadLicense": {
     "message": "Download license"
   },
+  "viewBillingToken": {
+    "message": "View Billing Token"
+  },
   "updateLicense": {
     "message": "Update license"
   },
@@ -7442,7 +7445,7 @@
     "message": "If you do not want to opt into billing sync, manually upload your license here. This will not automatically unlock Families sponsorships."
   },
   "syncLicense": {
-    "message": "Sync license"
+    "message": "Sync License"
   },
   "licenseSyncSuccess": {
     "message": "Successfully synced license"

From b5f7e3f18958bd1b142a323204d8ae848a8f21b1 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Fri, 27 Sep 2024 14:03:58 +0200
Subject: [PATCH 09/11] wip

---
 .../organization-subscription-cloud.component.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index 643eeb93bad..afea45e7c66 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -280,7 +280,7 @@ <h2 bitTypography="h2" *ngIf="shownSelfHost()" class="tw-mt-7">
         (click)="manageBillingSync()"
         *ngIf="canManageBillingSync"
       >
-        {{ (hasBillingSyncToken ? "viewBillingToken" : "setUpBillingSync") | i18n }}
+        {{ (hasBillingSyncToken ? "setUpBillingSync" : "viewBillingToken") | i18n }}
       </button>
     </div>
     <ng-container *ngIf="userOrg.canEditSubscription">

From 47bd111c5c7a23f440d9f40de55a2f598f8ab485 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Fri, 27 Sep 2024 14:06:47 +0200
Subject: [PATCH 10/11] wip

---
 .../organization-subscription-cloud.component.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index afea45e7c66..dc6509c4872 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -280,7 +280,7 @@ <h2 bitTypography="h2" *ngIf="shownSelfHost()" class="tw-mt-7">
         (click)="manageBillingSync()"
         *ngIf="canManageBillingSync"
       >
-        {{ (hasBillingSyncToken ? "setUpBillingSync" : "viewBillingToken") | i18n }}
+        {{ (hasBillingSyncToken ? "manageBillingTokenSync" : "viewBillingToken") | i18n }}
       </button>
     </div>
     <ng-container *ngIf="userOrg.canEditSubscription">

From 891e2a36573f69ac4cbc538bef637158d0166a77 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Mon, 30 Sep 2024 13:25:35 +0200
Subject: [PATCH 11/11] cloud completed

---
 .../billing/organizations/billing-sync-api-key.component.html | 2 +-
 .../organization-subscription-cloud.component.html            | 2 +-
 apps/web/src/locales/en/messages.json                         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
index 8b5ef867cca..4857a43a1ca 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
+++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog>
     <h1 bitDialogTitle>
-      {{ (hasBillingToken ? "viewBillingSyncToken" : "generateBillingSyncToken") | i18n }}
+      {{ (hasBillingToken ? "viewBillingToken" : "generateBillingToken") | i18n }}
     </h1>
     <div bitDialogContent>
       <app-user-verification formControlName="verification" *ngIf="!clientSecret">
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index dc6509c4872..643eeb93bad 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -280,7 +280,7 @@ <h2 bitTypography="h2" *ngIf="shownSelfHost()" class="tw-mt-7">
         (click)="manageBillingSync()"
         *ngIf="canManageBillingSync"
       >
-        {{ (hasBillingSyncToken ? "manageBillingTokenSync" : "viewBillingToken") | i18n }}
+        {{ (hasBillingSyncToken ? "viewBillingToken" : "setUpBillingSync") | i18n }}
       </button>
     </div>
     <ng-container *ngIf="userOrg.canEditSubscription">
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index c753cdc654b..f12501d6a10 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -5975,8 +5975,8 @@
   "viewBillingSyncToken": {
     "message": "View billing sync token"
   },
-  "generateBillingSyncToken": {
-    "message": "Generate billing sync token"
+  "generateBillingToken": {
+    "message": "Generate billing token"
   },
   "copyPasteBillingSync": {
     "message": "Copy and paste this token into the billing sync settings of your self-hosted organization."