15 files changed, 417 insertions, 182 deletions
diff --git a/src/main/webapp/jsp/SIGNATURBLOCK.jsp b/src/main/webapp/jsp/SIGNATURBLOCK.jsp
new file mode 100644
index 0000000..dc21f9a
--- /dev/null
+++ b/src/main/webapp/jsp/SIGNATURBLOCK.jsp
@@ -0,0 +1,110 @@
+<%@ page contentType="text/html; charset=UTF-8" language="java" errorPage=""%>
+
+<%@ page import="org.apache.commons.lang.time.DateFormatUtils" %>
+<%@ page import="java.util.Date" %>
+<%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.UpdateFormServlet"%>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
+
+<%@ include file="language.jsp" %>
+
+	<%
+	   String mode = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_MODE_KEY);
+	   String device = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY);
+	   String type = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_TYPE_KEY);
+
+	   String sbValue;
+	   String sbLabel;
+	   String sbMeta;
+	   String sbName;
+	   String sbDate;
+	   String sbIssuer;
+	   String sbNumber;
+	   String sbKZ;
+	   String sbID;
+	   String sbMetaValue;
+	   if ("SIGNATURBLOCK_DE".equals(type)) {
+	      sbValue     = "Signaturwert";
+	      sbLabel     = "signatur-logo_de-100.png";
+	      sbMetaValue = "Informationen zur Prüfung der elektronischen Signatur und des Ausdrucks finden Sie unter: <input type=\"text\" name=\"vservice\" readonly=\"readonly\" disabled=\"disabled\" value=\"https://www.buergerkarte.at/signature-verification\" size=\"50\" maxlength=\"255\"/>";
+	      sbName      = "Unterzeichner";
+	      sbDate      = "Datum/Zeit-UTC";
+	      sbIssuer    = "Aussteller-Zertifikat";
+	      sbNumber    = "Serien-Nr.";
+	      sbKZ        = "Methode";
+	      sbID        = "Parameter";
+	      sbMeta      = "Prüfinformation";
+	   } else {
+	      sbValue     = "Signature Value";
+	      sbLabel     = "signatur-logo_en-100.png";
+	      sbMetaValue = "Information about the verification of the electronic signature and of the printout can be found at: <input type=\"text\" name=\"vservice\" readonly=\"readonly\" disabled=\"disabled\" value=\"https://www.buergerkarte.at/signature-verification\" size=\"50\" maxlength=\"255\"/>";
+	      sbName      = "Signatory";
+	      sbDate      = "Date/Time-UTC";
+	      sbIssuer    = "Issuer-Certificate";
+	      sbNumber    = "Serial-No.";
+	      sbKZ        = "Method";
+	      sbID        = "Parameter";
+	      sbMeta      = "Verification";
+	   }
+	   
+	%>
+
+<html>
+
+<table border="0" cellpadding="3" cellspacing="0" class="pdfassignature">
+	<tr>
+		<td class="pdfaslabel" nowrap="nowrap"><%= sbValue %></td>
+		<td colspan="2" class="pdfasvalue">
+			<div style="float:left;">Aqs3vMeF81wm/UJjIcLOzUs9</div>
+			<div style="float:left;">dxTBzhi2RC8avQyMAmc3v</div>
+			<div style="float:left;">WEj9HT1DI3iish4smRr</div>
+		</td>
+	</tr>
+	<tr>
+		<td rowspan="6"><img src="<%= request.getContextPath() %>/images/<%= sbLabel %>" width="100" alt="Signatur-Logo"/></td>
+		<td class="pdfaslabel" nowrap="nowrap"><%= sbName %></td>
+		<td class="pdfasvalue"><input type="text" name="signer" value="<fmt:message key="signaturblock.signer.value"/>" readonly="readonly" disabled="disabled" size="40" maxlength="255"/></td>
+	</tr>
+	<tr>
+		<td class="pdfaslabel" nowrap="nowrap"><%= sbDate %></td>
+		<td class="pdfasvalue"><%= DateFormatUtils.formatUTC(new Date(), "yyyy-MM-dd'T'HH:mm:ss'Z'", request.getLocale()) %></td>
+	</tr>
+	<tr>
+		<td class="pdfaslabel" nowrap="nowrap"><%= sbIssuer %></td>
+		<td class="pdfasvalue">
+			<div class="pdfasnobreak">CN=<fmt:message key="signaturblock.issuer.value.cn"/>,</div>
+			<div class="pdfasnobreak">O=<fmt:message key="signaturblock.issuer.value.o"/>,</div>
+			<div class="pdfasnobreak">C=AT</div>
+		</td>
+	</tr>
+	<tr>
+		<td class="pdfaslabel" nowrap="nowrap"><%= sbNumber %></td>
+		<td class="pdfasvalue">123456</td>
+	</tr>
+	<tr>
+		<td class="pdfaslabel" nowrap="nowrap"><%= sbKZ %></td>
+		<td class="pdfasvalue">
+			<div class="pdfasnobreak">urn:pdfsigfilter:</div>
+			<div class="pdfasnobreak">bka.gv.at:</div>
+			<div class="pdfasnobreak"><%= FormFields.VALUE_MODE_TEXTUAL.equals(mode) ? "text" : "binaer" %>:v1.1.0</div>
+		</td>
+	</tr>
+	<tr>
+		<td class="pdfaslabel" nowrap="nowrap"><%= sbID %></td>
+		<td class="pdfasvalue">
+			<% if (Constants.SIGNATURE_DEVICE_MOC.equals(device)) { %>
+				<div class="pdfasnobreak">etsi-moc-1.0@12345678</div>
+			<% } else { %>
+				<div class="pdfasnobreak">etsi-bka-1.0@1234567890-123456789@</div>
+				<div class="pdfasnobreak">12345-1234-</div>
+				<div class="pdfasnobreak">0-</div>
+				<div class="pdfasnobreak">12345-</div>
+				<div class="pdfasnobreak">12345</div></td>
+			<% } // end if %>
+	</tr>
+	<tr>
+		<td class="pdfaslabel" nowrap="nowrap"><%= sbMeta %></td>
+		<td colspan="2" class="pdfasvalue"><%= sbMetaValue %></td>
+	</tr>
+</table>
+</html>
+\ No newline at end of file
diff --git a/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp b/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp
deleted file mode 100644
index 3b48294..0000000
--- a/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp
+++ /dev/null
@@ -1,61 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" language="java" errorPage=""%>
-
-<%@ page import="org.apache.commons.lang.time.DateFormatUtils" %>
-<%@ page import="java.util.Date" %>
-
-<html:xhtml />
-
-<table border="0" cellpadding="3" cellspacing="0" class="pdfassignature">
-	<tr>
-		<td class="pdfaslabel" nowrap="nowrap">Signaturwert</td>
-		<td colspan="2" class="pdfasvalue">
-			<div style="float:left;">Aqs3vMeF81wm/UJjIcLOzUs9</div>
-			<div style="float:left;">dxTBzhi2RC8avQyMAmc3v</div>
-			<div style="float:left;">WEj9HT1DI3iish4smRr</div>
-		</td>
-	</tr>
-	<tr>
-		<td rowspan="6"><img src="<%= request.getContextPath() %>/images/signatur-logo_de-100.png" width="100" alt="Signatur-Logo"/></td>
-		<td class="pdfaslabel" nowrap="nowrap">Unterzeichner</td>
-		<td class="pdfasvalue"><input type="text" name="signer" value="&lt;wird aus dem Zertifikat extrahiert&gt;" readonly="readonly" disabled="disabled" size="40" maxlength="255"/></td>
-	</tr>
-	<tr>
-		<td class="pdfaslabel" nowrap="nowrap">Datum/Zeit-UTC</td>
-		<td class="pdfasvalue"><%= DateFormatUtils.formatUTC(new Date(), "yyyy-MM-dd'T'HH:mm:ss'Z'", request.getLocale()) %></td>
-	</tr>
-	<tr>
-		<td class="pdfaslabel" nowrap="nowrap">Aussteller-Zertifikat</td>
-		<td class="pdfasvalue">
-			<div class="pdfasnobreak">CN=Ausstellername,</div>
-			<div class="pdfasnobreak">O=Ausstellerorganisation,</div>
-			<div class="pdfasnobreak">C=AT</div>
-		</td>
-	</tr>
-	<tr>
-		<td class="pdfaslabel" nowrap="nowrap">Serien-Nr.</td>
-		<td class="pdfasvalue">123456</td>
-	</tr>
-	<tr>
-		<td class="pdfaslabel" nowrap="nowrap">Methode</td>
-		<td class="pdfasvalue">
-			<div class="pdfasnobreak">urn:pdfsigfilter:</div>
-			<div class="pdfasnobreak">bka.gv.at:</div>
-			<div class="pdfasnobreak">text:v1.1.0</div>
-		</td>
-	</tr>
-	<tr>
-		<td class="pdfaslabel" nowrap="nowrap">Parameter</td>
-		<td class="pdfasvalue">
-			<div class="pdfasnobreak">etsi-bka-1.0@1234567890-123456789@</div>
-			<div class="pdfasnobreak">12345-1234-</div>
-			<div class="pdfasnobreak">0-</div>
-			<div class="pdfasnobreak">12345-</div>
-			<div class="pdfasnobreak">12345</div></td>
-	</tr>
-	<tr>
-		<td class="pdfaslabel" nowrap="nowrap">Pr&uuml;finformation</td>
-		<td colspan="2" class="pdfasvalue">
-			Informationen zur Pr&uuml;fung der elektronischen Signatur und des Ausdrucks finden Sie unter: <input type="text" name="vservice" readonly="readonly" disabled="disabled" value="https://www.buergerkarte.at/signature-verification" size="50" maxlength="255"/>
-		</td>
-	</tr>
-</table>
diff --git a/src/main/webapp/jsp/dataok.jsp b/src/main/webapp/jsp/dataok.jsp
index c77fb46..ae209ab 100644
--- a/src/main/webapp/jsp/dataok.jsp
+++ b/src/main/webapp/jsp/dataok.jsp
@@ -1,24 +1,25 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ include file="language.jsp" %>
+
 <html>
 <head>
