default locale: en, help pages fixed

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@748 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

116 files changed, 741 insertions, 1862 deletions

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 7873b263..9344181a 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -38,7 +38,6 @@ import org.slf4j.LoggerFactory;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIImpl;
-import at.gv.egiz.bku.gui.DeafHelpListener;
 import at.gv.egiz.bku.gui.HelpListener;
 import at.gv.egiz.bku.gui.viewer.FontProvider;
 import at.gv.egiz.stal.service.STALPortType;
@@ -155,11 +154,14 @@ public class BKUApplet extends JApplet {
     HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
 
     String locale = getParameter(LOCALE);
+    log.trace("requested locale: {}, jvm default locale: {}", locale, Locale.getDefault());
     if (locale != null) {
+      if (locale.indexOf('_') > 0) {
+        locale = locale.substring(0, locale.indexOf('_'));
+      }
       this.setLocale(new Locale(locale));
     }
-    log.trace("Default locale: {}.", Locale.getDefault());
-    log.debug("Applet locale set to: {}.", getLocale());
+    log.trace("Applet locale set to: {} (will be used as a hint for resource bundle loading).", getLocale());
 
     if (Boolean.parseBoolean(getParameter(ENFORCE_RECOMMENDED_PIN_LENGTH))) {
       SignatureCardFactory.ENFORCE_RECOMMENDED_PIN_LENGTH = true;
@@ -185,7 +187,7 @@ public class BKUApplet extends JApplet {
       log.warn("Cannot load applet background image. {}", ex.getMessage());
     }
 
-    helpListener = new DeafHelpListener(getParameter(HELP_URL), getLocale());
+    helpListener = new HelpListener(getParameter(HELP_URL), getLocale());
 
     SwitchFocusListener switchFocusListener = new SwitchFocusListener(
             getAppletContext(), "focusToBrowser");
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index d806c5fa..578df527 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -2290,26 +2290,20 @@ public class BKUGUIImpl implements BKUGUIFacade {
 	 * @param locale
 	 */
 	protected void loadMessageBundle(Locale locale) {
-		if (locale != null) {
-			// see [#378] Ignoring post parameter 'locale': bundle resolve-order
+    if (locale != null) {
+      // see [#378] Ignoring post parameter 'locale': bundle resolve-order
 			// not correct?!
-			Locale lang = new Locale(locale.getLanguage().substring(0, 2));
-			log.debug("Loading message bundle for language: {}.", lang.toString());
-			messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, lang);
-		} else {
-			log.debug("Loading default language message bundle.");
-			messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
-		}
+			log.debug("Loading message bundle for language: {}.", locale);
+			messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
+    } else {
+      messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
+    }
 
-		if (log.isDebugEnabled()) {
-			if (messages.getLocale() == null
-					|| "".equals(messages.getLocale().getLanguage())) {
-				log.info("Fallback to default locale message bundle.");
-			} else {
-				log.info("Applet message bundle loaded for {}.",
-						messages.getLocale());
-			}
-		}
+    if ("".equals(messages.getLocale().getLanguage())) {
+      log.debug("Using locale 'default'.");
+    } else {
+      log.debug("Using locale '{}'.", messages.getLocale());
+    }
 	}
 
 	protected int initButtonSize() {
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DeafHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DeafHelpListener.java
deleted file mode 100644
index a4ce79b0..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DeafHelpListener.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package at.gv.egiz.bku.gui;
-
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import java.util.Locale;
-
-public class DeafHelpListener extends HelpListener {
-
-  // localization in helpListener (pass message bundle, getLocale, add language to helpContext) or outside?
-  public DeafHelpListener(String helpURL, Locale locale) {
-    super(helpURL, locale);
-  }
-
-  @Override
-  public boolean implementsListener() {
-    return false;
-  }
-
-  @Override
-  public void mouseClicked(MouseEvent arg0) {
-  }
-
-  @Override
-  public void keyPressed(KeyEvent arg0) {
-  }
-
-  @Override
-  public void mousePressed(MouseEvent e) {
-  }
-
-  @Override
-  public void mouseReleased(MouseEvent e) {
-  }
-
-  @Override
-  public void mouseEntered(MouseEvent e) {
-  }
-
-  @Override
-  public void mouseExited(MouseEvent e) {
-  }
-
-  @Override
-  public void keyTyped(KeyEvent e) {
-  }
-
-  @Override
-  public void keyReleased(KeyEvent e) {
-  }
-
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java
index dc597656..2f6f1738 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java
@@ -16,14 +16,16 @@
  */
 package at.gv.egiz.bku.gui;
 
+import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.Locale;
 import java.util.ResourceBundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class HelpListener implements MouseListener, KeyListener, HelpURLProvider {
+public class HelpListener implements MouseListener, KeyListener, HelpURLProvider {
 
   public static final String MESSAGE_BUNDLE = "at/gv/egiz/bku/gui/Messages";
 
@@ -32,23 +34,22 @@ public abstract class HelpListener implements MouseListener, KeyListener, HelpUR
   protected String helpTopic;
   protected ResourceBundle messageBundle;
 
-  // localization in helpListener (pass message bundle, getLocale, add language to helpContext) or outside?
-  public HelpListener(String helpURL, Locale locale) {
-//    this.codebase = codebase;
-    this.helpURL = helpURL;
+  public HelpListener(String baseHelpURL, Locale locale) {
+
+    helpURL = baseHelpURL;
 
     if (locale != null) {
-      log.trace("Check for support of requested help locale {}.", locale.getLanguage().substring(0,2));
-      messageBundle = ResourceBundle.getBundle(MESSAGE_BUNDLE,
-              new Locale(locale.getLanguage().substring(0, 2)));
+      log.trace("Check for support of requested help locale {}.", locale);
+      messageBundle = ResourceBundle.getBundle(MESSAGE_BUNDLE, locale);
     } else {
       messageBundle = ResourceBundle.getBundle(MESSAGE_BUNDLE);
     }
-    if (!"".equals(messageBundle.getLocale().getLanguage())) {
-      log.trace("Using help locale '{}'.", messageBundle.getLocale().getLanguage().substring(0,2));
-      helpURL += messageBundle.getLocale().getLanguage().substring(0,2) + '/';
-    } else {
+
+    if ("".equals(messageBundle.getLocale().getLanguage())) {
       log.trace("Using help locale 'default'.");
+    } else {
+      log.trace("Using help locale '{}'.", messageBundle.getLocale());
+      helpURL += messageBundle.getLocale().getLanguage() + '/';
     }
     
     log.debug("Setting help context to {}.", helpURL);
@@ -66,9 +67,11 @@ public abstract class HelpListener implements MouseListener, KeyListener, HelpUR
       log.debug("No help topic set, return index.");
       return helpURL + "index.html";
     }
-    String url = helpURL + helpTopic + ".html";
-    log.debug("Return help topic: {}.", url);
-    return url;
+    StringBuilder url = new StringBuilder(helpURL);
+    url.append(helpTopic);
+    url.append(".html");
+    log.debug("Return help url: {}.", url.toString());
+    return url.toString();
   }
 
   /**
@@ -79,6 +82,39 @@ public abstract class HelpListener implements MouseListener, KeyListener, HelpUR
    * (whether a help icon shall be included)
    * @return true if this HelpListener implements the Mouse/KeyListeners 
    */
-  public abstract boolean implementsListener();
-  
+  public boolean implementsListener() {
+    return false;
+  }
+
+  @Override
+  public void mouseClicked(MouseEvent arg0) {
+  }
+
+  @Override
+  public void keyPressed(KeyEvent arg0) {
+  }
+
+  @Override
+  public void mousePressed(MouseEvent e) {
+  }
+
+  @Override
+  public void mouseReleased(MouseEvent e) {
+  }
+
+  @Override
+  public void mouseEntered(MouseEvent e) {
+  }
+
+  @Override
+  public void mouseExited(MouseEvent e) {
+  }
+
+  @Override
+  public void keyTyped(KeyEvent e) {
+  }
+
+  @Override
+  public void keyReleased(KeyEvent e) {
+  }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
index bfd797e8..0322d5a6 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
@@ -27,6 +27,7 @@ import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.net.URL;
 import java.text.MessageFormat;
+import java.util.Locale;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
 import javax.swing.JButton;
@@ -49,6 +50,8 @@ import org.slf4j.LoggerFactory;
 public class HelpViewer extends JDialog
         implements ActionListener {
 
+  public static final String MESSAGE_BUNDLE = "at/gv/egiz/bku/gui/Messages";
+
   private static final long serialVersionUID = 1L;
 
   private final Logger log = LoggerFactory.getLogger(HelpViewer.class);
@@ -65,29 +68,24 @@ public class HelpViewer extends JDialog
    * @param messages
    */
   public static void showHelpDialog(AppletContext ctx,
-          URL helpURL,
-//          String helpTopic,
-          ResourceBundle messages) {
-    showHelpDialog(null, ctx, helpURL, messages); //helpTopic, messages);
+          URL helpURL, ResourceBundle messages) {
+    showHelpDialog(null, ctx, helpURL, messages); 
   }
 
-  public static void showHelpDialog(URL helpURL,
-//          String helpTopic,
-          ResourceBundle messages) {
-    showHelpDialog(null, null, helpURL, messages); // helpTopic, messages);
+  public static void showHelpDialog(URL helpURL, ResourceBundle messages) {
+    showHelpDialog(null, null, helpURL, messages);
   }
 
   public static void showHelpDialog(Component owner,
           AppletContext ctx,
           URL helpURL,
-//          String helpTopic,
           ResourceBundle messages) {
 
     Frame frame = null;
     if (owner != null) {
       JOptionPane.getFrameForComponent(owner);
     }
-    dialog = new HelpViewer(frame, messages, ctx, helpURL); //, helpTopic);
+    dialog = new HelpViewer(frame, messages, ctx, helpURL); 
     dialog.setVisible(true);
     dialog.toFront();
   }
@@ -95,14 +93,12 @@ public class HelpViewer extends JDialog
   private HelpViewer(Frame frame,
           ResourceBundle messages,
           AppletContext ctx,
-          URL helpURL) { //, String helpTopic) {
+          URL helpURL) {
     super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_HELP), true);
     this.messages = messages;
     this.ctx = ctx;
 
-//    String p = messages.getString(BKUGUIFacade.MESSAGE_HELP);
-//    String helpItem = messages.getString(helpTopic);
-//    String viewerLabel = MessageFormat.format(p, new Object[]{helpItem});
+    log.trace("init help viewer for locale ", messages.getLocale());
 
     JPanel helpPanel = createViewerPanel(helpURL); //viewerLabel, helpURL);
     JPanel buttonPanel = createButtonPanel();
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java
index 4860756d..3d01c404 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java
@@ -74,28 +74,4 @@ public class ViewerHelpListener extends HelpListener {
   public void keyPressed(KeyEvent arg0) {
     displayHelpViewer(getHelpURL());
   }
-
-  @Override
-  public void mousePressed(MouseEvent e) {
-  }
-
-  @Override
-  public void mouseReleased(MouseEvent e) {
-  }
-
-  @Override
-  public void mouseEntered(MouseEvent e) {
-  }
-
-  @Override
-  public void mouseExited(MouseEvent e) {
-  }
-
-  @Override
-  public void keyTyped(KeyEvent e) {
-  }
-
-  @Override
-  public void keyReleased(KeyEvent e) {
-  }
 }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index ac8b2777..6381bdf9 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -13,98 +13,97 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-title.welcome=<html>Willkommen</html>
-title.insertcard=<html>Keine B\u00FCrgerkarte gefunden</html>
-title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
-title.verify.pin=<html>Karte wird gelesen</html>
-title.sign=<html>Signatur erstellen</html>
-title.verify.pinpad=<html>PIN eingeben
-title.error=<html>Fehler</html>
-title.warning=<html>Achtung
-title.entry.timeout=<html>Zeit\u00FCberschreitung</html>
-title.retry=<html>Falsche PIN</html>
-title.wait=<html>Bitte warten</html>
-title.signature.data=<html>Signaturdaten</html>
-windowtitle.save=Signaturdaten speichern
-windowtitle.error=Fehler
-windowtitle.savedir=Signaturdaten in Verzeichnis speichern
-windowtitle.overwrite=Datei \u00FCberschreiben?
-windowtitle.viewer=Signaturdaten
-windowtitle.help=Hilfe zur B\u00FCrgerkarte
+title.welcome=<html>Welcome</html>
+title.insertcard=<html>No citizen card found</html>
+title.cardnotsupported=<html>This card is not supported</html>
+title.verify.pin=<html>Reading card</html>
+title.sign=<html>Create signature</html>
+title.verify.pinpad=<html>Enter PIN
+title.error=<html>Error</html>
+title.warning=<html>Warning
+title.entry.timeout=<html>Timeout</html>
+title.retry=<html>Wrong PIN</html>
+title.wait=<html>Please wait</html>
+title.signature.data=<html>Signature data</html>
+windowtitle.save=Save signature data
+windowtitle.error=Error
+windowtitle.savedir=Save signature data to directory
+windowtitle.overwrite=Overwrite file?
+windowtitle.viewer=Signature data
+windowtitle.help=Citizen card help
 
 # removed message.* prefix to reuse keys as help keys
-welcome=<html>Bitte warten...</html>
-wait=<html>Bitte warten...</html>
-cardnotsupported=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
-insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
-enterpin=<html>{0} eingeben</html>
-enterpin.pinpad=<html>PIN am Kartenleser eingeben</html>
-enterpin.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben</html>
-hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
-hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
-hashdatalink.focus=<html><a href=\"anzeige\">[Signaturdaten anzeigen]</a></html>
-hashdatalink.tiny.focus=<html><a href=\"anzeige\">[Signaturdaten]</a></html>
-#message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
-#message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html> 
-#verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
-hashdatalist=<html>{0} Signaturdaten:</html>
-hashdata.viewer=<html>Signaturdaten werden im Betrachter angezeigt
-unsupported.mimetype=<html>Signaturdaten speichern und mit einem geeigneten {0} Betrachter \u00F6ffnen.
-retries.last=<html>Letzter Versuch!</html>
-retries=<html>Noch {0} Versuche</html>
-retries.pinpad.last=<html>Eingabe wiederholen, letzter Versuch!</html>
-retries.pinpad=<html>Eingabe wiederholen, noch {0} Versuche</html>
-overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
-help=<html>Hilfe zu {0}</html>
+welcome=<html>Please wait...</html>
+wait=<html>Please wait...</html>
+insertcard=<html>Please insert your citizen card into the reader</html>
+cardnotsupported=<html>Please insert your citizen card into the reader</html>
+enterpin=<html>Enter {0}</html>
+enterpin.pinpad=<html>Enter PIN on card reader pinpad</html>
+enterpin.pinpad.direct=<html>Enter {0} ({1} digits) on card reader pinpad</html>
+hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
+hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
+hashdatalink.focus=<html><a href=\"anzeige\">[Display signature data]</a></html>
+hashdatalink.tiny.focus=<html><a href=\"anzeige\">[signature data]</a></html>
+#message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
+hashdatalist=<html>{0} signature data objects:</html>
+hashdata.viewer=<html>Signature data is being displayed in viewer
+unsupported.mimetype=<html>Save and open signature data with appropriate {0} viewer.
+retries.last=<html>Last try!</html>
+retries=<html>{0} tries left</html>
+retries.pinpad.last=<html>Re-enter pin, last try!</html>
+retries.pinpad=<html>Re-enter pin, {0} tries left</html>
+overwrite=<html>Overwrite {0}?</html>
+help=<html>Help topic {0}</html>
 
-warning.xhtml=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
+warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standard-compliant display see help.</html>
 label.pin=<html>{0}:</html>
-label.pinsize=<html>({0} stellig)</html>
+label.pinsize=<html>({0} digits)</html>
 button.ok=OK
-button.cancel=Abbrechen
-button.back=Zur\u00FCck
-button.sign=Signieren
-button.save=Speichern...
-button.close=Schlie\u00DFen
-mimetype.desc.xml=XML-Dateien (.xml)
-mimetype.desc.html=HTML-Dateien (.html, .htm)
-mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
-mimetype.desc.txt=Textdateien (.txt)
-mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
-mimetype.desc.bin=Bin\u00E4rdateien (.bin)
-mimetype.desc.doc=Microsoft Word-Dateien (.doc)
-mimetype.desc.unknown=Alle Dateien (.*)
-save.hashdatainput.prefix=Signaturdaten
-alt.help=Hilfe
-dialog.sigpin.infolabel.sigdata.tooltiptext=Signaturdaten in neuem Fenster anzeigen
+button.cancel=Cancel
+button.back=Back
+button.sign=Sign
+button.save=Save...
+button.close=Close
+mimetype.desc.xml=XML-files (.xml)
+mimetype.desc.html=HTML-files (.html, .htm)
+mimetype.desc.xhtml=XHTML-files (.xhtml)
+mimetype.desc.txt=Textfiles (.txt)
+mimetype.desc.pdf=Adobe PDF-files (.pdf)
+mimetype.desc.bin=Binary files (.bin)
+mimetype.desc.doc=Microsoft Word-files (.doc)
+mimetype.desc.unknown=All files (.*)
+save.hashdatainput.prefix=signaturedata
+alt.help=help
+dialog.sigpin.infolabel.sigdata.tooltiptext=Show signature data in new window
+
 
 # Error Messages
-error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
-error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
-error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
-error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
-error.ws.unreachable=<html>Der Server ist nicht erreichbar</html>
-#error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
-error.pcsc=<html>Es konnte keine PC/SC Schnittstelle gefunden werden</html>
-error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden</html>
-error.unknown.param=<html>Ein Fehler trat auf: {0}</html>
-error.unknown=<html>Ein Fehler trat auf</html>
-error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
-error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
-error.card.notactivated=<html>Die B\u00FCrgerkarte ist nicht aktiviert</html>
-error.pin.timeout=<html>Zeit\u00FCberschreitung bei Eingabe der PIN</html>
-error.viewer=<html>Der Inhalt kann nicht dargestellt werden: {0}
-error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
-error.config=<html>Fehlerhafte Konfiguration des Systems: {0}</html>
+error.no.hashdata=<html>No signature data available: {0}</html>
+error.display.hashdata=<html>Could not display signature data: {0}</html>
+error.write.hashdata=<html>Could not save signature data: {0}</html>
+error.invalid.hash=<html>Invalid signature data: {0}</html>
+error.ws.unreachable=<html>Server unreachable</html>
+#error.ws.unreachable=<html>Web-service unreachable: {0}</html>
+error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
+error.cardterminal=<html>Could not find smartcard reader</html>
+error.unknown.param=<html>An error occured: {0}</html>
+error.unknown=<html>An error occured</html>
+error.test=<html>Error1 {0} - Error2 {1}</html>
+error.card.locked=<html>Citizen card is locked</html>
+error.card.notactivated=<html>Citizen card not activated</html>
+error.pin.timeout=<html>Timeout during PIN entry</html>
+error.viewer=<html>Failed to display contents: {0}
+error.external.link=<html>Cannot open external link {0}</html>
+error.config=<html>Incorrect system configuration: {0}</html>
 
 # Help Topics
-help.welcome=Startseite
-help.wait=Bitte Warten Bildschirm
-help.cardnotsupported=Nicht unterst\u00FCtzte B\u00FCrgerkarte
-help.insertcard=Keine B\u00FCrgerkarte im Kartenleser
-help.cardpin=Pineingabe
-help.signpin=Signatur-Pineingabe
-help.retry=Falsche Pin
-help.hashdata=Signierte Inhalte
-help.hashdatalist=Signierte Inhalte
-help.hashdataviewer=Anzeige signierter Inhalte
\ No newline at end of file
+help.welcome=Welcome page
+help.wait=Wait screen
+help.cardnotsupported=Unsupported citizen card
+help.insertcard=No citizen card found
+help.cardpin=Pin entry
+help.signpin=Signature pin entry
+help.retry=Wrong Pin
+help.hashdata=Signed contents
+help.hashdatalist=Signed contents
+help.hashdataviewer=Display of signed contents
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
new file mode 100644
index 00000000..ac8b2777
--- /dev/null
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
@@ -0,0 +1,110 @@
+# Copyright 2008 Federal Chancellery Austria and
+# Graz University of Technology
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+title.welcome=<html>Willkommen</html>
+title.insertcard=<html>Keine B\u00FCrgerkarte gefunden</html>
+title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
+title.verify.pin=<html>Karte wird gelesen</html>
+title.sign=<html>Signatur erstellen</html>
+title.verify.pinpad=<html>PIN eingeben
+title.error=<html>Fehler</html>
+title.warning=<html>Achtung
+title.entry.timeout=<html>Zeit\u00FCberschreitung</html>
+title.retry=<html>Falsche PIN</html>
+title.wait=<html>Bitte warten</html>
+title.signature.data=<html>Signaturdaten</html>
+windowtitle.save=Signaturdaten speichern
+windowtitle.error=Fehler
+windowtitle.savedir=Signaturdaten in Verzeichnis speichern
+windowtitle.overwrite=Datei \u00FCberschreiben?
+windowtitle.viewer=Signaturdaten
+windowtitle.help=Hilfe zur B\u00FCrgerkarte
+
+# removed message.* prefix to reuse keys as help keys
+welcome=<html>Bitte warten...</html>
+wait=<html>Bitte warten...</html>
+cardnotsupported=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+enterpin=<html>{0} eingeben</html>
+enterpin.pinpad=<html>PIN am Kartenleser eingeben</html>
+enterpin.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben</html>
+hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
+hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
+hashdatalink.focus=<html><a href=\"anzeige\">[Signaturdaten anzeigen]</a></html>
+hashdatalink.tiny.focus=<html><a href=\"anzeige\">[Signaturdaten]</a></html>
+#message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
+#message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html> 
+#verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
+hashdatalist=<html>{0} Signaturdaten:</html>
+hashdata.viewer=<html>Signaturdaten werden im Betrachter angezeigt
+unsupported.mimetype=<html>Signaturdaten speichern und mit einem geeigneten {0} Betrachter \u00F6ffnen.
+retries.last=<html>Letzter Versuch!</html>
+retries=<html>Noch {0} Versuche</html>
+retries.pinpad.last=<html>Eingabe wiederholen, letzter Versuch!</html>
+retries.pinpad=<html>Eingabe wiederholen, noch {0} Versuche</html>
+overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
+help=<html>Hilfe zu {0}</html>
+
+warning.xhtml=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
+label.pin=<html>{0}:</html>
+label.pinsize=<html>({0} stellig)</html>
+button.ok=OK
+button.cancel=Abbrechen
+button.back=Zur\u00FCck
+button.sign=Signieren
+button.save=Speichern...
+button.close=Schlie\u00DFen
+mimetype.desc.xml=XML-Dateien (.xml)
+mimetype.desc.html=HTML-Dateien (.html, .htm)
+mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
+mimetype.desc.txt=Textdateien (.txt)
+mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
+mimetype.desc.bin=Bin\u00E4rdateien (.bin)
+mimetype.desc.doc=Microsoft Word-Dateien (.doc)
+mimetype.desc.unknown=Alle Dateien (.*)
+save.hashdatainput.prefix=Signaturdaten
+alt.help=Hilfe
+dialog.sigpin.infolabel.sigdata.tooltiptext=Signaturdaten in neuem Fenster anzeigen
+
+# Error Messages
+error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
+error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
+error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
+error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
+error.ws.unreachable=<html>Der Server ist nicht erreichbar</html>
+#error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
+error.pcsc=<html>Es konnte keine PC/SC Schnittstelle gefunden werden</html>
+error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden</html>
+error.unknown.param=<html>Ein Fehler trat auf: {0}</html>
+error.unknown=<html>Ein Fehler trat auf</html>
+error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
+error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
+error.card.notactivated=<html>Die B\u00FCrgerkarte ist nicht aktiviert</html>
+error.pin.timeout=<html>Zeit\u00FCberschreitung bei Eingabe der PIN</html>
+error.viewer=<html>Der Inhalt kann nicht dargestellt werden: {0}
+error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
+error.config=<html>Fehlerhafte Konfiguration des Systems: {0}</html>
+
+# Help Topics
+help.welcome=Startseite
+help.wait=Bitte Warten Bildschirm
+help.cardnotsupported=Nicht unterst\u00FCtzte B\u00FCrgerkarte
+help.insertcard=Keine B\u00FCrgerkarte im Kartenleser
+help.cardpin=Pineingabe
+help.signpin=Signatur-Pineingabe
+help.retry=Falsche Pin
+help.hashdata=Signierte Inhalte
+help.hashdatalist=Signierte Inhalte
+help.hashdataviewer=Anzeige signierter Inhalte
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
deleted file mode 100644
index 6381bdf9..00000000
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2008 Federal Chancellery Austria and
-# Graz University of Technology
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-title.welcome=<html>Welcome</html>
-title.insertcard=<html>No citizen card found</html>
-title.cardnotsupported=<html>This card is not supported</html>
-title.verify.pin=<html>Reading card</html>
-title.sign=<html>Create signature</html>
-title.verify.pinpad=<html>Enter PIN
-title.error=<html>Error</html>
-title.warning=<html>Warning
-title.entry.timeout=<html>Timeout</html>
-title.retry=<html>Wrong PIN</html>
-title.wait=<html>Please wait</html>
-title.signature.data=<html>Signature data</html>
-windowtitle.save=Save signature data
-windowtitle.error=Error
-windowtitle.savedir=Save signature data to directory
-windowtitle.overwrite=Overwrite file?
-windowtitle.viewer=Signature data
-windowtitle.help=Citizen card help
-
-# removed message.* prefix to reuse keys as help keys
-welcome=<html>Please wait...</html>
-wait=<html>Please wait...</html>
-insertcard=<html>Please insert your citizen card into the reader</html>
-cardnotsupported=<html>Please insert your citizen card into the reader</html>
-enterpin=<html>Enter {0}</html>
-enterpin.pinpad=<html>Enter PIN on card reader pinpad</html>
-enterpin.pinpad.direct=<html>Enter {0} ({1} digits) on card reader pinpad</html>
-hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
-hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
-hashdatalink.focus=<html><a href=\"anzeige\">[Display signature data]</a></html>
-hashdatalink.tiny.focus=<html><a href=\"anzeige\">[signature data]</a></html>
-#message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
-hashdatalist=<html>{0} signature data objects:</html>
-hashdata.viewer=<html>Signature data is being displayed in viewer
-unsupported.mimetype=<html>Save and open signature data with appropriate {0} viewer.
-retries.last=<html>Last try!</html>
-retries=<html>{0} tries left</html>
-retries.pinpad.last=<html>Re-enter pin, last try!</html>
-retries.pinpad=<html>Re-enter pin, {0} tries left</html>
-overwrite=<html>Overwrite {0}?</html>
-help=<html>Help topic {0}</html>
-
-warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standard-compliant display see help.</html>
-label.pin=<html>{0}:</html>
-label.pinsize=<html>({0} digits)</html>
-button.ok=OK
-button.cancel=Cancel
-button.back=Back
-button.sign=Sign
-button.save=Save...
-button.close=Close
-mimetype.desc.xml=XML-files (.xml)
-mimetype.desc.html=HTML-files (.html, .htm)
-mimetype.desc.xhtml=XHTML-files (.xhtml)
-mimetype.desc.txt=Textfiles (.txt)
-mimetype.desc.pdf=Adobe PDF-files (.pdf)
-mimetype.desc.bin=Binary files (.bin)
-mimetype.desc.doc=Microsoft Word-files (.doc)
-mimetype.desc.unknown=All files (.*)
-save.hashdatainput.prefix=signaturedata
-alt.help=help
-dialog.sigpin.infolabel.sigdata.tooltiptext=Show signature data in new window
-
-
-# Error Messages
-error.no.hashdata=<html>No signature data available: {0}</html>
-error.display.hashdata=<html>Could not display signature data: {0}</html>
-error.write.hashdata=<html>Could not save signature data: {0}</html>
-error.invalid.hash=<html>Invalid signature data: {0}</html>
-error.ws.unreachable=<html>Server unreachable</html>
-#error.ws.unreachable=<html>Web-service unreachable: {0}</html>
-error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
-error.cardterminal=<html>Could not find smartcard reader</html>
-error.unknown.param=<html>An error occured: {0}</html>
-error.unknown=<html>An error occured</html>
-error.test=<html>Error1 {0} - Error2 {1}</html>
-error.card.locked=<html>Citizen card is locked</html>
-error.card.notactivated=<html>Citizen card not activated</html>
-error.pin.timeout=<html>Timeout during PIN entry</html>
-error.viewer=<html>Failed to display contents: {0}
-error.external.link=<html>Cannot open external link {0}</html>
-error.config=<html>Incorrect system configuration: {0}</html>
-
-# Help Topics
-help.welcome=Welcome page
-help.wait=Wait screen
-help.cardnotsupported=Unsupported citizen card
-help.insertcard=No citizen card found
-help.cardpin=Pin entry
-help.signpin=Signature pin entry
-help.retry=Wrong Pin
-help.hashdata=Signed contents
-help.hashdatalist=Signed contents
-help.hashdataviewer=Display of signed contents
\ No newline at end of file
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
index 64f7e744..b927aecd 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
@@ -33,7 +33,7 @@ public class SecureViewerDialogTest {
   @BeforeClass
   public static void setUpClass() throws Exception {
     messages = ResourceBundle.getBundle("at/gv/egiz/bku/gui/Messages");
-    secureViewer = new SecureViewerDialog(null, messages,null, null, new DummyFontLoader(), new DeafHelpListener("../help", messages.getLocale()), 1f);
+    secureViewer = new SecureViewerDialog(null, messages,null, null, new DummyFontLoader(), new HelpListener("../help", messages.getLocale()), 1f);
   }
 
   @AfterClass
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index 5ef3edee..87e3f181 100644
--- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -13,71 +13,70 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-title.activation=<html>Aktivierung</html>
-title.pin.mgmt=<html>PIN Verwaltung</html>
-title.activate.pin=<html>PIN aktivieren</html>
-title.change.pin=<html>PIN \u00E4ndern</html>
-title.unblock.pin=<html>PIN entsperren</html>
-#title.verify.pin=<html>PIN Eingeben</html>
-title.activate.success=<html>Erfolg</html>
-title.change.success=<html>Erfolg</html>
-title.unblock.success=<html>Erfolg</html>
+title.activation=<html>Activation</html>
+title.pin.mgmt=<html>PIN Management</html>
+title.activate.pin=<html>Activate PIN</html>
+#title.verify.pin=<html>Enter PIN</html>
+title.change.pin=<html>Change PIN</html>
+title.unblock.pin=<html>Unblock PIN</html>
+title.activate.success=<html>Success</html>
+title.change.success=<html>Success</html>
+title.unblock.success=<html>Success</html>
 
 # removed message.* prefix to reuse keys as help keys
-pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
+pin.mgmt=<html>{0} PINs available
 # software pin-entry messages
-activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
-change.pin=<html>{0} eingeben und best\u00E4tigen</html>
-unblock.pin=<html>PUK zu {0} eingeben</html>
+activate.pin=<html>Enter and confirm {0}
+change.pin=<html>Enter and confirm {0}
+unblock.pin=<html>Enter PUK for {0}
 # start/finish pin-entry messages
-activate.pinpad.current=<html>Transport-PIN am Kartenleser eingeben
-activate.pinpad.new=<html>Neue PIN am Kartenleser eingeben
-activate.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
-change.pinpad.current=<html>Alte PIN am Kartenleser eingeben
-change.pinpad.new=<html>Neue PIN am Kartenleser eingeben
-change.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
-unblock.pinpad.current=<html>PUK am Kartenleser eingeben
-unblock.pinpad.new=<html>Neue PIN am Kartenleser eingeben
-unblock.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
+activate.pinpad.current=<html>Enter transport-PIN on cardreader
+activate.pinpad.new=<html>Enter new PIN on cardreader
+activate.pinpad.confirm=<html>Confirm new PIN on cardreader
+change.pinpad.current=<html>Enter old PIN on cardreader
+change.pinpad.new=<html>Enter new PIN on cardreader
+change.pinpad.confirm=<html>Confirm new PIN on cardreader
+unblock.pinpad.current=<html>Enter PUK on cardreader
+unblock.pinpad.new=<html>Enter new PIN on cardreader
+unblock.pinpad.confirm=<html>Confirm new PIN on cardreader
 # direct pin-entry messages
-activate.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html>
-change.pinpad.direct=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html>
-unblock.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
+activate.pinpad.direct=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case)
+change.pinpad.direct=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case)
+unblock.pinpad.direct=<html>Enter {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case)
 # response messages
-activate.success=<html>{0} wurde erfolgreich aktiviert
-change.success=<html>{0} wurde erfolgreich ge\u00E4ndert
-unblock.success=<html>{0} wurde erfolgreich entsperrt
+activate.success=<html>{0} successfully activated</html>
+change.success=<html>{0} successfully changed</html>
+unblock.success=<html>{0} successfully unblocked
 
-label.activation=<html>e-card Aktivierungsprozess</html>
-label.activation.step=<html>Schritt {0}</html>
-label.activation.idle=<html>Warte auf Server...</html>
-label.old.pin=<html>Alte {0}:</html>
+label.activation=<html>e-card activation process</html>
+label.activation.step=<html>Step {0}</html>
+label.activation.idle=<html>Wait for server...</html>
+label.old.pin=<html>Old {0}:</html>
 label.puk=<html>{0} PUK:</html>
-label.new.pin=<html>Neue {0}:</html>
-label.repeat.pin=<html>Best\u00E4tigung:</html>
+label.new.pin=<html>New {0}:</html>
+label.repeat.pin=<html>Confirmation:</html>
 
-button.activate=Aktivieren
-button.change=\u00C4ndern
-button.unblock=Entsperren
-button.verify=Abfragen
+button.activate=Activate
+button.change=Change
+button.unblock=Unblock
+button.verify=Query
 
 help.activation=help.activation
 help.pin.mgmt=help.pin.mgmt
 
-err.status=<html>Der Status der PINs konnte nicht \u00FCberpr\u00FCft werden.</html>
-err.activate=<html>Beim Aktivieren der {0} trat ein Fehler auf.</html>
-err.change=<html>Beim \u00C4ndern der {0} trat ein Fehler auf.</html>
-err.unblock=<html>Das Entsperren der {0} wird nicht unterst\u00FCtzt.</html>
-err.verify=<html>VERIFY ERROR (TODO)</html>
-err.retries=<html>Falsche {0}, noch {1} Versuche</html>
-err.locked=<html>{0} gesperrt.</html>
-err.not.active=<html>{0} nicht aktiviert.</html>
-err.pin.format=<html>Ung\u00FCltige {0} L\u00E4nge, verlangt sind {1} Stellen.</html>
-err.pin.confirmation=<html>{0} und Best\u00E4tigung stimmen nicht \u00FCberein.</html>
-err.pin.operation.aborted=<html>Der Vorgang f\u00FCr {0} wurde abgebrochen.</html>
-err.unsupported.card=<html>Die Karte wird nicht unterst\u00FCtzt</html>
+err.status=<html>PIN statuses could not be read.</html>
+err.activate=<html>An error occured during the activation of {0}.</html>
+err.change=<html>An error occured during the changing of {0}.</html>
+err.unblock=<html>Unblocking of {0} is not supported.</html>
+err.retries=<html>Wrong {0}, {1} tries remaining</html>
+err.locked=<html>{0} locked</html>
+err.not.active=<html>{0} not activated.</html>
+err.pin.format=<html>Invalid {0} length, {1} digit(s) required.</html>
+err.pin.confirmation=<html>{0} and confirmation do not match.</html>
+err.pin.operation.aborted=<html>The operation on {0} was aborted.</html>
+err.unsupported.card=<html>This card is not supported</html>
 
-status.not.active=NICHT AKTIV
-status.active=AKTIV
-status.blocked=GESPERRT
-status.unknown=UNBEKANNT
+status.not.active=NOT ACTIVE
+status.active=ACTIVE
+status.blocked=BLOCKED
+status.unknown=UNKNOWN
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties
new file mode 100644
index 00000000..5ef3edee
--- /dev/null
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties
@@ -0,0 +1,83 @@
+# Copyright 2008 Federal Chancellery Austria and
+# Graz University of Technology
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+title.activation=<html>Aktivierung</html>
+title.pin.mgmt=<html>PIN Verwaltung</html>
+title.activate.pin=<html>PIN aktivieren</html>
+title.change.pin=<html>PIN \u00E4ndern</html>
+title.unblock.pin=<html>PIN entsperren</html>
+#title.verify.pin=<html>PIN Eingeben</html>
+title.activate.success=<html>Erfolg</html>
+title.change.success=<html>Erfolg</html>
+title.unblock.success=<html>Erfolg</html>
+
+# removed message.* prefix to reuse keys as help keys
+pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
+# software pin-entry messages
+activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
+change.pin=<html>{0} eingeben und best\u00E4tigen</html>
+unblock.pin=<html>PUK zu {0} eingeben</html>
+# start/finish pin-entry messages
+activate.pinpad.current=<html>Transport-PIN am Kartenleser eingeben
+activate.pinpad.new=<html>Neue PIN am Kartenleser eingeben
+activate.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
+change.pinpad.current=<html>Alte PIN am Kartenleser eingeben
+change.pinpad.new=<html>Neue PIN am Kartenleser eingeben
+change.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
+unblock.pinpad.current=<html>PUK am Kartenleser eingeben
+unblock.pinpad.new=<html>Neue PIN am Kartenleser eingeben
+unblock.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
+# direct pin-entry messages
+activate.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html>
+change.pinpad.direct=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html>
+unblock.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
+# response messages
+activate.success=<html>{0} wurde erfolgreich aktiviert
+change.success=<html>{0} wurde erfolgreich ge\u00E4ndert
+unblock.success=<html>{0} wurde erfolgreich entsperrt
+
+label.activation=<html>e-card Aktivierungsprozess</html>
+label.activation.step=<html>Schritt {0}</html>
+label.activation.idle=<html>Warte auf Server...</html>
+label.old.pin=<html>Alte {0}:</html>
+label.puk=<html>{0} PUK:</html>
+label.new.pin=<html>Neue {0}:</html>
+label.repeat.pin=<html>Best\u00E4tigung:</html>
+
+button.activate=Aktivieren
+button.change=\u00C4ndern
+button.unblock=Entsperren
+button.verify=Abfragen
+
+help.activation=help.activation
+help.pin.mgmt=help.pin.mgmt
+
+err.status=<html>Der Status der PINs konnte nicht \u00FCberpr\u00FCft werden.</html>
+err.activate=<html>Beim Aktivieren der {0} trat ein Fehler auf.</html>
+err.change=<html>Beim \u00C4ndern der {0} trat ein Fehler auf.</html>
+err.unblock=<html>Das Entsperren der {0} wird nicht unterst\u00FCtzt.</html>
+err.verify=<html>VERIFY ERROR (TODO)</html>
+err.retries=<html>Falsche {0}, noch {1} Versuche</html>
+err.locked=<html>{0} gesperrt.</html>
+err.not.active=<html>{0} nicht aktiviert.</html>
+err.pin.format=<html>Ung\u00FCltige {0} L\u00E4nge, verlangt sind {1} Stellen.</html>
+err.pin.confirmation=<html>{0} und Best\u00E4tigung stimmen nicht \u00FCberein.</html>
+err.pin.operation.aborted=<html>Der Vorgang f\u00FCr {0} wurde abgebrochen.</html>
+err.unsupported.card=<html>Die Karte wird nicht unterst\u00FCtzt</html>
+
+status.not.active=NICHT AKTIV
+status.active=AKTIV
+status.blocked=GESPERRT
+status.unknown=UNBEKANNT
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
deleted file mode 100644
index 87e3f181..00000000
--- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2008 Federal Chancellery Austria and
-# Graz University of Technology
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-title.activation=<html>Activation</html>
-title.pin.mgmt=<html>PIN Management</html>
-title.activate.pin=<html>Activate PIN</html>
-#title.verify.pin=<html>Enter PIN</html>
-title.change.pin=<html>Change PIN</html>
-title.unblock.pin=<html>Unblock PIN</html>
-title.activate.success=<html>Success</html>
-title.change.success=<html>Success</html>
-title.unblock.success=<html>Success</html>
-
-# removed message.* prefix to reuse keys as help keys
-pin.mgmt=<html>{0} PINs available
-# software pin-entry messages
-activate.pin=<html>Enter and confirm {0}
-change.pin=<html>Enter and confirm {0}
-unblock.pin=<html>Enter PUK for {0}
-# start/finish pin-entry messages
-activate.pinpad.current=<html>Enter transport-PIN on cardreader
-activate.pinpad.new=<html>Enter new PIN on cardreader
-activate.pinpad.confirm=<html>Confirm new PIN on cardreader
-change.pinpad.current=<html>Enter old PIN on cardreader
-change.pinpad.new=<html>Enter new PIN on cardreader
-change.pinpad.confirm=<html>Confirm new PIN on cardreader
-unblock.pinpad.current=<html>Enter PUK on cardreader
-unblock.pinpad.new=<html>Enter new PIN on cardreader
-unblock.pinpad.confirm=<html>Confirm new PIN on cardreader
-# direct pin-entry messages
-activate.pinpad.direct=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case)
-change.pinpad.direct=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case)
-unblock.pinpad.direct=<html>Enter {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case)
-# response messages
-activate.success=<html>{0} successfully activated</html>
-change.success=<html>{0} successfully changed</html>
-unblock.success=<html>{0} successfully unblocked
-
-label.activation=<html>e-card activation process</html>
-label.activation.step=<html>Step {0}</html>
-label.activation.idle=<html>Wait for server...</html>
-label.old.pin=<html>Old {0}:</html>
-label.puk=<html>{0} PUK:</html>
-label.new.pin=<html>New {0}:</html>
-label.repeat.pin=<html>Confirmation:</html>
-
-button.activate=Activate
-button.change=Change
-button.unblock=Unblock
-button.verify=Query
-
-help.activation=help.activation
-help.pin.mgmt=help.pin.mgmt
-
-err.status=<html>PIN statuses could not be read.</html>
-err.activate=<html>An error occured during the activation of {0}.</html>
-err.change=<html>An error occured during the changing of {0}.</html>
-err.unblock=<html>Unblocking of {0} is not supported.</html>
-err.retries=<html>Wrong {0}, {1} tries remaining</html>
-err.locked=<html>{0} locked</html>
-err.not.active=<html>{0} not activated.</html>
-err.pin.format=<html>Invalid {0} length, {1} digit(s) required.</html>
-err.pin.confirmation=<html>{0} and confirmation do not match.</html>
-err.pin.operation.aborted=<html>The operation on {0} was aborted.</html>
-err.unsupported.card=<html>This card is not supported</html>
-
-status.not.active=NOT ACTIVE
-status.active=ACTIVE
-status.blocked=BLOCKED
-status.unknown=UNKNOWN
diff --git a/BKUHelp/src/main/webapp/help/cardnotsupported.html b/BKUHelp/src/main/webapp/help/cardnotsupported.html
index 3da1a7e0..b1b88aa6 100644
--- a/BKUHelp/src/main/webapp/help/cardnotsupported.html
+++ b/BKUHelp/src/main/webapp/help/cardnotsupported.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="cardnotsupported.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="cardnotsupported.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Die Karte wird nicht unterstützt</h1>
@@ -40,7 +40,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/de/cardnotsupported.html b/BKUHelp/src/main/webapp/help/de/cardnotsupported.html
index 097586fd..ede98a20 100644
--- a/BKUHelp/src/main/webapp/help/de/cardnotsupported.html
+++ b/BKUHelp/src/main/webapp/help/de/cardnotsupported.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/error.card.locked.html b/BKUHelp/src/main/webapp/help/de/error.card.locked.html
index 166dfc04..8e76c14f 100644
--- a/BKUHelp/src/main/webapp/help/de/error.card.locked.html
+++ b/BKUHelp/src/main/webapp/help/de/error.card.locked.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/error.card.notactivated.html b/BKUHelp/src/main/webapp/help/de/error.card.notactivated.html
index 9fb4d6da..bae60da2 100644
--- a/BKUHelp/src/main/webapp/help/de/error.card.notactivated.html
+++ b/BKUHelp/src/main/webapp/help/de/error.card.notactivated.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/error.cardterminal.html b/BKUHelp/src/main/webapp/help/de/error.cardterminal.html
index f5dc4e72..958b7c9b 100644
--- a/BKUHelp/src/main/webapp/help/de/error.cardterminal.html
+++ b/BKUHelp/src/main/webapp/help/de/error.cardterminal.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/error.pcsc.html b/BKUHelp/src/main/webapp/help/de/error.pcsc.html
index dcba991e..9d463c10 100644
--- a/BKUHelp/src/main/webapp/help/de/error.pcsc.html
+++ b/BKUHelp/src/main/webapp/help/de/error.pcsc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/error.pin.timeout.html b/BKUHelp/src/main/webapp/help/de/error.pin.timeout.html
index 7c0ff4d5..c3ee0146 100644
--- a/BKUHelp/src/main/webapp/help/de/error.pin.timeout.html
+++ b/BKUHelp/src/main/webapp/help/de/error.pin.timeout.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/error.ws.unreachable.html b/BKUHelp/src/main/webapp/help/de/error.ws.unreachable.html
index cd335f17..023c3f93 100644
--- a/BKUHelp/src/main/webapp/help/de/error.ws.unreachable.html
+++ b/BKUHelp/src/main/webapp/help/de/error.ws.unreachable.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/help.activate.pin.html b/BKUHelp/src/main/webapp/help/de/help.activate.pin.html
index ed4f4e1b..8ed1d734 100644
--- a/BKUHelp/src/main/webapp/help/de/help.activate.pin.html
+++ b/BKUHelp/src/main/webapp/help/de/help.activate.pin.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/help.cardpin.html b/BKUHelp/src/main/webapp/help/de/help.cardpin.html
index 3e36dbf8..1ef40990 100644
--- a/BKUHelp/src/main/webapp/help/de/help.cardpin.html
+++ b/BKUHelp/src/main/webapp/help/de/help.cardpin.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/help.change.pin.html b/BKUHelp/src/main/webapp/help/de/help.change.pin.html
index 3978ad63..c262edf5 100644
--- a/BKUHelp/src/main/webapp/help/de/help.change.pin.html
+++ b/BKUHelp/src/main/webapp/help/de/help.change.pin.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/help.hashdataviewer.html b/BKUHelp/src/main/webapp/help/de/help.hashdataviewer.html
index 8c35dfdc..59b86b33 100644
--- a/BKUHelp/src/main/webapp/help/de/help.hashdataviewer.html
+++ b/BKUHelp/src/main/webapp/help/de/help.hashdataviewer.html
@@ -3,7 +3,7 @@
 <head>

 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

 <title>Bürgerkarte - Hilfe</title>

-<link href="../help.css" rel="stylesheet" type="text/css" />

+<link href="../css/help.css" rel="stylesheet" type="text/css" />

 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>

 <!--[if IE]>

 <style type="text/css"> 

diff --git a/BKUHelp/src/main/webapp/help/de/help.install.cacert.html b/BKUHelp/src/main/webapp/help/de/help.install.cacert.html
index 25c546f0..adfa30a6 100644
--- a/BKUHelp/src/main/webapp/help/de/help.install.cacert.html
+++ b/BKUHelp/src/main/webapp/help/de/help.install.cacert.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
@@ -23,7 +23,7 @@
     <!-- end #header --></div>
   <div id="mainContent" style="margin: 1.5em 1.5em 0 1.5em">
     <h1>Installation des CA Zertifikats</h1>
-    <p>Die Bürgerkartenumgebung authentifiziert sich mittels eines TLS Zertifikats ausgestellt auf
+    <p>Die lokale Bürgerkartenumgebung authentifiziert sich mittels eines TLS Zertifikats ausgestellt auf
       <code>CN=127.0.0.1, O=MOCCA, OU=MOCCA TLS Server</code>.
       Beim Aufruf der Bürgerkartenumgebung (zum Beispiel bei einem Anmeldevorgang mit Bürgerkarte)
       wird dieses Zertifikat vom Web-Browser überprüft.
@@ -36,7 +36,7 @@
     </p>
 
     <p>
-      Klicken Sie dazu auf die Verknüpfung <a href="../../ca.crt">CA Zertifikat installieren</a>
+      Klicken Sie dazu auf die Verknüpfung <a href="/ca.crt">CA Zertifikat installieren</a>
       und wählen Sie im angezeigten Dialog die Option 'Dieser CA vertrauen um Websites zu identifizieren'.
       (Anmerkung: Der genaue Wortlaut hängt vom verwendeten Web-Browser ab).
     </p>
diff --git a/BKUHelp/src/main/webapp/help/de/help.pin.mgmt.html b/BKUHelp/src/main/webapp/help/de/help.pin.mgmt.html
index 6423e5cf..91e25e33 100644
--- a/BKUHelp/src/main/webapp/help/de/help.pin.mgmt.html
+++ b/BKUHelp/src/main/webapp/help/de/help.pin.mgmt.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/help.retry.html b/BKUHelp/src/main/webapp/help/de/help.retry.html
index 4360b4ae..72f2e0b5 100644
--- a/BKUHelp/src/main/webapp/help/de/help.retry.html
+++ b/BKUHelp/src/main/webapp/help/de/help.retry.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/help.signpin.html b/BKUHelp/src/main/webapp/help/de/help.signpin.html
index 35afd5ec..d7fa5471 100644
--- a/BKUHelp/src/main/webapp/help/de/help.signpin.html
+++ b/BKUHelp/src/main/webapp/help/de/help.signpin.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/help.unblock.pin.html b/BKUHelp/src/main/webapp/help/de/help.unblock.pin.html
index eb2b1c33..c8b791b7 100644
--- a/BKUHelp/src/main/webapp/help/de/help.unblock.pin.html
+++ b/BKUHelp/src/main/webapp/help/de/help.unblock.pin.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/help.unsupported.mimetype.html b/BKUHelp/src/main/webapp/help/de/help.unsupported.mimetype.html
index 09440dc2..80f9502f 100644
--- a/BKUHelp/src/main/webapp/help/de/help.unsupported.mimetype.html
+++ b/BKUHelp/src/main/webapp/help/de/help.unsupported.mimetype.html
@@ -3,7 +3,7 @@
 <head>

 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

 <title>Bürgerkarte - Hilfe</title>

-<link href="../help.css" rel="stylesheet" type="text/css" />

+<link href="../css/help.css" rel="stylesheet" type="text/css" />

 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>

 <!--[if IE]>

 <style type="text/css"> 

diff --git a/BKUHelp/src/main/webapp/help/de/help.verify.pin.html b/BKUHelp/src/main/webapp/help/de/help.verify.pin.html
index e4d8502f..3f7d46a1 100644
--- a/BKUHelp/src/main/webapp/help/de/help.verify.pin.html
+++ b/BKUHelp/src/main/webapp/help/de/help.verify.pin.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/index.html b/BKUHelp/src/main/webapp/help/de/index.html
new file mode 100644
index 00000000..aad0b4f3
--- /dev/null
+++ b/BKUHelp/src/main/webapp/help/de/index.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Bürgerkarte - Hilfe</title>
+    <link href="../css/help.css" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
+  </head>
+
+  <body class="twoColElsLtHdr">
+
+    <div id="container">
+      <div id="header">
+        <h1>Online-Hilfe</h1>
+        <!-- end #header --></div>
+      <div id="sidebar1">
+        <p><img src="welcome.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+        <p>Hilfe-Icon rechts oben im Bürgerkartendialog</p>
+        <!-- end #sidebar1 --></div>
+      <div id="mainContent">
+        <h1> Hilfe zur Bürgerkartenumgebung </h1>
+        <p>Die Bürgerkartenumgebung bietet eine kontextabhängige Hilfe,
+          die jederzeit über das Hilfe-Icon rechts oben im Bürgerkartendialog abrufbar ist.
+          Alternativ können die einzelnen Hilfeseiten auch direkt in jedem Browser angezeigt - und zu den Lesezeichen hinzugefügt - werden.
+        </p>
+        <p>Häufige gestellte Fragen werden in den folgenden Hilfeseiten behandelt:</p>
+        <ul>
+          <li><a href="help.install.cacert.html">Installation des CA Zertifikats (nur lokale Bürgerkartenumgebung)</a></li>
+          <li><a href="error.pcsc.html">Fehler bei der PC/SC Installation</a></li>
+          <li><a href="cardnotsupported.html">Unterstützte Signaturkarten</a></li>
+          <li><a href="help.cardpin.html">Auslesen der Daten auf der Bürgerkarte</a></li>
+          <li><a href="help.signpin.html">Erstellen einer elektronischen Signatur</a></li>
+          <li><a href="help.retry.html">Falsche PIN</a></li>
+          <li><a href="help.hashdataviewer.html">Anzeige der Signaturdaten</a></li>
+          <li><a href="help.pin.mgmt.html">PIN Verwaltung</a></li>
+          <li><a href="help.change.pin.html">Ändern der PIN</a></li>
+        </ul>
+
+        <p><br class="clearfloat" /></p>
+      </div>
+      <div id="footer">
+        <p>
+          <a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+        </p>
+      </div>
+      <!-- end #container --></div>
+  </body>
+</html>
diff --git a/BKUHelp/src/main/webapp/help/de/insertcard.html b/BKUHelp/src/main/webapp/help/de/insertcard.html
index 17902252..466512cd 100644
--- a/BKUHelp/src/main/webapp/help/de/insertcard.html
+++ b/BKUHelp/src/main/webapp/help/de/insertcard.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/wait.html b/BKUHelp/src/main/webapp/help/de/wait.html
index c5fe9ad2..e0ebbb3c 100644
--- a/BKUHelp/src/main/webapp/help/de/wait.html
+++ b/BKUHelp/src/main/webapp/help/de/wait.html
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Untitled Document</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<title>Bürgerkarte - Hilfe</title>
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/de/welcome.html b/BKUHelp/src/main/webapp/help/de/welcome.html
index 8e9d2a5b..e4072114 100644
--- a/BKUHelp/src/main/webapp/help/de/welcome.html
+++ b/BKUHelp/src/main/webapp/help/de/welcome.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="../help.css" rel="stylesheet" type="text/css" />
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
 <link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
diff --git a/BKUHelp/src/main/webapp/help/en/cardnotsupported.html b/BKUHelp/src/main/webapp/help/en/cardnotsupported.html
deleted file mode 100644
index 92a23c04..00000000
--- a/BKUHelp/src/main/webapp/help/en/cardnotsupported.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="cardnotsupported.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Die Karte wird nicht unterstützt</h1>
-    <p>Die im Kartenleser gesteckte Chipkarte wird nicht unterstützt.</p>
-    <p>Bitte stecken Sie eine unterstützte Chipkarte (Bürgerkarte) in den Kartenleser. Derzeit werden die folgenden Chipkarten unterstützt:</p>
-   	<ul>
-       	<li><strong>e-card</strong> <br />
-   	    Chipkarte der <a href="http://www.sozialversicherung.at">Österreichischen Sozialversicherung</a></li>
-            <li><strong>a-sign premium</strong> <br />
-            Chipkarte der <a href="http://www.a-trust.at">A-Trust GmbH</a> bzw. diverse andere Chipkarten mit der Aufschrift 'a-sign premium'.</li>
-    </ul>
-    <p>Sind mehrere unterstützte Kartenleser angeschlossen, stecken sie eine unterstützte Chipkarte (Bürgerkarte) in einen der angeschlossenen Kartenleser. Wird die Chipkarte erkannt wechselt die Bildschirmanzeige. Wird die Chipkarte nicht erkannt, wird der Kartenleser möglicherweise nicht unterstützt. Stecken Sie die Chipkarte daher in einen anderen Kartenleser.</p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/cardnotsupported.png b/BKUHelp/src/main/webapp/help/en/cardnotsupported.png
deleted file mode 100644
index c3b7ce6b..00000000
--- a/BKUHelp/src/main/webapp/help/en/cardnotsupported.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/error.card.locked.html b/BKUHelp/src/main/webapp/help/en/error.card.locked.html
deleted file mode 100644
index 01c67de5..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.card.locked.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="error.card.locked.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Fehler: Bürgerkarte ist gesperrt</h1>
-    <p>Die Bürgerkartenfunktion auf der gesteckten Chipkarte ist gesperrt. Es stehen keine weiteren Versuche zur Eingabe einer PIN zur Verfügung, da zu oft eine falsche PIN eingegeben wurde.</p>
-    <p>Bitte wenden sie sich an den Aussteller der Karte.</p>
-<ul>
-   	  <li><strong>e-card</strong> <br />
-   	    Chipkarte der <a href="http://www.sozialversicherung.at">Österreichischen Sozialversicherung</a></li>
-            <li><strong>a-sign premium</strong> <br />
-            Chipkarte der <a href="http://www.a-trust.at">A-Trust GmbH</a> bzw. diverse andere Chipkarten mit der Aufschrift 'a-sign premium'.</li>
-    </ul>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/error.card.locked.png b/BKUHelp/src/main/webapp/help/en/error.card.locked.png
deleted file mode 100644
index 3e50661a..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.card.locked.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/error.card.notactivated.html b/BKUHelp/src/main/webapp/help/en/error.card.notactivated.html
deleted file mode 100644
index ff55ea27..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.card.notactivated.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="error.card.notactivated.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Fehler: Bürgerkartenfunktion ist nicht aktiviert.</h1>
-    <p>Die im Kartenleser gesteckte Chipkarte wird unterstützt, jedoch ist die Bürgerkartenfunktion auf der Chipkarte noch nicht aktiviert.</p> 
-    <p>Um die gesteckte Chipkarte als Bürgerkarte verwenden zu können, 
-      muss zuerst die 
-    Bürgerkartenfunktion aktiviert werden. Für Informationen dazu siehe <a href="http://www.buergerkarte.at/de/aktivieren/">Aktivierung der Bürgerkartenfunktion</a> auf <a href="http://www.buergerkarte.at">www.buergerkarte.at</a>.</p>
-    <p><br class="clearfloat" />
-    </p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/error.card.notactivated.png b/BKUHelp/src/main/webapp/help/en/error.card.notactivated.png
deleted file mode 100644
index 5761a110..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.card.notactivated.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/error.cardterminal.html b/BKUHelp/src/main/webapp/help/en/error.cardterminal.html
deleted file mode 100644
index 737e9877..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.cardterminal.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="error.cardterminal.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Fehler: Es konnte kein Kartenleser gefunden werden.</h1>
-    <p>Für den Zugriff auf die Bürgerkarte ist ein Chipkartenleser erforderlich. Es werden grundsätzlich alle Kartenleser unterstützt, die über die PC/SC-Schnittstelle angesprochen werden können und im Betriebssystem erfolgreich installiert wurden. Es können mehrere unterstützte Kartenleser gleichzeitig angeschlossen werden.</p>
-    <p>Kartenleser die, die nicht über die PC/SC-Schnittstelle angesprochen werden können (z.B. Kartenleser für die nur CT-API-Treiber verfügbar sind) werden nicht unterstützt.</p>
-    
-    <p><br class="clearfloat" />
-    </p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/error.cardterminal.png b/BKUHelp/src/main/webapp/help/en/error.cardterminal.png
deleted file mode 100644
index 1a7c8c70..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.cardterminal.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/error.pcsc.html b/BKUHelp/src/main/webapp/help/en/error.pcsc.html
deleted file mode 100644
index 1a093eb6..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.pcsc.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="error.pcsc.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Fehler: Es konnte keine PC/SC-Schnittstelle gefunden werden</h1>
-    <p>Die Software für den Zugriff auf die Bürgerkarte konnte keine PC/SC-Schnittstelle für den Zugriff auf Kartenleser erkennen. 
-       Das Betriebssystem scheint keine PC/SC-Schnittstelle zur Verfügung zu stellen.</p>
-    <p>Häufige Ursachen für dieses Problem sind
-    <ul>
-        <li>Der PC/SC Dienst läuft nicht</li>
-        <li>Die entsprechende PC/SC Bibliothek kann von Java nicht gefunden werden
-        (<a href="http://java.sun.com/javase/6/docs/technotes/guides/security/SunProviders.html#SunPCSCProvider">weitere Informationen</a>).</li>
-    </ul>
-    </p>
-    <p>Unter Betriebssystemen die PCSC-Lite verwenden (Linux u.a.) tritt dieses Problem auch auf, 
-       wenn kein Kartenleser angeschlossen ist und daher der entsprechende Dienst nicht gestartet wurde.
-       <br class="clearfloat" />
-    </p>
-    <p><br class="clearfloat" /></p>    
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/error.pcsc.png b/BKUHelp/src/main/webapp/help/en/error.pcsc.png
deleted file mode 100644
index cc022615..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.pcsc.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/error.pin.timeout.html b/BKUHelp/src/main/webapp/help/en/error.pin.timeout.html
deleted file mode 100644
index 7c965dbc..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.pin.timeout.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="error.pin.timeout.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Fehler: Zeitüberschreitung bei der PIN-Eingabe am Kartenleser.</h1>
-    <p>Bei sicheren Kartenlesern mit integrierter PIN-Eingabe wird der Signaturvorgang aus Sicherheitsgründen nach Ablauf einer definierten Zeitspanne abgebrochen.
-      Diese beträgt im Normalfall eine Minute bis zur Eingabe der ersten Stelle des PINs.
-      Für die Eingabe jeder weiteren Stelle ist diese Zeitspanne jedoch - abhängig vom verwendeten Kartenleser - kürzer.
-    </p>
-    
-    <p><br class="clearfloat" />
-    </p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/error.pin.timeout.png b/BKUHelp/src/main/webapp/help/en/error.pin.timeout.png
deleted file mode 100644
index 961d58da..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.pin.timeout.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/error.ws.unreachable.html b/BKUHelp/src/main/webapp/help/en/error.ws.unreachable.html
deleted file mode 100644
index 707a0aa1..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.ws.unreachable.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="error.ws.unreachable.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Fehler: Der Server ist nicht erreichbar</h1>
-    <p>Die Software zum Zugriff auf die Bürgerkarte konnte den Server nicht erreichen. Möglicherweise besteht derzeit ein Problem mit dem Dienst. Probieren Sie es daher zu einem späteren Zeitpunkt nochmal. Sollte das Problem dauerhaft bestehen, wenden Sie sich bitte an den Betreiber der Anwendung.</p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/error.ws.unreachable.png b/BKUHelp/src/main/webapp/help/en/error.ws.unreachable.png
deleted file mode 100644
index 80019733..00000000
--- a/BKUHelp/src/main/webapp/help/en/error.ws.unreachable.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.activate.pin.html b/BKUHelp/src/main/webapp/help/en/help.activate.pin.html
deleted file mode 100644
index cdd304f0..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.activate.pin.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1>Aktivieren der PIN</h1>
-    <p>Noch nicht aktivierte PINs werden als <em style="color:red; font-weight:bold">NICHT AKTIV</em> angeführt
-      und können über die Schaltfläche 'Aktivieren' gesetzt werden.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt-1.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>Geben Sie dazu die gewünschte PIN im dafür vorgesehenen Feld ein und wiederholen Sie diese im Feld 'Bestätigung'.
-    </p>
-    <p style="text-align: center"><img src="help.pin.activate.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/help.cardpin.html b/BKUHelp/src/main/webapp/help/en/help.cardpin.html
deleted file mode 100644
index bba7f5c0..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.cardpin.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="help.cardpin1.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><img src="help.cardpin2.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Lesen von Informationen von der Chipkarte</h1>
-    <p>Sie werden aufgefordert ihre Karten-PIN bzw. Infobox-PIN (abhängig von der verwendeten Bürgerkarte) einzugeben um das Auslesen von Informationen zur  Identifikation (Personenbindung) bzw. Vollmachten zu ermöglichen.</p>    
-    <p><a href="http://www.buergerkarte.at/de/datenschutz-sicherheit/">Details</a> zu den auf der Bürgerkarte gespeicherten Informationen finden sie auf <a href="http://www.buergerkarte.at">www.buergerkarte.at</a>.</p>
-    <p><br class="clearfloat" /></p>
-    </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/help.cardpin1.png b/BKUHelp/src/main/webapp/help/en/help.cardpin1.png
deleted file mode 100644
index 1bceccf5..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.cardpin1.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.cardpin2.png b/BKUHelp/src/main/webapp/help/en/help.cardpin2.png
deleted file mode 100644
index 12d17be0..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.cardpin2.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.change.pin.html b/BKUHelp/src/main/webapp/help/en/help.change.pin.html
deleted file mode 100644
index 204f323b..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.change.pin.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1>Ändern der PIN</h1>
-    <p>Bereits aktivierte PINs werden als <em style="color:green; font-weight:bold">AKTIV</em> angeführt
-      und können über die Schaltfläche 'Ändern' geändert werden.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>Geben Sie dazu die alte und neue PIN im jeweils dafür vorgesehenen Feld ein und wiederholen Sie die
-      neue PIN im Feld 'Bestätigung'.
-    </p>
-    <p style="text-align: center"><img src="help.pin.change.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/help.hashdataviewer.html b/BKUHelp/src/main/webapp/help/en/help.hashdataviewer.html
deleted file mode 100644
index 874cec3a..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.hashdataviewer.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

-<title>CitizenCard - Help</title>

-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />

-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>

-<!--[if IE]>

-<style type="text/css"> 

-/* place css fixes for all versions of IE in this conditional comment */

-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }

-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }

-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */

-</style>

-<![endif]-->

-</head>

-

-<body class="twoColElsLtHdr">

-

-<div id="container">

-  <div id="header">

-    <h1>Online Help</h1>

-    <!-- end #header --></div>

-  <div id="sidebar1">

-    <p><img src="help.hashdataviewer.png" alt="Bildschirmfoto des Applets" height="130" width="150"/></p>

-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>

-    <!-- end #sidebar1 --></div>

-  <div id="mainContent">

-    <h1> Anzeige der Signaturdaten </h1>

-    <p>Dieses Fenster zeigt die zu signierenden Daten an. Dies k&ouml;nnen entweder reine Textdaten oder XHTML sein. Im Falle von XHML erhalten Sie den Hinweis, dass es sich bei den dargestellten Daten nur um eine Voransicht handelt. Um die Daten standardkonform darzustellen, m&uuml;ssen diese abgespeichert und mit einem geeigneten XHTML Betrachter ge&ouml;ffnen werden.</p>

-    <p>In jedem Fall k&ouml;nnen die zu signierenden abgespeichert werden.</p>

-    <p><img src="help.hashdataviewer.png" alt="Bildschirmfoto des Applets" height="300" width="353"/></p>

-     <p><br class="clearfloat" /></p>

-  </div>

-  <div id="footer">

-  	<p>

-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>

-    </p>

-  </div>

-<!-- end #container --></div>

-</body>

-</html>

diff --git a/BKUHelp/src/main/webapp/help/en/help.hashdataviewer.png b/BKUHelp/src/main/webapp/help/en/help.hashdataviewer.png
deleted file mode 100644
index 83004322..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.hashdataviewer.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.install.cacert.html b/BKUHelp/src/main/webapp/help/en/help.install.cacert.html
deleted file mode 100644
index f2071ba0..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.install.cacert.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="mainContent" style="margin: 1.5em 1.5em 0 1.5em">
-    <h1>Installation des CA Zertifikats</h1>
-    <p>Die lokale Bürgerkartenumgebung (MOCCA Webstart) authentifiziert sich mittels eines TLS Zertifikats ausgestellt auf
-      <code>CN=127.0.0.1, O=MOCCA, OU=MOCCA TLS Server</code>.
-      Beim Aufruf der Bürgerkartenumgebung (zum Beispiel bei einem Anmeldevorgang mit Bürgerkarte)
-      wird dieses Zertifikat vom Web-Browser überprüft.
-      Um diese Überprüfung zu ermöglichen ist es notwendig das Ausstellerzertifikat, lautend auf
-      <code>O=MOCCA, OU=MOCCA TLS Server CA</code>, im Web-Browser zu installieren.
-    </p>
-
-    <p><strong>Achtung:</strong> Eine automatische Installation des CA Zertifikats als 'Vertrauenswürdiges Stammzertifikat' im Microsoft Zertifikatsspeicher ist in Windows Vista leider nicht möglich.
-      Sollten Sie Internet Explorer oder Safari in Windows Vista oder 7 benutzen, dann wählen Sie bei der Installation des Zertifikats ausdrücklich 'zu vertrauenswürdigen Stammzertifizierungsstellen hinzufügen'.
-    </p>
-
-    <p>
-      Klicken Sie dazu auf die Verknüpfung <a href="/ca.crt">CA Zertifikat installieren</a>
-      und wählen Sie im angezeigten Dialog die Option 'Dieser CA vertrauen um Websites zu identifizieren'.
-      (Anmerkung: Der genaue Wortlaut hängt vom verwendeten Web-Browser ab).
-    </p>
-    <p><img src="help.install.cacert.png" alt="Bildschirmfoto des Zertifikatsinstallationsdialogs" height="287" width="565"/></p>
-    <p style="font-size:70%;"><strong>Hinweis:</strong> Der tatsächliche Dialog kann vom oben dargestellten abweichen und hängt vom verwendeten Web-Browser ab.</p>
-    <p>Kopieren Sie diese Verknüpfung und rufen Sie sie in weiteren Web-Browsern ihrer Wahl auf um das Zertifikat auch dort zu installieren.</p>
-
-    <p>Das CA Zertifikat wird ausschließlich zur Identifikation der lokalen Bürgerkartenumgebung verwendet
-    und kann bei der Deinstallation der Bürgerkartenumgebung aus dem Web-Browser entfernt werden.</p>
-    <p><br class="clearfloat" /></p>
-    </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/help.install.cacert.png b/BKUHelp/src/main/webapp/help/en/help.install.cacert.png
deleted file mode 100644
index 0c1b2564..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.install.cacert.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.activate.png b/BKUHelp/src/main/webapp/help/en/help.pin.activate.png
deleted file mode 100644
index 4790cdf6..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.activate.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.change.png b/BKUHelp/src/main/webapp/help/en/help.pin.change.png
deleted file mode 100644
index a0fa8643..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.change.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-1.png b/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-1.png
deleted file mode 100644
index b17b3b40..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-1.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-2.png b/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-2.png
deleted file mode 100644
index 429c87eb..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-2.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-3.png b/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-3.png
deleted file mode 100644
index 76b11f69..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-3.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-4.png b/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-4.png
deleted file mode 100644
index 5be7c709..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt-4.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt.html b/BKUHelp/src/main/webapp/help/en/help.pin.mgmt.html
deleted file mode 100644
index 9bafec39..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1>PIN Verwaltung</h1>
-    <p>Mit Hilfe der PIN Verwaltung können Sie Karten-PINs <a href="#activate">aktivieren</a>, <a href="#change">ändern</a> und <a href="#unblock">entsperren</a>,
-      wobei der unterstützte Funktionsumfang vom Typ und Zustand der verwendeten Karte abhängt.
-    </p>
-    <h3><a name="change">Ändern der PIN</a></h3>
-    <p>Bereits aktivierte PINs werden als <em style="color:green; font-weight:bold">AKTIV</em> angeführt
-      und können über die Schaltfläche 'Ändern' geändert werden.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>Geben Sie dazu die alte und neue PIN im jeweils dafür vorgesehenen Feld ein und wiederholen Sie die
-      neue PIN im Feld 'Bestätigung'.
-    </p>
-    <p style="text-align: center"><img src="help.pin.change.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>Bei Karten mit dem ACOS Betriebssystem müssen die PINs verifiziert werden um ihren Status zu ermitteln. 
-      Den Status dieser als <em style="color:black; font-weight:bold">UNBEKANNT</em> angeführten PINs können Sie über die Schaltfläche 'Abfragen' verifizieren.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt-3.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>
-      Geben Sie dazu die PIN im dafür vorgesehenen Feld ein.
-    </p>
-    <p style="text-align: center"><img src="help.pin.verify.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-
-    <h3><a name="activate">Aktivieren der PIN</a></h3>
-    <p>Noch nicht aktivierte PINs werden als <em style="color:red; font-weight:bold">NICHT AKTIV</em> angeführt
-      und können über die Schaltfläche 'Aktivieren' gesetzt werden.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt-1.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>Geben Sie dazu die gewünschte PIN im dafür vorgesehenen Feld ein und wiederholen Sie diese im Feld 'Bestätigung'.
-    </p>
-    <p style="text-align: center"><img src="help.pin.activate.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-
-    <h3><a name="unblock">Entsperren der PIN</a></h3>
-    <p>Durch mehrmalige falsche Eingabe gesperrte PINs werden als <em style="color:red; font-weight:bold">GESPERRT</em> angeführt
-      und können über die Schaltfläche 'Entsperren' mit einer PUK neu gesetzt werden.
-      Das Entsperren wird nur von Karten mit dem ACOS Betriebssystem unterstützt.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt-2.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>Momentan wird das Entsperren von PINs noch nicht unterstützt.
-    </p>
-
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt.png b/BKUHelp/src/main/webapp/help/en/help.pin.mgmt.png
deleted file mode 100644
index 44ad3398..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.mgmt.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.pin.verify.png b/BKUHelp/src/main/webapp/help/en/help.pin.verify.png
deleted file mode 100644
index 0c7a7852..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.pin.verify.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.retry.html b/BKUHelp/src/main/webapp/help/en/help.retry.html
deleted file mode 100644
index 9e18fe63..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.retry.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="help.retry.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Falsche PIN</h1>
-    <p>Die eingegebene PIN war falsch. Bitte geben Sie die korrekte PIN ein.</p> 
-    <p>Die Anzahl der noch möglichen  Versuche wird angezeigt.</p>
-    <p><br class="clearfloat" /></p>
-    </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/help.retry.png b/BKUHelp/src/main/webapp/help/en/help.retry.png
deleted file mode 100644
index 00716afb..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.retry.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.signpin-1.png b/BKUHelp/src/main/webapp/help/en/help.signpin-1.png
deleted file mode 100644
index 1c5c8570..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.signpin-1.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.signpin.html b/BKUHelp/src/main/webapp/help/en/help.signpin.html
deleted file mode 100644
index 2bd61447..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.signpin.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="help.signpin.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Erstellen einer elektronischen Signatur</h1>
-    <p>Sie werden aufgefordert die  Signatur-PIN einzugeben, um eine elektronische Signatur zu erstellen.</p>
-    <p style="text-align: center"><img src="help.signpin-1.png" alt="Bildschirmfoto" width="278" height="146" /></p>
-    <ol>
-      <li>Klicken Sie auf 'Signaturdaten anzeigen' um die zu signierenden Daten anzuzeigen.</li>
-      <li>Geben Sie im Formularfeld die Signatur-PIN ein.</li>
-      <li>Klicken Sie auf die Schaltfläche 'Signieren' um die elektronische Signatur zu erstellen.</li>
-    </ol>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/help.signpin.png b/BKUHelp/src/main/webapp/help/en/help.signpin.png
deleted file mode 100644
index 37bef2d5..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.signpin.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/help.unblock.pin.html b/BKUHelp/src/main/webapp/help/en/help.unblock.pin.html
deleted file mode 100644
index 6c62c421..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.unblock.pin.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1>Entsperren der PIN</h1>
-    <p>Durch mehrmalige falsche Eingabe gesperrte PINs werden als <em style="color:red; font-weight:bold">GESPERRT</em> angeführt
-      und können über die Schaltfläche 'Entsperren' mit einer PUK neu gesetzt werden.
-      Das Entsperren wird nur von Karten mit dem ACOS Betriebssystem unterstützt.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt-2.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>Momentan wird das Entsperren von PINs noch nicht unterstützt.
-    </p>
-
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/help.unsupported.mimetype.html b/BKUHelp/src/main/webapp/help/en/help.unsupported.mimetype.html
deleted file mode 100644
index 79c06cac..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.unsupported.mimetype.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

-<title>CitizenCard - Help</title>

-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />

-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>

-<!--[if IE]>

-<style type="text/css"> 

-/* place css fixes for all versions of IE in this conditional comment */

-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }

-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }

-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */

-</style>

-<![endif]-->

-</head>

-

-<body class="twoColElsLtHdr">

-

-<div id="container">

-  <div id="header">

-    <h1>Online Help</h1>

-    <!-- end #header --></div>

-  <div id="sidebar1">

-    <p><img src="help.unsupported.mimetype.png" alt="applet screenshot" height="130" width="150"/></p>

-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>

-    <!-- end #sidebar1 --></div>

-  <div id="mainContent">

-    <h1>Signaturdaten können nicht dargestellt werden</h1>

-    <p>Die Signaturdatenanzeige unterstützt reine Textdaten sowie XHTML, andere MIME-Typen k&ouml;nnen nicht angezeigt werden.

-    Um die Daten standardkonform darzustellen, m&uuml;ssen diese abgespeichert und mit einem geeigneten externen Betrachter ge&ouml;ffnen werden.</p>

-     <p><br class="clearfloat" /></p>

-  </div>

-  <div id="footer">

-  	<p>

-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>

-    </p>

-  </div>

-<!-- end #container --></div>

-</body>

-</html>

diff --git a/BKUHelp/src/main/webapp/help/en/help.verify.pin.html b/BKUHelp/src/main/webapp/help/en/help.verify.pin.html
deleted file mode 100644
index e97b1163..00000000
--- a/BKUHelp/src/main/webapp/help/en/help.verify.pin.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1>PIN Abfragen</h1>
-    <p>Bei Karten mit dem ACOS Betriebssystem müssen die PINs verifiziert werden um ihren Status zu ermitteln. 
-      Den Status dieser als <em style="color:black; font-weight:bold">UNBEKANNT</em> angeführten PINs können Sie über die Schaltfläche 'Abfragen' verifizieren.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt-3.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>
-      Geben Sie dazu die PIN im dafür vorgesehenen Feld ein.
-    </p>
-    <p style="text-align: center"><img src="help.pin.verify.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-    <p>Nach erfolgreicher Eingabe wird die PIN entsprechend ihrem Status als <em style="color:green; font-weight:bold">AKTIV</em>, <em style="color:red; font-weight:bold">NICHT AKTIV</em> oder <em style="color:red; font-weight:bold">GESPERRT</em> angeführt.
-    </p>
-    <p style="text-align: center"><img src="help.pin.mgmt-4.png" alt="Bildschirmfoto" width="295" height="200" /></p>
-
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/index.html b/BKUHelp/src/main/webapp/help/en/index.html
deleted file mode 100644
index e0f86909..00000000
--- a/BKUHelp/src/main/webapp/help/en/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CitizenCard - Help</title>
-    <link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-    <link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-  </head>
-
-  <body class="twoColElsLtHdr">
-
-    <div id="container">
-      <div id="header">
-        <h1>Online Help</h1>
-        <!-- end #header --></div>
-      <div id="sidebar1">
-        <p><img src="welcome.png" alt="applet screenshot" width="190" height="130"/></p>
-        <p>Help icon above CitizenCard dialog</p>
-        <!-- end #sidebar1 --></div>
-      <div id="mainContent">
-        <h1>CitizenCard-Environment Help</h1>
-        <p>
-          The context-dependent CitizenCard Environment help is available via
-          the help icon in the top right corner above the CitizenCard dialog.
-          Alternatively, the individual help pages can be accessed or bookmarked directly from the browser.
-        </p>
-        <p>Answers to frequently asked questions can be found in the following help pages: </p>
-        <ul>
-          <li><a href="help.install.cacert.html">CA certificate installation (MOCCA Webstart only)</a></li>
-          <li><a href="error.pcsc.html">PC/SC installation error</a></li>
-          <li><a href="cardnotsupported.html">Supported signature cards</a></li>
-          <li><a href="help.cardpin.html">Accessing protected card data (pin entry)</a></li>
-          <li><a href="help.signpin.html">Signature creation</a></li>
-          <li><a href="help.retry.html">Wrong PIN</a></li>
-          <li><a href="help.hashdataviewer.html">Signature data display</a></li>
-          <li><a href="help.pin.mgmt.html">PIN management</a></li>
-          <li><a href="help.change.pin.html">Change PIN</a></li>
-        </ul>
-
-        <p><br class="clearfloat" /></p>
-      </div>
-      <div id="footer">
-        <p>
-          <a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-        </p>
-      </div>
-      <!-- end #container --></div>
-  </body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/insertcard.html b/BKUHelp/src/main/webapp/help/en/insertcard.html
deleted file mode 100644
index 7216a3fe..00000000
--- a/BKUHelp/src/main/webapp/help/en/insertcard.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="insertcard.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Bitte die Bürgerkarte in den Kartenleser stecken</h1>
-    <p>Die Software für den Zugriff auf die Bürgerkarte hat einen oder mehrere unterstützte Kartenleser gefunden.</p>
-    <p>Bitte stecken Sie nun ihre Bürgerkarte in den Kartenleser. Wird die Karte erkannt, welchselt die Bildschirmanzeige.</p>
-    <p>Sollten Sie mehrere Kartenleser angeschlossen haben, wählen Sie einen beliebigen aus. Wird die Karte im ausgewählten Kartenleser nicht erkannt, wird dieser Kartenleser eventuell nicht unterstützt. Probieren Sie es daher in einem anderen Kartenleser nochmal.
-    </p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/insertcard.png b/BKUHelp/src/main/webapp/help/en/insertcard.png
deleted file mode 100644
index 62a22975..00000000
--- a/BKUHelp/src/main/webapp/help/en/insertcard.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/wait.html b/BKUHelp/src/main/webapp/help/en/wait.html
deleted file mode 100644
index 73ca8200..00000000
--- a/BKUHelp/src/main/webapp/help/en/wait.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="wait.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Bitte warten ...</h1>
-    <p>Die Software für den Zugriff auf die Bürgerkarte ist damit beschäftigt, einen Befehl auszuführen bzw. auf einen neuen Befehl vom Server zu warten.    </p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/wait.png b/BKUHelp/src/main/webapp/help/en/wait.png
deleted file mode 100644
index 63a38fbf..00000000
--- a/BKUHelp/src/main/webapp/help/en/wait.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/en/welcome.html b/BKUHelp/src/main/webapp/help/en/welcome.html
deleted file mode 100644
index a26df4ac..00000000
--- a/BKUHelp/src/main/webapp/help/en/welcome.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>CitizenCard - Help</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online Help</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="welcome.png" alt="applet screenshot" width="190" height="130"/></p>
-    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Willkommen </h1>
-    <p>Die Anzeige &quot;Willkommen&quot; erfolgt unmittelbar nachdem die Software für den Zugriff auf die Bürgerkarte erfolgreich im Browser geladen wurde.</p>
-    <p>Die Software versucht nun eine Verbindung mit dem Server aufzunehmen um Befehle für den Zugriff auf die Bürgerkarte zu erhalten.</p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUHelp/src/main/webapp/help/en/welcome.png b/BKUHelp/src/main/webapp/help/en/welcome.png
deleted file mode 100644
index 78133b4d..00000000
--- a/BKUHelp/src/main/webapp/help/en/welcome.png
+++ /dev/null
diff --git a/BKUHelp/src/main/webapp/help/error.card.locked.html b/BKUHelp/src/main/webapp/help/error.card.locked.html
index d49bc1e9..9f8bdc79 100644
--- a/BKUHelp/src/main/webapp/help/error.card.locked.html
+++ b/BKUHelp/src/main/webapp/help/error.card.locked.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
     <p><img src="error.card.locked.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Fehler: Bürgerkarte ist gesperrt</h1>
@@ -39,7 +39,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/error.card.notactivated.html b/BKUHelp/src/main/webapp/help/error.card.notactivated.html
index 3e04cc93..5b1adefc 100644
--- a/BKUHelp/src/main/webapp/help/error.card.notactivated.html
+++ b/BKUHelp/src/main/webapp/help/error.card.notactivated.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="error.card.notactivated.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="error.card.notactivated.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Fehler: Bürgerkartenfunktion ist nicht aktiviert.</h1>
@@ -36,7 +36,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/error.cardterminal.html b/BKUHelp/src/main/webapp/help/error.cardterminal.html
index a4c3ee3f..cdd49138 100644
--- a/BKUHelp/src/main/webapp/help/error.cardterminal.html
+++ b/BKUHelp/src/main/webapp/help/error.cardterminal.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
     <p><img src="error.cardterminal.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Fehler: Es konnte kein Kartenleser gefunden werden.</h1>
@@ -35,7 +35,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/error.pcsc.html b/BKUHelp/src/main/webapp/help/error.pcsc.html
index 53cefb30..9c064a4a 100644
--- a/BKUHelp/src/main/webapp/help/error.pcsc.html
+++ b/BKUHelp/src/main/webapp/help/error.pcsc.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
     <p><img src="error.pcsc.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Fehler: Es konnte keine PC/SC-Schnittstelle gefunden werden</h1>
@@ -44,7 +44,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/error.pin.timeout.html b/BKUHelp/src/main/webapp/help/error.pin.timeout.html
index ca0d1a53..8f048c09 100644
--- a/BKUHelp/src/main/webapp/help/error.pin.timeout.html
+++ b/BKUHelp/src/main/webapp/help/error.pin.timeout.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
     <p><img src="error.pin.timeout.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Fehler: Zeitüberschreitung bei der PIN-Eingabe am Kartenleser.</h1>
@@ -37,7 +37,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/error.ws.unreachable.html b/BKUHelp/src/main/webapp/help/error.ws.unreachable.html
index ea4d94f1..294112b4 100644
--- a/BKUHelp/src/main/webapp/help/error.ws.unreachable.html
+++ b/BKUHelp/src/main/webapp/help/error.ws.unreachable.html
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
     <p><img src="error.ws.unreachable.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Fehler: Der Server ist nicht erreichbar</h1>
@@ -32,7 +32,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.activate.pin.html b/BKUHelp/src/main/webapp/help/help.activate.pin.html
index 2a5f7193..620c04bb 100644
--- a/BKUHelp/src/main/webapp/help/help.activate.pin.html
+++ b/BKUHelp/src/main/webapp/help/help.activate.pin.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1>Aktivieren der PIN</h1>
@@ -39,7 +39,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.cardpin.html b/BKUHelp/src/main/webapp/help/help.cardpin.html
index 609e4faa..d95042ef 100644
--- a/BKUHelp/src/main/webapp/help/help.cardpin.html
+++ b/BKUHelp/src/main/webapp/help/help.cardpin.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,12 +19,12 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="help.cardpin1.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><img src="help.cardpin1.png" alt="applet screenshot" width="190" height="130"/></p>
     <p><img src="help.cardpin2.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Lesen von Informationen von der Chipkarte</h1>
@@ -34,7 +34,7 @@
     </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.change.pin.html b/BKUHelp/src/main/webapp/help/help.change.pin.html
index 64fe213c..92ea1f7e 100644
--- a/BKUHelp/src/main/webapp/help/help.change.pin.html
+++ b/BKUHelp/src/main/webapp/help/help.change.pin.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1>Ändern der PIN</h1>
@@ -40,7 +40,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.css b/BKUHelp/src/main/webapp/help/help.css
deleted file mode 100644
index 28f9767b..00000000
--- a/BKUHelp/src/main/webapp/help/help.css
+++ /dev/null
@@ -1,81 +0,0 @@
-@charset "UTF-8";
-body  {
-	font: 100% Verdana, Arial, Helvetica, sans-serif;
-	background: #666666;
-	margin: 0; /* it's good practice to zero the margin and padding of the body element to account for differing browser defaults */
-	padding: 0;
-	text-align: center; /* this centers the container in IE 5* browsers. The text is then set to the left aligned default in the #container selector */
-	color: #000000;
-}
-
-/* Tips for Elastic layouts 
-1. Since the elastic layouts overall sizing is based on the user's default fonts size, they are more unpredictable. Used correctly, they are also more accessible for those that need larger fonts size since the line length remains proportionate.
-2. Sizing of divs in this layout are based on the 100% font size in the body element. If you decrease the text size overall by using a font-size: 80% on the body element or the #container, remember that the entire layout will downsize proportionately. You may want to increase the widths of the various divs to compensate for this.
-3. If font sizing is changed in differing amounts on each div instead of on the overall design (ie: #sidebar1 is given a 70% font size and #mainContent is given an 85% font size), this will proportionately change each of the divs overall size. You may want to adjust based on your final font sizing.
-*/
-.twoColElsLtHdr #container { 
-	width: 46em;  /* this width will create a container that will fit in an 800px browser window if text is left at browser default font sizes */
-	background: #FFFFFF;
-	margin: 0 auto; /* the auto margins (in conjunction with a width) center the page */
-	border: 1px solid #000000;
-	text-align: left; /* this overrides the text-align: center on the body element. */
-} 
-.twoColElsLtHdr #header { 
-	background: #DDDDDD; 
-	padding: 0 10px;  /* this padding matches the left alignment of the elements in the divs that appear beneath it. If an image is used in the #header instead of text, you may want to remove the padding. */
-} 
-.twoColElsLtHdr #header h1 {
-	margin: 0; /* zeroing the margin of the last element in the #header div will avoid margin collapse - an unexplainable space between divs. If the div has a border around it, this is not necessary as that also avoids the margin collapse */
-	padding: 10px 0; /* using padding instead of margin will allow you to keep the element away from the edges of the div */
-}
-
-/* Tips for sidebar1:
-1. Be aware that if you set a font-size value on this div, the overall width of the div will be adjusted accordingly.
-2. Since we are working in ems, it's best not to use padding on the sidebar itself. It will be added to the width for standards compliant browsers creating an unknown actual width. 
-3. Space between the side of the div and the elements within it can be created by placing a left and right margin on those elements as seen in the ".twoColElsLtHdr #sidebar1 p" rule.
-*/
-.twoColElsLtHdr #sidebar1 {
-	float: left;
-	width: 210px;
-	padding: 15px 0; /* top and bottom padding create visual space within this div */
-	background-color: #FFFFFF;
-}
-.twoColElsLtHdr #sidebar1 h3, .twoColElsLtHdr #sidebar1 p {
-	margin-left: 10px; /* the left and right margin should be given to every element that will be placed in the side columns */
-	margin-right: 10px;
-}
-
-/* Tips for mainContent:
-1. If you give this #mainContent div a font-size value different than the #sidebar1 div, the margins of the #mainContent div will be based on its font-size and the width of the #sidebar1 div will be based on its font-size. You may wish to adjust the values of these divs.
-2. The space between the mainContent and sidebar1 is created with the left margin on the mainContent div.  No matter how much content the sidebar1 div contains, the column space will remain. You can remove this left margin if you want the #mainContent div's text to fill the #sidebar1 space when the content in #sidebar1 ends.
-3. To avoid float drop, you may need to test to determine the approximate maximum image/element size since this layout is based on the user's font sizing combined with the values you set. However, if the user has their browser font size set lower than normal, less space will be available in the #mainContent div than you may see on testing.
-4. In the Internet Explorer Conditional Comment below, the zoom property is used to give the mainContent "hasLayout." This avoids several IE-specific bugs that may occur.
-*/
-.twoColElsLtHdr #mainContent {
-	margin: 0 1.5em 0 15em; /* the right margin can be given in ems or pixels. It creates the space down the right side of the page. */
-	padding: 0 10px;
-} 
-.twoColElsLtHdr #footer { 
-	padding: 0 10px; /* this padding matches the left alignment of the elements in the divs that appear above it. */
-	background:#DDDDDD;
-} 
-.twoColElsLtHdr #footer p {
-	margin: 0; /* zeroing the margins of the first element in the footer will avoid the possibility of margin collapse - a space between divs */
-	padding: 10px 0; /* padding on this element will create space, just as the the margin would have, without the margin collapse issue */
-}
-
-/* Miscellaneous classes for reuse */
-.fltrt { /* this class can be used to float an element right in your page. The floated element must precede the element it should be next to on the page. */
-	float: right;
-	margin-left: 8px;
-}
-.fltlft { /* this class can be used to float an element left in your page */
-	float: left;
-	margin-right: 8px;
-}
-.clearfloat { /* this class should be placed on a div or break element and should be the final element before the close of a container that should fully contain a float */
-	clear:both;
-    height:0;
-    font-size: 1px;
-    line-height: 0px;
-}
\ No newline at end of file
diff --git a/BKUHelp/src/main/webapp/help/help.hashdataviewer.html b/BKUHelp/src/main/webapp/help/help.hashdataviewer.html
index 98823e39..dbda857e 100644
--- a/BKUHelp/src/main/webapp/help/help.hashdataviewer.html
+++ b/BKUHelp/src/main/webapp/help/help.hashdataviewer.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">

 <head>

 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

