From 24495d046f4962793ac2e7c7683afb81c1f8be96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 15 Apr 2015 09:04:54 +0200
Subject: [PATCH] Renamed temperature and SD status timeout to interval

---
 .../dialogs/settings/serialconnection.jinja2  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2 b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
index 13b7177d..aacca84b 100644
--- a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
+++ b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
@@ -18,17 +18,8 @@
             </label>
         </div>
     </div>
-    <div class="control-group" title="{{ _('Time after which the communication with your printer will be considered timed out if nothing was sent by your printer (and an attempt to get it talking again will be done). Increase this if your printer takes longer than this for some moves. This is also the interval in which the temperature will be polled from the printer while not printing.') }}">
-        <label class="control-label" for="settings-serialTimeoutCommunication">{{ _('Communication timeout') }}</label>
-        <div class="controls">
-            <div class="input-append">
-                <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutCommunication" id="settings-serialTimeoutCommunication">
-                <span class="add-on">s</span>
-            </div>
-        </div>
-    </div>
     <div class="control-group" title="{{ _('Interval in which to poll for the temperature information from the printer while printing') }}">
-        <label class="control-label" for="settings-serialTimeoutTemperature">{{ _('Temperature timeout') }}</label>
+        <label class="control-label" for="settings-serialTimeoutTemperature">{{ _('Temperature interval') }}</label>
         <div class="controls">
             <div class="input-append">
                 <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutTemperature" id="settings-serialTimeoutTemperature">
@@ -37,7 +28,7 @@
         </div>
     </div>
     <div class="control-group" title="{{ _('Interval in which to poll for the SD printing status information from the printer while printing') }}">
-        <label class="control-label" for="settings-serialTimeoutSdStatus">{{ _('SD status timeout') }}</label>
+        <label class="control-label" for="settings-serialTimeoutSdStatus">{{ _('SD status interval') }}</label>
         <div class="controls">
             <div class="input-append">
                 <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutSdStatus" id="settings-serialTimeoutSdStatus">
@@ -45,6 +36,15 @@
             </div>
         </div>
     </div>
+    <div class="control-group" title="{{ _('Time after which the communication with your printer will be considered timed out if nothing was sent by your printer (and an attempt to get it talking again will be done). Increase this if your printer takes longer than this for some moves. This is also the interval in which the temperature will be polled from the printer while not printing.') }}">
+        <label class="control-label" for="settings-serialTimeoutCommunication">{{ _('Communication timeout') }}</label>
+        <div class="controls">
+            <div class="input-append">
+                <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutCommunication" id="settings-serialTimeoutCommunication">
+                <span class="add-on">s</span>
+            </div>
+        </div>
+    </div>
     <div class="control-group" title="{{ _('Time after which a connection attempt to the printer will be considered as having failed') }}">
         <label class="control-label" for="settings-serialTimeoutConnection">{{ _('Connection timeout') }}</label>
         <div class="controls">