[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog Makefile...
|
From: |
Ineiev |
|
Subject: |
trans-coord/gnun/server/gnun ChangeLog Makefile... |
|
Date: |
Fri, 7 Apr 2023 04:45:02 -0400 (EDT) |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Ineiev <ineiev> 23/04/07 04:45:02
Modified files:
gnun/server/gnun: ChangeLog Makefile.am NEWS README
gnun-preconvert.in gnun-validate-html.in
gnun/server/gnun/tests: conv-no-diffs.pr.po conv.html conv.pot
conv.pr.html conv.pr.po convert
preconv.pr.po
Log message:
* gnun-validate-html.in: One more ignored xmllint stderr message.
* README: Add a reference to release number.
* tests/conv-no-diffs.pr.po:
* tests/conv.html:
* tests/conv.pot:
* tests/conv.pr.html:
* tests/conv.pr.po:
* tests/convert:
* tests/preconv.pr.po: Use msgcat to make tests more reliable;
don't rely on po4a support of charsets other than UTF-8 (it looks
like po4a 0.66 doesn't like ASCII).
* Makefile.am (check_environment): Add MSGCAT.
* gnun-preconvert.in: Amend name of encoding.
* NEWS: Update.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.511&r2=1.512
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.161&r2=1.162
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/README?cvsroot=trans-coord&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-preconvert.in?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html.in?cvsroot=trans-coord&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/conv-no-diffs.pr.po?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/conv.html?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/conv.pot?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/conv.pr.html?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/conv.pr.po?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/convert?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/preconv.pr.po?cvsroot=trans-coord&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -b -r1.511 -r1.512
--- ChangeLog 17 Nov 2022 08:21:59 -0000 1.511
+++ ChangeLog 7 Apr 2023 08:45:02 -0000 1.512
@@ -1,3 +1,20 @@
+2023-04-07 Pavel Kharitonov <ineiev@gnu.org>
+
+ * gnun-validate-html.in: One more ignored xmllint stderr message.
+ * README: Add a reference to release number.
+ * tests/conv-no-diffs.pr.po:
+ * tests/conv.html:
+ * tests/conv.pot:
+ * tests/conv.pr.html:
+ * tests/conv.pr.po:
+ * tests/convert:
+ * tests/preconv.pr.po: Use msgcat to make tests more reliable;
+ don't rely on po4a support of charsets other than UTF-8 (it looks
+ like po4a 0.66 doesn't like ASCII).
+ * Makefile.am (check_environment): Add MSGCAT.
+ * gnun-preconvert.in: Amend name of encoding.
+ * NEWS: Update.
+
2022-11-17 Pavel Kharitonov <ineiev@gnu.org>
* GNUmakefile (substitute-localized-urls):
@@ -5106,8 +5123,8 @@
* philosophy/schools.html: philosophy/schools.html на
английÑки и
бÑлгаÑÑки.
- Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+ 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
This file is part of GNUnited Nations.
Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Makefile.am 15 Nov 2022 15:18:45 -0000 1.55
+++ Makefile.am 7 Apr 2023 08:45:02 -0000 1.56
@@ -1,5 +1,5 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -29,6 +29,7 @@
srcdir="$(srcdir)/tests" \
AWK="$(AWK)" \
MSGATTRIB="$(MSGATTRIB)" \
+ MSGCAT="$(MSGCAT)" \
SED="$(SED)" \
WDIFF="$(WDIFF)"
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- NEWS 17 Nov 2022 08:21:59 -0000 1.161
+++ NEWS 7 Apr 2023 08:45:02 -0000 1.162
@@ -5,10 +5,19 @@
** Support localized URLs in templates,
https://www.gnu.org/s/trans-coord/g/Localized-URLs.html
+** gnun-validate-html is updated to work with xmllint coming with Trisquel 11
+ (libxml version 20913).
+
+** Tests are updated for po4a-gettextize 0.66; it seems to only output
+ in non-UTF-8.
+
** Bugs fixed in 1.4
*** make-prototype.awk was used instead of make-prototype.awk.in.
+*** PO files in tests/convert pass through msgcat in order to make
+ the result less dependent on line wrapping, it may vary.
+
* Changes in GNUnited Nations 1.3 (2022-11-09)
* The SSI expansion function in gnun-validate-html rudimentarily
@@ -672,8 +681,8 @@
-----
-Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+ 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
This file is part of GNUnited Nations.
Index: README
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/README,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- README 9 Nov 2022 09:13:12 -0000 1.23
+++ README 7 Apr 2023 08:45:02 -0000 1.24
@@ -1,6 +1,9 @@
GNUnited Nations -*-text-*-
================
+This is a distribution of GNUnited Nations. For the release number,
+see NEWS.
+
GNUnited Nations (GNUN) is a collection of scripts to maintain
www.gnu.org translations.
@@ -89,7 +92,7 @@
this is an inclusive range that applies to every year in the range.
Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
- 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+ 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
Index: gnun-preconvert.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-preconvert.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnun-preconvert.in 9 Nov 2022 09:13:12 -0000 1.7
+++ gnun-preconvert.in 7 Apr 2023 08:45:02 -0000 1.8
@@ -2,8 +2,8 @@
# Invoke po4a-gettextize to convert an existing translation from
# HTML to PO.
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -23,8 +23,8 @@
function version () {
cat <<EOF
gnun-preconvert (@PACKAGE_NAME@) @PACKAGE_VERSION@
-Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+ 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
You may redistribute copies of @PACKAGE_NAME@
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
@@ -139,7 +139,7 @@
po=${translation%.html}.po
-@PO4A_GETTEXTIZE@ -f xhtml -M utf-8 -L "$encoding" \
+@PO4A_GETTEXTIZE@ -f xhtml -M UTF-8 -L "$encoding" \
-l "$translation" -m "$master" -p "$po" \
-o ontagerror=silent -o "attributes=<meta>content" -o "translated=W<pre>" \
|| exit 1
Index: gnun-validate-html.in
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gnun-validate-html.in 9 Nov 2022 09:13:12 -0000 1.27
+++ gnun-validate-html.in 7 Apr 2023 08:45:02 -0000 1.28
@@ -1,7 +1,7 @@
#! @BASH@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -21,8 +21,8 @@
function version () {
cat <<EOF
gnun-validate-html (@PACKAGE_NAME@) @PACKAGE_VERSION@
-Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+ 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
You may redistribute copies of @PACKAGE_NAME@
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
@@ -229,7 +229,9 @@
set +e
@XMLLINT@ --path "$DTD" $VALIDATE --nonet --noout "${OUTPUT}" 2> $TMP2
LINTSTATUS=$?
-@SED@ -i '/^I\/O error : Attempt to load network entity/d' $TMP2
+@SED@ -i -e '/^I\/O error : Attempt to load network entity/d' \
+ -e '/error : xmlAddEntity: invalid redeclaration of predefined entity/d' \
+ $TMP2
set -e
if test -s $TMP2; then
Index: tests/conv-no-diffs.pr.po
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/tests/conv-no-diffs.pr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/conv-no-diffs.pr.po 9 Nov 2022 09:13:18 -0000 1.3
+++ tests/conv-no-diffs.pr.po 7 Apr 2023 08:45:02 -0000 1.4
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
#
# This file is part of GNUnited Nations.
#
@@ -27,7 +27,7 @@
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ascii\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING\n"
#. type: Content of: <title>
@@ -61,41 +61,42 @@
#| "or suggestions can be sent to <a href=\"mailto:webmasters@gnu.org\";><"
#| "webmasters@gnu.org></a>."
msgid ""
-"Please send general FSF & GNU inquiries to <a href=\"mailto:gnu@gnu.org";
-"\"><gnu@gnu.org></a>. There are also <a href=\"/contact/\">other ways "
-"to contact</a> the FSF. Broken links and other corrections or suggestions "
-"can be sent to <a href=\"mailto:webmasters@gnu.org\";><webmasters@gnu."
-"org></a>."
+"Please send general FSF & GNU inquiries to <a href=\"mailto:gnu@gnu.";
+"org\"><gnu@gnu.org></a>. There are also <a href=\"/contact/\">other "
+"ways to contact</a> the FSF. Broken links and other corrections or "
+"suggestions can be sent to <a href=\"mailto:webmasters@gnu.org\";><"
+"webmasters@gnu.org></a>."
msgstr "translated contacts."
#. type: Content of: <div><p>
#: ../gnun/tests/conv.html:51
#, fuzzy
#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and submitting "
-#| "translations of this article."
+#| "Please see the <a href=\"/server/standards/README.translations."
+#| "html\">Translations README</a> for information on coordinating and "
+#| "submitting translations of this article."
msgid ""
-"Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
-"translations of this article."
+"Please see the <a href=\"/server/standards/README.translations."
+"html\">Translations README</a> for information on coordinating and "
+"submitting translations of this article."
msgstr ""
-"Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
-"translations of this article."
+"Please see the <a href=\"/server/standards/README.translations."
+"html\">Translations README</a> for information on coordinating and "
+"submitting translations of this article."
#. type: Content of: <div><p>
#: ../gnun/tests/conv.html:73
#, fuzzy
#| msgid ""
#| "Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, "
-#| "2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+#| "2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, "
+#| "Inc."
msgid ""
"Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
-"2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+"2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc."
msgstr ""
"Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
-"2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+"2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc."
#. type: Content of: <div><p>
#: ../gnun/tests/conv.html:75
Index: tests/conv.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/tests/conv.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/conv.html 9 Nov 2022 09:13:18 -0000 1.4
+++ tests/conv.html 7 Apr 2023 08:45:02 -0000 1.5
@@ -2,8 +2,8 @@
<!-- Parent-Version: 1.75 -->
<!-- Test file for HTML-to-PO conversion scripts.
-Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+ 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
This file is part of GNUnited Nations.
@@ -71,8 +71,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.</p>
+<p>Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
Index: tests/conv.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/tests/conv.pot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/conv.pot 9 Nov 2022 09:13:18 -0000 1.3
+++ tests/conv.pot 7 Apr 2023 08:45:02 -0000 1.4
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
#
# GNUnited Nations is free software: you can redistribute it and/or
@@ -26,7 +26,7 @@
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ascii\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <title>
@@ -66,7 +66,7 @@
#: ../gnun/tests/conv.html:73
msgid ""
"Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
-"2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+"2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc."
msgstr ""
#. type: Content of: <div><p>
Index: tests/conv.pr.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/tests/conv.pr.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/conv.pr.html 9 Nov 2022 09:13:18 -0000 1.4
+++ tests/conv.pr.html 7 Apr 2023 08:45:02 -0000 1.5
@@ -2,8 +2,8 @@
<!-- Parent-Version: 1.75 -->
<!-- Test file for HTML-to-PO conversion scripts.
-Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+ 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
This file is part of GNUnited Nations.
@@ -68,8 +68,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.</p>
+<p>Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
Index: tests/conv.pr.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/tests/conv.pr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/conv.pr.po 9 Nov 2022 09:13:18 -0000 1.3
+++ tests/conv.pr.po 7 Apr 2023 08:45:02 -0000 1.4
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
#
# This file is part of GNUnited Nations.
#
@@ -27,7 +27,7 @@
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ascii\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING\n"
#. type: Content of: <title>
@@ -65,11 +65,11 @@
#| "or suggestions can be sent to <a href=\"mailto:webmasters@gnu.org\";><"
#| "webmasters@gnu.org></a>."
msgid ""
-"Please send general FSF & GNU inquiries to <a href=\"mailto:gnu@gnu.org";
-"\"><gnu@gnu.org></a>. There are also <a href=\"/contact/\">other ways "
-"to contact</a> the FSF. Broken links and other corrections or suggestions "
-"can be sent to <a href=\"mailto:webmasters@gnu.org\";><webmasters@gnu."
-"org></a>."
+"Please send general FSF & GNU inquiries to <a href=\"mailto:gnu@gnu.";
+"org\"><gnu@gnu.org></a>. There are also <a href=\"/contact/\">other "
+"ways to contact</a> the FSF. Broken links and other corrections or "
+"suggestions can be sent to <a href=\"mailto:webmasters@gnu.org\";><"
+"webmasters@gnu.org></a>."
msgstr "translated contacts."
#. type: Content of: <div><p>
@@ -77,17 +77,17 @@
# || No change detected. The change might only be in amounts of spaces.
#, fuzzy
#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and submitting "
-#| "translations of this article."
+#| "Please see the <a href=\"/server/standards/README.translations."
+#| "html\">Translations README</a> for information on coordinating and "
+#| "submitting translations of this article."
msgid ""
-"Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
-"translations of this article."
+"Please see the <a href=\"/server/standards/README.translations."
+"html\">Translations README</a> for information on coordinating and "
+"submitting translations of this article."
msgstr ""
-"Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
-"translations of this article."
+"Please see the <a href=\"/server/standards/README.translations."
+"html\">Translations README</a> for information on coordinating and "
+"submitting translations of this article."
#. type: Content of: <div><p>
#: ../gnun/tests/conv.html:73
@@ -95,13 +95,14 @@
#, fuzzy
#| msgid ""
#| "Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, "
-#| "2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+#| "2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, "
+#| "Inc."
msgid ""
"Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
-"2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+"2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc."
msgstr ""
"Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
-"2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+"2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc."
#. type: Content of: <div><p>
#: ../gnun/tests/conv.html:75
Index: tests/convert
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/tests/convert,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/convert 9 Nov 2022 09:13:18 -0000 1.4
+++ tests/convert 7 Apr 2023 08:45:02 -0000 1.5
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -22,8 +22,8 @@
date_mask='....-..-.. ..:.\{5,7\}'
timestamp='1983-09-27 12:36-0500'
substitute_notices='2,3d;
-1a# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,\
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.\
+1a# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,\
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.\
#\
# This file is part of GNUnited Nations.\
#\
@@ -46,43 +46,54 @@
cat "${srcdir}/conv.pr.html" > conv.pr.html || exit 1
"${bindir}/gnun-preconvert" conv.pr.html "${srcdir}/conv.html" \
|| exit 1
-"${SED}" -i -e "$substitute_notices" -e '/^#: /d' -e '/^"Language: .*\\n"$/d'
-e \
- 's/^\("Content-Type:.*charset=\).*\\n"$/\1ascii\\n"/' -e \
+
+"${MSGCAT}" conv.pr.po \
+| "${SED}" -e "$substitute_notices" -e '/^#: /d' \
+ -e '/^"Language: .*\\n"$/d' -e \
+ 's/^\("Content-Type:.*charset=\).*\\n"$/\1UTF-8\\n"/' -e \
's/^\("Content-Transfer-Encoding:\) .*\\n"$/\1 ENCODING"/' -e \
's/^\("POT-Creation-Date:\) '"$date_mask"'\\n"$/\1 '"$timestamp"'\\n"/' \
- conv.pr.po
-diff "${srcdir}/preconv.pr.po" conv.pr.po || exit 1
-"${bindir}/gnun-preconvert" -e ascii conv.pr.html -- "${srcdir}/conv.html" \
+ > conv1.pr.po
+"${MSGCAT}" "${srcdir}/preconv.pr.po" > preconv.pr.po
+mv conv1.pr.po conv.pr.po
+diff preconv.pr.po conv.pr.po || exit 1
+"${bindir}/gnun-preconvert" -e UTF-8 conv.pr.html -- "${srcdir}/conv.html" \
|| exit 1
-cp conv.pr.po $HOME/c0.pr.po
-"${SED}" -i -e "$substitute_notices" -e '/^#: /d' -e '/^"Language: .*\\n"$/d'
-e \
+"${MSGCAT}" conv.pr.po > conv1.pr.po
+"${SED}" -e "$substitute_notices" -e '/^#: /d' -e '/^"Language: .*\\n"$/d' -e \
's/^\("Content-Transfer-Encoding:\) .*\\n"$/\1 ENCODING"/' -e \
's/^\("POT-Creation-Date:\) '"$date_mask"'\\n"$/\1 '"$timestamp"'\\n"/' \
- conv.pr.po
-diff "${srcdir}/preconv.pr.po" conv.pr.po || exit 1
-cat conv.pr.po > conv0.pr.po
+ < conv1.pr.po > conv.pr.po
+diff preconv.pr.po conv.pr.po || exit 1
+
+cp conv.pr.po conv2.pr.po
"${bindir}/gnun-merge-preconverted" conv.pr.po "${srcdir}/conv.pot"
-"${SED}" -i -e '/^"Language: .*\\n"$/d' -e \
+"${MSGCAT}" conv.pr.po \
+ | "${SED}" -e '/^"Language: .*\\n"$/d' -e \
's/^\("POT-Creation-Date:\) '"$date_mask"'\\n"$/\1 '"$timestamp"'\\n"/' \
-conv.pr.po
+ > conv1.pr.po
case "x$WDIFF" in
x ) file=conv-no-diffs.pr.po ;;
* ) file=conv.pr.po ;;
esac
-diff "${srcdir}/$file" conv.pr.po || exit 1
-rm conv.pr.html conv.pr.po
+"${MSGCAT}" "${srcdir}/$file" > conv0.pr.po
+
+diff conv0.pr.po conv1.pr.po || exit 1
+rm conv.pr.html
-"${bindir}/gnun-merge-preconverted" -d conv0.pr.po "${srcdir}/conv.pot"
+mv conv2.pr.po conv.pr.po
-cp conv0.pr.po $HOME
+"${bindir}/gnun-merge-preconverted" -d conv.pr.po "${srcdir}/conv.pot"
-"${SED}" -i -e '/^"Language: .*\\n"$/d' -e \
+"${MSGCAT}" conv.pr.po \
+ | "${SED}" -e '/^"Language: .*\\n"$/d' -e \
's/^\("POT-Creation-Date:\) '"$date_mask"'\\n"$/\1 '"$timestamp"'\\n"/' \
- conv0.pr.po
-diff "${srcdir}/conv-no-diffs.pr.po" conv0.pr.po || exit 1
+ > conv1.pr.po
+"${MSGCAT}" "${srcdir}/conv-no-diffs.pr.po" > conv0.pr.po
+diff conv0.pr.po conv1.pr.po || exit 1
-rm conv0.pr.po
+rm conv0.pr.po conv1.pr.po conv.pr.po
exit 0
Index: tests/preconv.pr.po
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/tests/preconv.pr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/preconv.pr.po 9 Nov 2022 09:13:18 -0000 1.4
+++ tests/preconv.pr.po 7 Apr 2023 08:45:02 -0000 1.5
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
#
# This file is part of GNUnited Nations.
#
@@ -27,7 +27,7 @@
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ascii\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <title>
@@ -70,10 +70,10 @@
#, fuzzy
msgid ""
"Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
-"2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+"2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc."
msgstr ""
"Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
-"2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc."
+"2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc."
#. type: Content of: <div><p>
#, fuzzy
- trans-coord/gnun/server/gnun ChangeLog Makefile...,
Ineiev <=