-<title>Bürgerkarte - Hilfe</title>

-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />

-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>

+<title>CitizenCard - Help</title>

+<link href="css/help.css" rel="stylesheet" type="text/css" />

+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>

 <!--[if IE]>

 <style type="text/css"> 

 /* place css fixes for all versions of IE in this conditional comment */

@@ -19,11 +19,11 @@
 

 <div id="container">

   <div id="header">

-    <h1>Online-Hilfe</h1>

+    <h1>Online Help</h1>

     <!-- end #header --></div>

   <div id="sidebar1">

     <p><img src="help.hashdataviewer.png" alt="Bildschirmfoto des Applets" height="130" width="150"/></p>

-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>

+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>

     <!-- end #sidebar1 --></div>

   <div id="mainContent">

     <h1> Anzeige der Signaturdaten </h1>

@@ -34,7 +34,7 @@
   </div>

   <div id="footer">

   	<p>

-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>

+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>

     </p>

   </div>

 <!-- end #container --></div>

diff --git a/BKUHelp/src/main/webapp/help/help.install.cacert.html b/BKUHelp/src/main/webapp/help/help.install.cacert.html
index 0f34c86f..d981496d 100644
--- a/BKUHelp/src/main/webapp/help/help.install.cacert.html
+++ b/BKUHelp/src/main/webapp/help/help.install.cacert.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="mainContent" style="margin: 1.5em 1.5em 0 1.5em">
     <h1>Installation des CA Zertifikats</h1>
