Merge branch 'archweb-generic'

1 files changed, 4 insertions, 4 deletions

diff --git a/settings.py b/settings.py
index fa27b2f2..70da44b8 100644
--- a/settings.py
+++ b/settings.py
@@ -152,11 +152,10 @@ LOGGING = {
             'handlers': ['mail_admins'],
             'level': 'ERROR',
             'propagate': True,
-        },
+        }
     },
 }
 
-
 ## Server used for linking to PGP keysearch results
 PGP_SERVER = 'pgp.mit.edu:11371'
 
@@ -199,9 +198,10 @@ BRANDING_WIKINAME = 'ParabolaWiki'
 BRANDING_EMAIL = 'Parabola Website Notification <nobody@parabola.nu>'
 BRANDING_OSEARCH_TAGS = 'gnu linuxlibre parabola package software'
 
-# Country name overrides for display purposes
+# Shorten some names just a bit
 COUNTRIES_OVERRIDE = {
-    'MK': 'Macedonia',
+    'GB': 'United Kingdom',
+    'US': 'United States',
 }
 
 ## Import local settings