aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2013-06-20 13:41:44 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2013-06-20 13:41:44 +0000
commitcc22d8bd7c718797aa73b5e29d23c16ea7dc40f5 (patch)
tree9a3f1fe69ba59ea610ebc5d2499fce3178b44f28
parent5d9f101d74f0baa42f325bf4c58f52c2581fb333 (diff)
downloaddoc-cc22d8bd7c718797aa73b5e29d23c16ea7dc40f5.tar.gz
doc-cc22d8bd7c718797aa73b5e29d23c16ea7dc40f5.zip
- Add back two accidentally removed entity definitions
Notes
Notes: svn path=/projects/db5/; revision=41958
Diffstat
-rw-r--r--el_GR.ISO8859-7/share/xml/trademarks.ent7
-rw-r--r--es_ES.ISO8859-1/share/xml/trademarks.ent7
-rw-r--r--fr_FR.ISO8859-1/share/xml/trademarks.ent7
-rw-r--r--hu_HU.ISO8859-2/share/xml/trademarks.ent7
-rw-r--r--mn_MN.UTF-8/share/xml/trademarks.ent7
-rw-r--r--nl_NL.ISO8859-1/share/xml/trademarks.ent7
-rw-r--r--ru_RU.KOI8-R/share/xml/trademarks.ent7
-rw-r--r--zh_CN.GB2312/share/xml/trademarks.ent7
-rw-r--r--zh_TW.Big5/share/xml/trademarks.ent7
9 files changed, 63 insertions, 0 deletions
diff --git a/el_GR.ISO8859-7/share/xml/trademarks.ent b/el_GR.ISO8859-7/share/xml/trademarks.ent
index 0daa74d99d..01d8e70f1d 100644
--- a/el_GR.ISO8859-7/share/xml/trademarks.ent
+++ b/el_GR.ISO8859-7/share/xml/trademarks.ent
@@ -73,6 +73,9 @@
ARM Limited.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'> Cisco, Catalyst, IOS
Cisco Systems, Inc. /
.">
@@ -104,6 +107,10 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'> CVSup
John D. Polstra.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'> FreeBSD
FreeBSD Foundation.</para>">
diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent
index 290f46303a..1fca3584c1 100644
--- a/es_ES.ISO8859-1/share/xml/trademarks.ent
+++ b/es_ES.ISO8859-1/share/xml/trademarks.ent
@@ -64,6 +64,9 @@
Limited.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, and IOS are
registered trademarks of Cisco Systems, Inc. and/or its affiliates
in the United States and certain other countries.</para>">
@@ -93,6 +96,10 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is a registered trademark of
John D. Polstra.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of
the FreeBSD Foundation.</para>">
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent
index e5d9bb0cab..7fae465297 100644
--- a/fr_FR.ISO8859-1/share/xml/trademarks.ent
+++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent
@@ -66,6 +66,9 @@
Limited.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, and IOS are
registered trademarks of Cisco Systems, Inc. and/or its affiliates
in the United States and certain other countries.</para>">
@@ -87,6 +90,10 @@
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup est une marque dpose de
John D. Polstra.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD est une marque
dpose de la fondation FreeBSD.</para>">
diff --git a/hu_HU.ISO8859-2/share/xml/trademarks.ent b/hu_HU.ISO8859-2/share/xml/trademarks.ent
index ad564f5078..1b2638ad4c 100644
--- a/hu_HU.ISO8859-2/share/xml/trademarks.ent
+++ b/hu_HU.ISO8859-2/share/xml/trademarks.ent
@@ -70,6 +70,9 @@
vdjegye.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>A Cisco, Catalyst s IOS
a Cisco Systems, Inc. s/vagy trsvllalatainak
bejegyzett vdjegyei az Egyeslt llamokban s
@@ -102,6 +105,10 @@
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>A CVSup John D. Polstra bejegyzett
vdjegye.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>A FreeBSD a FreeBSD Foundation
bejegyzett vdjegye.</para>">
diff --git a/mn_MN.UTF-8/share/xml/trademarks.ent b/mn_MN.UTF-8/share/xml/trademarks.ent
index bb708ebdeb..131cb3cba5 100644
--- a/mn_MN.UTF-8/share/xml/trademarks.ent
+++ b/mn_MN.UTF-8/share/xml/trademarks.ent
@@ -67,6 +67,9 @@
Limited-ийн бүртгэгдсэн худалдааны тэмдэг юм.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, ба IOS нь
Америкийн Нэгдсэн Улс болон зарим нэг улсууд дахь Cisco Systems, Inc.
ба/эсвэл түүний гишүүдийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
@@ -97,6 +100,10 @@
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup нь Жон Д. Полстрагийн бүртгэгдсэн худалдааны
тэмдэг юм.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD нь FreeBSD Сангийн бүртгэгдсэн худалдааны
тэмдэг юм.</para>">
diff --git a/nl_NL.ISO8859-1/share/xml/trademarks.ent b/nl_NL.ISO8859-1/share/xml/trademarks.ent
index 003c665118..ed655034b9 100644
--- a/nl_NL.ISO8859-1/share/xml/trademarks.ent
+++ b/nl_NL.ISO8859-1/share/xml/trademarks.ent
@@ -66,6 +66,9 @@
ARM Limited.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, en IOS zijn
geregistreerde handelsmerken van Cisco Systems, Inc. en/of haar affiliaties
in de Verenigde Staten en zekere andere landen.</para>">
@@ -97,6 +100,10 @@
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is een geregistreerd handelsmerk
van John D. Polstra.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>&os; is een geregistreerd
handelsmerk van de &os; Foundation.</para>">
diff --git a/ru_RU.KOI8-R/share/xml/trademarks.ent b/ru_RU.KOI8-R/share/xml/trademarks.ent
index 68d3a50333..4bbb22bab2 100644
--- a/ru_RU.KOI8-R/share/xml/trademarks.ent
+++ b/ru_RU.KOI8-R/share/xml/trademarks.ent
@@ -68,6 +68,9 @@
Limited.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, IOS
Cisco Systems, Inc. /
.</para>">
@@ -89,6 +92,10 @@
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup
John D. Polstra.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD
FreeBSD Foundation.</para>">
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index b39439ab4f..cd8a35fff7 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -60,6 +60,9 @@
Limited. ע̱ꡣ</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, IOS
Cisco Systems, Inc. /丽һЩҵע̱ꡣ</para>">
<!ENTITY cisco "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Cisco</trademark>">
@@ -86,6 +89,10 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup
John D. Polstra ע̱ꡣ</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD FreeBSDע̱</para>">
<!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Fujitsu</trademark>">
diff --git a/zh_TW.Big5/share/xml/trademarks.ent b/zh_TW.Big5/share/xml/trademarks.ent
index 67240f0085..e279b1c819 100644
--- a/zh_TW.Big5/share/xml/trademarks.ent
+++ b/zh_TW.Big5/share/xml/trademarks.ent
@@ -59,6 +59,9 @@ AMD Opteron, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.arm "<para xmlns='http://docbook.org/ns/docbook'>ARM O ARM Limited. UӼСC</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, M IOS
O Cisco Systems, Inc. M/ΨݾcbM@ǨLaUӼСC</para>">
<!ENTITY catalyst "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Catalyst</trademark>">
@@ -84,6 +87,10 @@ AMD Opteron, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup O
John D. Polstra UӼСC</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD O FreeBSD|UӼ</para>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
generated by cgit v1.2.3 (git 2.25.1) at 2023-03-25 23:37:00 +0000