Merge branch 'maintenance' into devel

2016-05-20 11:04:55 +02:00 · 2016-05-20 11:04:55 +02:00 · a8927d08ab
commit a8927d08ab
parent 82a580f5d5 436ebd7c18
1 changed files with 2 additions and 0 deletions
--- a/src/octoprint/templates/dialogs/settings/folders.jinja2
+++ b/src/octoprint/templates/dialogs/settings/folders.jinja2
@ -55,4 +55,6 @@
            <input type="text" class="input-mini text-right" data-bind="value: server_diskspace_critical_str">
        </div>
    </div>
+
+    <p>{% trans %}Provide values including size unit. Allowed units are: b, byte, bytes, kb, mb, gb, tb (case insensitive). Example: <code>5MB</code>, <code>500KB</code>{% endtrans %}</p>
 </form>