Add 'push-tx' Makefile rule, update README with suggested workflow

Also commit what resulted changed after a subsequent 'pull-tx' run

git-svn-id: http://svn.osgeo.org/postgis/trunk@13085 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e501a97da3c302a6ffa4654f0054eb944a86d2a1..80f9e415ad246b802cb3aa8e7c9bddc0c1a6a960 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -168,6 +168,9 @@ pull-tx:
        tx pull --all
        $(MAKE) update-po
 
+push-tx:
+       tx push -s -t --skip
+
 # Register transifex resources, run when adding a new .xml file
 update-tx:
        for f in $(XML_INPUTS_POT); do \

diff --git a/doc/po/README b/doc/po/README
index 0bdb55350c483584408df4f3e82f5d88d44106f2..55f90196cd502693d98afd6afcf939146082d5cd 100644 (file)
--- a/doc/po/README
+++ b/doc/po/README
@@ -3,12 +3,13 @@ Translation files for the PostGIS manual.
 Compilation of the files require the ``poxml`` package,
 part of the KDE development kit.
 
-Run ``make`` in language directories to generate the 
-localized manual.
+In language subdirectories, run ``make`` to build localized manual and
+comments, ``make local-pdf`` for the pdf.
 
-Run ``make update-po`` from the parent directory to
-update the translation files to be in sync with the 
-official documentation.
+In parent directory (doc), run ``make update-po`` to update the translation
+files to be in sync with the source code, ``make html-localized`` or
+``make pdf-localized`` to build the localized html or pdf manual for
+all enabled languages
 
 Using transifex
 ---------------
@@ -16,17 +17,23 @@ Using transifex
 Transifex web-ui to translation was setup here:
 https://www.transifex.com/projects/p/postgis-1
 
-Run ``make update-tx`` from the parent directory to
+Run ``make update-tx`` from the parent (doc) directory to
 update the transifex command-line tool configuration,
 found in ../.tx/config (only needed when new doc sources
 are added);
 
-Push locally updated templates to transifex with ``tx push -t``.
-
-Push locally updated translations to transifex with ``tx push -s``.
-The --skip switch makes upload continue on import failure (useful
-when some of the translation files have no translations at all).
-
-Pull remotely updated translations with ``tx pull``
-
-See ``tx help``.
+Run ``make pull-tx`` to import remotely updated translations
+and ``make push-tx`` to upload the locally update ones, after
+making sure they are well-formed (``make html-localized`` succeeds).
+
+NOTE: the recommended workflow is:
+
+ make pull-tx
+ do:
+  make html-localized || edit
+ until success 
+ if edits:
+  make push-tx
+  make pull-tx
+  commit changes to repo
+ fi

diff --git a/doc/po/it_IT/reporting.xml.po b/doc/po/it_IT/reporting.xml.po
index 499542f663f1a3f661d9f54e9e0bb98883d2cd76..e09492907db72319034ce25dd9449af235e0c909 100644 (file)
--- a/doc/po/it_IT/reporting.xml.po
+++ b/doc/po/it_IT/reporting.xml.po
@@ -2,13 +2,15 @@
 #
 # Translators:
 # aghisla <a.ghisla@gmail.com>, 2013
+# aghisla <a.ghisla@gmail.com>, 2013
+# Sandro Santilli <strk@keybit.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: PostGIS\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2012-09-14 17:50+0000\n"
-"PO-Revision-Date: 2013-11-28 09:40+0000\n"
-"Last-Translator: aghisla <a.ghisla@gmail.com>\n"
+"PO-Revision-Date: 2014-10-17 10:55+0000\n"
+"Last-Translator: Sandro Santilli <strk@keybit.net>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/"
 "postgis-1/language/it_IT/)\n"
 "Language: it_IT\n"