From cfc8991bbec4db4d1b8c9c179e7976dbb837086f Mon Sep 17 00:00:00 2001 From: OllisGit Date: Sat, 12 Sep 2020 21:35:31 +0200 Subject: [PATCH 01/26] Update README.md --- README.md | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 84d4e75..78b74ec 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,39 @@ # OctoPrint-FilamentManager +## UNDER NEW MANAGEMENT + + Hi everybody, + because there was no activtiy in the last month on the origial GitHub-Repository from @malnvenshorn, + the community deceided to find a new home of this OctoPrint-Plugin and here it it ;-) + See https://github.com/OctoPrint/plugins.octoprint.org/issues/471 for more details + + What is my roadmap/stratagy of "hosting" this plugin? + - First: Plugin should run under the latest versions of python and OctoPrint + - Analysing/fixing issues that prevent using the plugin + - An open mind for new ideas.... + - ...but if the effort to implement new features is to height, then it will probably be implemented in my SpoolManager-Plugin + (https://github.com/OllisGit/OctoPrint-SpoolManager) + - ...also I will move more and more features from FilamentManager to SpoolManager (e.g. external Database, MultiTool, ...) + + +# Overview + +[![Version](https://img.shields.io/badge/dynamic/json.svg?color=brightgreen&label=version&url=https://api.github.com/repos/OllisGit/OctoPrint-FilamentManager/releases&query=$[0].name)]() +[![Released](https://img.shields.io/badge/dynamic/json.svg?color=brightgreen&label=released&url=https://api.github.com/repos/OllisGit/OctoPrint-FilamentManager/releases&query=$[0].published_at)]() +![GitHub Releases (by Release)](https://img.shields.io/github/downloads/OllisGit/OctoPrint-FilamentManager/latest/total.svg) + This OctoPrint plugin makes it easy to manage your inventory of filament spools. You can add all your spools and assign them to print jobs. The Filament Manager will automatically track the amount of extruded filament so you can always see how much is left on your spools. If you have questions or encounter issues please take a look at the [Frequently Asked Questions](https://github.com/malnvenshorn/OctoPrint-FilamentManager/wiki#faq) first. There might be already an answer. In case you haven't found what you are looking for, feel free to open a [ticket](https://github.com/malnvenshorn/OctoPrint-FilamentManager/issues/new) and I'll try to help. Since OctoPrint provides an own [community forum](https://discourse.octoprint.org/) questions and requests for help should be placed there. +#### Support my Efforts + +This plugin, as well as my [other plugins](https://github.com/OllisGit/) were developed in my spare time. +If you like it, I would be thankful about a cup of coffee :) + +[![More coffee, more code](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6SW5R6ZUKLB5E&source=url) + + ## Features * Software odometer to track amount of extruded filament @@ -18,7 +48,7 @@ If you have questions or encounter issues please take a look at the [Frequently 1. Install this plugin via the bundled [Plugin Manager](https://github.com/foosel/OctoPrint/wiki/Plugin:-Plugin-Manager) or manually using this URL: - `https://github.com/malnvenshorn/OctoPrint-FilamentManager/archive/master.zip` + `https://github.com/OllisGit/OctoPrint-FilamentManager/releases/latest/download/master.zip` 1. For PostgreSQL support you need to install an additional dependency: From c384326d42863c6eae46413c6438a21428264de7 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Sat, 12 Sep 2020 21:41:35 +0200 Subject: [PATCH 02/26] Initial release 1.6.0 - Add Python 3 comp. - Add PR for Spanish Translation - Add PR for German Typo --- .github/PULL_REQUEST_TEMPLATE.md | 1 - .github/settings.yml | 86 ++++ .github/stale.yml | 18 + .travis.yml | 29 ++ octoprint_filamentmanager/__init__.py | 17 +- octoprint_filamentmanager/api/__init__.py | 5 +- octoprint_filamentmanager/api/util.py | 2 +- .../translations/de/LC_MESSAGES/messages.mo | Bin 7903 -> 7368 bytes .../translations/de/LC_MESSAGES/messages.po | 132 +++--- .../translations/es/LC_MESSAGES/messages.mo | Bin 0 -> 7467 bytes .../translations/es/LC_MESSAGES/messages.po | 378 ++++++++++++++++++ setup.py | 8 +- translations/de/LC_MESSAGES/messages.mo | Bin 7903 -> 7368 bytes translations/de/LC_MESSAGES/messages.po | 132 +++--- translations/es/LC_MESSAGES/messages.mo | Bin 0 -> 7467 bytes translations/es/LC_MESSAGES/messages.po | 378 ++++++++++++++++++ translations/messages.pot | 10 +- 17 files changed, 1057 insertions(+), 139 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/settings.yml create mode 100644 .github/stale.yml create mode 100644 .travis.yml create mode 100644 octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.mo create mode 100644 octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po create mode 100644 translations/es/LC_MESSAGES/messages.mo create mode 100644 translations/es/LC_MESSAGES/messages.po diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index aaa74ce..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ -**Currently no pull request are accepted due to extensive refactoring!** diff --git a/.github/settings.yml b/.github/settings.yml new file mode 100644 index 0000000..8c5fbf9 --- /dev/null +++ b/.github/settings.yml @@ -0,0 +1,86 @@ +repository: + # See https://developer.github.com/v3/repos/#edit for all available settings. + + # The name of the repository. Changing this will rename the repository +# name: repo-name + + # A short description of the repository that will show up on GitHub +# description: description of repo + + # A URL with more information about the repository +# homepage: https://example.github.io/ + + # Either `true` to make the repository private, or `false` to make it public. +# private: false + + # Either `true` to enable issues for this repository, `false` to disable them. + has_issues: true + + # Either `true` to enable the wiki for this repository, `false` to disable it. + has_wiki: true + + # Either `true` to enable downloads for this repository, `false` to disable them. +# has_downloads: true + + # Updates the default branch for this repository. +# default_branch: master + + # Either `true` to allow squash-merging pull requests, or `false` to prevent + # squash-merging. +# allow_squash_merge: true + + # Either `true` to allow merging pull requests with a merge commit, or `false` + # to prevent merging pull requests with merge commits. +# allow_merge_commit: true + + # Either `true` to allow rebase-merging pull requests, or `false` to prevent + # rebase-merging. +# allow_rebase_merge: true + +# Labels: define labels for Issues and Pull Requests +labels: + - name: "type: bug" + description: "Something isn't working" + color: d73a4a + - name: "type: enhancement" + description: "New feature or request" + color: a2eeef + - name: "type: question" + description: "Further information is requested" + color: d876e3 + - name: "status: analysing" + color: d3d847 + - name: "status: inProgress" + description: "I am working on it" + color: 5319e7 + - name: "status: inNextRelease" + description: "Will be implemented/fixed in next release" + color: 4ae857 + - name: "status: waitingForFeedback" + description: "Wating for Customers feedback" + color: bfdadc + - name: "status: waitingForTestFeedback" + color: 006b75 + - name: "status: wontfix" + description: "I don't wont to fix this" + color: fbca04 + - name: "status: markedForAutoClose" + description: "Issue will be closed automatically" + color: ed6d75 + + +# Collaborators: give specific users access to this repository. +#collaborators: +# - username: bkeepers + # Note: Only valid on organization-owned repositories. + # The permission to grant the collaborator. Can be one of: + # * `pull` - can pull, but not push to or administer this repository. + # * `push` - can pull and push, but not administer this repository. + # * `admin` - can pull, push and administer this repository. +# permission: push + +# - username: hubot +# permission: pull + +# - username: +# permission: pull diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 0000000..07cd942 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,18 @@ +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 30 +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 10 +# Issues with these labels will never be considered stale +exemptLabels: + - "status: analysing" + - "status: inNextRelease" + - "status: inProgress" + - "status: wontfix" +# Label to use when marking an issue as stale +staleLabel: "status: markedForAutoClose" +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked for closing, because it has not had + activity in 30 days. It will be closed if no further activity occurs in 10 days. +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: false diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..34c4562 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,29 @@ +## +## Simple script to build a zip file of the whole repository +## + +script: +# debug - echo 'Hello World' + - export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2) + - zip -r master.zip * -x \*testdata\* +# debug - ls -al + +## see "Fix travis automatic build and deploy" +## https://github.com/oliexdev/openScale/pull/121 +## https://github.com/oliexdev/openScale/pull/121/files +before_deploy: + - git tag -f travis-build + - git remote add gh https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git + - git push -f gh travis-build + - git remote remove gh + +deploy: + name: "V${PLUGIN_VERSION}-draft" + #prerelease: true + draft: true + provider: releases + api_key: "${GITHUB_TOKEN}" + file: "master.zip" + overwrite: true + skip_cleanup: true + target_commitish: $TRAVIS_COMMIT diff --git a/octoprint_filamentmanager/__init__.py b/octoprint_filamentmanager/__init__.py index 3988788..2a81b2f 100644 --- a/octoprint_filamentmanager/__init__.py +++ b/octoprint_filamentmanager/__init__.py @@ -50,7 +50,7 @@ def get_client_id(): self.client_id = get_client_id() self.filamentOdometer = FilamentOdometer() - self.filamentOdometer.set_g90_extruder(self._settings.getBoolean(["feature", "g90InfluencesExtruder"])) + self.filamentOdometer.set_g90_extruder(self._settings.get_boolean(["feature", "g90InfluencesExtruder"])) db_config = self._settings.get(["database"], merged=True) migrate_schema_version = False @@ -196,7 +196,7 @@ def on_settings_save(self, data): # we have to recalculate the pause thresholds self.update_pause_thresholds() - self.filamentOdometer.set_g90_extruder(self._settings.getBoolean(["feature", "g90InfluencesExtruder"])) + self.filamentOdometer.set_g90_extruder(self._settings.get_boolean(["feature", "g90InfluencesExtruder"])) # AssetPlugin @@ -232,8 +232,8 @@ def on_printer_state_changed(self, payload): else: # starting new print self.filamentOdometer.reset() - self.odometerEnabled = self._settings.getBoolean(["enableOdometer"]) - self.pauseEnabled = self._settings.getBoolean(["autoPause"]) + self.odometerEnabled = self._settings.get_boolean(["enableOdometer"]) + self.pauseEnabled = self._settings.get_boolean(["autoPause"]) self._logger.debug("Printer State: %s" % payload["state_string"]) self._logger.debug("Odometer: %s" % ("On" if self.odometerEnabled else "Off")) self._logger.debug("AutoPause: %s" % ("On" if self.pauseEnabled and self.odometerEnabled else "Off")) @@ -257,7 +257,7 @@ def calculate_weight(length, profile): volume = (length * PI * radius * radius) / 1000 # cm³ return volume * profile["density"] # g - for tool in xrange(0, numTools): + for tool in range(0, numTools): self._logger.info("Filament used: {length} mm (tool{id})" .format(length=str(extrusion[tool]), id=str(tool))) @@ -346,18 +346,19 @@ def get_update_information(self): # version check: github repository type="github_release", - user="malnvenshorn", + user="OllisGit", repo="OctoPrint-FilamentManager", current=self._plugin_version, # update method: pip - pip="https://github.com/malnvenshorn/OctoPrint-FilamentManager/archive/{target_version}.zip" + #pip="https://github.com/malnvenshorn/OctoPrint-FilamentManager/archive/{target_version}.zip" + pip="https://github.com/OllisGit/OctoPrint-FilamentManager/releases/latest/download/master.zip" ) ) __plugin_name__ = "Filament Manager" - +__plugin_pythoncompat__ = ">=2.7,<4" __required_octoprint_version__ = ">=1.3.6" diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index 94e0724..deccb62 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -16,6 +16,7 @@ import octoprint.plugin from octoprint.settings import valid_boolean_trues from octoprint.server import admin_permission +from octoprint.access.permissions import Permissions from octoprint.server.util.flask import restricted_access, check_lastmodified, check_etag from octoprint.util import dict_merge @@ -302,7 +303,7 @@ def update_selection(self, identifier): @octoprint.plugin.BlueprintPlugin.route("/export", methods=["GET"]) @restricted_access - @admin_permission.require(403) + @Permissions.ADMIN.require(403) def export_data(self): try: tempdir = tempfile.mkdtemp() @@ -337,7 +338,7 @@ def file_generator(): @octoprint.plugin.BlueprintPlugin.route("/import", methods=["POST"]) @restricted_access - @admin_permission.require(403) + @Permissions.ADMIN.require(403) def import_data(self): def unzip(filename, extract_dir): # python 2.7 lacks of shutil.unpack_archive ¯\_(ツ)_/¯ diff --git a/octoprint_filamentmanager/api/util.py b/octoprint_filamentmanager/api/util.py index 76d03ff..df6d95b 100644 --- a/octoprint_filamentmanager/api/util.py +++ b/octoprint_filamentmanager/api/util.py @@ -17,4 +17,4 @@ def add_revalidation_header_with_no_max_age(response, lm, etag): def entity_tag(lm): - return (hashlib.sha1(str(lm))).hexdigest() + return (hashlib.sha1(str(lm).encode(encoding='UTF-8')).hexdigest()) diff --git a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.mo b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.mo index 9f3867ba8ff308ccf2801713f0ca7d032da9892d..9826e038629a6fda057ba1aed87c6cc45c8e9e8a 100644 GIT binary patch delta 1463 zcmYk*O-PhM9LMpIP1n_Q^F7OIBM2+C-K7_|Ft8xf$TYOrjFJK~lSmA$!?GR94k;NM zb&x{Q5RwpC$TW(egOL}tOO%mVAYQUVWnQZ9FXzz1!+d7u`9IIh{AZp|MXv)L>0$HV z)fQ_^8tryW$8LrbK5 zL`O1SN4WqdT9fHqMtcLUz+7tp9kfgFJeGy2aGMbd z557W8;0xZv@2C&Ak$gxmhu&|%L=0b| zqEuf+4IIG=?7@fl1FNx<=pZgwD;Vt0iICQzq$3fJKxuElI-qy9o%ja9e?8*x3}LJtn2GB}Bfn?bT}exnAC z=U33cDX25yLAU-t9~I5C7_}z{kg-iADzFxdu>}=3jGFLE)PQ41w#^6B0CT9gU-tPQ zTt(YWdZ?PssPFGVoj+4fMTaPe3cQHgvzy4|O^1EngWAIpJcln(@8`0i`RGG^=M+A` zX4HTgbn5VKLQQNdYN0za?f<`*4z08rm9hrgZpI6=Z{T+PiCSS^*3yc1quwh)W#Ty2 zU_Ex?7*^m}4#Z&`#v|y;X3=;eoBWqhc}&MqT);{!BMr6KgUUn#8>*GNQ5i}@Z9xI* zw+o;qz8@LWlq0vPqd17yP`}+c_ToD%#ZXL6wAI;_kmC2|djt7CzsK*}<=wW$>yPYA Z9g57SHaZFmywOnFS4T`)v>~g>`4=Xsi@pj5>XLy&8E_rsMr{O!yn3ASDQa_n_GXF z*@UKl{DIaVu79{~hGm8^x8@Ij@&5FjXX~u*^E&7EoacAW`JQuXPkT4x#308p#vBRa zgHju8%s{NeL3jpx;|&bKI~a=hZ2PhO{uSyK?{EZu#3=01$N#=)jHaD{gE7mxrjK#D zzNoejj$jxaE@C7$BY&oi4^89=_QMybejl(ub|PaM7qg^lLQvmFq9!~VeVB-P&w5n9 zvJjRZL8X!h18_g;hbL^u^S0fDT2TwC-y{3{4eCYTP#ODU4Q13`v|}(FVQ@?4Ca);!X%f_4+C|36f}0$!qi*H8lovwTgc z2(|K6s7$W&KX*(G6=h%-YHtppCRArVjR~}`+wb4tN!lMU6L+wG4_q8hRHhtGunt=T z>V4Ocugp!AG$DVcl@IOVGpxYp zsNc^T!qvhYRKJ~g7LTF^Okh9s|6w+2V%eyL=0)54U(5rovKqHhLMBVi~rg zG7-y$Yvu8%3{6CBK^AgBOg?JjYmr5pa?}}ca3MCLuH7fRgg-DB8yrp;hu177x|bO= z=68Q!>l!?Z(EcfvJqW$nLud1 zKo(6lkxFQPRkT`NKV>hC;INyygvwYVolqu{2%UjIaZ|}5NPvpdwGY}8rBNwS(cxG@ z=z7f}RPqS@AJD$5Xj=khTA+e)1Q(&}VCwNiVmzU3m_!7MZps+lf1S)^LI+7j`>gAx zyRS0cPuKqdTQ%dT#M{PF%pi0gCfH}Qv4|LL+f%JRYk+8%X+9iuJ~YBNEzz5l=uLL} zQqq%rlf1tAjPMp$M*Z*b?IV*t-q4ka^GmmuR&A)MtV(z1SC($9sBtHGyq?tNvWV|J MUAvo$qN;=c1GQ|co&W#< diff --git a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po index ca7b099..ae51df4 100644 --- a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po +++ b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po @@ -8,17 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"POT-Creation-Date: 2020-09-12 21:04+0200\n" "PO-Revision-Date: 2018-02-04 15:24+0100\n" "Last-Translator: Sven Lohrmann \n" "Language: de\n" "Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.4.0\n" -"X-Generator: Poedit 2.0.6\n" +"Generated-By: Babel 2.8.0\n" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 msgid "Start Print" @@ -42,11 +41,11 @@ msgstr "Konnte Profil nicht hinzufügen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 msgid "" -"There was an unexpected error while saving the filament profile, please consult " -"the logs." +"There was an unexpected error while saving the filament profile, please " +"consult the logs." msgstr "" -"Unerwarteter Fehler beim Speichern des Filamentprofils, bitte konsultiere das " -"Log." +"Unerwarteter Fehler beim Speichern des Filamentprofils, bitte konsultiere" +" das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 msgid "Could not update profile" @@ -54,11 +53,11 @@ msgstr "Konnte Profil nicht aktualisieren" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 msgid "" -"There was an unexpected error while updating the filament profile, please " -"consult the logs." +"There was an unexpected error while updating the filament profile, please" +" consult the logs." msgstr "" -"Unerwarteter Fehler beim Aktualisieren des Filamentprofils, bitte konsultiere " -"das Log." +"Unerwarteter Fehler beim Aktualisieren des Filamentprofils, bitte " +"konsultiere das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 msgid "Could not delete profile" @@ -66,10 +65,11 @@ msgstr "Konnte Profil nicht löschen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 msgid "" -"There was an unexpected error while removing the filament profile, please " -"consult the logs." +"There was an unexpected error while removing the filament profile, please" +" consult the logs." msgstr "" -"Unerwarteter Fehler beim Löschen des Filamentprofils, bitte konsultiere das Log." +"Unerwarteter Fehler beim Löschen des Filamentprofils, bitte konsultiere " +"das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 msgid "Delete profile?" @@ -77,12 +77,12 @@ msgstr "Profil löschen?" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 msgid "" -"You are about to delete the filament profile (). Please note " -"that it is not possible to delete profiles with associated spools." +"You are about to delete the filament profile (). Please" +" note that it is not possible to delete profiles with associated spools." msgstr "" -"Du bist im Begriff das Filament-Profil () zu löschen. Bitte " -"beachte, dass es nicht möglich ist Profile zu löschen die Spulen zugewiesen " -"wurden." +"Du bist im Begriff das Filament-Profil () zu löschen. " +"Bitte beachte, dass es nicht möglich ist Profile zu löschen die Spulen " +"zugewiesen wurden." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 @@ -96,7 +96,8 @@ msgstr "Konnte Spule nicht auswählen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 msgid "" -"There was an unexpected error while selecting the spool, please consult the logs." +"There was an unexpected error while selecting the spool, please consult " +"the logs." msgstr "Unerwarteter Fehler beim auswählen der Spule, bitte konsultiere das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 @@ -105,10 +106,11 @@ msgstr "Konnte Spule nicht hinzufügen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 msgid "" -"There was an unexpected error while saving the filament spool, please consult " -"the logs." +"There was an unexpected error while saving the filament spool, please " +"consult the logs." msgstr "" -"Unerwarteter Fehler beim speichern der Filamentspule, bitte konsultiere das Log." +"Unerwarteter Fehler beim speichern der Filamentspule, bitte konsultiere " +"das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 msgid "Could not update spool" @@ -116,11 +118,11 @@ msgstr "Konnte Spule nicht aktualisieren" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 msgid "" -"There was an unexpected error while updating the filament spool, please consult " -"the logs." +"There was an unexpected error while updating the filament spool, please " +"consult the logs." msgstr "" -"Unerwarteter Fehler beim Aktualisieren der Filamentspule, bitte konsultiere das " -"Log." +"Unerwarteter Fehler beim Aktualisieren der Filamentspule, bitte " +"konsultiere das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 msgid "Could not delete spool" @@ -128,10 +130,11 @@ msgstr "Konnte Spule nicht löschen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 msgid "" -"There was an unexpected error while removing the filament spool, please consult " -"the logs." +"There was an unexpected error while removing the filament spool, please " +"consult the logs." msgstr "" -"Unerwarteter Fehler beim Löschen der Filamentspule, bitte konsultiere das Log." +"Unerwarteter Fehler beim Löschen der Filamentspule, bitte konsultiere das" +" Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 msgid "Delete spool?" @@ -147,10 +150,11 @@ msgstr "Filament nicht ausreichend" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 msgid "" -"The current print job needs more material than what's left on the selected spool." +"The current print job needs more material than what's left on the " +"selected spool." msgstr "" -"Der aktuelle Druckauftrag benötigt mehr Material als auf der ausgewählten Spule " -"vorhanden ist." +"Der aktuelle Druckauftrag benötigt mehr Material als auf der ausgewählten" +" Spule vorhanden ist." #: octoprint_filamentmanager/templates/settings.jinja2:4 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 @@ -253,10 +257,11 @@ msgstr "Aussehen" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:26 msgid "" -"Show dialog to confirm selected spools before starting/resuming the print job" +"Show dialog to confirm selected spools before starting/resuming the print" +" job" msgstr "" -"Vor dem starten/fortsetzen eines Druckauftrags einen Dialog zur Bestätigung der " -"ausgewählten Spulen anzeigen" +"Vor dem starten/fortsetzen eines Druckauftrags einen Dialog zur " +"Bestätigung der ausgewählten Spulen anzeigen" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:34 msgid "Warn if print job exceeds remaining filament" @@ -268,7 +273,7 @@ msgstr "Software-Hodometer aktivieren, um den Filamentverbrauch zu messen" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50 msgid "Pause print if filament runs out" -msgstr "Druck pausieren, wenn Filament zur zeige geht" +msgstr "Druck pausieren, wenn Filament zur Neige geht" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56 msgid "Pause threshold" @@ -296,11 +301,11 @@ msgstr "Verbindungstest" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 msgid "" -"Note: If you change these settings you must restart your OctoPrint instance for " -"the changes to take affect." +"Note: If you change these settings you must restart your OctoPrint " +"instance for the changes to take affect." msgstr "" -"Beachte: Wenn du diese Einstellungen änderst musst du OctoPrint neu starten, " -"damit diese wirksam werden." +"Beachte: Wenn du diese Einstellungen änderst musst du OctoPrint neu " +"starten, damit diese wirksam werden." #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 msgid "Import & Export" @@ -320,10 +325,11 @@ msgstr "Export" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 msgid "" -"This does not look like a valid import archive. Only zip files are supported." +"This does not look like a valid import archive. Only zip files are " +"supported." msgstr "" -"Dies sieht nicht wie ein gültiges Archiv zum importieren aus. Es werden nur Zip-" -"Dateien unterstützt." +"Dies sieht nicht wie ein gültiges Archiv zum importieren aus. Es werden " +"nur Zip-Dateien unterstützt." #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 msgid "Currency symbol" @@ -413,20 +419,23 @@ msgstr "Bestätige deine Spulauswahl" #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 msgid "" -"There are no information available about the active tools for the print job. " -"Make sure the analysing process of the file has finished and that it's loaded " -"correctly." +"There are no information available about the active tools for the print " +"job. Make sure the analysing process of the file has finished and that " +"it's loaded correctly." msgstr "" "Es sind keine Informationen über die aktiven Tools für den Druckauftrag " -"vorhanden. Überprüfe ob die Datei bereits analysiert und korrekt geladen wurde." +"vorhanden. Überprüfe ob die Datei bereits analysiert und korrekt geladen " +"wurde." #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 msgid "" -"Please confirm your selected spools for all active tools. This dialog is meant " -"to protect you from accidentically selecting wrong spools for the print." +"Please confirm your selected spools for all active tools. This dialog is " +"meant to protect you from accidentically selecting wrong spools for the " +"print." msgstr "" -"Bitte bestätige deine Spulenauswahl für alle aktiven Tools. Dieser Dialog soll " -"verhindern, dass du aus Versehen falsche Spulen für deinen Druck auswählst." +"Bitte bestätige deine Spulenauswahl für alle aktiven Tools. Dieser Dialog" +" soll verhindern, dass du aus Versehen falsche Spulen für deinen Druck " +"auswählst." #~ msgid "Profile (ascending)" #~ msgstr "Profil (aufsteigend)" @@ -444,23 +453,27 @@ msgstr "" #~ msgstr "Abfrage der Spulen fehlgeschlagen" #~ msgid "" -#~ "There was an unexpected database error while saving the filament profile, " +#~ "There was an unexpected database error" +#~ " while saving the filament profile, " #~ "please consult the logs." #~ msgstr "" -#~ "Unerwarteter Fehler beim Speichern des Filamentprofils, bitte konsultiere das " -#~ "Log." +#~ "Unerwarteter Fehler beim Speichern des " +#~ "Filamentprofils, bitte konsultiere das Log." #~ msgid "" -#~ "There was an unexpected database error while updating the filament profile, " +#~ "There was an unexpected database error" +#~ " while updating the filament profile, " #~ "please consult the logs." #~ msgstr "" -#~ "Ein unerwarteter Datenbankfehler ist aufgetreten, bitte konsultiere die Logs." +#~ "Ein unerwarteter Datenbankfehler ist " +#~ "aufgetreten, bitte konsultiere die Logs." #~ msgid "" #~ "There was an unexpected error while removing the filament spool,\n" #~ " please consult the logs." #~ msgstr "" -#~ "Ein unerwarteter Datenbankfehler ist aufgetreten, bitte konsultiere die Logs." +#~ "Ein unerwarteter Datenbankfehler ist " +#~ "aufgetreten, bitte konsultiere die Logs." #~ msgid "Spool selection failed" #~ msgstr "Konnte Spule nicht auswählen" @@ -473,3 +486,4 @@ msgstr "" #~ msgid "Enable filament odometer" #~ msgstr "Filament-Hodometer aktivieren" + diff --git a/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.mo b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..8b6b722512c32e0ea9192270dfabadc2a761826d GIT binary patch literal 7467 zcmchbdyHIF9mlV{ltoZc!3UBfCfI6cy1N1?OIz5s+p?zHmhP5^1oX_@Gc&i`xo3LM zy}MnaiHVU!0`VPVjENgHNQfFzBMKoz*2Kg=e8&(4Btk;`gXkX`)W7`v&OLW#w^<4i zN;94BoY(LC&hP!(r!PF~s}cWh;{PT5|HBzF8vVQH>?nFW!+XJZfGglR;E%y`!AHR{ z@E2kHyRiNw$R~Q1FQNN4@SWf}92R<)fbRmw!HdAzfS(BSOJV#4@GY$02VMw11ilIU zCCDfGJzsAI{{+gu=fU&A7r{4zXY(cd&j)4wB2f6f9Gn0rK(C7BSA%CV{wR0{cmU)R zJrCCI)bpzM1P zlzY!ZSi;XOpuGEbP~_MO^T$D+7<~#9dEW&JKlcXw7Py7+iLm|*_(jIggS)|Hm_G3a z>=G0?9YdM#0q+9kohu+)qx(Ug68!{}cdvqS@2^3*_X+Sa@Gs!|z%yV%P=S|%I|JSZ zihX|)RN&VGJ`8d+`ZM@m@C6VNMCW4sa?iz}j1|aI)C9#Yro;MS5EVtYf}#fl%Kj1@ z2R{P}ogaa6?om+W_$!c4^c-LE{(pnA?|cR_e-SA5@u4uD2Khus_>z4`L80S7k=y4$ zZ}*^_e*hG}eGC-)djc%Lr$Le9Jck?L$3fxyUhwnaH^Fy<4K5dY`vM*S<=!J8pXheJ zAQhFM=<9A!^z|k1W^e_(3j8l9_f1?}@wEe#@eN^o8+e%UF;MLG=U@&Vh52LPQvnac z)PV8Nz!IF~(R;w}few5D+z)D$D180^6uW&06!|;?iX8q33cpW+vhO*NCr2-UvhPfc z89WYDkP;NU(Y7}EXH*ZqYF4X+M+SE@@w~NGP(R3VF zlhO2GV05mtwuyG-cFCD$vl;D{aT@JTtuxVXn{|@Bua<3@E9VKCSUDl-SS-_6WwuZn zl7s5{lV<(aHFGgE3bVoHuyFGJ>dxxMHDt;`tT!YR76O?v&rQ}|R&Kf9vT3wO7g{C# zfz1om(a0+HQ!UL)_jtwv1o>2RHM7^&i=McQGM5y~(Vj&2c~c(kDFV717LbVKdrmbityF_J)O8&1+_= z+lCwb&_%QUodMM4DiEB_T-oU)?SxB4x6Kx&@6^ELYM{F&n$sCDx@wL`<%v#NsD7wT z+O0LR z&ae1mh@#M_&l}{yc3}_Y2@gp!rm z{&Z(336+Kf6t62&#KRHf<(h0q-L2(l-s`<$al!Pl zRqq+fb~<8j3mArQmLXAzatmSv-v5iy-6}ICMgziTzc%Fpi&INIU3}1~)N~4EGk^X1 z=QV{Q$HaRxi^1_$NN|0V71L_U3MZ8Y@%%( z7TED*d_eDMl#c#fj{u>wm=%r5dw#8snQU7EUAst^Yc7{K!mG;693Qa27L(_=#!^o* zL~iGq1~76P*{7~I;bP^5@9Pj(x%-4zn0cdAXBw{H!T8;=|(;95#!ITtC`(bz}U>#`slgVq)qe zVc&l3ipBy(s!MfYbLxae0^2_9DbZ?s!l2ppgX>&T#))kVEGfO&w*8%B`za+#3YjTo z+;GrXFuE@@YWx2E*QJTDy>pB#n(MT&m!R&ZR5tKKw`1}e5|ga#*p#XF?@$w)$L40| zW=4XWXpWDOdJ8gHV_|u~RRw0db&z6G*GLtTlbm*xMW?ZCv`=2sF?nMqYg;Lyrqs4p zQjG00nItuXgqNq(F5NPznrv?4hN{Ld&7xI@OpfWTFY?<6QRixxZ6%owrG7hEJwdI% z`k;=JT($fX1;5TI{16@Wr6xD)d{px5Jlai`5U6S#ty0oRb<|bWh`%Y;j+%`LH7HGt zdxT41m#hqT8?L6h=3?zxlO~=GwejKM@=KjIU0%2GA}P2e1l@^bHYUDi!-&FsBCUdW zBxOQoVkG4=Ct;}S93V$)Br(alXqS|PY^_E!;W5!J@-h2@)E|GWUI_BJHhTQAbz4F+ z5o;QfWOar5D7SSxF(f1H#E9tix|O7UqHki#d9+PsNtKB$j{1zt>PF+T&`^kWY56D# z^40G)nxbWZV7f@?g= zn_=if2u;Xs7*uJha;=V)QqsDLD%jIqBAJoC#L{*XL~^VNU-GR-pw}NzMSJDCM4mSk zySQJM*r<_A-ZhzAIH0HDG&1ezMVoJ_EA{n`%tm2@FqM~%N|+91#$hy7hhpWmt1IM5 zBV5O{DZ)IVT8vNLfKMJpD0N&&2x7kaWDe54EFN|;I`uE>Bx?nik`<+AArlz_O0YkA z6JCQ>hd<3)3IfJfwuQS&A}Wqw-#48?smBz8>Fab0>L-aIpH$kFN>+U_i_jo=V`)YQbNV_s z$KKI2ej`z7%`-*~jh1!lfEF9z!W{Q;eE(V|q`f4v(ag{)pcWXB1|j$(N=Ut)dU{!5 z7sJrDE`m2DM$3-1d?G7qhs+lx&f-1ttlCaQxzHNPBCyd^)6R5PAC}A|dnywNjf{_@ zIzt0wdhbZ9_roeh9dQ{EN|P&W;9gj<%+$stvBfl_>$S4d#)-V~)2fS+Sj=iB7CFoi zuv$e8FMy#qXgX?tc!j!pUf>rSl{@%J<)gDp^!Pf&+N;e zz6iBqdczW+In)KUIY961izqZk#371|FPLaO)`HK=|f|M9Z54K9Qv}Q?z3pDa6rB>HlnihP^Rv$ zOSNvk`d+z34$nT_OCnsyb?|J*+vq zamTg5`}wp>i4Q&+Ws=jR-SUAg(5zI=JVADt%d~H}sBaOPWWf!1+1Mdoy4(66cN+>U literal 0 HcmV?d00001 diff --git a/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po new file mode 100644 index 0000000..ae63aaa --- /dev/null +++ b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po @@ -0,0 +1,378 @@ +# Translations template for OctoPrint-FilamentManager. +# Copyright (C) 2019 The OctoPrint Project +# This file is distributed under the same license as the +# OctoPrint-FilamentManager project. +# Ivan Garcia , 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n" +"Report-Msgid-Bugs-To: i18n@octoprint.org\n" +"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"PO-Revision-Date: 2019-05-06 11:31+0100\n" +"Last-Translator: Ivan Garcia \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.4.0\n" +"Language: es\n" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 +msgid "Start Print" +msgstr "Comenzar Impresión" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:349 +msgid "Resume Print" +msgstr "Continuar Impresión" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:424 +msgid "Data import failed" +msgstr "Error al importar los datos" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:425 +msgid "Something went wrong, please consult the logs." +msgstr "Algo ha ido mal, revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:557 +msgid "Could not add profile" +msgstr "No se puede añadir el perfil" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 +msgid "There was an unexpected error while saving the filament profile, please consult the logs." +msgstr "Ha ocurrido un error al intentar guardar el perfil del filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 +msgid "Could not update profile" +msgstr "No se puede actualizar el perfil" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 +msgid "There was an unexpected error while updating the filament profile, please consult the logs." +msgstr "Ha ocurrido un error mientras se actualizaba el perfil del filamento" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 +msgid "Could not delete profile" +msgstr "No se puede eliminar el perfil" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 +msgid "There was an unexpected error while removing the filament profile, please consult the logs." +msgstr "Ha ocurrido un error al intentar eliminar el perfil del filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 +msgid "Delete profile?" +msgstr "¿Eliminar perfil?" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 +msgid "You are about to delete the filament profile (). Please note that it is not possible to delete profiles with associated spools." +msgstr "Estas apunto de borrar el perfil de filamento (). Ten en cuenta que no es posible borrar perfiles con bobinas asociadas." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 +msgid "Delete" +msgstr "Eliminar" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:686 +msgid "Could not select spool" +msgstr "No se puede elegir la bobina" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 +msgid "There was an unexpected error while selecting the spool, please consult the logs." +msgstr "Ha ocurrido un error al intentar seleccionar el perfil del filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 +msgid "Could not add spool" +msgstr "No se puede añadir la bobina" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 +msgid "There was an unexpected error while saving the filament spool, please consult the logs." +msgstr "Ha ocurrido un error al intentar guardar la bobina de filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 +msgid "Could not update spool" +msgstr "No se puede actualizar la bobina" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 +msgid "There was an unexpected error while updating the filament spool, please consult the logs." +msgstr "Ha ocurrido un error al intentar actualizar la bobina de filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 +msgid "Could not delete spool" +msgstr "No se puede eliminar la bobina" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 +msgid "There was an unexpected error while removing the filament spool, please consult the logs." +msgstr "Ha ocurrido un error al intentar eliminar la bobina de filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 +msgid "Delete spool?" +msgstr "¿Borrar bobina?" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:901 +msgid "You are about to delete the filament spool - ()." +msgstr "Estás apunto de borrar la bobina de filamento - ()." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:973 +msgid "Insufficient filament" +msgstr "Filamento insuficiente" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 +msgid "The current print job needs more material than what's left on the selected spool." +msgstr "La impresión actual necesita mas filamento del que hay en la bobina seleccionada." + +#: octoprint_filamentmanager/templates/settings.jinja2:4 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 +msgid "Plugin Configuration" +msgstr "Configuración del Plugin" + +#: octoprint_filamentmanager/templates/settings.jinja2:7 +msgid "Filament Spools" +msgstr "Bobinas de filamento" + +#: octoprint_filamentmanager/templates/settings.jinja2:13 +msgid "Items per page" +msgstr "Objetos por página" + +#: octoprint_filamentmanager/templates/settings.jinja2:22 +msgid "Sort by" +msgstr "Ordenar por" + +#: octoprint_filamentmanager/templates/settings.jinja2:23 +msgid "Name (ascending)" +msgstr "Nombre (Ascendente)" + +#: octoprint_filamentmanager/templates/settings.jinja2:24 +msgid "Material (ascending)" +msgstr "Material (Ascendente)" + +#: octoprint_filamentmanager/templates/settings.jinja2:25 +msgid "Vendor (ascending)" +msgstr "Vendedor (Ascendente)" + +#: octoprint_filamentmanager/templates/settings.jinja2:26 +msgid "Remaining (descending)" +msgstr "Restante (Descendente)" + +#: octoprint_filamentmanager/templates/settings.jinja2:36 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:15 +msgid "Name" +msgstr "Nombre" + +#: octoprint_filamentmanager/templates/settings.jinja2:37 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:38 +msgid "Material" +msgstr "Material" + +#: octoprint_filamentmanager/templates/settings.jinja2:38 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:26 +msgid "Vendor" +msgstr "Vendedor" + +#: octoprint_filamentmanager/templates/settings.jinja2:39 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:50 +msgid "Weight" +msgstr "Peso" + +#: octoprint_filamentmanager/templates/settings.jinja2:40 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:62 +msgid "Remaining" +msgstr "Restante" + +#: octoprint_filamentmanager/templates/settings.jinja2:41 +msgid "Used" +msgstr "Usado" + +#: octoprint_filamentmanager/templates/settings.jinja2:42 +msgid "Action" +msgstr "Acción" + +#: octoprint_filamentmanager/templates/settings.jinja2:54 +msgid "Edit Spool" +msgstr "Editar bobina" + +#: octoprint_filamentmanager/templates/settings.jinja2:55 +msgid "Duplicate Spool" +msgstr "Duplicar bobina" + +#: octoprint_filamentmanager/templates/settings.jinja2:56 +msgid "Delete Spool" +msgstr "Borrar bobina" + +#: octoprint_filamentmanager/templates/settings.jinja2:79 +msgid "Manage Profiles" +msgstr "Administrar perfiles" + +#: octoprint_filamentmanager/templates/settings.jinja2:80 +msgid "Add Spool" +msgstr "Añadir bobina" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:12 +msgid "Features" +msgstr "Características" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:87 +msgid "Database" +msgstr "Base de datos" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:14 +msgid "Appearance" +msgstr "Apariencia" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:26 +msgid "Show dialog to confirm selected spools before starting/resuming the print job" +msgstr "Mostrar el diálogo para confirmar las bobinas antes de empezar/continuar una impresión" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:34 +msgid "Warn if print job exceeds remaining filament" +msgstr "Avisar si la impresión excede el filamento restante" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:42 +msgid "Enable software odometer to measure used filament" +msgstr "Habilitar medición mediante software \"odometer\"" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50 +msgid "Pause print if filament runs out" +msgstr "Pausar la impresión si el filamento se gasta" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56 +msgid "Pause threshold" +msgstr "Margen de pausa" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:74 +msgid "Use external database" +msgstr "Usar base de datos externa" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:80 +msgid "URI" +msgstr "URI" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:94 +msgid "Username" +msgstr "Usuario" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:101 +msgid "Password" +msgstr "Contraseña" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:108 +msgid "Test connection" +msgstr "Comprobar conexión" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 +msgid "Note: If you change these settings you must restart your OctoPrint instance for the changes to take affect." +msgstr "Nota: Si cambias esta configuración deberás reiniciar la instancia de OctoPrint para que los cambios hagan efecto." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 +msgid "Import & Export" +msgstr "Importar & Exportar" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:120 +msgid "Browse..." +msgstr "Examinar..." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:124 +msgid "Import" +msgstr "Importar" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:126 +msgid "Export" +msgstr "Exportar" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 +msgid "This does not look like a valid import archive. Only zip files are supported." +msgstr "No parece un fichero de importación valido. Sólo se permiten archivos ZIP." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 +msgid "Currency symbol" +msgstr "Simbolo de moneda" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 +msgid "Cancel" +msgstr "Cancelar" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:150 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 +msgid "Save" +msgstr "Guardar" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:5 +msgid "Filament Profiles" +msgstr "Perfiles de Filamento" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:13 +msgid "--- New Profile ---" +msgstr "--- Nuevo Perfil ---" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:14 +msgid "New" +msgstr "Nuevo" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 +msgid "Save profile" +msgstr "Guardar perfil" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:30 +msgid "Vendor must be set" +msgstr "Debes escribir el vendedor" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:42 +msgid "Material must be set" +msgstr "Debes escribir el material" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:50 +msgid "Density" +msgstr "Densidad" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:62 +msgid "Diameter" +msgstr "Diámetro" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:75 +msgid "Close" +msgstr "Cerrar" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:5 +msgid "Filament Spool" +msgstr "Bobina de Filamento" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:19 +msgid "Name must be set" +msgstr "Debes escribir un nombre" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:27 +msgid "Profile" +msgstr "Perfil" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:38 +msgid "Price" +msgstr "Precio" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:74 +msgid "Temperature offset" +msgstr "Temperatura" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:4 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 +msgid "Tool" +msgstr "Extrusor" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:5 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 +msgid "--- Select Spool ---" +msgstr "--- Seleccionar Bobina ---" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5 +msgid "Confirm your selected spools" +msgstr "Confirma las bobinas seleccionadas" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 +msgid "There are no information available about the active tools for the print job. Make sure the analysing process of the file has finished and that it's loaded correctly." +msgstr "No hay información disponible sobre el extrusor de la impresión actual. Asegúrate de que el proceso de análisis esté finalizado y se haya cargado correctamente." + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 +msgid "Please confirm your selected spools for all active tools. This dialog is meant to protect you from accidentically selecting wrong spools for the print." +msgstr "Por favor, confirma las bobinas de los extrusores. Este dialogo está preparado para evitar que elijas bobinas incorrectas de forma accidental." + diff --git a/setup.py b/setup.py index 5075e2e..2bc946e 100644 --- a/setup.py +++ b/setup.py @@ -6,11 +6,11 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "0.5.3" +plugin_version = "1.6.0" plugin_description = "Manage your spools and keep track of remaining filament on them" -plugin_author = "Sven Lohrmann" -plugin_author_email = "malnvenshorn@gmail.com" -plugin_url = "https://github.com/malnvenshorn/OctoPrint-FilamentManager" +plugin_author = "Sven Lohrmann, Olli" +plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" +plugin_url = "https://github.com/OllisGit/OctoPrint-FilamentManager" plugin_license = "AGPLv3" plugin_requires = ["backports.csv>=1.0.5,<1.1", "uritools>=2.1,<2.2", diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index 9f3867ba8ff308ccf2801713f0ca7d032da9892d..9826e038629a6fda057ba1aed87c6cc45c8e9e8a 100644 GIT binary patch delta 1463 zcmYk*O-PhM9LMpIP1n_Q^F7OIBM2+C-K7_|Ft8xf$TYOrjFJK~lSmA$!?GR94k;NM zb&x{Q5RwpC$TW(egOL}tOO%mVAYQUVWnQZ9FXzz1!+d7u`9IIh{AZp|MXv)L>0$HV z)fQ_^8tryW$8LrbK5 zL`O1SN4WqdT9fHqMtcLUz+7tp9kfgFJeGy2aGMbd z557W8;0xZv@2C&Ak$gxmhu&|%L=0b| zqEuf+4IIG=?7@fl1FNx<=pZgwD;Vt0iICQzq$3fJKxuElI-qy9o%ja9e?8*x3}LJtn2GB}Bfn?bT}exnAC z=U33cDX25yLAU-t9~I5C7_}z{kg-iADzFxdu>}=3jGFLE)PQ41w#^6B0CT9gU-tPQ zTt(YWdZ?PssPFGVoj+4fMTaPe3cQHgvzy4|O^1EngWAIpJcln(@8`0i`RGG^=M+A` zX4HTgbn5VKLQQNdYN0za?f<`*4z08rm9hrgZpI6=Z{T+PiCSS^*3yc1quwh)W#Ty2 zU_Ex?7*^m}4#Z&`#v|y;X3=;eoBWqhc}&MqT);{!BMr6KgUUn#8>*GNQ5i}@Z9xI* zw+o;qz8@LWlq0vPqd17yP`}+c_ToD%#ZXL6wAI;_kmC2|djt7CzsK*}<=wW$>yPYA Z9g57SHaZFmywOnFS4T`)v>~g>`4=Xsi@pj5>XLy&8E_rsMr{O!yn3ASDQa_n_GXF z*@UKl{DIaVu79{~hGm8^x8@Ij@&5FjXX~u*^E&7EoacAW`JQuXPkT4x#308p#vBRa zgHju8%s{NeL3jpx;|&bKI~a=hZ2PhO{uSyK?{EZu#3=01$N#=)jHaD{gE7mxrjK#D zzNoejj$jxaE@C7$BY&oi4^89=_QMybejl(ub|PaM7qg^lLQvmFq9!~VeVB-P&w5n9 zvJjRZL8X!h18_g;hbL^u^S0fDT2TwC-y{3{4eCYTP#ODU4Q13`v|}(FVQ@?4Ca);!X%f_4+C|36f}0$!qi*H8lovwTgc z2(|K6s7$W&KX*(G6=h%-YHtppCRArVjR~}`+wb4tN!lMU6L+wG4_q8hRHhtGunt=T z>V4Ocugp!AG$DVcl@IOVGpxYp zsNc^T!qvhYRKJ~g7LTF^Okh9s|6w+2V%eyL=0)54U(5rovKqHhLMBVi~rg zG7-y$Yvu8%3{6CBK^AgBOg?JjYmr5pa?}}ca3MCLuH7fRgg-DB8yrp;hu177x|bO= z=68Q!>l!?Z(EcfvJqW$nLud1 zKo(6lkxFQPRkT`NKV>hC;INyygvwYVolqu{2%UjIaZ|}5NPvpdwGY}8rBNwS(cxG@ z=z7f}RPqS@AJD$5Xj=khTA+e)1Q(&}VCwNiVmzU3m_!7MZps+lf1S)^LI+7j`>gAx zyRS0cPuKqdTQ%dT#M{PF%pi0gCfH}Qv4|LL+f%JRYk+8%X+9iuJ~YBNEzz5l=uLL} zQqq%rlf1tAjPMp$M*Z*b?IV*t-q4ka^GmmuR&A)MtV(z1SC($9sBtHGyq?tNvWV|J MUAvo$qN;=c1GQ|co&W#< diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index ca7b099..ae51df4 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -8,17 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"POT-Creation-Date: 2020-09-12 21:04+0200\n" "PO-Revision-Date: 2018-02-04 15:24+0100\n" "Last-Translator: Sven Lohrmann \n" "Language: de\n" "Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.4.0\n" -"X-Generator: Poedit 2.0.6\n" +"Generated-By: Babel 2.8.0\n" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 msgid "Start Print" @@ -42,11 +41,11 @@ msgstr "Konnte Profil nicht hinzufügen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 msgid "" -"There was an unexpected error while saving the filament profile, please consult " -"the logs." +"There was an unexpected error while saving the filament profile, please " +"consult the logs." msgstr "" -"Unerwarteter Fehler beim Speichern des Filamentprofils, bitte konsultiere das " -"Log." +"Unerwarteter Fehler beim Speichern des Filamentprofils, bitte konsultiere" +" das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 msgid "Could not update profile" @@ -54,11 +53,11 @@ msgstr "Konnte Profil nicht aktualisieren" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 msgid "" -"There was an unexpected error while updating the filament profile, please " -"consult the logs." +"There was an unexpected error while updating the filament profile, please" +" consult the logs." msgstr "" -"Unerwarteter Fehler beim Aktualisieren des Filamentprofils, bitte konsultiere " -"das Log." +"Unerwarteter Fehler beim Aktualisieren des Filamentprofils, bitte " +"konsultiere das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 msgid "Could not delete profile" @@ -66,10 +65,11 @@ msgstr "Konnte Profil nicht löschen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 msgid "" -"There was an unexpected error while removing the filament profile, please " -"consult the logs." +"There was an unexpected error while removing the filament profile, please" +" consult the logs." msgstr "" -"Unerwarteter Fehler beim Löschen des Filamentprofils, bitte konsultiere das Log." +"Unerwarteter Fehler beim Löschen des Filamentprofils, bitte konsultiere " +"das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 msgid "Delete profile?" @@ -77,12 +77,12 @@ msgstr "Profil löschen?" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 msgid "" -"You are about to delete the filament profile (). Please note " -"that it is not possible to delete profiles with associated spools." +"You are about to delete the filament profile (). Please" +" note that it is not possible to delete profiles with associated spools." msgstr "" -"Du bist im Begriff das Filament-Profil () zu löschen. Bitte " -"beachte, dass es nicht möglich ist Profile zu löschen die Spulen zugewiesen " -"wurden." +"Du bist im Begriff das Filament-Profil () zu löschen. " +"Bitte beachte, dass es nicht möglich ist Profile zu löschen die Spulen " +"zugewiesen wurden." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 @@ -96,7 +96,8 @@ msgstr "Konnte Spule nicht auswählen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 msgid "" -"There was an unexpected error while selecting the spool, please consult the logs." +"There was an unexpected error while selecting the spool, please consult " +"the logs." msgstr "Unerwarteter Fehler beim auswählen der Spule, bitte konsultiere das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 @@ -105,10 +106,11 @@ msgstr "Konnte Spule nicht hinzufügen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 msgid "" -"There was an unexpected error while saving the filament spool, please consult " -"the logs." +"There was an unexpected error while saving the filament spool, please " +"consult the logs." msgstr "" -"Unerwarteter Fehler beim speichern der Filamentspule, bitte konsultiere das Log." +"Unerwarteter Fehler beim speichern der Filamentspule, bitte konsultiere " +"das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 msgid "Could not update spool" @@ -116,11 +118,11 @@ msgstr "Konnte Spule nicht aktualisieren" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 msgid "" -"There was an unexpected error while updating the filament spool, please consult " -"the logs." +"There was an unexpected error while updating the filament spool, please " +"consult the logs." msgstr "" -"Unerwarteter Fehler beim Aktualisieren der Filamentspule, bitte konsultiere das " -"Log." +"Unerwarteter Fehler beim Aktualisieren der Filamentspule, bitte " +"konsultiere das Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 msgid "Could not delete spool" @@ -128,10 +130,11 @@ msgstr "Konnte Spule nicht löschen" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 msgid "" -"There was an unexpected error while removing the filament spool, please consult " -"the logs." +"There was an unexpected error while removing the filament spool, please " +"consult the logs." msgstr "" -"Unerwarteter Fehler beim Löschen der Filamentspule, bitte konsultiere das Log." +"Unerwarteter Fehler beim Löschen der Filamentspule, bitte konsultiere das" +" Log." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 msgid "Delete spool?" @@ -147,10 +150,11 @@ msgstr "Filament nicht ausreichend" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 msgid "" -"The current print job needs more material than what's left on the selected spool." +"The current print job needs more material than what's left on the " +"selected spool." msgstr "" -"Der aktuelle Druckauftrag benötigt mehr Material als auf der ausgewählten Spule " -"vorhanden ist." +"Der aktuelle Druckauftrag benötigt mehr Material als auf der ausgewählten" +" Spule vorhanden ist." #: octoprint_filamentmanager/templates/settings.jinja2:4 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 @@ -253,10 +257,11 @@ msgstr "Aussehen" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:26 msgid "" -"Show dialog to confirm selected spools before starting/resuming the print job" +"Show dialog to confirm selected spools before starting/resuming the print" +" job" msgstr "" -"Vor dem starten/fortsetzen eines Druckauftrags einen Dialog zur Bestätigung der " -"ausgewählten Spulen anzeigen" +"Vor dem starten/fortsetzen eines Druckauftrags einen Dialog zur " +"Bestätigung der ausgewählten Spulen anzeigen" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:34 msgid "Warn if print job exceeds remaining filament" @@ -268,7 +273,7 @@ msgstr "Software-Hodometer aktivieren, um den Filamentverbrauch zu messen" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50 msgid "Pause print if filament runs out" -msgstr "Druck pausieren, wenn Filament zur zeige geht" +msgstr "Druck pausieren, wenn Filament zur Neige geht" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56 msgid "Pause threshold" @@ -296,11 +301,11 @@ msgstr "Verbindungstest" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 msgid "" -"Note: If you change these settings you must restart your OctoPrint instance for " -"the changes to take affect." +"Note: If you change these settings you must restart your OctoPrint " +"instance for the changes to take affect." msgstr "" -"Beachte: Wenn du diese Einstellungen änderst musst du OctoPrint neu starten, " -"damit diese wirksam werden." +"Beachte: Wenn du diese Einstellungen änderst musst du OctoPrint neu " +"starten, damit diese wirksam werden." #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 msgid "Import & Export" @@ -320,10 +325,11 @@ msgstr "Export" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 msgid "" -"This does not look like a valid import archive. Only zip files are supported." +"This does not look like a valid import archive. Only zip files are " +"supported." msgstr "" -"Dies sieht nicht wie ein gültiges Archiv zum importieren aus. Es werden nur Zip-" -"Dateien unterstützt." +"Dies sieht nicht wie ein gültiges Archiv zum importieren aus. Es werden " +"nur Zip-Dateien unterstützt." #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 msgid "Currency symbol" @@ -413,20 +419,23 @@ msgstr "Bestätige deine Spulauswahl" #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 msgid "" -"There are no information available about the active tools for the print job. " -"Make sure the analysing process of the file has finished and that it's loaded " -"correctly." +"There are no information available about the active tools for the print " +"job. Make sure the analysing process of the file has finished and that " +"it's loaded correctly." msgstr "" "Es sind keine Informationen über die aktiven Tools für den Druckauftrag " -"vorhanden. Überprüfe ob die Datei bereits analysiert und korrekt geladen wurde." +"vorhanden. Überprüfe ob die Datei bereits analysiert und korrekt geladen " +"wurde." #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 msgid "" -"Please confirm your selected spools for all active tools. This dialog is meant " -"to protect you from accidentically selecting wrong spools for the print." +"Please confirm your selected spools for all active tools. This dialog is " +"meant to protect you from accidentically selecting wrong spools for the " +"print." msgstr "" -"Bitte bestätige deine Spulenauswahl für alle aktiven Tools. Dieser Dialog soll " -"verhindern, dass du aus Versehen falsche Spulen für deinen Druck auswählst." +"Bitte bestätige deine Spulenauswahl für alle aktiven Tools. Dieser Dialog" +" soll verhindern, dass du aus Versehen falsche Spulen für deinen Druck " +"auswählst." #~ msgid "Profile (ascending)" #~ msgstr "Profil (aufsteigend)" @@ -444,23 +453,27 @@ msgstr "" #~ msgstr "Abfrage der Spulen fehlgeschlagen" #~ msgid "" -#~ "There was an unexpected database error while saving the filament profile, " +#~ "There was an unexpected database error" +#~ " while saving the filament profile, " #~ "please consult the logs." #~ msgstr "" -#~ "Unerwarteter Fehler beim Speichern des Filamentprofils, bitte konsultiere das " -#~ "Log." +#~ "Unerwarteter Fehler beim Speichern des " +#~ "Filamentprofils, bitte konsultiere das Log." #~ msgid "" -#~ "There was an unexpected database error while updating the filament profile, " +#~ "There was an unexpected database error" +#~ " while updating the filament profile, " #~ "please consult the logs." #~ msgstr "" -#~ "Ein unerwarteter Datenbankfehler ist aufgetreten, bitte konsultiere die Logs." +#~ "Ein unerwarteter Datenbankfehler ist " +#~ "aufgetreten, bitte konsultiere die Logs." #~ msgid "" #~ "There was an unexpected error while removing the filament spool,\n" #~ " please consult the logs." #~ msgstr "" -#~ "Ein unerwarteter Datenbankfehler ist aufgetreten, bitte konsultiere die Logs." +#~ "Ein unerwarteter Datenbankfehler ist " +#~ "aufgetreten, bitte konsultiere die Logs." #~ msgid "Spool selection failed" #~ msgstr "Konnte Spule nicht auswählen" @@ -473,3 +486,4 @@ msgstr "" #~ msgid "Enable filament odometer" #~ msgstr "Filament-Hodometer aktivieren" + diff --git a/translations/es/LC_MESSAGES/messages.mo b/translations/es/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..8b6b722512c32e0ea9192270dfabadc2a761826d GIT binary patch literal 7467 zcmchbdyHIF9mlV{ltoZc!3UBfCfI6cy1N1?OIz5s+p?zHmhP5^1oX_@Gc&i`xo3LM zy}MnaiHVU!0`VPVjENgHNQfFzBMKoz*2Kg=e8&(4Btk;`gXkX`)W7`v&OLW#w^<4i zN;94BoY(LC&hP!(r!PF~s}cWh;{PT5|HBzF8vVQH>?nFW!+XJZfGglR;E%y`!AHR{ z@E2kHyRiNw$R~Q1FQNN4@SWf}92R<)fbRmw!HdAzfS(BSOJV#4@GY$02VMw11ilIU zCCDfGJzsAI{{+gu=fU&A7r{4zXY(cd&j)4wB2f6f9Gn0rK(C7BSA%CV{wR0{cmU)R zJrCCI)bpzM1P zlzY!ZSi;XOpuGEbP~_MO^T$D+7<~#9dEW&JKlcXw7Py7+iLm|*_(jIggS)|Hm_G3a z>=G0?9YdM#0q+9kohu+)qx(Ug68!{}cdvqS@2^3*_X+Sa@Gs!|z%yV%P=S|%I|JSZ zihX|)RN&VGJ`8d+`ZM@m@C6VNMCW4sa?iz}j1|aI)C9#Yro;MS5EVtYf}#fl%Kj1@ z2R{P}ogaa6?om+W_$!c4^c-LE{(pnA?|cR_e-SA5@u4uD2Khus_>z4`L80S7k=y4$ zZ}*^_e*hG}eGC-)djc%Lr$Le9Jck?L$3fxyUhwnaH^Fy<4K5dY`vM*S<=!J8pXheJ zAQhFM=<9A!^z|k1W^e_(3j8l9_f1?}@wEe#@eN^o8+e%UF;MLG=U@&Vh52LPQvnac z)PV8Nz!IF~(R;w}few5D+z)D$D180^6uW&06!|;?iX8q33cpW+vhO*NCr2-UvhPfc z89WYDkP;NU(Y7}EXH*ZqYF4X+M+SE@@w~NGP(R3VF zlhO2GV05mtwuyG-cFCD$vl;D{aT@JTtuxVXn{|@Bua<3@E9VKCSUDl-SS-_6WwuZn zl7s5{lV<(aHFGgE3bVoHuyFGJ>dxxMHDt;`tT!YR76O?v&rQ}|R&Kf9vT3wO7g{C# zfz1om(a0+HQ!UL)_jtwv1o>2RHM7^&i=McQGM5y~(Vj&2c~c(kDFV717LbVKdrmbityF_J)O8&1+_= z+lCwb&_%QUodMM4DiEB_T-oU)?SxB4x6Kx&@6^ELYM{F&n$sCDx@wL`<%v#NsD7wT z+O0LR z&ae1mh@#M_&l}{yc3}_Y2@gp!rm z{&Z(336+Kf6t62&#KRHf<(h0q-L2(l-s`<$al!Pl zRqq+fb~<8j3mArQmLXAzatmSv-v5iy-6}ICMgziTzc%Fpi&INIU3}1~)N~4EGk^X1 z=QV{Q$HaRxi^1_$NN|0V71L_U3MZ8Y@%%( z7TED*d_eDMl#c#fj{u>wm=%r5dw#8snQU7EUAst^Yc7{K!mG;693Qa27L(_=#!^o* zL~iGq1~76P*{7~I;bP^5@9Pj(x%-4zn0cdAXBw{H!T8;=|(;95#!ITtC`(bz}U>#`slgVq)qe zVc&l3ipBy(s!MfYbLxae0^2_9DbZ?s!l2ppgX>&T#))kVEGfO&w*8%B`za+#3YjTo z+;GrXFuE@@YWx2E*QJTDy>pB#n(MT&m!R&ZR5tKKw`1}e5|ga#*p#XF?@$w)$L40| zW=4XWXpWDOdJ8gHV_|u~RRw0db&z6G*GLtTlbm*xMW?ZCv`=2sF?nMqYg;Lyrqs4p zQjG00nItuXgqNq(F5NPznrv?4hN{Ld&7xI@OpfWTFY?<6QRixxZ6%owrG7hEJwdI% z`k;=JT($fX1;5TI{16@Wr6xD)d{px5Jlai`5U6S#ty0oRb<|bWh`%Y;j+%`LH7HGt zdxT41m#hqT8?L6h=3?zxlO~=GwejKM@=KjIU0%2GA}P2e1l@^bHYUDi!-&FsBCUdW zBxOQoVkG4=Ct;}S93V$)Br(alXqS|PY^_E!;W5!J@-h2@)E|GWUI_BJHhTQAbz4F+ z5o;QfWOar5D7SSxF(f1H#E9tix|O7UqHki#d9+PsNtKB$j{1zt>PF+T&`^kWY56D# z^40G)nxbWZV7f@?g= zn_=if2u;Xs7*uJha;=V)QqsDLD%jIqBAJoC#L{*XL~^VNU-GR-pw}NzMSJDCM4mSk zySQJM*r<_A-ZhzAIH0HDG&1ezMVoJ_EA{n`%tm2@FqM~%N|+91#$hy7hhpWmt1IM5 zBV5O{DZ)IVT8vNLfKMJpD0N&&2x7kaWDe54EFN|;I`uE>Bx?nik`<+AArlz_O0YkA z6JCQ>hd<3)3IfJfwuQS&A}Wqw-#48?smBz8>Fab0>L-aIpH$kFN>+U_i_jo=V`)YQbNV_s z$KKI2ej`z7%`-*~jh1!lfEF9z!W{Q;eE(V|q`f4v(ag{)pcWXB1|j$(N=Ut)dU{!5 z7sJrDE`m2DM$3-1d?G7qhs+lx&f-1ttlCaQxzHNPBCyd^)6R5PAC}A|dnywNjf{_@ zIzt0wdhbZ9_roeh9dQ{EN|P&W;9gj<%+$stvBfl_>$S4d#)-V~)2fS+Sj=iB7CFoi zuv$e8FMy#qXgX?tc!j!pUf>rSl{@%J<)gDp^!Pf&+N;e zz6iBqdczW+In)KUIY961izqZk#371|FPLaO)`HK=|f|M9Z54K9Qv}Q?z3pDa6rB>HlnihP^Rv$ zOSNvk`d+z34$nT_OCnsyb?|J*+vq zamTg5`}wp>i4Q&+Ws=jR-SUAg(5zI=JVADt%d~H}sBaOPWWf!1+1Mdoy4(66cN+>U literal 0 HcmV?d00001 diff --git a/translations/es/LC_MESSAGES/messages.po b/translations/es/LC_MESSAGES/messages.po new file mode 100644 index 0000000..ae63aaa --- /dev/null +++ b/translations/es/LC_MESSAGES/messages.po @@ -0,0 +1,378 @@ +# Translations template for OctoPrint-FilamentManager. +# Copyright (C) 2019 The OctoPrint Project +# This file is distributed under the same license as the +# OctoPrint-FilamentManager project. +# Ivan Garcia , 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n" +"Report-Msgid-Bugs-To: i18n@octoprint.org\n" +"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"PO-Revision-Date: 2019-05-06 11:31+0100\n" +"Last-Translator: Ivan Garcia \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.4.0\n" +"Language: es\n" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 +msgid "Start Print" +msgstr "Comenzar Impresión" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:349 +msgid "Resume Print" +msgstr "Continuar Impresión" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:424 +msgid "Data import failed" +msgstr "Error al importar los datos" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:425 +msgid "Something went wrong, please consult the logs." +msgstr "Algo ha ido mal, revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:557 +msgid "Could not add profile" +msgstr "No se puede añadir el perfil" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 +msgid "There was an unexpected error while saving the filament profile, please consult the logs." +msgstr "Ha ocurrido un error al intentar guardar el perfil del filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 +msgid "Could not update profile" +msgstr "No se puede actualizar el perfil" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 +msgid "There was an unexpected error while updating the filament profile, please consult the logs." +msgstr "Ha ocurrido un error mientras se actualizaba el perfil del filamento" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 +msgid "Could not delete profile" +msgstr "No se puede eliminar el perfil" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 +msgid "There was an unexpected error while removing the filament profile, please consult the logs." +msgstr "Ha ocurrido un error al intentar eliminar el perfil del filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 +msgid "Delete profile?" +msgstr "¿Eliminar perfil?" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 +msgid "You are about to delete the filament profile (). Please note that it is not possible to delete profiles with associated spools." +msgstr "Estas apunto de borrar el perfil de filamento (). Ten en cuenta que no es posible borrar perfiles con bobinas asociadas." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 +msgid "Delete" +msgstr "Eliminar" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:686 +msgid "Could not select spool" +msgstr "No se puede elegir la bobina" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 +msgid "There was an unexpected error while selecting the spool, please consult the logs." +msgstr "Ha ocurrido un error al intentar seleccionar el perfil del filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 +msgid "Could not add spool" +msgstr "No se puede añadir la bobina" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 +msgid "There was an unexpected error while saving the filament spool, please consult the logs." +msgstr "Ha ocurrido un error al intentar guardar la bobina de filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 +msgid "Could not update spool" +msgstr "No se puede actualizar la bobina" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 +msgid "There was an unexpected error while updating the filament spool, please consult the logs." +msgstr "Ha ocurrido un error al intentar actualizar la bobina de filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 +msgid "Could not delete spool" +msgstr "No se puede eliminar la bobina" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 +msgid "There was an unexpected error while removing the filament spool, please consult the logs." +msgstr "Ha ocurrido un error al intentar eliminar la bobina de filamento, por favor revisa el log para más información." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 +msgid "Delete spool?" +msgstr "¿Borrar bobina?" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:901 +msgid "You are about to delete the filament spool - ()." +msgstr "Estás apunto de borrar la bobina de filamento - ()." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:973 +msgid "Insufficient filament" +msgstr "Filamento insuficiente" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 +msgid "The current print job needs more material than what's left on the selected spool." +msgstr "La impresión actual necesita mas filamento del que hay en la bobina seleccionada." + +#: octoprint_filamentmanager/templates/settings.jinja2:4 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 +msgid "Plugin Configuration" +msgstr "Configuración del Plugin" + +#: octoprint_filamentmanager/templates/settings.jinja2:7 +msgid "Filament Spools" +msgstr "Bobinas de filamento" + +#: octoprint_filamentmanager/templates/settings.jinja2:13 +msgid "Items per page" +msgstr "Objetos por página" + +#: octoprint_filamentmanager/templates/settings.jinja2:22 +msgid "Sort by" +msgstr "Ordenar por" + +#: octoprint_filamentmanager/templates/settings.jinja2:23 +msgid "Name (ascending)" +msgstr "Nombre (Ascendente)" + +#: octoprint_filamentmanager/templates/settings.jinja2:24 +msgid "Material (ascending)" +msgstr "Material (Ascendente)" + +#: octoprint_filamentmanager/templates/settings.jinja2:25 +msgid "Vendor (ascending)" +msgstr "Vendedor (Ascendente)" + +#: octoprint_filamentmanager/templates/settings.jinja2:26 +msgid "Remaining (descending)" +msgstr "Restante (Descendente)" + +#: octoprint_filamentmanager/templates/settings.jinja2:36 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:15 +msgid "Name" +msgstr "Nombre" + +#: octoprint_filamentmanager/templates/settings.jinja2:37 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:38 +msgid "Material" +msgstr "Material" + +#: octoprint_filamentmanager/templates/settings.jinja2:38 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:26 +msgid "Vendor" +msgstr "Vendedor" + +#: octoprint_filamentmanager/templates/settings.jinja2:39 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:50 +msgid "Weight" +msgstr "Peso" + +#: octoprint_filamentmanager/templates/settings.jinja2:40 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:62 +msgid "Remaining" +msgstr "Restante" + +#: octoprint_filamentmanager/templates/settings.jinja2:41 +msgid "Used" +msgstr "Usado" + +#: octoprint_filamentmanager/templates/settings.jinja2:42 +msgid "Action" +msgstr "Acción" + +#: octoprint_filamentmanager/templates/settings.jinja2:54 +msgid "Edit Spool" +msgstr "Editar bobina" + +#: octoprint_filamentmanager/templates/settings.jinja2:55 +msgid "Duplicate Spool" +msgstr "Duplicar bobina" + +#: octoprint_filamentmanager/templates/settings.jinja2:56 +msgid "Delete Spool" +msgstr "Borrar bobina" + +#: octoprint_filamentmanager/templates/settings.jinja2:79 +msgid "Manage Profiles" +msgstr "Administrar perfiles" + +#: octoprint_filamentmanager/templates/settings.jinja2:80 +msgid "Add Spool" +msgstr "Añadir bobina" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:12 +msgid "Features" +msgstr "Características" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:87 +msgid "Database" +msgstr "Base de datos" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:14 +msgid "Appearance" +msgstr "Apariencia" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:26 +msgid "Show dialog to confirm selected spools before starting/resuming the print job" +msgstr "Mostrar el diálogo para confirmar las bobinas antes de empezar/continuar una impresión" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:34 +msgid "Warn if print job exceeds remaining filament" +msgstr "Avisar si la impresión excede el filamento restante" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:42 +msgid "Enable software odometer to measure used filament" +msgstr "Habilitar medición mediante software \"odometer\"" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50 +msgid "Pause print if filament runs out" +msgstr "Pausar la impresión si el filamento se gasta" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56 +msgid "Pause threshold" +msgstr "Margen de pausa" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:74 +msgid "Use external database" +msgstr "Usar base de datos externa" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:80 +msgid "URI" +msgstr "URI" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:94 +msgid "Username" +msgstr "Usuario" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:101 +msgid "Password" +msgstr "Contraseña" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:108 +msgid "Test connection" +msgstr "Comprobar conexión" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 +msgid "Note: If you change these settings you must restart your OctoPrint instance for the changes to take affect." +msgstr "Nota: Si cambias esta configuración deberás reiniciar la instancia de OctoPrint para que los cambios hagan efecto." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 +msgid "Import & Export" +msgstr "Importar & Exportar" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:120 +msgid "Browse..." +msgstr "Examinar..." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:124 +msgid "Import" +msgstr "Importar" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:126 +msgid "Export" +msgstr "Exportar" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 +msgid "This does not look like a valid import archive. Only zip files are supported." +msgstr "No parece un fichero de importación valido. Sólo se permiten archivos ZIP." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 +msgid "Currency symbol" +msgstr "Simbolo de moneda" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 +msgid "Cancel" +msgstr "Cancelar" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:150 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 +msgid "Save" +msgstr "Guardar" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:5 +msgid "Filament Profiles" +msgstr "Perfiles de Filamento" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:13 +msgid "--- New Profile ---" +msgstr "--- Nuevo Perfil ---" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:14 +msgid "New" +msgstr "Nuevo" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 +msgid "Save profile" +msgstr "Guardar perfil" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:30 +msgid "Vendor must be set" +msgstr "Debes escribir el vendedor" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:42 +msgid "Material must be set" +msgstr "Debes escribir el material" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:50 +msgid "Density" +msgstr "Densidad" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:62 +msgid "Diameter" +msgstr "Diámetro" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:75 +msgid "Close" +msgstr "Cerrar" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:5 +msgid "Filament Spool" +msgstr "Bobina de Filamento" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:19 +msgid "Name must be set" +msgstr "Debes escribir un nombre" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:27 +msgid "Profile" +msgstr "Perfil" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:38 +msgid "Price" +msgstr "Precio" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:74 +msgid "Temperature offset" +msgstr "Temperatura" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:4 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 +msgid "Tool" +msgstr "Extrusor" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:5 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 +msgid "--- Select Spool ---" +msgstr "--- Seleccionar Bobina ---" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5 +msgid "Confirm your selected spools" +msgstr "Confirma las bobinas seleccionadas" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 +msgid "There are no information available about the active tools for the print job. Make sure the analysing process of the file has finished and that it's loaded correctly." +msgstr "No hay información disponible sobre el extrusor de la impresión actual. Asegúrate de que el proceso de análisis esté finalizado y se haya cargado correctamente." + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 +msgid "Please confirm your selected spools for all active tools. This dialog is meant to protect you from accidentically selecting wrong spools for the print." +msgstr "Por favor, confirma las bobinas de los extrusores. Este dialogo está preparado para evitar que elijas bobinas incorrectas de forma accidental." + diff --git a/translations/messages.pot b/translations/messages.pot index b35a733..54ebd23 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -1,22 +1,22 @@ # Translations template for OctoPrint-FilamentManager. -# Copyright (C) 2018 The OctoPrint Project +# Copyright (C) 2020 The OctoPrint Project # This file is distributed under the same license as the # OctoPrint-FilamentManager project. -# FIRST AUTHOR , 2018. +# FIRST AUTHOR , 2020. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n" +"Project-Id-Version: OctoPrint-FilamentManager 1.6.0\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"POT-Creation-Date: 2020-09-12 21:04+0200\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.4.0\n" +"Generated-By: Babel 2.8.0\n" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 msgid "Start Print" From d53d7967a1500fd1b2756d4e6bcdd09c0a492da8 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Wed, 7 Oct 2020 10:51:15 +0200 Subject: [PATCH 03/26] New Version 1.6.1 - B #5 export with python 3 --- octoprint_filamentmanager/api/__init__.py | 10 +++++++--- setup.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index deccb62..da850b3 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -323,9 +323,13 @@ def export_data(self): archive_name = "filament_export_{timestamp}.zip".format(timestamp=timestamp) def file_generator(): - with open(archive_path) as f: - for c in f: - yield c + with open(archive_path, "rb") as f: + while True: + chunk = f.read() + if chunk: + yield(chunk) + else: + break try: os.remove(archive_path) except Exception as e: diff --git a/setup.py b/setup.py index 2bc946e..82ee0a3 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.6.0" +plugin_version = "1.6.1" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" From b0dc5ce71c9a2ed33a7dd0ab1e0d503f0078fe6b Mon Sep 17 00:00:00 2001 From: OllisGit Date: Wed, 7 Oct 2020 10:57:11 +0200 Subject: [PATCH 04/26] update create issue link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78b74ec..52d140f 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ This OctoPrint plugin makes it easy to manage your inventory of filament spools. You can add all your spools and assign them to print jobs. The Filament Manager will automatically track the amount of extruded filament so you can always see how much is left on your spools. -If you have questions or encounter issues please take a look at the [Frequently Asked Questions](https://github.com/malnvenshorn/OctoPrint-FilamentManager/wiki#faq) first. There might be already an answer. In case you haven't found what you are looking for, feel free to open a [ticket](https://github.com/malnvenshorn/OctoPrint-FilamentManager/issues/new) and I'll try to help. Since OctoPrint provides an own [community forum](https://discourse.octoprint.org/) questions and requests for help should be placed there. +If you have questions or encounter issues please take a look at the [Frequently Asked Questions](https://github.com/malnvenshorn/OctoPrint-FilamentManager/wiki#faq) first. There might be already an answer. In case you haven't found what you are looking for, feel free to open a [ticket](https://github.com/OllisGit/OctoPrint-FilamentManager/issues/new/choose) and I'll try to help. Since OctoPrint provides an own [community forum](https://discourse.octoprint.org/) questions and requests for help should be placed there. #### Support my Efforts From b8fa04869425bd9c011a352c712cb3ee4fef089c Mon Sep 17 00:00:00 2001 From: OllisGit Date: Wed, 7 Oct 2020 11:33:49 +0200 Subject: [PATCH 05/26] update wiki and community link --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 52d140f..59ee124 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,9 @@ This OctoPrint plugin makes it easy to manage your inventory of filament spools. You can add all your spools and assign them to print jobs. The Filament Manager will automatically track the amount of extruded filament so you can always see how much is left on your spools. -If you have questions or encounter issues please take a look at the [Frequently Asked Questions](https://github.com/malnvenshorn/OctoPrint-FilamentManager/wiki#faq) first. There might be already an answer. In case you haven't found what you are looking for, feel free to open a [ticket](https://github.com/OllisGit/OctoPrint-FilamentManager/issues/new/choose) and I'll try to help. Since OctoPrint provides an own [community forum](https://discourse.octoprint.org/) questions and requests for help should be placed there. +If you have questions or encounter issues please take a look at the [Frequently Asked Questions](https://github.com/OllisGit/OctoPrint-FilamentManager/wiki#faq) first. There might be already an answer. +In case you haven't found what you are looking for, feel free to open a [ticket](https://github.com/OllisGit/OctoPrint-FilamentManager/issues/new/choose) and I'll try to help. +Or ask questions and requests for help in the community forum [community forum](https://community.octoprint.org/). #### Support my Efforts From 5c754fc9ec7f7a58837f03f327f0ddb2bb8264ef Mon Sep 17 00:00:00 2001 From: OllisGit Date: Thu, 8 Oct 2020 18:43:43 +0200 Subject: [PATCH 06/26] New Version 1.6.2 - #7 Added Postgres-Database driver --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 82ee0a3..a07d8ae 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.6.1" +plugin_version = "1.6.2" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" @@ -14,7 +14,8 @@ plugin_license = "AGPLv3" plugin_requires = ["backports.csv>=1.0.5,<1.1", "uritools>=2.1,<2.2", - "SQLAlchemy>=1.1.15,<1.2"] + "SQLAlchemy>=1.1.15,<1.2", + "psycopg2-binary"] plugin_additional_data = [] plugin_additional_packages = [] plugin_ignored_packages = [] From 3c76d9558bc75a4e7076c7e5727528c0572dbdbc Mon Sep 17 00:00:00 2001 From: OllisGit Date: Mon, 12 Oct 2020 19:26:50 +0200 Subject: [PATCH 07/26] New Version 1.6.3 - #11, 10 Removed Postgres-Database driver --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index a07d8ae..1141219 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.6.2" +plugin_version = "1.6.3" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" @@ -14,8 +14,7 @@ plugin_license = "AGPLv3" plugin_requires = ["backports.csv>=1.0.5,<1.1", "uritools>=2.1,<2.2", - "SQLAlchemy>=1.1.15,<1.2", - "psycopg2-binary"] + "SQLAlchemy>=1.1.15,<1.2"] plugin_additional_data = [] plugin_additional_packages = [] plugin_ignored_packages = [] From d294ce26f6b63a35a7b02dd9c7e585037bd2181b Mon Sep 17 00:00:00 2001 From: Gaston Dombiak Date: Sat, 24 Oct 2020 16:26:57 -0700 Subject: [PATCH 08/26] Send plugin notification when user selects new spool from UI --- octoprint_filamentmanager/api/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index da850b3..2729b88 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -289,6 +289,7 @@ def update_selection(self, identifier): try: saved_selection = self.filamentManager.update_selection(identifier, self.client_id, selection) + self.send_client_message("selection_changed", data=dict(table="selections", action="update")) except Exception as e: self._logger.error("Failed to update selected spool for tool{id}: {message}" .format(id=str(identifier), message=str(e))) From 690cb2e4e15d6343c1dc4710a78705596a1b60dd Mon Sep 17 00:00:00 2001 From: Owen Schwartz Date: Sat, 5 Dec 2020 11:57:12 -0500 Subject: [PATCH 09/26] Update methods --- octoprint_filamentmanager/api/__init__.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index da850b3..cdfb76b 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -25,6 +25,9 @@ class FilamentManagerApi(octoprint.plugin.BlueprintPlugin): + def send_client_message(self, message_type, data=None): + self._plugin_manager.send_plugin_message(self._identifier, dict(type=message_type, data=data)) + @octoprint.plugin.BlueprintPlugin.route("/profiles", methods=["GET"]) def get_profiles_list(self): force = request.values.get("force", "false") in valid_boolean_trues @@ -200,6 +203,12 @@ def create_spool(self): try: saved_spool = self.filamentManager.create_spool(new_spool) + + if "update" in json_data: + update = json_data["update"] + if update == True: + self.send_client_message("data_changed", data=dict(table="spools", action="update")) + return jsonify(dict(spool=saved_spool)) except Exception as e: self._logger.error("Failed to create spool: {message}".format(message=str(e))) @@ -289,6 +298,12 @@ def update_selection(self, identifier): try: saved_selection = self.filamentManager.update_selection(identifier, self.client_id, selection) + + if "update" in json_data: + update = json_data["update"] + if update == True: + self.send_client_message("data_changed", data=dict(table="spools", action="update")) + except Exception as e: self._logger.error("Failed to update selected spool for tool{id}: {message}" .format(id=str(identifier), message=str(e))) From 25dcc4bc6afdc5e6087e4f15992e2f24fbd776c0 Mon Sep 17 00:00:00 2001 From: Owen Schwartz Date: Tue, 12 Jan 2021 15:17:18 -0500 Subject: [PATCH 10/26] Change keyword name from `update` to `updateui` --- octoprint_filamentmanager/api/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index cdfb76b..c03dd32 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -204,8 +204,8 @@ def create_spool(self): try: saved_spool = self.filamentManager.create_spool(new_spool) - if "update" in json_data: - update = json_data["update"] + if "updateui" in json_data: + update = json_data["updateui"] if update == True: self.send_client_message("data_changed", data=dict(table="spools", action="update")) @@ -299,8 +299,8 @@ def update_selection(self, identifier): try: saved_selection = self.filamentManager.update_selection(identifier, self.client_id, selection) - if "update" in json_data: - update = json_data["update"] + if "updateui" in json_data: + update = json_data["updateui"] if update == True: self.send_client_message("data_changed", data=dict(table="spools", action="update")) From bc055d0ada79d7df429cc3a30ba7c17369e2cb40 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Sun, 24 Jan 2021 23:34:40 +0100 Subject: [PATCH 11/26] Fix typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59ee124..3b07057 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Hi everybody, because there was no activtiy in the last month on the origial GitHub-Repository from @malnvenshorn, - the community deceided to find a new home of this OctoPrint-Plugin and here it it ;-) + the community decided to find a new home of this OctoPrint-Plugin and here it is ;-) See https://github.com/OctoPrint/plugins.octoprint.org/issues/471 for more details What is my roadmap/stratagy of "hosting" this plugin? From a616ffd265d70f14adb43f3611ea9da41470cba5 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Thu, 28 Jan 2021 17:45:47 +0100 Subject: [PATCH 12/26] - improve logging and exception handling --- octoprint_filamentmanager/__init__.py | 6 + octoprint_filamentmanager/api/__init__.py | 127 +++++++++++++++--- .../templates/settings_configdialog.jinja2 | 3 + 3 files changed, 118 insertions(+), 18 deletions(-) diff --git a/octoprint_filamentmanager/__init__.py b/octoprint_filamentmanager/__init__.py index 2a81b2f..e74f183 100644 --- a/octoprint_filamentmanager/__init__.py +++ b/octoprint_filamentmanager/__init__.py @@ -97,6 +97,7 @@ def get_client_id(): .format(old=schema_version, new=self.DB_VERSION)) except Exception as e: self._logger.error("Failed to initialize database: {message}".format(message=str(e))) + self._logger.exception("Failed to initialize database: {message}".format(message=str(e))) def migrate_database_schema(self, target, current): if current <= 1: @@ -137,6 +138,7 @@ def notify(pid, channel, payload): self.set_temp_offsets(all_selections) except Exception as e: self._logger.error("Failed to set temperature offsets: {message}".format(message=str(e))) + self._logger.exception("Failed to set temperature offsets: {message}".format(message=str(e))) def on_shutdown(self): if self.filamentManager is not None: @@ -288,6 +290,8 @@ def calculate_weight(length, profile): except Exception as e: self._logger.error("Failed to update filament on tool{id}: {message}" .format(id=str(tool), message=str(e))) + self._logger.exception("Failed to update filament on tool{id}: {message}" + .format(id=str(tool), message=str(e))) self.send_client_message("data_changed", data=dict(table="spools", action="update")) self.on_data_modified("spools", "update") @@ -330,6 +334,8 @@ def threshold(spool): except Exception as e: self._logger.error("Failed to fetch selected spools, pause feature will not be available: {message}" .format(message=str(e))) + self._logger.exception("Failed to fetch selected spools, pause feature will not be available: {message}" + .format(message=str(e))) else: for s in selections: set_threshold(s) diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index da850b3..cd30b6d 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -30,10 +30,15 @@ def get_profiles_list(self): force = request.values.get("force", "false") in valid_boolean_trues try: - lm = self.filamentManager.get_profiles_lastmodified() + if (self.filamentManager != None): + lm = self.filamentManager.get_profiles_lastmodified() + else: + self._logger.warn("self.filamentManager is not initialized yet") + return except Exception as e: lm = None self._logger.error("Failed to fetch profiles lastmodified timestamp: {message}".format(message=str(e))) + self._logger.exception("Failed to fetch profiles lastmodified timestamp: {message}".format(message=str(e))) etag = entity_tag(lm) @@ -46,12 +51,17 @@ def get_profiles_list(self): return add_revalidation_header_with_no_max_age(response, lm, etag) except Exception as e: self._logger.error("Failed to fetch profiles: {message}".format(message=str(e))) + self._logger.exception("Failed to fetch profiles: {message}".format(message=str(e))) return make_response("Failed to fetch profiles, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/profiles/", methods=["GET"]) def get_profile(self, identifier): try: - profile = self.filamentManager.get_profile(identifier) + if (self.filamentManager != None): + profile = self.filamentManager.get_profile(identifier) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return if profile is not None: return jsonify(dict(profile=profile)) else: @@ -60,6 +70,8 @@ def get_profile(self, identifier): except Exception as e: self._logger.error("Failed to fetch profile with id {id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to fetch profile with id {id}: {message}" + .format(id=str(identifier), message=str(e))) return make_response("Failed to fetch profile, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/profiles", methods=["POST"]) @@ -83,10 +95,15 @@ def create_profile(self): return make_response("Profile does not contain mandatory '{}' field".format(key), 400) try: - saved_profile = self.filamentManager.create_profile(new_profile) + if (self.filamentManager != None): + saved_profile = self.filamentManager.create_profile(new_profile) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return return jsonify(dict(profile=saved_profile)) except Exception as e: self._logger.error("Failed to create profile: {message}".format(message=str(e))) + self._logger.exception("Failed to create profile: {message}".format(message=str(e))) return make_response("Failed to create profile, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/profiles/", methods=["PATCH"]) @@ -104,10 +121,16 @@ def update_profile(self, identifier): return make_response("No profile included in request", 400) try: - profile = self.filamentManager.get_profile(identifier) + if (self.filamentManager != None): + profile = self.filamentManager.get_profile(identifier) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return except Exception as e: self._logger.error("Failed to fetch profile with id {id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to fetch profile with id {id}: {message}" + .format(id=str(identifier), message=str(e))) return make_response("Failed to fetch profile, see the log for more details", 500) if not profile: @@ -122,6 +145,8 @@ def update_profile(self, identifier): except Exception as e: self._logger.error("Failed to update profile with id {id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to update profile with id {id}: {message}" + .format(id=str(identifier), message=str(e))) return make_response("Failed to update profile, see the log for more details", 500) else: self.on_data_modified("profiles", "update") @@ -131,11 +156,17 @@ def update_profile(self, identifier): @restricted_access def delete_profile(self, identifier): try: - self.filamentManager.delete_profile(identifier) + if (self.filamentManager != None): + self.filamentManager.delete_profile(identifier) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return return make_response("", 204) except Exception as e: self._logger.error("Failed to delete profile with id {id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to delete profile with id {id}: {message}" + .format(id=str(identifier), message=str(e))) return make_response("Failed to delete profile, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/spools", methods=["GET"]) @@ -143,10 +174,15 @@ def get_spools_list(self): force = request.values.get("force", "false") in valid_boolean_trues try: - lm = self.filamentManager.get_spools_lastmodified() + if (self.filamentManager != None): + lm = self.filamentManager.get_spools_lastmodified() + else: + self._logger.warn("self.filamentManager is not initialized yet") + return except Exception as e: lm = None self._logger.error("Failed to fetch spools lastmodified timestamp: {message}".format(message=str(e))) + self._logger.exception("Failed to fetch spools lastmodified timestamp: {message}".format(message=str(e))) etag = entity_tag(lm) @@ -159,12 +195,17 @@ def get_spools_list(self): return add_revalidation_header_with_no_max_age(response, lm, etag) except Exception as e: self._logger.error("Failed to fetch spools: {message}".format(message=str(e))) + self._logger.exception("Failed to fetch spools: {message}".format(message=str(e))) return make_response("Failed to fetch spools, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/spools/", methods=["GET"]) def get_spool(self, identifier): try: - spool = self.filamentManager.get_spool(identifier) + if (self.filamentManager != None): + spool = self.filamentManager.get_spool(identifier) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return if spool is not None: return jsonify(dict(spool=spool)) else: @@ -173,6 +214,8 @@ def get_spool(self, identifier): except Exception as e: self._logger.error("Failed to fetch spool with id {id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to fetch spool with id {id}: {message}" + .format(id=str(identifier), message=str(e))) return make_response("Failed to fetch spool, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/spools", methods=["POST"]) @@ -199,10 +242,15 @@ def create_spool(self): return make_response("Spool does not contain mandatory 'id (profile)' field", 400) try: - saved_spool = self.filamentManager.create_spool(new_spool) + if (self.filamentManager != None): + saved_spool = self.filamentManager.create_spool(new_spool) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return return jsonify(dict(spool=saved_spool)) except Exception as e: self._logger.error("Failed to create spool: {message}".format(message=str(e))) + self._logger.exception("Failed to create spool: {message}".format(message=str(e))) return make_response("Failed to create spool, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/spools/", methods=["PATCH"]) @@ -220,10 +268,16 @@ def update_spool(self, identifier): return make_response("No spool included in request", 400) try: - spool = self.filamentManager.get_spool(identifier) + if (self.filamentManager != None): + spool = self.filamentManager.get_spool(identifier) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return except Exception as e: self._logger.error("Failed to fetch spool with id {id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to fetch spool with id {id}: {message}" + .format(id=str(identifier), message=str(e))) return make_response("Failed to fetch spool, see the log for more details", 500) if not spool: @@ -238,6 +292,8 @@ def update_spool(self, identifier): except Exception as e: self._logger.error("Failed to update spool with id {id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to update spool with id {id}: {message}" + .format(id=str(identifier), message=str(e))) return make_response("Failed to update spool, see the log for more details", 500) else: self.on_data_modified("spools", "update") @@ -247,20 +303,31 @@ def update_spool(self, identifier): @restricted_access def delete_spool(self, identifier): try: - self.filamentManager.delete_spool(identifier) + if (self.filamentManager != None): + self.filamentManager.delete_spool(identifier) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return return make_response("", 204) except Exception as e: self._logger.error("Failed to delete spool with id {id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to delete spool with id {id}: {message}" + .format(id=str(identifier), message=str(e))) return make_response("Failed to delete spool, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/selections", methods=["GET"]) def get_selections_list(self): try: - all_selections = self.filamentManager.get_all_selections(self.client_id) + if (self.filamentManager != None): + all_selections = self.filamentManager.get_all_selections(self.client_id) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return return jsonify(dict(selections=all_selections)) except Exception as e: self._logger.error("Failed to fetch selected spools: {message}".format(message=str(e))) + self._logger.exception("Failed to fetch selected spools: {message}".format(message=str(e))) return make_response("Failed to fetch selected spools, see the log for more details", 500) @octoprint.plugin.BlueprintPlugin.route("/selections/", methods=["PATCH"]) @@ -288,16 +355,25 @@ def update_selection(self, identifier): return make_response("Trying to change filament while printing", 409) try: - saved_selection = self.filamentManager.update_selection(identifier, self.client_id, selection) + if (self.filamentManager != None): + saved_selection = self.filamentManager.update_selection(identifier, self.client_id, selection) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return + self.send_client_message("selection_changed", data=dict(table="selections", action="update")) except Exception as e: self._logger.error("Failed to update selected spool for tool{id}: {message}" .format(id=str(identifier), message=str(e))) + self._logger.exception("Failed to update selected spool for tool{id}: {message}" + .format(id=str(identifier), message=str(e))) + return make_response("Failed to update selected spool, see the log for more details", 500) else: try: self.set_temp_offsets([saved_selection]) except Exception as e: self._logger.error("Failed to set temperature offsets: {message}".format(message=str(e))) + self._logger.exception("Failed to set temperature offsets: {message}".format(message=str(e))) self.on_data_modified("selections", "update") return jsonify(dict(selection=saved_selection)) @@ -307,10 +383,15 @@ def update_selection(self, identifier): def export_data(self): try: tempdir = tempfile.mkdtemp() - self.filamentManager.export_data(tempdir) + if (self.filamentManager != None): + self.filamentManager.export_data(tempdir) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return archive_path = shutil.make_archive(tempfile.mktemp(), "zip", tempdir) except Exception as e: self._logger.error("Data export failed: {message}".format(message=str(e))) + self._logger.exception("Data export failed: {message}".format(message=str(e))) return make_response("Data export failed, see the log for more details", 500) finally: try: @@ -366,9 +447,14 @@ def unzip(filename, extract_dir): try: tempdir = tempfile.mkdtemp() unzip(upload_path, tempdir) - self.filamentManager.import_data(tempdir) + if (self.filamentManager != None): + self.filamentManager.import_data(tempdir) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return except Exception as e: self._logger.error("Data import failed: {message}".format(message=str(e))) + self._logger.exception("Data import failed: {message}".format(message=str(e))) return make_response("Data import failed, see the log for more details", 500) finally: try: @@ -400,11 +486,16 @@ def test_database_connection(self): return make_response("Configuration does not contain mandatory '{}' field".format(key), 400) try: - connection = self.filamentManager.connect(config["uri"], - database=config["name"], - username=config["user"], - password=config["password"]) + if (self.filamentManager != None): + connection = self.filamentManager.connect(config["uri"], + database=config["name"], + username=config["user"], + password=config["password"]) + else: + self._logger.warn("self.filamentManager is not initialized yet") + return except Exception as e: + self._logger.exception("Failed to connect to the database with the given configuration") return make_response("Failed to connect to the database with the given configuration", 400) else: connection.close() diff --git a/octoprint_filamentmanager/templates/settings_configdialog.jinja2 b/octoprint_filamentmanager/templates/settings_configdialog.jinja2 index b0ba38a..b226c5f 100644 --- a/octoprint_filamentmanager/templates/settings_configdialog.jinja2 +++ b/octoprint_filamentmanager/templates/settings_configdialog.jinja2 @@ -73,6 +73,9 @@ +
+ If you want to use an external database, please take a look into my wiki how to install the drivers and setup the database. +
From 07d1e67cda0ae03d570f5f4259d5cad989b01613 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Thu, 28 Jan 2021 17:54:21 +0100 Subject: [PATCH 13/26] - mr #15 commented --- octoprint_filamentmanager/api/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index cd30b6d..f748d9a 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -357,10 +357,11 @@ def update_selection(self, identifier): try: if (self.filamentManager != None): saved_selection = self.filamentManager.update_selection(identifier, self.client_id, selection) + # Inform (external e.g. OctoPod) UI about spool selection change + self.send_client_message("selection_changed", data=dict(table="selections", action="update")) else: self._logger.warn("self.filamentManager is not initialized yet") return - self.send_client_message("selection_changed", data=dict(table="selections", action="update")) except Exception as e: self._logger.error("Failed to update selected spool for tool{id}: {message}" .format(id=str(identifier), message=str(e))) From 2c56c039673805744404831900081a9280362205 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Thu, 28 Jan 2021 21:49:57 +0100 Subject: [PATCH 14/26] New Verison 1.7.0 - MR #15 inform external ui (like OctoDash) about filament change. Credit goes to @gdombiak - MR #28 creating and selecting a spool via API. Credit goes to @oschwartz10612 --- octoprint_filamentmanager/api/__init__.py | 12 +++++++++--- setup.py | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index 2c78c89..287508d 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -25,9 +25,6 @@ class FilamentManagerApi(octoprint.plugin.BlueprintPlugin): - def send_client_message(self, message_type, data=None): - self._plugin_manager.send_plugin_message(self._identifier, dict(type=message_type, data=data)) - @octoprint.plugin.BlueprintPlugin.route("/profiles", methods=["GET"]) def get_profiles_list(self): force = request.values.get("force", "false") in valid_boolean_trues @@ -247,6 +244,10 @@ def create_spool(self): try: if (self.filamentManager != None): saved_spool = self.filamentManager.create_spool(new_spool) + if ("updateui" in json_data): + update = json_data["updateui"] + if update == True: + self.send_client_message("data_changed", data=dict(table="spools", action="update")) else: self._logger.warn("self.filamentManager is not initialized yet") return @@ -362,6 +363,11 @@ def update_selection(self, identifier): saved_selection = self.filamentManager.update_selection(identifier, self.client_id, selection) # Inform (external e.g. OctoPod) UI about spool selection change self.send_client_message("selection_changed", data=dict(table="selections", action="update")) + if ("updateui" in json_data["selection"]): + update = json_data["selection"]["updateui"] + if update == True: + self.send_client_message("data_changed", data=dict(table="spools", action="update")) + else: self._logger.warn("self.filamentManager is not initialized yet") return diff --git a/setup.py b/setup.py index 1141219..4a86481 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.6.3" +plugin_version = "1.7.0" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" From 46b8561f73f6d7f52e4d130733d764f664586d5c Mon Sep 17 00:00:00 2001 From: OllisGit Date: Thu, 28 Jan 2021 21:54:57 +0100 Subject: [PATCH 15/26] New Verison 1.7.0 - MR #15 inform external ui (like OctoDash) about filament change. Credit goes to @gdombiak - MR #28 creating and selecting a spool via API. Credit goes to @oschwartz10612 --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 3b07057..129042d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ (https://github.com/OllisGit/OctoPrint-SpoolManager) - ...also I will move more and more features from FilamentManager to SpoolManager (e.g. external Database, MultiTool, ...) - # Overview [![Version](https://img.shields.io/badge/dynamic/json.svg?color=brightgreen&label=version&url=https://api.github.com/repos/OllisGit/OctoPrint-FilamentManager/releases&query=$[0].name)]() From 5237c4dc48f9eba0f26d50c042a938649ecc7bf9 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Fri, 29 Jan 2021 21:46:20 +0100 Subject: [PATCH 16/26] New Verison 1.7.1 #33, #27, #24, #16 major bug. after resuming a multi extruder print the tracked material is assigned to tool0 --- octoprint_filamentmanager/__init__.py | 157 +++++++++++++++++++------- octoprint_filamentmanager/odometer.py | 8 ++ setup.py | 2 +- 3 files changed, 128 insertions(+), 39 deletions(-) diff --git a/octoprint_filamentmanager/__init__.py b/octoprint_filamentmanager/__init__.py index e74f183..e1f0957 100644 --- a/octoprint_filamentmanager/__init__.py +++ b/octoprint_filamentmanager/__init__.py @@ -15,7 +15,8 @@ from .api import FilamentManagerApi from .data import FilamentManager -from .odometer import FilamentOdometer +from .newodometer import NewFilamentOdometer +# from .odometer import FilamentOdometer class FilamentManagerPlugin(FilamentManagerApi, @@ -31,7 +32,8 @@ class FilamentManagerPlugin(FilamentManagerApi, def __init__(self): self.client_id = None self.filamentManager = None - self.filamentOdometer = None + # self.filamentOdometer = None + self.myFilamentOdometer = None self.lastPrintState = None self.odometerEnabled = False @@ -49,8 +51,13 @@ def get_client_id(): self.client_id = get_client_id() - self.filamentOdometer = FilamentOdometer() - self.filamentOdometer.set_g90_extruder(self._settings.get_boolean(["feature", "g90InfluencesExtruder"])) + # self.filamentOdometer = FilamentOdometer() + # self.filamentOdometer.set_g90_extruder(self._settings.get_boolean(["feature", "g90InfluencesExtruder"])) + + self.myFilamentOdometer = NewFilamentOdometer() + self.myFilamentOdometer.set_g90_extruder(self._settings.get_boolean(["feature", "g90InfluencesExtruder"])) + + self.alreadyCanceled = False db_config = self._settings.get(["database"], merged=True) migrate_schema_version = False @@ -119,6 +126,9 @@ def migrate_database_schema(self, target, current): self.filamentManager.initialize() def on_after_startup(self): + self.odometerEnabled = self._settings.get_boolean(["enableOdometer"]) + self.pauseEnabled = self._settings.get_boolean(["autoPause"]) + # subscribe to the notify channel so that we get notified if another client has altered the data # notify is not available if we are connected to the internal sqlite database if self.filamentManager is not None and self.filamentManager.notify is not None: @@ -198,7 +208,11 @@ def on_settings_save(self, data): # we have to recalculate the pause thresholds self.update_pause_thresholds() - self.filamentOdometer.set_g90_extruder(self._settings.get_boolean(["feature", "g90InfluencesExtruder"])) + # self.filamentOdometer.set_g90_extruder(self._settings.get_boolean(["feature", "g90InfluencesExtruder"])) + self.myFilamentOdometer.set_g90_extruder(self._settings.get_boolean(["feature", "g90InfluencesExtruder"])) + + self.odometerEnabled = self._settings.get_boolean(["enableOdometer"]) + self.pauseEnabled = self._settings.get_boolean(["autoPause"]) # AssetPlugin @@ -223,42 +237,102 @@ def get_template_configs(self): # EventHandlerPlugin def on_event(self, event, payload): - if event == Events.PRINTER_STATE_CHANGED: - self.on_printer_state_changed(payload) - - def on_printer_state_changed(self, payload): - if payload['state_id'] == "PRINTING": - if self.lastPrintState == "PAUSED": - # resuming print - self.filamentOdometer.reset_extruded_length() - else: - # starting new print - self.filamentOdometer.reset() - self.odometerEnabled = self._settings.get_boolean(["enableOdometer"]) - self.pauseEnabled = self._settings.get_boolean(["autoPause"]) - self._logger.debug("Printer State: %s" % payload["state_string"]) - self._logger.debug("Odometer: %s" % ("On" if self.odometerEnabled else "Off")) - self._logger.debug("AutoPause: %s" % ("On" if self.pauseEnabled and self.odometerEnabled else "Off")) - elif self.lastPrintState == "PRINTING": - # print state changed from printing => update filament usage - self._logger.debug("Printer State: %s" % payload["state_string"]) - if self.odometerEnabled: - self.odometerEnabled = False # disabled because we don't want to track manual extrusion - self.update_filament_usage() - - # update last print state - self.lastPrintState = payload['state_id'] + # if event == Events.PRINTER_STATE_CHANGED: + # self.on_printer_state_changed(payload) + + if Events.PRINT_STARTED == event: + self.alreadyCanceled = False + self._printJobStarted(payload) + elif Events.PRINT_PAUSED == event: + self.alreadyCanceled = True + self._printJobPaused() + elif Events.PRINT_RESUMED == event: + self.alreadyCanceled = True + self._printJobResumed() + elif Events.PRINT_DONE == event: + self._printJobFinished() + elif Events.PRINT_FAILED == event: + if self.alreadyCanceled == False: + self._printJobFinished() + elif Events.PRINT_CANCELLED == event: + self.alreadyCanceled = True + self._printJobFinished() + pass + + def _printJobStarted(self, payload): + + # starting new print + # self.filamentOdometer.reset() + self.myFilamentOdometer.reset() + + self.odometerEnabled = self._settings.get_boolean(["enableOdometer"]) + self.pauseEnabled = self._settings.get_boolean(["autoPause"]) + self._logger.debug("Printer started") + self._logger.debug("Odometer: %s" % ("On" if self.odometerEnabled else "Off")) + self._logger.debug("AutoPause: %s" % ("On" if self.pauseEnabled and self.odometerEnabled else "Off")) + + pass + + def _printJobPaused(self): + # do nothing + pass + + def _printJobResumed(self): + # do nothing + pass + + def _printJobFinished(self): + self.update_filament_usage() + pass + + # def on_printer_state_changed(self, payload): + # if payload['state_id'] == "PRINTING": + # if self.lastPrintState == "PAUSED": + # # resuming print + # # no idea why on pausing the extruded length should be reseted self.filamentOdometer.reset_extruded_length() + # pass + # else: + # # starting new print + # # self.filamentOdometer.reset() + # self.myFilamentOdometer.reset() + # self.odometerEnabled = self._settings.get_boolean(["enableOdometer"]) + # self.pauseEnabled = self._settings.get_boolean(["autoPause"]) + # self._logger.debug("Printer State: %s" % payload["state_string"]) + # self._logger.debug("Odometer: %s" % ("On" if self.odometerEnabled else "Off")) + # self._logger.debug("AutoPause: %s" % ("On" if self.pauseEnabled and self.odometerEnabled else "Off")) + # elif self.lastPrintState == "PRINTING": + # # print state changed from printing => update filament usage + # self._logger.debug("Printer State: %s" % payload["state_string"]) + # if self.odometerEnabled: + # self.odometerEnabled = False # disabled because we don't want to track manual extrusion + # self.update_filament_usage() + # + # # update last print state + # self.lastPrintState = payload['state_id'] def update_filament_usage(self): printer_profile = self._printer_profile_manager.get_current_or_default() - extrusion = self.filamentOdometer.get_extrusion() - numTools = min(printer_profile['extruder']['count'], len(extrusion)) + # extrusion = self.filamentOdometer.get_extrusion() + extrusion = self.myFilamentOdometer.getExtrusionAmount() + + printerProfileToolCount = printer_profile['extruder']['count'] + self._logger.info("Updating Filament usage for octoprint configured toolcount: {toolCount}" + .format(toolCount=str(printerProfileToolCount))) + + self._logger.info("Filament tracked toolcount: {toolCount}" + .format(toolCount=str(len(extrusion)))) + + self._logger.info("Filament tracked values: {trackedValues}" + .format(trackedValues=str(extrusion))) + + numTools = min(printerProfileToolCount, len(extrusion)) def calculate_weight(length, profile): radius = profile["diameter"] / 2 # mm volume = (length * PI * radius * radius) / 1000 # cm³ return volume * profile["density"] # g + for tool in range(0, numTools): self._logger.info("Filament used: {length} mm (tool{id})" .format(length=str(extrusion[tool]), id=str(tool))) @@ -284,7 +358,7 @@ def calculate_weight(length, profile): spool_string = "{name} - {material} ({vendor})" spool_string = spool_string.format(name=spool["name"], material=spool["profile"]["material"], vendor=spool["profile"]["vendor"]) - self._logger.debug("Updated remaining filament on spool '{spool}' from {old}g to {new}g ({diff}g)" + self._logger.info("Updated remaining filament on spool '{spool}' from {old}g to {new}g ({diff}g)" .format(spool=spool_string, old=str(old_value), new=str(new_value), diff=str(new_value - old_value))) except Exception as e: @@ -297,18 +371,24 @@ def calculate_weight(length, profile): self.on_data_modified("spools", "update") # Protocol hook - def filament_odometer(self, comm_instance, phase, cmd, cmd_type, gcode, *args, **kwargs): - if self.odometerEnabled: - self.filamentOdometer.parse(gcode, cmd) + # is enabled in plugin settings and is currently prining + + if self.odometerEnabled and self._printer.is_printing(): + # self.filamentOdometer.parse(gcode, cmd) + self.myFilamentOdometer.processGCodeLine(cmd) + if self.pauseEnabled and self.check_threshold(): self._logger.info("Filament is running out, pausing print") self._printer.pause_print() def check_threshold(self): - extrusion = self.filamentOdometer.get_extrusion() - tool = self.filamentOdometer.get_current_tool() + # extrusion = self.filamentOdometer.get_extrusion() + extrusion = self.myFilamentOdometer.getExtrusionAmount() + # tool = self.filamentOdometer.get_current_tool() + tool = self.myFilamentOdometer.getCurrentTool() threshold = self.pauseThresholds.get("tool%s" % tool) + return (threshold is not None and extrusion[tool] >= threshold) def update_pause_thresholds(self): @@ -324,6 +404,7 @@ def threshold(spool): if spool is not None: self.pauseThresholds["tool%s" % selection["tool"]] = threshold(spool) except ZeroDivisionError: + tool = selection["tool"] self._logger.warn("ZeroDivisionError while calculating pause threshold for tool{tool}, " "pause feature not available for selected spool".format(tool=tool)) diff --git a/octoprint_filamentmanager/odometer.py b/octoprint_filamentmanager/odometer.py index 3c60f23..73ca241 100644 --- a/octoprint_filamentmanager/odometer.py +++ b/octoprint_filamentmanager/odometer.py @@ -24,6 +24,7 @@ def reset(self): self.totalExtrusion = [0.0] self.maxExtrusion = [0.0] self.currentTool = 0 + self.parseCount = 0 def reset_extruded_length(self): tools = len(self.maxExtrusion) @@ -31,6 +32,7 @@ def reset_extruded_length(self): self.totalExtrusion = [0.0] * tools def parse(self, gcode, cmd): + self.parseCount = self.parseCount + 1 if gcode is None: return @@ -57,6 +59,12 @@ def parse(self, gcode, cmd): elif gcode == "G92": # set position e = self._get_float(cmd, self.regexE) if e is not None: + + print("*****") + print(str(self.parseCount)) + print(cmd) + print("*****") + self.lastExtrusion[self.currentTool] = e elif gcode == "M82": # set extruder to absolute mode self.relativeExtrusion = False diff --git a/setup.py b/setup.py index 4a86481..d085cd2 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.7.0" +plugin_version = "1.7.1" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" From c7d8410ede7be779a757efaaaf1e787bc70dc3d9 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Sun, 31 Jan 2021 08:33:33 +0100 Subject: [PATCH 17/26] New Verison 1.7.2 #37, #38 NewFilamentOdometer missing in GitHub-Repository --- octoprint_filamentmanager/newodometer.py | 219 +++++++++++++++++++++++ setup.py | 2 +- 2 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 octoprint_filamentmanager/newodometer.py diff --git a/octoprint_filamentmanager/newodometer.py b/octoprint_filamentmanager/newodometer.py new file mode 100644 index 0000000..6994958 --- /dev/null +++ b/octoprint_filamentmanager/newodometer.py @@ -0,0 +1,219 @@ + +# coding=utf-8 +from __future__ import absolute_import + +import math +# import logging +# copied from gcodeinterpreter.py Version OP 1.5.2 +class NewFilamentOdometer(object): + + def __init__(self): + # self._logger = logging.getLogger(__name__) + self.max_extruders = 10 + self.g90_extruder = False + self.reset() + + + def set_g90_extruder(self, flag=False): + self.g90_extruder = flag + + def reset(self): + self.currentE = [0.0] + self.totalExtrusion = [0.0] + self.maxExtrusion = [0.0] + self.currentExtruder = 0 # Tool Id + self.relativeE = False + self.relativeMode = False + self.duplicationMode = False + + + def processGCodeLine(self, line): + + # origLine = line + # comment should not be during "hook-processing" + if ";" in line: + # comment = line[line.find(";") + 1:].strip() + line = line[0: line.find(";")] + pass + + if (len(line) == 0): + return + G = self._getCodeInt(line, "G") + M = self._getCodeInt(line, "M") + T = self._getCodeInt(line, "T") + + if G is not None: + if G == 0 or G == 1: # Move + x = self._getCodeFloat(line, "X") + y = self._getCodeFloat(line, "Y") + z = self._getCodeFloat(line, "Z") + e = self._getCodeFloat(line, "E") + f = self._getCodeFloat(line, "F") + + if x is not None or y is not None or z is not None: + # this is a move + move = True + else: + # print head stays on position + move = False + + if e is not None: + if self.relativeMode or self.relativeE: + # e is already relative, nothing to do + pass + else: + e -= self.currentE[self.currentExtruder] + + # # If move with extrusion, calculate new min/max coordinates of model + # if e > 0.0 and move: + # # extrusion and move -> oldPos & pos relevant for print area & dimensions + # self._minMax.record(oldPos) + # self._minMax.record(pos) + + self.totalExtrusion[self.currentExtruder] += e + self.currentE[self.currentExtruder] += e + self.maxExtrusion[self.currentExtruder] = max( + self.maxExtrusion[self.currentExtruder], self.totalExtrusion[self.currentExtruder] + ) + + if self.currentExtruder == 0 and len(self.currentE) > 1 and self.duplicationMode: + # Copy first extruder length to other extruders + for i in range(1, len(self.currentE)): + self.totalExtrusion[i] += e + self.currentE[i] += e + self.maxExtrusion[i] = max(self.maxExtrusion[i], self.totalExtrusion[i]) + else: + e = 0.0 + + elif G == 90: # Absolute position + self.relativeMode = False + if self.g90_extruder: + self.relativeE = False + + elif G == 91: # Relative position + self.relativeMode = True + if self.g90_extruder: + self.relativeE = True + + elif G == 92: + x = self._getCodeFloat(line, "X") + y = self._getCodeFloat(line, "Y") + z = self._getCodeFloat(line, "Z") + e = self._getCodeFloat(line, "E") + + if e is None and x is None and y is None and z is None: + # no parameters, set all axis to 0 + self.currentE[self.currentExtruder] = 0.0 + # pos.x = 0.0 + # pos.y = 0.0 + # pos.z = 0.0 + else: + # some parameters set, only set provided axes + if e is not None: + self.currentE[self.currentExtruder] = e + # if x is not None: + # pos.x = x + # if y is not None: + # pos.y = y + # if z is not None: + # pos.z = z + + elif M is not None: + if M == 82: # Absolute E + self.relativeE = False + elif M == 83: # Relative E + self.relativeE = True + # elif M == 207 or M == 208: # Firmware retract settings + # s = self._getCodeFloat(line, "S") + # f = self._getCodeFloat(line, "F") + # if s is not None and f is not None: + # if M == 207: + # fwretractTime = s / f + # fwretractDist = s + # else: + # fwrecoverTime = (fwretractDist + s) / f + elif M == 605: # Duplication/Mirroring mode + s = self._getCodeInt(line, "S") + if s in [2, 4, 5, 6]: + # Duplication / Mirroring mode selected. Printer firmware copies extrusion commands + # from first extruder to all other extruders + self.duplicationMode = True + else: + self.duplicationMode = False + + elif T is not None: + if T > self.max_extruders: + # self._logger.warning( + # "GCODE tried to select tool %d, that looks wrong, ignoring for GCODE analysis" + # % T + # ) + print("GCODE tried to select tool %d, that looks wrong, ignoring for GCODE analysis" % T) + pass + elif T == self.currentExtruder: + pass + else: + # pos.x -= ( + # offsets[currentExtruder][0] + # if currentExtruder < len(offsets) + # else 0 + # ) + # pos.y -= ( + # offsets[currentExtruder][1] + # if currentExtruder < len(offsets) + # else 0 + # ) + + self.currentExtruder = T + + # pos.x += ( + # offsets[currentExtruder][0] + # if currentExtruder < len(offsets) + # else 0 + # ) + # pos.y += ( + # offsets[currentExtruder][1] + # if currentExtruder < len(offsets) + # else 0 + # ) + + if len(self.currentE) <= self.currentExtruder: + for _ in range(len(self.currentE), self.currentExtruder + 1): + self.currentE.append(0.0) + if len(self.maxExtrusion) <= self.currentExtruder: + for _ in range(len(self.maxExtrusion), self.currentExtruder + 1): + self.maxExtrusion.append(0.0) + if len(self.totalExtrusion) <= self.currentExtruder: + for _ in range(len(self.totalExtrusion), self.currentExtruder + 1): + self.totalExtrusion.append(0.0) + + def getCurrentTool(self): + return self.currentExtruder + + def getExtrusionAmount(self): + return self.maxExtrusion + + def _getCodeInt(self, line, code): + return self._getCode(line, code, int) + + + def _getCodeFloat(self, line, code): + return self._getCode(line, code, float) + + + def _getCode(self, line, code, c): + n = line.find(code) + 1 + if n < 1: + return None + m = line.find(" ", n) + try: + if m < 0: + result = c(line[n:]) + else: + result = c(line[n:m]) + except ValueError: + return None + + if math.isnan(result) or math.isinf(result): + return None + + return result diff --git a/setup.py b/setup.py index d085cd2..6ae4bcb 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.7.1" +plugin_version = "1.7.2" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" From e6d428cc59d81d3fb6eb0b972674dab06ed7e7ed Mon Sep 17 00:00:00 2001 From: OllisGit Date: Mon, 19 Apr 2021 21:33:17 +0200 Subject: [PATCH 18/26] Added short API description --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 129042d..009be2c 100644 --- a/README.md +++ b/README.md @@ -64,3 +64,22 @@ or manually using this URL: ![FilamentManager Settings Spool](screenshots/filamentmanager_settings_spool.png?raw=true) ![FilamentManager Settings](screenshots/filamentmanager_settings.png?raw=true) + +# Developer section + +## API - Calls + +E.g. +``` +url = 'http://localhost/plugin/filamentmanager/selections/0' + headers = {'X-Api-Key': config.API_KEY} + payload = { + "selection": { + "tool": 0, + "spool": { + "id": id + } + }, + "updateui": True + } +``` From 3116907f658d3e265a50ff18febd5a71a48dde6c Mon Sep 17 00:00:00 2001 From: OllisGit Date: Mon, 24 May 2021 10:04:00 +0200 Subject: [PATCH 19/26] New Verison 1.8.0 - #41 hide overused spools --- .travis.yml | 2 +- TODOs.md | 5 ++ .../static/js/filamentmanager.bundled.js | 82 ++++++++++++------- .../templates/sidebar.jinja2 | 18 +++- 4 files changed, 77 insertions(+), 30 deletions(-) create mode 100644 TODOs.md diff --git a/.travis.yml b/.travis.yml index 34c4562..be51dff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: # debug - echo 'Hello World' - export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2) - - zip -r master.zip * -x \*testdata\* + - zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py' # debug - ls -al ## see "Fix travis automatic build and deploy" diff --git a/TODOs.md b/TODOs.md new file mode 100644 index 0000000..1102ff3 --- /dev/null +++ b/TODOs.md @@ -0,0 +1,5 @@ +What are the next steps? +======================== + +- handling release channel +- issue 23: update to SQLAlchemy 1.3.23 (precondition: release-channel) diff --git a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js index a7f5467..02d57c8 100644 --- a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js +++ b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js @@ -707,36 +707,62 @@ FilamentManager.prototype.viewModels.spools = function spoolsViewModel() { var self = this.viewModels.spools; var api = this.core.client; + + self.overUsedUsage = ko.observable(false); + self.overUsedUsage.subscribe(function(newValue){ + debugger + // self.allSpools.updateItems(self.allSpools.items) + self.allSpools.toggleFilter("overUsedUsage"); + }); var profilesViewModel = this.viewModels.profiles; - self.allSpools = new ItemListHelper('filamentSpools', { - name: function name(a, b) { - // sorts ascending - if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) return -1; - if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) return 1; - return 0; - }, - material: function material(a, b) { - // sorts ascending - if (a.profile.material.toLocaleLowerCase() < b.profile.material.toLocaleLowerCase()) return -1; - if (a.profile.material.toLocaleLowerCase() > b.profile.material.toLocaleLowerCase()) return 1; - return 0; - }, - vendor: function vendor(a, b) { - // sorts ascending - if (a.profile.vendor.toLocaleLowerCase() < b.profile.vendor.toLocaleLowerCase()) return -1; - if (a.profile.vendor.toLocaleLowerCase() > b.profile.vendor.toLocaleLowerCase()) return 1; - return 0; - }, - remaining: function remaining(a, b) { - // sorts descending - var ra = parseFloat(a.weight) - parseFloat(a.used); - var rb = parseFloat(b.weight) - parseFloat(b.used); - if (ra > rb) return -1; - if (ra < rb) return 1; - return 0; + + var myListHelperFilters = { + overUsedUsage: function (data){ + debugger + console.error(data); + var result = data.used < data.weight; + return result; } - }, {}, 'name', [], [], 10); + }; + var myListHelperExclusiveFilters = [["overUsedUsage"]]; + + self.allSpools = new ItemListHelper( + 'filamentSpools', + { + name: function name(a, b) { + // sorts ascending + if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) return -1; + if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) return 1; + return 0; + }, + material: function material(a, b) { + // sorts ascending + if (a.profile.material.toLocaleLowerCase() < b.profile.material.toLocaleLowerCase()) return -1; + if (a.profile.material.toLocaleLowerCase() > b.profile.material.toLocaleLowerCase()) return 1; + return 0; + }, + vendor: function vendor(a, b) { + // sorts ascending + if (a.profile.vendor.toLocaleLowerCase() < b.profile.vendor.toLocaleLowerCase()) return -1; + if (a.profile.vendor.toLocaleLowerCase() > b.profile.vendor.toLocaleLowerCase()) return 1; + return 0; + }, + remaining: function remaining(a, b) { + // sorts descending + var ra = parseFloat(a.weight) - parseFloat(a.used); + var rb = parseFloat(b.weight) - parseFloat(b.used); + if (ra > rb) return -1; + if (ra < rb) return 1; + return 0; + } + }, + myListHelperFilters, + 'name', + [], + myListHelperExclusiveFilters, + 10); + self.pageSize = ko.pureComputed({ read: function read() { @@ -1044,4 +1070,4 @@ FilamentManager.prototype.viewModels.warning = function insufficientFilamentWarn dependencies: Plugin.REQUIRED_VIEWMODELS, elements: Plugin.BINDINGS }); -})(); \ No newline at end of file +})(); diff --git a/octoprint_filamentmanager/templates/sidebar.jinja2 b/octoprint_filamentmanager/templates/sidebar.jinja2 index 55c8e8c..f0cb29e 100644 --- a/octoprint_filamentmanager/templates/sidebar.jinja2 +++ b/octoprint_filamentmanager/templates/sidebar.jinja2 @@ -1,8 +1,24 @@ + +
+
  - + + +