-    <p>Die lokale Bürgerkartenumgebung authentifiziert sich mittels eines TLS Zertifikats ausgestellt auf
+    <p>Die lokale Bürgerkartenumgebung (MOCCA Webstart) authentifiziert sich mittels eines TLS Zertifikats ausgestellt auf
       <code>CN=127.0.0.1, O=MOCCA, OU=MOCCA TLS Server</code>.
       Beim Aufruf der Bürgerkartenumgebung (zum Beispiel bei einem Anmeldevorgang mit Bürgerkarte)
       wird dieses Zertifikat vom Web-Browser überprüft.
@@ -50,7 +50,7 @@
     </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.pin.mgmt.html b/BKUHelp/src/main/webapp/help/help.pin.mgmt.html
index 4a4b471b..116a37c8 100644
--- a/BKUHelp/src/main/webapp/help/help.pin.mgmt.html
+++ b/BKUHelp/src/main/webapp/help/help.pin.mgmt.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1>PIN Verwaltung</h1>
@@ -70,7 +70,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.retry.html b/BKUHelp/src/main/webapp/help/help.retry.html
index 088eb857..9aa45795 100644
--- a/BKUHelp/src/main/webapp/help/help.retry.html
+++ b/BKUHelp/src/main/webapp/help/help.retry.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
     <p><img src="help.retry.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Falsche PIN</h1>
