diff --git a/English.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
similarity index 100%
rename from English.lproj/MainMenu.xib
rename to Base.lproj/MainMenu.xib
diff --git a/English.lproj/Preferences.xib b/Base.lproj/Preferences.xib
similarity index 100%
rename from English.lproj/Preferences.xib
rename to Base.lproj/Preferences.xib
diff --git a/English.lproj/TermWindow.xib b/Base.lproj/TermWindow.xib
similarity index 100%
rename from English.lproj/TermWindow.xib
rename to Base.lproj/TermWindow.xib
diff --git a/DTerm.xcodeproj/project.pbxproj b/DTerm.xcodeproj/project.pbxproj
index f00eac8..7aed821 100644
--- a/DTerm.xcodeproj/project.pbxproj
+++ b/DTerm.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -105,12 +105,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		250074540CF0B1C500949B95 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		2500751A0CF0B2B600949B95 /* DTAppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTAppController.h; sourceTree = "<group>"; };
 		2500751B0CF0B2B600949B95 /* DTAppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTAppController.m; sourceTree = "<group>"; };
-		2500751F0CF0B33600949B95 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		2500756D0CF0C1CF00949B95 /* Finder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Finder.h; sourceTree = "<group>"; };
 		250075720CF0C24200949B95 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = /System/Library/Frameworks/ScriptingBridge.framework; sourceTree = "<absolute>"; };
 		251453C10D720F35000B6100 /* FontNameToDisplayNameTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FontNameToDisplayNameTransformer.m; sourceTree = "<group>"; };
@@ -127,7 +125,6 @@
 		2529F76D0CF4D61100CDF456 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
 		2529F8500CF5F6AB00CDF456 /* DTerm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = DTerm.icns; sourceTree = "<group>"; };
 		2529F8E90CF7575000CDF456 /* Terminal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Terminal.h; sourceTree = "<group>"; };
-		254036C510FFCDCC0076CE83 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
 		2559EB0E0D36EC58002BCF4E /* PathFinder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathFinder.h; sourceTree = "<group>"; };
 		257158E70CFF9A99007181F4 /* DTShellUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTShellUtilities.h; sourceTree = "<group>"; };
 		257158E80CFF9A99007181F4 /* DTShellUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTShellUtilities.m; sourceTree = "<group>"; };
@@ -167,16 +164,13 @@
 		25A870C70D0B03E300D88D65 /* Updates Prefs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Updates Prefs.png"; path = "Images/Updates Prefs.png"; sourceTree = SOURCE_ROOT; };
 		25A8719F0D0B157F00D88D65 /* DTPrefsAXController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTPrefsAXController.h; sourceTree = SOURCE_ROOT; };
 		25A871A00D0B157F00D88D65 /* DTPrefsAXController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTPrefsAXController.m; sourceTree = SOURCE_ROOT; };
-		25AE84210CF0D208008F96FD /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TermWindow.xib; sourceTree = "<group>"; };
 		25AE84310CF0D5AA008F96FD /* DTTermWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTTermWindowController.h; sourceTree = "<group>"; };
 		25AE84320CF0D5AA008F96FD /* DTTermWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTTermWindowController.m; sourceTree = "<group>"; };
 		25B10DCE0D29D2B40034B100 /* DSUniqueTextStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSUniqueTextStorage.h; sourceTree = "<group>"; };
 		25B10DCF0D29D2B40034B100 /* DSUniqueTextStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DSUniqueTextStorage.m; sourceTree = "<group>"; };
-		25BEBAE70D171C8D00F7A797 /* English */ = {isa = PBXFileReference; lastKnownFileType = folder; name = English; path = English.lproj/DTermHelp; sourceTree = "<group>"; };
 		25E007090DBFCA280092F1E5 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
 		25E651520CF3B0860072997F /* DTPrefsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTPrefsWindowController.h; sourceTree = "<group>"; };
 		25E651530CF3B0860072997F /* DTPrefsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTPrefsWindowController.m; sourceTree = "<group>"; };
-		25E651560CF3B0B80072997F /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = "<group>"; };
 		25E6DA3C0EB2623F003C1E84 /* DSAppleScriptUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSAppleScriptUtilities.h; sourceTree = "<group>"; };
 		25E6DA3D0EB2623F003C1E84 /* DSAppleScriptUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DSAppleScriptUtilities.m; sourceTree = "<group>"; };
 		25FA394212E5E47100DE744A /* iTerm2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTerm2.h; sourceTree = "<group>"; };
@@ -200,6 +194,12 @@
 		3B3E1FB0190C10C500B31D3E /* SRValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRValidator.h; sourceTree = "<group>"; };
 		3B3E1FB1190C10C500B31D3E /* SRValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRValidator.m; sourceTree = "<group>"; };
 		3B6316B5190D51E100D62E4E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		754E35BF2AD1D4F10096ADBF /* en */ = {isa = PBXFileReference; lastKnownFileType = folder; name = en; path = en.lproj/DTermHelp; sourceTree = "<group>"; };