From 42a3f695c480662e58655abb4124f466ab2755bb Mon Sep 17 00:00:00 2001 From: OllisGit Date: Mon, 24 May 2021 10:09:50 +0200 Subject: [PATCH 20/26] New Verison 1.8.0 - #41 hide overused spools --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6ae4bcb..45ac5d6 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.7.2" +plugin_version = "1.8.0" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" From 4e271a3574c1e4d5111bc1ad3e00dd62ed296fa4 Mon Sep 17 00:00:00 2001 From: ldursw <37294448+ldursw@users.noreply.github.com> Date: Fri, 4 Jun 2021 16:41:02 -0300 Subject: [PATCH 21/26] Fix extruder calculation with G2/G3 (#67) * Fix extruder calculation with G2/G3 * Update odometer.py --- octoprint_filamentmanager/newodometer.py | 2 +- octoprint_filamentmanager/odometer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/octoprint_filamentmanager/newodometer.py b/octoprint_filamentmanager/newodometer.py index 6994958..9d80072 100644 --- a/octoprint_filamentmanager/newodometer.py +++ b/octoprint_filamentmanager/newodometer.py @@ -43,7 +43,7 @@ def processGCodeLine(self, line): T = self._getCodeInt(line, "T") if G is not None: - if G == 0 or G == 1: # Move + if G >= 0 and G <= 3: # Move G0/G1/G2/G3 x = self._getCodeFloat(line, "X") y = self._getCodeFloat(line, "Y") z = self._getCodeFloat(line, "Z") diff --git a/octoprint_filamentmanager/odometer.py b/octoprint_filamentmanager/odometer.py index 73ca241..99e0a51 100644 --- a/octoprint_filamentmanager/odometer.py +++ b/octoprint_filamentmanager/odometer.py @@ -36,7 +36,7 @@ def parse(self, gcode, cmd): if gcode is None: return - if gcode == "G1" or gcode == "G0": # move + if gcode in ("G0", "G1", "G2", "G3"): # move e = self._get_float(cmd, self.regexE) if e is not None: if self.relativeMode or self.relativeExtrusion: From ab5311b68c79fcdffe78ce8a128b4a4601ff1051 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Sat, 5 Jun 2021 15:55:23 +0200 Subject: [PATCH 22/26] New Verison 1.8.1 - PR #67, #62 G2/G3 movement is now tracked. Thx @ldursw - E #8 output of current selecetd spool in confirm dialog --- .../static/js/filamentmanager.bundled.js | 11 ++++++++--- .../templates/spool_confirmation.jinja2 | 2 +- setup.py | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js index 02d57c8..117da99 100644 --- a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js +++ b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js @@ -316,10 +316,17 @@ FilamentManager.prototype.viewModels.confirmation = function spoolSelectionConfi }; var showDialog = function showSpoolConfirmationDialog() { + var allCurrentSelections = selections.selectedSpools != null ? selections.selectedSpools() : null; var s = []; printerStateViewModel.filament().forEach(function (value) { var toolID = Utils.extractToolIDFromName(value.name()); - s.push({ spool: undefined, tool: toolID }); + + var currentSelectionForTool = allCurrentSelections?.[toolID]?.name; + + s.push({ spool: undefined, + tool: toolID, + currentSpoolName: currentSelectionForTool + }); }); self.selections(s); button.attr('disabled', true); @@ -710,7 +717,6 @@ FilamentManager.prototype.viewModels.spools = function spoolsViewModel() { self.overUsedUsage = ko.observable(false); self.overUsedUsage.subscribe(function(newValue){ - debugger // self.allSpools.updateItems(self.allSpools.items) self.allSpools.toggleFilter("overUsedUsage"); }); @@ -719,7 +725,6 @@ FilamentManager.prototype.viewModels.spools = function spoolsViewModel() { var myListHelperFilters = { overUsedUsage: function (data){ - debugger console.error(data); var result = data.used < data.weight; return result; diff --git a/octoprint_filamentmanager/templates/spool_confirmation.jinja2 b/octoprint_filamentmanager/templates/spool_confirmation.jinja2 index 98232b1..61491c3 100644 --- a/octoprint_filamentmanager/templates/spool_confirmation.jinja2 +++ b/octoprint_filamentmanager/templates/spool_confirmation.jinja2 @@ -15,7 +15,7 @@
-   +  
diff --git a/setup.py b/setup.py index 45ac5d6..788ed24 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.8.0" +plugin_version = "1.8.1" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" From a9762900d43ad4f110941120854f06d920e17100 Mon Sep 17 00:00:00 2001 From: Alex Bahm Date: Sat, 16 Oct 2021 00:56:51 -0700 Subject: [PATCH 23/26] Show errors when database connection test fails (#77) I've setup the database on a couple different octoprint instances in the last month, and I keep forgetting to install psycopg2. Debugging this is always frustrating as I keep tweaking settings, checking logs and chrome debugger to try to determine the errors, etc. I figured it would make it a lot easier for everyone to include an error message after we got a result from "Test Connection". This just exposes a bit more info from the responses in the test api, then adds an extra field to the UI to show the returning error. The error clears after a few seconds. --- octoprint_filamentmanager/api/__init__.py | 4 ++-- .../static/js/filamentmanager.bundled.js | 13 ++++++++++++- .../templates/settings_configdialog.jinja2 | 5 ++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index 287508d..948a3da 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -503,10 +503,10 @@ def test_database_connection(self): password=config["password"]) else: self._logger.warn("self.filamentManager is not initialized yet") - return + return make_response("FilamentManager is still initializing (if this persists, some dependencies may be missing)", 503) except Exception as e: self._logger.exception("Failed to connect to the database with the given configuration") - return make_response("Failed to connect to the database with the given configuration", 400) + return make_response("Failed to connect to the database with the given configuration: {}".format(e), 400) else: connection.close() return make_response("", 204) diff --git a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js index 117da99..41836b1 100644 --- a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js +++ b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js @@ -230,6 +230,7 @@ FilamentManager.prototype.viewModels.config = function configurationViewModel() var api = this.core.client; var settingsViewModel = this.core.bridge.allViewModels.settingsViewModel; + self.testResult = ko.observable(null); var dialog = $('#settings_plugin_filamentmanager_configurationdialog'); @@ -279,13 +280,23 @@ FilamentManager.prototype.viewModels.config = function configurationViewModel() var data = ko.mapping.toJS(self.config.database); + self.testResult('Waiting for response...'); + api.database.test(data).done(function () { target.addClass('btn-success'); - }).fail(function () { + self.testResult('Success!'); + }).fail(function (response) { target.addClass('btn-danger'); + console.log(JSON.stringify(response)); + self.testResult(response.responseText); }).always(function () { $('i.fa-spinner', target).remove(); target.prop('disabled', false); + // clear the result message after a few seconds + window.setTimeout(function() { + self.testResult(''); + target.removeClass('btn-success btn-danger'); + }, 7 * 1000) }); }; }; diff --git a/octoprint_filamentmanager/templates/settings_configdialog.jinja2 b/octoprint_filamentmanager/templates/settings_configdialog.jinja2 index b226c5f..d388a2c 100644 --- a/octoprint_filamentmanager/templates/settings_configdialog.jinja2 +++ b/octoprint_filamentmanager/templates/settings_configdialog.jinja2 @@ -108,7 +108,10 @@
- +
+ + +
{{ _("Note: If you change these settings you must restart your OctoPrint instance for the changes to take affect.") }} From 5f8c9033e0bb93334c4f568a5ab046d699894700 Mon Sep 17 00:00:00 2001 From: OllisGit Date: Sun, 17 Oct 2021 15:58:50 +0200 Subject: [PATCH 24/26] New Verison 1.9.0 - PR #77 Show errors when database connection test fails. Thx @techfreek - E #72 French translation. Thx @LeBress - B #66 assign temp.offset after connecting the printer - B #79 selections-API return only the max numbers of tools --- README.md | 14 +- docker-compose.yml | 17 + octoprint_filamentmanager/__init__.py | 19 +- octoprint_filamentmanager/api/__init__.py | 5 + .../static/js/filamentmanager.bundled.js | 17 +- .../templates/settings_configdialog.jinja2 | 5 +- .../templates/sidebar.jinja2 | 2 +- .../translations/de/LC_MESSAGES/messages.mo | Bin 7368 -> 7368 bytes .../translations/de/LC_MESSAGES/messages.po | 100 ++-- .../translations/es/LC_MESSAGES/messages.mo | Bin 7467 -> 7467 bytes .../translations/es/LC_MESSAGES/messages.po | 213 +++++--- .../translations/fr/LC_MESSAGES/messages.mo | Bin 0 -> 7919 bytes .../translations/fr/LC_MESSAGES/messages.po | 512 ++++++++++++++++++ setup.py | 2 +- translations/de/LC_MESSAGES/messages.mo | Bin 7368 -> 7368 bytes translations/de/LC_MESSAGES/messages.po | 100 ++-- translations/es/LC_MESSAGES/messages.mo | Bin 7467 -> 7467 bytes translations/es/LC_MESSAGES/messages.po | 213 +++++--- translations/fr/LC_MESSAGES/messages.mo | Bin 0 -> 7919 bytes translations/fr/LC_MESSAGES/messages.po | 512 ++++++++++++++++++ translations/messages.pot | 106 ++-- 21 files changed, 1541 insertions(+), 296 deletions(-) create mode 100644 docker-compose.yml create mode 100644 octoprint_filamentmanager/translations/fr/LC_MESSAGES/messages.mo create mode 100644 octoprint_filamentmanager/translations/fr/LC_MESSAGES/messages.po create mode 100644 translations/fr/LC_MESSAGES/messages.mo create mode 100644 translations/fr/LC_MESSAGES/messages.po diff --git a/README.md b/README.md index 009be2c..76e4740 100644 --- a/README.md +++ b/README.md @@ -51,10 +51,22 @@ or manually using this URL: `https://github.com/OllisGit/OctoPrint-FilamentManager/releases/latest/download/master.zip` -1. For PostgreSQL support you need to install an additional dependency: +1. For PostgreSQL support you need to install an additional dependency. Take a look into the [wiki](https://github.com/OllisGit/OctoPrint-FilamentManager/wiki) for more details. `pip install psycopg2` + +### Using PostgreSQL with Docker +You need to make sure that you setup a docker runtime on your system. After that you can "manage" a PostgreSQL with the following commands: + + docker-compose up +_ + + docker-compose down --volumes +_ + + docker-compose run postgres bash + ## Screenshots ![FilamentManager Sidebar](screenshots/filamentmanager_sidebar.png?raw=true) diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b2dfa2f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,17 @@ +version: '3' +services: + postgres: + image: "postgres" # use latest official postgres version +# env_file: +# - database.env # configure postgres + volumes: + - postgres-data:/var/lib/postgresql/data/ # persist data even if container shuts down + ports: + - 5432:5432 + environment: + - POSTGRES_DB=spoolmanagerdb + - POSTGRES_USER=Olli + - POSTGRES_PASSWORD=illO + +volumes: + postgres-data: # named volumes can be managed easier using docker-compose diff --git a/octoprint_filamentmanager/__init__.py b/octoprint_filamentmanager/__init__.py index e1f0957..79da242 100644 --- a/octoprint_filamentmanager/__init__.py +++ b/octoprint_filamentmanager/__init__.py @@ -143,12 +143,7 @@ def notify(pid, channel, payload): self.update_pause_thresholds() # set temperature offsets for saved selections - try: - all_selections = self.filamentManager.get_all_selections(self.client_id) - self.set_temp_offsets(all_selections) - except Exception as e: - self._logger.error("Failed to set temperature offsets: {message}".format(message=str(e))) - self._logger.exception("Failed to set temperature offsets: {message}".format(message=str(e))) + self.assign_temperature_offset() def on_shutdown(self): if self.filamentManager is not None: @@ -257,6 +252,10 @@ def on_event(self, event, payload): elif Events.PRINT_CANCELLED == event: self.alreadyCanceled = True self._printJobFinished() + + elif Events.CONNECTED == event: + self.assign_temperature_offset() + pass def _printJobStarted(self, payload): @@ -310,6 +309,14 @@ def _printJobFinished(self): # # update last print state # self.lastPrintState = payload['state_id'] + def assign_temperature_offset(self): + try: + all_selections = self.filamentManager.get_all_selections(self.client_id) + self.set_temp_offsets(all_selections) + except Exception as e: + self._logger.error("Failed to set temperature offsets: {message}".format(message=str(e))) + self._logger.exception("Failed to set temperature offsets: {message}".format(message=str(e))) + def update_filament_usage(self): printer_profile = self._printer_profile_manager.get_current_or_default() # extrusion = self.filamentOdometer.get_extrusion() diff --git a/octoprint_filamentmanager/api/__init__.py b/octoprint_filamentmanager/api/__init__.py index 948a3da..4ad4d7f 100644 --- a/octoprint_filamentmanager/api/__init__.py +++ b/octoprint_filamentmanager/api/__init__.py @@ -324,7 +324,12 @@ def delete_spool(self, identifier): def get_selections_list(self): try: if (self.filamentManager != None): + + printer_profile = self._printer_profile_manager.get_current_or_default() + printerProfileToolCount = printer_profile['extruder']['count'] all_selections = self.filamentManager.get_all_selections(self.client_id) + # return only the selection of the max tool count of the current printer profile + all_selections = all_selections[0:printerProfileToolCount] else: self._logger.warn("self.filamentManager is not initialized yet") return diff --git a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js index 41836b1..33eb3c9 100644 --- a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js +++ b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js @@ -230,7 +230,8 @@ FilamentManager.prototype.viewModels.config = function configurationViewModel() var api = this.core.client; var settingsViewModel = this.core.bridge.allViewModels.settingsViewModel; - self.testResult = ko.observable(null); + self.testConnectionResult = ko.observable(null); + self.testConnectionResultTextColor = ko.observable("color:blue"); var dialog = $('#settings_plugin_filamentmanager_configurationdialog'); @@ -280,23 +281,27 @@ FilamentManager.prototype.viewModels.config = function configurationViewModel() var data = ko.mapping.toJS(self.config.database); - self.testResult('Waiting for response...'); + self.testConnectionResult('Waiting for response...'); + self.testConnectionResultTextColor('color:orange'); api.database.test(data).done(function () { target.addClass('btn-success'); - self.testResult('Success!'); + self.testConnectionResult('Success!'); + self.testConnectionResultTextColor('color:green'); }).fail(function (response) { target.addClass('btn-danger'); console.log(JSON.stringify(response)); - self.testResult(response.responseText); + self.testConnectionResult(response.responseText); + self.testConnectionResultTextColor("color:red"); }).always(function () { $('i.fa-spinner', target).remove(); target.prop('disabled', false); // clear the result message after a few seconds window.setTimeout(function() { - self.testResult(''); + self.testConnectionResult(''); + self.testConnectionResultTextColor(''); target.removeClass('btn-success btn-danger'); - }, 7 * 1000) + }, 10 * 1000) }); }; }; diff --git a/octoprint_filamentmanager/templates/settings_configdialog.jinja2 b/octoprint_filamentmanager/templates/settings_configdialog.jinja2 index d388a2c..b03399b 100644 --- a/octoprint_filamentmanager/templates/settings_configdialog.jinja2 +++ b/octoprint_filamentmanager/templates/settings_configdialog.jinja2 @@ -74,7 +74,8 @@ {{ _("Use external database") }}
- If you want to use an external database, please take a look into my wiki how to install the drivers and setup the database. +{# If you want to use an external database, please take a look into my wiki how to install the drivers and setup the database.#} + {{ _('If you want to use an external database, please take a look into my wiki how to install the drivers and setup the database.') }}
@@ -110,7 +111,7 @@
- +
diff --git a/octoprint_filamentmanager/templates/sidebar.jinja2 b/octoprint_filamentmanager/templates/sidebar.jinja2 index f0cb29e..23db613 100644 --- a/octoprint_filamentmanager/templates/sidebar.jinja2 +++ b/octoprint_filamentmanager/templates/sidebar.jinja2 @@ -1,6 +1,6 @@ diff --git a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.mo b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.mo index 9826e038629a6fda057ba1aed87c6cc45c8e9e8a..764b6de3dbaf50da8d82e69a0ac5da885c3b297d 100644 GIT binary patch delta 33 ocmX?MdBSpowg9i8uAzahp}B&gp_Q@0W(xsrMn=ocDS|270G?3@W&i*H delta 33 ocmX?MdBSpowg9hzu7Rblp^<`-p_PHjW(xsrMn;RxDS|270G^!)X#fBK diff --git a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po index ae51df4..d31220b 100644 --- a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po +++ b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-09-12 21:04+0200\n" +"POT-Creation-Date: 2021-10-17 11:30+0200\n" "PO-Revision-Date: 2018-02-04 15:24+0100\n" "Last-Translator: Sven Lohrmann \n" "Language: de\n" @@ -17,29 +17,29 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.8.0\n" +"Generated-By: Babel 2.9.0\n" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:357 msgid "Start Print" msgstr "Druck starten" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:349 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:372 msgid "Resume Print" msgstr "Druck fortsetzen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:424 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:447 msgid "Data import failed" msgstr "Daten-Import fehlgeschlagen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:425 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:448 msgid "Something went wrong, please consult the logs." msgstr "Etwas ist schief gelaufen, bitte konsultiere das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:557 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 msgid "Could not add profile" msgstr "Konnte Profil nicht hinzufügen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:581 msgid "" "There was an unexpected error while saving the filament profile, please " "consult the logs." @@ -47,11 +47,11 @@ msgstr "" "Unerwarteter Fehler beim Speichern des Filamentprofils, bitte konsultiere" " das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:602 msgid "Could not update profile" msgstr "Konnte Profil nicht aktualisieren" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:603 msgid "" "There was an unexpected error while updating the filament profile, please" " consult the logs." @@ -59,11 +59,11 @@ msgstr "" "Unerwarteter Fehler beim Aktualisieren des Filamentprofils, bitte " "konsultiere das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:617 msgid "Could not delete profile" msgstr "Konnte Profil nicht löschen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:618 msgid "" "There was an unexpected error while removing the filament profile, please" " consult the logs." @@ -71,11 +71,11 @@ msgstr "" "Unerwarteter Fehler beim Löschen des Filamentprofils, bitte konsultiere " "das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:627 msgid "Delete profile?" msgstr "Profil löschen?" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:628 msgid "" "You are about to delete the filament profile (). Please" " note that it is not possible to delete profiles with associated spools." @@ -84,27 +84,27 @@ msgstr "" "Bitte beachte, dass es nicht möglich ist Profile zu löschen die Spulen " "zugewiesen wurden." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:629 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:949 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 msgid "Delete" msgstr "Löschen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:686 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:709 msgid "Could not select spool" msgstr "Konnte Spule nicht auswählen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:710 msgid "" "There was an unexpected error while selecting the spool, please consult " "the logs." msgstr "Unerwarteter Fehler beim auswählen der Spule, bitte konsultiere das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:898 msgid "Could not add spool" msgstr "Konnte Spule nicht hinzufügen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:899 msgid "" "There was an unexpected error while saving the filament spool, please " "consult the logs." @@ -112,11 +112,11 @@ msgstr "" "Unerwarteter Fehler beim speichern der Filamentspule, bitte konsultiere " "das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:921 msgid "Could not update spool" msgstr "Konnte Spule nicht aktualisieren" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:922 msgid "" "There was an unexpected error while updating the filament spool, please " "consult the logs." @@ -124,11 +124,11 @@ msgstr "" "Unerwarteter Fehler beim Aktualisieren der Filamentspule, bitte " "konsultiere das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:937 msgid "Could not delete spool" msgstr "Konnte Spule nicht löschen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:938 msgid "" "There was an unexpected error while removing the filament spool, please " "consult the logs." @@ -136,19 +136,19 @@ msgstr "" "Unerwarteter Fehler beim Löschen der Filamentspule, bitte konsultiere das" " Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:947 msgid "Delete spool?" msgstr "Spule löschen?" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:901 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 msgid "You are about to delete the filament spool - ()." msgstr "Du bist im Begriff die Filament-Spule - () zu löschen." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:973 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 msgid "Insufficient filament" msgstr "Filament nicht ausreichend" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1021 msgid "" "The current print job needs more material than what's left on the " "selected spool." @@ -247,7 +247,7 @@ msgid "Features" msgstr "Funktionen" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:87 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:91 msgid "Database" msgstr "Datenbank" @@ -283,23 +283,31 @@ msgstr "Schwellwert für Pause" msgid "Use external database" msgstr "Verwende externe Datenbank" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:80 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:78 +msgid "" +"If you want to use an external database, please take a look into my wiki how to " +"install the drivers and setup the database." +msgstr "" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 msgid "URI" msgstr "URI" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:94 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:98 msgid "Username" msgstr "Benutzername" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:101 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:105 msgid "Password" msgstr "Passwort" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:108 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:113 msgid "Test connection" msgstr "Verbindungstest" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:118 msgid "" "Note: If you change these settings you must restart your OctoPrint " "instance for the changes to take affect." @@ -307,23 +315,23 @@ msgstr "" "Beachte: Wenn du diese Einstellungen änderst musst du OctoPrint neu " "starten, damit diese wirksam werden." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 msgid "Import & Export" msgstr "Import & Export" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:120 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 msgid "Browse..." msgstr "Durchsuchen..." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:124 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:131 msgid "Import" msgstr "Import" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:126 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:133 msgid "Export" msgstr "Export" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:135 msgid "" "This does not look like a valid import archive. Only zip files are " "supported." @@ -331,17 +339,17 @@ msgstr "" "Dies sieht nicht wie ein gültiges Archiv zum importieren aus. Es werden " "nur Zip-Dateien unterstützt." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 msgid "Currency symbol" msgstr "Währungssymbol" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 msgid "Cancel" msgstr "Abbrechen" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:150 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:157 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 msgid "Save" @@ -403,12 +411,16 @@ msgstr "Preis" msgid "Temperature offset" msgstr "Temperaturoffset" -#: octoprint_filamentmanager/templates/sidebar.jinja2:4 +#: octoprint_filamentmanager/templates/sidebar.jinja2:3 +msgid "hide overused usage" +msgstr "" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:10 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 msgid "Tool" msgstr "Tool" -#: octoprint_filamentmanager/templates/sidebar.jinja2:5 +#: octoprint_filamentmanager/templates/sidebar.jinja2:19 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" msgstr "--- Spule auswählen ---" diff --git a/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.mo b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.mo index 8b6b722512c32e0ea9192270dfabadc2a761826d..309d9ae2d7c486c014cc39352c0d10dc67f5d0fd 100644 GIT binary patch delta 37 scmZ2&wc2WfzJQ>Sp{}8UuA#Ytp`n$rfwqCsW(NTsMn=ocxq|z+0l7X2VE_OC delta 37 scmZ2&wc2WfzJQ>ig|2~-u7Qbyp{bRTp|*kHW(NTsMn;Rxxq|z+0lC}>W&i*H diff --git a/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po index ae63aaa..fa97dff 100644 --- a/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po +++ b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po @@ -1,4 +1,4 @@ -# Translations template for OctoPrint-FilamentManager. +# Spanish translations for OctoPrint-FilamentManager. # Copyright (C) 2019 The OctoPrint Project # This file is distributed under the same license as the # OctoPrint-FilamentManager project. @@ -8,116 +8,152 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"POT-Creation-Date: 2021-10-17 11:30+0200\n" "PO-Revision-Date: 2019-05-06 11:31+0100\n" "Last-Translator: Ivan Garcia \n" +"Language: es\n" +"Language-Team: es \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.4.0\n" -"Language: es\n" +"Generated-By: Babel 2.9.0\n" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:357 msgid "Start Print" msgstr "Comenzar Impresión" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:349 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:372 msgid "Resume Print" msgstr "Continuar Impresión" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:424 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:447 msgid "Data import failed" msgstr "Error al importar los datos" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:425 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:448 msgid "Something went wrong, please consult the logs." msgstr "Algo ha ido mal, revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:557 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 msgid "Could not add profile" msgstr "No se puede añadir el perfil" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 -msgid "There was an unexpected error while saving the filament profile, please consult the logs." -msgstr "Ha ocurrido un error al intentar guardar el perfil del filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:581 +msgid "" +"There was an unexpected error while saving the filament profile, please " +"consult the logs." +msgstr "" +"Ha ocurrido un error al intentar guardar el perfil del filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:602 msgid "Could not update profile" msgstr "No se puede actualizar el perfil" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 -msgid "There was an unexpected error while updating the filament profile, please consult the logs." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:603 +msgid "" +"There was an unexpected error while updating the filament profile, please" +" consult the logs." msgstr "Ha ocurrido un error mientras se actualizaba el perfil del filamento" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:617 msgid "Could not delete profile" msgstr "No se puede eliminar el perfil" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 -msgid "There was an unexpected error while removing the filament profile, please consult the logs." -msgstr "Ha ocurrido un error al intentar eliminar el perfil del filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:618 +msgid "" +"There was an unexpected error while removing the filament profile, please" +" consult the logs." +msgstr "" +"Ha ocurrido un error al intentar eliminar el perfil del filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:627 msgid "Delete profile?" msgstr "¿Eliminar perfil?" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 -msgid "You are about to delete the filament profile (). Please note that it is not possible to delete profiles with associated spools." -msgstr "Estas apunto de borrar el perfil de filamento (). Ten en cuenta que no es posible borrar perfiles con bobinas asociadas." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:628 +msgid "" +"You are about to delete the filament profile (). Please" +" note that it is not possible to delete profiles with associated spools." +msgstr "" +"Estas apunto de borrar el perfil de filamento (). Ten " +"en cuenta que no es posible borrar perfiles con bobinas asociadas." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:629 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:949 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 msgid "Delete" msgstr "Eliminar" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:686 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:709 msgid "Could not select spool" msgstr "No se puede elegir la bobina" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 -msgid "There was an unexpected error while selecting the spool, please consult the logs." -msgstr "Ha ocurrido un error al intentar seleccionar el perfil del filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:710 +msgid "" +"There was an unexpected error while selecting the spool, please consult " +"the logs." +msgstr "" +"Ha ocurrido un error al intentar seleccionar el perfil del filamento, por" +" favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:898 msgid "Could not add spool" msgstr "No se puede añadir la bobina" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 -msgid "There was an unexpected error while saving the filament spool, please consult the logs." -msgstr "Ha ocurrido un error al intentar guardar la bobina de filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:899 +msgid "" +"There was an unexpected error while saving the filament spool, please " +"consult the logs." +msgstr "" +"Ha ocurrido un error al intentar guardar la bobina de filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:921 msgid "Could not update spool" msgstr "No se puede actualizar la bobina" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 -msgid "There was an unexpected error while updating the filament spool, please consult the logs." -msgstr "Ha ocurrido un error al intentar actualizar la bobina de filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:922 +msgid "" +"There was an unexpected error while updating the filament spool, please " +"consult the logs." +msgstr "" +"Ha ocurrido un error al intentar actualizar la bobina de filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:937 msgid "Could not delete spool" msgstr "No se puede eliminar la bobina" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 -msgid "There was an unexpected error while removing the filament spool, please consult the logs." -msgstr "Ha ocurrido un error al intentar eliminar la bobina de filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:938 +msgid "" +"There was an unexpected error while removing the filament spool, please " +"consult the logs." +msgstr "" +"Ha ocurrido un error al intentar eliminar la bobina de filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:947 msgid "Delete spool?" msgstr "¿Borrar bobina?" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:901 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 msgid "You are about to delete the filament spool - ()." msgstr "Estás apunto de borrar la bobina de filamento - ()." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:973 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 msgid "Insufficient filament" msgstr "Filamento insuficiente" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 -msgid "The current print job needs more material than what's left on the selected spool." -msgstr "La impresión actual necesita mas filamento del que hay en la bobina seleccionada." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1021 +msgid "" +"The current print job needs more material than what's left on the " +"selected spool." +msgstr "" +"La impresión actual necesita mas filamento del que hay en la bobina " +"seleccionada." #: octoprint_filamentmanager/templates/settings.jinja2:4 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 @@ -210,7 +246,7 @@ msgid "Features" msgstr "Características" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:87 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:91 msgid "Database" msgstr "Base de datos" @@ -219,8 +255,12 @@ msgid "Appearance" msgstr "Apariencia" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:26 -msgid "Show dialog to confirm selected spools before starting/resuming the print job" -msgstr "Mostrar el diálogo para confirmar las bobinas antes de empezar/continuar una impresión" +msgid "" +"Show dialog to confirm selected spools before starting/resuming the print" +" job" +msgstr "" +"Mostrar el diálogo para confirmar las bobinas antes de empezar/continuar " +"una impresión" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:34 msgid "Warn if print job exceeds remaining filament" @@ -242,57 +282,71 @@ msgstr "Margen de pausa" msgid "Use external database" msgstr "Usar base de datos externa" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:80 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:78 +msgid "" +"If you want to use an external database, please take a look into my wiki how to " +"install the drivers and setup the database." +msgstr "" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 msgid "URI" msgstr "URI" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:94 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:98 msgid "Username" msgstr "Usuario" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:101 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:105 msgid "Password" msgstr "Contraseña" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:108 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:113 msgid "Test connection" msgstr "Comprobar conexión" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 -msgid "Note: If you change these settings you must restart your OctoPrint instance for the changes to take affect." -msgstr "Nota: Si cambias esta configuración deberás reiniciar la instancia de OctoPrint para que los cambios hagan efecto." +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:118 +msgid "" +"Note: If you change these settings you must restart your OctoPrint " +"instance for the changes to take affect." +msgstr "" +"Nota: Si cambias esta configuración deberás reiniciar la instancia de " +"OctoPrint para que los cambios hagan efecto." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 msgid "Import & Export" msgstr "Importar & Exportar" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:120 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 msgid "Browse..." msgstr "Examinar..." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:124 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:131 msgid "Import" msgstr "Importar" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:126 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:133 msgid "Export" msgstr "Exportar" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 -msgid "This does not look like a valid import archive. Only zip files are supported." +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:135 +msgid "" +"This does not look like a valid import archive. Only zip files are " +"supported." msgstr "No parece un fichero de importación valido. Sólo se permiten archivos ZIP." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 msgid "Currency symbol" msgstr "Simbolo de moneda" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 msgid "Cancel" msgstr "Cancelar" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:150 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:157 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 msgid "Save" @@ -354,12 +408,16 @@ msgstr "Precio" msgid "Temperature offset" msgstr "Temperatura" -#: octoprint_filamentmanager/templates/sidebar.jinja2:4 +#: octoprint_filamentmanager/templates/sidebar.jinja2:3 +msgid "hide overused usage" +msgstr "" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:10 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 msgid "Tool" msgstr "Extrusor" -#: octoprint_filamentmanager/templates/sidebar.jinja2:5 +#: octoprint_filamentmanager/templates/sidebar.jinja2:19 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" msgstr "--- Seleccionar Bobina ---" @@ -369,10 +427,21 @@ msgid "Confirm your selected spools" msgstr "Confirma las bobinas seleccionadas" #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 -msgid "There are no information available about the active tools for the print job. Make sure the analysing process of the file has finished and that it's loaded correctly." -msgstr "No hay información disponible sobre el extrusor de la impresión actual. Asegúrate de que el proceso de análisis esté finalizado y se haya cargado correctamente." +msgid "" +"There are no information available about the active tools for the print " +"job. Make sure the analysing process of the file has finished and that " +"it's loaded correctly." +msgstr "" +"No hay información disponible sobre el extrusor de la impresión actual. " +"Asegúrate de que el proceso de análisis esté finalizado y se haya cargado" +" correctamente." #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 -msgid "Please confirm your selected spools for all active tools. This dialog is meant to protect you from accidentically selecting wrong spools for the print." -msgstr "Por favor, confirma las bobinas de los extrusores. Este dialogo está preparado para evitar que elijas bobinas incorrectas de forma accidental." +msgid "" +"Please confirm your selected spools for all active tools. This dialog is " +"meant to protect you from accidentically selecting wrong spools for the " +"print." +msgstr "" +"Por favor, confirma las bobinas de los extrusores. Este dialogo está " +"preparado para evitar que elijas bobinas incorrectas de forma accidental." diff --git a/octoprint_filamentmanager/translations/fr/LC_MESSAGES/messages.mo b/octoprint_filamentmanager/translations/fr/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..268d332a66b087913f65a1c39e6b27338ba50dec GIT binary patch literal 7919 zcmchbdyHIF9mlWo(qd6TKoRhu*li;--K{9FeZY3RC5zp*bhjXysAuM$nYrc8y~92C z?xTr>n4pnBq7lO%Y64MH7ZTKvXoUEO8HtG|C~Be@A4HABKa9p`i2qnWzjM#LmMI`w zn(ch&o_o&uy|X`@pw=4}oWc-vVC`eiz&X z{=h%~)W82V$Y1aWKIGm%gBOBlb6D=X6nrZ<30?%wd;FMRU-8eM0pG~`6X5yax53we zKLq&;e#XZez+Zu~?>TTY_&j(HcorYBe={iWF9L<%E#MS51+q1$gR<`!_-4?8=Ye;F za_)Xm_I<@aKLUz8Pk^%TX}|s~DEIsg6n*{6<9RHe$@9CwH-TF{UI(7R^G)FG;6aeT z;Bh__*ae0DAHfH}e}HoDy(nMw`w$3;-~=f4_&Oh=&+mYum!E(__c#9e_uvB0e+8@H zZj>SCWAI!s2Sv|!fkO9l;LYHd!LNe<1V0RZfz7vp&wIQXV&X%OfU^G#j3E1tg0k*-#y?2_ziFi_)AdaItgA0UWn6+-KRmJ^8rxeV37~8R}+-|cY-4S{h;voC6K@1 z1Rq=#JOSQgNr~pzZH~ydq6pNGbsCve@;ODf=}=v_I<#wp8$p46X4sx zCqa?>cc9qmBq;Zt0TFqBF(`6Ofu91e14WPD1Gj@uftV!tH~1rPGeSzdKLd*W{|?Ie z=RKYT`3ug$Xo8o6;*an1&okhiJbw_}3H|~UelOrs*?$=*d|eF+p9jGhtbvb%KL&H~ z9yX=mNpKlVFA0KG@K2xtKl=6{D8MJd6>ulXs{uX+o&{cVS*Z^NirudSMZY(JVuwXg zsOQmLqeW*tC(a=**}zOx+okr>bqVEm$ios>OobmgK?Qs<0XC zH#+B~4fgvNJu?rjl+^kg+@lTVotz%j7UeITPi)a>MD++F18VcRXUnxNix4DASjKNvBhBQjzs8DwbA7u}y3rsQ zs=;Ax?Mj-3d_mus)}3zjHKDR1u_`Tczaeiyv6aRgh_MqFzeq$l>N<{Lc*k~ zmRgZjA?iz;if`B(j$w?5$t6NX>_(QhIaZHC?1B@;F<$H94f)kdmh$QR&h|xgydzOu zG^0ehNNpCGb}^1t2x^}Zf+MD_qlAkF-_+L73@muW*aE{iT?UJK*|?9M;|GhabfqT% zeD_qaAs=9Qw2#rmKoHxG=8CqkF9s8sZkG3wz6`m$BF zWA55ou;}bwvbbd0_^OKxl{OmUZ%a6aaF(D^$#P5L1TOyb0d18S6Jh~jv)yy$9FJ2g zEuBwT6`Mw`(!`M;6|X8ca!jH(NpU!22GykE4MnUw@8UqbtoaT9gjMaaXBR6 zWQ&f}Iuqi(Qa6ttnGcSVYRxLehR9IVdhLodtD(GNmFjW}1t`rtjFg%3%}AlSRcDEc z8bi6jtkzvNAR5Z-*e?RXttM)=^58ZSvoPqxI#s?&5o>M?8@0>klBM^kt=o2O_us3^ zR}GpZsc9~3r3OgT)Jd(4q$?n$`ip%JWz|ZQw-lu+tw*G(UdL5^c^o;D4fv_35tgJX z93v-G=EKS@CbML)Y1OZ!mHocYC|iI`O;)F>lbenhu~22fHlwhzw`khRQaY{X7G~xT z+%U6m-;ue+#Z89~EmdYS`W0@h&}vcBcTDb>s!UB*rmj&_Q`7IAe9z>L$w@X=j+o_0 zC=c(OyrwdBwc0T?J@x)_-vMp&$`bvljdh-8(`s?qBNt>FuyQ2(3j|hiknlwDobk}Nac9z_D+l^?Ud#tqbBVx@>_$tL4=CqgL4g#qK&SsdSj$g~JK$Y2nY_i%;>s$LPrGG6`f6#Hqn!Zy4Efs!IkO z%0;KxMf;Hx)!hdv#f&wlq_=Tj|GGstP8e|}Xtc3_j!e+~biHNjZgHXIgWJK-8|C$8WNTR$sNUrDi(0P zMl`Y{-m)w!6Ec>#qtbiHj1ZHhP*IysE|VQYd9TQ$IKn0Tq#|C!ELqRH>se&;2(q@< zfFl3kpbhqxjykmFmqzya$%T8%Ne1%U{Sd=iFHK43FY}D0rw$I)j+vY>M*A`5MtE^t zvsO;0R)!VfkO{Z{jnWZ!TDsOtd-1l_h_4q^;ip#Gr$4kdFp z0#GQYCPb3%oj>jg@1u{hAO=&wxrFUZX@lVEMpV9#$D$NFs1b7XF6QQ?rq zgQL_5<^&_Z^-PGy;VUen+~A8tMwS6hc!azp&_oxjbZ*3ygdIPF^eB$FlPojV%FhaL z#m@~L;>%5NfsAgY%*e*Xg7ZlTj$={L07%uMgW@`IRQv=Rxy;e-g|?C);KzVFiipVJ za+$OSG za6D0teJF(aAG?bJMe8VovAMghOpXW>#G0&1Q_*D6&w56FC8`daEJ`%NlZ41VYCV!U z3PbA>9a2(!fQx(k-wb)#YiM7Ft%v;NrHB?707H^OOZvV^Ic@YLhnaqGiH=+ppKdY7 zk#+ih733XBdDzrXY%dwH|AiHuC~b0oziE0kd}j>RSFY1pgZC5U;{2v9V;99w#F5DN z(`lIv8Fb3V%?+@OtkgS7l%zW!rB;1t{xCo0;#~A>)+Hs0PEyGssb@^E{CE8kAuR-C zdUe^@_kn)4HGWswQ$W6Ksu%`}a;_c1aot8k(l2F4GWM9RV}`CSk4WaOl8?=&ln2)Y zjFfuGnNr^lr%`BwTclRg03m;w1j%~xt0^(;vdM;~UDkWKWH5w|48{G9LB`_D=eRQC rictnr#V`eFqsw$fyRhsU?Lqk~N9FE1zZbqdc6&Yccy24B6Z3xnzAMWC literal 0 HcmV?d00001 diff --git a/octoprint_filamentmanager/translations/fr/LC_MESSAGES/messages.po b/octoprint_filamentmanager/translations/fr/LC_MESSAGES/messages.po new file mode 100644 index 0000000..984539e --- /dev/null +++ b/octoprint_filamentmanager/translations/fr/LC_MESSAGES/messages.po @@ -0,0 +1,512 @@ +# French translations for OctoPrint-FilamentManager. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the +# OctoPrint-FilamentManager project. +# FIRST AUTHOR , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2021-10-17 11:30+0200\n" +"PO-Revision-Date: 2021-07-14 21:16+0200\n" +"Last-Translator: Sven Lohrmann \n" +"Language: fr\n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.9.0\n" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:357 +msgid "Start Print" +msgstr "Démarrer l'impression" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:372 +msgid "Resume Print" +msgstr "Reprendre l'impression" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:447 +msgid "Data import failed" +msgstr "Échec de l'importation des données" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:448 +msgid "Something went wrong, please consult the logs." +msgstr "Une erreur s'est produite, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 +msgid "Could not add profile" +msgstr "Impossible d'ajouter le profile" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:581 +msgid "" +"There was an unexpected error while saving the filament profile, please " +"consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de l'enregistrement du profile " +"de filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:602 +msgid "Could not update profile" +msgstr "Impossible de mettre à jour le profile" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:603 +msgid "" +"There was an unexpected error while updating the filament profile, please" +" consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de la mise à jour du profile de" +" filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:617 +msgid "Could not delete profile" +msgstr "Impossible de supprimer le profile" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:618 +msgid "" +"There was an unexpected error while removing the filament profile, please" +" consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de la suppression du profile de" +" filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:627 +msgid "Delete profile?" +msgstr "Supprimer le profile ?" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:628 +msgid "" +"You are about to delete the filament profile (). Please" +" note that it is not possible to delete profiles with associated spools." +msgstr "" +"Vous êtes sur le point de supprimer le profile de filament " +"(). Veuillez noter qu'il n'est pas possible de supprimer des " +"profils avec des bobines associés." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:629 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:949 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 +msgid "Delete" +msgstr "Effacer" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:709 +msgid "Could not select spool" +msgstr "Impossible de sélectionner la bobine" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:710 +msgid "" +"There was an unexpected error while selecting the spool, please consult " +"the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de la sélection du spool, " +"veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:898 +msgid "Could not add spool" +msgstr "Impossible d'ajouter la bobine" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:899 +msgid "" +"There was an unexpected error while saving the filament spool, please " +"consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de l'enregistrement de la " +"bobine de filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:921 +msgid "Could not update spool" +msgstr "Impossible de mettre à jour la bobine" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:922 +msgid "" +"There was an unexpected error while updating the filament spool, please " +"consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de la mise à jour de la bobine " +"de filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:937 +msgid "Could not delete spool" +msgstr "Impossible de supprimer la bobine" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:938 +msgid "" +"There was an unexpected error while removing the filament spool, please " +"consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors du retrait de la bobine de " +"filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:947 +msgid "Delete spool?" +msgstr "Supprimer la bobine ?" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 +msgid "You are about to delete the filament spool - ()." +msgstr "" +"Vous êtes sur le point de supprimer la bobine de filament - " +"()." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 +msgid "Insufficient filament" +msgstr "Filament insuffisant" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1021 +msgid "" +"The current print job needs more material than what's left on the " +"selected spool." +msgstr "" +"Le travail d'impression en cours nécessite plus de matériel que ce qui " +"reste sur la bobine sélectionnée." + +#: octoprint_filamentmanager/templates/settings.jinja2:4 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 +msgid "Plugin Configuration" +msgstr "Configuration du plug-in" + +#: octoprint_filamentmanager/templates/settings.jinja2:7 +msgid "Filament Spools" +msgstr "Bobines de filament" + +#: octoprint_filamentmanager/templates/settings.jinja2:13 +msgid "Items per page" +msgstr "Objets par page" + +#: octoprint_filamentmanager/templates/settings.jinja2:22 +msgid "Sort by" +msgstr "Trier par" + +#: octoprint_filamentmanager/templates/settings.jinja2:23 +msgid "Name (ascending)" +msgstr "Nom (alphabétique)" + +#: octoprint_filamentmanager/templates/settings.jinja2:24 +msgid "Material (ascending)" +msgstr "Matériel (alphabétique)" + +#: octoprint_filamentmanager/templates/settings.jinja2:25 +msgid "Vendor (ascending)" +msgstr "Vendeur (alphabétique)" + +#: octoprint_filamentmanager/templates/settings.jinja2:26 +msgid "Remaining (descending)" +msgstr "Restant (décroissant)" + +#: octoprint_filamentmanager/templates/settings.jinja2:36 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:15 +msgid "Name" +msgstr "Nom" + +#: octoprint_filamentmanager/templates/settings.jinja2:37 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:38 +msgid "Material" +msgstr "Matériel" + +#: octoprint_filamentmanager/templates/settings.jinja2:38 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:26 +msgid "Vendor" +msgstr "Vendeur" + +#: octoprint_filamentmanager/templates/settings.jinja2:39 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:50 +msgid "Weight" +msgstr "Poids" + +#: octoprint_filamentmanager/templates/settings.jinja2:40 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:62 +msgid "Remaining" +msgstr "Restant" + +#: octoprint_filamentmanager/templates/settings.jinja2:41 +msgid "Used" +msgstr "Utilisé" + +#: octoprint_filamentmanager/templates/settings.jinja2:42 +msgid "Action" +msgstr "Action" + +#: octoprint_filamentmanager/templates/settings.jinja2:54 +msgid "Edit Spool" +msgstr "Modifier la bobine" + +#: octoprint_filamentmanager/templates/settings.jinja2:55 +msgid "Duplicate Spool" +msgstr "Dupliquer la bobine" + +#: octoprint_filamentmanager/templates/settings.jinja2:56 +msgid "Delete Spool" +msgstr "Supprimer la bobine" + +#: octoprint_filamentmanager/templates/settings.jinja2:79 +msgid "Manage Profiles" +msgstr "Gérer les profiles" + +#: octoprint_filamentmanager/templates/settings.jinja2:80 +msgid "Add Spool" +msgstr "Ajouter une bobine" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:12 +msgid "Features" +msgstr "Caractéristiques" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:91 +msgid "Database" +msgstr "Base de données" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:14 +msgid "Appearance" +msgstr "Apparence" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:26 +msgid "" +"Show dialog to confirm selected spools before starting/resuming the print" +" job" +msgstr "" +"Afficher la boîte de dialogue pour confirmer les bobines sélectionnées " +"avant de démarrer/reprendre le travail d'impression" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:34 +msgid "Warn if print job exceeds remaining filament" +msgstr "Avertir si le travail d'impression dépasse le filament restant" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:42 +msgid "Enable software odometer to measure used filament" +msgstr "Activer l'odomètre logiciel pour mesurer le filament utilisé" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50 +msgid "Pause print if filament runs out" +msgstr "Suspendre l'impression si le filament s'épuise" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56 +msgid "Pause threshold" +msgstr "Seuil de pause" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:74 +msgid "Use external database" +msgstr "Utiliser une base de données externe" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:78 +msgid "" +"If you want to use an external database, please take a look into my wiki how to " +"install the drivers and setup the database." +msgstr "" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 +msgid "URI" +msgstr "URl" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:98 +msgid "Username" +msgstr "Nom d'utilisateur" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:105 +msgid "Password" +msgstr "Mot de passe" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:113 +msgid "Test connection" +msgstr "Tester la connexion" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:118 +msgid "" +"Note: If you change these settings you must restart your OctoPrint " +"instance for the changes to take affect." +msgstr "" +"Remarque : si vous modifiez ces paramètres, vous devez redémarrer votre " +"instance OctoPrint pour que les modifications prennent effet." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 +msgid "Import & Export" +msgstr "Importer / Exporter" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 +msgid "Browse..." +msgstr "Parcourir..." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:131 +msgid "Import" +msgstr "Importer" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:133 +msgid "Export" +msgstr "Exporter" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:135 +msgid "" +"This does not look like a valid import archive. Only zip files are " +"supported." +msgstr "" +"Cela ne ressemble pas à une archive d'importation valide. Seuls les " +"fichiers ZIP sont pris en charge." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 +msgid "Currency symbol" +msgstr "Symbole de la monnaie" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 +msgid "Cancel" +msgstr "Annuler" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:157 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 +msgid "Save" +msgstr "Sauvegarder" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:5 +msgid "Filament Profiles" +msgstr "Profiles de filaments" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:13 +msgid "--- New Profile ---" +msgstr "--- Nouveau profile ---" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:14 +msgid "New" +msgstr "Nouveau" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 +msgid "Save profile" +msgstr "Enregistrer le profile" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:30 +msgid "Vendor must be set" +msgstr "Le fournisseur doit être défini" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:42 +msgid "Material must be set" +msgstr "Le matériel doit être réglé" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:50 +msgid "Density" +msgstr "Densité" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:62 +msgid "Diameter" +msgstr "Diamètre" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:75 +msgid "Close" +msgstr "Fermer" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:5 +msgid "Filament Spool" +msgstr "Bobine de filament" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:19 +msgid "Name must be set" +msgstr "Le nom doit être défini" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:27 +msgid "Profile" +msgstr "Profile" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:38 +msgid "Price" +msgstr "Prix" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:74 +msgid "Temperature offset" +msgstr "Décalage de température" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:3 +msgid "hide overused usage" +msgstr "" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:10 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 +msgid "Tool" +msgstr "Outil" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:19 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 +msgid "--- Select Spool ---" +msgstr "--- Sélectionnez la bobine ---" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5 +msgid "Confirm your selected spools" +msgstr "Confirmez vos bobines sélectionnées" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 +msgid "" +"There are no information available about the active tools for the print " +"job. Make sure the analysing process of the file has finished and that " +"it's loaded correctly." +msgstr "" +"Aucune information n'est disponible sur les outils actifs pour le travail" +" d'impression. Assurez-vous que le processus d'analyse du fichier est " +"terminé et qu'il est chargé correctement." + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 +msgid "" +"Please confirm your selected spools for all active tools. This dialog is " +"meant to protect you from accidentically selecting wrong spools for the " +"print." +msgstr "" +"Veuillez confirmer vos bobines sélectionnées pour tous les outils actifs." +" Cette boîte de dialogue est destinée à vous protéger contre la sélection" +" accidentelle de mauvais spools pour l'impression." + +#~ msgid "Profile (ascending)" +#~ msgstr "Profile (croissant)" + +#~ msgid "Selected Spools" +#~ msgstr "Bobines sélectionnées" + +#~ msgid "Filament warning" +#~ msgstr "Avertissement de filament" + +#~ msgid "Saving failed" +#~ msgstr "Échec de l'enregistrement" + +#~ msgid "Failed to query spools" +#~ msgstr "Échec de la requête des bobines" + +#~ msgid "" +#~ "There was an unexpected database error" +#~ " while saving the filament profile, " +#~ "please consult the logs." +#~ msgstr "" +#~ "Une erreur de base de données " +#~ "inattendue s'est produite lors de " +#~ "l'enregistrement du profile de filament, " +#~ "veuillez consulter les journaux." + +#~ msgid "" +#~ "There was an unexpected database error" +#~ " while updating the filament profile, " +#~ "please consult the logs." +#~ msgstr "" +#~ "Une erreur de base de données " +#~ "inattendue s'est produite lors de la " +#~ "mise à jour du profile de " +#~ "filament, veuillez consulter les journaux." + +#~ msgid "" +#~ "There was an unexpected error while removing the filament spool,\n" +#~ " please consult the logs." +#~ msgstr "" +#~ "Une erreur inattendue s'est produite " +#~ "lors du retrait de la bobine de" +#~ " filament,\n" +#~ " veuillez " +#~ "consulter les journaux." + +#~ msgid "Spool selection failed" +#~ msgstr "Échec de la sélection de la bobine" + +#~ msgid "Cannot delete profiles with associated spools." +#~ msgstr "Impossible de supprimer les profiles avec les bobines associés." + +#~ msgid "Data import successfull" +#~ msgstr "Importation des données réussie" + +#~ msgid "Enable filament odometer" +#~ msgstr "Activer l'odomètre à filament" + diff --git a/setup.py b/setup.py index 788ed24..c1123c8 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.8.1" +plugin_version = "1.9.0" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index 9826e038629a6fda057ba1aed87c6cc45c8e9e8a..764b6de3dbaf50da8d82e69a0ac5da885c3b297d 100644 GIT binary patch delta 33 ocmX?MdBSpowg9i8uAzahp}B&gp_Q@0W(xsrMn=ocDS|270G?3@W&i*H delta 33 ocmX?MdBSpowg9hzu7Rblp^<`-p_PHjW(xsrMn;RxDS|270G^!)X#fBK diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index ae51df4..d31220b 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-09-12 21:04+0200\n" +"POT-Creation-Date: 2021-10-17 11:30+0200\n" "PO-Revision-Date: 2018-02-04 15:24+0100\n" "Last-Translator: Sven Lohrmann \n" "Language: de\n" @@ -17,29 +17,29 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.8.0\n" +"Generated-By: Babel 2.9.0\n" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:357 msgid "Start Print" msgstr "Druck starten" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:349 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:372 msgid "Resume Print" msgstr "Druck fortsetzen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:424 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:447 msgid "Data import failed" msgstr "Daten-Import fehlgeschlagen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:425 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:448 msgid "Something went wrong, please consult the logs." msgstr "Etwas ist schief gelaufen, bitte konsultiere das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:557 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 msgid "Could not add profile" msgstr "Konnte Profil nicht hinzufügen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:581 msgid "" "There was an unexpected error while saving the filament profile, please " "consult the logs." @@ -47,11 +47,11 @@ msgstr "" "Unerwarteter Fehler beim Speichern des Filamentprofils, bitte konsultiere" " das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:602 msgid "Could not update profile" msgstr "Konnte Profil nicht aktualisieren" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:603 msgid "" "There was an unexpected error while updating the filament profile, please" " consult the logs." @@ -59,11 +59,11 @@ msgstr "" "Unerwarteter Fehler beim Aktualisieren des Filamentprofils, bitte " "konsultiere das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:617 msgid "Could not delete profile" msgstr "Konnte Profil nicht löschen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:618 msgid "" "There was an unexpected error while removing the filament profile, please" " consult the logs." @@ -71,11 +71,11 @@ msgstr "" "Unerwarteter Fehler beim Löschen des Filamentprofils, bitte konsultiere " "das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:627 msgid "Delete profile?" msgstr "Profil löschen?" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:628 msgid "" "You are about to delete the filament profile (). Please" " note that it is not possible to delete profiles with associated spools." @@ -84,27 +84,27 @@ msgstr "" "Bitte beachte, dass es nicht möglich ist Profile zu löschen die Spulen " "zugewiesen wurden." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:629 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:949 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 msgid "Delete" msgstr "Löschen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:686 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:709 msgid "Could not select spool" msgstr "Konnte Spule nicht auswählen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:710 msgid "" "There was an unexpected error while selecting the spool, please consult " "the logs." msgstr "Unerwarteter Fehler beim auswählen der Spule, bitte konsultiere das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:898 msgid "Could not add spool" msgstr "Konnte Spule nicht hinzufügen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:899 msgid "" "There was an unexpected error while saving the filament spool, please " "consult the logs." @@ -112,11 +112,11 @@ msgstr "" "Unerwarteter Fehler beim speichern der Filamentspule, bitte konsultiere " "das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:921 msgid "Could not update spool" msgstr "Konnte Spule nicht aktualisieren" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:922 msgid "" "There was an unexpected error while updating the filament spool, please " "consult the logs." @@ -124,11 +124,11 @@ msgstr "" "Unerwarteter Fehler beim Aktualisieren der Filamentspule, bitte " "konsultiere das Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:937 msgid "Could not delete spool" msgstr "Konnte Spule nicht löschen" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:938 msgid "" "There was an unexpected error while removing the filament spool, please " "consult the logs." @@ -136,19 +136,19 @@ msgstr "" "Unerwarteter Fehler beim Löschen der Filamentspule, bitte konsultiere das" " Log." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:947 msgid "Delete spool?" msgstr "Spule löschen?" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:901 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 msgid "You are about to delete the filament spool - ()." msgstr "Du bist im Begriff die Filament-Spule - () zu löschen." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:973 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 msgid "Insufficient filament" msgstr "Filament nicht ausreichend" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1021 msgid "" "The current print job needs more material than what's left on the " "selected spool." @@ -247,7 +247,7 @@ msgid "Features" msgstr "Funktionen" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:87 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:91 msgid "Database" msgstr "Datenbank" @@ -283,23 +283,31 @@ msgstr "Schwellwert für Pause" msgid "Use external database" msgstr "Verwende externe Datenbank" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:80 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:78 +msgid "" +"If you want to use an external database, please take a look into my wiki how to " +"install the drivers and setup the database." +msgstr "" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 msgid "URI" msgstr "URI" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:94 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:98 msgid "Username" msgstr "Benutzername" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:101 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:105 msgid "Password" msgstr "Passwort" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:108 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:113 msgid "Test connection" msgstr "Verbindungstest" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:118 msgid "" "Note: If you change these settings you must restart your OctoPrint " "instance for the changes to take affect." @@ -307,23 +315,23 @@ msgstr "" "Beachte: Wenn du diese Einstellungen änderst musst du OctoPrint neu " "starten, damit diese wirksam werden." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 msgid "Import & Export" msgstr "Import & Export" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:120 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 msgid "Browse..." msgstr "Durchsuchen..." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:124 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:131 msgid "Import" msgstr "Import" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:126 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:133 msgid "Export" msgstr "Export" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:135 msgid "" "This does not look like a valid import archive. Only zip files are " "supported." @@ -331,17 +339,17 @@ msgstr "" "Dies sieht nicht wie ein gültiges Archiv zum importieren aus. Es werden " "nur Zip-Dateien unterstützt." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 msgid "Currency symbol" msgstr "Währungssymbol" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 msgid "Cancel" msgstr "Abbrechen" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:150 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:157 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 msgid "Save" @@ -403,12 +411,16 @@ msgstr "Preis" msgid "Temperature offset" msgstr "Temperaturoffset" -#: octoprint_filamentmanager/templates/sidebar.jinja2:4 +#: octoprint_filamentmanager/templates/sidebar.jinja2:3 +msgid "hide overused usage" +msgstr "" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:10 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 msgid "Tool" msgstr "Tool" -#: octoprint_filamentmanager/templates/sidebar.jinja2:5 +#: octoprint_filamentmanager/templates/sidebar.jinja2:19 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" msgstr "--- Spule auswählen ---" diff --git a/translations/es/LC_MESSAGES/messages.mo b/translations/es/LC_MESSAGES/messages.mo index 8b6b722512c32e0ea9192270dfabadc2a761826d..309d9ae2d7c486c014cc39352c0d10dc67f5d0fd 100644 GIT binary patch delta 37 scmZ2&wc2WfzJQ>Sp{}8UuA#Ytp`n$rfwqCsW(NTsMn=ocxq|z+0l7X2VE_OC delta 37 scmZ2&wc2WfzJQ>ig|2~-u7Qbyp{bRTp|*kHW(NTsMn;Rxxq|z+0lC}>W&i*H diff --git a/translations/es/LC_MESSAGES/messages.po b/translations/es/LC_MESSAGES/messages.po index ae63aaa..fa97dff 100644 --- a/translations/es/LC_MESSAGES/messages.po +++ b/translations/es/LC_MESSAGES/messages.po @@ -1,4 +1,4 @@ -# Translations template for OctoPrint-FilamentManager. +# Spanish translations for OctoPrint-FilamentManager. # Copyright (C) 2019 The OctoPrint Project # This file is distributed under the same license as the # OctoPrint-FilamentManager project. @@ -8,116 +8,152 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"POT-Creation-Date: 2021-10-17 11:30+0200\n" "PO-Revision-Date: 2019-05-06 11:31+0100\n" "Last-Translator: Ivan Garcia \n" +"Language: es\n" +"Language-Team: es \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.4.0\n" -"Language: es\n" +"Generated-By: Babel 2.9.0\n" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:357 msgid "Start Print" msgstr "Comenzar Impresión" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:349 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:372 msgid "Resume Print" msgstr "Continuar Impresión" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:424 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:447 msgid "Data import failed" msgstr "Error al importar los datos" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:425 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:448 msgid "Something went wrong, please consult the logs." msgstr "Algo ha ido mal, revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:557 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 msgid "Could not add profile" msgstr "No se puede añadir el perfil" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 -msgid "There was an unexpected error while saving the filament profile, please consult the logs." -msgstr "Ha ocurrido un error al intentar guardar el perfil del filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:581 +msgid "" +"There was an unexpected error while saving the filament profile, please " +"consult the logs." +msgstr "" +"Ha ocurrido un error al intentar guardar el perfil del filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:602 msgid "Could not update profile" msgstr "No se puede actualizar el perfil" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 -msgid "There was an unexpected error while updating the filament profile, please consult the logs." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:603 +msgid "" +"There was an unexpected error while updating the filament profile, please" +" consult the logs." msgstr "Ha ocurrido un error mientras se actualizaba el perfil del filamento" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:617 msgid "Could not delete profile" msgstr "No se puede eliminar el perfil" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 -msgid "There was an unexpected error while removing the filament profile, please consult the logs." -msgstr "Ha ocurrido un error al intentar eliminar el perfil del filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:618 +msgid "" +"There was an unexpected error while removing the filament profile, please" +" consult the logs." +msgstr "" +"Ha ocurrido un error al intentar eliminar el perfil del filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:627 msgid "Delete profile?" msgstr "¿Eliminar perfil?" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 -msgid "You are about to delete the filament profile (). Please note that it is not possible to delete profiles with associated spools." -msgstr "Estas apunto de borrar el perfil de filamento (). Ten en cuenta que no es posible borrar perfiles con bobinas asociadas." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:628 +msgid "" +"You are about to delete the filament profile (). Please" +" note that it is not possible to delete profiles with associated spools." +msgstr "" +"Estas apunto de borrar el perfil de filamento (). Ten " +"en cuenta que no es posible borrar perfiles con bobinas asociadas." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:629 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:949 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 msgid "Delete" msgstr "Eliminar" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:686 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:709 msgid "Could not select spool" msgstr "No se puede elegir la bobina" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 -msgid "There was an unexpected error while selecting the spool, please consult the logs." -msgstr "Ha ocurrido un error al intentar seleccionar el perfil del filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:710 +msgid "" +"There was an unexpected error while selecting the spool, please consult " +"the logs." +msgstr "" +"Ha ocurrido un error al intentar seleccionar el perfil del filamento, por" +" favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:898 msgid "Could not add spool" msgstr "No se puede añadir la bobina" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 -msgid "There was an unexpected error while saving the filament spool, please consult the logs." -msgstr "Ha ocurrido un error al intentar guardar la bobina de filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:899 +msgid "" +"There was an unexpected error while saving the filament spool, please " +"consult the logs." +msgstr "" +"Ha ocurrido un error al intentar guardar la bobina de filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:921 msgid "Could not update spool" msgstr "No se puede actualizar la bobina" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 -msgid "There was an unexpected error while updating the filament spool, please consult the logs." -msgstr "Ha ocurrido un error al intentar actualizar la bobina de filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:922 +msgid "" +"There was an unexpected error while updating the filament spool, please " +"consult the logs." +msgstr "" +"Ha ocurrido un error al intentar actualizar la bobina de filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:937 msgid "Could not delete spool" msgstr "No se puede eliminar la bobina" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 -msgid "There was an unexpected error while removing the filament spool, please consult the logs." -msgstr "Ha ocurrido un error al intentar eliminar la bobina de filamento, por favor revisa el log para más información." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:938 +msgid "" +"There was an unexpected error while removing the filament spool, please " +"consult the logs." +msgstr "" +"Ha ocurrido un error al intentar eliminar la bobina de filamento, por " +"favor revisa el log para más información." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:947 msgid "Delete spool?" msgstr "¿Borrar bobina?" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:901 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 msgid "You are about to delete the filament spool - ()." msgstr "Estás apunto de borrar la bobina de filamento - ()." -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:973 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 msgid "Insufficient filament" msgstr "Filamento insuficiente" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 -msgid "The current print job needs more material than what's left on the selected spool." -msgstr "La impresión actual necesita mas filamento del que hay en la bobina seleccionada." +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1021 +msgid "" +"The current print job needs more material than what's left on the " +"selected spool." +msgstr "" +"La impresión actual necesita mas filamento del que hay en la bobina " +"seleccionada." #: octoprint_filamentmanager/templates/settings.jinja2:4 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 @@ -210,7 +246,7 @@ msgid "Features" msgstr "Características" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:87 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:91 msgid "Database" msgstr "Base de datos" @@ -219,8 +255,12 @@ msgid "Appearance" msgstr "Apariencia" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:26 -msgid "Show dialog to confirm selected spools before starting/resuming the print job" -msgstr "Mostrar el diálogo para confirmar las bobinas antes de empezar/continuar una impresión" +msgid "" +"Show dialog to confirm selected spools before starting/resuming the print" +" job" +msgstr "" +"Mostrar el diálogo para confirmar las bobinas antes de empezar/continuar " +"una impresión" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:34 msgid "Warn if print job exceeds remaining filament" @@ -242,57 +282,71 @@ msgstr "Margen de pausa" msgid "Use external database" msgstr "Usar base de datos externa" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:80 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:78 +msgid "" +"If you want to use an external database, please take a look into my wiki how to " +"install the drivers and setup the database." +msgstr "" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 msgid "URI" msgstr "URI" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:94 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:98 msgid "Username" msgstr "Usuario" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:101 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:105 msgid "Password" msgstr "Contraseña" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:108 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:113 msgid "Test connection" msgstr "Comprobar conexión" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 -msgid "Note: If you change these settings you must restart your OctoPrint instance for the changes to take affect." -msgstr "Nota: Si cambias esta configuración deberás reiniciar la instancia de OctoPrint para que los cambios hagan efecto." +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:118 +msgid "" +"Note: If you change these settings you must restart your OctoPrint " +"instance for the changes to take affect." +msgstr "" +"Nota: Si cambias esta configuración deberás reiniciar la instancia de " +"OctoPrint para que los cambios hagan efecto." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 msgid "Import & Export" msgstr "Importar & Exportar" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:120 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 msgid "Browse..." msgstr "Examinar..." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:124 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:131 msgid "Import" msgstr "Importar" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:126 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:133 msgid "Export" msgstr "Exportar" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 -msgid "This does not look like a valid import archive. Only zip files are supported." +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:135 +msgid "" +"This does not look like a valid import archive. Only zip files are " +"supported." msgstr "No parece un fichero de importación valido. Sólo se permiten archivos ZIP." -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 msgid "Currency symbol" msgstr "Simbolo de moneda" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 msgid "Cancel" msgstr "Cancelar" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:150 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:157 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 msgid "Save" @@ -354,12 +408,16 @@ msgstr "Precio" msgid "Temperature offset" msgstr "Temperatura" -#: octoprint_filamentmanager/templates/sidebar.jinja2:4 +#: octoprint_filamentmanager/templates/sidebar.jinja2:3 +msgid "hide overused usage" +msgstr "" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:10 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 msgid "Tool" msgstr "Extrusor" -#: octoprint_filamentmanager/templates/sidebar.jinja2:5 +#: octoprint_filamentmanager/templates/sidebar.jinja2:19 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" msgstr "--- Seleccionar Bobina ---" @@ -369,10 +427,21 @@ msgid "Confirm your selected spools" msgstr "Confirma las bobinas seleccionadas" #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 -msgid "There are no information available about the active tools for the print job. Make sure the analysing process of the file has finished and that it's loaded correctly." -msgstr "No hay información disponible sobre el extrusor de la impresión actual. Asegúrate de que el proceso de análisis esté finalizado y se haya cargado correctamente." +msgid "" +"There are no information available about the active tools for the print " +"job. Make sure the analysing process of the file has finished and that " +"it's loaded correctly." +msgstr "" +"No hay información disponible sobre el extrusor de la impresión actual. " +"Asegúrate de que el proceso de análisis esté finalizado y se haya cargado" +" correctamente." #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 -msgid "Please confirm your selected spools for all active tools. This dialog is meant to protect you from accidentically selecting wrong spools for the print." -msgstr "Por favor, confirma las bobinas de los extrusores. Este dialogo está preparado para evitar que elijas bobinas incorrectas de forma accidental." +msgid "" +"Please confirm your selected spools for all active tools. This dialog is " +"meant to protect you from accidentically selecting wrong spools for the " +"print." +msgstr "" +"Por favor, confirma las bobinas de los extrusores. Este dialogo está " +"preparado para evitar que elijas bobinas incorrectas de forma accidental." diff --git a/translations/fr/LC_MESSAGES/messages.mo b/translations/fr/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..268d332a66b087913f65a1c39e6b27338ba50dec GIT binary patch literal 7919 zcmchbdyHIF9mlWo(qd6TKoRhu*li;--K{9FeZY3RC5zp*bhjXysAuM$nYrc8y~92C z?xTr>n4pnBq7lO%Y64MH7ZTKvXoUEO8HtG|C~Be@A4HABKa9p`i2qnWzjM#LmMI`w zn(ch&o_o&uy|X`@pw=4}oWc-vVC`eiz&X z{=h%~)W82V$Y1aWKIGm%gBOBlb6D=X6nrZ<30?%wd;FMRU-8eM0pG~`6X5yax53we zKLq&;e#XZez+Zu~?>TTY_&j(HcorYBe={iWF9L<%E#MS51+q1$gR<`!_-4?8=Ye;F za_)Xm_I<@aKLUz8Pk^%TX}|s~DEIsg6n*{6<9RHe$@9CwH-TF{UI(7R^G)FG;6aeT z;Bh__*ae0DAHfH}e}HoDy(nMw`w$3;-~=f4_&Oh=&+mYum!E(__c#9e_uvB0e+8@H zZj>SCWAI!s2Sv|!fkO9l;LYHd!LNe<1V0RZfz7vp&wIQXV&X%OfU^G#j3E1tg0k*-#y?2_ziFi_)AdaItgA0UWn6+-KRmJ^8rxeV37~8R}+-|cY-4S{h;voC6K@1 z1Rq=#JOSQgNr~pzZH~ydq6pNGbsCve@;ODf=}=v_I<#wp8$p46X4sx zCqa?>cc9qmBq;Zt0TFqBF(`6Ofu91e14WPD1Gj@uftV!tH~1rPGeSzdKLd*W{|?Ie z=RKYT`3ug$Xo8o6;*an1&okhiJbw_}3H|~UelOrs*?$=*d|eF+p9jGhtbvb%KL&H~ z9yX=mNpKlVFA0KG@K2xtKl=6{D8MJd6>ulXs{uX+o&{cVS*Z^NirudSMZY(JVuwXg zsOQmLqeW*tC(a=**}zOx+okr>bqVEm$ios>OobmgK?Qs<0XC zH#+B~4fgvNJu?rjl+^kg+@lTVotz%j7UeITPi)a>MD++F18VcRXUnxNix4DASjKNvBhBQjzs8DwbA7u}y3rsQ zs=;Ax?Mj-3d_mus)}3zjHKDR1u_`Tczaeiyv6aRgh_MqFzeq$l>N<{Lc*k~ zmRgZjA?iz;if`B(j$w?5$t6NX>_(QhIaZHC?1B@;F<$H94f)kdmh$QR&h|xgydzOu zG^0ehNNpCGb}^1t2x^}Zf+MD_qlAkF-_+L73@muW*aE{iT?UJK*|?9M;|GhabfqT% zeD_qaAs=9Qw2#rmKoHxG=8CqkF9s8sZkG3wz6`m$BF zWA55ou;}bwvbbd0_^OKxl{OmUZ%a6aaF(D^$#P5L1TOyb0d18S6Jh~jv)yy$9FJ2g zEuBwT6`Mw`(!`M;6|X8ca!jH(NpU!22GykE4MnUw@8UqbtoaT9gjMaaXBR6 zWQ&f}Iuqi(Qa6ttnGcSVYRxLehR9IVdhLodtD(GNmFjW}1t`rtjFg%3%}AlSRcDEc z8bi6jtkzvNAR5Z-*e?RXttM)=^58ZSvoPqxI#s?&5o>M?8@0>klBM^kt=o2O_us3^ zR}GpZsc9~3r3OgT)Jd(4q$?n$`ip%JWz|ZQw-lu+tw*G(UdL5^c^o;D4fv_35tgJX z93v-G=EKS@CbML)Y1OZ!mHocYC|iI`O;)F>lbenhu~22fHlwhzw`khRQaY{X7G~xT z+%U6m-;ue+#Z89~EmdYS`W0@h&}vcBcTDb>s!UB*rmj&_Q`7IAe9z>L$w@X=j+o_0 zC=c(OyrwdBwc0T?J@x)_-vMp&$`bvljdh-8(`s?qBNt>FuyQ2(3j|hiknlwDobk}Nac9z_D+l^?Ud#tqbBVx@>_$tL4=CqgL4g#qK&SsdSj$g~JK$Y2nY_i%;>s$LPrGG6`f6#Hqn!Zy4Efs!IkO z%0;KxMf;Hx)!hdv#f&wlq_=Tj|GGstP8e|}Xtc3_j!e+~biHNjZgHXIgWJK-8|C$8WNTR$sNUrDi(0P zMl`Y{-m)w!6Ec>#qtbiHj1ZHhP*IysE|VQYd9TQ$IKn0Tq#|C!ELqRH>se&;2(q@< zfFl3kpbhqxjykmFmqzya$%T8%Ne1%U{Sd=iFHK43FY}D0rw$I)j+vY>M*A`5MtE^t zvsO;0R)!VfkO{Z{jnWZ!TDsOtd-1l_h_4q^;ip#Gr$4kdFp z0#GQYCPb3%oj>jg@1u{hAO=&wxrFUZX@lVEMpV9#$D$NFs1b7XF6QQ?rq zgQL_5<^&_Z^-PGy;VUen+~A8tMwS6hc!azp&_oxjbZ*3ygdIPF^eB$FlPojV%FhaL z#m@~L;>%5NfsAgY%*e*Xg7ZlTj$={L07%uMgW@`IRQv=Rxy;e-g|?C);KzVFiipVJ za+$OSG za6D0teJF(aAG?bJMe8VovAMghOpXW>#G0&1Q_*D6&w56FC8`daEJ`%NlZ41VYCV!U z3PbA>9a2(!fQx(k-wb)#YiM7Ft%v;NrHB?707H^OOZvV^Ic@YLhnaqGiH=+ppKdY7 zk#+ih733XBdDzrXY%dwH|AiHuC~b0oziE0kd}j>RSFY1pgZC5U;{2v9V;99w#F5DN z(`lIv8Fb3V%?+@OtkgS7l%zW!rB;1t{xCo0;#~A>)+Hs0PEyGssb@^E{CE8kAuR-C zdUe^@_kn)4HGWswQ$W6Ksu%`}a;_c1aot8k(l2F4GWM9RV}`CSk4WaOl8?=&ln2)Y zjFfuGnNr^lr%`BwTclRg03m;w1j%~xt0^(;vdM;~UDkWKWH5w|48{G9LB`_D=eRQC rictnr#V`eFqsw$fyRhsU?Lqk~N9FE1zZbqdc6&Yccy24B6Z3xnzAMWC literal 0 HcmV?d00001 diff --git a/translations/fr/LC_MESSAGES/messages.po b/translations/fr/LC_MESSAGES/messages.po new file mode 100644 index 0000000..984539e --- /dev/null +++ b/translations/fr/LC_MESSAGES/messages.po @@ -0,0 +1,512 @@ +# French translations for OctoPrint-FilamentManager. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the +# OctoPrint-FilamentManager project. +# FIRST AUTHOR , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2021-10-17 11:30+0200\n" +"PO-Revision-Date: 2021-07-14 21:16+0200\n" +"Last-Translator: Sven Lohrmann \n" +"Language: fr\n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.9.0\n" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:357 +msgid "Start Print" +msgstr "Démarrer l'impression" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:372 +msgid "Resume Print" +msgstr "Reprendre l'impression" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:447 +msgid "Data import failed" +msgstr "Échec de l'importation des données" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:448 +msgid "Something went wrong, please consult the logs." +msgstr "Une erreur s'est produite, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 +msgid "Could not add profile" +msgstr "Impossible d'ajouter le profile" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:581 +msgid "" +"There was an unexpected error while saving the filament profile, please " +"consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de l'enregistrement du profile " +"de filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:602 +msgid "Could not update profile" +msgstr "Impossible de mettre à jour le profile" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:603 +msgid "" +"There was an unexpected error while updating the filament profile, please" +" consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de la mise à jour du profile de" +" filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:617 +msgid "Could not delete profile" +msgstr "Impossible de supprimer le profile" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:618 +msgid "" +"There was an unexpected error while removing the filament profile, please" +" consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de la suppression du profile de" +" filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:627 +msgid "Delete profile?" +msgstr "Supprimer le profile ?" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:628 +msgid "" +"You are about to delete the filament profile (). Please" +" note that it is not possible to delete profiles with associated spools." +msgstr "" +"Vous êtes sur le point de supprimer le profile de filament " +"(). Veuillez noter qu'il n'est pas possible de supprimer des " +"profils avec des bobines associés." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:629 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:949 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 +msgid "Delete" +msgstr "Effacer" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:709 +msgid "Could not select spool" +msgstr "Impossible de sélectionner la bobine" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:710 +msgid "" +"There was an unexpected error while selecting the spool, please consult " +"the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de la sélection du spool, " +"veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:898 +msgid "Could not add spool" +msgstr "Impossible d'ajouter la bobine" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:899 +msgid "" +"There was an unexpected error while saving the filament spool, please " +"consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de l'enregistrement de la " +"bobine de filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:921 +msgid "Could not update spool" +msgstr "Impossible de mettre à jour la bobine" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:922 +msgid "" +"There was an unexpected error while updating the filament spool, please " +"consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors de la mise à jour de la bobine " +"de filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:937 +msgid "Could not delete spool" +msgstr "Impossible de supprimer la bobine" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:938 +msgid "" +"There was an unexpected error while removing the filament spool, please " +"consult the logs." +msgstr "" +"Une erreur inattendue s'est produite lors du retrait de la bobine de " +"filament, veuillez consulter les journaux." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:947 +msgid "Delete spool?" +msgstr "Supprimer la bobine ?" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 +msgid "You are about to delete the filament spool - ()." +msgstr "" +"Vous êtes sur le point de supprimer la bobine de filament - " +"()." + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 +msgid "Insufficient filament" +msgstr "Filament insuffisant" + +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1021 +msgid "" +"The current print job needs more material than what's left on the " +"selected spool." +msgstr "" +"Le travail d'impression en cours nécessite plus de matériel que ce qui " +"reste sur la bobine sélectionnée." + +#: octoprint_filamentmanager/templates/settings.jinja2:4 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 +msgid "Plugin Configuration" +msgstr "Configuration du plug-in" + +#: octoprint_filamentmanager/templates/settings.jinja2:7 +msgid "Filament Spools" +msgstr "Bobines de filament" + +#: octoprint_filamentmanager/templates/settings.jinja2:13 +msgid "Items per page" +msgstr "Objets par page" + +#: octoprint_filamentmanager/templates/settings.jinja2:22 +msgid "Sort by" +msgstr "Trier par" + +#: octoprint_filamentmanager/templates/settings.jinja2:23 +msgid "Name (ascending)" +msgstr "Nom (alphabétique)" + +#: octoprint_filamentmanager/templates/settings.jinja2:24 +msgid "Material (ascending)" +msgstr "Matériel (alphabétique)" + +#: octoprint_filamentmanager/templates/settings.jinja2:25 +msgid "Vendor (ascending)" +msgstr "Vendeur (alphabétique)" + +#: octoprint_filamentmanager/templates/settings.jinja2:26 +msgid "Remaining (descending)" +msgstr "Restant (décroissant)" + +#: octoprint_filamentmanager/templates/settings.jinja2:36 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:15 +msgid "Name" +msgstr "Nom" + +#: octoprint_filamentmanager/templates/settings.jinja2:37 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:38 +msgid "Material" +msgstr "Matériel" + +#: octoprint_filamentmanager/templates/settings.jinja2:38 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:26 +msgid "Vendor" +msgstr "Vendeur" + +#: octoprint_filamentmanager/templates/settings.jinja2:39 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:50 +msgid "Weight" +msgstr "Poids" + +#: octoprint_filamentmanager/templates/settings.jinja2:40 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:62 +msgid "Remaining" +msgstr "Restant" + +#: octoprint_filamentmanager/templates/settings.jinja2:41 +msgid "Used" +msgstr "Utilisé" + +#: octoprint_filamentmanager/templates/settings.jinja2:42 +msgid "Action" +msgstr "Action" + +#: octoprint_filamentmanager/templates/settings.jinja2:54 +msgid "Edit Spool" +msgstr "Modifier la bobine" + +#: octoprint_filamentmanager/templates/settings.jinja2:55 +msgid "Duplicate Spool" +msgstr "Dupliquer la bobine" + +#: octoprint_filamentmanager/templates/settings.jinja2:56 +msgid "Delete Spool" +msgstr "Supprimer la bobine" + +#: octoprint_filamentmanager/templates/settings.jinja2:79 +msgid "Manage Profiles" +msgstr "Gérer les profiles" + +#: octoprint_filamentmanager/templates/settings.jinja2:80 +msgid "Add Spool" +msgstr "Ajouter une bobine" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:12 +msgid "Features" +msgstr "Caractéristiques" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:91 +msgid "Database" +msgstr "Base de données" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:14 +msgid "Appearance" +msgstr "Apparence" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:26 +msgid "" +"Show dialog to confirm selected spools before starting/resuming the print" +" job" +msgstr "" +"Afficher la boîte de dialogue pour confirmer les bobines sélectionnées " +"avant de démarrer/reprendre le travail d'impression" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:34 +msgid "Warn if print job exceeds remaining filament" +msgstr "Avertir si le travail d'impression dépasse le filament restant" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:42 +msgid "Enable software odometer to measure used filament" +msgstr "Activer l'odomètre logiciel pour mesurer le filament utilisé" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50 +msgid "Pause print if filament runs out" +msgstr "Suspendre l'impression si le filament s'épuise" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56 +msgid "Pause threshold" +msgstr "Seuil de pause" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:74 +msgid "Use external database" +msgstr "Utiliser une base de données externe" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:78 +msgid "" +"If you want to use an external database, please take a look into my wiki how to " +"install the drivers and setup the database." +msgstr "" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 +msgid "URI" +msgstr "URl" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:98 +msgid "Username" +msgstr "Nom d'utilisateur" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:105 +msgid "Password" +msgstr "Mot de passe" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:113 +msgid "Test connection" +msgstr "Tester la connexion" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:118 +msgid "" +"Note: If you change these settings you must restart your OctoPrint " +"instance for the changes to take affect." +msgstr "" +"Remarque : si vous modifiez ces paramètres, vous devez redémarrer votre " +"instance OctoPrint pour que les modifications prennent effet." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 +msgid "Import & Export" +msgstr "Importer / Exporter" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 +msgid "Browse..." +msgstr "Parcourir..." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:131 +msgid "Import" +msgstr "Importer" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:133 +msgid "Export" +msgstr "Exporter" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:135 +msgid "" +"This does not look like a valid import archive. Only zip files are " +"supported." +msgstr "" +"Cela ne ressemble pas à une archive d'importation valide. Seuls les " +"fichiers ZIP sont pris en charge." + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 +msgid "Currency symbol" +msgstr "Symbole de la monnaie" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 +msgid "Cancel" +msgstr "Annuler" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:157 +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 +msgid "Save" +msgstr "Sauvegarder" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:5 +msgid "Filament Profiles" +msgstr "Profiles de filaments" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:13 +msgid "--- New Profile ---" +msgstr "--- Nouveau profile ---" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:14 +msgid "New" +msgstr "Nouveau" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 +msgid "Save profile" +msgstr "Enregistrer le profile" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:30 +msgid "Vendor must be set" +msgstr "Le fournisseur doit être défini" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:42 +msgid "Material must be set" +msgstr "Le matériel doit être réglé" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:50 +msgid "Density" +msgstr "Densité" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:62 +msgid "Diameter" +msgstr "Diamètre" + +#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:75 +msgid "Close" +msgstr "Fermer" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:5 +msgid "Filament Spool" +msgstr "Bobine de filament" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:19 +msgid "Name must be set" +msgstr "Le nom doit être défini" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:27 +msgid "Profile" +msgstr "Profile" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:38 +msgid "Price" +msgstr "Prix" + +#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:74 +msgid "Temperature offset" +msgstr "Décalage de température" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:3 +msgid "hide overused usage" +msgstr "" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:10 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 +msgid "Tool" +msgstr "Outil" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:19 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 +msgid "--- Select Spool ---" +msgstr "--- Sélectionnez la bobine ---" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5 +msgid "Confirm your selected spools" +msgstr "Confirmez vos bobines sélectionnées" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 +msgid "" +"There are no information available about the active tools for the print " +"job. Make sure the analysing process of the file has finished and that " +"it's loaded correctly." +msgstr "" +"Aucune information n'est disponible sur les outils actifs pour le travail" +" d'impression. Assurez-vous que le processus d'analyse du fichier est " +"terminé et qu'il est chargé correctement." + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 +msgid "" +"Please confirm your selected spools for all active tools. This dialog is " +"meant to protect you from accidentically selecting wrong spools for the " +"print." +msgstr "" +"Veuillez confirmer vos bobines sélectionnées pour tous les outils actifs." +" Cette boîte de dialogue est destinée à vous protéger contre la sélection" +" accidentelle de mauvais spools pour l'impression." + +#~ msgid "Profile (ascending)" +#~ msgstr "Profile (croissant)" + +#~ msgid "Selected Spools" +#~ msgstr "Bobines sélectionnées" + +#~ msgid "Filament warning" +#~ msgstr "Avertissement de filament" + +#~ msgid "Saving failed" +#~ msgstr "Échec de l'enregistrement" + +#~ msgid "Failed to query spools" +#~ msgstr "Échec de la requête des bobines" + +#~ msgid "" +#~ "There was an unexpected database error" +#~ " while saving the filament profile, " +#~ "please consult the logs." +#~ msgstr "" +#~ "Une erreur de base de données " +#~ "inattendue s'est produite lors de " +#~ "l'enregistrement du profile de filament, " +#~ "veuillez consulter les journaux." + +#~ msgid "" +#~ "There was an unexpected database error" +#~ " while updating the filament profile, " +#~ "please consult the logs." +#~ msgstr "" +#~ "Une erreur de base de données " +#~ "inattendue s'est produite lors de la " +#~ "mise à jour du profile de " +#~ "filament, veuillez consulter les journaux." + +#~ msgid "" +#~ "There was an unexpected error while removing the filament spool,\n" +#~ " please consult the logs." +#~ msgstr "" +#~ "Une erreur inattendue s'est produite " +#~ "lors du retrait de la bobine de" +#~ " filament,\n" +#~ " veuillez " +#~ "consulter les journaux." + +#~ msgid "Spool selection failed" +#~ msgstr "Échec de la sélection de la bobine" + +#~ msgid "Cannot delete profiles with associated spools." +#~ msgstr "Impossible de supprimer les profiles avec les bobines associés." + +#~ msgid "Data import successfull" +#~ msgstr "Importation des données réussie" + +#~ msgid "Enable filament odometer" +#~ msgstr "Activer l'odomètre à filament" + diff --git a/translations/messages.pot b/translations/messages.pot index 54ebd23..024e87c 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -1,138 +1,138 @@ # Translations template for OctoPrint-FilamentManager. -# Copyright (C) 2020 The OctoPrint Project +# Copyright (C) 2021 The OctoPrint Project # This file is distributed under the same license as the # OctoPrint-FilamentManager project. -# FIRST AUTHOR , 2020. +# FIRST AUTHOR , 2021. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OctoPrint-FilamentManager 1.6.0\n" +"Project-Id-Version: OctoPrint-FilamentManager 1.9.0\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2020-09-12 21:04+0200\n" +"POT-Creation-Date: 2021-10-17 11:30+0200\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.8.0\n" +"Generated-By: Babel 2.9.0\n" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:357 msgid "Start Print" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:349 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:372 msgid "Resume Print" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:424 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:447 msgid "Data import failed" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:425 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:448 msgid "Something went wrong, please consult the logs." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:557 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 msgid "Could not add profile" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:558 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:581 msgid "" "There was an unexpected error while saving the filament profile, please " "consult the logs." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:579 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:602 msgid "Could not update profile" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:580 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:603 msgid "" "There was an unexpected error while updating the filament profile, please" " consult the logs." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:594 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:617 msgid "Could not delete profile" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:595 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:618 msgid "" "There was an unexpected error while removing the filament profile, please" " consult the logs." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:604 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:627 msgid "Delete profile?" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:605 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:628 msgid "" "You are about to delete the filament profile (). Please" " note that it is not possible to delete profiles with associated spools." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:606 -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:902 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:629 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:949 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:15 msgid "Delete" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:686 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:709 msgid "Could not select spool" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:687 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:710 msgid "" "There was an unexpected error while selecting the spool, please consult " "the logs." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:851 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:898 msgid "Could not add spool" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:852 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:899 msgid "" "There was an unexpected error while saving the filament spool, please " "consult the logs." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:874 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:921 msgid "Could not update spool" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:875 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:922 msgid "" "There was an unexpected error while updating the filament spool, please " "consult the logs." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:890 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:937 msgid "Could not delete spool" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:891 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:938 msgid "" "There was an unexpected error while removing the filament spool, please " "consult the logs." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:900 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:947 msgid "Delete spool?" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:901 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 msgid "You are about to delete the filament spool - ()." msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:973 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 msgid "Insufficient filament" msgstr "" -#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:974 +#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1021 msgid "" "The current print job needs more material than what's left on the " "selected spool." @@ -229,7 +229,7 @@ msgid "Features" msgstr "" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:13 -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:87 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:91 msgid "Database" msgstr "" @@ -263,61 +263,69 @@ msgstr "" msgid "Use external database" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:80 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:78 +msgid "" +"If you want to use an external database, please take a look into my wiki how to " +"install the drivers and setup the database." +msgstr "" + +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 msgid "URI" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:94 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:98 msgid "Username" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:101 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:105 msgid "Password" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:108 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:113 msgid "Test connection" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:111 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:118 msgid "" "Note: If you change these settings you must restart your OctoPrint " "instance for the changes to take affect." msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:115 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 msgid "Import & Export" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:120 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 msgid "Browse..." msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:124 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:131 msgid "Import" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:126 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:133 msgid "Export" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:128 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:135 msgid "" "This does not look like a valid import archive. Only zip files are " "supported." msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:137 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 msgid "Currency symbol" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 msgid "Cancel" msgstr "" -#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:150 +#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:157 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:16 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:88 msgid "Save" @@ -379,12 +387,16 @@ msgstr "" msgid "Temperature offset" msgstr "" -#: octoprint_filamentmanager/templates/sidebar.jinja2:4 +#: octoprint_filamentmanager/templates/sidebar.jinja2:3 +msgid "hide overused usage" +msgstr "" + +#: octoprint_filamentmanager/templates/sidebar.jinja2:10 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 msgid "Tool" msgstr "" -#: octoprint_filamentmanager/templates/sidebar.jinja2:5 +#: octoprint_filamentmanager/templates/sidebar.jinja2:19 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" msgstr "" From cae60d54d0627323cd77e8ef32983a8038f3b312 Mon Sep 17 00:00:00 2001 From: Carlos R Date: Mon, 15 Nov 2021 20:23:16 +0100 Subject: [PATCH 25/26] Bugfix/spanish translation fix (#82) * Capitalized a phrase. * Fixed grammatical errors. * Removed unnecesari capitalization. * "Fabricante" is a better translation of "vendor" rather than "vendedor", as "vendedor" main meaning is "seller" and not the brand that manufactured the spool. A vendor/manufacturer is Sunlu, and the seller is Amazon, for instance. * Other minor fixes to improve clarity. * Added missing translations. * Fixed an incredibly misleading translation that made extruders be set to the wrong temperature. * Updated the translator info. --- translations/es/LC_MESSAGES/messages.po | 52 ++++++++++++++----------- translations/messages.pot | 2 +- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/translations/es/LC_MESSAGES/messages.po b/translations/es/LC_MESSAGES/messages.po index fa97dff..90e9c84 100644 --- a/translations/es/LC_MESSAGES/messages.po +++ b/translations/es/LC_MESSAGES/messages.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the # OctoPrint-FilamentManager project. # Ivan Garcia , 2019. +# Carlos Romero , 2021. # msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" "POT-Creation-Date: 2021-10-17 11:30+0200\n" -"PO-Revision-Date: 2019-05-06 11:31+0100\n" -"Last-Translator: Ivan Garcia \n" +"PO-Revision-Date: 2021-10-18 12:35+0100\n" +"Last-Translator: Carlos Romero \n" "Language: es\n" "Language-Team: es \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -141,7 +142,7 @@ msgstr "¿Borrar bobina?" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 msgid "You are about to delete the filament spool - ()." -msgstr "Estás apunto de borrar la bobina de filamento - ()." +msgstr "Estás a punto de borrar la bobina de filamento - ()." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 msgid "Insufficient filament" @@ -152,13 +153,13 @@ msgid "" "The current print job needs more material than what's left on the " "selected spool." msgstr "" -"La impresión actual necesita mas filamento del que hay en la bobina " +"La impresión actual necesita más filamento del que hay en la bobina " "seleccionada." #: octoprint_filamentmanager/templates/settings.jinja2:4 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 msgid "Plugin Configuration" -msgstr "Configuración del Plugin" +msgstr "Configuración del plugin" #: octoprint_filamentmanager/templates/settings.jinja2:7 msgid "Filament Spools" @@ -166,7 +167,7 @@ msgstr "Bobinas de filamento" #: octoprint_filamentmanager/templates/settings.jinja2:13 msgid "Items per page" -msgstr "Objetos por página" +msgstr "Elementos por página" #: octoprint_filamentmanager/templates/settings.jinja2:22 msgid "Sort by" @@ -182,7 +183,7 @@ msgstr "Material (Ascendente)" #: octoprint_filamentmanager/templates/settings.jinja2:25 msgid "Vendor (ascending)" -msgstr "Vendedor (Ascendente)" +msgstr "Fabricante (Ascendente)" #: octoprint_filamentmanager/templates/settings.jinja2:26 msgid "Remaining (descending)" @@ -201,7 +202,7 @@ msgstr "Material" #: octoprint_filamentmanager/templates/settings.jinja2:38 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:26 msgid "Vendor" -msgstr "Vendedor" +msgstr "Fabricante" #: octoprint_filamentmanager/templates/settings.jinja2:39 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:50 @@ -272,7 +273,7 @@ msgstr "Habilitar medición mediante software \"odometer\"" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50 msgid "Pause print if filament runs out" -msgstr "Pausar la impresión si el filamento se gasta" +msgstr "Pausar la impresión si el filamento se agota" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56 msgid "Pause threshold" @@ -289,6 +290,11 @@ msgid "" "PostgreSQL-on-Raspbian-(Stretch)\" target=\"newTab\">wiki how to " "install the drivers and setup the database." msgstr "" +"Si quieres usar una base de datos externa, por favor, mira mi wiki sobre como " +"instalar los drivers y configurar la base de datos." + #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 msgid "URI" @@ -312,11 +318,11 @@ msgid "" "instance for the changes to take affect." msgstr "" "Nota: Si cambias esta configuración deberás reiniciar la instancia de " -"OctoPrint para que los cambios hagan efecto." +"OctoPrint para que los cambios tengan efecto." #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 msgid "Import & Export" -msgstr "Importar & Exportar" +msgstr "Importar y exportar" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 msgid "Browse..." @@ -334,11 +340,11 @@ msgstr "Exportar" msgid "" "This does not look like a valid import archive. Only zip files are " "supported." -msgstr "No parece un fichero de importación valido. Sólo se permiten archivos ZIP." +msgstr "No parece un fichero de importación válido. Sólo se permiten archivos zip." #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 msgid "Currency symbol" -msgstr "Simbolo de moneda" +msgstr "Símbolo de moneda" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 @@ -354,11 +360,11 @@ msgstr "Guardar" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:5 msgid "Filament Profiles" -msgstr "Perfiles de Filamento" +msgstr "Perfiles de filamento" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:13 msgid "--- New Profile ---" -msgstr "--- Nuevo Perfil ---" +msgstr "--- Nuevo perfil ---" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:14 msgid "New" @@ -370,7 +376,7 @@ msgstr "Guardar perfil" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:30 msgid "Vendor must be set" -msgstr "Debes escribir el vendedor" +msgstr "Debes escribir el fabricante" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:42 msgid "Material must be set" @@ -406,11 +412,11 @@ msgstr "Precio" #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:74 msgid "Temperature offset" -msgstr "Temperatura" +msgstr "Compensación de temperatura" #: octoprint_filamentmanager/templates/sidebar.jinja2:3 -msgid "hide overused usage" -msgstr "" +msgid "Hide overused usage" +msgstr "Ocultar bobinas agotadas" #: octoprint_filamentmanager/templates/sidebar.jinja2:10 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 @@ -420,7 +426,7 @@ msgstr "Extrusor" #: octoprint_filamentmanager/templates/sidebar.jinja2:19 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" -msgstr "--- Seleccionar Bobina ---" +msgstr "--- Seleccionar bobina ---" #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5 msgid "Confirm your selected spools" @@ -433,7 +439,7 @@ msgid "" "it's loaded correctly." msgstr "" "No hay información disponible sobre el extrusor de la impresión actual. " -"Asegúrate de que el proceso de análisis esté finalizado y se haya cargado" +"Asegúrate de que el proceso de análisis esté finalizado y haya cargado" " correctamente." #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 @@ -442,6 +448,6 @@ msgid "" "meant to protect you from accidentically selecting wrong spools for the " "print." msgstr "" -"Por favor, confirma las bobinas de los extrusores. Este dialogo está " -"preparado para evitar que elijas bobinas incorrectas de forma accidental." +"Por favor, confirma las bobinas seleccionadas para todos los extrusores activos. Este diálogo está " +"pensado para evitar que elijas bobinas incorrectas para esta impresión." diff --git a/translations/messages.pot b/translations/messages.pot index 024e87c..269d86e 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -388,7 +388,7 @@ msgid "Temperature offset" msgstr "" #: octoprint_filamentmanager/templates/sidebar.jinja2:3 -msgid "hide overused usage" +msgid "Hide overused usage" msgstr "" #: octoprint_filamentmanager/templates/sidebar.jinja2:10 From 39ca512f5b91b10ea033c5ad9a398d91fa896bea Mon Sep 17 00:00:00 2001 From: OllisGit Date: Mon, 15 Nov 2021 22:35:32 +0100 Subject: [PATCH 26/26] New Verison 1.9.1 - PR #82 spanish translation (credit goes to @Deses) - Changed to github-action to build the release --- .github/workflows/github-release-actions.yml | 78 ++++++++++++++++++ .travis.yml => .travis.yml.notusedanymore | 0 RELEASE_TEMPLATE.md | 15 ++++ .../translations/es/LC_MESSAGES/messages.mo | Bin 7467 -> 8102 bytes .../translations/es/LC_MESSAGES/messages.po | 50 ++++++----- setup.py | 2 +- translations/es/LC_MESSAGES/messages.mo | Bin 7467 -> 8102 bytes translations/es/LC_MESSAGES/messages.po | 2 +- translations/messages.pot | 2 +- 9 files changed, 124 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/github-release-actions.yml rename .travis.yml => .travis.yml.notusedanymore (100%) create mode 100644 RELEASE_TEMPLATE.md diff --git a/.github/workflows/github-release-actions.yml b/.github/workflows/github-release-actions.yml new file mode 100644 index 0000000..ef600fd --- /dev/null +++ b/.github/workflows/github-release-actions.yml @@ -0,0 +1,78 @@ +### +### Simple script to build a zip file of the whole repository +### +# +#script: +## debug - echo 'Hello World' +# - export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2) +# - zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py' +## debug - ls -al +# +### see "Fix travis automatic build and deploy" +### https://github.com/oliexdev/openScale/pull/121 +### https://github.com/oliexdev/openScale/pull/121/files +#before_deploy: +# - git tag -f travis-build +# - git remote add gh https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git +# - git push -f gh travis-build +# - git remote remove gh +# +#deploy: +# name: "V${PLUGIN_VERSION}-draft" +# #prerelease: true +# draft: true +# provider: releases +# api_key: "${GITHUB_TOKEN}" +# file: "master.zip" +# overwrite: true +# skip_cleanup: true +# target_commitish: $TRAVIS_COMMIT + + + +name: Build Plugin Release - Action +on: [push] +jobs: + Build-Release-ZIP-Action: + runs-on: ubuntu-latest + steps: + - name: Check out repository code + uses: actions/checkout@v2 + + - run: echo "Read current plugin version..." + - run: export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2) + - run: echo "Plugin Version $PLUGIN_VERSION ${PLUGIN_VERSION}" + + - run: echo "Build ZIP" + - run: zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py' + - name: List files in the repository + run: | + ls ${{ github.workspace }} + + - name: version + run: echo "::set-output name=version::$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2)" + id: version + + - name: release + uses: actions/create-release@v1 + id: create_release + env: + GITHUB_TOKEN: ${{ github.token }} + with: + draft: true + prerelease: false + release_name: V${{ steps.version.outputs.version }}-draft + tag_name: ${{ steps.version.outputs.version }}-draft + body_path: RELEASE_TEMPLATE.md + + - name: upload master.zip to release + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: master.zip + asset_name: master.zip + asset_content_type: application/gzip + + - run: echo "🍏 This job's status is ${{ job.status }}." \ No newline at end of file diff --git a/.travis.yml b/.travis.yml.notusedanymore similarity index 100% rename from .travis.yml rename to .travis.yml.notusedanymore diff --git a/RELEASE_TEMPLATE.md b/RELEASE_TEMPLATE.md new file mode 100644 index 0000000..f88c24a --- /dev/null +++ b/RELEASE_TEMPLATE.md @@ -0,0 +1,15 @@ +## [BugFix] +- #xxx + +## [Enhancement] +- #xxx + +## Counter +![downloaded](https://img.shields.io/github/downloads/OllisGit/OctoPrint-FilamentManager/xxx/total) + +## Support my Efforts + +This plugin, as well as my [other plugins](https://github.com/OllisGit/) were developed in my spare time. +If you like it, I would be thankful about a cup of coffee :) + +[![More coffee, more code](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6SW5R6ZUKLB5E&source=url) diff --git a/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.mo b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.mo index 309d9ae2d7c486c014cc39352c0d10dc67f5d0fd..bcdd87b249b70ef97c141d62aa62c6b7f4257b80 100644 GIT binary patch delta 2385 zcmciB*>6-;9Ki82E&F2k7AVM}i3`YdIz<+nLQ6_17?7p75TEW$@622~Gk3W64yA-R z7xA-5}Oy_g<^EX9;{~Gk)K|ZRO z!Lsf|tilIT)@#OTN)^<43e_}NfjdV!)PbOW0!!$>faQ1U0 zKSE+t!^lwe8A@g^qh#n7%ErG3^}n&OmWIibm8!?hC=2XHKI$dDB;|)tHhvE`;8{G1 zWvu!vet`0RD#*K-!Kd*8%J|u&MaFGG>A#4w??WZzUn0u0x}1DFN-Cd6X@3PJ0|!x3 zei$X7fxt63pZXU;{~g>%y_j^i;eM3I_7%Px;%ZPb_8N=Kz`=6zFDL$l27*$TkgTZd z$RX7YlmKp{1n>{m;W$>Eg>wTt@P6uM;EO1){s?M37x+E0geoG6TC6HiAWJHWvQbM= zUxhO8DI{oR1^wGm?sgY)ShW{r{u|hU$57V!7G>U#C>gzt?5(Cyp{O*5$Vg!!1(~pz zmm&jNQ69}EzGPxI%7hnC#=RP}zloB<_fax)31$9Ou!cO`9U!-uDjyW91!SlEU7jr@40Oqik*>aLSxB`oK04{dmTKo_t(1|<*dCcV~ z8LCFfL=+|9#VBvA1#1>kc$|Vn7Q;uefb#lJVjrHuRk&jINNV@a9_kxgTa-%ZUOTUQ zjI5_UTjyO<8(D2`^Gqjeq;;3!88O2(=j&YBMC}>fjL>P@?$%b88JS+)Z0M9@CYIKv zJTK=qMIuSdOXXwraXS-Pmrh%5hvh~5FH5EuB0W~O73nm+d@j7+cD#I$>b%1K8P+e=?IVI}j9bQoG*g(i{9c_OwOB$yi;$utGs z%QNC+(zen{8yQoc3wM@JSaFMrsoK*ftw-7`L&ct%^*gFsi;bl1_f;)e?V4#b9=GhQ z(Pg+gXOI=o?jjzEiRa1X*^)^k?pa&eU$?s+@mRzCX*+3a)Afe?b+@&L{5+)nn=@OduZ!o?lBJj( Nv$7nKgL`sT^)EYh)an2L delta 1795 zcmYMzZEO@p7{KwlyA}$ywXO8pLR&^nh%elEN0mq;Sj5_t6lf_`kbo|C+q(6*z3%QI zChD0ONhEDVS7X$ectNe&1Y^!vEkQ$SqVWU1#t@`PY!l*#svk6{iHZNGUE*bLfAj1- zJ2U(2>|1wEv==VamA$C=-N(O~|My{u{{M}ZD|HRw7_Pt~F2N6R8J@!B_<0b28}y$? z4mHb3#{C8BaS1oec+J?TR6!+ZM7hu%_~2rPdL)RC;nnnyV;xRn1%8Pf>N`$X;W?DN zOIU@MaVeH_lKd)^{wT_V*I<(QRgwm|Dut3bjJ4=uH9n1U;|nNxZv^oK$`hSL$@?a_ zei3Dy-%%>|cVIOa%ZRVX8oWVdezk!{1h?YDxE(pv6eo?-C<~awm+%jifk&yol(>k@ zp~g{O$$Olnq93DF=4+IRXM*@=+(!Hx7UDEEQV$s*gO%u^l=?}OiGA$DV^eKdiRAK^Vn-T+G8`zRAvQZ8B0o@(kZPrjcEQpy8C$6@3l)#E57KZ3HL zvB1}HEpaL6zlhHfU&1Z;D61}o*qkVp8sUAe#3LvVT0~OSJGIoGhfyDKL7sdXW#X?; zCO(VT;ZN9tVOAk(Y{gB1`%rfIW2o`vz$xTb^&_srd87zx8J~d6(@>xx7c|nR;wYPA zbC9qTc};3B%BwI@^7EL$r%(p^0Oh_@D3v^e9BPh}RNya^yea~@9!1$Bg`0v4n~_5e zaFWDfl!087(mjIgkGrvm>+v6y36l+r3)_ei_XY7j+(|rwvUxv42Zvex zhD}^G;nL}f#tMJF=9R6<4Y9;+vBY|vOt!ZrZ%!l= ziRC?p>&13CM%K+3p6#^j?n6dacNtE~GV~o5L40T-=y1J!+OlIg+sbmeOKv|y3SC@^2=BJ8@k7j)UT`WKA5u|&v4Y0hF+sP{hsLR zvKu5=+C1zzdDnJKH?BKf&(vwl$k;=+HeGMJ zsB?~)GaSFI@s=C8VbFFC8ronTX*25?nYh|wX9umJykn%S=~7mw&5Z6XjW*VVLc9DE zO`Af7|7+7!*fmSzE88PPvn|&~?(gpPm$u$sd#{;In`zroR~r6Iw55^}4h0?l6Rl_b IZL2%}13?Z0YXATM diff --git a/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po index fa97dff..8fbf530 100644 --- a/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po +++ b/octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the # OctoPrint-FilamentManager project. # Ivan Garcia , 2019. +# Carlos Romero , 2021. # msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" "POT-Creation-Date: 2021-10-17 11:30+0200\n" -"PO-Revision-Date: 2019-05-06 11:31+0100\n" -"Last-Translator: Ivan Garcia \n" +"PO-Revision-Date: 2021-10-18 12:35+0100\n" +"Last-Translator: Carlos Romero \n" "Language: es\n" "Language-Team: es \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -141,7 +142,7 @@ msgstr "¿Borrar bobina?" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948 msgid "You are about to delete the filament spool - ()." -msgstr "Estás apunto de borrar la bobina de filamento - ()." +msgstr "Estás a punto de borrar la bobina de filamento - ()." #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020 msgid "Insufficient filament" @@ -152,13 +153,13 @@ msgid "" "The current print job needs more material than what's left on the " "selected spool." msgstr "" -"La impresión actual necesita mas filamento del que hay en la bobina " +"La impresión actual necesita más filamento del que hay en la bobina " "seleccionada." #: octoprint_filamentmanager/templates/settings.jinja2:4 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5 msgid "Plugin Configuration" -msgstr "Configuración del Plugin" +msgstr "Configuración del plugin" #: octoprint_filamentmanager/templates/settings.jinja2:7 msgid "Filament Spools" @@ -166,7 +167,7 @@ msgstr "Bobinas de filamento" #: octoprint_filamentmanager/templates/settings.jinja2:13 msgid "Items per page" -msgstr "Objetos por página" +msgstr "Elementos por página" #: octoprint_filamentmanager/templates/settings.jinja2:22 msgid "Sort by" @@ -182,7 +183,7 @@ msgstr "Material (Ascendente)" #: octoprint_filamentmanager/templates/settings.jinja2:25 msgid "Vendor (ascending)" -msgstr "Vendedor (Ascendente)" +msgstr "Fabricante (Ascendente)" #: octoprint_filamentmanager/templates/settings.jinja2:26 msgid "Remaining (descending)" @@ -201,7 +202,7 @@ msgstr "Material" #: octoprint_filamentmanager/templates/settings.jinja2:38 #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:26 msgid "Vendor" -msgstr "Vendedor" +msgstr "Fabricante" #: octoprint_filamentmanager/templates/settings.jinja2:39 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:50 @@ -272,7 +273,7 @@ msgstr "Habilitar medición mediante software \"odometer\"" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50 msgid "Pause print if filament runs out" -msgstr "Pausar la impresión si el filamento se gasta" +msgstr "Pausar la impresión si el filamento se agota" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56 msgid "Pause threshold" @@ -289,6 +290,11 @@ msgid "" "PostgreSQL-on-Raspbian-(Stretch)\" target=\"newTab\">wiki how to " "install the drivers and setup the database." msgstr "" +"Si quieres usar una base de datos externa, por favor, mira mi wiki sobre como " +"instalar los drivers y configurar la base de datos." + #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84 msgid "URI" @@ -312,11 +318,11 @@ msgid "" "instance for the changes to take affect." msgstr "" "Nota: Si cambias esta configuración deberás reiniciar la instancia de " -"OctoPrint para que los cambios hagan efecto." +"OctoPrint para que los cambios tengan efecto." #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122 msgid "Import & Export" -msgstr "Importar & Exportar" +msgstr "Importar y exportar" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127 msgid "Browse..." @@ -334,11 +340,11 @@ msgstr "Exportar" msgid "" "This does not look like a valid import archive. Only zip files are " "supported." -msgstr "No parece un fichero de importación valido. Sólo se permiten archivos ZIP." +msgstr "No parece un fichero de importación válido. Sólo se permiten archivos zip." #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144 msgid "Currency symbol" -msgstr "Simbolo de moneda" +msgstr "Símbolo de moneda" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 @@ -354,11 +360,11 @@ msgstr "Guardar" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:5 msgid "Filament Profiles" -msgstr "Perfiles de Filamento" +msgstr "Perfiles de filamento" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:13 msgid "--- New Profile ---" -msgstr "--- Nuevo Perfil ---" +msgstr "--- Nuevo perfil ---" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:14 msgid "New" @@ -370,7 +376,7 @@ msgstr "Guardar perfil" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:30 msgid "Vendor must be set" -msgstr "Debes escribir el vendedor" +msgstr "Debes escribir el fabricante" #: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:42 msgid "Material must be set" @@ -406,11 +412,11 @@ msgstr "Precio" #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:74 msgid "Temperature offset" -msgstr "Temperatura" +msgstr "Compensación de temperatura" #: octoprint_filamentmanager/templates/sidebar.jinja2:3 msgid "hide overused usage" -msgstr "" +msgstr "Ocultar bobinas agotadas" #: octoprint_filamentmanager/templates/sidebar.jinja2:10 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 @@ -420,7 +426,7 @@ msgstr "Extrusor" #: octoprint_filamentmanager/templates/sidebar.jinja2:19 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" -msgstr "--- Seleccionar Bobina ---" +msgstr "--- Seleccionar bobina ---" #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5 msgid "Confirm your selected spools" @@ -433,7 +439,7 @@ msgid "" "it's loaded correctly." msgstr "" "No hay información disponible sobre el extrusor de la impresión actual. " -"Asegúrate de que el proceso de análisis esté finalizado y se haya cargado" +"Asegúrate de que el proceso de análisis esté finalizado y haya cargado" " correctamente." #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 @@ -442,6 +448,6 @@ msgid "" "meant to protect you from accidentically selecting wrong spools for the " "print." msgstr "" -"Por favor, confirma las bobinas de los extrusores. Este dialogo está " -"preparado para evitar que elijas bobinas incorrectas de forma accidental." +"Por favor, confirma las bobinas seleccionadas para todos los extrusores activos. Este diálogo está " +"pensado para evitar que elijas bobinas incorrectas para esta impresión." diff --git a/setup.py b/setup.py index c1123c8..1ca7d52 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "1.9.0" +plugin_version = "1.9.1" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann, Olli" plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com" diff --git a/translations/es/LC_MESSAGES/messages.mo b/translations/es/LC_MESSAGES/messages.mo index 309d9ae2d7c486c014cc39352c0d10dc67f5d0fd..bcdd87b249b70ef97c141d62aa62c6b7f4257b80 100644 GIT binary patch delta 2385 zcmciB*>6-;9Ki82E&F2k7AVM}i3`YdIz<+nLQ6_17?7p75TEW$@622~Gk3W64yA-R z7xA-5}Oy_g<^EX9;{~Gk)K|ZRO z!Lsf|tilIT)@#OTN)^<43e_}NfjdV!)PbOW0!!$>faQ1U0 zKSE+t!^lwe8A@g^qh#n7%ErG3^}n&OmWIibm8!?hC=2XHKI$dDB;|)tHhvE`;8{G1 zWvu!vet`0RD#*K-!Kd*8%J|u&MaFGG>A#4w??WZzUn0u0x}1DFN-Cd6X@3PJ0|!x3 zei$X7fxt63pZXU;{~g>%y_j^i;eM3I_7%Px;%ZPb_8N=Kz`=6zFDL$l27*$TkgTZd z$RX7YlmKp{1n>{m;W$>Eg>wTt@P6uM;EO1){s?M37x+E0geoG6TC6HiAWJHWvQbM= zUxhO8DI{oR1^wGm?sgY)ShW{r{u|hU$57V!7G>U#C>gzt?5(Cyp{O*5$Vg!!1(~pz zmm&jNQ69}EzGPxI%7hnC#=RP}zloB<_fax)31$9Ou!cO`9U!-uDjyW91!SlEU7jr@40Oqik*>aLSxB`oK04{dmTKo_t(1|<*dCcV~ z8LCFfL=+|9#VBvA1#1>kc$|Vn7Q;uefb#lJVjrHuRk&jINNV@a9_kxgTa-%ZUOTUQ zjI5_UTjyO<8(D2`^Gqjeq;;3!88O2(=j&YBMC}>fjL>P@?$%b88JS+)Z0M9@CYIKv zJTK=qMIuSdOXXwraXS-Pmrh%5hvh~5FH5EuB0W~O73nm+d@j7+cD#I$>b%1K8P+e=?IVI}j9bQoG*g(i{9c_OwOB$yi;$utGs z%QNC+(zen{8yQoc3wM@JSaFMrsoK*ftw-7`L&ct%^*gFsi;bl1_f;)e?V4#b9=GhQ z(Pg+gXOI=o?jjzEiRa1X*^)^k?pa&eU$?s+@mRzCX*+3a)Afe?b+@&L{5+)nn=@OduZ!o?lBJj( Nv$7nKgL`sT^)EYh)an2L delta 1795 zcmYMzZEO@p7{KwlyA}$ywXO8pLR&^nh%elEN0mq;Sj5_t6lf_`kbo|C+q(6*z3%QI zChD0ONhEDVS7X$ectNe&1Y^!vEkQ$SqVWU1#t@`PY!l*#svk6{iHZNGUE*bLfAj1- zJ2U(2>|1wEv==VamA$C=-N(O~|My{u{{M}ZD|HRw7_Pt~F2N6R8J@!B_<0b28}y$? z4mHb3#{C8BaS1oec+J?TR6!+ZM7hu%_~2rPdL)RC;nnnyV;xRn1%8Pf>N`$X;W?DN zOIU@MaVeH_lKd)^{wT_V*I<(QRgwm|Dut3bjJ4=uH9n1U;|nNxZv^oK$`hSL$@?a_ zei3Dy-%%>|cVIOa%ZRVX8oWVdezk!{1h?YDxE(pv6eo?-C<~awm+%jifk&yol(>k@ zp~g{O$$Olnq93DF=4+IRXM*@=+(!Hx7UDEEQV$s*gO%u^l=?}OiGA$DV^eKdiRAK^Vn-T+G8`zRAvQZ8B0o@(kZPrjcEQpy8C$6@3l)#E57KZ3HL zvB1}HEpaL6zlhHfU&1Z;D61}o*qkVp8sUAe#3LvVT0~OSJGIoGhfyDKL7sdXW#X?; zCO(VT;ZN9tVOAk(Y{gB1`%rfIW2o`vz$xTb^&_srd87zx8J~d6(@>xx7c|nR;wYPA zbC9qTc};3B%BwI@^7EL$r%(p^0Oh_@D3v^e9BPh}RNya^yea~@9!1$Bg`0v4n~_5e zaFWDfl!087(mjIgkGrvm>+v6y36l+r3)_ei_XY7j+(|rwvUxv42Zvex zhD}^G;nL}f#tMJF=9R6<4Y9;+vBY|vOt!ZrZ%!l= ziRC?p>&13CM%K+3p6#^j?n6dacNtE~GV~o5L40T-=y1J!+OlIg+sbmeOKv|y3SC@^2=BJ8@k7j)UT`WKA5u|&v4Y0hF+sP{hsLR zvKu5=+C1zzdDnJKH?BKf&(vwl$k;=+HeGMJ zsB?~)GaSFI@s=C8VbFFC8ronTX*25?nYh|wX9umJykn%S=~7mw&5Z6XjW*VVLc9DE zO`Af7|7+7!*fmSzE88PPvn|&~?(gpPm$u$sd#{;In`zroR~r6Iw55^}4h0?l6Rl_b IZL2%}13?Z0YXATM diff --git a/translations/es/LC_MESSAGES/messages.po b/translations/es/LC_MESSAGES/messages.po index 90e9c84..8fbf530 100644 --- a/translations/es/LC_MESSAGES/messages.po +++ b/translations/es/LC_MESSAGES/messages.po @@ -415,7 +415,7 @@ msgid "Temperature offset" msgstr "Compensación de temperatura" #: octoprint_filamentmanager/templates/sidebar.jinja2:3 -msgid "Hide overused usage" +msgid "hide overused usage" msgstr "Ocultar bobinas agotadas" #: octoprint_filamentmanager/templates/sidebar.jinja2:10 diff --git a/translations/messages.pot b/translations/messages.pot index 269d86e..024e87c 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -388,7 +388,7 @@ msgid "Temperature offset" msgstr "" #: octoprint_filamentmanager/templates/sidebar.jinja2:3 -msgid "Hide overused usage" +msgid "hide overused usage" msgstr "" #: octoprint_filamentmanager/templates/sidebar.jinja2:10