@@ -33,7 +33,7 @@
     </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.signpin.html b/BKUHelp/src/main/webapp/help/help.signpin.html
index 4a0f00eb..72c19096 100644
--- a/BKUHelp/src/main/webapp/help/help.signpin.html
+++ b/BKUHelp/src/main/webapp/help/help.signpin.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="help.signpin.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="help.signpin.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Erstellen einer elektronischen Signatur</h1>
@@ -38,7 +38,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.unblock.pin.html b/BKUHelp/src/main/webapp/help/help.unblock.pin.html
index 96eed5b2..64c3ecf2 100644
--- a/BKUHelp/src/main/webapp/help/help.unblock.pin.html
+++ b/BKUHelp/src/main/webapp/help/help.unblock.pin.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1>Entsperren der PIN</h1>
@@ -39,7 +39,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/help.unsupported.mimetype.html b/BKUHelp/src/main/webapp/help/help.unsupported.mimetype.html
index 76a29bfd..efb93f1c 100644
--- a/BKUHelp/src/main/webapp/help/help.unsupported.mimetype.html
+++ b/BKUHelp/src/main/webapp/help/help.unsupported.mimetype.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">

 <head>

 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

-<title>Bürgerkarte - Hilfe</title>

-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />

-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>

+<title>CitizenCard - Help</title>

