trans-coord-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

trans-coord/gnun/server/gnun AUTHORS ChangeLog ...


From: Pavel Kharitonov
Subject: trans-coord/gnun/server/gnun AUTHORS ChangeLog ...
Date: Sat, 31 Aug 2013 14:09:42 +0000

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       13/08/31 14:09:42

Modified files:
        gnun/server/gnun: AUTHORS ChangeLog GNUmakefile Makefile.am NEWS 
                          README config.mk.in make-prototype.awk 
        gnun/server/gnun/doc: gnun.texi web-trans.texi 

Log message:
        Exclude generic.*.html and *.m4 files from build process.
        
        * config.mk.in: Remove `M4' variable.
        * expand-m4-includes.in: Remove script.
        * GNUmakefile (insert-ssi-vars): Use additional parameter to
        distinguish between the generated file and its URL.
        (generate-html): Don't invoke `insert-ssi-vars'.
        (post-generate-html, generic-var, generic-rules):
        Remove functions.
        ($(template-dir)/po/whatsnew.%.html): Don't process m4_includes;
        output directly to $@, witout whatsnew.$*.m4; don't use $(M4).
        (output-article-html): Likewise.
        (vcs-add-always): Remove `generic.*.html' from dependencies.
        (article-rules): Likewise; move `generate-html' call
        to `output-article-html'.
        (localized-includes): Add `server/generic'.
        * make-prototype.awk: Don't issue `m4_include' instruction
        for `generic.html'.
        * Makefile.am: Remove `expand-m4-includes'.
        * doc/web-trans.texi (SSI): Add `server/generic.html' (from
        gnun.texi).
        * doc/gnun.texi (Usage): Remove `generic.LANG.html' from menu.
        (generic.LANG.html): Remove node.
        (Runtime Variables) <VCS=yes>: Update description.
        (Files and Directories): Exclude *.m4 and
        server/gnun/generic.*.html files from diagram.
        * AUTHORS:
        * NEWS: Update.
        * README: Minor clarifications.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/AUTHORS?cvsroot=trans-coord&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.380&r2=1.381
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/README?cvsroot=trans-coord&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk.in?cvsroot=trans-coord&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/make-prototype.awk?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/web-trans.texi?cvsroot=trans-coord&r1=1.56&r2=1.57

Patches:
Index: AUTHORS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/AUTHORS,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- AUTHORS     19 Aug 2013 05:23:34 -0000      1.16
+++ AUTHORS     31 Aug 2013 14:09:41 -0000      1.17
@@ -15,7 +15,7 @@
     Add add-fuzzy-diff.in, copy-msgid.in, diff-page-head.html,
         diff-page-tail.html, diff-po.in,
         dtd/html5.dtd (based on W3C DTD),
-        expand-m4-includes.in, expand-ssi.awk,
+        expand-ssi.awk,
         languages.txt (compiled from www.gnu.org pages),
         gnun-add-fuzzy-diff, gnun-diff-po.in,
         gnun-init-po.in, gnun-report.in, make-prototype.awk,

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -b -r1.380 -r1.381
--- ChangeLog   30 Aug 2013 06:28:16 -0000      1.380
+++ ChangeLog   31 Aug 2013 14:09:41 -0000      1.381
@@ -1,3 +1,35 @@
+2013-08-31  Pavel Kharitonov  <address@hidden>
+
+       Exclude generic.*.html and *.m4 files from build process.
+       
+       * config.mk.in: Remove `M4' variable.
+       * expand-m4-includes.in: Remove script.
+       * GNUmakefile (insert-ssi-vars): Use additional parameter to
+       distinguish between the generated file and its URL.
+       (generate-html): Don't invoke `insert-ssi-vars'.
+       (post-generate-html, generic-var, generic-rules):
+       Remove functions.
+       ($(template-dir)/po/whatsnew.%.html): Don't process m4_includes;
+       output directly to $@, witout whatsnew.$*.m4; don't use $(M4).
+       (output-article-html): Likewise.
+       (vcs-add-always): Remove `generic.*.html' from dependencies.
+       (article-rules): Likewise; move `generate-html' call
+       to `output-article-html'.
+       (localized-includes): Add `server/generic'.
+       * make-prototype.awk: Don't issue `m4_include' instruction
+       for `generic.html'.
+       * Makefile.am: Remove `expand-m4-includes'.
+       * doc/web-trans.texi (SSI): Add `server/generic.html' (from
+       gnun.texi).
+       * doc/gnun.texi (Usage): Remove `generic.LANG.html' from menu.
+       (generic.LANG.html): Remove node.
+       (Runtime Variables) <VCS=yes>: Update description.
+       (Files and Directories): Exclude *.m4 and
+       server/gnun/generic.*.html files from diagram.
+       * AUTHORS:
+       * NEWS: Update.
+       * README: Minor clarifications.
+
 2013-08-30  Pavel Kharitonov  <address@hidden>
         
        Fix documentation issues reported by Thérèse Godefroy.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- GNUmakefile 30 Aug 2013 06:28:18 -0000      1.163
