diff --git a/.versioneer-lookup b/.versioneer-lookup index 7c9750a02..db6d9a7b7 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -10,10 +10,10 @@ # master shall not use the lookup table, only tags master -# maintenance is currently the branch for preparation of maintenance release 1.2.4 +# maintenance is currently the branch for preparation of maintenance release 1.2.5 # so are any fix/... branches -maintenance 1.2.4-dev 3761995aff94acf32495556730f133a1626245b3 -fix/.* 1.2.4-dev 3761995aff94acf32495556730f133a1626245b3 +maintenance 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c +fix/.* 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now .* 1.3.0-dev 198d3450d94be1a2 diff --git a/AUTHORS.md b/AUTHORS.md index 07f0fc9ab..0309fdf53 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -52,6 +52,7 @@ date of first contribution): * [Lucas Clemente](https://github.com/lucas-clemente) * [Andrew Erickson](https://github.com/aerickson) * [Nicanor Romero Venier](https://github.com/nicanor-romero) + * [Thomas Hou](https://github.com/masterhou) OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by [Daid Braam](https://github.com/daid). Parts of its communication layer and diff --git a/CHANGELOG.md b/CHANGELOG.md index 11546dbf1..69ef9b242 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,77 @@ # OctoPrint Changelog +## 1.2.5 (2015-08-31) + +### Improvements + + * [#986](https://github.com/foosel/OctoPrint/issues/986) - Added tooltip for + "additional data" button in file list. + * [#1028](https://github.com/foosel/OctoPrint/issues/1028) - Hint about why + timelapse configuration is disabled. + * New central configuration option for commands to restart OctoPrint and to + restart and shut down the system OctoPrint is running on. This allows plugins + (like the Software Update Plugin or the Plugin Manager) and core functionality + to perform these common administrative tasks without the user needing to define + everything redundantly. + * Settings dialog now visualizes when settings are saving and when they being + retrieved. Also the Send/Cancel buttons are disabled while settings are saving + to prevent duplicated requests and concurrent retrieval of the settings by + multiple viewmodels is disabled as well. + * Better protection against rendering errors from templates provided by third + party plugins. + * Better protection against corrupting the configuration by using a temporary + file as intermediate buffer. + * Added warning to UI regarding Z timelapses and spiralized objects. + * Better compatibility with Repetier firmware: + * Added "Format Error" to whitelisted recoverable communication errors + (see also [#1032](https://github.com/foosel/OctoPrint/pull/1032)). + * Added option to ignore repeated resend requests for the same line (see + also discussion in [#1015](https://github.com/foosel/OctoPrint/pull/1015)). + * Software Update Plugin: + * Adjusted to utilize new centralized restart commands (see above). + * Allow configuration of checkout folder and version tracking type via + Plugin Configuration. + * Display message to user if OctoPrint's checkout folder is not configured + or a non-release version is running and version tracking against releases + is enabled. + * Clear version cache when a change in the check configuration is detected. + * Mark check configurations for which an update is not possible. + * Made disk space running low a bit more obvious through visual warning on + configurable thresholds. + +### Bug Fixes + + * [#985](https://github.com/foosel/OctoPrint/issues/985) - Do not hiccup on + unset `Content-Type` part headers for multipart file uploads. + * [#1001](https://github.com/foosel/OctoPrint/issues/1001) - Fixed connection + tab not unfolding properly (see also [#1002](https://github.com/foosel/OctoPrint/pull/1002)). + * [#1012](https://github.com/foosel/OctoPrint/issues/1012) - All API + responses now set no-cache headers, making the Edge browser behave a bit better + * [#1019](https://github.com/foosel/OctoPrint/issues/1019) - Better error + handling of problems when trying to write the webassets cache. + * [#1021](https://github.com/foosel/OctoPrint/issues/1021) - Properly handle + serial close on Macs. + * [#1031](https://github.com/foosel/OctoPrint/issues/1031) - Special + handling of `M112` (emergency stop) command: + * Jump send queue + * In case the printer's firmware doesn't understand it yet, at least + shutdown all of the heaters + * Disconnect + * Properly reset job progress to 0% when restarting a previously completed + printjob (see [#998](https://github.com/foosel/OctoPrint/pull/998)). + * Report an update as failed if the `pip` command returns a return code that + indicates failure. + * Fixed sorting of templates: could only be sorted by name, individual + configurations were ignored (see [#1022](https://github.com/foosel/OctoPrint/pull/1022)). + * Fixed positioning of custom context menus: were offset due to changes in + overall positioning settings (see [#1023](https://github.com/foosel/OctoPrint/pull/1023)). + * Software Update: Don't use display version for comparison of git commit + hashs. + * Fixed temperature parsing for multi extruder setups. + * Fixed nested vertical and horizontal custom control layouts. + +([Commits](https://github.com/foosel/OctoPrint/compare/1.2.4...1.2.5)) + ## 1.2.4 (2015-07-23) ### Improvements diff --git a/README.md b/README.md index 57ebc9abb..06d5b6b04 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,17 @@ OctoPrint ========= -OctoPrint provides a responsive web interface for controlling a 3D printer (RepRap, Ultimaker, ...). It is Free Software +OctoPrint provides a snappy web interface for controlling a 3D printer (RepRap, Ultimaker, ...). It is Free Software and released under the [GNU Affero General Public License V3](http://www.gnu.org/licenses/agpl.html). Its website can be found at [octoprint.org](http://octoprint.org). The documentation is located at [docs.octoprint.org](http://docs.octoprint.org). +The official plugin repository can be reached at [plugins.octoprint.org](http://plugins.octoprint.org). + +![Screenshot](http://i.imgur.com/dF3noFp.png) + You are currently looking at the source code repository of OctoPrint. If you already installed it (e.g. by using the Raspberry Pi targeted distribution [OctoPi](https://github.com/guysoft/OctoPi)) and only want to find out how to use it, [the documentation](http://docs.octoprint.org/) and [the public wiki](https://github.com/foosel/OctoPrint/wiki) @@ -42,7 +46,8 @@ which is a custom SD card image that includes OctoPrint plus dependencies. After installation, please make sure you follow the first-run wizard and set up access control as necessary. If you want to not only be notified about new releases but also be able to automatically upgrade to them from within -OctoPrint, take a look [at the documentation of the Software Update Plugin](https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update#making-octoprint-updateable-on-existing-installations). +OctoPrint, take a look [at the documentation of the Software Update Plugin](https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update#making-octoprint-updateable-on-existing-installations) +and at its settings. Dependencies ------------ @@ -113,3 +118,4 @@ Special Thanks The development of OctoPrint is sponsored and maintained by [BQ](http://www.bq.com/). Cross-browser testing services are kindly provided by [BrowserStack](http://www.browserstack.com/). +Profiling is done with the help of [PyVmMonitor](http://www.pyvmmonitor.com). diff --git a/docs/configuration/config_yaml.rst b/docs/configuration/config_yaml.rst index 15cfbbbf4..e182e6bb5 100644 --- a/docs/configuration/config_yaml.rst +++ b/docs/configuration/config_yaml.rst @@ -621,7 +621,8 @@ Use the following settings to configure the server: .. code-block:: yaml server: - # Use this option to define the host to which to bind the server, defaults to "0.0.0.0" (= all interfaces) + # Use this option to define the host to which to bind the server, defaults to "0.0.0.0" (= all + # interfaces) host: 0.0.0.0 # Use this option to define the port to which to bind the server, defaults to 5000 @@ -691,6 +692,18 @@ Use the following settings to configure the server: # Maximum size of requests other than file uploads in bytes, defaults to 100KB. maxSize: 102400 + # Commands to restart/shutdown octoprint or the system it's running on + commands: + + # Command to restart OctoPrint, defaults to being unset + serverRestartCommand: sudo service octoprint restart + + # Command to restart the system OctoPrint is running on, defaults to being unset + systemRestartCommand: sudo shutdown -r now + + # Command to shut down the system OctoPrint is running on, defaults to being unset + systemShutdownCommand: sudo shutdown -h now + .. note:: diff --git a/setup.py b/setup.py index 7fff74ecb..5003970e8 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,8 @@ "rsa", "pkginfo", "requests", - "semantic_version" + "semantic_version", + "psutil" ] # Additional requirements for optional install options diff --git a/src/octoprint/filemanager/__init__.py b/src/octoprint/filemanager/__init__.py index dae5ed51d..fad1fc41c 100644 --- a/src/octoprint/filemanager/__init__.py +++ b/src/octoprint/filemanager/__init__.py @@ -155,7 +155,11 @@ def register_slicingprogress_callback(self, callback): self._slicing_progress_callbacks.append(callback) def unregister_slicingprogress_callback(self, callback): - self._slicing_progress_callbacks.remove(callback) + try: + self._slicing_progress_callbacks.remove(callback) + except ValueError: + # callback was not registered + pass def _determine_analysis_backlog(self, storage_type, storage_manager): counter = 0 diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index a1cbd8d14..ad1683a1d 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -12,6 +12,7 @@ import os import threading import time +import hashlib from . import version_checks, updaters, exceptions, util @@ -83,8 +84,12 @@ def _load_version_cache(self): self._logger.exception("Error while loading version cache from disk") else: try: - if "octoprint" in data and len(data["octoprint"]) == 4 and "local" in data["octoprint"][1] and "value" in data["octoprint"][1]["local"]: - data_version = data["octoprint"][1]["local"]["value"] + if not isinstance(data, dict): + self._logger.info("Version cache was created in a different format, not using it") + return + + if "__version" in data: + data_version = data["__version"] else: self._logger.info("Can't determine version of OctoPrint version cache was created for, not using it") return @@ -102,24 +107,18 @@ def _load_version_cache(self): self._logger.exception("Error parsing in version cache data") def _save_version_cache(self): - import tempfile import yaml - import shutil + from octoprint.util import atomic_write + from octoprint._version import get_versions - file_obj = tempfile.NamedTemporaryFile(delete=False) - try: + octoprint_version = get_versions()["version"] + self._version_cache["__version"] = octoprint_version + + with atomic_write(self._version_cache_path) as file_obj: yaml.safe_dump(self._version_cache, stream=file_obj, default_flow_style=False, indent=" ", allow_unicode=True) - file_obj.close() - shutil.move(file_obj.name, self._version_cache_path) - self._version_cache_dirty = False - self._logger.info("Saved version cache to disk") - finally: - try: - if os.path.exists(file_obj.name): - os.remove(file_obj.name) - except Exception as e: - self._logger.warn("Could not delete file {}: {}".format(file_obj.name, str(e))) + self._version_cache_dirty = False + self._logger.info("Saved version cache to disk") #~~ SettingsPlugin API @@ -134,9 +133,6 @@ def get_settings_defaults(self): "restart": "octoprint" }, }, - - "octoprint_restart_command": None, - "environment_restart_command": None, "pip_command": None, "cache_ttl": 24 * 60, @@ -146,28 +142,92 @@ def on_settings_load(self): data = dict(octoprint.plugin.SettingsPlugin.on_settings_load(self)) if "checks" in data: del data["checks"] + + checks = self._get_configured_checks() + if "octoprint" in checks: + if "checkout_folder" in checks["octoprint"]: + data["octoprint_checkout_folder"] = checks["octoprint"]["checkout_folder"] + elif "update_folder" in checks["octoprint"]: + data["octoprint_checkout_folder"] = checks["octoprint"]["update_folder"] + else: + data["octoprint_checkout_folder"] = None + data["octoprint_type"] = checks["octoprint"].get("type", None) + else: + data["octoprint_checkout_folder"] = None + data["octoprint_type"] = None + return data def on_settings_save(self, data): for key in self.get_settings_defaults(): - if key == "checks" or key == "cache_ttl": + if key == "checks" or key == "cache_ttl" or key == "octoprint_checkout_folder" or key == "octoprint_type": continue if key in data: self._settings.set([key], data[key]) if "cache_ttl" in data: self._settings.set_int(["cache_ttl"], data["cache_ttl"]) - self._version_cache_ttl = self._settings.get_int(["cache_ttl"]) * 60 + checks = self._get_configured_checks() + if "octoprint" in checks: + check = checks["octoprint"] + update_type = check.get("type", None) + checkout_folder = check.get("checkout_folder", None) + update_folder = check.get("update_folder", None) + + defaults = dict( + plugins=dict(softwareupdate=dict( + checks=dict( + octoprint=dict( + type=update_type, + checkout_folder=checkout_folder, + update_folder=update_folder + ) + ) + )) + ) + + if "octoprint_checkout_folder" in data: + self._settings.set(["checks", "octoprint", "checkout_folder"], data["octoprint_checkout_folder"], defaults=defaults, force=True) + if update_folder and data["octoprint_checkout_folder"]: + self._settings.set(["checks", "octoprint", "update_folder"], None, defaults=defaults, force=True) + self._refresh_configured_checks = True + + if "octoprint_type" in data and data["octoprint_type"] in ("github_release", "git_commit"): + self._settings.set(["checks", "octoprint", "type"], data["octoprint_type"], defaults=defaults, force=True) + self._refresh_configured_checks = True + def get_settings_version(self): - return 3 + return 4 def on_settings_migrate(self, target, current=None): + + if current is None or current < 4: + # config version 4 and higher moves octoprint_restart_command and + # environment_restart_command to the core configuration + + # current plugin commands + configured_octoprint_restart_command = self._settings.get(["octoprint_restart_command"]) + configured_environment_restart_command = self._settings.get(["environment_restart_command"]) + + # current global commands + configured_system_restart_command = self._settings.global_get(["server", "commands", "systemRestartCommand"]) + configured_server_restart_command = self._settings.global_get(["server", "commands", "serverRestartCommand"]) + + # only set global commands if they are not yet set + if configured_system_restart_command is None and configured_environment_restart_command is not None: + self._settings.global_set(["server", "commands", "systemRestartCommand"], configured_environment_restart_command) + if configured_server_restart_command is None and configured_octoprint_restart_command is not None: + self._settings.global_set(["server", "commands", "serverRestartCommand"], configured_octoprint_restart_command) + + # delete current plugin commands from config + self._settings.set(["environment_restart_command"], None) + self._settings.set(["octoprint_restart_command"], None) + if current is None or current == 2: - # there might be some left over data from the time we still persisted everything to settings, - # even the stuff that shouldn't be persisted but always provided by the hook - let's - # clean up + # No config version and config version 2 need the same fix, stripping + # accidentally persisted data off the checks configured_checks = self._settings.get(["checks"], incl_defaults=False) if configured_checks is None: @@ -213,6 +273,10 @@ def on_settings_migrate(self, target, current=None): self._settings.set(["checks", key], None, defaults=dummy_defaults) elif current == 1: + # config version 1 had the error that the octoprint check got accidentally + # included in checks["octoprint"], leading to recursion and hence to + # yaml parser errors + configured_checks = self._settings.get(["checks"], incl_defaults=False) if configured_checks is None: return @@ -223,7 +287,6 @@ def on_settings_migrate(self, target, current=None): dummy_defaults["plugins"][self._identifier] = dict(checks=dict()) dummy_defaults["plugins"][self._identifier]["checks"]["octoprint"] = None self._settings.set(["checks", "octoprint"], None, defaults=dummy_defaults) - self._settings.save() def _clean_settings_check(self, key, data, defaults, delete=None, save=True): if delete is None: @@ -337,10 +400,12 @@ def get_current_versions(self, check_targets=None, force=False): if not target in check_targets: continue + populated_check = self._populated_check(target, check) + try: - target_information, target_update_available, target_update_possible = self._get_current_version(target, check, force=force) + target_information, target_update_available, target_update_possible = self._get_current_version(target, populated_check, force=force) if target_information is None: - continue + target_information = dict() except exceptions.UnknownCheckType: self._logger.warn("Unknown update check type for %s" % target) continue @@ -349,32 +414,39 @@ def get_current_versions(self, check_targets=None, force=False): update_available = update_available or target_update_available update_possible = update_possible or (target_update_possible and target_update_available) - information[target] = dict(updateAvailable=target_update_available, updatePossible=target_update_possible, information=target_information) - if "displayName" in check: - information[target]["displayName"] = check["displayName"] + from octoprint._version import get_versions + octoprint_version = get_versions()["version"] + local_name = target_information["local"]["name"] + local_value = target_information["local"]["value"] - if "displayVersion" in check: - from octoprint._version import get_versions - octoprint_version = get_versions()["version"] - local_name = target_information["local"]["name"] - local_value = target_information["local"]["value"] - information[target]["displayVersion"] = check["displayVersion"].format(octoprint_version=octoprint_version, local_name=local_name, local_value=local_value) + information[target] = dict(updateAvailable=target_update_available, + updatePossible=target_update_possible, + information=target_information, + displayName=populated_check["displayName"], + displayVersion=populated_check["displayVersion"].format(octoprint_version=octoprint_version, local_name=local_name, local_value=local_value), + check=populated_check) if self._version_cache_dirty: self._save_version_cache() return information, update_available, update_possible + def _get_check_hash(self, check): + hash = hashlib.md5() + hash.update(repr(check)) + return hash.hexdigest() + def _get_current_version(self, target, check, force=False): """ Determines the current version information for one target based on its check configuration. """ + current_hash = self._get_check_hash(check) if target in self._version_cache and not force: - timestamp, information, update_available, update_possible = self._version_cache[target] - if timestamp + self._version_cache_ttl >= time.time() > timestamp: + data = self._version_cache[target] + if data["hash"] == current_hash and data["timestamp"] + self._version_cache_ttl >= time.time() > data["timestamp"]: # we also check that timestamp < now to not get confused too much by clock changes - return information, update_available, update_possible + return data["information"], data["available"], data["possible"] information = dict() update_available = False @@ -397,7 +469,11 @@ def _get_current_version(self, target, check, force=False): except: update_possible = False - self._version_cache[target] = (time.time(), information, update_available, update_possible) + self._version_cache[target] = dict(timestamp=time.time(), + hash=current_hash, + information=information, + available=update_available, + possible=update_possible) self._version_cache_dirty = True return information, update_available, update_possible @@ -481,7 +557,11 @@ def _update_worker(self, checks, check_targets, force): if restart_type is not None and restart_type in ("octoprint", "environment"): # one of our updates requires a restart of either type "octoprint" or "environment". Let's see if # we can actually perform that - restart_command = self._settings.get(["%s_restart_command" % restart_type]) + + if restart_type == "octoprint": + restart_command = self._settings.global_get(["server", "commands", "serverRestartCommand"]) + elif restart_type == "environment": + restart_command = self._settings.global_get(["server", "commands", "systemRestartCommand"]) if restart_command is not None: self._send_client_message("restarting", dict(restart_type=restart_type, results=target_results)) @@ -574,6 +654,30 @@ def _perform_restart(self, restart_command): self._logger.warn("Restart stderr:\n%s" % e.stderr) raise exceptions.RestartFailed() + def _populated_check(self, target, check): + result = dict(check) + + if target == "octoprint": + from flask.ext.babel import gettext + result["displayName"] = check.get("displayName", gettext("OctoPrint")) + result["displayVersion"] = check.get("displayVersion", "{octoprint_version}") + + from octoprint._version import get_versions + versions = get_versions() + if check["type"] == "github_commit": + result["current"] = versions.get("full-revisionid", versions.get("full", "unknown")) + else: + result["current"] = versions["version"] + else: + result["displayName"] = check.get("displayName", target) + result["displayVersion"] = check.get("displayVersion", check.get("current", "unknown")) + if check["type"] in ("github_commit"): + result["current"] = check.get("current", None) + else: + result["current"] = check.get("current", check.get("displayVersion", None)) + + return result + def _get_version_checker(self, target, check): """ Retrieves the version checker to use for given target and check configuration. Will raise an UnknownCheckType diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index dbd0579e8..fd4ba14ff 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -13,12 +13,20 @@ $(function() { self.currentlyBeingUpdated = []; - self.config_restartCommand = ko.observable(); - self.config_rebootCommand = ko.observable(); + self.octoprintUnconfigured = ko.observable(); + self.octoprintUnreleased = ko.observable(); + self.config_cacheTtl = ko.observable(); + self.config_checkoutFolder = ko.observable(); + self.config_checkType = ko.observable(); self.configurationDialog = $("#settings_plugin_softwareupdate_configurationdialog"); + self.config_availableCheckTypes = [ + {"key": "github_release", "name": gettext("Release")}, + {"key": "git_commit", "name": gettext("Commit")} + ]; + self.versions = new ItemListHelper( "plugin.softwareupdate.versions", { @@ -78,19 +86,23 @@ $(function() { var data = { plugins: { softwareupdate: { - octoprint_restart_command: self.config_restartCommand(), - environment_restart_command: self.config_rebootCommand(), - cache_ttl: parseInt(self.config_cacheTtl()) + cache_ttl: parseInt(self.config_cacheTtl()), + octoprint_checkout_folder: self.config_checkoutFolder(), + octoprint_type: self.config_checkType() } } }; - self.settings.saveData(data, function() { self.configurationDialog.modal("hide"); self._copyConfig(); }); + self.settings.saveData(data, function() { + self.configurationDialog.modal("hide"); + self._copyConfig(); + self.performCheck(); + }); }; self._copyConfig = function() { - self.config_restartCommand(self.settings.settings.plugins.softwareupdate.octoprint_restart_command()); - self.config_rebootCommand(self.settings.settings.plugins.softwareupdate.environment_restart_command()); self.config_cacheTtl(self.settings.settings.plugins.softwareupdate.cache_ttl()); + self.config_checkoutFolder(self.settings.settings.plugins.softwareupdate.octoprint_checkout_folder()); + self.config_checkType(self.settings.settings.plugins.softwareupdate.octoprint_type()); }; self.fromCheckResponse = function(data, ignoreSeen, showIfNothingNew) { @@ -109,6 +121,25 @@ $(function() { }); self.versions.updateItems(versions); + var octoprint = data.information["octoprint"]; + if (octoprint && octoprint.hasOwnProperty("check")) { + var check = octoprint.check; + if (BRANCH != "master" && check["type"] == "github_release") { + self.octoprintUnreleased(true); + } else { + self.octoprintUnreleased(false); + } + + var checkoutFolder = (check["checkout_folder"] || "").trim(); + var updateFolder = (check["update_folder"] || "").trim(); + var checkType = check["type"] || ""; + if ((checkType == "github_release" || checkType == "git_commit") && checkoutFolder == "" && updateFolder == "") { + self.octoprintUnconfigured(true); + } else { + self.octoprintUnconfigured(false); + } + } + if (data.status == "updateAvailable" || data.status == "updatePossible") { var text = gettext("There are updates available for the following components:"); diff --git a/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 b/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 index 96f017131..c3b0bdc8a 100644 --- a/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 +++ b/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 @@ -1,3 +1,21 @@ +
{% trans %} + Please configure the checkout folder of OctoPrint, otherwise + this plugin won't be able to update it. Click on the button + to do this. Also refer to the Documentation. +{% endtrans %}
+
{% trans %} +

+ You are running a non-release version of OctoPrint but are tracking OctoPrint + releases. +

+ You probably want OctoPrint to track the matching development version instead. + If you have a local OctoPrint checkout folder switched to another branch, + simply switching over to "Commit" tracking will already + take care of that. Otherwise please take a look at the + Documentation. +