+<link href="css/help.css" rel="stylesheet" type="text/css" />

+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>

 <!--[if IE]>

 <style type="text/css"> 

 /* place css fixes for all versions of IE in this conditional comment */

@@ -19,11 +19,11 @@
 

 <div id="container">

   <div id="header">

-    <h1>Online-Hilfe</h1>

+    <h1>Online Help</h1>

     <!-- end #header --></div>

   <div id="sidebar1">

-    <p><img src="help.unsupported.mimetype.png" alt="Bildschirmfoto des Applets" height="130" width="150"/></p>

-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>

+    <p><img src="help.unsupported.mimetype.png" alt="applet screenshot" height="130" width="150"/></p>

+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>

     <!-- end #sidebar1 --></div>

   <div id="mainContent">

     <h1>Signaturdaten können nicht dargestellt werden</h1>

@@ -33,7 +33,7 @@
   </div>

   <div id="footer">

   	<p>

-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>

+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>

     </p>

   </div>

 <!-- end #container --></div>

diff --git a/BKUHelp/src/main/webapp/help/help.verify.pin.html b/BKUHelp/src/main/webapp/help/help.verify.pin.html
index f666a4e4..571474f4 100644
--- a/BKUHelp/src/main/webapp/help/help.verify.pin.html
+++ b/BKUHelp/src/main/webapp/help/help.verify.pin.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="help.pin.mgmt.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="help.pin.mgmt.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1>PIN Abfragen</h1>
@@ -43,7 +43,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/index.html b/BKUHelp/src/main/webapp/help/index.html
index 35b15ccd..6ab7d58d 100644
--- a/BKUHelp/src/main/webapp/help/index.html
+++ b/BKUHelp/src/main/webapp/help/index.html
@@ -2,45 +2,46 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Bürgerkarte - Hilfe</title>
-    <link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-    <link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+    <title>CitizenCard - Help</title>
+    <link href="css/help.css" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
   </head>
 
   <body class="twoColElsLtHdr">
 
     <div id="container">
       <div id="header">