+		754E35C02AD1D4F10096ADBF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		754E35C12AD1D4F10096ADBF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		754E35C52AD1D50A0096ADBF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		754E35C62AD1D50A0096ADBF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TermWindow.xib; sourceTree = "<group>"; };
+		754E35C72AD1D50A0096ADBF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Preferences.xib; sourceTree = "<group>"; };
 		75BDB76D1A07EAA9006BB694 /* SystemEvents.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SystemEvents.h; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* DTerm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DTerm.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -497,27 +497,27 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1500;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DTerm" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-				Dutch,
 				sv,
 				cs,
 				pl,
 				pt_BR,
-				Russian,
-				Swedish,
 				zh_CN,
 				zh_TW,
 				en,
+				de,
+				ru,
+				fr,
+				Base,
+				nl,
+				ja,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* DTerm */;
 			projectDirPath = "";
@@ -595,13 +595,17 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
 			);
 			outputPaths = (
+				"",
+				"$(BUILT_PRODUCTS_DIR)/include/Revision.h",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "PATH=\"$HOME/bin:/usr/local/bin:$PATH\"\ncd \"$PROJECT_DIR\"\nSHA=$(git rev-parse --short HEAD)\nCOUNT=$(git rev-list --count HEAD)\necho \"*** Building Git Revision: $COUNT @ $SHA\"\nmkdir -p \"$BUILT_PRODUCTS_DIR/include\"\necho \"#define REVISION 1.7.$COUNT\" >  $BUILT_PRODUCTS_DIR/include/Revision.h\n\ngit diff --quiet\nif [[ $? -eq 0 ]]; then\n  echo \"#define REVISION_PUBLIC 1.7.$COUNT-$SHA\" >> $BUILT_PRODUCTS_DIR/include/Revision.h\nelse\n  echo \"#define REVISION_PUBLIC 1.7.$COUNT-$SHA+\" >> $BUILT_PRODUCTS_DIR/include/Revision.h\nfi\n";
+			shellScript = "PATH=\"$HOME/bin:/usr/local/bin:$PATH\"\ncd \"$PROJECT_DIR\"\nSHA=$(git rev-parse --short HEAD)\nCOUNT=$(git rev-list --count HEAD)\necho \"*** Building Git Revision: $COUNT @ $SHA\"\necho \"*** Updating $BUILT_PRODUCTS_DIR/include/Revision.h\"\n\nmkdir -p \"$BUILT_PRODUCTS_DIR/include\"\necho \"#define REVISION 1.7.$COUNT\" >  $BUILT_PRODUCTS_DIR/include/Revision.h\n\ngit diff --quiet\nif [[ $? -eq 0 ]]; then\n  echo \"#define REVISION_PUBLIC 1.7.$COUNT-$SHA\" >> $BUILT_PRODUCTS_DIR/include/Revision.h\nelse\n  echo \"#define REVISION_PUBLIC 1.7.$COUNT-$SHA+\" >> $BUILT_PRODUCTS_DIR/include/Revision.h\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -667,7 +671,7 @@
 		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				089C165DFE840E0CC02AAC07 /* English */,
+				754E35C02AD1D4F10096ADBF /* en */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -675,7 +679,7 @@
 		2500751E0CF0B33600949B95 /* MainMenu.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				2500751F0CF0B33600949B95 /* English */,
+				754E35C52AD1D50A0096ADBF /* Base */,
 			);
 			name = MainMenu.xib;
 			sourceTree = "<group>";