+{% endtrans %}
+
@@ -11,7 +29,7 @@ - :
+ :
{{ _('Installed:') }}
{{ _('Available:') }} @@ -44,7 +62,7 @@
{{ _('Advanced options') }}
- +
@@ -56,15 +74,15 @@
- +
- +
- +
- +
diff --git a/src/octoprint/plugins/softwareupdate/updaters/pip.py b/src/octoprint/plugins/softwareupdate/updaters/pip.py index 5199378d8..ef534b83c 100644 --- a/src/octoprint/plugins/softwareupdate/updaters/pip.py +++ b/src/octoprint/plugins/softwareupdate/updaters/pip.py @@ -10,6 +10,7 @@ import pkg_resources from octoprint.util.pip import PipCaller, UnknownPip +from .. import exceptions logger = logging.getLogger("octoprint.plugins.softwareupdate.updaters.pip") console_logger = logging.getLogger("octoprint.plugins.softwareupdate.updaters.pip.console") @@ -44,7 +45,7 @@ def perform_update(target, check, target_version): pip_caller = _get_pip_caller(command=pip_command) if pip_caller is None: - raise RuntimeError("Can't run pip") + raise exceptions.UpdateError("Can't run pip", None) install_arg = check["pip"].format(target_version=target_version) @@ -54,12 +55,16 @@ def perform_update(target, check, target_version): if "dependency_links" in check and check["dependency_links"] and pip_caller >= _pip_version_dependency_links: pip_args += ["--process-dependency-links"] - pip_caller.execute(*pip_args) + returncode, stdout, stderr = pip_caller.execute(*pip_args) + if returncode != 0: + raise exceptions.UpdateError("Error while executing pip install", (stdout, stderr)) logger.debug(u"Target: %s, executing pip install %s --ignore-reinstalled --force-reinstall --no-deps" % (target, install_arg)) pip_args += ["--ignore-installed", "--force-reinstall", "--no-deps"] - pip_caller.execute(*pip_args) + returncode, stdout, stderr = pip_caller.execute(*pip_args) + if returncode != 0: + raise exceptions.UpdateError("Error while executing pip install --force-reinstall", (stdout, stderr)) return "ok" diff --git a/src/octoprint/plugins/softwareupdate/updaters/update_script.py b/src/octoprint/plugins/softwareupdate/updaters/update_script.py index 4d6f69d45..db3a114b3 100644 --- a/src/octoprint/plugins/softwareupdate/updaters/update_script.py +++ b/src/octoprint/plugins/softwareupdate/updaters/update_script.py @@ -13,7 +13,17 @@ def can_perform_update(target, check): - return "update_script" in check and ("checkout_folder" in check or "update_folder" in check) + import os + script_configured = bool("update_script" in check and check["update_script"]) + + folder = None + if "update_folder" in check: + folder = check["update_folder"] + elif "checkout_folder" in check: + folder = check["checkout_folder"] + folder_configured = bool(folder and os.path.isdir(folder)) + + return script_configured and folder_configured def perform_update(target, check, target_version): diff --git a/src/octoprint/plugins/virtual_printer/virtual.py b/src/octoprint/plugins/virtual_printer/virtual.py index 874f50249..59c3da464 100644 --- a/src/octoprint/plugins/virtual_printer/virtual.py +++ b/src/octoprint/plugins/virtual_printer/virtual.py @@ -65,6 +65,7 @@ def __init__(self, read_timeout=5.0, write_timeout=10.0): self._heatupThread = None self._okBeforeCommandOutput = settings().getBoolean(["devel", "virtualPrinter", "okBeforeCommandOutput"]) + self._supportM112 = settings().getBoolean(["devel", "virtualPrinter", "supportM112"]) self._sendWait = settings().getBoolean(["devel", "virtualPrinter", "sendWait"]) self._waitInterval = settings().getFloat(["devel", "virtualPrinter", "waitInterval"]) @@ -83,6 +84,7 @@ def __init__(self, read_timeout=5.0, write_timeout=10.0): self._action_hooks = plugin_manager().get_hooks("octoprint.plugin.virtual_printer.custom_action") + self._killed = False waitThread = threading.Thread(target=self._sendWaitAfterTimeout) waitThread.start() @@ -106,7 +108,7 @@ def _clearQueue(self, queue): def _processIncoming(self): next_wait_timeout = time.time() + self._waitInterval - while self.incoming is not None: + while self.incoming is not None and not self._killed: self._simulateTemps() try: @@ -266,9 +268,10 @@ def _processIncoming(self): elif "G92" in data: self._setPosition(data) - elif data.startswith("G0") or data.startswith("G1") or data.startswith("G2") or data.startswith("G3") \ - or data.startswith("G28") or data.startswith("G29") or data.startswith("G30") \ - or data.startswith("G31") or data.startswith("G32"): + elif data.startswith("G28"): + self._performMove(data) + + elif data.startswith("G0") or data.startswith("G1") or data.startswith("G2") or data.startswith("G3"): # simulate reprap buffered commands via a Queue with maxsize which internally simulates the moves self.buffered.put(data) @@ -291,6 +294,12 @@ def _processIncoming(self): if len(data.strip()) > 0 and not self._okBeforeCommandOutput: self._sendOk() + def _kill(self): + if not self._supportM112: + return + self._killed = True + self.outgoing.put("echo:EMERGENCY SHUTDOWN DETECTED. KILLED.") + def _triggerResend(self, expected=None, actual=None): with self._incoming_lock: if expected is None: @@ -303,8 +312,13 @@ def _triggerResend(self, expected=None, actual=None): else: self.outgoing.put("Error: expected line %d got %d" % (expected, actual)) - self.outgoing.put("Resend:%d" % expected) - self.outgoing.put("ok") + def request_resend(): + self.outgoing.put("Resend:%d" % expected) + self.outgoing.put("ok") + + if settings().getBoolean(["devel", "virtualPrinter", "repetierStyleResends"]): + request_resend() + request_resend() def _debugTrigger(self, data): if data == "action_pause": @@ -516,14 +530,10 @@ def _performMove(self, line): pass if duration: - if settings().getBoolean(["devel", "virtualPrinter", "waitOnLongMoves"]): - slept = 0 - while duration - slept > self._read_timeout: - time.sleep(self._read_timeout) - self.outgoing.put("wait") - slept += self._read_timeout - else: - time.sleep(duration) + slept = 0 + while duration - slept > self._read_timeout and not self._killed: + time.sleep(self._read_timeout) + slept += self._read_timeout def _setPosition(self, line): matchX = re.search("X([0-9.]+)", line) @@ -577,6 +587,9 @@ def _sdPrintingWorker(self): self._selectedSdFilePos = 0 with open(self._selectedSdFile, "r") as f: for line in iter(f.readline, ""): + if self._killed: + break + # reset position if requested by client if self._newSdFilePos is not None: f.seek(self._newSdFilePos) @@ -606,12 +619,12 @@ def _waitForHeatup(self, heater): delay = 1 if heater.startswith("tool"): toolNum = int(heater[len("tool"):]) - while self.temp[toolNum] < self.targetTemp[toolNum] - delta or self.temp[toolNum] > self.targetTemp[toolNum] + delta: + while not self._killed and (self.temp[toolNum] < self.targetTemp[toolNum] - delta or self.temp[toolNum] > self.targetTemp[toolNum] + delta): self._simulateTemps(delta=delta) self.outgoing.put("T:%0.2f" % self.temp[toolNum]) time.sleep(delay) elif heater == "bed": - while self.bedTemp < self.bedTargetTemp - delta or self.bedTemp > self.bedTargetTemp + delta: + while not self._killed and (self.bedTemp < self.bedTargetTemp - delta or self.bedTemp > self.bedTargetTemp + delta): self._simulateTemps(delta=delta) self.outgoing.put("B:%0.2f" % self.bedTemp) time.sleep(delay) @@ -662,6 +675,11 @@ def write(self, data): with self._incoming_lock: if self.incoming is None or self.outgoing is None: return + + if "M112" in data and self._supportM112: + self._kill() + return + try: self.incoming.put(data, timeout=self._write_timeout) except Queue.Full: @@ -685,6 +703,9 @@ def close(self): self.buffered = None def _sendOk(self): + if self.outgoing is None: + return + if settings().getBoolean(["devel", "virtualPrinter", "okWithLinenumber"]): self.outgoing.put("ok %d" % self.lastN) else: diff --git a/src/octoprint/printer/profile.py b/src/octoprint/printer/profile.py index 06560d744..88bdfe3e1 100644 --- a/src/octoprint/printer/profile.py +++ b/src/octoprint/printer/profile.py @@ -329,12 +329,14 @@ def _save_to_path(self, path, profile, allow_overwrite=False): if os.path.exists(path) and not allow_overwrite: raise SaveError("Profile %s already exists and not allowed to overwrite" % profile["id"]) + from octoprint.util import atomic_write import yaml - with open(path, "wb") as f: - try: + try: + with atomic_write(path, "wb") as f: yaml.safe_dump(profile, f, default_flow_style=False, indent=" ", allow_unicode=True) - except Exception as e: - raise SaveError("Cannot save profile %s: %s" % (profile["id"], str(e))) + except Exception as e: + self._logger.exception("Error while trying to save profile %s" % profile["id"]) + raise SaveError("Cannot save profile %s: %s" % (profile["id"], str(e))) def _remove_from_path(self, path): try: diff --git a/src/octoprint/printer/standard.py b/src/octoprint/printer/standard.py index a652e6e7d..c332182c5 100644 --- a/src/octoprint/printer/standard.py +++ b/src/octoprint/printer/standard.py @@ -389,6 +389,7 @@ def start_print(self): self._timeEstimationData = TimeEstimationHelper(rolling_window=rolling_window, threshold=threshold, countdown=countdown) self._lastProgressReport = None + self._setProgressData(0, None, None, None) self._setCurrentZ(None) self._comm.startPrint() diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index b70655cf1..18ea638df 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -736,16 +736,58 @@ def _setup_assets(self): # clean the folder if settings().getBoolean(["devel", "webassets", "clean_on_startup"]): import shutil + import errno + import sys + for entry in ("webassets", ".webassets-cache"): path = os.path.join(base_folder, entry) - self._logger.debug("Deleting {path}...".format(**locals())) + + # delete path if it exists if os.path.isdir(path): - shutil.rmtree(path, ignore_errors=True) - elif os.path.isfile(path): try: - os.remove(path) + self._logger.debug("Deleting {path}...".format(**locals())) + shutil.rmtree(path) except: - self._logger.exception("Exception while trying to delete {entry} from {base_folder}".format(**locals())) + self._logger.exception("Error while trying to delete {path}, leaving it alone".format(**locals())) + continue + + # re-create path + self._logger.debug("Creating {path}...".format(**locals())) + error_text = "Error while trying to re-create {path}, that might cause errors with the webassets cache".format(**locals()) + try: + os.makedirs(path) + except OSError as e: + if e.errno == errno.EACCES: + # that might be caused by the user still having the folder open somewhere, let's try again after + # waiting a bit + import time + for n in xrange(3): + time.sleep(0.5) + self._logger.debug("Creating {path}: Retry #{retry} after {time}s".format(path=path, retry=n+1, time=(n + 1)*0.5)) + try: + os.makedirs(path) + break + except: + if self._logger.isEnabledFor(logging.DEBUG): + self._logger.exception("Ignored error while creating directory {path}".format(**locals())) + pass + else: + # this will only get executed if we never did + # successfully execute makedirs above + self._logger.exception(error_text) + continue + else: + # not an access error, so something we don't understand + # went wrong -> log an error and stop + self._logger.exception(error_text) + continue + except: + # not an OSError, so something we don't understand + # went wrong -> log an error and stop + self._logger.exception(error_text) + continue + + self._logger.info("Reset webasset folder {path}...".format(**locals())) AdjustedEnvironment = type(Environment)(Environment.__name__, (Environment,), dict( resolver_class=util.flask.PluginAssetResolver @@ -764,12 +806,10 @@ def directory(self): assets.updater = UpdaterType enable_gcodeviewer = settings().getBoolean(["gcodeViewer", "enabled"]) - enable_timelapse = (settings().get(["webcam", "snapshot"]) and settings().get(["webcam", "ffmpeg"])) preferred_stylesheet = settings().get(["devel", "stylesheet"]) dynamic_assets = util.flask.collect_plugin_assets( enable_gcodeviewer=enable_gcodeviewer, - enable_timelapse=enable_timelapse, preferred_stylesheet=preferred_stylesheet ) diff --git a/src/octoprint/server/api/__init__.py b/src/octoprint/server/api/__init__.py index 735155da0..961441fa7 100644 --- a/src/octoprint/server/api/__init__.py +++ b/src/octoprint/server/api/__init__.py @@ -19,7 +19,7 @@ import octoprint.plugin from octoprint.server import admin_permission, NO_CONTENT from octoprint.settings import settings as s, valid_boolean_trues -from octoprint.server.util import apiKeyRequestHandler, corsResponseHandler +from octoprint.server.util import noCachingResponseHandler, apiKeyRequestHandler, corsResponseHandler from octoprint.server.util.flask import restricted_access, get_json_command_from_request, passive_login @@ -42,6 +42,8 @@ VERSION = "0.1" +api.after_request(noCachingResponseHandler) + api.before_request(apiKeyRequestHandler) api.after_request(corsResponseHandler) diff --git a/src/octoprint/server/api/files.py b/src/octoprint/server/api/files.py index 9c318a6b5..7cd553454 100644 --- a/src/octoprint/server/api/files.py +++ b/src/octoprint/server/api/files.py @@ -7,7 +7,6 @@ from flask import request, jsonify, make_response, url_for -import octoprint.util as util from octoprint.filemanager.destinations import FileDestinations from octoprint.settings import settings, valid_boolean_trues from octoprint.server import printer, fileManager, slicingManager, eventManager, NO_CONTENT @@ -18,6 +17,8 @@ import octoprint.filemanager.util import octoprint.slicing +import psutil + #~~ GCODE file handling @@ -29,7 +30,8 @@ def readGcodeFiles(): filter = request.values["filter"] files = _getFileList(FileDestinations.LOCAL, filter=filter) files.extend(_getFileList(FileDestinations.SDCARD)) - return jsonify(files=files, free=util.get_free_bytes(settings().getBaseFolder("uploads"))) + usage = psutil.disk_usage(settings().getBaseFolder("uploads")) + return jsonify(files=files, free=usage.free, total=usage.total) @api.route("/files/", methods=["GET"]) @@ -40,7 +42,8 @@ def readGcodeFilesForOrigin(origin): files = _getFileList(origin) if origin == FileDestinations.LOCAL: - return jsonify(files=files, free=util.get_free_bytes(settings().getBaseFolder("uploads"))) + usage = psutil.disk_usage(settings().getBaseFolder("uploads")) + return jsonify(files=files, free=usage.free, total=usage.total) else: return jsonify(files=files) diff --git a/src/octoprint/server/api/log.py b/src/octoprint/server/api/log.py index ccfeb01ac..ba298b336 100644 --- a/src/octoprint/server/api/log.py +++ b/src/octoprint/server/api/log.py @@ -15,15 +15,18 @@ from octoprint.server import NO_CONTENT, admin_permission from octoprint.server.util.flask import redirect_to_tornado, restricted_access from octoprint.server.api import api -from octoprint.util import get_free_bytes @api.route("/logs", methods=["GET"]) @restricted_access @admin_permission.require(403) def getLogFiles(): + import psutil + usage = psutil.disk_usage(settings().getBaseFolder("logs")) + files = _getLogFiles() - return jsonify(files=files, free=get_free_bytes(settings().getBaseFolder("logs"))) + + return jsonify(files=files, free=usage.free, total=usage.total) @api.route("/logs/", methods=["GET"]) diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py index 31e5235fc..161b3294b 100644 --- a/src/octoprint/server/api/settings.py +++ b/src/octoprint/server/api/settings.py @@ -69,7 +69,8 @@ def getSettings(): "repetierTargetTemp": s.getBoolean(["feature", "repetierTargetTemp"]), "externalHeatupDetection": s.getBoolean(["feature", "externalHeatupDetection"]), "keyboardControl": s.getBoolean(["feature", "keyboardControl"]), - "pollWatched": s.getBoolean(["feature", "pollWatched"]) + "pollWatched": s.getBoolean(["feature", "pollWatched"]), + "ignoreIdenticalResends": s.getBoolean(["feature", "ignoreIdenticalResends"]) }, "serial": { "port": connectionOptions["portPreference"], @@ -112,6 +113,17 @@ def getSettings(): "afterPrintResumed": None, "snippets": dict() } + }, + "server": { + "commands": { + "systemShutdownCommand": s.get(["server", "commands", "systemShutdownCommand"]), + "systemRestartCommand": s.get(["server", "commands", "systemRestartCommand"]), + "serverRestartCommand": s.get(["server", "commands", "serverRestartCommand"]) + }, + "diskspace": { + "warning": s.getInt(["server", "diskspace", "warning"]), + "critical": s.getInt(["server", "diskspace", "critical"]) + } } } @@ -201,6 +213,7 @@ def setSettings(): if "externalHeatupDetection" in data["feature"].keys(): s.setBoolean(["feature", "externalHeatupDetection"], data["feature"]["externalHeatupDetection"]) if "keyboardControl" in data["feature"].keys(): s.setBoolean(["feature", "keyboardControl"], data["feature"]["keyboardControl"]) if "pollWatched" in data["feature"]: s.setBoolean(["feature", "pollWatched"], data["feature"]["pollWatched"]) + if "ignoreIdenticalResends" in data["feature"]: s.setBoolean(["feature", "ignoreIdenticalResends"], data["feature"]["ignoreIdenticalResends"]) if "serial" in data.keys(): if "autoconnect" in data["serial"].keys(): s.setBoolean(["serial", "autoconnect"], data["serial"]["autoconnect"]) @@ -250,6 +263,15 @@ def setSettings(): continue s.saveScript("gcode", name, script.replace("\r\n", "\n").replace("\r", "\n")) + if "server" in data: + if "commands" in data["server"]: + if "systemShutdownCommand" in data["server"]["commands"].keys(): s.set(["server", "commands", "systemShutdownCommand"], data["server"]["commands"]["systemShutdownCommand"]) + if "systemRestartCommand" in data["server"]["commands"].keys(): s.set(["server", "commands", "systemRestartCommand"], data["server"]["commands"]["systemRestartCommand"]) + if "serverRestartCommand" in data["server"]["commands"].keys(): s.set(["server", "commands", "serverRestartCommand"], data["server"]["commands"]["serverRestartCommand"]) + if "diskspace" in data["server"]: + if "warning" in data["server"]["diskspace"]: s.setInt(["server", "diskspace", "warning"], data["server"]["diskspace"]["warning"]) + if "critical" in data["server"]["diskspace"]: s.setInt(["server", "diskspace", "critical"], data["server"]["diskspace"]["critical"]) + if "plugins" in data: for plugin in octoprint.plugin.plugin_manager().get_implementations(octoprint.plugin.SettingsPlugin): plugin_id = plugin._identifier diff --git a/src/octoprint/server/apps/__init__.py b/src/octoprint/server/apps/__init__.py index e1c7f5098..b133f7da7 100644 --- a/src/octoprint/server/apps/__init__.py +++ b/src/octoprint/server/apps/__init__.py @@ -10,10 +10,15 @@ import octoprint.server import octoprint.plugin + +from octoprint.server.util import noCachingResponseHandler, corsResponseHandler from octoprint.settings import settings as s apps = Blueprint("apps", __name__) +apps.after_request(noCachingResponseHandler) +apps.after_request(corsResponseHandler) + @apps.route("/auth", methods=["GET"]) def getSessionKey(): unverified_key, valid_until = octoprint.server.appSessionManager.create() diff --git a/src/octoprint/server/util/__init__.py b/src/octoprint/server/util/__init__.py index 426acc7a6..d128e8efe 100644 --- a/src/octoprint/server/util/__init__.py +++ b/src/octoprint/server/util/__init__.py @@ -80,6 +80,18 @@ def corsResponseHandler(resp): return resp +def noCachingResponseHandler(resp): + """ + ``after_request`` handler for blueprints which shall set no caching headers + on their responses. + + Sets ``Cache-Control``, ``Pragma`` and ``Expires`` headers accordingly + to prevent all client side caching from taking place. + """ + + return flask.add_non_caching_response_headers(resp) + + def optionsAllowOrigin(request): """ Shortcut for request handling for CORS OPTIONS requests to set CORS headers. diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index 48b027d4a..30136222e 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -123,12 +123,19 @@ def fixed_get_translations(): def fix_webassets_cache(): from webassets import cache - import os - import tempfile - import pickle - import shutil + + error_logger = logging.getLogger(__name__ + ".fix_webassets_cache") def fixed_set(self, key, data): + import os + import tempfile + import pickle + import shutil + + if not os.path.exists(self.directory): + error_logger.warn("Cache directory {} doesn't exist, not going " + "to attempt to write cache file".format(self.directory)) + md5 = '%s' % cache.make_md5(self.V, key) filename = os.path.join(self.directory, md5) fd, temp_filename = tempfile.mkstemp(prefix='.' + md5, @@ -148,6 +155,11 @@ def fixed_get(self, key): import warnings from webassets.cache import make_md5 + if not os.path.exists(self.directory): + error_logger.warn("Cache directory {} doesn't exist, not going " + "to attempt to read cache file".format(self.directory)) + return None + try: hash = make_md5(self.V, key) except IOError as e: @@ -194,12 +206,15 @@ def fixed_wrap_cache(self, key, func): try: content = func().getvalue() if self.cache: - log.debug('Storing result in cache with key %s', key,) - self.cache.set(key, content) + try: + log.debug('Storing result in cache with key %s', key,) + self.cache.set(key, content) + except: + error_logger.exception("Got an exception while trying to save file to cache, not caching") return MemoryHunk(content) except: error_logger.exception("Got an exception while trying to apply filter, ignoring file") - return MemoryHunk("") + return MemoryHunk(u"") FilterTool._wrap_cache = fixed_wrap_cache @@ -307,6 +322,14 @@ def cache_check_response_headers(response): return False + +def add_non_caching_response_headers(response): + response.headers["Cache-Control"] = "no-store, no-cache, must-revalidate, post-check=0, pre-check=0, max-age=0" + response.headers["Pragma"] = "no-cache" + response.headers["Expires"] = "-1" + return response + + #~~ access validators for use with tornado @@ -585,7 +608,7 @@ def build_done(self, bundle, ctx): ##~~ plugin assets collector -def collect_plugin_assets(enable_gcodeviewer=True, enable_timelapse=True, preferred_stylesheet="css"): +def collect_plugin_assets(enable_gcodeviewer=True, preferred_stylesheet="css"): logger = logging.getLogger(__name__ + ".collect_plugin_assets") supported_stylesheets = ("css", "less") @@ -608,6 +631,7 @@ def collect_plugin_assets(enable_gcodeviewer=True, enable_timelapse=True, prefer 'js/app/viewmodels/slicing.js', 'js/app/viewmodels/temperature.js', 'js/app/viewmodels/terminal.js', + 'js/app/viewmodels/timelapse.js', 'js/app/viewmodels/users.js', 'js/app/viewmodels/log.js', 'js/app/viewmodels/usersettings.js' @@ -619,8 +643,6 @@ def collect_plugin_assets(enable_gcodeviewer=True, enable_timelapse=True, prefer 'gcodeviewer/js/gCodeReader.js', 'gcodeviewer/js/renderer.js' ] - if enable_timelapse: - assets["js"].append('js/app/viewmodels/timelapse.js') if preferred_stylesheet == "less": assets["less"].append('less/octoprint.less') diff --git a/src/octoprint/server/util/sockjs.py b/src/octoprint/server/util/sockjs.py index 8e7df0230..eb802889d 100644 --- a/src/octoprint/server/util/sockjs.py +++ b/src/octoprint/server/util/sockjs.py @@ -59,7 +59,13 @@ def on_open(self, info): plugin_hash.update(",".join(ui_plugins)) # connected => update the API key, might be necessary if the client was left open while the server restarted - self._emit("connected", {"apikey": octoprint.server.UI_API_KEY, "version": octoprint.server.VERSION, "display_version": octoprint.server.DISPLAY_VERSION, "plugin_hash": plugin_hash.hexdigest()}) + self._emit("connected", { + "apikey": octoprint.server.UI_API_KEY, + "version": octoprint.server.VERSION, + "display_version": octoprint.server.DISPLAY_VERSION, + "branch": octoprint.server.BRANCH, + "plugin_hash": plugin_hash.hexdigest() + }) self._printer.register_callback(self) self._fileManager.register_slicingprogress_callback(self) diff --git a/src/octoprint/server/util/tornado.py b/src/octoprint/server/util/tornado.py index 61614ae60..ce1bdd002 100644 --- a/src/octoprint/server/util/tornado.py +++ b/src/octoprint/server/util/tornado.py @@ -360,13 +360,24 @@ def _on_request_body_finish(self): for name, part in self._parts.iteritems(): if "filename" in part: # add form fields for filename, path, size and content_type for all files contained in the request - fields = dict((self._suffixes[key], value) for (key, value) in dict(name=part["filename"], path=part["path"], size=str(os.stat(part["path"]).st_size), content_type=part["content_type"]).iteritems()) + if not "path" in part: + continue + + parameters = dict( + name=part["filename"], + path=part["path"], + size=str(os.stat(part["path"]).st_size) + ) + if "content_type" in part: + parameters["content_type"] = part["content_type"] + + fields = dict((self._suffixes[key], value) for (key, value) in parameters.iteritems()) for n, p in fields.iteritems(): key = name + "." + n self._new_body += b"--%s\r\n" % self._multipart_boundary self._new_body += b"Content-Disposition: form-data; name=\"%s\"\r\n" % key self._new_body += b"\r\n" - self._new_body += p + b"\r\n" + self._new_body += b"%s\r\n" % p elif "data" in part: self._new_body += b"--%s\r\n" % self._multipart_boundary value = part["data"] @@ -924,4 +935,4 @@ def path_validation_factory(path_filter, status_code=404): def f(path): if not path_filter(path): raise tornado.web.HTTPError(status_code) - return f \ No newline at end of file + return f diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py index 4df458bb7..905e14366 100644 --- a/src/octoprint/server/views.py +++ b/src/octoprint/server/views.py @@ -12,7 +12,8 @@ import octoprint.plugin -from octoprint.server import app, userManager, pluginManager, gettext, debug, LOCALES, VERSION, DISPLAY_VERSION, UI_API_KEY +from octoprint.server import app, userManager, pluginManager, gettext, \ + debug, LOCALES, VERSION, DISPLAY_VERSION, UI_API_KEY, BRANCH from octoprint.settings import settings from . import util @@ -150,6 +151,7 @@ def index(): folders=(gettext("Folders"), dict(template="dialogs/settings/folders.jinja2", _div="settings_folders", custom_bindings=False)), appearance=(gettext("Appearance"), dict(template="dialogs/settings/appearance.jinja2", _div="settings_appearance", custom_bindings=False)), logs=(gettext("Logs"), dict(template="dialogs/settings/logs.jinja2", _div="settings_logs")), + server=(gettext("Server"), dict(template="dialogs/settings/server.jinja2", _div="settings_server", custom_bindings=False)), ) if enable_accesscontrol: templates["settings"]["entries"]["accesscontrol"] = (gettext("Access Control"), dict(template="dialogs/settings/accesscontrol.jinja2", _div="settings_users", custom_bindings=False)) @@ -229,9 +231,30 @@ def index(): # finally add anything that's not included in our order yet sorted_missing = list(missing_in_order) if template_sorting[t]["key"] is not None: - # anything but navbar and generic components get sorted by their name - if template_sorting[t]["key"] == "name": - sorted_missing = sorted(missing_in_order, key=lambda x: templates[t]["entries"][x][0]) + # default extractor: works with entries that are dicts and entries that are 2-tuples with the + # entry data at index 1 + def extractor(item, key): + if isinstance(item, dict) and key in item: + return item[key] + elif isinstance(item, tuple) and len(item) > 1 and isinstance(item[1], dict) and key in item[1]: + return item[1][key] + + return None + + # if template type provides custom extractor, make sure its exceptions are handled + if "key_extractor" in template_sorting[t] and callable(template_sorting[t]["key_extractor"]): + def create_safe_extractor(extractor): + def f(x, k): + try: + return extractor(x, k) + except: + _logger.exception("Error while extracting sorting keys for template {}".format(t)) + return None + return f + extractor = create_safe_extractor(template_sorting[t]["key_extractor"]) + + sort_key = template_sorting[t]["key"] + sorted_missing = sorted(missing_in_order, key=lambda x: extractor(templates[t]["entries"][x], sort_key)) if template_sorting[t]["add"] == "prepend": templates[t]["order"] = sorted_missing + templates[t]["order"] @@ -256,6 +279,7 @@ def index(): debug=debug, version=VERSION, display_version=DISPLAY_VERSION, + branch=BRANCH, gcodeMobileThreshold=settings().get(["gcodeViewer", "mobileSizeThreshold"]), gcodeThreshold=settings().get(["gcodeViewer", "sizeThreshold"]), uiApiKey=UI_API_KEY, @@ -276,9 +300,7 @@ def index(): response.headers["Last-Modified"] = datetime.datetime.now() if first_run: - response.headers["Cache-Control"] = "no-store, no-cache, must-revalidate, post-check=0, pre-check=0, max-age=0" - response.headers["Pragma"] = "no-cache" - response.headers["Expires"] = "-1" + response = util.flask.add_non_caching_response_headers(response) return response @@ -319,6 +341,8 @@ def _process_template_configs(name, implementation, configs, rules): app.jinja_env.get_or_select_template(data["template"]) except TemplateNotFound: pass + except: + _logger.exception("Error in template {}, not going to include it".format(data["template"])) else: includes[template_type].append(rule["to_entry"](data)) diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py index f5fd85a23..fa3f0e5fb 100644 --- a/src/octoprint/settings.py +++ b/src/octoprint/settings.py @@ -104,6 +104,15 @@ def settings(init=False, basedir=None, configfile=None): "pathSuffix": "path" }, "maxSize": 100 * 1024, # 100 KB + "commands": { + "systemShutdownCommand": None, + "systemRestartCommand": None, + "serverRestartCommand": None + }, + "diskspace": { + "warning": 500 * 1024 * 1024, # 500 MB + "critical": 200 * 1024 * 1024, # 200 MB + } }, "webcam": { "stream": None, @@ -143,7 +152,9 @@ def settings(init=False, basedir=None, configfile=None): "externalHeatupDetection": True, "supportWait": True, "keyboardControl": True, - "pollWatched": False + "pollWatched": False, + "ignoreIdenticalResends": False, + "identicalResendsCountdown": 7 }, "folder": { "uploads": None, @@ -188,7 +199,7 @@ def settings(init=False, basedir=None, configfile=None): "settings": [ "section_printer", "serial", "printerprofiles", "temperatures", "terminalfilters", "gcodescripts", "section_features", "features", "webcam", "accesscontrol", "api", - "section_octoprint", "folders", "appearance", "logs", "plugin_pluginmanager", "plugin_softwareupdate" + "section_octoprint", "server", "folders", "appearance", "logs", "plugin_pluginmanager", "plugin_softwareupdate" ], "usersettings": ["access", "interface"], "generic": [] @@ -271,6 +282,7 @@ def settings(init=False, basedir=None, configfile=None): }, "hasBed": True, "repetierStyleTargetTemperature": False, + "repetierStyleResends": False, "okBeforeCommandOutput": False, "smoothieTemperatureReporting": False, "extendedSdFileList": False, @@ -280,7 +292,8 @@ def settings(init=False, basedir=None, configfile=None): "txBuffer": 40, "commandBuffer": 4, "sendWait": True, - "waitInterval": 1.0 + "waitInterval": 1.0, + "supportM112": True } } } @@ -321,14 +334,14 @@ class Settings(object): "/dev/ttyACM0" - ``["serial", "timeouts"]`` :: + ``["serial", "timeout"]`` :: communication: 20.0 temperature: 5.0 sdStatus: 1.0 connection: 10.0 - ``["serial", "timeouts", "temperature"]`` :: + ``["serial", "timeout", "temperature"]`` :: 5.0 @@ -774,11 +787,17 @@ def save(self, force=False): if not self._dirty and not force: return False - with open(self._configfile, "wb") as configFile: - yaml.safe_dump(self._config, configFile, default_flow_style=False, indent=" ", allow_unicode=True) - self._dirty = False - self.load() - return True + from octoprint.util import atomic_write + try: + with atomic_write(self._configfile, "wb", prefix="octoprint-config-", suffix=".yaml") as configFile: + yaml.safe_dump(self._config, configFile, default_flow_style=False, indent=" ", allow_unicode=True) + self._dirty = False + except: + self._logger.exception("Error while saving config.yaml!") + raise + else: + self.load() + return True @property def last_modified(self): @@ -970,7 +989,7 @@ def set(self, path, value, force=False, defaults=None, config=None, preprocessor if not force and key in defaults and key in config and defaults[key] == value: del config[key] self._dirty = True - elif force or (not key in config and defaults[key] != value) or (key in config and config[key] != value): + elif force or (not key in config and key in defaults and defaults[key] != value) or (key in config and config[key] != value): if value is None and key in config: del config[key] else: diff --git a/src/octoprint/static/css/octoprint.css b/src/octoprint/static/css/octoprint.css index 5f83b1d97..aaaeddf59 100644 --- a/src/octoprint/static/css/octoprint.css +++ b/src/octoprint/static/css/octoprint.css @@ -1 +1 @@ -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{border-color:transparent;cursor:pointer;color:#08c;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.nowrap{white-space:nowrap}.actioncol{text-align:center;white-space:nowrap}.actioncol a{text-decoration:none;color:#000}.actioncol a.disabled{color:#ccc;cursor:default}#navbar .navbar-inner{background-color:#ebebeb;background-image:-moz-linear-gradient(top,#fff,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#ccc));background-image:-webkit-linear-gradient(top,#fff,#ccc);background-image:-o-linear-gradient(top,#fff,#ccc);background-image:linear-gradient(to bottom,#fff,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffcccccc',GradientType=0)}#navbar .navbar-inner .brand,#navbar .navbar-inner .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner .brand .caret,#navbar .navbar-inner .nav>li>a .caret{border-bottom-color:#939393;border-top-color:#939393}#navbar .navbar-inner .brand:hover .caret,#navbar .navbar-inner .nav>li>a:hover .caret,#navbar .navbar-inner .brand:focus .caret,#navbar .navbar-inner .nav>li>a:focus .caret{border-bottom-color:#636363;border-top-color:#636363}#navbar .navbar-inner .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e0e0e0;background-image:-moz-linear-gradient(top,#ccc,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ccc),to(#fff));background-image:-webkit-linear-gradient(top,#ccc,#fff);background-image:-o-linear-gradient(top,#ccc,#fff);background-image:linear-gradient(to bottom,#ccc,#fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcccccc',endColorstr='#ffffffff',GradientType=0)}#navbar .navbar-inner.transparent{background-color:rgba(235,235,235,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.6)),to(rgba(204,204,204,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99ffffff',endColorstr='#99cccccc',GradientType=0)}#navbar .navbar-inner.transparent .brand,#navbar .navbar-inner.transparent .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.transparent .brand .caret,#navbar .navbar-inner.transparent .nav>li>a .caret{border-bottom-color:#939393;border-top-color:#939393}#navbar .navbar-inner.transparent .brand:hover .caret,#navbar .navbar-inner.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.transparent .brand:focus .caret,#navbar .navbar-inner.transparent .nav>li>a:focus .caret{border-bottom-color:#636363;border-top-color:#636363}#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(224,224,224,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(204,204,204,0.6)),to(rgba(255,255,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99cccccc',endColorstr='#99ffffff',GradientType=0)}#navbar .navbar-inner.red{background-color:#bb645f;background-image:-moz-linear-gradient(top,#e28e8a,#802420);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e28e8a),to(#802420));background-image:-webkit-linear-gradient(top,#e28e8a,#802420);background-image:-o-linear-gradient(top,#e28e8a,#802420);background-image:linear-gradient(to bottom,#e28e8a,#802420);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe28e8a',endColorstr='#ff802420',GradientType=0)}#navbar .navbar-inner.red .brand,#navbar .navbar-inner.red .nav>li>a{text-shadow:0 1px 0 #802420;color:#f2f2f2}#navbar .navbar-inner.red .brand .caret,#navbar .navbar-inner.red .nav>li>a .caret{border-bottom-color:#d89491;border-top-color:#d89491}#navbar .navbar-inner.red .brand:hover .caret,#navbar .navbar-inner.red .nav>li>a:hover .caret,#navbar .navbar-inner.red .brand:focus .caret,#navbar .navbar-inner.red .nav>li>a:focus .caret{border-bottom-color:#e5c3c1;border-top-color:#e5c3c1}#navbar .navbar-inner.red .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.red .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.red .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.red .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.red .nav li.dropdown.open.active>.dropdown-toggle{background-color:#a74f4a;background-image:-moz-linear-gradient(top,#802420,#e28e8a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#802420),to(#e28e8a));background-image:-webkit-linear-gradient(top,#802420,#e28e8a);background-image:-o-linear-gradient(top,#802420,#e28e8a);background-image:linear-gradient(to bottom,#802420,#e28e8a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff802420',endColorstr='#ffe28e8a',GradientType=0)}#navbar .navbar-inner.red.transparent{background-color:rgba(187,100,95,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(226,142,138,0.6)),to(rgba(128,36,32,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99e28e8a',endColorstr='#99802420',GradientType=0)}#navbar .navbar-inner.red.transparent .brand,#navbar .navbar-inner.red.transparent .nav>li>a{text-shadow:0 1px 0 #802420;color:#f2f2f2}#navbar .navbar-inner.red.transparent .brand .caret,#navbar .navbar-inner.red.transparent .nav>li>a .caret{border-bottom-color:#d89491;border-top-color:#d89491}#navbar .navbar-inner.red.transparent .brand:hover .caret,#navbar .navbar-inner.red.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.red.transparent .brand:focus .caret,#navbar .navbar-inner.red.transparent .nav>li>a:focus .caret{border-bottom-color:#e5c3c1;border-top-color:#e5c3c1}#navbar .navbar-inner.red.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.red.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.red.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.red.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.red.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(167,79,74,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(128,36,32,0.6)),to(rgba(226,142,138,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99802420',endColorstr='#99e28e8a',GradientType=0)}#navbar .navbar-inner.orange{background-color:#e39665;background-image:-moz-linear-gradient(top,#f9c3a0,#c2530c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f9c3a0),to(#c2530c));background-image:-webkit-linear-gradient(top,#f9c3a0,#c2530c);background-image:-o-linear-gradient(top,#f9c3a0,#c2530c);background-image:linear-gradient(to bottom,#f9c3a0,#c2530c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9c3a0',endColorstr='#ffc2530c',GradientType=0)}#navbar .navbar-inner.orange .brand,#navbar .navbar-inner.orange .nav>li>a{text-shadow:0 1px 0 #f6a570;color:#f2f2f2}#navbar .navbar-inner.orange .brand .caret,#navbar .navbar-inner.orange .nav>li>a .caret{border-bottom-color:#f2b58d;border-top-color:#f2b58d}#navbar .navbar-inner.orange .brand:hover .caret,#navbar .navbar-inner.orange .nav>li>a:hover .caret,#navbar .navbar-inner.orange .brand:focus .caret,#navbar .navbar-inner.orange .nav>li>a:focus .caret{border-bottom-color:#f2d3c0;border-top-color:#f2d3c0}#navbar .navbar-inner.orange .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.orange .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.orange .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.orange .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.orange .nav li.dropdown.open.active>.dropdown-toggle{background-color:#d88047;background-image:-moz-linear-gradient(top,#c2530c,#f9c3a0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c2530c),to(#f9c3a0));background-image:-webkit-linear-gradient(top,#c2530c,#f9c3a0);background-image:-o-linear-gradient(top,#c2530c,#f9c3a0);background-image:linear-gradient(to bottom,#c2530c,#f9c3a0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc2530c',endColorstr='#fff9c3a0',GradientType=0)}#navbar .navbar-inner.orange.transparent{background-color:rgba(227,150,101,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(249,195,160,0.6)),to(rgba(194,83,12,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99f9c3a0',endColorstr='#99c2530c',GradientType=0)}#navbar .navbar-inner.orange.transparent .brand,#navbar .navbar-inner.orange.transparent .nav>li>a{text-shadow:0 1px 0 #f6a570;color:#f2f2f2}#navbar .navbar-inner.orange.transparent .brand .caret,#navbar .navbar-inner.orange.transparent .nav>li>a .caret{border-bottom-color:#f2b58d;border-top-color:#f2b58d}#navbar .navbar-inner.orange.transparent .brand:hover .caret,#navbar .navbar-inner.orange.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.orange.transparent .brand:focus .caret,#navbar .navbar-inner.orange.transparent .nav>li>a:focus .caret{border-bottom-color:#f2d3c0;border-top-color:#f2d3c0}#navbar .navbar-inner.orange.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.orange.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.orange.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.orange.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.orange.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(216,128,71,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(194,83,12,0.6)),to(rgba(249,195,160,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c2530c',endColorstr='#99f9c3a0',GradientType=0)}#navbar .navbar-inner.yellow{background-color:#e3d765;background-image:-moz-linear-gradient(top,#f9f0a0,#c2b00c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f9f0a0),to(#c2b00c));background-image:-webkit-linear-gradient(top,#f9f0a0,#c2b00c);background-image:-o-linear-gradient(top,#f9f0a0,#c2b00c);background-image:linear-gradient(to bottom,#f9f0a0,#c2b00c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f0a0',endColorstr='#ffc2b00c',GradientType=0)}#navbar .navbar-inner.yellow .brand,#navbar .navbar-inner.yellow .nav>li>a{text-shadow:0 1px 0 #f6e970;color:#333}#navbar .navbar-inner.yellow .brand .caret,#navbar .navbar-inner.yellow .nav>li>a .caret{border-bottom-color:#93892e;border-top-color:#93892e}#navbar .navbar-inner.yellow .brand:hover .caret,#navbar .navbar-inner.yellow .nav>li>a:hover .caret,#navbar .navbar-inner.yellow .brand:focus .caret,#navbar .navbar-inner.yellow .nav>li>a:focus .caret{border-bottom-color:#635e30;border-top-color:#635e30}#navbar .navbar-inner.yellow .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.yellow .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.yellow .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.yellow .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.yellow .nav li.dropdown.open.active>.dropdown-toggle{background-color:#d8ca47;background-image:-moz-linear-gradient(top,#c2b00c,#f9f0a0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c2b00c),to(#f9f0a0));background-image:-webkit-linear-gradient(top,#c2b00c,#f9f0a0);background-image:-o-linear-gradient(top,#c2b00c,#f9f0a0);background-image:linear-gradient(to bottom,#c2b00c,#f9f0a0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc2b00c',endColorstr='#fff9f0a0',GradientType=0)}#navbar .navbar-inner.yellow.transparent{background-color:rgba(227,215,101,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(249,240,160,0.6)),to(rgba(194,176,12,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99f9f0a0',endColorstr='#99c2b00c',GradientType=0)}#navbar .navbar-inner.yellow.transparent .brand,#navbar .navbar-inner.yellow.transparent .nav>li>a{text-shadow:0 1px 0 #f6e970;color:#333}#navbar .navbar-inner.yellow.transparent .brand .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a .caret{border-bottom-color:#93892e;border-top-color:#93892e}#navbar .navbar-inner.yellow.transparent .brand:hover .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.yellow.transparent .brand:focus .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a:focus .caret{border-bottom-color:#635e30;border-top-color:#635e30}#navbar .navbar-inner.yellow.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.yellow.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.yellow.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.yellow.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.yellow.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(216,202,71,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(194,176,12,0.6)),to(rgba(249,240,160,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c2b00c',endColorstr='#99f9f0a0',GradientType=0)}#navbar .navbar-inner.green{background-color:#98f064;background-image:-moz-linear-gradient(top,#c8ffa7,#50da00);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8ffa7),to(#50da00));background-image:-webkit-linear-gradient(top,#c8ffa7,#50da00);background-image:-o-linear-gradient(top,#c8ffa7,#50da00);background-image:linear-gradient(to bottom,#c8ffa7,#50da00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8ffa7',endColorstr='#ff50da00',GradientType=0)}#navbar .navbar-inner.green .brand,#navbar .navbar-inner.green .nav>li>a{text-shadow:0 1px 0 #a7ff74;color:#333}#navbar .navbar-inner.green .brand .caret,#navbar .navbar-inner.green .nav>li>a .caret{border-bottom-color:#55992e;border-top-color:#55992e}#navbar .navbar-inner.green .brand:hover .caret,#navbar .navbar-inner.green .nav>li>a:hover .caret,#navbar .navbar-inner.green .brand:focus .caret,#navbar .navbar-inner.green .nav>li>a:focus .caret{border-bottom-color:#446630;border-top-color:#446630}#navbar .navbar-inner.green .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.green .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.green .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.green .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.green .nav li.dropdown.open.active>.dropdown-toggle{background-color:#80e943;background-image:-moz-linear-gradient(top,#50da00,#c8ffa7);background-image:-webkit-gradient(linear,0 0,0 100%,from(#50da00),to(#c8ffa7));background-image:-webkit-linear-gradient(top,#50da00,#c8ffa7);background-image:-o-linear-gradient(top,#50da00,#c8ffa7);background-image:linear-gradient(to bottom,#50da00,#c8ffa7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff50da00',endColorstr='#ffc8ffa7',GradientType=0)}#navbar .navbar-inner.green.transparent{background-color:rgba(152,240,100,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,255,167,0.6)),to(rgba(80,218,0,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8ffa7',endColorstr='#9950da00',GradientType=0)}#navbar .navbar-inner.green.transparent .brand,#navbar .navbar-inner.green.transparent .nav>li>a{text-shadow:0 1px 0 #a7ff74;color:#333}#navbar .navbar-inner.green.transparent .brand .caret,#navbar .navbar-inner.green.transparent .nav>li>a .caret{border-bottom-color:#55992e;border-top-color:#55992e}#navbar .navbar-inner.green.transparent .brand:hover .caret,#navbar .navbar-inner.green.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.green.transparent .brand:focus .caret,#navbar .navbar-inner.green.transparent .nav>li>a:focus .caret{border-bottom-color:#446630;border-top-color:#446630}#navbar .navbar-inner.green.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.green.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.green.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.green.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.green.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(128,233,67,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(80,218,0,0.6)),to(rgba(200,255,167,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9950da00',endColorstr='#99c8ffa7',GradientType=0)}#navbar .navbar-inner.blue{background-color:#2e63cc;background-image:-moz-linear-gradient(top,#4d88ff,#002b80);background-image:-webkit-gradient(linear,0 0,0 100%,from(#4d88ff),to(#002b80));background-image:-webkit-linear-gradient(top,#4d88ff,#002b80);background-image:-o-linear-gradient(top,#4d88ff,#002b80);background-image:linear-gradient(to bottom,#4d88ff,#002b80);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4d88ff',endColorstr='#ff002b80',GradientType=0)}#navbar .navbar-inner.blue .brand,#navbar .navbar-inner.blue .nav>li>a{text-shadow:0 1px 0 #002b80;color:#f2f2f2}#navbar .navbar-inner.blue .brand .caret,#navbar .navbar-inner.blue .nav>li>a .caret{border-bottom-color:#799bdf;border-top-color:#799bdf}#navbar .navbar-inner.blue .brand:hover .caret,#navbar .navbar-inner.blue .nav>li>a:hover .caret,#navbar .navbar-inner.blue .brand:focus .caret,#navbar .navbar-inner.blue .nav>li>a:focus .caret{border-bottom-color:#b6c7e9;border-top-color:#b6c7e9}#navbar .navbar-inner.blue .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.blue .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.blue .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.blue .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.blue .nav li.dropdown.open.active>.dropdown-toggle{background-color:#1f50b3;background-image:-moz-linear-gradient(top,#002b80,#4d88ff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#002b80),to(#4d88ff));background-image:-webkit-linear-gradient(top,#002b80,#4d88ff);background-image:-o-linear-gradient(top,#002b80,#4d88ff);background-image:linear-gradient(to bottom,#002b80,#4d88ff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff002b80',endColorstr='#ff4d88ff',GradientType=0)}#navbar .navbar-inner.blue.transparent{background-color:rgba(46,99,204,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(77,136,255,0.6)),to(rgba(0,43,128,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#994d88ff',endColorstr='#99002b80',GradientType=0)}#navbar .navbar-inner.blue.transparent .brand,#navbar .navbar-inner.blue.transparent .nav>li>a{text-shadow:0 1px 0 #002b80;color:#f2f2f2}#navbar .navbar-inner.blue.transparent .brand .caret,#navbar .navbar-inner.blue.transparent .nav>li>a .caret{border-bottom-color:#799bdf;border-top-color:#799bdf}#navbar .navbar-inner.blue.transparent .brand:hover .caret,#navbar .navbar-inner.blue.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.blue.transparent .brand:focus .caret,#navbar .navbar-inner.blue.transparent .nav>li>a:focus .caret{border-bottom-color:#b6c7e9;border-top-color:#b6c7e9}#navbar .navbar-inner.blue.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.blue.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.blue.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.blue.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.blue.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(31,80,179,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(0,43,128,0.6)),to(rgba(77,136,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99002b80',endColorstr='#994d88ff',GradientType=0)}#navbar .navbar-inner.violet{background-color:#9864f0;background-image:-moz-linear-gradient(top,#c8a7ff,#5000da);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8a7ff),to(#5000da));background-image:-webkit-linear-gradient(top,#c8a7ff,#5000da);background-image:-o-linear-gradient(top,#c8a7ff,#5000da);background-image:linear-gradient(to bottom,#c8a7ff,#5000da);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8a7ff',endColorstr='#ff5000da',GradientType=0)}#navbar .navbar-inner.violet .brand,#navbar .navbar-inner.violet .nav>li>a{text-shadow:0 1px 0 #5000da;color:#f2f2f2}#navbar .navbar-inner.violet .brand .caret,#navbar .navbar-inner.violet .nav>li>a .caret{border-bottom-color:#b58df9;border-top-color:#b58df9}#navbar .navbar-inner.violet .brand:hover .caret,#navbar .navbar-inner.violet .nav>li>a:hover .caret,#navbar .navbar-inner.violet .brand:focus .caret,#navbar .navbar-inner.violet .nav>li>a:focus .caret{border-bottom-color:#d3c0f5;border-top-color:#d3c0f5}#navbar .navbar-inner.violet .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.violet .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.violet .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.violet .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.violet .nav li.dropdown.open.active>.dropdown-toggle{background-color:#8043e9;background-image:-moz-linear-gradient(top,#5000da,#c8a7ff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5000da),to(#c8a7ff));background-image:-webkit-linear-gradient(top,#5000da,#c8a7ff);background-image:-o-linear-gradient(top,#5000da,#c8a7ff);background-image:linear-gradient(to bottom,#5000da,#c8a7ff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5000da',endColorstr='#ffc8a7ff',GradientType=0)}#navbar .navbar-inner.violet.transparent{background-color:rgba(152,100,240,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,167,255,0.6)),to(rgba(80,0,218,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8a7ff',endColorstr='#995000da',GradientType=0)}#navbar .navbar-inner.violet.transparent .brand,#navbar .navbar-inner.violet.transparent .nav>li>a{text-shadow:0 1px 0 #5000da;color:#f2f2f2}#navbar .navbar-inner.violet.transparent .brand .caret,#navbar .navbar-inner.violet.transparent .nav>li>a .caret{border-bottom-color:#b58df9;border-top-color:#b58df9}#navbar .navbar-inner.violet.transparent .brand:hover .caret,#navbar .navbar-inner.violet.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.violet.transparent .brand:focus .caret,#navbar .navbar-inner.violet.transparent .nav>li>a:focus .caret{border-bottom-color:#d3c0f5;border-top-color:#d3c0f5}#navbar .navbar-inner.violet.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.violet.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.violet.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.violet.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.violet.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(128,67,233,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(80,0,218,0.6)),to(rgba(200,167,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#995000da',endColorstr='#99c8a7ff',GradientType=0)}#navbar .navbar-inner.black{background-color:#4f4f4f;background-image:-moz-linear-gradient(top,#787878,#121212);background-image:-webkit-gradient(linear,0 0,0 100%,from(#787878),to(#121212));background-image:-webkit-linear-gradient(top,#787878,#121212);background-image:-o-linear-gradient(top,#787878,#121212);background-image:linear-gradient(to bottom,#787878,#121212);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff787878',endColorstr='#ff121212',GradientType=0)}#navbar .navbar-inner.black .brand,#navbar .navbar-inner.black .nav>li>a{text-shadow:0 1px 0 #121212;color:#f2f2f2}#navbar .navbar-inner.black .brand .caret,#navbar .navbar-inner.black .nav>li>a .caret{border-bottom-color:#959595;border-top-color:#959595}#navbar .navbar-inner.black .brand:hover .caret,#navbar .navbar-inner.black .nav>li>a:hover .caret,#navbar .navbar-inner.black .brand:focus .caret,#navbar .navbar-inner.black .nav>li>a:focus .caret{border-bottom-color:#c4c4c4;border-top-color:#c4c4c4}#navbar .navbar-inner.black .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.black .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.black .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.black .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.black .nav li.dropdown.open.active>.dropdown-toggle{background-color:#3b3b3b;background-image:-moz-linear-gradient(top,#121212,#787878);background-image:-webkit-gradient(linear,0 0,0 100%,from(#121212),to(#787878));background-image:-webkit-linear-gradient(top,#121212,#787878);background-image:-o-linear-gradient(top,#121212,#787878);background-image:linear-gradient(to bottom,#121212,#787878);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff121212',endColorstr='#ff787878',GradientType=0)}#navbar .navbar-inner.black.transparent{background-color:rgba(79,79,79,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(120,120,120,0.6)),to(rgba(18,18,18,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99787878',endColorstr='#99121212',GradientType=0)}#navbar .navbar-inner.black.transparent .brand,#navbar .navbar-inner.black.transparent .nav>li>a{text-shadow:0 1px 0 #121212;color:#f2f2f2}#navbar .navbar-inner.black.transparent .brand .caret,#navbar .navbar-inner.black.transparent .nav>li>a .caret{border-bottom-color:#959595;border-top-color:#959595}#navbar .navbar-inner.black.transparent .brand:hover .caret,#navbar .navbar-inner.black.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.black.transparent .brand:focus .caret,#navbar .navbar-inner.black.transparent .nav>li>a:focus .caret{border-bottom-color:#c4c4c4;border-top-color:#c4c4c4}#navbar .navbar-inner.black.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.black.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.black.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.black.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.black.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(59,59,59,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(18,18,18,0.6)),to(rgba(120,120,120,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99121212',endColorstr='#99787878',GradientType=0)}#navbar .navbar-inner.white{background-color:#e9e9e9;background-image:-moz-linear-gradient(top,#fff,#c8c8c8);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#c8c8c8));background-image:-webkit-linear-gradient(top,#fff,#c8c8c8);background-image:-o-linear-gradient(top,#fff,#c8c8c8);background-image:linear-gradient(to bottom,#fff,#c8c8c8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffc8c8c8',GradientType=0)}#navbar .navbar-inner.white .brand,#navbar .navbar-inner.white .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.white .brand .caret,#navbar .navbar-inner.white .nav>li>a .caret{border-bottom-color:#919191;border-top-color:#919191}#navbar .navbar-inner.white .brand:hover .caret,#navbar .navbar-inner.white .nav>li>a:hover .caret,#navbar .navbar-inner.white .brand:focus .caret,#navbar .navbar-inner.white .nav>li>a:focus .caret{border-bottom-color:#626262;border-top-color:#626262}#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.white .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.open.active>.dropdown-toggle{background-color:#dedede;background-image:-moz-linear-gradient(top,#c8c8c8,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8c8c8),to(#fff));background-image:-webkit-linear-gradient(top,#c8c8c8,#fff);background-image:-o-linear-gradient(top,#c8c8c8,#fff);background-image:linear-gradient(to bottom,#c8c8c8,#fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8c8c8',endColorstr='#ffffffff',GradientType=0)}#navbar .navbar-inner.white.transparent{background-color:rgba(233,233,233,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.6)),to(rgba(200,200,200,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99ffffff',endColorstr='#99c8c8c8',GradientType=0)}#navbar .navbar-inner.white.transparent .brand,#navbar .navbar-inner.white.transparent .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.white.transparent .brand .caret,#navbar .navbar-inner.white.transparent .nav>li>a .caret{border-bottom-color:#919191;border-top-color:#919191}#navbar .navbar-inner.white.transparent .brand:hover .caret,#navbar .navbar-inner.white.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.white.transparent .brand:focus .caret,#navbar .navbar-inner.white.transparent .nav>li>a:focus .caret{border-bottom-color:#626262;border-top-color:#626262}#navbar .navbar-inner.white.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.white.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(222,222,222,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,200,200,0.6)),to(rgba(255,255,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8c8c8',endColorstr='#99ffffff',GradientType=0)}#navbar .navbar-inner .brand span{background-size:20px 20px;background-position:left center;padding-left:24px;background-repeat:no-repeat}.octoprint-container{margin-top:20px}.octoprint-container .tab-content{padding:9px 15px;border-left:1px solid #DDD;border-right:1px solid #DDD;border-bottom:1px solid #DDD;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.octoprint-container .nav{margin-bottom:0}.octoprint-container .tab-content h1{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5;font-weight:normal}.octoprint-container .accordion-heading .accordion-heading-button{float:right}.octoprint-container .accordion-heading .accordion-heading-button a{display:inline-block;padding:8px 15px;font-size:14px;line-height:20px;color:#000;text-decoration:none;background:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.octoprint-container .accordion-heading a.accordion-toggle{display:inline-block}.octoprint-container .accordion-heading [class^="icon-"],.octoprint-container .accordion-heading [class*=" icon-"]{color:#000}.print-control .btn{padding-left:4px;padding-right:4px}.upload-buttons .btn{margin-right:0}table{table-layout:fixed}table .popover-title{text-overflow:ellipsis;word-break:break-all}table th,table td{overflow:hidden}table th.gcode_files_name,table td.gcode_files_name{text-overflow:ellipsis;text-align:left;white-space:nowrap}table th.gcode_files_action,table td.gcode_files_action{width:90px;text-align:center;white-space:nowrap}table th.gcode_files_action a,table td.gcode_files_action a{text-decoration:none;color:#000}table th.gcode_files_action a.disabled,table td.gcode_files_action a.disabled{color:#ccc;cursor:default}table th.timelapse_files_name,table td.timelapse_files_name{text-overflow:ellipsis;text-align:left}table th.timelapse_files_size,table td.timelapse_files_size{text-align:right;width:55px}table th.timelapse_files_action,table td.timelapse_files_action{width:45px;text-align:center;white-space:nowrap}table th.timelapse_files_action a,table td.timelapse_files_action a{text-decoration:none;color:#000}table th.timelapse_files_action a.disabled,table td.timelapse_files_action a.disabled{color:#ccc;cursor:default}table th.settings_users_name,table td.settings_users_name{text-overflow:ellipsis;text-align:left}table th.settings_users_active,table td.settings_users_active,table th.settings_users_admin,table td.settings_users_admin{text-align:center;width:55px}table th.settings_users_actions,table td.settings_users_actions{width:60px;text-align:center;white-space:nowrap}table th.settings_users_actions a,table td.settings_users_actions a{text-decoration:none;color:#000}table th.settings_users_actions a.disabled,table td.settings_users_actions a.disabled{color:#ccc;cursor:default}table th.settings_logs_name,table td.settings_logs_name{text-overflow:ellipsis;text-align:left}table th.settings_logs_size,table td.settings_logs_size{text-align:right;width:70px}table th.settings_logs_date,table td.settings_logs_date{text-align:left;width:130px}table th.settings_logs_action,table td.settings_logs_action{width:70px;text-align:center;white-space:nowrap}table th.settings_logs_action a,table td.settings_logs_action a{text-decoration:none;color:#000}table th.settings_logs_action a.disabled,table td.settings_logs_action a.disabled{color:#ccc;cursor:default}table th.settings_printerProfiles_profiles_name,table td.settings_printerProfiles_profiles_name{text-overflow:ellipsis;text-align:left}table th.settings_printerProfiles_profiles_model,table td.settings_printerProfiles_profiles_model{text-align:left;width:250px}table th.settings_printerProfiles_profiles_action,table td.settings_printerProfiles_profiles_action{width:80px;text-align:center;white-space:nowrap}table th.settings_printerProfiles_profiles_action a,table td.settings_printerProfiles_profiles_action a{text-decoration:none;color:#000}table th.settings_printerProfiles_profiles_action a.disabled,table td.settings_printerProfiles_profiles_action a.disabled{color:#ccc;cursor:default}#temperature-graph{height:350px;width:100%;background-image:url("../img/graph-background.png");background-position:center;background-repeat:no-repeat}.tab-content,.tab-pane{overflow:visible}.tempInput{width:50px}#temp_newTemp,#temp_newBedTemp,#speed_innerWall,#speed_outerWall,#speed_fill,#speed_support,#webcam_timelapse_interval,#webcam_timelapse_postRoll,#webcam_timelapse_fps{text-align:right}ul.dropdown-menu li a{cursor:pointer}#connection_ports,#connection_baudrates,#connection_printers{width:100%}#offline_overlay,#reloadui_overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:10001;display:none}#offline_overlay_background,#reloadui_overlay_background{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#offline_overlay_wrapper,#reloadui_overlay_wrapper{position:absolute;top:0;bottom:0;left:0;right:0;padding-top:60px}#offline_overlay_wrapper .container,#reloadui_overlay_wrapper .container{margin:auto}#webcam_container{width:100%;position:relative;outline:0}#webcam_container .flipH{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1)}#webcam_container .flipV{-webkit-transform:scaleY(-1);-moz-transform:scaleY(-1);-ms-transform:scaleY(-1)}#webcam_container .flipH.flipV{-webkit-transform:scaleX(-1) scaleY(-1);-moz-transform:scaleX(-1) scaleY(-1);-ms-transform:scaleX(-1) scaleY(-1)}#webcam_container .rotate90{transform:rotate(-90deg)}#webcam_container .keycontrol_overlay{position:absolute;left:10px;right:10px;bottom:10px;background:rgba(0,0,0,0.5);font-size:85%;color:white;padding:0}#webcam_container .keycontrol_overlay kbd{border:1px solid #eee;border-radius:3px;margin-left:2px;margin-right:2px;font-size:90%;padding:2px;min-width:1em}#webcam_container .keycontrol_overlay .keycontrol_overlay_heading{position:relative;padding:10px;font-weight:bold}#webcam_container .keycontrol_overlay .keycontrol_overlay_column{position:relative;width:45%;padding:10px;float:left}#files .gcode_files{padding-right:7px}#files .gcode_files .entry{padding:5px;line-height:20px;border-bottom:1px solid #ddd;position:relative}#files .gcode_files .entry:hover{background-color:#f5f5f5}#files .gcode_files .entry .title{text-overflow:ellipsis;word-break:break-all}#files .gcode_files .entry .uploaded,#files .gcode_files .entry .size,#files .gcode_files .entry .additionalInfo{font-size:85%;color:#999}#files .gcode_files .entry .action-buttons{position:absolute;bottom:5px;right:5px}#files .gcode_files .entry .additionalInfo{padding-bottom:22px}#files .upload-buttons{margin-top:10px}#files .form-search{text-align:center;margin-bottom:5px!important}#control{overflow:hidden}#control .jog-panel{float:left;margin-right:19px}#control h1{text-align:left}#control .jog-panel>div{text-align:center}#control .jog-panel>div.distance{text-align:left}#control .jog-panel .slider{margin-bottom:10px}#control .box{width:30px;height:30px;margin-right:10px;margin-bottom:10px;padding-left:8px}#control .control-box{display:block;height:30px;margin-bottom:10px}#control .btn-group{margin-bottom:10px}#control .btn-group.distance>.btn{width:43px;padding:3px 0;height:30px}#control .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}#control .custom_section h1{cursor:pointer}#control .custom_section_horizontal .custom_control{display:inline-block}#control .custom_section_vertical .custom_control{display:block}#control .custom_control .slider{margin-left:10px;margin-right:10px;margin-bottom:2px}#gcode .progress{width:582px}#gcode .progress .bar{-webkit-transition:width 0s linear;-moz-transition:width 0s linear;-o-transition:width 0s linear;transition:width 0s linear}#gcode .canvas_container{position:relative}#gcode #gcode_layer_slider{position:absolute;right:0;top:0;height:568px;float:right}#gcode #gcode_layer_slider .slider-handle{width:14px;height:14px;margin-left:-3px;margin-top:-7px}#gcode #gcode_command_slider .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}#term .terminal{margin-bottom:30px}#term .terminal #terminal-output{min-height:340px;margin-bottom:5px}#term #terminal-sendpanel{text-align:right}#settings_dialog .modal-body #settings_dialog_menu{margin-left:0}#settings_appearance_managelanguagesdialog_emptylist{overflow:hidden;width:100%;height:300px;text-align:center;display:table}#settings_appearance_managelanguagesdialog_emptylist div{display:table-cell;vertical-align:middle}.footer ul{margin:0}.footer ul li{display:inline;margin-left:1em;font-size:85%}.footer ul li:first-child{margin-left:0}.footer ul li a{color:#555}.ui-pnotify .alert a{color:#c09853}.ui-pnotify .alert-error a,.ui-pnotify .alert-danger a{color:#b94a48}.ui-pnotify .alert-success a{color:#468847}.ui-pnotify .alert-info a{color:#3a87ad}.pnotify_additional_info .pnotify_more{font-size:85%}.text-right{text-align:right}.overflow_visible{overflow:visible!important}.border_box{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none}textarea.block{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%}#drop_overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:10000;display:none}#drop_overlay.in{display:block}#drop_overlay #drop_overlay_background{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#drop_overlay #drop_overlay_wrapper{position:absolute;top:0;bottom:0;left:0;right:0;padding-top:60px}#drop_overlay #drop_overlay_wrapper #drop,#drop_overlay #drop_overlay_wrapper #drop_background{position:absolute;top:0;left:0;margin-left:0;width:100%}#drop_overlay #drop_overlay_wrapper #drop_locally,#drop_overlay #drop_overlay_wrapper #drop_locally_background{position:absolute;top:0;left:50%;margin-left:-50%;width:50%;border-right:2px dashed #ccc}#drop_overlay #drop_overlay_wrapper #drop_sd,#drop_overlay #drop_overlay_wrapper #drop_sd_background{position:absolute;top:0;left:50%;margin-left:0;width:50%;border-left:2px dashed #ccc}#drop_overlay #drop_overlay_wrapper .dropzone{height:100%;z-index:10001;color:#fff;font-size:30px}#drop_overlay #drop_overlay_wrapper .dropzone i{font-size:50px}#drop_overlay #drop_overlay_wrapper .dropzone .text{display:block;text-align:center;line-height:40px;position:absolute;width:100%;bottom:5%;filter:alpha(opacity=100);-moz-opacity:1.0;-khtml-opacity:1.0;opacity:1.0}#drop_overlay #drop_overlay_wrapper .dropzone_background{width:50%;height:100%;background-color:#000;filter:alpha(opacity=25);-moz-opacity:.25;-khtml-opacity:.25;opacity:.25}#drop_overlay #drop_overlay_wrapper .dropzone_background.hover{background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#drop_overlay #drop_overlay_wrapper .dropzone_background.fade{-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out;opacity:1}.icon-sd-black-14{background:url("../img/icon-sd-black-14.png") 0 3px no-repeat;width:11px;height:17px;display:inline-block!important}.center{float:none;margin-left:auto;margin-right:auto}.slider .slider-selection{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.slider .slider-selection:hover,.slider .slider-selection:focus,.slider .slider-selection:active,.slider .slider-selection.active,.slider .slider-selection.disabled,.slider .slider-selection[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.slider .slider-selection:active,.slider .slider-selection.active{background-color:#039 \9}.slider.slider-disabled .slider-selection{background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-track{background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.slider.slider-disabled .slider-track{background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-handle{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);padding:0;margin-bottom:0;opacity:1;filter:alpha(opacity=100)}.slider .slider-handle:hover,.slider .slider-handle:focus,.slider .slider-handle:active,.slider .slider-handle.active,.slider .slider-handle.disabled,.slider .slider-handle[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.slider .slider-handle:active,.slider .slider-handle.active{background-color:#ccc \9}.slider .slider-handle:first-child{*margin-left:0}.slider .slider-handle:hover,.slider .slider-handle:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.slider .slider-handle:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.slider .slider-handle.active,.slider .slider-handle:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.slider .slider-handle.disabled,.slider .slider-handle[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-handle.hide{display:none}.slider .slider-handle.round{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%}.modal.large{width:975px;margin-left:-487px}.full-sized-box{position:absolute;bottom:0;left:0;right:0;top:0;padding:15px}.full-sized-box .row-fluid{height:100%}@media(max-width:979px){.full-sized-box{position:static}}_::-webkit-full-page-media,_:future,:root .full-sized-box{position:static}.scrollable{height:100%;overflow:auto;-webkit-overflow-scrolling:touch}.input-append .add-on.add-on-limited,.input-prepend .add-on.add-on-limited{overflow-x:hidden;text-overflow:ellipsis;width:inherit}.control-group.error .input-prepend .fileinput-button,.control-group.error .input-append .fileinput-button{border-color:#b94a48}input[type=number]{text-align:right} \ No newline at end of file +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{border-color:transparent;cursor:pointer;color:#08c;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.nowrap{white-space:nowrap}.actioncol{text-align:center;white-space:nowrap}.actioncol a{text-decoration:none;color:#000}.actioncol a.disabled{color:#ccc;cursor:default}#navbar .navbar-inner{background-color:#ebebeb;background-image:-moz-linear-gradient(top,#fff,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#ccc));background-image:-webkit-linear-gradient(top,#fff,#ccc);background-image:-o-linear-gradient(top,#fff,#ccc);background-image:linear-gradient(to bottom,#fff,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffcccccc',GradientType=0)}#navbar .navbar-inner .brand,#navbar .navbar-inner .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner .brand .caret,#navbar .navbar-inner .nav>li>a .caret{border-bottom-color:#939393;border-top-color:#939393}#navbar .navbar-inner .brand:hover .caret,#navbar .navbar-inner .nav>li>a:hover .caret,#navbar .navbar-inner .brand:focus .caret,#navbar .navbar-inner .nav>li>a:focus .caret{border-bottom-color:#636363;border-top-color:#636363}#navbar .navbar-inner .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e0e0e0;background-image:-moz-linear-gradient(top,#ccc,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ccc),to(#fff));background-image:-webkit-linear-gradient(top,#ccc,#fff);background-image:-o-linear-gradient(top,#ccc,#fff);background-image:linear-gradient(to bottom,#ccc,#fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcccccc',endColorstr='#ffffffff',GradientType=0)}#navbar .navbar-inner.transparent{background-color:rgba(235,235,235,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.6)),to(rgba(204,204,204,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99ffffff',endColorstr='#99cccccc',GradientType=0)}#navbar .navbar-inner.transparent .brand,#navbar .navbar-inner.transparent .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.transparent .brand .caret,#navbar .navbar-inner.transparent .nav>li>a .caret{border-bottom-color:#939393;border-top-color:#939393}#navbar .navbar-inner.transparent .brand:hover .caret,#navbar .navbar-inner.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.transparent .brand:focus .caret,#navbar .navbar-inner.transparent .nav>li>a:focus .caret{border-bottom-color:#636363;border-top-color:#636363}#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(224,224,224,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(204,204,204,0.6)),to(rgba(255,255,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99cccccc',endColorstr='#99ffffff',GradientType=0)}#navbar .navbar-inner.red{background-color:#bb645f;background-image:-moz-linear-gradient(top,#e28e8a,#802420);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e28e8a),to(#802420));background-image:-webkit-linear-gradient(top,#e28e8a,#802420);background-image:-o-linear-gradient(top,#e28e8a,#802420);background-image:linear-gradient(to bottom,#e28e8a,#802420);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe28e8a',endColorstr='#ff802420',GradientType=0)}#navbar .navbar-inner.red .brand,#navbar .navbar-inner.red .nav>li>a{text-shadow:0 1px 0 #802420;color:#f2f2f2}#navbar .navbar-inner.red .brand .caret,#navbar .navbar-inner.red .nav>li>a .caret{border-bottom-color:#d89491;border-top-color:#d89491}#navbar .navbar-inner.red .brand:hover .caret,#navbar .navbar-inner.red .nav>li>a:hover .caret,#navbar .navbar-inner.red .brand:focus .caret,#navbar .navbar-inner.red .nav>li>a:focus .caret{border-bottom-color:#e5c3c1;border-top-color:#e5c3c1}#navbar .navbar-inner.red .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.red .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.red .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.red .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.red .nav li.dropdown.open.active>.dropdown-toggle{background-color:#a74f4a;background-image:-moz-linear-gradient(top,#802420,#e28e8a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#802420),to(#e28e8a));background-image:-webkit-linear-gradient(top,#802420,#e28e8a);background-image:-o-linear-gradient(top,#802420,#e28e8a);background-image:linear-gradient(to bottom,#802420,#e28e8a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff802420',endColorstr='#ffe28e8a',GradientType=0)}#navbar .navbar-inner.red.transparent{background-color:rgba(187,100,95,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(226,142,138,0.6)),to(rgba(128,36,32,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99e28e8a',endColorstr='#99802420',GradientType=0)}#navbar .navbar-inner.red.transparent .brand,#navbar .navbar-inner.red.transparent .nav>li>a{text-shadow:0 1px 0 #802420;color:#f2f2f2}#navbar .navbar-inner.red.transparent .brand .caret,#navbar .navbar-inner.red.transparent .nav>li>a .caret{border-bottom-color:#d89491;border-top-color:#d89491}#navbar .navbar-inner.red.transparent .brand:hover .caret,#navbar .navbar-inner.red.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.red.transparent .brand:focus .caret,#navbar .navbar-inner.red.transparent .nav>li>a:focus .caret{border-bottom-color:#e5c3c1;border-top-color:#e5c3c1}#navbar .navbar-inner.red.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.red.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.red.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.red.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.red.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(167,79,74,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(128,36,32,0.6)),to(rgba(226,142,138,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99802420',endColorstr='#99e28e8a',GradientType=0)}#navbar .navbar-inner.orange{background-color:#e39665;background-image:-moz-linear-gradient(top,#f9c3a0,#c2530c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f9c3a0),to(#c2530c));background-image:-webkit-linear-gradient(top,#f9c3a0,#c2530c);background-image:-o-linear-gradient(top,#f9c3a0,#c2530c);background-image:linear-gradient(to bottom,#f9c3a0,#c2530c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9c3a0',endColorstr='#ffc2530c',GradientType=0)}#navbar .navbar-inner.orange .brand,#navbar .navbar-inner.orange .nav>li>a{text-shadow:0 1px 0 #f6a570;color:#f2f2f2}#navbar .navbar-inner.orange .brand .caret,#navbar .navbar-inner.orange .nav>li>a .caret{border-bottom-color:#f2b58d;border-top-color:#f2b58d}#navbar .navbar-inner.orange .brand:hover .caret,#navbar .navbar-inner.orange .nav>li>a:hover .caret,#navbar .navbar-inner.orange .brand:focus .caret,#navbar .navbar-inner.orange .nav>li>a:focus .caret{border-bottom-color:#f2d3c0;border-top-color:#f2d3c0}#navbar .navbar-inner.orange .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.orange .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.orange .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.orange .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.orange .nav li.dropdown.open.active>.dropdown-toggle{background-color:#d88047;background-image:-moz-linear-gradient(top,#c2530c,#f9c3a0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c2530c),to(#f9c3a0));background-image:-webkit-linear-gradient(top,#c2530c,#f9c3a0);background-image:-o-linear-gradient(top,#c2530c,#f9c3a0);background-image:linear-gradient(to bottom,#c2530c,#f9c3a0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc2530c',endColorstr='#fff9c3a0',GradientType=0)}#navbar .navbar-inner.orange.transparent{background-color:rgba(227,150,101,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(249,195,160,0.6)),to(rgba(194,83,12,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99f9c3a0',endColorstr='#99c2530c',GradientType=0)}#navbar .navbar-inner.orange.transparent .brand,#navbar .navbar-inner.orange.transparent .nav>li>a{text-shadow:0 1px 0 #f6a570;color:#f2f2f2}#navbar .navbar-inner.orange.transparent .brand .caret,#navbar .navbar-inner.orange.transparent .nav>li>a .caret{border-bottom-color:#f2b58d;border-top-color:#f2b58d}#navbar .navbar-inner.orange.transparent .brand:hover .caret,#navbar .navbar-inner.orange.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.orange.transparent .brand:focus .caret,#navbar .navbar-inner.orange.transparent .nav>li>a:focus .caret{border-bottom-color:#f2d3c0;border-top-color:#f2d3c0}#navbar .navbar-inner.orange.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.orange.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.orange.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.orange.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.orange.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(216,128,71,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(194,83,12,0.6)),to(rgba(249,195,160,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c2530c',endColorstr='#99f9c3a0',GradientType=0)}#navbar .navbar-inner.yellow{background-color:#e3d765;background-image:-moz-linear-gradient(top,#f9f0a0,#c2b00c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f9f0a0),to(#c2b00c));background-image:-webkit-linear-gradient(top,#f9f0a0,#c2b00c);background-image:-o-linear-gradient(top,#f9f0a0,#c2b00c);background-image:linear-gradient(to bottom,#f9f0a0,#c2b00c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f0a0',endColorstr='#ffc2b00c',GradientType=0)}#navbar .navbar-inner.yellow .brand,#navbar .navbar-inner.yellow .nav>li>a{text-shadow:0 1px 0 #f6e970;color:#333}#navbar .navbar-inner.yellow .brand .caret,#navbar .navbar-inner.yellow .nav>li>a .caret{border-bottom-color:#93892e;border-top-color:#93892e}#navbar .navbar-inner.yellow .brand:hover .caret,#navbar .navbar-inner.yellow .nav>li>a:hover .caret,#navbar .navbar-inner.yellow .brand:focus .caret,#navbar .navbar-inner.yellow .nav>li>a:focus .caret{border-bottom-color:#635e30;border-top-color:#635e30}#navbar .navbar-inner.yellow .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.yellow .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.yellow .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.yellow .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.yellow .nav li.dropdown.open.active>.dropdown-toggle{background-color:#d8ca47;background-image:-moz-linear-gradient(top,#c2b00c,#f9f0a0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c2b00c),to(#f9f0a0));background-image:-webkit-linear-gradient(top,#c2b00c,#f9f0a0);background-image:-o-linear-gradient(top,#c2b00c,#f9f0a0);background-image:linear-gradient(to bottom,#c2b00c,#f9f0a0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc2b00c',endColorstr='#fff9f0a0',GradientType=0)}#navbar .navbar-inner.yellow.transparent{background-color:rgba(227,215,101,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(249,240,160,0.6)),to(rgba(194,176,12,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99f9f0a0',endColorstr='#99c2b00c',GradientType=0)}#navbar .navbar-inner.yellow.transparent .brand,#navbar .navbar-inner.yellow.transparent .nav>li>a{text-shadow:0 1px 0 #f6e970;color:#333}#navbar .navbar-inner.yellow.transparent .brand .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a .caret{border-bottom-color:#93892e;border-top-color:#93892e}#navbar .navbar-inner.yellow.transparent .brand:hover .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.yellow.transparent .brand:focus .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a:focus .caret{border-bottom-color:#635e30;border-top-color:#635e30}#navbar .navbar-inner.yellow.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.yellow.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.yellow.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.yellow.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.yellow.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(216,202,71,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(194,176,12,0.6)),to(rgba(249,240,160,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c2b00c',endColorstr='#99f9f0a0',GradientType=0)}#navbar .navbar-inner.green{background-color:#98f064;background-image:-moz-linear-gradient(top,#c8ffa7,#50da00);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8ffa7),to(#50da00));background-image:-webkit-linear-gradient(top,#c8ffa7,#50da00);background-image:-o-linear-gradient(top,#c8ffa7,#50da00);background-image:linear-gradient(to bottom,#c8ffa7,#50da00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8ffa7',endColorstr='#ff50da00',GradientType=0)}#navbar .navbar-inner.green .brand,#navbar .navbar-inner.green .nav>li>a{text-shadow:0 1px 0 #a7ff74;color:#333}#navbar .navbar-inner.green .brand .caret,#navbar .navbar-inner.green .nav>li>a .caret{border-bottom-color:#55992e;border-top-color:#55992e}#navbar .navbar-inner.green .brand:hover .caret,#navbar .navbar-inner.green .nav>li>a:hover .caret,#navbar .navbar-inner.green .brand:focus .caret,#navbar .navbar-inner.green .nav>li>a:focus .caret{border-bottom-color:#446630;border-top-color:#446630}#navbar .navbar-inner.green .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.green .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.green .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.green .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.green .nav li.dropdown.open.active>.dropdown-toggle{background-color:#80e943;background-image:-moz-linear-gradient(top,#50da00,#c8ffa7);background-image:-webkit-gradient(linear,0 0,0 100%,from(#50da00),to(#c8ffa7));background-image:-webkit-linear-gradient(top,#50da00,#c8ffa7);background-image:-o-linear-gradient(top,#50da00,#c8ffa7);background-image:linear-gradient(to bottom,#50da00,#c8ffa7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff50da00',endColorstr='#ffc8ffa7',GradientType=0)}#navbar .navbar-inner.green.transparent{background-color:rgba(152,240,100,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,255,167,0.6)),to(rgba(80,218,0,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8ffa7',endColorstr='#9950da00',GradientType=0)}#navbar .navbar-inner.green.transparent .brand,#navbar .navbar-inner.green.transparent .nav>li>a{text-shadow:0 1px 0 #a7ff74;color:#333}#navbar .navbar-inner.green.transparent .brand .caret,#navbar .navbar-inner.green.transparent .nav>li>a .caret{border-bottom-color:#55992e;border-top-color:#55992e}#navbar .navbar-inner.green.transparent .brand:hover .caret,#navbar .navbar-inner.green.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.green.transparent .brand:focus .caret,#navbar .navbar-inner.green.transparent .nav>li>a:focus .caret{border-bottom-color:#446630;border-top-color:#446630}#navbar .navbar-inner.green.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.green.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.green.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.green.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.green.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(128,233,67,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(80,218,0,0.6)),to(rgba(200,255,167,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9950da00',endColorstr='#99c8ffa7',GradientType=0)}#navbar .navbar-inner.blue{background-color:#2e63cc;background-image:-moz-linear-gradient(top,#4d88ff,#002b80);background-image:-webkit-gradient(linear,0 0,0 100%,from(#4d88ff),to(#002b80));background-image:-webkit-linear-gradient(top,#4d88ff,#002b80);background-image:-o-linear-gradient(top,#4d88ff,#002b80);background-image:linear-gradient(to bottom,#4d88ff,#002b80);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4d88ff',endColorstr='#ff002b80',GradientType=0)}#navbar .navbar-inner.blue .brand,#navbar .navbar-inner.blue .nav>li>a{text-shadow:0 1px 0 #002b80;color:#f2f2f2}#navbar .navbar-inner.blue .brand .caret,#navbar .navbar-inner.blue .nav>li>a .caret{border-bottom-color:#799bdf;border-top-color:#799bdf}#navbar .navbar-inner.blue .brand:hover .caret,#navbar .navbar-inner.blue .nav>li>a:hover .caret,#navbar .navbar-inner.blue .brand:focus .caret,#navbar .navbar-inner.blue .nav>li>a:focus .caret{border-bottom-color:#b6c7e9;border-top-color:#b6c7e9}#navbar .navbar-inner.blue .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.blue .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.blue .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.blue .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.blue .nav li.dropdown.open.active>.dropdown-toggle{background-color:#1f50b3;background-image:-moz-linear-gradient(top,#002b80,#4d88ff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#002b80),to(#4d88ff));background-image:-webkit-linear-gradient(top,#002b80,#4d88ff);background-image:-o-linear-gradient(top,#002b80,#4d88ff);background-image:linear-gradient(to bottom,#002b80,#4d88ff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff002b80',endColorstr='#ff4d88ff',GradientType=0)}#navbar .navbar-inner.blue.transparent{background-color:rgba(46,99,204,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(77,136,255,0.6)),to(rgba(0,43,128,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#994d88ff',endColorstr='#99002b80',GradientType=0)}#navbar .navbar-inner.blue.transparent .brand,#navbar .navbar-inner.blue.transparent .nav>li>a{text-shadow:0 1px 0 #002b80;color:#f2f2f2}#navbar .navbar-inner.blue.transparent .brand .caret,#navbar .navbar-inner.blue.transparent .nav>li>a .caret{border-bottom-color:#799bdf;border-top-color:#799bdf}#navbar .navbar-inner.blue.transparent .brand:hover .caret,#navbar .navbar-inner.blue.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.blue.transparent .brand:focus .caret,#navbar .navbar-inner.blue.transparent .nav>li>a:focus .caret{border-bottom-color:#b6c7e9;border-top-color:#b6c7e9}#navbar .navbar-inner.blue.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.blue.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.blue.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.blue.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.blue.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(31,80,179,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(0,43,128,0.6)),to(rgba(77,136,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99002b80',endColorstr='#994d88ff',GradientType=0)}#navbar .navbar-inner.violet{background-color:#9864f0;background-image:-moz-linear-gradient(top,#c8a7ff,#5000da);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8a7ff),to(#5000da));background-image:-webkit-linear-gradient(top,#c8a7ff,#5000da);background-image:-o-linear-gradient(top,#c8a7ff,#5000da);background-image:linear-gradient(to bottom,#c8a7ff,#5000da);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8a7ff',endColorstr='#ff5000da',GradientType=0)}#navbar .navbar-inner.violet .brand,#navbar .navbar-inner.violet .nav>li>a{text-shadow:0 1px 0 #5000da;color:#f2f2f2}#navbar .navbar-inner.violet .brand .caret,#navbar .navbar-inner.violet .nav>li>a .caret{border-bottom-color:#b58df9;border-top-color:#b58df9}#navbar .navbar-inner.violet .brand:hover .caret,#navbar .navbar-inner.violet .nav>li>a:hover .caret,#navbar .navbar-inner.violet .brand:focus .caret,#navbar .navbar-inner.violet .nav>li>a:focus .caret{border-bottom-color:#d3c0f5;border-top-color:#d3c0f5}#navbar .navbar-inner.violet .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.violet .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.violet .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.violet .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.violet .nav li.dropdown.open.active>.dropdown-toggle{background-color:#8043e9;background-image:-moz-linear-gradient(top,#5000da,#c8a7ff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5000da),to(#c8a7ff));background-image:-webkit-linear-gradient(top,#5000da,#c8a7ff);background-image:-o-linear-gradient(top,#5000da,#c8a7ff);background-image:linear-gradient(to bottom,#5000da,#c8a7ff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5000da',endColorstr='#ffc8a7ff',GradientType=0)}#navbar .navbar-inner.violet.transparent{background-color:rgba(152,100,240,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,167,255,0.6)),to(rgba(80,0,218,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8a7ff',endColorstr='#995000da',GradientType=0)}#navbar .navbar-inner.violet.transparent .brand,#navbar .navbar-inner.violet.transparent .nav>li>a{text-shadow:0 1px 0 #5000da;color:#f2f2f2}#navbar .navbar-inner.violet.transparent .brand .caret,#navbar .navbar-inner.violet.transparent .nav>li>a .caret{border-bottom-color:#b58df9;border-top-color:#b58df9}#navbar .navbar-inner.violet.transparent .brand:hover .caret,#navbar .navbar-inner.violet.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.violet.transparent .brand:focus .caret,#navbar .navbar-inner.violet.transparent .nav>li>a:focus .caret{border-bottom-color:#d3c0f5;border-top-color:#d3c0f5}#navbar .navbar-inner.violet.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.violet.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.violet.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.violet.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.violet.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(128,67,233,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(80,0,218,0.6)),to(rgba(200,167,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#995000da',endColorstr='#99c8a7ff',GradientType=0)}#navbar .navbar-inner.black{background-color:#4f4f4f;background-image:-moz-linear-gradient(top,#787878,#121212);background-image:-webkit-gradient(linear,0 0,0 100%,from(#787878),to(#121212));background-image:-webkit-linear-gradient(top,#787878,#121212);background-image:-o-linear-gradient(top,#787878,#121212);background-image:linear-gradient(to bottom,#787878,#121212);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff787878',endColorstr='#ff121212',GradientType=0)}#navbar .navbar-inner.black .brand,#navbar .navbar-inner.black .nav>li>a{text-shadow:0 1px 0 #121212;color:#f2f2f2}#navbar .navbar-inner.black .brand .caret,#navbar .navbar-inner.black .nav>li>a .caret{border-bottom-color:#959595;border-top-color:#959595}#navbar .navbar-inner.black .brand:hover .caret,#navbar .navbar-inner.black .nav>li>a:hover .caret,#navbar .navbar-inner.black .brand:focus .caret,#navbar .navbar-inner.black .nav>li>a:focus .caret{border-bottom-color:#c4c4c4;border-top-color:#c4c4c4}#navbar .navbar-inner.black .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.black .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.black .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.black .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.black .nav li.dropdown.open.active>.dropdown-toggle{background-color:#3b3b3b;background-image:-moz-linear-gradient(top,#121212,#787878);background-image:-webkit-gradient(linear,0 0,0 100%,from(#121212),to(#787878));background-image:-webkit-linear-gradient(top,#121212,#787878);background-image:-o-linear-gradient(top,#121212,#787878);background-image:linear-gradient(to bottom,#121212,#787878);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff121212',endColorstr='#ff787878',GradientType=0)}#navbar .navbar-inner.black.transparent{background-color:rgba(79,79,79,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(120,120,120,0.6)),to(rgba(18,18,18,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99787878',endColorstr='#99121212',GradientType=0)}#navbar .navbar-inner.black.transparent .brand,#navbar .navbar-inner.black.transparent .nav>li>a{text-shadow:0 1px 0 #121212;color:#f2f2f2}#navbar .navbar-inner.black.transparent .brand .caret,#navbar .navbar-inner.black.transparent .nav>li>a .caret{border-bottom-color:#959595;border-top-color:#959595}#navbar .navbar-inner.black.transparent .brand:hover .caret,#navbar .navbar-inner.black.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.black.transparent .brand:focus .caret,#navbar .navbar-inner.black.transparent .nav>li>a:focus .caret{border-bottom-color:#c4c4c4;border-top-color:#c4c4c4}#navbar .navbar-inner.black.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.black.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.black.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.black.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.black.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(59,59,59,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(18,18,18,0.6)),to(rgba(120,120,120,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99121212',endColorstr='#99787878',GradientType=0)}#navbar .navbar-inner.white{background-color:#e9e9e9;background-image:-moz-linear-gradient(top,#fff,#c8c8c8);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#c8c8c8));background-image:-webkit-linear-gradient(top,#fff,#c8c8c8);background-image:-o-linear-gradient(top,#fff,#c8c8c8);background-image:linear-gradient(to bottom,#fff,#c8c8c8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffc8c8c8',GradientType=0)}#navbar .navbar-inner.white .brand,#navbar .navbar-inner.white .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.white .brand .caret,#navbar .navbar-inner.white .nav>li>a .caret{border-bottom-color:#919191;border-top-color:#919191}#navbar .navbar-inner.white .brand:hover .caret,#navbar .navbar-inner.white .nav>li>a:hover .caret,#navbar .navbar-inner.white .brand:focus .caret,#navbar .navbar-inner.white .nav>li>a:focus .caret{border-bottom-color:#626262;border-top-color:#626262}#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.white .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.open.active>.dropdown-toggle{background-color:#dedede;background-image:-moz-linear-gradient(top,#c8c8c8,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8c8c8),to(#fff));background-image:-webkit-linear-gradient(top,#c8c8c8,#fff);background-image:-o-linear-gradient(top,#c8c8c8,#fff);background-image:linear-gradient(to bottom,#c8c8c8,#fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8c8c8',endColorstr='#ffffffff',GradientType=0)}#navbar .navbar-inner.white.transparent{background-color:rgba(233,233,233,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.6)),to(rgba(200,200,200,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99ffffff',endColorstr='#99c8c8c8',GradientType=0)}#navbar .navbar-inner.white.transparent .brand,#navbar .navbar-inner.white.transparent .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.white.transparent .brand .caret,#navbar .navbar-inner.white.transparent .nav>li>a .caret{border-bottom-color:#919191;border-top-color:#919191}#navbar .navbar-inner.white.transparent .brand:hover .caret,#navbar .navbar-inner.white.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.white.transparent .brand:focus .caret,#navbar .navbar-inner.white.transparent .nav>li>a:focus .caret{border-bottom-color:#626262;border-top-color:#626262}#navbar .navbar-inner.white.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.white.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(222,222,222,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,200,200,0.6)),to(rgba(255,255,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8c8c8',endColorstr='#99ffffff',GradientType=0)}#navbar .navbar-inner .brand span{background-size:20px 20px;background-position:left center;padding-left:24px;background-repeat:no-repeat}.octoprint-container{margin-top:20px}.octoprint-container .tab-content{padding:9px 15px;border-left:1px solid #DDD;border-right:1px solid #DDD;border-bottom:1px solid #DDD;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.octoprint-container .nav{margin-bottom:0}.octoprint-container .tab-content h1{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5;font-weight:normal}.octoprint-container .accordion-heading .accordion-heading-button{float:right}.octoprint-container .accordion-heading .accordion-heading-button a{display:inline-block;padding:8px 15px;font-size:14px;line-height:20px;color:#000;text-decoration:none;background:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.octoprint-container .accordion-heading a.accordion-toggle{display:inline-block}.octoprint-container .accordion-heading [class^="icon-"],.octoprint-container .accordion-heading [class*=" icon-"]{color:#000}.print-control .btn{padding-left:4px;padding-right:4px}.upload-buttons .btn{margin-right:0}table{table-layout:fixed}table .popover-title{text-overflow:ellipsis;word-break:break-all}table th,table td{overflow:hidden}table th.gcode_files_name,table td.gcode_files_name{text-overflow:ellipsis;text-align:left;white-space:nowrap}table th.gcode_files_action,table td.gcode_files_action{width:90px;text-align:center;white-space:nowrap}table th.gcode_files_action a,table td.gcode_files_action a{text-decoration:none;color:#000}table th.gcode_files_action a.disabled,table td.gcode_files_action a.disabled{color:#ccc;cursor:default}table th.timelapse_files_name,table td.timelapse_files_name{text-overflow:ellipsis;text-align:left}table th.timelapse_files_size,table td.timelapse_files_size{text-align:right;width:55px}table th.timelapse_files_action,table td.timelapse_files_action{width:45px;text-align:center;white-space:nowrap}table th.timelapse_files_action a,table td.timelapse_files_action a{text-decoration:none;color:#000}table th.timelapse_files_action a.disabled,table td.timelapse_files_action a.disabled{color:#ccc;cursor:default}table th.settings_users_name,table td.settings_users_name{text-overflow:ellipsis;text-align:left}table th.settings_users_active,table td.settings_users_active,table th.settings_users_admin,table td.settings_users_admin{text-align:center;width:55px}table th.settings_users_actions,table td.settings_users_actions{width:60px;text-align:center;white-space:nowrap}table th.settings_users_actions a,table td.settings_users_actions a{text-decoration:none;color:#000}table th.settings_users_actions a.disabled,table td.settings_users_actions a.disabled{color:#ccc;cursor:default}table th.settings_logs_name,table td.settings_logs_name{text-overflow:ellipsis;text-align:left}table th.settings_logs_size,table td.settings_logs_size{text-align:right;width:70px}table th.settings_logs_date,table td.settings_logs_date{text-align:left;width:130px}table th.settings_logs_action,table td.settings_logs_action{width:70px;text-align:center;white-space:nowrap}table th.settings_logs_action a,table td.settings_logs_action a{text-decoration:none;color:#000}table th.settings_logs_action a.disabled,table td.settings_logs_action a.disabled{color:#ccc;cursor:default}table th.settings_printerProfiles_profiles_name,table td.settings_printerProfiles_profiles_name{text-overflow:ellipsis;text-align:left}table th.settings_printerProfiles_profiles_model,table td.settings_printerProfiles_profiles_model{text-align:left;width:250px}table th.settings_printerProfiles_profiles_action,table td.settings_printerProfiles_profiles_action{width:80px;text-align:center;white-space:nowrap}table th.settings_printerProfiles_profiles_action a,table td.settings_printerProfiles_profiles_action a{text-decoration:none;color:#000}table th.settings_printerProfiles_profiles_action a.disabled,table td.settings_printerProfiles_profiles_action a.disabled{color:#ccc;cursor:default}#temperature-graph{height:350px;width:100%;background-image:url("../img/graph-background.png");background-position:center;background-repeat:no-repeat}.tab-content,.tab-pane{overflow:visible}.tempInput{width:50px}#temp_newTemp,#temp_newBedTemp,#speed_innerWall,#speed_outerWall,#speed_fill,#speed_support,#webcam_timelapse_interval,#webcam_timelapse_postRoll,#webcam_timelapse_fps{text-align:right}ul.dropdown-menu li a{cursor:pointer}#connection_ports,#connection_baudrates,#connection_printers{width:100%}#offline_overlay,#reloadui_overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:10001;display:none}#offline_overlay_background,#reloadui_overlay_background{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#offline_overlay_wrapper,#reloadui_overlay_wrapper{position:absolute;top:0;bottom:0;left:0;right:0;padding-top:60px}#offline_overlay_wrapper .container,#reloadui_overlay_wrapper .container{margin:auto}#webcam_container{width:100%;position:relative;outline:0}#webcam_container .flipH{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1)}#webcam_container .flipV{-webkit-transform:scaleY(-1);-moz-transform:scaleY(-1);-ms-transform:scaleY(-1)}#webcam_container .flipH.flipV{-webkit-transform:scaleX(-1) scaleY(-1);-moz-transform:scaleX(-1) scaleY(-1);-ms-transform:scaleX(-1) scaleY(-1)}#webcam_container .rotate90{transform:rotate(-90deg)}#webcam_container .keycontrol_overlay{position:absolute;left:10px;right:10px;bottom:10px;background:rgba(0,0,0,0.5);font-size:85%;color:white;padding:0}#webcam_container .keycontrol_overlay kbd{border:1px solid #eee;border-radius:3px;margin-left:2px;margin-right:2px;font-size:90%;padding:2px;min-width:1em}#webcam_container .keycontrol_overlay .keycontrol_overlay_heading{position:relative;padding:10px;font-weight:bold}#webcam_container .keycontrol_overlay .keycontrol_overlay_column{position:relative;width:45%;padding:10px;float:left}#files .gcode_files{padding-right:7px}#files .gcode_files .entry{padding:5px;line-height:20px;border-bottom:1px solid #ddd;position:relative}#files .gcode_files .entry:hover{background-color:#f5f5f5}#files .gcode_files .entry .title{text-overflow:ellipsis;word-break:break-all}#files .gcode_files .entry .uploaded,#files .gcode_files .entry .size,#files .gcode_files .entry .additionalInfo{font-size:85%;color:#999}#files .gcode_files .entry .action-buttons{position:absolute;bottom:5px;right:5px}#files .gcode_files .entry .additionalInfo{padding-bottom:22px}#files .upload-buttons{margin-top:10px}#files .form-search{text-align:center;margin-bottom:5px!important}#control{overflow:hidden}#control .jog-panel{float:left;margin-right:19px}#control h1{text-align:left}#control .jog-panel>div{text-align:center}#control .jog-panel>div.distance{text-align:left}#control .jog-panel .slider{margin-bottom:10px}#control .box{width:30px;height:30px;margin-right:10px;margin-bottom:10px;padding-left:8px}#control .control-box{display:block;height:30px;margin-bottom:10px}#control .btn-group{margin-bottom:10px}#control .btn-group.distance>.btn{width:43px;padding:3px 0;height:30px}#control .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}#control .custom_section h1{cursor:pointer}#control .custom_section_horizontal>.custom_control{display:inline-block}#control .custom_section_vertical>.custom_control{display:block}#control .custom_control .slider{margin-left:10px;margin-right:10px;margin-bottom:2px}#gcode .progress{width:582px}#gcode .progress .bar{-webkit-transition:width 0s linear;-moz-transition:width 0s linear;-o-transition:width 0s linear;transition:width 0s linear}#gcode .canvas_container{position:relative}#gcode #gcode_layer_slider{position:absolute;right:0;top:0;height:568px;float:right}#gcode #gcode_layer_slider .slider-handle{width:14px;height:14px;margin-left:-3px;margin-top:-7px}#gcode #gcode_command_slider .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}#term .terminal{margin-bottom:30px}#term .terminal #terminal-output{min-height:340px;margin-bottom:5px}#term #terminal-sendpanel{text-align:right}#settings_dialog .modal-body #settings_dialog_menu{margin-left:0}#settings_appearance_managelanguagesdialog_emptylist{overflow:hidden;width:100%;height:300px;text-align:center;display:table}#settings_appearance_managelanguagesdialog_emptylist div{display:table-cell;vertical-align:middle}.footer ul{margin:0}.footer ul li{display:inline;margin-left:1em;font-size:85%}.footer ul li:first-child{margin-left:0}.footer ul li a{color:#555}.ui-pnotify .alert a{color:#c09853}.ui-pnotify .alert-error a,.ui-pnotify .alert-danger a{color:#b94a48}.ui-pnotify .alert-success a{color:#468847}.ui-pnotify .alert-info a{color:#3a87ad}.pnotify_additional_info .pnotify_more{font-size:85%}.text-right{text-align:right}.overflow_visible{overflow:visible!important}.border_box{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none}textarea.block{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%}#drop_overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:10000;display:none}#drop_overlay.in{display:block}#drop_overlay #drop_overlay_background{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#drop_overlay #drop_overlay_wrapper{position:absolute;top:0;bottom:0;left:0;right:0;padding-top:60px}#drop_overlay #drop_overlay_wrapper #drop,#drop_overlay #drop_overlay_wrapper #drop_background{position:absolute;top:0;left:0;margin-left:0;width:100%}#drop_overlay #drop_overlay_wrapper #drop_locally,#drop_overlay #drop_overlay_wrapper #drop_locally_background{position:absolute;top:0;left:50%;margin-left:-50%;width:50%;border-right:2px dashed #ccc}#drop_overlay #drop_overlay_wrapper #drop_sd,#drop_overlay #drop_overlay_wrapper #drop_sd_background{position:absolute;top:0;left:50%;margin-left:0;width:50%;border-left:2px dashed #ccc}#drop_overlay #drop_overlay_wrapper .dropzone{height:100%;z-index:10001;color:#fff;font-size:30px}#drop_overlay #drop_overlay_wrapper .dropzone i{font-size:50px}#drop_overlay #drop_overlay_wrapper .dropzone .text{display:block;text-align:center;line-height:40px;position:absolute;width:100%;bottom:5%;filter:alpha(opacity=100);-moz-opacity:1.0;-khtml-opacity:1.0;opacity:1.0}#drop_overlay #drop_overlay_wrapper .dropzone_background{width:50%;height:100%;background-color:#000;filter:alpha(opacity=25);-moz-opacity:.25;-khtml-opacity:.25;opacity:.25}#drop_overlay #drop_overlay_wrapper .dropzone_background.hover{background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#drop_overlay #drop_overlay_wrapper .dropzone_background.fade{-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out;opacity:1}.icon-sd-black-14{background:url("../img/icon-sd-black-14.png") 0 3px no-repeat;width:11px;height:17px;display:inline-block!important}.center{float:none;margin-left:auto;margin-right:auto}.slider .slider-selection{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.slider .slider-selection:hover,.slider .slider-selection:focus,.slider .slider-selection:active,.slider .slider-selection.active,.slider .slider-selection.disabled,.slider .slider-selection[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.slider .slider-selection:active,.slider .slider-selection.active{background-color:#039 \9}.slider.slider-disabled .slider-selection{background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-track{background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.slider.slider-disabled .slider-track{background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-handle{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);padding:0;margin-bottom:0;opacity:1;filter:alpha(opacity=100)}.slider .slider-handle:hover,.slider .slider-handle:focus,.slider .slider-handle:active,.slider .slider-handle.active,.slider .slider-handle.disabled,.slider .slider-handle[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.slider .slider-handle:active,.slider .slider-handle.active{background-color:#ccc \9}.slider .slider-handle:first-child{*margin-left:0}.slider .slider-handle:hover,.slider .slider-handle:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.slider .slider-handle:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.slider .slider-handle.active,.slider .slider-handle:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.slider .slider-handle.disabled,.slider .slider-handle[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-handle.hide{display:none}.slider .slider-handle.round{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%}.modal.large{width:975px;margin-left:-487px}.full-sized-box{position:absolute;bottom:0;left:0;right:0;top:0;padding:15px}.full-sized-box .row-fluid{height:100%}@media(max-width:979px){.full-sized-box{position:static}}_::-webkit-full-page-media,_:future,:root .full-sized-box{position:static}.scrollable{height:100%;overflow:auto;-webkit-overflow-scrolling:touch}.input-append .add-on.add-on-limited,.input-prepend .add-on.add-on-limited{overflow-x:hidden;text-overflow:ellipsis;width:inherit}.control-group.error .input-prepend .fileinput-button,.control-group.error .input-append .fileinput-button{border-color:#b94a48}input[type=number]{text-align:right} \ No newline at end of file diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js index 788edc865..53f5ef705 100644 --- a/src/octoprint/static/js/app/dataupdater.js +++ b/src/octoprint/static/js/app/dataupdater.js @@ -122,6 +122,7 @@ function DataUpdater(allViewModels) { var oldVersion = VERSION; VERSION = data["version"]; DISPLAY_VERSION = data["display_version"]; + BRANCH = data["branch"]; $("span.version").text(DISPLAY_VERSION); var oldPluginHash = self._pluginHash; diff --git a/src/octoprint/static/js/app/helpers.js b/src/octoprint/static/js/app/helpers.js index e64ee9a14..181229fb8 100644 --- a/src/octoprint/static/js/app/helpers.js +++ b/src/octoprint/static/js/app/helpers.js @@ -333,6 +333,34 @@ function formatSize(bytes) { return _.sprintf("%.1f%s", bytes, "TB"); } +function bytesFromSize(size) { + if (size == undefined || size.trim() == "") return undefined; + + var parsed = size.match(/^([+]?[0-9]*\.?[0-9]+)(?:\s*)?(.*)$/); + var number = parsed[1]; + var unit = parsed[2].trim(); + + if (unit == "") return parseFloat(number); + + var units = { + b: 1, + byte: 1, + bytes: 1, + kb: 1024, + mb: Math.pow(1024, 2), + gb: Math.pow(1024, 3), + tb: Math.pow(1024, 4) + }; + unit = unit.toLowerCase(); + + if (!units.hasOwnProperty(unit)) { + return undefined; + } + + var factor = units[unit]; + return number * factor; +} + function formatDuration(seconds) { if (!seconds) return "-"; if (seconds < 0) return "00:00:00"; @@ -461,3 +489,17 @@ function splitTextToArray(text, sep, stripEmpty, filter) { function(item) { return (stripEmpty ? item : true) && (filter ? filter(item) : true); } ); } + +var sizeObservable = function(observable) { + return ko.computed({ + read: function() { + return formatSize(observable()); + }, + write: function(value) { + var result = bytesFromSize(value); + if (result != undefined) { + observable(result); + } + } + }) +}; diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js index cb518e0b7..56617dbae 100644 --- a/src/octoprint/static/js/app/main.js +++ b/src/octoprint/static/js/app/main.js @@ -321,7 +321,7 @@ $(function() { .data("contextParent", $(this)) .show() .css({ - position: "absolute", + position: "fixed", left: getMenuPosition(e.clientX, 'width', 'scrollLeft'), top: getMenuPosition(e.clientY, 'height', 'scrollTop'), "z-index": 9999 diff --git a/src/octoprint/static/js/app/viewmodels/connection.js b/src/octoprint/static/js/app/viewmodels/connection.js index 9c35936e4..7f55d6075 100644 --- a/src/octoprint/static/js/app/viewmodels/connection.js +++ b/src/octoprint/static/js/app/viewmodels/connection.js @@ -86,6 +86,15 @@ $(function() { self._processStateData(data.state); }; + self.openOrCloseOnStateChange = function() { + var connectionTab = $("#connection"); + if (self.isOperational() && connectionTab.hasClass("in")) { + connectionTab.collapse("hide"); + } else if (!self.isOperational() && !connectionTab.hasClass("in")) { + connectionTab.collapse("show"); + } + } + self._processStateData = function(data) { self.previousIsOperational = self.isOperational(); @@ -97,15 +106,10 @@ $(function() { self.isReady(data.flags.ready); self.isLoading(data.flags.loading); - var connectionTab = $("#connection"); - if (self.previousIsOperational != self.isOperational()) { - if (self.isOperational() && connectionTab.hasClass("in")) { - // connection just got established, close connection tab for now - connectionTab.collapse("hide"); - } else if (!connectionTab.hasClass("in")) { - // connection just dropped, make sure connection tab is open - connectionTab.collapse("show"); - } + if (self.loginState.isAdmin() && self.previousIsOperational != self.isOperational()) { + // only open or close if the panel is visible (for admins) and + // the state just changed to avoid thwarting manual open/close + self.openOrCloseOnStateChange(); } }; @@ -147,6 +151,16 @@ $(function() { self.onStartup = function() { self.requestData(); + + // when isAdmin becomes true the first time, set the panel open or + // closed based on the connection state + var subscription = self.loginState.isAdmin.subscribe(function(newValue) { + if (newValue) { + // wait until after the isAdmin state has run through all subscriptions + setTimeout(self.openOrCloseOnStateChange, 0); + subscription.dispose(); + } + }); }; } diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js index 60e700ccb..885f5a406 100644 --- a/src/octoprint/static/js/app/viewmodels/files.js +++ b/src/octoprint/static/js/app/viewmodels/files.js @@ -2,9 +2,10 @@ $(function() { function GcodeFilesViewModel(parameters) { var self = this; - self.printerState = parameters[0]; + self.settingsViewModel = parameters[0]; self.loginState = parameters[1]; - self.slicing = parameters[2]; + self.printerState = parameters[2]; + self.slicing = parameters[3]; self.isErrorOrClosed = ko.observable(undefined); self.isOperational = ko.observable(undefined); @@ -21,11 +22,35 @@ $(function() { }); self.freeSpace = ko.observable(undefined); + self.totalSpace = ko.observable(undefined); self.freeSpaceString = ko.computed(function() { if (!self.freeSpace()) return "-"; return formatSize(self.freeSpace()); }); + self.totalSpaceString = ko.computed(function() { + if (!self.totalSpace()) + return "-"; + return formatSize(self.totalSpace()); + }); + + self.diskusageWarning = ko.computed(function() { + return self.freeSpace() != undefined + && self.freeSpace() < self.settingsViewModel.server_diskspace_warning(); + }); + self.diskusageCritical = ko.computed(function() { + return self.freeSpace() != undefined + && self.freeSpace() < self.settingsViewModel.server_diskspace_critical(); + }); + self.diskusageString = ko.computed(function() { + if (self.diskusageCritical()) { + return gettext("Your available free disk space is critically low."); + } else if (self.diskusageWarning()) { + return gettext("Your available free disk space is starting to run low."); + } else { + return gettext("Your current disk usage."); + } + }); self.uploadButton = undefined; @@ -155,10 +180,14 @@ $(function() { } } - if (response.free) { + if (response.free != undefined) { self.freeSpace(response.free); } + if (response.total != undefined) { + self.totalSpace(response.total); + } + self.highlightFilename(self.printerState.filename()); }; @@ -575,7 +604,7 @@ $(function() { OCTOPRINT_VIEWMODELS.push([ GcodeFilesViewModel, - ["printerStateViewModel", "loginStateViewModel", "slicingViewModel"], + ["settingsViewModel", "loginStateViewModel", "printerStateViewModel", "slicingViewModel"], "#files_wrapper" ]); }); diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js index c860402f0..79c6d526b 100644 --- a/src/octoprint/static/js/app/viewmodels/settings.js +++ b/src/octoprint/static/js/app/viewmodels/settings.js @@ -6,6 +6,10 @@ $(function() { self.users = parameters[1]; self.printerProfiles = parameters[2]; + self.receiving = ko.observable(false); + self.sending = ko.observable(false); + self.callbacks = []; + self.api_enabled = ko.observable(undefined); self.api_key = ko.observable(undefined); self.api_allowCrossOrigin = ko.observable(undefined); @@ -114,6 +118,7 @@ $(function() { self.feature_disableExternalHeatupDetection = ko.observable(undefined); self.feature_keyboardControl = ko.observable(undefined); self.feature_pollWatched = ko.observable(undefined); + self.feature_ignoreIdenticalResends = ko.observable(undefined); self.serial_port = ko.observable(); self.serial_baudrate = ko.observable(); @@ -149,6 +154,15 @@ $(function() { self.terminalFilters = ko.observableArray([]); + self.server_commands_systemShutdownCommand = ko.observable(undefined); + self.server_commands_systemRestartCommand = ko.observable(undefined); + self.server_commands_serverRestartCommand = ko.observable(undefined); + + self.server_diskspace_warning = ko.observable(); + self.server_diskspace_critical = ko.observable(); + self.server_diskspace_warning_str = sizeObservable(self.server_diskspace_warning); + self.server_diskspace_critical_str = sizeObservable(self.server_diskspace_critical); + self.settings = undefined; self.addTemperatureProfile = function() { @@ -257,13 +271,42 @@ $(function() { }; self.requestData = function(callback) { + if (self.receiving()) { + if (callback) { + self.callbacks.push(callback); + } + return; + } + + self.receiving(true); $.ajax({ url: API_BASEURL + "settings", type: "GET", dataType: "json", success: function(response) { - self.fromResponse(response); - if (callback) callback(); + if (callback) { + self.callbacks.push(callback); + } + + try { + self.fromResponse(response); + + var cb; + while (self.callbacks.length) { + cb = self.callbacks.shift(); + try { + cb(); + } catch(exc) { + log.error("Error calling settings callback", cb, ":", (exc.stack || exc)); + } + } + } finally { + self.receiving(false); + self.callbacks = []; + } + }, + error: function(xhr) { + self.receiving(false); } }); }; @@ -415,12 +458,18 @@ $(function() { self.system_actions(response.system.actions); self.terminalFilters(response.terminalFilters); + + self.server_commands_systemShutdownCommand(response.server.commands.systemShutdownCommand); + self.server_commands_systemRestartCommand(response.server.commands.systemRestartCommand); + self.server_commands_serverRestartCommand(response.server.commands.serverRestartCommand); }; self.saveData = function (data, successCallback) { self.settingsDialog.trigger("beforeSave"); if (data == undefined) { + // we only set sending to true when we didn't include data + self.sending(true); data = ko.mapping.toJS(self.settings); data = _.extend(data, { @@ -499,6 +548,13 @@ $(function() { "beforePrintResumed": self.scripts_gcode_beforePrintResumed(), "afterPrinterConnected": self.scripts_gcode_afterPrinterConnected() } + }, + "server": { + "commands": { + "systemShutdownCommand": self.server_commands_systemShutdownCommand(), + "systemRestartCommand": self.server_commands_systemRestartCommand(), + "serverRestartCommand": self.server_commands_serverRestartCommand() + } } }); } @@ -510,11 +566,24 @@ $(function() { contentType: "application/json; charset=UTF-8", data: JSON.stringify(data), success: function(response) { - self.fromResponse(response); - if (successCallback) successCallback(response); + self.receiving(true); + self.sending(false); + try { + self.fromResponse(response); + if (successCallback) successCallback(response); + } finally { + self.receiving(false); + } + }, + error: function(xhr) { + self.sending(false); } }); }; + + self.onEventSettingsUpdated = function() { + self.requestData(); + }; } OCTOPRINT_VIEWMODELS.push([ diff --git a/src/octoprint/static/less/octoprint.less b/src/octoprint/static/less/octoprint.less index 2ac2098dc..c1b8daf61 100644 --- a/src/octoprint/static/less/octoprint.less +++ b/src/octoprint/static/less/octoprint.less @@ -611,11 +611,11 @@ ul.dropdown-menu li a { } } - .custom_section_horizontal .custom_control { + .custom_section_horizontal > .custom_control { display: inline-block; } - .custom_section_vertical .custom_control { + .custom_section_vertical > .custom_control { display:block; } diff --git a/src/octoprint/templates/dialogs/settings.jinja2 b/src/octoprint/templates/dialogs/settings.jinja2 index aa27a6265..f3d3f708c 100644 --- a/src/octoprint/templates/dialogs/settings.jinja2 +++ b/src/octoprint/templates/dialogs/settings.jinja2 @@ -1,7 +1,7 @@
  • {{ _('User Settings') }}
    • diff --git a/src/octoprint/templates/sidebar/files.jinja2 b/src/octoprint/templates/sidebar/files.jinja2 index 66adac4a6..39b4d9c8c 100644 --- a/src/octoprint/templates/sidebar/files.jinja2 +++ b/src/octoprint/templates/sidebar/files.jinja2 @@ -10,11 +10,11 @@
    {{ _('Size') }}:
    -
    - -
    -
    -
    +
    + +
    +
    +
    @@ -23,9 +23,9 @@
    {{ _('Uploaded') }}:
    {{ _('Size') }}:
    - -
    -
    + +
    +
    @@ -33,8 +33,8 @@
