diff --git a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
index 8034f82a37..84742e9fbe 100644
--- a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
@@ -18,7 +18,8 @@ final class PhabricatorAuthenticationConfigOptions
         ->setOptions(
           array(
             pht("Allow password authentication"),
-            pht("Don't allow password authentication")))
+            pht("Don't allow password authentication")
+          ))
         ->setSummary(pht("Enables password-based authentication."))
         ->setDescription(
           pht(
@@ -60,7 +61,8 @@ final class PhabricatorAuthenticationConfigOptions
         ->setOptions(
           array(
             pht("Require email verification"),
-            pht("Don't require email verification")))
+            pht("Don't require email verification")
+          ))
         ->setSummary(
           pht("Require email verification before a user can log in."))
         ->setDescription(
@@ -96,7 +98,8 @@ final class PhabricatorAuthenticationConfigOptions
         ->setOptions(
           array(
             pht("Allow editing"),
-            pht("Prevent editing")))
+            pht("Prevent editing")
+          ))
         ->setSummary(
           pht(
             "Determines whether or not basic account information is ".
diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
index d00656a27b..50395654d8 100644
--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -53,8 +53,8 @@ final class PhabricatorCoreConfigOptions
       $this->newOption('phabricator.serious-business', 'bool', false)
         ->setOptions(
           array(
-            pht('Shenanigans'), // That should be interesting to translate. :P
             pht('Serious business'),
+            pht('Shenanigans'), // That should be interesting to translate. :P
           ))
         ->setSummary(
           pht("Should Phabricator be serious?"))
diff --git a/src/applications/config/option/PhabricatorDeveloperConfigOptions.php b/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
index 84f91b08e4..46092c43be 100644
--- a/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
+++ b/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
@@ -16,8 +16,8 @@ final class PhabricatorDeveloperConfigOptions
       $this->newOption('darkconsole.enabled', 'bool', false)
         ->setOptions(
           array(
-            pht("Disable DarkConsole"),
             pht("Enable DarkConsole"),
+            pht("Disable DarkConsole"),
           ))
         ->setSummary(pht("Enable Phabricator's debugging console."))
         ->setDescription(
@@ -35,8 +35,8 @@ final class PhabricatorDeveloperConfigOptions
       $this->newOption('darkconsole.always-on', 'bool', false)
         ->setOptions(
           array(
-            pht("Require DarkConsole Activation"),
             pht("Always Activate DarkConsole"),
+            pht("Require DarkConsole Activation"),
           ))
         ->setSummary(pht("Activate DarkConsole on every page."))
         ->setDescription(
@@ -50,8 +50,8 @@ final class PhabricatorDeveloperConfigOptions
       $this->newOption('debug.stop-on-redirect', 'bool', false)
         ->setOptions(
           array(
-            pht("Use Normal HTTP Redirects"),
             pht("Stop Before HTTP Redirect"),
+            pht("Use Normal HTTP Redirects"),
           ))
         ->setSummary(
           pht(
@@ -89,8 +89,8 @@ final class PhabricatorDeveloperConfigOptions
       $this->newOption('phabricator.show-stack-traces', 'bool', false)
         ->setOptions(
           array(
-            pht('Hide stack traces'),
             pht('Show stack traces'),
+            pht('Hide stack traces'),
           ))
         ->setSummary(pht("Show stack traces when unhandled exceptions occur."))
         ->setDescription(
@@ -101,8 +101,8 @@ final class PhabricatorDeveloperConfigOptions
       $this->newOption('phabricator.show-error-callout', 'bool', false)
         ->setOptions(
           array(
-            pht('Hide error callout'),
             pht('Show error callout'),
+            pht('Hide error callout'),
           ))
         ->setSummary(pht("Show error callout."))
         ->setDescription(
@@ -114,8 +114,8 @@ final class PhabricatorDeveloperConfigOptions
       $this->newOption('celerity.force-disk-reads', 'bool', false)
         ->setOptions(
           array(
-            pht("Don't force disk reads"),
             pht('Force disk reads'),
+            pht("Don't force disk reads"),
           ))
         ->setSummary(pht("Force Celerity to read from disk on every request."))
         ->setDescription(
@@ -131,8 +131,8 @@ final class PhabricatorDeveloperConfigOptions
       $this->newOption('celerity.minify', 'bool', false)
         ->setOptions(
           array(
-            pht("Don't minify static resources."),
             pht('Minify static resources.'),
+            pht("Don't minify static resources."),
           ))
         ->setSummary(pht("Minify static Celerity resources."))
         ->setDescription(
diff --git a/src/applications/config/option/PhabricatorDisqusConfigOptions.php b/src/applications/config/option/PhabricatorDisqusConfigOptions.php
index de773e07ac..decafe9907 100644
--- a/src/applications/config/option/PhabricatorDisqusConfigOptions.php
+++ b/src/applications/config/option/PhabricatorDisqusConfigOptions.php
@@ -16,8 +16,8 @@ final class PhabricatorDisqusConfigOptions
       $this->newOption('disqus.auth-enabled', 'bool', false)
         ->setOptions(
           array(
-            pht("Disable Disqus Authentication"),
             pht("Enable Disqus Authentication"),
+            pht("Disable Disqus Authentication"),
           ))
         ->setDescription(
           pht(
@@ -25,8 +25,8 @@ final class PhabricatorDisqusConfigOptions
       $this->newOption('disqus.registration-enabled', 'bool', true)
         ->setOptions(
           array(
-            pht("Disable Disqus Registration"),
             pht("Enable Disqus Registration"),
+            pht("Disable Disqus Registration"),
           ))
         ->setDescription(
           pht(
@@ -35,8 +35,8 @@ final class PhabricatorDisqusConfigOptions
       $this->newOption('disqus.auth-permanent', 'bool', false)
         ->setOptions(
           array(
-            pht("Allow Disqus Account Unlinking"),
             pht("Permanently Bind Disqus Accounts"),
+            pht("Allow Disqus Account Unlinking"),
           ))
         ->setDescription(
           pht(
diff --git a/src/applications/config/option/PhabricatorFacebookConfigOptions.php b/src/applications/config/option/PhabricatorFacebookConfigOptions.php
index 9be18876a7..fdf828701f 100644
--- a/src/applications/config/option/PhabricatorFacebookConfigOptions.php
+++ b/src/applications/config/option/PhabricatorFacebookConfigOptions.php
@@ -16,8 +16,8 @@ final class PhabricatorFacebookConfigOptions
       $this->newOption('facebook.auth-enabled', 'bool', false)
         ->setOptions(
           array(
-            pht("Disable Facebook Authentication"),
             pht("Enable Facebook Authentication"),
+            pht("Disable Facebook Authentication"),
           ))
         ->setDescription(
           pht(
@@ -25,8 +25,8 @@ final class PhabricatorFacebookConfigOptions
       $this->newOption('facebook.registration-enabled', 'bool', true)
         ->setOptions(
           array(
-            pht("Disable Facebook Registration"),
             pht("Enable Facebook Registration"),
+            pht("Disable Facebook Registration"),
           ))
         ->setDescription(
           pht(
@@ -35,8 +35,8 @@ final class PhabricatorFacebookConfigOptions
       $this->newOption('facebook.auth-permanent', 'bool', false)
         ->setOptions(
           array(
-            pht("Allow Facebook Account Unlinking"),
             pht("Permanently Bind Facebook Accounts"),
+            pht("Allow Facebook Account Unlinking"),
           ))
         ->setDescription(
           pht(
@@ -53,8 +53,8 @@ final class PhabricatorFacebookConfigOptions
       $this->newOption('facebook.require-https-auth', 'bool', false)
         ->setOptions(
           array(
-            pht("Do Not Require HTTPS"),
             pht("Require HTTPS"),
+            pht("Do Not Require HTTPS"),
           ))
         ->setSummary(
           pht(
diff --git a/src/applications/config/option/PhabricatorGitHubConfigOptions.php b/src/applications/config/option/PhabricatorGitHubConfigOptions.php
index 662a887c63..d7c0531b01 100644
--- a/src/applications/config/option/PhabricatorGitHubConfigOptions.php
+++ b/src/applications/config/option/PhabricatorGitHubConfigOptions.php
@@ -16,8 +16,8 @@ final class PhabricatorGitHubConfigOptions
       $this->newOption('github.auth-enabled', 'bool', false)
         ->setOptions(
           array(
-            pht("Disable GitHub Authentication"),
             pht("Enable GitHub Authentication"),
+            pht("Disable GitHub Authentication"),
           ))
         ->setDescription(
           pht(
@@ -25,8 +25,8 @@ final class PhabricatorGitHubConfigOptions
       $this->newOption('github.registration-enabled', 'bool', true)
         ->setOptions(
           array(
-            pht("Disable GitHub Registration"),
             pht("Enable GitHub Registration"),
+            pht("Disable GitHub Registration"),
           ))
         ->setDescription(
           pht(
@@ -35,8 +35,8 @@ final class PhabricatorGitHubConfigOptions
       $this->newOption('github.auth-permanent', 'bool', false)
         ->setOptions(
           array(
-            pht("Allow GitHub Account Unlinking"),
             pht("Permanently Bind GitHub Accounts"),
+            pht("Allow GitHub Account Unlinking"),
           ))
         ->setDescription(
           pht(
diff --git a/src/applications/config/option/PhabricatorGoogleConfigOptions.php b/src/applications/config/option/PhabricatorGoogleConfigOptions.php
index bae00d4927..6e35637b13 100644
--- a/src/applications/config/option/PhabricatorGoogleConfigOptions.php
+++ b/src/applications/config/option/PhabricatorGoogleConfigOptions.php
@@ -16,8 +16,8 @@ final class PhabricatorGoogleConfigOptions
       $this->newOption('google.auth-enabled', 'bool', false)
         ->setOptions(
           array(
-            pht("Disable Google Authentication"),
             pht("Enable Google Authentication"),
+            pht("Disable Google Authentication"),
           ))
         ->setDescription(
           pht(
@@ -25,8 +25,8 @@ final class PhabricatorGoogleConfigOptions
       $this->newOption('google.registration-enabled', 'bool', true)
         ->setOptions(
           array(
-            pht("Disable Google Registration"),
             pht("Enable Google Registration"),
+            pht("Disable Google Registration"),
           ))
         ->setDescription(
           pht(
@@ -35,8 +35,8 @@ final class PhabricatorGoogleConfigOptions
       $this->newOption('google.auth-permanent', 'bool', false)
         ->setOptions(
           array(
-            pht("Allow Google Account Unlinking"),
             pht("Permanently Bind Google Accounts"),
+            pht("Allow Google Account Unlinking"),
           ))
         ->setDescription(
           pht(
diff --git a/src/applications/config/option/PhabricatorLDAPConfigOptions.php b/src/applications/config/option/PhabricatorLDAPConfigOptions.php
index 8f3f7f92d6..c67a7a748a 100644
--- a/src/applications/config/option/PhabricatorLDAPConfigOptions.php
+++ b/src/applications/config/option/PhabricatorLDAPConfigOptions.php
@@ -16,8 +16,8 @@ final class PhabricatorLDAPConfigOptions
       $this->newOption('ldap.auth-enabled', 'bool', false)
         ->setOptions(
           array(
-            pht("Disable LDAP Authentication"),
             pht("Enable LDAP Authentication"),
+            pht("Disable LDAP Authentication"),
           ))
         ->setDescription(
           pht('Enable LDAP for authentication and registration.')),
@@ -41,8 +41,8 @@ final class PhabricatorLDAPConfigOptions
       $this->newOption('ldap.search-first', 'bool', false)
         ->setOptions(
           array(
-            pht("Disabled"),
             pht("Enabled"),
+            pht("Disabled"),
           )),
       $this->newOption('ldap.username-attribute', 'string', null),
       $this->newOption('ldap.real_name_attributes', 'list<string>', array())
@@ -56,8 +56,8 @@ final class PhabricatorLDAPConfigOptions
       $this->newOption('ldap.referrals', 'bool', true)
         ->setOptions(
           array(
-            pht("Do Not Follow Referrals"),
             pht("Follow Referrals"),
+            pht("Do Not Follow Referrals"),
           ))
         ->setDescription(
           pht("You may need to disable this if you use Windows 2003 ".
diff --git a/src/applications/config/option/PhabricatorNotificationConfigOptions.php b/src/applications/config/option/PhabricatorNotificationConfigOptions.php
index 028651a6aa..3304079915 100644
--- a/src/applications/config/option/PhabricatorNotificationConfigOptions.php
+++ b/src/applications/config/option/PhabricatorNotificationConfigOptions.php
@@ -16,8 +16,8 @@ final class PhabricatorNotificationConfigOptions
       $this->newOption('notification.enabled', 'bool', false)
         ->setOptions(
           array(
-            pht("Disable Real-Time Notifications"),
             pht("Enable Real-Time Notifications"),
+            pht("Disable Real-Time Notifications"),
           ))
         ->setSummary(pht('Enable real-time notifications.'))
         ->setDescription(
diff --git a/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php b/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
index 27deaf3a03..3355d3fee7 100644
--- a/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
+++ b/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
@@ -17,8 +17,8 @@ final class PhabricatorRecaptchaConfigOptions
       $this->newOption('recaptcha.enabled', 'bool', false)
         ->setOptions(
           array(
-            pht("Disable Recaptcha"),
             pht("Enable Recaptcha"),
+            pht("Disable Recaptcha"),
           ))
         ->setSummary(pht('Enable captchas with Recaptcha.'))
         ->setDescription(
diff --git a/src/applications/config/option/PhabricatorSecurityConfigOptions.php b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
index e69f15122d..24e9df9cf5 100644
--- a/src/applications/config/option/PhabricatorSecurityConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
@@ -75,8 +75,8 @@ final class PhabricatorSecurityConfigOptions
             "\$_SERVER['HTTPS'] to the correct value."))
         ->setOptions(
           array(
-            pht('Allow HTTP'),
             pht('Force HTTPS'),
+            pht('Allow HTTP'),
           )),
       $this->newOption(
         'phabricator.csrf-key',