Merge branch 'fix43' into 'master'

Change "ClusterIntergation|" to "ClusterIntegration|"

See merge request gitlab-org/gitlab!70205

app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue

@@ -293,7 +293,7 @@ export default {
         :items="roles"
         :loading="isLoadingRoles"
         :loading-text="s__('ClusterIntegration|Loading IAM Roles')"
-        :placeholder="s__('ClusterIntergation|Select service role')"
+        :placeholder="s__('ClusterIntegration|Select service role')"
         :search-field-placeholder="s__('ClusterIntegration|Search IAM Roles')"
         :empty-text="s__('ClusterIntegration|No IAM Roles found')"
         :has-errors="Boolean(loadingRolesError)"
@@ -330,7 +330,7 @@ export default {
         :disabled-text="s__('ClusterIntegration|Select a region to choose a Key Pair')"
         :loading="isLoadingKeyPairs"
         :loading-text="s__('ClusterIntegration|Loading Key Pairs')"
-        :placeholder="s__('ClusterIntergation|Select key pair')"
+        :placeholder="s__('ClusterIntegration|Select key pair')"
         :search-field-placeholder="s__('ClusterIntegration|Search Key Pairs')"
         :empty-text="s__('ClusterIntegration|No Key Pairs found')"
         :has-errors="Boolean(loadingKeyPairsError)"
@@ -359,7 +359,7 @@ export default {
         :disabled="vpcDropdownDisabled"
         :disabled-text="s__('ClusterIntegration|Select a region to choose a VPC')"
         :loading-text="s__('ClusterIntegration|Loading VPCs')"
-        :placeholder="s__('ClusterIntergation|Select a VPC')"
+        :placeholder="s__('ClusterIntegration|Select a VPC')"
         :search-field-placeholder="s__('ClusterIntegration|Search VPCs')"
         :empty-text="s__('ClusterIntegration|No VPCs found')"
         :has-errors="Boolean(loadingVpcsError)"
@@ -389,7 +389,7 @@ export default {
         :disabled="subnetDropdownDisabled"
         :disabled-text="s__('ClusterIntegration|Select a VPC to choose a subnet')"
         :loading-text="s__('ClusterIntegration|Loading subnets')"
-        :placeholder="s__('ClusterIntergation|Select a subnet')"
+        :placeholder="s__('ClusterIntegration|Select a subnet')"
         :search-field-placeholder="s__('ClusterIntegration|Search subnets')"
         :empty-text="s__('ClusterIntegration|No subnet found')"
         :has-errors="displaySubnetError"
@@ -420,7 +420,7 @@ export default {
         :disabled="securityGroupDropdownDisabled"
         :disabled-text="s__('ClusterIntegration|Select a VPC to choose a security group')"
         :loading-text="s__('ClusterIntegration|Loading security groups')"
-        :placeholder="s__('ClusterIntergation|Select a security group')"
+        :placeholder="s__('ClusterIntegration|Select a security group')"
         :search-field-placeholder="s__('ClusterIntegration|Search security groups')"
         :empty-text="s__('ClusterIntegration|No security group found')"
         :has-errors="Boolean(loadingSecurityGroupsError)"
@@ -451,7 +451,7 @@ export default {
         :items="instanceTypes"
         :loading="isLoadingInstanceTypes"
         :loading-text="s__('ClusterIntegration|Loading instance types')"
-        :placeholder="s__('ClusterIntergation|Select an instance type')"
+        :placeholder="s__('ClusterIntegration|Select an instance type')"
         :search-field-placeholder="s__('ClusterIntegration|Search instance types')"
         :empty-text="s__('ClusterIntegration|No instance type found')"
         :has-errors="Boolean(loadingInstanceTypesError)"

app/assets/javascripts/create_cluster/gke_cluster/components/gke_network_dropdown.vue

@@ -43,7 +43,7 @@ export default {
     :loading="isLoadingItems"
     :has-errors="Boolean(loadingItemsError)"
     :loading-text="s__('ClusterIntegration|Loading networks')"
-    :placeholder="s__('ClusterIntergation|Select a network')"
+    :placeholder="s__('ClusterIntegration|Select a network')"
     :search-field-placeholder="s__('ClusterIntegration|Search networks')"
     :empty-text="s__('ClusterIntegration|No networks found')"
     :error-message="s__('ClusterIntegration|Could not load networks')"

app/assets/javascripts/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue

@@ -34,7 +34,7 @@ export default {
     :loading="isLoadingItems"
     :has-errors="Boolean(loadingItemsError)"
     :loading-text="s__('ClusterIntegration|Loading subnetworks')"
-    :placeholder="s__('ClusterIntergation|Select a subnetwork')"
+    :placeholder="s__('ClusterIntegration|Select a subnetwork')"
     :search-field-placeholder="s__('ClusterIntegration|Search subnetworks')"
     :empty-text="s__('ClusterIntegration|No subnetworks found')"
     :error-message="s__('ClusterIntegration|Could not load subnetworks')"

locale/gitlab.pot

@@ -7948,6 +7948,9 @@ msgstr ""
 msgid "ClusterIntegration|See and edit the details for your Kubernetes cluster"
 msgstr ""
 
+msgid "ClusterIntegration|Select a VPC"
+msgstr ""
+
 msgid "ClusterIntegration|Select a VPC to choose a security group"
 msgstr ""
 
@@ -7957,6 +7960,9 @@ msgstr ""
 msgid "ClusterIntegration|Select a VPC to use for your EKS Cluster resources. To use a new VPC, first create one on %{linkStart}Amazon Web Services %{linkEnd}."
 msgstr ""
 
+msgid "ClusterIntegration|Select a network"
+msgstr ""
+
 msgid "ClusterIntegration|Select a network to choose a subnetwork"
 msgstr ""
 
@@ -7966,9 +7972,24 @@ msgstr ""
 msgid "ClusterIntegration|Select a region to choose a VPC"
 msgstr ""
 
+msgid "ClusterIntegration|Select a security group"
+msgstr ""
+
+msgid "ClusterIntegration|Select a subnet"
+msgstr ""
+
+msgid "ClusterIntegration|Select a subnetwork"
+msgstr ""
+
 msgid "ClusterIntegration|Select a zone to choose a network"
 msgstr ""
 
+msgid "ClusterIntegration|Select an instance type"
+msgstr ""
+
+msgid "ClusterIntegration|Select key pair"
+msgstr ""
+
 msgid "ClusterIntegration|Select machine type"
 msgstr ""
 
@@ -7981,6 +8002,9 @@ msgstr ""
 msgid "ClusterIntegration|Select project to choose zone"
 msgstr ""
 
+msgid "ClusterIntegration|Select service role"
+msgstr ""
+
 msgid "ClusterIntegration|Select the key pair name that will be used to create EC2 nodes. To use a new key pair name, first create one on %{linkStart}Amazon Web Services%{linkEnd}."
 msgstr ""
 
@@ -8131,30 +8155,6 @@ msgstr ""
 msgid "ClusterIntegration|sign up"
 msgstr ""
 
-msgid "ClusterIntergation|Select a VPC"
-msgstr ""
-
-msgid "ClusterIntergation|Select a network"
-msgstr ""
-
-msgid "ClusterIntergation|Select a security group"
-msgstr ""
-
-msgid "ClusterIntergation|Select a subnet"
-msgstr ""
-
-msgid "ClusterIntergation|Select a subnetwork"
-msgstr ""
-
-msgid "ClusterIntergation|Select an instance type"
-msgstr ""
-
-msgid "ClusterIntergation|Select key pair"
-msgstr ""
-
-msgid "ClusterIntergation|Select service role"
-msgstr ""
-
 msgid "Clusters|An error occurred while loading clusters"
 msgstr ""