-        <h1>Online-Hilfe</h1>
+        <h1>Online Help</h1>
         <!-- end #header --></div>
       <div id="sidebar1">
-        <p><img src="welcome.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-        <p>Hilfe-Icon rechts oben im Bürgerkartendialog</p>
+        <p><img src="welcome.png" alt="applet screenshot" width="190" height="130"/></p>
+        <p>Help icon above CitizenCard dialog</p>
         <!-- end #sidebar1 --></div>
       <div id="mainContent">
-        <h1> Hilfe zur Bürgerkartenumgebung </h1>
-        <p>Die Bürgerkartenumgebung bietet eine kontextabhängige Hilfe,
-          die jederzeit über das Hilfe-Icon rechts oben im Bürgerkartendialog abrufbar ist.
-          Alternativ können die einzelnen Hilfeseiten auch direkt in jedem Browser angezeigt - und zu den Lesezeichen hinzugefügt - werden.
+        <h1>CitizenCard-Environment Help</h1>
+        <p>
+          The context-dependent CitizenCard Environment help is available via
+          the help icon in the top right corner above the CitizenCard dialog.
+          Alternatively, the individual help pages can be accessed or bookmarked directly from the browser.
         </p>
-        <p>Häufige gestellte Fragen werden in den folgenden Hilfeseiten behandelt:</p>
+        <p>Answers to frequently asked questions can be found in the following help pages: </p>
         <ul>