-
- {{ _('Free') }}: +
+ {{ _('Free') }}: / {{ _('Total') }}:
diff --git a/src/octoprint/templates/tabs/timelapse.jinja2 b/src/octoprint/templates/tabs/timelapse.jinja2 index fb221c890..5fda40a9f 100644 --- a/src/octoprint/templates/tabs/timelapse.jinja2 +++ b/src/octoprint/templates/tabs/timelapse.jinja2 @@ -1,4 +1,7 @@
+
+ {{ _('Take note that timelapse configuration is disabled while your printer is printing.') }} +

{{ _('Timelapse Configuration') }}

@@ -7,6 +10,7 @@ + {{ _('Warning') }} {{ _('Do not use with spiralized ("Joris") vases or similar continuous Z models.') }}
diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.mo b/src/octoprint/translations/de/LC_MESSAGES/messages.mo index a6c2acecc..9f2ed5e39 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 cfe771b28..f87120120 100644 --- a/src/octoprint/translations/de/LC_MESSAGES/messages.po +++ b/src/octoprint/translations/de/LC_MESSAGES/messages.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-07-07 18:58+0200\n" -"PO-Revision-Date: 2015-07-07 18:59+0100\n" +"POT-Creation-Date: 2015-08-31 10:04+0200\n" +"PO-Revision-Date: 2015-08-31 10:28+0100\n" "Last-Translator: Gina Häußge \n" "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -46,7 +46,7 @@ msgstr "Profile" #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "Sort by" msgstr "Sortieren" @@ -61,7 +61,7 @@ msgstr "ID" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "ascending" msgstr "aufsteigend" @@ -75,8 +75,8 @@ msgstr "aufsteigend" #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:5 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:44 #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 -#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:54 msgid "Name" msgstr "Name" @@ -138,232 +138,232 @@ msgstr "Abbrechen" msgid "Confirm" msgstr "Bestätigen" -#: src/octoprint/plugins/pluginmanager/__init__.py:104 +#: src/octoprint/plugins/pluginmanager/__init__.py:107 msgid "Plugin Manager" msgstr "Pluginmanager" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:130 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:270 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 msgid "Installing plugin..." msgstr "Installiere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:130 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 msgid "Installing plugin from uploaded archive..." msgstr "Installiere Plugin von hochgeladenem Archiv..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:142 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:222 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:295 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:325 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:539 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:569 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:586 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:603 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:147 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:225 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:302 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:332 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:546 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:576 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:593 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:610 msgid "Something went wrong" msgstr "Etwas ist schief gegangen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:143 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:223 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:296 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:326 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:148 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:226 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:303 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:333 msgid "Please consult octoprint.log for details" msgstr "Bitte konsultiere octoprint.log für Details" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:272 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:279 #, python-format msgid "Installing plugin \"%(name)s\" from %(url)s..." msgstr "Installiere Plugin \"%(name)s\" von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:274 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:281 #, python-format msgid "Installing plugin from %(url)s..." msgstr "Installiere Plugin von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:284 msgid "Reinstalling plugin..." msgstr "Reinstalliere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:278 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:285 #, python-format msgid "Reinstalling plugin \"%(name)s\" from %(url)s..." msgstr "Reinstalliere Plugin \"%(name)s\" von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:316 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 msgid "Uninstalling plugin..." msgstr "Deinstalliere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:316 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 #, python-format msgid "Uninstalling plugin \"%(name)s\"" msgstr "Deinstalliere Plugin \"%(name)s\"" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 msgid "Reinstall" msgstr "Reinstallieren" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:130 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:146 msgid "Install" msgstr "Installieren" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 msgid "Incompatible" msgstr "Inkompatibel" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:369 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:376 #: src/octoprint/templates/overlays/reloadui.jinja2:9 msgid "Reload now" msgstr "Jetzt neu laden" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:438 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:445 msgid "Done!" msgstr "Fertig!" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:458 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 msgid "Enable Plugin" msgstr "Plugin enablen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:458 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 msgid "Disable Plugin" msgstr "Plugin disablen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:523 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 msgid "Plugin installed" msgstr "Plugin installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:524 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 msgid "A plugin was installed successfully, however it was impossible to detect which one. Please Restart OctoPrint to make sure everything will be registered properly" msgstr "Ein Plugin wurde erfolgreich installiert, es war aber unmöglich zu detektieren, welches. Bitte starte OctoPrint neu um sicherzustellen, dass alles ordnungsgemäß registriert wird." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:528 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 #, python-format msgid "Plugin \"%(name)s\" reinstalled" msgstr "Plugin \"%(name)s\" reinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:529 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 msgid "The plugin was reinstalled successfully" msgstr "Das Plugin wurde erfolgreich reinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:537 msgid "The plugin was reinstalled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich reinstalliert, es ist aber ein Neustart von OctoPrint notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:538 msgid "The plugin was reinstalled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich reinstalliert, es ist aber ein Neuladen der Seite notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:533 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:540 #, python-format msgid "Plugin \"%(name)s\" installed" msgstr "Plugin \"%(name)s\" installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:534 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:541 msgid "The plugin was installed successfully" msgstr "Das Plugin wurde erfolgreich installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:542 msgid "The plugin was installed successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich installiert, es ist jedoch ein Neustart von OctoPrint notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:543 msgid "The plugin was installed successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich installiert, es ist jedoch ein Neuladen der Seite notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:547 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:554 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "Reinstallation des Plugins von URL \"%(url)s\" fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:549 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:556 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "Installation des Plugins von URL \"%(url)s\" fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:553 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:560 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed, please see the log for details." msgstr "Reinstallation des Plugins von URL \"%(url)s\" fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:555 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:562 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed, please see the log for details." msgstr "Installation des Plugins von URL \"%(url)s\" fehlgeschlagen, bitte konsultiere das Log für Details" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:564 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 #, python-format msgid "Plugin \"%(name)s\" uninstalled" msgstr "Plugin \"%(name)s\" deinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:565 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:572 msgid "The plugin was uninstalled successfully" msgstr "Das Plugin wurde erfolgreich deinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:566 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 msgid "The plugin was uninstalled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deinstalliert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:567 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:574 msgid "The plugin was uninstalled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deinstalliert, es ist jedoch ein Neuladen der Seite notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:578 #, python-format msgid "Uninstalling the plugin failed: %(reason)s" msgstr "Deinstallation des Plugins fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:580 msgid "Uninstalling the plugin failed, please see the log for details." msgstr "Deinstallation des Plugins fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:581 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 #, python-format msgid "Plugin \"%(name)s\" enabled" msgstr "Plugin \"%(name)s\" aktiviert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:582 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:589 msgid "The plugin was enabled successfully." msgstr "Das Plugin wurde erfolgreich aktiviert." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:583 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 msgid "The plugin was enabled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich aktiviert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:584 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:591 msgid "The plugin was enabled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich aktiviert, es ist jedoch ein Neuladen der Seite notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:595 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:612 #, python-format msgid "Toggling the plugin failed: %(reason)s" msgstr "Togglen des Plugins fehlgeschalgen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:597 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:614 msgid "Toggling the plugin failed, please see the log for details." msgstr "Togglen des Plugins fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:598 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 #, python-format msgid "Plugin \"%(name)s\" disabled" msgstr "Plugin \"%(name)s\" deaktiviert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:599 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:606 msgid "The plugin was disabled successfully." msgstr "Das Plugin wurde erfolgreich deaktiviert." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:600 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 msgid "The plugin was disabled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:601 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:608 msgid "The plugin was disabled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neuladen der Seite notwendig." #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:3 msgid "Take note that all plugin management functionality is disabled while your printer is printing." -msgstr "Bitte beachte das jegliche Pluginmanagementfunktionen während des Druckens deaktiviert sind." +msgstr "Bitte beachte dass jegliche Pluginmanagementfunktionen während des Druckens deaktiviert sind." #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:9 msgid "Installed Plugins" @@ -388,7 +388,7 @@ msgid "Get More..." msgstr "Mehr..." #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:59 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:167 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96 msgid "Close" msgstr "Schließen" @@ -414,7 +414,7 @@ msgstr "Nach Veröffentlichungsdatum sortieren" #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:7 #: src/octoprint/templates/sidebar/files_header.jinja2:8 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "descending" msgstr "absteigend" @@ -467,12 +467,23 @@ msgstr "... von einem hochgeladenen Archiv" msgid "This does not look like a valid plugin archive. Valid plugin archives should be either zip files or tarballs and have the extension \".zip\", \".tar.gz\", \".tgz\" or \".tar\"" msgstr "Das sieht nicht aus wie ein valides Pluginarchiv. Valide Pluginarchive sollten entweder ZIP-Dateien oder Tarballs sein und die Dateiextension \".zip\", \".tar.gz\", \".tgz\" oder \".tar\" haben" -#: src/octoprint/plugins/softwareupdate/__init__.py:315 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 +#: src/octoprint/templates/tabs/terminal.jinja2:25 +msgid "Advanced options" +msgstr "Erweiterte Optionen" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 +msgid "Use --process-dependency-links with pip install" +msgstr "--process-dependency-link mit pip install verwenden" + +#: src/octoprint/plugins/softwareupdate/__init__.py:378 msgid "Software Update" msgstr "Software Update" -#: src/octoprint/plugins/softwareupdate/__init__.py:589 -#: src/octoprint/server/views.py:146 +#: src/octoprint/plugins/softwareupdate/__init__.py:662 +#: src/octoprint/plugins/softwareupdate/__init__.py:693 +#: src/octoprint/server/views.py:149 #: src/octoprint/static/js/app/viewmodels/appearance.js:11 #: src/octoprint/static/js/app/viewmodels/appearance.js:13 #: src/octoprint/static/js/app/viewmodels/appearance.js:18 @@ -480,180 +491,210 @@ msgstr "Software Update" msgid "OctoPrint" msgstr "OctoPrint" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:114 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:26 +msgid "Release" +msgstr "Release" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:27 +msgid "Commit" +msgstr "Commit" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:145 msgid "There are updates available for the following components:" msgstr "Es gibt Aktualisierungen für die folgenden Komponenten:" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:128 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:159 msgid "Those components marked with can be updated directly." msgstr "Die mit markierten Komponenten können direkt aktualisiert werden." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:131 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:162 msgid "Update Available" msgstr "Aktualisierung verfügbar" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:143 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 msgid "Ignore" msgstr "Ignorieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:178 msgid "You can make this message display again via \"Settings\" > \"Software Update\" > \"Check for update now\"" msgstr "Du kannst diese Nachricht erneut anzeigen lassen mittels \"Einstellungen\" > \"Software Update\" > \"Jetzt nach Aktualisierungen suchen\"" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:151 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:182 msgid "Update now" msgstr "Jetzt aktualisieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:168 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:199 msgid "Everything is up-to-date" msgstr "Alles ist auf dem neusten Stand" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:233 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:264 msgid "Updating..." msgstr "Aktualisiere..." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:234 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:265 msgid "Now updating, please wait." msgstr "Aktualisiere gerade, bitte warten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:253 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:284 msgid "Update not started!" msgstr "Aktualisierung nicht gestartet!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:254 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:285 msgid "The update could not be started. Is it already active? Please consult the log for details." msgstr "Die Aktualisierung konnte nicht gestartet werden. Läuft bereits eine? Bitte konsultiere das Log für Details." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:276 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:307 msgid "Can't update while printing" msgstr "Aktualisierung nicht möglich während gedruckt wird" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:277 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:308 msgid "A print job is currently in progress. Updating will be prevented until it is done." msgstr "Ein Druckjob ist zur Zeit aktiv. Aktualisierungen werden unterbunden bis er fertig ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:281 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:312 msgid "This will update your OctoPrint installation and restart the server." msgstr "Das wird Deine OctoPrint Installation aktualisieren und den Server neu starten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:305 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 msgid "Restart successful!" msgstr "Neustart erfolgreich!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:306 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:337 msgid "The server was restarted successfully. The page will now reload automatically." msgstr "Der Server wurde erfolgreich neu gestartet. Die Seite wird nun automatisch neu geladen." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:338 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:369 #, python-format msgid "Now updating %(name)s to %(version)s" msgstr "Aktualisiere %(name)s auf %(version)s" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:346 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 msgid "Update successful, restarting!" msgstr "Aktualisierung erfolgreich, starte neu!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:347 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:378 msgid "The update finished successfully and the server will now be restarted." msgstr "Die Aktualisierung wurde erfolgreich durchgeführt und der Server wird jetzt neu gestartet." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:358 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:400 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:431 msgid "Restart failed" msgstr "Neustart fehlgeschlagen" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:359 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:401 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:390 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 msgid "The server apparently did not restart by itself, you'll have to do it manually. Please consult the log file on what went wrong." msgstr "Der Server hat anscheinend nicht von selbst neu gstartet, Du wirst das manuell tun müssen. Bitte konsultiere das Logfile." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:375 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 msgid "The update finished successfully, please restart OctoPrint now." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen, bitte starte OctoPrint jetzt neu." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:408 msgid "The update finished successfully, please reboot the server now." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen, bitte reboote den Server jetzt." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:381 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:412 msgid "Update successful, restart required!" msgstr "Aktualisierung erfolgreich, Neustart notwendig!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:394 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 msgid "Restarting OctoPrint failed, please restart it manually. You might also want to consult the log file on what went wrong here." msgstr "Der Neustart von OctoPrint ist fehlgeschlagen, bitte starte es manuell neu. Du solltest das Logfile konsultieren, um herauszufinden, was hier schief gelaufen ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:396 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 msgid "Rebooting the server failed, please reboot it manually. You might also want to consult the log file on what went wrong here." msgstr "Reboot des Servers fehlgeschlagen, bitte reboote ihn manuell. Du solltest auch das Logfile konsultieren, um herauszufinden, was hier gerade schief gelaufen ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:414 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 msgid "Update successful!" msgstr "Aktualisierung erfolgreich!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:415 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:446 msgid "The update finished successfully." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:458 msgid "Update failed!" msgstr "Aktualisierung fehlgeschlagen!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:428 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:459 msgid "The update did not finish successfully. Please consult the log for details." msgstr "Die Aktualisierung wurde nicht erfolgreich abgeschlossen. Bitte konsultiere das Log für Details." -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:2 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:54 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:1 +msgid "" +"\n" +" Please configure the checkout folder of OctoPrint, otherwise\n" +" this plugin won't be able to update it. Click on the button\n" +" to do this. Also refer to the Documentation.\n" +msgstr " Bitte konfiguriere das Checkoutverzeichnis von OctoPrint, andernfalls wird dieses Plugin Deine Installation nicht updaten können. Klicke dazu auf den Button. Siehe des Weiteren auch die Dokumentation." + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:6 +msgid "" +"\n" +"

