[PATCH] Changes to libc.pot for glibc core and ports.

[PATCH] Changes to libc.pot for glibc core and ports.

[Carlos O'Donell]

Community,

I've rebuild libc.pot and I'm getting it ready to send it to the translation
team for 2.16.

I was shocked to see that our libc.pot support *does not include* ports.
We lost the IA64 translations as they moved into ports. I see 6 translations
in ports that aren't being handled:

sysdeps/mips/dl-lookup.c:                            N_("relocation error"),
sysdeps/mips/dl-lookup.c:                            N_("symbol lookup error"),
sysdeps/unix/sysv/linux/ia64/makecontext.c:      fprintf (stderr, _("\
sysdeps/hppa/dl-fptr.c:               N_("cannot map pages for fdesc table"));
sysdeps/hppa/dl-fptr.c:               N_("cannot map pages for fptr table"));
sysdeps/hppa/dl-fptr.c:               N_("internal error: symidx out of range of fptr table"));

Luckily the MIPS and HPPA translations already exist in the main source tree.
The IA64 one doesn't which is why I noticed the problem since that translation
went away, and that's wrong.

I've fixed this by adjusting scripts/list-sources.sh to include ports. This
will need to be undone once we merge ports back. This will also effect the
TAGS target for emacs users.

I've trimmed the diff to the relevant and substantial changes.

Comments?

2012-06-15  Carlos O'Donell  <carlos_odonell@mentor.com>

	* scripts/list-sources.sh: Include ports.
	* po/libc.pot: Regenerate.

diff --git a/scripts/list-sources.sh b/scripts/list-sources.sh
index 53b6f7f..5944115 100755
--- a/scripts/list-sources.sh
+++ b/scripts/list-sources.sh
@@ -11,8 +11,12 @@ esac

 if [ -r .git/HEAD ]; then

-  exec ${GIT:-git} ls-files
-
+  # List files for glibc core.
+  ${GIT:-git} ls-files
+  # List files for glibc ports.
+  cd "$PWD/ports"
+  ${GIT:-git} ls-files | sed -e 's,^,ports/,g'
+  exit 0
 fi

 echo >&2 'Cannot list sources without some version control system in use.'
~~~
...
-"Project-Id-Version: libc 2.13.90\n"
-"POT-Creation-Date: 2011-05-31 00:06-0400\n"
+"Project-Id-Version: libc 2.15.90\n"
+"POT-Creation-Date: 2012-06-15 07:07-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
...
-#: debug/xtrace.sh:33 malloc/memusage.sh:27
-msgid "Try \\`%s --help' or `%s --usage' for more information.\\n"
+#: debug/xtrace.sh:32 elf/sotruss.ksh:57 elf/sotruss.ksh:68
+#: elf/sotruss.ksh:136 malloc/memusage.sh:26
+msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
 msgstr ""
...
-#: elf/ldconfig.c:1065
+#: elf/ldconfig.c:1064
 #, c-format
-msgid "Can't open configuration file %s"
+msgid "Warning: ignoring configuration file that cannot be opened: %s"
 msgstr ""
...
-#: elf/readelflib.c:35
+#: elf/pldd-xx.c:105
+#, c-format
+msgid "cannot find program header of process"
+msgstr ""
+
+#: elf/pldd-xx.c:110
+#, c-format
+msgid "cannot read program header"
+msgstr ""
+
+#: elf/pldd-xx.c:135
+#, c-format
+msgid "cannot read dynamic section"
+msgstr ""
+
+#: elf/pldd-xx.c:147
+#, c-format
+msgid "cannot read r_debug"
+msgstr ""
+
+#: elf/pldd-xx.c:167
+#, c-format
+msgid "cannot read program interpreter"
+msgstr ""
+
+#: elf/pldd-xx.c:196
+#, c-format
+msgid "cannot read link map"
+msgstr ""
+
+#: elf/pldd-xx.c:207
+#, c-format
+msgid "cannot read object name"
+msgstr ""
+
+#: elf/pldd.c:67
+msgid "List dynamic shared objects loaded into process."
+msgstr ""
+
+#: elf/pldd.c:71
+msgid "PID"
+msgstr ""
+
+#: elf/pldd.c:102
+#, c-format
+msgid "Exactly one parameter with process ID required.\n"
+msgstr ""
+
+#: elf/pldd.c:114
+#, c-format
+msgid "invalid process ID '%s'"
+msgstr ""
+
+#: elf/pldd.c:122
+#, c-format
+msgid "cannot open %s"
+msgstr ""
+
+#: elf/pldd.c:147
+#, c-format
+msgid "cannot open %s/task"
+msgstr ""
+
+#: elf/pldd.c:150
+#, c-format
+msgid "cannot prepare reading %s/task"
+msgstr ""
+
+#: elf/pldd.c:163
+#, c-format
+msgid "invalid thread ID '%s'"
+msgstr ""
+
+#: elf/pldd.c:174
+#, c-format
+msgid "cannot attach to process %lu"
+msgstr ""
+
+#: elf/pldd.c:246
+#, c-format
+msgid "cannot get information about process %lu"
+msgstr ""
+
+#: elf/pldd.c:259
+#, c-format
+msgid "process %lu is no ELF program"
+msgstr ""
+
+#: elf/readelflib.c:34
...
-#: elf/sotruss.ksh:33
+#: elf/sotruss.ksh:32
 #, sh-format
 msgid ""
 "Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]\n"
-"  -F, --from FROMLIST     trace calls from objects on FORMLIST\n"
-"  -T, --to TOLIST         trace calls to objects on TOLIST\n"
+"  -F, --from FROMLIST     Trace calls from objects on FROMLIST\n"
+"  -T, --to TOLIST         Trace calls to objects on TOLIST\n"
 "\n"
-"  -e, --exit              also show exits from the function calls\n"
-"  -f, --follow            trace child processes\n"
-"  -o, --output FILENAME   write output to FILENAME (or FILENAME.$PID in "
+"  -e, --exit              Also show exits from the function calls\n"
+"  -f, --follow            Trace child processes\n"
+"  -o, --output FILENAME   Write output to FILENAME (or FILENAME.$PID in "
 "case\n"
 "\t\t\t  -f is also used) instead of standard error\n"
 "\n"
-"      --help              print this help and exit\n"
-"      --version           print version information and exit"
+"  -?, --help              Give this help list\n"
+"      --usage             Give a short usage message\n"
+"      --version           Print program version"
 msgstr ""
...
-#: elf/sotruss.ksh:57 elf/sotruss.ksh:68 elf/sotruss.ksh:134
-msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
-msgstr ""
-
 #: elf/sotruss.ksh:62
 msgid "%s: option is ambiguous; possibilities:"
 msgstr ""
@@ -1096,257 +1183,259 @@ msgstr ""
 #: elf/sotruss.ksh:87
 msgid ""
 "Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n"
-"\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\\n"
+"\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\n"
+"\t    [--help] [--usage] [--version] [--]\n"
+"\t    EXECUTABLE [EXECUTABLE-OPTION...]\\n"
 msgstr ""
...
-#: nscd/connections.c:1039
+#: nscd/connections.c:986
+#, c-format
+msgid "register trace file %s for database %s"
+msgstr ""
+
+#: nscd/connections.c:1116
...
-#: nscd/nscd.c:101
+#: nscd/netgroupcache.c:77
+#, c-format
+msgid "Haven't found \"%s\" in netgroup cache!"
+msgstr ""
+
+#: nscd/netgroupcache.c:79
+#, c-format
+msgid "Reloading \"%s\" in netgroup cache!"
+msgstr ""
+
+#: nscd/netgroupcache.c:467
+#, c-format
+msgid "Haven't found \"%s (%s,%s,%s)\" in netgroup cache!"
+msgstr ""
+
+#: nscd/netgroupcache.c:470
+#, c-format
+msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!"
+msgstr ""
+
+#: nscd/nscd.c:116
...
-#: nscd/nscd.c:104
+#: nscd/nscd.c:120
+msgid "Do not fork, but otherwise behave like a daemon"
+msgstr ""
+
+#: nscd/nscd.c:121
...
-#: nss/makedb.c:70
-msgid "Create simple DB database from textual input."
+#: nss/makedb.c:123
+msgid "CHAR"
 msgstr ""

-#: nss/makedb.c:73
+#: nss/makedb.c:124
+msgid "Generated line not part of iteration"
+msgstr ""
+
+#: nss/makedb.c:129
+msgid "Create simple database from textual input."
+msgstr ""
+
+#: nss/makedb.c:132
...
-#: nss/makedb.c:142
+#: nss/makedb.c:228
 #, c-format
-msgid "No usable database library found."
+msgid "cannot open database file `%s'"
 msgstr ""

-#: nss/makedb.c:149
+#: nss/makedb.c:273
 #, c-format
-msgid "cannot open database file `%s': %s"
+msgid "no entries to be processed"
 msgstr ""

-#: nss/makedb.c:151
-msgid "incorrectly formatted file"
+#: nss/makedb.c:283
+#, c-format
+msgid "cannot create temporary file name"
 msgstr ""

-#: nss/makedb.c:331
-msgid "duplicate key"
+#: nss/makedb.c:305
+#, c-format
+msgid "cannot stat newly created file"
+msgstr ""
+
+#: nss/makedb.c:316
+#, c-format
+msgid "cannot rename temporary file"
 msgstr ""

-#: nss/makedb.c:337
+#: nss/makedb.c:529 nss/makedb.c:552
 #, c-format
-msgid "while writing database file"
+msgid "cannot create search tree"
+msgstr ""
+
+#: nss/makedb.c:558
+msgid "duplicate key"
 msgstr ""
...
-#: nss/makedb.c:368 nss/makedb.c:385
+#: nss/makedb.c:794
+#, c-format
+msgid "failed to write new database file"
+msgstr ""
+
+#: nss/makedb.c:807
 #, c-format
-msgid "while reading database"
+msgid "cannot stat database file"
 msgstr ""

-#: posix/getconf.c:1036
+#: nss/makedb.c:812
+#, c-format
+msgid "cannot map database file"
+msgstr ""
+
+#: nss/makedb.c:815
+#, c-format
+msgid "file not a database file"
+msgstr ""
+
+#: nss/makedb.c:866
+#, c-format
+msgid "cannot set file creation context for `%s'"
+msgstr ""
+
+#: ports/sysdeps/unix/sysv/linux/ia64/makecontext.c:62
+#, c-format
+msgid "makecontext: does not know how to handle more than 8 arguments\n"
+msgstr ""
+
+#: posix/getconf.c:1035
...
-#: sysdeps/mach/_strerror.c:57
+#: sysdeps/gnu/errlist.c:1469
+msgid "Memory page has hardware error"
+msgstr ""
+
+#: sysdeps/mach/_strerror.c:56
...
-#: sysdeps/unix/siglist.c:26
-msgid "Signal 0"
-msgstr ""
-
-#: sysdeps/unix/siglist.c:32
-msgid "IOT trap"
-msgstr ""
-
-#: sysdeps/unix/sysv/linux/i386/readelflib.c:49
+#: sysdeps/unix/sysv/linux/i386/readelflib.c:65
...
-#: sysdeps/unix/sysv/linux/ia64/makecontext.c:63
-#, c-format
-msgid "makecontext: does not know how to handle more than 8 arguments\n"
-msgstr ""
-
-#: sysdeps/unix/sysv/linux/lddlibc4.c:61
+#: sysdeps/unix/sysv/linux/lddlibc4.c:60
...
~~~

Cheers,
Carlos.
-- 
Carlos O'Donell
Mentor Graphics / CodeSourcery
carlos_odonell@mentor.com
carlos@codesourcery.com
+1 (613) 963 1026

Re: [PATCH] Changes to libc.pot for glibc core and ports.

[Roland McGrath]

That is technically not really kosher since nothing says the add-on has to
be under that name.  But since list-sources.sh is effectively only for
maintainer use I suppose it's OK.  But since it will be moot as soon as
we do the repo consolidation, maybe you should just do it by hand and not
fiddle the script.

Re: [PATCH] Changes to libc.pot for glibc core and ports.

[Carlos O'Donell]

On 6/15/2012 12:56 PM, Roland McGrath wrote:
> That is technically not really kosher since nothing says the add-on has to
> be under that name.  But since list-sources.sh is effectively only for
> maintainer use I suppose it's OK.  But since it will be moot as soon as
> we do the repo consolidation, maybe you should just do it by hand and not
> fiddle the script.

That's a good point, I'd just assumed that *everyone* symlinks it into the
tree as `ports', and that's all I've seen. You are right though that as a
maintainer you're expected to follow some documented practice and I've
added the assumption under "Regeneration" in the wiki.

How about something more robust like?

diff --git a/scripts/list-sources.sh b/scripts/list-sources.sh
index 53b6f7f..a7d7e34 100755
--- a/scripts/list-sources.sh
+++ b/scripts/list-sources.sh
@@ -11,8 +11,15 @@ esac

 if [ -r .git/HEAD ]; then

-  exec ${GIT:-git} ls-files
-
+  # List files for glibc core.
+  ${GIT:-git} ls-files
+  # List files for glibc ports.
+  ports="ports"
+  if [ -d "$PWD/$ports" ]; then
+    cd "$PWD/$ports"
+    ${GIT:-git} ls-files | sed -e "s,^,$ports/,g"
+  fi
+  exit 0
 fi

 echo >&2 'Cannot list sources without some version control system in use.'
---

I really hate doing this by hand and leaving no reproducible trace of
evidence showing anyone how this was done before.

Heaven forbid we don't get the merge done, but say it doesn't happen,
then I'd be happier with it just working (tm).

Joseph, as always, raised a great point on IRC, that ports shouldn't
really be contributing any translatable messages. Translations belong
at a higher level and in glibc core. Regardless of this point I don't
want to loose a translation, and the latter is a QoI issue that
should be independent of our global support for translations.

Cheers,
Carlos.
-- 
Carlos O'Donell
Mentor Graphics / CodeSourcery
carlos_odonell@mentor.com
carlos@codesourcery.com
+1 (613) 963 1026

Re: [PATCH] Changes to libc.pot for glibc core and ports.

[Roland McGrath]

> Joseph, as always, raised a great point on IRC, that ports shouldn't
> really be contributing any translatable messages. Translations belong
> at a higher level and in glibc core. 

Indeed.  I didn't bother to whine about that though it came immediately to
mind, because I'd long ago noted it and just muttered under my breath.

> Regardless of this point I don't want to loose a translation, and the
> latter is a QoI issue that should be independent of our global support
> for translations.

Or lose one, either.

Re: [PATCH] Changes to libc.pot for glibc core and ports.

[Andreas Schwab]

Since the message in ia64/makecontext.c is supposed to be dropped anyway
it wouldn't be a great loss.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH] Changes to libc.pot for glibc core and ports.

[Carlos O'Donell]

On 6/15/2012 1:27 PM, Roland McGrath wrote:
>> Joseph, as always, raised a great point on IRC, that ports shouldn't
>> really be contributing any translatable messages. Translations belong
>> at a higher level and in glibc core. 
> 
> Indeed.  I didn't bother to whine about that though it came immediately to
> mind, because I'd long ago noted it and just muttered under my breath.
> 
>> Regardless of this point I don't want to loose a translation, and the
>> latter is a QoI issue that should be independent of our global support
>> for translations.
> 
> Or lose one, either.
> 

I've checked in the libc.pot update along with the scripts change
that enables others to reproduce the same result.

2012-06-21  Carlos O'Donell  <carlos_odonell@mentor.com>

        * scripts/list-sources.sh: Scan PORTS for translations.
        * po/libc.pot: Regenerated.

diff --git a/scripts/list-sources.sh b/scripts/list-sources.sh
index 53b6f7f..528e971 100755
--- a/scripts/list-sources.sh
+++ b/scripts/list-sources.sh
@@ -11,8 +11,21 @@ esac

 if [ -r .git/HEAD ]; then

-  exec ${GIT:-git} ls-files
-
+  # List files for glibc core.
+  ${GIT:-git} ls-files
+  # List files for glibc ports.
+  ports="ports"
+  if [ -d "$PWD/$ports" ]; then
+    cd "$PWD/$ports"
+    ${GIT:-git} ls-files | sed -e "s,^,$ports/,g"
+  else
+    # We expect the glibc-ports directory to be symlinked as PORTS.
+    # The glibc release manager will run this script as part of libc.pot
+    # regeneration and should ensure the symlink to PORTS is setup.
+    echo >&2 "WARNING: No \"$ports\" directory found. Expected glibc-ports"\
+            "source directory to be symlinked as \"$ports\" directory."
+  fi
+  exit 0
 fi

 echo >&2 'Cannot list sources without some version control system in use.'