diff --git a/CotEditor/Sources/DocumentWindowController.swift b/CotEditor/Sources/DocumentWindowController.swift
index f2b2c56e7..85a35ff42 100644
--- a/CotEditor/Sources/DocumentWindowController.swift
+++ b/CotEditor/Sources/DocumentWindowController.swift
@@ -497,7 +497,7 @@ extension DocumentWindowController: NSToolbarDelegate {
             case .textOrientation:
                 let horizontalItem = NSToolbarItem(itemIdentifier: .horizontalText)
                 horizontalItem.label = String(localized: "Toolbar.textOrientation.horizontalText.label",
-                                              defaultValue: "Horizontal", table: "tooltip", comment: "abc")
+                                              defaultValue: "Horizontal", table: "Document")
                 horizontalItem.toolTip = String(localized: "Toolbar.textOrientation.horizontalText.tooltip",
                                                 defaultValue: "Horizontal", table: "Document")
                 horizontalItem.image = NSImage(systemSymbolName: "text.alignleft", accessibilityDescription: horizontalItem.label)
diff --git a/CotEditor/Sources/FindSettingsView.swift b/CotEditor/Sources/FindSettingsView.swift
index bd925b2a6..e481f8845 100644
--- a/CotEditor/Sources/FindSettingsView.swift
+++ b/CotEditor/Sources/FindSettingsView.swift
@@ -63,6 +63,7 @@ struct FindSettingsView: View {
                                       defaultValue: "Wrap search around",
                                       table: "TextFind", comment: "toggle button label"),
                                isOn: $settings.findIsWrap)