@@ -683,7 +687,7 @@
 		254036C410FFCDCC0076CE83 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				254036C510FFCDCC0076CE83 /* English */,
+				754E35C12AD1D4F10096ADBF /* en */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -691,7 +695,7 @@
 		25AE84200CF0D208008F96FD /* TermWindow.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				25AE84210CF0D208008F96FD /* English */,
+				754E35C62AD1D50A0096ADBF /* Base */,
 			);
 			name = TermWindow.xib;
 			sourceTree = "<group>";
@@ -699,7 +703,7 @@
 		25BEBAE60D171C8D00F7A797 /* DTermHelp */ = {
 			isa = PBXVariantGroup;
 			children = (
-				25BEBAE70D171C8D00F7A797 /* English */,
+				754E35BF2AD1D4F10096ADBF /* en */,
 			);
 			name = DTermHelp;
 			sourceTree = "<group>";
@@ -707,7 +711,7 @@
 		25E651550CF3B0B80072997F /* Preferences.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				25E651560CF3B0B80072997F /* English */,
+				754E35C72AD1D50A0096ADBF /* Base */,
 			);
 			name = Preferences.xib;
 			sourceTree = "<group>";
@@ -719,14 +723,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/DTerm.app/Contents/MacOS/DTerm";
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -738,7 +743,7 @@
 					"-framework",
 					Cocoa,
 				);
-				PREBINDING = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = net.decimus.dterm.tests;
 				PRODUCT_NAME = Tests;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 			};
@@ -748,14 +753,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/DTerm.app/Contents/MacOS/DTerm";
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -766,7 +772,7 @@
 					"-framework",
 					Cocoa,
 				);
-				PREBINDING = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = net.decimus.dterm.tests;
 				PRODUCT_NAME = Tests;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				ZERO_LINK = NO;
@@ -776,7 +782,9 @@
 		25A0CDCB0DE500010042D226 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				PRODUCT_NAME = Revision;
 			};
 			name = Debug;
@@ -784,9 +792,10 @@
 		25A0CDCC0DE500010042D226 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COPY_PHASE_STRIP = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				PRODUCT_NAME = Revision;
 			};
 			name = Release;
@@ -810,7 +819,13 @@
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = BC4UGPAMY3;
+				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = DTerm_Prefix.pch;
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
@@ -837,6 +852,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_BUNDLE_IDENTIFIER = net.decimus.dterm;
 				PRODUCT_NAME = DTerm;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				WARNING_CFLAGS = (
 					"-Wall",
 					"-Wextra",
@@ -864,7 +880,13 @@
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = BC4UGPAMY3;
+				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = DTerm_Prefix.pch;
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
@@ -891,7 +913,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_BUNDLE_IDENTIFIER = net.decimus.dterm;
 				PRODUCT_NAME = DTerm;
-				STRIP_INSTALLED_PRODUCT = YES;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				WARNING_CFLAGS = (
 					"-Wall",
 					"-Wextra",
@@ -903,11 +925,39 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
@@ -915,10 +965,37 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 			};
 			name = Release;
 		};