+++ GNUmakefile 31 Aug 2013 14:09:41 -0000      1.164
@@ -103,7 +103,8 @@
                      server/head-include-2 server/banner \
                      server/html5-header server/html5-head-include-1 \
                      server/body-include-1 server/body-include-2 \
-                     server/footer server/footer-short server/footer-min \
+                     server/footer server/generic \
+                     server/footer-short server/footer-min \
                      $(extra-templates) $(optional-templates)
 
 # Issue a command to substitute localized includes in a HTML file.
@@ -117,15 +118,15 @@
 # a HTML file produced with make-proto; template files don't contain
 # the comment about being automatically generated by GNUN, so they are
 # not affected.
-# Usage: $(call insert-ssi-vars,file.$(lang).html)
+# Usage: $(call 
insert-ssi-vars,file.$(lang).html.${draft-suffix},file.$(lang).html)
 define insert-ssi-vars
+file=$(2); file_base=$$$${file%.*.html}; \
+file_base=$$$${file_base#${rootdir}}; \
 $(SED) --in-place \
   's%<!-- This file is automatically generated by GNUnited Nations! -->%&\n\
 <!--#set var="ENGLISH_PAGE"\
-value="$(strip\
-  $(subst /po/,/,$(subst ${rootdir},,\
-  $(basename $(basename \
-$(1)))$(if $(findstring no, $(MULTIVIEWS)),,.en))).html)" -->\n%' $(1)
+value="'"$$$${file_base}"'$(if $(findstring no, \
+                             $(MULTIVIEWS)),,.en).html" -->\n%' $(1)
 endef
 
 ### Special variables for the `www' master templates ###
@@ -491,7 +492,6 @@
 $(call update-po,$(2),$(if $(4),$(4),$(2:.$(1).po=.pot)),$(1)); \
 $(PO4A_TRANSLATE) $(PO4A-XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) \
   --master $$< --po $(2) --localized $(3); \
-  $(call insert-ssi-vars,$(3)); \
   $(call substitute-localized-includes,$(1)) $(3)
 endef
 
@@ -501,15 +501,6 @@
   ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' $(1)
 endef
 
-# Prepare the intermediate file $(1) generated by `generate-html' for $(M4).
-# $(2) is language code.
-define post-generate-html
-$(SED) --in-place \
-  "s/\(<gnun>m4_include(\`.*\)\([.]html')<\/gnun>\)/\1.$(2)\2/g" $(1); \
-  $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" $(1); \
-  $(call merge-empty-lines,$(1))
-endef
-
 comma := ,
 # Generate diff file against latest translated revision
 # when available.
@@ -765,23 +756,6 @@
                         PO=$(1).po ; $$(touch-hook))
 endef
 
-# Ensure that generic.LANG.html is always present for articles' generation.
-
-define generic-var
-GENERIC_LINGUAS += $(1)
-endef
-
-define generic-rules
-generic.$(1).html:
-       $$(addfile)
-endef
-
-$(foreach h-lang,$(TEMPLATE_LINGUAS),$(eval $(call generic-var,$(h-lang))))
-$(foreach po-base,$(ALL_POS_BASE), \
-  $(eval $(call generic-var,$(subst .,,$(suffix $(po-base))))))
-$(foreach g-lang,$(sort $(GENERIC_LINGUAS)), \
-  $(eval $(call generic-rules,$(g-lang))))
-
 ### Specific rules for extra templates ###
 # Essentially duplicate rules for templates, but define per-template
 # rules rather than use static patterns
