Merge branch 'staging/maintenance' into maintenance
This commit is contained in:
Gina Häußge
commit
7c6b85a0ad
11 changed files with 2885 additions and 1169 deletions
|
|
@ -22,8 +22,8 @@ maintenance 1.3.4 3fbd477d15b5776ca929ea578c5437720aaf7f31 pep440-dev
|
|||
fix/.* 1.3.4 3fbd477d15b5776ca929ea578c5437720aaf7f31 pep440-dev
|
||||
improve/.* 1.3.4 3fbd477d15b5776ca929ea578c5437720aaf7f31 pep440-dev
|
||||
|
||||
# staging/maintenance is currently the branch for preparation of 1.3.3rc3 (if we'll need that)
|
||||
staging/maintenance 1.3.3rc2 3fbd477d15b5776ca929ea578c5437720aaf7f31 pep440-dev
|
||||
# staging/maintenance is currently the branch for preparation of 1.3.3rc4 (if we'll need that)
|
||||
staging/maintenance 1.3.3rc4 ce1541e956778b732458599a21f38b6783a0c2ec pep440-dev
|
||||
|
||||
# every other branch is a development branch and thus gets resolved to 1.4.0-dev for now
|
||||
.* 1.4.0 7f5d03d0549bcbd26f40e7e4a3297ea5204fb1cc pep440-dev
|
||||
|
|
|
|||
13
CHANGELOG.md
13
CHANGELOG.md
|
|
@ -1,5 +1,18 @@
|
|||
# OctoPrint Changelog
|
||||
|
||||
## 1.3.3rc3 (2017-05-24)
|
||||
|
||||
### Improvements
|
||||
|
||||
* Some clarifications and typo fixes in the documentation
|
||||
|
||||
### Bug fixes
|
||||
|
||||
* [#1821](https://github.com/foosel/OctoPrint/issues/1821) - Properly reset "Capture post roll images" setting in timelapse configuration when switching from "off" to "timed" timelapse mode.
|
||||
* [#1934](https://github.com/foosel/OctoPrint/issues/1934) (regression) - Fix consecutive timed timelapse captures without configured post roll.
|
||||
|
||||
([Commits](https://github.com/foosel/OctoPrint/compare/1.3.3rc2...1.3.3rc3))
|
||||
|
||||
## 1.3.3rc2 (2017-05-17)
|
||||
|
||||
### Bug fixes
|
||||
|
|
|
|||
|
|
@ -64,4 +64,4 @@ thanks to everyone who contributed!
|
|||
* Timeshell.ca
|
||||
* Trent Shumay
|
||||
|
||||
and 1084 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!
|
||||
and 1086 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!
|
||||
|
|
@ -1378,6 +1378,14 @@ class SettingsPlugin(OctoPrintPlugin):
|
|||
Of course, you are always free to completely override both :func:`on_settings_load` and :func:`on_settings_save` if the
|
||||
default implementations do not fit your requirements.
|
||||
|
||||
|
||||
.. warning::
|
||||
|
||||
Make sure to protect sensitive information stored by your plugin that only logged in administrators (or users)
|
||||
should have access to via :meth:`~octoprint.plugin.SettingsPlugin.get_settings_restricted_paths`. OctoPrint will
|
||||
return its settings on the REST API even to anonymous clients, but will filter out fields it know are restricted,
|
||||
therefore you **must** make sure that you specify sensitive information accordingly to limit access as required!
|
||||
|
||||
.. attribute:: _settings
|
||||
|
||||
The :class:`~octoprint.plugin.PluginSettings` instance to use for accessing the plugin's settings. Injected by
|
||||
|
|
@ -1549,8 +1557,8 @@ class SettingsPlugin(OctoPrintPlugin):
|
|||
field="field"),
|
||||
path=dict(to=dict(never=dict(return="return"))))
|
||||
|
||||
def get_settings_restricted_path(self):
|
||||
return dict(admin=[["some", "admin_only", "path"], ["another", "admin_only", "path"],
|
||||
def get_settings_restricted_paths(self):
|
||||
return dict(admin=[["some", "admin_only", "path"], ["another", "admin_only", "path"],],
|
||||
user=[["some", "user_only", "path"],],
|
||||
never=[["path", "to", "never", "return"],])
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ $(function() {
|
|||
self.defaultPostRoll = 0;
|
||||
self.defaultInterval = 10;
|
||||
self.defaultRetractionZHop = 0;
|
||||
self.defaultCapturePostroll = true;
|
||||
self.defaultCapturePostRoll = true;
|
||||
|
||||
self.timelapseType = ko.observable(undefined);
|
||||
self.timelapseTimedInterval = ko.observable(self.defaultInterval);
|
||||
|
|
@ -159,18 +159,20 @@ $(function() {
|
|||
// timelapse config
|
||||
self.timelapseType(config.type);
|
||||
|
||||
if (config.type == "timed") {
|
||||
if (config.interval != undefined && config.interval > 0) {
|
||||
self.timelapseTimedInterval(config.interval);
|
||||
}
|
||||
if (config.type == "timed" && config.interval != undefined && config.interval > 0) {
|
||||
self.timelapseTimedInterval(config.interval);
|
||||
} else {
|
||||
self.timelapseTimedInterval(self.defaultInterval);
|
||||
}
|
||||
|
||||
if (config.type == "zchange") {
|
||||
if (config.retractionZHop != undefined && config.retractionZHop > 0) {
|
||||
self.timelapseRetractionZHop(config.retractionZHop);
|
||||
}
|
||||
if (config.type == "timed" && config.capturePostRoll != undefined){
|
||||
self.timelapseCapturePostRoll(config.capturePostRoll);
|
||||
} else {
|
||||
self.timelapseCapturePostRoll(self.defaultCapturePostRoll);
|
||||
}
|
||||
|
||||
if (config.type == "zchange" && config.retractionZHop != undefined && config.retractionZHop > 0) {
|
||||
self.timelapseRetractionZHop(config.retractionZHop);
|
||||
} else {
|
||||
self.timelapseRetractionZHop(self.defaultRetractionZHop);
|
||||
}
|
||||
|
|
@ -187,12 +189,6 @@ $(function() {
|
|||
self.timelapseFps(self.defaultFps);
|
||||
}
|
||||
|
||||
if (config.capturePostRoll != undefined){
|
||||
self.timelapseCapturePostRoll(config.capturePostRoll);
|
||||
} else {
|
||||
self.timelapseCapturePostRoll(self.defaultCapturePostRoll);
|
||||
}
|
||||
|
||||
self.persist(false);
|
||||
self.isDirty(false);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ def configure_timelapse(config=None, persist=False):
|
|||
if "options" in config and "interval" in config["options"] and config["options"]["interval"] > 0:
|
||||
interval = config["options"]["interval"]
|
||||
|
||||
capture_post_roll = False
|
||||
capture_post_roll = True
|
||||
if "options" in config and "capturePostRoll" in config["options"] and isinstance(config["options"]["capturePostRoll"], bool):
|
||||
capture_post_roll = config["options"]["capturePostRoll"]
|
||||
|
||||
|
|
@ -703,10 +703,6 @@ class TimedTimelapse(Timelapse):
|
|||
self._copying_postroll()
|
||||
self.post_roll_finished()
|
||||
|
||||
def post_roll_finished(self):
|
||||
Timelapse.post_roll_finished(self)
|
||||
self._timer = None
|
||||
|
||||
def _timer_active(self):
|
||||
return self._in_timelapse or self._postroll_captures > 0
|
||||
|
||||
|
|
@ -719,6 +715,9 @@ class TimedTimelapse(Timelapse):
|
|||
if self._capture_post_roll:
|
||||
self.post_roll_finished()
|
||||
|
||||
# timer is done, delete it
|
||||
self._timer = None
|
||||
|
||||
|
||||
class TimelapseRenderJob(object):
|
||||
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OctoPrint 1.3.3.dev98+g3bfc472.dirty\n"
|
||||
"Project-Id-Version: OctoPrint 1.3.3rc3.dev8+gbd1d0e6\n"
|
||||
"Report-Msgid-Bugs-To: i18n@octoprint.org\n"
|
||||
"POT-Creation-Date: 2017-05-11 13:31+0200\n"
|
||||
"POT-Creation-Date: 2017-05-24 13:21+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -17,13 +17,13 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: Babel 2.3.4\n"
|
||||
|
||||
#: src/octoprint/plugins/announcements/__init__.py:119
|
||||
#: src/octoprint/plugins/announcements/__init__.py:125
|
||||
#: src/octoprint/plugins/announcements/templates/announcements.jinja2:4
|
||||
#: src/octoprint/plugins/announcements/templates/announcements_navbar.jinja2:1
|
||||
msgid "Announcements"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/announcements/__init__.py:466
|
||||
#: src/octoprint/plugins/announcements/__init__.py:472
|
||||
msgid ""
|
||||
"Without this plugin you might miss important announcements regarding "
|
||||
"security or other critical issues concerning OctoPrint."
|
||||
|
|
@ -48,12 +48,12 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/announcements/static/js/announcements.js:259
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:890
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:888
|
||||
msgid "Later"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/announcements/static/js/announcements.js:265
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:897
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:895
|
||||
msgid "Mark read"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -544,7 +544,7 @@ msgid ""
|
|||
"discoverable on the network via Bonjour and uPnP."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/__init__.py:135
|
||||
#: src/octoprint/plugins/pluginmanager/__init__.py:142
|
||||
msgid "Plugin Manager"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -575,19 +575,19 @@ msgstr ""
|
|||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:294
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:419
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:519
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:559
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:708
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1087
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1137
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1154
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1171
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:557
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:706
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1085
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1135
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1152
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1169
|
||||
msgid "Something went wrong"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:295
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:420
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:520
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:560
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:558
|
||||
msgid "Please consult octoprint.log for details"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -631,300 +631,300 @@ msgstr ""
|
|||
msgid "Reinstalling plugin \"%(name)s\" from %(url)s..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:551
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:549
|
||||
msgid "Uninstalling plugin..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:551
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:549
|
||||
#, python-format
|
||||
msgid "Uninstalling plugin \"%(name)s\""
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:665
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:663
|
||||
msgid "Reinstall"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:665
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:663
|
||||
#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:190
|
||||
#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:206
|
||||
msgid "Install"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:665
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:663
|
||||
msgid "Disabled"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:665
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:663
|
||||
msgid "Incompatible"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:694
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:692
|
||||
msgid "Restart now"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:697
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:695
|
||||
msgid "This will restart your OctoPrint server."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:702
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:700
|
||||
msgid "Restart in progress"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:703
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:701
|
||||
msgid "The server is now being restarted in the background"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:709
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:707
|
||||
msgid ""
|
||||
"Trying to restart the server produced an error, please check "
|
||||
"octoprint.log for details. You'll have to restart manually."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:727
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:725
|
||||
#: src/octoprint/templates/overlays/reloadui.jinja2:14
|
||||
msgid "Reload now"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:782
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:780
|
||||
msgid "Error!"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:785
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:783
|
||||
msgid "Done!"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:810
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:808
|
||||
msgid "Disabled due to active safe mode"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:812
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:810
|
||||
msgid "Enable Plugin"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:815
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:813
|
||||
msgid "Disable Plugin"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:835
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:833
|
||||
#, python-format
|
||||
msgid ""
|
||||
"There are %(count)d notices (%(important)d marked as important) available"
|
||||
" regarding this plugin - click to show!"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:837
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:835
|
||||
#, python-format
|
||||
msgid ""
|
||||
"There are %(count)d notices available regarding this plugin - click to "
|
||||
"show!"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:841
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:839
|
||||
msgid ""
|
||||
"There is an important notice available regarding this plugin - click to "
|
||||
"show!"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:843
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:841
|
||||
msgid "There is a notice available regarding this plugin - click to show!"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:857
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:855
|
||||
#, python-format
|
||||
msgid "Important notice regarding plugin \"%(name)s\""
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:859
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:857
|
||||
#, python-format
|
||||
msgid "Notice regarding plugin \"%(name)s\""
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:866
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:864
|
||||
#, python-format
|
||||
msgid "Affected versions: %(versions)s"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:868
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:866
|
||||
msgid "Affected versions: all"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:873
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:871
|
||||
msgid "Read more..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1071
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1069
|
||||
msgid "Plugin installed"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1072
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1070
|
||||
msgid ""
|
||||
"A plugin was installed successfully, however it was impossible to detect "
|
||||
"which one. Please Restart OctoPrint to make sure everything will be "
|
||||
"registered properly"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1076
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1074
|
||||
#, python-format
|
||||
msgid "Plugin \"%(name)s\" reinstalled"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1077
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1075
|
||||
msgid "The plugin was reinstalled successfully"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1078
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1076
|
||||
msgid ""
|
||||
"The plugin was reinstalled successfully, however a restart of OctoPrint "
|
||||
"is needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1079
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1077
|
||||
msgid ""
|
||||
"The plugin was reinstalled successfully, however a reload of the page is "
|
||||
"needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1081
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1079
|
||||
#, python-format
|
||||
msgid "Plugin \"%(name)s\" installed"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1082
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1080
|
||||
msgid "The plugin was installed successfully"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1083
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1081
|
||||
msgid ""
|
||||
"The plugin was installed successfully, however a restart of OctoPrint is "
|
||||
"needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1084
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1082
|
||||
msgid ""
|
||||
"The plugin was installed successfully, however a reload of the page is "
|
||||
"needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1100
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1098
|
||||
#, python-format
|
||||
msgid "Reinstalling the plugin from file failed: %(reason)s"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1102
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1100
|
||||
#, python-format
|
||||
msgid "Reinstalling the plugin from \"%(source)s\" failed: %(reason)s"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1106
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1104
|
||||
#, python-format
|
||||
msgid "Installing the plugin from file failed: %(reason)s"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1108
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1106
|
||||
#, python-format
|
||||
msgid "Installing the plugin from \"%(source)s\" failed: %(reason)s"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1114
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1112
|
||||
msgid "Reinstalling the plugin from file failed, please see the log for details."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1116
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1114
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Reinstalling the plugin from \"%(source)s\" failed, please see the log "
|
||||
"for details."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1120
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1118
|
||||
msgid "Installing the plugin from file failed, please see the log for details."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1122
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1120
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Installing the plugin from \"%(source)s\" failed, please see the log for "
|
||||
"details."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1132
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1130
|
||||
#, python-format
|
||||
msgid "Plugin \"%(name)s\" uninstalled"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1133
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1131
|
||||
msgid "The plugin was uninstalled successfully"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1134
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1132
|
||||
msgid ""
|
||||
"The plugin was uninstalled successfully, however a restart of OctoPrint "
|
||||
"is needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1135
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1133
|
||||
msgid ""
|
||||
"The plugin was uninstalled successfully, however a reload of the page is "
|
||||
"needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1139
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1137
|
||||
#, python-format
|
||||
msgid "Uninstalling the plugin failed: %(reason)s"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1141
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1139
|
||||
msgid "Uninstalling the plugin failed, please see the log for details."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1149
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1147
|
||||
#, python-format
|
||||
msgid "Plugin \"%(name)s\" enabled"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1150
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1148
|
||||
msgid "The plugin was enabled successfully."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1151
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1149
|
||||
msgid ""
|
||||
"The plugin was enabled successfully, however a restart of OctoPrint is "
|
||||
"needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1152
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1150
|
||||
msgid ""
|
||||
"The plugin was enabled successfully, however a reload of the page is "
|
||||
"needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1156
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1173
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1154
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1171
|
||||
#, python-format
|
||||
msgid "Toggling the plugin failed: %(reason)s"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1158
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1175
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1156
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1173
|
||||
msgid "Toggling the plugin failed, please see the log for details."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1166
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1164
|
||||
#, python-format
|
||||
msgid "Plugin \"%(name)s\" disabled"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1167
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1165
|
||||
msgid "The plugin was disabled successfully."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1168
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1166
|
||||
msgid ""
|
||||
"The plugin was disabled successfully, however a restart of OctoPrint is "
|
||||
"needed for that to take effect."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1169
|
||||
#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:1167
|
||||
msgid ""
|
||||
"The plugin was disabled successfully, however a reload of the page is "
|
||||
"needed for that to take effect."
|
||||
|
|
@ -1200,12 +1200,12 @@ msgstr ""
|
|||
msgid "Save"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/softwareupdate/__init__.py:548
|
||||
#: src/octoprint/plugins/softwareupdate/__init__.py:554
|
||||
#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_wizard.jinja2:1
|
||||
msgid "Software Update"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/softwareupdate/__init__.py:884
|
||||
#: src/octoprint/plugins/softwareupdate/__init__.py:890
|
||||
#: src/octoprint/server/views.py:555
|
||||
#: src/octoprint/static/js/app/viewmodels/appearance.js:13
|
||||
#: src/octoprint/static/js/app/viewmodels/appearance.js:18
|
||||
|
|
@ -1216,7 +1216,7 @@ msgstr ""
|
|||
msgid "OctoPrint"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/plugins/softwareupdate/__init__.py:1051
|
||||
#: src/octoprint/plugins/softwareupdate/__init__.py:1057
|
||||
msgid ""
|
||||
"Without this plugin OctoPrint will no longer be able to update itself or "
|
||||
"any of your installed plugins which might put your system at risk."
|
||||
|
|
@ -2189,40 +2189,40 @@ msgstr ""
|
|||
msgid "Could not add profile"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:512
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:515
|
||||
msgid "Cannot delete the default profile or the currently active profile."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:514
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:517
|
||||
msgid ""
|
||||
"There was unexpected error while removing the printer profile, please "
|
||||
"consult the logs."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:516
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:519
|
||||
msgid "Could not delete profile"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:523
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:524
|
||||
#, python-format
|
||||
msgid "You are about to delete the printer profile \"%(name)s\"."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:541
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:545
|
||||
msgid ""
|
||||
"There was unexpected error while updating the printer profile, please "
|
||||
"consult the logs."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:542
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:546
|
||||
msgid "Could not update profile"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:557
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:559
|
||||
msgid "Add Printer Profile"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:557
|
||||
#: src/octoprint/static/js/app/viewmodels/printerprofiles.js:559
|
||||
#, python-format
|
||||
msgid "Edit Printer Profile \"%(name)s\""
|
||||
msgstr ""
|
||||
|
|
@ -2456,144 +2456,144 @@ msgstr ""
|
|||
msgid "showing %(displayed)d lines"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:239
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:235
|
||||
#, python-format
|
||||
msgid "You are about to delete timelapse file \"%(name)s\"."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:251
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:247
|
||||
#, python-format
|
||||
msgid "You are about to delete %(count)d timelapse files."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:276
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:272
|
||||
#, python-format
|
||||
msgid "You are about to delete unrendered timelapse \"%(name)s\"."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:288
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:284
|
||||
#, python-format
|
||||
msgid "You are about to delete %(count)d unrendered timelapses."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:296
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:292
|
||||
msgid "Deleting timelapse files"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:297
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:293
|
||||
#, python-format
|
||||
msgid "Deleting %(count)d timelapse files..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:301
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:313
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:297
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:309
|
||||
#, python-format
|
||||
msgid "Deleted %(filename)s..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:304
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:316
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:300
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:312
|
||||
#, python-format
|
||||
msgid "Deletion of %(filename)s failed, continuing..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:308
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:304
|
||||
msgid "Deleting unrendered timelapses"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:309
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:305
|
||||
#, python-format
|
||||
msgid "Deleting %(count)d unrendered timelapses..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:398
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:394
|
||||
msgid "Capturing timelapse postroll"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:402
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:398
|
||||
msgid "Now capturing timelapse post roll, this will take only a moment..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:409
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:405
|
||||
#, python-format
|
||||
msgid "%(minutes)d min"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:410
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:406
|
||||
#, 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:412
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:408
|
||||
#, python-format
|
||||
msgid "%(seconds)d sec"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:413
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:409
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Now capturing timelapse post roll, this will take approximately "
|
||||
"%(duration)s..."
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:443
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:439
|
||||
msgid ""
|
||||
"Failed repeatedly to capture timelapse frame from webcam - is the "
|
||||
"snapshot URL configured correctly and the camera on?"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:446
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:442
|
||||
msgid "Could not capture snapshots"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:455
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:451
|
||||
msgid "Rendering timelapse"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:456
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:452
|
||||
#, 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:465
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:461
|
||||
msgid "Cannot render timelapse"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:466
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:462
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Rendering of timelapse %(movie_prefix)s is not possible since no frames "
|
||||
"were captured. Is the snapshot URL configured correctly?"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:464
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:468
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:472
|
||||
msgid "Rendering timelapse failed"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:469
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:465
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Rendering of timelapse %(movie_prefix)s failed with return code "
|
||||
"%(returncode)s"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:473
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:469
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Rendering of timelapse %(movie_prefix)s failed due to an unknown error, "
|
||||
"please consult the log file"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:486
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:482
|
||||
msgid "Timelapse ready"
|
||||
msgstr ""
|
||||
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:487
|
||||
#: src/octoprint/static/js/app/viewmodels/timelapse.js:483
|
||||
#, python-format
|
||||
msgid "New timelapse %(movie_prefix)s is done rendering."
|
||||
msgstr ""
|
||||
|
|
|
|||
Loading…
Reference in a new issue