Index: utils/ofarc/GZIPArchive.m ================================================================== --- utils/ofarc/GZIPArchive.m +++ utils/ofarc/GZIPArchive.m @@ -112,12 +112,12 @@ { OFString *fileName; OFFile *output; if (files.count != 0) { - [OFStdErr writeLine: - OF_LOCALIZED(@"cannot_extract_specific_file_from_gz", + [OFStdErr writeLine: OF_LOCALIZED( + @"cannot_extract_specific_file_from_gz", @"Cannot extract a specific file of a .gz archive!")]; app->_exitStatus = 1; return; } Index: utils/ofdns/OFDNS.m ================================================================== --- utils/ofdns/OFDNS.m +++ utils/ofdns/OFDNS.m @@ -34,12 +34,11 @@ OF_APPLICATION_DELEGATE(OFDNS) static void help(OFStream *stream, bool full, int status) { - [OFStdErr writeLine: - OF_LOCALIZED(@"usage", + [OFStdErr writeLine: OF_LOCALIZED(@"usage", @"Usage: %[prog] -[chst] domain1 [domain2 ...]", @"prog", [OFApplication programName])]; if (full) { [stream writeString: @"\n"]; @@ -70,12 +69,11 @@ _inFlight--; if (exception == nil) [OFStdOut writeFormat: @"%@\n", response]; else { - [OFStdErr writeLine: OF_LOCALIZED( - @"failed_to_resolve", + [OFStdErr writeLine: OF_LOCALIZED(@"failed_to_resolve", @"Failed to resolve: %[exception]", @"exception", exception)]; _errors++; } Index: utils/ofhash/OFHash.m ================================================================== --- utils/ofhash/OFHash.m +++ utils/ofhash/OFHash.m @@ -105,20 +105,20 @@ while ((option = [optionsParser nextOption]) != '\0') { switch (option) { case '?': if (optionsParser.lastLongOption != nil) - [OFStdErr writeLine: - OF_LOCALIZED(@"unknown_long_option", + [OFStdErr writeLine: OF_LOCALIZED( + @"unknown_long_option", @"%[prog]: Unknown option: --%[opt]", @"prog", [OFApplication programName], @"opt", optionsParser.lastLongOption)]; else { OFString *optStr = [OFString stringWithFormat: @"%C", optionsParser.lastOption]; - [OFStdErr writeLine: - OF_LOCALIZED(@"unknown_option", + [OFStdErr writeLine: OF_LOCALIZED( + @"unknown_option", @"%[prog]: Unknown option: -%[opt]", @"prog", [OFApplication programName], @"opt", optStr)]; } Index: utils/ofhttp/OFHTTP.m ================================================================== --- utils/ofhttp/OFHTTP.m +++ utils/ofhttp/OFHTTP.m @@ -96,12 +96,11 @@ OF_APPLICATION_DELEGATE(OFHTTP) static void help(OFStream *stream, bool full, int status) { - [OFStdErr writeLine: - OF_LOCALIZED(@"usage", + [OFStdErr writeLine: OF_LOCALIZED(@"usage", @"Usage: %[prog] -[cehHmoOPqv] iri1 [iri2 ...]", @"prog", [OFApplication programName])]; if (full) { [stream writeString: @"\n"]; @@ -479,52 +478,52 @@ case 'P': [self setProxy: optionsParser.argument]; break; case ':': if (optionsParser.lastLongOption != nil) - [OFStdErr writeLine: - OF_LOCALIZED(@"long_argument_missing", + [OFStdErr writeLine: OF_LOCALIZED( + @"long_argument_missing", @"%[prog]: Argument for option --%[opt] " @"missing", @"prog", [OFApplication programName], @"opt", optionsParser.lastLongOption)]; else { OFString *optStr = [OFString stringWithFormat: @"%C", optionsParser.lastOption]; - [OFStdErr writeLine: - OF_LOCALIZED(@"argument_missing", + [OFStdErr writeLine: OF_LOCALIZED( + @"argument_missing", @"%[prog]: Argument for option -%[opt] " @"missing", @"prog", [OFApplication programName], @"opt", optStr)]; } [OFApplication terminateWithStatus: 1]; break; case '=': - [OFStdErr writeLine: - OF_LOCALIZED(@"option_takes_no_argument", + [OFStdErr writeLine: OF_LOCALIZED( + @"option_takes_no_argument", @"%[prog]: Option --%[opt] takes no argument", @"prog", [OFApplication programName], @"opt", optionsParser.lastLongOption)]; [OFApplication terminateWithStatus: 1]; break; case '?': if (optionsParser.lastLongOption != nil) - [OFStdErr writeLine: - OF_LOCALIZED(@"unknown_long_option", + [OFStdErr writeLine: OF_LOCALIZED( + @"unknown_long_option", @"%[prog]: Unknown option: --%[opt]", @"prog", [OFApplication programName], @"opt", optionsParser.lastLongOption)]; else { OFString *optStr = [OFString stringWithFormat: @"%C", optionsParser.lastOption]; - [OFStdErr writeLine: - OF_LOCALIZED(@"unknown_option", + [OFStdErr writeLine: OF_LOCALIZED( + @"unknown_option", @"%[prog]: Unknown option: -%[opt]", @"prog", [OFApplication programName], @"opt", optStr)]; } @@ -571,12 +570,12 @@ @"prog", [OFApplication programName])]; [OFApplication terminateWithStatus: 1]; } if (_outputPath != nil && _IRIs.count > 1) { - [OFStdErr writeLine: - OF_LOCALIZED(@"output_only_with_one_iri", + [OFStdErr writeLine: OF_LOCALIZED( + @"output_only_with_one_iri", @"%[prog]: Cannot use -o / --output when more than one IRI " @"has been specified!", @"prog", [OFApplication programName])]; [OFApplication terminateWithStatus: 1]; } @@ -817,12 +816,12 @@ if ([exception isKindOfClass: [OFResolveHostFailedException class]]) { if (!_quiet) [OFStdOut writeString: @"\n"]; - [OFStdErr writeLine: - OF_LOCALIZED(@"download_resolve_host_failed", + [OFStdErr writeLine: OF_LOCALIZED( + @"download_resolve_host_failed", @"%[prog]: Failed to download <%[iri]>!\n" @" Failed to resolve host: %[exception]", @"prog", [OFApplication programName], @"iri", request.IRI.string, @"exception", exception)]; @@ -829,12 +828,12 @@ } else if ([exception isKindOfClass: [OFConnectSocketFailedException class]]) { if (!_quiet) [OFStdOut writeString: @"\n"]; - [OFStdErr writeLine: - OF_LOCALIZED(@"download_failed_connection_failed", + [OFStdErr writeLine: OF_LOCALIZED( + @"download_failed_connection_failed", @"%[prog]: Failed to download <%[iri]>!\n" @" Connection failed: %[exception]", @"prog", [OFApplication programName], @"iri", request.IRI.string, @"exception", exception)];