diff --git a/CHANGELOG.md b/CHANGELOG.md index 741659ea..a65fb195 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ # OctoPrint Changelog +## 1.2.12 (2016-06-08) + +### Improvements + + * [#1338](https://github.com/foosel/OctoPrint/issues/1338): Threshold configuration fields now include information about how to specify the thresholds. + * Mark unrendered timelapses currently being processed (recording or rendering) in the list and remove action buttons so no accidental double-processing can take place. + * Removed file extension from "rendering" and "rendered" notifications, was misleading when using the [mp4 wrapper script](https://github.com/guysoft/OctoPi/issues/184). + * Added some new events for manipulation of slicing profiles. + * Small fix of the german translation. + +### Bug Fixes + + * [#1314](https://github.com/foosel/OctoPrint/issues/1314): Do not change the extension of `.g` files being uploaded to SD (e.g. `auto0.g`) + * [#1320](https://github.com/foosel/OctoPrint/issues/1320): Allow deletion of *.mp4 timelapse files (see [this wrapper script](https://github.com/guysoft/OctoPi/issues/184)). + * [#1324](https://github.com/foosel/OctoPrint/issues/1324): Make daemonized OctoPrint properly clean up its pid file again (see also [#1330](https://github.com/foosel/OctoPrint/pull/1330)). + * [#1326](https://github.com/foosel/OctoPrint/issues/1326): Do not try to clean up an unrendered timelapse while it is already being deleted (and produce way too much logging output in the process). + * [#1343](https://github.com/foosel/OctoPrint/issues/1343): Events are now processed in the order they are fired in, making e.g. the "timelapse rendering" message always appear before "timelapse failed" and hence not stay on forever in case of a failed timelapse. + * [#1344](https://github.com/foosel/OctoPrint/issues/1344): `ProgressPlugin`s now get also notified about a progress of 0%. + * [#1357](https://github.com/foosel/OctoPrint/issues/1357): Fixed wrongly named method call on editing access control options for a user, causing that to not work properly. + * [#1361](https://github.com/foosel/OctoPrint/issues/1361): Properly reload profile list for currently selected slicer in the slicing dialog on change of profiles. + * Fixed concurrent message pushing to the frontend being able to break push messages for the session by forcing synchronization of SockJS message sending. + * Do not require admin rights for connecting/disconnecting, like it was in 1.1.x (note that this is supposed to become configurable behaviour once [#1110](https://github.com/foosel/OctoPrint/issues/1110) gets implemented) + +([Commits](https://github.com/foosel/OctoPrint/compare/1.2.11...1.2.12)) + ## 1.2.11 (2016-05-04) ### Important Announcement diff --git a/SUPPORTERS.md b/SUPPORTERS.md index 958f3c02..fef00f79 100644 --- a/SUPPORTERS.md +++ b/SUPPORTERS.md @@ -7,35 +7,59 @@ thanks to everyone who contributed! ## Patreon Patrons * 3D Moniak + * alephobjects * Andrew Moorby * Arnljot Arntsen * Aurelio Bernal Ramírez + * Bart Zudell + * Brad Jackson + * Brent Fiegle * Brian E. Tyler + * Charles Mitchell * Christian Petropolis * COLLE+McVOY * CreativeTools * D Brian Kimmel + * DeltaMaker 3D Printers * Doug Johnson * E3D BigBox * Erik de Bruijn * Ernesto Martinez * Exovite + * Frank Sander * georgeroblesjr * Gregor Luetolf + * Jason Galarneau + * Joe Korzeniewski * Joshua Gregory + * Kaile Riser * Kale Stedman + * Kevin Freeheart * Kyle Gress * Makespace Madrid + * Mark Lane + * Mark Qvist + * Mark Walker * Masayoshi Mitsui * Miguel Angel Salmeron - * MikeyDK + * Mikey + * Miles Flavel * Mohammed Khorakiwala * Noe Ruiz + * Paul Generes + * Peter Schmehl + * Roger Strolz * Roy Cortes * Samer Najia + * SD3D + * Shane Ekerbicer + * Simon * Stefan Krister + * stefi davis * Steven Pearson * Sven Mueller - * Tom + * Thomas Hatley + * Thomas Sanladerer + * Trent Shumay -and 414 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)! \ No newline at end of file +and 734 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)! \ No newline at end of file diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.mo b/src/octoprint/translations/de/LC_MESSAGES/messages.mo index 947535d8..bcdcf24a 100644 Binary files a/src/octoprint/translations/de/LC_MESSAGES/messages.mo and b/src/octoprint/translations/de/LC_MESSAGES/messages.mo differ diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.po b/src/octoprint/translations/de/LC_MESSAGES/messages.po index 9215382c..1aaf2389 100644 --- a/src/octoprint/translations/de/LC_MESSAGES/messages.po +++ b/src/octoprint/translations/de/LC_MESSAGES/messages.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2016-05-04 13:26+0200\n" -"PO-Revision-Date: 2016-05-09 15:26+0100\n" +"POT-Creation-Date: 2016-06-08 11:03+0200\n" +"PO-Revision-Date: 2016-06-08 11:04+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" @@ -976,128 +976,73 @@ msgstr "Zugriff" msgid "Interface" msgstr "Interface" -#: src/octoprint/static/js/app/dataupdater.js:94 -#: src/octoprint/static/js/app/dataupdater.js:129 +#: src/octoprint/static/js/app/dataupdater.js:92 +#: src/octoprint/static/js/app/dataupdater.js:127 #: src/octoprint/static/js/app/helpers.js:451 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "Der Server ist offline" -#: src/octoprint/static/js/app/dataupdater.js:95 +#: src/octoprint/static/js/app/dataupdater.js:93 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:130 +#: src/octoprint/static/js/app/dataupdater.js:128 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:208 -#: src/octoprint/static/js/app/dataupdater.js:314 +#: src/octoprint/static/js/app/dataupdater.js:206 +#: src/octoprint/static/js/app/dataupdater.js:226 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "Slice ... (%(percentage)d%%)" -#: src/octoprint/static/js/app/dataupdater.js:230 -msgid "Rendering timelapse" -msgstr "Zeitrafferaufnahme wird gerendert" - -#: src/octoprint/static/js/app/dataupdater.js:231 -#, python-format -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:244 -msgid "Timelapse ready" -msgstr "Zeitrafferaufnahme fertig" - -#: src/octoprint/static/js/app/dataupdater.js:245 -#, 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:256 -#, 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:263 -msgid "Rendering failed" -msgstr "Rendering fehlgeschlagen" - -#: src/octoprint/static/js/app/dataupdater.js:276 -msgid "Capturing timelapse postroll" -msgstr "Zeichne Timelapse-Postroll auf" - -#: src/octoprint/static/js/app/dataupdater.js:280 -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:287 -#, python-format -msgid "%(minutes)d min" -msgstr "%(minutes)d Min" - -#: src/octoprint/static/js/app/dataupdater.js:288 -#, 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:290 -#, python-format -msgid "%(seconds)d sec" -msgstr "%(seconds) Sek" - -#: src/octoprint/static/js/app/dataupdater.js:291 -#, 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:316 +#: src/octoprint/static/js/app/dataupdater.js:228 msgid "Slicing ..." msgstr "Slice ..." -#: src/octoprint/static/js/app/dataupdater.js:322 +#: src/octoprint/static/js/app/dataupdater.js:234 msgid "Slicing done" msgstr "Slicing abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:322 +#: src/octoprint/static/js/app/dataupdater.js:234 #, python-format msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds" msgstr "%(stl)s nach %(gcode)s geslicet, dauerte %(time).2f Sekunden" -#: src/octoprint/static/js/app/dataupdater.js:332 +#: src/octoprint/static/js/app/dataupdater.js:244 #, python-format msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s" msgstr "Konnte %(stl)s nicht nach %(gcode)s slicen: %(reason)s" -#: src/octoprint/static/js/app/dataupdater.js:333 +#: src/octoprint/static/js/app/dataupdater.js:245 msgid "Slicing failed" msgstr "Slicing fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:337 +#: src/octoprint/static/js/app/dataupdater.js:249 msgid "Streaming ..." msgstr "Streaming ..." -#: src/octoprint/static/js/app/dataupdater.js:343 +#: src/octoprint/static/js/app/dataupdater.js:255 msgid "Streaming done" msgstr "Streaming abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:344 +#: src/octoprint/static/js/app/dataupdater.js:256 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden" -#: src/octoprint/static/js/app/dataupdater.js:350 -#: src/octoprint/static/js/app/dataupdater.js:358 +#: src/octoprint/static/js/app/dataupdater.js:262 +#: src/octoprint/static/js/app/dataupdater.js:270 msgid "Unhandled communication error" msgstr "Unbehandelter Kommunikationsfehler" -#: src/octoprint/static/js/app/dataupdater.js:351 +#: src/octoprint/static/js/app/dataupdater.js:263 #, python-format msgid "There was an unhandled error while talking to the printer. Due to that the ongoing print job was cancelled. Error: %(firmwareError)s" msgstr "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem Drucker. Daher wurder der laufende Druckauftrag abgebrochen. Fehler: %(firmwareError)s" -#: src/octoprint/static/js/app/dataupdater.js:359 +#: src/octoprint/static/js/app/dataupdater.js:271 #, python-format msgid "The was an unhandled error while talking to the printer. Due to that OctoPrint disconnected. Error: %(error)s" msgstr "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem Drucker. Daher hat OctoPrint die Verbindung getrennt. Fehler: %(error)s" @@ -1550,6 +1495,61 @@ msgstr "zeige %(displayed)d Zeilen (Buffer voll)" msgid "showing %(displayed)d lines" msgstr "zeige %(displayed)d Zeilen" +#: src/octoprint/static/js/app/viewmodels/timelapse.js:255 +msgid "Capturing timelapse postroll" +msgstr "Zeichne Timelapse-Postroll auf" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:259 +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/viewmodels/timelapse.js:266 +#, python-format +msgid "%(minutes)d min" +msgstr "%(minutes)d Min" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:267 +#, 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/viewmodels/timelapse.js:269 +#, python-format +msgid "%(seconds)d sec" +msgstr "%(seconds) Sek" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:270 +#, 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/viewmodels/timelapse.js:283 +msgid "Rendering timelapse" +msgstr "Zeitrafferaufnahme wird gerendert" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:284 +#, python-format +msgid "Now rendering timelapse %(movie_prefix)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_prefix)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/viewmodels/timelapse.js:290 +#, python-format +msgid "Rendering of timelapse %(movie_prefix)s failed with return code %(returncode)s" +msgstr "Rendering der Zeitrafferaufnahme %(movie_prefix)s fehlgeschlagen mit Returncode %(returncode)s" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:294 +msgid "Rendering failed" +msgstr "Rendering fehlgeschlagen" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:303 +msgid "Timelapse ready" +msgstr "Zeitrafferaufnahme fertig" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:304 +#, python-format +msgid "New timelapse %(movie_prefix)s is done rendering." +msgstr "Neue Zeitrafferaufnahme %(movie_prefix)s wurde fertig gerendert" + #: src/octoprint/static/js/app/viewmodels/usersettings.js:10 msgid "Site default" msgstr "Seitenvoreinstellung" @@ -1994,6 +1994,10 @@ msgstr "Warnung" msgid "Critical" msgstr "Kritisch" +#: src/octoprint/templates/dialogs/settings/folders.jinja2:59 +msgid "Provide values including size unit. Allowed units are: b, byte, bytes, kb, mb, gb, tb (case insensitive). Example: 5MB, 500KB" +msgstr "Wert inklusive Größeneinheit. Erlaubte Einheiten sind: b, byte, bytes, kb, mb, gb, tb (Groß-/Kleinschreibung irrelevant). Beispiel: 5MB, 500KB" + #: src/octoprint/templates/dialogs/settings/gcodescripts.jinja2:3 msgid "Before print job starts" msgstr "Vor dem Start eines Druckjobs" @@ -2826,11 +2830,11 @@ msgstr "Ungerenderte Zeitrafferaufnahmen" msgid "Frames" msgstr "Frames" -#: src/octoprint/templates/tabs/timelapse.jinja2:97 +#: src/octoprint/templates/tabs/timelapse.jinja2:99 msgid "Delete unrendered timelapse" msgstr "Ungerenderte Zeitrafferaufnahme löschen" -#: src/octoprint/templates/tabs/timelapse.jinja2:97 +#: src/octoprint/templates/tabs/timelapse.jinja2:99 msgid "Render timelapse" msgstr "Zeitrafferaufnahme rendern" diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index 947535d8..bcdcf24a 100644 Binary files a/translations/de/LC_MESSAGES/messages.mo and b/translations/de/LC_MESSAGES/messages.mo differ diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index 9215382c..1aaf2389 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2016-05-04 13:26+0200\n" -"PO-Revision-Date: 2016-05-09 15:26+0100\n" +"POT-Creation-Date: 2016-06-08 11:03+0200\n" +"PO-Revision-Date: 2016-06-08 11:04+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" @@ -976,128 +976,73 @@ msgstr "Zugriff" msgid "Interface" msgstr "Interface" -#: src/octoprint/static/js/app/dataupdater.js:94 -#: src/octoprint/static/js/app/dataupdater.js:129 +#: src/octoprint/static/js/app/dataupdater.js:92 +#: src/octoprint/static/js/app/dataupdater.js:127 #: src/octoprint/static/js/app/helpers.js:451 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "Der Server ist offline" -#: src/octoprint/static/js/app/dataupdater.js:95 +#: src/octoprint/static/js/app/dataupdater.js:93 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:130 +#: src/octoprint/static/js/app/dataupdater.js:128 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:208 -#: src/octoprint/static/js/app/dataupdater.js:314 +#: src/octoprint/static/js/app/dataupdater.js:206 +#: src/octoprint/static/js/app/dataupdater.js:226 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "Slice ... (%(percentage)d%%)" -#: src/octoprint/static/js/app/dataupdater.js:230 -msgid "Rendering timelapse" -msgstr "Zeitrafferaufnahme wird gerendert" - -#: src/octoprint/static/js/app/dataupdater.js:231 -#, python-format -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:244 -msgid "Timelapse ready" -msgstr "Zeitrafferaufnahme fertig" - -#: src/octoprint/static/js/app/dataupdater.js:245 -#, 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:256 -#, 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:263 -msgid "Rendering failed" -msgstr "Rendering fehlgeschlagen" - -#: src/octoprint/static/js/app/dataupdater.js:276 -msgid "Capturing timelapse postroll" -msgstr "Zeichne Timelapse-Postroll auf" - -#: src/octoprint/static/js/app/dataupdater.js:280 -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:287 -#, python-format -msgid "%(minutes)d min" -msgstr "%(minutes)d Min" - -#: src/octoprint/static/js/app/dataupdater.js:288 -#, 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:290 -#, python-format -msgid "%(seconds)d sec" -msgstr "%(seconds) Sek" - -#: src/octoprint/static/js/app/dataupdater.js:291 -#, 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:316 +#: src/octoprint/static/js/app/dataupdater.js:228 msgid "Slicing ..." msgstr "Slice ..." -#: src/octoprint/static/js/app/dataupdater.js:322 +#: src/octoprint/static/js/app/dataupdater.js:234 msgid "Slicing done" msgstr "Slicing abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:322 +#: src/octoprint/static/js/app/dataupdater.js:234 #, python-format msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds" msgstr "%(stl)s nach %(gcode)s geslicet, dauerte %(time).2f Sekunden" -#: src/octoprint/static/js/app/dataupdater.js:332 +#: src/octoprint/static/js/app/dataupdater.js:244 #, python-format msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s" msgstr "Konnte %(stl)s nicht nach %(gcode)s slicen: %(reason)s" -#: src/octoprint/static/js/app/dataupdater.js:333 +#: src/octoprint/static/js/app/dataupdater.js:245 msgid "Slicing failed" msgstr "Slicing fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:337 +#: src/octoprint/static/js/app/dataupdater.js:249 msgid "Streaming ..." msgstr "Streaming ..." -#: src/octoprint/static/js/app/dataupdater.js:343 +#: src/octoprint/static/js/app/dataupdater.js:255 msgid "Streaming done" msgstr "Streaming abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:344 +#: src/octoprint/static/js/app/dataupdater.js:256 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden" -#: src/octoprint/static/js/app/dataupdater.js:350 -#: src/octoprint/static/js/app/dataupdater.js:358 +#: src/octoprint/static/js/app/dataupdater.js:262 +#: src/octoprint/static/js/app/dataupdater.js:270 msgid "Unhandled communication error" msgstr "Unbehandelter Kommunikationsfehler" -#: src/octoprint/static/js/app/dataupdater.js:351 +#: src/octoprint/static/js/app/dataupdater.js:263 #, python-format msgid "There was an unhandled error while talking to the printer. Due to that the ongoing print job was cancelled. Error: %(firmwareError)s" msgstr "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem Drucker. Daher wurder der laufende Druckauftrag abgebrochen. Fehler: %(firmwareError)s" -#: src/octoprint/static/js/app/dataupdater.js:359 +#: src/octoprint/static/js/app/dataupdater.js:271 #, python-format msgid "The was an unhandled error while talking to the printer. Due to that OctoPrint disconnected. Error: %(error)s" msgstr "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem Drucker. Daher hat OctoPrint die Verbindung getrennt. Fehler: %(error)s" @@ -1550,6 +1495,61 @@ msgstr "zeige %(displayed)d Zeilen (Buffer voll)" msgid "showing %(displayed)d lines" msgstr "zeige %(displayed)d Zeilen" +#: src/octoprint/static/js/app/viewmodels/timelapse.js:255 +msgid "Capturing timelapse postroll" +msgstr "Zeichne Timelapse-Postroll auf" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:259 +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/viewmodels/timelapse.js:266 +#, python-format +msgid "%(minutes)d min" +msgstr "%(minutes)d Min" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:267 +#, 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/viewmodels/timelapse.js:269 +#, python-format +msgid "%(seconds)d sec" +msgstr "%(seconds) Sek" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:270 +#, 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/viewmodels/timelapse.js:283 +msgid "Rendering timelapse" +msgstr "Zeitrafferaufnahme wird gerendert" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:284 +#, python-format +msgid "Now rendering timelapse %(movie_prefix)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_prefix)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/viewmodels/timelapse.js:290 +#, python-format +msgid "Rendering of timelapse %(movie_prefix)s failed with return code %(returncode)s" +msgstr "Rendering der Zeitrafferaufnahme %(movie_prefix)s fehlgeschlagen mit Returncode %(returncode)s" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:294 +msgid "Rendering failed" +msgstr "Rendering fehlgeschlagen" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:303 +msgid "Timelapse ready" +msgstr "Zeitrafferaufnahme fertig" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:304 +#, python-format +msgid "New timelapse %(movie_prefix)s is done rendering." +msgstr "Neue Zeitrafferaufnahme %(movie_prefix)s wurde fertig gerendert" + #: src/octoprint/static/js/app/viewmodels/usersettings.js:10 msgid "Site default" msgstr "Seitenvoreinstellung" @@ -1994,6 +1994,10 @@ msgstr "Warnung" msgid "Critical" msgstr "Kritisch" +#: src/octoprint/templates/dialogs/settings/folders.jinja2:59 +msgid "Provide values including size unit. Allowed units are: b, byte, bytes, kb, mb, gb, tb (case insensitive). Example: 5MB, 500KB" +msgstr "Wert inklusive Größeneinheit. Erlaubte Einheiten sind: b, byte, bytes, kb, mb, gb, tb (Groß-/Kleinschreibung irrelevant). Beispiel: 5MB, 500KB" + #: src/octoprint/templates/dialogs/settings/gcodescripts.jinja2:3 msgid "Before print job starts" msgstr "Vor dem Start eines Druckjobs" @@ -2826,11 +2830,11 @@ msgstr "Ungerenderte Zeitrafferaufnahmen" msgid "Frames" msgstr "Frames" -#: src/octoprint/templates/tabs/timelapse.jinja2:97 +#: src/octoprint/templates/tabs/timelapse.jinja2:99 msgid "Delete unrendered timelapse" msgstr "Ungerenderte Zeitrafferaufnahme löschen" -#: src/octoprint/templates/tabs/timelapse.jinja2:97 +#: src/octoprint/templates/tabs/timelapse.jinja2:99 msgid "Render timelapse" msgstr "Zeitrafferaufnahme rendern" diff --git a/translations/messages.pot b/translations/messages.pot index 0e283491..1bc5ef39 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OctoPrint 1.2.11.dev32+g76959e0.dirty\n" +"Project-Id-Version: OctoPrint 1.2.12.dev21+g5006b01.dirty\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2016-05-04 13:26+0200\n" +"POT-Creation-Date: 2016-06-08 11:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1045,14 +1045,14 @@ msgstr "" msgid "Interface" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:94 -#: src/octoprint/static/js/app/dataupdater.js:129 +#: src/octoprint/static/js/app/dataupdater.js:92 +#: src/octoprint/static/js/app/dataupdater.js:127 #: src/octoprint/static/js/app/helpers.js:451 #: src/octoprint/templates/overlays/offline.jinja2:6 msgid "Server is offline" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:95 +#: src/octoprint/static/js/app/dataupdater.js:93 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" @@ -1060,131 +1060,67 @@ msgid "" "anytime using the button below." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:130 +#: src/octoprint/static/js/app/dataupdater.js:128 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:208 -#: src/octoprint/static/js/app/dataupdater.js:314 +#: src/octoprint/static/js/app/dataupdater.js:206 +#: src/octoprint/static/js/app/dataupdater.js:226 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:230 -msgid "Rendering timelapse" -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:231 -#, python-format -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:244 -msgid "Timelapse ready" -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:245 -#, python-format -msgid "New timelapse %(movie_basename)s is done rendering." -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:256 -#, python-format -msgid "" -"Rendering of timelapse %(movie_basename)s failed with return code " -"%(returncode)s" -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:263 -msgid "Rendering failed" -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:276 -msgid "Capturing timelapse postroll" -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:280 -msgid "Now capturing timelapse post roll, this will take only a moment..." -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:287 -#, python-format -msgid "%(minutes)d min" -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:288 -#, 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:290 -#, python-format -msgid "%(seconds)d sec" -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:291 -#, python-format -msgid "" -"Now capturing timelapse post roll, this will take approximately " -"%(duration)s..." -msgstr "" - -#: src/octoprint/static/js/app/dataupdater.js:316 +#: src/octoprint/static/js/app/dataupdater.js:228 msgid "Slicing ..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:322 +#: src/octoprint/static/js/app/dataupdater.js:234 msgid "Slicing done" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:322 +#: src/octoprint/static/js/app/dataupdater.js:234 #, python-format msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:332 +#: src/octoprint/static/js/app/dataupdater.js:244 #, python-format msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:333 +#: src/octoprint/static/js/app/dataupdater.js:245 msgid "Slicing failed" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:337 +#: src/octoprint/static/js/app/dataupdater.js:249 msgid "Streaming ..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:343 +#: src/octoprint/static/js/app/dataupdater.js:255 msgid "Streaming done" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:344 +#: src/octoprint/static/js/app/dataupdater.js:256 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:350 -#: src/octoprint/static/js/app/dataupdater.js:358 +#: src/octoprint/static/js/app/dataupdater.js:262 +#: src/octoprint/static/js/app/dataupdater.js:270 msgid "Unhandled communication error" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:351 +#: src/octoprint/static/js/app/dataupdater.js:263 #, python-format msgid "" "There was an unhandled error while talking to the printer. Due to that " "the ongoing print job was cancelled. Error: %(firmwareError)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:359 +#: src/octoprint/static/js/app/dataupdater.js:271 #, python-format msgid "" "The was an unhandled error while talking to the printer. Due to that " @@ -1655,6 +1591,69 @@ msgstr "" msgid "showing %(displayed)d lines" msgstr "" +#: src/octoprint/static/js/app/viewmodels/timelapse.js:255 +msgid "Capturing timelapse postroll" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:259 +msgid "Now capturing timelapse post roll, this will take only a moment..." +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:266 +#, python-format +msgid "%(minutes)d min" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:267 +#, python-format +msgid "" +"Now capturing timelapse post roll, this will take approximately " +"%(duration)s (so until %(time)s)..." +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:269 +#, python-format +msgid "%(seconds)d sec" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:270 +#, python-format +msgid "" +"Now capturing timelapse post roll, this will take approximately " +"%(duration)s..." +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:283 +msgid "Rendering timelapse" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:284 +#, python-format +msgid "" +"Now rendering timelapse %(movie_prefix)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/viewmodels/timelapse.js:290 +#, python-format +msgid "" +"Rendering of timelapse %(movie_prefix)s failed with return code " +"%(returncode)s" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:294 +msgid "Rendering failed" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:303 +msgid "Timelapse ready" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/timelapse.js:304 +#, python-format +msgid "New timelapse %(movie_prefix)s is done rendering." +msgstr "" + #: src/octoprint/static/js/app/viewmodels/usersettings.js:10 msgid "Site default" msgstr "" @@ -2109,6 +2108,13 @@ msgstr "" msgid "Critical" msgstr "" +#: src/octoprint/templates/dialogs/settings/folders.jinja2:59 +msgid "" +"Provide values including size unit. Allowed units are: b, byte, bytes, " +"kb, mb, gb, tb (case insensitive). Example: 5MB, " +"500KB" +msgstr "" + #: src/octoprint/templates/dialogs/settings/gcodescripts.jinja2:3 msgid "Before print job starts" msgstr "" @@ -3006,11 +3012,11 @@ msgstr "" msgid "Frames" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:97 +#: src/octoprint/templates/tabs/timelapse.jinja2:99 msgid "Delete unrendered timelapse" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:97 +#: src/octoprint/templates/tabs/timelapse.jinja2:99 msgid "Render timelapse" msgstr ""