diff --git a/DTerm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DTerm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/DTerm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/DTerm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/DTerm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..0c67376
--- /dev/null
+++ b/DTerm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/DTerm.xcodeproj/xcshareddata/xcschemes/DTerm.xcscheme b/DTerm.xcodeproj/xcshareddata/xcschemes/DTerm.xcscheme
new file mode 100644
index 0000000..1a687d4
--- /dev/null
+++ b/DTerm.xcodeproj/xcshareddata/xcschemes/DTerm.xcscheme
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8D1107260486CEB800E47090"
+               BuildableName = "DTerm.app"
+               BlueprintName = "DTerm"
+               ReferencedContainer = "container:DTerm.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "257159180CFFAA2C007181F4"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
+               ReferencedContainer = "container:DTerm.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8D1107260486CEB800E47090"
+            BuildableName = "DTerm.app"
+            BlueprintName = "DTerm"
+            ReferencedContainer = "container:DTerm.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8D1107260486CEB800E47090"
+            BuildableName = "DTerm.app"
+            BlueprintName = "DTerm"
+            ReferencedContainer = "container:DTerm.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/DTerm.xcodeproj/xcshareddata/xcschemes/Revision.xcscheme b/DTerm.xcodeproj/xcshareddata/xcschemes/Revision.xcscheme
new file mode 100644
index 0000000..0c037af
--- /dev/null
+++ b/DTerm.xcodeproj/xcshareddata/xcschemes/Revision.xcscheme
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "25A0CDCA0DE500010042D226"
+               BuildableName = "Revision"
+               BlueprintName = "Revision"
+               ReferencedContainer = "container:DTerm.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "25A0CDCA0DE500010042D226"
+            BuildableName = "Revision"
+            BlueprintName = "Revision"
+            ReferencedContainer = "container:DTerm.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Tests/Tests-Info.plist b/Tests/Tests-Info.plist
index 7f447ac..460a7d9 100644
--- a/Tests/Tests-Info.plist
+++ b/Tests/Tests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.decimus.dterm.tests</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/English.lproj/DTermHelp/DTermHelp.helpindex b/en.lproj/DTermHelp/DTermHelp.helpindex
similarity index 100%
rename from English.lproj/DTermHelp/DTermHelp.helpindex
rename to en.lproj/DTermHelp/DTermHelp.helpindex
diff --git a/English.lproj/DTermHelp/DTermHelp.html b/en.lproj/DTermHelp/DTermHelp.html
similarity index 100%
rename from English.lproj/DTermHelp/DTermHelp.html
rename to en.lproj/DTermHelp/DTermHelp.html
diff --git a/English.lproj/DTermHelp/gfx/DTerm16.png b/en.lproj/DTermHelp/gfx/DTerm16.png
similarity index 100%
rename from English.lproj/DTermHelp/gfx/DTerm16.png
rename to en.lproj/DTermHelp/gfx/DTerm16.png
diff --git a/English.lproj/DTermHelp/gfx/DTerm32.png b/en.lproj/DTermHelp/gfx/DTerm32.png
similarity index 100%
rename from English.lproj/DTermHelp/gfx/DTerm32.png
rename to en.lproj/DTermHelp/gfx/DTerm32.png
diff --git a/English.lproj/DTermHelp/gfx/access_border_bottom.gif b/en.lproj/DTermHelp/gfx/access_border_bottom.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_bottom.gif
rename to en.lproj/DTermHelp/gfx/access_border_bottom.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_bottomleft.gif b/en.lproj/DTermHelp/gfx/access_border_bottomleft.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_bottomleft.gif
rename to en.lproj/DTermHelp/gfx/access_border_bottomleft.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_bottomright.gif b/en.lproj/DTermHelp/gfx/access_border_bottomright.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_bottomright.gif
rename to en.lproj/DTermHelp/gfx/access_border_bottomright.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_innerbottomleft.gif b/en.lproj/DTermHelp/gfx/access_border_innerbottomleft.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_innerbottomleft.gif
rename to en.lproj/DTermHelp/gfx/access_border_innerbottomleft.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_innerbottomright.gif b/en.lproj/DTermHelp/gfx/access_border_innerbottomright.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_innerbottomright.gif
rename to en.lproj/DTermHelp/gfx/access_border_innerbottomright.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_innerleft.gif b/en.lproj/DTermHelp/gfx/access_border_innerleft.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_innerleft.gif
rename to en.lproj/DTermHelp/gfx/access_border_innerleft.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_innerright.gif b/en.lproj/DTermHelp/gfx/access_border_innerright.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_innerright.gif
rename to en.lproj/DTermHelp/gfx/access_border_innerright.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_innertopleft.gif b/en.lproj/DTermHelp/gfx/access_border_innertopleft.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_innertopleft.gif
rename to en.lproj/DTermHelp/gfx/access_border_innertopleft.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_innertopright.gif b/en.lproj/DTermHelp/gfx/access_border_innertopright.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_innertopright.gif
rename to en.lproj/DTermHelp/gfx/access_border_innertopright.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_left.gif b/en.lproj/DTermHelp/gfx/access_border_left.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_left.gif
rename to en.lproj/DTermHelp/gfx/access_border_left.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_right.gif b/en.lproj/DTermHelp/gfx/access_border_right.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_right.gif
rename to en.lproj/DTermHelp/gfx/access_border_right.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_top.gif b/en.lproj/DTermHelp/gfx/access_border_top.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_top.gif
rename to en.lproj/DTermHelp/gfx/access_border_top.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_topleft.gif b/en.lproj/DTermHelp/gfx/access_border_topleft.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_topleft.gif
rename to en.lproj/DTermHelp/gfx/access_border_topleft.gif
diff --git a/English.lproj/DTermHelp/gfx/access_border_topright.gif b/en.lproj/DTermHelp/gfx/access_border_topright.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/access_border_topright.gif
rename to en.lproj/DTermHelp/gfx/access_border_topright.gif
diff --git a/English.lproj/DTermHelp/gfx/border_bottom.gif b/en.lproj/DTermHelp/gfx/border_bottom.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/border_bottom.gif
rename to en.lproj/DTermHelp/gfx/border_bottom.gif
diff --git a/English.lproj/DTermHelp/gfx/border_bottomleft.gif b/en.lproj/DTermHelp/gfx/border_bottomleft.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/border_bottomleft.gif
rename to en.lproj/DTermHelp/gfx/border_bottomleft.gif
diff --git a/English.lproj/DTermHelp/gfx/border_bottomright.gif b/en.lproj/DTermHelp/gfx/border_bottomright.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/border_bottomright.gif
rename to en.lproj/DTermHelp/gfx/border_bottomright.gif
diff --git a/English.lproj/DTermHelp/gfx/border_left.gif b/en.lproj/DTermHelp/gfx/border_left.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/border_left.gif
rename to en.lproj/DTermHelp/gfx/border_left.gif
diff --git a/English.lproj/DTermHelp/gfx/border_right.gif b/en.lproj/DTermHelp/gfx/border_right.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/border_right.gif
rename to en.lproj/DTermHelp/gfx/border_right.gif
diff --git a/English.lproj/DTermHelp/gfx/border_top.gif b/en.lproj/DTermHelp/gfx/border_top.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/border_top.gif
rename to en.lproj/DTermHelp/gfx/border_top.gif
diff --git a/English.lproj/DTermHelp/gfx/border_topleft.gif b/en.lproj/DTermHelp/gfx/border_topleft.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/border_topleft.gif
rename to en.lproj/DTermHelp/gfx/border_topleft.gif
diff --git a/English.lproj/DTermHelp/gfx/border_topright.gif b/en.lproj/DTermHelp/gfx/border_topright.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/border_topright.gif
rename to en.lproj/DTermHelp/gfx/border_topright.gif
diff --git a/English.lproj/DTermHelp/gfx/rule.gif b/en.lproj/DTermHelp/gfx/rule.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/rule.gif
rename to en.lproj/DTermHelp/gfx/rule.gif
diff --git a/English.lproj/DTermHelp/gfx/step_1.gif b/en.lproj/DTermHelp/gfx/step_1.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_1.gif
rename to en.lproj/DTermHelp/gfx/step_1.gif
diff --git a/English.lproj/DTermHelp/gfx/step_10.gif b/en.lproj/DTermHelp/gfx/step_10.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_10.gif
rename to en.lproj/DTermHelp/gfx/step_10.gif
diff --git a/English.lproj/DTermHelp/gfx/step_2.gif b/en.lproj/DTermHelp/gfx/step_2.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_2.gif
rename to en.lproj/DTermHelp/gfx/step_2.gif
diff --git a/English.lproj/DTermHelp/gfx/step_3.gif b/en.lproj/DTermHelp/gfx/step_3.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_3.gif
rename to en.lproj/DTermHelp/gfx/step_3.gif
diff --git a/English.lproj/DTermHelp/gfx/step_4.gif b/en.lproj/DTermHelp/gfx/step_4.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_4.gif
rename to en.lproj/DTermHelp/gfx/step_4.gif
diff --git a/English.lproj/DTermHelp/gfx/step_5.gif b/en.lproj/DTermHelp/gfx/step_5.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_5.gif
rename to en.lproj/DTermHelp/gfx/step_5.gif
diff --git a/English.lproj/DTermHelp/gfx/step_6.gif b/en.lproj/DTermHelp/gfx/step_6.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_6.gif
rename to en.lproj/DTermHelp/gfx/step_6.gif
diff --git a/English.lproj/DTermHelp/gfx/step_7.gif b/en.lproj/DTermHelp/gfx/step_7.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_7.gif
rename to en.lproj/DTermHelp/gfx/step_7.gif
diff --git a/English.lproj/DTermHelp/gfx/step_8.gif b/en.lproj/DTermHelp/gfx/step_8.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_8.gif
rename to en.lproj/DTermHelp/gfx/step_8.gif
diff --git a/English.lproj/DTermHelp/gfx/step_9.gif b/en.lproj/DTermHelp/gfx/step_9.gif
similarity index 100%
rename from English.lproj/DTermHelp/gfx/step_9.gif
rename to en.lproj/DTermHelp/gfx/step_9.gif
diff --git a/English.lproj/DTermHelp/pgs/aboutdterm.html b/en.lproj/DTermHelp/pgs/aboutdterm.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/aboutdterm.html
rename to en.lproj/DTermHelp/pgs/aboutdterm.html
diff --git a/English.lproj/DTermHelp/pgs/accessibility.html b/en.lproj/DTermHelp/pgs/accessibility.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/accessibility.html
rename to en.lproj/DTermHelp/pgs/accessibility.html
diff --git a/English.lproj/DTermHelp/pgs/calculatewd.html b/en.lproj/DTermHelp/pgs/calculatewd.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/calculatewd.html
rename to en.lproj/DTermHelp/pgs/calculatewd.html
diff --git a/English.lproj/DTermHelp/pgs/cancel.html b/en.lproj/DTermHelp/pgs/cancel.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/cancel.html
rename to en.lproj/DTermHelp/pgs/cancel.html
diff --git a/English.lproj/DTermHelp/pgs/changehotkey.html b/en.lproj/DTermHelp/pgs/changehotkey.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/changehotkey.html
rename to en.lproj/DTermHelp/pgs/changehotkey.html
diff --git a/English.lproj/DTermHelp/pgs/copyresults.html b/en.lproj/DTermHelp/pgs/copyresults.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/copyresults.html
rename to en.lproj/DTermHelp/pgs/copyresults.html
diff --git a/English.lproj/DTermHelp/pgs/genericwind.html b/en.lproj/DTermHelp/pgs/genericwind.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/genericwind.html
rename to en.lproj/DTermHelp/pgs/genericwind.html
diff --git a/English.lproj/DTermHelp/pgs/history.html b/en.lproj/DTermHelp/pgs/history.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/history.html
rename to en.lproj/DTermHelp/pgs/history.html
diff --git a/English.lproj/DTermHelp/pgs/insertselection.html b/en.lproj/DTermHelp/pgs/insertselection.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/insertselection.html
rename to en.lproj/DTermHelp/pgs/insertselection.html
diff --git a/English.lproj/DTermHelp/pgs/nocd.html b/en.lproj/DTermHelp/pgs/nocd.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/nocd.html
rename to en.lproj/DTermHelp/pgs/nocd.html
diff --git a/English.lproj/DTermHelp/pgs/noterminal.html b/en.lproj/DTermHelp/pgs/noterminal.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/noterminal.html
rename to en.lproj/DTermHelp/pgs/noterminal.html
diff --git a/English.lproj/DTermHelp/pgs/openinterminal.html b/en.lproj/DTermHelp/pgs/openinterminal.html
similarity index 100%
rename from English.lproj/DTermHelp/pgs/openinterminal.html
rename to en.lproj/DTermHelp/pgs/openinterminal.html
diff --git a/English.lproj/DTermHelp/sty/access_4box.css b/en.lproj/DTermHelp/sty/access_4box.css
similarity index 100%
rename from English.lproj/DTermHelp/sty/access_4box.css
rename to en.lproj/DTermHelp/sty/access_4box.css
diff --git a/English.lproj/DTermHelp/sty/genlist.html b/en.lproj/DTermHelp/sty/genlist.html
similarity index 100%
rename from English.lproj/DTermHelp/sty/genlist.html
rename to en.lproj/DTermHelp/sty/genlist.html
diff --git a/English.lproj/DTermHelp/sty/genlist_style.css b/en.lproj/DTermHelp/sty/genlist_style.css
similarity index 100%
rename from English.lproj/DTermHelp/sty/genlist_style.css
rename to en.lproj/DTermHelp/sty/genlist_style.css
diff --git a/English.lproj/DTermHelp/sty/index.css b/en.lproj/DTermHelp/sty/index.css
similarity index 100%
rename from English.lproj/DTermHelp/sty/index.css
rename to en.lproj/DTermHelp/sty/index.css
diff --git a/English.lproj/DTermHelp/sty/launchpad.css b/en.lproj/DTermHelp/sty/launchpad.css
similarity index 100%
rename from English.lproj/DTermHelp/sty/launchpad.css
rename to en.lproj/DTermHelp/sty/launchpad.css
diff --git a/English.lproj/DTermHelp/sty/ref.css b/en.lproj/DTermHelp/sty/ref.css
similarity index 100%
rename from English.lproj/DTermHelp/sty/ref.css
rename to en.lproj/DTermHelp/sty/ref.css
diff --git a/English.lproj/DTermHelp/sty/task_bulleted.css b/en.lproj/DTermHelp/sty/task_bulleted.css
similarity index 100%
rename from English.lproj/DTermHelp/sty/task_bulleted.css
rename to en.lproj/DTermHelp/sty/task_bulleted.css
diff --git a/English.lproj/DTermHelp/sty/task_numbered.css b/en.lproj/DTermHelp/sty/task_numbered.css
similarity index 100%
rename from English.lproj/DTermHelp/sty/task_numbered.css
rename to en.lproj/DTermHelp/sty/task_numbered.css
diff --git a/English.lproj/DTermHelp/sty/task_plain.css b/en.lproj/DTermHelp/sty/task_plain.css
similarity index 100%
rename from English.lproj/DTermHelp/sty/task_plain.css
rename to en.lproj/DTermHelp/sty/task_plain.css
diff --git a/English.lproj/DTermHelp/xpgs/xall.html b/en.lproj/DTermHelp/xpgs/xall.html
similarity index 100%
rename from English.lproj/DTermHelp/xpgs/xall.html
rename to en.lproj/DTermHelp/xpgs/xall.html
diff --git a/English.lproj/InfoPlist.strings b/en.lproj/InfoPlist.strings
similarity index 100%
rename from English.lproj/InfoPlist.strings
rename to en.lproj/InfoPlist.strings
diff --git a/English.lproj/Localizable.strings b/en.lproj/Localizable.strings
similarity index 100%
rename from English.lproj/Localizable.strings
rename to en.lproj/Localizable.strings