-<title>PDF-AS Amtssignaturen</title>
+<title><fmt:message key="common.title"/></title>
 <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/css/styles.css" />
 </head>
 <body>
 <div class="maindiv">
-<h1>PDF-AS Amtssignaturen</h1>
-<div class="mainframe">
-<div class="mainheadline">Daten&auml;nderung</div>
+<h1><fmt:message key="common.title"/></h1>
+<h2><fmt:message key="dataok.heading2"/></h2>
 
 <p>
-Die Daten wurden erfolgreich &uuml;bernommen.
+<fmt:message key="dataok.taken"/>
 </p>
 
-</div>
 <%
   String btlurl = (String)request.getAttribute("btlurl");
 %>
-<a class="big" href="<%=btlurl%>">zur&uuml;ck zur Liste</a>
+<a class="big" href="<%=btlurl%>"><fmt:message key="common.backtolist"/></a>
 </div>
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/main/webapp/jsp/download.jsp b/src/main/webapp/jsp/download.jsp
index 76180cc..95109e3 100644
--- a/src/main/webapp/jsp/download.jsp
+++ b/src/main/webapp/jsp/download.jsp
@@ -1,5 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 
+<%@ include file="language.jsp" %>
+
 <%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
 
@@ -9,7 +11,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 	<head>
-		<title>PDF-Signaturen Lokale Verbindung</title>
+		<title><fmt:message key="download.title"/></title>
 		<script language="javascript" type="text/javascript">
 			<!--
 				function disableElement(elementId) {
@@ -19,7 +21,7 @@
 				function hitButton() {
 					document.submitform.submit();
 					disableElement("SendRequestButton");
-					document.getElementById("SendRequestButton").value = "Download bereits erfolgt";
+					document.getElementById("SendRequestButton").value = "<fmt:message key="download.button.alreadydone"/>";
 					return(true);
 				}
 			-->
@@ -28,15 +30,15 @@
 	</head>
 
 	<body>
-		<h1>PDF-Signaturen</h1>
-		<h2>Dokument Signatur erstellen</h2>
-		<div class="pdfasnote">Der Signatur-Vorgang ist abgeschlossen. Das signierte Dokument kann nun heruntergeladen werden.<br/>Hinweis: Der Download ist nur einmalig m&ouml;glich. Das Dokument wird nicht am Server gespeichert.</div>
+		<h1><fmt:message key="common.title"/></h1>
+		<h2><fmt:message key="download.heading2"/></h2>
+		<div class="pdfasnote"><fmt:message key="download.note"/></div>
 		<div class="pdfasverticalspace"></div>
 		<form action="<%= downloadURL %>" name="submitform" accept-charset="UTF-8" method="post" enctype="application/x-www-form-urlencoded">
-			<input type="submit" id="SendRequestButton" value="Signiertes Dokument herunterladen" onclick="return hitButton();"/>
+			<input type="submit" id="SendRequestButton" value="<fmt:message key="download.button.download"/>" onclick="return hitButton();"/>
 		</form>
 		<div class="pdfasverticalspace"></div>
-		<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>
+		<a href="<%= (response.encodeRedirectURL(request.getContextPath() + "/") + "?") %><fmt:message key="common.locale.param"/>"><fmt:message key="common.back"/></a>
 	</body>
 	
 </html>
diff --git a/src/main/webapp/jsp/error.jsp b/src/main/webapp/jsp/error.jsp
index 0ec94d8..2183a62 100644
--- a/src/main/webapp/jsp/error.jsp
+++ b/src/main/webapp/jsp/error.jsp
@@ -4,11 +4,13 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.exceptions.*" %>
 <%@ page import="java.io.*" %>
 
+<%@ include file="language.jsp" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 
 	<head>
-		<title>PDF-Signaturen Resultat</title>
+		<title><fmt:message key="error.title"/></title>
 		<base href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/"/>
 	</head>
 
@@ -22,15 +24,24 @@
 
   String error = (request.getAttribute("error") == null ? "" : request.getAttribute("error").toString());
   String cause = (request.getAttribute("cause") == null ? "" : request.getAttribute("cause").toString());
+  boolean rb = Boolean.TRUE.equals((Boolean) request.getAttribute("resourcebundle"));
 %>
 
 	<body>
-		<h1>PDF-Signaturen</h1>
-		<h2>Ein Fehler ist aufgetreten</h2>
-		<div class="pdfasnote"><%= error %></div>
-		<div class="pdfasnote">Ursache: <strong><%= cause %></strong></div>
+		<h1><fmt:message key="common.title"/></h1>
+		<h2><fmt:message key="error.heading2"/></h2>
+		<div class="pdfasnote">
+			<% if (rb) { %>
+				<fmt:message key="<%= error %>"/>
+			<% } else { out.write(error); } %>
+		</div>
+		<div class="pdfasnote"><fmt:message key="error.cause"/>: <strong>
+			<% if (rb) { %>
+				<fmt:message key="<%= cause %>"/>
+			<% } else { out.write(cause); } %>
+		</strong></div>
 		<div class="pdfasverticalspace"></div>
-		<a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/">zur&uuml;ck</a>
+		<a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/"><fmt:message key="common.back"/></a>
 		<pre style="display:none">
 		<%
 		  if (pe != null) {
diff --git a/src/main/webapp/jsp/error_verify.jsp b/src/main/webapp/jsp/error_verify.jsp
index 3b82a32..7d3e5cc 100644
--- a/src/main/webapp/jsp/error_verify.jsp
+++ b/src/main/webapp/jsp/error_verify.jsp
@@ -4,11 +4,13 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.exceptions.*" %>
 <%@ page import="java.io.*" %>
 
+<%@ include file="language.jsp" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 
 	<head>
-		<title>PDF-Signaturen Resultat</title>
+		<title><fmt:message key="errorverify.title"/></title>
 		<base href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/"/>
 	</head>
 
@@ -25,12 +27,12 @@
 %>
 
 	<body>
-		<h1>PDF-Signaturen</h1>
-		<h2>Ein Fehler ist aufgetreten</h2>
+		<h1><fmt:message key="common.title"/></h1>
+		<h2><fmt:message key="errorverify.heading2"/></h2>
 		<div class="pdfasnote"><%= error %></div>
-		<div class="pdfasnote">Ursache: <strong><%= cause %></strong></div>
+		<div class="pdfasnote"><fmt:message key="errorverify.cause"/>: <strong><%= cause %></strong></div>
 		<div class="pdfasverticalspace"></div>
-		<a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/jsp/verifyupload.jsp">zur&uuml;ck</a>
+		<a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/jsp/verifyupload.jsp"><fmt:message key="common.back"/></a>
 		<pre style="display:none">
 		<%
 		  if (pe != null) {
diff --git a/src/main/webapp/jsp/language.jsp b/src/main/webapp/jsp/language.jsp
new file mode 100644
index 0000000..11aad84
--- /dev/null
+++ b/src/main/webapp/jsp/language.jsp
@@ -0,0 +1,9 @@
+<%@ page import="at.gv.egiz.pdfas.web.i18n.LocaleParamFilter" %>
+<%@ page import="java.util.Locale" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%
+	Locale currentLocale = (Locale) session.getAttribute(LocaleParamFilter.LOCALE_SESSION_KEY);
+	if (currentLocale != null) {
+%>
+	<fmt:setLocale value="<%= currentLocale.getLanguage() %>"/>
+<% } // end if %>
diff --git a/src/main/webapp/jsp/null_request_page.jsp b/src/main/webapp/jsp/null_request_page.jsp
index 5773f63..c54fa26 100644
--- a/src/main/webapp/jsp/null_request_page.jsp
+++ b/src/main/webapp/jsp/null_request_page.jsp
@@ -1,41 +1,67 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.UpdateFormServlet"%>
+<%@ page import="java.util.Locale" %>
+<%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>
+<%@ include file="language.jsp" %>
 <%
   String local_request_url = (String)request.getAttribute("local_request_url");
   String data_url = (String)request.getAttribute("data_url");
+  String device = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY);
+  Locale locale = (Locale) session.getAttribute(LocaleParamFilter.LOCALE_SESSION_KEY);
+  
+  boolean isOnlineMOCCA = Constants.SIGNATURE_DEVICE_MOC.equals(device); 
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>PDF-Signaturen Lokale Verbindung</title>
+		<title><fmt:message key="nullrequestpage.title"/></title>
 		<script language="javascript" type="text/javascript">
 			<!--
 				function disableElement(elementId) {
-					document.getElementById(elementId).disabled = true;
-					document.getElementById(elementId).blur();
+					if (elementId != null && document.getElementById(elementId)) {
+						document.getElementById(elementId).disabled = true;
+						document.getElementById(elementId).blur();
+					}
 					return(true);
 				}
 				function hitButton() {
 					document.submitform.submit();
 					disableElement("SendRequestButton");
-					document.getElementById("SendRequestButton").value = "Bitte warten...";
+					if (document.getElementById("SendRequestButton")) {
+						document.getElementById("SendRequestButton").value = "<fmt:message key="nullrequestpage.button.pleasewait"/>";
+					}
 				}
 			-->
 		</script>
 	</head>
 
 	<body>
-		<h1>PDF-Signaturen</h1>
-		<h2>Dokument Signatur erstellen</h2>
-		<div class="pdfasnote">Die Verbindung zu Ihrer B&uuml;rgerkartenumgebung wird hergestellt...</div>
+		<h1><fmt:message key="common.title"/></h1>
+		<h2><fmt:message key="nullrequestpage.heading2"/></h2>
+		<div class="pdfasnote"><fmt:message key="nullrequestpage.note"/></div>
+		<% if (isOnlineMOCCA) { %>
+			<form action="<%= local_request_url %>" name="submitform" accept-charset="UTF-8" method="post" target="moccaframe">
+				<input type="hidden" name="XMLRequest"	value="<?xml version='1.0' encoding='UTF-8'?><NullOperationRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'/>" />
+				<input type="hidden" name="DataURL" value="<%= data_url %>" />
+				<input type="hidden" name="appletWidth" value="190"/>
+				<input type="hidden" name="appletHeight" value="130"/>
+				<% if (locale != null) { %>
+					<input type="hidden" name="locale" value="<%= locale.toString() %>"/>
+				<% } // end if %>
+			</form>
+			<div class="pdfasverticalspace"></div>
+			<iframe name="moccaframe" style="border: 1px solid black;" width="190" height="130" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="<%= request.getContextPath() %>/jsp/please_wait.jsp" ></iframe>
+		<% } else { %>
 		<div class="pdfasverticalspace"></div>
-		<form action="<%= local_request_url %>" name="submitform" accept-charset="UTF-8" method="post"><!--  enctype="multipart/form-data"-->
-			<input type="hidden" name="XMLRequest"	value="<?xml version='1.0' encoding='UTF-8'?><NullOperationRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'/>" />
-			<input type="hidden" name="DataURL" value="<%= data_url %>" />
-			<input type="submit" id="SendRequestButton" value="Absenden..." />
-		</form>
+			<form action="<%= local_request_url %>" name="submitform" accept-charset="UTF-8" method="post">
+				<input type="hidden" name="XMLRequest"	value="<?xml version='1.0' encoding='UTF-8'?><NullOperationRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'/>" />
+				<input type="hidden" name="DataURL" value="<%= data_url %>" />
+				<input type="submit" id="SendRequestButton" value="<fmt:message key="nullrequestpage.button.submit"/>" />
+			</form>
+		<% } // end if %>
 		<div class="pdfasverticalspace"></div>
-		<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>
+		<a href="<%= request.getContextPath() %>/"><fmt:message key="common.back"/></a>
 		<script language="javascript" type="text/javascript">
 			<!--
 				window.setTimeout("hitButton()", 800);
diff --git a/src/main/webapp/jsp/please_wait.jsp b/src/main/webapp/jsp/please_wait.jsp
new file mode 100644
index 0000000..62c0d28
--- /dev/null
+++ b/src/main/webapp/jsp/please_wait.jsp
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html; charset=UTF-8" language="java" errorPage=""%>
+
+<%@ include file="language.jsp" %>
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<title><fmt:message key="pleasewait.title"/></title>
+</head>
+
+<body>
+	<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+		<tr height="100%" valign="middle">
+			<td align="center"><fmt:message key="pleasewait.body"/></td>
+		</tr>
+	</table>
+</body>
diff --git a/src/main/webapp/jsp/results.jsp b/src/main/webapp/jsp/results.jsp
index faabc27..f3ab71c 100644
--- a/src/main/webapp/jsp/results.jsp
+++ b/src/main/webapp/jsp/results.jsp
@@ -3,6 +3,8 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.sig.SignatureResponse" %>
 
+<%@ include file="language.jsp" %>
+
 <%
 	List results = (List) request.getAttribute("results");
 	Object bb = request.getAttribute("backbutton");
@@ -15,11 +17,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 	<head>
-	  <title>PDF-Signaturen</title>
+	  <title><fmt:message key="common.title"/></title>
 	</head>
 	<body>
-		<h1>PDF-Signaturen</h1>
-		<h2>Pr&uuml;fergebnis</h2>
+		<h1><fmt:message key="common.title"/></h1>
+		<h2><fmt:message key="results.heading2"/></h2>
 		<%
 			Iterator resit = results.iterator();
 			while (resit.hasNext()) {
@@ -28,34 +30,34 @@
 		
 		<div class="pdfasverticalspace"></div>
 		<fieldset class="pdfasresultfieldset">
-			<legend><b>Signatur-Check</b></legend>
+			<legend><b><fmt:message key="results.signaturecheck"/></b></legend>
 			<div class="<%= "0".equals(result.getSignatureCheckCode()) ? "pdfasok" : "pdfasnok" %>"><%= result.getSignatureCheckInfo() %></div>
 		</fieldset>
 
 		<div class="pdfassmallverticalspace"></div>
 		<fieldset class="pdfasresultfieldset">
-			<legend><b>Zertifikat</b></legend>
+			<legend><b><fmt:message key="results.certificatecheck"/></b></legend>
 			<table class="pdfaslisttable" cellpadding="1" cellspacing="1">
-				<tr><td class="pdfascaption">Signator:</td><td class="pdfasvalue"><%= result.getX509SubjectName() %></td></tr>
-				<tr><td class="pdfascaption">Aussteller:</td><td class="pdfasvalue"><%= result.getX509IssuerName() %></td></tr>
-				<tr><td class="pdfascaption">Seriennummer:</td><td class="pdfasvalue"><%= result.getX509SerialNumber() %></td></tr>
+				<tr><td class="pdfascaption"><fmt:message key="results.signer"/>:</td><td class="pdfasvalue"><%= result.getX509SubjectName() %></td></tr>
+				<tr><td class="pdfascaption"><fmt:message key="results.issuer"/>:</td><td class="pdfasvalue"><%= result.getX509IssuerName() %></td></tr>
+				<tr><td class="pdfascaption"><fmt:message key="results.serialnumber"/>:</td><td class="pdfasvalue"><%= result.getX509SerialNumber() %></td></tr>
 				<%
 					List public_properties = result.getPublicProperties();
 					Iterator propit = public_properties.iterator();
 					while (propit.hasNext()) {
 						String public_property = (String) propit.next();
 				%>
-				<tr><td class="pdfascaption">Eigenschaft:</td><td class="pdfasvalue"><%= public_property %></td></tr>
+				<tr><td class="pdfascaption"><fmt:message key="results.property"/>:</td><td class="pdfasvalue"><%= public_property %></td></tr>
 				<%
 					}
 				%>
-				<tr><td class="pdfascaption">Zertifikat:</td><td class="<%= "0".equals(result.getCertificateCheckCode()) ? "pdfasok" : "pdfasnok" %>"><%= result.getCertificateCheckInfo() %></td></tr>
+				<tr><td class="pdfascaption"><fmt:message key="results.certificate"/>:</td><td class="<%= "0".equals(result.getCertificateCheckCode()) ? "pdfasok" : "pdfasnok" %>"><%= result.getCertificateCheckInfo() %></td></tr>
 			</table>
 		</fieldset>
 
 		<div class="pdfassmallverticalspace"></div>
 		<fieldset class="pdfasresultfieldset">
-			<legend><b>Manifest-Check</b></legend>
+			<legend><b><fmt:message key="results.manifestcheck"/></b></legend>
 			<div class="<%= "0".equals(result.getSignatureManifestCheckCode()) ? "pdfasok" : "pdfasnok" %>"><%= result.getSignatureManifestCheckInfo() %></div>
 		</fieldset>
 
@@ -69,10 +71,10 @@
 		%>
 		<div class="pdfasverticalspace"></div>
 		<% if (backbutton) { %>
-			<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zur&uuml;ck</a>
+			<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp"><fmt:message key="common.back"/></a>
 		<% } %>
 		<% if (btlurl != null) { %>
-			<a href="<%=btlurl%>">zur&uuml;ck zur Liste</a>
+			<a href="<%=btlurl%>"><fmt:message key="common.backtolist"/></a>
 		<% } %>
 	</body>
 </html>
diff --git a/src/main/webapp/jsp/signpreview.jsp b/src/main/webapp/jsp/signpreview.jsp
index ee97497..66a9f69 100644
--- a/src/main/webapp/jsp/signpreview.jsp
+++ b/src/main/webapp/jsp/signpreview.jsp
@@ -3,9 +3,11 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.sig.SignatureData" %>
 <%@ page import="at.gv.egiz.pdfas.web.SignSessionInformation" %>
 <%@ page import="at.gv.egiz.pdfas.impl.input.TextDataSourceImpl"%>
-<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@ page import="org.apache.commons.lang.StringEscapeUtils"%>
 <%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>
 
+<%@ include file="language.jsp" %>
+
 <%
   SignSessionInformation si = (SignSessionInformation) session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
 
@@ -25,12 +27,12 @@
 <html>
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>PDF-Signaturen Vorschau</title>
+		<title><fmt:message key="signpreview.title"/></title>
 	</head>
 
 	<body>
-		<h1>PDF-Signaturen</h1>
-		<h2>Vorschau: Dokument Signieren</h2>
+		<h1><fmt:message key="common.title"/></h1>
+		<h2><fmt:message key="signpreview.heading2"/></h2>
 		<%
 		  if (si.mode.equals(FormFields.VALUE_MODE_TEXTUAL)) {
 		%>
@@ -42,15 +44,19 @@
 						<iframe src="bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>
 						<!-- ================================================ Stop BKU-Erkennung -->
 					</div>
+				<% } else if (Constants.SIGNATURE_DEVICE_MOC.equals(si.connector)) { %>
+					<div>
+						<img src="images/chiperling.jpg" width="57" height="57" alt="<fmt:message key="common.mocca"/>"/>
+					</div>
 				<% } // end if %>
-				<input type="submit" value="Signieren..." />
+				<input type="submit" value="<fmt:message key="signpreview.button.sign"/>" />
 			</form>
 		<%
 		  } else {
 		%>
 			<div class="pdfasverticalspace"></div>
 			<form action="<%= signature_data_url %>" method="get" target="blank_">
-				<input type="submit" value="Vorschaudokument anzeigen..." />
+				<input type="submit" value="<fmt:message key="signpreview.showpreview"/>" />
 			</form>
 			<div class="pdfasverticalspace"></div>
 			<% if (Constants.SIGNATURE_DEVICE_BKU.equals(si.connector)) { %>
@@ -59,15 +65,19 @@
 					<iframe src="bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>
 					<!-- ================================================ Stop BKU-Erkennung -->
 				</div>
+			<% } else if (Constants.SIGNATURE_DEVICE_MOC.equals(si.connector)) { %>
+				<div>
+					<img src="images/chiperling.jpg" width="57" height="57" alt="<fmt:message key="common.mocca"/>"/>
+				</div>
 			<% } // end if %>
 			<form action="<%= submit_url %>" method="get">
-				<input type="submit" value="Signieren..." />
+				<input type="submit" value="<fmt:message key="signpreview.button.sign"/>" />
 			</form>
 		<%
 		  }
 		%>
 		<div class="pdfasverticalspace"></div>
-		<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>
+		<a href="<%= request.getContextPath() %>/"><fmt:message key="common.back"/></a>
 	</body>
 
 </html>
diff --git a/src/main/webapp/jsp/signupload.jsp b/src/main/webapp/jsp/signupload.jsp
index 3db3be5..287afb1 100644
--- a/src/main/webapp/jsp/signupload.jsp
+++ b/src/main/webapp/jsp/signupload.jsp
@@ -1,78 +1,180 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>
 <%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>
+<%@ page import="at.gv.egiz.pdfas.web.i18n.LanguageDecoratorMapper"%>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.UpdateFormServlet"%>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ include file="language.jsp" %>
+
 <html>
 <head>
-  <title>PDF-Signaturen</title>
+	<%
+   boolean testMode = request.getContextPath().startsWith("/test-");
+	boolean forceTextualForMocca = true;
+	%>
+	<title>
+	<%
+		if (testMode) {
+	%>
+		<fmt:message key="test.common.title"/>
+	<% } else { %>
+		<fmt:message key="common.title"/>
+	<% } // end if %>		   
+	</title>
   <% session.removeAttribute(SessionAttributes.SIGNED_PDF_DOCUMENT); %>
+	<script language="javascript" type="text/javascript">
+		<!--
+			function updateForm() {
+				var updateform = document.getElementById('updateform');
+				var submitform = document.getElementById('submitform');
+				
+				updateform.<%= FormFields.FIELD_SIGNATURE_TYPE %>.value = submitform.<%= FormFields.FIELD_SIGNATURE_TYPE %>.value; 
+				updateform.<%= FormFields.FIELD_MODE %>.value = submitform.<%= FormFields.FIELD_MODE %>.value; 
+				updateform.<%= FormFields.FIELD_CONNECTOR %>.value = submitform.<%= FormFields.FIELD_CONNECTOR %>.value; 
+				updateform.submit();
+				return(false);
+			}
+			function submitForm(preview) {
+				var submitform = document.getElementById('submitform');
+				if (!submitform.fileupload.value) {
+					if (preview) {
+						alert('<fmt:message key="signupload.documentnotselected.preview"/>');
+					} else {
+						alert('<fmt:message key="signupload.documentnotselected"/>');
+					}
+					return(false);
+				}
+				if (preview) {
+					submitform.<%= FormFields.FIELD_PREVIEW %>.value='true';
+				} else {
+					submitform.<%= FormFields.FIELD_PREVIEW %>.value='false';
+				}
+				return(true);
+			}
+		-->
+	</script>
+	<%
+	   String device = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY);
+	   if (device == null) {
+	      device = Constants.SIGNATURE_DEVICE_MOC;
+	      session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY, device);
+	   }
+	   String mode = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_MODE_KEY);
+		if (forceTextualForMocca && Constants.SIGNATURE_DEVICE_MOC.equals(device)) {
+		   mode = FormFields.VALUE_MODE_TEXTUAL;
+		   session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_MODE_KEY, mode);
+		}
+	   if (mode == null) {
+		   mode = FormFields.VALUE_MODE_TEXTUAL;
+		   session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_MODE_KEY, mode);
+		}
+	   String type = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_TYPE_KEY);
+	   if (type == null) {
+	      Locale locale = (Locale) session.getAttribute(LocaleParamFilter.LOCALE_SESSION_KEY);
+	      if (locale == null) {
+	         locale = request.getLocale();
+	      }
+	      type = Locale.GERMAN.getLanguage().equals(locale.getLanguage()) ? "SIGNATURBLOCK_DE" : "SIGNATURBLOCK_EN";
+	      session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_TYPE_KEY, type);
+	   }
+
+	   %>
 </head>
 <body>
