From be54dcc5035226e81508f2a0a84478fecb3024f6 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Thu, 12 Dec 2024 16:36:03 +0000 Subject: [PATCH 1/2] Include Jing license that I forgot to add when commiting the JAR (#206) --- docbook/JING_LICENSE | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 docbook/JING_LICENSE diff --git a/docbook/JING_LICENSE b/docbook/JING_LICENSE new file mode 100644 index 000000000..f3a99e28c --- /dev/null +++ b/docbook/JING_LICENSE @@ -0,0 +1,45 @@ + + +Jing Copying Conditions + + + +

Jing Copying Conditions

+ +

Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
+All rights reserved.

+ +

Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met:

+ + + +

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ + + + From 0ef7804c1285a4d82fd0bab95ec04334c23975bb Mon Sep 17 00:00:00 2001 From: alfsb Date: Thu, 12 Dec 2024 14:31:10 -0300 Subject: [PATCH 2/2] Alleviate breakages in translations (#204) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: André L F S Bacci --- entities/global.ent | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/entities/global.ent b/entities/global.ent index 0c15b13c7..1976e0bea 100644 --- a/entities/global.ent +++ b/entities/global.ent @@ -1,10 +1,13 @@ - + + + - $Id$ - - Contains global "macros" for all the XML documents. - - --> +