diff --git a/CHANGELOG.md b/CHANGELOG.md
index c39f0061..ba06b09b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,42 @@
 # OctoPrint Changelog
 
+## 1.2.14 (2016-07-28)
+
+### Improvements
+
+  * [#935](https://github.com/foosel/OctoPrint/issues/935) - Support alternative source file types and target extensions in [SlicerPlugins](http://docs.octoprint.org/en/master/plugins/mixins.html#slicerplugin).
+  * [#1393](https://github.com/foosel/OctoPrint/issues/1393) - Added dedicated sub commands on the job API to pause and resume a print job (instead of only offering a toggle option).
+  * Better "upload error" message with a list of supported extensions (instead of hardcoded ones)
+  * Use fuzzy times for print time estimation from GCODE analysis
+  * Allow M23 "File opened" response with no filename (RepRapPro)
+  * Allow intermediary startup page to forward query parameters and fragments from initial call to actual web frontend
+  * More error resilience when rendering templates (e.g. from plugins)
+  * Make sure that all bytes of a line to send to the printer have actually been sent
+  * "Tickle" printer when encountering a communication timeout while idle
+  * Report `CLOSED`/`CLOSED_WITH_ERROR` states as "Offline" in frontend for more consistency with startup `NONE` state which already was reported as "Offline"
+  * Another attempt at a saner print time estimation: Force linear (way less accurate) estimate if calculation of more accurate version takes too long, sanity check calculated estimate and use linear estimate if it looks wrong, improved threshold values for calculation. Read [the second half of this post on the mailing list](https://groups.google.com/forum/#!msg/octoprint/WWpm1FCUkAs/X3HomTM5DgAJ) on why accurate print time estimation is so difficult to achieve.
+  * Display print job progress percentage on progress bar.
+  * Added an indicator for print time left prediction accuracy and explanation of its origin as tooltip.
+  * Improved visual distinction of "State" sidebar panel info clusters.
+
+### Bug Fixes
+
+  * [#1385](https://github.com/foosel/OctoPrint/issues/1385) - Send all non-protocol messages from printer to clients.
+  * [#1388](https://github.com/foosel/OctoPrint/issues/1388) - Track consecutive timeouts even when idle and disconnect from printer when it's not responding any longer.
+  * [#1391](https://github.com/foosel/OctoPrint/issues/1391) - Only use the first value from the X-Scheme header for the reverse proxy setup. Otherwise there could be problems when multiple reverse proxies were configured chained together, each adding their own header to the mix.
+  * [#1407](https://github.com/foosel/OctoPrint/issues/1407) - If a file is uploaded with the "print" flag set to true, make sure to clear that flag after the print job has been triggered so that now all following uploaded or selected files will start printing on their own.
+  * [#1409](https://github.com/foosel/OctoPrint/issues/1409) - Don't report a communication timeout after a heatup triggered by a print from SD.
+  * Fixed scrolling to freshly uploaded files, also now highlighting the file entry for better visibility.
+  * Fixed overeager preemptive caching of invalid protocols.
+  * Fix modal background of update confirmation not vanishing
+  * Ensure log entries and messages from printer are sent to frontend already converted to utf-8. Otherwise even one line in the log that can't be converted automatically without error can cause updates from the backend to not arrive.
+  * Report correct printer state including error strings even after disconnecting
+  * While printing, be sure to read the next line from file and send that if the current line was filtered
+  * Small fixes in the GCODE analysis
+  * Small fixes in the documentation
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.2.13...1.2.14))
+
 ## 1.2.13 (2016-06-16)
 
 ### Bug Fixes
diff --git a/SUPPORTERS.md b/SUPPORTERS.md
index a49b3375..659d13df 100644
--- a/SUPPORTERS.md
+++ b/SUPPORTERS.md
@@ -7,34 +7,37 @@ thanks to everyone who contributed!
 ## Patreon Patrons
 
   * 3D Moniak
-  * alephobjects 
+  * alephobjects
   * Andrew Moorby
   * Arnljot Arntsen
   * Aurelio Bernal Ramírez
   * Bart Zudell
   * Brad Jackson
+  * Brad Mooneyham
   * Brent Fiegle
   * Brian E. Tyler
   * Charles Mitchell
   * Christian Petropolis
-  * COLLE+McVOY 
-  * CreativeTools 
+  * COLLE+McVOY
+  * CreativeTools
   * D Brian Kimmel
   * DeltaMaker 3D Printers
   * Doug Johnson
   * E3D BigBox
   * Erik de Bruijn
   * Ernesto Martinez
-  * Exovite 
+  * Exovite
   * Frank Sander
-  * georgeroblesjr 
+  * georgeroblesjr
   * Gregor Luetolf
+  * J. Eckert
   * Jason Galarneau
   * Joe Korzeniewski
   * Joshua Gregory
   * Kaile Riser
   * Kale Stedman
-  * Kevin Freeheart
+  * Kazuhiro Ogura
+  * Korneel Bullens
   * Kyle Gress
   * Makespace Madrid
   * Mark Lane
@@ -43,18 +46,20 @@ thanks to everyone who contributed!
   * Masayoshi Mitsui
   * Michael McDargh
   * Miguel Angel Salmeron
-  * Mikey 
+  * Mikey
   * Miles Flavel
   * Mohammed Khorakiwala
   * Noe Ruiz
   * Paul Generes
+  * Peter Grace
   * Peter Schmehl
+  * PRINT3Dforum.com
   * Roger Strolz
   * Roy Cortes
   * Samer Najia
-  * SD3D 
+  * SD3D
   * Shane Ekerbicer
-  * Simon 
+  * Simon Hallam
   * Stefan Krister
   * stefi davis
   * Steven Pearson
@@ -63,4 +68,4 @@ thanks to everyone who contributed!
   * Thomas Sanladerer
   * Trent Shumay
 
-and 734 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!
\ No newline at end of file
+and 844 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!
\ No newline at end of file
diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.mo b/src/octoprint/translations/de/LC_MESSAGES/messages.mo
index bcdcf24a..f2444b45 100644
Binary files a/src/octoprint/translations/de/LC_MESSAGES/messages.mo and b/src/octoprint/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.po b/src/octoprint/translations/de/LC_MESSAGES/messages.po
index 1aaf2389..93701c1b 100644
--- a/src/octoprint/translations/de/LC_MESSAGES/messages.po
+++ b/src/octoprint/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OctoPrint\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2016-06-08 11:03+0200\n"
-"PO-Revision-Date: 2016-06-08 11:04+0100\n"
+"POT-Creation-Date: 2016-07-28 11:50+0200\n"
+"PO-Revision-Date: 2016-07-28 12:03+0100\n"
 "Last-Translator: Gina Häußge <osd@foosel.net>\n"
 "Language: de\n"
 "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Generated-By: Babel 2.2.0\n"
 "X-Generator: Poedit 1.6.8\n"
 
-#: src/octoprint/plugins/announcements/__init__.py:85
+#: src/octoprint/plugins/announcements/__init__.py:89
 #: src/octoprint/plugins/announcements/templates/announcements.jinja2:4
 #: src/octoprint/plugins/announcements/templates/announcements_navbar.jinja2:1
 msgid "Announcements"
@@ -56,7 +56,6 @@ msgstr "Zuletzt gelesen"
 #: src/octoprint/plugins/announcements/templates/announcements.jinja2:43
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:197
-#: src/octoprint/templates/dialogs/about.jinja2:51
 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96
 msgid "Close"
 msgstr "Schließen"
@@ -200,7 +199,6 @@ msgstr ""
 "    Tools wie z.B. Repetier Host.\n"
 
 #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:121
-#: src/octoprint/templates/dialogs/usersettings.jinja2:46
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:80
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:109
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:151
@@ -209,7 +207,6 @@ msgid "Abort"
 msgstr "Abbrechen"
 
 #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:122
-#: src/octoprint/templates/dialogs/usersettings.jinja2:47
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:81
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:110
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:152
@@ -479,7 +476,6 @@ msgstr "Gebundled"
 
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:129
-#: src/octoprint/templates/index.jinja2:118
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -620,15 +616,13 @@ msgstr "Repository-Cache TTL"
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:26
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101
 #: src/octoprint/templates/dialogs/confirmation.jinja2:11
-#: src/octoprint/templates/dialogs/settings.jinja2:52
 #: src/octoprint/templates/dialogs/slicing.jinja2:50
-#: src/octoprint/templates/sidebar/state.jinja2:19
+#: src/octoprint/templates/sidebar/state.jinja2:24
 msgid "Cancel"
 msgstr "Abbruch"
 
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:102
-#: src/octoprint/templates/dialogs/settings.jinja2:53
 msgid "Save"
 msgstr "Speichern"
 
@@ -905,7 +899,7 @@ msgid "GCode Viewer"
 msgstr "GCode Viewer"
 
 #: src/octoprint/server/views.py:146
-#: src/octoprint/templates/sidebar/state.jinja2:3
+#: src/octoprint/templates/sidebar/state.jinja2:4
 msgid "Timelapse"
 msgstr "Zeitraffer"
 
@@ -976,75 +970,34 @@ msgstr "Zugriff"
 msgid "Interface"
 msgstr "Interface"
 
-#: src/octoprint/static/js/app/dataupdater.js:92
-#: src/octoprint/static/js/app/dataupdater.js:127
+#: src/octoprint/static/js/app/dataupdater.js:96
+#: src/octoprint/static/js/app/dataupdater.js:131
 #: src/octoprint/static/js/app/helpers.js:451
 #: src/octoprint/templates/overlays/offline.jinja2:6
 msgid "Server is offline"
 msgstr "Der Server ist offline"
 
-#: src/octoprint/static/js/app/dataupdater.js:93
+#: src/octoprint/static/js/app/dataupdater.js:97
 msgid "The server appears to be offline, at least I'm not getting any response from it. I'll try to reconnect automatically <strong>over the next couple of minutes</strong>, however you are welcome to try a manual reconnect anytime using the button below."
 msgstr "Der Server scheint offline zu sein, zumindest kann ich mich nicht mit ihm verbinden. Ich werde <strong>in den nächsten Minuten</strong> versuchen mich erneut zu verbinden, aber Du kannst mittels des folgenden Buttons auch jederzeit einen manuellen Verbindungsversuch anstoßen."
 
-#: src/octoprint/static/js/app/dataupdater.js:128
+#: src/octoprint/static/js/app/dataupdater.js:132
 msgid "The server appears to be offline, at least I'm not getting any response from it. I <strong>could not reconnect automatically</strong>, but you may try a manual reconnect using the button below."
 msgstr "Der Server scheint offline zu sein, zumindest kann ich mich nicht mit ihm verbinden. Ich <strong>konnte mich nicht automatisch neu verbinden</strong>, aber Du kannst mittels des folgenden Buttons einen manuellen Verbindungsversuch anstoßen."
 
-#: src/octoprint/static/js/app/dataupdater.js:206
-#: src/octoprint/static/js/app/dataupdater.js:226
-#, python-format
-msgid "Slicing ... (%(percentage)d%%)"
-msgstr "Slice ... (%(percentage)d%%)"
-
-#: src/octoprint/static/js/app/dataupdater.js:228
-msgid "Slicing ..."
-msgstr "Slice ..."
-
-#: src/octoprint/static/js/app/dataupdater.js:234
-msgid "Slicing done"
-msgstr "Slicing abgeschlossen"
-
-#: src/octoprint/static/js/app/dataupdater.js:234
-#, python-format
-msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds"
-msgstr "%(stl)s nach %(gcode)s geslicet, dauerte %(time).2f Sekunden"
-
-#: src/octoprint/static/js/app/dataupdater.js:244
-#, python-format
-msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s"
-msgstr "Konnte %(stl)s nicht nach %(gcode)s slicen: %(reason)s"
-
-#: src/octoprint/static/js/app/dataupdater.js:245
-msgid "Slicing failed"
-msgstr "Slicing fehlgeschlagen"
-
-#: src/octoprint/static/js/app/dataupdater.js:249
-msgid "Streaming ..."
-msgstr "Streaming ..."
-
-#: src/octoprint/static/js/app/dataupdater.js:255
-msgid "Streaming done"
-msgstr "Streaming abgeschlossen"
-
-#: src/octoprint/static/js/app/dataupdater.js:256
-#, python-format
-msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds"
-msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden"
-
-#: src/octoprint/static/js/app/dataupdater.js:262
-#: src/octoprint/static/js/app/dataupdater.js:270
+#: src/octoprint/static/js/app/dataupdater.js:230
+#: src/octoprint/static/js/app/dataupdater.js:238
 msgid "Unhandled communication error"
 msgstr "Unbehandelter Kommunikationsfehler"
 
-#: src/octoprint/static/js/app/dataupdater.js:263
+#: src/octoprint/static/js/app/dataupdater.js:231
 #, python-format
 msgid "There was an unhandled error while talking to the printer. Due to that the ongoing print job was cancelled. Error: %(firmwareError)s"
 msgstr "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem Drucker. Daher wurder der laufende Druckauftrag abgebrochen. Fehler: %(firmwareError)s"
 
-#: src/octoprint/static/js/app/dataupdater.js:271
-#, python-format
-msgid "The was an unhandled error while talking to the printer. Due to that OctoPrint disconnected. Error: %(error)s"
+#: src/octoprint/static/js/app/dataupdater.js:239
+#, fuzzy, python-format
+msgid "There was an unhandled error while talking to the printer. Due to that OctoPrint disconnected. Error: %(error)s"
 msgstr "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem Drucker. Daher hat OctoPrint die Verbindung getrennt. Fehler: %(error)s"
 
 #: src/octoprint/static/js/app/helpers.js:372
@@ -1119,15 +1072,15 @@ msgid "Disconnect"
 msgstr "Trennen"
 
 #: src/octoprint/static/js/app/viewmodels/control.js:65
-#: src/octoprint/static/js/app/viewmodels/files.js:329
-#: src/octoprint/static/js/app/viewmodels/gcode.js:465
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:177
-#: src/octoprint/static/js/app/viewmodels/temperature.js:56
+#: src/octoprint/static/js/app/viewmodels/files.js:348
+#: src/octoprint/static/js/app/viewmodels/gcode.js:471
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:228
+#: src/octoprint/static/js/app/viewmodels/temperature.js:58
 msgid "Tool"
 msgstr "Werkzeug"
 
 #: src/octoprint/static/js/app/viewmodels/control.js:71
-#: src/octoprint/static/js/app/viewmodels/temperature.js:67
+#: src/octoprint/static/js/app/viewmodels/temperature.js:69
 msgid "Hotend"
 msgstr "Hotend"
 
@@ -1143,32 +1096,74 @@ msgstr "Dein verfügbarer freier Plattenplatz wird langsam knapp."
 msgid "Your current disk usage."
 msgstr "Dein aktuell verfügbarer freier Plattenplatz."
 
-#: src/octoprint/static/js/app/viewmodels/files.js:324
-#: src/octoprint/static/js/app/viewmodels/files.js:329
+#: src/octoprint/static/js/app/viewmodels/files.js:343
+#: src/octoprint/static/js/app/viewmodels/files.js:348
 msgid "Filament"
 msgstr "Filament"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:333
+#: src/octoprint/static/js/app/viewmodels/files.js:352
 msgid "Estimated Print Time"
 msgstr "Geschätzte Druckdauer"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:336
+#: src/octoprint/static/js/app/viewmodels/files.js:355
 msgid "Last Printed"
 msgstr "Zuletzt gedruckt"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:338
+#: src/octoprint/static/js/app/viewmodels/files.js:357
 msgid "Last Print Time"
 msgstr "Letzte Druckdauer"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:520
-msgid "Could not upload the file. Make sure that it is a GCODE file and has the extension \".gcode\" or \".gco\" or that it is an STL file with the extension \".stl\"."
-msgstr "Konnte die Datei nicht hochladen. Bitte stelle sicher, dass es sich um eine GCODE-Datei mit der Extension \".gcode\" oder \".gco\" oder um eine STL-Datei mit der Extension \".stl\" handelt."
+#: src/octoprint/static/js/app/viewmodels/files.js:460
+#: src/octoprint/static/js/app/viewmodels/files.js:467
+#, python-format
+msgid "Slicing ... (%(percentage)d%%)"
+msgstr "Slice ... (%(percentage)d%%)"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:541
+#: src/octoprint/static/js/app/viewmodels/files.js:462
+msgid "Slicing ..."
+msgstr "Slice ..."
+
+#: src/octoprint/static/js/app/viewmodels/files.js:488
+msgid "Slicing done"
+msgstr "Slicing abgeschlossen"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:489
+#, python-format
+msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds"
+msgstr "%(stl)s nach %(gcode)s geslicet, dauerte %(time).2f Sekunden"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:504
+#, python-format
+msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s"
+msgstr "Konnte %(stl)s nicht nach %(gcode)s slicen: %(reason)s"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:505
+msgid "Slicing failed"
+msgstr "Slicing fehlgeschlagen"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:522
+msgid "Streaming ..."
+msgstr "Streaming ..."
+
+#: src/octoprint/static/js/app/viewmodels/files.js:534
+msgid "Streaming done"
+msgstr "Streaming abgeschlossen"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:535
+#, python-format
+msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds"
+msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:627
+#, python-format
+msgid "Could not upload the file. Make sure that it is a valid file with one of these extensions: %(extensions)s"
+msgstr "Konnte die Datei nicht hochladen. Bitte stelle sicher, dass es sich um eine valide Datei mit einer dieser Erweiterungen ist: %(extensions)s"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:654
 msgid "Uploading ..."
 msgstr "Uploade ..."
 
-#: src/octoprint/static/js/app/viewmodels/files.js:548
+#: src/octoprint/static/js/app/viewmodels/files.js:660
 msgid "Saving ..."
 msgstr "Speichere ..."
 
@@ -1188,52 +1183,52 @@ msgstr "Analysiere..."
 msgid "Analyzed"
 msgstr "Analysiert"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:431
+#: src/octoprint/static/js/app/viewmodels/gcode.js:437
 msgid "Model size"
 msgstr "Modelgröße"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:432
+#: src/octoprint/static/js/app/viewmodels/gcode.js:438
 msgid "Estimated total print time"
 msgstr "Geschätzte Gesamtdruckdauer"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:433
+#: src/octoprint/static/js/app/viewmodels/gcode.js:439
 msgid "Estimated layer height"
 msgstr "Geschätzte Schichthöhe"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:433
+#: src/octoprint/static/js/app/viewmodels/gcode.js:439
 msgid "mm"
 msgstr "mm"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:434
+#: src/octoprint/static/js/app/viewmodels/gcode.js:440
 msgid "Layer count"
 msgstr "Schichtanzahl"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:434
+#: src/octoprint/static/js/app/viewmodels/gcode.js:440
 msgid "printed"
 msgstr "gedruckt"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:434
+#: src/octoprint/static/js/app/viewmodels/gcode.js:440
 msgid "visited"
 msgstr "besucht"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:457
+#: src/octoprint/static/js/app/viewmodels/gcode.js:463
 msgid "Layer number"
 msgstr "Schichtnummer"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:458
+#: src/octoprint/static/js/app/viewmodels/gcode.js:464
 msgid "Layer height"
 msgstr "Schichthöhe"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:459
+#: src/octoprint/static/js/app/viewmodels/gcode.js:465
 msgid "GCODE commands in layer"
 msgstr "GCODE Befehle in Schicht"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:462
-#: src/octoprint/static/js/app/viewmodels/gcode.js:465
+#: src/octoprint/static/js/app/viewmodels/gcode.js:468
+#: src/octoprint/static/js/app/viewmodels/gcode.js:471
 msgid "Filament used by layer"
 msgstr "Genutztes Filament in Schicht"
 
-#: src/octoprint/static/js/app/viewmodels/gcode.js:469
+#: src/octoprint/static/js/app/viewmodels/gcode.js:475
 msgid "Print time for layer"
 msgstr "Druckdauer für Schicht"
 
@@ -1371,52 +1366,76 @@ msgstr "Druckerprofil hinzufügen"
 msgid "Edit Printer Profile \"%(name)s\""
 msgstr "Druckerprofile \"%(name)s\" bearbeiten"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:44
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:45
 msgid "Restarts the print job from the beginning"
 msgstr "Started den Druckjob von vorne"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:45
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:46
 msgid "Starts the print job"
 msgstr "Startet den Druckjob"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:46
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:47
 msgid "Resumes the print job"
 msgstr "Setzt den Druckjob fort"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:47
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:48
 msgid "Pauses the print job"
 msgstr "Pausiert den Druckjob"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:80
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:81
 msgid "Calculating..."
 msgstr "Wird ermittelt..."
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:93
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:91
+msgid "Based on a linear approximation (accuracy highly dependent on the model)"
+msgstr "Basiert auf einer linearen Approximation (Genauigkeit hängt stark vom Modell ab)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:94
+msgid "Based on the estimate from analysis of file (medium accuracy)"
+msgstr "Basiert auf der Schätzung der Analyse der Datei (mittlere Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:97
+msgid "Based on a mix of estimate from analysis and calculation (medium accuracy)"
+msgstr "Basiert auf einem Mix der Schätzung aus der Analyse und der Berechnung (mittlere Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:100
+msgid "Based on the average total of past prints of this model with the same printer profile (usually good accuracy)"
+msgstr "Basiert auf der durchschnittlichen Dauer vergangener Druckjobs dieses Modells mit dem selben Druckerprofil (normalerweise gute Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:103
+msgid "Based on a mix of average total from past prints and calculation (usually good accuracy)"
+msgstr "Basiert auf einem Mix der durschnittlichen Dauer vergangener Druckjobs und der Berechnung (normalerweise gute Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:106
+msgid "Based on the calculated estimate (best accuracy)"
+msgstr "Basiert auf der berechneten Schätzung (beste Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:144
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:95
-#: src/octoprint/templates/sidebar/state.jinja2:18
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:146
+#: src/octoprint/templates/sidebar/state.jinja2:23
 msgid "Pause"
 msgstr "Pause"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:106
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:157
 #: src/octoprint/templates/tabs/timelapse.jinja2:11
 msgid "On Z Change"
 msgstr "Bei Ebenenwechsel"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:108
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:159
 #: src/octoprint/templates/tabs/timelapse.jinja2:10
 msgid "Timed"
 msgstr "Nach Zeit"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:108
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:159
 #: src/octoprint/templates/tabs/timelapse.jinja2:25
 #: src/octoprint/templates/tabs/timelapse.jinja2:32
 msgid "sec"
 msgstr "Sek"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:216
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:268
 msgid "This will restart the print job from the beginning."
 msgstr "Der Druckjob wird zurückgesetzt und von vorne begonnen."
 
@@ -1434,43 +1453,43 @@ msgstr "weiß"
 msgid "Autodetect from browser"
 msgstr "Automatisch vom Browser erkennen"
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:31
+#: src/octoprint/static/js/app/viewmodels/slicing.js:104
 msgid "Do nothing"
 msgstr "Nichts machen"
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:32
+#: src/octoprint/static/js/app/viewmodels/slicing.js:105
 msgid "Select for printing"
 msgstr "Zum Drucken auswählen"
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:33
+#: src/octoprint/static/js/app/viewmodels/slicing.js:106
 msgid "Start printing"
 msgstr "Drucken"
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:45
+#: src/octoprint/static/js/app/viewmodels/slicing.js:118
 #, python-format
 msgid "Slicing %(filename)s"
 msgstr "Slice %(filename)s"
 
 #: src/octoprint/static/js/app/viewmodels/temperature.js:23
-#: src/octoprint/static/js/app/viewmodels/temperature.js:74
+#: src/octoprint/static/js/app/viewmodels/temperature.js:76
 #: src/octoprint/templates/dialogs/settings/temperatures.jinja2:16
 msgid "Bed"
 msgstr "Bett"
 
-#: src/octoprint/static/js/app/viewmodels/temperature.js:112
+#: src/octoprint/static/js/app/viewmodels/temperature.js:115
 msgid "just now"
 msgstr "gerade eben"
 
-#: src/octoprint/static/js/app/viewmodels/temperature.js:114
+#: src/octoprint/static/js/app/viewmodels/temperature.js:117
 msgid "min"
 msgstr "Min"
 
-#: src/octoprint/static/js/app/viewmodels/temperature.js:253
+#: src/octoprint/static/js/app/viewmodels/temperature.js:256
 #: src/octoprint/templates/tabs/temperature.jinja2:11
 msgid "Actual"
 msgstr "Ist"
 
-#: src/octoprint/static/js/app/viewmodels/temperature.js:258
+#: src/octoprint/static/js/app/viewmodels/temperature.js:261
 #: src/octoprint/templates/tabs/temperature.jinja2:12
 msgid "Target"
 msgstr "Soll"
@@ -1554,31 +1573,6 @@ msgstr "Neue Zeitrafferaufnahme %(movie_prefix)s wurde fertig gerendert"
 msgid "Site default"
 msgstr "Seitenvoreinstellung"
 
-#: src/octoprint/templates/index.jinja2:115
-msgid "Version"
-msgstr "Version"
-
-#: src/octoprint/templates/index.jinja2:119
-msgid "Sourcecode"
-msgstr "Quellcode"
-
-#: src/octoprint/templates/index.jinja2:120
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#: src/octoprint/templates/index.jinja2:121
-msgid "Bugs and Requests"
-msgstr "Bugs und Requests"
-
-#: src/octoprint/templates/index.jinja2:122
-msgid "About"
-msgstr "Über"
-
-#: src/octoprint/templates/dialogs/about.jinja2:4
-#: src/octoprint/templates/dialogs/settings.jinja2:51
-msgid "About OctoPrint"
-msgstr "Über OctoPrint"
-
 #: src/octoprint/templates/dialogs/confirmation.jinja2:4
 msgid "Are you sure?"
 msgstr "Bist Du sicher?"
@@ -1674,10 +1668,6 @@ msgstr "Zugangsbeschränkung deaktivieren"
 msgid "Keep Access Control Enabled"
 msgstr "Zugangsbeschränkung aktiviert lassen"
 
-#: src/octoprint/templates/dialogs/settings.jinja2:4
-msgid "OctoPrint Settings"
-msgstr "OctoPrint Einstellungen"
-
 #: src/octoprint/templates/dialogs/slicing.jinja2:8
 msgid "Slicing is currently disabled since no slicer has been configured yet. Please configure a slicer under \"Settings\"."
 msgstr "Slicing ist aktuell deaktiviert da noch kein Slicer konfiguriert wurde. Bitte konfiguriere einen Slicer unter \"Settings\"."
@@ -1712,8 +1702,8 @@ msgid "Select a printer profile..."
 msgstr "Wähle ein Druckerprofil..."
 
 #: src/octoprint/templates/dialogs/slicing.jinja2:32
-msgid "GCode Filename"
-msgstr "GCode Dateiname"
+msgid "Output Filename"
+msgstr "Ausgabedateiname"
 
 #: src/octoprint/templates/dialogs/slicing.jinja2:41
 msgid "After slicing..."
@@ -1724,11 +1714,6 @@ msgstr "Nach dem Slicing..."
 msgid "Slice"
 msgstr "Slicen"
 
-#: src/octoprint/templates/dialogs/usersettings.jinja2:4
-#: src/octoprint/templates/navbar/login.jinja2:16
-msgid "User Settings"
-msgstr "Nutzereinstellungen"
-
 #: src/octoprint/templates/dialogs/about/about.jinja2:3
 msgid "The snappy web interface for your 3D printer"
 msgstr "The snappy web interface for your 3D printer"
@@ -1922,31 +1907,39 @@ msgid "Wait for <code>start</code> on connect"
 msgstr "Bei der Verbindung auf <code>start</code> warten"
 
 #: src/octoprint/templates/dialogs/settings/features.jinja2:40
+msgid "Select SD files by relative path"
+msgstr "SD Dateien per relativem Pfad addressieren"
+
+#: src/octoprint/templates/dialogs/settings/features.jinja2:40
+msgid "RepRap Firmware"
+msgstr "RepRap Firmware"
+
+#: src/octoprint/templates/dialogs/settings/features.jinja2:47
 msgid "Always assume SD card is present"
 msgstr "Immer davon ausgehen, dass eine SD-Karte vorhanden ist"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:40
 #: src/octoprint/templates/dialogs/settings/features.jinja2:47
 #: src/octoprint/templates/dialogs/settings/features.jinja2:54
 #: src/octoprint/templates/dialogs/settings/features.jinja2:61
 #: src/octoprint/templates/dialogs/settings/features.jinja2:68
+#: src/octoprint/templates/dialogs/settings/features.jinja2:75
 msgid "Repetier"
 msgstr "Repetier"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:47
+#: src/octoprint/templates/dialogs/settings/features.jinja2:54
 msgid "Send a checksum with <strong>every</strong> command"
 msgstr "Eine Prüfsumme mit <strong>jedem</strong> Befehl senden"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:54
+#: src/octoprint/templates/dialogs/settings/features.jinja2:61
 msgid "Ignore consecutive resend requests for the same line"
 msgstr "Aufeinanderfolgende Resend Requests für die selbe Zeilennummer ignorieren"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:61
+#: src/octoprint/templates/dialogs/settings/features.jinja2:68
 #, python-format
 msgid "Support <code>TargetExtr%%n</code>/<code>TargetBed</code> target temperature format"
 msgstr "<code>TargetExtr%%n</code>/<code>TargetBed</code> Zieltemperaturformat unterstützen"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:68
+#: src/octoprint/templates/dialogs/settings/features.jinja2:75
 msgid "Disable detection of external heatups"
 msgstr "Detektierung externer Aufheizvorgänge deaktivieren"
 
@@ -1985,7 +1978,7 @@ msgstr "Falls der freie Plattenplatz unter diese Schwellwerte fallen sollte wird
 #: src/octoprint/templates/dialogs/settings/folders.jinja2:47
 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69
 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:90
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:66
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:69
 #: src/octoprint/templates/tabs/timelapse.jinja2:13
 msgid "Warning"
 msgstr "Warnung"
@@ -2261,6 +2254,30 @@ msgstr "Viele Marlin < v1.1.0"
 msgid "Simulate an additional `ok` for resend requests"
 msgstr "Zusätzliches `ok` für Resendrequests simulieren"
 
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:129
+msgid "Maximum consecutive communication timeouts while idle. More than this and the printer will be considered to be gone. Set to 0 to disable."
+msgstr "Maximale Anzahl aufeinanderfolgender Communication Timeouts im Idlezustand. Mehr als das und es wird angenommen, dass der Drucker offline ist. Auf 0 setzen um das zu verhindern."
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:130
+msgid "Max. consecutive timeouts while idle"
+msgstr "Max. aufeinanderfolgende Timeouts wenn idle"
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:135
+msgid "Maximum consecutive communication timeouts while printing. More than this and the printer will be considered to be gone. Set to 0 to disable."
+msgstr "Maximale Anzahl aufeinanderfolgender Communication Timeouts beim Drucken. Mehr als das und es wird angenommen, dass der Drucker offline ist. Auf 0 setzen um das zu verhindern."
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:136
+msgid "Max. consecutive timeouts while printing"
+msgstr "Max. aufeinanderfolgende Timeouts beim Drucken"
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:141
+msgid "Maximum consecutive communication timeouts while a long running command is active. More than this and the printer will be considered to be gone. Set to 0 to disable."
+msgstr "Maximale Anzahl aufeinanderfolgender Communication Timeouts wenn ein lang laufender Befehl aktiv ist. Mehr als das und es wird angenommen, dass der Drucker offline ist. Auf 0 setzen um das zu verhindern."
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:142
+msgid "Max. consecutive timeouts during long running commands"
+msgstr "Max. aufeinanderfolgende Timeouts während lang laufender Befehle"
+
 #: src/octoprint/templates/dialogs/settings/server.jinja2:2
 msgid "Commands"
 msgstr "Befehle"
@@ -2385,6 +2402,10 @@ msgstr "Änderungen der Oberflächensprache werden erst nach einem Neuladen der
 msgid "Remember me"
 msgstr "Login merken"
 
+#: src/octoprint/templates/navbar/login.jinja2:16
+msgid "User Settings"
+msgstr "Nutzereinstellungen"
+
 #: src/octoprint/templates/navbar/login.jinja2:17
 msgid "Logout"
 msgstr "Logout"
@@ -2465,7 +2486,7 @@ msgstr "Frei"
 msgid "Total"
 msgstr "Gesamt"
 
-#: src/octoprint/templates/sidebar/files.jinja2:64
+#: src/octoprint/templates/sidebar/files.jinja2:67
 msgid "Hint: You can also drag and drop files on this page to upload them."
 msgstr "Hinweis: Du kannst auch Dateien auf diese Seite ziehen um sie hochzuladen."
 
@@ -2529,39 +2550,39 @@ msgstr "SD-Karte auswerfen"
 msgid "Machine State"
 msgstr "Druckerstatus"
 
-#: src/octoprint/templates/sidebar/state.jinja2:2
+#: src/octoprint/templates/sidebar/state.jinja2:3
 msgid "File"
 msgstr "Datei"
 
-#: src/octoprint/templates/sidebar/state.jinja2:7
+#: src/octoprint/templates/sidebar/state.jinja2:8
 msgid "Approx. Total Print Time"
 msgstr "Ungefähre Druckdauer"
 
-#: src/octoprint/templates/sidebar/state.jinja2:8
+#: src/octoprint/templates/sidebar/state.jinja2:10
 msgid "Print Time"
 msgstr "Druckdauer"
 
-#: src/octoprint/templates/sidebar/state.jinja2:9
+#: src/octoprint/templates/sidebar/state.jinja2:11
 msgid "Print Time Left"
 msgstr "Verbleibende Druckdauer"
 
-#: src/octoprint/templates/sidebar/state.jinja2:10
+#: src/octoprint/templates/sidebar/state.jinja2:12
 msgid "Printed"
 msgstr "Gedruckt"
 
-#: src/octoprint/templates/sidebar/state.jinja2:17
+#: src/octoprint/templates/sidebar/state.jinja2:22
 msgid "Restart"
 msgstr "Restart"
 
-#: src/octoprint/templates/sidebar/state.jinja2:17
+#: src/octoprint/templates/sidebar/state.jinja2:22
 msgid "Print"
 msgstr "Drucken"
 
-#: src/octoprint/templates/sidebar/state.jinja2:18
+#: src/octoprint/templates/sidebar/state.jinja2:23
 msgid "Resume"
 msgstr "Weiter"
 
-#: src/octoprint/templates/sidebar/state.jinja2:19
+#: src/octoprint/templates/sidebar/state.jinja2:24
 msgid "Cancels the print job"
 msgstr "Bricht den Druckjob ab"
 
@@ -2637,51 +2658,51 @@ msgstr "Lüfter an"
 msgid "Fan off"
 msgstr "Lüfter aus"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:14
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:17
 msgid "Model info"
 msgstr "Modelinformationen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:21
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:24
 msgid "Renderer options"
 msgstr "Rendereroptionen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:25
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:28
 msgid "Sync with job progress"
 msgstr "Job mit Fortschritt synchronisieren"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:30
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:33
 msgid "Center viewport on model"
 msgstr "Ausschnitt auf Modell zentrieren"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:33
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:36
 msgid "Zoom in on model"
 msgstr "Auf Model zoomen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:39
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:42
 msgid "Show moves"
 msgstr "Bewegungen zeigen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:42
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:45
 msgid "Show retracts"
 msgstr "Retracts zeigen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:48
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:51
 msgid "Also show previous layer"
 msgstr "Auch vorherige Schicht anzeigen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:51
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:54
 msgid "Also show next layer"
 msgstr "Auch nächste Schicht anzeigen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:56
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:59
 msgid "Reload"
 msgstr "Neu laden"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:65
 msgid "Note that the time estimates in this tab are calculated by the GCODE viewer in your browser and might differ from the values calculated by the server that are displayed in the \"State\" and \"Files\" panels in the sidebar due to slightly different implementations."
 msgstr "Beachte, dass die geschätzten Zeiten in diesem Tab durch den GCODE Viewer in Deinem Browser berechnet werden und sich von den durch den Server berechneten Werten unterscheiden können, die im \"Status\" und \"Dateien\" Bereich der Seitenleiste angezeigt werden. Die Ursache hierfür sind leicht unterschiedliche Implementierungen."
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:67
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:70
 msgid ""
 "<p>\n"
 "        You've selected <strong data-bind=\"text: selectedFile.name\"></strong> for printing which has a size of\n"
@@ -2703,7 +2724,7 @@ msgstr ""
 "        Bist Du sicher, dass du die Datei trotzdem visualisieren willst?\n"
 "    </p>"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:78
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:81
 #, python-format
 msgid "Yes, please visualize %(name)s regardless of its size"
 msgstr "Ja, bitte visualisiere %(name)s unabhängig seiner Größe"
@@ -2927,3 +2948,24 @@ msgstr "Zeitrafferaufnahme rendern"
 
 #~ msgid "Show Announcements..."
 #~ msgstr "Ankündigungen anzeigen..."
+
+#~ msgid "Version"
+#~ msgstr "Version"
+
+#~ msgid "Sourcecode"
+#~ msgstr "Quellcode"
+
+#~ msgid "Documentation"
+#~ msgstr "Dokumentation"
+
+#~ msgid "Bugs and Requests"
+#~ msgstr "Bugs und Requests"
+
+#~ msgid "About"
+#~ msgstr "Über"
+
+#~ msgid "About OctoPrint"
+#~ msgstr "Über OctoPrint"
+
+#~ msgid "OctoPrint Settings"
+#~ msgstr "OctoPrint Einstellungen"
diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo
index bcdcf24a..f2444b45 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 42e8da64..93701c1b 100644
--- a/translations/de/LC_MESSAGES/messages.po
+++ b/translations/de/LC_MESSAGES/messages.po
@@ -5,18 +5,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version:  OctoPrint\n"
+"Project-Id-Version: OctoPrint\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2016-06-16 12:18+0200\n"
-"PO-Revision-Date: 2016-06-08 11:04+0100\n"
+"POT-Creation-Date: 2016-07-28 11:50+0200\n"
+"PO-Revision-Date: 2016-07-28 12:03+0100\n"
 "Last-Translator: Gina Häußge <osd@foosel.net>\n"
 "Language: de\n"
 "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.2.0\n"
+"X-Generator: Poedit 1.6.8\n"
 
 #: src/octoprint/plugins/announcements/__init__.py:89
 #: src/octoprint/plugins/announcements/templates/announcements.jinja2:4
@@ -55,7 +56,6 @@ msgstr "Zuletzt gelesen"
 #: src/octoprint/plugins/announcements/templates/announcements.jinja2:43
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:197
-#: src/octoprint/templates/dialogs/about.jinja2:51
 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96
 msgid "Close"
 msgstr "Schließen"
@@ -199,7 +199,6 @@ msgstr ""
 "    Tools wie z.B. Repetier Host.\n"
 
 #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:121
-#: src/octoprint/templates/dialogs/usersettings.jinja2:46
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:80
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:109
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:151
@@ -208,7 +207,6 @@ msgid "Abort"
 msgstr "Abbrechen"
 
 #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:122
-#: src/octoprint/templates/dialogs/usersettings.jinja2:47
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:81
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:110
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:152
@@ -478,7 +476,6 @@ msgstr "Gebundled"
 
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:129
-#: src/octoprint/templates/index.jinja2:118
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -619,15 +616,13 @@ msgstr "Repository-Cache TTL"
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:26
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101
 #: src/octoprint/templates/dialogs/confirmation.jinja2:11
-#: src/octoprint/templates/dialogs/settings.jinja2:52
 #: src/octoprint/templates/dialogs/slicing.jinja2:50
-#: src/octoprint/templates/sidebar/state.jinja2:19
+#: src/octoprint/templates/sidebar/state.jinja2:24
 msgid "Cancel"
 msgstr "Abbruch"
 
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:102
-#: src/octoprint/templates/dialogs/settings.jinja2:53
 msgid "Save"
 msgstr "Speichern"
 
@@ -904,7 +899,7 @@ msgid "GCode Viewer"
 msgstr "GCode Viewer"
 
 #: src/octoprint/server/views.py:146
-#: src/octoprint/templates/sidebar/state.jinja2:3
+#: src/octoprint/templates/sidebar/state.jinja2:4
 msgid "Timelapse"
 msgstr "Zeitraffer"
 
@@ -990,60 +985,19 @@ msgstr "Der Server scheint offline zu sein, zumindest kann ich mich nicht mit ih
 msgid "The server appears to be offline, at least I'm not getting any response from it. I <strong>could not reconnect automatically</strong>, but you may try a manual reconnect using the button below."
 msgstr "Der Server scheint offline zu sein, zumindest kann ich mich nicht mit ihm verbinden. Ich <strong>konnte mich nicht automatisch neu verbinden</strong>, aber Du kannst mittels des folgenden Buttons einen manuellen Verbindungsversuch anstoßen."
 
-#: src/octoprint/static/js/app/dataupdater.js:217
-#: src/octoprint/static/js/app/dataupdater.js:237
-#, python-format
-msgid "Slicing ... (%(percentage)d%%)"
-msgstr "Slice ... (%(percentage)d%%)"
-
-#: src/octoprint/static/js/app/dataupdater.js:239
-msgid "Slicing ..."
-msgstr "Slice ..."
-
-#: src/octoprint/static/js/app/dataupdater.js:245
-msgid "Slicing done"
-msgstr "Slicing abgeschlossen"
-
-#: src/octoprint/static/js/app/dataupdater.js:245
-#, python-format
-msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds"
-msgstr "%(stl)s nach %(gcode)s geslicet, dauerte %(time).2f Sekunden"
-
-#: src/octoprint/static/js/app/dataupdater.js:255
-#, python-format
-msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s"
-msgstr "Konnte %(stl)s nicht nach %(gcode)s slicen: %(reason)s"
-
-#: src/octoprint/static/js/app/dataupdater.js:256
-msgid "Slicing failed"
-msgstr "Slicing fehlgeschlagen"
-
-#: src/octoprint/static/js/app/dataupdater.js:260
-msgid "Streaming ..."
-msgstr "Streaming ..."
-
-#: src/octoprint/static/js/app/dataupdater.js:266
-msgid "Streaming done"
-msgstr "Streaming abgeschlossen"
-
-#: src/octoprint/static/js/app/dataupdater.js:267
-#, python-format
-msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds"
-msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden"
-
-#: src/octoprint/static/js/app/dataupdater.js:273
-#: src/octoprint/static/js/app/dataupdater.js:281
+#: src/octoprint/static/js/app/dataupdater.js:230
+#: src/octoprint/static/js/app/dataupdater.js:238
 msgid "Unhandled communication error"
 msgstr "Unbehandelter Kommunikationsfehler"
 
-#: src/octoprint/static/js/app/dataupdater.js:274
+#: src/octoprint/static/js/app/dataupdater.js:231
 #, python-format
 msgid "There was an unhandled error while talking to the printer. Due to that the ongoing print job was cancelled. Error: %(firmwareError)s"
 msgstr "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem Drucker. Daher wurder der laufende Druckauftrag abgebrochen. Fehler: %(firmwareError)s"
 
-#: src/octoprint/static/js/app/dataupdater.js:282
-#, python-format
-msgid "The was an unhandled error while talking to the printer. Due to that OctoPrint disconnected. Error: %(error)s"
+#: src/octoprint/static/js/app/dataupdater.js:239
+#, fuzzy, python-format
+msgid "There was an unhandled error while talking to the printer. Due to that OctoPrint disconnected. Error: %(error)s"
 msgstr "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem Drucker. Daher hat OctoPrint die Verbindung getrennt. Fehler: %(error)s"
 
 #: src/octoprint/static/js/app/helpers.js:372
@@ -1118,9 +1072,9 @@ msgid "Disconnect"
 msgstr "Trennen"
 
 #: src/octoprint/static/js/app/viewmodels/control.js:65
-#: src/octoprint/static/js/app/viewmodels/files.js:329
+#: src/octoprint/static/js/app/viewmodels/files.js:348
 #: src/octoprint/static/js/app/viewmodels/gcode.js:471
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:177
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:228
 #: src/octoprint/static/js/app/viewmodels/temperature.js:58
 msgid "Tool"
 msgstr "Werkzeug"
@@ -1142,32 +1096,74 @@ msgstr "Dein verfügbarer freier Plattenplatz wird langsam knapp."
 msgid "Your current disk usage."
 msgstr "Dein aktuell verfügbarer freier Plattenplatz."
 
-#: src/octoprint/static/js/app/viewmodels/files.js:324
-#: src/octoprint/static/js/app/viewmodels/files.js:329
+#: src/octoprint/static/js/app/viewmodels/files.js:343
+#: src/octoprint/static/js/app/viewmodels/files.js:348
 msgid "Filament"
 msgstr "Filament"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:333
+#: src/octoprint/static/js/app/viewmodels/files.js:352
 msgid "Estimated Print Time"
 msgstr "Geschätzte Druckdauer"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:336
+#: src/octoprint/static/js/app/viewmodels/files.js:355
 msgid "Last Printed"
 msgstr "Zuletzt gedruckt"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:338
+#: src/octoprint/static/js/app/viewmodels/files.js:357
 msgid "Last Print Time"
 msgstr "Letzte Druckdauer"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:515
-msgid "Could not upload the file. Make sure that it is a GCODE file and has the extension \".gcode\" or \".gco\" or that it is an STL file with the extension \".stl\"."
-msgstr "Konnte die Datei nicht hochladen. Bitte stelle sicher, dass es sich um eine GCODE-Datei mit der Extension \".gcode\" oder \".gco\" oder um eine STL-Datei mit der Extension \".stl\" handelt."
+#: src/octoprint/static/js/app/viewmodels/files.js:460
+#: src/octoprint/static/js/app/viewmodels/files.js:467
+#, python-format
+msgid "Slicing ... (%(percentage)d%%)"
+msgstr "Slice ... (%(percentage)d%%)"
 
-#: src/octoprint/static/js/app/viewmodels/files.js:536
+#: src/octoprint/static/js/app/viewmodels/files.js:462
+msgid "Slicing ..."
+msgstr "Slice ..."
+
+#: src/octoprint/static/js/app/viewmodels/files.js:488
+msgid "Slicing done"
+msgstr "Slicing abgeschlossen"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:489
+#, python-format
+msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds"
+msgstr "%(stl)s nach %(gcode)s geslicet, dauerte %(time).2f Sekunden"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:504
+#, python-format
+msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s"
+msgstr "Konnte %(stl)s nicht nach %(gcode)s slicen: %(reason)s"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:505
+msgid "Slicing failed"
+msgstr "Slicing fehlgeschlagen"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:522
+msgid "Streaming ..."
+msgstr "Streaming ..."
+
+#: src/octoprint/static/js/app/viewmodels/files.js:534
+msgid "Streaming done"
+msgstr "Streaming abgeschlossen"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:535
+#, python-format
+msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds"
+msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:627
+#, python-format
+msgid "Could not upload the file. Make sure that it is a valid file with one of these extensions: %(extensions)s"
+msgstr "Konnte die Datei nicht hochladen. Bitte stelle sicher, dass es sich um eine valide Datei mit einer dieser Erweiterungen ist: %(extensions)s"
+
+#: src/octoprint/static/js/app/viewmodels/files.js:654
 msgid "Uploading ..."
 msgstr "Uploade ..."
 
-#: src/octoprint/static/js/app/viewmodels/files.js:543
+#: src/octoprint/static/js/app/viewmodels/files.js:660
 msgid "Saving ..."
 msgstr "Speichere ..."
 
@@ -1370,52 +1366,76 @@ msgstr "Druckerprofil hinzufügen"
 msgid "Edit Printer Profile \"%(name)s\""
 msgstr "Druckerprofile \"%(name)s\" bearbeiten"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:44
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:45
 msgid "Restarts the print job from the beginning"
 msgstr "Started den Druckjob von vorne"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:45
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:46
 msgid "Starts the print job"
 msgstr "Startet den Druckjob"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:46
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:47
 msgid "Resumes the print job"
 msgstr "Setzt den Druckjob fort"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:47
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:48
 msgid "Pauses the print job"
 msgstr "Pausiert den Druckjob"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:80
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:81
 msgid "Calculating..."
 msgstr "Wird ermittelt..."
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:93
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:91
+msgid "Based on a linear approximation (accuracy highly dependent on the model)"
+msgstr "Basiert auf einer linearen Approximation (Genauigkeit hängt stark vom Modell ab)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:94
+msgid "Based on the estimate from analysis of file (medium accuracy)"
+msgstr "Basiert auf der Schätzung der Analyse der Datei (mittlere Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:97
+msgid "Based on a mix of estimate from analysis and calculation (medium accuracy)"
+msgstr "Basiert auf einem Mix der Schätzung aus der Analyse und der Berechnung (mittlere Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:100
+msgid "Based on the average total of past prints of this model with the same printer profile (usually good accuracy)"
+msgstr "Basiert auf der durchschnittlichen Dauer vergangener Druckjobs dieses Modells mit dem selben Druckerprofil (normalerweise gute Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:103
+msgid "Based on a mix of average total from past prints and calculation (usually good accuracy)"
+msgstr "Basiert auf einem Mix der durschnittlichen Dauer vergangener Druckjobs und der Berechnung (normalerweise gute Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:106
+msgid "Based on the calculated estimate (best accuracy)"
+msgstr "Basiert auf der berechneten Schätzung (beste Genauigkeit)"
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:144
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:95
-#: src/octoprint/templates/sidebar/state.jinja2:18
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:146
+#: src/octoprint/templates/sidebar/state.jinja2:23
 msgid "Pause"
 msgstr "Pause"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:106
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:157
 #: src/octoprint/templates/tabs/timelapse.jinja2:11
 msgid "On Z Change"
 msgstr "Bei Ebenenwechsel"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:108
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:159
 #: src/octoprint/templates/tabs/timelapse.jinja2:10
 msgid "Timed"
 msgstr "Nach Zeit"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:108
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:159
 #: src/octoprint/templates/tabs/timelapse.jinja2:25
 #: src/octoprint/templates/tabs/timelapse.jinja2:32
 msgid "sec"
 msgstr "Sek"
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:216
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:268
 msgid "This will restart the print job from the beginning."
 msgstr "Der Druckjob wird zurückgesetzt und von vorne begonnen."
 
@@ -1433,19 +1453,19 @@ msgstr "weiß"
 msgid "Autodetect from browser"
 msgstr "Automatisch vom Browser erkennen"
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:31
+#: src/octoprint/static/js/app/viewmodels/slicing.js:104
 msgid "Do nothing"
 msgstr "Nichts machen"
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:32
+#: src/octoprint/static/js/app/viewmodels/slicing.js:105
 msgid "Select for printing"
 msgstr "Zum Drucken auswählen"
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:33
+#: src/octoprint/static/js/app/viewmodels/slicing.js:106
 msgid "Start printing"
 msgstr "Drucken"
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:45
+#: src/octoprint/static/js/app/viewmodels/slicing.js:118
 #, python-format
 msgid "Slicing %(filename)s"
 msgstr "Slice %(filename)s"
@@ -1553,31 +1573,6 @@ msgstr "Neue Zeitrafferaufnahme %(movie_prefix)s wurde fertig gerendert"
 msgid "Site default"
 msgstr "Seitenvoreinstellung"
 
-#: src/octoprint/templates/index.jinja2:115
-msgid "Version"
-msgstr "Version"
-
-#: src/octoprint/templates/index.jinja2:119
-msgid "Sourcecode"
-msgstr "Quellcode"
-
-#: src/octoprint/templates/index.jinja2:120
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#: src/octoprint/templates/index.jinja2:121
-msgid "Bugs and Requests"
-msgstr "Bugs und Requests"
-
-#: src/octoprint/templates/index.jinja2:122
-msgid "About"
-msgstr "Über"
-
-#: src/octoprint/templates/dialogs/about.jinja2:4
-#: src/octoprint/templates/dialogs/settings.jinja2:51
-msgid "About OctoPrint"
-msgstr "Über OctoPrint"
-
 #: src/octoprint/templates/dialogs/confirmation.jinja2:4
 msgid "Are you sure?"
 msgstr "Bist Du sicher?"
@@ -1673,10 +1668,6 @@ msgstr "Zugangsbeschränkung deaktivieren"
 msgid "Keep Access Control Enabled"
 msgstr "Zugangsbeschränkung aktiviert lassen"
 
-#: src/octoprint/templates/dialogs/settings.jinja2:4
-msgid "OctoPrint Settings"
-msgstr "OctoPrint Einstellungen"
-
 #: src/octoprint/templates/dialogs/slicing.jinja2:8
 msgid "Slicing is currently disabled since no slicer has been configured yet. Please configure a slicer under \"Settings\"."
 msgstr "Slicing ist aktuell deaktiviert da noch kein Slicer konfiguriert wurde. Bitte konfiguriere einen Slicer unter \"Settings\"."
@@ -1711,8 +1702,8 @@ msgid "Select a printer profile..."
 msgstr "Wähle ein Druckerprofil..."
 
 #: src/octoprint/templates/dialogs/slicing.jinja2:32
-msgid "GCode Filename"
-msgstr "GCode Dateiname"
+msgid "Output Filename"
+msgstr "Ausgabedateiname"
 
 #: src/octoprint/templates/dialogs/slicing.jinja2:41
 msgid "After slicing..."
@@ -1723,11 +1714,6 @@ msgstr "Nach dem Slicing..."
 msgid "Slice"
 msgstr "Slicen"
 
-#: src/octoprint/templates/dialogs/usersettings.jinja2:4
-#: src/octoprint/templates/navbar/login.jinja2:16
-msgid "User Settings"
-msgstr "Nutzereinstellungen"
-
 #: src/octoprint/templates/dialogs/about/about.jinja2:3
 msgid "The snappy web interface for your 3D printer"
 msgstr "The snappy web interface for your 3D printer"
@@ -1921,31 +1907,39 @@ msgid "Wait for <code>start</code> on connect"
 msgstr "Bei der Verbindung auf <code>start</code> warten"
 
 #: src/octoprint/templates/dialogs/settings/features.jinja2:40
+msgid "Select SD files by relative path"
+msgstr "SD Dateien per relativem Pfad addressieren"
+
+#: src/octoprint/templates/dialogs/settings/features.jinja2:40
+msgid "RepRap Firmware"
+msgstr "RepRap Firmware"
+
+#: src/octoprint/templates/dialogs/settings/features.jinja2:47
 msgid "Always assume SD card is present"
 msgstr "Immer davon ausgehen, dass eine SD-Karte vorhanden ist"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:40
 #: src/octoprint/templates/dialogs/settings/features.jinja2:47
 #: src/octoprint/templates/dialogs/settings/features.jinja2:54
 #: src/octoprint/templates/dialogs/settings/features.jinja2:61
 #: src/octoprint/templates/dialogs/settings/features.jinja2:68
+#: src/octoprint/templates/dialogs/settings/features.jinja2:75
 msgid "Repetier"
 msgstr "Repetier"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:47
+#: src/octoprint/templates/dialogs/settings/features.jinja2:54
 msgid "Send a checksum with <strong>every</strong> command"
 msgstr "Eine Prüfsumme mit <strong>jedem</strong> Befehl senden"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:54
+#: src/octoprint/templates/dialogs/settings/features.jinja2:61
 msgid "Ignore consecutive resend requests for the same line"
 msgstr "Aufeinanderfolgende Resend Requests für die selbe Zeilennummer ignorieren"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:61
+#: src/octoprint/templates/dialogs/settings/features.jinja2:68
 #, python-format
 msgid "Support <code>TargetExtr%%n</code>/<code>TargetBed</code> target temperature format"
 msgstr "<code>TargetExtr%%n</code>/<code>TargetBed</code> Zieltemperaturformat unterstützen"
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:68
+#: src/octoprint/templates/dialogs/settings/features.jinja2:75
 msgid "Disable detection of external heatups"
 msgstr "Detektierung externer Aufheizvorgänge deaktivieren"
 
@@ -1984,7 +1978,7 @@ msgstr "Falls der freie Plattenplatz unter diese Schwellwerte fallen sollte wird
 #: src/octoprint/templates/dialogs/settings/folders.jinja2:47
 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69
 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:90
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:66
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:69
 #: src/octoprint/templates/tabs/timelapse.jinja2:13
 msgid "Warning"
 msgstr "Warnung"
@@ -2260,6 +2254,30 @@ msgstr "Viele Marlin < v1.1.0"
 msgid "Simulate an additional `ok` for resend requests"
 msgstr "Zusätzliches `ok` für Resendrequests simulieren"
 
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:129
+msgid "Maximum consecutive communication timeouts while idle. More than this and the printer will be considered to be gone. Set to 0 to disable."
+msgstr "Maximale Anzahl aufeinanderfolgender Communication Timeouts im Idlezustand. Mehr als das und es wird angenommen, dass der Drucker offline ist. Auf 0 setzen um das zu verhindern."
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:130
+msgid "Max. consecutive timeouts while idle"
+msgstr "Max. aufeinanderfolgende Timeouts wenn idle"
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:135
+msgid "Maximum consecutive communication timeouts while printing. More than this and the printer will be considered to be gone. Set to 0 to disable."
+msgstr "Maximale Anzahl aufeinanderfolgender Communication Timeouts beim Drucken. Mehr als das und es wird angenommen, dass der Drucker offline ist. Auf 0 setzen um das zu verhindern."
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:136
+msgid "Max. consecutive timeouts while printing"
+msgstr "Max. aufeinanderfolgende Timeouts beim Drucken"
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:141
+msgid "Maximum consecutive communication timeouts while a long running command is active. More than this and the printer will be considered to be gone. Set to 0 to disable."
+msgstr "Maximale Anzahl aufeinanderfolgender Communication Timeouts wenn ein lang laufender Befehl aktiv ist. Mehr als das und es wird angenommen, dass der Drucker offline ist. Auf 0 setzen um das zu verhindern."
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:142
+msgid "Max. consecutive timeouts during long running commands"
+msgstr "Max. aufeinanderfolgende Timeouts während lang laufender Befehle"
+
 #: src/octoprint/templates/dialogs/settings/server.jinja2:2
 msgid "Commands"
 msgstr "Befehle"
@@ -2384,6 +2402,10 @@ msgstr "Änderungen der Oberflächensprache werden erst nach einem Neuladen der
 msgid "Remember me"
 msgstr "Login merken"
 
+#: src/octoprint/templates/navbar/login.jinja2:16
+msgid "User Settings"
+msgstr "Nutzereinstellungen"
+
 #: src/octoprint/templates/navbar/login.jinja2:17
 msgid "Logout"
 msgstr "Logout"
@@ -2464,7 +2486,7 @@ msgstr "Frei"
 msgid "Total"
 msgstr "Gesamt"
 
-#: src/octoprint/templates/sidebar/files.jinja2:64
+#: src/octoprint/templates/sidebar/files.jinja2:67
 msgid "Hint: You can also drag and drop files on this page to upload them."
 msgstr "Hinweis: Du kannst auch Dateien auf diese Seite ziehen um sie hochzuladen."
 
@@ -2528,39 +2550,39 @@ msgstr "SD-Karte auswerfen"
 msgid "Machine State"
 msgstr "Druckerstatus"
 
-#: src/octoprint/templates/sidebar/state.jinja2:2
+#: src/octoprint/templates/sidebar/state.jinja2:3
 msgid "File"
 msgstr "Datei"
 
-#: src/octoprint/templates/sidebar/state.jinja2:7
+#: src/octoprint/templates/sidebar/state.jinja2:8
 msgid "Approx. Total Print Time"
 msgstr "Ungefähre Druckdauer"
 
-#: src/octoprint/templates/sidebar/state.jinja2:8
+#: src/octoprint/templates/sidebar/state.jinja2:10
 msgid "Print Time"
 msgstr "Druckdauer"
 
-#: src/octoprint/templates/sidebar/state.jinja2:9
+#: src/octoprint/templates/sidebar/state.jinja2:11
 msgid "Print Time Left"
 msgstr "Verbleibende Druckdauer"
 
-#: src/octoprint/templates/sidebar/state.jinja2:10
+#: src/octoprint/templates/sidebar/state.jinja2:12
 msgid "Printed"
 msgstr "Gedruckt"
 
-#: src/octoprint/templates/sidebar/state.jinja2:17
+#: src/octoprint/templates/sidebar/state.jinja2:22
 msgid "Restart"
 msgstr "Restart"
 
-#: src/octoprint/templates/sidebar/state.jinja2:17
+#: src/octoprint/templates/sidebar/state.jinja2:22
 msgid "Print"
 msgstr "Drucken"
 
-#: src/octoprint/templates/sidebar/state.jinja2:18
+#: src/octoprint/templates/sidebar/state.jinja2:23
 msgid "Resume"
 msgstr "Weiter"
 
-#: src/octoprint/templates/sidebar/state.jinja2:19
+#: src/octoprint/templates/sidebar/state.jinja2:24
 msgid "Cancels the print job"
 msgstr "Bricht den Druckjob ab"
 
@@ -2636,51 +2658,51 @@ msgstr "Lüfter an"
 msgid "Fan off"
 msgstr "Lüfter aus"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:14
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:17
 msgid "Model info"
 msgstr "Modelinformationen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:21
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:24
 msgid "Renderer options"
 msgstr "Rendereroptionen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:25
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:28
 msgid "Sync with job progress"
 msgstr "Job mit Fortschritt synchronisieren"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:30
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:33
 msgid "Center viewport on model"
 msgstr "Ausschnitt auf Modell zentrieren"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:33
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:36
 msgid "Zoom in on model"
 msgstr "Auf Model zoomen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:39
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:42
 msgid "Show moves"
 msgstr "Bewegungen zeigen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:42
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:45
 msgid "Show retracts"
 msgstr "Retracts zeigen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:48
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:51
 msgid "Also show previous layer"
 msgstr "Auch vorherige Schicht anzeigen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:51
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:54
 msgid "Also show next layer"
 msgstr "Auch nächste Schicht anzeigen"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:56
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:59
 msgid "Reload"
 msgstr "Neu laden"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:65
 msgid "Note that the time estimates in this tab are calculated by the GCODE viewer in your browser and might differ from the values calculated by the server that are displayed in the \"State\" and \"Files\" panels in the sidebar due to slightly different implementations."
 msgstr "Beachte, dass die geschätzten Zeiten in diesem Tab durch den GCODE Viewer in Deinem Browser berechnet werden und sich von den durch den Server berechneten Werten unterscheiden können, die im \"Status\" und \"Dateien\" Bereich der Seitenleiste angezeigt werden. Die Ursache hierfür sind leicht unterschiedliche Implementierungen."
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:67
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:70
 msgid ""
 "<p>\n"
 "        You've selected <strong data-bind=\"text: selectedFile.name\"></strong> for printing which has a size of\n"
@@ -2702,7 +2724,7 @@ msgstr ""
 "        Bist Du sicher, dass du die Datei trotzdem visualisieren willst?\n"
 "    </p>"
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:78
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:81
 #, python-format
 msgid "Yes, please visualize %(name)s regardless of its size"
 msgstr "Ja, bitte visualisiere %(name)s unabhängig seiner Größe"
@@ -2927,3 +2949,23 @@ msgstr "Zeitrafferaufnahme rendern"
 #~ msgid "Show Announcements..."
 #~ msgstr "Ankündigungen anzeigen..."
 
+#~ msgid "Version"
+#~ msgstr "Version"
+
+#~ msgid "Sourcecode"
+#~ msgstr "Quellcode"
+
+#~ msgid "Documentation"
+#~ msgstr "Dokumentation"
+
+#~ msgid "Bugs and Requests"
+#~ msgstr "Bugs und Requests"
+
+#~ msgid "About"
+#~ msgstr "Über"
+
+#~ msgid "About OctoPrint"
+#~ msgstr "Über OctoPrint"
+
+#~ msgid "OctoPrint Settings"
+#~ msgstr "OctoPrint Einstellungen"
diff --git a/translations/messages.pot b/translations/messages.pot
index 36190803..99b9051c 100644
--- a/translations/messages.pot
+++ b/translations/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OctoPrint 1.2.13.dev7+g6c20e58\n"
+"Project-Id-Version: OctoPrint 1.2.14.dev70+gf671006\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2016-06-16 12:18+0200\n"
+"POT-Creation-Date: 2016-07-28 11:50+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"
@@ -54,7 +54,6 @@ msgstr ""
 #: src/octoprint/plugins/announcements/templates/announcements.jinja2:43
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:197
-#: src/octoprint/templates/dialogs/about.jinja2:51
 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96
 msgid "Close"
 msgstr ""
@@ -194,7 +193,6 @@ msgid ""
 msgstr ""
 
 #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:121
-#: src/octoprint/templates/dialogs/usersettings.jinja2:46
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:80
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:109
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:151
@@ -203,7 +201,6 @@ msgid "Abort"
 msgstr ""
 
 #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:122
-#: src/octoprint/templates/dialogs/usersettings.jinja2:47
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:81
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:110
 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:152
@@ -507,7 +504,6 @@ msgstr ""
 
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:129
-#: src/octoprint/templates/index.jinja2:118
 msgid "Homepage"
 msgstr ""
 
@@ -661,15 +657,13 @@ msgstr ""
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:26
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101
 #: src/octoprint/templates/dialogs/confirmation.jinja2:11
-#: src/octoprint/templates/dialogs/settings.jinja2:52
 #: src/octoprint/templates/dialogs/slicing.jinja2:50
-#: src/octoprint/templates/sidebar/state.jinja2:19
+#: src/octoprint/templates/sidebar/state.jinja2:24
 msgid "Cancel"
 msgstr ""
 
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:102
-#: src/octoprint/templates/dialogs/settings.jinja2:53
 msgid "Save"
 msgstr ""
 
@@ -974,7 +968,7 @@ msgid "GCode Viewer"
 msgstr ""
 
 #: src/octoprint/server/views.py:146
-#: src/octoprint/templates/sidebar/state.jinja2:3
+#: src/octoprint/templates/sidebar/state.jinja2:4
 msgid "Timelapse"
 msgstr ""
 
@@ -1067,63 +1061,22 @@ msgid ""
 "may try a manual reconnect using the button below."
 msgstr ""
 
-#: src/octoprint/static/js/app/dataupdater.js:217
-#: src/octoprint/static/js/app/dataupdater.js:237
-#, python-format
-msgid "Slicing ... (%(percentage)d%%)"
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:239
-msgid "Slicing ..."
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:245
-msgid "Slicing done"
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:245
-#, python-format
-msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds"
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:255
-#, python-format
-msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s"
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:256
-msgid "Slicing failed"
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:260
-msgid "Streaming ..."
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:266
-msgid "Streaming done"
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:267
-#, python-format
-msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds"
-msgstr ""
-
-#: src/octoprint/static/js/app/dataupdater.js:273
-#: src/octoprint/static/js/app/dataupdater.js:281
+#: src/octoprint/static/js/app/dataupdater.js:230
+#: src/octoprint/static/js/app/dataupdater.js:238
 msgid "Unhandled communication error"
 msgstr ""
 
-#: src/octoprint/static/js/app/dataupdater.js:274
+#: src/octoprint/static/js/app/dataupdater.js:231
 #, python-format
 msgid ""
 "There was an unhandled error while talking to the printer. Due to that "
 "the ongoing print job was cancelled. Error: %(firmwareError)s"
 msgstr ""
 
-#: src/octoprint/static/js/app/dataupdater.js:282
+#: src/octoprint/static/js/app/dataupdater.js:239
 #, python-format
 msgid ""
-"The was an unhandled error while talking to the printer. Due to that "
+"There was an unhandled error while talking to the printer. Due to that "
 "OctoPrint disconnected. Error: %(error)s"
 msgstr ""
 
@@ -1199,9 +1152,9 @@ msgid "Disconnect"
 msgstr ""
 
 #: src/octoprint/static/js/app/viewmodels/control.js:65
-#: src/octoprint/static/js/app/viewmodels/files.js:329
+#: src/octoprint/static/js/app/viewmodels/files.js:348
 #: src/octoprint/static/js/app/viewmodels/gcode.js:471
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:177
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:228
 #: src/octoprint/static/js/app/viewmodels/temperature.js:58
 msgid "Tool"
 msgstr ""
@@ -1223,35 +1176,76 @@ msgstr ""
 msgid "Your current disk usage."
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/files.js:324
-#: src/octoprint/static/js/app/viewmodels/files.js:329
+#: src/octoprint/static/js/app/viewmodels/files.js:343
+#: src/octoprint/static/js/app/viewmodels/files.js:348
 msgid "Filament"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/files.js:333
+#: src/octoprint/static/js/app/viewmodels/files.js:352
 msgid "Estimated Print Time"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/files.js:336
+#: src/octoprint/static/js/app/viewmodels/files.js:355
 msgid "Last Printed"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/files.js:338
+#: src/octoprint/static/js/app/viewmodels/files.js:357
 msgid "Last Print Time"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/files.js:515
-msgid ""
-"Could not upload the file. Make sure that it is a GCODE file and has the "
-"extension \".gcode\" or \".gco\" or that it is an STL file with the "
-"extension \".stl\"."
+#: src/octoprint/static/js/app/viewmodels/files.js:460
+#: src/octoprint/static/js/app/viewmodels/files.js:467
+#, python-format
+msgid "Slicing ... (%(percentage)d%%)"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/files.js:536
+#: src/octoprint/static/js/app/viewmodels/files.js:462
+msgid "Slicing ..."
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:488
+msgid "Slicing done"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:489
+#, python-format
+msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:504
+#, python-format
+msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:505
+msgid "Slicing failed"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:522
+msgid "Streaming ..."
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:534
+msgid "Streaming done"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:535
+#, python-format
+msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:627
+#, python-format
+msgid ""
+"Could not upload the file. Make sure that it is a valid file with one of "
+"these extensions: %(extensions)s"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/files.js:654
 msgid "Uploading ..."
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/files.js:543
+#: src/octoprint/static/js/app/viewmodels/files.js:660
 msgid "Saving ..."
 msgstr ""
 
@@ -1463,52 +1457,80 @@ msgstr ""
 msgid "Edit Printer Profile \"%(name)s\""
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:44
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:45
 msgid "Restarts the print job from the beginning"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:45
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:46
 msgid "Starts the print job"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:46
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:47
 msgid "Resumes the print job"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:47
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:48
 msgid "Pauses the print job"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:80
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:81
 msgid "Calculating..."
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:93
-msgid "Continue"
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:91
+msgid "Based on a linear approximation (accuracy highly dependent on the model)"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:95
-#: src/octoprint/templates/sidebar/state.jinja2:18
-msgid "Pause"
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:94
+msgid "Based on the estimate from analysis of file (medium accuracy)"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:97
+msgid "Based on a mix of estimate from analysis and calculation (medium accuracy)"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:100
+msgid ""
+"Based on the average total of past prints of this model with the same "
+"printer profile (usually good accuracy)"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:103
+msgid ""
+"Based on a mix of average total from past prints and calculation (usually"
+" good accuracy)"
 msgstr ""
 
 #: src/octoprint/static/js/app/viewmodels/printerstate.js:106
+msgid "Based on the calculated estimate (best accuracy)"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:144
+msgid "Continue"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:146
+#: src/octoprint/templates/sidebar/state.jinja2:23
+msgid "Pause"
+msgstr ""
+
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:157
 #: src/octoprint/templates/tabs/timelapse.jinja2:11
 msgid "On Z Change"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:108
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:159
 #: src/octoprint/templates/tabs/timelapse.jinja2:10
 msgid "Timed"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:108
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:159
 #: src/octoprint/templates/tabs/timelapse.jinja2:25
 #: src/octoprint/templates/tabs/timelapse.jinja2:32
 msgid "sec"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/printerstate.js:216
+#: src/octoprint/static/js/app/viewmodels/printerstate.js:268
 msgid "This will restart the print job from the beginning."
 msgstr ""
 
@@ -1526,19 +1548,19 @@ msgstr ""
 msgid "Autodetect from browser"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:31
+#: src/octoprint/static/js/app/viewmodels/slicing.js:104
 msgid "Do nothing"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:32
+#: src/octoprint/static/js/app/viewmodels/slicing.js:105
 msgid "Select for printing"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:33
+#: src/octoprint/static/js/app/viewmodels/slicing.js:106
 msgid "Start printing"
 msgstr ""
 
-#: src/octoprint/static/js/app/viewmodels/slicing.js:45
+#: src/octoprint/static/js/app/viewmodels/slicing.js:118
 #, python-format
 msgid "Slicing %(filename)s"
 msgstr ""
@@ -1658,31 +1680,6 @@ msgstr ""
 msgid "Site default"
 msgstr ""
 
-#: src/octoprint/templates/index.jinja2:115
-msgid "Version"
-msgstr ""
-
-#: src/octoprint/templates/index.jinja2:119
-msgid "Sourcecode"
-msgstr ""
-
-#: src/octoprint/templates/index.jinja2:120
-msgid "Documentation"
-msgstr ""
-
-#: src/octoprint/templates/index.jinja2:121
-msgid "Bugs and Requests"
-msgstr ""
-
-#: src/octoprint/templates/index.jinja2:122
-msgid "About"
-msgstr ""
-
-#: src/octoprint/templates/dialogs/about.jinja2:4
-#: src/octoprint/templates/dialogs/settings.jinja2:51
-msgid "About OctoPrint"
-msgstr ""
-
 #: src/octoprint/templates/dialogs/confirmation.jinja2:4
 msgid "Are you sure?"
 msgstr ""
@@ -1767,10 +1764,6 @@ msgstr ""
 msgid "Keep Access Control Enabled"
 msgstr ""
 
-#: src/octoprint/templates/dialogs/settings.jinja2:4
-msgid "OctoPrint Settings"
-msgstr ""
-
 #: src/octoprint/templates/dialogs/slicing.jinja2:8
 msgid ""
 "Slicing is currently disabled since no slicer has been configured yet. "
@@ -1810,7 +1803,7 @@ msgid "Select a printer profile..."
 msgstr ""
 
 #: src/octoprint/templates/dialogs/slicing.jinja2:32
-msgid "GCode Filename"
+msgid "Output Filename"
 msgstr ""
 
 #: src/octoprint/templates/dialogs/slicing.jinja2:41
@@ -1822,11 +1815,6 @@ msgstr ""
 msgid "Slice"
 msgstr ""
 
-#: src/octoprint/templates/dialogs/usersettings.jinja2:4
-#: src/octoprint/templates/navbar/login.jinja2:16
-msgid "User Settings"
-msgstr ""
-
 #: src/octoprint/templates/dialogs/about/about.jinja2:3
 msgid "The snappy web interface for your 3D printer"
 msgstr ""
@@ -2030,33 +2018,41 @@ msgid "Wait for <code>start</code> on connect"
 msgstr ""
 
 #: src/octoprint/templates/dialogs/settings/features.jinja2:40
-msgid "Always assume SD card is present"
+msgid "Select SD files by relative path"
 msgstr ""
 
 #: src/octoprint/templates/dialogs/settings/features.jinja2:40
+msgid "RepRap Firmware"
+msgstr ""
+
+#: src/octoprint/templates/dialogs/settings/features.jinja2:47
+msgid "Always assume SD card is present"
+msgstr ""
+
 #: src/octoprint/templates/dialogs/settings/features.jinja2:47
 #: src/octoprint/templates/dialogs/settings/features.jinja2:54
 #: src/octoprint/templates/dialogs/settings/features.jinja2:61
 #: src/octoprint/templates/dialogs/settings/features.jinja2:68
+#: src/octoprint/templates/dialogs/settings/features.jinja2:75
 msgid "Repetier"
 msgstr ""
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:47
+#: src/octoprint/templates/dialogs/settings/features.jinja2:54
 msgid "Send a checksum with <strong>every</strong> command"
 msgstr ""
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:54
+#: src/octoprint/templates/dialogs/settings/features.jinja2:61
 msgid "Ignore consecutive resend requests for the same line"
 msgstr ""
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:61
+#: src/octoprint/templates/dialogs/settings/features.jinja2:68
 #, python-format
 msgid ""
 "Support <code>TargetExtr%%n</code>/<code>TargetBed</code> target "
 "temperature format"
 msgstr ""
 
-#: src/octoprint/templates/dialogs/settings/features.jinja2:68
+#: src/octoprint/templates/dialogs/settings/features.jinja2:75
 msgid "Disable detection of external heatups"
 msgstr ""
 
@@ -2099,7 +2095,7 @@ msgstr ""
 #: src/octoprint/templates/dialogs/settings/folders.jinja2:47
 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69
 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:90
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:66
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:69
 #: src/octoprint/templates/tabs/timelapse.jinja2:13
 msgid "Warning"
 msgstr ""
@@ -2417,6 +2413,37 @@ msgstr ""
 msgid "Simulate an additional `ok` for resend requests"
 msgstr ""
 
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:129
+msgid ""
+"Maximum consecutive communication timeouts while idle. More than this and"
+" the printer will be considered to be gone. Set to 0 to disable."
+msgstr ""
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:130
+msgid "Max. consecutive timeouts while idle"
+msgstr ""
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:135
+msgid ""
+"Maximum consecutive communication timeouts while printing. More than this"
+" and the printer will be considered to be gone. Set to 0 to disable."
+msgstr ""
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:136
+msgid "Max. consecutive timeouts while printing"
+msgstr ""
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:141
+msgid ""
+"Maximum consecutive communication timeouts while a long running command "
+"is active. More than this and the printer will be considered to be gone. "
+"Set to 0 to disable."
+msgstr ""
+
+#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:142
+msgid "Max. consecutive timeouts during long running commands"
+msgstr ""
+
 #: src/octoprint/templates/dialogs/settings/server.jinja2:2
 msgid "Commands"
 msgstr ""
@@ -2545,6 +2572,10 @@ msgstr ""
 msgid "Remember me"
 msgstr ""
 
+#: src/octoprint/templates/navbar/login.jinja2:16
+msgid "User Settings"
+msgstr ""
+
 #: src/octoprint/templates/navbar/login.jinja2:17
 msgid "Logout"
 msgstr ""
@@ -2629,7 +2660,7 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/files.jinja2:64
+#: src/octoprint/templates/sidebar/files.jinja2:67
 msgid "Hint: You can also drag and drop files on this page to upload them."
 msgstr ""
 
@@ -2693,39 +2724,39 @@ msgstr ""
 msgid "Machine State"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:2
+#: src/octoprint/templates/sidebar/state.jinja2:3
 msgid "File"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:7
+#: src/octoprint/templates/sidebar/state.jinja2:8
 msgid "Approx. Total Print Time"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:8
+#: src/octoprint/templates/sidebar/state.jinja2:10
 msgid "Print Time"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:9
+#: src/octoprint/templates/sidebar/state.jinja2:11
 msgid "Print Time Left"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:10
+#: src/octoprint/templates/sidebar/state.jinja2:12
 msgid "Printed"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:17
+#: src/octoprint/templates/sidebar/state.jinja2:22
 msgid "Restart"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:17
+#: src/octoprint/templates/sidebar/state.jinja2:22
 msgid "Print"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:18
+#: src/octoprint/templates/sidebar/state.jinja2:23
 msgid "Resume"
 msgstr ""
 
-#: src/octoprint/templates/sidebar/state.jinja2:19
+#: src/octoprint/templates/sidebar/state.jinja2:24
 msgid "Cancels the print job"
 msgstr ""
 
@@ -2803,47 +2834,47 @@ msgstr ""
 msgid "Fan off"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:14
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:17
 msgid "Model info"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:21
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:24
 msgid "Renderer options"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:25
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:28
 msgid "Sync with job progress"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:30
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:33
 msgid "Center viewport on model"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:33
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:36
 msgid "Zoom in on model"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:39
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:42
 msgid "Show moves"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:42
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:45
 msgid "Show retracts"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:48
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:51
 msgid "Also show previous layer"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:51
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:54
 msgid "Also show next layer"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:56
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:59
 msgid "Reload"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:65
 msgid ""
 "Note that the time estimates in this tab are calculated by the GCODE "
 "viewer in your browser and might differ from the values calculated by the"
@@ -2851,7 +2882,7 @@ msgid ""
 "sidebar due to slightly different implementations."
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:67
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:70
 msgid ""
 "<p>\n"
 "        You've selected <strong data-bind=\"text: "
@@ -2868,7 +2899,7 @@ msgid ""
 "    </p>"
 msgstr ""
 
-#: src/octoprint/templates/tabs/gcodeviewer.jinja2:78
+#: src/octoprint/templates/tabs/gcodeviewer.jinja2:81
 #, python-format
 msgid "Yes, please visualize %(name)s regardless of its size"
 msgstr ""