\n" +" You are running a non-release version of OctoPrint but are tracking OctoPrint\n" +" releases.\n" +"

\n" +" You probably want OctoPrint to track the matching development version instead.\n" +" If you have a local OctoPrint checkout folder switched to another branch,\n" +" simply switching over to \"Commit\" tracking will already\n" +" take care of that. Otherwise please take a look at the\n" +" Documentation.\n" +"

\n" +msgstr "

Du nutzt eine unveröffentlichte Version von OctoPrint, trackst aber OctoPrint Releases.

Du willst vermutlich, dass OctoPrint stattdessen die entsprechende Entwicklungsversion trackt. Falls Du dein lokales OctoPrint-Checkoutverzeichnis auf einen anderen Branch gewechselt hast, dann wechsle das Tracking einfach auf \"Commit\". Ansonsten wirf einen Blick in die Dokumentation.

" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 msgid "Plugin Configuration" msgstr "Pluginkonfiguration" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:5 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:23 msgid "Current versions" msgstr "Aktuelle Versionen" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:11 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:29 msgid "Update available" msgstr "Aktualisierung verfügbar" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:16 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:32 +msgid "Update not possible, configuration ok?" +msgstr "Update nicht möglich, Konfiguration in Ordnung?" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:34 msgid "Installed:" msgstr "Installiert:" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:17 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:35 msgid "Available:" msgstr "Verfügbar:" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:41 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 msgid "Check for update now" msgstr "Jetzt nach Aktualisierungen suchen" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:44 -#: src/octoprint/templates/tabs/terminal.jinja2:25 -msgid "Advanced options" -msgstr "Erweiterte Optionen" - -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:46 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:64 msgid "Force check for update (overrides cache used for update checks)" msgstr "Suche nach Aktualisierungen forcieren (ignoriert den Cache für Aktualisierungsinformationen)" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:47 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 msgid "Force update now (even if no new versions are available)" msgstr "Aktualisierung forcieren (selbst wenn keine neue Versionen verfügbar sind)" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 -msgid "Restart Command" -msgstr "Neustartbefehl" +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:77 +msgid "OctoPrint checkout folder" +msgstr "Checkoutverzeichnis von OctoPrint " -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 -msgid "Reboot Command" -msgstr "Rebootbefehl" +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +msgid "OctoPrint version tracking" +msgstr "Versionstracking für OctoPrint" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:71 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:89 msgid "Version cache TTL" -msgstr "Versionscache TTL" +msgstr "TTL des Versionscaches" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:82 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 #: src/octoprint/templates/dialogs/confirmation.jinja2:11 #: src/octoprint/templates/dialogs/settings.jinja2:51 #: src/octoprint/templates/dialogs/slicing.jinja2:50 @@ -661,113 +702,118 @@ msgstr "Versionscache TTL" msgid "Cancel" msgstr "Abbruch" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 #: src/octoprint/templates/dialogs/settings.jinja2:52 msgid "Save" msgstr "Speichern" -#: src/octoprint/server/views.py:55 +#: src/octoprint/server/views.py:58 msgid "Plugins" msgstr "Plugins" -#: src/octoprint/server/views.py:112 +#: src/octoprint/server/views.py:115 msgid "Connection" msgstr "Verbindung" -#: src/octoprint/server/views.py:113 +#: src/octoprint/server/views.py:116 msgid "State" msgstr "Status" -#: src/octoprint/server/views.py:114 +#: src/octoprint/server/views.py:117 msgid "Files" msgstr "Dateien" -#: src/octoprint/server/views.py:120 +#: src/octoprint/server/views.py:123 msgid "Temperature" msgstr "Temperatur" -#: src/octoprint/server/views.py:121 +#: src/octoprint/server/views.py:124 msgid "Control" msgstr "Steuerung" -#: src/octoprint/server/views.py:122 +#: src/octoprint/server/views.py:125 msgid "Terminal" msgstr "Terminal" -#: src/octoprint/server/views.py:125 +#: src/octoprint/server/views.py:128 msgid "GCode Viewer" msgstr "GCode Viewer" -#: src/octoprint/server/views.py:127 +#: src/octoprint/server/views.py:130 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "Zeitraffer" -#: src/octoprint/server/views.py:132 +#: src/octoprint/server/views.py:135 msgid "Printer" msgstr "Drucker" -#: src/octoprint/server/views.py:134 +#: src/octoprint/server/views.py:137 msgid "Serial Connection" msgstr "Serielle Verbindung" -#: src/octoprint/server/views.py:135 +#: src/octoprint/server/views.py:138 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "Druckerprofile" -#: src/octoprint/server/views.py:136 +#: src/octoprint/server/views.py:139 msgid "Temperatures" msgstr "Temperaturen" -#: src/octoprint/server/views.py:137 +#: src/octoprint/server/views.py:140 msgid "Terminal Filters" msgstr "Terminalfilter" -#: src/octoprint/server/views.py:138 +#: src/octoprint/server/views.py:141 msgid "GCODE Scripts" msgstr "GCODE Scripts" -#: src/octoprint/server/views.py:140 src/octoprint/server/views.py:142 +#: src/octoprint/server/views.py:143 src/octoprint/server/views.py:145 msgid "Features" msgstr "Funktionen" -#: src/octoprint/server/views.py:143 +#: src/octoprint/server/views.py:146 msgid "Webcam" msgstr "Webcam" -#: src/octoprint/server/views.py:144 +#: src/octoprint/server/views.py:147 msgid "API" msgstr "API" -#: src/octoprint/server/views.py:148 +#: src/octoprint/server/views.py:151 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "Verzeichnisse" -#: src/octoprint/server/views.py:149 +#: src/octoprint/server/views.py:152 msgid "Appearance" msgstr "Aussehen" -#: src/octoprint/server/views.py:150 +#: src/octoprint/server/views.py:153 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "Logs" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:154 +msgid "Server" +msgstr "Server" + +#: src/octoprint/server/views.py:157 msgid "Access Control" msgstr "Zugangsbeschränkung" -#: src/octoprint/server/views.py:159 +#: src/octoprint/server/views.py:163 msgid "Access" msgstr "Zugriff" -#: src/octoprint/server/views.py:160 +#: src/octoprint/server/views.py:164 msgid "Interface" msgstr "Interface" #: src/octoprint/static/js/app/dataupdater.js:66 #: src/octoprint/static/js/app/dataupdater.js:100 -#: src/octoprint/static/js/app/helpers.js:436 +#: src/octoprint/static/js/app/helpers.js:464 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "Der Server ist offline" @@ -780,85 +826,85 @@ 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 could not reconnect automatically, 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 konnte mich nicht automatisch neu verbinden, aber Du kannst mittels des folgenden Buttons einen manuellen Verbindungsversuch anstoßen." -#: src/octoprint/static/js/app/dataupdater.js:168 -#: src/octoprint/static/js/app/dataupdater.js:196 +#: src/octoprint/static/js/app/dataupdater.js:169 +#: src/octoprint/static/js/app/dataupdater.js:197 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "Slice ... (%(percentage)d%%)" -#: src/octoprint/static/js/app/dataupdater.js:185 +#: src/octoprint/static/js/app/dataupdater.js:186 msgid "Rendering timelapse" msgstr "Zeitrafferaufnahme wird gerendert" -#: src/octoprint/static/js/app/dataupdater.js:185 +#: src/octoprint/static/js/app/dataupdater.js:186 #, python-format msgid "Now rendering timelapse %(movie_basename)s" msgstr "Rendere Zeitrafferaufnahme %(movie_basename)s" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:188 msgid "Timelapse ready" msgstr "Zeitrafferaufnahme fertig" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:188 #, python-format msgid "New timelapse %(movie_basename)s is done rendering." msgstr "Neue Zeitrafferaufnahme %(movie_basename)s wurde fertig gerendert" -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:190 #, python-format msgid "Rendering of timelapse %(movie_basename)s failed with return code %(returncode)s" msgstr "Rendering der Zeitrafferaufnahme %(movie_basename)s fehlgeschlagen mit Returncode %(returncode)s" -#: src/octoprint/static/js/app/dataupdater.js:191 +#: src/octoprint/static/js/app/dataupdater.js:192 msgid "Rendering failed" msgstr "Rendering fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:198 +#: src/octoprint/static/js/app/dataupdater.js:199 msgid "Slicing ..." msgstr "Slice ..." -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:205 msgid "Slicing done" msgstr "Slicing abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:205 #, 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:214 +#: src/octoprint/static/js/app/dataupdater.js:215 #, 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:215 +#: src/octoprint/static/js/app/dataupdater.js:216 msgid "Slicing failed" msgstr "Slicing fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:219 +#: src/octoprint/static/js/app/dataupdater.js:220 msgid "Streaming ..." msgstr "Streaming ..." -#: src/octoprint/static/js/app/dataupdater.js:225 +#: src/octoprint/static/js/app/dataupdater.js:226 msgid "Streaming done" msgstr "Streaming abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:226 +#: src/octoprint/static/js/app/dataupdater.js:227 #, 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/helpers.js:357 +#: src/octoprint/static/js/app/helpers.js:385 #, python-format msgid "%(hour)02d:%(minute)02d:%(second)02d" msgstr "%(hour)02d:%(minute)02d:%(second)02d" -#: src/octoprint/static/js/app/helpers.js:377 +#: src/octoprint/static/js/app/helpers.js:405 msgid "YYYY-MM-DD HH:mm" msgstr "DD.MM.YYYY HH:mm" -#: src/octoprint/static/js/app/helpers.js:395 -#: src/octoprint/static/js/app/helpers.js:400 +#: src/octoprint/static/js/app/helpers.js:423 +#: src/octoprint/static/js/app/helpers.js:428 msgid "off" msgstr "Aus" @@ -920,7 +966,7 @@ msgid "Disconnect" msgstr "Trennen" #: src/octoprint/static/js/app/viewmodels/control.js:60 -#: src/octoprint/static/js/app/viewmodels/files.js:301 +#: src/octoprint/static/js/app/viewmodels/files.js:330 #: src/octoprint/static/js/app/viewmodels/gcode.js:453 #: src/octoprint/static/js/app/viewmodels/printerstate.js:167 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 @@ -932,32 +978,44 @@ msgstr "Werkzeug" msgid "Hotend" msgstr "Hotend" -#: src/octoprint/static/js/app/viewmodels/files.js:296 -#: src/octoprint/static/js/app/viewmodels/files.js:301 +#: src/octoprint/static/js/app/viewmodels/files.js:47 +msgid "Your available free disk space is critically low." +msgstr "Dein verfügbarer freier Plattenplatz ist auf einem kritischen Tiefstand." + +#: src/octoprint/static/js/app/viewmodels/files.js:49 +msgid "Your available free disk space is starting to run low." +msgstr "Dein verfügbarer freier Plattenplatz wird langsam knapp." + +#: src/octoprint/static/js/app/viewmodels/files.js:51 +msgid "Your current disk usage." +msgstr "Dein aktuell verfügbarer freier Plattenplatz." + +#: src/octoprint/static/js/app/viewmodels/files.js:325 +#: src/octoprint/static/js/app/viewmodels/files.js:330 msgid "Filament" msgstr "Filament" -#: src/octoprint/static/js/app/viewmodels/files.js:305 +#: src/octoprint/static/js/app/viewmodels/files.js:334 msgid "Estimated Print Time" msgstr "Geschätzte Druckdauer" -#: src/octoprint/static/js/app/viewmodels/files.js:308 +#: src/octoprint/static/js/app/viewmodels/files.js:337 msgid "Last Printed" msgstr "Zuletzt gedruckt" -#: src/octoprint/static/js/app/viewmodels/files.js:310 +#: src/octoprint/static/js/app/viewmodels/files.js:339 msgid "Last Print Time" msgstr "Letzte Druckdauer" -#: src/octoprint/static/js/app/viewmodels/files.js:392 +#: src/octoprint/static/js/app/viewmodels/files.js:420 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:408 +#: src/octoprint/static/js/app/viewmodels/files.js:436 msgid "Uploading ..." msgstr "Uploade ..." -#: src/octoprint/static/js/app/viewmodels/files.js:411 +#: src/octoprint/static/js/app/viewmodels/files.js:439 msgid "Saving ..." msgstr "Speichere ..." @@ -1011,7 +1069,7 @@ msgstr "Schichthöhe" #: src/octoprint/static/js/app/viewmodels/gcode.js:447 msgid "GCODE commands in layer" -msgstr "GCODE Kommandos in Schicht" +msgstr "GCODE Befehle in Schicht" #: src/octoprint/static/js/app/viewmodels/gcode.js:450 #: src/octoprint/static/js/app/viewmodels/gcode.js:453 @@ -1056,56 +1114,56 @@ msgstr "Du bist jetzt ausgeloggt" #: src/octoprint/static/js/app/viewmodels/navigation.js:28 #, python-format msgid "The command \"%(command)s\" executed successfully" -msgstr "Das Kommando \"%(command)s\" wurde erfolgreich ausgeführt" +msgstr "Der Befehl \"%(command)s\" wurde erfolgreich ausgeführt" #: src/octoprint/static/js/app/viewmodels/navigation.js:32 #, python-format msgid "The command \"%(command)s\" could not be executed." -msgstr "Das Kommando \"%(command)s\" konnte nicht ausgeführt werden." +msgstr "Der Befehl \"%(command)s\" konnte nicht ausgeführt werden." #: src/octoprint/static/js/app/viewmodels/navigation.js:34 msgid "Error" msgstr "Fehler" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:96 -#: src/octoprint/static/js/app/viewmodels/settings.js:53 -#: src/octoprint/static/js/app/viewmodels/settings.js:83 +#: src/octoprint/static/js/app/viewmodels/settings.js:57 +#: src/octoprint/static/js/app/viewmodels/settings.js:87 msgid "default" msgstr "Standard" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:97 -#: src/octoprint/static/js/app/viewmodels/settings.js:54 -#: src/octoprint/static/js/app/viewmodels/settings.js:67 +#: src/octoprint/static/js/app/viewmodels/settings.js:58 +#: src/octoprint/static/js/app/viewmodels/settings.js:71 msgid "red" msgstr "Rot" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:98 -#: src/octoprint/static/js/app/viewmodels/settings.js:55 -#: src/octoprint/static/js/app/viewmodels/settings.js:69 +#: src/octoprint/static/js/app/viewmodels/settings.js:59 +#: src/octoprint/static/js/app/viewmodels/settings.js:73 msgid "orange" msgstr "Orange" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:99 -#: src/octoprint/static/js/app/viewmodels/settings.js:56 -#: src/octoprint/static/js/app/viewmodels/settings.js:71 +#: src/octoprint/static/js/app/viewmodels/settings.js:60 +#: src/octoprint/static/js/app/viewmodels/settings.js:75 msgid "yellow" msgstr "Gelb" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:100 -#: src/octoprint/static/js/app/viewmodels/settings.js:57 -#: src/octoprint/static/js/app/viewmodels/settings.js:73 +#: src/octoprint/static/js/app/viewmodels/settings.js:61 +#: src/octoprint/static/js/app/viewmodels/settings.js:77 msgid "green" msgstr "Grün" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:101 -#: src/octoprint/static/js/app/viewmodels/settings.js:58 -#: src/octoprint/static/js/app/viewmodels/settings.js:75 +#: src/octoprint/static/js/app/viewmodels/settings.js:62 +#: src/octoprint/static/js/app/viewmodels/settings.js:79 msgid "blue" msgstr "Blau" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:102 -#: src/octoprint/static/js/app/viewmodels/settings.js:60 -#: src/octoprint/static/js/app/viewmodels/settings.js:79 +#: src/octoprint/static/js/app/viewmodels/settings.js:64 +#: src/octoprint/static/js/app/viewmodels/settings.js:83 msgid "black" msgstr "Schwarz" @@ -1186,18 +1244,18 @@ msgid "Pause" msgstr "Pause" #: src/octoprint/static/js/app/viewmodels/printerstate.js:96 -#: src/octoprint/templates/tabs/timelapse.jinja2:7 +#: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "On Z Change" msgstr "Bei Ebenenwechsel" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:8 +#: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "Timed" msgstr "Nach Zeit" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:20 -#: src/octoprint/templates/tabs/timelapse.jinja2:27 +#: src/octoprint/templates/tabs/timelapse.jinja2:24 +#: src/octoprint/templates/tabs/timelapse.jinja2:31 msgid "sec" msgstr "Sek" @@ -1205,17 +1263,17 @@ msgstr "Sek" msgid "This will restart the print job from the beginning." msgstr "Der Druckjob wird zurückgesetzt und von vorne begonnen." -#: src/octoprint/static/js/app/viewmodels/settings.js:59 -#: src/octoprint/static/js/app/viewmodels/settings.js:77 +#: src/octoprint/static/js/app/viewmodels/settings.js:63 +#: src/octoprint/static/js/app/viewmodels/settings.js:81 msgid "violet" msgstr "Violett" -#: src/octoprint/static/js/app/viewmodels/settings.js:61 -#: src/octoprint/static/js/app/viewmodels/settings.js:81 +#: src/octoprint/static/js/app/viewmodels/settings.js:65 +#: src/octoprint/static/js/app/viewmodels/settings.js:85 msgid "white" msgstr "weiß" -#: src/octoprint/static/js/app/viewmodels/settings.js:89 +#: src/octoprint/static/js/app/viewmodels/settings.js:93 msgid "Autodetect from browser" msgstr "Automatisch vom Browser erkennen" @@ -1463,7 +1521,7 @@ msgstr "Admin" #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:7 #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 -#: src/octoprint/templates/tabs/timelapse.jinja2:52 +#: src/octoprint/templates/tabs/timelapse.jinja2:56 msgid "Action" msgstr "Aktion" @@ -1643,50 +1701,70 @@ msgstr "Immer davon ausgehen, dass eine SD-Karte vorhanden ist" #: 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 msgid "Repetier" msgstr "Repetier" #: src/octoprint/templates/dialogs/settings/features.jinja2:47 msgid "Send a checksum with every command" -msgstr "Eine Prüfsumme mit jedem Kommando senden" +msgstr "Eine Prüfsumme mit jedem Befehl senden" #: src/octoprint/templates/dialogs/settings/features.jinja2:54 +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 #, python-format msgid "Support TargetExtr%%n/TargetBed target temperature format" msgstr "TargetExtr%%n/TargetBed Zieltemperaturformat unterstützen" -#: src/octoprint/templates/dialogs/settings/features.jinja2:61 +#: src/octoprint/templates/dialogs/settings/features.jinja2:68 msgid "Disable detection of external heatups" msgstr "Detektierung externer Aufheizvorgänge deaktivieren" -#: src/octoprint/templates/dialogs/settings/features.jinja2:68 -msgid "Swallow the first \"ok\" after a resend response" -msgstr "Erstes \"ok\" nach Resend ignorieren" - -#: src/octoprint/templates/dialogs/settings/folders.jinja2:3 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:5 msgid "Upload Folder" msgstr "Uploadverzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:9 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:11 msgid "Timelapse Folder" msgstr "Zeitrafferverzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:15 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:17 msgid "Timelapse Temp Folder" msgstr "Temporäres Zeitrafferverzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:21 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:23 msgid "Logs Folder" msgstr "Logverzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:27 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:29 msgid "Watched Folder" msgstr "Beobachtetes Verzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:35 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:37 msgid "Actively poll the watched folder. Check this if files in your watched folder aren't automatically added otherwise." msgstr "Aktives Pollen des beobachteten Verzeichnisses. Einschalten wenn Dateien in Deinem beobachteten Verzeichnis hinzugefügt werden sonst nicht automatisch hinzugefügt werden." +#: src/octoprint/templates/dialogs/settings/folders.jinja2:42 +msgid "Disk space thresholds" +msgstr "Plattenplatzschwellwerte" + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:44 +msgid "If the free disk space falls below these thresholds, OctoPrint will warn the user." +msgstr "Falls der freie Plattenplatz unter diese Schwellwerte fallen sollte wird OctoPrint den Nutzer warnen." + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:47 +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 +#: src/octoprint/templates/tabs/timelapse.jinja2:13 +msgid "Warning" +msgstr "Warnung" + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:53 +msgid "Critical" +msgstr "Kritisch" + #: src/octoprint/templates/dialogs/settings/gcodescripts.jinja2:3 msgid "Before print job starts" msgstr "Vor dem Start eines Druckjobs" @@ -1719,8 +1797,8 @@ msgstr "Änderungsdatum" #: src/octoprint/templates/dialogs/settings/logs.jinja2:13 #: src/octoprint/templates/sidebar/files.jinja2:10 #: src/octoprint/templates/sidebar/files.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 -#: src/octoprint/templates/tabs/timelapse.jinja2:51 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:55 msgid "Size" msgstr "Größe" @@ -1884,11 +1962,6 @@ msgstr "Autodetectiontimeout" msgid "Log communication to serial.log (might negatively impact performance)" msgstr "Logge die Kommunikation in das serial.log (kann die Performance negativ beeinflussen)" -#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69 -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 -msgid "Warning" -msgstr "Warnung" - #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:74 msgid "Long running commands" msgstr "Lang laufende Befehle" @@ -1906,6 +1979,34 @@ msgstr "Zusätzliche serielle Ports" msgid "Use this to define additional glob patterns matching serial ports to list for connecting against, e.g. /dev/ttyAMA*. One entry per line." msgstr "Nutze diese Einstellung um zusätzliche glob patterns zu konfigurieren, die auf serielle Ports deines Druckers matchen, z.B. /dev/ttyAMA*. Ein Eintrag pro Zeile." +#: src/octoprint/templates/dialogs/settings/server.jinja2:2 +msgid "Commands" +msgstr "Befehle" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:4 +msgid "Command to restart the OctoPrint server" +msgstr "Befehl zum Neustart des OctoPrint-Servers" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:5 +msgid "Restart OctoPrint" +msgstr "OctoPrint neustarten" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:10 +msgid "Command to restart the system OctoPrint is running on" +msgstr "Befehl zum Neustart des Systems, auf dem OctoPrint läuft" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:11 +msgid "Restart system" +msgstr "System neustarten" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:16 +msgid "Command to shut down the system OctoPrint is running on" +msgstr "Befehl zum Herunterfahren des Systems, auf dem OctoPrint läuft" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:17 +msgid "Shutdown system" +msgstr "System herunterfahren" + #: src/octoprint/templates/dialogs/settings/temperatures.jinja2:2 msgid "Temperature Graph" msgstr "Temperaturgraph" @@ -2052,6 +2153,10 @@ msgstr "Automatisch bei Serverstart verbinden" msgid "Uploaded" msgstr "Hochgeladen" +#: src/octoprint/templates/sidebar/files.jinja2:13 +msgid "Additional data" +msgstr "Weitere Daten" + #: src/octoprint/templates/sidebar/files.jinja2:14 #: src/octoprint/templates/sidebar/files.jinja2:26 msgid "Download" @@ -2074,6 +2179,10 @@ msgstr "Laden und Drucken" msgid "Free" msgstr "Frei" +#: src/octoprint/templates/sidebar/files.jinja2:37 +msgid "Total" +msgstr "Gesamt" + #: src/octoprint/templates/sidebar/files.jinja2:64 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." @@ -2311,7 +2420,7 @@ msgid "Set" msgstr "Setzen" #: src/octoprint/templates/tabs/temperature.jinja2:41 -#: src/octoprint/templates/tabs/timelapse.jinja2:6 +#: src/octoprint/templates/tabs/timelapse.jinja2:9 msgid "Off" msgstr "Aus" @@ -2333,7 +2442,7 @@ msgstr "Senden" #: src/octoprint/templates/tabs/terminal.jinja2:20 msgid "Hint: Use the arrow up/down keys to recall commands sent previously" -msgstr "Hinweis: Nutze die Pfeil hoch/runter Tasten um vorher versandte Kommandos wiederaufzurufen " +msgstr "Hinweis: Nutze die Pfeil hoch/runter Tasten um vorher versandte Befehle wieder aufzurufen " #: src/octoprint/templates/tabs/terminal.jinja2:27 msgid "Fake Acknowledgement" @@ -2343,43 +2452,51 @@ msgstr "Bestätigung faken" msgid "If acknowledgements (\"ok\"s) sent by the firmware get lost due to issues with the serial communication to your printer, OctoPrint's communication with it can become stuck. If that happens, this can help. Please be advised that such occurences hint at general communication issues with your printer which will probably negatively influence your printing results and which you should therefore try to resolve!" msgstr "Falls Bestätigungen (\"ok\"s) Deiner Firmware aufgrund von Kommunikationsproblemen mit Deinem Drucker verloren gehen, kann die Kommunikation zwischen OctoPrint und Deinem Drucker zum Stillstand kommen. Falls das passiert, kann das hier helfen. Bitte bedenke, dass solche Vorfälle ein Hinweis auf ein generelles Kommunikationsproblem mit Deinem Drucker hindeuten, das wahrscheinlich Deine Druckergebnisse negativ beeinflusst und dass du daher versuchen solltest, zu beseitigen!" -#: src/octoprint/templates/tabs/timelapse.jinja2:2 +#: src/octoprint/templates/tabs/timelapse.jinja2:3 +msgid "Take note that timelapse configuration is disabled while your printer is printing." +msgstr "Bitte beachte dass die Zeitrafferkonfiguration während des Druckens deaktiviert ist." + +#: src/octoprint/templates/tabs/timelapse.jinja2:5 msgid "Timelapse Configuration" msgstr "Zeitrafferkonfiguration" -#: src/octoprint/templates/tabs/timelapse.jinja2:4 +#: src/octoprint/templates/tabs/timelapse.jinja2:7 msgid "Timelapse Mode" msgstr "Zeitraffermodus" -#: src/octoprint/templates/tabs/timelapse.jinja2:11 +#: src/octoprint/templates/tabs/timelapse.jinja2:13 +msgid "Do not use with spiralized (\"Joris\") vases or similar continuous Z models." +msgstr "Nicht mit spiralisierten Vasen (\"Joris\") oder ähnlichen Modellen mit ständigen Z-Achsen-Änderungen verwenden." + +#: src/octoprint/templates/tabs/timelapse.jinja2:15 msgid "Timelapse frame rate (in frames per second)" msgstr "Zeitrafferbildrate (in Bildern pro Sekunde)" -#: src/octoprint/templates/tabs/timelapse.jinja2:14 +#: src/octoprint/templates/tabs/timelapse.jinja2:18 msgid "fps" msgstr "FPS" -#: src/octoprint/templates/tabs/timelapse.jinja2:17 +#: src/octoprint/templates/tabs/timelapse.jinja2:21 msgid "Timelapse post roll (in rendered seconds)" msgstr "Zeitraffernachlauf (in gerenderten Sekunden)" -#: src/octoprint/templates/tabs/timelapse.jinja2:24 +#: src/octoprint/templates/tabs/timelapse.jinja2:28 msgid "Interval" msgstr "Intervall" -#: src/octoprint/templates/tabs/timelapse.jinja2:33 +#: src/octoprint/templates/tabs/timelapse.jinja2:37 msgid "Save as default" msgstr "Als Standard speichern" -#: src/octoprint/templates/tabs/timelapse.jinja2:38 +#: src/octoprint/templates/tabs/timelapse.jinja2:42 msgid "Save config" msgstr "Konfiguration speichern" -#: src/octoprint/templates/tabs/timelapse.jinja2:42 +#: src/octoprint/templates/tabs/timelapse.jinja2:46 msgid "Finished Timelapses" msgstr "Abgeschlossene Zeitraffer" -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "Creation date" msgstr "Erstellungsdatum" @@ -2430,3 +2547,12 @@ msgstr "Erstellungsdatum" #~ msgid "Updating, please wait." #~ msgstr "Aktualisiere gerade, bitte warten." + +#~ msgid "Restart Command" +#~ msgstr "Neustartbefehl" + +#~ msgid "Reboot Command" +#~ msgstr "Rebootbefehl" + +#~ msgid "Swallow the first \"ok\" after a resend response" +#~ msgstr "Erstes \"ok\" nach Resend ignorieren" diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py index 7d799fc20..07f80b813 100644 --- a/src/octoprint/util/__init__.py +++ b/src/octoprint/util/__init__.py @@ -17,7 +17,7 @@ import threading from functools import wraps import warnings - +import contextlib logger = logging.getLogger(__name__) @@ -197,29 +197,12 @@ def get_exception_string(): return "%s: '%s' @ %s:%s:%d" % (str(sys.exc_info()[0].__name__), str(sys.exc_info()[1]), os.path.basename(locationInfo[0]), locationInfo[2], locationInfo[1]) +@deprecated("get_free_bytes has been deprecated and will be removed in the future", + includedoc="Replaced by `psutil.disk_usage `_.", + since="1.2.5") def get_free_bytes(path): - """ - Retrieves the number of free bytes on the partition ``path`` is located at and returns it. Works on both Windows and - Unix/Linux. - - Taken from http://stackoverflow.com/a/2372171/2028598 - - Arguments: - path (string): The path for which to check the remaining partition space. - - Returns: - int: The amount of bytes still left on the partition. - """ - - path = os.path.abspath(path) - if sys.platform == "win32": - import ctypes - freeBytes = ctypes.c_ulonglong(0) - ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(path), None, None, ctypes.pointer(freeBytes)) - return freeBytes.value - else: - st = os.statvfs(path) - return st.f_bavail * st.f_frsize + import psutil + return psutil.disk_usage(path).free def get_dos_filename(origin, existing_filenames=None, extension=None, **kwargs): @@ -513,6 +496,15 @@ def address_for_client(host, port): except: continue + +@contextlib.contextmanager +def atomic_write(filename, mode="w+b", prefix="tmp", suffix=""): + temp_config = tempfile.NamedTemporaryFile(mode=mode, prefix=prefix, suffix=suffix, delete=False) + yield temp_config + temp_config.close() + shutil.move(temp_config.name, filename) + + class RepeatedTimer(threading.Thread): """ This class represents an action that should be run repeatedly in an interval. It is similar to python's diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 8a5703298..49c8bc6c0 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -31,6 +31,79 @@ except: pass +_logger = logging.getLogger(__name__) + +# a bunch of regexes we'll need for the communication parsing... + +regex_float_pattern = "[-+]?[0-9]*\.?[0-9]+" +regex_positive_float_pattern = "[+]?[0-9]*\.?[0-9]+" +regex_int_pattern = "\d+" + +regex_command = re.compile("^\s*((?P[GM]\d+)|(?PT)\d+)") +"""Regex for a GCODE command.""" + +regex_float = re.compile(regex_float_pattern) +"""Regex for a float value.""" + +regexes_parameters = dict( + floatP=re.compile("(^|[^A-Za-z])[Pp](?P%s)" % regex_float_pattern), + floatS=re.compile("(^|[^A-Za-z])[Ss](?P%s)" % regex_float_pattern), + floatZ=re.compile("(^|[^A-Za-z])[Zz](?P%s)" % regex_float_pattern), + intN=re.compile("(^|[^A-Za-z])[Nn](?P%s)" % regex_int_pattern), + intT=re.compile("(^|[^A-Za-z])[Tt](?P%s)" % regex_int_pattern) +) +"""Regexes for parsing various GCODE command parameters.""" + +regex_minMaxError = re.compile("Error:[0-9]\n") +"""Regex matching first line of min/max errors from the firmware.""" + +regex_sdPrintingByte = re.compile("(?P[0-9]*)/(?P[0-9]*)") +"""Regex matching SD printing status reports. + +Groups will be as follows: + + * ``current``: current byte position in file being printed + * ``total``: total size of file being printed +""" + +regex_sdFileOpened = re.compile("File opened:\s*(?P.*?)\s+Size:\s*(?P%s)" % regex_int_pattern) +"""Regex matching "File opened" messages from the firmware. + +Groups will be as follows: + + * ``name``: name of the file reported as having been opened (str) + * ``size``: size of the file in bytes (int) +""" + +regex_temp = re.compile("(?PB|T(?P\d*)):\s*(?P%s)(\s*\/?\s*(?P%s))?" % (regex_positive_float_pattern, regex_positive_float_pattern)) +"""Regex matching temperature entries in line. + +Groups will be as follows: + + * ``tool``: whole tool designator, incl. optional ``toolnum`` (str) + * ``toolnum``: tool number, if provided (int) + * ``actual``: actual temperature (float) + * ``target``: target temperature, if provided (float) +""" + +regex_repetierTempExtr = re.compile("TargetExtr(?P\d+):(?P%s)" % regex_positive_float_pattern) +"""Regex for matching target temp reporting from Repetier. + +Groups will be as follows: + + * ``toolnum``: number of the extruder to which the target temperature + report belongs (int) + * ``target``: new target temperature (float) +""" + +regex_repetierTempBed = re.compile("TargetBed:(?P%s)" % regex_positive_float_pattern) +"""Regex for matching target temp reporting from Repetier for beds. + +Groups will be as follows: + + * ``target``: new target temperature (float) +""" + def serialList(): baselist=[] if os.name=="nt": @@ -151,6 +224,7 @@ def __init__(self, port = None, baudrate=None, callbackObject=None, printerProfi self._long_running_command = False self._heating = False + self._connection_closing = False self._timeout = None @@ -158,12 +232,15 @@ def __init__(self, port = None, baudrate=None, callbackObject=None, printerProfi self._sendChecksumWithUnknownCommands = settings().getBoolean(["feature", "sendChecksumWithUnknownCommands"]) self._unknownCommandsNeedAck = settings().getBoolean(["feature", "unknownCommandsNeedAck"]) self._currentLine = 1 + self._line_mutex = threading.RLock() self._resendDelta = None self._lastLines = deque([], 50) self._lastCommError = None self._lastResendNumber = None self._currentResendCount = 0 self._resendSwallowNextOk = False + self._resendSwallowRepetitions = settings().getBoolean(["feature", "ignoreIdenticalResends"]) + self._resendSwallowRepetitionsCounter = 0 self._clear_to_send = CountedEvent(max=10, name="comm.clear_to_send") self._send_queue = TypedQueue() @@ -195,28 +272,6 @@ def __init__(self, port = None, baudrate=None, callbackObject=None, printerProfi self._currentFile = None # regexes - floatPattern = "[-+]?[0-9]*\.?[0-9]+" - positiveFloatPattern = "[+]?[0-9]*\.?[0-9]+" - intPattern = "\d+" - self._regex_command = re.compile("^\s*([GM]\d+|T)") - self._regex_float = re.compile(floatPattern) - self._regex_paramZFloat = re.compile("Z(%s)" % floatPattern) - self._regex_paramSInt = re.compile("S(%s)" % intPattern) - self._regex_paramNInt = re.compile("N(%s)" % intPattern) - self._regex_paramTInt = re.compile("T(%s)" % intPattern) - self._regex_minMaxError = re.compile("Error:[0-9]\n") - self._regex_sdPrintingByte = re.compile("([0-9]*)/([0-9]*)") - self._regex_sdFileOpened = re.compile("File opened:\s*(.*?)\s+Size:\s*(%s)" % intPattern) - - # Regex matching temperature entries in line. Groups will be as follows: - # - 1: whole tool designator incl. optional toolNumber ("T", "Tn", "B") - # - 2: toolNumber, if given ("", "n", "") - # - 3: actual temperature - # - 4: whole target substring, if given (e.g. " / 22.0") - # - 5: target temperature - self._regex_temp = re.compile("(B|T(\d*)):\s*(%s)(\s*\/?\s*(%s))?" % (positiveFloatPattern, positiveFloatPattern)) - self._regex_repetierTempExtr = re.compile("TargetExtr([0-9]+):(%s)" % positiveFloatPattern) - self._regex_repetierTempBed = re.compile("TargetBed:(%s)" % positiveFloatPattern) self._long_running_commands = settings().get(["serial", "longRunningCommands"]) @@ -383,6 +438,10 @@ def getTransport(self): ##~~ external interface def close(self, isError = False): + if self._connection_closing: + return + self._connection_closing = True + if self._temperature_timer is not None: try: self._temperature_timer.cancel() @@ -400,11 +459,15 @@ def close(self, isError = False): printing = self.isPrinting() or self.isPaused() if self._serial is not None: + try: + self._serial.close() + except: + self._logger.exception("Error while trying to close serial port") + isError = True if isError: self._changeState(self.STATE_CLOSED_WITH_ERROR) else: self._changeState(self.STATE_CLOSED) - self._serial.close() self._serial = None if settings().get(["feature", "sdSupport"]): @@ -708,51 +771,9 @@ def releaseSdCard(self): ##~~ communication monitoring and handling - def _parseTemperatures(self, line): - result = {} - maxToolNum = 0 - for match in re.finditer(self._regex_temp, line): - tool = match.group(1) - toolNumber = int(match.group(2)) if match.group(2) and len(match.group(2)) > 0 else None - if toolNumber > maxToolNum: - maxToolNum = toolNumber - - try: - actual = float(match.group(3)) - target = None - if match.group(4) and match.group(5): - target = float(match.group(5)) - - result[tool] = (toolNumber, actual, target) - except ValueError: - # catch conversion issues, we'll rather just not get the temperature update instead of killing the connection - pass - - if "T0" in result.keys() and "T" in result.keys(): - del result["T"] - - return maxToolNum, result - def _processTemperatures(self, line): - maxToolNum, parsedTemps = self._parseTemperatures(line) - - # extruder temperatures - if not "T0" in parsedTemps.keys() and not "T1" in parsedTemps.keys() and "T" in parsedTemps.keys(): - # no T1 so only single reporting, "T" is our one and only extruder temperature - toolNum, actual, target = parsedTemps["T"] - - if target is not None: - self._temp[0] = (actual, target) - elif 0 in self._temp.keys() and self._temp[0] is not None and isinstance(self._temp[0], tuple): - (oldActual, oldTarget) = self._temp[0] - self._temp[0] = (actual, oldTarget) - else: - self._temp[0] = (actual, None) - elif not "T0" in parsedTemps.keys() and "T" in parsedTemps.keys(): - # Smoothieware sends multi extruder temperature data this way: "T: T1: ..." and therefore needs some special treatment... - _, actual, target = parsedTemps["T"] - del parsedTemps["T"] - parsedTemps["T0"] = (0, actual, target) + current_tool = self._currentTool if self._currentTool is not None else 0 + maxToolNum, parsedTemps = parse_temperature_line(line, current_tool) if "T0" in parsedTemps.keys(): for n in range(maxToolNum + 1): @@ -760,18 +781,18 @@ def _processTemperatures(self, line): if not tool in parsedTemps.keys(): continue - toolNum, actual, target = parsedTemps[tool] + actual, target = parsedTemps[tool] if target is not None: - self._temp[toolNum] = (actual, target) - elif toolNum in self._temp.keys() and self._temp[toolNum] is not None and isinstance(self._temp[toolNum], tuple): - (oldActual, oldTarget) = self._temp[toolNum] - self._temp[toolNum] = (actual, oldTarget) + self._temp[n] = (actual, target) + elif n in self._temp and self._temp[n] is not None and isinstance(self._temp[n], tuple): + (oldActual, oldTarget) = self._temp[n] + self._temp[n] = (actual, oldTarget) else: - self._temp[toolNum] = (actual, None) + self._temp[n] = (actual, None) # bed temperature if "B" in parsedTemps.keys(): - toolNum, actual, target = parsedTemps["B"] + actual, target = parsedTemps["B"] if target is not None: self._bedTemp = (actual, target) elif self._bedTemp is not None and isinstance(self._bedTemp, tuple): @@ -899,8 +920,8 @@ def _monitor(self): self._callback.on_comm_temperature_update(self._temp, self._bedTemp) elif supportRepetierTargetTemp and ('TargetExtr' in line or 'TargetBed' in line): - matchExtr = self._regex_repetierTempExtr.match(line) - matchBed = self._regex_repetierTempBed.match(line) + matchExtr = regex_repetierTempExtr.match(line) + matchBed = regex_repetierTempBed.match(line) if matchExtr is not None: toolNum = int(matchExtr.group(1)) @@ -954,18 +975,18 @@ def _monitor(self): self._callback.on_comm_sd_files(self._sdFiles) elif 'SD printing byte' in line and self.isSdPrinting(): # answer to M27, at least on Marlin, Repetier and Sprinter: "SD printing byte %d/%d" - match = self._regex_sdPrintingByte.search(line) - self._currentFile.setFilepos(int(match.group(1))) + match = regex_sdPrintingByte.search(line) + self._currentFile.setFilepos(int(match.group("current"))) self._callback.on_comm_progress() elif 'File opened' in line and not self._ignore_select: # answer to M23, at least on Marlin, Repetier and Sprinter: "File opened:%s Size:%d" - match = self._regex_sdFileOpened.search(line) + match = regex_sdFileOpened.search(line) if self._sdFileToSelect: name = self._sdFileToSelect self._sdFileToSelect = None else: - name = match.group(1) - self._currentFile = PrintingSdFileInformation(name, int(match.group(2))) + name = match.group("name") + self._currentFile = PrintingSdFileInformation(name, int(match.group("size"))) elif 'File selected' in line: if self._ignore_select: self._ignore_select = False @@ -1299,10 +1320,10 @@ def _handleErrors(self, line): # Marlin reports an MIN/MAX temp error as "Error:x\n: Extruder switched off. MAXTEMP triggered !\n" # But a bed temp error is reported as "Error: Temperature heated bed switched off. MAXTEMP triggered !!" # So we can have an extra newline in the most common case. Awesome work people. - if self._regex_minMaxError.match(line): + if regex_minMaxError.match(line): line = line.rstrip() + self._readline() - if 'line number' in line.lower() or 'checksum' in line.lower() or 'expected line' in line.lower(): + if 'line number' in line.lower() or 'checksum' in line.lower() or 'format error' in line.lower() or 'expected line' in line.lower(): #Skip the communication errors, as those get corrected. self._lastCommError = line[6:] if line.startswith("Error:") else line[2:] pass @@ -1317,14 +1338,17 @@ def _handleErrors(self, line): return line def _readline(self): - if self._serial == None: + if self._serial is None: return None + try: ret = self._serial.readline() except: - self._log("Unexpected error while reading serial port: %s" % (get_exception_string())) - self._errorValue = get_exception_string() - self.close(True) + if not self._connection_closing: + self._logger.exception("Unexpected error while reading from serial port") + self._log("Unexpected error while reading serial port, please consult octoprint.log for details: %s" % (get_exception_string())) + self._errorValue = get_exception_string() + self.close(True) return None if ret == '': #self._log("Recv: TIMEOUT") @@ -1401,9 +1425,18 @@ def _handleResendRequest(self, line): self._currentResendCount += 1 return + # If we ignore resend repetitions (Repetier firmware...), check if we + # need to do this now. If the same line number has been requested we + # already saw and resent, we'll ignore it up to times. + if self._resendSwallowRepetitions and lineToResend == self._lastResendNumber and self._resendSwallowRepetitionsCounter > 0: + self._logger.debug("Ignoring resend request for line %d, that is probably a repetition sent by the firmware to ensure it arrives, not a real request" % lineToResend) + self._resendSwallowRepetitionsCounter -= 1 + return + self._resendDelta = resendDelta self._lastResendNumber = lineToResend self._currentResendCount = 0 + self._resendSwallowRepetitionsCounter = settings().getInt(["feature", "identicalResendsCountdown"]) if self._resendDelta > len(self._lastLines) or len(self._lastLines) == 0 or self._resendDelta < 0: self._errorValue = "Printer requested line %d but no sufficient history is available, can't resend" % lineToResend @@ -1460,25 +1493,6 @@ def _sendCommand(self, cmd, cmd_type=None): # trigger the "queued" phase only if we are not streaming to sd right now self._process_command_phase("queued", cmd, cmd_type, gcode=gcode) - def gcode_command_for_cmd(self, cmd): - """ - Tries to parse the provided ``cmd`` and extract the GCODE command identifier from it (e.g. "G0" for "G0 X10.0"). - - Arguments: - cmd (str): The command to try to parse. - - Returns: - str or None: The GCODE command identifier if it could be parsed, or None if not. - """ - if not cmd: - return None - - gcode = self._regex_command.search(cmd) - if not gcode: - return None - - return gcode.group(1) - ##~~ send loop handling def _enqueue_for_sending(self, command, linenumber=None, command_type=None): @@ -1519,7 +1533,7 @@ def _send_loop(self): # some firmwares (e.g. Smoothie) might support additional in-band communication that will not # stick to the acknowledgement behaviour of GCODE, so we check here if we have a GCODE command # at hand here and only clear our clear_to_send flag later if that's the case - gcode = self.gcode_command_for_cmd(command) + gcode = gcode_command_for_cmd(command) if linenumber is not None: # line number predetermined - this only happens for resends, so we'll use the number and @@ -1536,10 +1550,7 @@ def _send_loop(self): # now comes the part where we increase line numbers and send stuff - no turning back now if (gcode is not None or self._sendChecksumWithUnknownCommands) and (self.isPrinting() or self._alwaysSendChecksum): - linenumber = self._currentLine - self._addToLastLines(command) - self._currentLine += 1 - self._doSendWithChecksum(command, linenumber) + self._doIncrementAndSendWithChecksum(command) else: self._doSendWithoutChecksum(command) @@ -1567,7 +1578,7 @@ def _process_command_phase(self, phase, command, command_type=None, gcode=None): return command, command_type, gcode if gcode is None: - gcode = self.gcode_command_for_cmd(command) + gcode = gcode_command_for_cmd(command) # send it through the phase specific handlers provided by plugins for name, hook in self._gcode_hooks[phase].items(): @@ -1622,11 +1633,18 @@ def _handle_command_handler_result(self, command, command_type, gcode, handler_r # handler returned a tuple of an unexpected length return original_tuple - gcode = self.gcode_command_for_cmd(command) + gcode = gcode_command_for_cmd(command) return command, command_type, gcode ##~~ actual sending via serial + def _doIncrementAndSendWithChecksum(self, cmd): + with self._line_mutex: + linenumber = self._currentLine + self._addToLastLines(cmd) + self._currentLine += 1 + self._doSendWithChecksum(cmd, linenumber) + def _doSendWithChecksum(self, cmd, lineNumber): commandToSend = "N%d %s" % (lineNumber, cmd) checksum = reduce(lambda x,y:x^y, map(ord, commandToSend)) @@ -1634,6 +1652,9 @@ def _doSendWithChecksum(self, cmd, lineNumber): self._doSendWithoutChecksum(commandToSend) def _doSendWithoutChecksum(self, cmd): + if self._serial is None: + return + self._log("Send: %s" % cmd) try: self._serial.write(cmd + '\n') @@ -1642,29 +1663,31 @@ def _doSendWithoutChecksum(self, cmd): try: self._serial.write(cmd + '\n') except: + if not self._connection_closing: + self._logger.exception("Unexpected error while writing to serial port") + self._log("Unexpected error while writing to serial port: %s" % (get_exception_string())) + self._errorValue = get_exception_string() + self.close(True) + except: + if not self._connection_closing: self._logger.exception("Unexpected error while writing to serial port") self._log("Unexpected error while writing to serial port: %s" % (get_exception_string())) self._errorValue = get_exception_string() self.close(True) - except: - self._logger.exception("Unexpected error while writing to serial port") - self._log("Unexpected error while writing to serial port: %s" % (get_exception_string())) - self._errorValue = get_exception_string() - self.close(True) ##~~ command handlers def _gcode_T_sent(self, cmd, cmd_type=None): - toolMatch = self._regex_paramTInt.search(cmd) + toolMatch = regexes_parameters["intT"].search(cmd) if toolMatch: - self._currentTool = int(toolMatch.group(1)) + self._currentTool = int(toolMatch.group("value")) def _gcode_G0_sent(self, cmd, cmd_type=None): if 'Z' in cmd: - match = self._regex_paramZFloat.search(cmd) + match = regexes_parameters["floatZ"].search(cmd) if match: try: - z = float(match.group(1)) + z = float(match.group("value")) if self._currentZ != z: self._currentZ = z self._callback.on_comm_z_change(z) @@ -1679,13 +1702,13 @@ def _gcode_M0_queuing(self, cmd, cmd_type=None): def _gcode_M104_sent(self, cmd, cmd_type=None): toolNum = self._currentTool - toolMatch = self._regex_paramTInt.search(cmd) + toolMatch = regexes_parameters["intT"].search(cmd) if toolMatch: - toolNum = int(toolMatch.group(1)) - match = self._regex_paramSInt.search(cmd) + toolNum = int(toolMatch.group("value")) + match = regexes_parameters["floatS"].search(cmd) if match: try: - target = float(match.group(1)) + target = float(match.group("value")) if toolNum in self._temp.keys() and self._temp[toolNum] is not None and isinstance(self._temp[toolNum], tuple): (actual, oldTarget) = self._temp[toolNum] self._temp[toolNum] = (actual, target) @@ -1695,10 +1718,10 @@ def _gcode_M104_sent(self, cmd, cmd_type=None): pass def _gcode_M140_sent(self, cmd, cmd_type=None): - match = self._regex_paramSInt.search(cmd) + match = regexes_parameters["floatS"].search(cmd) if match: try: - target = float(match.group(1)) + target = float(match.group("value")) if self._bedTemp is not None and isinstance(self._bedTemp, tuple): (actual, oldTarget) = self._bedTemp self._bedTemp = (actual, target) @@ -1721,37 +1744,61 @@ def _gcode_M190_sent(self, cmd, cmd_type=None): def _gcode_M110_sending(self, cmd, cmd_type=None): newLineNumber = None - match = self._regex_paramNInt.search(cmd) + match = regexes_parameters["intN"].search(cmd) if match: try: - newLineNumber = int(match.group(1)) + newLineNumber = int(match.group("value")) except: pass else: newLineNumber = 0 - # send M110 command with new line number - self._currentLine = newLineNumber + with self._line_mutex: + # send M110 command with new line number + self._currentLine = newLineNumber - # after a reset of the line number we have no way to determine what line exactly the printer now wants - self._lastLines.clear() + # after a reset of the line number we have no way to determine what line exactly the printer now wants + self._lastLines.clear() self._resendDelta = None - def _gcode_M112_queuing(self, cmd, cmd_type=None): # It's an emergency what todo? Canceling the print should be the minimum - self.cancelPrint() + def _gcode_M112_queuing(self, cmd, cmd_type=None): + # emergency stop, jump the queue with the M112 + self._doSendWithoutChecksum("M112") + self._doIncrementAndSendWithChecksum("M112") + + # No idea if the printer is still listening or if M112 won. Just in case + # we'll now try to also manually make sure all heaters are shut off - better + # safe than sorry. We do this ignoring the queue since at this point it + # is irrelevant whether the printer has sent enough ack's or not, we + # are going to shutdown the connection in a second anyhow. + for tool in range(self._printerProfileManager.get_current_or_default()["extruder"]["count"]): + self._doIncrementAndSendWithChecksum("M104 T{tool} S0".format(tool=tool)) + self._doIncrementAndSendWithChecksum("M140 S0") + + # close to reset host state + self._errorValue = "Closing serial port due to emergency stop M112." + self._log(self._errorValue) + self.close(isError=True) + + # fire the M112 event since we sent it and we're going to prevent the caller from seeing it + gcode = "M112" + if gcode in gcodeToEvent: + eventManager().fire(gcodeToEvent[gcode]) + + # return None 1-tuple to eat the one that is queuing because we don't want to send it twice + # I hope it got it the first time because as far as I can tell, there is no way to know + return None, def _gcode_G4_sent(self, cmd, cmd_type=None): # we are intending to dwell for a period of time, increase the timeout to match - cmd = cmd.upper() - p_idx = cmd.find('P') - s_idx = cmd.find('S') + p_match = regexes_parameters["floatP"].search(cmd) + s_match = regexes_parameters["floatS"].search(cmd) + _timeout = 0 - if p_idx != -1: - # dwell time is specified in milliseconds - _timeout = float(cmd[p_idx+1:]) / 1000.0 - elif s_idx != -1: - # dwell time is specified in seconds - _timeout = float(cmd[s_idx+1:]) + if p_match: + _timeout = float(p_match.group("value")) / 1000.0 + elif s_match: + _timeout = float(s_match.group("value")) self._timeout = get_new_timeout("communication") + _timeout ##~~ command phase handlers @@ -2141,3 +2188,159 @@ def prepare_result_entry(): return feedback_controls, feedback_matcher +def canonicalize_temperatures(parsed, current): + """ + Canonicalizes the temperatures provided in parsed. + + Will make sure that returned result only contains extruder keys + like Tn, so always qualified with a tool number. + + The algorithm for cleaning up the parsed keys is the following: + + * If ``T`` is not included with the reported extruders, return + * If more than just ``T`` is reported: + * If both ``T`` and ``T0`` are reported set ``Tc`` to ``T``, remove + ``T`` from the result. + * Else set ``T0`` to ``T`` and delete ``T`` (Smoothie extra). + * If only ``T`` is reported, set ``Tc`` to ``T`` and delete ``T`` + * return + + Arguments: + parsed (dict): the parsed temperatures (mapping tool => (actual, target)) + to canonicalize + current (int): the current active extruder + Returns: + dict: the canonicalized version of ``parsed`` + """ + + reported_extruders = filter(lambda x: x.startswith("T"), parsed.keys()) + if not "T" in reported_extruders: + # Our reported_extruders are either empty or consist purely + # of Tn keys, no need for any action + return parsed + + current_tool_key = "T%d" % current + result = dict(parsed) + + if len(reported_extruders) > 1: + if "T0" in reported_extruders: + # Both T and T0 are present, so T contains the current + # extruder's temperature, e.g. for current_tool == 1: + # + # T: T0: T2: ... B: + # + # becomes + # + # T0: T1: T2: ... B: + # + # Same goes if Tc is already present, it will be overwritten: + # + # T: T0: T1: T2: ... B: + # + # becomes + # + # T0: T1: T2: ... B: + result[current_tool_key] = result["T"] + del result["T"] + else: + # So T is there, but T0 isn't. That looks like Smoothieware which + # always reports the first extruder T0 as T: + # + # T: T1: T2: ... B: + # + # becomes + # + # T0: T1: T2: ... B: + result["T0"] = result["T"] + del result["T"] + + else: + # We only have T. That can mean two things: + # + # * we only have one extruder at all, or + # * we are currently parsing a response to M109/M190, which on + # some firmwares doesn't report the full M105 output while + # waiting for the target temperature to be reached but only + # reports the current tool and bed + # + # In both cases it is however safe to just move our T over + # to T in the parsed data, current should always stay + # 0 for single extruder printers. E.g. for current_tool == 1: + # + # T: + # + # becomes + # + # T1: + + result[current_tool_key] = result["T"] + del result["T"] + + return result + +def parse_temperature_line(line, current): + """ + Parses the provided temperature line. + + The result will be a dictionary mapping from the extruder or bed key to + a tuple with current and target temperature. The result will be canonicalized + with :func:`canonicalize_temperatures` before returning. + + Arguments: + line (str): the temperature line to parse + current (int): the current active extruder + + Returns: + tuple: a 2-tuple with the maximum tool number and a dict mapping from + key to (actual, target) tuples, with key either matching ``Tn`` for ``n >= 0`` or ``B`` + """ + + result = {} + maxToolNum = 0 + for match in re.finditer(regex_temp, line): + values = match.groupdict() + tool = values["tool"] + toolnum = values.get("toolnum", None) + toolNumber = int(toolnum) if toolnum is not None and len(toolnum) else None + if toolNumber > maxToolNum: + maxToolNum = toolNumber + + try: + actual = float(match.group(3)) + target = None + if match.group(4) and match.group(5): + target = float(match.group(5)) + + result[tool] = (actual, target) + except ValueError: + # catch conversion issues, we'll rather just not get the temperature update instead of killing the connection + pass + + return max(maxToolNum, current), canonicalize_temperatures(result, current) + +def gcode_command_for_cmd(cmd): + """ + Tries to parse the provided ``cmd`` and extract the GCODE command identifier from it (e.g. "G0" for "G0 X10.0"). + + Arguments: + cmd (str): The command to try to parse. + + Returns: + str or None: The GCODE command identifier if it could be parsed, or None if not. + """ + if not cmd: + return None + + gcode = regex_command.search(cmd) + if not gcode: + return None + + values = gcode.groupdict() + if "commandGM" in values and values["commandGM"]: + return values["commandGM"] + elif "commandT" in values and values["commandT"]: + return values["commandT"] + else: + # this should never happen + return None + diff --git a/tests/util/test_comm_helpers.py b/tests/util/test_comm_helpers.py index 3015e6f65..e7b906f12 100644 --- a/tests/util/test_comm_helpers.py +++ b/tests/util/test_comm_helpers.py @@ -156,3 +156,76 @@ def md5sum(input): self.assertEquals(x_template, x["templates"][x_template_key]) self.assertEquals("(?P{temp_regex})|(?P{x_regex})".format(**locals()), matcher.pattern) + + @data( + ("G4 P2.0", "floatP", True, "2.0"), + ("M109 S220.0", "floatS", True, "220.0"), + ("G1 X10.0 Y10.0 Z0.2", "floatZ", True, "0.2"), + ("G1X10.0Y10.0Z0.2", "floatZ", True, "0.2"), + ("g1x10.0y10.0z0.2", "floatZ", True, "0.2"), + ("M110 N0", "intN", True, "0"), + ("M104 S220.0 T1", "intT", True, "1"), + ("M104 T1 S220.0", "intT", True, "1"), + ("N100 M110", "intN", True, "100"), + ("NP100", "floatP", False, None), + ) + @unpack + def test_parameter_regexes(self, line, parameter, should_match, expected_value): + from octoprint.util.comm import regexes_parameters + + regex = regexes_parameters[parameter] + match = regex.search(line) + + if should_match: + self.assertIsNotNone(match) + self.assertEquals(expected_value, match.group("value")) + else: + self.assertIsNone(match) + + @data( + ("G0 X0", "G0"), + ("G28 X0 Y0", "G28"), + ("M109 S220.0 T1", "M109"), + ("M117 Hello World", "M117"), + ("T0", "T"), + ("T3", "T"), + (None, None), + ("No match", None) + ) + @unpack + def test_gcode_command_for_cmd(self, cmd, expected): + from octoprint.util.comm import gcode_command_for_cmd + result = gcode_command_for_cmd(cmd) + self.assertEquals(expected, result) + + @data( + ("T:23.0 B:60.0", 0, dict(T0=(23.0, None), B=(60.0, None)), 0), + ("T:23.0 B:60.0", 1, dict(T1=(23.0, None), B=(60.0, None)), 1), + ("T:23.0/220.0 B:60.0/70.0", 0, dict(T0=(23.0, 220.0), B=(60.0, 70.0)), 0), + ("ok T:23.0/220.0 T0:23.0/220.0 T1:50.2/210.0 T2:39.4/220.0 B:60.0", 0, dict(T0=(23.0, 220.0), T1=(50.2, 210.0), T2=(39.4, 220.0), B=(60.0, None)), 2), + ("ok T:50.2/210.0 T0:23.0/220.0 T1:50.2/210.0 T2:39.4/220.0 B:60.0", 1, dict(T0=(23.0, 220.0), T1=(50.2, 210.0), T2=(39.4, 220.0), B=(60.0, None)), 2) + ) + @unpack + def test_process_temperature_line(self, line, current, expected_result, expected_max): + from octoprint.util.comm import parse_temperature_line + maxtool, result = parse_temperature_line(line, current) + self.assertDictEqual(expected_result, result) + self.assertEquals(expected_max, maxtool) + + @data( + (dict(T=(23.0,None)), 0, dict(T0=(23.0, None))), + (dict(T=(23.0,None)), 1, dict(T1=(23.0, None))), + (dict(T=(23.0, None), T0=(23.0, None), T1=(42.0, None)), 0, dict(T0=(23.0, None), T1=(42.0, None))), + (dict(T=(42.0, None), T0=(23.0, None), T1=(42.0, None)), 1, dict(T0=(23.0, None), T1=(42.0, None))), + (dict(T=(21.0, None), T0=(23.0, None), T1=(42.0, None)), 0, dict(T0=(21.0, None), T1=(42.0, None))), + (dict(T=(41.0, None), T0=(23.0, None), T1=(42.0, None)), 1, dict(T0=(23.0, None), T1=(41.0, None))), + (dict(T=(23.0, None), T1=(42.0, None)), 1, dict(T0=(23.0, None), T1=(42.0, None))), + (dict(T0=(23.0, None), T1=(42.0, None)), 1, dict(T0=(23.0, None), T1=(42.0, None))) + + ) + @unpack + def test_canonicalize_temperatures(self, parsed, current, expected): + from octoprint.util.comm import canonicalize_temperatures + result = canonicalize_temperatures(parsed, current) + self.assertDictEqual(expected, result) + diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index a6c2acecc..9f2ed5e39 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 cfe771b28..f87120120 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-07-07 18:58+0200\n" -"PO-Revision-Date: 2015-07-07 18:59+0100\n" +"POT-Creation-Date: 2015-08-31 10:04+0200\n" +"PO-Revision-Date: 2015-08-31 10:28+0100\n" "Last-Translator: Gina Häußge \n" "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -46,7 +46,7 @@ msgstr "Profile" #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "Sort by" msgstr "Sortieren" @@ -61,7 +61,7 @@ msgstr "ID" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "ascending" msgstr "aufsteigend" @@ -75,8 +75,8 @@ msgstr "aufsteigend" #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:5 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:44 #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 -#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:54 msgid "Name" msgstr "Name" @@ -138,232 +138,232 @@ msgstr "Abbrechen" msgid "Confirm" msgstr "Bestätigen" -#: src/octoprint/plugins/pluginmanager/__init__.py:104 +#: src/octoprint/plugins/pluginmanager/__init__.py:107 msgid "Plugin Manager" msgstr "Pluginmanager" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:130 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:270 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 msgid "Installing plugin..." msgstr "Installiere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:130 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 msgid "Installing plugin from uploaded archive..." msgstr "Installiere Plugin von hochgeladenem Archiv..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:142 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:222 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:295 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:325 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:539 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:569 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:586 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:603 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:147 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:225 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:302 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:332 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:546 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:576 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:593 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:610 msgid "Something went wrong" msgstr "Etwas ist schief gegangen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:143 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:223 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:296 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:326 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:148 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:226 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:303 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:333 msgid "Please consult octoprint.log for details" msgstr "Bitte konsultiere octoprint.log für Details" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:272 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:279 #, python-format msgid "Installing plugin \"%(name)s\" from %(url)s..." msgstr "Installiere Plugin \"%(name)s\" von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:274 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:281 #, python-format msgid "Installing plugin from %(url)s..." msgstr "Installiere Plugin von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:284 msgid "Reinstalling plugin..." msgstr "Reinstalliere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:278 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:285 #, python-format msgid "Reinstalling plugin \"%(name)s\" from %(url)s..." msgstr "Reinstalliere Plugin \"%(name)s\" von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:316 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 msgid "Uninstalling plugin..." msgstr "Deinstalliere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:316 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 #, python-format msgid "Uninstalling plugin \"%(name)s\"" msgstr "Deinstalliere Plugin \"%(name)s\"" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 msgid "Reinstall" msgstr "Reinstallieren" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:130 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:146 msgid "Install" msgstr "Installieren" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 msgid "Incompatible" msgstr "Inkompatibel" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:369 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:376 #: src/octoprint/templates/overlays/reloadui.jinja2:9 msgid "Reload now" msgstr "Jetzt neu laden" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:438 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:445 msgid "Done!" msgstr "Fertig!" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:458 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 msgid "Enable Plugin" msgstr "Plugin enablen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:458 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 msgid "Disable Plugin" msgstr "Plugin disablen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:523 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 msgid "Plugin installed" msgstr "Plugin installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:524 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 msgid "A plugin was installed successfully, however it was impossible to detect which one. Please Restart OctoPrint to make sure everything will be registered properly" msgstr "Ein Plugin wurde erfolgreich installiert, es war aber unmöglich zu detektieren, welches. Bitte starte OctoPrint neu um sicherzustellen, dass alles ordnungsgemäß registriert wird." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:528 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 #, python-format msgid "Plugin \"%(name)s\" reinstalled" msgstr "Plugin \"%(name)s\" reinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:529 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 msgid "The plugin was reinstalled successfully" msgstr "Das Plugin wurde erfolgreich reinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:537 msgid "The plugin was reinstalled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich reinstalliert, es ist aber ein Neustart von OctoPrint notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:538 msgid "The plugin was reinstalled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich reinstalliert, es ist aber ein Neuladen der Seite notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:533 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:540 #, python-format msgid "Plugin \"%(name)s\" installed" msgstr "Plugin \"%(name)s\" installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:534 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:541 msgid "The plugin was installed successfully" msgstr "Das Plugin wurde erfolgreich installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:542 msgid "The plugin was installed successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich installiert, es ist jedoch ein Neustart von OctoPrint notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:543 msgid "The plugin was installed successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich installiert, es ist jedoch ein Neuladen der Seite notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:547 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:554 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "Reinstallation des Plugins von URL \"%(url)s\" fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:549 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:556 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "Installation des Plugins von URL \"%(url)s\" fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:553 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:560 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed, please see the log for details." msgstr "Reinstallation des Plugins von URL \"%(url)s\" fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:555 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:562 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed, please see the log for details." msgstr "Installation des Plugins von URL \"%(url)s\" fehlgeschlagen, bitte konsultiere das Log für Details" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:564 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 #, python-format msgid "Plugin \"%(name)s\" uninstalled" msgstr "Plugin \"%(name)s\" deinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:565 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:572 msgid "The plugin was uninstalled successfully" msgstr "Das Plugin wurde erfolgreich deinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:566 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 msgid "The plugin was uninstalled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deinstalliert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:567 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:574 msgid "The plugin was uninstalled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deinstalliert, es ist jedoch ein Neuladen der Seite notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:578 #, python-format msgid "Uninstalling the plugin failed: %(reason)s" msgstr "Deinstallation des Plugins fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:580 msgid "Uninstalling the plugin failed, please see the log for details." msgstr "Deinstallation des Plugins fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:581 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 #, python-format msgid "Plugin \"%(name)s\" enabled" msgstr "Plugin \"%(name)s\" aktiviert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:582 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:589 msgid "The plugin was enabled successfully." msgstr "Das Plugin wurde erfolgreich aktiviert." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:583 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 msgid "The plugin was enabled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich aktiviert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:584 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:591 msgid "The plugin was enabled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich aktiviert, es ist jedoch ein Neuladen der Seite notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:595 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:612 #, python-format msgid "Toggling the plugin failed: %(reason)s" msgstr "Togglen des Plugins fehlgeschalgen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:597 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:614 msgid "Toggling the plugin failed, please see the log for details." msgstr "Togglen des Plugins fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:598 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 #, python-format msgid "Plugin \"%(name)s\" disabled" msgstr "Plugin \"%(name)s\" deaktiviert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:599 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:606 msgid "The plugin was disabled successfully." msgstr "Das Plugin wurde erfolgreich deaktiviert." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:600 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 msgid "The plugin was disabled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:601 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:608 msgid "The plugin was disabled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neuladen der Seite notwendig." #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:3 msgid "Take note that all plugin management functionality is disabled while your printer is printing." -msgstr "Bitte beachte das jegliche Pluginmanagementfunktionen während des Druckens deaktiviert sind." +msgstr "Bitte beachte dass jegliche Pluginmanagementfunktionen während des Druckens deaktiviert sind." #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:9 msgid "Installed Plugins" @@ -388,7 +388,7 @@ msgid "Get More..." msgstr "Mehr..." #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:59 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:167 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96 msgid "Close" msgstr "Schließen" @@ -414,7 +414,7 @@ msgstr "Nach Veröffentlichungsdatum sortieren" #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:7 #: src/octoprint/templates/sidebar/files_header.jinja2:8 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "descending" msgstr "absteigend" @@ -467,12 +467,23 @@ msgstr "... von einem hochgeladenen Archiv" msgid "This does not look like a valid plugin archive. Valid plugin archives should be either zip files or tarballs and have the extension \".zip\", \".tar.gz\", \".tgz\" or \".tar\"" msgstr "Das sieht nicht aus wie ein valides Pluginarchiv. Valide Pluginarchive sollten entweder ZIP-Dateien oder Tarballs sein und die Dateiextension \".zip\", \".tar.gz\", \".tgz\" oder \".tar\" haben" -#: src/octoprint/plugins/softwareupdate/__init__.py:315 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 +#: src/octoprint/templates/tabs/terminal.jinja2:25 +msgid "Advanced options" +msgstr "Erweiterte Optionen" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 +msgid "Use --process-dependency-links with pip install" +msgstr "--process-dependency-link mit pip install verwenden" + +#: src/octoprint/plugins/softwareupdate/__init__.py:378 msgid "Software Update" msgstr "Software Update" -#: src/octoprint/plugins/softwareupdate/__init__.py:589 -#: src/octoprint/server/views.py:146 +#: src/octoprint/plugins/softwareupdate/__init__.py:662 +#: src/octoprint/plugins/softwareupdate/__init__.py:693 +#: src/octoprint/server/views.py:149 #: src/octoprint/static/js/app/viewmodels/appearance.js:11 #: src/octoprint/static/js/app/viewmodels/appearance.js:13 #: src/octoprint/static/js/app/viewmodels/appearance.js:18 @@ -480,180 +491,210 @@ msgstr "Software Update" msgid "OctoPrint" msgstr "OctoPrint" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:114 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:26 +msgid "Release" +msgstr "Release" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:27 +msgid "Commit" +msgstr "Commit" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:145 msgid "There are updates available for the following components:" msgstr "Es gibt Aktualisierungen für die folgenden Komponenten:" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:128 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:159 msgid "Those components marked with can be updated directly." msgstr "Die mit markierten Komponenten können direkt aktualisiert werden." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:131 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:162 msgid "Update Available" msgstr "Aktualisierung verfügbar" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:143 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 msgid "Ignore" msgstr "Ignorieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:178 msgid "You can make this message display again via \"Settings\" > \"Software Update\" > \"Check for update now\"" msgstr "Du kannst diese Nachricht erneut anzeigen lassen mittels \"Einstellungen\" > \"Software Update\" > \"Jetzt nach Aktualisierungen suchen\"" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:151 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:182 msgid "Update now" msgstr "Jetzt aktualisieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:168 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:199 msgid "Everything is up-to-date" msgstr "Alles ist auf dem neusten Stand" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:233 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:264 msgid "Updating..." msgstr "Aktualisiere..." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:234 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:265 msgid "Now updating, please wait." msgstr "Aktualisiere gerade, bitte warten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:253 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:284 msgid "Update not started!" msgstr "Aktualisierung nicht gestartet!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:254 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:285 msgid "The update could not be started. Is it already active? Please consult the log for details." msgstr "Die Aktualisierung konnte nicht gestartet werden. Läuft bereits eine? Bitte konsultiere das Log für Details." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:276 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:307 msgid "Can't update while printing" msgstr "Aktualisierung nicht möglich während gedruckt wird" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:277 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:308 msgid "A print job is currently in progress. Updating will be prevented until it is done." msgstr "Ein Druckjob ist zur Zeit aktiv. Aktualisierungen werden unterbunden bis er fertig ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:281 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:312 msgid "This will update your OctoPrint installation and restart the server." msgstr "Das wird Deine OctoPrint Installation aktualisieren und den Server neu starten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:305 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 msgid "Restart successful!" msgstr "Neustart erfolgreich!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:306 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:337 msgid "The server was restarted successfully. The page will now reload automatically." msgstr "Der Server wurde erfolgreich neu gestartet. Die Seite wird nun automatisch neu geladen." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:338 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:369 #, python-format msgid "Now updating %(name)s to %(version)s" msgstr "Aktualisiere %(name)s auf %(version)s" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:346 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 msgid "Update successful, restarting!" msgstr "Aktualisierung erfolgreich, starte neu!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:347 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:378 msgid "The update finished successfully and the server will now be restarted." msgstr "Die Aktualisierung wurde erfolgreich durchgeführt und der Server wird jetzt neu gestartet." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:358 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:400 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:431 msgid "Restart failed" msgstr "Neustart fehlgeschlagen" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:359 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:401 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:390 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 msgid "The server apparently did not restart by itself, you'll have to do it manually. Please consult the log file on what went wrong." msgstr "Der Server hat anscheinend nicht von selbst neu gstartet, Du wirst das manuell tun müssen. Bitte konsultiere das Logfile." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:375 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 msgid "The update finished successfully, please restart OctoPrint now." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen, bitte starte OctoPrint jetzt neu." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:408 msgid "The update finished successfully, please reboot the server now." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen, bitte reboote den Server jetzt." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:381 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:412 msgid "Update successful, restart required!" msgstr "Aktualisierung erfolgreich, Neustart notwendig!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:394 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 msgid "Restarting OctoPrint failed, please restart it manually. You might also want to consult the log file on what went wrong here." msgstr "Der Neustart von OctoPrint ist fehlgeschlagen, bitte starte es manuell neu. Du solltest das Logfile konsultieren, um herauszufinden, was hier schief gelaufen ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:396 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 msgid "Rebooting the server failed, please reboot it manually. You might also want to consult the log file on what went wrong here." msgstr "Reboot des Servers fehlgeschlagen, bitte reboote ihn manuell. Du solltest auch das Logfile konsultieren, um herauszufinden, was hier gerade schief gelaufen ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:414 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 msgid "Update successful!" msgstr "Aktualisierung erfolgreich!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:415 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:446 msgid "The update finished successfully." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:458 msgid "Update failed!" msgstr "Aktualisierung fehlgeschlagen!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:428 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:459 msgid "The update did not finish successfully. Please consult the log for details." msgstr "Die Aktualisierung wurde nicht erfolgreich abgeschlossen. Bitte konsultiere das Log für Details." -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:2 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:54 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:1 +msgid "" +"\n" +" Please configure the checkout folder of OctoPrint, otherwise\n" +" this plugin won't be able to update it. Click on the button\n" +" to do this. Also refer to the Documentation.\n" +msgstr " Bitte konfiguriere das Checkoutverzeichnis von OctoPrint, andernfalls wird dieses Plugin Deine Installation nicht updaten können. Klicke dazu auf den Button. Siehe des Weiteren auch die Dokumentation." + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:6 +msgid "" +"\n" +"