-<h1>PDF-Signaturen</h1>
-<h2>Dokument Signatur erstellen</h2>
-<div class="pdfasnote">Bitte w&auml;hlen Sie die zu signierende PDF-Datei. Diese wird mit Ihrer B&uuml;rgerkarte signiert.</div>
-<form name="submitform"
+<h1>
+	<%
+		if (testMode) {
+	%>
+		<fmt:message key="test.common.title"/>
+	<% } else { %>
+		<fmt:message key="common.title"/>
+	<% } // end if %>		   
+</h1>
+<h2><fmt:message key="signupload.heading2"/></h2>
+<div class="pdfasnote"><fmt:message key="signupload.selectfilenote"/></div>
+<form name="updateform" id="updateform" method="post" action="<%= request.getContextPath() %>/UpdateForm">
+	<input type="hidden" name="<%= FormFields.FIELD_SIGNATURE_TYPE %>" value=""/>
+	<input type="hidden" name="<%= FormFields.FIELD_MODE %>" value=""/>
+	<input type="hidden" name="<%= FormFields.FIELD_CONNECTOR %>" value=""/>
+</form>
+<form name="submitform" id="submitform"
       enctype="multipart/form-data"
       accept-charset="UTF-8"
       method="post"
       action="<%= request.getContextPath() %>/Sign">
 	<table border="0" cellspacing="0" cellpadding="4" id="pdfasupperformtable">
 		<tr>