+                        
                         Toggle(String(localized: "FindSettings.findSearchesIncrementally.label",
                                       defaultValue: "Search incrementally",
                                       table: "TextFind", comment: "toggle button label"),
@@ -116,6 +117,7 @@ struct FindTextualOptionsView: View {
                 .help(String(localized: "FindSettings.matchesFullWord.description",
                              defaultValue: "Restrict search results to the whole words.",
                              table: "TextFind", comment: "tooltip"))
+                
                 Toggle(String(localized: "FindSettings.isLiteralSearch.label",
                               defaultValue: "Distinguish characters strictly",
                               table: "TextFind", comment: "toggle button label"),
@@ -123,13 +125,15 @@ struct FindTextualOptionsView: View {
                 .help(String(localized: "FindSettings.isLiteralSearch.description",
                              defaultValue: "Exact character-by-character equivalence.",
                              table: "TextFind", comment: "tooltip"))
-                Toggle(String(localized: "FindSettings.findSearchesIncrementally.label",
+                
+                Toggle(String(localized: "FindSettings.ignoresDiacriticMarks.label",
                               defaultValue: "Ignore diacritical marks",
                               table: "TextFind", comment: "toggle button label"),
                        isOn: $ignoresDiacriticMarks)
                 .help(String(localized: "FindSettings.ignoresDiacriticMarks.description",
                              defaultValue: "Search ignores diacritical marks (e.g. ö = o).",
                              table: "TextFind", comment: "tooltip"))
+                
                 Toggle(String(localized: "FindSettings.ignoresWidth.label",
                               defaultValue: "Ignore width differences",
                               table: "TextFind", comment: "toggle button label"),
@@ -165,6 +169,7 @@ struct FindRegularExpressionOptionsView: View {
                 .help(String(localized: "FindSettings.isSingleLine.description",
                              defaultValue: "Allow . to match any character, including newline characters (singleline).",
                              table: "TextFind", comment: "tooltip"))
+                
                 Toggle(String(localized: "FindSettings.isMultiline.label",
                               defaultValue: "Anchors match lines",
                               table: "TextFind", comment: "toggle button label"),
@@ -172,6 +177,7 @@ struct FindRegularExpressionOptionsView: View {
                 .help(String(localized: "FindSettings.isMultiline.description",
                              defaultValue: "Allow ^ and $ to match the start and end of lines (multiline).",
                              table: "TextFind", comment: "tooltip"))
+                
                 Toggle(String(localized: "FindSettings.usesUnicodeBoundaries.label",
                               defaultValue: "Use Unicode word boundaries",
                               table: "TextFind", comment: "toggle button label"),
@@ -179,6 +185,7 @@ struct FindRegularExpressionOptionsView: View {
                 .help(String(localized: "FindSettings.usesUnicodeBoundaries.description",
                              defaultValue: "Use Unicode TR#29 to specify word boundaries",
                              table: "TextFind", comment: "tooltip"))
+                
                 Toggle(String(localized: "FindSettings.unescapesReplacementString.label",
                               defaultValue: "Unescape replacement string",
                               table: "TextFind", comment: "toggle button label"),
diff --git a/CotEditor/mul.lproj/AppearanceSettings.xcstrings b/CotEditor/mul.lproj/AppearanceSettings.xcstrings
index 9b6154be1..738fa4adf 100644
--- a/CotEditor/mul.lproj/AppearanceSettings.xcstrings
+++ b/CotEditor/mul.lproj/AppearanceSettings.xcstrings
@@ -15,12 +15,6 @@
             "value" : "Text glätten"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Antialias"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -91,12 +85,6 @@
             "value" : "Erscheinungsbild:"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Appearance:"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -469,12 +457,6 @@
             "value" : "Editor-Deckkraft:"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Editor opacity:"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -545,12 +527,6 @@
             "value" : "Ligaturen"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Ligatures"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -621,12 +597,6 @@
             "value" : "Zeilenhöhe:"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Line height:"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -697,12 +667,6 @@
             "value" : "Nichtproportionale Schrift:"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Monospaced font:"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -774,12 +738,6 @@
             "value" : "Auswählen …"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Select…"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -850,12 +808,6 @@
             "value" : "Standardschrift:"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Standard font:"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -982,83 +934,6 @@
         }
       }
     },
-    "Theme" : {
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Motiv"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Thema"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Theme"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Theme"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tema"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Thème"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tema"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "テーマ"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tema"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tema"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "主题"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "主題"
-          }
-        }
-      }
-    },
     "times" : {
       "comment" : "unit for line height",
       "localizations" : {
@@ -1074,12 +949,6 @@
             "value" : "-fach"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "times"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
diff --git a/CotEditor/mul.lproj/Document.xcstrings b/CotEditor/mul.lproj/Document.xcstrings
index 1f4585366..b880860ab 100644
--- a/CotEditor/mul.lproj/Document.xcstrings
+++ b/CotEditor/mul.lproj/Document.xcstrings
@@ -1970,7 +1970,7 @@
       }
     },
     "Line Endings" : {
-      "extractionState" : "manual",
+      "comment" : "label in document inspector",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -7000,7 +7000,7 @@
       }
     },
     "Toolbar.textOrientation.horizontalText.label" : {
-      "extractionState" : "migrated",
+      "extractionState" : "extracted_with_value",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -7014,6 +7014,12 @@
             "value" : "Horizontal"
           }
         },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Horizontal"
+          }
+        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
diff --git a/CotEditor/mul.lproj/EditSettings.xcstrings b/CotEditor/mul.lproj/EditSettings.xcstrings
index e771f1e07..1c9a1e10f 100644
--- a/CotEditor/mul.lproj/EditSettings.xcstrings
+++ b/CotEditor/mul.lproj/EditSettings.xcstrings
@@ -77,82 +77,6 @@
         }
       }
     },
-    "Automatically insert closing brackets and quotes" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Automaticky vkládat uzavírací závorky a uvozovky"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Klammern und Anführungszeichen automatisch schließen"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Automatically insert closing brackets and quotes"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Automatically insert closing brackets and quotes"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inserte automáticamente los corchetes de cierre y las comillas"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Insérer automatiquement les parenthèses et guillemets fermants"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inserisci automaticamente parentesi e virgolette di chiusura"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "括弧と引用符を自動的に閉じる"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inserir chaves e aspas finais automaticamente"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Kapatma ayraçlarını ve tırnaklarını kendiliğinden ekle"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "自动补全括号和引号"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "自動補全括弧和引號"
-          }
-        }
-      }
-    },
     "Automatically trim trailing whitespace" : {
       "localizations" : {
         "cs" : {
@@ -229,216 +153,6 @@
         }
       }
     },
-    "Check spelling while typing" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Kontrolovat pravopis při psaní"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Rechtschreibung während der Texteingabe prüfen"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Check spelling while typing"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Comprobar ortografía mientras se escribe"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vérifier le document lors de la saisie"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Controlla ortografia mentre scrivo"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "入力中にスペルをチェック"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Verificar Ortografia Durante Digitação"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Yazarken yazım denetimi yap"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "键入时检查拼写"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "在輸入時同步檢查拼字"
-          }
-        }
-      }
-    },
-    "Completion list includes:" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Zahrnout seznam pro dokončování:"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vervollständigungsliste enthält:"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Completion list includes:"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "La lista de autocompletado incluye:"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "La liste de complétion inclue :"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "La lista di completamento include:"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "入力補完候補リストに含む単語:"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Lista de preenchimento inclui:"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tamamlama listesi şunları içerir:"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "补全列表包括："
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "補全列表包括："
-          }
-        }
-      }
-    },
-    "Completion:" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Dokončování:"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vervollständigung:"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Completion:"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Autocompletado:"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Complétion :"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Completamento:"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "入力補完:"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Preenchimento:"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tamamlama:"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "补全："
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "補全："
-          }
-        }
-      }
-    },
     "Content parse:" : {
       "localizations" : {
         "cs" : {
@@ -1350,216 +1064,6 @@
         }
       }
     },
