diff --git a/octoprint_klipper/templates/klipper_graph_dialog.jinja2 b/octoprint_klipper/templates/klipper_graph_dialog.jinja2
index a0508e8..d24c80b 100644
--- a/octoprint_klipper/templates/klipper_graph_dialog.jinja2
+++ b/octoprint_klipper/templates/klipper_graph_dialog.jinja2
@@ -6,7 +6,7 @@
    <div class="modal-body">
       <div class="full-sized-box">
          <span class="help-inline" style="display:block; position: absolute">
-            <em>Click labels to hide/show dataset</em>
+            <em>{{ _('Click labels to hide/show dataset') }}</em>
          </span>
          <script src="plugin/klipper/static/js/lib/Chart.bundle.min.js" type="text/javascript" defer></script>
          <canvas id="klipper_graph_canvas"></canvas>
@@ -32,6 +32,6 @@
 <div id="klipper_graph_spinner" class="modal hide fade small" tabindex="-1" role="dialog" aria-hidden="true">
    <img src="plugin/klipper/static/img/spinner.gif" width="100" height="100">
    <span class="help-inline">
-      Depending on the size of the log file this might take a while.
+      {{ _('Depending on the size of the log file this might take a while.') }}
    </span>
 </div>
diff --git a/octoprint_klipper/templates/klipper_navbar.jinja2 b/octoprint_klipper/templates/klipper_navbar.jinja2
index a227021..91d3c32 100644
--- a/octoprint_klipper/templates/klipper_navbar.jinja2
+++ b/octoprint_klipper/templates/klipper_navbar.jinja2
@@ -1,3 +1,3 @@
 <!-- ko if: settings.settings.plugins.klipper.configuration.shortStatus_navbar -->
-    <a title="Go to OctoKlipper Tab" data-bind="text: shortStatus_navbar, click: navbarClicked"></a>
+    <a title="{{ _('Go to OctoKlipper Tab') }}" data-bind="text: shortStatus_navbar, click: navbarClicked"></a>
 <!-- /ko -->
diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2
index 9371e70..6d60d5a 100644
--- a/octoprint_klipper/templates/klipper_settings.jinja2
+++ b/octoprint_klipper/templates/klipper_settings.jinja2
@@ -1,9 +1,9 @@
 <form class="form-horizontal">
 <ul class="nav nav-pills" id="klipper-settings">
-  <li><a href="#basic" data-toggle="tab" data-profile-type="klipper-basic">Basic</a></li>
-  <li><a href="#macros" data-toggle="tab" data-profile-type="klipper-macros">Macros</a></li>
-  <li><a href="#level" data-toggle="tab" data-profile-type="klipper-bed">Bed Leveling</a></li>
-  <li><a href="#conf" data-toggle="tab" data-profile-type="klipper-config">Klipper Configuration</a></li>
+  <li><a href="#basic" data-toggle="tab" data-profile-type="klipper-basic">{{ _('Basic') }}</a></li>
+  <li><a href="#macros" data-toggle="tab" data-profile-type="klipper-macros">{{ _('Macros') }}</a></li>
+  <li><a href="#level" data-toggle="tab" data-profile-type="klipper-bed">{{ _('Bed Leveling') }}</a></li>
+  <li><a href="#conf" data-toggle="tab" data-profile-type="klipper-config">{{ _('Klipper Configuration') }}</a></li>
 </ul>
 <div class="tab-content">
   <!-- Basics -->
@@ -55,8 +55,8 @@
               <option value="manually">Manually</option>
            </select>
            <span class="help-block">
-              The command that is executed when the Klipper configuration changed and needs to be reloaded.<br>
-              Set this to "Manually" if you don't want to immediately restart klipper.
+              {{ _('The command that is executed when the Klipper configuration changed and needs to be reloaded.<br>
+              Set this to "Manually" if you don\'t want to immediately restart klipper.') }}
            </span>
         </div>
     </div>
@@ -111,7 +111,7 @@
     </div>
     <div class="control-group">
         <span class="help-block">
-         To show a dialog that asks for parameters you can write your macro like in the following example:<br>
+         {{ _('To show a dialog that asks for parameters you can write your macro like in the following example:') }}<br>
         </span>
     </div>
     <div class="control-group">
@@ -127,8 +127,8 @@
   <div class="tab-pane" id="level">
     <div class="control-group">
        <span class="help-block">