-			<td nowrap="nowrap"><label>PDF Datei:</label></td>
-			<td><input size="50" type="file" name="<%= FormFields.FIELD_UPLOAD %>" accept="application/pdf"/></td>
-		</tr>
-		<tr>
-			<td nowrap="nowrap"><label>Signatur Typ:</label></td>
+			<td nowrap="nowrap"><label><fmt:message key="signupload.signaturetype"/>:</label></td>
 			<td>
-				<select class="field" name="sig_type">
-					<option value="SIGNATURBLOCK_DE" selected="selected">Standardsignatur Deutsch</option>
-					<option value="SIGNATURBLOCK_EN" >Standardsignatur Englisch</option>
+				<select class="field" name="<%= FormFields.FIELD_SIGNATURE_TYPE %>" onchange="return updateForm();">
+					<option value="SIGNATURBLOCK_DE" <%= "SIGNATURBLOCK_DE".equals(type) ? "selected=\"selected\"" : "" %>><fmt:message key="signupload.signaturetype.signaturblock.de"/></option>
+					<option value="SIGNATURBLOCK_EN" <%= "SIGNATURBLOCK_EN".equals(type) ? "selected=\"selected\"" : "" %>><fmt:message key="signupload.signaturetype.signaturblock.en"/></option>
 				</select>			
 				<!-- %= // FormFields.generateTypeSelectBox() % -->
 			</td>
 		</tr>
 		<tr>