-    "Smart copy/paste" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inteligentní kopírování/vkládání"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Intelligentes Kopieren/Ersetzen"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Smart copy/paste"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Copiado/pegado inteligente"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Copier-coller intelligent"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Copia/incolla smart"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "スマートコピー/ペースト"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Copiar/colar inteligente"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Akıllı kopyala/yapıştır"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "智能拷贝/粘贴"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "智慧型拷貝/貼上"
-          }
-        }
-      }
-    },
-    "Smart dashes" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inteligentní pomlčky"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Intelligente Bindestriche"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Smart dashes"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Guiones inteligentes"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tirets intelligents"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Trattini smart"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "スマートダッシュ記号"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Hifens Inteligentes"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Akıllı Tireler"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "智能破折号"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "智慧型破折號"
-          }
-        }
-      }
-    },
-    "Smart quotes" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inteligentní uvozovky"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Intelligente Anführungszeichen"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Smart quotes"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Comillas tipográficas"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Guillemets courbes"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Virgolette smart"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "スマート引用符"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Aspas Inteligentes"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Akıllı Tırnaklar"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "智能引号"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "智慧型引號"
-          }
-        }
-      }
-    },
     "spaces" : {
       "comment" : "unit for indentation",
       "localizations" : {
@@ -1702,146 +1206,6 @@
         }
       }
     },
-    "Standard words" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Standardní slova"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Normale Wörter"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Standard words"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Palabras estándar"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Mots courants"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Parole standard"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "一般単語"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Palavras padrão"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Standart sözcükler"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "标准单词"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "標準單字"
-          }
-        }
-      }
-    },
-    "Suggest completions while typing" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Navrhovat dokončování textu při psaní"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Während der Texteingabe Vervollständigungen vorschlagen"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Suggest completions while typing"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sugerir terminaciones mientras se escribe"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Afficher des suggestions pendant la saisie"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Suggerisci completamento durante l’inserimento"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "入力中に補完候補を表示"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sugerir preenchimento ao digitar"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Yazarken tamamlamaları öner"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "键入时提供补齐建议"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "在輸入時建議關聯字"
-          }
-        }
-      }
-    },
     "Tabs" : {
       "comment" : "indent style",
       "localizations" : {
@@ -1982,146 +1346,6 @@
           }
         }
       }
-    },
-    "Words defined in syntax" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Slova definovaná v syntaxi"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Wörter, die in der Syntax definiert sind"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Words defined in syntax"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Palabras definidas en sintaxis"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Mots définis dans la syntaxe"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Parole definite nella sintassi"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "シンタックスで定義された単語"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Palavras definidas na sintaxe"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Sözdizimde tanımlı sözcükler"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "语法中包含的单词"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "被程式文法所定義的單字"
-          }
-        }
-      }
-    },
-    "Words in document" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Slova v dokumentu"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Wörter im Dokument"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Words in document"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Palabras en el documento"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Mots du document"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Parole del documento"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "書類に含まれる単語"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Palavras no documento"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Belgedeki sözcükler"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "文稿中的单词"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "文件中的單字"
-          }
-        }
-      }
     }
   },
   "version" : "1.0"
diff --git a/CotEditor/mul.lproj/ModeSettings.xcstrings b/CotEditor/mul.lproj/ModeSettings.xcstrings
index d6da660fd..76f31e1bf 100644
--- a/CotEditor/mul.lproj/ModeSettings.xcstrings
+++ b/CotEditor/mul.lproj/ModeSettings.xcstrings
@@ -86,12 +86,6 @@
             "value" : "Klammern und Anführungszeichen automatisch schließen"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Automatically insert closing brackets and quotes"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -866,76 +860,6 @@
         }
       }
     },
