From b219642f6de756cf59b7cc0e7739546aab407bec Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 8 Aug 2015 16:43:21 -0700
Subject: [PATCH] 'Except Archives from Encryption' -> 'Exempt Archives from
 Encryption'

---
 src/General/Config.coffee | 2 +-
 src/General/Main.coffee   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index d6f4fb29b..e3e1962e0 100755
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -39,7 +39,7 @@ Config =
         true
         'Enable reporting posts to supported archives.'
       ]
-      'Except Archives from Encryption': [
+      'Exempt Archives from Encryption': [
         false
         'Permit loading content from, and warningless redirects to, HTTP-only archives from HTTPS pages.'
       ]
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 2ac1cc7fe..53758a627 100755
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -52,6 +52,9 @@ Main =
     Conf['selectedArchives'] = {}
     Conf['cooldowns'] = {}
 
+    # XXX old key names
+    Conf['Except Archives from Encryption'] = false
+
     # Get saved values as items
     items = {}
     items[key] = undefined for key of Conf
@@ -86,7 +89,9 @@ Main =
 
     if compareString < '00001.00011.00008.00000'
       unless items['Fixed Thread Watcher']?
-        items2['Fixed Thread Watcher']    = items['Toggleable Thread Watcher'] ? true
+        items2['Fixed Thread Watcher'] = items['Toggleable Thread Watcher'] ? true
+      unless items['Exempt Archives from Encryption']?
+        items2['Exempt Archives from Encryption'] = items['Except Archives from Encryption'] ? false
 
     $.extend items, items2
     $.set items2, ->