From: Bruno Haible Date: Sun, 31 Mar 2019 16:57:58 +0000 (+0200) Subject: maint: Make code more "git diff"-friendly. X-Git-Tag: v0.20~96 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70153e2f290f2ef6db20b045c89c227b3598e997;p=thirdparty%2Fgettext.git maint: Make code more "git diff"-friendly. * gettext-runtime/src/envsubst.c: Prefer long lines to lines that start with a non-whitespace character. * gettext-tools/src/cldr-plurals.c: Likewise. * gettext-tools/src/format.c: Likewise. * gettext-tools/src/msgcmp.c: Likewise. * gettext-tools/src/msgfmt.c: Likewise. * gettext-tools/src/msggrep.c: Likewise. * gettext-tools/src/msgl-cat.c: Likewise. * gettext-tools/src/msgl-charset.c: Likewise. * gettext-tools/src/msgl-check.c: Likewise. * gettext-tools/src/msgl-iconv.c: Likewise. * gettext-tools/src/msgmerge.c: Likewise. * gettext-tools/src/po-lex.c: Likewise. * gettext-tools/src/read-stringtable.c: Likewise. * gettext-tools/src/recode-sr-latin.c: Likewise. * gettext-tools/src/write-catalog.c: Likewise. * gettext-tools/src/write-java.c: Likewise. * gettext-tools/src/write-po.c: Likewise. * gettext-tools/src/x-csharp.c: Likewise. * gettext-tools/src/x-elisp.c: Likewise. * gettext-tools/src/x-java.c: Likewise. * gettext-tools/src/x-javascript.c: Likewise. * gettext-tools/src/x-librep.c: Likewise. * gettext-tools/src/x-lisp.c: Likewise. * gettext-tools/src/x-perl.c: Likewise. * gettext-tools/src/x-python.c: Likewise. * gettext-tools/src/x-scheme.c: Likewise. * gettext-tools/src/x-sh.c: Likewise. * gettext-tools/src/x-tcl.c: Likewise. * gettext-tools/src/x-vala.c: Likewise. * gettext-tools/src/xg-encoding.c: Likewise. * gettext-tools/src/xgettext.c: Likewise. --- diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c index 45a277d19..c5b5eb5d9 100644 --- a/gettext-runtime/src/envsubst.c +++ b/gettext-runtime/src/envsubst.c @@ -444,8 +444,8 @@ do_getc () if (c == EOF) { if (ferror (stdin)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), _("standard input")); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), _("standard input")); } return c; diff --git a/gettext-tools/src/cldr-plurals.c b/gettext-tools/src/cldr-plurals.c index 0a127fb3f..97a080ee2 100644 --- a/gettext-tools/src/cldr-plurals.c +++ b/gettext-tools/src/cldr-plurals.c @@ -66,8 +66,7 @@ extract_rules (FILE *fp, error_at_line (0, 0, logical_filename, xmlGetLineNo (node), - _("\ -The root element must be <%s>"), + _("The root element must be <%s>"), "supplementalData"); goto out; } @@ -102,8 +101,7 @@ The root element must be <%s>"), error_at_line (0, 0, logical_filename, xmlGetLineNo (n), - _("\ -The element <%s> does not have attribute <%s>"), + _("The element <%s> does not have attribute <%s>"), "pluralRules", "locales"); continue; } @@ -143,8 +141,7 @@ The element <%s> does not have attribute <%s>"), error_at_line (0, 0, logical_filename, xmlGetLineNo (n2), - _("\ -The element <%s> does not have attribute <%s>"), + _("The element <%s> does not have attribute <%s>"), "pluralRule", "count"); break; } diff --git a/gettext-tools/src/format.c b/gettext-tools/src/format.c index 5b6d6d3fe..1f019e5d7 100644 --- a/gettext-tools/src/format.c +++ b/gettext-tools/src/format.c @@ -1,5 +1,5 @@ /* Format strings. - Copyright (C) 2001-2010, 2012-2013, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2010, 2012-2013, 2015, 2019 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -149,8 +149,7 @@ check_msgid_msgstr_format_i (const char *msgid, const char *msgid_plural, } else { - error_logger (_("\ -'%s' is not a valid %s format string, unlike '%s'. Reason: %s"), + error_logger (_("'%s' is not a valid %s format string, unlike '%s'. Reason: %s"), pretty_msgstr, format_language_pretty[i], pretty_msgid, invalid_reason); seen_errors++; diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c index b4d9cbe36..6409e8ee3 100644 --- a/gettext-tools/src/msgcmp.c +++ b/gettext-tools/src/msgcmp.c @@ -320,14 +320,14 @@ match_domain (const char *fn1, const char *fn2, if (!include_untranslated && defmsg->msgstr[0] == '\0') { (*nerrors)++; - po_gram_error_at_line (&defmsg->pos, _("\ -this message is untranslated")); + po_gram_error_at_line (&defmsg->pos, + _("this message is untranslated")); } else if (!include_fuzzies && defmsg->is_fuzzy && !is_header (defmsg)) { (*nerrors)++; - po_gram_error_at_line (&defmsg->pos, _("\ -this message needs to be reviewed by the translator")); + po_gram_error_at_line (&defmsg->pos, + _("this message needs to be reviewed by the translator")); } else defmsg->used = 1; @@ -365,16 +365,17 @@ this message needs to be reviewed by the translator")); defmsg = NULL; if (defmsg) { - po_gram_error_at_line (&refmsg->pos, _("\ -this message is used but not defined...")); + po_gram_error_at_line (&refmsg->pos, + _("this message is used but not defined...")); error_message_count--; - po_gram_error_at_line (&defmsg->pos, _("\ -...but this definition is similar")); + po_gram_error_at_line (&defmsg->pos, + _("...but this definition is similar")); defmsg->used = 1; } else - po_gram_error_at_line (&refmsg->pos, _("\ -this message is used but not defined in %s"), fn1); + po_gram_error_at_line (&refmsg->pos, + _("this message is used but not defined in %s"), + fn1); } } } diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c index 505038cf9..cb3b83da3 100644 --- a/gettext-tools/src/msgfmt.c +++ b/gettext-tools/src/msgfmt.c @@ -1182,11 +1182,9 @@ msgfmt_parse_debrief (abstract_catalog_reader_ty *that) if (!this->has_header_entry) { multiline_error (xasprintf ("%s: ", this->file_name), - xasprintf (_("\ -warning: PO file header missing or invalid\n"))); + xasprintf (_("warning: PO file header missing or invalid\n"))); multiline_error (NULL, - xasprintf (_("\ -warning: charset conversion will not work\n"))); + xasprintf (_("warning: charset conversion will not work\n"))); } } } @@ -1209,13 +1207,14 @@ msgfmt_set_domain (default_catalog_reader_ty *this, char *name) exit_status = EXIT_FAILURE; if (correct == 0) { - error (0, 0, _("\ -domain name \"%s\" not suitable as file name"), name); + error (0, 0, + _("domain name \"%s\" not suitable as file name"), name); return; } else - error (0, 0, _("\ -domain name \"%s\" not suitable as file name: will use prefix"), name); + error (0, 0, + _("domain name \"%s\" not suitable as file name: will use prefix"), + name); name[correct] = '\0'; } @@ -1336,8 +1335,8 @@ msgfmt_comment_special (abstract_catalog_reader_ty *that, const char *s) if (!include_fuzzies && check_compatibility && !warned) { warned = true; - error (0, 0, _("\ -%s: warning: source file contains fuzzy translation"), + error (0, 0, + _("%s: warning: source file contains fuzzy translation"), gram_pos.file_name); } } diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c index e6286c3e5..462728ec8 100644 --- a/gettext-tools/src/msggrep.c +++ b/gettext-tools/src/msggrep.c @@ -243,8 +243,8 @@ main (int argc, char **argv) FILE *fp = fopen (optarg, "r"); if (fp == NULL) - error (EXIT_FAILURE, errno, _("\ -error while opening \"%s\" for reading"), optarg); + error (EXIT_FAILURE, errno, + _("error while opening \"%s\" for reading"), optarg); while (!feof (fp)) { @@ -254,8 +254,8 @@ error while opening \"%s\" for reading"), optarg); if (count == 0) { if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), optarg); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), optarg); /* EOF reached. */ break; } diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c index b70cfa728..ed3a197bb 100644 --- a/gettext-tools/src/msgl-cat.c +++ b/gettext-tools/src/msgl-cat.c @@ -1,5 +1,5 @@ /* Message list concatenation and duplicate handling. - Copyright (C) 2001-2003, 2005-2008, 2012, 2015 Free Software + Copyright (C) 2001-2003, 2005-2008, 2012, 2015, 2019 Free Software Foundation, Inc. Written by Bruno Haible , 2001. @@ -175,8 +175,7 @@ catenate_msgdomain_list (string_list_ty *file_list, canon_charset = po_charset_ascii; else error (EXIT_FAILURE, 0, - _("\ -present charset \"%s\" is not a portable encoding name"), + _("present charset \"%s\" is not a portable encoding name"), charset); } @@ -186,8 +185,7 @@ present charset \"%s\" is not a portable encoding name"), canon_from_code = canon_charset; else if (canon_from_code != canon_charset) error (EXIT_FAILURE, 0, - _("\ -two different charsets \"%s\" and \"%s\" in input file"), + _("two different charsets \"%s\" and \"%s\" in input file"), canon_from_code, canon_charset); } } @@ -201,12 +199,12 @@ two different charsets \"%s\" and \"%s\" in input file"), else { if (k == 0) - error (EXIT_FAILURE, 0, _("\ -input file '%s' doesn't contain a header entry with a charset specification"), + error (EXIT_FAILURE, 0, + _("input file '%s' doesn't contain a header entry with a charset specification"), files[n]); else - error (EXIT_FAILURE, 0, _("\ -domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"), + error (EXIT_FAILURE, 0, + _("domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"), mdlp->item[k]->domain, files[n]); } } diff --git a/gettext-tools/src/msgl-charset.c b/gettext-tools/src/msgl-charset.c index c6ceae85f..42d182e91 100644 --- a/gettext-tools/src/msgl-charset.c +++ b/gettext-tools/src/msgl-charset.c @@ -1,5 +1,5 @@ /* Message list charset and locale charset handling. - Copyright (C) 2001-2003, 2005-2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009, 2019 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -83,8 +83,7 @@ compare_po_locale_charsets (const msgdomain_list_ty *mdlp) canon_charset = po_charset_canonicalize (charset); if (canon_charset == NULL) error (EXIT_FAILURE, 0, - _("\ -present charset \"%s\" is not a portable encoding name"), + _("present charset \"%s\" is not a portable encoding name"), charset); freea (charset); if (canon_locale_code != canon_charset) diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c index afc9c6ea6..32c21adf5 100644 --- a/gettext-tools/src/msgl-check.c +++ b/gettext-tools/src/msgl-check.c @@ -1,5 +1,5 @@ /* Checking of messages in PO files. - Copyright (C) 1995-1998, 2000-2008, 2010-2016 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2008, 2010-2016, 2019 Free Software Foundation, Inc. Written by Ulrich Drepper , April 1995. This program is free software: you can redistribute it and/or modify @@ -612,16 +612,16 @@ check_pair (const message_ty *mp, { po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, - (size_t)(-1), false, _("\ -'msgid' and 'msgid_plural' entries do not both begin with '\\n'")); + (size_t)(-1), false, + _("'msgid' and 'msgid_plural' entries do not both begin with '\\n'")); seen_errors++; } for (p = msgstr, j = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, j++) if (TEST_NEWLINE(p) != has_newline) { char *msg = - xasprintf (_("\ -'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"), j); + xasprintf (_("'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"), + j); po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, (size_t)(-1), false, msg); @@ -635,8 +635,8 @@ check_pair (const message_ty *mp, { po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, - (size_t)(-1), false, _("\ -'msgid' and 'msgstr' entries do not both begin with '\\n'")); + (size_t)(-1), false, + _("'msgid' and 'msgstr' entries do not both begin with '\\n'")); seen_errors++; } } @@ -653,16 +653,16 @@ check_pair (const message_ty *mp, { po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, - (size_t)(-1), false, _("\ -'msgid' and 'msgid_plural' entries do not both end with '\\n'")); + (size_t)(-1), false, + _("'msgid' and 'msgid_plural' entries do not both end with '\\n'")); seen_errors++; } for (p = msgstr, j = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, j++) if (TEST_NEWLINE(p) != has_newline) { char *msg = - xasprintf (_("\ -'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"), j); + xasprintf (_("'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"), + j); po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, (size_t)(-1), false, msg); @@ -676,8 +676,8 @@ check_pair (const message_ty *mp, { po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, - (size_t)(-1), false, _("\ -'msgid' and 'msgstr' entries do not both end with '\\n'")); + (size_t)(-1), false, + _("'msgid' and 'msgstr' entries do not both end with '\\n'")); seen_errors++; } } @@ -688,8 +688,8 @@ check_pair (const message_ty *mp, { po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, - (size_t)(-1), false, _("\ -plural handling is a GNU gettext extension")); + (size_t)(-1), false, + _("plural handling is a GNU gettext extension")); seen_errors++; } @@ -1010,8 +1010,7 @@ syntax_check_space_ellipsis (const message_ty *mp, const char *msgid) if (uc != 0xfffd && uc_is_space (uc)) { po_xerror (PO_SEVERITY_ERROR, mp, NULL, 0, 0, false, - _("\ -space before ellipsis found in user visible strings")); + _("space before ellipsis found in user visible strings")); seen_errors++; } } diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c index 50c35e3a8..a9bada3bc 100644 --- a/gettext-tools/src/msgl-iconv.c +++ b/gettext-tools/src/msgl-iconv.c @@ -1,5 +1,5 @@ /* Message list charset and locale charset handling. - Copyright (C) 2001-2003, 2005-2009 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2009, 2019 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -66,8 +66,7 @@ conversion_error (const struct conversion_context* context) context->from_filename, context->from_code)); else po_xerror (PO_SEVERITY_FATAL_ERROR, context->message, NULL, 0, 0, false, - xasprintf (_("\ -%s: error while converting from \"%s\" encoding to \"%s\" encoding"), + xasprintf (_("%s: error while converting from \"%s\" encoding to \"%s\" encoding"), context->from_filename, context->from_code, context->to_code)); /* NOTREACHED */ @@ -244,8 +243,8 @@ iconv_message_list_internal (message_list_ty *mlp, canon_charset = po_charset_ascii; else po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, - false, xasprintf (_("\ -present charset \"%s\" is not a portable encoding name"), + false, + xasprintf (_("present charset \"%s\" is not a portable encoding name"), charset)); } } @@ -256,8 +255,7 @@ present charset \"%s\" is not a portable encoding name"), else if (canon_from_code != canon_charset) po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, - xasprintf (_("\ -two different charsets \"%s\" and \"%s\" in input file"), + xasprintf (_("two different charsets \"%s\" and \"%s\" in input file"), canon_from_code, canon_charset)); } freea (charset); @@ -287,8 +285,7 @@ two different charsets \"%s\" and \"%s\" in input file"), canon_from_code = po_charset_ascii; else po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, - _("\ -input file doesn't contain a header entry with a charset specification")); + _("input file doesn't contain a header entry with a charset specification")); } msgids_changed = false; @@ -302,9 +299,7 @@ input file doesn't contain a header entry with a charset specification")); if (iconveh_open (canon_to_code, canon_from_code, &cd) < 0) po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, - xasprintf (_("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), \ -and iconv() does not support this conversion."), + xasprintf (_("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."), canon_from_code, canon_to_code, basename (program_name))); @@ -332,15 +327,11 @@ and iconv() does not support this conversion."), if (msgids_changed) if (message_list_msgids_changed (mlp)) po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, - xasprintf (_("\ -Conversion from \"%s\" to \"%s\" introduces duplicates: \ -some different msgids become equal."), + xasprintf (_("Conversion from \"%s\" to \"%s\" introduces duplicates: some different msgids become equal."), canon_from_code, canon_to_code)); #else po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, - xasprintf (_("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). \ -This version was built without iconv()."), + xasprintf (_("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."), canon_from_code, canon_to_code, basename (program_name))); #endif @@ -372,8 +363,7 @@ iconv_msgdomain_list (msgdomain_list_ty *mdlp, canon_to_code = po_charset_canonicalize (to_code); if (canon_to_code == NULL) po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, - xasprintf (_("\ -target charset \"%s\" is not a portable encoding name."), + xasprintf (_("target charset \"%s\" is not a portable encoding name."), to_code)); for (k = 0; k < mdlp->nitems; k++) diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index c7f49b287..e2f533ed6 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -1563,11 +1563,11 @@ match_domain (const char *fn1, const char *fn2, if (verbosity_level > 1) { - po_gram_error_at_line (&refmsg->pos, _("\ -this message is used but not defined...")); + po_gram_error_at_line (&refmsg->pos, + _("this message is used but not defined...")); error_message_count--; - po_gram_error_at_line (&defmsg->pos, _("\ -...but this definition is similar")); + po_gram_error_at_line (&defmsg->pos, + _("...but this definition is similar")); } /* Merge the reference with the definition: take the #. and @@ -1595,8 +1595,9 @@ this message is used but not defined...")); const char *pend; if (verbosity_level > 1) - po_gram_error_at_line (&refmsg->pos, _("\ -this message is used but not defined in %s"), fn1); + po_gram_error_at_line (&refmsg->pos, + _("this message is used but not defined in %s"), + fn1); mp = message_copy (refmsg); @@ -1671,10 +1672,8 @@ this message is used but not defined in %s"), fn1); unsigned long i; if (verbosity_level > 1) - { - po_gram_error_at_line (&mp->pos, _("\ -this message should define plural forms")); - } + po_gram_error_at_line (&mp->pos, + _("this message should define plural forms")); new_msgstr_len = nplurals * mp->msgstr_len; new_msgstr = XNMALLOC (new_msgstr_len, char); @@ -1694,10 +1693,8 @@ this message should define plural forms")); Use only the first among the plural forms. */ if (verbosity_level > 1) - { - po_gram_error_at_line (&mp->pos, _("\ -this message should not define plural forms")); - } + po_gram_error_at_line (&mp->pos, + _("this message should not define plural forms")); mp->msgstr_len = strlen (mp->msgstr) + 1; mp->is_fuzzy = true; diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c index d8a4e80ba..934829eae 100644 --- a/gettext-tools/src/po-lex.c +++ b/gettext-tools/src/po-lex.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-2009, 2011 Free Software Foundation, Inc. + Copyright (C) 1995-2009, 2011, 2019 Free Software Foundation, Inc. This file was written by Peter Miller . Multibyte character handling by Bruno Haible . @@ -462,8 +462,7 @@ mbfile_getc (mbchar_t mbc, mbfile_t mbf) if (ferror (mbf->fp)) goto eof; if (signal_eilseq) - po_gram_error (_("\ -incomplete multibyte sequence at end of file")); + po_gram_error (_("incomplete multibyte sequence at end of file")); bytes = mbf->bufcount; mbc->uc_valid = false; break; @@ -472,8 +471,7 @@ incomplete multibyte sequence at end of file")); if (c == '\n') { if (signal_eilseq) - po_gram_error (_("\ -incomplete multibyte sequence at end of line")); + po_gram_error (_("incomplete multibyte sequence at end of line")); bytes = mbf->bufcount - 1; mbc->uc_valid = false; break; diff --git a/gettext-tools/src/read-stringtable.c b/gettext-tools/src/read-stringtable.c index a7cdc88df..5e5c6f915 100644 --- a/gettext-tools/src/read-stringtable.c +++ b/gettext-tools/src/read-stringtable.c @@ -1,5 +1,5 @@ /* Reading NeXTstep/GNUstep .strings files. - Copyright (C) 2003, 2005-2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2007, 2009, 2019 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -936,8 +936,8 @@ stringtable_parse (abstract_catalog_reader_ty *pop, FILE *file, { po_xerror (PO_SEVERITY_ERROR, NULL, real_file_name, gram_pos.line_number, (size_t)(-1), - false, _("\ -warning: syntax error, expected ';' after string")); + false, + _("warning: syntax error, expected ';' after string")); break; } } @@ -945,8 +945,7 @@ warning: syntax error, expected ';' after string")); { po_xerror (PO_SEVERITY_ERROR, NULL, real_file_name, gram_pos.line_number, (size_t)(-1), false, - _("\ -warning: syntax error, expected '=' or ';' after string")); + _("warning: syntax error, expected '=' or ';' after string")); break; } } diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c index 3f34c540b..7bc8b5e60 100644 --- a/gettext-tools/src/recode-sr-latin.c +++ b/gettext-tools/src/recode-sr-latin.c @@ -284,23 +284,20 @@ process (FILE *stream) conv_from_utf8 = iconv_open (locale_code, "UTF-8"); } if (conv_to_utf8 == (iconv_t)(-1)) - error (EXIT_FAILURE, 0, _("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), \ -and iconv() does not support this conversion."), + error (EXIT_FAILURE, 0, + _("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."), locale_code, "UTF-8", basename (program_name)); if (conv_from_utf8 == (iconv_t)(-1)) - error (EXIT_FAILURE, 0, _("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), \ -and iconv() does not support this conversion."), + error (EXIT_FAILURE, 0, + _("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."), "UTF-8", locale_code, basename (program_name)); last_utf8_line = NULL; last_utf8_line_len = 0; last_backconv_line = NULL; last_backconv_line_len = 0; #else - error (EXIT_FAILURE, 0, _("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). \ -This version was built without iconv()."), + error (EXIT_FAILURE, 0, + _("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."), locale_code, "UTF-8", basename (program_name)); #endif } diff --git a/gettext-tools/src/write-catalog.c b/gettext-tools/src/write-catalog.c index 4bac4ba8e..d67436f4c 100644 --- a/gettext-tools/src/write-catalog.c +++ b/gettext-tools/src/write-catalog.c @@ -127,11 +127,11 @@ msgdomain_list_print (msgdomain_list_ty *mdlp, const char *filename, if (!output_syntax->supports_multiple_domains && mdlp->nitems > 1) { if (output_syntax->alternative_is_po) - po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, _("\ -Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead.")); + po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, + _("Cannot output multiple translation domains into a single file with the specified output format. Try using PO file syntax instead.")); else - po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, _("\ -Cannot output multiple translation domains into a single file with the specified output format.")); + po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, NULL, 0, 0, false, + _("Cannot output multiple translation domains into a single file with the specified output format.")); } else { @@ -163,8 +163,8 @@ Cannot output multiple translation domains into a single file with the specified error_with_progname = false; po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, has_context->file_name, has_context->line_number, - (size_t)(-1), false, _("\ -message catalog has context dependent translations, but the output format does not support them.")); + (size_t)(-1), false, + _("message catalog has context dependent translations, but the output format does not support them.")); error_with_progname = true; } } @@ -198,13 +198,13 @@ message catalog has context dependent translations, but the output format does n if (output_syntax->alternative_is_java_class) po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, has_plural->file_name, has_plural->line_number, - (size_t)(-1), false, _("\ -message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file.")); + (size_t)(-1), false, + _("message catalog has plural form translations, but the output format does not support them. Try generating a Java class using \"msgfmt --java\", instead of a properties file.")); else po_xerror (PO_SEVERITY_FATAL_ERROR, NULL, has_plural->file_name, has_plural->line_number, - (size_t)(-1), false, _("\ -message catalog has plural form translations, but the output format does not support them.")); + (size_t)(-1), false, + _("message catalog has plural form translations, but the output format does not support them.")); error_with_progname = true; } } diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c index 24776a496..07e9f76d9 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-2003, 2005-2010, 2014, 2016, 2018 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2010, 2014, 2016, 2018-2019 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -1212,11 +1212,11 @@ msgdomain_write_java (message_list_ty *mlp, const char *canon_encoding, true, false, true, verbose > 0)) { if (!verbose) - error (0, 0, _("\ -compilation of Java class failed, please try --verbose or set $JAVAC")); + error (0, 0, + _("compilation of Java class failed, please try --verbose or set $JAVAC")); else - error (0, 0, _("\ -compilation of Java class failed, please try to set $JAVAC")); + error (0, 0, + _("compilation of Java class failed, please try to set $JAVAC")); goto quit3; } diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c index 877f05365..d917e4cbf 100644 --- a/gettext-tools/src/write-po.c +++ b/gettext-tools/src/write-po.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1998, 2000-2010, 2012, 2014-2015, 2018 Free Software + Copyright (C) 1995-1998, 2000-2010, 2012, 2014-2015, 2018-2019 Free Software Foundation, Inc. This file was written by Peter Miller @@ -890,8 +890,7 @@ wrap (const message_ty *mp, ostream_t stream, if (c != 'n' && c != 't') { char *error_message = - xasprintf (_("\ -internationalized messages should not contain the '\\%c' escape sequence"), + xasprintf (_("internationalized messages should not contain the '\\%c' escape sequence"), c); po_xerror (PO_SEVERITY_WARNING, mp, NULL, 0, 0, false, error_message); diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c index 6a5dad905..4e3c5904b 100644 --- a/gettext-tools/src/x-csharp.c +++ b/gettext-tools/src/x-csharp.c @@ -1,5 +1,5 @@ /* xgettext C# backend. - Copyright (C) 2003-2009, 2011, 2014, 2018 Free Software Foundation, Inc. + Copyright (C) 2003-2009, 2011, 2014, 2018-2019 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -222,8 +222,7 @@ phase2_getc () non_ascii_error_message (lexical_context, real_file_name, line_number), - _("\ -Please specify the source encoding through --from-code."))); + _("Please specify the source encoding through --from-code."))); exit (EXIT_FAILURE); } return c; diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c index b661c0c4d..90a45c455 100644 --- a/gettext-tools/src/x-elisp.c +++ b/gettext-tools/src/x-elisp.c @@ -1,5 +1,5 @@ /* xgettext Emacs Lisp backend. - Copyright (C) 2001-2003, 2005-2009, 2018 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2009, 2018-2019 Free Software Foundation, Inc. This file was written by Bruno Haible , 2001-2002. @@ -141,8 +141,8 @@ do_getc () if (c == EOF) { if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), real_file_name); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), real_file_name); } else if (c == '\n') line_number++; diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c index 9b7591588..e174bd066 100644 --- a/gettext-tools/src/x-java.c +++ b/gettext-tools/src/x-java.c @@ -1,5 +1,5 @@ /* xgettext Java backend. - Copyright (C) 2003, 2005-2009, 2018 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2009, 2018-2019 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -180,8 +180,8 @@ phase1_getc () if (c == EOF) { if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), real_file_name); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), real_file_name); } return c; diff --git a/gettext-tools/src/x-javascript.c b/gettext-tools/src/x-javascript.c index 85c9ad328..d6d563d09 100644 --- a/gettext-tools/src/x-javascript.c +++ b/gettext-tools/src/x-javascript.c @@ -1,5 +1,5 @@ /* xgettext JavaScript backend. - Copyright (C) 2002-2003, 2005-2009, 2013-2014, 2018 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2009, 2013-2014, 2018-2019 Free Software Foundation, Inc. This file was written by Andreas Stricker , 2010 It's based on x-python from Bruno Haible. @@ -228,8 +228,7 @@ phase2_getc () non_ascii_error_message (lexical_context, real_file_name, line_number), - _("\ -Please specify the source encoding through --from-code\n"))); + _("Please specify the source encoding through --from-code\n"))); exit (EXIT_FAILURE); } return c; diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c index f660808c7..b516b84c7 100644 --- a/gettext-tools/src/x-librep.c +++ b/gettext-tools/src/x-librep.c @@ -1,5 +1,5 @@ /* xgettext librep backend. - Copyright (C) 2001-2003, 2005-2009, 2018 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2009, 2018-2019 Free Software Foundation, Inc. This file was written by Bruno Haible , 2001. @@ -143,8 +143,8 @@ do_getc () if (c == EOF) { if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), real_file_name); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), real_file_name); } else if (c == '\n') line_number++; diff --git a/gettext-tools/src/x-lisp.c b/gettext-tools/src/x-lisp.c index 7604325f8..6dab49049 100644 --- a/gettext-tools/src/x-lisp.c +++ b/gettext-tools/src/x-lisp.c @@ -1,5 +1,5 @@ /* xgettext Lisp backend. - Copyright (C) 2001-2003, 2005-2009, 2018 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2009, 2018-2019 Free Software Foundation, Inc. This file was written by Bruno Haible , 2001. @@ -208,8 +208,8 @@ do_getc () if (c == EOF) { if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), real_file_name); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), real_file_name); } else if (c == '\n') line_number++; diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c index 50b87bc12..1517cb117 100644 --- a/gettext-tools/src/x-perl.c +++ b/gettext-tools/src/x-perl.c @@ -1,5 +1,5 @@ /* xgettext Perl backend. - Copyright (C) 2002-2010, 2013, 2016, 2018 Free Software Foundation, Inc. + Copyright (C) 2002-2010, 2013, 2016, 2018-2019 Free Software Foundation, Inc. This file was written by Guido Flohr , 2002-2010. @@ -335,8 +335,8 @@ get_here_document (const char *delimiter) else { error_with_progname = false; - error (EXIT_SUCCESS, 0, _("\ -%s:%d: can't find string terminator \"%s\" anywhere before EOF"), + error (EXIT_SUCCESS, 0, + _("%s:%d: can't find string terminator \"%s\" anywhere before EOF"), real_file_name, line_number, delimiter); error_with_progname = true; @@ -1070,8 +1070,9 @@ extract_quotelike_pass3 (token_ty *tp, int error_level) if (end == NULL) { error_with_progname = false; - error (error_level, 0, _("\ -%s:%d: missing right brace on \\x{HEXNUMBER}"), real_file_name, line_number); + error (error_level, 0, + _("%s:%d: missing right brace on \\x{HEXNUMBER}"), + real_file_name, line_number); error_with_progname = true; ++crs; continue; @@ -1190,8 +1191,8 @@ extract_quotelike_pass3 (token_ty *tp, int error_level) else if ((unsigned char) *crs >= 0x80) { error_with_progname = false; - error (error_level, 0, _("\ -%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""), + error (error_level, 0, + _("%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""), real_file_name, line_number, *crs); error_with_progname = true; } @@ -1210,8 +1211,8 @@ extract_quotelike_pass3 (token_ty *tp, int error_level) else if ((unsigned char) *crs >= 0x80) { error_with_progname = false; - error (error_level, 0, _("\ -%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""), + error (error_level, 0, + _("%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""), real_file_name, line_number, *crs); error_with_progname = true; } @@ -1244,8 +1245,8 @@ extract_quotelike_pass3 (token_ty *tp, int error_level) if (!backslashed && !extract_all && (*crs == '$' || *crs == '@')) { error_with_progname = false; - error (error_level, 0, _("\ -%s:%d: invalid variable interpolation at \"%c\""), + error (error_level, 0, + _("%s:%d: invalid variable interpolation at \"%c\""), real_file_name, line_number, *crs); error_with_progname = true; ++crs; @@ -1257,8 +1258,8 @@ extract_quotelike_pass3 (token_ty *tp, int error_level) else if ((unsigned char) *crs >= 0x80) { error_with_progname = false; - error (error_level, 0, _("\ -%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""), + error (error_level, 0, + _("%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""), real_file_name, line_number, *crs); error_with_progname = true; buffer[bufpos++] = *crs; @@ -1274,8 +1275,8 @@ extract_quotelike_pass3 (token_ty *tp, int error_level) else if ((unsigned char) *crs >= 0x80) { error_with_progname = false; - error (error_level, 0, _("\ -%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""), + error (error_level, 0, + _("%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""), real_file_name, line_number, *crs); error_with_progname = true; buffer[bufpos++] = *crs; diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c index a37a1e8b0..f6116f551 100644 --- a/gettext-tools/src/x-python.c +++ b/gettext-tools/src/x-python.c @@ -1,5 +1,5 @@ /* xgettext Python backend. - Copyright (C) 2002-2003, 2005-2011, 2013-2014, 2018 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2011, 2013-2014, 2018-2019 Free Software Foundation, Inc. This file was written by Bruno Haible , 2002. @@ -595,18 +595,16 @@ set_current_file_source_encoding (const char *canon_encoding) # endif cd = iconv_open (po_charset_utf8, xgettext_current_file_source_encoding); if (cd == (iconv_t)(-1)) - error_at_line (EXIT_FAILURE, 0, logical_file_name, line_number - 1, _("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), \ -and iconv() does not support this conversion."), - xgettext_current_file_source_encoding, po_charset_utf8, - basename (program_name)); + error_at_line (EXIT_FAILURE, 0, logical_file_name, line_number - 1, + _("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."), + xgettext_current_file_source_encoding, po_charset_utf8, + basename (program_name)); xgettext_current_file_source_iconv = cd; #else - error_at_line (EXIT_FAILURE, 0, logical_file_name, line_number - 1, _("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). \ -This version was built without iconv()."), - xgettext_global_source_encoding, po_charset_utf8, - basename (program_name)); + error_at_line (EXIT_FAILURE, 0, logical_file_name, line_number - 1, + _("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."), + xgettext_global_source_encoding, po_charset_utf8, + basename (program_name)); #endif } @@ -652,8 +650,8 @@ try_to_extract_coding (const char *comment) if (canon_encoding == NULL) { error_at_line (0, 0, - logical_file_name, line_number - 1, _("\ -Unknown encoding \"%s\". Proceeding with ASCII instead."), + logical_file_name, line_number - 1, + _("Unknown encoding \"%s\". Proceeding with ASCII instead."), encoding); canon_encoding = po_charset_ascii; } diff --git a/gettext-tools/src/x-scheme.c b/gettext-tools/src/x-scheme.c index fc4b7853d..075f46795 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-2009, 2011, 2014, 2018 Free Software Foundation, Inc. + Copyright (C) 2004-2009, 2011, 2014, 2018-2019 Free Software Foundation, Inc. This file was written by Bruno Haible , 2004-2005. @@ -167,8 +167,8 @@ do_getc () if (c == EOF) { if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), real_file_name); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), real_file_name); } else if (c == '\n') line_number++; diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c index 653d8ab6c..79631f825 100644 --- a/gettext-tools/src/x-sh.c +++ b/gettext-tools/src/x-sh.c @@ -1,5 +1,5 @@ /* xgettext sh backend. - Copyright (C) 2003, 2005-2009, 2014, 2018 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2009, 2014, 2018-2019 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -159,8 +159,8 @@ do_getc () if (c == EOF) { if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), real_file_name); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), real_file_name); } else if (c == '\n') line_number++; diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c index 8980739fc..0c814cd04 100644 --- a/gettext-tools/src/x-tcl.c +++ b/gettext-tools/src/x-tcl.c @@ -1,5 +1,5 @@ /* xgettext Tcl backend. - Copyright (C) 2002-2003, 2005-2009, 2013, 2018 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2009, 2013, 2018-2019 Free Software Foundation, Inc. This file was written by Bruno Haible , 2002. @@ -147,8 +147,8 @@ do_getc () if (c == EOF) { if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), real_file_name); + error (EXIT_FAILURE, errno, + _("error while reading \"%s\""), real_file_name); } else if (c == '\n') line_number++; diff --git a/gettext-tools/src/x-vala.c b/gettext-tools/src/x-vala.c index 0fadd6af5..7bf0979a7 100644 --- a/gettext-tools/src/x-vala.c +++ b/gettext-tools/src/x-vala.c @@ -1,5 +1,5 @@ /* xgettext Vala backend. - Copyright (C) 2013-2014, 2018 Free Software Foundation, Inc. + Copyright (C) 2013-2014, 2018-2019 Free Software Foundation, Inc. This file was written by Daiki Ueno , 2013. @@ -903,8 +903,8 @@ phase3_get (token_ty *tp) if (c == P7_NEWLINE) { error_with_progname = false; - error (0, 0, _("\ -%s:%d: warning: unterminated string literal"), + error (0, 0, + _("%s:%d: warning: unterminated string literal"), logical_file_name, line_number - 1); error_with_progname = true; phase7_ungetc ('\n'); diff --git a/gettext-tools/src/xg-encoding.c b/gettext-tools/src/xg-encoding.c index 1180157a7..63f30eeeb 100644 --- a/gettext-tools/src/xg-encoding.c +++ b/gettext-tools/src/xg-encoding.c @@ -1,5 +1,5 @@ /* Keeping track of the encoding of strings to be extracted. - Copyright (C) 2001-2018 Free Software Foundation, Inc. + Copyright (C) 2001-2019 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 @@ -106,8 +106,7 @@ from_current_source_encoding (const char *string, non_ascii_error_message (lcontext, file_name, line_number), - _("\ -Please specify the source encoding through --from-code."))); + _("Please specify the source encoding through --from-code."))); exit (EXIT_FAILURE); } } diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c index f42d4482f..af3f4a2fa 100644 --- a/gettext-tools/src/xgettext.c +++ b/gettext-tools/src/xgettext.c @@ -563,8 +563,7 @@ main (int argc, char *argv[]) if (xgettext_global_source_encoding == NULL) { multiline_warning (xasprintf (_("warning: ")), - xasprintf (_("\ -'%s' is not a valid encoding name. Using ASCII as fallback.\n"), + xasprintf (_("'%s' is not a valid encoding name. Using ASCII as fallback.\n"), optarg)); xgettext_global_source_encoding = po_charset_ascii; } @@ -697,8 +696,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\ "--kde", "--boost"); if (join_existing && strcmp (default_domain, "-") == 0) - error (EXIT_FAILURE, 0, _("\ ---join-existing cannot be used when output is written to stdout")); + error (EXIT_FAILURE, 0, + _("--join-existing cannot be used when output is written to stdout")); if (no_default_keywords && !some_additional_keywords) { @@ -783,16 +782,14 @@ xgettext cannot work without keywords to look for")); # endif cd = iconv_open (po_charset_utf8, xgettext_global_source_encoding); if (cd == (iconv_t)(-1)) - error (EXIT_FAILURE, 0, _("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), \ -and iconv() does not support this conversion."), + error (EXIT_FAILURE, 0, + _("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."), xgettext_global_source_encoding, po_charset_utf8, basename (program_name)); xgettext_global_source_iconv = cd; #else - error (EXIT_FAILURE, 0, _("\ -Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). \ -This version was built without iconv()."), + error (EXIT_FAILURE, 0, + _("Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."), xgettext_global_source_encoding, po_charset_utf8, basename (program_name)); #endif @@ -837,10 +834,9 @@ This version was built without iconv()."), its_rules = its_rule_list_alloc (); if (!its_rule_list_add_from_file (its_rules, explicit_its_filename)) - { - error (EXIT_FAILURE, 0, _("\ -warning: ITS rule file '%s' does not exist"), explicit_its_filename); - } + error (EXIT_FAILURE, 0, + _("warning: ITS rule file '%s' does not exist"), + explicit_its_filename); } else { @@ -919,8 +915,8 @@ warning: ITS rule file '%s' does not exist"), explicit_its_filename); } if (its_dirs[j] == NULL) { - error (0, 0, _("\ -warning: ITS rule file '%s' does not exist; check your gettext installation"), + error (0, 0, + _("warning: ITS rule file '%s' does not exist; check your gettext installation"), its_basename); its_rule_list_free (its_rules); its_rules = NULL; @@ -937,8 +933,9 @@ warning: ITS rule file '%s' does not exist; check your gettext installation"), extension = ""; else extension++; - error (0, 0, _("\ -warning: file '%s' extension '%s' is unknown; will try C"), filename, extension); + error (0, 0, + _("warning: file '%s' extension '%s' is unknown; will try C"), + filename, extension); language_from_extension = "C"; } @@ -1595,8 +1592,8 @@ xgettext_record_flag (const char *optionstring) } err: - error (EXIT_FAILURE, 0, _("\ -A --flag argument doesn't have the ::[pass-] syntax: %s"), + error (EXIT_FAILURE, 0, + _("A --flag argument doesn't have the ::[pass-] syntax: %s"), optionstring); } @@ -1703,8 +1700,8 @@ xgettext_open (const char *fn, new_name = xstrdup (fn); fp = fopen (fn, "r"); if (fp == NULL) - error (EXIT_FAILURE, errno, _("\ -error while opening \"%s\" for reading"), fn); + error (EXIT_FAILURE, errno, + _("error while opening \"%s\" for reading"), fn); logical_file_name = xstrdup (new_name); } else @@ -1716,8 +1713,8 @@ error while opening \"%s\" for reading"), fn); const char *dir = dir_list_nth (j); if (dir == NULL) - error (EXIT_FAILURE, ENOENT, _("\ -error while opening \"%s\" for reading"), fn); + error (EXIT_FAILURE, ENOENT, + _("error while opening \"%s\" for reading"), fn); new_name = xconcatenated_filename (dir, fn, NULL); @@ -1726,8 +1723,8 @@ error while opening \"%s\" for reading"), fn); break; if (errno != ENOENT) - error (EXIT_FAILURE, errno, _("\ -error while opening \"%s\" for reading"), new_name); + error (EXIT_FAILURE, errno, + _("error while opening \"%s\" for reading"), new_name); free (new_name); }