\n" +" You are running a non-release version of OctoPrint but are tracking OctoPrint\n" +" releases.\n" +"

\n" +" You probably want OctoPrint to track the matching development version instead.\n" +" If you have a local OctoPrint checkout folder switched to another branch,\n" +" simply switching over to \"Commit\" tracking will already\n" +" take care of that. Otherwise please take a look at the\n" +" Documentation.\n" +"

\n" +msgstr "

Du nutzt eine unveröffentlichte Version von OctoPrint, trackst aber OctoPrint Releases.

Du willst vermutlich, dass OctoPrint stattdessen die entsprechende Entwicklungsversion trackt. Falls Du dein lokales OctoPrint-Checkoutverzeichnis auf einen anderen Branch gewechselt hast, dann wechsle das Tracking einfach auf \"Commit\". Ansonsten wirf einen Blick in die Dokumentation.

" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 msgid "Plugin Configuration" msgstr "Pluginkonfiguration" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:5 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:23 msgid "Current versions" msgstr "Aktuelle Versionen" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:11 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:29 msgid "Update available" msgstr "Aktualisierung verfügbar" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:16 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:32 +msgid "Update not possible, configuration ok?" +msgstr "Update nicht möglich, Konfiguration in Ordnung?" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:34 msgid "Installed:" msgstr "Installiert:" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:17 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:35 msgid "Available:" msgstr "Verfügbar:" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:41 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 msgid "Check for update now" msgstr "Jetzt nach Aktualisierungen suchen" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:44 -#: src/octoprint/templates/tabs/terminal.jinja2:25 -msgid "Advanced options" -msgstr "Erweiterte Optionen" - -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:46 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:64 msgid "Force check for update (overrides cache used for update checks)" msgstr "Suche nach Aktualisierungen forcieren (ignoriert den Cache für Aktualisierungsinformationen)" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:47 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 msgid "Force update now (even if no new versions are available)" msgstr "Aktualisierung forcieren (selbst wenn keine neue Versionen verfügbar sind)" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 -msgid "Restart Command" -msgstr "Neustartbefehl" +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:77 +msgid "OctoPrint checkout folder" +msgstr "Checkoutverzeichnis von OctoPrint " -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 -msgid "Reboot Command" -msgstr "Rebootbefehl" +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +msgid "OctoPrint version tracking" +msgstr "Versionstracking für OctoPrint" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:71 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:89 msgid "Version cache TTL" -msgstr "Versionscache TTL" +msgstr "TTL des Versionscaches" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:82 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 #: src/octoprint/templates/dialogs/confirmation.jinja2:11 #: src/octoprint/templates/dialogs/settings.jinja2:51 #: src/octoprint/templates/dialogs/slicing.jinja2:50 @@ -661,113 +702,118 @@ msgstr "Versionscache TTL" msgid "Cancel" msgstr "Abbruch" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 #: src/octoprint/templates/dialogs/settings.jinja2:52 msgid "Save" msgstr "Speichern" -#: src/octoprint/server/views.py:55 +#: src/octoprint/server/views.py:58 msgid "Plugins" msgstr "Plugins" -#: src/octoprint/server/views.py:112 +#: src/octoprint/server/views.py:115 msgid "Connection" msgstr "Verbindung" -#: src/octoprint/server/views.py:113 +#: src/octoprint/server/views.py:116 msgid "State" msgstr "Status" -#: src/octoprint/server/views.py:114 +#: src/octoprint/server/views.py:117 msgid "Files" msgstr "Dateien" -#: src/octoprint/server/views.py:120 +#: src/octoprint/server/views.py:123 msgid "Temperature" msgstr "Temperatur" -#: src/octoprint/server/views.py:121 +#: src/octoprint/server/views.py:124 msgid "Control" msgstr "Steuerung" -#: src/octoprint/server/views.py:122 +#: src/octoprint/server/views.py:125 msgid "Terminal" msgstr "Terminal" -#: src/octoprint/server/views.py:125 +#: src/octoprint/server/views.py:128 msgid "GCode Viewer" msgstr "GCode Viewer" -#: src/octoprint/server/views.py:127 +#: src/octoprint/server/views.py:130 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "Zeitraffer" -#: src/octoprint/server/views.py:132 +#: src/octoprint/server/views.py:135 msgid "Printer" msgstr "Drucker" -#: src/octoprint/server/views.py:134 +#: src/octoprint/server/views.py:137 msgid "Serial Connection" msgstr "Serielle Verbindung" -#: src/octoprint/server/views.py:135 +#: src/octoprint/server/views.py:138 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "Druckerprofile" -#: src/octoprint/server/views.py:136 +#: src/octoprint/server/views.py:139 msgid "Temperatures" msgstr "Temperaturen" -#: src/octoprint/server/views.py:137 +#: src/octoprint/server/views.py:140 msgid "Terminal Filters" msgstr "Terminalfilter" -#: src/octoprint/server/views.py:138 +#: src/octoprint/server/views.py:141 msgid "GCODE Scripts" msgstr "GCODE Scripts" -#: src/octoprint/server/views.py:140 src/octoprint/server/views.py:142 +#: src/octoprint/server/views.py:143 src/octoprint/server/views.py:145 msgid "Features" msgstr "Funktionen" -#: src/octoprint/server/views.py:143 +#: src/octoprint/server/views.py:146 msgid "Webcam" msgstr "Webcam" -#: src/octoprint/server/views.py:144 +#: src/octoprint/server/views.py:147 msgid "API" msgstr "API" -#: src/octoprint/server/views.py:148 +#: src/octoprint/server/views.py:151 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "Verzeichnisse" -#: src/octoprint/server/views.py:149 +#: src/octoprint/server/views.py:152 msgid "Appearance" msgstr "Aussehen" -#: src/octoprint/server/views.py:150 +#: src/octoprint/server/views.py:153 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "Logs" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:154 +msgid "Server" +msgstr "Server" + +#: src/octoprint/server/views.py:157 msgid "Access Control" msgstr "Zugangsbeschränkung" -#: src/octoprint/server/views.py:159 +#: src/octoprint/server/views.py:163 msgid "Access" msgstr "Zugriff" -#: src/octoprint/server/views.py:160 +#: src/octoprint/server/views.py:164 msgid "Interface" msgstr "Interface" #: src/octoprint/static/js/app/dataupdater.js:66 #: src/octoprint/static/js/app/dataupdater.js:100 -#: src/octoprint/static/js/app/helpers.js:436 +#: src/octoprint/static/js/app/helpers.js:464 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "Der Server ist offline" @@ -780,85 +826,85 @@ 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 could not reconnect automatically, 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 konnte mich nicht automatisch neu verbinden, aber Du kannst mittels des folgenden Buttons einen manuellen Verbindungsversuch anstoßen." -#: src/octoprint/static/js/app/dataupdater.js:168 -#: src/octoprint/static/js/app/dataupdater.js:196 +#: src/octoprint/static/js/app/dataupdater.js:169 +#: src/octoprint/static/js/app/dataupdater.js:197 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "Slice ... (%(percentage)d%%)" -#: src/octoprint/static/js/app/dataupdater.js:185 +#: src/octoprint/static/js/app/dataupdater.js:186 msgid "Rendering timelapse" msgstr "Zeitrafferaufnahme wird gerendert" -#: src/octoprint/static/js/app/dataupdater.js:185 +#: src/octoprint/static/js/app/dataupdater.js:186 #, python-format msgid "Now rendering timelapse %(movie_basename)s" msgstr "Rendere Zeitrafferaufnahme %(movie_basename)s" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:188 msgid "Timelapse ready" msgstr "Zeitrafferaufnahme fertig" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:188 #, python-format msgid "New timelapse %(movie_basename)s is done rendering." msgstr "Neue Zeitrafferaufnahme %(movie_basename)s wurde fertig gerendert" -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:190 #, python-format msgid "Rendering of timelapse %(movie_basename)s failed with return code %(returncode)s" msgstr "Rendering der Zeitrafferaufnahme %(movie_basename)s fehlgeschlagen mit Returncode %(returncode)s" -#: src/octoprint/static/js/app/dataupdater.js:191 +#: src/octoprint/static/js/app/dataupdater.js:192 msgid "Rendering failed" msgstr "Rendering fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:198 +#: src/octoprint/static/js/app/dataupdater.js:199 msgid "Slicing ..." msgstr "Slice ..." -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:205 msgid "Slicing done" msgstr "Slicing abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:205 #, 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:214 +#: src/octoprint/static/js/app/dataupdater.js:215 #, 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:215 +#: src/octoprint/static/js/app/dataupdater.js:216 msgid "Slicing failed" msgstr "Slicing fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:219 +#: src/octoprint/static/js/app/dataupdater.js:220 msgid "Streaming ..." msgstr "Streaming ..." -#: src/octoprint/static/js/app/dataupdater.js:225 +#: src/octoprint/static/js/app/dataupdater.js:226 msgid "Streaming done" msgstr "Streaming abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:226 +#: src/octoprint/static/js/app/dataupdater.js:227 #, 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/helpers.js:357 +#: src/octoprint/static/js/app/helpers.js:385 #, python-format msgid "%(hour)02d:%(minute)02d:%(second)02d" msgstr "%(hour)02d:%(minute)02d:%(second)02d" -#: src/octoprint/static/js/app/helpers.js:377 +#: src/octoprint/static/js/app/helpers.js:405 msgid "YYYY-MM-DD HH:mm" msgstr "DD.MM.YYYY HH:mm" -#: src/octoprint/static/js/app/helpers.js:395 -#: src/octoprint/static/js/app/helpers.js:400 +#: src/octoprint/static/js/app/helpers.js:423 +#: src/octoprint/static/js/app/helpers.js:428 msgid "off" msgstr "Aus" @@ -920,7 +966,7 @@ msgid "Disconnect" msgstr "Trennen" #: src/octoprint/static/js/app/viewmodels/control.js:60 -#: src/octoprint/static/js/app/viewmodels/files.js:301 +#: src/octoprint/static/js/app/viewmodels/files.js:330 #: src/octoprint/static/js/app/viewmodels/gcode.js:453 #: src/octoprint/static/js/app/viewmodels/printerstate.js:167 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 @@ -932,32 +978,44 @@ msgstr "Werkzeug" msgid "Hotend" msgstr "Hotend" -#: src/octoprint/static/js/app/viewmodels/files.js:296 -#: src/octoprint/static/js/app/viewmodels/files.js:301 +#: src/octoprint/static/js/app/viewmodels/files.js:47 +msgid "Your available free disk space is critically low." +msgstr "Dein verfügbarer freier Plattenplatz ist auf einem kritischen Tiefstand." + +#: src/octoprint/static/js/app/viewmodels/files.js:49 +msgid "Your available free disk space is starting to run low." +msgstr "Dein verfügbarer freier Plattenplatz wird langsam knapp." + +#: src/octoprint/static/js/app/viewmodels/files.js:51 +msgid "Your current disk usage." +msgstr "Dein aktuell verfügbarer freier Plattenplatz." + +#: src/octoprint/static/js/app/viewmodels/files.js:325 +#: src/octoprint/static/js/app/viewmodels/files.js:330 msgid "Filament" msgstr "Filament" -#: src/octoprint/static/js/app/viewmodels/files.js:305 +#: src/octoprint/static/js/app/viewmodels/files.js:334 msgid "Estimated Print Time" msgstr "Geschätzte Druckdauer" -#: src/octoprint/static/js/app/viewmodels/files.js:308 +#: src/octoprint/static/js/app/viewmodels/files.js:337 msgid "Last Printed" msgstr "Zuletzt gedruckt" -#: src/octoprint/static/js/app/viewmodels/files.js:310 +#: src/octoprint/static/js/app/viewmodels/files.js:339 msgid "Last Print Time" msgstr "Letzte Druckdauer" -#: src/octoprint/static/js/app/viewmodels/files.js:392 +#: src/octoprint/static/js/app/viewmodels/files.js:420 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:408 +#: src/octoprint/static/js/app/viewmodels/files.js:436 msgid "Uploading ..." msgstr "Uploade ..." -#: src/octoprint/static/js/app/viewmodels/files.js:411 +#: src/octoprint/static/js/app/viewmodels/files.js:439 msgid "Saving ..." msgstr "Speichere ..." @@ -1011,7 +1069,7 @@ msgstr "Schichthöhe" #: src/octoprint/static/js/app/viewmodels/gcode.js:447 msgid "GCODE commands in layer" -msgstr "GCODE Kommandos in Schicht" +msgstr "GCODE Befehle in Schicht" #: src/octoprint/static/js/app/viewmodels/gcode.js:450 #: src/octoprint/static/js/app/viewmodels/gcode.js:453 @@ -1056,56 +1114,56 @@ msgstr "Du bist jetzt ausgeloggt" #: src/octoprint/static/js/app/viewmodels/navigation.js:28 #, python-format msgid "The command \"%(command)s\" executed successfully" -msgstr "Das Kommando \"%(command)s\" wurde erfolgreich ausgeführt" +msgstr "Der Befehl \"%(command)s\" wurde erfolgreich ausgeführt" #: src/octoprint/static/js/app/viewmodels/navigation.js:32 #, python-format msgid "The command \"%(command)s\" could not be executed." -msgstr "Das Kommando \"%(command)s\" konnte nicht ausgeführt werden." +msgstr "Der Befehl \"%(command)s\" konnte nicht ausgeführt werden." #: src/octoprint/static/js/app/viewmodels/navigation.js:34 msgid "Error" msgstr "Fehler" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:96 -#: src/octoprint/static/js/app/viewmodels/settings.js:53 -#: src/octoprint/static/js/app/viewmodels/settings.js:83 +#: src/octoprint/static/js/app/viewmodels/settings.js:57 +#: src/octoprint/static/js/app/viewmodels/settings.js:87 msgid "default" msgstr "Standard" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:97 -#: src/octoprint/static/js/app/viewmodels/settings.js:54 -#: src/octoprint/static/js/app/viewmodels/settings.js:67 +#: src/octoprint/static/js/app/viewmodels/settings.js:58 +#: src/octoprint/static/js/app/viewmodels/settings.js:71 msgid "red" msgstr "Rot" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:98 -#: src/octoprint/static/js/app/viewmodels/settings.js:55 -#: src/octoprint/static/js/app/viewmodels/settings.js:69 +#: src/octoprint/static/js/app/viewmodels/settings.js:59 +#: src/octoprint/static/js/app/viewmodels/settings.js:73 msgid "orange" msgstr "Orange" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:99 -#: src/octoprint/static/js/app/viewmodels/settings.js:56 -#: src/octoprint/static/js/app/viewmodels/settings.js:71 +#: src/octoprint/static/js/app/viewmodels/settings.js:60 +#: src/octoprint/static/js/app/viewmodels/settings.js:75 msgid "yellow" msgstr "Gelb" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:100 -#: src/octoprint/static/js/app/viewmodels/settings.js:57 -#: src/octoprint/static/js/app/viewmodels/settings.js:73 +#: src/octoprint/static/js/app/viewmodels/settings.js:61 +#: src/octoprint/static/js/app/viewmodels/settings.js:77 msgid "green" msgstr "Grün" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:101 -#: src/octoprint/static/js/app/viewmodels/settings.js:58 -#: src/octoprint/static/js/app/viewmodels/settings.js:75 +#: src/octoprint/static/js/app/viewmodels/settings.js:62 +#: src/octoprint/static/js/app/viewmodels/settings.js:79 msgid "blue" msgstr "Blau" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:102 -#: src/octoprint/static/js/app/viewmodels/settings.js:60 -#: src/octoprint/static/js/app/viewmodels/settings.js:79 +#: src/octoprint/static/js/app/viewmodels/settings.js:64 +#: src/octoprint/static/js/app/viewmodels/settings.js:83 msgid "black" msgstr "Schwarz" @@ -1186,18 +1244,18 @@ msgid "Pause" msgstr "Pause" #: src/octoprint/static/js/app/viewmodels/printerstate.js:96 -#: src/octoprint/templates/tabs/timelapse.jinja2:7 +#: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "On Z Change" msgstr "Bei Ebenenwechsel" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:8 +#: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "Timed" msgstr "Nach Zeit" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:20 -#: src/octoprint/templates/tabs/timelapse.jinja2:27 +#: src/octoprint/templates/tabs/timelapse.jinja2:24 +#: src/octoprint/templates/tabs/timelapse.jinja2:31 msgid "sec" msgstr "Sek" @@ -1205,17 +1263,17 @@ msgstr "Sek" msgid "This will restart the print job from the beginning." msgstr "Der Druckjob wird zurückgesetzt und von vorne begonnen." -#: src/octoprint/static/js/app/viewmodels/settings.js:59 -#: src/octoprint/static/js/app/viewmodels/settings.js:77 +#: src/octoprint/static/js/app/viewmodels/settings.js:63 +#: src/octoprint/static/js/app/viewmodels/settings.js:81 msgid "violet" msgstr "Violett" -#: src/octoprint/static/js/app/viewmodels/settings.js:61 -#: src/octoprint/static/js/app/viewmodels/settings.js:81 +#: src/octoprint/static/js/app/viewmodels/settings.js:65 +#: src/octoprint/static/js/app/viewmodels/settings.js:85 msgid "white" msgstr "weiß" -#: src/octoprint/static/js/app/viewmodels/settings.js:89 +#: src/octoprint/static/js/app/viewmodels/settings.js:93 msgid "Autodetect from browser" msgstr "Automatisch vom Browser erkennen" @@ -1463,7 +1521,7 @@ msgstr "Admin" #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:7 #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 -#: src/octoprint/templates/tabs/timelapse.jinja2:52 +#: src/octoprint/templates/tabs/timelapse.jinja2:56 msgid "Action" msgstr "Aktion" @@ -1643,50 +1701,70 @@ msgstr "Immer davon ausgehen, dass eine SD-Karte vorhanden ist" #: 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 msgid "Repetier" msgstr "Repetier" #: src/octoprint/templates/dialogs/settings/features.jinja2:47 msgid "Send a checksum with every command" -msgstr "Eine Prüfsumme mit jedem Kommando senden" +msgstr "Eine Prüfsumme mit jedem Befehl senden" #: src/octoprint/templates/dialogs/settings/features.jinja2:54 +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 #, python-format msgid "Support TargetExtr%%n/TargetBed target temperature format" msgstr "TargetExtr%%n/TargetBed Zieltemperaturformat unterstützen" -#: src/octoprint/templates/dialogs/settings/features.jinja2:61 +#: src/octoprint/templates/dialogs/settings/features.jinja2:68 msgid "Disable detection of external heatups" msgstr "Detektierung externer Aufheizvorgänge deaktivieren" -#: src/octoprint/templates/dialogs/settings/features.jinja2:68 -msgid "Swallow the first \"ok\" after a resend response" -msgstr "Erstes \"ok\" nach Resend ignorieren" - -#: src/octoprint/templates/dialogs/settings/folders.jinja2:3 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:5 msgid "Upload Folder" msgstr "Uploadverzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:9 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:11 msgid "Timelapse Folder" msgstr "Zeitrafferverzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:15 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:17 msgid "Timelapse Temp Folder" msgstr "Temporäres Zeitrafferverzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:21 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:23 msgid "Logs Folder" msgstr "Logverzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:27 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:29 msgid "Watched Folder" msgstr "Beobachtetes Verzeichnis" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:35 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:37 msgid "Actively poll the watched folder. Check this if files in your watched folder aren't automatically added otherwise." msgstr "Aktives Pollen des beobachteten Verzeichnisses. Einschalten wenn Dateien in Deinem beobachteten Verzeichnis hinzugefügt werden sonst nicht automatisch hinzugefügt werden." +#: src/octoprint/templates/dialogs/settings/folders.jinja2:42 +msgid "Disk space thresholds" +msgstr "Plattenplatzschwellwerte" + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:44 +msgid "If the free disk space falls below these thresholds, OctoPrint will warn the user." +msgstr "Falls der freie Plattenplatz unter diese Schwellwerte fallen sollte wird OctoPrint den Nutzer warnen." + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:47 +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 +#: src/octoprint/templates/tabs/timelapse.jinja2:13 +msgid "Warning" +msgstr "Warnung" + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:53 +msgid "Critical" +msgstr "Kritisch" + #: src/octoprint/templates/dialogs/settings/gcodescripts.jinja2:3 msgid "Before print job starts" msgstr "Vor dem Start eines Druckjobs" @@ -1719,8 +1797,8 @@ msgstr "Änderungsdatum" #: src/octoprint/templates/dialogs/settings/logs.jinja2:13 #: src/octoprint/templates/sidebar/files.jinja2:10 #: src/octoprint/templates/sidebar/files.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 -#: src/octoprint/templates/tabs/timelapse.jinja2:51 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:55 msgid "Size" msgstr "Größe" @@ -1884,11 +1962,6 @@ msgstr "Autodetectiontimeout" msgid "Log communication to serial.log (might negatively impact performance)" msgstr "Logge die Kommunikation in das serial.log (kann die Performance negativ beeinflussen)" -#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69 -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 -msgid "Warning" -msgstr "Warnung" - #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:74 msgid "Long running commands" msgstr "Lang laufende Befehle" @@ -1906,6 +1979,34 @@ msgstr "Zusätzliche serielle Ports" msgid "Use this to define additional glob patterns matching serial ports to list for connecting against, e.g. /dev/ttyAMA*. One entry per line." msgstr "Nutze diese Einstellung um zusätzliche glob patterns zu konfigurieren, die auf serielle Ports deines Druckers matchen, z.B. /dev/ttyAMA*. Ein Eintrag pro Zeile." +#: src/octoprint/templates/dialogs/settings/server.jinja2:2 +msgid "Commands" +msgstr "Befehle" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:4 +msgid "Command to restart the OctoPrint server" +msgstr "Befehl zum Neustart des OctoPrint-Servers" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:5 +msgid "Restart OctoPrint" +msgstr "OctoPrint neustarten" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:10 +msgid "Command to restart the system OctoPrint is running on" +msgstr "Befehl zum Neustart des Systems, auf dem OctoPrint läuft" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:11 +msgid "Restart system" +msgstr "System neustarten" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:16 +msgid "Command to shut down the system OctoPrint is running on" +msgstr "Befehl zum Herunterfahren des Systems, auf dem OctoPrint läuft" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:17 +msgid "Shutdown system" +msgstr "System herunterfahren" + #: src/octoprint/templates/dialogs/settings/temperatures.jinja2:2 msgid "Temperature Graph" msgstr "Temperaturgraph" @@ -2052,6 +2153,10 @@ msgstr "Automatisch bei Serverstart verbinden" msgid "Uploaded" msgstr "Hochgeladen" +#: src/octoprint/templates/sidebar/files.jinja2:13 +msgid "Additional data" +msgstr "Weitere Daten" + #: src/octoprint/templates/sidebar/files.jinja2:14 #: src/octoprint/templates/sidebar/files.jinja2:26 msgid "Download" @@ -2074,6 +2179,10 @@ msgstr "Laden und Drucken" msgid "Free" msgstr "Frei" +#: src/octoprint/templates/sidebar/files.jinja2:37 +msgid "Total" +msgstr "Gesamt" + #: src/octoprint/templates/sidebar/files.jinja2:64 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." @@ -2311,7 +2420,7 @@ msgid "Set" msgstr "Setzen" #: src/octoprint/templates/tabs/temperature.jinja2:41 -#: src/octoprint/templates/tabs/timelapse.jinja2:6 +#: src/octoprint/templates/tabs/timelapse.jinja2:9 msgid "Off" msgstr "Aus" @@ -2333,7 +2442,7 @@ msgstr "Senden" #: src/octoprint/templates/tabs/terminal.jinja2:20 msgid "Hint: Use the arrow up/down keys to recall commands sent previously" -msgstr "Hinweis: Nutze die Pfeil hoch/runter Tasten um vorher versandte Kommandos wiederaufzurufen " +msgstr "Hinweis: Nutze die Pfeil hoch/runter Tasten um vorher versandte Befehle wieder aufzurufen " #: src/octoprint/templates/tabs/terminal.jinja2:27 msgid "Fake Acknowledgement" @@ -2343,43 +2452,51 @@ msgstr "Bestätigung faken" msgid "If acknowledgements (\"ok\"s) sent by the firmware get lost due to issues with the serial communication to your printer, OctoPrint's communication with it can become stuck. If that happens, this can help. Please be advised that such occurences hint at general communication issues with your printer which will probably negatively influence your printing results and which you should therefore try to resolve!" msgstr "Falls Bestätigungen (\"ok\"s) Deiner Firmware aufgrund von Kommunikationsproblemen mit Deinem Drucker verloren gehen, kann die Kommunikation zwischen OctoPrint und Deinem Drucker zum Stillstand kommen. Falls das passiert, kann das hier helfen. Bitte bedenke, dass solche Vorfälle ein Hinweis auf ein generelles Kommunikationsproblem mit Deinem Drucker hindeuten, das wahrscheinlich Deine Druckergebnisse negativ beeinflusst und dass du daher versuchen solltest, zu beseitigen!" -#: src/octoprint/templates/tabs/timelapse.jinja2:2 +#: src/octoprint/templates/tabs/timelapse.jinja2:3 +msgid "Take note that timelapse configuration is disabled while your printer is printing." +msgstr "Bitte beachte dass die Zeitrafferkonfiguration während des Druckens deaktiviert ist." + +#: src/octoprint/templates/tabs/timelapse.jinja2:5 msgid "Timelapse Configuration" msgstr "Zeitrafferkonfiguration" -#: src/octoprint/templates/tabs/timelapse.jinja2:4 +#: src/octoprint/templates/tabs/timelapse.jinja2:7 msgid "Timelapse Mode" msgstr "Zeitraffermodus" -#: src/octoprint/templates/tabs/timelapse.jinja2:11 +#: src/octoprint/templates/tabs/timelapse.jinja2:13 +msgid "Do not use with spiralized (\"Joris\") vases or similar continuous Z models." +msgstr "Nicht mit spiralisierten Vasen (\"Joris\") oder ähnlichen Modellen mit ständigen Z-Achsen-Änderungen verwenden." + +#: src/octoprint/templates/tabs/timelapse.jinja2:15 msgid "Timelapse frame rate (in frames per second)" msgstr "Zeitrafferbildrate (in Bildern pro Sekunde)" -#: src/octoprint/templates/tabs/timelapse.jinja2:14 +#: src/octoprint/templates/tabs/timelapse.jinja2:18 msgid "fps" msgstr "FPS" -#: src/octoprint/templates/tabs/timelapse.jinja2:17 +#: src/octoprint/templates/tabs/timelapse.jinja2:21 msgid "Timelapse post roll (in rendered seconds)" msgstr "Zeitraffernachlauf (in gerenderten Sekunden)" -#: src/octoprint/templates/tabs/timelapse.jinja2:24 +#: src/octoprint/templates/tabs/timelapse.jinja2:28 msgid "Interval" msgstr "Intervall" -#: src/octoprint/templates/tabs/timelapse.jinja2:33 +#: src/octoprint/templates/tabs/timelapse.jinja2:37 msgid "Save as default" msgstr "Als Standard speichern" -#: src/octoprint/templates/tabs/timelapse.jinja2:38 +#: src/octoprint/templates/tabs/timelapse.jinja2:42 msgid "Save config" msgstr "Konfiguration speichern" -#: src/octoprint/templates/tabs/timelapse.jinja2:42 +#: src/octoprint/templates/tabs/timelapse.jinja2:46 msgid "Finished Timelapses" msgstr "Abgeschlossene Zeitraffer" -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "Creation date" msgstr "Erstellungsdatum" @@ -2430,3 +2547,12 @@ msgstr "Erstellungsdatum" #~ msgid "Updating, please wait." #~ msgstr "Aktualisiere gerade, bitte warten." + +#~ msgid "Restart Command" +#~ msgstr "Neustartbefehl" + +#~ msgid "Reboot Command" +#~ msgstr "Rebootbefehl" + +#~ msgid "Swallow the first \"ok\" after a resend response" +#~ msgstr "Erstes \"ok\" nach Resend ignorieren" diff --git a/translations/messages.pot b/translations/messages.pot index 67870ed3e..e5a10bf43 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OctoPrint 1.2.3-dev-17-g6f7b941\n" +"Project-Id-Version: OctoPrint 1.2.5-dev-57-g8ed0bef-dirty\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-07-07 18:58+0200\n" +"POT-Creation-Date: 2015-08-31 10:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ msgstr "" #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "Sort by" msgstr "" @@ -55,7 +55,7 @@ msgstr "" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "ascending" msgstr "" @@ -69,8 +69,8 @@ msgstr "" #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:5 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:44 #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 -#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:54 msgid "Name" msgstr "" @@ -132,251 +132,251 @@ msgstr "" msgid "Confirm" msgstr "" -#: src/octoprint/plugins/pluginmanager/__init__.py:104 +#: src/octoprint/plugins/pluginmanager/__init__.py:107 msgid "Plugin Manager" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:130 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:270 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 msgid "Installing plugin..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:130 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 msgid "Installing plugin from uploaded archive..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:142 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:222 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:295 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:325 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:539 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:569 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:586 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:603 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:147 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:225 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:302 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:332 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:546 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:576 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:593 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:610 msgid "Something went wrong" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:143 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:223 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:296 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:326 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:148 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:226 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:303 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:333 msgid "Please consult octoprint.log for details" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:272 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:279 #, python-format msgid "Installing plugin \"%(name)s\" from %(url)s..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:274 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:281 #, python-format msgid "Installing plugin from %(url)s..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:284 msgid "Reinstalling plugin..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:278 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:285 #, python-format msgid "Reinstalling plugin \"%(name)s\" from %(url)s..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:316 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 msgid "Uninstalling plugin..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:316 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 #, python-format msgid "Uninstalling plugin \"%(name)s\"" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 msgid "Reinstall" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:130 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:146 msgid "Install" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:351 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 msgid "Incompatible" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:369 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:376 #: src/octoprint/templates/overlays/reloadui.jinja2:9 msgid "Reload now" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:438 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:445 msgid "Done!" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:458 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 msgid "Enable Plugin" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:458 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 msgid "Disable Plugin" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:523 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 msgid "Plugin installed" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:524 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 msgid "" "A plugin was installed successfully, however it was impossible to detect " "which one. Please Restart OctoPrint to make sure everything will be " "registered properly" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:528 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 #, python-format msgid "Plugin \"%(name)s\" reinstalled" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:529 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 msgid "The plugin was reinstalled successfully" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:537 msgid "" "The plugin was reinstalled successfully, however a restart of OctoPrint " "is needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:538 msgid "" "The plugin was reinstalled successfully, however a reload of the page is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:533 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:540 #, python-format msgid "Plugin \"%(name)s\" installed" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:534 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:541 msgid "The plugin was installed successfully" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:542 msgid "" "The plugin was installed successfully, however a restart of OctoPrint is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:543 msgid "" "The plugin was installed successfully, however a reload of the page is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:547 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:554 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:549 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:556 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:553 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:560 #, python-format msgid "" "Reinstalling the plugin from URL \"%(url)s\" failed, please see the log " "for details." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:555 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:562 #, python-format msgid "" "Installing the plugin from URL \"%(url)s\" failed, please see the log for" " details." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:564 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 #, python-format msgid "Plugin \"%(name)s\" uninstalled" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:565 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:572 msgid "The plugin was uninstalled successfully" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:566 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 msgid "" "The plugin was uninstalled successfully, however a restart of OctoPrint " "is needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:567 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:574 msgid "" "The plugin was uninstalled successfully, however a reload of the page is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:578 #, python-format msgid "Uninstalling the plugin failed: %(reason)s" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:580 msgid "Uninstalling the plugin failed, please see the log for details." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:581 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 #, python-format msgid "Plugin \"%(name)s\" enabled" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:582 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:589 msgid "The plugin was enabled successfully." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:583 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 msgid "" "The plugin was enabled successfully, however a restart of OctoPrint is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:584 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:591 msgid "" "The plugin was enabled successfully, however a reload of the page is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:595 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:612 #, python-format msgid "Toggling the plugin failed: %(reason)s" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:597 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:614 msgid "Toggling the plugin failed, please see the log for details." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:598 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 #, python-format msgid "Plugin \"%(name)s\" disabled" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:599 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:606 msgid "The plugin was disabled successfully." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:600 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 msgid "" "The plugin was disabled successfully, however a restart of OctoPrint is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:601 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:608 msgid "" "The plugin was disabled successfully, however a reload of the page is " "needed for that to take effect." @@ -411,7 +411,7 @@ msgid "Get More..." msgstr "" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:59 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:167 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96 msgid "Close" msgstr "" @@ -437,7 +437,7 @@ msgstr "" #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:7 #: src/octoprint/templates/sidebar/files_header.jinja2:8 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "descending" msgstr "" @@ -493,12 +493,23 @@ msgid "" "\".tar.gz\", \".tgz\" or \".tar\"" msgstr "" -#: src/octoprint/plugins/softwareupdate/__init__.py:315 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 +#: src/octoprint/templates/tabs/terminal.jinja2:25 +msgid "Advanced options" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 +msgid "Use --process-dependency-links with pip install" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/__init__.py:378 msgid "Software Update" msgstr "" -#: src/octoprint/plugins/softwareupdate/__init__.py:589 -#: src/octoprint/server/views.py:146 +#: src/octoprint/plugins/softwareupdate/__init__.py:662 +#: src/octoprint/plugins/softwareupdate/__init__.py:693 +#: src/octoprint/server/views.py:149 #: src/octoprint/static/js/app/viewmodels/appearance.js:11 #: src/octoprint/static/js/app/viewmodels/appearance.js:13 #: src/octoprint/static/js/app/viewmodels/appearance.js:18 @@ -506,198 +517,237 @@ msgstr "" msgid "OctoPrint" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:114 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:26 +msgid "Release" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:27 +msgid "Commit" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:145 msgid "There are updates available for the following components:" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:128 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:159 msgid "" "Those components marked with can be updated " "directly." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:131 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:162 msgid "Update Available" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:143 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 msgid "Ignore" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:178 msgid "" "You can make this message display again via \"Settings\" > \"Software " "Update\" > \"Check for update now\"" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:151 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:182 msgid "Update now" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:168 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:199 msgid "Everything is up-to-date" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:233 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:264 msgid "Updating..." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:234 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:265 msgid "Now updating, please wait." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:253 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:284 msgid "Update not started!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:254 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:285 msgid "" "The update could not be started. Is it already active? Please consult the" " log for details." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:276 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:307 msgid "Can't update while printing" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:277 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:308 msgid "" "A print job is currently in progress. Updating will be prevented until it" " is done." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:281 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:312 msgid "This will update your OctoPrint installation and restart the server." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:305 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 msgid "Restart successful!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:306 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:337 msgid "" "The server was restarted successfully. The page will now reload " "automatically." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:338 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:369 #, python-format msgid "Now updating %(name)s to %(version)s" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:346 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 msgid "Update successful, restarting!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:347 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:378 msgid "The update finished successfully and the server will now be restarted." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:358 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:400 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:431 msgid "Restart failed" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:359 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:401 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:390 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 msgid "" "The server apparently did not restart by itself, you'll have to do it " "manually. Please consult the log file on what went wrong." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:375 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 msgid "The update finished successfully, please restart OctoPrint now." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:408 msgid "The update finished successfully, please reboot the server now." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:381 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:412 msgid "Update successful, restart required!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:394 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 msgid "" "Restarting OctoPrint failed, please restart it manually. You might also " "want to consult the log file on what went wrong here." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:396 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 msgid "" "Rebooting the server failed, please reboot it manually. You might also " "want to consult the log file on what went wrong here." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:414 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 msgid "Update successful!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:415 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:446 msgid "The update finished successfully." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:458 msgid "Update failed!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:428 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:459 msgid "" "The update did not finish successfully. Please consult the log for " "details." msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:2 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:54 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:1 +msgid "" +"\n" +" Please configure the checkout folder of OctoPrint, " +"otherwise\n" +" this plugin won't be able to update it. Click on the button\n" +" to do this. Also refer to the Documentation.\n" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:6 +msgid "" +"\n" +"