-			<td nowrap="nowrap"><label>Signatur Modus:</label></td>
+			<td nowrap="nowrap"><label><fmt:message key="signupload.signaturemode"/>:</label></td>
 			<td>
-				<select name="<%= FormFields.FIELD_MODE %>">
-				<option value="<%= FormFields.VALUE_MODE_BINARY %>">bin&auml;r</option>
-				<option value="<%= FormFields.VALUE_MODE_TEXTUAL %>" selected="selected">textuell</option>
-					<!--
-						<option value="<%= FormFields.VALUE_MODE_DETACHED %>">detached</option>
-					-->
-				</select>
+				<% if (forceTextualForMocca && Constants.SIGNATURE_DEVICE_MOC.equals(device)) {%>
+					<fmt:message key="common.textual"/>
+					<input type="hidden" name="<%= FormFields.FIELD_MODE %>" value="<%= FormFields.VALUE_MODE_TEXTUAL %>"/>
+				<% } else { %>
+					<select name="<%= FormFields.FIELD_MODE %>" onchange="return updateForm();">
+					<option value="<%= FormFields.VALUE_MODE_BINARY %>" <%= FormFields.VALUE_MODE_BINARY.equals(mode) ? "selected=\"selected\"" : "" %>><fmt:message key="common.binary"/></option>
+					<option value="<%= FormFields.VALUE_MODE_TEXTUAL %>" <%= FormFields.VALUE_MODE_TEXTUAL.equals(mode) ? "selected=\"selected\"" : "" %>><fmt:message key="common.textual"/></option>
+						<!--
+							<option value="<%= FormFields.VALUE_MODE_DETACHED %>">detached</option>
+						-->
+					</select>
+				<% } %>
 			</td>
 		</tr>
 		<tr>
