@@ -21,11 +21,11 @@
 
 #import "OFApplication.h"
 #import "OFArray.h"
 #import "OFFile.h"
 #import "OFFileManager.h"
-#import "OFLocalization.h"
+#import "OFLocale.h"
 #import "OFOptionsParser.h"
 #import "OFSandbox.h"
 #import "OFStdIOStream.h"
 #import "OFURL.h"
 
@@ -189,13 +189,13 @@
 		[sandbox release];
 	}
 #endif
 
 #ifndef OF_AMIGAOS
-	[OFLocalization addLanguageDirectory: @LANGUAGE_DIR];
+	[OFLocale addLanguageDirectory: @LANGUAGE_DIR];
 #else
-	[OFLocalization addLanguageDirectory: @"PROGDIR:/share/ofarc/lang"];
+	[OFLocale addLanguageDirectory: @"PROGDIR:/share/ofarc/lang"];
 #endif
 
 	optionsParser = [OFOptionsParser parserWithOptions: options];
 	while ((option = [optionsParser nextOption]) != '\0') {
 		switch (option) {
@@ -357,11 +357,11 @@
 		@try {
 			[archive extractFiles: files];
 		} @catch (OFCreateDirectoryFailedException *e) {
 			OFString *error = [OFString
 			    stringWithCString: strerror([e errNo])
-				     encoding: [OFLocalization encoding]];
+				     encoding: [OFLocale encoding]];
 			[of_stderr writeString: @"\r"];
 			[of_stderr writeLine: OF_LOCALIZED(
 			    @"failed_to_create_directory",
 			    @"Failed to create directory %[dir]: %[error]",
 			    @"dir", [[e URL] fileSystemRepresentation],
@@ -368,11 +368,11 @@
 			    @"error", error)];
 			_exitStatus = 1;
 		} @catch (OFOpenItemFailedException *e) {
 			OFString *error = [OFString
 			    stringWithCString: strerror([e errNo])
-				     encoding: [OFLocalization encoding]];
+				     encoding: [OFLocale encoding]];
 			[of_stderr writeString: @"\r"];
 			[of_stderr writeLine: OF_LOCALIZED(
 			    @"failed_to_open_file",
 			    @"Failed to open file %[file]: %[error]",
 			    @"file", [e path],
@@ -425,11 +425,11 @@
 		file = [OFFile fileWithPath: path
 				       mode: fileModeString];
 	} @catch (OFOpenItemFailedException *e) {
 		OFString *error = [OFString
 		    stringWithCString: strerror([e errNo])
-			     encoding: [OFLocalization encoding]];
+			     encoding: [OFLocale encoding]];
 		[of_stderr writeString: @"\r"];
 		[of_stderr writeLine: OF_LOCALIZED(
 		    @"failed_to_open_file",
 		    @"Failed to open file %[file]: %[error]",
 		    @"file", [e path],
@@ -493,20 +493,20 @@
 
 		@throw e;
 	} @catch (OFReadFailedException *e) {
 		OFString *error = [OFString
 		    stringWithCString: strerror([e errNo])
-			     encoding: [OFLocalization encoding]];
+			     encoding: [OFLocale encoding]];
 		[of_stderr writeLine: OF_LOCALIZED(@"failed_to_read_file",
 		    @"Failed to read file %[file]: %[error]",
 		    @"file", path,
 		    @"error", error)];
 		goto error;
 	} @catch (OFSeekFailedException *e) {
 		OFString *error = [OFString
 		    stringWithCString: strerror([e errNo])
-			     encoding: [OFLocalization encoding]];
+			     encoding: [OFLocale encoding]];
 		[of_stderr writeLine: OF_LOCALIZED(@"failed_to_seek_in_file",
 		    @"Failed to seek in file %[file]: %[error]",
 		    @"file", path,
 		    @"error", error)];
 		goto error;
@@ -603,11 +603,11 @@
 		length = [input readIntoBuffer: buffer
 					length: BUFFER_SIZE];
 	} @catch (OFReadFailedException *e) {
 		OFString *error = [OFString
 		    stringWithCString: strerror([e errNo])
-			     encoding: [OFLocalization encoding]];
+			     encoding: [OFLocale encoding]];
 		[of_stdout writeString: @"\r"];
 		[of_stderr writeLine: OF_LOCALIZED(@"failed_to_read_file",
 		    @"Failed to read file %[file]: %[error]",
 		    @"file", fileName,
 		    @"error", error)];
@@ -618,11 +618,11 @@
 		[output writeBuffer: buffer
 			     length: length];
 	} @catch (OFWriteFailedException *e) {
 		OFString *error = [OFString
 		    stringWithCString: strerror([e errNo])
-			     encoding: [OFLocalization encoding]];
+			     encoding: [OFLocale encoding]];
 		[of_stdout writeString: @"\r"];
 		[of_stderr writeLine: OF_LOCALIZED(@"failed_to_write_file",
 		    @"Failed to write file %[file]: %[error]",
 		    @"file", fileName,
 		    @"error", error)];