diff --git a/awx/locale/django.pot b/awx/locale/django.pot
index d0ccead4ac..0da0f1a6d0 100644
--- a/awx/locale/django.pot
+++ b/awx/locale/django.pot
@@ -2835,7 +2835,7 @@ msgstr ""
 
 #: awx/main/models/credential/__init__.py:979
 msgid ""
-"Enter the URL for the virtual machine that corresponds to your CloudForm "
+"Enter the URL for the virtual machine that corresponds to your CloudForms "
 "instance. For example, https://cloudforms.example.org"
 msgstr ""
 
diff --git a/awx/locale/en-us/LC_MESSAGES/django.po b/awx/locale/en-us/LC_MESSAGES/django.po
index d0ccead4ac..0da0f1a6d0 100644
--- a/awx/locale/en-us/LC_MESSAGES/django.po
+++ b/awx/locale/en-us/LC_MESSAGES/django.po
@@ -2835,7 +2835,7 @@ msgstr ""
 
 #: awx/main/models/credential/__init__.py:979
 msgid ""
-"Enter the URL for the virtual machine that corresponds to your CloudForm "
+"Enter the URL for the virtual machine that corresponds to your CloudForms "
 "instance. For example, https://cloudforms.example.org"
 msgstr ""
 
diff --git a/awx/locale/es/LC_MESSAGES/django.po b/awx/locale/es/LC_MESSAGES/django.po
index 1eedd928f7..be81d26dc2 100644
--- a/awx/locale/es/LC_MESSAGES/django.po
+++ b/awx/locale/es/LC_MESSAGES/django.po
@@ -3086,7 +3086,7 @@ msgstr "URL CloudForms"
 
 #: awx/main/models/credential/__init__.py:982
 msgid ""
-"Enter the URL for the virtual machine that corresponds to your CloudForm "
+"Enter the URL for the virtual machine that corresponds to your CloudForms "
 "instance. For example, https://cloudforms.example.org"
 msgstr ""
 "Introduzca la URL para la máquina virtual que corresponda a su instancia "
diff --git a/awx/locale/fr/LC_MESSAGES/django.po b/awx/locale/fr/LC_MESSAGES/django.po
index 5e550b7806..84c3f4ff51 100644
--- a/awx/locale/fr/LC_MESSAGES/django.po
+++ b/awx/locale/fr/LC_MESSAGES/django.po
@@ -3099,7 +3099,7 @@ msgstr "URL CloudForms"
 
 #: awx/main/models/credential/__init__.py:982
 msgid ""
-"Enter the URL for the virtual machine that corresponds to your CloudForm "
+"Enter the URL for the virtual machine that corresponds to your CloudForms "
 "instance. For example, https://cloudforms.example.org"
 msgstr ""
 "Veuillez saisir l’URL de la machine virtuelle qui correspond à votre "
diff --git a/awx/locale/ja/LC_MESSAGES/django.po b/awx/locale/ja/LC_MESSAGES/django.po
index f854fffdc0..dce9fb7204 100644
--- a/awx/locale/ja/LC_MESSAGES/django.po
+++ b/awx/locale/ja/LC_MESSAGES/django.po
@@ -2858,7 +2858,7 @@ msgstr "CloudForms URL"
 
 #: awx/main/models/credential/__init__.py:982
 msgid ""
-"Enter the URL for the virtual machine that corresponds to your CloudForm "
+"Enter the URL for the virtual machine that corresponds to your CloudForms "
 "instance. For example, https://cloudforms.example.org"
 msgstr ""
 "CloudForms インスタンスに対応する仮想マシンの URL を入力します (例: https://cloudforms.example.org)。"
diff --git a/awx/locale/nl/LC_MESSAGES/django.po b/awx/locale/nl/LC_MESSAGES/django.po
index 331d36082e..c02d8dfb29 100644
--- a/awx/locale/nl/LC_MESSAGES/django.po
+++ b/awx/locale/nl/LC_MESSAGES/django.po
@@ -3072,7 +3072,7 @@ msgstr "CloudForms-URL"
 
 #: awx/main/models/credential/__init__.py:982
 msgid ""
-"Enter the URL for the virtual machine that corresponds to your CloudForm "
+"Enter the URL for the virtual machine that corresponds to your CloudForms "
 "instance. For example, https://cloudforms.example.org"
 msgstr ""
 "Voer de URL in voor de virtuele machine die overeenkomt met uw CloudForm-"
diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py
index aa89f41574..d6daa9f6fc 100644
--- a/awx/main/models/credential/__init__.py
+++ b/awx/main/models/credential/__init__.py
@@ -982,7 +982,7 @@ def cloudforms(cls):
                 'label': ugettext_noop('CloudForms URL'),
                 'type': 'string',
                 'help_text': ugettext_noop('Enter the URL for the virtual machine that '
-                                           'corresponds to your CloudForm instance. '
+                                           'corresponds to your CloudForms instance. '
                                            'For example, https://cloudforms.example.org')
             }, {
                 'id': 'username',
diff --git a/awx/ui/client/src/credential-types/credential-types.list.js b/awx/ui/client/src/credential-types/credential-types.list.js
index 5b6d73fcd3..b15030d28b 100644
--- a/awx/ui/client/src/credential-types/credential-types.list.js
+++ b/awx/ui/client/src/credential-types/credential-types.list.js
@@ -55,7 +55,7 @@ export default ['i18n', function(i18n){
                 icon: 'fa-edit',
                 label: i18n._('Edit'),
                 "class": 'btn-sm',
-                awToolTip: i18n._('Edit credenital type'),
+                awToolTip: i18n._('Edit credential type'),
                 dataPlacement: 'top',
                 ngShow: 'credential_type.summary_fields.user_capabilities.edit'
             },
diff --git a/awx/ui/client/src/credentials/factories/become-method-change.factory.js b/awx/ui/client/src/credentials/factories/become-method-change.factory.js
index 6f702be0e3..2c95e12523 100644
--- a/awx/ui/client/src/credentials/factories/become-method-change.factory.js
+++ b/awx/ui/client/src/credentials/factories/become-method-change.factory.js
@@ -79,7 +79,7 @@ export default
                        scope.host_required = true;
                        scope.hostLabel = i18n._("CloudForms URL");
                        scope.hostPopOver = i18n.sprintf(i18n._("Enter the URL for the virtual machine which %s" +
-                           "corresponds to your CloudForm instance. %s" +
+                           "corresponds to your CloudForms instance. %s" +
                            "For example, %s"), "<br />", "<br />", "https://cloudforms.example.org");
                     break;
                     case 'net':
diff --git a/awx/ui/client/src/credentials/factories/kind-change.factory.js b/awx/ui/client/src/credentials/factories/kind-change.factory.js
index c9fc1d2d4f..6254720391 100644
--- a/awx/ui/client/src/credentials/factories/kind-change.factory.js
+++ b/awx/ui/client/src/credentials/factories/kind-change.factory.js
@@ -136,7 +136,7 @@ export default
                        scope.host_required = true;
                        scope.hostLabel = i18n._("CloudForms URL");
                        scope.hostPopOver = i18n.sprintf(i18n._("Enter the URL for the virtual machine which %s" +
-                           "corresponds to your CloudForm instance. %s" +
+                           "corresponds to your CloudForms instance. %s" +
                            "For example, %s"), "<br />", "<br />", "https://cloudforms.example.org");
                     break;
                     case 'net':
diff --git a/awx/ui/client/src/teams/teams.form.js b/awx/ui/client/src/teams/teams.form.js
index 1b3fa842ad..41666353ae 100644
--- a/awx/ui/client/src/teams/teams.form.js
+++ b/awx/ui/client/src/teams/teams.form.js
@@ -146,7 +146,7 @@ export default ['i18n', function(i18n) {
                             ngClick: 'deletePermissionFromTeam(team_id, team_obj.name, permission.name, permission.summary_fields.resource_name, permission.related.teams)',
                             'class': "List-actionButton--delete",
                             iconClass: 'fa fa-times',
-                            awToolTip: i18n._('Dissasociate permission from team'),
+                            awToolTip: i18n._('Dissassociate permission from team'),
                             dataPlacement: 'top',
                             ngShow: 'permission.summary_fields.user_capabilities.unattach'
                         }
diff --git a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
index 28207ba0e3..60ba73d401 100644
--- a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
@@ -18,7 +18,7 @@ export default
                 {name: i18n._('Integer'), type: 'integer'},
                 {name: i18n._('Float'), type: 'float'}
             ];
-            scope.disableSurveyTooltip = i18n._('Disble Survey');
+            scope.disableSurveyTooltip = i18n._('Disable Survey');
             scope.editQuestionTooltip = i18n._('Edit Question');
             scope.deleteQuestionTooltip = i18n._('Delete Question');
             scope.dragQuestionTooltip = i18n._('Drag to reorder question');
diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js
index eece22f6fe..7bffc717fc 100644
--- a/awx/ui/client/src/templates/workflows.form.js
+++ b/awx/ui/client/src/templates/workflows.form.js
@@ -111,7 +111,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
                     rows: 6,
                     "default": "---",
                     column: 2,
-                    awPopOver:i18n._('Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentaton for example syntax.'),
+                    awPopOver:i18n._('Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentation for example syntax.'),
                     dataTitle: i18n._('Extra Variables'),
                     dataPlacement: 'right',
                     dataContainer: "body",
diff --git a/awx/ui/client/src/users/users.form.js b/awx/ui/client/src/users/users.form.js
index 60f9e422d7..c27ab2d7a1 100644
--- a/awx/ui/client/src/users/users.form.js
+++ b/awx/ui/client/src/users/users.form.js
@@ -224,7 +224,7 @@ export default ['i18n', function(i18n) {
                             label: i18n._('Remove'),
                             ngClick: 'deletePermissionFromUser(user_id, username, permission.name, permission.summary_fields.resource_name, permission.related.users)',
                             iconClass: 'fa fa-times',
-                            awToolTip: i18n._('Dissasociate permission from user'),
+                            awToolTip: i18n._('Dissassociate permission from user'),
                             ngShow: 'permission.summary_fields.user_capabilities.unattach'
                         }
                     },
diff --git a/awx/ui/po/ansible-tower-ui.pot b/awx/ui/po/ansible-tower-ui.pot
index 1493768fc1..18b1b5c016 100644
--- a/awx/ui/po/ansible-tower-ui.pot
+++ b/awx/ui/po/ansible-tower-ui.pot
@@ -1388,7 +1388,7 @@ msgid "Disassociate host"
 msgstr ""
 
 #: client/src/templates/survey-maker/surveys/init.factory.js:21
-msgid "Disble Survey"
+msgid "Disable Survey"
 msgstr ""
 
 #: client/src/configuration/forms/auth-form/configuration-auth.controller.js:54
@@ -1398,11 +1398,11 @@ msgid "Discard changes"
 msgstr ""
 
 #: client/src/teams/teams.form.js:149
-msgid "Dissasociate permission from team"
+msgid "Dissassociate permission from team"
 msgstr ""
 
 #: client/src/users/users.form.js:227
-msgid "Dissasociate permission from user"
+msgid "Dissassociate permission from user"
 msgstr ""
 
 #: client/src/templates/job_templates/job-template.form.js:270
@@ -1525,7 +1525,7 @@ msgid "Edit Survey"
 msgstr ""
 
 #: client/src/credential-types/credential-types.list.js:58
-msgid "Edit credenital type"
+msgid "Edit credential type"
 msgstr ""
 
 #: client/src/credentials/credentials.list.js:68
@@ -1690,7 +1690,7 @@ msgstr ""
 
 #: client/src/credentials/factories/become-method-change.factory.js:81
 #: client/src/credentials/factories/kind-change.factory.js:138
-msgid "Enter the URL for the virtual machine which %scorresponds to your CloudForm instance. %sFor example, %s"
+msgid "Enter the URL for the virtual machine which %scorresponds to your CloudForms instance. %sFor example, %s"
 msgstr ""
 
 #: client/src/credentials/factories/become-method-change.factory.js:71
@@ -3495,7 +3495,7 @@ msgid "Pass extra command line variables to the playbook. Provide key/value pair
 msgstr ""
 
 #: client/src/templates/workflows.form.js:114
-msgid "Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentaton for example syntax."
+msgid "Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentation for example syntax."
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:139
diff --git a/awx/ui/po/es.po b/awx/ui/po/es.po
index 327d6f018a..8e3ff94b8d 100644
--- a/awx/ui/po/es.po
+++ b/awx/ui/po/es.po
@@ -1566,7 +1566,7 @@ msgid "Disassociate host"
 msgstr "Disociar host"
 
 #: client/src/templates/survey-maker/surveys/init.factory.js:21
-msgid "Disble Survey"
+msgid "Disable Survey"
 msgstr "Desactivar la encuesta"
 
 #: client/src/configuration/auth-form/configuration-auth.controller.js:94
@@ -1577,11 +1577,11 @@ msgid "Discard changes"
 msgstr "Descartar cambios"
 
 #: client/src/teams/teams.form.js:149
-msgid "Dissasociate permission from team"
+msgid "Dissassociate permission from team"
 msgstr "Desasociar permiso de un equipo."
 
 #: client/src/users/users.form.js:227
-msgid "Dissasociate permission from user"
+msgid "Dissassociate permission from user"
 msgstr "Desasociar permiso de un usuario"
 
 #: client/src/credentials/credentials.form.js:384
@@ -1720,7 +1720,7 @@ msgid "Edit Survey"
 msgstr "Editar la encuesta"
 
 #: client/src/credential-types/credential-types.list.js:58
-msgid "Edit credenital type"
+msgid "Edit credential type"
 msgstr "Editar tipo de credencial"
 
 #: client/src/credentials/credentials.list.js:68
@@ -1927,7 +1927,7 @@ msgstr ""
 #: client/src/credentials/factories/become-method-change.factory.js:81
 #: client/src/credentials/factories/kind-change.factory.js:138
 msgid ""
-"Enter the URL for the virtual machine which %scorresponds to your CloudForm "
+"Enter the URL for the virtual machine which %scorresponds to your CloudForms "
 "instance. %sFor example, %s"
 msgstr ""
 "Introduzca la URL para la máquina virtual la cual %scorresponda a su "
@@ -3851,7 +3851,7 @@ msgstr ""
 msgid ""
 "Pass extra command line variables to the playbook. This is the -e or "
 "--extra-vars command line parameter for ansible-playbook. Provide key/value "
-"pairs using either YAML or JSON. Refer to the Ansible Tower documentaton for"
+"pairs using either YAML or JSON. Refer to the Ansible Tower documentation for"
 " example syntax."
 msgstr ""
 "Traslade variables de línea de comando adicionales al manual. Este es el "
diff --git a/awx/ui/po/fr.po b/awx/ui/po/fr.po
index 5518df4bab..d75bfd48fd 100644
--- a/awx/ui/po/fr.po
+++ b/awx/ui/po/fr.po
@@ -1563,7 +1563,7 @@ msgid "Disassociate host"
 msgstr "Dissocier l'hôte"
 
 #: client/src/templates/survey-maker/surveys/init.factory.js:21
-msgid "Disble Survey"
+msgid "Disable Survey"
 msgstr "Désactiver le questionnaire"
 
 #: client/src/configuration/auth-form/configuration-auth.controller.js:94
@@ -1574,11 +1574,11 @@ msgid "Discard changes"
 msgstr "Ignorer les modifications"
 
 #: client/src/teams/teams.form.js:149
-msgid "Dissasociate permission from team"
+msgid "Dissassociate permission from team"
 msgstr "Dissocier la permission de l’équipe"
 
 #: client/src/users/users.form.js:227
-msgid "Dissasociate permission from user"
+msgid "Dissassociate permission from user"
 msgstr "Dissocier la permission de l’utilisateur"
 
 #: client/src/credentials/credentials.form.js:384
@@ -1718,7 +1718,7 @@ msgid "Edit Survey"
 msgstr "Modifier le questionnaire"
 
 #: client/src/credential-types/credential-types.list.js:58
-msgid "Edit credenital type"
+msgid "Edit credential type"
 msgstr "Modifier le type d'information d'identification"
 
 #: client/src/credentials/credentials.list.js:68
@@ -1923,7 +1923,7 @@ msgstr ""
 #: client/src/credentials/factories/become-method-change.factory.js:81
 #: client/src/credentials/factories/kind-change.factory.js:138
 msgid ""
-"Enter the URL for the virtual machine which %scorresponds to your CloudForm "
+"Enter the URL for the virtual machine which %scorresponds to your CloudForms "
 "instance. %sFor example, %s"
 msgstr ""
 "Veuillez saisir l’URL de la machine virtuelle qui correspond à votre "
@@ -3846,7 +3846,7 @@ msgstr ""
 msgid ""
 "Pass extra command line variables to the playbook. This is the -e or "
 "--extra-vars command line parameter for ansible-playbook. Provide key/value "
-"pairs using either YAML or JSON. Refer to the Ansible Tower documentaton for"
+"pairs using either YAML or JSON. Refer to the Ansible Tower documentation for"
 " example syntax."
 msgstr ""
 "Transmettez des variables de ligne de commandes supplémentaires au playbook."
diff --git a/awx/ui/po/ja.po b/awx/ui/po/ja.po
index 178d4c1aaf..071a0c792e 100644
--- a/awx/ui/po/ja.po
+++ b/awx/ui/po/ja.po
@@ -1510,7 +1510,7 @@ msgid "Disassociate host"
 msgstr "ホストの関連付けの解除"
 
 #: client/src/templates/survey-maker/surveys/init.factory.js:21
-msgid "Disble Survey"
+msgid "Disable Survey"
 msgstr "Survey の無効化"
 
 #: client/src/configuration/auth-form/configuration-auth.controller.js:94
@@ -1521,11 +1521,11 @@ msgid "Discard changes"
 msgstr "変更の破棄"
 
 #: client/src/teams/teams.form.js:149
-msgid "Dissasociate permission from team"
+msgid "Dissassociate permission from team"
 msgstr "チームからパーミッションの関連付けを解除"
 
 #: client/src/users/users.form.js:227
-msgid "Dissasociate permission from user"
+msgid "Dissassociate permission from user"
 msgstr "ユーザーからパーミッションの関連付けを解除"
 
 #: client/src/credentials/credentials.form.js:384
@@ -1659,7 +1659,7 @@ msgid "Edit Survey"
 msgstr "Survey の編集"
 
 #: client/src/credential-types/credential-types.list.js:58
-msgid "Edit credenital type"
+msgid "Edit credential type"
 msgstr "認証情報タイプの編集"
 
 #: client/src/credentials/credentials.list.js:68
@@ -1851,7 +1851,7 @@ msgstr "各行に 1 つの電話番号を入力し、SMS メッセージのル
 #: client/src/credentials/factories/become-method-change.factory.js:81
 #: client/src/credentials/factories/kind-change.factory.js:138
 msgid ""
-"Enter the URL for the virtual machine which %scorresponds to your CloudForm "
+"Enter the URL for the virtual machine which %scorresponds to your CloudForms "
 "instance. %sFor example, %s"
 msgstr "CloudForms インスタンスに対応する %s仮想マシンの URL を入力します (%s例: %s)。"
 
@@ -3703,7 +3703,7 @@ msgstr ""
 msgid ""
 "Pass extra command line variables to the playbook. This is the -e or "
 "--extra-vars command line parameter for ansible-playbook. Provide key/value "
-"pairs using either YAML or JSON. Refer to the Ansible Tower documentaton for"
+"pairs using either YAML or JSON. Refer to the Ansible Tower documentation for"
 " example syntax."
 msgstr ""
 "追加のコマンドライン変数を Playbook に渡します。これは、ansible-playbook の -e または --extra-vars "
diff --git a/awx/ui/po/nl.po b/awx/ui/po/nl.po
index a20579232f..e320c6d73a 100644
--- a/awx/ui/po/nl.po
+++ b/awx/ui/po/nl.po
@@ -1555,7 +1555,7 @@ msgid "Disassociate host"
 msgstr "Host loskoppelen"
 
 #: client/src/templates/survey-maker/surveys/init.factory.js:21
-msgid "Disble Survey"
+msgid "Disable Survey"
 msgstr "Vragenlijst uitschkelen"
 
 #: client/src/configuration/auth-form/configuration-auth.controller.js:94
@@ -1566,11 +1566,11 @@ msgid "Discard changes"
 msgstr "Wijzigingen annuleren"
 
 #: client/src/teams/teams.form.js:149
-msgid "Dissasociate permission from team"
+msgid "Dissassociate permission from team"
 msgstr "Machtiging loskoppelen van team"
 
 #: client/src/users/users.form.js:227
-msgid "Dissasociate permission from user"
+msgid "Dissassociate permission from user"
 msgstr "Machtiging loskoppelen van gebruiker"
 
 #: client/src/credentials/credentials.form.js:384
@@ -1710,7 +1710,7 @@ msgid "Edit Survey"
 msgstr "Vragenlijst wijzigen"
 
 #: client/src/credential-types/credential-types.list.js:58
-msgid "Edit credenital type"
+msgid "Edit credential type"
 msgstr "Soort toegangsgegevens wijzigen"
 
 #: client/src/credentials/credentials.list.js:68
@@ -1914,7 +1914,7 @@ msgstr ""
 #: client/src/credentials/factories/become-method-change.factory.js:81
 #: client/src/credentials/factories/kind-change.factory.js:138
 msgid ""
-"Enter the URL for the virtual machine which %scorresponds to your CloudForm "
+"Enter the URL for the virtual machine which %scorresponds to your CloudForms "
 "instance. %sFor example, %s"
 msgstr ""
 "Voer de URL in voor de virtuele machine die %sovereenkomt met uw CloudForm-"
@@ -3826,7 +3826,7 @@ msgstr ""
 msgid ""
 "Pass extra command line variables to the playbook. This is the -e or "
 "--extra-vars command line parameter for ansible-playbook. Provide key/value "
-"pairs using either YAML or JSON. Refer to the Ansible Tower documentaton for"
+"pairs using either YAML or JSON. Refer to the Ansible Tower documentation for"
 " example syntax."
 msgstr ""
 "Geef extra commandoregelvariabelen op in het draaiboek. Dit is de "