@@ -951,21 +925,14 @@
        $(RM) $(template-dir)/po/whatsnew.$*.po1
        $(PO4A_TRANSLATE) $(PO4A-XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) \
            --master $< --po $(template-dir)/po/whatsnew.$*.po \
-           --localized $(template-dir)/po/whatsnew.$*.m4
-       $(SED) --in-place \
-         "s/\(<gnun>m4_include(\`.*\)\([.]html')<\/gnun>\)/\1.$*\2/g" \
-         $(template-dir)/po/whatsnew.$*.m4
-       $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" \
-         $(template-dir)/po/whatsnew.$*.m4
+           --localized $@
+       $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" $@
        $(SED) --in-place \
-         ':egin;N;$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' \
-         $(template-dir)/po/whatsnew.$*.m4
-       $(call substitute-localized-includes,$*) \
-         $(template-dir)/po/whatsnew.$*.m4
+         ':egin;N;$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g'  $@
+       $(call substitute-localized-includes,$*) $@
        $(SED) --in-place \
          "s/\(<!--#include virtual=\".*whatsnew\)\(.include\" -->\)/\1.$*\2/g" 
\
-         $(template-dir)/po/whatsnew.$*.m4
-       $(M4) $(template-dir)/po/whatsnew.$*.m4 > $@
+         $@
        $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(transl-addr) \
          $@ || (PO=$(template-dir)/po/whatsnew.$*.po ; $(touch-hook))
 # Copy the target where it belongs.
@@ -999,7 +966,10 @@
 
 # Produce article HTML file and validate it if needed.
 define output-article-html
-$(M4) $(1).m4 > address@hidden \
+$(call generate-html,$(2),$(1).po,address@hidden); \
+$(call insert-ssi-vars,address@hidden,$$@); \
+$(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" address@hidden; \
+$(call merge-empty-lines,address@hidden) \
 $(if $(findstring $(basename $(1)),$(no-validate-items)), , \
   && $(call validate-article,$(1)))
 endef
@@ -1018,8 +988,7 @@
        $$(fixperm)
        $(call update-po,$$@,$$<,$(2))
 
-$(subst /po/,/,$(1).html): $(basename $(1)).proto \
-                          $(1).po generic.$(2).html
+$(subst /po/,/,$(1).html): $(basename $(1)).proto $(1).po
 # If the server templates are missing, assume the worst and exit with
 # an error to prevent the generation of broken translations -- even if
 # validation is not enforced there will be Apache error.  The case
@@ -1036,8 +1005,6 @@
        exit 1
 endif
        $$(call check-po,$(1).po) || (touch $(1).po; exit 1)
-       $(call generate-html,$(2),$(1).po,$(1).m4)
-       $(call post-generate-html,$(1).m4,$(2))
        -$(RM) address@hidden
 # If GRACE is not defined, which is the usual case for local manual
 # builds, update the target and validate the result.
@@ -1094,7 +1061,7 @@
 # WARNING: This is implemented just in case, rarely used and probably broken.
 ifneq (,$(findstring always,$(VCS)))
 vcs-add-always: $(template-translated) $(ALL_POTS) \
-               $(articles-translated) $(gnunews) $(wildcard generic.*.html) \
+               $(articles-translated) $(gnunews) \
                substitute-localized-urls
          -$(vcs) add $(filter-out substitute-localized-urls,$^)
 else
@@ -1175,7 +1142,7 @@
 ifndef TEAM
        $(error Please specify a language code, for example TEAM=fr)
 endif
-ifeq (,$(call find-language,$(TEAM),$(sort $(GENERIC_LINGUAS))))
+ifeq (,$(call find-language,$(TEAM),$(sort $(TEMPLATE_LINGUAS))))
        @echo "There are no translations for language $(TEAM)."
 else
 ifeq (,${priority-articles}${important-articles}${important-directories})
@@ -1190,7 +1157,7 @@
                          ${important-dir-htmls})
        $(call report-pos,${other-pos},Other Translations,${other-htmls})
 endif #!eq (,${priority-articles}${important-articles}${important-directories})
-endif # !eq (,$(call find-language,$(TEAM),$(sort $(GENERIC_LINGUAS))))
+endif # !eq (,$(call find-language,$(TEAM),$(sort $(TEMPLATE_LINGUAS))))
 
 # Special target to compile report about number of outdated translations
 # for all languages.

Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Makefile.am 21 Mar 2013 16:25:10 -0000      1.35
+++ Makefile.am 31 Aug 2013 14:09:41 -0000      1.36
@@ -38,7 +38,7 @@
 endif
 
 noinst_SCRIPTS = stamp-config.mk
