release-notes Makefile,1.28,1.29
by fedora-docs-commits@redhat.com
Author: eitch
Update of /cvs/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16097
Modified Files:
Makefile
Log Message:
added pt_BR target
Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile 1 Mar 2006 22:18:00 -0000 1.28
+++ Makefile 4 Mar 2006 06:21:50 -0000 1.29
@@ -8,7 +8,7 @@
#
DOCBASE = RELEASE-NOTES
PRI_LANG = en
-OTHERS = zh_CN #it pa ru
+OTHERS = zh_CN pt_BR #it pa ru
########################################################################
# List each XML file of your document in the template below. Append the
18 years, 3 months
docs-common Makefile.common,1.93,1.94
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5916
Modified Files:
Makefile.common
Log Message:
${PO2XML} is back!! You need the "kdesdk" RPM after all!! Sorry!!
Evidently, the XML merge mode of xml2po(1) is broken; at least I
could never get it to work reliably. The worst bug is that it
doesn't handle "&FOO;"-style entities reliably: sometimes they get
substituted, even if the "-k" switch is used and often times they are
simply dropped from the output XML. Boo!
Using po2xml(1) doesn't fix everything, but it's a step.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Makefile.common 3 Mar 2006 23:20:32 -0000 1.93
+++ Makefile.common 4 Mar 2006 01:28:47 -0000 1.94
@@ -104,6 +104,7 @@
XMLLINT =xmllint
XML2PO =xml2po
MSGMERGE=msgmerge
+PO2XML =po2xml
LN =ln
#########################################################################
@@ -411,9 +412,10 @@
define XML_template
$(patsubst ${PRI_LANG}/%,${1}/%,${2}):: ${2} po/${1}.po
mkdir -p ${1}
- ${XML2PO} -k -p po/${1}.po ${2} >$$@
-endef
-
+# ${XML2PO} -k -p po/${1}.po ${2} >$$@
+ ${PO2XML} ${2} po/${1}.po >$$@
+ endef
+
$(foreach L,${OTHERS}, \
$(foreach F,${XMLFILES-${PRI_LANG}}, \
$(eval $(call XML_template,${L},${F}))))
18 years, 3 months
docs-common/common/entities Makefile, 1.14, 1.15 entities-de.ent, 1.2, 1.3 entities-en.ent, 1.5, 1.6 entities-en_US.ent, 1.2, 1.3 entities-it.ent, 1.11, 1.12 entities-pt_BR.ent, 1.5, 1.6 entities-ru.ent, 1.4, 1.5 entities-zh_CN.ent, 1.4, 1.5 entities.pot, 1.4, 1.5
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/common/entities
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1555
Modified Files:
Makefile entities-de.ent entities-en.ent entities-en_US.ent
entities-it.ent entities-pt_BR.ent entities-ru.ent
entities-zh_CN.ent entities.pot
Log Message:
Corrected the default relative path. Yes, this is back to the
original value. Live and learn.
Index: Makefile
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile 3 Mar 2006 23:20:38 -0000 1.14
+++ Makefile 3 Mar 2006 23:24:59 -0000 1.15
@@ -32,7 +32,7 @@
#######################################################################
# FDPCOMMONDIR:=$(shell cd .. && /bin/pwd)
-FDPCOMMONDIR:=../../docs-common/common
+FDPCOMMONDIR:=../docs-common/common
#######################################################################
#######################################################################
Index: entities-de.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-de.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- entities-de.ent 3 Mar 2006 23:20:38 -0000 1.2
+++ entities-de.ent 3 Mar 2006 23:24:59 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-en.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-en.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- entities-en.ent 3 Mar 2006 23:20:38 -0000 1.5
+++ entities-en.ent 3 Mar 2006 23:24:59 -0000 1.6
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-en_US.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-en_US.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- entities-en_US.ent 3 Mar 2006 23:20:38 -0000 1.2
+++ entities-en_US.ent 3 Mar 2006 23:24:59 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-it.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-it.ent,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- entities-it.ent 3 Mar 2006 23:20:38 -0000 1.11
+++ entities-it.ent 3 Mar 2006 23:24:59 -0000 1.12
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
<!-- Queste entit�� comuni sono utili abbreviazioni di termini e nomi, che potrebbero essere soggette a cambiamento in qualsiasi momento. Questo �� il valore importante che le entit�� forniscono: Una singola locazione per aggiornare termini e nomi comuni. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-pt_BR.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-pt_BR.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- entities-pt_BR.ent 3 Mar 2006 23:20:38 -0000 1.5
+++ entities-pt_BR.ent 3 Mar 2006 23:24:59 -0000 1.6
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
<!-- Estas entidades comuns s��o termos de m��o e nomes ��teis que podem ser mudados a qualquer momento. �� muito importante que se forne��a um local ��nico para a atualiza����o de termos e nomes comuns. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-pt_BR.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-pt_BR.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-ru.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-ru.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entities-ru.ent 3 Mar 2006 23:20:38 -0000 1.4
+++ entities-ru.ent 3 Mar 2006 23:24:59 -0000 1.5
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-zh_CN.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-zh_CN.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entities-zh_CN.ent 3 Mar 2006 23:20:38 -0000 1.4
+++ entities-zh_CN.ent 3 Mar 2006 23:24:59 -0000 1.5
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities.pot
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities.pot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entities.pot 3 Mar 2006 23:20:38 -0000 1.4
+++ entities.pot 3 Mar 2006 23:24:59 -0000 1.5
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-03 15:18-0600\n"
+"POT-Creation-Date: 2006-03-03 17:24-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
18 years, 3 months
docs-common/common/entities Makefile, 1.13, 1.14 entities-de.ent, 1.1, 1.2 entities-en.ent, 1.4, 1.5 entities-en_US.ent, 1.1, 1.2 entities-it.ent, 1.10, 1.11 entities-pt_BR.ent, 1.4, 1.5 entities-ru.ent, 1.3, 1.4 entities-zh_CN.ent, 1.3, 1.4 entities.pot, 1.3, 1.4
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/common/entities
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1486/common/entities
Modified Files:
Makefile entities-de.ent entities-en.ent entities-en_US.ent
entities-it.ent entities-pt_BR.ent entities-ru.ent
entities-zh_CN.ent entities.pot
Log Message:
Place the per-document entities file in the ${LANG}/ directory, where
it belonged all along. Using relative paths from within the local
entities should work the same as relative paths elsewhere. With
using the symbolic link "../doc-entities.ent" previously, relative
paths within the per-document entities had to be relative to the
parent directory unlike all other relative paths in the document.
Index: Makefile
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile 3 Mar 2006 19:40:16 -0000 1.13
+++ Makefile 3 Mar 2006 23:20:38 -0000 1.14
@@ -32,7 +32,7 @@
#######################################################################
# FDPCOMMONDIR:=$(shell cd .. && /bin/pwd)
-FDPCOMMONDIR:=../docs-common/common
+FDPCOMMONDIR:=../../docs-common/common
#######################################################################
#######################################################################
Index: entities-de.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-de.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- entities-de.ent 2 Mar 2006 18:15:12 -0000 1.1
+++ entities-de.ent 3 Mar 2006 23:20:38 -0000 1.2
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-en.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-en.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entities-en.ent 2 Mar 2006 22:52:15 -0000 1.4
+++ entities-en.ent 3 Mar 2006 23:20:38 -0000 1.5
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-en_US.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-en_US.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- entities-en_US.ent 2 Mar 2006 22:52:15 -0000 1.1
+++ entities-en_US.ent 3 Mar 2006 23:20:38 -0000 1.2
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-it.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-it.ent,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- entities-it.ent 1 Mar 2006 19:51:00 -0000 1.10
+++ entities-it.ent 3 Mar 2006 23:20:38 -0000 1.11
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
<!-- Queste entit�� comuni sono utili abbreviazioni di termini e nomi, che potrebbero essere soggette a cambiamento in qualsiasi momento. Questo �� il valore importante che le entit�� forniscono: Una singola locazione per aggiornare termini e nomi comuni. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-it.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-pt_BR.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-pt_BR.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entities-pt_BR.ent 1 Mar 2006 18:56:05 -0000 1.4
+++ entities-pt_BR.ent 3 Mar 2006 23:20:38 -0000 1.5
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
<!-- Estas entidades comuns s��o termos de m��o e nomes ��teis que podem ser mudados a qualquer momento. �� muito importante que se forne��a um local ��nico para a atualiza����o de termos e nomes comuns. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-pt_BR.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-pt_BR.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-ru.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-ru.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- entities-ru.ent 1 Mar 2006 01:14:00 -0000 1.3
+++ entities-ru.ent 3 Mar 2006 23:20:38 -0000 1.4
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities-zh_CN.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities-zh_CN.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- entities-zh_CN.ent 1 Mar 2006 01:14:00 -0000 1.3
+++ entities-zh_CN.ent 3 Mar 2006 23:20:38 -0000 1.4
@@ -1,5 +1,5 @@
<!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR "../docs-common/common" > <!-- Base directory -->
+<!ENTITY FDPCOMMONDIR "../../docs-common/common" > <!-- Base directory -->
<!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
<!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
<!-- Group: Common doc files -->
- <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
- <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+ <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
<!-- Group: Common applications -->
Index: entities.pot
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities.pot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- entities.pot 3 Mar 2006 20:49:45 -0000 1.3
+++ entities.pot 3 Mar 2006 23:20:38 -0000 1.4
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-03 10:22-0600\n"
+"POT-Creation-Date: 2006-03-03 15:18-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
18 years, 3 months
docs-common Makefile.common,1.92,1.93
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1486
Modified Files:
Makefile.common
Log Message:
Place the per-document entities file in the ${LANG}/ directory, where
it belonged all along. Using relative paths from within the local
entities should work the same as relative paths elsewhere. With
using the symbolic link "../doc-entities.ent" previously, relative
paths within the per-document entities had to be relative to the
parent directory unlike all other relative paths in the document.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- Makefile.common 3 Mar 2006 20:49:35 -0000 1.92
+++ Makefile.common 3 Mar 2006 23:20:32 -0000 1.93
@@ -781,14 +781,11 @@
set-locale-${1}::
${LN} -f -s ${FDPDIR}/docs-common/common/entities/entities-${1}.ent \
${FDP_ENTITIES}
-ifneq "${DOC_ENTITIES}" ""
- ${LN} -f -s ${1}/${DOC_ENTITIES}.ent .
-endif
clean::
${RM} ${FDP_ENTITIES}
ifneq "${DOC_ENTITIES}" ""
- ${RM} ${DOC_ENTITIES}.ent
+ ${RM} ${1}/${DOC_ENTITIES}.ent
endif
help::
18 years, 3 months
docs-common/common/entities entities.pot,1.2,1.3
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/common/entities
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27026/common/entities
Modified Files:
entities.pot
Log Message:
When validating XML, be sure to include the dependent files such as
${1}/fdp-info.xml and ${1}/${DOC_ENTITIES}.ent so there is actually a
hope of the XML validating.
Index: entities.pot
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- entities.pot 3 Mar 2006 00:13:18 -0000 1.2
+++ entities.pot 3 Mar 2006 20:49:45 -0000 1.3
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-02 18:04-0600\n"
+"POT-Creation-Date: 2006-03-03 10:22-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
18 years, 3 months
docs-common Makefile.common,1.91,1.92
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27026
Modified Files:
Makefile.common
Log Message:
When validating XML, be sure to include the dependent files such as
${1}/fdp-info.xml and ${1}/${DOC_ENTITIES}.ent so there is actually a
hope of the XML validating.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Makefile.common 3 Mar 2006 20:46:27 -0000 1.91
+++ Makefile.common 3 Mar 2006 20:49:35 -0000 1.92
@@ -807,7 +807,7 @@
.PHONY: validate-xml-${1}
-validate-xml-${1}:: ${XMLFILES-${1}} ${1}/fdp-info.xml set-locale-${1}
+validate-xml-${1}:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
${XMLLINT} --noout --xinclude --postvalid ${1}/${DOCBASE}.xml
help::
18 years, 3 months
docs-common Makefile.common,1.90,1.91
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26989
Modified Files:
Makefile.common
Log Message:
Replaced ${MSGMERGE} processing to update .PO file when the .XML and
thus the .POT file changes.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Makefile.common 3 Mar 2006 20:39:19 -0000 1.90
+++ Makefile.common 3 Mar 2006 20:46:27 -0000 1.91
@@ -460,6 +460,8 @@
[ -d po ] || (echo ADD po/ TO CVS >&2; exit 1)
if [ ! -f $$@ ]; then \
cp po/${DOCBASE}.pot $$@; \
+ else \
+ ${MSGMERGE} -U -q $$@ $$<; \
fi
.PHONY: po-${1}
18 years, 3 months
docs-common Makefile.common,1.89,1.90
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26933
Modified Files:
Makefile.common
Log Message:
Deleted the 'DIR_template' foolishness and removed the "${LANG}" dummy
target, too. Replaced the explicit "mkdir -p ${LANG}" in the rule to
derive the non-${PRI_LANG} XML. This cuts down on the unnecessary
XML regeneration and speeds things up a good bit.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Makefile.common 3 Mar 2006 19:55:40 -0000 1.89
+++ Makefile.common 3 Mar 2006 20:39:19 -0000 1.90
@@ -406,26 +406,11 @@
#########################################################################
#########################################################################
-define DIR_template
-${1}::
- mkdir -p ${1}
-
-distclean::
- ${RM} -r ${1}
-
-help::
- @printf ${TFMT} '${1}' 'Creates translated XML working directory'
-
-endef
-
-$(foreach L,${OTHERS},$(eval $(call DIR_template,${L})))
-#########################################################################
-
-#########################################################################
# Define a template to generate the locale-specific XML files given the
# original ${PRI_LANG} file and an updated po/${LANG}.po file.
define XML_template
-$(patsubst ${PRI_LANG}/%,${1}/%,${2}):: ${2} po/${1}.po ${1}
+$(patsubst ${PRI_LANG}/%,${1}/%,${2}):: ${2} po/${1}.po
+ mkdir -p ${1}
${XML2PO} -k -p po/${1}.po ${2} >$$@
endef
18 years, 3 months
docs-common Makefile.common,1.88,1.89
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24758
Modified Files:
Makefile.common
Log Message:
Added "-k" switch to ${XML2PO} usages to try and keep entity references
intact. This doesn't fix the whole problem, but it's a start.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Makefile.common 2 Mar 2006 22:01:34 -0000 1.88
+++ Makefile.common 3 Mar 2006 19:55:40 -0000 1.89
@@ -46,6 +46,12 @@
#########################################################################
#########################################################################
+# Strange though it may seem, some shells do not provide a ${PWD}
+# environment variable for us.
+PWD :=$(shell /bin/pwd)
+#########################################################################
+
+#########################################################################
# Supply default values for the boilerplate files _unless_ the user has
# provided their own values.
ifeq "${FDPDIR}" ""
@@ -90,12 +96,6 @@
#########################################################################
#########################################################################
-# Strange though it may seem, some shells do not provide a ${PWD}
-# environment variable for us.
-PWD :=$(shell /bin/pwd)
-#########################################################################
-
-#########################################################################
# Use macros to locate our commonly-used programs
XMLTO =xmlto
XSLTPROC=xsltproc
@@ -112,7 +112,7 @@
# from the gnome-doc-utils RPM.
.SUFFIXES: .po .pot .ent .xml
%.po: %.xml
- ${XML2PO} $< >$@
+ ${XML2PO} -k $< >$@
%.ent: %.xml
${XSLTPROC} -o $@ --stringparam FDPCOMMONDIR "NONE" \
@@ -394,7 +394,7 @@
#########################################################################
po/${DOCBASE}.pot:: ${XMLFILES-${PRI_LANG}}
[ -d po ] || (echo ADD po/ TO CVS >&2; exit 1)
- ${XML2PO} -o $@ $^
+ ${XML2PO} -k -o $@ $^
help::
@printf ${TFMT} 'po' 'Writes one ${PRI_LANG} PO file for all XML'
@@ -426,7 +426,7 @@
# original ${PRI_LANG} file and an updated po/${LANG}.po file.
define XML_template
$(patsubst ${PRI_LANG}/%,${1}/%,${2}):: ${2} po/${1}.po ${1}
- ${XML2PO} -p po/${1}.po ${2} >$$@
+ ${XML2PO} -k -p po/${1}.po ${2} >$$@
endef
$(foreach L,${OTHERS}, \
@@ -471,12 +471,10 @@
.PRECIOUS: po/${1}.po
-po/${1}.po:: ${XMLFILES-${PRI_LANG}} po/${DOCBASE}.pot
+po/${1}.po:: po/${DOCBASE}.pot
[ -d po ] || (echo ADD po/ TO CVS >&2; exit 1)
if [ ! -f $$@ ]; then \
cp po/${DOCBASE}.pot $$@; \
- else \
- ${MSGMERGE} -U --backup=simple $$@ po/${DOCBASE}.pot; \
fi
.PHONY: po-${1}
18 years, 3 months