-          <li><a href="help.install.cacert.html">Installation des CA Zertifikats (nur lokale Bürgerkartenumgebung)</a></li>
-          <li><a href="error.pcsc.html">Fehler bei der PC/SC Installation</a></li>
-          <li><a href="cardnotsupported.html">Unterstützte Signaturkarten</a></li>
-          <li><a href="help.cardpin.html">Auslesen der Daten auf der Bürgerkarte</a></li>
-          <li><a href="help.signpin.html">Erstellen einer elektronischen Signatur</a></li>
-          <li><a href="help.retry.html">Falsche PIN</a></li>
-          <li><a href="help.hashdataviewer.html">Anzeige der Signaturdaten</a></li>
-          <li><a href="help.pin.mgmt.html">PIN Verwaltung</a></li>
-          <li><a href="help.change.pin.html">Ändern der PIN</a></li>
+          <li><a href="help.install.cacert.html">CA certificate installation (MOCCA Webstart only)</a></li>
+          <li><a href="error.pcsc.html">PC/SC installation error</a></li>
+          <li><a href="cardnotsupported.html">Supported signature cards</a></li>
+          <li><a href="help.cardpin.html">Accessing protected card data (pin entry)</a></li>
+          <li><a href="help.signpin.html">Signature creation</a></li>
+          <li><a href="help.retry.html">Wrong PIN</a></li>
+          <li><a href="help.hashdataviewer.html">Signature data display</a></li>
+          <li><a href="help.pin.mgmt.html">PIN management</a></li>
+          <li><a href="help.change.pin.html">Change PIN</a></li>
         </ul>
 
         <p><br class="clearfloat" /></p>
       </div>
       <div id="footer">
         <p>
-          <a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+          <a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
         </p>
       </div>
       <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/insertcard.html b/BKUHelp/src/main/webapp/help/insertcard.html
index bb64dcc9..bdc9da25 100644
--- a/BKUHelp/src/main/webapp/help/insertcard.html
+++ b/BKUHelp/src/main/webapp/help/insertcard.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
     <p><img src="insertcard.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Bitte die Bürgerkarte in den Kartenleser stecken</h1>