-    "Prefer using" : {
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Preferovat:"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Einrückung mit"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Prefer using:"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Prefiero usar"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Préférer :"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Preferisci l'uso di:"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "使用する文字:"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Preferir usando:"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Şunu tercih et"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "偏好使用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "縮進專用字元:"
-          }
-        }
-      }
-    },
     "Remove" : {
       "comment" : "button label",
       "localizations" : {
diff --git a/CotEditor/mul.lproj/SyntaxEditor.xcstrings b/CotEditor/mul.lproj/SyntaxEditor.xcstrings
index 84124b808..73703f1e1 100644
--- a/CotEditor/mul.lproj/SyntaxEditor.xcstrings
+++ b/CotEditor/mul.lproj/SyntaxEditor.xcstrings
@@ -1530,12 +1530,6 @@
             "value" : "Dateizuordnung"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "File Mapping"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -1926,12 +1920,6 @@
             "value" : "Informationen"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Information"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
@@ -3239,162 +3227,6 @@
         }
       }
     },
-    "Syntax.Kind.code.label" : {
-      "comment" : "syntax kind",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Kód"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Code"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Code"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Code"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Código"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Code"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Codice"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "コード"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Código"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Kod"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "代码"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "程式碼"
-          }
-        }
-      }
-    },
-    "Syntax.Kind.general.label" : {
-      "comment" : "syntax kind",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Obecné"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Allgemein"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "General"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "General"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "General"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Général"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Generale"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "一般"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "General"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Genel"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "通用"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "一般"
-          }
-        }
-      }
-    },
     "The interpreters are used to determine the syntax from the shebang in the document." : {
       "comment" : "description",
       "localizations" : {
@@ -3693,12 +3525,6 @@
             "value" : "Validierung"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Validation"
-          }
-        },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
diff --git a/CotEditor/mul.lproj/TextFind.xcstrings b/CotEditor/mul.lproj/TextFind.xcstrings
index df1b40058..bd2587743 100644
--- a/CotEditor/mul.lproj/TextFind.xcstrings
+++ b/CotEditor/mul.lproj/TextFind.xcstrings
@@ -1742,79 +1742,72 @@
       }
     },
     "FindSettings.findSearchesIncrementally.label" : {
-      "comment" : "toggle button label",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "manual",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ignorovat diakritiku"
+            "value" : "Hledat postupně"
           }
         },
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Diakritische Zeichen ignorieren"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Search incrementally"
+            "value" : "Inkrementell suchen"
           }
         },
         "en-GB" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ignore diacritical marks"
+            "value" : "Search incrementally"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ignorar las marcas diacríticas"
+            "value" : "Buscar de forma incremental"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ignorer les signes diacritiques"
+            "value" : "Recherche incrémentale"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ignora segni diacritici"
+            "value" : "Ricerca incrementale"
           }
         },
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "発音区別記号を無視"
+            "value" : "インクリメンタルに検索"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ignorar sinais diacríticos"
+            "value" : "Buscar incrementalmente"
           }
         },
         "tr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aksan imlerini yok say"
+            "value" : "Aşamalı olarak ara"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "忽略变音符号"
+            "value" : "增量搜索"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "忽略變音符號"
+            "value" : "增量尋找"
           }
         }
       }
@@ -1897,6 +1890,84 @@
         }
       }
     },
+    "FindSettings.ignoresDiacriticMarks.label" : {
+      "comment" : "toggle button label",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "cs" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ignorovat diakritiku"
+          }
+        },
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Diakritische Zeichen ignorieren"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Ignore diacritical marks"
+          }
+        },
+        "en-GB" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ignore diacritical marks"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ignorar las marcas diacríticas"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ignorer les signes diacritiques"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ignora segni diacritici"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "発音区別記号を無視"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ignorar sinais diacríticos"
+          }
+        },
+        "tr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aksan imlerini yok say"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "忽略变音符号"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "忽略變音符號"
+          }
+        }
+      }
+    },
     "FindSettings.ignoresWidth.description" : {
       "comment" : "tooltip",
       "extractionState" : "extracted_with_value",
@@ -4186,77 +4257,6 @@
         }
       }
     },
-    "Search incrementally" : {
-      "extractionState" : "migrated",
-      "localizations" : {
-        "cs" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Hledat postupně"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inkrementell suchen"
-          }
-        },
-        "en-GB" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Search incrementally"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Buscar de forma incremental"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Recherche incrémentale"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ricerca incrementale"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "インクリメンタルに検索"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Buscar incrementalmente"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Aşamalı olarak ara"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "增量搜索"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "增量尋找"
-          }
-        }
-      }
-    },
     "Search wrapped." : {
       "comment" : "Announced when the search restarted from the beginning.",
       "localizations" : {