-			<td nowrap="nowrap"><label>Signaturger&auml;t:</label></td>
+			<td nowrap="nowrap"><label><fmt:message key="signupload.signaturedevice"/>:</label></td>
 			<td>
-				<select name="connector">
-					<option value="<%= Constants.SIGNATURE_DEVICE_BKU %>">BKU</option>
-					<option value="<%= Constants.SIGNATURE_DEVICE_MOC %>" selected="selected">MOCCA</option>
+				<select name="<%= FormFields.FIELD_CONNECTOR %>" onchange="return updateForm();">
+					<option value="<%= Constants.SIGNATURE_DEVICE_BKU %>" <%= Constants.SIGNATURE_DEVICE_BKU.equals(device) ? "selected=\"selected\"" : "" %>><fmt:message key="common.bku"/></option>
+					<option value="<%= Constants.SIGNATURE_DEVICE_MOC %>" <%= Constants.SIGNATURE_DEVICE_MOC.equals(device) ? "selected=\"selected\"" : "" %>><fmt:message key="common.mocca"/></option>
 				</select>
 			</td>
 		</tr>
+		<tr>
+			<td nowrap="nowrap"><label><fmt:message key="signupload.file"/>:</label></td>
+			<td><input size="50" type="file" id="fileupload" name="<%= FormFields.FIELD_UPLOAD %>" accept="application/pdf"/></td>
+		</tr>
 	</table>
