From 5955d3d32e152851a354c0e2642519f0971d2159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 09:58:40 +0100 Subject: [PATCH 01/10] Added estimates total time from gcode viewer to gcode viewer tab Implements request in #1204 --- src/octoprint/static/js/app/viewmodels/gcode.js | 1 + src/octoprint/templates/tabs/gcodeviewer.jinja2 | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/octoprint/static/js/app/viewmodels/gcode.js b/src/octoprint/static/js/app/viewmodels/gcode.js index 04feaebd..30f13200 100644 --- a/src/octoprint/static/js/app/viewmodels/gcode.js +++ b/src/octoprint/static/js/app/viewmodels/gcode.js @@ -429,6 +429,7 @@ $(function() { } else { var output = []; output.push(gettext("Model size") + ": " + model.width.toFixed(2) + "mm × " + model.depth.toFixed(2) + "mm × " + model.height.toFixed(2) + "mm"); + output.push(gettext("Estimated total print time") + ": " + formatDuration(model.printTime)); output.push(gettext("Estimated layer height") + ": " + model.layerHeight.toFixed(2) + gettext("mm")); output.push(gettext("Layer count") + ": " + model.layersPrinted.toFixed(0) + " " + gettext("printed") + ", " + model.layersTotal.toFixed(0) + " " + gettext("visited")); diff --git a/src/octoprint/templates/tabs/gcodeviewer.jinja2 b/src/octoprint/templates/tabs/gcodeviewer.jinja2 index 4c674bea..d20725ab 100644 --- a/src/octoprint/templates/tabs/gcodeviewer.jinja2 +++ b/src/octoprint/templates/tabs/gcodeviewer.jinja2 @@ -57,6 +57,10 @@

+ +
+ {{ _('Note that the time estimates in this tab are calculated by the GCODE viewer in your browser and might differ from the values calculated by the server that are displayed in the "State" and "Files" panels in the sidebar due to slightly different implementations.') }} +

{{ _('Warning') }}

