diff --git a/cf/app/app.go b/cf/app/app.go
index 1f8a54aca60..d500125e6ea 100644
--- a/cf/app/app.go
+++ b/cf/app/app.go
@@ -103,7 +103,7 @@ func appHelpTemplate() string {
 {{.SubTitle .Name}}{{range .CommandSubGroups}}
 {{range .}}   {{.Name}} {{.Description}}
 {{end}}{{end}}{{end}}
-{{.Title "` + T("ENVIRONMENT VARIABLES") + `"}}
+{{.Title "` + T("ENVIRONMENT VARIABLES:") + `"}}
    CF_COLOR=false                     ` + T("Do not colorize output") + `
    CF_HOME=path/to/dir/               ` + T("Override path to default config directory") + `
    CF_PLUGIN_HOME=path/to/dir/        ` + T("Override path to default plugin config directory") + `
@@ -113,7 +113,7 @@ func appHelpTemplate() string {
    CF_TRACE=path/to/trace.log         ` + T("Append API request diagnostics to a log file") + `
    HTTP_PROXY=proxy.example.com:8080  ` + T("Enable HTTP proxying for API requests") + `
 
-{{.Title "` + T("GLOBAL OPTIONS") + `"}}
+{{.Title "` + T("GLOBAL OPTIONS:") + `"}}
    --version, -v                      ` + T("Print the version") + `
    --help, -h                         ` + T("Show help") + `
 `
diff --git a/cf/i18n/resources/de_DE.all.json b/cf/i18n/resources/de_DE.all.json
index 237f7aadda6..a7bfbdd4bd3 100644
--- a/cf/i18n/resources/de_DE.all.json
+++ b/cf/i18n/resources/de_DE.all.json
@@ -1645,8 +1645,8 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
-      "translation": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
+      "translation": "ENVIRONMENT VARIABLES:",
       "modified": false
    },
    {
@@ -2050,8 +2050,8 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
-      "translation": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
+      "translation": "GLOBAL OPTIONS:",
       "modified": false
    },
    {
diff --git a/cf/i18n/resources/en_US.all.json b/cf/i18n/resources/en_US.all.json
index db06b39fa0f..e3e78276735 100644
--- a/cf/i18n/resources/en_US.all.json
+++ b/cf/i18n/resources/en_US.all.json
@@ -1645,8 +1645,8 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
-      "translation": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
+      "translation": "ENVIRONMENT VARIABLES:",
       "modified": false
    },
    {
@@ -2050,8 +2050,8 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
-      "translation": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
+      "translation": "GLOBAL OPTIONS:",
       "modified": false
    },
    {
diff --git a/cf/i18n/resources/es_ES.all.json b/cf/i18n/resources/es_ES.all.json
index d16d02d9776..aff81940449 100644
--- a/cf/i18n/resources/es_ES.all.json
+++ b/cf/i18n/resources/es_ES.all.json
@@ -1645,8 +1645,8 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
-      "translation": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
+      "translation": "ENVIRONMENT VARIABLES:",
       "modified": false
    },
    {
@@ -2050,7 +2050,7 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
       "translation": "OPCIONES GLOBALES",
       "modified": false
    },
diff --git a/cf/i18n/resources/fr_FR.all.json b/cf/i18n/resources/fr_FR.all.json
index d45629b8d84..56e87295f0d 100644
--- a/cf/i18n/resources/fr_FR.all.json
+++ b/cf/i18n/resources/fr_FR.all.json
@@ -1645,7 +1645,7 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
       "translation": "VARIABLES D'ENVIRONNEMENT",
       "modified": false
    },
@@ -2050,7 +2050,7 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
       "translation": "OPTIONS GLOBALES",
       "modified": false
    },
diff --git a/cf/i18n/resources/it_IT.all.json b/cf/i18n/resources/it_IT.all.json
index 5f0e77513ba..016e1e40ecc 100644
--- a/cf/i18n/resources/it_IT.all.json
+++ b/cf/i18n/resources/it_IT.all.json
@@ -1645,8 +1645,8 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
-      "translation": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
+      "translation": "ENVIRONMENT VARIABLES:",
       "modified": false
    },
    {
@@ -2050,8 +2050,8 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
-      "translation": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
+      "translation": "GLOBAL OPTIONS:",
       "modified": false
    },
    {
diff --git a/cf/i18n/resources/ja_JA.all.json b/cf/i18n/resources/ja_JA.all.json
index 5f0e77513ba..016e1e40ecc 100644
--- a/cf/i18n/resources/ja_JA.all.json
+++ b/cf/i18n/resources/ja_JA.all.json
@@ -1645,8 +1645,8 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
-      "translation": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
+      "translation": "ENVIRONMENT VARIABLES:",
       "modified": false
    },
    {
@@ -2050,8 +2050,8 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
-      "translation": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
+      "translation": "GLOBAL OPTIONS:",
       "modified": false
    },
    {
diff --git a/cf/i18n/resources/pt_BR.all.json b/cf/i18n/resources/pt_BR.all.json
index 7dd908020fc..71e332299e2 100644
--- a/cf/i18n/resources/pt_BR.all.json
+++ b/cf/i18n/resources/pt_BR.all.json
@@ -1645,7 +1645,7 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
       "translation": "VARIÁVEIS DE AMBIENTE",
       "modified": false
    },
@@ -2050,7 +2050,7 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
       "translation": "OPÇÕES GLOBAIS",
       "modified": false
    },
diff --git a/cf/i18n/resources/zh_CN.all.json b/cf/i18n/resources/zh_CN.all.json
index a4c9be561fa..f8fe3a4a7b8 100644
--- a/cf/i18n/resources/zh_CN.all.json
+++ b/cf/i18n/resources/zh_CN.all.json
@@ -1645,7 +1645,7 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
       "translation": "环境变量",
       "modified": false
    },
@@ -2050,7 +2050,7 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
       "translation": "全局选项",
       "modified": false
    },
diff --git a/cf/i18n/resources/zh_HK.all.json b/cf/i18n/resources/zh_HK.all.json
index 237f7aadda6..a7bfbdd4bd3 100644
--- a/cf/i18n/resources/zh_HK.all.json
+++ b/cf/i18n/resources/zh_HK.all.json
@@ -1645,8 +1645,8 @@
       "modified": false
    },
    {
-      "id": "ENVIRONMENT VARIABLES",
-      "translation": "ENVIRONMENT VARIABLES",
+      "id": "ENVIRONMENT VARIABLES:",
+      "translation": "ENVIRONMENT VARIABLES:",
       "modified": false
    },
    {
@@ -2050,8 +2050,8 @@
       "modified": false
    },
    {
-      "id": "GLOBAL OPTIONS",
-      "translation": "GLOBAL OPTIONS",
+      "id": "GLOBAL OPTIONS:",
+      "translation": "GLOBAL OPTIONS:",
       "modified": false
    },
    {