revert introduction of new strings, hardcode StartTLS and SSL/TLS, reuse translated 'automatic' and 'off'

deltachat-ios/Controller/AccountSetup/SecuritySettingsController.swift

@@ -107,19 +107,19 @@ class SecurityConverter {
     static func convertHexToString(type: SecurityType, hex value: Int) -> String {
         switch value {
         case 0x00:
-            return String.localized("crtck_auto")
+            return String.localized("automatic")
         case 0x100:
-            return String.localized("crtck_starttls")
+            return "StartTLS"
         case 0x200:
-            return String.localized("crtck_ssltls")
+            return "SSL/TLS"
         case  0x400:
-            return String.localized("crtck_off")
+            return String.localized("off")
         case 0x10000:
-            return String.localized("crtck_starttls")
+            return "StartTLS"
         case 0x20000:
-            return String.localized("crtck_ssltls")
+            return "SSL/TLS"
         case  0x40000:
-            return String.localized("crtck_off")
+            return String.localized("off")
         default:
             return "Undefined"
         }

deltachat-ios/en.lproj/Localizable.strings

@@ -629,7 +629,3 @@
 "complete" = "Complete";
 "info" = "Info";
 "qr_code_title" = "QR scan/show";
-"crtck_auto" = "Automatic";
-"crtck_starttls" = "STARTTLS";
-"crtck_ssltls" = "SSL / TLS";
-"crtck_off" = "Off";

tools/untranslated.xml

@@ -19,10 +19,6 @@
     <string name="complete">Complete</string>
     <string name="info">Info</string>
     <string name="qr_code_title">QR scan/show</string>
-    <string name="crtck_auto">Automatic</string>
-    <string name="crtck_starttls">STARTTLS</string>
-    <string name="crtck_ssltls">SSL / TLS</string>
-    <string name="crtck_off">Off</string>
     <!-- info plist keys need to pre prefixed with INFOPLIST., spaces need to be replaced with dots and dashes need to replaced with underscores -->
     <string name="INFOPLIST.Privacy._.Camera.Usage.Description">Allowing access to the camera lets you take photos and videos.</string>
     <string name="INFOPLIST.Privacy._.Contacts.Usage.Description">Allowing access to your address book lets you chat with contacts from your device.</string>