-	<div class="pdfasnote"><span class="pdfasemphasis">Bitte beachten Sie:</span> Im textuellen Modus signierte Dokumente k&ouml;nnen nur dann gepr&uuml;ft werden, wenn das Zertifikat in einem Verzeichnisdienst verf&uuml;gbar ist.</div>
+	<div class="pdfasnote"><span class="pdfasemphasis"><fmt:message key="signupload.note.prefix"/>:</span> <fmt:message key="signupload.note"/></div>
 
 	<input type="hidden" name="<%= FormFields.FIELD_DOWNLOAD %>" value="<%= FormFields.VALUE_DOWNLOAD_ATTACHMENT %>"/>
 	<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />
 
 	<div class="pdfasverticalspace"></div>
 	
-	<jsp:include page="SIGNATURBLOCK_DE.jsp"/>
+	<jsp:include page="SIGNATURBLOCK.jsp"/>
 	
-	<div class="pdfasnote">Das Erscheinungsbild der Signaturmarke kann abh&auml;ngig vom Signatur Typ, vom Signatur Modus, von der verwendeten B&uuml;rgerkarte, sowie von der verwendeten B&uuml;rgerkartenumgebung variieren.</div>
-	<div>
-		<!-- =============================================== Start BKU-Erkennung -->
-		<iframe src="<%= request.getContextPath() %>/bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>
-		<!-- ================================================ Stop BKU-Erkennung -->
-	</div>
-	<input type="submit" value="Signatur erstellen" />
-	<input type="submit" value="Vorschau" onclick="document.submitform.<%= FormFields.FIELD_PREVIEW %>.value='true'" />
+	<div class="pdfasnote"><fmt:message key="signupload.noteonsigmark"/></div>
+	<% if (Constants.SIGNATURE_DEVICE_BKU.equals(device)) { %>
+		<div>
+			<!-- =============================================== Start BKU-Erkennung -->
+			<iframe src="<%= request.getContextPath() %>/bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>
+			<!-- ================================================ Stop BKU-Erkennung -->
+		</div>
+	<% } else if (Constants.SIGNATURE_DEVICE_MOC.equals(device)) { %>
+		<div>
+			<img src="images/chiperling.jpg" width="57" height="57" alt="<fmt:message key="common.mocca"/>"/>
+		</div>
+	<% } else { %>
+		<div class="pdfasverticalspace"></div>
+	<% } // end if %>
+		<div>
+			<input type="submit" value="<fmt:message key="signupload.button.sign"/>" onclick="return submitForm(false);"/>
+			<input type="submit" value="<fmt:message key="signupload.button.preview"/>" onclick="return submitForm(true);"/>
+		</div>
 	
 </form>
 
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/src/main/webapp/jsp/verifylist.jsp b/src/main/webapp/jsp/verifylist.jsp
index fac5755..c04928a 100644
--- a/src/main/webapp/jsp/verifylist.jsp
+++ b/src/main/webapp/jsp/verifylist.jsp
@@ -7,6 +7,7 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.VerifyPreviewServlet" %>
 <%@ page import="at.gv.egiz.pdfas.web.VerifySessionInformation" %>
 <%@ page import="at.gv.egiz.pdfas.web.helper.SessionHelper"%>
+<%@ include file="language.jsp" %>
 <%
 
   VerifySessionInformation si = (VerifySessionInformation) SessionHelper.getSession(request);
@@ -18,16 +19,16 @@
 <html>
 	<head>
 	  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	  <title>PDF-Signaturen</title>
+	  <title><fmt:message key="common.title"/></title>
 	</head>
 	<body>
-		<h1>PDF-Signaturen</h1>
+		<h1><fmt:message key="common.title"/></h1>
 		<%
 			if (signature_holders.size() > 1) {
 		%>
-		<h2>Dokument Signaturen pr&uuml;fen</h2>
+		<h2><fmt:message key="verifylist.heading2.plural"/></h2>
 		<% } else { %>
-		<h2>Dokument Signatur pr&uuml;fen</h2>
+		<h2><fmt:message key="verifylist.heading2.singular"/></h2>
 		<%
 			}
 		%>
@@ -44,7 +45,7 @@
 			      style="float:left;">
 				<input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= i %>" />      
 				<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />      
-				<input type="submit" value="Nur diese Signatur pr&uuml;fen" />
+				<input type="submit" value="<fmt:message key="verifylist.button.verifysinglesignature"/>" />
 			</form>
 			<form action="<%= response.encodeURL(request.getContextPath() + "/VerifyPreview") %>"
 			      accept-charset="UTF-8"
@@ -52,7 +53,7 @@
 			      style="float:left;">
 				<input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= i %>" />      
 				<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="true" />      
-				<input type="submit" value="Vorschau..." />
+				<input type="submit" value="<fmt:message key="verifylist.button.preview"/>" />
 			</form>
 		</div>
 		<%
