From 167f97e96af87c6b06435e034db2caa1a499858b Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Fri, 23 Jun 2017 15:39:11 +0200
Subject: [PATCH] BugFix Vorlagen DS

Textkorrektur Zeugnis
---
 system/xsl/ZeugnisEng_0.xsl           | 2 +-
 system/xsl/ZeugnisEng_Lehrgaenge.xsl  | 2 +-
 system/xsl/diplomaSupp_0.xsl          | 9 +++++----
 system/xsl/diplomaSupp_Lehrgaenge.xsl | 9 +++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/system/xsl/ZeugnisEng_0.xsl b/system/xsl/ZeugnisEng_0.xsl
index 26a8c5dff..475caa149 100644
--- a/system/xsl/ZeugnisEng_0.xsl
+++ b/system/xsl/ZeugnisEng_0.xsl
@@ -474,7 +474,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
             </table:table>
             <text:p text:style-name="P26"/>
             <text:p text:style-name="P22">¹ 1 Semester period per week = 45 minutes</text:p>
-            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
+            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), good (2), satisfactory (3), sufficient (4), insufficient (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
             <text:p text:style-name="P22">
                 <text:tab/>Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), participated(tg)</text:p>
             <text:p text:style-name="P7"/>
diff --git a/system/xsl/ZeugnisEng_Lehrgaenge.xsl b/system/xsl/ZeugnisEng_Lehrgaenge.xsl
index c60ae2840..6b990356c 100644
--- a/system/xsl/ZeugnisEng_Lehrgaenge.xsl
+++ b/system/xsl/ZeugnisEng_Lehrgaenge.xsl
@@ -462,7 +462,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
             </table:table>
             <text:p text:style-name="P26"/>
             <text:p text:style-name="P22">¹ 1 Semester period per week = 45 minutes</text:p>
-            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
+            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), good (2), satisfactory (3), sufficient (4), insufficient (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
             <text:p text:style-name="P22">
                 <text:tab/>Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), participated(tg)</text:p>
             <text:p text:style-name="P7"/>
diff --git a/system/xsl/diplomaSupp_0.xsl b/system/xsl/diplomaSupp_0.xsl
index 072441318..358396f28 100644
--- a/system/xsl/diplomaSupp_0.xsl
+++ b/system/xsl/diplomaSupp_0.xsl
@@ -1285,10 +1285,11 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
 		<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
 		</text:sequence-decls>
-		<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr5" draw:name="Bild2" text:anchor-type="page" text:anchor-page-number="1" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="17">
-			<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-		</draw:frame>
-		<text:p text:style-name="P60"/>
+		<text:p text:style-name="P60">
+			<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr5" draw:name="Bild2" text:anchor-type="paragraph" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="20">
+				<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+			</draw:frame>
+		</text:p>
 		<text:p text:style-name="P2"/>
 		<text:p text:style-name="P2"/>
 		<text:p text:style-name="P2"/>
diff --git a/system/xsl/diplomaSupp_Lehrgaenge.xsl b/system/xsl/diplomaSupp_Lehrgaenge.xsl
index cd01a741f..26758c220 100644
--- a/system/xsl/diplomaSupp_Lehrgaenge.xsl
+++ b/system/xsl/diplomaSupp_Lehrgaenge.xsl
@@ -1289,10 +1289,11 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
 		<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
 		</text:sequence-decls>
-		<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr5" draw:name="Bild2" text:anchor-type="page" text:anchor-page-number="1" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="17">
-			<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-		</draw:frame>
-		<text:p text:style-name="P60"/>
+		<text:p text:style-name="P60">
+			<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr5" draw:name="Bild2" text:anchor-type="paragraph" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="20">
+				<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+			</draw:frame>
+		</text:p>
 		<text:p text:style-name="P2"/>
 		<text:p text:style-name="P2"/>
 		<text:p text:style-name="P2"/>