-pkglibexec_SCRIPTS = copy-msgid expand-m4-includes update-localized-urls \
+pkglibexec_SCRIPTS = copy-msgid update-localized-urls \
  validate-html-notify
 
 if HAVE_WDIFF
@@ -64,7 +64,6 @@
        -e 's|@address@hidden|$(pkglibexecdir)|g' \
        -e 's|@address@hidden|$(AWK)|g' \
        -e 's|@address@hidden|$(GREP)|g' \
-       -e 's|@address@hidden|$(pkglibexecdir)/expand-m4-includes|g' \
        -e 's|@address@hidden|$(MSGATTRIB)|g' \
        -e 's|@address@hidden|$(MSGCAT)|g' \
        -e 's|@address@hidden|$(MSGEXEC)|g' \
@@ -73,7 +72,7 @@
        -e 's|@address@hidden|$(SED)|g' \
        -e 's|@address@hidden|$(WDIFF)|g'
 
-add-fuzzy-diff copy-msgid expand-m4-includes gnun-add-fuzzy-diff \
+add-fuzzy-diff copy-msgid gnun-add-fuzzy-diff \
 gnun-diff-po gnun-init-po gnun-merge-preconverted gnun-report \
 gnun-validate-html diff-po.awk update-localized-urls \
 validate-html-notify: Makefile
@@ -89,7 +88,6 @@
 
 add-fuzzy-diff: $(srcdir)/add-fuzzy-diff.in
 copy-msgid: $(srcdir)/copy-msgid.in
-expand-m4-includes: $(srcdir)/expand-m4-includes.in
 gnun-add-fuzzy-diff: $(srcdir)/gnun-add-fuzzy-diff.in
 gnun-diff-po: $(srcdir)/gnun-diff-po.in
 gnun-init-po: $(srcdir)/gnun-init-po.in
@@ -111,14 +109,14 @@
 dist_sysconf_DATA = gnun.conf
 dist_pkgdata_DATA = GNUmakefile
 
-EXTRA_DIST = add-fuzzy-diff.in copy-msgid.in expand-m4-includes.in \
+EXTRA_DIST = add-fuzzy-diff.in copy-msgid.in \
             gnun-add-fuzzy-diff.in gnun-diff-po.in \
             gnun-init-po.in gnun-merge-preconverted.in \
             gnun-report.in gnun-validate-html.in \
             diff-po.awk.in update-localized-urls.in \
             validate-html-notify.in
 