@@ -65,9 +66,9 @@
 		      method="get">
 			<input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= FormFields.VALUE_VERIFY_WHICH_ALL %>" />      
 			<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />      
-			<input type="submit" value="Alle pr&uuml;fen" />
+			<input type="submit" value="<fmt:message key="verifylist.button.verifyallsignatures"/>" />
 		</form>
 		<div class="pdfasverticalspace"></div>
-		<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zur&uuml;ck</a>
+		<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp"><fmt:message key="common.back"/></a>
 	</body>
 </html>
diff --git a/src/main/webapp/jsp/verifypreview.jsp b/src/main/webapp/jsp/verifypreview.jsp
index 1b0adfa..5b6ae6e 100644
--- a/src/main/webapp/jsp/verifypreview.jsp
+++ b/src/main/webapp/jsp/verifypreview.jsp
@@ -8,6 +8,7 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.VerifyPreviewServlet" %>
 <%@ page import="at.gv.egiz.pdfas.web.VerifySessionInformation" %>
 <%@ page import="at.gv.egiz.pdfas.web.helper.SessionHelper"%>
+<%@ include file="language.jsp" %>
 <%
 	String btlurl = (String)request.getAttribute("btlurl");
 
@@ -21,7 +22,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-  <title>PDF-Signaturen</title>
+  <title><fmt:message key="common.title"/></title>
 	<script type="text/javascript">
 		<!--
 		function initSigValues() {
@@ -31,26 +32,26 @@
 	</script>
 </head>
 <body">
-<h1>PDF-Signaturen</h1>
-<h2>Vorschau: Dokument pr&uuml;fen</h2>
+<h1><fmt:message key="common.title"/></h1>
+<h2><fmt:message key="verifypreview.heading2"/></h2>
 <form action="<%= response.encodeURL(request.getContextPath() + "/VerifyPreview") %>"
       name="submitform"
       enctype="multipart/form-data"
       accept-charset="UTF-8"
       method="post">
 	<input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= verify_which %>" />
-	<div class="pdfasnote"><label>Rekonstruktion der Signaturmarke:</label></div>
+	<div class="pdfasnote"><label><fmt:message key="verifypreview.reconstruction"/>:</label></div>
 	<div class="pdfasverticalspace"></div>
 	<textarea class="pdfaspreviewfield" rows="14" name="<%= FormFields.FIELD_RAW_DOCUMENT_TEXT %>"><%= ((TextualSignatureHolder)signature_holder).getSignedText() %></textarea>	
 	<%= VerifyPreviewServlet.renderRequiredKeys(signature_holder.getSignatureObject(), "", false) %>
 	<br />
 	<input type="hidden" name="verify" value="false" />
-	<input type="submit" value="Werte &uuml;bernehmen" />
-	<input type="submit" value="Werte &uuml;bernehmen und pr&uuml;fen" onclick="document.submitform.verify.value='true'" />
+	<input type="submit" value="<fmt:message key="verifypreview.applyvalues"/>" />
+	<input type="submit" value="<fmt:message key="verifypreview.applyvaluesandverify"/>" onclick="document.submitform.verify.value='true'" />
 </form>
 <div class="pdfasverticalspace"></div>
-<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zur&uuml;ck</a>
-<a href="<%=btlurl%>">zur&uuml;ck zur Liste</a>
+<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp"><fmt:message key="common.back"/></a>
+<a href="<%=btlurl%>"><fmt:message key="common.backtolist"/></a>
 	<script language="javascript" type="text/javascript">
 		<!--
 			initSigValues();
diff --git a/src/main/webapp/jsp/verifyupload.jsp b/src/main/webapp/jsp/verifyupload.jsp
index 54823f5..6e2f237 100644
--- a/src/main/webapp/jsp/verifyupload.jsp
+++ b/src/main/webapp/jsp/verifyupload.jsp
@@ -1,24 +1,27 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
+
+<%@ include file="language.jsp" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-  <title>PDF-Signaturen</title>
+  <title><fmt:message key="common.title"/></title>
 </head>
 <body>
-<h1>PDF-Signaturen</h1>
-<h2>Dokument Signatur pr&uuml;fen</h2>
-<div class="pdfasnote">Hier bitte den vollst&auml;ndigen Dokumenttext samt Signaturblock eingeben.<br/></div>
+<h1><fmt:message key="common.title"/></h1>
+<h2><fmt:message key="verifyupload.heading2"/></h2>
+<div class="pdfasnote"><fmt:message key="verifyupload.note"/><br/></div>
 <form name="submitform" enctype="multipart/form-data" method="post" action="<%= request.getContextPath() %>/Verify" accept-charset="UTF-8">
 	<textarea class="pdfaspreviewfield" rows="14" name="<%= FormFields.FIELD_UPLOAD %>"></textarea>
 	<table border="0" cellspacing="0" cellpadding="4" id="pdfasupperformtable">
 		<tr>
-			<td nowrap="nowrap"><label>Pr&uuml;f Applikation:</label></td>
+			<td nowrap="nowrap"><label><fmt:message key="verifyupload.verifydevice"/>:</label></td>
 			<td><%= FormFields.generateConnectorSelectBox() %></td>
 		</tr>
 		<tr>
-			<td nowrap="nowrap"><label>Pr&uuml;f Modus:</label></td>
-			<td><span>textuell</span></td>
+			<td nowrap="nowrap"><label><fmt:message key="verifyupload.verifymode"/>:</label></td>
+			<td><span><fmt:message key="common.textual"/></span></td>
 		</tr>
 	</table>
 
@@ -28,11 +31,11 @@
 		<!-- ================================================ Stop BKU-Erkennung -->
 	</div>
 	<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />
-	<input type="submit" value="Alle pr&uuml;fen" />
-	<input type="submit" value="Signaturen auflisten" onclick="document.submitform.<%= FormFields.FIELD_PREVIEW %>.value='true'" />
+	<input type="submit" value="<fmt:message key="verifyupload.button.verifyallsignatures"/>" />
+	<input type="submit" value="<fmt:message key="verifyupload.button.listsignatures"/>" onclick="document.submitform.<%= FormFields.FIELD_PREVIEW %>.value='true'" />
 	
 </form>
 <div class="pdfasverticalspace"></div>
-<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>
+<a href="<%= request.getContextPath() %>/"><fmt:message key="common.back"/></a>
 </body>
 </html>
 \ No newline at end of file