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

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/09/26 14:39:04

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile NEWS 
        gnun/server/gnun/doc: gnun.texi 

Log message:
        Use `<span class="gnun-split"></span>' as a means to break long
        strings in the English files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.291&r2=1.292
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.59&r2=1.60

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -b -r1.291 -r1.292
--- ChangeLog   24 Sep 2012 13:06:39 -0000      1.291
+++ ChangeLog   26 Sep 2012 14:39:03 -0000      1.292
@@ -1,3 +1,19 @@
+2012-09-26  Pavel Kharitonov  <address@hidden>
+
+       Use `<span class="gnun-split"></span>' as a means to break long
+       strings in the English files.  Suggested by Therese Godefroy
+       and Denis Barbier.
+
+       * GNUmakefile (generate-proto): New function to refactor
+       `make-prototype' invocations; additionally, it substitutes
+       `<span class="gnun-split"></span>' with `<gnun></gnun>' in
+       the generated .proto file.
+       (mail-error-proto): Merge to `generate-proto'.
+       ($(template-dir)/po/whatsnew.proto, $(rootdir)/po/home.proto)
+       (article-pot-rules): Use `generate-proto' to make .proto files.
+       * doc/gnun.texi (Splitting Long Passages): New node.
+       * NEWS: Update.
+
 2012-09-24  Pavel Kharitonov  <address@hidden>
 
        * expand-ssi.awk: Fix expansion of nested conditionals.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- GNUmakefile 13 Sep 2012 07:40:45 -0000      1.136
+++ GNUmakefile 26 Sep 2012 14:39:03 -0000      1.137
@@ -608,10 +608,14 @@
      )
 endef
 
-# The command to mail errors from make-prototype.
-define mail-error-proto
+# The command to generate a prototype for a page.
+define generate-proto
 $(MAILFAIL) $(NOTIFYSKIP) $(web-addr),$(devel-addr) \
-  "[GNUN Error] Incompatible change in $(subst $(rootdir)/,,$<)"
+  "[GNUN Error] Incompatible change in $(subst $(rootdir)/,,$<)" \
+  $(MAKE-PROTOTYPE) --home --input=$< --generic=generic.html --output=$@ \
+  || ($(RM) $@ ; exit 1)
+$(SED) --in-place -e 's,<span class="gnun-split"></span>,<gnun></gnun>,' \
+                  -e "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
 endef
 
 # The command to restore the necessary write permissions of the
@@ -840,10 +844,7 @@
 # be #include'd automatically in the corresponding homepage.
 $(template-dir)/po/whatsnew.proto: $(template-dir)/whatsnew.html
        $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(web-addr) $<
-       $(mail-error-proto) $(MAKE-PROTOTYPE) --input=$< \
-         --generic=generic.html --home --output=$@ \
-         || ($(RM) $@ ; exit 1)
-       $(SED) --in-place "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
+       $(generate-proto)
        $(MAKE) regen-whatsnew-translist
 
 $(template-dir)/po/whatsnew.pot: $(template-dir)/po/whatsnew.proto \
@@ -961,9 +962,7 @@
 # exit with an error so that make does not proceed to the next
 # command.
        $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(web-addr) $<
-       $(mail-error-proto) $(MAKE-PROTOTYPE) --home --input=$< \
-         --generic=generic.html --output=$@ || ($(RM) $@ ; exit 1)
-       $(SED) --in-place "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
+       $(generate-proto)
 
 $(rootdir)/po/home.pot: $(rootdir)/po/home.proto
        $(addfile)
@@ -1030,10 +1029,7 @@
 endif
        $(call generate-translinks,$(1))
        $(call update-translinks-include,$(1)) 
-       $$(mail-error-proto) $(MAKE-PROTOTYPE) --home --input=$$< \
-         --generic=generic.html --output=$(1).proto \
-           || ($(RM) $(1).proto ; exit 1)
-       $(SED) --in-place "s/\$$$$Date.*\$$$$/<gnun>\0<\/gnun>/g" $(1).proto
+       $$(generate-proto)
 
 $(1).pot: $(1).proto
        $$(addfile)

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- NEWS        24 Sep 2012 13:06:39 -0000      1.65
+++ NEWS        26 Sep 2012 14:39:04 -0000      1.66
@@ -2,6 +2,9 @@
 
 * Changes in GNUnited Nations 0.7 (????-??-??)
 
+** <span class="gnun-split"></span> is used as a separator to split
+   long strings of the original files.
+
 ** New variable in gnun.mk: `optional-templates'.  It is used for low
    priority SSI templates; it won't generate empty PO files, so
    the scripts reporting outdated translations won't take them into

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- doc/gnun.texi       13 Sep 2012 07:40:45 -0000      1.59
+++ doc/gnun.texi       26 Sep 2012 14:39:04 -0000      1.60
@@ -1910,6 +1910,8 @@
 * Modifying Boilerplates::
 * Localized URLs::            Specifying URLs of diagrams
                                 to be translated.
+* Splitting Long Passages::   How to avoid too long strings
+                                in PO files.
 @end menu
 
 @node Validation
@@ -2002,6 +2004,34 @@
 And please don't forget to commit the image in its source form
 (typically, in SVG format).
 
address@hidden Splitting Long Passages
address@hidden Splitting Long Passages
address@hidden long passages, avoiding
address@hidden conventional separator for strings
+
+GNUN splits typical text by paragraphs, and translators write the
+translations for the resulting parts of the text one by one.  When a
+part is too long, it is hard to translate and proofread the translation;
+the likelihood of skipping some phrases is relatively high.
+
+In order to make our translators' life easier, it is desirable to keep
+the paragraphs short (no more than 350--700 characters).  If rearranging
+the paragraphs is not an option, you can use a conventional separator,
address@hidden<span class="gnun-split"></span>}:
+
address@hidden
+<p>GNUN splits typical text by paragraphs, and translators write
+the translations for the resulting parts of the text
+one by one. <span class="gnun-split"></span> When a part
+is too long, it is hard to translate and proofread the translation;
+the likelihood of skipping some phrases is relatively high.</p>
address@hidden example
+
+It is important that the separator be inserted between complete
+sentences, because different languages may require different orders
+of parts of the sentence, and the translator has no control over
+the sequence of the strings in the translation.
+
 @node Internals
 @chapter Unexciting Information for GNUN's Operation