\n" +" You are running a non-release version of OctoPrint but " +"are tracking OctoPrint\n" +" releases.\n" +"

\n" +" You probably want OctoPrint to track the matching development " +"version instead.\n" +" If you have a local OctoPrint checkout folder switched to another" +" branch,\n" +" simply switching over to \"Commit\" tracking " +"will already\n" +" take care of that. Otherwise please take a look at the\n" +" Documentation.\n" +"

\n" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 msgid "Plugin Configuration" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:5 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:23 msgid "Current versions" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:11 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:29 msgid "Update available" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:16 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:32 +msgid "Update not possible, configuration ok?" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:34 msgid "Installed:" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:17 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:35 msgid "Available:" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:41 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 msgid "Check for update now" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:44 -#: src/octoprint/templates/tabs/terminal.jinja2:25 -msgid "Advanced options" -msgstr "" - -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:46 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:64 msgid "Force check for update (overrides cache used for update checks)" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:47 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 msgid "Force update now (even if no new versions are available)" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 -msgid "Restart Command" +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:77 +msgid "OctoPrint checkout folder" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 -msgid "Reboot Command" +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +msgid "OctoPrint version tracking" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:71 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:89 msgid "Version cache TTL" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:82 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 #: src/octoprint/templates/dialogs/confirmation.jinja2:11 #: src/octoprint/templates/dialogs/settings.jinja2:51 #: src/octoprint/templates/dialogs/slicing.jinja2:50 @@ -705,113 +755,118 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 #: src/octoprint/templates/dialogs/settings.jinja2:52 msgid "Save" msgstr "" -#: src/octoprint/server/views.py:55 +#: src/octoprint/server/views.py:58 msgid "Plugins" msgstr "" -#: src/octoprint/server/views.py:112 +#: src/octoprint/server/views.py:115 msgid "Connection" msgstr "" -#: src/octoprint/server/views.py:113 +#: src/octoprint/server/views.py:116 msgid "State" msgstr "" -#: src/octoprint/server/views.py:114 +#: src/octoprint/server/views.py:117 msgid "Files" msgstr "" -#: src/octoprint/server/views.py:120 +#: src/octoprint/server/views.py:123 msgid "Temperature" msgstr "" -#: src/octoprint/server/views.py:121 +#: src/octoprint/server/views.py:124 msgid "Control" msgstr "" -#: src/octoprint/server/views.py:122 +#: src/octoprint/server/views.py:125 msgid "Terminal" msgstr "" -#: src/octoprint/server/views.py:125 +#: src/octoprint/server/views.py:128 msgid "GCode Viewer" msgstr "" -#: src/octoprint/server/views.py:127 +#: src/octoprint/server/views.py:130 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "" -#: src/octoprint/server/views.py:132 +#: src/octoprint/server/views.py:135 msgid "Printer" msgstr "" -#: src/octoprint/server/views.py:134 +#: src/octoprint/server/views.py:137 msgid "Serial Connection" msgstr "" -#: src/octoprint/server/views.py:135 +#: src/octoprint/server/views.py:138 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "" -#: src/octoprint/server/views.py:136 +#: src/octoprint/server/views.py:139 msgid "Temperatures" msgstr "" -#: src/octoprint/server/views.py:137 +#: src/octoprint/server/views.py:140 msgid "Terminal Filters" msgstr "" -#: src/octoprint/server/views.py:138 +#: src/octoprint/server/views.py:141 msgid "GCODE Scripts" msgstr "" -#: src/octoprint/server/views.py:140 src/octoprint/server/views.py:142 +#: src/octoprint/server/views.py:143 src/octoprint/server/views.py:145 msgid "Features" msgstr "" -#: src/octoprint/server/views.py:143 +#: src/octoprint/server/views.py:146 msgid "Webcam" msgstr "" -#: src/octoprint/server/views.py:144 +#: src/octoprint/server/views.py:147 msgid "API" msgstr "" -#: src/octoprint/server/views.py:148 +#: src/octoprint/server/views.py:151 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "" -#: src/octoprint/server/views.py:149 +#: src/octoprint/server/views.py:152 msgid "Appearance" msgstr "" -#: src/octoprint/server/views.py:150 +#: src/octoprint/server/views.py:153 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:154 +msgid "Server" +msgstr "" + +#: src/octoprint/server/views.py:157 msgid "Access Control" msgstr "" -#: src/octoprint/server/views.py:159 +#: src/octoprint/server/views.py:163 msgid "Access" msgstr "" -#: src/octoprint/server/views.py:160 +#: src/octoprint/server/views.py:164 msgid "Interface" msgstr "" #: src/octoprint/static/js/app/dataupdater.js:66 #: src/octoprint/static/js/app/dataupdater.js:100 -#: src/octoprint/static/js/app/helpers.js:436 +#: src/octoprint/static/js/app/helpers.js:464 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "" @@ -831,87 +886,87 @@ msgid "" "may try a manual reconnect using the button below." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:168 -#: src/octoprint/static/js/app/dataupdater.js:196 +#: src/octoprint/static/js/app/dataupdater.js:169 +#: src/octoprint/static/js/app/dataupdater.js:197 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:185 +#: src/octoprint/static/js/app/dataupdater.js:186 msgid "Rendering timelapse" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:185 +#: src/octoprint/static/js/app/dataupdater.js:186 #, python-format msgid "Now rendering timelapse %(movie_basename)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:188 msgid "Timelapse ready" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:188 #, python-format msgid "New timelapse %(movie_basename)s is done rendering." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:190 #, python-format msgid "" "Rendering of timelapse %(movie_basename)s failed with return code " "%(returncode)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:191 +#: src/octoprint/static/js/app/dataupdater.js:192 msgid "Rendering failed" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:198 +#: src/octoprint/static/js/app/dataupdater.js:199 msgid "Slicing ..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:205 msgid "Slicing done" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:205 #, python-format msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:214 +#: src/octoprint/static/js/app/dataupdater.js:215 #, python-format msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:215 +#: src/octoprint/static/js/app/dataupdater.js:216 msgid "Slicing failed" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:219 +#: src/octoprint/static/js/app/dataupdater.js:220 msgid "Streaming ..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:225 +#: src/octoprint/static/js/app/dataupdater.js:226 msgid "Streaming done" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:226 +#: src/octoprint/static/js/app/dataupdater.js:227 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "" -#: src/octoprint/static/js/app/helpers.js:357 +#: src/octoprint/static/js/app/helpers.js:385 #, python-format msgid "%(hour)02d:%(minute)02d:%(second)02d" msgstr "" -#: src/octoprint/static/js/app/helpers.js:377 +#: src/octoprint/static/js/app/helpers.js:405 msgid "YYYY-MM-DD HH:mm" msgstr "" -#: src/octoprint/static/js/app/helpers.js:395 -#: src/octoprint/static/js/app/helpers.js:400 +#: src/octoprint/static/js/app/helpers.js:423 +#: src/octoprint/static/js/app/helpers.js:428 msgid "off" msgstr "" @@ -973,7 +1028,7 @@ msgid "Disconnect" msgstr "" #: src/octoprint/static/js/app/viewmodels/control.js:60 -#: src/octoprint/static/js/app/viewmodels/files.js:301 +#: src/octoprint/static/js/app/viewmodels/files.js:330 #: src/octoprint/static/js/app/viewmodels/gcode.js:453 #: src/octoprint/static/js/app/viewmodels/printerstate.js:167 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 @@ -985,35 +1040,47 @@ msgstr "" msgid "Hotend" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:296 -#: src/octoprint/static/js/app/viewmodels/files.js:301 +#: src/octoprint/static/js/app/viewmodels/files.js:47 +msgid "Your available free disk space is critically low." +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/files.js:49 +msgid "Your available free disk space is starting to run low." +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/files.js:51 +msgid "Your current disk usage." +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/files.js:325 +#: src/octoprint/static/js/app/viewmodels/files.js:330 msgid "Filament" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:305 +#: src/octoprint/static/js/app/viewmodels/files.js:334 msgid "Estimated Print Time" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:308 +#: src/octoprint/static/js/app/viewmodels/files.js:337 msgid "Last Printed" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:310 +#: src/octoprint/static/js/app/viewmodels/files.js:339 msgid "Last Print Time" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:392 +#: src/octoprint/static/js/app/viewmodels/files.js:420 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 "" -#: src/octoprint/static/js/app/viewmodels/files.js:408 +#: src/octoprint/static/js/app/viewmodels/files.js:436 msgid "Uploading ..." msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:411 +#: src/octoprint/static/js/app/viewmodels/files.js:439 msgid "Saving ..." msgstr "" @@ -1127,44 +1194,44 @@ msgid "Error" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:96 -#: src/octoprint/static/js/app/viewmodels/settings.js:53 -#: src/octoprint/static/js/app/viewmodels/settings.js:83 +#: src/octoprint/static/js/app/viewmodels/settings.js:57 +#: src/octoprint/static/js/app/viewmodels/settings.js:87 msgid "default" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:97 -#: src/octoprint/static/js/app/viewmodels/settings.js:54 -#: src/octoprint/static/js/app/viewmodels/settings.js:67 +#: src/octoprint/static/js/app/viewmodels/settings.js:58 +#: src/octoprint/static/js/app/viewmodels/settings.js:71 msgid "red" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:98 -#: src/octoprint/static/js/app/viewmodels/settings.js:55 -#: src/octoprint/static/js/app/viewmodels/settings.js:69 +#: src/octoprint/static/js/app/viewmodels/settings.js:59 +#: src/octoprint/static/js/app/viewmodels/settings.js:73 msgid "orange" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:99 -#: src/octoprint/static/js/app/viewmodels/settings.js:56 -#: src/octoprint/static/js/app/viewmodels/settings.js:71 +#: src/octoprint/static/js/app/viewmodels/settings.js:60 +#: src/octoprint/static/js/app/viewmodels/settings.js:75 msgid "yellow" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:100 -#: src/octoprint/static/js/app/viewmodels/settings.js:57 -#: src/octoprint/static/js/app/viewmodels/settings.js:73 +#: src/octoprint/static/js/app/viewmodels/settings.js:61 +#: src/octoprint/static/js/app/viewmodels/settings.js:77 msgid "green" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:101 -#: src/octoprint/static/js/app/viewmodels/settings.js:58 -#: src/octoprint/static/js/app/viewmodels/settings.js:75 +#: src/octoprint/static/js/app/viewmodels/settings.js:62 +#: src/octoprint/static/js/app/viewmodels/settings.js:79 msgid "blue" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:102 -#: src/octoprint/static/js/app/viewmodels/settings.js:60 -#: src/octoprint/static/js/app/viewmodels/settings.js:79 +#: src/octoprint/static/js/app/viewmodels/settings.js:64 +#: src/octoprint/static/js/app/viewmodels/settings.js:83 msgid "black" msgstr "" @@ -1251,18 +1318,18 @@ msgid "Pause" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerstate.js:96 -#: src/octoprint/templates/tabs/timelapse.jinja2:7 +#: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "On Z Change" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:8 +#: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "Timed" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:20 -#: src/octoprint/templates/tabs/timelapse.jinja2:27 +#: src/octoprint/templates/tabs/timelapse.jinja2:24 +#: src/octoprint/templates/tabs/timelapse.jinja2:31 msgid "sec" msgstr "" @@ -1270,17 +1337,17 @@ msgstr "" msgid "This will restart the print job from the beginning." msgstr "" -#: src/octoprint/static/js/app/viewmodels/settings.js:59 -#: src/octoprint/static/js/app/viewmodels/settings.js:77 +#: src/octoprint/static/js/app/viewmodels/settings.js:63 +#: src/octoprint/static/js/app/viewmodels/settings.js:81 msgid "violet" msgstr "" -#: src/octoprint/static/js/app/viewmodels/settings.js:61 -#: src/octoprint/static/js/app/viewmodels/settings.js:81 +#: src/octoprint/static/js/app/viewmodels/settings.js:65 +#: src/octoprint/static/js/app/viewmodels/settings.js:85 msgid "white" msgstr "" -#: src/octoprint/static/js/app/viewmodels/settings.js:89 +#: src/octoprint/static/js/app/viewmodels/settings.js:93 msgid "Autodetect from browser" msgstr "" @@ -1524,7 +1591,7 @@ msgstr "" #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:7 #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 -#: src/octoprint/templates/tabs/timelapse.jinja2:52 +#: src/octoprint/templates/tabs/timelapse.jinja2:56 msgid "Action" msgstr "" @@ -1714,6 +1781,7 @@ 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 msgid "Repetier" msgstr "" @@ -1722,46 +1790,67 @@ msgid "Send a checksum with every command" msgstr "" #: src/octoprint/templates/dialogs/settings/features.jinja2:54 +msgid "Ignore consecutive resend requests for the same line" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/features.jinja2:61 #, python-format msgid "" "Support TargetExtr%%n/TargetBed target " "temperature format" msgstr "" -#: src/octoprint/templates/dialogs/settings/features.jinja2:61 -msgid "Disable detection of external heatups" -msgstr "" - #: src/octoprint/templates/dialogs/settings/features.jinja2:68 -msgid "Swallow the first \"ok\" after a resend response" +msgid "Disable detection of external heatups" msgstr "" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:3 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:5 msgid "Upload Folder" msgstr "" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:9 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:11 msgid "Timelapse Folder" msgstr "" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:15 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:17 msgid "Timelapse Temp Folder" msgstr "" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:21 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:23 msgid "Logs Folder" msgstr "" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:27 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:29 msgid "Watched Folder" msgstr "" -#: src/octoprint/templates/dialogs/settings/folders.jinja2:35 +#: src/octoprint/templates/dialogs/settings/folders.jinja2:37 msgid "" "Actively poll the watched folder. Check this if files in your watched " "folder aren't automatically added otherwise." msgstr "" +#: src/octoprint/templates/dialogs/settings/folders.jinja2:42 +msgid "Disk space thresholds" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:44 +msgid "" +"If the free disk space falls below these thresholds, OctoPrint will warn " +"the user." +msgstr "" + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:47 +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 +#: src/octoprint/templates/tabs/timelapse.jinja2:13 +msgid "Warning" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/folders.jinja2:53 +msgid "Critical" +msgstr "" + #: src/octoprint/templates/dialogs/settings/gcodescripts.jinja2:3 msgid "Before print job starts" msgstr "" @@ -1794,8 +1883,8 @@ msgstr "" #: src/octoprint/templates/dialogs/settings/logs.jinja2:13 #: src/octoprint/templates/sidebar/files.jinja2:10 #: src/octoprint/templates/sidebar/files.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:45 -#: src/octoprint/templates/tabs/timelapse.jinja2:51 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:55 msgid "Size" msgstr "" @@ -1978,11 +2067,6 @@ msgstr "" msgid "Log communication to serial.log (might negatively impact performance)" msgstr "" -#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69 -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 -msgid "Warning" -msgstr "" - #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:74 msgid "Long running commands" msgstr "" @@ -2006,6 +2090,34 @@ msgid "" "/dev/ttyAMA*. One entry per line." msgstr "" +#: src/octoprint/templates/dialogs/settings/server.jinja2:2 +msgid "Commands" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:4 +msgid "Command to restart the OctoPrint server" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:5 +msgid "Restart OctoPrint" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:10 +msgid "Command to restart the system OctoPrint is running on" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:11 +msgid "Restart system" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:16 +msgid "Command to shut down the system OctoPrint is running on" +msgstr "" + +#: src/octoprint/templates/dialogs/settings/server.jinja2:17 +msgid "Shutdown system" +msgstr "" + #: src/octoprint/templates/dialogs/settings/temperatures.jinja2:2 msgid "Temperature Graph" msgstr "" @@ -2160,6 +2272,10 @@ msgstr "" msgid "Uploaded" msgstr "" +#: src/octoprint/templates/sidebar/files.jinja2:13 +msgid "Additional data" +msgstr "" + #: src/octoprint/templates/sidebar/files.jinja2:14 #: src/octoprint/templates/sidebar/files.jinja2:26 msgid "Download" @@ -2182,6 +2298,10 @@ msgstr "" msgid "Free" msgstr "" +#: src/octoprint/templates/sidebar/files.jinja2:37 +msgid "Total" +msgstr "" + #: src/octoprint/templates/sidebar/files.jinja2:64 msgid "Hint: You can also drag and drop files on this page to upload them." msgstr "" @@ -2416,7 +2536,7 @@ msgid "Set" msgstr "" #: src/octoprint/templates/tabs/temperature.jinja2:41 -#: src/octoprint/templates/tabs/timelapse.jinja2:6 +#: src/octoprint/templates/tabs/timelapse.jinja2:9 msgid "Off" msgstr "" @@ -2454,43 +2574,55 @@ msgid "" "results and which you should therefore try to resolve!" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:2 +#: src/octoprint/templates/tabs/timelapse.jinja2:3 +msgid "" +"Take note that timelapse configuration is disabled while your printer is " +"printing." +msgstr "" + +#: src/octoprint/templates/tabs/timelapse.jinja2:5 msgid "Timelapse Configuration" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:4 +#: src/octoprint/templates/tabs/timelapse.jinja2:7 msgid "Timelapse Mode" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:11 +#: src/octoprint/templates/tabs/timelapse.jinja2:13 +msgid "" +"Do not use with spiralized (\"Joris\") vases or similar continuous Z " +"models." +msgstr "" + +#: src/octoprint/templates/tabs/timelapse.jinja2:15 msgid "Timelapse frame rate (in frames per second)" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:14 +#: src/octoprint/templates/tabs/timelapse.jinja2:18 msgid "fps" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:17 +#: src/octoprint/templates/tabs/timelapse.jinja2:21 msgid "Timelapse post roll (in rendered seconds)" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:24 +#: src/octoprint/templates/tabs/timelapse.jinja2:28 msgid "Interval" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:33 +#: src/octoprint/templates/tabs/timelapse.jinja2:37 msgid "Save as default" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:38 +#: src/octoprint/templates/tabs/timelapse.jinja2:42 msgid "Save config" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:42 +#: src/octoprint/templates/tabs/timelapse.jinja2:46 msgid "Finished Timelapses" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:45 +#: src/octoprint/templates/tabs/timelapse.jinja2:49 msgid "Creation date" msgstr ""