Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
malnvenshorn committed Sep 30, 2019
2 parents 1b25457 + 5b40927 commit b6bb8fc
Show file tree
Hide file tree
Showing 10 changed files with 285 additions and 7 deletions.
2 changes: 1 addition & 1 deletion octoprint_costestimation/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
from __future__ import absolute_import

__author__ = "Sven Lohrmann <malnvenshorn@gmail.com>"
__author__ = "Sven Lohrmann <malnvenshorn@mailbox.org>"
__license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
__copyright__ = "Copyright (C) 2017 Sven Lohrmann - Released under terms of the AGPLv3 License"

Expand Down
2 changes: 1 addition & 1 deletion octoprint_costestimation/static/js/costestimation.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* View model for OctoPrint-CostEstimation
*
* Author: Sven Lohrmann <malnvenshorn@gmail.com>
* Author: Sven Lohrmann <malnvenshorn@mailbox.org>
* License: AGPLv3
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="input-append">
<input type="number" step="0.01" min="0" class="input-mini text-right"
data-bind="value: $root.settings.settings.plugins.costestimation.costOfFilament">
<span class="add-on">€</span>
<span class="add-on" data-bind="text: $root.settings.settings.plugins.costestimation.currency"></span>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2018-01-14 19:43+0100\n"
"PO-Revision-Date: 2018-01-14 19:49+0100\n"
"Last-Translator: Sven Lohrmann <malnvenshorn@gmail.com>\n"
"Last-Translator: Sven Lohrmann <malnvenshorn@mailbox.org>\n"
"Language: de\n"
"Language-Team: de <[email protected]>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
Expand Down
Binary file not shown.
139 changes: 139 additions & 0 deletions octoprint_costestimation/translations/pt_br/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
msgid ""
msgstr ""
"Project-Id-Version: Untitled project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-06-05 17:44-0300\n"
"PO-Revision-Date: 2019-06-05 17:56-0300\n"
"Last-Translator: Hector Perez Baranda\n"
"Language-Team: Brazilian Portuguese\n"
"Language: pt-BR\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"
"X-Generator: Loco https://localise.biz\n"
"X-Loco-Source-Locale: en\n"
"X-Loco-Project-Id: 69944\n"
"X-Loco-Api-Version: 1.0.23 20190531-1"

#: octoprint_costestimation/static/js/costestimation.js:98
#: loco:5cf829ef4d3dd74ab8039fc1
msgid "Cost"
msgstr "Custo"

#: octoprint_costestimation/static/js/costestimation.js:99
#: loco:5cf829ef4d3dd74ab8039fc2
msgid ""
"Estimated print cost based on required quantity of filament and print time"
msgstr ""
"Custo de impressão estimado com base na quantidade necessária de filamentos "
"e no tempo de impressão"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:3
#: loco:5cf829ef4d3dd74ab8039fc3
msgid "Filament"
msgstr "Filamento"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:9
#: loco:5cf829ef4d3dd74ab8039fc4
msgid ""
"Use <a target=\"_blank\" href=\"https://github.com/malnvenshorn/OctoPrint-"
"FilamentManager\">Filament Manager Plugin</a>"
msgstr ""
"Use <a target=\"_blank\" href=\"https://github.com/malnvenshorn/OctoPrint-"
"FilamentManager\">Plugin do Gerenciador de Filamento </a>"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:11
#: loco:5cf829ef4d3dd74ab8039fc5
msgid "(installed)"
msgstr "(instalado)"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:14
#: loco:5cf829ef4d3dd74ab8039fc6
msgid "(not installed)"
msgstr "(não instalado)"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:22
#: loco:5cf829ef4d3dd74ab8039fc7
msgid "Price"
msgstr "Preço"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:33
#: loco:5cf829ef4d3dd74ab8039fc8
msgid "Weight"
msgstr "Peso"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:44
#: loco:5cf829ef4d3dd74ab8039fc9
msgid "Density"
msgstr "Densidade"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:55
#: loco:5cf829ef4d3dd74ab8039fca
msgid "Diameter"
msgstr "Diametro"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:66
#: loco:5cf829ef4d3dd74ab8039fcb
msgid "Operating Cost"
msgstr "Custo de Operação"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:69
#: loco:5cf829ef4d3dd74ab8039fcc
msgid "Power consumption"
msgstr "Consumo de Energía"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:79
#: loco:5cf829ef4d3dd74ab8039fcd
msgid "Electricity cost"
msgstr "Custo da Electricidade"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:88
#: loco:5cf829ef4d3dd74ab8039fce
msgid "Printer Cost"
msgstr "Custo de Impressão"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:91
#: loco:5cf829ef4d3dd74ab8039fcf
msgid "Purchase price"
msgstr "Preço de compra"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:101
#: loco:5cf829ef4d3dd74ab8039fd0
msgid "Estimated lifespan"
msgstr "Vida útil estimada"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:111
#: loco:5cf829ef4d3dd74ab8039fd1
msgid "Maintenance costs"
msgstr "Custo de manuntenção"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:120
#: loco:5cf829ef4d3dd74ab8039fd2
msgid "Appearance"
msgstr "Aparência"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:123
#: loco:5cf829ef4d3dd74ab8039fd3
msgid "Currency symbol"
msgstr "R$"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:129
#: loco:5cf829ef4d3dd74ab8039fd4
#, python-format
msgid ""
"Format string that allows control of symbol position (%%v = value, %%s = "
"symbol)"
msgstr ""
"Formatar string que permite controlar a posição do símbolo (%%v = value, %%s "
"= symbol)"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:130
#: loco:5cf829ef4d3dd74ab8039fd5
msgid "String format"
msgstr "Formato de String"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:139
#: loco:5cf829ef4d3dd74ab8039fd6
msgid "Show estimated cost only if logged in"
msgstr "Mostrar custo estimado somente se conectado"
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
plugin_identifier = "costestimation"
plugin_package = "octoprint_costestimation"
plugin_name = "OctoPrint-CostEstimation"
plugin_version = "2.1.2"
plugin_version = "2.1.3"
plugin_description = "Displays the estimated print cost for the loaded model"
plugin_author = "Sven Lohrmann"
plugin_author_email = "malnvenshorn@gmail.com"
plugin_author_email = "malnvenshorn@mailbox.org"
plugin_url = "https://github.com/malnvenshorn/OctoPrint-CostEstimation"
plugin_license = "AGPLv3"
plugin_requires = []
Expand Down
2 changes: 1 addition & 1 deletion translations/de/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2018-01-14 19:43+0100\n"
"PO-Revision-Date: 2018-01-14 19:49+0100\n"
"Last-Translator: Sven Lohrmann <malnvenshorn@gmail.com>\n"
"Last-Translator: Sven Lohrmann <malnvenshorn@mailbox.org>\n"
"Language: de\n"
"Language-Team: de <[email protected]>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
Expand Down
Binary file added translations/pt_br/LC_MESSAGES/messages.mo
Binary file not shown.
139 changes: 139 additions & 0 deletions translations/pt_br/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
msgid ""
msgstr ""
"Project-Id-Version: Untitled project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-06-05 17:44-0300\n"
"PO-Revision-Date: 2019-06-05 17:56-0300\n"
"Last-Translator: Hector Perez Baranda\n"
"Language-Team: Brazilian Portuguese\n"
"Language: pt-BR\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"
"X-Generator: Loco https://localise.biz\n"
"X-Loco-Source-Locale: en\n"
"X-Loco-Project-Id: 69944\n"
"X-Loco-Api-Version: 1.0.23 20190531-1"

