Since many software programs recogize different converter names for + *
Since many software programs recognize different converter names for * different types of converters, there are other functions in this API to * iterate over the converter aliases. The functions {@link ucnv_getAvailableName() }, * {@link ucnv_getAlias() } and {@link ucnv_getStandardName() } are some of the @@ -184,7 +184,7 @@ typedef enum { /** * Function pointer for error callback in the codepage to unicode direction. - * Called when an error has occured in conversion to unicode, or on open/close of the callback (see reason). + * Called when an error has occurred in conversion to unicode, or on open/close of the callback (see reason). * @param context Pointer to the callback's private data * @param args Information about the conversion in progress * @param codeUnits Points to 'length' bytes of the concerned codepage sequence @@ -452,7 +452,7 @@ ucnv_openU(const UChar *name, * @param platform the platform in which the codepage number exists * @param err error status U_MEMORY_ALLOCATION_ERROR, U_FILE_ACCESS_ERROR * @return the created Unicode converter object, or NULL if an error - * occured. + * occurred. * @see ucnv_open * @see ucnv_openU * @see ucnv_close @@ -596,7 +596,7 @@ U_NAMESPACE_END * stateful, then subChars will be an empty string. * * @param converter the Unicode converter - * @param subChars the subsitution characters + * @param subChars the substitution characters * @param len on input the capacity of subChars, on output the number * of bytes copied to it * @param err the outgoing error status code. @@ -832,7 +832,7 @@ ucnv_getMinCharSize(const UConverter *converter); * name will be filled in. * * @param converter the Unicode converter. - * @param displayLocale is the specific Locale we want to localised for + * @param displayLocale is the specific Locale we want to localized for * @param displayName user provided buffer to be filled in * @param displayNameCapacity size of displayName Buffer * @param err error status code @@ -877,7 +877,7 @@ ucnv_getName(const UConverter *converter, UErrorCode *err); * * @param converter the Unicode converter * @param err the error status code. - * @return If any error occurrs, -1 will be returned otherwise, the codepage number + * @return If any error occurs, -1 will be returned otherwise, the codepage number * will be returned * @see ucnv_openCCSID * @see ucnv_getPlatform diff --git a/icu4c/source/common/unicode/utext.h b/icu4c/source/common/unicode/utext.h index 65688d74af0..33f2f4cf27b 100644 --- a/icu4c/source/common/unicode/utext.h +++ b/icu4c/source/common/unicode/utext.h @@ -389,7 +389,7 @@ utext_equals(const UText *a, const UText *b); /***************************************************************************** * - * Functions to work with the text represeted by a UText wrapper + * Functions to work with the text represented by a UText wrapper * *****************************************************************************/ @@ -433,7 +433,7 @@ utext_isLengthExpensive(const UText *ut); * * The iteration position will be set to the start of the returned code point. * - * This function is roughly equivalent to the the sequence + * This function is roughly equivalent to the sequence * utext_setNativeIndex(index); * utext_current32(); * (There is a subtle difference if the index is out of bounds by being less than zero - @@ -592,7 +592,7 @@ U_STABLE void U_EXPORT2 utext_setNativeIndex(UText *ut, int64_t nativeIndex); /** - * Move the iterator postion by delta code points. The number of code points + * Move the iterator position by delta code points. The number of code points * is a signed number; a negative delta will move the iterator backwards, * towards the start of the text. *
@@ -611,7 +611,7 @@ U_STABLE UBool U_EXPORT2 utext_moveIndex32(UText *ut, int32_t delta); /** - * Get the native index of the character preceeding the current position. + * Get the native index of the character preceding the current position. * If the iteration position is already at the start of the text, zero * is returned. * The value returned is the same as that obtained from the following sequence, @@ -628,7 +628,7 @@ utext_moveIndex32(UText *ut, int32_t delta); * native index of the character most recently returned from utext_next(). * * @param ut the text to be accessed - * @return the native index of the character preceeding the current index position, + * @return the native index of the character preceding the current index position, * or zero if the current position is at the start of the text. * @stable ICU 3.6 */ @@ -1054,7 +1054,7 @@ UTextAccess(UText *ut, int64_t nativeIndex, UBool forward); * be NUL-terminated if there is sufficient space in the destination buffer. * * @param ut the UText from which to extract data. - * @param nativeStart the native index of the first characer to extract. + * @param nativeStart the native index of the first character to extract. * @param nativeLimit the native string index of the position following the last * character to extract. * @param dest the UChar (UTF-16) buffer into which the extracted text is placed @@ -1211,7 +1211,7 @@ UTextClose(UText *ut); struct UTextFuncs { /** * (public) Function table size, sizeof(UTextFuncs) - * Intended for use should the table grow to accomodate added + * Intended for use should the table grow to accommodate added * functions in the future, to allow tests for older format * function tables that do not contain the extensions. * @@ -1345,7 +1345,7 @@ typedef struct UTextFuncs UTextFuncs; struct UText { /** * (private) Magic. Used to help detect when UText functions are handed - * invalid or unitialized UText structs. + * invalid or uninitialized UText structs. * utext_openXYZ() functions take an initialized, * but not necessarily open, UText struct as an * optional fill-in parameter. This magic field @@ -1367,7 +1367,7 @@ struct UText { /** - * Text provider properties. This set of flags is maintainted by the + * Text provider properties. This set of flags is maintained by the * text provider implementation. * @stable ICU 3.4 */ diff --git a/icu4c/source/extra/uconv/uconv.1.in b/icu4c/source/extra/uconv/uconv.1.in index 3636025aaf4..cd5c8279356 100644 --- a/icu4c/source/extra/uconv/uconv.1.in +++ b/icu4c/source/extra/uconv/uconv.1.in @@ -109,7 +109,7 @@ When calling it is possible to specify callbacks that are used to handle invalid characters in the input, or characters that cannot be transcoded to the destination encoding. Some encodings, for example, offer a default -substitution character that can be used to represent the occurence of +substitution character that can be used to represent the occurrence of such characters in the input. Other callbacks offer a useful visual representation of the invalid data. .PP @@ -188,7 +188,7 @@ Run the given .IR transliteration on the transcoded Unicode data, and use the transliterated data as input for the transcoding to -the the destination encoding. +the destination encoding. .TP .BI "\-\-to\-callback" " callback" Use @@ -278,7 +278,7 @@ is displayed when it is called with .PP .TP \w'\fBescape-unicode'u+3n .B substitute -Write the the encoding's substitute sequence, or the Unicode +Write the encoding's substitute sequence, or the Unicode replacement character .B U+FFFD when transcoding to Unicode. @@ -357,7 +357,7 @@ is the hexadecimal value of the Unicode codepoint. That hexadecimal string is of variable length and can use from 4 to 6 digits. This is the format universally used to denote a Unicode codepoint in -the litterature, delimited by curly braces for easy recognition of those +the literature, delimited by curly braces for easy recognition of those substitutions in the output. .SH EXAMPLES Convert data from a given @@ -418,10 +418,10 @@ and map Katakana to Hiragana: .B " \-x '::nfkc; [:Cc:] >; ::katakana-hiragana;'" .SH CAVEATS AND BUGS .B uconv -does report errors as occuring at the first invalid byte +does report errors as occurring at the first invalid byte encountered. This may be confusing to users of GNU .BR iconv (1), -which reports errors as occuring at the first byte of an invalid +which reports errors as occurring at the first byte of an invalid sequence. For multi-byte character sets or encodings, this means that .BR uconv error positions may be at a later offset in the input stream than @@ -432,7 +432,7 @@ The reporting of error positions when a transliterator is used may be inaccurate or unavailable, in which case .BR uconv will report the offset in the output stream at which the error -occured. +occurred. .SH AUTHORS Jonas Utterstroem .br diff --git a/icu4c/source/test/intltest/incaltst.cpp b/icu4c/source/test/intltest/incaltst.cpp index 665460c24a8..1e79576d882 100644 --- a/icu4c/source/test/intltest/incaltst.cpp +++ b/icu4c/source/test/intltest/incaltst.cpp @@ -412,14 +412,14 @@ void IntlCalendarTest::TestBuddhistFormat() { // Test simple parse/format with adopt - // First, a contrived english test.. + // First, a contrived English test.. UDate aDate = 999932400000.0; SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale("en_US@calendar=buddhist"), status); CHECK(status, "creating date format instance"); SimpleDateFormat *fmt2 = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale("en_US@calendar=gregorian"), status); CHECK(status, "creating gregorian date format instance"); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UnicodeString str; fmt2->format(aDate, str); @@ -443,7 +443,7 @@ void IntlCalendarTest::TestBuddhistFormat() { } delete fmt2; - CHECK(status, "Error occured testing Buddhist Calendar in English "); + CHECK(status, "Error occurred testing Buddhist Calendar in English "); status = U_ZERO_ERROR; // Now, try in Thai @@ -504,7 +504,7 @@ void IntlCalendarTest::TestJapaneseFormat() { SimpleDateFormat *fmt2 = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale("en_US@calendar=gregorian"), status); CHECK(status, "creating date format instance"); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UnicodeString str; fmt2->format(aDate, str); @@ -563,7 +563,7 @@ void IntlCalendarTest::TestJapaneseFormat() { delete cal2; delete fmt2; - CHECK(status, "Error occured"); + CHECK(status, "Error occurred"); // Now, try in Japanese { @@ -632,7 +632,7 @@ void IntlCalendarTest::TestJapanese3860() SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("y.M.d"), Locale("ja_JP@calendar=japanese"), status); CHECK(status, "creating date format instance"); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UErrorCode s2 = U_ZERO_ERROR; cal2->clear(); @@ -672,7 +672,7 @@ void IntlCalendarTest::TestJapanese3860() SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("y"), Locale("ja_JP@calendar=japanese"), status); CHECK(status, "creating date format instance"); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UErrorCode s2 = U_ZERO_ERROR; cal2->clear(); @@ -840,7 +840,7 @@ void IntlCalendarTest::TestPersianFormat() { UnicodeString gregorianDate("January 18, 2007 AD"); UDate aDate = fmt2->parse(gregorianDate, status); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UnicodeString str; fmt->format(aDate, str); @@ -895,7 +895,7 @@ void IntlCalendarTest::simpleTest(const Locale& loc, const UnicodeString& expect } d = fmt2->parse(expect,status); - CHECK(status, "Error occured parsing " + UnicodeString(loc.getName())); + CHECK(status, "Error occurred parsing " + UnicodeString(loc.getName())); if(d != expectDate) { fmt2->format(d,tmp); errln(UnicodeString("Failed to parse " ) + escape(expect) + ", " + loc.getName() + " expect " + (double)expectDate + " got " + (double)d + " " + escape(tmp)); diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp index b66e6256761..5edf872d3b7 100644 --- a/icu4c/source/test/intltest/intltest.cpp +++ b/icu4c/source/test/intltest/intltest.cpp @@ -709,10 +709,10 @@ UBool IntlTest::runTest( char* name, char* par, char *baseName ) return rval; } -// call individual tests, to be overriden to call implementations +// call individual tests, to be overridden to call implementations void IntlTest::runIndexedTest( int32_t /*index*/, UBool /*exec*/, const char* & /*name*/, char* /*par*/ ) { - // to be overriden by a method like: + // to be overridden by a method like: /* switch (index) { case 0: name = "First Test"; if (exec) FirstTest( par ); break; @@ -720,7 +720,7 @@ void IntlTest::runIndexedTest( int32_t /*index*/, UBool /*exec*/, const char* & default: name = ""; break; } */ - this->errln("*** runIndexedTest needs to be overriden! ***"); + this->errln("*** runIndexedTest needs to be overridden! ***"); } @@ -1108,7 +1108,7 @@ void IntlTest::LL_message( UnicodeString message, UBool newline ) { // Synchronize this function. // All error messages generated by tests funnel through here. - // Multithreaded tests can concurrently generate errors, requiring syncronization + // Multithreaded tests can concurrently generate errors, requiring synchronization // to keep each message together. Mutex lock(&messageMutex); diff --git a/icu4c/source/tools/ctestfw/uperf.cpp b/icu4c/source/tools/ctestfw/uperf.cpp index 0735f8a8eff..b807974f58a 100644 --- a/icu4c/source/tools/ctestfw/uperf.cpp +++ b/icu4c/source/tools/ctestfw/uperf.cpp @@ -323,10 +323,10 @@ void UPerfTest::setPath( char* pathVal ) this->path = pathVal; } -// call individual tests, to be overriden to call implementations +// call individual tests, to be overridden to call implementations UPerfFunction* UPerfTest::runIndexedTest( int32_t /*index*/, UBool /*exec*/, const char* & /*name*/, char* /*par*/ ) { - // to be overriden by a method like: + // to be overridden by a method like: /* switch (index) { case 0: name = "First Test"; if (exec) FirstTest( par ); break; @@ -334,7 +334,7 @@ UPerfFunction* UPerfTest::runIndexedTest( int32_t /*index*/, UBool /*exec*/, con default: name = ""; break; } */ - fprintf(stderr,"*** runIndexedTest needs to be overriden! ***"); + fprintf(stderr,"*** runIndexedTest needs to be overridden! ***"); return NULL; } diff --git a/icu4c/source/tools/genrb/genrb.cpp b/icu4c/source/tools/genrb/genrb.cpp index 68870bd90a1..c4fc462066a 100644 --- a/icu4c/source/tools/genrb/genrb.cpp +++ b/icu4c/source/tools/genrb/genrb.cpp @@ -652,7 +652,7 @@ processFile(const char *filename, const char *cp, goto finish; } if (ucbuf == NULL || U_FAILURE(status)) { - fprintf(stderr, "An error occured processing file %s. Error: %s\n", + fprintf(stderr, "An error occurred processing file %s. Error: %s\n", openFileName == NULL ? filename : openFileName, u_errorName(status)); goto finish; } diff --git a/icu4c/source/tools/genrb/parse.cpp b/icu4c/source/tools/genrb/parse.cpp index 96ac4a7313b..465c099baba 100644 --- a/icu4c/source/tools/genrb/parse.cpp +++ b/icu4c/source/tools/genrb/parse.cpp @@ -362,7 +362,7 @@ parseUCARules(ParseState* state, char *tag, uint32_t startline, const struct USt ucbuf = ucbuf_open(filename, &cp, getShowWarning(),FALSE, status); if (U_FAILURE(*status)) { - error(line, "An error occured while opening the input file %s\n", filename); + error(line, "An error occurred while opening the input file %s\n", filename); return NULL; } @@ -500,7 +500,7 @@ parseTransliterator(ParseState* state, char *tag, uint32_t startline, const stru ucbuf = ucbuf_open(filename, &cp, getShowWarning(),FALSE, status); if (U_FAILURE(*status)) { - error(line, "An error occured while opening the input file %s\n", filename); + error(line, "An error occurred while opening the input file %s\n", filename); return NULL; } @@ -758,7 +758,7 @@ GenrbImporter::getRules( return; } if (ucbuf.isNull() || U_FAILURE(errorCode)) { - fprintf(stderr, "An error occured processing file %s. Error: %s\n", openFileName.data(), u_errorName(errorCode)); + fprintf(stderr, "An error occurred processing file %s. Error: %s\n", openFileName.data(), u_errorName(errorCode)); return; } diff --git a/icu4c/source/tools/gensprep/gensprep.c b/icu4c/source/tools/gensprep/gensprep.c index a8353231ff8..e3466379e12 100644 --- a/icu4c/source/tools/gensprep/gensprep.c +++ b/icu4c/source/tools/gensprep/gensprep.c @@ -113,7 +113,7 @@ static int printHelp(int argc, char* argv[]){ fprintf(stderr, "\t-d or --destdir destination directory, followed by the path\n" "\t-s or --sourcedir source directory of ICU data, followed by the path\n" - "\t-b or --bundle-name generate the ouput data file with the name specified\n" + "\t-b or --bundle-name generate the output data file with the name specified\n" "\t-i or --icudatadir directory for locating any needed intermediate data files,\n" "\t followed by path, defaults to %s\n", u_getDataDirectory()); diff --git a/icu4c/source/tools/makeconv/makeconv.1.in b/icu4c/source/tools/makeconv/makeconv.1.in index 4406855ee20..e42d5127b52 100644 --- a/icu4c/source/tools/makeconv/makeconv.1.in +++ b/icu4c/source/tools/makeconv/makeconv.1.in @@ -51,14 +51,14 @@ be understood by .BR makeconv . The ICU ucm format is similar to the IBM NLTC upmap/tpmap/rpmap files. Comments in the -.I convertable +.I convertertable are handled as follows. If a comment (starting with a `#' sign) that is after some text does contain the fallback indicator `|' then only the text starting with the `#' sign, and ending before the `|' sign, is ignored. Otherwise, or if the comment is the first thing on the line, the comment runs up to the end of the line. This special -handling of comments is to accomodate the practice of putting fallback +handling of comments is to accommodate the practice of putting fallback information in comments in the strict IBM NLTC ucmap format. .PP Note that new converters will be automatically found by ICU after their