-CLEANFILES = add-fuzzy-diff copy-msgid expand-m4-includes gnun-add-fuzzy-diff \
+CLEANFILES = add-fuzzy-diff copy-msgid gnun-add-fuzzy-diff \
             gnun-diff-po gnun-init-po gnun-merge-preconverted gnun-report \
             gnun-validate-html diff-po.awk \
             update-localized-urls validate-html-notify \

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- NEWS        30 Aug 2013 06:28:18 -0000      1.90
+++ NEWS        31 Aug 2013 14:09:41 -0000      1.91
@@ -21,6 +21,9 @@
 
 *** The support of `sync' target in GNUmakefile is dropped.
 
+*** The `generic.LANG.html' files are replaced with SSI, which
+    enabled GNUN to avoid intermediate *.m4 files.
+
 ** Bugs fixed in 0.8.
 
 *** `gnun-diff-po' didn't process empty comments correctly.

Index: README
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/README,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- README      19 Aug 2013 05:23:34 -0000      1.12
+++ README      31 Aug 2013 14:09:41 -0000      1.13
@@ -29,19 +29,19 @@
 * GNU Make >= 3.81 (prereleases of 3.81 also work)
   http://www.gnu.org/software/make
 
-* GNU Sed (other `sed' implementations are not acceptable)
+* GNU Sed (other `sed' implementations won't do)
   http://www.gnu.org/software/sed
 
 * GNU Gettext (>= 0.16)
   http://www.gnu.org/software/gettext
 
-* GNU Awk (other `awk' implementations are untested)
+* GNU Awk (other `awk' implementations are not supported)
   http://www.gnu.org/software/gawk
 
-* Po4a >= 0.34
+* Po4a >= 0.34 (used to generate HTML pages)
   from http://po4a.alioth.debian.org
 
-* GNU wdiff (needed for gnun-add-fuzzy-diff)
+* GNU wdiff (optionally used to produce differences)
   http://www.gnu.org/software/wdiff
 
 * Libxml2 (>= 2.6.24, needed for HTML validation only)

Index: config.mk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- config.mk.in        19 Aug 2013 05:23:35 -0000      1.10
+++ config.mk.in        31 Aug 2013 14:09:41 -0000      1.11
@@ -25,8 +25,6 @@
 SED            := @SED@
 GREP           := @GREP@
 EGREP          := @EGREP@
-# We actually use our sed script rather than a real m4.
-M4             := @M4@
 MSGATTRIB      := @MSGATTRIB@
 MSGCAT         := @MSGCAT@
 MSGFMT         := @MSGFMT@

Index: make-prototype.awk
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/make-prototype.awk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- make-prototype.awk  4 Oct 2012 14:43:18 -0000       1.1
+++ make-prototype.awk  31 Aug 2013 14:09:41 -0000      1.2
@@ -1,6 +1,6 @@
 # make-prototype.awk: generate `prototype' HTML.
 
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2013 Free Software Foundation, Inc.
 
 # This file is part of GNUnited Nations.
 
@@ -24,9 +24,6 @@
 
 # Program's name to prepend error messages.
   my_name = "make-prototype.awk: "
-# Default name of file with `generic' message.
-  if(generic_file == "")
-    generic_file = "generic.html"
 
   if (!match(text, /(<title>.*)(<\/div>.*<div id="footer">)(.*)/, parts))
     {
@@ -58,6 +55,5 @@
 "\n" \
 "<div class=\"translators-credits\">\n" \
 "<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->\n" \
-"*GNUN-SLOT: TRANSLATOR'S CREDITS*</div>\n" \
-"<gnun>m4_include(`" generic_file "')</gnun> " tail[2]
+"*GNUN-SLOT: TRANSLATOR'S CREDITS*</div>\n\n\n " tail[2]
 }

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- doc/gnun.texi       30 Aug 2013 06:28:19 -0000      1.89
+++ doc/gnun.texi       31 Aug 2013 14:09:42 -0000      1.90
@@ -390,8 +390,6 @@
 * Runtime Variables::   Variables to control the build process.
 * Special Targets::     Targets that are not built by default.
 * Main Variables::      Specifying what to build.
-* generic.LANG.html::   Specifying information that will propagate in
-                          every translation in a certain language.
 * languages.txt::       Specifying canonical names for languages.
 * Compendia::           Using translation memory.
 * Sitemap::             Specifics of sitemap generation.
@@ -488,10 +486,8 @@
 manually (or via cron) to take care of effectively adding them to the
 public repository.  @xref{triggers}, for a short explanation.} These are
 any POT files, if they are generated for the first time, and the
-translated articles (@address@hidden) in HTML format.  In
-addition, if there is no @file{server/gnun/address@hidden file
-for the specific language an article is being generated, an empty file
-will be added.  Finally, any missing PO and their HTML counterparts of
+translated articles (@address@hidden) in HTML format.  Finally,
+any missing PO and their HTML counterparts of
 the server templates will be added, computed on the basis of the
 @code{extra-templates} and @code{optional-templates} variables.
 
@@ -909,36 +905,6 @@
 GNUN doesn't maintain its translations.
 @end table
 
address@hidden generic.LANG.html
address@hidden The @address@hidden File
address@hidden team information
address@hidden generic notice, translations
-
-The files @file{server/gnun/address@hidden are special: if
-no such file exists for your language, an empty file will be created
-(and added to the repository if specified @code{VCS=yes}).  This file
-is optional, and should contain a short message in your native
-language, ideally providing more information about the translation
-team or where to report bugs.  For example:
-
address@hidden
-<p>To join the Fooish translation team, see <a
-href="http://gnu.org/@/server/@/standards/@/translations/@/foo";>the
-Foo team homepage</a>.</p>
address@hidden example
-
-The contents of @address@hidden is injected right after
-the translators' credits, if any, and before the timestamp.  It should
-be valid HTML markup.
-
-When you modify this file, for example, adding a message to the
-existing empty file or changing a URL, such modification will affect
address@hidden articles of the language @var{lang} in
address@hidden@var{lang}.html}.  The next time a build occurs, all
-translations of the language code @var{lang} (i.e. all
address@hidden@var{lang}.html}, including the homepage), will be modified to
-include the contents of this special file.
-
 @node languages.txt
 @section The @file{languages.txt} File
 
@@ -2118,7 +2084,6 @@
   |
   +--gnu/
   |   |
-  |   |
   |   +--linux-and-gnu.html #
   |   address@hidden @@
   |   +--manifesto.html #
@@ -2131,13 +2096,12 @@
   address@hidden @@             +--manifesto.pot @@
   +--planetfeeds.html #/@@         +--manifesto.proto * @@
   address@hidden @@      +--manifesto.translist @@
-  +--po/                          address@hidden * @@
+  +--po/                          |
   |  |                            address@hidden @@
   |  +--home.pot @@                address@hidden @@
   |  +--home.proto * @@            address@hidden %
   |  +--home.translist @@          address@hidden
   |  address@hidden %
-  |  address@hidden * @@
   |  address@hidden @@
   |  address@hidden @@
   |  +--planetfeeds.proto * @@
@@ -2153,12 +2117,12 @@
   |  address@hidden @@      +--config.mk * #
   |  +--po/                      +--gnun.mk #
   |  |  |                        +--languages.txt #
-  |  |  +--sitemap.pot @@         address@hidden #
-  |  |  +--sitemap.proto * @@     +--compendia/
-  |  |  address@hidden %          |
-  |  |  address@hidden @@          address@hidden #
-  |  |  +--body-include-2.pot @@       address@hidden @@
-  |  |  +--body-include-2.proto * @@   +--excluded.pot #
+  |  |  +--sitemap.pot @@         +--compendia/
+  |  |  +--sitemap.proto * @@     |
+  |  |  address@hidden %          address@hidden #
+  |  |  |                        address@hidden @@
+  |  |  +--body-include-2.pot @@       +--excluded.pot #
+  |  |  +--body-include-2.proto * @@
   |  |  address@hidden %
   |  |  address@hidden
   |  |  
@@ -2180,9 +2144,8 @@
 
 @item @dots{}/po/@var{file}.proto
 Intermediate files generated from @address@hidden; they are
-used only internally.  Essentially, GNUN inserts its special slots and
-instructions to include the @address@hidden file.
address@hidden Slots}, and @ref{generic.LANG.html}.
+used only internally.  Essentially, GNUN inserts its special slots.
address@hidden Slots}, for more details.
 
 @item @dots{}/po/@var{file}.translist
 The list of trasnlations for @address@hidden/@var{file}.html}.  It is
