# HG changeset patch
# User Emanuel Schuetze <emanuel@intevation.de>
# Date 1411382406 -7200
# Node ID 0651afddb4ec80e1c2982fc35576213718854809
# Parent  f8ad8fc464db4be7c1aa1be26a7e1263557ba770# Parent  59b3c22a404c5a4faafff8fb073b609a586d84e7
Merged.

diff -r 59b3c22a404c -r 0651afddb4ec extras/testplan/testplan.xml
--- a/extras/testplan/testplan.xml	Mon Sep 22 12:38:03 2014 +0200
+++ b/extras/testplan/testplan.xml	Mon Sep 22 12:40:06 2014 +0200
@@ -351,7 +351,7 @@
                 <step>Button [Aktualisieren] klicken.</step>
             </steps>
             <results>
-                <result>TrustBridge wurde lokal installiert.</result>
+                <result>TrustBridge wurde systemweit installiert.</result>
                 <result>TrustBridge startet nach Abschluss der Installation automatisch.</result>
                 <result>Eintrag im Startmenü ist vorhanden</result>
                 <result>TrustBridge meldet nach Login, dass neue Zertifikatsaktualisierungen verfügbar sind.</result>
diff -r 59b3c22a404c -r 0651afddb4ec manuals/admin-manual/_templates/searchbox.html
--- a/manuals/admin-manual/_templates/searchbox.html	Mon Sep 22 12:38:03 2014 +0200
+++ b/manuals/admin-manual/_templates/searchbox.html	Mon Sep 22 12:40:06 2014 +0200
@@ -9,7 +9,7 @@
 #}
 {%- if pagename != "search" and builder != "singlehtml" %}
 <div id="searchbox" style="display: none">
-  <h3>{{ _('Quick search') }}</h3>
+  <h3>Suche</h3>
     <form class="search" action="{{ pathto('search') }}" method="get">
       <input type="text" name="q" />
       <input type="submit" value="{{ _('Go') }}" />
diff -r 59b3c22a404c -r 0651afddb4ec manuals/help-manual/_templates/searchbox.html
--- a/manuals/help-manual/_templates/searchbox.html	Mon Sep 22 12:38:03 2014 +0200
+++ b/manuals/help-manual/_templates/searchbox.html	Mon Sep 22 12:40:06 2014 +0200
@@ -9,7 +9,7 @@
 #}
 {%- if pagename != "search" and builder != "singlehtml" %}
 <div id="searchbox" style="display: none">
-  <h3>{{ _('Quick search') }}</h3>
+  <h3>Suche</h3>
     <form class="search" action="{{ pathto('search') }}" method="get">
       <input type="text" name="q" />
       <input type="submit" value="{{ _('Go') }}" />