-           This feature assists in manually leveling you print bed by moving the head to the defined points in sequence.<br>
-           If you use a piece of paper for leveling, set "Probe Height" to the paper thickness eg. "0.1".
+           {{ _('This feature assists in manually leveling you print bed by moving the head to the defined points in sequence.<br>
+           If you use a piece of paper for leveling, set "Probe Height" to the paper thickness eg. "0.1".') }}
         </span>
     </div>
     <div class="control-group">
diff --git a/octoprint_klipper/templates/klipper_sidebar.jinja2 b/octoprint_klipper/templates/klipper_sidebar.jinja2
index 8276b33..86f98be 100644
--- a/octoprint_klipper/templates/klipper_sidebar.jinja2
+++ b/octoprint_klipper/templates/klipper_sidebar.jinja2
@@ -8,7 +8,7 @@
 </div>
 <!-- ko if: settings.settings.plugins.klipper.configuration.shortStatus_sidebar -->
   <div class="plugin-klipper-sidebar">
-    <a title="Go to OctoKlipper Tab" data-bind="text: shortStatus_sidebar, click: navbarClicked"></a>
+    <a title="{{ _('Go to OctoKlipper Tab') }}" data-bind="text: shortStatus_sidebar, click: navbarClicked"></a>
   </div>
 <!-- /ko -->
 <div class="control-group" data-bind="visible: hasRight('MACRO', 'Ko')">
diff --git a/octoprint_klipper/templates/klipper_tab_main.jinja2 b/octoprint_klipper/templates/klipper_tab_main.jinja2
index b7a8840..bbfac99 100644
--- a/octoprint_klipper/templates/klipper_tab_main.jinja2
+++ b/octoprint_klipper/templates/klipper_tab_main.jinja2
@@ -11,9 +11,9 @@
     <button
       class="btn btn-mini pull-right clear-btn"
       data-bind="click: onClearLog"
-      title="Clear Log"
+      title="{{ _('Clear Log') }}"
     >
-      <i class="fa fa-trash"></i> {{ _("Clear") }}
+      <i class="fa fa-trash"></i> {{ _('Clear Log') }}
     </button>
   </div>
   <div id="right-side">
@@ -24,14 +24,14 @@
           <button
             class="btn btn-block btn-small"
             data-bind="click: onGetStatus, enable: isActive()"
-            title="Query Klipper for its current status"
+            title="{{ _('Query Klipper for its current status') }}"
           >
             <i class="fa icon-black fa-info-circle"></i> {{ _("Get Status") }}
           </button>
           <button
             class="btn btn-block btn-small"
             data-bind="visible: hasRight('CONFIG', 'Ko'), click: function() {openOctoKlipperSettings('klipper-config');}"
-            title="Open the Klipper configurationfile"
+            title="{{ _('Open the Klipper configuration file') }}"
           >
             <i class="fa icon-black fa-file-code-o"></i>
             {{ _("Open Klipper config") }}
@@ -46,14 +46,14 @@
           <button
             class="btn btn-block btn-small"
             data-bind="click: onRestartHost, enable: isActive()"
-            title="This will cause the host software to reload its config and perform an internal reset"
+            title="{{ _('This will cause the host software to reload its config and perform an internal reset') }}"
           >
             {{ _("Host") }}
           </button>
           <button
             class="btn btn-block btn-small"
             data-bind="click: onRestartFirmware, enable: isActive()"
-            title="Similar to a host restart, but also clears any error state from the micro-controller"
+            title="{{ _('Similar to a host restart, but also clears any error state from the micro-controller') }}"
           >
             {{ _("Firmware") }}
           </button>
@@ -67,28 +67,28 @@
           <button
             class="btn btn-block btn-small"
             data-bind="click: showLevelingDialog, enable: isActive()"
-            title="Assists in manually leveling your printbed by moving the head to a configurable set of positions in sequence."
+            title="{{ _('Assists in manually leveling your printbed by moving the head to a configurable set of positions in sequence.') }}"
           >
             {{ _("Assisted Bed Leveling") }}
           </button>
           <button
             class="btn btn-block btn-small"
             data-bind="click: showPidTuningDialog, enable: isActive()"
-            title="Determines optimal PID parameters by heat cycling the hotend/bed."
+            title="{{ _('Determines optimal PID parameters by heat cycling the hotend/bed.') }}"
           >
             {{ _("PID Tuning") }}
           </button>
           <button
             class="btn btn-block btn-small"
             data-bind="click: showOffsetDialog, enable: isActive()"
-            title="Sets a offset for subsequent GCODE coordinates."
+            title="{{ _('Sets a offset for subsequent GCODE coordinates.') }}"
           >
             {{ _("Coordinate Offset") }}
           </button>
           <button
             class="btn btn-block btn-small"
             data-bind="click: showGraphDialog"
-            title="Assists in debugging performance issues by analyzing the Klipper log files."
+            title="{{ _('Assists in debugging performance issues by analyzing the Klipper log files.') }}"
           >
             {{ _("Analyze Klipper Log") }}
           </button>
diff --git a/octoprint_klipper/translations/de/LC_MESSAGES/messages.mo b/octoprint_klipper/translations/de/LC_MESSAGES/messages.mo
index 5775b70..f5c061a 100644
Binary files a/octoprint_klipper/translations/de/LC_MESSAGES/messages.mo and b/octoprint_klipper/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/octoprint_klipper/translations/de/LC_MESSAGES/messages.po b/octoprint_klipper/translations/de/LC_MESSAGES/messages.po
index 512e789..24d60c5 100644
--- a/octoprint_klipper/translations/de/LC_MESSAGES/messages.po
+++ b/octoprint_klipper/translations/de/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OctoKlipper 0.3.8.2\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2021-05-13 16:32+0200\n"
+"POT-Creation-Date: 2021-05-13 18:15+0200\n"
 "PO-Revision-Date: 2021-05-13 17:32+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -31,6 +31,10 @@ msgstr "Erlaubt Makros zu benutzen"
 msgid "Performance Graph"
 msgstr "Performancediagramm"
 
+#: octoprint_klipper/templates/klipper_graph_dialog.jinja2:9
+msgid "Click labels to hide/show dataset"
+msgstr "Auf Labels klicken zum verstecken/anzeigen"
+
 #: octoprint_klipper/templates/klipper_graph_dialog.jinja2:15
 msgid "Fill Datasets"
 msgstr "Fülle Flächen"
@@ -47,6 +51,10 @@ msgstr "Log analysieren"
 msgid "Close"
 msgstr "Schließen"
 
+#: octoprint_klipper/templates/klipper_graph_dialog.jinja2:35
+msgid "Depending on the size of the log file this might take a while."
+msgstr "Abhängig von der Größe der Logdatei kann es etwas dauern."
+
 #: octoprint_klipper/templates/klipper_leveling_dialog.jinja2:4
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:72
 msgid "Assisted Bed Leveling"
@@ -72,6 +80,11 @@ msgstr "Nächster"
 msgid "Stop"
 msgstr "Stop"
 
+#: octoprint_klipper/templates/klipper_navbar.jinja2:2
+#: octoprint_klipper/templates/klipper_sidebar.jinja2:11
+msgid "Go to OctoKlipper Tab"
+msgstr "Gehe zum OctoKlipper Reiter"
+
 #: octoprint_klipper/templates/klipper_offset_dialog.jinja2:4
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:86
 msgid "Coordinate Offset"
@@ -122,6 +135,26 @@ msgstr "Die Ergebnisse der Abstimmung werden im Nachrichtenlog ausgegeben."
 msgid "Start Tuning"
 msgstr "Starte Abstimmung"
 
+#: octoprint_klipper/templates/klipper_settings.jinja2:3
+msgid "Basic"
+msgstr "Haupteinstellungen"
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:4
+#: octoprint_klipper/templates/klipper_sidebar.jinja2:16
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:99
+msgid "Macros"
+msgstr "Makros"
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:5
+#, fuzzy
+msgid "Bed Leveling"
+msgstr "Unterstützte Druckbett-Nivellierung"
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:6
+#, fuzzy
+msgid "Klipper Configuration"
+msgstr "Klipper Konfiguration"
+
 #: octoprint_klipper/templates/klipper_settings.jinja2:12
 msgid "Serial Port"
 msgstr "Serieller Port"
@@ -160,6 +193,17 @@ msgstr "Klipper Logdatei"
 msgid "Configuration Reload Command"
 msgstr "Konfiguration Neustart Befehl"
 
+#: octoprint_klipper/templates/klipper_settings.jinja2:58
+msgid ""
+"The command that is executed when the Klipper configuration changed and "
+"needs to be reloaded.<br>\n"
+"              Set this to \"Manually\" if you don't want to immediately "
+"restart klipper."
+msgstr ""
+"Der Befehl der ausgeführt wird nachdem die Klipper Konfiguration geändert wurde und "
+"neu geladen werden muss.<br>\n"
+"              Auf \"Manually\" setzen wenn man nicht gleich Klipper neustarten möchte."
+
 #: octoprint_klipper/templates/klipper_settings.jinja2:69
 msgid "Add macro button to:"
 msgstr "Makroschaltfläche anzeigen:"
@@ -186,9 +230,29 @@ msgstr "Befehl"
 msgid "Add Macro"
 msgstr "Makro hinzufügen"
 
+#: octoprint_klipper/templates/klipper_settings.jinja2:114
+msgid ""
+"To show a dialog that asks for parameters you can write your macro like "
+"in the following example:"
+msgstr ""
+"Um ein Dialog anzeigen zu lassen, welches nach Parametern fragt, kann man "
+"ein Makro wie im nächsten Beispiel schreiben:"
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:130
+msgid ""
+"This feature assists in manually leveling you print bed by moving the "
+"head to the defined points in sequence.<br>\n"
+"           If you use a piece of paper for leveling, set \"Probe Height\""
+" to the paper thickness eg. \"0.1\"."
+msgstr ""
+"Diese Funktion hilft beim Einstellen des Druckbettes, "
+"da es die angegebenen Punkte automatisch nacheinander anfährt.<br>\n"
+"          Wenn man ein Papier zum messen nimmt, setzt man \"Messhöhe\""
+" auf die Papierstärke zBsp.: \"0.1\"."
+
 #: octoprint_klipper/templates/klipper_settings.jinja2:135
 msgid "Probe Height"
-msgstr "Sensor Messhöhe"
+msgstr "Messhöhe"
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:141
 msgid "Z-height to probe at"
@@ -196,11 +260,11 @@ msgstr "Höhe bei der gemessen wird"
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:145
 msgid "Probe Lift"
-msgstr "Sensorhöhe bei Seitenbewegung"
+msgstr "Höhe für Seitenbewegung"
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:151
 msgid "Lift Head by this amount before moving."
-msgstr "Hebe Düsenkopf auf diese Höhe vor Seitenbewegung"
+msgstr "Hebe Druckkopf auf diese Höhe vor Seitenbewegung"
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:155
 msgid "Probe Feedrate Z"
@@ -253,31 +317,50 @@ msgstr "Verbinde"
 msgid "Open Klipper config"
 msgstr "Öffne Klipper Konfig"
 
-#: octoprint_klipper/templates/klipper_sidebar.jinja2:16
-#: octoprint_klipper/templates/klipper_tab_main.jinja2:99
-msgid "Macros"
-msgstr "Makros"
-
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:3
 msgid "Messages"
 msgstr "Nachricht"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:14
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:16
-msgid "Clear"
-msgstr "Lösche"
+msgid "Clear Log"
+msgstr "Log löschen"
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:27
+msgid "Query Klipper for its current status"
+msgstr "Aktuellen Status von Klipper anfragen"
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:29
 msgid "Get Status"
 msgstr "Statusanfrage"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:34
+#, fuzzy
+msgid "Open the Klipper configuration file"
+msgstr "Öffne Klipper Konfiguration"
+
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:44
 msgid "Restart"
 msgstr "Neustart"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:49
+msgid ""
+"This will cause the host software to reload its config and perform an "
+"internal reset"
+msgstr ""
+"Das wird die Konfigurationsdatei neuladen und die Hostsoftware neustarten"
+
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:51
 msgid "Host"
 msgstr "Host"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:56
+msgid ""
+"Similar to a host restart, but also clears any error state from the "
+"micro-controller"
+msgstr ""
+"Wie der Host Neustart, aber zusätzlich wird die Firmware neugestartet"
+
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:58
 msgid "Firmware"
 msgstr "Firmware"
@@ -286,6 +369,29 @@ msgstr "Firmware"
 msgid "Tools"
 msgstr "Tools"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:70
+msgid ""
+"Assists in manually leveling your printbed by moving the head to a "
+"configurable set of positions in sequence."
+msgstr ""
+"Unterstützt beim manuellem Bettnivellieren da der Druckkopf "
+"nacheinander einstellbare Punkte anfährt."
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:77
+msgid "Determines optimal PID parameters by heat cycling the hotend/bed."
+msgstr "Findet optimale PID Parameter beim zyklischen Heizen des Druckkopfes/-bettes."
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:84
+msgid "Sets a offset for subsequent GCODE coordinates."
+msgstr "Setze einen Versatz für alle weiteren GCODE Koordinaten"
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:91
+msgid ""
+"Assists in debugging performance issues by analyzing the Klipper log "
+"files."
+msgstr ""
+"Unterstützt beim Suchen von Performanceproblemen mit dem analysieren des Klipperlogs"
+
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:93
 msgid "Analyze Klipper Log"
 msgstr "Analysiere Klipperlog"
diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo
index 5775b70..f5c061a 100644
Binary files a/translations/de/LC_MESSAGES/messages.mo and b/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po
index 512e789..24d60c5 100644
--- a/translations/de/LC_MESSAGES/messages.po
+++ b/translations/de/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OctoKlipper 0.3.8.2\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2021-05-13 16:32+0200\n"
+"POT-Creation-Date: 2021-05-13 18:15+0200\n"
 "PO-Revision-Date: 2021-05-13 17:32+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -31,6 +31,10 @@ msgstr "Erlaubt Makros zu benutzen"
 msgid "Performance Graph"
 msgstr "Performancediagramm"
 
+#: octoprint_klipper/templates/klipper_graph_dialog.jinja2:9
+msgid "Click labels to hide/show dataset"
+msgstr "Auf Labels klicken zum verstecken/anzeigen"
+
 #: octoprint_klipper/templates/klipper_graph_dialog.jinja2:15
 msgid "Fill Datasets"
 msgstr "Fülle Flächen"
@@ -47,6 +51,10 @@ msgstr "Log analysieren"
 msgid "Close"
 msgstr "Schließen"
 
+#: octoprint_klipper/templates/klipper_graph_dialog.jinja2:35
+msgid "Depending on the size of the log file this might take a while."
+msgstr "Abhängig von der Größe der Logdatei kann es etwas dauern."
+
 #: octoprint_klipper/templates/klipper_leveling_dialog.jinja2:4
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:72
 msgid "Assisted Bed Leveling"
@@ -72,6 +80,11 @@ msgstr "Nächster"
 msgid "Stop"
 msgstr "Stop"
 
+#: octoprint_klipper/templates/klipper_navbar.jinja2:2
+#: octoprint_klipper/templates/klipper_sidebar.jinja2:11
+msgid "Go to OctoKlipper Tab"
+msgstr "Gehe zum OctoKlipper Reiter"
+
 #: octoprint_klipper/templates/klipper_offset_dialog.jinja2:4
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:86
 msgid "Coordinate Offset"
@@ -122,6 +135,26 @@ msgstr "Die Ergebnisse der Abstimmung werden im Nachrichtenlog ausgegeben."
 msgid "Start Tuning"
 msgstr "Starte Abstimmung"
 
+#: octoprint_klipper/templates/klipper_settings.jinja2:3
+msgid "Basic"
+msgstr "Haupteinstellungen"
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:4
+#: octoprint_klipper/templates/klipper_sidebar.jinja2:16
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:99
+msgid "Macros"
+msgstr "Makros"
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:5
+#, fuzzy
+msgid "Bed Leveling"
+msgstr "Unterstützte Druckbett-Nivellierung"
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:6
+#, fuzzy
+msgid "Klipper Configuration"
+msgstr "Klipper Konfiguration"
+
 #: octoprint_klipper/templates/klipper_settings.jinja2:12
 msgid "Serial Port"
 msgstr "Serieller Port"
@@ -160,6 +193,17 @@ msgstr "Klipper Logdatei"
 msgid "Configuration Reload Command"
 msgstr "Konfiguration Neustart Befehl"
 
+#: octoprint_klipper/templates/klipper_settings.jinja2:58
+msgid ""
+"The command that is executed when the Klipper configuration changed and "
+"needs to be reloaded.<br>\n"
+"              Set this to \"Manually\" if you don't want to immediately "
+"restart klipper."
+msgstr ""
+"Der Befehl der ausgeführt wird nachdem die Klipper Konfiguration geändert wurde und "
+"neu geladen werden muss.<br>\n"
+"              Auf \"Manually\" setzen wenn man nicht gleich Klipper neustarten möchte."
+
 #: octoprint_klipper/templates/klipper_settings.jinja2:69
 msgid "Add macro button to:"
 msgstr "Makroschaltfläche anzeigen:"
@@ -186,9 +230,29 @@ msgstr "Befehl"
 msgid "Add Macro"
 msgstr "Makro hinzufügen"
 
+#: octoprint_klipper/templates/klipper_settings.jinja2:114
+msgid ""
+"To show a dialog that asks for parameters you can write your macro like "
+"in the following example:"
+msgstr ""
+"Um ein Dialog anzeigen zu lassen, welches nach Parametern fragt, kann man "
+"ein Makro wie im nächsten Beispiel schreiben:"
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:130
+msgid ""
+"This feature assists in manually leveling you print bed by moving the "
+"head to the defined points in sequence.<br>\n"
+"           If you use a piece of paper for leveling, set \"Probe Height\""
+" to the paper thickness eg. \"0.1\"."
+msgstr ""
+"Diese Funktion hilft beim Einstellen des Druckbettes, "
+"da es die angegebenen Punkte automatisch nacheinander anfährt.<br>\n"
+"          Wenn man ein Papier zum messen nimmt, setzt man \"Messhöhe\""
+" auf die Papierstärke zBsp.: \"0.1\"."
+
 #: octoprint_klipper/templates/klipper_settings.jinja2:135
 msgid "Probe Height"
-msgstr "Sensor Messhöhe"
+msgstr "Messhöhe"
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:141
 msgid "Z-height to probe at"
@@ -196,11 +260,11 @@ msgstr "Höhe bei der gemessen wird"
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:145
 msgid "Probe Lift"
-msgstr "Sensorhöhe bei Seitenbewegung"
+msgstr "Höhe für Seitenbewegung"
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:151
 msgid "Lift Head by this amount before moving."
-msgstr "Hebe Düsenkopf auf diese Höhe vor Seitenbewegung"
+msgstr "Hebe Druckkopf auf diese Höhe vor Seitenbewegung"
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:155
 msgid "Probe Feedrate Z"
@@ -253,31 +317,50 @@ msgstr "Verbinde"
 msgid "Open Klipper config"
 msgstr "Öffne Klipper Konfig"
 
-#: octoprint_klipper/templates/klipper_sidebar.jinja2:16
-#: octoprint_klipper/templates/klipper_tab_main.jinja2:99
-msgid "Macros"
-msgstr "Makros"
-
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:3
 msgid "Messages"
 msgstr "Nachricht"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:14
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:16
-msgid "Clear"
-msgstr "Lösche"
+msgid "Clear Log"
+msgstr "Log löschen"
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:27
+msgid "Query Klipper for its current status"
+msgstr "Aktuellen Status von Klipper anfragen"
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:29
 msgid "Get Status"
 msgstr "Statusanfrage"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:34
+#, fuzzy
+msgid "Open the Klipper configuration file"
+msgstr "Öffne Klipper Konfiguration"
+
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:44
 msgid "Restart"
 msgstr "Neustart"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:49
+msgid ""
+"This will cause the host software to reload its config and perform an "
+"internal reset"
+msgstr ""
+"Das wird die Konfigurationsdatei neuladen und die Hostsoftware neustarten"
+
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:51
 msgid "Host"
 msgstr "Host"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:56
+msgid ""
+"Similar to a host restart, but also clears any error state from the "
+"micro-controller"
+msgstr ""
+"Wie der Host Neustart, aber zusätzlich wird die Firmware neugestartet"
+
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:58
 msgid "Firmware"
 msgstr "Firmware"
@@ -286,6 +369,29 @@ msgstr "Firmware"
 msgid "Tools"
 msgstr "Tools"
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:70
+msgid ""
+"Assists in manually leveling your printbed by moving the head to a "
+"configurable set of positions in sequence."
+msgstr ""
+"Unterstützt beim manuellem Bettnivellieren da der Druckkopf "
+"nacheinander einstellbare Punkte anfährt."
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:77
+msgid "Determines optimal PID parameters by heat cycling the hotend/bed."
+msgstr "Findet optimale PID Parameter beim zyklischen Heizen des Druckkopfes/-bettes."
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:84
+msgid "Sets a offset for subsequent GCODE coordinates."
+msgstr "Setze einen Versatz für alle weiteren GCODE Koordinaten"
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:91
+msgid ""
+"Assists in debugging performance issues by analyzing the Klipper log "
+"files."
+msgstr ""
+"Unterstützt beim Suchen von Performanceproblemen mit dem analysieren des Klipperlogs"
+
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:93
 msgid "Analyze Klipper Log"
 msgstr "Analysiere Klipperlog"
diff --git a/translations/messages.pot b/translations/messages.pot
index 42eab70..c876298 100644
--- a/translations/messages.pot
+++ b/translations/messages.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OctoKlipper 0.3.8.2\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2021-05-13 16:32+0200\n"
+"POT-Creation-Date: 2021-05-13 18:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,272 +20,361 @@ msgstr ""
 
 #: octoprint_klipper/__init__.py:87
 msgid "Allows to config klipper"
-msgstr "Erlaubt Klipper zu konfigurieren"
+msgstr ""
 
 #: octoprint_klipper/__init__.py:95
 msgid "Allows to use klipper macros"
-msgstr "Erlaubt Makros zu benutzen"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_graph_dialog.jinja2:4
 msgid "Performance Graph"
-msgstr "Performancediagramm"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_graph_dialog.jinja2:9
+msgid "Click labels to hide/show dataset"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_graph_dialog.jinja2:15
 msgid "Fill Datasets"
-msgstr "Fülle Flächen"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_graph_dialog.jinja2:22
 msgid "Select"
-msgstr "Auswählen"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_graph_dialog.jinja2:26
 msgid "Analyze Log"
-msgstr "Log analysieren"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_graph_dialog.jinja2:27
 msgid "Close"
-msgstr "Schließen"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_graph_dialog.jinja2:35
+msgid "Depending on the size of the log file this might take a while."
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_leveling_dialog.jinja2:4
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:72
 msgid "Assisted Bed Leveling"
-msgstr "Unterstützte Druckbett-Nivellierung"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_leveling_dialog.jinja2:14
 msgid "Home"
-msgstr "Grundstellung"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_leveling_dialog.jinja2:42
 msgid "Start"
-msgstr "Start"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_leveling_dialog.jinja2:43
 msgid "Previous"
-msgstr "Vorheriger"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_leveling_dialog.jinja2:44
 msgid "Next"
-msgstr "Nächster"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_leveling_dialog.jinja2:45
 msgid "Stop"
-msgstr "Stop"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_navbar.jinja2:2
+#: octoprint_klipper/templates/klipper_sidebar.jinja2:11
+msgid "Go to OctoKlipper Tab"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_offset_dialog.jinja2:4
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:86
 msgid "Coordinate Offset"
-msgstr "Koordinaten Versatz"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_offset_dialog.jinja2:8
 msgid "Set an offset for all future GCODE move commands in mm."
-msgstr "Setze einen Versatz in mm für alle zukünftigen GCODE Bewegungskommandos"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_offset_dialog.jinja2:26
 msgid "Add to existing offset"
-msgstr "Hinzufügen zum existierenden Versatz"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_offset_dialog.jinja2:31
 msgid "Set Offset"
-msgstr "Setze Versatz"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_param_macro_dialog.jinja2:4
 msgid "Run - "
-msgstr "Ausführen - "
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_param_macro_dialog.jinja2:27
 msgid "OK"
-msgstr "OK"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2:4
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:79
 msgid "PID Tuning"
-msgstr "PID Abstimmung"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2:8
 msgid "Heater / Extruder Name (from config file)"
-msgstr "Heizer / Extruder Name (von Konfigdatei)"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2:12
 msgid "name"
-msgstr "Name"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2:17
 msgid "Target Temperature"
-msgstr "Zieltemperatur"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2:25
 msgid "The result of the tuning cycle is reported in the message log."
-msgstr "Die Ergebnisse der Abstimmung werden im Nachrichtenlog ausgegeben."
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_pid_tuning_dialog.jinja2:28
 msgid "Start Tuning"
-msgstr "Starte Abstimmung"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:3
+msgid "Basic"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:4
+#: octoprint_klipper/templates/klipper_sidebar.jinja2:16
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:99
+msgid "Macros"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:5
+msgid "Bed Leveling"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:6
+msgid "Klipper Configuration"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:12
 msgid "Serial Port"
-msgstr "Serieller Port"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:18
 #: octoprint_klipper/templates/klipper_settings.jinja2:20
 msgid "Replace Connection Panel"
-msgstr "Ersetze Verbindungsmenu"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:25
 msgid "Show Short Messages"
-msgstr "Zeige Kurzmeldungen"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:27
 msgid "on NavBar"
-msgstr "auf Nav-leiste"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:28
 msgid "on SideBar"
-msgstr "auf Seitenleiste"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:32
 #: octoprint_klipper/templates/klipper_settings.jinja2:34
 msgid "Enable debug logging"
-msgstr "Aktiviere Debugloging"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:38
 msgid "Klipper Config File"
-msgstr "Klipper Konfigdatei"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:44
 msgid "Klipper Log File"
-msgstr "Klipper Logdatei"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:50
 msgid "Configuration Reload Command"
-msgstr "Konfiguration Neustart Befehl"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:58
+msgid ""
+"The command that is executed when the Klipper configuration changed and "
+"needs to be reloaded.<br>\n"
+"              Set this to \"Manually\" if you don't want to immediately "
+"restart klipper."
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:69
 msgid "Add macro button to:"
-msgstr "Makroschaltfläche anzeigen:"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:70
 #: octoprint_klipper/templates/klipper_settings.jinja2:84
 msgid "Klipper Tab"
-msgstr "Klipper Reiter"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:71
 #: octoprint_klipper/templates/klipper_settings.jinja2:87
 msgid "Sidebar"
-msgstr "Seitenleiste"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:77
 msgid "Name"
-msgstr "Name"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:96
 msgid "Command"
-msgstr "Befehl"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:109
 msgid "Add Macro"
-msgstr "Makro hinzufügen"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:114
+msgid ""
+"To show a dialog that asks for parameters you can write your macro like "
+"in the following example:"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_settings.jinja2:130
+msgid ""
+"This feature assists in manually leveling you print bed by moving the "
+"head to the defined points in sequence.<br>\n"
+"           If you use a piece of paper for leveling, set \"Probe Height\""
+" to the paper thickness eg. \"0.1\"."
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:135
 msgid "Probe Height"
-msgstr "Sensor Messhöhe"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:141
 msgid "Z-height to probe at"
-msgstr "Höhe bei der gemessen wird"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:145
 msgid "Probe Lift"
-msgstr "Sensorhöhe bei Seitenbewegung"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:151
 msgid "Lift Head by this amount before moving."
-msgstr "Hebe Düsenkopf auf diese Höhe vor Seitenbewegung"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:155
 msgid "Probe Feedrate Z"
-msgstr "Geschwindigkeit Z"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:164
 msgid "Feedrate X/Y"
-msgstr "Geschwindigkeit X/Y"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:173
 msgid "Probe Points"
-msgstr "Messpunkte"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:200
 msgid "Add Point"
-msgstr "Füge Messpunkt hinzu"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:212
 #: octoprint_klipper/templates/klipper_settings.jinja2:213
 msgid "Reload last changes"
-msgstr "Lade letzte Änderung"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:216
 #: octoprint_klipper/templates/klipper_settings.jinja2:217
 msgid "Reload from file"
-msgstr "Neuladen von Datei"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:219
 msgid "Check parsing on save"
-msgstr "Prüfe Syntax beim speichern"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:221
 msgid "Decrease Fontsize"
-msgstr "Verringere Schriftgröße"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_settings.jinja2:222
 msgid "Increase Fontsize"
-msgstr "Vergrößere Schriftgröße"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_sidebar.jinja2:3
 msgid "Printer Profile"
-msgstr "Druckprofil"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_sidebar.jinja2:5
 msgid "Connect"
-msgstr "Verbinde"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_sidebar.jinja2:6
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:37
 msgid "Open Klipper config"
-msgstr "Öffne Klipper Konfig"
-
-#: octoprint_klipper/templates/klipper_sidebar.jinja2:16
-#: octoprint_klipper/templates/klipper_tab_main.jinja2:99
-msgid "Macros"
-msgstr "Makros"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:3
 msgid "Messages"
-msgstr "Nachricht"
+msgstr ""
 
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:14
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:16
-msgid "Clear"
-msgstr "Lösche"
+msgid "Clear Log"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:27
+msgid "Query Klipper for its current status"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:29
 msgid "Get Status"
-msgstr "Statusanfrage"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:34
+msgid "Open the Klipper configuration file"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:44
 msgid "Restart"
-msgstr "Neustart"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:49
+msgid ""
+"This will cause the host software to reload its config and perform an "
+"internal reset"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:51
 msgid "Host"
-msgstr "Host"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:56
+msgid ""
+"Similar to a host restart, but also clears any error state from the "
+"micro-controller"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:58
 msgid "Firmware"
-msgstr "Firmware"
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:65
 msgid "Tools"
-msgstr "Tools"
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:70
+msgid ""
+"Assists in manually leveling your printbed by moving the head to a "
+"configurable set of positions in sequence."
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:77
+msgid "Determines optimal PID parameters by heat cycling the hotend/bed."
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:84
+msgid "Sets a offset for subsequent GCODE coordinates."
+msgstr ""
+
+#: octoprint_klipper/templates/klipper_tab_main.jinja2:91
+msgid ""
+"Assists in debugging performance issues by analyzing the Klipper log "
+"files."
+msgstr ""
 
 #: octoprint_klipper/templates/klipper_tab_main.jinja2:93
 msgid "Analyze Klipper Log"
-msgstr "Analysiere Klipperlog"
+msgstr ""