Remove 'safety number approval' option from settings dialog

Also sync templates in test/index.html and background.html

FREEBIE

_locales/en/messages.json

@@ -594,14 +594,6 @@
       "message": "Play audio notification",
       "description": "Description for audio notification setting"
     },
-    "safetyNumbersSettingHeader": {
-      "message": "Safety numbers approval",
-      "description": "Header for safety numbers setting"
-    },
-    "safetyNumbersSettingDescription": {
-      "message": "Require approval of new safety numbers when they change",
-      "description": "Description for safety numbers setting"
-    },
     "keychanged": {
       "message": "Your safety number with $name$ has changed. Click to verify.",
       "description": "",

background.html

@@ -480,12 +480,6 @@
         <input type='checkbox' name='audio-notification' id='audio-notification'/>
         <label for='audio-notification'>{{ audioNotificationDescription }}</label>
       </div>
-      <hr>
-      <div class='safety-numbers-settings'>
-        <h3>{{ safetyNumbersSettingHeader }}</h3>
-        <input type='checkbox' name='safety-numbers-approval' id='safety-numbers-approval'/>
-        <label for='safety-numbers-approval'>{{ safetyNumbersSettingDescription }}</label>
-      </div>
     </div>
   </script>
   <script type='text/x-tmpl-mustache' id='syncSettings'>

js/views/settings_view.js

@@ -64,11 +64,6 @@
                 defaultValue: false,
                 name: 'audio-notification'
             });
-            new CheckboxView({
-                el: this.$('.safety-numbers-settings'),
-                defaultValue: true,
-                name: 'safety-numbers-approval'
-            });
             if (textsecure.storage.user.getDeviceId() != '1') {
                 var syncView = new SyncView().render();
                 this.$('.content').append(syncView.el);
@@ -87,8 +82,6 @@
               nameAndMessage: i18n('nameAndMessage'),
               noNameOrMessage: i18n('noNameOrMessage'),
               nameOnly: i18n('nameOnly'),
-              safetyNumbersSettingDescription: i18n('safetyNumbersSettingDescription'),
-              safetyNumbersSettingHeader: i18n('safetyNumbersSettingHeader'),
               audioNotificationDescription: i18n('audioNotificationDescription'),
               themeAndroidDark: i18n('themeAndroidDark'),
             };

test/index.html

@@ -422,7 +422,7 @@
         </div>
         <div>
           <input type='radio' name='theme' id='theme-setting-android-dark' value='android-dark'>
-          <label for='theme-setting-android-dark'>{{ themeAndroidDark }} </label>
+          <label for='theme-setting-android-dark'>{{ themeAndroidDark }}</label>
         </div>
         <div>
           <input type='radio' name='theme' id='theme-setting-ios'  value='ios'/>
@@ -450,6 +450,11 @@
           <label for='notification-setting-off'>{{ disableNotifications }} </label>
         </div>
       </div>
+      <br />
+      <div class='audio-notification-setting'>
+        <input type='checkbox' name='audio-notification' id='audio-notification'/>
+        <label for='audio-notification'>{{ audioNotificationDescription }}</label>
+      </div>
     </div>
   </script>
   <script type='text/x-tmpl-mustache' id='syncSettings'>