#: octoprint_costestimation/static/js/costestimation.js:98
#: loco:5cf829ef4d3dd74ab8039fc1
msgid "Cost"
msgstr "Custo"

#: octoprint_costestimation/static/js/costestimation.js:99
#: loco:5cf829ef4d3dd74ab8039fc2
msgid ""
"Estimated print cost based on required quantity of filament and print time"
msgstr ""
"Custo de impressão estimado com base na quantidade necessária de filamentos "
"e no tempo de impressão"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:3
#: loco:5cf829ef4d3dd74ab8039fc3
msgid "Filament"
msgstr "Filamento"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:9
#: loco:5cf829ef4d3dd74ab8039fc4
msgid ""
"Use <a target=\"_blank\" href=\"https://github.com/malnvenshorn/OctoPrint-"
"FilamentManager\">Filament Manager Plugin</a>"
msgstr ""
"Use <a target=\"_blank\" href=\"https://github.com/malnvenshorn/OctoPrint-"
"FilamentManager\">Plugin do Gerenciador de Filamento </a>"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:11
#: loco:5cf829ef4d3dd74ab8039fc5
msgid "(installed)"
msgstr "(instalado)"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:14
#: loco:5cf829ef4d3dd74ab8039fc6
msgid "(not installed)"
msgstr "(não instalado)"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:22
#: loco:5cf829ef4d3dd74ab8039fc7
msgid "Price"
msgstr "Preço"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:33
#: loco:5cf829ef4d3dd74ab8039fc8
msgid "Weight"
msgstr "Peso"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:44
#: loco:5cf829ef4d3dd74ab8039fc9
msgid "Density"
msgstr "Densidade"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:55
#: loco:5cf829ef4d3dd74ab8039fca
msgid "Diameter"
msgstr "Diametro"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:66
#: loco:5cf829ef4d3dd74ab8039fcb
msgid "Operating Cost"
msgstr "Custo de Operação"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:69
#: loco:5cf829ef4d3dd74ab8039fcc
msgid "Power consumption"
msgstr "Consumo de Energía"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:79
#: loco:5cf829ef4d3dd74ab8039fcd
msgid "Electricity cost"
msgstr "Custo da Electricidade"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:88
#: loco:5cf829ef4d3dd74ab8039fce
msgid "Printer Cost"
msgstr "Custo de Impressão"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:91
#: loco:5cf829ef4d3dd74ab8039fcf
msgid "Purchase price"
msgstr "Preço de compra"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:101
#: loco:5cf829ef4d3dd74ab8039fd0
msgid "Estimated lifespan"
msgstr "Vida útil estimada"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:111
#: loco:5cf829ef4d3dd74ab8039fd1
msgid "Maintenance costs"
msgstr "Custo de manuntenção"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:120
#: loco:5cf829ef4d3dd74ab8039fd2
msgid "Appearance"
msgstr "Aparência"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:123
#: loco:5cf829ef4d3dd74ab8039fd3
msgid "Currency symbol"
msgstr "R$"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:129
#: loco:5cf829ef4d3dd74ab8039fd4
#, python-format
msgid ""
"Format string that allows control of symbol position (%%v = value, %%s = "
"symbol)"
msgstr ""
"Formatar string que permite controlar a posição do símbolo (%%v = value, %%s "
"= symbol)"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:130
#: loco:5cf829ef4d3dd74ab8039fd5
msgid "String format"
msgstr "Formato de String"

#: octoprint_costestimation/templates/costestimation_settings.jinja2:139
#: loco:5cf829ef4d3dd74ab8039fd6
msgid "Show estimated cost only if logged in"
msgstr "Mostrar custo estimado somente se conectado"

0 comments on commit b6bb8fc

Please sign in to comment.