From: Bruno Haible Date: Mon, 21 Jul 2025 13:31:01 +0000 (+0200) Subject: Fix typos. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f66e5482ea097db37e90674b5335e42adbf479ad;p=thirdparty%2Fgettext.git Fix typos. Reported by . * gettext-tools/libgrep/m-regex.c: Fix typo in comments. * gettext-tools/misc/autopoint.in: Likewise. * gettext-tools/misc/gettextize.in: Likewise. * gettext-tools/src/format-python-brace.c: Likewise. * gettext-tools/src/gnu/gettext/DumpResource.java: Likewise. * gettext-tools/src/its.h: Likewise. * gettext-tools/src/locating-rules.h: Likewise. * gettext-tools/src/msgmerge.c: Likewise. * gettext-tools/src/read-catalog-abstract.h: Likewise. * gettext-tools/src/read-catalog-abstract.c: Likewise. * gettext-tools/src/read-catalog.h: Likewise. * gettext-tools/src/read-properties.c: Likewise. * gettext-tools/src/write-java.c: Likewise. * gettext-tools/src/write-mo.c: Likewise. * gettext-tools/src/x-d.c: Likewise. * gettext-tools/src/x-scheme.c: Likewise. * gettext-tools/src/x-sh.c: Likewise. * gettext-tools/emacs/po-mode.el: Fix typos in help and comments. * gettext-tools/doc/gettext.texi: Fix typos. * NEWS: Fix typos. --- diff --git a/NEWS b/NEWS index e10776206..56645e9eb 100644 --- a/NEWS +++ b/NEWS @@ -732,7 +732,7 @@ Version 0.18.3 - July 2013 set of formatting methods nor translation functions, the implementation supports only a limited set of formatting methods and translation functions commonly used in Gjs and other popular - JavaScript implemenations and libraries. + JavaScript implementations and libraries. - Lua: xgettext now supports Lua, using Ľubomír Remák's lua-gettext. @@ -848,7 +848,7 @@ Version 0.18 - May 2010 version 0.12. * msgfilter now sets environment variables during the invocation of the - filter, indicating the msgid and location of the messge being processed. + filter, indicating the msgid and location of the message being processed. * xgettext now can extract plural forms from Qt 4 programs. The recommended xgettext command-line options for this case are: diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 77459001d..4fd819e9e 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -212,7 +212,7 @@ The User's View Setting the Locale through Environment Variables * Locale Names:: How a Locale Specification Looks Like -* Locale Environment Variables:: Which Environment Variable Specfies What +* Locale Environment Variables:: Which Environment Variable Specifies What * The LANGUAGE variable:: How to Specify a Priority List of Languages The Format of PO Files @@ -1298,7 +1298,7 @@ prompt, merely execute @menu * Locale Names:: How a Locale Specification Looks Like -* Locale Environment Variables:: Which Environment Variable Specfies What +* Locale Environment Variables:: Which Environment Variable Specifies What * The LANGUAGE variable:: How to Specify a Priority List of Languages @end menu @@ -5805,7 +5805,7 @@ you therefore normally don't need to save output produced with the @vindex TERM@r{, environment variable} The environment variable @code{TERM} contains a identifier for the text -window's capabilities. You can get a detailed list of these cababilities +window's capabilities. You can get a detailed list of these capabilities by using the @samp{infocmp} command, using @samp{man 5 terminfo} as a reference. diff --git a/gettext-tools/emacs/po-mode.el b/gettext-tools/emacs/po-mode.el index cad2bdac7..2cde7af14 100644 --- a/gettext-tools/emacs/po-mode.el +++ b/gettext-tools/emacs/po-mode.el @@ -1,6 +1,6 @@ ;;; po-mode.el --- major mode for GNU gettext PO files -;; Copyright (C) 1995-2024 Free Software Foundation, Inc. +;; Copyright (C) 1995-2025 Free Software Foundation, Inc. ;; Authors: François Pinard ;; Greg McGary @@ -466,7 +466,7 @@ slightly different." ) "*Association list giving team codes from team names. This is used for generating a submission file name for the 'M' command. -If a string instead of an alist, it is a team code to use unconditionnally." +If a string instead of an alist, it is a team code to use unconditionally." :type 'sexp :group 'po) @@ -710,7 +710,7 @@ M-S Ignore path M-A Ignore PO file *M-L Ignore lexicon :help "Initialize or replace current translation with the original message"]) ("Other files" ["Other window" po-other-window - :help "Select other window; if necessay split current frame"] + :help "Select other window; if necessary split current frame"] "---" ;; "Program sources" ["Cycle reference in source file" po-cycle-source-reference t] @@ -1335,7 +1335,7 @@ fuzzy, untranslated, or translated." nil t) (replace-match "" t t))))))) -;;; Entry positionning. +;;; Entry positioning. (defun po-say-location-depth () "Tell how many entries in the entry location stack." diff --git a/gettext-tools/libgrep/m-regex.c b/gettext-tools/libgrep/m-regex.c index 60e8955b6..37719f42f 100644 --- a/gettext-tools/libgrep/m-regex.c +++ b/gettext-tools/libgrep/m-regex.c @@ -1,5 +1,5 @@ /* Pattern Matchers for Regular Expressions. - Copyright (C) 1992-2024 Free Software Foundation, Inc. + Copyright (C) 1992-2025 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -188,7 +188,7 @@ EGexecute (const void *compiled_pattern, { /* If -w, check if the match aligns with word boundaries. We do this iteratively because: - (a) the line may contain more than one occurence of the + (a) the line may contain more than one occurrence of the pattern, and (b) Several alternatives in the pattern might be valid at a given point, and we may need to consider a shorter diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index 9f26e2096..7bf6ed03d 100644 --- a/gettext-tools/misc/autopoint.in +++ b/gettext-tools/misc/autopoint.in @@ -277,7 +277,7 @@ unset CLICOLOR_FORCE GREP_OPTIONS --version | --versio | --versi | --vers | --ver | --ve | --v ) func_version true exit 0 ;; - -- ) # Stop option prcessing + -- ) # Stop option processing shift; break ;; -* ) echo "autopoint: unknown option $1" 1>&2 diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 856e0e1a0..11c31bf91 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -283,7 +283,7 @@ unset CLICOLOR_FORCE GREP_OPTIONS --version | --versio | --versi | --vers | --ver | --ve | --v ) func_version exit 0 ;; - -- ) # Stop option prcessing + -- ) # Stop option processing shift; break ;; -* ) echo "gettextize: unknown option $1" 1>&2 diff --git a/gettext-tools/src/format-python-brace.c b/gettext-tools/src/format-python-brace.c index 168356b32..7dc3b725d 100644 --- a/gettext-tools/src/format-python-brace.c +++ b/gettext-tools/src/format-python-brace.c @@ -171,7 +171,7 @@ parse_directive (struct spec *spec, || parse_numeric_field (spec, &format, translated, fdi, invalid_reason)) { /* Parse '.' (getattr) or '[..]' (getitem) operators followed by a - name. If must not recurse, but can be specifed in a chain, such + name. If must not recurse, but can be specified in a chain, such as "foo.bar.baz[0]". */ for (;;) { diff --git a/gettext-tools/src/gnu/gettext/DumpResource.java b/gettext-tools/src/gnu/gettext/DumpResource.java index 41f002a6f..6586494d1 100644 --- a/gettext-tools/src/gnu/gettext/DumpResource.java +++ b/gettext-tools/src/gnu/gettext/DumpResource.java @@ -1,5 +1,5 @@ /* GNU gettext for Java - * Copyright (C) 2001-2003, 2007 Free Software Foundation, Inc. + * Copyright (C) 2001-2025 Free Software Foundation, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -211,7 +211,7 @@ public class DumpResource { Locale locale = new Locale(language,country,variant); // Get the resource. ResourceBundle catalog = ResourceBundle.getBundle(resource_name,locale); - // We are only interested in the messsages belonging to the locale + // We are only interested in the messages belonging to the locale // itself, not in the inherited messages. But catalog.getLocale() exists // only in Java2 and sometimes differs from the given locale. try { diff --git a/gettext-tools/src/its.h b/gettext-tools/src/its.h index f5221ef49..93e6a0f2b 100644 --- a/gettext-tools/src/its.h +++ b/gettext-tools/src/its.h @@ -1,5 +1,5 @@ /* Internationalization Tag Set (ITS) handling - Copyright (C) 2015-2024 Free Software Foundation, Inc. + Copyright (C) 2015-2025 Free Software Foundation, Inc. This file was written by Daiki Ueno , 2015. @@ -67,7 +67,7 @@ typedef message_ty * const char *marker, enum its_whitespace_type_ty whitespace); -/* Extracts messages from FP, accoding to the loaded ITS rules. */ +/* Extracts messages from FP, according to the loaded ITS rules. */ extern void its_rule_list_extract (its_rule_list_ty *rules, FILE *fp, const char *real_filename, const char *logical_filename, diff --git a/gettext-tools/src/locating-rules.h b/gettext-tools/src/locating-rules.h index f50ef6e96..dc7473e95 100644 --- a/gettext-tools/src/locating-rules.h +++ b/gettext-tools/src/locating-rules.h @@ -1,5 +1,5 @@ /* XML resource locating rules - Copyright (C) 2015-2024 Free Software Foundation, Inc. + Copyright (C) 2015-2025 Free Software Foundation, Inc. This file was written by Daiki Ueno , 2015. @@ -88,7 +88,7 @@ extern bool /* Determines the location of the .its file to be used for FILENAME, when the "language name" is NAME (can be NULL if not provided), - accoding to the locating rules in the RULES object. + according to the locating rules in the RULES object. The result is just the base name of the .its file; the caller then needs to find it, using "search-path.h". The lifetime of the result is limited by the lifetime of the RULES diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index df4a89ea9..dacd31949 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -1169,7 +1169,7 @@ message_merge (message_ty *def, message_ty *ref, bool force_fuzzy, } /* The rest of the Language-Team field should be the english name - of the languge. Convert to ISO 639 and ISO 3166 syntax. */ + of the language. Convert to ISO 639 and ISO 3166 syntax. */ { size_t i; diff --git a/gettext-tools/src/read-catalog-abstract.c b/gettext-tools/src/read-catalog-abstract.c index d14c7db1d..754d6db52 100644 --- a/gettext-tools/src/read-catalog-abstract.c +++ b/gettext-tools/src/read-catalog-abstract.c @@ -558,7 +558,7 @@ parse_comment_solaris_filepos (abstract_catalog_reader_ty *catr, const char *s) } -/* This callback is called whenever a generic comment line has been seeen. +/* This callback is called whenever a generic comment line has been seen. It parses s and invokes the appropriate method: call_comment, call_comment_dot, call_comment_filepos (via parse_comment_filepos), or call_comment_special. */ diff --git a/gettext-tools/src/read-catalog-abstract.h b/gettext-tools/src/read-catalog-abstract.h index e18f9ac6d..9112226fe 100644 --- a/gettext-tools/src/read-catalog-abstract.h +++ b/gettext-tools/src/read-catalog-abstract.h @@ -1,5 +1,5 @@ /* Reading textual message catalogs (such as PO files), abstract class. - Copyright (C) 1995-2024 Free Software Foundation, Inc. + Copyright (C) 1995-2025 Free Software Foundation, Inc. This file was written by Peter Miller @@ -229,7 +229,7 @@ extern void extern void catalog_reader_seen_comment_special (abstract_catalog_reader_ty *catr, const char *s); -/* This callback is called whenever a generic comment line has been seeen. +/* This callback is called whenever a generic comment line has been seen. It parses s and invokes the appropriate method. */ extern void catalog_reader_seen_generic_comment (abstract_catalog_reader_ty *catr, diff --git a/gettext-tools/src/read-catalog.h b/gettext-tools/src/read-catalog.h index 875b19137..dc4b54503 100644 --- a/gettext-tools/src/read-catalog.h +++ b/gettext-tools/src/read-catalog.h @@ -80,7 +80,7 @@ struct default_catalog_reader_class_ty /* If true, pay attention to comments and filepos comments. */ \ bool handle_comments; \ \ - /* If false, domain directives lead to an error messsage. */ \ + /* If false, domain directives lead to an error message. */ \ bool allow_domain_directives; \ \ /* If false, duplicate msgids in the same domain and file generate an \ diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c index 3531065ea..91f5c9fb8 100644 --- a/gettext-tools/src/read-properties.c +++ b/gettext-tools/src/read-properties.c @@ -55,7 +55,7 @@ The encoding of Java .properties files is: - ASCII with Java \uxxxx escape sequences, - - ISO-8859-1 if non-ASCII bytes are encounterd, + - ISO-8859-1 if non-ASCII bytes are encountered, - UTF-8 if non-ASCII bytes are encountered and the entire file is valid UTF-8 (in Java 9 or newer), see https://docs.oracle.com/javase/9/intl/internationalization-enhancements-jdk-9.htm */ diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c index 02b0add95..6b22c4c51 100644 --- a/gettext-tools/src/write-java.c +++ b/gettext-tools/src/write-java.c @@ -1,5 +1,5 @@ /* Writing Java ResourceBundles. - Copyright (C) 2001-2024 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -255,7 +255,7 @@ compute_hashsize (message_list_ty *mlp, bool *collisionp) unsigned int incr; /* Since the set { idx0, idx0 + incr, ... } depends only on idx0 - and gcd(hashsize,incr), we only need to conside incr that + and gcd(hashsize,incr), we only need to consider incr that divides hashsize. */ for (incr = 1; incr <= hashsize / 2; incr++) if ((hashsize % incr) == 0) diff --git a/gettext-tools/src/write-mo.c b/gettext-tools/src/write-mo.c index 390deaff3..281c1d788 100644 --- a/gettext-tools/src/write-mo.c +++ b/gettext-tools/src/write-mo.c @@ -172,7 +172,7 @@ struct pre_sysdep_message * None of these PO files uses the 'I' format string flag. There are few possible flavours. Each such flavour gives rise - to an instantation rule. We ran this test program on various platforms: + to an instantiation rule. We ran this test program on various platforms: ============================================================================= #include #include @@ -300,7 +300,7 @@ concat_prefix_cs (const char *prefix, char conversion) return result; } -/* Expand a system dependent string segment for a specific instantation. +/* Expand a system dependent string segment for a specific instantiation. Return NULL if unsupported. */ static const char * get_sysdep_segment_value (struct pre_sysdep_segment segment, diff --git a/gettext-tools/src/x-d.c b/gettext-tools/src/x-d.c index d530bb081..f151495f6 100644 --- a/gettext-tools/src/x-d.c +++ b/gettext-tools/src/x-d.c @@ -1320,7 +1320,7 @@ extract_from_function_call_without_args (TSNode callee_node, unref_region (arg_region); } -/* Extracts messages from the template instantation NODE consisting of +/* Extracts messages from the template instantiation NODE consisting of - IDENTIFIER_NODE: a tree node of type 'identifier', - ARGS_NODE: a tree node of type 'template_arguments'. Extracted messages are added to MLP. */ diff --git a/gettext-tools/src/x-scheme.c b/gettext-tools/src/x-scheme.c index 62be465cf..e73ec8a84 100644 --- a/gettext-tools/src/x-scheme.c +++ b/gettext-tools/src/x-scheme.c @@ -1,5 +1,5 @@ /* xgettext Scheme backend. - Copyright (C) 2004-2024 Free Software Foundation, Inc. + Copyright (C) 2004-2025 Free Software Foundation, Inc. This file was written by Bruno Haible , 2004-2005. @@ -1301,7 +1301,7 @@ read_object (struct object *op, flag_region_ty *outer_region) phase1_ungetc (c); if (c == '(') { - /* Homogenous vector syntax: + /* Homogeneous vector syntax: #a(...) - vector of char #c(...) - vector of complex (old) #c32(...) - vector of complex of single-float @@ -1371,7 +1371,7 @@ read_object (struct object *op, flag_region_ty *outer_region) phase1_ungetc (c); if (c == '(') { - /* Homogenous vector syntax: + /* Homogeneous vector syntax: #e(...) - vector of long (old) #i(...) - vector of double-float (old) */ diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c index 9b7249fa7..6cdc18e0b 100644 --- a/gettext-tools/src/x-sh.c +++ b/gettext-tools/src/x-sh.c @@ -466,7 +466,7 @@ static int phase2_pushback_length; The result is QUOTED(c) for some unsigned char c, if the next character is escaped sufficiently often to make it a regular constituent character, or simply an 'unsigned char' if it has its special meaning (of special, - whitespace or operator charcter), or OPENING_BACKQUOTE, CLOSING_BACKQUOTE, + whitespace or operator character), or OPENING_BACKQUOTE, CLOSING_BACKQUOTE, EOF. It's the caller's responsibility to update the state. */ static int