From d457ad16e11174e839c2587bba8235c6080cf889 Mon Sep 17 00:00:00 2001 From: Osamu Aoki Date: Thu, 7 Nov 2013 22:17:44 +0900 Subject: [PATCH] move po4a->po --- Makefile | 2 +- README.source | 10 +++++----- {po4a => po}/debian-reference.de.po | 0 {po4a => po}/debian-reference.es.po | 0 {po4a => po}/debian-reference.fr.po | 0 {po4a => po}/debian-reference.it.po | 0 {po4a => po}/debian-reference.ja.po | 0 {po4a => po}/debian-reference.pot | 0 {po4a => po}/debian-reference.pt.po | 0 {po4a => po}/es.1.add | 0 {po4a => po}/fr.1.add | 0 {po4a => po}/hyphenation.de.tex | 0 {po4a => po}/hyphenation.en.tex | 0 {po4a => po}/hyphenation.es.tex | 0 {po4a => po}/hyphenation.fr.tex | 0 {po4a => po}/hyphenation.it.tex | 0 {po4a => po}/hyphenation.ja.tex | 0 {po4a => po}/hyphenation.pt.tex | 0 {po4a => po}/it.1.add | 0 {po4a => po}/ja.1.add | 0 {po4a => po}/policy.ja | 0 {po4a => po}/pt.1.add | 0 xslt/user_param.xsl | 2 +- 23 files changed, 7 insertions(+), 7 deletions(-) rename {po4a => po}/debian-reference.de.po (100%) rename {po4a => po}/debian-reference.es.po (100%) rename {po4a => po}/debian-reference.fr.po (100%) rename {po4a => po}/debian-reference.it.po (100%) rename {po4a => po}/debian-reference.ja.po (100%) rename {po4a => po}/debian-reference.pot (100%) rename {po4a => po}/debian-reference.pt.po (100%) rename {po4a => po}/es.1.add (100%) rename {po4a => po}/fr.1.add (100%) rename {po4a => po}/hyphenation.de.tex (100%) rename {po4a => po}/hyphenation.en.tex (100%) rename {po4a => po}/hyphenation.es.tex (100%) rename {po4a => po}/hyphenation.fr.tex (100%) rename {po4a => po}/hyphenation.it.tex (100%) rename {po4a => po}/hyphenation.ja.tex (100%) rename {po4a => po}/hyphenation.pt.tex (100%) rename {po4a => po}/it.1.add (100%) rename {po4a => po}/ja.1.add (100%) rename {po4a => po}/policy.ja (100%) rename {po4a => po}/pt.1.add (100%) diff --git a/Makefile b/Makefile index 18c5ed0c..2437ac79 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ DOCNAME := debian-reference PXSLT := xslt PBIN := bin ADOC := asciidoc -PODOC := po4a +PODOC := po IMAGES := /usr/share/xml/docbook/stylesheet/nwalsh/images # Program name and option diff --git a/README.source b/README.source index a100c626..bfa534ba 100644 --- a/README.source +++ b/README.source @@ -25,9 +25,9 @@ After everything is fine, update master tree and merge local as: $ git pull $ git checkout local $ git rebase master - + If conflicts happen with po4a/*.po files, checkout local one to overwrite + + If conflicts happen with po/*.po files, checkout local one to overwrite merged file. - + If conflicts happen with po4a/*.pot file, checkout master one to + + If conflicts happen with po/*.pot file, checkout master one to overwrite merged file. + If conflicts happen with other files, edit merged file into a sane text. ... hack ... hack ... @@ -87,7 +87,7 @@ reformat and test it first by: If this test causes no error, clean the source tree and commit only updated PO file with: $ make clean - $ git add po4a/debian-reference.it.po + $ git add po/debian-reference.it.po $ git commit -m "Updated Italian" Specifying "LANGPO" variable as above saves build time by skipping other @@ -114,7 +114,7 @@ For the package building, it is good idea to use tools such as = Flow chart for the building of this documentation = The English source is kept as ASCIIDOC(*) files under asciidoc/. -The translation source is kept as PO files under po4a/. +The translation source is kept as PO files under po/. >>> all the asciidoc/*.txt files :(make rawxml) @@ -185,7 +185,7 @@ Add a new PO: You can create a new template PO file for a new language and edit it as: - $ cd po4a + $ cd po $ cp debian-reference.pot debian-reference.??.po $ poedit debian-reference.??.po diff --git a/po4a/debian-reference.de.po b/po/debian-reference.de.po similarity index 100% rename from po4a/debian-reference.de.po rename to po/debian-reference.de.po diff --git a/po4a/debian-reference.es.po b/po/debian-reference.es.po similarity index 100% rename from po4a/debian-reference.es.po rename to po/debian-reference.es.po diff --git a/po4a/debian-reference.fr.po b/po/debian-reference.fr.po similarity index 100% rename from po4a/debian-reference.fr.po rename to po/debian-reference.fr.po diff --git a/po4a/debian-reference.it.po b/po/debian-reference.it.po similarity index 100% rename from po4a/debian-reference.it.po rename to po/debian-reference.it.po diff --git a/po4a/debian-reference.ja.po b/po/debian-reference.ja.po similarity index 100% rename from po4a/debian-reference.ja.po rename to po/debian-reference.ja.po diff --git a/po4a/debian-reference.pot b/po/debian-reference.pot similarity index 100% rename from po4a/debian-reference.pot rename to po/debian-reference.pot diff --git a/po4a/debian-reference.pt.po b/po/debian-reference.pt.po similarity index 100% rename from po4a/debian-reference.pt.po rename to po/debian-reference.pt.po diff --git a/po4a/es.1.add b/po/es.1.add similarity index 100% rename from po4a/es.1.add rename to po/es.1.add diff --git a/po4a/fr.1.add b/po/fr.1.add similarity index 100% rename from po4a/fr.1.add rename to po/fr.1.add diff --git a/po4a/hyphenation.de.tex b/po/hyphenation.de.tex similarity index 100% rename from po4a/hyphenation.de.tex rename to po/hyphenation.de.tex diff --git a/po4a/hyphenation.en.tex b/po/hyphenation.en.tex similarity index 100% rename from po4a/hyphenation.en.tex rename to po/hyphenation.en.tex diff --git a/po4a/hyphenation.es.tex b/po/hyphenation.es.tex similarity index 100% rename from po4a/hyphenation.es.tex rename to po/hyphenation.es.tex diff --git a/po4a/hyphenation.fr.tex b/po/hyphenation.fr.tex similarity index 100% rename from po4a/hyphenation.fr.tex rename to po/hyphenation.fr.tex diff --git a/po4a/hyphenation.it.tex b/po/hyphenation.it.tex similarity index 100% rename from po4a/hyphenation.it.tex rename to po/hyphenation.it.tex diff --git a/po4a/hyphenation.ja.tex b/po/hyphenation.ja.tex similarity index 100% rename from po4a/hyphenation.ja.tex rename to po/hyphenation.ja.tex diff --git a/po4a/hyphenation.pt.tex b/po/hyphenation.pt.tex similarity index 100% rename from po4a/hyphenation.pt.tex rename to po/hyphenation.pt.tex diff --git a/po4a/it.1.add b/po/it.1.add similarity index 100% rename from po4a/it.1.add rename to po/it.1.add diff --git a/po4a/ja.1.add b/po/ja.1.add similarity index 100% rename from po4a/ja.1.add rename to po/ja.1.add diff --git a/po4a/policy.ja b/po/policy.ja similarity index 100% rename from po4a/policy.ja rename to po/policy.ja diff --git a/po4a/pt.1.add b/po/pt.1.add similarity index 100% rename from po4a/pt.1.add rename to po/pt.1.add diff --git a/xslt/user_param.xsl b/xslt/user_param.xsl index de471c38..e7a05ee8 100644 --- a/xslt/user_param.xsl +++ b/xslt/user_param.xsl @@ -22,7 +22,7 @@ - \input{po4a/hyphenation..tex} + \input{po/hyphenation..tex}