From ed82488c5b71245f3c248130927b6325b4b753d1 Mon Sep 17 00:00:00 2001 From: geoporalis Date: Tue, 9 Feb 2016 10:47:49 +0100 Subject: [PATCH 02/10] typo fixed (cherry picked from commit 4e91284) --- .../plugins/softwareupdate/version_checks/git_commit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/softwareupdate/version_checks/git_commit.py b/src/octoprint/plugins/softwareupdate/version_checks/git_commit.py index 3cb2e0c4..b3646d10 100644 --- a/src/octoprint/plugins/softwareupdate/version_checks/git_commit.py +++ b/src/octoprint/plugins/softwareupdate/version_checks/git_commit.py @@ -65,7 +65,7 @@ def get_latest(target, check): if returncode != 0: return None, True - return_code, base = _git(["merge-base", "@{0}", "@{u}"], checkout_folder) + returncode, base = _git(["merge-base", "@{0}", "@{u}"], checkout_folder) if returncode != 0: return None, True From d20a9f64a299abdec20f97dce1a7fbd038ec40a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 10:15:01 +0100 Subject: [PATCH 03/10] Updated AUTHORS.md (cherry picked from commit ab52e28) --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index 132a1e63..37e6ae71 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -58,6 +58,7 @@ date of first contribution): * [Richard Joyce](https://github.com/richjoyce) * ["bwgan"](https://github.com/bwgan) * [Siim Raud](https://github.com/2ndalpha) + * ["geoporalis"](https://github.com/geoporalis) 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 From 92c65cb21cf9713886dfef3606de654877ae2c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 11:09:31 +0100 Subject: [PATCH 04/10] Added info about branches and versioning to contribution guide --- CONTRIBUTING.md | 71 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 924bfa25..684aa087 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,6 +13,8 @@ or **[creating pull requests](#pull-requests)**. * [Where can I find those log files you keep talking about?](#where-can-i-find-those-log-files-you-keep-talking-about) * [Where can I find my browser's error console?](#where-can-i-find-my-browsers-error-console) * [Pull requests](#pull-requests) + * [What do the branches mean?](#what-do-the-branches-mean) + * [How OctoPrint is versioned](#how-octoprint-is-versioned) * [History](#history) * [Footnotes](#footnotes) @@ -225,12 +227,14 @@ See [How to open the Javascript Console in different browsers](https://webmaster make sure to backport it to the `maintenance` branch to also include it in the next release. 4. Make sure you **follow the current coding style**. This means: + * Tabs instead of spaces in the Python files[2] * Spaces instead of tabs in the Javascript sources * English language (code, variables, comments, ...) - * Comments where necessary: Tell why the code does something like it does + * Comments where necessary: Tell *why* the code does something like it does it, structure your code * Following the general architecture + If your PR needs to make changes to the Stylesheets, change the ``.less`` files from which the CSS is compiled. 5. **Test your changes thoroughly**. That also means testing with usage @@ -240,13 +244,75 @@ See [How to open the Javascript Console in different browsers](https://webmaster your changes. Ideally **add unit tests** - OctoPrint severly lacks in that department, but we are trying to change that, so any new code already covered with a test suite helps a lot! -6. In your pull request's description, **state what your pull request is doing**, +6. In your pull request's description, **state what your pull request does**, as in, what feature does it implement, what bug does it fix. The more thoroughly you explain your intent behind the PR here, the higher the chances it will get merged fast. 7. Important: Don't forget to **add yourself to the [AUTHORS](./AUTHORS.md) file** :) +## What do the branches mean? + +There are three main branches in OctoPrint: + + * `master`: The master branch always contains the current stable release. It + is *only* updated on new releases. Will have a version number following + the scheme `x.y.z` (e.g. `1.2.9`) or - if it's absolutely necessary to + add a commit after release to this branch - `x.y.z.post` + (e.g. `1.2.9.post1`). + * `maintenance`: Improvements and fixes of the current release that make up + the next release go here. More or less continously updated. You can consider + this a preview of the next release version. It should be very stable at all + times. Anything you spot in here helps tremendously with getting a rock solid + next stable release, so if you want to help out development, running the + `maintenance` branch and reporting back anything you find is a very good way + to do that. Will usually have a version number following the scheme + `x.y.z+1.dev.` for an OctoPrint version of `x.y.z` + (e.g. `1.2.10.dev12`). + * `devel`: Ongoing development of new features that will go into the next bigger + release (MINOR version number increases) will happen on this branch. Usually + kept stable, sometimes stuff can break though or lose backwards compatibility + temporarily. Can be considered the "bleeding edge". All PRs should target + *this* branch. Important improvements and fixes from PRs here are backported to + `maintenance` as needed. Will usually have a version number following the + scheme `x.y+1.0.dev` for an OctoPrint version + of `x.y.z` (e.g. `1.3.0.dev123`). + +Additionally, from time to time you might see other branches pop up in the repository. +Those usually have one of the following prefixes: + + * `fix/...`: Fixes under development that are to be merged into the `maintenance` + and `devel` branches. + * `improve/...`: Improvements under development that are to be merged into the + `maintenance` and `devel` branches. + * `dev/...` or `feature/...`: New functionality under development that is to be merged + into the `devel` branch. + +There is also the `gh-pages` branch, which holds OctoPrint's web page, and a couple of +older development branches that are slowly being migrated or deleted. + +## How OctoPrint is versioned + +OctoPrint follows the [semantic versioning scheme](http://semver.org/) of **MAJOR.MINOR.PATCH**. + +The **PATCH** version number is the one increasing most often due to OctoPrint's maintenance releases. +Releases that only change the patch number indicate that they contain bug fixes and small improvements +of existing functionality. Example: 1.2.8 to 1.2.9. + +The **MINOR** version number increases with releases that add a lot of new functionality and +large features. Example: 1.2.x to 1.3.0. + +Finally, the **MAJOR** version number increases if there are breaking API changes that concern any of the +documented interfaces (REST API, plugin interfaces, ...). So far this hasn't happened. Example: 1.x.y to 2.0.0. + +OctoPrint's version numbers are automatically generated using [versioneer](https://github.com/warner/python-versioneer) +and depend on the selected git branch, nearest git tag and commits. The generated version number +should always be [PEP440](https://www.python.org/dev/peps/pep-0440/) compatible. Unless a git tag +is used for version number determination, the version number will also contain the git hash within +the local version identifier to allow for an exact determination of the active code base +(e.g. `1.2.9.dev68+g46c7a9c`). Additionally, instances with active uncommitted changes will contain +`.dirty` in the local version identifier. + ## History * 2015-01-23: More guidelines for creating pull requests, support/questions @@ -255,6 +321,7 @@ See [How to open the Javascript Console in different browsers](https://webmaster * 2015-07-07: Added step to add yourself to AUTHORS when creating a PR :) * 2015-12-01: Heavily reworked to include examples, better structure and all information in one document. + * 2016-02-10: Added information about branch structure and versioning. ## Footnotes * [1] - If you are wondering why, the problem is that anything that you add From d4072a3afd4063f58ed1582c9847b4cc7e7b6cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 12:43:13 +0100 Subject: [PATCH 05/10] Updated translation files & german translation --- .../translations/de/LC_MESSAGES/messages.mo | Bin 56599 -> 60943 bytes .../translations/de/LC_MESSAGES/messages.po | 486 ++++++++++------- translations/de/LC_MESSAGES/messages.mo | Bin 56599 -> 60943 bytes translations/de/LC_MESSAGES/messages.po | 486 ++++++++++------- translations/messages.pot | 509 +++++++++++------- 5 files changed, 922 insertions(+), 559 deletions(-) diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.mo b/src/octoprint/translations/de/LC_MESSAGES/messages.mo index 3c036179c9b4bf2f94cc23550d13c134aba66664..22c641e2703e0d8dead063dac51fc227197db550 100644 GIT binary patch delta 13593 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 delta 9541 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 W&6+)KQlTlzn|!3i^vs(&*8B&5Y_$Ra diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.po b/src/octoprint/translations/de/LC_MESSAGES/messages.po index 51ae962a..edeec609 100644 --- a/src/octoprint/translations/de/LC_MESSAGES/messages.po +++ b/src/octoprint/translations/de/LC_MESSAGES/messages.po @@ -1,18 +1,14 @@ # German translations for OctoPrint. -# Copyright (C) 2014 The OctoPrint Project +# Copyright (C) 2016 The OctoPrint Project # This file is distributed under the same license as the OctoPrint project. +# FIRST AUTHOR , 2016. # -# Translators: -# demod , 2014 -# FIRST AUTHOR , 2014 -# Gina Häußge , 2014 -# Johannes Rebling , 2014 msgid "" msgstr "" "Project-Id-Version: OctoPrint\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-12-01 11:20+0100\n" -"PO-Revision-Date: 2015-12-01 11:37+0100\n" +"POT-Creation-Date: 2016-02-10 11:12+0100\n" +"PO-Revision-Date: 2016-02-10 11:25+0100\n" "Last-Translator: Gina Häußge \n" "Language: de\n" "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n" @@ -20,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.1.1\n" +"Generated-By: Babel 2.2.0\n" "X-Generator: Poedit 1.6.8\n" #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:1 @@ -87,6 +83,7 @@ msgstr "aufsteigend" #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 #: src/octoprint/templates/tabs/timelapse.jinja2:50 #: src/octoprint/templates/tabs/timelapse.jinja2:55 +#: src/octoprint/templates/tabs/timelapse.jinja2:86 msgid "Name" msgstr "Name" @@ -416,7 +413,7 @@ msgstr " Das pip Command ist konfiguriert, sudo zu #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:30 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:204 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:73 msgid "Plugin Configuration" msgstr "Pluginkonfiguration" @@ -523,8 +520,8 @@ msgid "This does not look like a valid plugin archive. Valid plugin archives sho 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/pluginmanager/templates/pluginmanager_settings.jinja2:182 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 -#: src/octoprint/templates/tabs/terminal.jinja2:25 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:63 +#: src/octoprint/templates/tabs/terminal.jinja2:27 msgid "Advanced options" msgstr "Erweiterte Optionen" @@ -573,7 +570,8 @@ msgid "Repository cache TTL" msgstr "Repository-Cache TTL" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:239 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:26 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 #: src/octoprint/templates/dialogs/confirmation.jinja2:11 #: src/octoprint/templates/dialogs/settings.jinja2:51 #: src/octoprint/templates/dialogs/slicing.jinja2:50 @@ -582,7 +580,7 @@ msgid "Cancel" msgstr "Abbruch" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:102 #: src/octoprint/templates/dialogs/settings.jinja2:52 msgid "Save" msgstr "Speichern" @@ -591,8 +589,8 @@ msgstr "Speichern" msgid "Software Update" msgstr "Software Update" -#: src/octoprint/plugins/softwareupdate/__init__.py:680 -#: src/octoprint/server/views.py:155 +#: src/octoprint/plugins/softwareupdate/__init__.py:700 +#: src/octoprint/server/views.py:162 #: 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 @@ -600,129 +598,161 @@ msgstr "Software Update" msgid "OctoPrint" msgstr "OctoPrint" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:26 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:29 msgid "Release" msgstr "Release" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:27 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:30 msgid "Commit" msgstr "Commit" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:133 +#, python-format +msgid "%(name)s: %(version)s" +msgstr "%(name)s: %(version)s" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:136 +msgid "unknown" +msgstr "unbekannt" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:166 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:161 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:14 +msgid "Release Notes" +msgstr "Release Notes" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 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:164 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:185 msgid "Update Available" msgstr "Aktualisierung verfügbar" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:176 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:197 msgid "Ignore" msgstr "Ignorieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 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:184 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:205 msgid "Update now" msgstr "Jetzt aktualisieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:222 msgid "Everything is up-to-date" msgstr "Alles ist auf dem neusten Stand" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:266 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 msgid "Updating..." msgstr "Aktualisiere..." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:267 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:288 msgid "Now updating, please wait." msgstr "Aktualisiere gerade, bitte warten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:286 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:314 msgid "Update not started!" msgstr "Aktualisierung nicht gestartet!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:315 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:309 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:335 msgid "Can't update while printing" msgstr "Aktualisierung nicht möglich während gedruckt wird" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:310 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 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:314 -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:363 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 #, 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:371 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:397 msgid "Update successful, restarting!" msgstr "Aktualisierung erfolgreich, starte neu!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:372 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:398 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:383 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:409 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:451 msgid "Restart failed" msgstr "Neustart fehlgeschlagen" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:384 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:410 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 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:400 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 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:402 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:428 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:406 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 msgid "Update successful, restart required!" msgstr "Aktualisierung erfolgreich, Neustart notwendig!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:419 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 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:421 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:447 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:439 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:465 msgid "Update successful!" msgstr "Aktualisierung erfolgreich!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:440 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:466 msgid "The update finished successfully." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:478 msgid "Update failed!" msgstr "Aktualisierung fehlgeschlagen!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:453 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:479 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.jinja2:4 +msgid "Are you sure you want to update now?" +msgstr "Bist Du sicher, dass du jetzt aktualisieren willst?" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:8 +msgid "This will update the following components and restart the server:" +msgstr "Das wird die folgenden Komponenten aktualisieren und den Server neu starten." + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:19 +msgid "Be sure to read through any linked release notes, especially those for OctoPrint since they might contain important information you need to know before upgrading." +msgstr "Bitte lies alle verlinkten Release Notes, insbesondere die von OctoPrint, da diese wichtige Informationen behinhalten könnten, die Du for dem Softwareupdate wissen solltest." + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:22 +#: src/octoprint/templates/dialogs/confirmation.jinja2:8 +msgid "Are you sure you want to proceed?" +msgstr "Bist Du sicher, dass du fortfahren willst?" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:27 +#: src/octoprint/templates/dialogs/confirmation.jinja2:12 +msgid "Proceed" +msgstr "Fortfahren" + #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:1 msgid "" "\n" @@ -766,240 +796,264 @@ msgstr "Installiert:" msgid "Available:" msgstr "Verfügbar:" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:36 +msgid "Release Notes:" +msgstr "Release Notes:" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:60 msgid "Check for update now" msgstr "Jetzt nach Aktualisierungen suchen" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:64 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 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:65 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:66 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:77 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:78 msgid "OctoPrint checkout folder" msgstr "Checkoutverzeichnis von OctoPrint " -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:84 msgid "OctoPrint version tracking" msgstr "Versionstracking für OctoPrint" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:89 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:90 msgid "Version cache TTL" msgstr "TTL des Versionscaches" -#: src/octoprint/server/views.py:64 +#: src/octoprint/server/views.py:71 msgid "Plugins" msgstr "Plugins" -#: src/octoprint/server/views.py:121 +#: src/octoprint/server/views.py:128 msgid "Connection" msgstr "Verbindung" -#: src/octoprint/server/views.py:122 +#: src/octoprint/server/views.py:129 msgid "State" msgstr "Status" -#: src/octoprint/server/views.py:123 +#: src/octoprint/server/views.py:130 msgid "Files" msgstr "Dateien" -#: src/octoprint/server/views.py:129 +#: src/octoprint/server/views.py:136 msgid "Temperature" msgstr "Temperatur" -#: src/octoprint/server/views.py:130 +#: src/octoprint/server/views.py:137 msgid "Control" msgstr "Steuerung" -#: src/octoprint/server/views.py:131 +#: src/octoprint/server/views.py:138 msgid "Terminal" msgstr "Terminal" -#: src/octoprint/server/views.py:134 +#: src/octoprint/server/views.py:141 msgid "GCode Viewer" msgstr "GCode Viewer" -#: src/octoprint/server/views.py:136 +#: src/octoprint/server/views.py:143 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "Zeitraffer" -#: src/octoprint/server/views.py:141 +#: src/octoprint/server/views.py:148 msgid "Printer" msgstr "Drucker" -#: src/octoprint/server/views.py:143 +#: src/octoprint/server/views.py:150 msgid "Serial Connection" msgstr "Serielle Verbindung" -#: src/octoprint/server/views.py:144 +#: src/octoprint/server/views.py:151 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "Druckerprofile" -#: src/octoprint/server/views.py:145 +#: src/octoprint/server/views.py:152 msgid "Temperatures" msgstr "Temperaturen" -#: src/octoprint/server/views.py:146 +#: src/octoprint/server/views.py:153 msgid "Terminal Filters" msgstr "Terminalfilter" -#: src/octoprint/server/views.py:147 +#: src/octoprint/server/views.py:154 msgid "GCODE Scripts" msgstr "GCODE Scripts" -#: src/octoprint/server/views.py:149 src/octoprint/server/views.py:151 +#: src/octoprint/server/views.py:156 src/octoprint/server/views.py:158 msgid "Features" msgstr "Funktionen" -#: src/octoprint/server/views.py:152 +#: src/octoprint/server/views.py:159 msgid "Webcam" msgstr "Webcam" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:160 msgid "API" msgstr "API" -#: src/octoprint/server/views.py:157 +#: src/octoprint/server/views.py:164 #: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "Verzeichnisse" -#: src/octoprint/server/views.py:158 +#: src/octoprint/server/views.py:165 msgid "Appearance" msgstr "Aussehen" -#: src/octoprint/server/views.py:159 +#: src/octoprint/server/views.py:166 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "Logs" -#: src/octoprint/server/views.py:160 +#: src/octoprint/server/views.py:167 msgid "Server" msgstr "Server" -#: src/octoprint/server/views.py:163 +#: src/octoprint/server/views.py:170 msgid "Access Control" msgstr "Zugangsbeschränkung" -#: src/octoprint/server/views.py:169 +#: src/octoprint/server/views.py:176 msgid "Access" msgstr "Zugriff" -#: src/octoprint/server/views.py:170 +#: src/octoprint/server/views.py:177 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/dataupdater.js:95 +#: src/octoprint/static/js/app/dataupdater.js:130 #: src/octoprint/static/js/app/helpers.js:464 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "Der Server ist offline" -#: src/octoprint/static/js/app/dataupdater.js:67 +#: src/octoprint/static/js/app/dataupdater.js:96 msgid "The server appears to be offline, at least I'm not getting any response from it. I'll try to reconnect automatically over the next couple of minutes, however you are welcome to try a manual reconnect anytime using the button below." msgstr "Der Server scheint offline zu sein, zumindest kann ich mich nicht mit ihm verbinden. Ich werde in den nächsten Minuten versuchen mich erneut zu verbinden, aber Du kannst mittels des folgenden Buttons auch jederzeit einen manuellen Verbindungsversuch anstoßen." -#: src/octoprint/static/js/app/dataupdater.js:101 +#: src/octoprint/static/js/app/dataupdater.js:131 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:169 -#: src/octoprint/static/js/app/dataupdater.js:222 +#: src/octoprint/static/js/app/dataupdater.js:210 +#: src/octoprint/static/js/app/dataupdater.js:316 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "Slice ... (%(percentage)d%%)" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:232 msgid "Rendering timelapse" msgstr "Zeitrafferaufnahme wird gerendert" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:233 #, python-format -msgid "Now rendering timelapse %(movie_basename)s" -msgstr "Rendere Zeitrafferaufnahme %(movie_basename)s" +msgid "Now rendering timelapse %(movie_basename)s. Due to performance reasons it is not recommended to start a print job while a movie is still rendering." +msgstr "Rendere jetzt die Zeitrafferaufnahme %(movie_basename)s. Aus Gründen der Performance ist es nicht empfehlenswert, einen Druckauftrage zu starten, so lange die Aufnahme noch gerendert wird." -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:246 msgid "Timelapse ready" msgstr "Zeitrafferaufnahme fertig" -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:247 #, 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:191 +#: src/octoprint/static/js/app/dataupdater.js:258 #, 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:194 +#: src/octoprint/static/js/app/dataupdater.js:265 msgid "Rendering failed" msgstr "Rendering fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:200 +#: src/octoprint/static/js/app/dataupdater.js:278 msgid "Capturing timelapse postroll" msgstr "Zeichne Timelapse-Postroll auf" -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:282 msgid "Now capturing timelapse post roll, this will take only a moment..." msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird nur einen Moment dauern..." -#: src/octoprint/static/js/app/dataupdater.js:207 +#: src/octoprint/static/js/app/dataupdater.js:289 #, python-format msgid "%(minutes)d min" msgstr "%(minutes)d Min" -#: src/octoprint/static/js/app/dataupdater.js:209 +#: src/octoprint/static/js/app/dataupdater.js:290 +#, python-format +msgid "Now capturing timelapse post roll, this will take approximately %(duration)s (so until %(time)s)..." +msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird voraussichtlich %(duration)s dauern (also etwa bis %(time)s)..." + +#: src/octoprint/static/js/app/dataupdater.js:292 #, python-format msgid "%(seconds)d sec" msgstr "%(seconds) Sek" -#: src/octoprint/static/js/app/dataupdater.js:211 +#: src/octoprint/static/js/app/dataupdater.js:293 #, python-format msgid "Now capturing timelapse post roll, this will take approximately %(duration)s..." msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird voraussichtlich %(duration)s dauern..." -#: src/octoprint/static/js/app/dataupdater.js:224 +#: src/octoprint/static/js/app/dataupdater.js:318 msgid "Slicing ..." msgstr "Slice ..." -#: src/octoprint/static/js/app/dataupdater.js:230 +#: src/octoprint/static/js/app/dataupdater.js:324 msgid "Slicing done" msgstr "Slicing abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:230 +#: src/octoprint/static/js/app/dataupdater.js:324 #, 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:240 +#: src/octoprint/static/js/app/dataupdater.js:334 #, 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:241 +#: src/octoprint/static/js/app/dataupdater.js:335 msgid "Slicing failed" msgstr "Slicing fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:245 +#: src/octoprint/static/js/app/dataupdater.js:339 msgid "Streaming ..." msgstr "Streaming ..." -#: src/octoprint/static/js/app/dataupdater.js:251 +#: src/octoprint/static/js/app/dataupdater.js:345 msgid "Streaming done" msgstr "Streaming abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:252 +#: src/octoprint/static/js/app/dataupdater.js:346 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden" +#: src/octoprint/static/js/app/dataupdater.js:352 +#: src/octoprint/static/js/app/dataupdater.js:360 +msgid "Unhandled firmware error" +msgstr "Unbehandelter Fehler der Firmware" + +#: src/octoprint/static/js/app/dataupdater.js:353 +#, python-format +msgid "The firmware reported an unhandled error. Due to that the ongoing print job was cancelled. Error: %(firmwareError)s" +msgstr "Die Firmware hat einen durch OctoPrint unbehandelten Fehler gemeldet. Daher wurder der laufende Druckauftrag abgebrochen. Fehler: %(firmwareError)s" + +#: src/octoprint/static/js/app/dataupdater.js:361 +#, python-format +msgid "The firmware reported an unhandled error. Due to that OctoPrint disconnected. Error: %(error)s" +msgstr "Die Firmware hat einen durch OctoPrint unbehandelten Fehler gemeldet. Daher hat OctoPrint die Verbindung getrennt. Fehler: %(error)s" + #: src/octoprint/static/js/app/helpers.js:385 #, python-format msgid "%(hour)02d:%(minute)02d:%(second)02d" @@ -1072,9 +1126,9 @@ msgid "Disconnect" msgstr "Trennen" #: src/octoprint/static/js/app/viewmodels/control.js:64 -#: src/octoprint/static/js/app/viewmodels/files.js:330 -#: src/octoprint/static/js/app/viewmodels/gcode.js:467 -#: src/octoprint/static/js/app/viewmodels/printerstate.js:167 +#: src/octoprint/static/js/app/viewmodels/files.js:334 +#: src/octoprint/static/js/app/viewmodels/gcode.js:468 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:177 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 msgid "Tool" msgstr "Werkzeug" @@ -1096,32 +1150,32 @@ msgstr "Dein verfügbarer freier Plattenplatz wird langsam knapp." msgid "Your current disk usage." msgstr "Dein aktuell verfügbarer freier Plattenplatz." -#: src/octoprint/static/js/app/viewmodels/files.js:325 -#: src/octoprint/static/js/app/viewmodels/files.js:330 +#: src/octoprint/static/js/app/viewmodels/files.js:329 +#: src/octoprint/static/js/app/viewmodels/files.js:334 msgid "Filament" msgstr "Filament" -#: src/octoprint/static/js/app/viewmodels/files.js:334 +#: src/octoprint/static/js/app/viewmodels/files.js:338 msgid "Estimated Print Time" msgstr "Geschätzte Druckdauer" -#: src/octoprint/static/js/app/viewmodels/files.js:337 +#: src/octoprint/static/js/app/viewmodels/files.js:341 msgid "Last Printed" msgstr "Zuletzt gedruckt" -#: src/octoprint/static/js/app/viewmodels/files.js:339 +#: src/octoprint/static/js/app/viewmodels/files.js:343 msgid "Last Print Time" msgstr "Letzte Druckdauer" -#: src/octoprint/static/js/app/viewmodels/files.js:420 +#: src/octoprint/static/js/app/viewmodels/files.js:525 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:436 +#: src/octoprint/static/js/app/viewmodels/files.js:546 msgid "Uploading ..." msgstr "Uploade ..." -#: src/octoprint/static/js/app/viewmodels/files.js:439 +#: src/octoprint/static/js/app/viewmodels/files.js:553 msgid "Saving ..." msgstr "Speichere ..." @@ -1146,43 +1200,47 @@ msgid "Model size" msgstr "Modelgröße" #: src/octoprint/static/js/app/viewmodels/gcode.js:435 +msgid "Estimated total print time" +msgstr "Geschätzte Gesamtdruckdauer" + +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "Estimated layer height" msgstr "Geschätzte Schichthöhe" -#: src/octoprint/static/js/app/viewmodels/gcode.js:435 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "mm" msgstr "mm" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "Layer count" msgstr "Schichtanzahl" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "printed" msgstr "gedruckt" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "visited" msgstr "besucht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:459 +#: src/octoprint/static/js/app/viewmodels/gcode.js:460 msgid "Layer number" msgstr "Schichtnummer" -#: src/octoprint/static/js/app/viewmodels/gcode.js:460 +#: src/octoprint/static/js/app/viewmodels/gcode.js:461 msgid "Layer height" msgstr "Schichthöhe" -#: src/octoprint/static/js/app/viewmodels/gcode.js:461 +#: src/octoprint/static/js/app/viewmodels/gcode.js:462 msgid "GCODE commands in layer" msgstr "GCODE Befehle in Schicht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:464 -#: src/octoprint/static/js/app/viewmodels/gcode.js:467 +#: src/octoprint/static/js/app/viewmodels/gcode.js:465 +#: src/octoprint/static/js/app/viewmodels/gcode.js:468 msgid "Filament used by layer" msgstr "Genutztes Filament in Schicht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:471 +#: src/octoprint/static/js/app/viewmodels/gcode.js:472 msgid "Print time for layer" msgstr "Druckdauer für Schicht" @@ -1192,11 +1250,11 @@ msgstr "Druckdauer für Schicht" msgid "Login" msgstr "Login" -#: src/octoprint/static/js/app/viewmodels/loginstate.js:91 +#: src/octoprint/static/js/app/viewmodels/loginstate.js:87 msgid "Login successful" msgstr "Login erfolgreich" -#: src/octoprint/static/js/app/viewmodels/loginstate.js:91 +#: src/octoprint/static/js/app/viewmodels/loginstate.js:87 #, python-format msgid "You are now logged in as \"%(username)s\"" msgstr "Du bist jetzt eingeloggt als \"%(username)s\"" @@ -1232,44 +1290,44 @@ msgid "Error" msgstr "Fehler" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:96 -#: src/octoprint/static/js/app/viewmodels/settings.js:57 -#: src/octoprint/static/js/app/viewmodels/settings.js:87 +#: src/octoprint/static/js/app/viewmodels/settings.js:60 +#: src/octoprint/static/js/app/viewmodels/settings.js:90 msgid "default" msgstr "Standard" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:97 -#: src/octoprint/static/js/app/viewmodels/settings.js:58 -#: src/octoprint/static/js/app/viewmodels/settings.js:71 +#: src/octoprint/static/js/app/viewmodels/settings.js:61 +#: src/octoprint/static/js/app/viewmodels/settings.js:74 msgid "red" msgstr "Rot" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:98 -#: src/octoprint/static/js/app/viewmodels/settings.js:59 -#: src/octoprint/static/js/app/viewmodels/settings.js:73 +#: src/octoprint/static/js/app/viewmodels/settings.js:62 +#: src/octoprint/static/js/app/viewmodels/settings.js:76 msgid "orange" msgstr "Orange" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:99 -#: src/octoprint/static/js/app/viewmodels/settings.js:60 -#: src/octoprint/static/js/app/viewmodels/settings.js:75 +#: src/octoprint/static/js/app/viewmodels/settings.js:63 +#: src/octoprint/static/js/app/viewmodels/settings.js:78 msgid "yellow" msgstr "Gelb" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:100 -#: src/octoprint/static/js/app/viewmodels/settings.js:61 -#: src/octoprint/static/js/app/viewmodels/settings.js:77 +#: src/octoprint/static/js/app/viewmodels/settings.js:64 +#: src/octoprint/static/js/app/viewmodels/settings.js:80 msgid "green" msgstr "Grün" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:101 -#: src/octoprint/static/js/app/viewmodels/settings.js:62 -#: src/octoprint/static/js/app/viewmodels/settings.js:79 +#: src/octoprint/static/js/app/viewmodels/settings.js:65 +#: src/octoprint/static/js/app/viewmodels/settings.js:82 msgid "blue" msgstr "Blau" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:102 -#: src/octoprint/static/js/app/viewmodels/settings.js:64 -#: src/octoprint/static/js/app/viewmodels/settings.js:83 +#: src/octoprint/static/js/app/viewmodels/settings.js:67 +#: src/octoprint/static/js/app/viewmodels/settings.js:86 msgid "black" msgstr "Schwarz" @@ -1320,66 +1378,66 @@ msgstr "Druckerprofil hinzufügen" msgid "Edit Printer Profile \"%(name)s\"" msgstr "Druckerprofile \"%(name)s\" bearbeiten" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:34 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:44 msgid "Restarts the print job from the beginning" msgstr "Started den Druckjob von vorne" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:35 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:45 msgid "Starts the print job" msgstr "Startet den Druckjob" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:36 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:46 msgid "Resumes the print job" msgstr "Setzt den Druckjob fort" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:37 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:47 msgid "Pauses the print job" msgstr "Pausiert den Druckjob" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:70 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:80 msgid "Calculating..." msgstr "Wird ermittelt..." -#: src/octoprint/static/js/app/viewmodels/printerstate.js:83 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:93 msgid "Continue" msgstr "Fortsetzen" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:85 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:95 #: src/octoprint/templates/sidebar/state.jinja2:18 msgid "Pause" msgstr "Pause" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:96 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:106 #: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "On Z Change" msgstr "Bei Ebenenwechsel" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:98 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:108 #: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "Timed" msgstr "Nach Zeit" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:98 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:108 #: src/octoprint/templates/tabs/timelapse.jinja2:25 #: src/octoprint/templates/tabs/timelapse.jinja2:32 msgid "sec" msgstr "Sek" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:206 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:216 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:63 -#: src/octoprint/static/js/app/viewmodels/settings.js:81 +#: src/octoprint/static/js/app/viewmodels/settings.js:66 +#: src/octoprint/static/js/app/viewmodels/settings.js:84 msgid "violet" msgstr "Violett" -#: src/octoprint/static/js/app/viewmodels/settings.js:65 -#: src/octoprint/static/js/app/viewmodels/settings.js:85 +#: src/octoprint/static/js/app/viewmodels/settings.js:68 +#: src/octoprint/static/js/app/viewmodels/settings.js:88 msgid "white" msgstr "weiß" -#: src/octoprint/static/js/app/viewmodels/settings.js:93 +#: src/octoprint/static/js/app/viewmodels/settings.js:96 msgid "Autodetect from browser" msgstr "Automatisch vom Browser erkennen" @@ -1424,22 +1482,22 @@ msgstr "Ist" msgid "Target" msgstr "Soll" -#: src/octoprint/static/js/app/viewmodels/terminal.js:61 +#: src/octoprint/static/js/app/viewmodels/terminal.js:105 #, python-format msgid "showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered, buffer full)" msgstr "zeige %(displayed)d Zeilen (%(filtered)d von %(total)d Zeilen gefiltert, Buffer voll)" -#: src/octoprint/static/js/app/viewmodels/terminal.js:63 +#: src/octoprint/static/js/app/viewmodels/terminal.js:107 #, python-format msgid "showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered)" msgstr "zeige %(displayed)d Zeilen (%(filtered)d von %(total)d Zeilen gefiltert)" -#: src/octoprint/static/js/app/viewmodels/terminal.js:67 +#: src/octoprint/static/js/app/viewmodels/terminal.js:111 #, python-format msgid "showing %(displayed)d lines (buffer full)" msgstr "zeige %(displayed)d Zeilen (Buffer voll)" -#: src/octoprint/static/js/app/viewmodels/terminal.js:69 +#: src/octoprint/static/js/app/viewmodels/terminal.js:113 #, python-format msgid "showing %(displayed)d lines" msgstr "zeige %(displayed)d Zeilen" @@ -1468,14 +1526,6 @@ msgstr "Bugs und Requests" msgid "Are you sure?" msgstr "Bist Du sicher?" -#: src/octoprint/templates/dialogs/confirmation.jinja2:8 -msgid "Are you sure you want to proceed?" -msgstr "Bist Du sicher, dass du fortfahren willst?" - -#: src/octoprint/templates/dialogs/confirmation.jinja2:12 -msgid "Proceed" -msgstr "Fortfahren" - #: src/octoprint/templates/dialogs/firstrun.jinja2:3 msgid "Configure Access Control" msgstr "Zugangsbeschränkung konfigurieren" @@ -1638,6 +1688,7 @@ msgstr "Admin" #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 #: src/octoprint/templates/tabs/timelapse.jinja2:57 +#: src/octoprint/templates/tabs/timelapse.jinja2:89 msgid "Action" msgstr "Aktion" @@ -1872,7 +1923,8 @@ msgstr "Falls der freie Plattenplatz unter diese Schwellwerte fallen sollte wird #: src/octoprint/templates/dialogs/settings/folders.jinja2:47 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69 -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:97 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:66 #: src/octoprint/templates/tabs/timelapse.jinja2:13 msgid "Warning" msgstr "Warnung" @@ -1915,6 +1967,7 @@ msgstr "Änderungsdatum" #: src/octoprint/templates/sidebar/files.jinja2:24 #: src/octoprint/templates/tabs/timelapse.jinja2:50 #: src/octoprint/templates/tabs/timelapse.jinja2:56 +#: src/octoprint/templates/tabs/timelapse.jinja2:88 msgid "Size" msgstr "Größe" @@ -2095,6 +2148,14 @@ 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/serialconnection.jinja2:90 +msgid "Not only cancel ongoing prints but also disconnect on unhandled errors from the firmware." +msgstr "Bei unbehalten Firmwarefehlern nicht nur den Druckauftrag abbrechen, sondern auch die Verbindung zum Drucker trennen." + +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:97 +msgid "Ignore any unhandled errors from the firmware. Only use this if your firmware sends stuff prefixed with \"Error\" that is not an actual error. Might mask printer issues, be careful!" +msgstr "Alle unbehalten Firmwarefehler ignorieren. Nur nutzen wenn Deine Firmware Dinge mit \"Error\" sendet die nicht wirklich Fehler sind. Könnte Druckerprobleme maskieren, vorsicht!" + #: src/octoprint/templates/dialogs/settings/server.jinja2:2 msgid "Commands" msgstr "Befehle" @@ -2303,6 +2364,10 @@ msgstr "Gesamt" 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." +#: src/octoprint/templates/sidebar/files_header.jinja2:2 +msgid "File list settings" +msgstr "Einstellungen der Dateiliste" + #: src/octoprint/templates/sidebar/files_header.jinja2:6 msgid "Sort by name" msgstr "Nach Name sortieren" @@ -2335,15 +2400,23 @@ msgstr "Nur auf SD abgelegte Dateien anzeigen" msgid "Hide successfully printed files" msgstr "Erfolgreich gedruckte Dateien verbergen" -#: src/octoprint/templates/sidebar/files_header.jinja2:28 +#: src/octoprint/templates/sidebar/files_header.jinja2:23 +msgid "Refresh file list" +msgstr "Dateiliste aktualisieren" + +#: src/octoprint/templates/sidebar/files_header.jinja2:30 +msgid "SD Card operations" +msgstr "SD Card Operationen" + +#: src/octoprint/templates/sidebar/files_header.jinja2:34 msgid "Initialize SD card" msgstr "SD-Karte initialisieren" -#: src/octoprint/templates/sidebar/files_header.jinja2:29 +#: src/octoprint/templates/sidebar/files_header.jinja2:35 msgid "Refresh SD files" msgstr "SD-Dateien aktualisieren" -#: src/octoprint/templates/sidebar/files_header.jinja2:30 +#: src/octoprint/templates/sidebar/files_header.jinja2:36 msgid "Release SD card" msgstr "SD-Karte auswerfen" @@ -2499,7 +2572,11 @@ msgstr "Auch nächste Schicht anzeigen" msgid "Reload" msgstr "Neu laden" -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:63 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 +msgid "Note that the time estimates in this tab are calculated by the GCODE viewer in your browser and might differ from the values calculated by the server that are displayed in the \"State\" and \"Files\" panels in the sidebar due to slightly different implementations." +msgstr "Beachte, dass die geschätzten Zeiten in diesem Tab durch den GCODE Viewer in Deinem Browser berechnet werden und sich von den durch den Server berechneten Werten unterscheiden können, die im \"Status\" und \"Dateien\" Bereich der Seitenleiste angezeigt werden. Die Ursache hierfür sind leicht unterschiedliche Implementierungen." + +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:67 msgid "" "

\n" " You've selected for printing which has a size of\n" @@ -2521,7 +2598,7 @@ msgstr "" " Bist Du sicher, dass du die Datei trotzdem visualisieren willst?\n" "

" -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:74 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:78 #, python-format msgid "Yes, please visualize %(name)s regardless of its size" msgstr "Ja, bitte visualisiere %(name)s unabhängig seiner Größe" @@ -2540,34 +2617,50 @@ msgstr "Setzen" msgid "Off" msgstr "Aus" -#: src/octoprint/templates/tabs/terminal.jinja2:3 +#: src/octoprint/templates/tabs/terminal.jinja2:4 msgid "Autoscroll" msgstr "Autoscroll" -#: src/octoprint/templates/tabs/terminal.jinja2:4 +#: src/octoprint/templates/tabs/terminal.jinja2:5 msgid "Scroll to end" msgstr "Zum Ende scrollen" -#: src/octoprint/templates/tabs/terminal.jinja2:4 +#: src/octoprint/templates/tabs/terminal.jinja2:5 msgid "Select all" msgstr "Alles auswählen" -#: src/octoprint/templates/tabs/terminal.jinja2:18 +#: src/octoprint/templates/tabs/terminal.jinja2:6 +msgid "For performance reasons only a limited amount of terminal functionality is enabled right now." +msgstr "Aus Gründen der Performance ist nur ein begrenzter Teil der Terminalfunktionalität zur Zeit verfügbar." + +#: src/octoprint/templates/tabs/terminal.jinja2:20 msgid "Send" msgstr "Senden" -#: src/octoprint/templates/tabs/terminal.jinja2:20 +#: src/octoprint/templates/tabs/terminal.jinja2:22 msgid "Hint: Use the arrow up/down keys to recall commands sent previously" msgstr "Hinweis: Nutze die Pfeil hoch/runter Tasten um vorher versandte Befehle wieder aufzurufen " -#: src/octoprint/templates/tabs/terminal.jinja2:27 +#: src/octoprint/templates/tabs/terminal.jinja2:30 msgid "Fake Acknowledgement" msgstr "Bestätigung faken" -#: src/octoprint/templates/tabs/terminal.jinja2:28 +#: src/octoprint/templates/tabs/terminal.jinja2:31 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/terminal.jinja2:34 +msgid "Force fancy functionality" +msgstr "Vollständige Funktionen erzwingen" + +#: src/octoprint/templates/tabs/terminal.jinja2:35 +msgid "Force terminal output during printing" +msgstr "Terminalausgabe beim Druck erzwingen" + +#: src/octoprint/templates/tabs/terminal.jinja2:36 +msgid "Some functionality of the terminal will be disabled if OctoPrint detects that your browser is too slow for that. You may force it back on here, but be aware that this might make your browser unresponsive." +msgstr "Einige Funktionen des Terminals werden deaktiviert, wenn OctoPrint erkennt, dass Dein Browser zu langsam dafür ist. Du kannst diese Funktionen hier wieder zwangsweise aktivieren, aber bitte bedenke, dass das zur Folge haben könnte, dass dein Browser nicht mehr oder nur sehr langsam reagiert." + #: 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." @@ -2624,6 +2717,22 @@ msgstr "Abgeschlossene Zeitraffer" msgid "Creation date" msgstr "Erstellungsdatum" +#: src/octoprint/templates/tabs/timelapse.jinja2:81 +msgid "Unrendered Timelapses" +msgstr "Ungerenderte Zeitrafferaufnahmen" + +#: src/octoprint/templates/tabs/timelapse.jinja2:87 +msgid "Frames" +msgstr "Frames" + +#: src/octoprint/templates/tabs/timelapse.jinja2:97 +msgid "Delete unrendered timelapse" +msgstr "Ungerenderte Zeitrafferaufnahme löschen" + +#: src/octoprint/templates/tabs/timelapse.jinja2:97 +msgid "Render timelapse" +msgstr "Zeitrafferaufnahme rendern" + #~ msgid "Total filament used" #~ msgstr "Gesamtmenge genutzten Filaments" @@ -2689,3 +2798,6 @@ msgstr "Erstellungsdatum" #~ 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." + +#~ msgid "Now rendering timelapse %(movie_basename)s" +#~ msgstr "Rendere Zeitrafferaufnahme %(movie_basename)s" diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index 3c036179c9b4bf2f94cc23550d13c134aba66664..22c641e2703e0d8dead063dac51fc227197db550 100644 GIT binary patch delta 13593 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 delta 9541 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 W&6+)KQlTlzn|!3i^vs(&*8B&5Y_$Ra diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index 51ae962a..edeec609 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -1,18 +1,14 @@ # German translations for OctoPrint. -# Copyright (C) 2014 The OctoPrint Project +# Copyright (C) 2016 The OctoPrint Project # This file is distributed under the same license as the OctoPrint project. +# FIRST AUTHOR , 2016. # -# Translators: -# demod , 2014 -# FIRST AUTHOR , 2014 -# Gina Häußge , 2014 -# Johannes Rebling , 2014 msgid "" msgstr "" "Project-Id-Version: OctoPrint\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-12-01 11:20+0100\n" -"PO-Revision-Date: 2015-12-01 11:37+0100\n" +"POT-Creation-Date: 2016-02-10 11:12+0100\n" +"PO-Revision-Date: 2016-02-10 11:25+0100\n" "Last-Translator: Gina Häußge \n" "Language: de\n" "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n" @@ -20,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.1.1\n" +"Generated-By: Babel 2.2.0\n" "X-Generator: Poedit 1.6.8\n" #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:1 @@ -87,6 +83,7 @@ msgstr "aufsteigend" #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 #: src/octoprint/templates/tabs/timelapse.jinja2:50 #: src/octoprint/templates/tabs/timelapse.jinja2:55 +#: src/octoprint/templates/tabs/timelapse.jinja2:86 msgid "Name" msgstr "Name" @@ -416,7 +413,7 @@ msgstr " Das pip Command ist konfiguriert, sudo zu #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:30 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:204 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:73 msgid "Plugin Configuration" msgstr "Pluginkonfiguration" @@ -523,8 +520,8 @@ msgid "This does not look like a valid plugin archive. Valid plugin archives sho 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/pluginmanager/templates/pluginmanager_settings.jinja2:182 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 -#: src/octoprint/templates/tabs/terminal.jinja2:25 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:63 +#: src/octoprint/templates/tabs/terminal.jinja2:27 msgid "Advanced options" msgstr "Erweiterte Optionen" @@ -573,7 +570,8 @@ msgid "Repository cache TTL" msgstr "Repository-Cache TTL" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:239 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:26 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 #: src/octoprint/templates/dialogs/confirmation.jinja2:11 #: src/octoprint/templates/dialogs/settings.jinja2:51 #: src/octoprint/templates/dialogs/slicing.jinja2:50 @@ -582,7 +580,7 @@ msgid "Cancel" msgstr "Abbruch" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:102 #: src/octoprint/templates/dialogs/settings.jinja2:52 msgid "Save" msgstr "Speichern" @@ -591,8 +589,8 @@ msgstr "Speichern" msgid "Software Update" msgstr "Software Update" -#: src/octoprint/plugins/softwareupdate/__init__.py:680 -#: src/octoprint/server/views.py:155 +#: src/octoprint/plugins/softwareupdate/__init__.py:700 +#: src/octoprint/server/views.py:162 #: 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 @@ -600,129 +598,161 @@ msgstr "Software Update" msgid "OctoPrint" msgstr "OctoPrint" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:26 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:29 msgid "Release" msgstr "Release" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:27 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:30 msgid "Commit" msgstr "Commit" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:133 +#, python-format +msgid "%(name)s: %(version)s" +msgstr "%(name)s: %(version)s" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:136 +msgid "unknown" +msgstr "unbekannt" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:166 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:161 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:14 +msgid "Release Notes" +msgstr "Release Notes" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 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:164 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:185 msgid "Update Available" msgstr "Aktualisierung verfügbar" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:176 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:197 msgid "Ignore" msgstr "Ignorieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 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:184 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:205 msgid "Update now" msgstr "Jetzt aktualisieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:222 msgid "Everything is up-to-date" msgstr "Alles ist auf dem neusten Stand" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:266 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 msgid "Updating..." msgstr "Aktualisiere..." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:267 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:288 msgid "Now updating, please wait." msgstr "Aktualisiere gerade, bitte warten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:286 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:314 msgid "Update not started!" msgstr "Aktualisierung nicht gestartet!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:315 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:309 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:335 msgid "Can't update while printing" msgstr "Aktualisierung nicht möglich während gedruckt wird" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:310 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 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:314 -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:363 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 #, 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:371 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:397 msgid "Update successful, restarting!" msgstr "Aktualisierung erfolgreich, starte neu!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:372 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:398 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:383 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:409 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:451 msgid "Restart failed" msgstr "Neustart fehlgeschlagen" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:384 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:410 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 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:400 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 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:402 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:428 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:406 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 msgid "Update successful, restart required!" msgstr "Aktualisierung erfolgreich, Neustart notwendig!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:419 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 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:421 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:447 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:439 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:465 msgid "Update successful!" msgstr "Aktualisierung erfolgreich!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:440 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:466 msgid "The update finished successfully." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:478 msgid "Update failed!" msgstr "Aktualisierung fehlgeschlagen!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:453 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:479 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.jinja2:4 +msgid "Are you sure you want to update now?" +msgstr "Bist Du sicher, dass du jetzt aktualisieren willst?" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:8 +msgid "This will update the following components and restart the server:" +msgstr "Das wird die folgenden Komponenten aktualisieren und den Server neu starten." + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:19 +msgid "Be sure to read through any linked release notes, especially those for OctoPrint since they might contain important information you need to know before upgrading." +msgstr "Bitte lies alle verlinkten Release Notes, insbesondere die von OctoPrint, da diese wichtige Informationen behinhalten könnten, die Du for dem Softwareupdate wissen solltest." + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:22 +#: src/octoprint/templates/dialogs/confirmation.jinja2:8 +msgid "Are you sure you want to proceed?" +msgstr "Bist Du sicher, dass du fortfahren willst?" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:27 +#: src/octoprint/templates/dialogs/confirmation.jinja2:12 +msgid "Proceed" +msgstr "Fortfahren" + #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:1 msgid "" "\n" @@ -766,240 +796,264 @@ msgstr "Installiert:" msgid "Available:" msgstr "Verfügbar:" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:36 +msgid "Release Notes:" +msgstr "Release Notes:" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:60 msgid "Check for update now" msgstr "Jetzt nach Aktualisierungen suchen" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:64 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 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:65 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:66 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:77 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:78 msgid "OctoPrint checkout folder" msgstr "Checkoutverzeichnis von OctoPrint " -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:84 msgid "OctoPrint version tracking" msgstr "Versionstracking für OctoPrint" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:89 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:90 msgid "Version cache TTL" msgstr "TTL des Versionscaches" -#: src/octoprint/server/views.py:64 +#: src/octoprint/server/views.py:71 msgid "Plugins" msgstr "Plugins" -#: src/octoprint/server/views.py:121 +#: src/octoprint/server/views.py:128 msgid "Connection" msgstr "Verbindung" -#: src/octoprint/server/views.py:122 +#: src/octoprint/server/views.py:129 msgid "State" msgstr "Status" -#: src/octoprint/server/views.py:123 +#: src/octoprint/server/views.py:130 msgid "Files" msgstr "Dateien" -#: src/octoprint/server/views.py:129 +#: src/octoprint/server/views.py:136 msgid "Temperature" msgstr "Temperatur" -#: src/octoprint/server/views.py:130 +#: src/octoprint/server/views.py:137 msgid "Control" msgstr "Steuerung" -#: src/octoprint/server/views.py:131 +#: src/octoprint/server/views.py:138 msgid "Terminal" msgstr "Terminal" -#: src/octoprint/server/views.py:134 +#: src/octoprint/server/views.py:141 msgid "GCode Viewer" msgstr "GCode Viewer" -#: src/octoprint/server/views.py:136 +#: src/octoprint/server/views.py:143 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "Zeitraffer" -#: src/octoprint/server/views.py:141 +#: src/octoprint/server/views.py:148 msgid "Printer" msgstr "Drucker" -#: src/octoprint/server/views.py:143 +#: src/octoprint/server/views.py:150 msgid "Serial Connection" msgstr "Serielle Verbindung" -#: src/octoprint/server/views.py:144 +#: src/octoprint/server/views.py:151 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "Druckerprofile" -#: src/octoprint/server/views.py:145 +#: src/octoprint/server/views.py:152 msgid "Temperatures" msgstr "Temperaturen" -#: src/octoprint/server/views.py:146 +#: src/octoprint/server/views.py:153 msgid "Terminal Filters" msgstr "Terminalfilter" -#: src/octoprint/server/views.py:147 +#: src/octoprint/server/views.py:154 msgid "GCODE Scripts" msgstr "GCODE Scripts" -#: src/octoprint/server/views.py:149 src/octoprint/server/views.py:151 +#: src/octoprint/server/views.py:156 src/octoprint/server/views.py:158 msgid "Features" msgstr "Funktionen" -#: src/octoprint/server/views.py:152 +#: src/octoprint/server/views.py:159 msgid "Webcam" msgstr "Webcam" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:160 msgid "API" msgstr "API" -#: src/octoprint/server/views.py:157 +#: src/octoprint/server/views.py:164 #: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "Verzeichnisse" -#: src/octoprint/server/views.py:158 +#: src/octoprint/server/views.py:165 msgid "Appearance" msgstr "Aussehen" -#: src/octoprint/server/views.py:159 +#: src/octoprint/server/views.py:166 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "Logs" -#: src/octoprint/server/views.py:160 +#: src/octoprint/server/views.py:167 msgid "Server" msgstr "Server" -#: src/octoprint/server/views.py:163 +#: src/octoprint/server/views.py:170 msgid "Access Control" msgstr "Zugangsbeschränkung" -#: src/octoprint/server/views.py:169 +#: src/octoprint/server/views.py:176 msgid "Access" msgstr "Zugriff" -#: src/octoprint/server/views.py:170 +#: src/octoprint/server/views.py:177 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/dataupdater.js:95 +#: src/octoprint/static/js/app/dataupdater.js:130 #: src/octoprint/static/js/app/helpers.js:464 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "Der Server ist offline" -#: src/octoprint/static/js/app/dataupdater.js:67 +#: src/octoprint/static/js/app/dataupdater.js:96 msgid "The server appears to be offline, at least I'm not getting any response from it. I'll try to reconnect automatically over the next couple of minutes, however you are welcome to try a manual reconnect anytime using the button below." msgstr "Der Server scheint offline zu sein, zumindest kann ich mich nicht mit ihm verbinden. Ich werde in den nächsten Minuten versuchen mich erneut zu verbinden, aber Du kannst mittels des folgenden Buttons auch jederzeit einen manuellen Verbindungsversuch anstoßen." -#: src/octoprint/static/js/app/dataupdater.js:101 +#: src/octoprint/static/js/app/dataupdater.js:131 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:169 -#: src/octoprint/static/js/app/dataupdater.js:222 +#: src/octoprint/static/js/app/dataupdater.js:210 +#: src/octoprint/static/js/app/dataupdater.js:316 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "Slice ... (%(percentage)d%%)" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:232 msgid "Rendering timelapse" msgstr "Zeitrafferaufnahme wird gerendert" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:233 #, python-format -msgid "Now rendering timelapse %(movie_basename)s" -msgstr "Rendere Zeitrafferaufnahme %(movie_basename)s" +msgid "Now rendering timelapse %(movie_basename)s. Due to performance reasons it is not recommended to start a print job while a movie is still rendering." +msgstr "Rendere jetzt die Zeitrafferaufnahme %(movie_basename)s. Aus Gründen der Performance ist es nicht empfehlenswert, einen Druckauftrage zu starten, so lange die Aufnahme noch gerendert wird." -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:246 msgid "Timelapse ready" msgstr "Zeitrafferaufnahme fertig" -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:247 #, 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:191 +#: src/octoprint/static/js/app/dataupdater.js:258 #, 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:194 +#: src/octoprint/static/js/app/dataupdater.js:265 msgid "Rendering failed" msgstr "Rendering fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:200 +#: src/octoprint/static/js/app/dataupdater.js:278 msgid "Capturing timelapse postroll" msgstr "Zeichne Timelapse-Postroll auf" -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:282 msgid "Now capturing timelapse post roll, this will take only a moment..." msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird nur einen Moment dauern..." -#: src/octoprint/static/js/app/dataupdater.js:207 +#: src/octoprint/static/js/app/dataupdater.js:289 #, python-format msgid "%(minutes)d min" msgstr "%(minutes)d Min" -#: src/octoprint/static/js/app/dataupdater.js:209 +#: src/octoprint/static/js/app/dataupdater.js:290 +#, python-format +msgid "Now capturing timelapse post roll, this will take approximately %(duration)s (so until %(time)s)..." +msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird voraussichtlich %(duration)s dauern (also etwa bis %(time)s)..." + +#: src/octoprint/static/js/app/dataupdater.js:292 #, python-format msgid "%(seconds)d sec" msgstr "%(seconds) Sek" -#: src/octoprint/static/js/app/dataupdater.js:211 +#: src/octoprint/static/js/app/dataupdater.js:293 #, python-format msgid "Now capturing timelapse post roll, this will take approximately %(duration)s..." msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird voraussichtlich %(duration)s dauern..." -#: src/octoprint/static/js/app/dataupdater.js:224 +#: src/octoprint/static/js/app/dataupdater.js:318 msgid "Slicing ..." msgstr "Slice ..." -#: src/octoprint/static/js/app/dataupdater.js:230 +#: src/octoprint/static/js/app/dataupdater.js:324 msgid "Slicing done" msgstr "Slicing abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:230 +#: src/octoprint/static/js/app/dataupdater.js:324 #, 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:240 +#: src/octoprint/static/js/app/dataupdater.js:334 #, 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:241 +#: src/octoprint/static/js/app/dataupdater.js:335 msgid "Slicing failed" msgstr "Slicing fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:245 +#: src/octoprint/static/js/app/dataupdater.js:339 msgid "Streaming ..." msgstr "Streaming ..." -#: src/octoprint/static/js/app/dataupdater.js:251 +#: src/octoprint/static/js/app/dataupdater.js:345 msgid "Streaming done" msgstr "Streaming abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:252 +#: src/octoprint/static/js/app/dataupdater.js:346 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden" +#: src/octoprint/static/js/app/dataupdater.js:352 +#: src/octoprint/static/js/app/dataupdater.js:360 +msgid "Unhandled firmware error" +msgstr "Unbehandelter Fehler der Firmware" + +#: src/octoprint/static/js/app/dataupdater.js:353 +#, python-format +msgid "The firmware reported an unhandled error. Due to that the ongoing print job was cancelled. Error: %(firmwareError)s" +msgstr "Die Firmware hat einen durch OctoPrint unbehandelten Fehler gemeldet. Daher wurder der laufende Druckauftrag abgebrochen. Fehler: %(firmwareError)s" + +#: src/octoprint/static/js/app/dataupdater.js:361 +#, python-format +msgid "The firmware reported an unhandled error. Due to that OctoPrint disconnected. Error: %(error)s" +msgstr "Die Firmware hat einen durch OctoPrint unbehandelten Fehler gemeldet. Daher hat OctoPrint die Verbindung getrennt. Fehler: %(error)s" + #: src/octoprint/static/js/app/helpers.js:385 #, python-format msgid "%(hour)02d:%(minute)02d:%(second)02d" @@ -1072,9 +1126,9 @@ msgid "Disconnect" msgstr "Trennen" #: src/octoprint/static/js/app/viewmodels/control.js:64 -#: src/octoprint/static/js/app/viewmodels/files.js:330 -#: src/octoprint/static/js/app/viewmodels/gcode.js:467 -#: src/octoprint/static/js/app/viewmodels/printerstate.js:167 +#: src/octoprint/static/js/app/viewmodels/files.js:334 +#: src/octoprint/static/js/app/viewmodels/gcode.js:468 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:177 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 msgid "Tool" msgstr "Werkzeug" @@ -1096,32 +1150,32 @@ msgstr "Dein verfügbarer freier Plattenplatz wird langsam knapp." msgid "Your current disk usage." msgstr "Dein aktuell verfügbarer freier Plattenplatz." -#: src/octoprint/static/js/app/viewmodels/files.js:325 -#: src/octoprint/static/js/app/viewmodels/files.js:330 +#: src/octoprint/static/js/app/viewmodels/files.js:329 +#: src/octoprint/static/js/app/viewmodels/files.js:334 msgid "Filament" msgstr "Filament" -#: src/octoprint/static/js/app/viewmodels/files.js:334 +#: src/octoprint/static/js/app/viewmodels/files.js:338 msgid "Estimated Print Time" msgstr "Geschätzte Druckdauer" -#: src/octoprint/static/js/app/viewmodels/files.js:337 +#: src/octoprint/static/js/app/viewmodels/files.js:341 msgid "Last Printed" msgstr "Zuletzt gedruckt" -#: src/octoprint/static/js/app/viewmodels/files.js:339 +#: src/octoprint/static/js/app/viewmodels/files.js:343 msgid "Last Print Time" msgstr "Letzte Druckdauer" -#: src/octoprint/static/js/app/viewmodels/files.js:420 +#: src/octoprint/static/js/app/viewmodels/files.js:525 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:436 +#: src/octoprint/static/js/app/viewmodels/files.js:546 msgid "Uploading ..." msgstr "Uploade ..." -#: src/octoprint/static/js/app/viewmodels/files.js:439 +#: src/octoprint/static/js/app/viewmodels/files.js:553 msgid "Saving ..." msgstr "Speichere ..." @@ -1146,43 +1200,47 @@ msgid "Model size" msgstr "Modelgröße" #: src/octoprint/static/js/app/viewmodels/gcode.js:435 +msgid "Estimated total print time" +msgstr "Geschätzte Gesamtdruckdauer" + +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "Estimated layer height" msgstr "Geschätzte Schichthöhe" -#: src/octoprint/static/js/app/viewmodels/gcode.js:435 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "mm" msgstr "mm" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "Layer count" msgstr "Schichtanzahl" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "printed" msgstr "gedruckt" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "visited" msgstr "besucht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:459 +#: src/octoprint/static/js/app/viewmodels/gcode.js:460 msgid "Layer number" msgstr "Schichtnummer" -#: src/octoprint/static/js/app/viewmodels/gcode.js:460 +#: src/octoprint/static/js/app/viewmodels/gcode.js:461 msgid "Layer height" msgstr "Schichthöhe" -#: src/octoprint/static/js/app/viewmodels/gcode.js:461 +#: src/octoprint/static/js/app/viewmodels/gcode.js:462 msgid "GCODE commands in layer" msgstr "GCODE Befehle in Schicht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:464 -#: src/octoprint/static/js/app/viewmodels/gcode.js:467 +#: src/octoprint/static/js/app/viewmodels/gcode.js:465 +#: src/octoprint/static/js/app/viewmodels/gcode.js:468 msgid "Filament used by layer" msgstr "Genutztes Filament in Schicht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:471 +#: src/octoprint/static/js/app/viewmodels/gcode.js:472 msgid "Print time for layer" msgstr "Druckdauer für Schicht" @@ -1192,11 +1250,11 @@ msgstr "Druckdauer für Schicht" msgid "Login" msgstr "Login" -#: src/octoprint/static/js/app/viewmodels/loginstate.js:91 +#: src/octoprint/static/js/app/viewmodels/loginstate.js:87 msgid "Login successful" msgstr "Login erfolgreich" -#: src/octoprint/static/js/app/viewmodels/loginstate.js:91 +#: src/octoprint/static/js/app/viewmodels/loginstate.js:87 #, python-format msgid "You are now logged in as \"%(username)s\"" msgstr "Du bist jetzt eingeloggt als \"%(username)s\"" @@ -1232,44 +1290,44 @@ msgid "Error" msgstr "Fehler" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:96 -#: src/octoprint/static/js/app/viewmodels/settings.js:57 -#: src/octoprint/static/js/app/viewmodels/settings.js:87 +#: src/octoprint/static/js/app/viewmodels/settings.js:60 +#: src/octoprint/static/js/app/viewmodels/settings.js:90 msgid "default" msgstr "Standard" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:97 -#: src/octoprint/static/js/app/viewmodels/settings.js:58 -#: src/octoprint/static/js/app/viewmodels/settings.js:71 +#: src/octoprint/static/js/app/viewmodels/settings.js:61 +#: src/octoprint/static/js/app/viewmodels/settings.js:74 msgid "red" msgstr "Rot" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:98 -#: src/octoprint/static/js/app/viewmodels/settings.js:59 -#: src/octoprint/static/js/app/viewmodels/settings.js:73 +#: src/octoprint/static/js/app/viewmodels/settings.js:62 +#: src/octoprint/static/js/app/viewmodels/settings.js:76 msgid "orange" msgstr "Orange" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:99 -#: src/octoprint/static/js/app/viewmodels/settings.js:60 -#: src/octoprint/static/js/app/viewmodels/settings.js:75 +#: src/octoprint/static/js/app/viewmodels/settings.js:63 +#: src/octoprint/static/js/app/viewmodels/settings.js:78 msgid "yellow" msgstr "Gelb" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:100 -#: src/octoprint/static/js/app/viewmodels/settings.js:61 -#: src/octoprint/static/js/app/viewmodels/settings.js:77 +#: src/octoprint/static/js/app/viewmodels/settings.js:64 +#: src/octoprint/static/js/app/viewmodels/settings.js:80 msgid "green" msgstr "Grün" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:101 -#: src/octoprint/static/js/app/viewmodels/settings.js:62 -#: src/octoprint/static/js/app/viewmodels/settings.js:79 +#: src/octoprint/static/js/app/viewmodels/settings.js:65 +#: src/octoprint/static/js/app/viewmodels/settings.js:82 msgid "blue" msgstr "Blau" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:102 -#: src/octoprint/static/js/app/viewmodels/settings.js:64 -#: src/octoprint/static/js/app/viewmodels/settings.js:83 +#: src/octoprint/static/js/app/viewmodels/settings.js:67 +#: src/octoprint/static/js/app/viewmodels/settings.js:86 msgid "black" msgstr "Schwarz" @@ -1320,66 +1378,66 @@ msgstr "Druckerprofil hinzufügen" msgid "Edit Printer Profile \"%(name)s\"" msgstr "Druckerprofile \"%(name)s\" bearbeiten" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:34 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:44 msgid "Restarts the print job from the beginning" msgstr "Started den Druckjob von vorne" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:35 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:45 msgid "Starts the print job" msgstr "Startet den Druckjob" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:36 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:46 msgid "Resumes the print job" msgstr "Setzt den Druckjob fort" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:37 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:47 msgid "Pauses the print job" msgstr "Pausiert den Druckjob" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:70 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:80 msgid "Calculating..." msgstr "Wird ermittelt..." -#: src/octoprint/static/js/app/viewmodels/printerstate.js:83 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:93 msgid "Continue" msgstr "Fortsetzen" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:85 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:95 #: src/octoprint/templates/sidebar/state.jinja2:18 msgid "Pause" msgstr "Pause" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:96 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:106 #: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "On Z Change" msgstr "Bei Ebenenwechsel" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:98 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:108 #: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "Timed" msgstr "Nach Zeit" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:98 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:108 #: src/octoprint/templates/tabs/timelapse.jinja2:25 #: src/octoprint/templates/tabs/timelapse.jinja2:32 msgid "sec" msgstr "Sek" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:206 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:216 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:63 -#: src/octoprint/static/js/app/viewmodels/settings.js:81 +#: src/octoprint/static/js/app/viewmodels/settings.js:66 +#: src/octoprint/static/js/app/viewmodels/settings.js:84 msgid "violet" msgstr "Violett" -#: src/octoprint/static/js/app/viewmodels/settings.js:65 -#: src/octoprint/static/js/app/viewmodels/settings.js:85 +#: src/octoprint/static/js/app/viewmodels/settings.js:68 +#: src/octoprint/static/js/app/viewmodels/settings.js:88 msgid "white" msgstr "weiß" -#: src/octoprint/static/js/app/viewmodels/settings.js:93 +#: src/octoprint/static/js/app/viewmodels/settings.js:96 msgid "Autodetect from browser" msgstr "Automatisch vom Browser erkennen" @@ -1424,22 +1482,22 @@ msgstr "Ist" msgid "Target" msgstr "Soll" -#: src/octoprint/static/js/app/viewmodels/terminal.js:61 +#: src/octoprint/static/js/app/viewmodels/terminal.js:105 #, python-format msgid "showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered, buffer full)" msgstr "zeige %(displayed)d Zeilen (%(filtered)d von %(total)d Zeilen gefiltert, Buffer voll)" -#: src/octoprint/static/js/app/viewmodels/terminal.js:63 +#: src/octoprint/static/js/app/viewmodels/terminal.js:107 #, python-format msgid "showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered)" msgstr "zeige %(displayed)d Zeilen (%(filtered)d von %(total)d Zeilen gefiltert)" -#: src/octoprint/static/js/app/viewmodels/terminal.js:67 +#: src/octoprint/static/js/app/viewmodels/terminal.js:111 #, python-format msgid "showing %(displayed)d lines (buffer full)" msgstr "zeige %(displayed)d Zeilen (Buffer voll)" -#: src/octoprint/static/js/app/viewmodels/terminal.js:69 +#: src/octoprint/static/js/app/viewmodels/terminal.js:113 #, python-format msgid "showing %(displayed)d lines" msgstr "zeige %(displayed)d Zeilen" @@ -1468,14 +1526,6 @@ msgstr "Bugs und Requests" msgid "Are you sure?" msgstr "Bist Du sicher?" -#: src/octoprint/templates/dialogs/confirmation.jinja2:8 -msgid "Are you sure you want to proceed?" -msgstr "Bist Du sicher, dass du fortfahren willst?" - -#: src/octoprint/templates/dialogs/confirmation.jinja2:12 -msgid "Proceed" -msgstr "Fortfahren" - #: src/octoprint/templates/dialogs/firstrun.jinja2:3 msgid "Configure Access Control" msgstr "Zugangsbeschränkung konfigurieren" @@ -1638,6 +1688,7 @@ msgstr "Admin" #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 #: src/octoprint/templates/tabs/timelapse.jinja2:57 +#: src/octoprint/templates/tabs/timelapse.jinja2:89 msgid "Action" msgstr "Aktion" @@ -1872,7 +1923,8 @@ msgstr "Falls der freie Plattenplatz unter diese Schwellwerte fallen sollte wird #: src/octoprint/templates/dialogs/settings/folders.jinja2:47 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:69 -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:97 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:66 #: src/octoprint/templates/tabs/timelapse.jinja2:13 msgid "Warning" msgstr "Warnung" @@ -1915,6 +1967,7 @@ msgstr "Änderungsdatum" #: src/octoprint/templates/sidebar/files.jinja2:24 #: src/octoprint/templates/tabs/timelapse.jinja2:50 #: src/octoprint/templates/tabs/timelapse.jinja2:56 +#: src/octoprint/templates/tabs/timelapse.jinja2:88 msgid "Size" msgstr "Größe" @@ -2095,6 +2148,14 @@ 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/serialconnection.jinja2:90 +msgid "Not only cancel ongoing prints but also disconnect on unhandled errors from the firmware." +msgstr "Bei unbehalten Firmwarefehlern nicht nur den Druckauftrag abbrechen, sondern auch die Verbindung zum Drucker trennen." + +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:97 +msgid "Ignore any unhandled errors from the firmware. Only use this if your firmware sends stuff prefixed with \"Error\" that is not an actual error. Might mask printer issues, be careful!" +msgstr "Alle unbehalten Firmwarefehler ignorieren. Nur nutzen wenn Deine Firmware Dinge mit \"Error\" sendet die nicht wirklich Fehler sind. Könnte Druckerprobleme maskieren, vorsicht!" + #: src/octoprint/templates/dialogs/settings/server.jinja2:2 msgid "Commands" msgstr "Befehle" @@ -2303,6 +2364,10 @@ msgstr "Gesamt" 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." +#: src/octoprint/templates/sidebar/files_header.jinja2:2 +msgid "File list settings" +msgstr "Einstellungen der Dateiliste" + #: src/octoprint/templates/sidebar/files_header.jinja2:6 msgid "Sort by name" msgstr "Nach Name sortieren" @@ -2335,15 +2400,23 @@ msgstr "Nur auf SD abgelegte Dateien anzeigen" msgid "Hide successfully printed files" msgstr "Erfolgreich gedruckte Dateien verbergen" -#: src/octoprint/templates/sidebar/files_header.jinja2:28 +#: src/octoprint/templates/sidebar/files_header.jinja2:23 +msgid "Refresh file list" +msgstr "Dateiliste aktualisieren" + +#: src/octoprint/templates/sidebar/files_header.jinja2:30 +msgid "SD Card operations" +msgstr "SD Card Operationen" + +#: src/octoprint/templates/sidebar/files_header.jinja2:34 msgid "Initialize SD card" msgstr "SD-Karte initialisieren" -#: src/octoprint/templates/sidebar/files_header.jinja2:29 +#: src/octoprint/templates/sidebar/files_header.jinja2:35 msgid "Refresh SD files" msgstr "SD-Dateien aktualisieren" -#: src/octoprint/templates/sidebar/files_header.jinja2:30 +#: src/octoprint/templates/sidebar/files_header.jinja2:36 msgid "Release SD card" msgstr "SD-Karte auswerfen" @@ -2499,7 +2572,11 @@ msgstr "Auch nächste Schicht anzeigen" msgid "Reload" msgstr "Neu laden" -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:63 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 +msgid "Note that the time estimates in this tab are calculated by the GCODE viewer in your browser and might differ from the values calculated by the server that are displayed in the \"State\" and \"Files\" panels in the sidebar due to slightly different implementations." +msgstr "Beachte, dass die geschätzten Zeiten in diesem Tab durch den GCODE Viewer in Deinem Browser berechnet werden und sich von den durch den Server berechneten Werten unterscheiden können, die im \"Status\" und \"Dateien\" Bereich der Seitenleiste angezeigt werden. Die Ursache hierfür sind leicht unterschiedliche Implementierungen." + +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:67 msgid "" "

\n" " You've selected for printing which has a size of\n" @@ -2521,7 +2598,7 @@ msgstr "" " Bist Du sicher, dass du die Datei trotzdem visualisieren willst?\n" "

" -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:74 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:78 #, python-format msgid "Yes, please visualize %(name)s regardless of its size" msgstr "Ja, bitte visualisiere %(name)s unabhängig seiner Größe" @@ -2540,34 +2617,50 @@ msgstr "Setzen" msgid "Off" msgstr "Aus" -#: src/octoprint/templates/tabs/terminal.jinja2:3 +#: src/octoprint/templates/tabs/terminal.jinja2:4 msgid "Autoscroll" msgstr "Autoscroll" -#: src/octoprint/templates/tabs/terminal.jinja2:4 +#: src/octoprint/templates/tabs/terminal.jinja2:5 msgid "Scroll to end" msgstr "Zum Ende scrollen" -#: src/octoprint/templates/tabs/terminal.jinja2:4 +#: src/octoprint/templates/tabs/terminal.jinja2:5 msgid "Select all" msgstr "Alles auswählen" -#: src/octoprint/templates/tabs/terminal.jinja2:18 +#: src/octoprint/templates/tabs/terminal.jinja2:6 +msgid "For performance reasons only a limited amount of terminal functionality is enabled right now." +msgstr "Aus Gründen der Performance ist nur ein begrenzter Teil der Terminalfunktionalität zur Zeit verfügbar." + +#: src/octoprint/templates/tabs/terminal.jinja2:20 msgid "Send" msgstr "Senden" -#: src/octoprint/templates/tabs/terminal.jinja2:20 +#: src/octoprint/templates/tabs/terminal.jinja2:22 msgid "Hint: Use the arrow up/down keys to recall commands sent previously" msgstr "Hinweis: Nutze die Pfeil hoch/runter Tasten um vorher versandte Befehle wieder aufzurufen " -#: src/octoprint/templates/tabs/terminal.jinja2:27 +#: src/octoprint/templates/tabs/terminal.jinja2:30 msgid "Fake Acknowledgement" msgstr "Bestätigung faken" -#: src/octoprint/templates/tabs/terminal.jinja2:28 +#: src/octoprint/templates/tabs/terminal.jinja2:31 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/terminal.jinja2:34 +msgid "Force fancy functionality" +msgstr "Vollständige Funktionen erzwingen" + +#: src/octoprint/templates/tabs/terminal.jinja2:35 +msgid "Force terminal output during printing" +msgstr "Terminalausgabe beim Druck erzwingen" + +#: src/octoprint/templates/tabs/terminal.jinja2:36 +msgid "Some functionality of the terminal will be disabled if OctoPrint detects that your browser is too slow for that. You may force it back on here, but be aware that this might make your browser unresponsive." +msgstr "Einige Funktionen des Terminals werden deaktiviert, wenn OctoPrint erkennt, dass Dein Browser zu langsam dafür ist. Du kannst diese Funktionen hier wieder zwangsweise aktivieren, aber bitte bedenke, dass das zur Folge haben könnte, dass dein Browser nicht mehr oder nur sehr langsam reagiert." + #: 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." @@ -2624,6 +2717,22 @@ msgstr "Abgeschlossene Zeitraffer" msgid "Creation date" msgstr "Erstellungsdatum" +#: src/octoprint/templates/tabs/timelapse.jinja2:81 +msgid "Unrendered Timelapses" +msgstr "Ungerenderte Zeitrafferaufnahmen" + +#: src/octoprint/templates/tabs/timelapse.jinja2:87 +msgid "Frames" +msgstr "Frames" + +#: src/octoprint/templates/tabs/timelapse.jinja2:97 +msgid "Delete unrendered timelapse" +msgstr "Ungerenderte Zeitrafferaufnahme löschen" + +#: src/octoprint/templates/tabs/timelapse.jinja2:97 +msgid "Render timelapse" +msgstr "Zeitrafferaufnahme rendern" + #~ msgid "Total filament used" #~ msgstr "Gesamtmenge genutzten Filaments" @@ -2689,3 +2798,6 @@ msgstr "Erstellungsdatum" #~ 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." + +#~ msgid "Now rendering timelapse %(movie_basename)s" +#~ msgstr "Rendere Zeitrafferaufnahme %(movie_basename)s" diff --git a/translations/messages.pot b/translations/messages.pot index ce58d5c6..df0a199a 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -1,21 +1,21 @@ # Translations template for OctoPrint. -# Copyright (C) 2015 The OctoPrint Project +# Copyright (C) 2016 The OctoPrint Project # This file is distributed under the same license as the OctoPrint project. -# FIRST AUTHOR , 2015. +# FIRST AUTHOR , 2016. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OctoPrint 1.2.8.dev50+gb8283b2\n" +"Project-Id-Version: OctoPrint 1.2.9.dev71+g92c65cb.dirty\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-12-01 11:20+0100\n" +"POT-Creation-Date: 2016-02-10 11:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.1.1\n" +"Generated-By: Babel 2.2.0\n" #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:1 #: src/octoprint/templates/tabs/control.jinja2:98 @@ -76,6 +76,7 @@ msgstr "" #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 #: src/octoprint/templates/tabs/timelapse.jinja2:50 #: src/octoprint/templates/tabs/timelapse.jinja2:55 +#: src/octoprint/templates/tabs/timelapse.jinja2:86 msgid "Name" msgstr "" @@ -440,7 +441,7 @@ msgstr "" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:30 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:204 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:73 msgid "Plugin Configuration" msgstr "" @@ -550,8 +551,8 @@ msgid "" msgstr "" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:182 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 -#: src/octoprint/templates/tabs/terminal.jinja2:25 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:63 +#: src/octoprint/templates/tabs/terminal.jinja2:27 msgid "Advanced options" msgstr "" @@ -610,7 +611,8 @@ msgid "Repository cache TTL" msgstr "" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:239 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:26 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 #: src/octoprint/templates/dialogs/confirmation.jinja2:11 #: src/octoprint/templates/dialogs/settings.jinja2:51 #: src/octoprint/templates/dialogs/slicing.jinja2:50 @@ -619,7 +621,7 @@ msgid "Cancel" msgstr "" #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:102 #: src/octoprint/templates/dialogs/settings.jinja2:52 msgid "Save" msgstr "" @@ -628,8 +630,8 @@ msgstr "" msgid "Software Update" msgstr "" -#: src/octoprint/plugins/softwareupdate/__init__.py:680 -#: src/octoprint/server/views.py:155 +#: src/octoprint/plugins/softwareupdate/__init__.py:700 +#: src/octoprint/server/views.py:162 #: 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 @@ -637,145 +639,180 @@ msgstr "" msgid "OctoPrint" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:26 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:29 msgid "Release" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:27 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:30 msgid "Commit" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:133 +#, python-format +msgid "%(name)s: %(version)s" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:136 +msgid "unknown" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:166 msgid "There are updates available for the following components:" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:161 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:14 +msgid "Release Notes" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 msgid "" "Those components marked with can be updated " "directly." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:164 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:185 msgid "Update Available" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:176 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:197 msgid "Ignore" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 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:184 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:205 msgid "Update now" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:222 msgid "Everything is up-to-date" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:266 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 msgid "Updating..." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:267 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:288 msgid "Now updating, please wait." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:286 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:314 msgid "Update not started!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:315 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:309 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:335 msgid "Can't update while printing" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:310 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 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:314 -msgid "This will update your OctoPrint installation and restart the server." -msgstr "" - -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:363 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 #, python-format msgid "Now updating %(name)s to %(version)s" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:371 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:397 msgid "Update successful, restarting!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:372 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:398 msgid "The update finished successfully and the server will now be restarted." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:383 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:409 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:451 msgid "Restart failed" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:384 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:410 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 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:400 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 msgid "The update finished successfully, please restart OctoPrint now." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:402 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:428 msgid "The update finished successfully, please reboot the server now." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 msgid "Update successful, restart required!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:419 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 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:421 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:447 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:439 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:465 msgid "Update successful!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:440 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:466 msgid "The update finished successfully." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:478 msgid "Update failed!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:453 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:479 msgid "" "The update did not finish successfully. Please consult the log for " "details." msgstr "" +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:4 +msgid "Are you sure you want to update now?" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:8 +msgid "This will update the following components and restart the server:" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:19 +msgid "" +"Be sure to read through any linked release notes, especially those for " +"OctoPrint since they might contain important information you need to know" +" before upgrading." +msgstr "" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:22 +#: src/octoprint/templates/dialogs/confirmation.jinja2:8 +msgid "Are you sure you want to proceed?" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2:27 +#: src/octoprint/templates/dialogs/confirmation.jinja2:12 +msgid "Proceed" +msgstr "" + #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:1 msgid "" "\n" @@ -828,142 +865,146 @@ msgstr "" msgid "Available:" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:59 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:36 +msgid "Release Notes:" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:60 msgid "Check for update now" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:64 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 msgid "Force check for update (overrides cache used for update checks)" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:65 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:66 msgid "Force update now (even if no new versions are available)" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:77 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:78 msgid "OctoPrint checkout folder" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:83 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:84 msgid "OctoPrint version tracking" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:89 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:90 msgid "Version cache TTL" msgstr "" -#: src/octoprint/server/views.py:64 +#: src/octoprint/server/views.py:71 msgid "Plugins" msgstr "" -#: src/octoprint/server/views.py:121 +#: src/octoprint/server/views.py:128 msgid "Connection" msgstr "" -#: src/octoprint/server/views.py:122 +#: src/octoprint/server/views.py:129 msgid "State" msgstr "" -#: src/octoprint/server/views.py:123 +#: src/octoprint/server/views.py:130 msgid "Files" msgstr "" -#: src/octoprint/server/views.py:129 +#: src/octoprint/server/views.py:136 msgid "Temperature" msgstr "" -#: src/octoprint/server/views.py:130 +#: src/octoprint/server/views.py:137 msgid "Control" msgstr "" -#: src/octoprint/server/views.py:131 +#: src/octoprint/server/views.py:138 msgid "Terminal" msgstr "" -#: src/octoprint/server/views.py:134 +#: src/octoprint/server/views.py:141 msgid "GCode Viewer" msgstr "" -#: src/octoprint/server/views.py:136 +#: src/octoprint/server/views.py:143 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "" -#: src/octoprint/server/views.py:141 +#: src/octoprint/server/views.py:148 msgid "Printer" msgstr "" -#: src/octoprint/server/views.py:143 +#: src/octoprint/server/views.py:150 msgid "Serial Connection" msgstr "" -#: src/octoprint/server/views.py:144 +#: src/octoprint/server/views.py:151 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "" -#: src/octoprint/server/views.py:145 +#: src/octoprint/server/views.py:152 msgid "Temperatures" msgstr "" -#: src/octoprint/server/views.py:146 +#: src/octoprint/server/views.py:153 msgid "Terminal Filters" msgstr "" -#: src/octoprint/server/views.py:147 +#: src/octoprint/server/views.py:154 msgid "GCODE Scripts" msgstr "" -#: src/octoprint/server/views.py:149 src/octoprint/server/views.py:151 +#: src/octoprint/server/views.py:156 src/octoprint/server/views.py:158 msgid "Features" msgstr "" -#: src/octoprint/server/views.py:152 +#: src/octoprint/server/views.py:159 msgid "Webcam" msgstr "" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:160 msgid "API" msgstr "" -#: src/octoprint/server/views.py:157 +#: src/octoprint/server/views.py:164 #: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "" -#: src/octoprint/server/views.py:158 +#: src/octoprint/server/views.py:165 msgid "Appearance" msgstr "" -#: src/octoprint/server/views.py:159 +#: src/octoprint/server/views.py:166 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "" -#: src/octoprint/server/views.py:160 +#: src/octoprint/server/views.py:167 msgid "Server" msgstr "" -#: src/octoprint/server/views.py:163 +#: src/octoprint/server/views.py:170 msgid "Access Control" msgstr "" -#: src/octoprint/server/views.py:169 +#: src/octoprint/server/views.py:176 msgid "Access" msgstr "" -#: src/octoprint/server/views.py:170 +#: src/octoprint/server/views.py:177 msgid "Interface" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:66 -#: src/octoprint/static/js/app/dataupdater.js:100 +#: src/octoprint/static/js/app/dataupdater.js:95 +#: src/octoprint/static/js/app/dataupdater.js:130 #: src/octoprint/static/js/app/helpers.js:464 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:67 +#: src/octoprint/static/js/app/dataupdater.js:96 msgid "" "The server appears to be offline, at least I'm not getting any response " "from it. I'll try to reconnect automatically over the next couple" @@ -971,108 +1012,137 @@ msgid "" "anytime using the button below." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:101 +#: src/octoprint/static/js/app/dataupdater.js:131 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 "" -#: src/octoprint/static/js/app/dataupdater.js:169 -#: src/octoprint/static/js/app/dataupdater.js:222 +#: src/octoprint/static/js/app/dataupdater.js:210 +#: src/octoprint/static/js/app/dataupdater.js:316 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:232 msgid "Rendering timelapse" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:187 +#: src/octoprint/static/js/app/dataupdater.js:233 #, python-format -msgid "Now rendering timelapse %(movie_basename)s" +msgid "" +"Now rendering timelapse %(movie_basename)s. Due to performance reasons it" +" is not recommended to start a print job while a movie is still " +"rendering." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:246 msgid "Timelapse ready" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:189 +#: src/octoprint/static/js/app/dataupdater.js:247 #, python-format msgid "New timelapse %(movie_basename)s is done rendering." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:191 +#: src/octoprint/static/js/app/dataupdater.js:258 #, python-format msgid "" "Rendering of timelapse %(movie_basename)s failed with return code " "%(returncode)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:194 +#: src/octoprint/static/js/app/dataupdater.js:265 msgid "Rendering failed" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:200 +#: src/octoprint/static/js/app/dataupdater.js:278 msgid "Capturing timelapse postroll" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:204 +#: src/octoprint/static/js/app/dataupdater.js:282 msgid "Now capturing timelapse post roll, this will take only a moment..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:207 +#: src/octoprint/static/js/app/dataupdater.js:289 #, python-format msgid "%(minutes)d min" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:209 +#: src/octoprint/static/js/app/dataupdater.js:290 +#, python-format +msgid "" +"Now capturing timelapse post roll, this will take approximately " +"%(duration)s (so until %(time)s)..." +msgstr "" + +#: src/octoprint/static/js/app/dataupdater.js:292 #, python-format msgid "%(seconds)d sec" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:211 +#: src/octoprint/static/js/app/dataupdater.js:293 #, python-format msgid "" "Now capturing timelapse post roll, this will take approximately " "%(duration)s..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:224 +#: src/octoprint/static/js/app/dataupdater.js:318 msgid "Slicing ..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:230 +#: src/octoprint/static/js/app/dataupdater.js:324 msgid "Slicing done" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:230 +#: src/octoprint/static/js/app/dataupdater.js:324 #, python-format msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:240 +#: src/octoprint/static/js/app/dataupdater.js:334 #, python-format msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:241 +#: src/octoprint/static/js/app/dataupdater.js:335 msgid "Slicing failed" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:245 +#: src/octoprint/static/js/app/dataupdater.js:339 msgid "Streaming ..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:251 +#: src/octoprint/static/js/app/dataupdater.js:345 msgid "Streaming done" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:252 +#: src/octoprint/static/js/app/dataupdater.js:346 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "" +#: src/octoprint/static/js/app/dataupdater.js:352 +#: src/octoprint/static/js/app/dataupdater.js:360 +msgid "Unhandled firmware error" +msgstr "" + +#: src/octoprint/static/js/app/dataupdater.js:353 +#, python-format +msgid "" +"The firmware reported an unhandled error. Due to that the ongoing print " +"job was cancelled. Error: %(firmwareError)s" +msgstr "" + +#: src/octoprint/static/js/app/dataupdater.js:361 +#, python-format +msgid "" +"The firmware reported an unhandled error. Due to that OctoPrint " +"disconnected. Error: %(error)s" +msgstr "" + #: src/octoprint/static/js/app/helpers.js:385 #, python-format msgid "%(hour)02d:%(minute)02d:%(second)02d" @@ -1145,9 +1215,9 @@ msgid "Disconnect" msgstr "" #: src/octoprint/static/js/app/viewmodels/control.js:64 -#: src/octoprint/static/js/app/viewmodels/files.js:330 -#: src/octoprint/static/js/app/viewmodels/gcode.js:467 -#: src/octoprint/static/js/app/viewmodels/printerstate.js:167 +#: src/octoprint/static/js/app/viewmodels/files.js:334 +#: src/octoprint/static/js/app/viewmodels/gcode.js:468 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:177 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 msgid "Tool" msgstr "" @@ -1169,35 +1239,35 @@ msgstr "" msgid "Your current disk usage." msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:325 -#: src/octoprint/static/js/app/viewmodels/files.js:330 +#: src/octoprint/static/js/app/viewmodels/files.js:329 +#: src/octoprint/static/js/app/viewmodels/files.js:334 msgid "Filament" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:334 +#: src/octoprint/static/js/app/viewmodels/files.js:338 msgid "Estimated Print Time" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:337 +#: src/octoprint/static/js/app/viewmodels/files.js:341 msgid "Last Printed" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:339 +#: src/octoprint/static/js/app/viewmodels/files.js:343 msgid "Last Print Time" msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:420 +#: src/octoprint/static/js/app/viewmodels/files.js:525 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:436 +#: src/octoprint/static/js/app/viewmodels/files.js:546 msgid "Uploading ..." msgstr "" -#: src/octoprint/static/js/app/viewmodels/files.js:439 +#: src/octoprint/static/js/app/viewmodels/files.js:553 msgid "Saving ..." msgstr "" @@ -1225,43 +1295,47 @@ msgid "Model size" msgstr "" #: src/octoprint/static/js/app/viewmodels/gcode.js:435 +msgid "Estimated total print time" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "Estimated layer height" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:435 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "mm" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "Layer count" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "printed" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:436 +#: src/octoprint/static/js/app/viewmodels/gcode.js:437 msgid "visited" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:459 +#: src/octoprint/static/js/app/viewmodels/gcode.js:460 msgid "Layer number" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:460 +#: src/octoprint/static/js/app/viewmodels/gcode.js:461 msgid "Layer height" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:461 +#: src/octoprint/static/js/app/viewmodels/gcode.js:462 msgid "GCODE commands in layer" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:464 -#: src/octoprint/static/js/app/viewmodels/gcode.js:467 +#: src/octoprint/static/js/app/viewmodels/gcode.js:465 +#: src/octoprint/static/js/app/viewmodels/gcode.js:468 msgid "Filament used by layer" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:471 +#: src/octoprint/static/js/app/viewmodels/gcode.js:472 msgid "Print time for layer" msgstr "" @@ -1271,11 +1345,11 @@ msgstr "" msgid "Login" msgstr "" -#: src/octoprint/static/js/app/viewmodels/loginstate.js:91 +#: src/octoprint/static/js/app/viewmodels/loginstate.js:87 msgid "Login successful" msgstr "" -#: src/octoprint/static/js/app/viewmodels/loginstate.js:91 +#: src/octoprint/static/js/app/viewmodels/loginstate.js:87 #, python-format msgid "You are now logged in as \"%(username)s\"" msgstr "" @@ -1311,44 +1385,44 @@ msgid "Error" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:96 -#: src/octoprint/static/js/app/viewmodels/settings.js:57 -#: src/octoprint/static/js/app/viewmodels/settings.js:87 +#: src/octoprint/static/js/app/viewmodels/settings.js:60 +#: src/octoprint/static/js/app/viewmodels/settings.js:90 msgid "default" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:97 -#: src/octoprint/static/js/app/viewmodels/settings.js:58 -#: src/octoprint/static/js/app/viewmodels/settings.js:71 +#: src/octoprint/static/js/app/viewmodels/settings.js:61 +#: src/octoprint/static/js/app/viewmodels/settings.js:74 msgid "red" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:98 -#: src/octoprint/static/js/app/viewmodels/settings.js:59 -#: src/octoprint/static/js/app/viewmodels/settings.js:73 +#: src/octoprint/static/js/app/viewmodels/settings.js:62 +#: src/octoprint/static/js/app/viewmodels/settings.js:76 msgid "orange" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:99 -#: src/octoprint/static/js/app/viewmodels/settings.js:60 -#: src/octoprint/static/js/app/viewmodels/settings.js:75 +#: src/octoprint/static/js/app/viewmodels/settings.js:63 +#: src/octoprint/static/js/app/viewmodels/settings.js:78 msgid "yellow" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:100 -#: src/octoprint/static/js/app/viewmodels/settings.js:61 -#: src/octoprint/static/js/app/viewmodels/settings.js:77 +#: src/octoprint/static/js/app/viewmodels/settings.js:64 +#: src/octoprint/static/js/app/viewmodels/settings.js:80 msgid "green" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:101 -#: src/octoprint/static/js/app/viewmodels/settings.js:62 -#: src/octoprint/static/js/app/viewmodels/settings.js:79 +#: src/octoprint/static/js/app/viewmodels/settings.js:65 +#: src/octoprint/static/js/app/viewmodels/settings.js:82 msgid "blue" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerprofiles.js:102 -#: src/octoprint/static/js/app/viewmodels/settings.js:64 -#: src/octoprint/static/js/app/viewmodels/settings.js:83 +#: src/octoprint/static/js/app/viewmodels/settings.js:67 +#: src/octoprint/static/js/app/viewmodels/settings.js:86 msgid "black" msgstr "" @@ -1405,66 +1479,66 @@ msgstr "" msgid "Edit Printer Profile \"%(name)s\"" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:34 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:44 msgid "Restarts the print job from the beginning" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:35 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:45 msgid "Starts the print job" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:36 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:46 msgid "Resumes the print job" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:37 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:47 msgid "Pauses the print job" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:70 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:80 msgid "Calculating..." msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:83 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:93 msgid "Continue" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:85 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:95 #: src/octoprint/templates/sidebar/state.jinja2:18 msgid "Pause" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:96 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:106 #: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "On Z Change" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:98 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:108 #: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "Timed" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:98 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:108 #: src/octoprint/templates/tabs/timelapse.jinja2:25 #: src/octoprint/templates/tabs/timelapse.jinja2:32 msgid "sec" msgstr "" -#: src/octoprint/static/js/app/viewmodels/printerstate.js:206 +#: src/octoprint/static/js/app/viewmodels/printerstate.js:216 msgid "This will restart the print job from the beginning." msgstr "" -#: src/octoprint/static/js/app/viewmodels/settings.js:63 -#: src/octoprint/static/js/app/viewmodels/settings.js:81 +#: src/octoprint/static/js/app/viewmodels/settings.js:66 +#: src/octoprint/static/js/app/viewmodels/settings.js:84 msgid "violet" msgstr "" -#: src/octoprint/static/js/app/viewmodels/settings.js:65 -#: src/octoprint/static/js/app/viewmodels/settings.js:85 +#: src/octoprint/static/js/app/viewmodels/settings.js:68 +#: src/octoprint/static/js/app/viewmodels/settings.js:88 msgid "white" msgstr "" -#: src/octoprint/static/js/app/viewmodels/settings.js:93 +#: src/octoprint/static/js/app/viewmodels/settings.js:96 msgid "Autodetect from browser" msgstr "" @@ -1509,26 +1583,26 @@ msgstr "" msgid "Target" msgstr "" -#: src/octoprint/static/js/app/viewmodels/terminal.js:61 +#: src/octoprint/static/js/app/viewmodels/terminal.js:105 #, python-format msgid "" "showing %(displayed)d lines (%(filtered)d of %(total)d total lines " "filtered, buffer full)" msgstr "" -#: src/octoprint/static/js/app/viewmodels/terminal.js:63 +#: src/octoprint/static/js/app/viewmodels/terminal.js:107 #, python-format msgid "" "showing %(displayed)d lines (%(filtered)d of %(total)d total lines " "filtered)" msgstr "" -#: src/octoprint/static/js/app/viewmodels/terminal.js:67 +#: src/octoprint/static/js/app/viewmodels/terminal.js:111 #, python-format msgid "showing %(displayed)d lines (buffer full)" msgstr "" -#: src/octoprint/static/js/app/viewmodels/terminal.js:69 +#: src/octoprint/static/js/app/viewmodels/terminal.js:113 #, python-format msgid "showing %(displayed)d lines" msgstr "" @@ -1557,14 +1631,6 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: src/octoprint/templates/dialogs/confirmation.jinja2:8 -msgid "Are you sure you want to proceed?" -msgstr "" - -#: src/octoprint/templates/dialogs/confirmation.jinja2:12 -msgid "Proceed" -msgstr "" - #: src/octoprint/templates/dialogs/firstrun.jinja2:3 msgid "Configure Access Control" msgstr "" @@ -1721,6 +1787,7 @@ msgstr "" #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 #: src/octoprint/templates/tabs/timelapse.jinja2:57 +#: src/octoprint/templates/tabs/timelapse.jinja2:89 msgid "Action" msgstr "" @@ -1971,7 +2038,8 @@ 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/dialogs/settings/serialconnection.jinja2:97 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:66 #: src/octoprint/templates/tabs/timelapse.jinja2:13 msgid "Warning" msgstr "" @@ -2014,6 +2082,7 @@ msgstr "" #: src/octoprint/templates/sidebar/files.jinja2:24 #: src/octoprint/templates/tabs/timelapse.jinja2:50 #: src/octoprint/templates/tabs/timelapse.jinja2:56 +#: src/octoprint/templates/tabs/timelapse.jinja2:88 msgid "Size" msgstr "" @@ -2219,6 +2288,19 @@ msgid "" "/dev/ttyAMA*. One entry per line." msgstr "" +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:90 +msgid "" +"Not only cancel ongoing prints but also disconnect on unhandled errors " +"from the firmware." +msgstr "" + +#: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:97 +msgid "" +"Ignore any unhandled errors from the firmware. Only use this if your " +"firmware sends stuff prefixed with \"Error\" that is not an actual error." +" Might mask printer issues, be careful!" +msgstr "" + #: src/octoprint/templates/dialogs/settings/server.jinja2:2 msgid "Commands" msgstr "" @@ -2435,6 +2517,10 @@ msgstr "" msgid "Hint: You can also drag and drop files on this page to upload them." msgstr "" +#: src/octoprint/templates/sidebar/files_header.jinja2:2 +msgid "File list settings" +msgstr "" + #: src/octoprint/templates/sidebar/files_header.jinja2:6 msgid "Sort by name" msgstr "" @@ -2467,15 +2553,23 @@ msgstr "" msgid "Hide successfully printed files" msgstr "" -#: src/octoprint/templates/sidebar/files_header.jinja2:28 -msgid "Initialize SD card" -msgstr "" - -#: src/octoprint/templates/sidebar/files_header.jinja2:29 -msgid "Refresh SD files" +#: src/octoprint/templates/sidebar/files_header.jinja2:23 +msgid "Refresh file list" msgstr "" #: src/octoprint/templates/sidebar/files_header.jinja2:30 +msgid "SD Card operations" +msgstr "" + +#: src/octoprint/templates/sidebar/files_header.jinja2:34 +msgid "Initialize SD card" +msgstr "" + +#: src/octoprint/templates/sidebar/files_header.jinja2:35 +msgid "Refresh SD files" +msgstr "" + +#: src/octoprint/templates/sidebar/files_header.jinja2:36 msgid "Release SD card" msgstr "" @@ -2633,7 +2727,15 @@ msgstr "" msgid "Reload" msgstr "" -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:63 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:62 +msgid "" +"Note that the time estimates in this tab are calculated by the GCODE " +"viewer in your browser and might differ from the values calculated by the" +" server that are displayed in the \"State\" and \"Files\" panels in the " +"sidebar due to slightly different implementations." +msgstr "" + +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:67 msgid "" "

\n" " You've selected " msgstr "" -#: src/octoprint/templates/tabs/gcodeviewer.jinja2:74 +#: src/octoprint/templates/tabs/gcodeviewer.jinja2:78 #, python-format msgid "Yes, please visualize %(name)s regardless of its size" msgstr "" @@ -2669,31 +2771,37 @@ msgstr "" msgid "Off" msgstr "" -#: src/octoprint/templates/tabs/terminal.jinja2:3 +#: src/octoprint/templates/tabs/terminal.jinja2:4 msgid "Autoscroll" msgstr "" -#: src/octoprint/templates/tabs/terminal.jinja2:4 +#: src/octoprint/templates/tabs/terminal.jinja2:5 msgid "Scroll to end" msgstr "" -#: src/octoprint/templates/tabs/terminal.jinja2:4 +#: src/octoprint/templates/tabs/terminal.jinja2:5 msgid "Select all" msgstr "" -#: src/octoprint/templates/tabs/terminal.jinja2:18 -msgid "Send" +#: src/octoprint/templates/tabs/terminal.jinja2:6 +msgid "" +"For performance reasons only a limited amount of terminal functionality " +"is enabled right now." msgstr "" #: src/octoprint/templates/tabs/terminal.jinja2:20 +msgid "Send" +msgstr "" + +#: src/octoprint/templates/tabs/terminal.jinja2:22 msgid "Hint: Use the arrow up/down keys to recall commands sent previously" msgstr "" -#: src/octoprint/templates/tabs/terminal.jinja2:27 +#: src/octoprint/templates/tabs/terminal.jinja2:30 msgid "Fake Acknowledgement" msgstr "" -#: src/octoprint/templates/tabs/terminal.jinja2:28 +#: src/octoprint/templates/tabs/terminal.jinja2:31 msgid "" "If acknowledgements (\"ok\"s) sent by the firmware get lost due to issues" " with the serial communication to your printer, OctoPrint's communication" @@ -2703,6 +2811,21 @@ msgid "" "results and which you should therefore try to resolve!" msgstr "" +#: src/octoprint/templates/tabs/terminal.jinja2:34 +msgid "Force fancy functionality" +msgstr "" + +#: src/octoprint/templates/tabs/terminal.jinja2:35 +msgid "Force terminal output during printing" +msgstr "" + +#: src/octoprint/templates/tabs/terminal.jinja2:36 +msgid "" +"Some functionality of the terminal will be disabled if OctoPrint detects " +"that your browser is too slow for that. You may force it back on here, " +"but be aware that this might make your browser unresponsive." +msgstr "" + #: src/octoprint/templates/tabs/timelapse.jinja2:3 msgid "" "Take note that timelapse configuration is disabled while your printer is " @@ -2765,3 +2888,19 @@ msgstr "" msgid "Creation date" msgstr "" +#: src/octoprint/templates/tabs/timelapse.jinja2:81 +msgid "Unrendered Timelapses" +msgstr "" + +#: src/octoprint/templates/tabs/timelapse.jinja2:87 +msgid "Frames" +msgstr "" + +#: src/octoprint/templates/tabs/timelapse.jinja2:97 +msgid "Delete unrendered timelapse" +msgstr "" + +#: src/octoprint/templates/tabs/timelapse.jinja2:97 +msgid "Render timelapse" +msgstr "" + From 742818c2caa24e25c74308f5ef1be0e8b7712e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 14:34:33 +0100 Subject: [PATCH 06/10] Delete unrendered legacy timelapses when encountering them --- src/octoprint/timelapse.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py index 4be6025d..1887c96e 100644 --- a/src/octoprint/timelapse.py +++ b/src/octoprint/timelapse.py @@ -22,6 +22,8 @@ from octoprint.events import eventManager, Events import sarge import collections +import re + # currently configured timelapse current = None @@ -32,6 +34,10 @@ current_render_job = None _capture_format = "{prefix}-%d.jpg" _output_format = "{prefix}.mpg" +# old capture format, needed to delete old left-overs from +# versions <1.2.9 +_old_capture_format_re = re.compile("^tmp_\d{5}.jpg$") + # valid timelapses _valid_timelapse_types = ["off", "timed", "zchange"] @@ -129,14 +135,30 @@ def delete_old_unrendered_timelapses(): clean_after_days = settings().getInt(["webcam", "cleanTmpAfterDays"]) cutoff = time.time() - clean_after_days * 24 * 60 * 60 + prefixes_to_clean = [] for filename in os.listdir(basedir): try: path = os.path.join(basedir, filename) + + prefix = _extract_prefix(filename) + if prefix is None: + # might be an old tmp_00000.jpg kinda frame. we can't + # render those easily anymore, so delete that stuff + if _old_capture_format_re.match(filename): + os.remove(path) + continue + + if prefix in prefixes_to_clean: + continue + if os.path.getmtime(path) < cutoff: - os.remove(path) + prefixes_to_clean.append(prefix) except: logging.getLogger(__name__).exception("Error while processing file {} during cleanup".format(filename)) + for prefix in prefixes_to_clean: + delete_unrendered_timelapse(prefix) + def _create_render_start_handler(name, gcode=None): def f(movie): From 99c65b8cf475d487994015d595bc117f265e3415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 14:34:53 +0100 Subject: [PATCH 07/10] Unit test for unrendered timelapse cleanup --- tests/timelapse/__init__.py | 9 ++ tests/timelapse/test_timelapse_helpers.py | 102 ++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 tests/timelapse/__init__.py create mode 100644 tests/timelapse/test_timelapse_helpers.py diff --git a/tests/timelapse/__init__.py b/tests/timelapse/__init__.py new file mode 100644 index 00000000..717536da --- /dev/null +++ b/tests/timelapse/__init__.py @@ -0,0 +1,9 @@ +# coding=utf-8 +""" +Unit tests for ``octoprint.timelapse``. +""" + +from __future__ import absolute_import + +__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' +__copyright__ = "Copyright (C) 2016 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/tests/timelapse/test_timelapse_helpers.py b/tests/timelapse/test_timelapse_helpers.py new file mode 100644 index 00000000..56acf962 --- /dev/null +++ b/tests/timelapse/test_timelapse_helpers.py @@ -0,0 +1,102 @@ +# coding=utf-8 +from __future__ import absolute_import + +__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' +__copyright__ = "Copyright (C) 2016 The OctoPrint Project - Released under terms of the AGPLv3 License" + +import unittest +import mock + +import os +import time + +import octoprint.settings +import octoprint.timelapse + +class TimelapseTest(unittest.TestCase): + + def setUp(self): + # mock settings + self.settings_patcher = mock.patch("octoprint.timelapse.settings") + self.settings_getter = self.settings_patcher.start() + + self.settings = mock.create_autospec(octoprint.settings.Settings) + self.settings_getter.return_value = self.settings + + self.now = time.time() + + def cleanUp(self): + self.settings_patcher.stop() + + @mock.patch("os.remove") + @mock.patch("os.listdir") + def test_delete_unrendered_timelapse(self, mock_listdir, mock_remove): + ## prepare + + mocked_path = "/path/to/timelapse/tmp" + mocked_files = ["a-0.jpg", + "a-1.jpg", + "a-2.jpg", + "b-0.jpg", + "b-1.jpg", + "tmp_00000.jpg", + "tmp_00001.jpg"] + + self.settings.getBaseFolder.return_value = mocked_path + mock_listdir.return_value = mocked_files + + ## test + octoprint.timelapse.delete_unrendered_timelapse("b") + + ## verify + expected_deletions = map(lambda x: os.path.join(mocked_path, x), ["b-0.jpg", + "b-1.jpg"]) + expected_deletion_calls = map(mock.call, expected_deletions) + self.assertListEqual(mock_remove.mock_calls, expected_deletion_calls) + + @mock.patch("time.time") + @mock.patch("os.remove") + @mock.patch("os.path.getmtime") + @mock.patch("os.listdir") + def test_delete_old_unrendered_timelapses(self, mock_listdir, mock_mtime, mock_remove, mock_time): + ## prepare + + mocked_path = "/path/to/timelapse/tmp" + mocked_files = ["old-0.jpg", + "old-1.jpg", + "old-2.jpg", + "prefix-0.jpg", + "prefix-1.jpg", + "tmp_00000.jpg", + "tmp_00001.jpg"] + now = self.now + days = 1 + + def mtime(p): + if p.startswith(os.path.join(mocked_path, "old-0")): + # old-0 is definitely older than cutoff + return 0 + else: + # all other files were just created + return now + + self.settings.getBaseFolder.return_value = mocked_path + self.settings.getInt.return_value = days + + mock_time.return_value = now + + mock_listdir.return_value = mocked_files + + mock_mtime.side_effect = mtime + + ## test + octoprint.timelapse.delete_old_unrendered_timelapses() + + ## verify + expected_deletions = map(lambda x: os.path.join(mocked_path, x), ["tmp_00000.jpg", + "tmp_00001.jpg", + "old-0.jpg", + "old-1.jpg", + "old-2.jpg"]) + expected_deletion_calls = map(mock.call, expected_deletions) + self.assertListEqual(mock_remove.mock_calls, expected_deletion_calls) From abe68adac8f465a31bf4f3f3933190c1fc242cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 14:47:18 +0100 Subject: [PATCH 08/10] Preparing release of 1.2.9 --- CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a07b2b19..4866ca00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,44 @@ # OctoPrint Changelog +## 1.2.9 (2016-02-10) + +### Improvements + + * [#318](https://github.com/foosel/OctoPrint/issues/318) - Snapshots for timelapses are now named in a non-colliding, job-based way, allowing a new timelapse to start while the other is still being rendered (although printing with an active timelapse rendering job is not recommended and will be solved with a proper render job queue in a later version). Timelapses that were not successfully rendered are kept for 7 days (configurable, although not via the UI so far) and can be manually rendered or deleted through a new UI component within the timelapse tab that shows up if unrendered timelapses are detected. + * [#485](https://github.com/foosel/OctoPrint/issues/485) - "Timelapse rendering" notification is now persistent, even across reloads/client switches. That should make it easier to see that a rendering job is currently in progress. + * [#939](https://github.com/foosel/OctoPrint/issues/939) - Updated to Knockout 3.4.0 + * [#1204](https://github.com/foosel/OctoPrint/issues/1204) - Display total print time as estimated by GCODE viewer on GCODE viewer tab. That will allow access to an estimate even if the server hadn't yet calculated that when a print started. Note that due to slightly different implementation server and client side the resulting estimate might differ. + * OctoPrint now serves an intermediary page upon start that informs the user about the server still starting up. Once the server is detected as running, the page automatically switches to the standard interface. + * OctoPrint now displays a link to the release notes of an updated component in the update notification, the update confirmation and the version overview in the settings dialog. Please always make sure to at least skim over the release notes for new OctoPrint releases, they might contain important information that you need to know before updating. + * Improved initial page loading speeds by introducing a preemptive cache. OctoPrint will now record how you access it and on server start pre-render the page so it's ideally available in the server-side cache when you try to access it. + * Initialize login user name and password with an empty string and clear both on successful login (see [#1175](https://github.com/foosel/OctoPrint/pull/1175)). + * Added a "Refresh" button to the file list for people who modify the stored files externally (doing this is not encouraged however due to reasons of book keeping, e.g. metadata tracking etc). + * "Save" button on settings dialog is now disabled while background tasks (getting or receiving config data from the backend) are in progress. + * Improved performance of terminal tab on lower powered clients. Adaptive rate limiting now ensures the server backs off with log updates if the client can't process them fast enough. If the client is really slow, log updates get disabled automatically during printing. This behaviour can be disabled with override buttons in the terminal tab's advanced options if necessary. + * Added option to ignore any unhandled errors reported by the firmware and another option to only cancel ongoing prints on unhandled errors from the firmware (instead of instant disconnect that so far was the default). + * Made version compatibility check PEP440 compliant (important for plugin authors). + * Do not hiccup on manually sent `M28` commands. + * Persist print recovery data on print failures (origin and name of printed file, position in file when print was aborted, time and date of print failure). Currently this data isn't used anywhere, but it [can be accessed from plugins in order to add recovery functionality](https://github.com/foosel/OctoPrint-PrintRecoveryPoc) to OctoPrint. + * Small performance improvements in update checks. + * The file upload dialog will now only display files having an extension that's supported for upload (if the browser supports it, also see [#1196](https://github.com/foosel/OctoPrint/issues/1196)). + +### Bug Fixes + + * [#1007](https://github.com/foosel/OctoPrint/issues/1007) - Don't enable the "Print" button if no print job is selected. + * [#1181](https://github.com/foosel/OctoPrint/issues/1181) - Properly slugify UTF-8 only file names. + * [#1196](https://github.com/foosel/OctoPrint/issues/1196) - Do not show drag-n-drop overlay if server is offline. + * [#1208](https://github.com/foosel/OctoPrint/issues/1208) - Fixed `retraction_combing` profile setting being incorrectly used by bundled Cura plugin (see [#1209](https://github.com/foosel/OctoPrint/pull/1209)) + * Fixed OctoPrint compatibility check in the plugin manager, could report `False` for development versions against certain versions of Python's `setuptools` (thanks to @ignaworm who stumbled over this). + * Fixed a missing parameter in `PluginSettings.remove` call (see [#1177](https://github.com/foosel/OctoPrint/pull/1177)). + * Docs: Fixed the example for a custom `M114` control to also match negative coordinates. + * Reset scroll position in settings dialog properly when re-opening it or switching tabs. + * Fixed an issue that prevented system menu entries that were added to a so far empty system menu make the menu show up. + * Fixed an issue that made requests to restricted resources fail even though the first run wizard had been completed successfully. + * Fixed an issue where an unknown command or the suppression of a command could cause the communication to stall until a communication timeout was triggered. + * Strip [unwanted ANSI characters](https://github.com/pypa/pip/issues/3418) from output produced by pip versions 8.0.0, 8.0.1 and 8.0.3 that prevents our plugin installation detection from working correctly. + +([Commits](https://github.com/foosel/OctoPrint/compare/1.2.8...1.2.9)) + ## 1.2.8 (2015-12-07) ### Notes for Upgraders From 3dd0ace076a00519f8ea553b02c6b0e04691bfe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 16:44:18 +0100 Subject: [PATCH 09/10] maintenance branch is now 1.2.10.dev --- .versioneer-lookup | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.versioneer-lookup b/.versioneer-lookup index d753c1c0..3172981e 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -14,11 +14,11 @@ master HEAD \(detached.* -# maintenance is currently the branch for preparation of maintenance release 1.2.9 +# maintenance is currently the branch for preparation of maintenance release 1.2.10 # so are any fix/... and improve/... branches -maintenance 1.2.9 dedadbc9ac0305799e94ae279d3bca131629c4c5 pep440-dev -fix/.* 1.2.9 dedadbc9ac0305799e94ae279d3bca131629c4c5 pep440-dev -improve/.* 1.2.9 dedadbc9ac0305799e94ae279d3bca131629c4c5 pep440-dev +maintenance 1.2.10 abe68adac8f465a31bf4f3f3933190c1fc242cda pep440-dev +fix/.* 1.2.10 abe68adac8f465a31bf4f3f3933190c1fc242cda pep440-dev +improve/.* 1.2.10 abe68adac8f465a31bf4f3f3933190c1fc242cda pep440-dev # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now .* 1.3.0 198d3450d94be1a2 pep440-dev From 3fb9248d2ace30164c48d44ed8eca81e01badf34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Feb 2016 16:44:46 +0100 Subject: [PATCH 10/10] More timelapse unit tests --- src/octoprint/timelapse.py | 2 +- tests/timelapse/test_timelapse_helpers.py | 70 +++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py index 1887c96e..d635d23a 100644 --- a/src/octoprint/timelapse.py +++ b/src/octoprint/timelapse.py @@ -99,7 +99,7 @@ def get_unrendered_timelapses(): del job["timestamp"] return job - return [util.dict_merge(dict(name=key), finalize_fields(value)) for key, value in jobs.items()] + return sorted([util.dict_merge(dict(name=key), finalize_fields(value)) for key, value in jobs.items()], key=lambda x: x["name"]) def delete_unrendered_timelapse(name): diff --git a/tests/timelapse/test_timelapse_helpers.py b/tests/timelapse/test_timelapse_helpers.py index 56acf962..5f3c108a 100644 --- a/tests/timelapse/test_timelapse_helpers.py +++ b/tests/timelapse/test_timelapse_helpers.py @@ -10,6 +10,9 @@ import mock import os import time +from collections import namedtuple +_stat = namedtuple("StatResult", "st_size, st_ctime, st_mtime") + import octoprint.settings import octoprint.timelapse @@ -100,3 +103,70 @@ class TimelapseTest(unittest.TestCase): "old-2.jpg"]) expected_deletion_calls = map(mock.call, expected_deletions) self.assertListEqual(mock_remove.mock_calls, expected_deletion_calls) + + @mock.patch("os.stat") + @mock.patch("os.listdir") + def test_get_finished_timelapses(self, mock_listdir, mock_stat): + + ## prepare + + files = dict() + files["one.mpg"] = _stat(st_size=1024, st_ctime=self.now, st_mtime=self.now) + files["nope.jpg"] = _stat(st_size=100, st_ctime=self.now, st_mtime=self.now) + files["two.mpg"] = _stat(st_size=2048, st_ctime=self.now, st_mtime=self.now) + + mocked_path = "/path/to/timelapse" + self.settings.getBaseFolder.return_value = mocked_path + + mock_listdir.return_value = sorted(files.keys()) + + def stat(p): + name = p[len(mocked_path) + 1:] + return files[name] + mock_stat.side_effect = stat + + ## test + result = octoprint.timelapse.get_finished_timelapses() + + ## verify + self.assertEqual(len(result), 2) + self.assertEqual(result[0]["name"], "one.mpg") + self.assertEqual(result[0]["bytes"], 1024) + self.assertEqual(result[1]["name"], "two.mpg") + self.assertEqual(result[1]["bytes"], 2048) + + @mock.patch("os.stat") + @mock.patch("os.listdir") + def test_unrendered_timelapses(self, mock_listdir, mock_stat): + ## prepare + files = dict() + files["one-0.jpg"] = _stat(st_size=1, st_ctime=self.now - 1, st_mtime=self.now - 1) + files["one-1.jpg"] = _stat(st_size=2, st_ctime=self.now, st_mtime=self.now) + files["one-2.jpg"] = _stat(st_size=3, st_ctime=self.now, st_mtime=self.now) + files["nope.mpg"] = _stat(st_size=2048, st_ctime=self.now, st_mtime=self.now) + files["two-0.jpg"] = _stat(st_size=4, st_ctime=self.now, st_mtime=self.now) + files["two-1.jpg"] = _stat(st_size=5, st_ctime=self.now, st_mtime=self.now) + + mocked_path = "/path/to/timelapse/tmp" + self.settings.getBaseFolder.return_value = mocked_path + + mock_listdir.return_value = sorted(files.keys()) + + def stat(p): + name = p[len(mocked_path) + 1:] + return files[name] + mock_stat.side_effect = stat + + ## test + result = octoprint.timelapse.get_unrendered_timelapses() + + ## verify + self.assertEqual(len(result), 2) + + self.assertEqual(result[0]["name"], "one") + self.assertEqual(result[0]["count"], 3) + self.assertEqual(result[0]["bytes"], 6) + + self.assertEqual(result[1]["name"], "two") + self.assertEqual(result[1]["count"], 2) + self.assertEqual(result[1]["bytes"], 9)