@@ -2199,10 +2162,6 @@
 Translations of @address@hidden or @address@hidden
 committed by the translators and merged by GNUN.
 
address@hidden @dots{}/po/@address@hidden
-Intermediate files from which @address@hidden@var{lang}.html} are
-generated.
-
 @item @dots{}/po/@address@hidden
 The latest revision of the English file for which a full translation
 into @var{lang} language was provided.
@@ -2238,9 +2197,6 @@
 @item server/gnun/languages.txt
 See @ref{languages.txt}.
 
address@hidden server/gnun/address@hidden
-See @ref{generic.LANG.html}.
-
 @item server/gnun/compendia
 The directory for compendia.  @xref{Compendia}.
 @end table

Index: doc/web-trans.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/web-trans.texi,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- doc/web-trans.texi  30 Aug 2013 06:28:19 -0000      1.56
+++ doc/web-trans.texi  31 Aug 2013 14:09:42 -0000      1.57
@@ -1617,6 +1617,17 @@
 This is a very short file currently containing the ``back to top'' link.
 Also translatable via GNUN.
 
address@hidden server/generic.html
+This file is empty; its ``localized'' versions may contain optional
+short messages providing more information about the translation
+team or where to report bugs.
+
address@hidden
+<p>To join the Fooish translation team, see <a
+href="http://gnu.org/@/server/@/standards/@/translations/@/foo";>the
+Foo team homepage</a>.</p>
address@hidden example
+
 @item server/header.html
 The declaration that is included in literally every file.  It is
 maintained manually, as it does not make much sense to put it under



reply via email to

[Prev in Thread] Current Thread [Next in Thread]