[Po4a-commits] "po4a/po/bin Makevars, 1.1, 1.2 POTFILES.in, 1.1, 1.2 po4a.pot, 1.72, 1.73"
Neil Williams
codehelp at alioth.debian.org
Thu Nov 12 22:02:17 UTC 2009
Update of /cvsroot/po4a/po4a/po/bin
In directory alioth:/tmp/cvs-serv24765/po/bin
Modified Files:
Makevars POTFILES.in po4a.pot
Log Message:
* Build.PL: OK, this is a hack but gettext really doesn't
like mixing shell and perl without one of the formats
having a file extension, so make a temporary po4a-build.sh
symlink which gets cleaned up later.
* Makefile: Clean up the temporary symlink.
* po/bin/Makevars: Let xgettext use the default Lang
now that the symlink solves the other confusion.
* po/bin/POTFILES.in: Get POTFILES to look at the symlink.
* po/bin/po4a.pot: Updated with new strings from po4a-build.
* share/po4a-build: Fix the string markup so that xgettext
finds all 14 strings.
Index: po4a.pot
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/po4a.pot,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- po4a.pot 7 Nov 2009 12:59:53 -0000 1.72
+++ po4a.pot 12 Nov 2009 22:02:14 -0000 1.73
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: po4a v0.36.6\n"
-"Report-Msgid-Bugs-To: po4a-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-11-07 13:51+0100\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: po4a at packages.debian.org\n"
+"POT-Creation-Date: 2009-11-12 21:51+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -34,6 +34,7 @@
msgid "List of valid formats:"
msgstr ""
+#. ."\n - ".gettext("bibtex: BibTex bibliography format.")
#: ../../lib/Locale/Po4a/Chooser.pm:61
msgid "dia: uncompressed Dia diagrams."
msgstr ""
@@ -46,6 +47,7 @@
msgid "guide: Gentoo Linux's xml documentation format."
msgstr ""
+#. ."\n - ".gettext("html: HTML documents (EXPERIMENTAL).")
#: ../../lib/Locale/Po4a/Chooser.pm:65
msgid "ini: .INI format."
msgstr ""
@@ -328,13 +330,13 @@
msgstr ""
#: ../../lib/Locale/Po4a/Po.pm:500 ../../po4a:1135
-#, perl-format
+#, c-format, perl-format
msgid "Can't copy %s to %s: %s."
msgstr ""
#: ../../lib/Locale/Po4a/Po.pm:505 ../../lib/Locale/Po4a/Po.pm:510
#: ../../po4a:1142
-#, perl-format
+#, c-format, perl-format
msgid "Can't move %s to %s: %s."
msgstr ""
@@ -543,7 +545,7 @@
msgstr ""
#: ../../lib/Locale/Po4a/TeX.pm:1025 ../../po4a:620
-#, perl-format
+#, c-format, perl-format
msgid "Can't open %s: %s"
msgstr ""
@@ -673,6 +675,8 @@
msgid "Addendum '%s' applied at the end of the file."
msgstr ""
+#. FYI, the document charset have to be determined *before* we see the first
+#. string to recode.
#: ../../lib/Locale/Po4a/TransTractor.pm:853
#: ../../lib/Locale/Po4a/TransTractor.pm:1037
#, perl-format
@@ -686,6 +690,8 @@
msgid "Can't create a temporary xml file: %s"
msgstr ""
+#. TODO: It will be hard to identify the location.
+#. => find a way to retrieve the reference.
#: ../../lib/Locale/Po4a/Xml.pm:208
#, perl-format
msgid ""
@@ -730,6 +736,7 @@
msgid "Bad attribute syntax"
msgstr ""
+#. Inform that this tag isn't translated in debug mode
#: ../../lib/Locale/Po4a/Xml.pm:1640
#, perl-format
msgid "Content of tag %s excluded: %s"
@@ -751,64 +758,58 @@
msgstr ""
#: ../../po4a:517 ../../po4a:521
-#, perl-format
+#, c-format
msgid "Invalid %s. Directory %s does not exist."
msgstr ""
#: ../../po4a:554 ../../po4a:772
-#, perl-format
+#, c-format
msgid "Unparsable argument '%s' (%s)."
msgstr ""
#: ../../po4a:588
-#, perl-format
+#, c-format
msgid "failed to execute '%s': %s."
msgstr ""
-#: ../../po4a:592
-#, perl-format
-msgid "'%s' died with signal %d, with coredump."
-msgstr ""
-
-#: ../../po4a:596
-#, perl-format
-msgid "'%s' died with signal %d, without coredump."
+#: ../../po4a:592 ../../po4a:596
+#, c-format
+msgid "'%s' died with signal %d, "
msgstr ""
#: ../../po4a:601
-#, perl-format
+#, c-format
msgid "'%s' exited with value %d."
msgstr ""
#: ../../po4a:605
-#, perl-format
+#, c-format
msgid "Error: %s"
msgstr ""
#: ../../po4a:611 ../../po4a-gettextize:224 ../../po4a-normalize:150
#: ../../po4a-translate:204 ../../po4a-translate:205 ../../po4a-updatepo:219
-#: ../../scripts/msguntypot:167 ../../scripts/msguntypot:169
-#, perl-format
+#, c-format
msgid "File %s does not exist."
msgstr ""
#: ../../po4a:633
-#, perl-format
+#, c-format
msgid "Unknown variable: %s"
msgstr ""
#: ../../po4a:642
-#, perl-format
+#, c-format
msgid "Syntax error: %s"
msgstr ""
#: ../../po4a:669 ../../po4a:681
-#, perl-format
+#, c-format
msgid "'%s' redeclared"
msgstr ""
#: ../../po4a:674
-#, perl-format
+#, c-format
msgid "Unparsable argument '%s'."
msgstr ""
@@ -821,30 +822,28 @@
msgstr ""
#: ../../po4a:697
-#, perl-format
+#, c-format
msgid "'%s' is not a directory"
msgstr ""
#: ../../po4a:701
-#, perl-format
+#, c-format
msgid "Cannot list the '%s' directory"
msgstr ""
#: ../../po4a:712
-#, perl-format
+#, c-format
msgid "too many POT files: %s %s"
msgstr ""
#: ../../po4a:722
-#, perl-format
+#, c-format
msgid "no PO files found in %s"
msgstr ""
#: ../../po4a:730
-#, perl-format
-msgid ""
-"The '%s' master file was specified earlier in the configuration file. This "
-"may cause problems with options."
+#, c-format
+msgid "The '%s' master file was specified earlier in the "
msgstr ""
#: ../../po4a:776
@@ -852,12 +851,12 @@
msgstr ""
#: ../../po4a:783
-#, perl-format
+#, c-format
msgid "Translation of %s in %s redefined"
msgstr ""
#: ../../po4a:809
-#, perl-format
+#, c-format
msgid "Unparsable command '%s'."
msgstr ""
@@ -866,7 +865,7 @@
msgstr ""
#: ../../po4a:828
-#, perl-format
+#, c-format
msgid "Cannot parse option line (missing >%s<?): %s"
msgstr ""
@@ -875,77 +874,77 @@
msgstr ""
#: ../../po4a:896 ../../po4a:1058 ../../po4a-updatepo:247
-#, perl-format
+#, c-format
msgid "Updating %s:"
msgstr ""
#: ../../po4a:899 ../../po4a:1068 ../../po4a-updatepo:255
-#, perl-format
+#, c-format
msgid "Creating %s:"
msgstr ""
#: ../../po4a:963 ../../po4a:999 ../../po4a:1096 ../../po4a-updatepo:229
-#, perl-format
+#, c-format
msgid "Can't create a temporary pot file: %s"
msgstr ""
#: ../../po4a:976
-#, perl-format
+#, c-format
msgid " (%d entries)"
msgstr ""
#: ../../po4a:1008 ../../po4a:1122
-#, perl-format
+#, c-format
msgid "Can't create directory '%s': %s"
msgstr ""
-#: ../../po4a:1030 ../../scripts/msguntypot:204
-#, perl-format
+#: ../../po4a:1030
+#, c-format
msgid "Can't create a temporary po file: %s"
msgstr ""
#: ../../po4a:1206
-#, perl-format
+#, c-format
msgid "%s doesn't need to be updated."
msgstr ""
#: ../../po4a:1254
-#, perl-format
+#, c-format
msgid "Discard %s (%s of %s strings; only %s%% translated; need %s%%)."
msgstr ""
#: ../../po4a:1263
-#, perl-format
+#, c-format
msgid "Timestamp %s created."
msgstr ""
#: ../../po4a:1277
-#, perl-format
+#, c-format
msgid "Timestamp %s removed."
msgstr ""
#: ../../po4a:1290
-#, perl-format
+#, c-format
msgid "Addendum %s does NOT apply to %s (translation discarded)."
msgstr ""
#: ../../po4a:1305
-#, perl-format
+#, c-format
msgid "%s is %s%% translated (%s strings)."
msgstr ""
#: ../../po4a:1308 ../../po4a-translate:236
-#, perl-format
+#, c-format
msgid "%s is %s%% translated (%s of %s strings)."
msgstr ""
#: ../../po4a-translate:242
-#, perl-format
+#, c-format
msgid "Discard the translation of %s (only %s%% translated; need %s%%)."
msgstr ""
#: ../../po4a-translate:249
-#, perl-format
+#, c-format
msgid "Discard the translation of %s (addendum %s does not apply)."
msgstr ""
@@ -961,39 +960,98 @@
msgid "done."
msgstr ""
-#: ../../po4a-updatepo:251 ../../scripts/msguntypot:213
-#, perl-format
+#: ../../po4a-updatepo:251
+#, c-format
msgid "Error while running msgmerge: %s"
msgstr ""
#: ../../po4a-updatepo:258
-#, perl-format
+#, c-format
msgid "Error while copying the po file: %s"
msgstr ""
-#: ../../scripts/msguntypot:166 ../../scripts/msguntypot:168
-#, perl-format
-msgid "Mandatory argument '%s' missing."
+#. print out help message
+#: ../../po4a-build.sh:89
+#, sh-format
+msgid ""
+"\n"
+"po4a-build - po4a frontend\n"
+"\n"
+"Syntax: po4a-build\n"
+" po4a-build --pot-only\n"
+"\n"
+"Commands:\n"
+"-?|-h|--help|-version: print this help message and exit\n"
+"--pot-only: only create the POT file\n"
+"\n"
+"Options:\n"
+"-f|--file FILE: po4a-build.conf config file path\n"
+"\n"
msgstr ""
-#: ../../scripts/msguntypot:177
-#, perl-format
-msgid ""
-"The new and old pot files have different amount of strings (%d != %d). "
-"Something's seriously wrong here."
+#: ../../po4a-build.sh:122
+#, sh-format
+msgid "Unrecognised command: $com"
msgstr ""
-#: ../../scripts/msguntypot:195
-#, perl-format
-msgid "Found %d modified entries."
+#. without config, there's nothing to do.
+#: ../../po4a-build.sh:130
+#, sh-format
+msgid "Cannot find config file! '$FILE'"
msgstr ""
-#: ../../scripts/msguntypot:209
-#, perl-format
-msgid "Handling %s"
+#. test
+#: ../../po4a-build.sh:185 ../../po4a-build.sh:229
+#, sh-format
+msgid "Internal po4a from $OURS being used instead of /usr/bin/"
msgstr ""
-#: ../../scripts/msguntypot:234
-#, perl-format
-msgid "Modified %d entries in %d files."
+#: ../../po4a-build.sh:239
+#, sh-format
+msgid "Processing untranslated files for $X (1). . ."
+msgstr ""
+
+#: ../../po4a-build.sh:245
+#, sh-format
+msgid "Processing untranslated files for $X3 (3). . ."
+msgstr ""
+
+#: ../../po4a-build.sh:256
+#, sh-format
+msgid "Processing untranslated files for $file (1) . . ."
+msgstr ""
+
+#: ../../po4a-build.sh:263
+#, sh-format
+msgid "Processing untranslated files for $name (3) . . ."
+msgstr ""
+
+#: ../../po4a-build.sh:270
+#, sh-format
+msgid "Processing untranslated files for $file (7) . . ."
+msgstr ""
+
+#: ../../po4a-build.sh:290
+#, sh-format
+msgid "Processing $l translations for $X (1). . ."
+msgstr ""
+
+#: ../../po4a-build.sh:298
+#, sh-format
+msgid "Processing $l translations for $X3 (3). . ."
+msgstr ""
+
+#: ../../po4a-build.sh:311
+#, sh-format
+msgid "Processing $l translations for $file (1). . ."
+msgstr ""
+
+#: ../../po4a-build.sh:321
+#, sh-format
+msgid "Processing $l translations for $name (3). . ."
+msgstr ""
+
+#: ../../po4a-build.sh:330
+#, sh-format
+msgid "Processing $l translations for $file (7). . ."
msgstr ""
Index: POTFILES.in
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/POTFILES.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POTFILES.in 12 Nov 2009 20:29:53 -0000 1.1
+++ POTFILES.in 12 Nov 2009 22:02:14 -0000 1.2
@@ -12,7 +12,9 @@
../lib/Locale/Po4a/Xhtml.pm
../lib/Locale/Po4a/Xml.pm
../po4a
+../po4a-gettextize
+../po4a-normalize
../po4a-translate
../po4a-updatepo
../scripts/msguntypot
-../share/po4a-build
+../po4a-build.sh
Index: Makevars
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/Makevars,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makevars 12 Nov 2009 20:29:53 -0000 1.1
+++ Makevars 12 Nov 2009 22:02:14 -0000 1.2
@@ -8,7 +8,7 @@
top_builddir = ../..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = -L Perl -L Shell --from-code=iso-8859-1
+XGETTEXT_OPTIONS = --from-code=iso-8859-1 --keyword=eval_gettext --keyword=gettext
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
More information about the Po4a-commits
mailing list