Updating branch refs/heads/master
to 39b714d8d86a30bb2f2dc2af55a7b866eb89a535 (commit)
from 5a2b111de25e1e761478bcb5b67d7f82be2b5949 (commit)
commit 39b714d8d86a30bb2f2dc2af55a7b866eb89a535
Author: Nick Schermer <n...@xfce.org>
Date: Sun Jun 6 19:38:36 2010 +0200
Move documentation translations to a more suitable place.
Makefile.am | 1 -
configure.in.in | 2 +-
docs/manual/Makefile.am | 15 ++++++++-------
{po-doc => docs/manual/po}/Makefile.am | 0
{po-doc => docs/manual/po}/bn.po | 0
{po-doc => docs/manual/po}/ca.po | 0
{po-doc => docs/manual/po}/da.po | 0
{po-doc => docs/manual/po}/es.po | 0
.../manual/po}/exo-preferred-applications.pot | 0
{po-doc => docs/manual/po}/fr.po | 0
{po-doc => docs/manual/po}/gl.po | 0
{po-doc => docs/manual/po}/id.po | 0
{po-doc => docs/manual/po}/it.po | 0
{po-doc => docs/manual/po}/ja.po | 0
{po-doc => docs/manual/po}/pt.po | 0
{po-doc => docs/manual/po}/pt_BR.po | 0
{po-doc => docs/manual/po}/ru.po | 0
{po-doc => docs/manual/po}/tr.po | 0
{po-doc => docs/manual/po}/ug.po | 0
{po-doc => docs/manual/po}/zh_CN.po | 0
20 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6a02f88..8c13ac9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,6 @@ SUBDIRS =
\
icons \
pixmaps \
po \
- po-doc \
$(PYTHON_SUBDIR) \
tests
diff --git a/configure.in.in b/configure.in.in
index e51a531..cb7f893 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -364,6 +364,7 @@ docs/manual/Makefile
docs/manual/images/Makefile
docs/manual/images/es/Makefile
docs/manual/images/ja/Makefile
+docs/manual/po/Makefile
docs/reference/Makefile
docs/reference/version.xml
exo.spec
@@ -386,7 +387,6 @@ icons/24x24/Makefile
icons/48x48/Makefile
pixmaps/Makefile
po/Makefile.in
-po-doc/Makefile
python/Makefile
python/examples/Makefile
tests/Makefile
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 3067373..58cc6c8 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -1,9 +1,10 @@
SUBDIRS = \
- images
+ images \
+ po
STYLESHEET = exo-preferred-applications.xsl
DOCUMENT = exo-preferred-applications.xml
-LINGUAS = $(shell cd $(top_srcdir)/po-doc && echo `/bin/ls *.po | sed
's,[.]po,,g'`)
+LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po | sed 's,[.]po,,g'`)
ALL_LINGUAS = C $(LINGUAS)
# install the html files to the destdir
@@ -45,11 +46,11 @@ if GENERATE_DOCUMENTATION
# regenerate po(t) files
update-po:
- rm -f $(top_srcdir)/po-doc/exo-preferred-applications.pot; \
- $(XML2PO) -o $(top_srcdir)/po-doc/exo-preferred-applications.pot
$(srcdir)/$(DOCUMENT); \
+ rm -f $(srcdir)/po/exo-preferred-applications.pot; \
+ $(XML2PO) -o $(srcdir)/po/exo-preferred-applications.pot
$(srcdir)/$(DOCUMENT); \
for lang in $(LINGUAS); do \
- pofile=$(top_srcdir)/po-doc/$$lang.po; \
- $(XML2PO) -u $(top_srcdir)/po-doc/$$lang.po
$(srcdir)/$(DOCUMENT); \
+ pofile=$(srcdir)/po/$$lang.po; \
+ $(XML2PO) -u $(srcdir)/po/$$lang.po $(srcdir)/$(DOCUMENT); \
done
# build the translated help files
@@ -58,7 +59,7 @@ doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(STYLESHEET)
rm -rf $(srcdir)/html; \
echo; \
for lang in $(ALL_LINGUAS); do \
- pofile=$(top_srcdir)/po-doc/$$lang.po; \
+ pofile=$(srcdir)/po/$$lang.po; \
echo "*** Generating $$lang documentation"; \
if test x"$$lang" = x"C"; then \
cp $(srcdir)/$(DOCUMENT) xgen-doc; \
diff --git a/po-doc/Makefile.am b/docs/manual/po/Makefile.am
similarity index 100%
rename from po-doc/Makefile.am
rename to docs/manual/po/Makefile.am
diff --git a/po-doc/bn.po b/docs/manual/po/bn.po
similarity index 100%
rename from po-doc/bn.po
rename to docs/manual/po/bn.po
diff --git a/po-doc/ca.po b/docs/manual/po/ca.po
similarity index 100%
rename from po-doc/ca.po
rename to docs/manual/po/ca.po
diff --git a/po-doc/da.po b/docs/manual/po/da.po
similarity index 100%
rename from po-doc/da.po
rename to docs/manual/po/da.po
diff --git a/po-doc/es.po b/docs/manual/po/es.po
similarity index 100%
rename from po-doc/es.po
rename to docs/manual/po/es.po
diff --git a/po-doc/exo-preferred-applications.pot
b/docs/manual/po/exo-preferred-applications.pot
similarity index 100%
rename from po-doc/exo-preferred-applications.pot
rename to docs/manual/po/exo-preferred-applications.pot
diff --git a/po-doc/fr.po b/docs/manual/po/fr.po
similarity index 100%
rename from po-doc/fr.po
rename to docs/manual/po/fr.po
diff --git a/po-doc/gl.po b/docs/manual/po/gl.po
similarity index 100%
rename from po-doc/gl.po
rename to docs/manual/po/gl.po
diff --git a/po-doc/id.po b/docs/manual/po/id.po
similarity index 100%
rename from po-doc/id.po
rename to docs/manual/po/id.po
diff --git a/po-doc/it.po b/docs/manual/po/it.po
similarity index 100%
rename from po-doc/it.po
rename to docs/manual/po/it.po
diff --git a/po-doc/ja.po b/docs/manual/po/ja.po
similarity index 100%
rename from po-doc/ja.po
rename to docs/manual/po/ja.po
diff --git a/po-doc/pt.po b/docs/manual/po/pt.po
similarity index 100%
rename from po-doc/pt.po
rename to docs/manual/po/pt.po
diff --git a/po-doc/pt_BR.po b/docs/manual/po/pt_BR.po
similarity index 100%
rename from po-doc/pt_BR.po
rename to docs/manual/po/pt_BR.po
diff --git a/po-doc/ru.po b/docs/manual/po/ru.po
similarity index 100%
rename from po-doc/ru.po
rename to docs/manual/po/ru.po
diff --git a/po-doc/tr.po b/docs/manual/po/tr.po
similarity index 100%
rename from po-doc/tr.po
rename to docs/manual/po/tr.po
diff --git a/po-doc/ug.po b/docs/manual/po/ug.po
similarity index 100%
rename from po-doc/ug.po
rename to docs/manual/po/ug.po
diff --git a/po-doc/zh_CN.po b/docs/manual/po/zh_CN.po
similarity index 100%
rename from po-doc/zh_CN.po
rename to docs/manual/po/zh_CN.po
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
