Preparing release of 1.3.10rc4

Author: foosel

CHANGELOG.md

@@ -1,5 +1,37 @@
 # OctoPrint Changelog
 
+## 1.3.10rc4 (2018-12-03)
+
+### Improvements
+
+  * Backup: Exclude `generated`, `logs` and `watched` folders from backup
+  * Backup: Use base version for version check on restore
+
+### Bug fixes
+
+  * [#2920](https://github.com/foosel/OctoPrint/issues/2920) - Backup: Fix wrong compatibility check logic in plugin install during restore
+  * Backup: Disable restore on Windows servers where it's not supported thanks to the Windows file system
+  * Backup: Fix reporting of restore failure due to version mismatch or other cases of an invalid backup
+  * Backup: Fix feedback in UI during restore, start feedback right on upload of backup
+  * Printer Safety: Fix localization of warning message
+
+### Unreproduced issues
+
+The following issues were reported in RC1 or RC2 but so far have been unreproduced and further data to analyse them is still missing. If you encounter any of them please report back with a [fully filled out issue template](https://github.com/foosel/OctoPrint/blob/master/CONTRIBUTING.md#what-should-i-include-in-a-bug-report):
+
+  * [Not possible to complete Anonymous Usage Tracking setup wizard](https://discourse.octoprint.org/t/anonymous-usage-setup/5151)
+  * ["temperature changes doesn't work"](https://github.com/foosel/OctoPrint/issues/2889#issuecomment-441449215)
+
+### Special thanks to all the contributors!
+
+Special thanks to everyone who contributed to this release candidate and provided full, analysable bug reports.
+
+### More information
+
+  * [Commits](https://github.com/foosel/OctoPrint/compare/1.3.10rc3...1.3.10rc4)
+
+## 1.3.10rc3 (2018-11-28)
+
 ### Improvements
 
   * More resilience against third party plugins that happily block or kill important startup threads

src/octoprint/translations/de/LC_MESSAGES/messages.mo

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OctoPrint\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2018-11-28 12:25+0100\n"
-"PO-Revision-Date: 2018-11-28 12:28+0100\n"
+"POT-Creation-Date: 2018-12-03 11:55+0100\n"
+"PO-Revision-Date: 2018-12-03 11:57+0100\n"
 "Last-Translator: Gina Häußge <[email protected]>\n"
 "Language: de\n"
 "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n"
@@ -89,7 +89,7 @@ msgid "Mark as last read"
 msgstr "Zuletzt gelesen"
 
 #: src/octoprint/plugins/announcements/templates/announcements.jinja2:44
-#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:127
+#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:133
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:121
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:235
 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:136
@@ -287,103 +287,103 @@ msgstr "Generiere einen Application Key manuell"
 msgid "Generate"
 msgstr "Erzeugen"
 
-#: src/octoprint/plugins/backup/__init__.py:881
+#: src/octoprint/plugins/backup/__init__.py:914
 msgid "Backup & Restore"
 msgstr "Sicherung & Wiederherstellung"
 
-#: src/octoprint/plugins/backup/__init__.py:884
+#: src/octoprint/plugins/backup/__init__.py:917
 msgid "Without this plugin you will no longer be able to backup & restore your OctoPrint settings and data."
 msgstr "Ohne dieses Plugin kannst du deine OctoPrint Einstellung und Daten nicht länger sichern & wiederherstellen."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:86
+#: src/octoprint/plugins/backup/static/js/backup.js:88
 #, python-format
 msgid "You are about to delete backup file \"%(name)s\"."
 msgstr "Du bist im Begriff, die Sicherung \"%(name)s\" zu löschen."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:94
+#: src/octoprint/plugins/backup/static/js/backup.js:104
 #, python-format
 msgid "You are about to restore the backup file \"%(name)s\". This cannot be undone."
 msgstr "Du bist im Begriff, die Sicherung \"%(name)s\" wiederherzustellen."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:104
+#: src/octoprint/plugins/backup/static/js/backup.js:120
 #, python-format
 msgid "You are about to upload and restore the backup file \"%(name)s\". This cannot be undone."
 msgstr "Du bist im Begriff, die Sicherung \"%(name)s\" hochzuladen und wiederherzustellen. Das kann nicht rückgängig gemacht werden."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:115
+#: src/octoprint/plugins/backup/static/js/backup.js:131
 msgid "You are about to delete the record of plugins unknown during the last restore."
 msgstr "Du bist dabei, die Liste der Plugins zu löschen, die während der letzten Wiederherstellung unbekannt waren."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:139
+#: src/octoprint/plugins/backup/static/js/backup.js:155
 #, python-format
 msgid "You are about to delete %(count)d backups."
 msgstr "Du bist im Begriff, %(count)d Sicherungen zu löschen."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:159
+#: src/octoprint/plugins/backup/static/js/backup.js:175
 msgid "Backup created successfully"
 msgstr "Backup erfolgreich erstellt"
 
-#: src/octoprint/plugins/backup/static/js/backup.js:168
+#: src/octoprint/plugins/backup/static/js/backup.js:184
 msgid "Creating the backup failed"
 msgstr "Backuperstellung fehlgeschlagen"
 
-#: src/octoprint/plugins/backup/static/js/backup.js:169
+#: src/octoprint/plugins/backup/static/js/backup.js:185
 #, python-format
 msgid "OctoPrint could not create your backup. Please consult <code>octoprint.log</code> for details. Error: %(error)s"
 msgstr "OctoPrint konnte dein Backup nicht erstellen. Bitte konsultiere <code>octoprint.log</code> für Details. Fehler: %(error)s"
 
-#: src/octoprint/plugins/backup/static/js/backup.js:176
-#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:121
+#: src/octoprint/plugins/backup/static/js/backup.js:190
+#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:127
 msgid "Restoring from backup..."
 msgstr "Stelle Sicherung wieder her..."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:181
+#: src/octoprint/plugins/backup/static/js/backup.js:194
 msgid "Restore failed! Check the above output and octoprint.log for reasons as to why."
 msgstr "Wiederherstellung fehlgeschlagen! Prüfe die obige Ausgabe sowie octoprint.log für mögliche Gründe dafür."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:185
+#: src/octoprint/plugins/backup/static/js/backup.js:198
 msgid "Restore successful! The server will now be restarted!"
 msgstr "Wiederherstellung erfolgreich! Der Server wird jetzt neu gestartet!"
 
-#: src/octoprint/plugins/backup/static/js/backup.js:190
+#: src/octoprint/plugins/backup/static/js/backup.js:203
 #, python-format
 msgid "Installing plugin \"%(plugin)s}\"..."
 msgstr "Installiere Plugin \"%(plugin)s\"..."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:196
+#: src/octoprint/plugins/backup/static/js/backup.js:209
 #, python-format
 msgid "Cannot install plugin \"%(plugin)s\" due to it being incompatible to this OctoPrint version and/or underlying operating system"
 msgstr "Kann Plugin \"%(plugin)s\" nicht installieren, da es mit dieser OctoPrint Version oder dem darunter liegenden Betriebssystem inkompatibel ist"
 
-#: src/octoprint/plugins/backup/static/js/backup.js:202
+#: src/octoprint/plugins/backup/static/js/backup.js:215
 #, python-format
 msgid "There are %(count)d plugins you'll need to install manually since they aren't registered on the repository:"
 msgstr "Du musst %(count)d Plugins manuell installieren, da sie nicht im Repository registriert sind:"
 
-#: src/octoprint/plugins/backup/static/js/backup.js:230
+#: src/octoprint/plugins/backup/static/js/backup.js:243
 msgid "Deleting backups"
 msgstr "Lösche Sicherungen"
 
-#: src/octoprint/plugins/backup/static/js/backup.js:231
+#: src/octoprint/plugins/backup/static/js/backup.js:244
 #, python-format
 msgid "Deleting %(count)d backups..."
 msgstr "Lösche %(count)d Sicherungen..."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:235
+#: src/octoprint/plugins/backup/static/js/backup.js:248
 #: src/octoprint/static/js/app/viewmodels/timelapse.js:313
 #: src/octoprint/static/js/app/viewmodels/timelapse.js:327
 #, python-format
 msgid "Deleted %(filename)s..."
 msgstr "%(filename)s gelöscht..."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:238
+#: src/octoprint/plugins/backup/static/js/backup.js:251
 #: src/octoprint/static/js/app/viewmodels/timelapse.js:316
 #: src/octoprint/static/js/app/viewmodels/timelapse.js:330
 #, python-format
 msgid "Deletion of %(filename)s failed, continuing..."
 msgstr "Löschen von %(filename)s fehlgeschlagen, fahre fort..."
 
-#: src/octoprint/plugins/backup/static/js/backup.js:239
+#: src/octoprint/plugins/backup/static/js/backup.js:252
 #: src/octoprint/static/js/app/viewmodels/timelapse.js:317
 #, python-format
 msgid "Deletion of %(filename)s failed: %(error)s"
@@ -472,29 +472,34 @@ msgstr "Zeitrafferaufnahmen nicht sichern"
 msgid "Create backup now"
 msgstr "Sicherung jetzt erstellen"
 
-#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:94
+#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:95
 msgid "Restore from uploaded backup"
 msgstr "Von einer hochgeladenen Sicherung wiederherstellen"
 
-#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:96
+#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:97
 msgid "Restore settings & files from an uploaded backup archive."
 msgstr "Einstellungen und Dateien von einer hochgeladenen Sicherung wiederherstellen."
 
-#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:100
+#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:101
 msgid "Backup file"
 msgstr "Sicherungsdatei"
 
-#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:104
+#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:105
 #: src/octoprint/plugins/cura/templates/snippets/settings/cura/profileImporter.jinja2:13
 #: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:209
 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:104
 msgid "Browse..."
 msgstr "Durchsuchen..."
 
-#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:114
+#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:115
 msgid "Upload & restore"
 msgstr "Hochladen & wiederherstellen"
 
+#: src/octoprint/plugins/backup/templates/backup_settings.jinja2:122
+#, python-format
+msgid "Please note that the operating system that this OctoPrint server is running on does not support automatically restoring backups. You will have to <a href=\"%(url)s\" target=\"_blank\" rel=\"noopener noreferrer\">restore your backups manually for now</a>."
+msgstr "Achtung: Das Betriebssystem, auf dem diese OctoPrint Instanz läuft, unterstützt nicht die automatische Wiederherstellung von Sicherungen. Bis auf weiteres kannst du Sicherungen nur <a href=\"%(url)s\" target=\"_blank\" rel=\"noopener noreferrer\">manuell wiederherstellen</a>."
+
 #: src/octoprint/plugins/corewizard/__init__.py:123
 msgid "Without this plugin OctoPrint will no longer be able to perform setup steps that might be required after an update."
 msgstr "Ohne dieses Plugin wird OctoPrint nicht mehr in der Lage sein, wichtige Konfigurationsschritte durchzuführen, die ggf. nach einem Update notwendig sind."