@@ -35,7 +35,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/wait.html b/BKUHelp/src/main/webapp/help/wait.html
index 35ccffe4..caa0f424 100644
--- a/BKUHelp/src/main/webapp/help/wait.html
+++ b/BKUHelp/src/main/webapp/help/wait.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
     <p><img src="wait.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Bitte warten ...</h1>
@@ -32,7 +32,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKUHelp/src/main/webapp/help/welcome.html b/BKUHelp/src/main/webapp/help/welcome.html
index 44b6279e..2b284e67 100644
--- a/BKUHelp/src/main/webapp/help/welcome.html
+++ b/BKUHelp/src/main/webapp/help/welcome.html
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Bürgerkarte - Hilfe</title>
-<link href="/help/css/help.css" rel="stylesheet" type="text/css" />
-<link rel="shortcut icon" href="/help/chip16.ico" type="image/x-icon"/>
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="chip16.ico" type="image/x-icon"/>
 <!--[if IE]>
 <style type="text/css"> 
 /* place css fixes for all versions of IE in this conditional comment */
@@ -19,11 +19,11 @@
 
 <div id="container">
   <div id="header">
-    <h1>Online-Hilfe</h1>
+    <h1>Online Help</h1>
     <!-- end #header --></div>
   <div id="sidebar1">
-    <p><img src="welcome.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <p><img src="welcome.png" alt="applet screenshot" width="190" height="130"/></p>
+    <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Willkommen </h1>
@@ -33,7 +33,7 @@
   </div>
   <div id="footer">
   	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    	<a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
     </p>
   </div>
 <!-- end #container --></div>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 132f44b4..1bd92096 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -123,7 +123,7 @@
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
diff --git a/BKULocal/src/main/webapp/en/index.html b/BKULocal/src/main/webapp/de/index.html
index cfb0f957..f8c6d2c0 100644
--- a/BKULocal/src/main/webapp/en/index.html
+++ b/BKULocal/src/main/webapp/de/index.html
@@ -18,7 +18,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CitizenCard - Welcome</title>
+    <title>Bürgerkarte - Willkommen</title>
     <link href="/help/css/help.css" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/img/chip16.ico" type="image/x-icon"/>
   </head>
@@ -27,35 +27,35 @@
 
     <div id="container">
       <div id="header">
-        <h1>Welcome</h1>
+        <h1>Willkommen</h1>
         <!-- end #header --></div>
       <div id="mainContent" style="margin: 1.5em 1.5em 0 1.5em">
         <div style="float:left; margin-right:1em">
           <img src="/img/chip48.png" alt="Logo" width="48" height="48"/>
         </div>
-        <p>Congratulations, you successfully installed the citizen-card environment MOCCA.
-          Please install the 
-          <a href="/ca.crt">CA certificate</a>&sup1; as trusted certificate in your browser.
+        <p>Sie haben die Bürgerkartenumgebung MOCCA erfolgreich installiert.
+          Um diese zu verwenden installieren Sie bitte noch das
+          <a href="/ca.crt">CA Zertifikat</a>&sup1; in ihrem Browser.
         </p>
 
-        <p style="clear:left; margin-top:1.5em">Please also have a look at</p>
+        <p style="clear:left; margin-top:1.5em">Weiters können Sie</p>
         <ul>
-          <li>the <a href="/help/en/">help topics</a>,</li>
-          <li>the <a href="/PINManagement?redirect=./index.html">PIN management</a> or </li>
-          <li>the <a href="/ca.crt">CA certificate installation</a> (you may open this link with another browser as well).</li>
+          <li>die <a href="/help">Hilfe durchsehen</a>,</li>
+          <li>die <a href="/PINManagement?redirect=./index.html">PIN Verwaltung starten</a> oder </li>
+          <li>das <a href="/ca.crt">CA Zertifikat installieren</a> (rufen Sie diesen Link aus anderen Web-Browsern auf um auch dort das CA Zertifikat zu installieren).</li>
         </ul>
 
         <p><br class="clearfloat" /></p>
 
         <p style="font-size:80%">
-          &sup1;The automated installation of the CA certificate is not available in Microsoft Windows Vista and Windows 7,
-          please see <a href="/help/en/help.install.cacert.html">Help</a>.
+          &sup1;Eine automatisierte Installation ist mit Microsoft Internet Explorer in Windows Vista oder 7 leider nicht möglich,
+          siehe dazu <a href="/help/help.install.cacert.html">Hilfe</a>.
         </p>
 
       </div>
       <div id="footer">
         <p>
-          <a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
+          <a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
         </p>
       </div>
       <!-- end #container --></div>
diff --git a/BKULocal/src/main/webapp/index.html b/BKULocal/src/main/webapp/index.html
index f8c6d2c0..cfb0f957 100644
--- a/BKULocal/src/main/webapp/index.html
+++ b/BKULocal/src/main/webapp/index.html
@@ -18,7 +18,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Bürgerkarte - Willkommen</title>
+    <title>CitizenCard - Welcome</title>
     <link href="/help/css/help.css" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/img/chip16.ico" type="image/x-icon"/>
   </head>
@@ -27,35 +27,35 @@
 
     <div id="container">
       <div id="header">
-        <h1>Willkommen</h1>
+        <h1>Welcome</h1>
         <!-- end #header --></div>
       <div id="mainContent" style="margin: 1.5em 1.5em 0 1.5em">
         <div style="float:left; margin-right:1em">
           <img src="/img/chip48.png" alt="Logo" width="48" height="48"/>
         </div>
-        <p>Sie haben die Bürgerkartenumgebung MOCCA erfolgreich installiert.
-          Um diese zu verwenden installieren Sie bitte noch das
-          <a href="/ca.crt">CA Zertifikat</a>&sup1; in ihrem Browser.
+        <p>Congratulations, you successfully installed the citizen-card environment MOCCA.
+          Please install the 
+          <a href="/ca.crt">CA certificate</a>&sup1; as trusted certificate in your browser.
         </p>
 
-        <p style="clear:left; margin-top:1.5em">Weiters können Sie</p>
+        <p style="clear:left; margin-top:1.5em">Please also have a look at</p>
         <ul>
-          <li>die <a href="/help">Hilfe durchsehen</a>,</li>
-          <li>die <a href="/PINManagement?redirect=./index.html">PIN Verwaltung starten</a> oder </li>
-          <li>das <a href="/ca.crt">CA Zertifikat installieren</a> (rufen Sie diesen Link aus anderen Web-Browsern auf um auch dort das CA Zertifikat zu installieren).</li>
+          <li>the <a href="/help/en/">help topics</a>,</li>
+          <li>the <a href="/PINManagement?redirect=./index.html">PIN management</a> or </li>
+          <li>the <a href="/ca.crt">CA certificate installation</a> (you may open this link with another browser as well).</li>
         </ul>
 
         <p><br class="clearfloat" /></p>
 
         <p style="font-size:80%">
-          &sup1;Eine automatisierte Installation ist mit Microsoft Internet Explorer in Windows Vista oder 7 leider nicht möglich,
-          siehe dazu <a href="/help/help.install.cacert.html">Hilfe</a>.
+          &sup1;The automated installation of the CA certificate is not available in Microsoft Windows Vista and Windows 7,
+          please see <a href="/help/en/help.install.cacert.html">Help</a>.
         </p>
 
       </div>
       <div id="footer">
         <p>
-          <a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+          <a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
         </p>
       </div>
       <!-- end #container --></div>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index bd2cb67b..5c754f07 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -49,7 +49,6 @@
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/BKUOnline/src/main/webapp/SLRequestForm.html b/BKUOnline/src/main/webapp/SLRequestForm.html
index 8a557262..8f7fe54f 100644
--- a/BKUOnline/src/main/webapp/SLRequestForm.html
+++ b/BKUOnline/src/main/webapp/SLRequestForm.html
@@ -189,6 +189,11 @@
                     <input type="radio" name="applet.jsp" value="BKUApplet" checked="checked">Default
                     <input type="radio" name="applet.jsp" value="BKUAppletAlternative">Alternative
                 </p>
+
+                <p>
+                    <label for="appletPage">Locale</label>
+                    <input value="de_AT" name="locale"/>
+                </p>
 <!--
                 <p>
                     <label for="appletExtension">Extension</label>
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index c1624cdf..eba0ed87 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -134,7 +134,7 @@
             Background : '<%=backgroundImg%>',
             BackgroundColor : '<%=backgroundColor%>',
             WSDL_URL : '../stal;jsessionid=<%=sessionId%>?wsdl',
-            HelpURL : '../help/',
+            HelpURL : 'help/',
             SessionID : '<%=sessionId%>',
             RedirectURL : '../bkuResult',
             RedirectTarget: '_parent',
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index b50b2436..1ba5f3f2 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -33,8 +33,6 @@
             <configuration>
               <includeArtifactIds>BKULocal</includeArtifactIds>
               <includeGroupIds>at.gv.egiz</includeGroupIds>
-              <includeTypes>jar</includeTypes>
-              <excludes>META-INF/</excludes>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <stripVersion>true</stripVersion>
             </configuration>
@@ -226,12 +224,11 @@
       <version>${project.version}</version>
       <type>war</type>
       <!-- make dependency not transitive -->
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCertificates</artifactId>
-      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages.properties b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages.properties
index 8b27b6e3..ee11f2a8 100644
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages.properties
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages.properties
@@ -13,26 +13,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-tray.caption.default=B\u00FCrgerkarte
-tray.caption.error=Fehler
-tray.message.start=wird gestartet...
-tray.message.start.offline=wird offline gestartet...
-tray.message.config=lade Konfiguration
-tray.message.certs=lade Zertifikate
-tray.message.finished=erfolgreich gestartet
-tray.message.shutdown=wird beendet
-tray.error.start=B\u00FCrgerkartenumgebung konnte nicht gestartet werden
-tray.error.config=Konfiguration konnte nicht initialisiert werden, B\u00FCrberkartenumgebung wird nicht gestartet
-tray.error.bind=Die f\u00FCr die B\u00FCrgerkartenumgebung reservierte Adresse wird bereits von einem anderen Dienst verwendet
-tray.error.pin.connect=Verbindung zur PIN Verwaltung konnte nicht hergestellt werden
-tray.error.open.url=Verbindung zu {0} konnte nicht hergestellt werden
-tray.label.shutdown=Beenden
-tray.label.pin=PIN Verwaltung
-tray.label.help=Hilfe
-tray.label.about=\u00DCber...
-tray.tooltip.default=B\u00FCrgerkartenumgebung
-about.frame.title=B\u00FCrgerkarte
-about.title=<html>B\u00FCrgerkartenumgebung
+tray.caption.default=CitizenCard
+tray.caption.error=Error
+tray.message.start=starting...
+tray.message.start.offline=starting offline...
+tray.message.config=loading configuration
+tray.message.certs=loading certificates
+tray.message.finished=successfully started
+tray.message.shutdown=shutting down CitizenCard environment
+tray.error.start=failed to start CitizenCard environment
+tray.error.config=failed to initialize configuration, CitizenCard environment not started
+tray.error.bind=another service is using the address reserved for the CitizenCard environment
+tray.error.pin.connect=failed to connect to PIN management
+tray.error.open.url=failed to open {0}
+tray.label.shutdown=Close
+tray.label.pin=PIN management
+tray.label.help=Help
+tray.label.about=About...
+tray.tooltip.default=CitizenCard
+about.frame.title=CitizenCard
+about.title=<html>CitizenCard Environment
 about.version=<html>Version: {0}
-button.ok=Best\u00E4tigen
-button.close=Schlie\u00DFen
+button.ok=Confirm
+button.close=Close
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages_de.properties b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages_de.properties
new file mode 100644
index 00000000..8b27b6e3
--- /dev/null
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages_de.properties
@@ -0,0 +1,38 @@
+# Copyright 2008 Federal Chancellery Austria and
+# Graz University of Technology
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+tray.caption.default=B\u00FCrgerkarte
+tray.caption.error=Fehler
+tray.message.start=wird gestartet...
+tray.message.start.offline=wird offline gestartet...
+tray.message.config=lade Konfiguration
+tray.message.certs=lade Zertifikate
+tray.message.finished=erfolgreich gestartet
+tray.message.shutdown=wird beendet
+tray.error.start=B\u00FCrgerkartenumgebung konnte nicht gestartet werden
+tray.error.config=Konfiguration konnte nicht initialisiert werden, B\u00FCrberkartenumgebung wird nicht gestartet
+tray.error.bind=Die f\u00FCr die B\u00FCrgerkartenumgebung reservierte Adresse wird bereits von einem anderen Dienst verwendet
+tray.error.pin.connect=Verbindung zur PIN Verwaltung konnte nicht hergestellt werden
+tray.error.open.url=Verbindung zu {0} konnte nicht hergestellt werden
+tray.label.shutdown=Beenden
+tray.label.pin=PIN Verwaltung
+tray.label.help=Hilfe
+tray.label.about=\u00DCber...
+tray.tooltip.default=B\u00FCrgerkartenumgebung
+about.frame.title=B\u00FCrgerkarte
+about.title=<html>B\u00FCrgerkartenumgebung
+about.version=<html>Version: {0}
+button.ok=Best\u00E4tigen
+button.close=Schlie\u00DFen
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages_en.properties b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages_en.properties
deleted file mode 100644
index ee11f2a8..00000000
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages_en.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2008 Federal Chancellery Austria and
-# Graz University of Technology
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tray.caption.default=CitizenCard
-tray.caption.error=Error
-tray.message.start=starting...
-tray.message.start.offline=starting offline...
-tray.message.config=loading configuration
-tray.message.certs=loading certificates
-tray.message.finished=successfully started
-tray.message.shutdown=shutting down CitizenCard environment
-tray.error.start=failed to start CitizenCard environment
-tray.error.config=failed to initialize configuration, CitizenCard environment not started
-tray.error.bind=another service is using the address reserved for the CitizenCard environment
-tray.error.pin.connect=failed to connect to PIN management
-tray.error.open.url=failed to open {0}
-tray.label.shutdown=Close
-tray.label.pin=PIN management
-tray.label.help=Help
-tray.label.about=About...
-tray.tooltip.default=CitizenCard
-about.frame.title=CitizenCard
-about.title=<html>CitizenCard Environment
-about.version=<html>Version: {0}
-button.ok=Confirm
-button.close=Close
diff --git a/pom.xml b/pom.xml
index 49a5f047..4def3bae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,6 +304,12 @@
         <version>${project.version}</version>
         <type>zip</type>
       </dependency>
+      <!-- dependency in BKULocal, BKUWebstart and BKUOnline -->
+      <dependency>
+        <groupId>at.gv.egiz</groupId>
+        <artifactId>BKUCertificates</artifactId>
+        <version>1.2</version>
+      </dependency>
       <dependency>
       	<groupId>org.springframework</groupId>
       	<artifactId>spring-web</artifactId>