diff --git a/octoprint_mrbeam/__init__.py b/octoprint_mrbeam/__init__.py index 380a314c0..a530cbddb 100644 --- a/octoprint_mrbeam/__init__.py +++ b/octoprint_mrbeam/__init__.py @@ -428,8 +428,11 @@ def on_settings_save(self, data): data['gcode_nextgen']['clip_working_area']) if "machine" in data and isinstance(data['machine'], collections.Iterable): if "backlash_compensation_x" in data['machine']: - self._settings.set_float(["machine", "backlash_compensation_x"], - data['machine']['backlash_compensation_x']) + min_mal = -1.0 + max_val = 1.0 + val = data['machine']['backlash_compensation_x'] + val = max(min(max_val, val), min_mal) + self._settings.set_float(["machine", "backlash_compensation_x"], val) if "analyticsEnabled" in data: self.analytics_handler.analytics_user_permission_change(analytics_enabled=data['analyticsEnabled']) if "focusReminder" in data: @@ -2500,6 +2503,7 @@ def __plugin_load__(): order=dict( wizard=["plugin_mrbeam_wifi", "plugin_mrbeam_acl", "plugin_mrbeam_lasersafety", "plugin_mrbeam_whatsnew_0", "plugin_mrbeam_whatsnew_1", "plugin_mrbeam_whatsnew_2", "plugin_mrbeam_whatsnew_3", "plugin_mrbeam_whatsnew_4", + "plugin_mrbeam_beta_news_0", "plugin_mrbeam_analytics"], settings=['plugin_mrbeam_about', 'plugin_softwareupdate', 'accesscontrol', 'plugin_mrbeam_maintenance', 'plugin_netconnectd', 'plugin_findmymrbeam', 'plugin_mrbeam_conversion', diff --git a/octoprint_mrbeam/__version.py b/octoprint_mrbeam/__version.py index bc8c296f6..ed9d4d87b 100644 --- a/octoprint_mrbeam/__version.py +++ b/octoprint_mrbeam/__version.py @@ -1 +1 @@ -__version__ = "0.7.2" +__version__ = "0.7.4" diff --git a/octoprint_mrbeam/iobeam/lid_handler.py b/octoprint_mrbeam/iobeam/lid_handler.py index 3d53f1069..703467742 100644 --- a/octoprint_mrbeam/iobeam/lid_handler.py +++ b/octoprint_mrbeam/iobeam/lid_handler.py @@ -139,9 +139,11 @@ def onEvent(self, event, payload): self._logger.debug("onEvent() CLIENT_OPENED sending client lidClosed: %s", self._lid_closed) self._client_opened = True self._startStopCamera(event) - elif event == OctoPrintEvents.CLIENT_CLOSED: - self._client_opened = False - self._startStopCamera(event) + # Please re-enable when the OctoPrint is more reliable at + # detecting when a user actually disconnected. + # elif event == OctoPrintEvents.CLIENT_CLOSED: + # self._client_opened = False + # self._startStopCamera(event) elif event == OctoPrintEvents.SHUTDOWN: self.shutdown() elif event == IoBeamEvents.ONEBUTTON_RELEASED \ @@ -751,9 +753,9 @@ def serve_pictures(self, cam, pic_settings=None, cam_params=None, out_pic_size=N self.send_last_img_to_analytics( trigger='dev_auto', force_upload=(pic_counter%10==0) ) + self.last_shutter_speed = cam.shutter_speed self.save_camera_settings(markers=self.last_markers, shutter_speed=self.last_shutter_speed) - self.last_shutter_speed = cam.shutter_speed cam.stop_preview() if session_details['num_pics'] > 0: session_details.update({ diff --git a/octoprint_mrbeam/iobeam/onebutton_handler.py b/octoprint_mrbeam/iobeam/onebutton_handler.py index 69b2a945b..2f806fed7 100644 --- a/octoprint_mrbeam/iobeam/onebutton_handler.py +++ b/octoprint_mrbeam/iobeam/onebutton_handler.py @@ -239,8 +239,8 @@ def onEvent(self, event, payload): self._logger.debug("onEvent() FILE_SELECTED set_ready_to_laser filename: %s:", 'filename' in payload) try: # OctoPrint 1.3.4 doesn't provide the file name anymore - filename = payload['filename'] if 'filename' in payload else None - self.set_ready_to_laser(filename) + path = payload['path'] if 'path' in payload else None + self.set_ready_to_laser(path) except Exception as e: self._logger.exception("Error while going into state ReadyToLaser: {}".format(e)) diff --git a/octoprint_mrbeam/static/css/svgtogcode.css b/octoprint_mrbeam/static/css/svgtogcode.css index 65971a087..d31529bb5 100644 --- a/octoprint_mrbeam/static/css/svgtogcode.css +++ b/octoprint_mrbeam/static/css/svgtogcode.css @@ -526,6 +526,14 @@ g#camera_markers.markerSW circle#markerSW { animation: blinker 2s linear infinite; } +g#camera_markers.markerNE.gray circle#markerNE, +g#camera_markers.markerSE.gray circle#markerSE, +g#camera_markers.markerNW.gray circle#markerNW, +g#camera_markers.markerSW.gray circle#markerSW { + opacity: .6; + animation: none; +} + @keyframes blinker { 50% { opacity: 0; diff --git a/octoprint_mrbeam/static/css/wizard.css b/octoprint_mrbeam/static/css/wizard.css index 9f9517102..ac340ebd0 100644 --- a/octoprint_mrbeam/static/css/wizard.css +++ b/octoprint_mrbeam/static/css/wizard.css @@ -154,4 +154,44 @@ input[type="radio"]{ margin: 50px 0 0 170px; } +/* +* === What's new dialog === +*/ +.beta-news-ds-use-case-grid { + display: grid; + grid-gap: 10px; + grid-template-columns: 1.4fr 0.3fr 0.8fr; + width: 90%; + margin: 20px 0 0 5px; +} + +.beta-news-ds-info-grid { + display: grid; + grid-gap: 10px; + grid-template-columns: 1fr 10fr; + width: 90%; + margin: 20px 0 0 5px; +} +.beta-news-ds-info-icon { + transform: scaleY(0.7); + -ms-transform: scaleY(0.7); + -moz-transform: scaleY(0.7); + -webkit-transform: scaleY(0.7); + -o-transform: scaleY(0.7); +} + +.beta-news-arrow { + margin: auto; + transform: rotate(180deg) scaleY(0.7); + -ms-transform: rotate(180deg) scaleY(0.7); + -moz-transform: rotate(180deg) scaleY(0.7); + -webkit-transform: rotate(180deg) scaleY(0.7); + -o-transform: rotate(180deg) scaleY(0.7); + filter: invert(41%) sepia(50%) saturate(6758%) hue-rotate(12deg) brightness(99%) contrast(98%); +} + +#ds_title_stars { + height: 50px; + filter: invert(41%) sepia(50%) saturate(6758%) hue-rotate(12deg) brightness(99%) contrast(98%); +} diff --git a/octoprint_mrbeam/static/img/beta_dialog/beam_coin.svg b/octoprint_mrbeam/static/img/beta_dialog/beam_coin.svg new file mode 100644 index 000000000..81bee0c21 --- /dev/null +++ b/octoprint_mrbeam/static/img/beta_dialog/beam_coin.svg @@ -0,0 +1,29 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + diff --git a/octoprint_mrbeam/static/img/beta_dialog/question_mark.svg b/octoprint_mrbeam/static/img/beta_dialog/question_mark.svg new file mode 100644 index 000000000..5e8fc0198 --- /dev/null +++ b/octoprint_mrbeam/static/img/beta_dialog/question_mark.svg @@ -0,0 +1,19 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + diff --git a/octoprint_mrbeam/static/img/beta_dialog/skyline_design.png b/octoprint_mrbeam/static/img/beta_dialog/skyline_design.png new file mode 100644 index 000000000..841a53651 Binary files /dev/null and b/octoprint_mrbeam/static/img/beta_dialog/skyline_design.png differ diff --git a/octoprint_mrbeam/static/img/beta_dialog/skyline_product.jpg b/octoprint_mrbeam/static/img/beta_dialog/skyline_product.jpg new file mode 100644 index 000000000..9f2268066 Binary files /dev/null and b/octoprint_mrbeam/static/img/beta_dialog/skyline_product.jpg differ diff --git a/octoprint_mrbeam/static/img/beta_dialog/stars.svg b/octoprint_mrbeam/static/img/beta_dialog/stars.svg new file mode 100644 index 000000000..919bac625 --- /dev/null +++ b/octoprint_mrbeam/static/img/beta_dialog/stars.svg @@ -0,0 +1,39 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + + + diff --git a/octoprint_mrbeam/static/js/camera.js b/octoprint_mrbeam/static/js/camera.js index ea87d6a74..93985daa9 100644 --- a/octoprint_mrbeam/static/js/camera.js +++ b/octoprint_mrbeam/static/js/camera.js @@ -29,6 +29,7 @@ $(function(){ self.isCamCalibrated = false; self.firstImageLoaded = false; self.countImagesLoaded = ko.observable(0); + self.imagesInSession = ko.observable(0); self.markersFound = ko.observable(new Map(MARKERS.map(elm => [elm, undefined]))); @@ -42,6 +43,20 @@ $(function(){ // event listener callbacks // self.onAllBound = function () { + self.cameraActive = ko.computed(function() { + // Needs the motherViewModel to set the interlocks + // Output not used yet - + // Function updates self.imageInSession (Which is used) + let ret = self.firstRealimageLoaded() + && self.state.isOperational() + && !self.state.isPrinting() + && !self.state.isLocked() + && !self.state.interlocksClosed(); + if (!ret) { + self.imagesInSession(0); + } + return ret; + }) self.webCamImageElem = $("#beamcam_image_svg"); self.cameraMarkerElem = $("#camera_markers"); // self.webCamImageElem.removeAttr('onerror'); @@ -103,9 +118,6 @@ $(function(){ return self.countImagesLoaded() >= 2; }) - self.cameraActive = ko.computed(function() { - return self.firstRealimageLoaded() && self.state.isOperational() && !self.state.isPrinting() && !self.state.isLocked(); - }) self.markerMissedClass = ko.computed(function() { var ret = ''; @@ -113,6 +125,14 @@ $(function(){ if ((self.markersFound()[m] !== undefined) && !self.markersFound()[m]) ret = ret + ' marker' + m; }); + if (self.cameraMarkerElem !== undefined){ + if (self.imagesInSession() == 0) { + ret = ret + ' gray' + // Somehow the filter in css doesn't work + self.cameraMarkerElem.attr({style:"filter: url(#grayscale_filter)"}); + } else + self.cameraMarkerElem.attr({style:""}); + } return ret; }) @@ -152,11 +172,6 @@ $(function(){ } self.loadImage(self.croppedUrl); } - - // If camera is not active (lid closed), all marker(NW|NE|SW|SE) classes should be removed. - if('interlocks_closed' in data && data.interlocks_closed === true){ - self.cameraMarkerElem.attr('class', ''); - } }; self.loadImage = function (url) { @@ -179,6 +194,7 @@ $(function(){ } else { OctoPrint.simpleApiCommand("mrbeam", "on_camera_picture_transfer", {}) } + self.imagesInSession(self.imagesInSession()+1) }); if (!self.firstImageLoaded) { img.error(function () { diff --git a/octoprint_mrbeam/static/js/design_store.js b/octoprint_mrbeam/static/js/design_store.js index ea221bddc..34f98c8ae 100644 --- a/octoprint_mrbeam/static/js/design_store.js +++ b/octoprint_mrbeam/static/js/design_store.js @@ -12,7 +12,7 @@ $(function () { self.settings = params[3]; self.onUserLoggedIn = function () { - if (window.mrbeam.isDev()) { + if (window.mrbeam.isDev() || window.mrbeam.isBeta()) { self.prepareDesignStoreTab(); } }; diff --git a/octoprint_mrbeam/static/js/ready_to_laser_viewmodel.js b/octoprint_mrbeam/static/js/ready_to_laser_viewmodel.js index bc2d2799c..02c4a9c45 100644 --- a/octoprint_mrbeam/static/js/ready_to_laser_viewmodel.js +++ b/octoprint_mrbeam/static/js/ready_to_laser_viewmodel.js @@ -16,7 +16,7 @@ $(function () { self.dialogTimeoutId = -1; self.gcodeFile = undefined; - self.interlocks_closed = ko.observable(true); + self.state.interlocksClosed = ko.observable(false) self.is_cooling_mode = ko.observable(false); self.is_fan_connected = ko.observable(true); self.is_rtl_mode = ko.observable(false); @@ -218,7 +218,7 @@ $(function () { self.is_pause_mode(mrb_state['pause_mode']); } if ('interlocks_closed' in mrb_state) { - self.interlocks_closed(mrb_state['interlocks_closed']); + self.state.interlocksClosed(mrb_state['interlocks_closed']); } if ('lid_fully_open' in mrb_state) { self.lid_fully_open(mrb_state['lid_fully_open']); diff --git a/octoprint_mrbeam/static/js/wizard_general.js b/octoprint_mrbeam/static/js/wizard_general.js index f5c085459..351326f8a 100644 --- a/octoprint_mrbeam/static/js/wizard_general.js +++ b/octoprint_mrbeam/static/js/wizard_general.js @@ -29,22 +29,21 @@ $(function() { self.analytics = parameters[1]; self.tour = parameters[2]; - self.isWhatsnew = MRBEAM_WIZARD_TO_SHOW === 'WHATSNEW'; self.isWelcome = MRBEAM_WIZARD_TO_SHOW === 'WELCOME'; + self.isWhatsnew = MRBEAM_WIZARD_TO_SHOW === 'WHATSNEW'; + self.isBetaNews = MRBEAM_WIZARD_TO_SHOW === 'BETA_NEWS'; self.aboutToStart = true; self.onAfterBinding = function(){ $('#wizard_dialog div.modal-footer button.button-finish').text(gettext("Let's go!")); $('#wizard_dialog div.modal-footer div.text-center').hide(); - if (self.isWhatsnew) { - if (!window.mrbeam.isBeta()) { - $('#wizard_dialog div.modal-header h3').text(gettext("What's New")); - } else { - $('#wizard_dialog div.modal-header h3').text(gettext("What's New in the Stable Channel")); - } - } else if (self.isWelcome) { + if (self.isWelcome) { $('#wizard_dialog div.modal-header h3').text(gettext("Welcome dialog")); + }else if (self.isWhatsnew) { + $('#wizard_dialog div.modal-header h3').text(gettext("What's New")); + } else if (self.isBetaNews) { + $('#wizard_dialog div.modal-header h3').text(gettext("What's New in Beta")); } }; @@ -64,9 +63,11 @@ $(function() { let links = response.mrbeam.details.links; self._changeNavDesignForAllTabsInitialState(links); - // For the whatsnew we have to manually set the first tab to active + // For the whatsnew and beta news we have to manually set the first tab to active if(self.isWhatsnew) { $('#wizard_plugin_corewizard_whatsnew_0_link').attr('class', 'wizard-nav-list-active') + } else if (self.isBetaNews) { + $('#wizard_plugin_corewizard_beta_news_0_link').attr('class', 'wizard-nav-list-active') } } }; diff --git a/octoprint_mrbeam/static/js/working_area.js b/octoprint_mrbeam/static/js/working_area.js index c7cef316f..16f5838fc 100644 --- a/octoprint_mrbeam/static/js/working_area.js +++ b/octoprint_mrbeam/static/js/working_area.js @@ -2049,8 +2049,9 @@ $(function(){ }); // opens preview pane on the left if hovered over one of the pink markers on the working area - $('#camera_markers circle').mouseenter(function(){ - if (!$('#wa_view_settings_body').hasClass('in')) { + $('#camera_markers circle').mouseenter(function(e){ + if (!$('#wa_view_settings_body').hasClass('in') + && !self.camera.markersFound()[$(e.target).attr('id').replace('marker', '')]) { $('#wa_view_settings_body').collapse('toggle'); } }); diff --git a/octoprint_mrbeam/templates/mrbeam_ui_index.jinja2 b/octoprint_mrbeam/templates/mrbeam_ui_index.jinja2 index 81c0d91db..3e04fc20c 100644 --- a/octoprint_mrbeam/templates/mrbeam_ui_index.jinja2 +++ b/octoprint_mrbeam/templates/mrbeam_ui_index.jinja2 @@ -51,7 +51,7 @@
  • {{ _('working area') }}
    • {# Translatots: Name of the tab #}
  • {{ _('design library') }}
    • -
  • {{ _('design store') }}
    • +
  • {{ _('design store') }}
    • {% if not enableFocus %}
  • {{ _('focus') }}
    • {% endif %} diff --git a/octoprint_mrbeam/templates/ready_to_laser.jinja2 b/octoprint_mrbeam/templates/ready_to_laser.jinja2 index 71555d60e..d7e48933a 100644 --- a/octoprint_mrbeam/templates/ready_to_laser.jinja2 +++ b/octoprint_mrbeam/templates/ready_to_laser.jinja2 @@ -1,6 +1,6 @@ diff --git a/octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2 b/octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2 new file mode 100644 index 000000000..85a964bee --- /dev/null +++ b/octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2 @@ -0,0 +1,47 @@ +

    + + {{ _("The new Mr Beam Design Store") }} +

    + +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    + {{ _("Buy beautiful designs, integrated in your Mr Beam software") }} +
    +
    +
    + {{ _("Create wonderful objects") }} +
    +
    + +
    +
    + +
    +
    +

    {{ _("All Beta users get 300 Beam Coins for free!") }}

    +
    + +
    + +
    +
    +

    + {{ _("For more information about the Design Store, visit our %(tag_open)sKnowledge Base%(tag_close)s.", + tag_open=' ', + tag_close='') }} +

    +
    +
    +
    + diff --git a/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo b/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo index b9508401a..0092acfaf 100644 Binary files a/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo and b/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo differ diff --git a/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po b/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po index e6d8499a7..4be101757 100644 --- a/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po +++ b/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Mr_Beam 0.1.61\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-08-18 13:07+0200\n" -"PO-Revision-Date: 2020-08-20 09:36+0200\n" +"POT-Creation-Date: 2020-09-07 08:10+0200\n" +"PO-Revision-Date: 2020-09-09 08:53+0200\n" "Last-Translator: Andy Werner \n" "Language-Team: \n" "Language: de\n" @@ -17,98 +17,103 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.4.1\n" -#: octoprint_mrbeam/__init__.py:683 +#: octoprint_mrbeam/__init__.py:680 #: octoprint_mrbeam/templates/settings/svgtogcode_settings.jinja2:2 msgid "File Import Settings" msgstr "Dateiimport Einstellungen" -#: octoprint_mrbeam/__init__.py:684 +#: octoprint_mrbeam/__init__.py:681 #: octoprint_mrbeam/templates/settings/camera_settings.jinja2:4 msgid "Camera" msgstr "Kamera" -#: octoprint_mrbeam/__init__.py:685 +#: octoprint_mrbeam/__init__.py:682 #: octoprint_mrbeam/templates/settings/backlash_settings.jinja2:2 msgid "Precision Calibration" msgstr "Feinjustierung" -#: octoprint_mrbeam/__init__.py:686 +#: octoprint_mrbeam/__init__.py:683 #: octoprint_mrbeam/templates/calibration/watterott/calibration_tool.jinja2:52 #: octoprint_mrbeam/templates/settings/debug_settings.jinja2:5 msgid "Debug" msgstr "Debug" -#: octoprint_mrbeam/__init__.py:687 +#: octoprint_mrbeam/__init__.py:684 #: octoprint_mrbeam/templates/settings/about_settings.jinja2:2 msgid "About This Mr Beam" msgstr "Über diesen Mr Beam" -#: octoprint_mrbeam/__init__.py:688 +#: octoprint_mrbeam/__init__.py:685 #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:9 #: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:8 -#: octoprint_mrbeam/wizard_config.py:98 octoprint_mrbeam/wizard_config.py:156 +#: octoprint_mrbeam/wizard_config.py:105 octoprint_mrbeam/wizard_config.py:163 msgid "Analytics" msgstr "Analytics" -#: octoprint_mrbeam/__init__.py:689 +#: octoprint_mrbeam/__init__.py:686 #: octoprint_mrbeam/templates/settings/reminders_settings.jinja2:2 msgid "Reminders" msgstr "Erinnerungen" -#: octoprint_mrbeam/__init__.py:690 +#: octoprint_mrbeam/__init__.py:687 #: octoprint_mrbeam/templates/settings/maintenance_settings.jinja2:2 msgid "Maintenance" msgstr "Wartung" -#: octoprint_mrbeam/__init__.py:691 +#: octoprint_mrbeam/__init__.py:688 #: octoprint_mrbeam/templates/settings/leds_settings.jinja2:2 msgid "Mr Beam Lights" msgstr "Mr Beam Lights" -#: octoprint_mrbeam/__init__.py:692 +#: octoprint_mrbeam/__init__.py:689 #: octoprint_mrbeam/templates/settings/custom_material_settings.jinja2:2 msgid "Custom Material Settings" msgstr "Benutzerdefinierte Materialeinstellungen" -#: octoprint_mrbeam/__init__.py:1816 +#: octoprint_mrbeam/__init__.py:1813 msgid "A new picture is being taken, please wait a little..." msgstr "Es wird ein neues Bild gemacht, bitte warte einen Moment..." -#: octoprint_mrbeam/__init__.py:1819 +#: octoprint_mrbeam/__init__.py:1816 msgid "Either the camera is busy or the lid is not open." msgstr "" "Entweder ist die Kamera nicht erreichbar oder der Deckel ist nicht geöffnet." -#: octoprint_mrbeam/wizard_config.py:71 +#: octoprint_mrbeam/wizard_config.py:78 msgid "Connection" msgstr "Verbinden" -#: octoprint_mrbeam/wizard_config.py:80 +#: octoprint_mrbeam/wizard_config.py:87 msgid "Your user" msgstr "Dein Nutzerkonto" -#: octoprint_mrbeam/wizard_config.py:89 +#: octoprint_mrbeam/wizard_config.py:96 msgid "For your safety" msgstr "Zu deiner Sicherheit" -#: octoprint_mrbeam/wizard_config.py:120 +#: octoprint_mrbeam/wizard_config.py:127 msgid "Improved camera" msgstr "Verbesserte Kamera" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_1.jinja2:2 -#: octoprint_mrbeam/wizard_config.py:129 +#: octoprint_mrbeam/wizard_config.py:136 msgid "Custom material backup" msgstr "Backup von benutzerdefinierten Materialien" -#: octoprint_mrbeam/wizard_config.py:138 +#: octoprint_mrbeam/wizard_config.py:145 msgid "SVG split" msgstr "SVGs Zerteilen" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_3.jinja2:2 -#: octoprint_mrbeam/wizard_config.py:147 +#: octoprint_mrbeam/wizard_config.py:154 msgid "...and more!" msgstr "...und mehr!" +# tab title +#: octoprint_mrbeam/wizard_config.py:186 +msgid "Design Store" +msgstr "Design-Store" + #: octoprint_mrbeam/printing/comm_acc2.py:314 #: octoprint_mrbeam/printing/comm_acc2.py:353 msgid "Please contact Mr Beam support team and attach octoprint.log." @@ -187,8 +192,8 @@ msgstr "nur Gravur" #: octoprint_mrbeam/static/js/convert.js:409 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:135 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:306 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:178 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:242 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:180 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:244 msgid "mm" msgstr "mm" @@ -723,7 +728,7 @@ msgstr "Bereit zum Lasern?" #: octoprint_mrbeam/templates/calibration/watterott/tab_corner_calibration.jinja2:101 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:152 #: octoprint_mrbeam/templates/settings.jinja2:52 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:128 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:130 #: octoprint_mrbeam/templates/take_photo.jinja2:10 msgid "Cancel" msgstr "Abbruch" @@ -1300,22 +1305,21 @@ msgstr "" "Deine Einstellung zu Analytics kann im Moment nicht gespeichert werden. " "%(br)sPrüfe die Verbindung zu Mr Beam und versuche es erneut." -#: octoprint_mrbeam/static/js/wizard_general.js:37 +#: octoprint_mrbeam/static/js/wizard_general.js:38 msgid "Let's go!" msgstr "Auf geht's!" #: octoprint_mrbeam/static/js/wizard_general.js:42 -msgid "What's New" -msgstr "Was gibt's Neues" +msgid "Welcome dialog" +msgstr "Welcome Dialog" -# Settings > About Screen #: octoprint_mrbeam/static/js/wizard_general.js:44 -msgid "What's New in the Stable Channel" -msgstr "Was gibt’s Neues im Stabilen Kanal?" +msgid "What's New" +msgstr "Was gibt's Neues" -#: octoprint_mrbeam/static/js/wizard_general.js:47 -msgid "Welcome dialog" -msgstr "Welcome Dialog" +#: octoprint_mrbeam/static/js/wizard_general.js:46 +msgid "What's New in Beta" +msgstr "Was gibt's Neues in Beta" #: octoprint_mrbeam/static/js/working_area.js:84 msgid "Rectangle" @@ -1333,11 +1337,11 @@ msgstr "Stern" msgid "Heart" msgstr "Herz" -#: octoprint_mrbeam/static/js/working_area.js:938 +#: octoprint_mrbeam/static/js/working_area.js:941 msgid "Limited split result." msgstr "Nur teilweise zerteiltes Ergebnis." -#: octoprint_mrbeam/static/js/working_area.js:939 +#: octoprint_mrbeam/static/js/working_area.js:942 msgid "" "Splitting this design would result in too many parts. Here are " "${split_result.length} parts. You can split the last one again if necessary." @@ -1346,27 +1350,27 @@ msgstr "" "${split_result.length} Teile. Du kannst den letzten Teil bei Bedarf noch " "einmal zerteilen." -#: octoprint_mrbeam/static/js/working_area.js:948 +#: octoprint_mrbeam/static/js/working_area.js:951 msgid "No different line colors found." msgstr "Keine unterschiedlichen Linienfarben gefunden." -#: octoprint_mrbeam/static/js/working_area.js:951 +#: octoprint_mrbeam/static/js/working_area.js:954 msgid "No non-intersecting shapes found." msgstr "Keine nicht-überlappenden Formen gefunden." -#: octoprint_mrbeam/static/js/working_area.js:956 +#: octoprint_mrbeam/static/js/working_area.js:959 msgid "Looks like a single path." msgstr "Sieht nach einem einzigen Pfad aus." -#: octoprint_mrbeam/static/js/working_area.js:959 +#: octoprint_mrbeam/static/js/working_area.js:962 msgid "Element not splittable with this method." msgstr "Element is nicht zerteilbar mit dieser Methode." -#: octoprint_mrbeam/static/js/working_area.js:960 +#: octoprint_mrbeam/static/js/working_area.js:963 msgid "Can't split this design." msgstr "Dieses Design kann nicht zerteilt werden." -#: octoprint_mrbeam/static/js/working_area.js:1287 +#: octoprint_mrbeam/static/js/working_area.js:1290 #, python-format msgid "" "The SVG file contains unsupported elements: '%(elemName)s' These elements " @@ -1375,12 +1379,12 @@ msgstr "" "Die SVG-Datei enthält nicht unterstützte Elemente: %(elemName)s' Diese " "Elemente wurden entfernt." -#: octoprint_mrbeam/static/js/working_area.js:1289 +#: octoprint_mrbeam/static/js/working_area.js:1292 #, python-format msgid "Unsupported elements in SVG: '%(elemName)s'" msgstr "Nicht unterstützte Elemente in SVG: '%(elemName)s'" -#: octoprint_mrbeam/static/js/working_area.js:1297 +#: octoprint_mrbeam/static/js/working_area.js:1300 #, python-format msgid "" "The SVG file contains text elements.%(br)sIf you want to laser just their " @@ -1391,11 +1395,11 @@ msgstr "" "willst,%(br)skonvertiere sie in Pfade.%(br)sAnsonsten werden sie mit Füllung " "graviert." -#: octoprint_mrbeam/static/js/working_area.js:1299 +#: octoprint_mrbeam/static/js/working_area.js:1302 msgid "Text elements found" msgstr "Textelemente gefunden" -#: octoprint_mrbeam/static/js/working_area.js:1310 +#: octoprint_mrbeam/static/js/working_area.js:1313 msgid "" "The SVG file contained style elements with online references. Since online " "references are not supported, we removed them. The image might look a bit " @@ -1405,11 +1409,11 @@ msgstr "" "Referenzen nicht unterstützt werden, haben wir sie entfernt. Das Bild könnte " "jetzt etwas anders aussehen." -#: octoprint_mrbeam/static/js/working_area.js:1312 +#: octoprint_mrbeam/static/js/working_area.js:1315 msgid "Style elements removed" msgstr "Style-Elemente entfernt" -#: octoprint_mrbeam/static/js/working_area.js:1323 +#: octoprint_mrbeam/static/js/working_area.js:1326 msgid "" "The selected design file can not be handled. Please make sure it is a valid " "design file." @@ -1417,25 +1421,25 @@ msgstr "" "Die ausgewählte Design-Datei kann nicht bearbeitet werden. Bitte stelle " "sicher, dass es sich um eine gültige Design-Datei handelt." -#: octoprint_mrbeam/static/js/working_area.js:1325 +#: octoprint_mrbeam/static/js/working_area.js:1328 msgid "File error." msgstr "Dateifehler." -#: octoprint_mrbeam/static/js/working_area.js:1336 +#: octoprint_mrbeam/static/js/working_area.js:1339 msgid "The selected design file does not have any content." msgstr "Die ausgewählte Design-Datei hat keinen Inhalt." -#: octoprint_mrbeam/static/js/working_area.js:1338 +#: octoprint_mrbeam/static/js/working_area.js:1341 msgid "Empty File." msgstr "Leere Datei." -#: octoprint_mrbeam/static/js/working_area.js:1349 +#: octoprint_mrbeam/static/js/working_area.js:1352 msgid "An unknown error occurred while processing this design file." msgstr "" "Ein bekannter Fehler ist während der Verarbeitung dieser Designdatei " "aufgetreten." -#: octoprint_mrbeam/static/js/working_area.js:1350 +#: octoprint_mrbeam/static/js/working_area.js:1353 msgid "" "Please try reloading this browser window and try again. If this error " "remains, contact the Mr Beam Support Team. Make sure you provide the error " @@ -1449,8 +1453,8 @@ msgstr "" #: octoprint_mrbeam/static/js/calibration/camera_calibration.js:219 #: octoprint_mrbeam/static/js/calibration/camera_calibration.js:811 #: octoprint_mrbeam/static/js/calibration/camera_calibration.js:839 -#: octoprint_mrbeam/static/js/working_area.js:1351 -#: octoprint_mrbeam/static/js/working_area.js:1353 +#: octoprint_mrbeam/static/js/working_area.js:1354 +#: octoprint_mrbeam/static/js/working_area.js:1356 msgid "Error" msgstr "Fehler" @@ -2020,7 +2024,7 @@ msgid "Basic" msgstr "Basic" #: octoprint_mrbeam/templates/conversion_dialog.jinja2:338 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:443 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:445 msgid "Image Preprocessing" msgstr "Bildvorverarbeitung" @@ -2649,13 +2653,13 @@ msgstr "Etwas ist schief gelaufen" # Serial number #: octoprint_mrbeam/templates/loading_overlay.jinja2:222 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:767 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:769 msgid "Serial" msgstr "Seriennummer" #: octoprint_mrbeam/templates/loading_overlay.jinja2:223 #: octoprint_mrbeam/templates/loginscreen_viewmodel.jinja2:13 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:768 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:770 msgid "Mr Beam Name" msgstr "Mr Beam Name" @@ -2726,7 +2730,7 @@ msgstr "designbibliothek" # tab title #: octoprint_mrbeam/templates/mrbeam_ui_index.jinja2:54 msgid "design store" -msgstr "design store" +msgstr "design-store" # tab headline (old mr beam I) #: octoprint_mrbeam/templates/mrbeam_ui_index.jinja2:56 @@ -3160,11 +3164,11 @@ msgstr "Download" #: octoprint_mrbeam/templates/tab_designlib.jinja2:223 #: octoprint_mrbeam/templates/tab_designlib.jinja2:255 #: octoprint_mrbeam/templates/tab_designlib.jinja2:286 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:301 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:319 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:395 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:566 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:622 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:303 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:321 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:397 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:568 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:624 msgid "Remove" msgstr "Entfernen" @@ -3193,7 +3197,7 @@ msgstr "Intern" #: octoprint_mrbeam/templates/tab_designstore.jinja2:21 msgid "The Mr Beam Design Store is not reachable" -msgstr "Der Mr Beam Design Store ist nicht erreichbar" +msgstr "Der Mr Beam Design-Store ist nicht erreichbar" #: octoprint_mrbeam/templates/tab_designstore.jinja2:22 msgid "" @@ -3360,7 +3364,7 @@ msgstr "Einheiten auf Millimeter einstellen" # Terminal GCode Reference #: octoprint_mrbeam/templates/tab_terminal.jinja2:138 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:130 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:132 msgid "Send" msgstr "Senden" @@ -3386,7 +3390,7 @@ msgid "Offline" msgstr "Offline" #: octoprint_mrbeam/templates/tab_workingarea.jinja2:25 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:279 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:281 msgid "File" msgstr "Datei" @@ -3440,15 +3444,20 @@ msgstr "" " Stelle " "sicher, dass alle vier Markierungen sichtbar sind." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:95 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:88 +msgid "More info" +msgstr "" + +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:90 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:97 msgid "Send image to Mr Beam" msgstr "Bild an Mr Beam senden" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:99 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:101 msgid "Send the current image to Mr Beam Lasers for review." msgstr "Sende das aktuelle Bild zur Überprüfung an Mr Beam Lasers." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:100 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:102 msgid "" "This helps us to improve the camera system to work better in even more " "difficult conditions." @@ -3456,12 +3465,12 @@ msgstr "" "Dies hilft uns, das Kamerasystem zu verbessern damit es sogar unter weniger " "günstigen Bedingungen besser funktioniert." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:106 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:108 msgid "Mr Beam Lasers might store your image in it's camera training data set." msgstr "" "Mr Beam Lasers kann Dein Bild in ihrem Kamera-Training-Datensatz speichern." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:107 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:109 msgid "" "Please understand that Mr Beam Lasers can not send you any response " "regarding this image." @@ -3469,7 +3478,7 @@ msgstr "" "Bitte habe Verständnis, dass Mr Beam Lasers Dir keine Rückmeldung zu diesem " "Bild geben kann." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:108 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:110 msgid "Mr Beam Lasers will not publish the image nor sell it to third parties." msgstr "" "Mr Beam Lasers wird das Bild weder veröffentlichen noch an Dritte verkaufen." @@ -3477,12 +3486,12 @@ msgstr "" # URL - do not translate/modify #: octoprint_mrbeam/templates/settings/about_settings.jinja2:94 #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:10 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:109 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:111 #: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:9 msgid "/plugin/mrbeam/static/docs/MrBeamAnalytics-PrivacyPolicy_en.pdf" msgstr "/plugin/mrbeam/static/docs/MrBeamAnalytics-PrivacyPolicy_de.pdf" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:110 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:112 #, python-format msgid "" "Your image is sent within the context of Mr Beam Analytics. (See " @@ -3491,7 +3500,7 @@ msgstr "" "Dein Bild wird im Rahmen der Mr Beam Analytics gesendet. " "(%(open)sDatenschutzbestimmungen%(close)s)" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:111 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:113 msgid "" "The upload of your image to Mr Beam's servers will happen in the background. " "If you're not online, the image will be uploaded next time you're online." @@ -3500,16 +3509,16 @@ msgstr "" "Hintergrund. Wenn Du gerade nicht online bist, wird das Bild hochgeladen, " "wenn Du wieder online bist." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:115 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:117 msgid "We appreciate your support. Thank you!" msgstr "Wir wissen Deine Unterstützung sehr zu schätzen. Vielen Dank!" # Settings > About Screen -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:119 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:121 msgid "Activate Mr Beam Analytics:" msgstr "Aktiviere Mr Beam Analytics:" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:121 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:123 msgid "" "This functionality is part of Mr Beam Analytics which needs to be " "enabled to use this functionality." @@ -3517,22 +3526,22 @@ msgstr "" "Diese Funktionalität ist Teil von Mr Beam Analytics. Zur Nutzung muß " "diese Funktionalität aktiviert werden." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:122 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:124 #, python-format msgid "Please go to %(open)sMr Beam Analytics%(close)s to enable it." msgstr "" "Bitte gehe zu %(open)sMr Beam Analytics%(close)s, um diese " "Funktionalität zu aktivieren." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:137 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 msgid "Low" msgstr "Niedrig" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:137 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 msgid "Picture Quality" msgstr "Bildqualität" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:141 msgid "" "- Open the lid and keep your hands off the working area for a few seconds to " "receive a higher resolution image" @@ -3542,220 +3551,220 @@ msgstr "" # Image adjustment sliders #: octoprint_mrbeam/templates/settings/leds_settings.jinja2:6 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:144 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:146 msgid "Brightness" msgstr "Helligkeit" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:154 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:156 msgid "Zoom" msgstr "Zoom" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:169 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:171 msgid "Scroll to zoom" msgstr "Scrolle zum zoomen" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:173 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:175 msgid "Object height" msgstr "Objekt-Höhe" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:186 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:188 msgid "Firmware update in progress" msgstr "Firmware-Aktualisierung läuft" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:191 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:193 msgid "Do not power off the machine during the flashing process." msgstr "Schalte das Gerät während des Aktualisierungsprozess nicht aus." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:196 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:198 msgid "Position" msgstr "Position" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:207 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:209 msgid "XY-Axes" msgstr "XY-Achsen" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:223 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:225 msgid "Z-Axis" msgstr "Z-Achse" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:237 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:239 msgid "Jog distance:" msgstr "Jog-Distanz:" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:251 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:253 msgid "Serial Port" msgstr "Serielle Schnittstelle" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:253 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:255 msgid "Baudrate" msgstr "Baudrate" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:256 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:258 msgid "Save connection settings" msgstr "Verbindungseinstellungen speichern" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:259 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:261 msgid "Auto-connect on server startup" msgstr "Automatische Verbindung beim Start des Servers" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:261 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:263 #: octoprint_mrbeam/templates/wizard/wizard_wifi.jinja2:54 msgid "Connect" msgstr "Verbinden" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:273 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:275 msgid "Designs" msgstr "Designs" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:274 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:276 msgid "Clear all" msgstr "Zurücksetzen" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:280 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:282 msgid "Text" msgstr "Text" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:281 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:283 msgid "Shape" msgstr "Form" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:318 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:394 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:563 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:621 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:320 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:396 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:565 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:623 msgid "Transform" msgstr "Transformieren" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:323 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:399 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:570 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:626 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:325 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:401 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:572 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:628 msgid "translation" msgstr "Übersetzung" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:327 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:403 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:575 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:630 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:329 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:405 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:577 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:632 msgid "rotation" msgstr "Rotation" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:332 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:408 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:580 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:635 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:334 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:410 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:582 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:637 msgid "horizontal" msgstr "horizontal" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:337 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:413 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:585 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:640 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:339 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:415 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:587 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:642 msgid "vertical" msgstr "vertikal" # oder: # Skala? # Skalierung? -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:342 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:418 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:590 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:645 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:344 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:420 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:592 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:647 msgid "scale" msgstr "Skalierung" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:347 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:423 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:595 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:650 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:349 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:425 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:597 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:652 msgid "multiply" msgstr "multiplizieren" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:352 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:355 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:427 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:430 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:599 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:602 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:654 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:657 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:354 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:357 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:429 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:432 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:601 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:604 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:656 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:659 msgid "duplicate" msgstr "duplizieren" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:362 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:364 msgid "split" msgstr "zerteilten" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:365 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:367 msgid "by stroke color" msgstr "Nach Linienfarbe" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:368 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:370 msgid "into shapes (keep overlapping)" msgstr "in Formen (Überlappungen erhaltend)" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:371 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:373 msgid "vertically" msgstr "vertikal" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:374 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:376 msgid "horizontally" msgstr "horizontal" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:381 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:544 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:605 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:660 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:383 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:546 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:607 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:662 msgid "exceeds working area" msgstr "überschreitet den Arbeitsbereich" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:382 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:545 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:606 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:661 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:384 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:547 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:608 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:663 msgid "Design exceeds the working area." msgstr "Das Design überschreitet den Arbeitsbereich." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:383 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:547 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:607 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:662 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:385 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:549 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:609 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:664 msgid "Make it fit" msgstr "Anpassen" # Image adjustment sliders -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:455 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:457 msgid "contrast" msgstr "Kontrast" # Image adjustment sliders -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:466 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:468 msgid "brightness" msgstr "Helligkeit" # Image adjustment sliders -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:478 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:480 msgid "sharpen" msgstr "Schärfe" # Image adjustment sliders -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:489 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:491 msgid "gamma" msgstr "Gamma" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:516 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:518 msgid "crop" msgstr "zuschneiden" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:560 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:620 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:562 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:622 msgid "Edit" msgstr "Bearbeiten" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:747 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:750 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:753 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:756 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:749 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:752 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:755 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:758 msgid "" "The system can not find the pink marker in the device in this corner of the " "workin area. Please make sure that it is visible for the camera." @@ -4295,6 +4304,7 @@ msgid "Usernames, email addresses or passwords." msgstr "Nutzernamen, Emailadressen oder Passwörter." #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:50 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:50 msgid "Camera pictures (except if explicitly and actively sent by you.)" msgstr "" "Kamerabilder (ausser wenn sie von Dir explizit und aktiv gesendet werden.)" @@ -4303,11 +4313,12 @@ msgstr "" # „Ortsdaten“…. # > Standortdaten #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:51 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:51 msgid "Location or public IP addresses." msgstr "Standortdaten oder öffentliche IP Adressen." #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:59 -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:61 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:62 #, python-format msgid "" "Want more detailed information? You can check our %(open)sprivacy policy" @@ -4954,18 +4965,37 @@ msgstr "" msgid "No, I’d rather not share the analytics data." msgstr "Nein, ich möchte lieber keine Analysedaten teilen." -# vorheriger Vorschlag für „Locaton“: -# „Ortsdaten“…. -# > Standortdaten -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:50 -msgid "Location, camera pictures, public IP addresses." -msgstr "Standortdaten, Kamerabilder, öffentliche IP Adressen." - -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:58 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:59 msgid "" "You can change you choice any time in the menu \"Settings > Analytics\"." msgstr "Du kannst Deine Auswahl jederzeit im Menü “Einstellungen > Analytics”" +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:3 +msgid "The new Mr Beam Design Store" +msgstr "Der neue Mr Beam Design-Store" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:19 +msgid "Buy beautiful designs, integrated in your Mr Beam software" +msgstr "" +"Kaufe schöne Designs, die in deine Mr Beam Software integriert sind" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:23 +msgid "Create wonderful objects" +msgstr "Erstelle tolle Objekte" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:32 +msgid "All Beta users get 300 Beam Coins for free!" +msgstr "Alle Beta User bekommen 300 Beam Coins gratis!" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:40 +#, python-format +msgid "" +"For more information about the Design Store, visit our %(tag_open)sKnowledge " +"Base%(tag_close)s." +msgstr "" +"Für mehr Informationen über unseren Design-Store, besuche unsere " +"%(tag_open)sKnowledge Base%(tag_close)s." + #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_0.jinja2:1 msgid "Improved Camera" msgstr "Verbesserte Kamera" @@ -5157,6 +5187,16 @@ msgstr "Daemon offline" msgid "Reset daemon" msgstr "Dämon zurücksetzen" +# Settings > About Screen +#~ msgid "What's New in the Stable Channel" +#~ msgstr "Was gibt’s Neues im Stabilen Kanal?" + +# vorheriger Vorschlag für „Locaton“: +# „Ortsdaten“…. +# > Standortdaten +#~ msgid "Location, camera pictures, public IP addresses." +#~ msgstr "Standortdaten, Kamerabilder, öffentliche IP Adressen." + #~ msgid "Quick Shapes" #~ msgstr "Quick Form" diff --git a/octoprint_mrbeam/translations/es/LC_MESSAGES/messages.mo b/octoprint_mrbeam/translations/es/LC_MESSAGES/messages.mo index c51fad36c..921a0fcf4 100644 Binary files a/octoprint_mrbeam/translations/es/LC_MESSAGES/messages.mo and b/octoprint_mrbeam/translations/es/LC_MESSAGES/messages.mo differ diff --git a/octoprint_mrbeam/translations/es/LC_MESSAGES/messages.po b/octoprint_mrbeam/translations/es/LC_MESSAGES/messages.po index ddb33f582..1cb1b5242 100644 --- a/octoprint_mrbeam/translations/es/LC_MESSAGES/messages.po +++ b/octoprint_mrbeam/translations/es/LC_MESSAGES/messages.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Mr_Beam 0.1.61\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-08-20 09:34+0200\n" -"PO-Revision-Date: 2020-08-20 09:40+0200\n" +"POT-Creation-Date: 2020-09-07 08:10+0200\n" +"PO-Revision-Date: 2020-09-07 08:15+0200\n" "Last-Translator: Andy Werner \n" "Language-Team: \n" "Language: es_ES\n" @@ -48,7 +48,7 @@ msgstr "Acerca de este Mr Beam" #: octoprint_mrbeam/__init__.py:685 #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:9 #: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:8 -#: octoprint_mrbeam/wizard_config.py:98 octoprint_mrbeam/wizard_config.py:156 +#: octoprint_mrbeam/wizard_config.py:105 octoprint_mrbeam/wizard_config.py:163 msgid "Analytics" msgstr "Analytics" @@ -80,36 +80,40 @@ msgstr "Se está tomando una nueva imagen, espera un poco por favor..." msgid "Either the camera is busy or the lid is not open." msgstr "La cámara está ocupada o la tapa no está abierta." -#: octoprint_mrbeam/wizard_config.py:71 +#: octoprint_mrbeam/wizard_config.py:78 msgid "Connection" msgstr "Conexión" -#: octoprint_mrbeam/wizard_config.py:80 +#: octoprint_mrbeam/wizard_config.py:87 msgid "Your user" msgstr "Tu usuario" -#: octoprint_mrbeam/wizard_config.py:89 +#: octoprint_mrbeam/wizard_config.py:96 msgid "For your safety" msgstr "Para tu seguridad" -#: octoprint_mrbeam/wizard_config.py:120 +#: octoprint_mrbeam/wizard_config.py:127 msgid "Improved camera" msgstr "Mejoras en la cámara" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_1.jinja2:2 -#: octoprint_mrbeam/wizard_config.py:129 +#: octoprint_mrbeam/wizard_config.py:136 msgid "Custom material backup" msgstr "Backup de ajustes de material personalizados" -#: octoprint_mrbeam/wizard_config.py:138 +#: octoprint_mrbeam/wizard_config.py:145 msgid "SVG split" msgstr "Dividir SVGs" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_3.jinja2:2 -#: octoprint_mrbeam/wizard_config.py:147 +#: octoprint_mrbeam/wizard_config.py:154 msgid "...and more!" msgstr "...y mucho más!" +#: octoprint_mrbeam/wizard_config.py:186 +msgid "Design Store" +msgstr "Design Store" + #: octoprint_mrbeam/printing/comm_acc2.py:314 #: octoprint_mrbeam/printing/comm_acc2.py:353 msgid "Please contact Mr Beam support team and attach octoprint.log." @@ -184,8 +188,8 @@ msgstr "solo grabar" #: octoprint_mrbeam/static/js/convert.js:409 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:135 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:306 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:178 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:242 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:180 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:244 msgid "mm" msgstr "mm" @@ -714,7 +718,7 @@ msgstr "¿Listo para empezar?" #: octoprint_mrbeam/templates/calibration/watterott/tab_corner_calibration.jinja2:101 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:152 #: octoprint_mrbeam/templates/settings.jinja2:52 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:128 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:130 #: octoprint_mrbeam/templates/take_photo.jinja2:10 msgid "Cancel" msgstr "Cancelar" @@ -1271,21 +1275,21 @@ msgstr "" "No se ha podido guardar tu estado de Analytics en este momento." "%(br)sComprueba la conexión de Mr Beam e inténtalo de nuevo." -#: octoprint_mrbeam/static/js/wizard_general.js:37 +#: octoprint_mrbeam/static/js/wizard_general.js:38 msgid "Let's go!" msgstr "¡Vamos allá!" #: octoprint_mrbeam/static/js/wizard_general.js:42 -msgid "What's New" -msgstr "Novedades" +msgid "Welcome dialog" +msgstr "Welcome dialog" #: octoprint_mrbeam/static/js/wizard_general.js:44 -msgid "What's New in the Stable Channel" -msgstr "Novedades en el Canal Estable" +msgid "What's New" +msgstr "Novedades" -#: octoprint_mrbeam/static/js/wizard_general.js:47 -msgid "Welcome dialog" -msgstr "Welcome dialog" +#: octoprint_mrbeam/static/js/wizard_general.js:46 +msgid "What's New in Beta" +msgstr "Novedades en Beta" #: octoprint_mrbeam/static/js/working_area.js:84 msgid "Rectangle" @@ -1972,7 +1976,7 @@ msgid "Basic" msgstr "Básico" #: octoprint_mrbeam/templates/conversion_dialog.jinja2:338 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:443 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:445 msgid "Image Preprocessing" msgstr "Preprocesamiento de imágenes" @@ -2536,13 +2540,13 @@ msgid "Something went wrong" msgstr "Algo ha salido mal" #: octoprint_mrbeam/templates/loading_overlay.jinja2:222 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:767 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:769 msgid "Serial" msgstr "Número de serie" #: octoprint_mrbeam/templates/loading_overlay.jinja2:223 #: octoprint_mrbeam/templates/loginscreen_viewmodel.jinja2:13 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:768 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:770 msgid "Mr Beam Name" msgstr "Nombre del Mr Beam" @@ -3040,11 +3044,11 @@ msgstr "Descargar" #: octoprint_mrbeam/templates/tab_designlib.jinja2:223 #: octoprint_mrbeam/templates/tab_designlib.jinja2:255 #: octoprint_mrbeam/templates/tab_designlib.jinja2:286 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:301 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:319 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:395 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:566 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:622 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:303 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:321 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:397 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:568 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:624 msgid "Remove" msgstr "Eliminar" @@ -3207,7 +3211,7 @@ msgid "set units to millimeters" msgstr "ajustar las unidades a milímetros" #: octoprint_mrbeam/templates/tab_terminal.jinja2:138 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:130 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:132 msgid "Send" msgstr "Enviar" @@ -3232,7 +3236,7 @@ msgid "Offline" msgstr "Offline" #: octoprint_mrbeam/templates/tab_workingarea.jinja2:25 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:279 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:281 msgid "File" msgstr "Archivo" @@ -3287,15 +3291,20 @@ msgstr "" " Asegúrate de " "que los cuatro marcadores son visibles." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:95 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:88 +msgid "More info" +msgstr "" + +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:90 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:97 msgid "Send image to Mr Beam" msgstr "Enviar la imagen a Mr Beam" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:99 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:101 msgid "Send the current image to Mr Beam Lasers for review." msgstr "Enviar la imagen actual a Mr Beam Lasers para su revisión." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:100 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:102 msgid "" "This helps us to improve the camera system to work better in even more " "difficult conditions." @@ -3303,31 +3312,31 @@ msgstr "" "Esto nos ayuda a mejorar la cámara para que funcione mejor en condiciones " "aún más difíciles." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:106 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:108 msgid "Mr Beam Lasers might store your image in it's camera training data set." msgstr "" "Puede que Mr Beam Lasers almacene la imagen en su conjunto de datos para " "entrenar la cámara." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:107 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:109 msgid "" "Please understand that Mr Beam Lasers can not send you any response " "regarding this image." msgstr "" "Por favor, entiende que Mr Beam Lasers no puede responderte a esta imagen." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:108 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:110 msgid "Mr Beam Lasers will not publish the image nor sell it to third parties." msgstr "Mr Beam Lasers no publicará ni venderá esta imagen a terceros." #: octoprint_mrbeam/templates/settings/about_settings.jinja2:94 #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:10 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:109 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:111 #: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:9 msgid "/plugin/mrbeam/static/docs/MrBeamAnalytics-PrivacyPolicy_en.pdf" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:110 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:112 #, python-format msgid "" "Your image is sent within the context of Mr Beam Analytics. (See " @@ -3336,7 +3345,7 @@ msgstr "" "Tu imagen se mandará en el contexto de Mr Beam Analytics. (Mira la " "%(open)spolítica de privacidad%(close)s.)" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:111 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:113 msgid "" "The upload of your image to Mr Beam's servers will happen in the background. " "If you're not online, the image will be uploaded next time you're online." @@ -3344,15 +3353,15 @@ msgstr "" "La carga de tu imagen a los servidores de Mr Beam se hará en segundo plano. " "Si no estás en línea, la imagen se subirá la próxima vez que estés en línea." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:115 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:117 msgid "We appreciate your support. Thank you!" msgstr "¡Gracias por tu ayuda!" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:119 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:121 msgid "Activate Mr Beam Analytics:" msgstr "Activa Mr Beam Analytics:" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:121 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:123 msgid "" "This functionality is part of Mr Beam Analytics which needs to be " "enabled to use this functionality." @@ -3360,21 +3369,21 @@ msgstr "" "Esta funcionalidad es parte de Mr Beam Analytics, así que necesita ser " "habilitada para usarla." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:122 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:124 #, python-format msgid "Please go to %(open)sMr Beam Analytics%(close)s to enable it." msgstr "" "Por favor, ve a %(open)sMr Beam Analytics%(close)s para habilitarlo." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:137 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 msgid "Low" msgstr "Baja" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:137 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 msgid "Picture Quality" msgstr "Calidad de Imagen" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:141 msgid "" "- Open the lid and keep your hands off the working area for a few seconds to " "receive a higher resolution image" @@ -3383,213 +3392,213 @@ msgstr "" "segundos para recibir una imagen de mayor resolución" #: octoprint_mrbeam/templates/settings/leds_settings.jinja2:6 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:144 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:146 msgid "Brightness" msgstr "Brillo" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:154 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:156 msgid "Zoom" msgstr "Zoom" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:169 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:171 msgid "Scroll to zoom" msgstr "Desliza para hacer zoom" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:173 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:175 msgid "Object height" msgstr "Altura del objeto" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:186 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:188 msgid "Firmware update in progress" msgstr "Actualización del firmware en curso" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:191 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:193 msgid "Do not power off the machine during the flashing process." msgstr "No apagues la máquina mientras se flashea." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:196 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:198 msgid "Position" msgstr "Posición" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:207 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:209 msgid "XY-Axes" msgstr "Ejes XY" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:223 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:225 msgid "Z-Axis" msgstr "Eje Z" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:237 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:239 msgid "Jog distance:" msgstr "Distancia de movimiento:" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:251 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:253 msgid "Serial Port" msgstr "Puerto Serie" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:253 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:255 msgid "Baudrate" msgstr "Velocidad de Transmisión" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:256 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:258 msgid "Save connection settings" msgstr "Guardar ajustes de conexión" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:259 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:261 msgid "Auto-connect on server startup" msgstr "Conectar automáticamente al iniciar el servidor" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:261 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:263 #: octoprint_mrbeam/templates/wizard/wizard_wifi.jinja2:54 msgid "Connect" msgstr "Conectar" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:273 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:275 msgid "Designs" msgstr "Diseños" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:274 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:276 msgid "Clear all" msgstr "Borrar todo" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:280 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:282 msgid "Text" msgstr "Texto" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:281 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:283 msgid "Shape" msgstr "Forma" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:318 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:394 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:563 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:621 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:320 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:396 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:565 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:623 msgid "Transform" msgstr "Transformar" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:323 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:399 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:570 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:626 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:325 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:401 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:572 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:628 msgid "translation" msgstr "traslación" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:327 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:403 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:575 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:630 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:329 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:405 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:577 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:632 msgid "rotation" msgstr "rotación" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:332 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:408 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:580 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:635 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:334 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:410 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:582 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:637 msgid "horizontal" msgstr "horizontal" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:337 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:413 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:585 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:640 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:339 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:415 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:587 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:642 msgid "vertical" msgstr "vertical" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:342 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:418 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:590 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:645 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:344 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:420 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:592 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:647 msgid "scale" msgstr "escalar" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:347 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:423 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:595 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:650 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:349 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:425 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:597 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:652 msgid "multiply" msgstr "multiplicar" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:352 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:355 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:427 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:430 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:599 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:602 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:654 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:657 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:354 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:357 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:429 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:432 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:601 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:604 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:656 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:659 msgid "duplicate" msgstr "duplicar" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:362 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:364 msgid "split" msgstr "dividir" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:365 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:367 msgid "by stroke color" msgstr "por el color del trazo" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:368 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:370 msgid "into shapes (keep overlapping)" msgstr "en formas (mantiene las superposiciones)" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:371 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:373 msgid "vertically" msgstr "verticalmente" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:374 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:376 msgid "horizontally" msgstr "horizontalmente" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:381 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:544 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:605 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:660 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:383 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:546 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:607 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:662 msgid "exceeds working area" msgstr "excede el área de trabajo" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:382 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:545 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:606 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:661 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:384 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:547 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:608 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:663 msgid "Design exceeds the working area." msgstr "El diseño excede el área de trabajo." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:383 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:547 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:607 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:662 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:385 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:549 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:609 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:664 msgid "Make it fit" msgstr "Ajustar" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:455 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:457 msgid "contrast" msgstr "contraste" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:466 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:468 msgid "brightness" msgstr "brillo" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:478 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:480 msgid "sharpen" msgstr "nitidez" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:489 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:491 msgid "gamma" msgstr "gamma" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:516 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:518 msgid "crop" msgstr "recortar" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:560 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:620 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:562 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:622 msgid "Edit" msgstr "Editar" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:747 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:750 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:753 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:756 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:749 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:752 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:755 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:758 msgid "" "The system can not find the pink marker in the device in this corner of the " "workin area. Please make sure that it is visible for the camera." @@ -4106,16 +4115,18 @@ msgid "Usernames, email addresses or passwords." msgstr "Nombres de usuario, direcciones de e-mail o contraseñas." #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:50 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:50 msgid "Camera pictures (except if explicitly and actively sent by you.)" msgstr "" "Imágenes de la cámara (excepto si las envías de forma explícita y activa)" #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:51 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:51 msgid "Location or public IP addresses." msgstr "Ubicación o direcciones de IP públicas." #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:59 -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:61 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:62 #, python-format msgid "" "Want more detailed information? You can check our %(open)sprivacy policy" @@ -4751,17 +4762,38 @@ msgstr "" msgid "No, I’d rather not share the analytics data." msgstr "No, prefiero no compartir datos de Analytics." -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:50 -msgid "Location, camera pictures, public IP addresses." -msgstr "Ubicación, fotos de la cámara, direcciones de IP públicas." - -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:58 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:59 msgid "" "You can change you choice any time in the menu \"Settings > Analytics\"." msgstr "" "Puedes cambiar tu elección en los \"Ajustes > Analytics\" siempre que " "quieras." +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:3 +msgid "The new Mr Beam Design Store" +msgstr "El nuevo Mr Beam Design Store" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:19 +msgid "Buy beautiful designs, integrated in your Mr Beam software" +msgstr "Compra hermosos diseños, integrado en el software de tu Mr Beam" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:23 +msgid "Create wonderful objects" +msgstr "Crear objetos maravillosos" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:32 +msgid "All Beta users get 300 Beam Coins for free!" +msgstr "¡Todos los usuarios de Beta reciben 300 Beam Coins gratis!" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:40 +#, python-format +msgid "" +"For more information about the Design Store, visit our %(tag_open)sKnowledge " +"Base%(tag_close)s." +msgstr "" +"Para más información sobre visita nuestra %(tag_open)sKnowledge Base" +"%(tag_close)s" + #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_0.jinja2:1 msgid "Improved Camera" msgstr "Mejoras en la cámara" @@ -4950,6 +4982,12 @@ msgstr "Daemon apagado" msgid "Reset daemon" msgstr "Resetear daemon" +#~ msgid "What's New in the Stable Channel" +#~ msgstr "Novedades en el Canal Estable" + +#~ msgid "Location, camera pictures, public IP addresses." +#~ msgstr "Ubicación, fotos de la cámara, direcciones de IP públicas." + #~ msgid "Quick Shapes" #~ msgstr "Quick Shapes" diff --git a/octoprint_mrbeam/translations/fr/LC_MESSAGES/messages.mo b/octoprint_mrbeam/translations/fr/LC_MESSAGES/messages.mo index 821ee87a4..6a2c1d092 100644 Binary files a/octoprint_mrbeam/translations/fr/LC_MESSAGES/messages.mo and b/octoprint_mrbeam/translations/fr/LC_MESSAGES/messages.mo differ diff --git a/octoprint_mrbeam/translations/fr/LC_MESSAGES/messages.po b/octoprint_mrbeam/translations/fr/LC_MESSAGES/messages.po index 445ce15b3..7b05c8043 100644 --- a/octoprint_mrbeam/translations/fr/LC_MESSAGES/messages.po +++ b/octoprint_mrbeam/translations/fr/LC_MESSAGES/messages.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-08-18 13:07+0200\n" -"PO-Revision-Date: 2020-08-18 13:31+0200\n" +"POT-Creation-Date: 2020-09-07 08:10+0200\n" +"PO-Revision-Date: 2020-09-07 09:44+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr_FR\n" @@ -12,99 +12,103 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "Generated-By: Babel 2.6.0\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.1\n" -#: octoprint_mrbeam/__init__.py:683 +#: octoprint_mrbeam/__init__.py:680 #: octoprint_mrbeam/templates/settings/svgtogcode_settings.jinja2:2 msgid "File Import Settings" msgstr "Paramètres d'import de fichiers" -#: octoprint_mrbeam/__init__.py:684 +#: octoprint_mrbeam/__init__.py:681 #: octoprint_mrbeam/templates/settings/camera_settings.jinja2:4 msgid "Camera" msgstr "Caméra" -#: octoprint_mrbeam/__init__.py:685 +#: octoprint_mrbeam/__init__.py:682 #: octoprint_mrbeam/templates/settings/backlash_settings.jinja2:2 msgid "Precision Calibration" msgstr "Calibration de précision" -#: octoprint_mrbeam/__init__.py:686 +#: octoprint_mrbeam/__init__.py:683 #: octoprint_mrbeam/templates/calibration/watterott/calibration_tool.jinja2:52 #: octoprint_mrbeam/templates/settings/debug_settings.jinja2:5 msgid "Debug" msgstr "Débogage" -#: octoprint_mrbeam/__init__.py:687 +#: octoprint_mrbeam/__init__.py:684 #: octoprint_mrbeam/templates/settings/about_settings.jinja2:2 msgid "About This Mr Beam" msgstr "A propos de ce Mr Beam" -#: octoprint_mrbeam/__init__.py:688 +#: octoprint_mrbeam/__init__.py:685 #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:9 #: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:8 -#: octoprint_mrbeam/wizard_config.py:98 octoprint_mrbeam/wizard_config.py:156 +#: octoprint_mrbeam/wizard_config.py:105 octoprint_mrbeam/wizard_config.py:163 msgid "Analytics" msgstr "Analytiques" -#: octoprint_mrbeam/__init__.py:689 +#: octoprint_mrbeam/__init__.py:686 #: octoprint_mrbeam/templates/settings/reminders_settings.jinja2:2 msgid "Reminders" msgstr "Rappels" -#: octoprint_mrbeam/__init__.py:690 +#: octoprint_mrbeam/__init__.py:687 #: octoprint_mrbeam/templates/settings/maintenance_settings.jinja2:2 msgid "Maintenance" msgstr "Maintenance" -#: octoprint_mrbeam/__init__.py:691 +#: octoprint_mrbeam/__init__.py:688 #: octoprint_mrbeam/templates/settings/leds_settings.jinja2:2 msgid "Mr Beam Lights" msgstr "Lumières Mr Beam" -#: octoprint_mrbeam/__init__.py:692 +#: octoprint_mrbeam/__init__.py:689 #: octoprint_mrbeam/templates/settings/custom_material_settings.jinja2:2 msgid "Custom Material Settings" msgstr "Paramètres des Matériaux Personnalisés" -#: octoprint_mrbeam/__init__.py:1816 +#: octoprint_mrbeam/__init__.py:1813 msgid "A new picture is being taken, please wait a little..." msgstr "Une nouvelle image a été prise, veuillez attendre un instant..." -#: octoprint_mrbeam/__init__.py:1819 +#: octoprint_mrbeam/__init__.py:1816 msgid "Either the camera is busy or the lid is not open." msgstr "La caméra est occupée ou le couvercle n'est pas ouvert." -#: octoprint_mrbeam/wizard_config.py:71 +#: octoprint_mrbeam/wizard_config.py:78 msgid "Connection" msgstr "Connection" -#: octoprint_mrbeam/wizard_config.py:80 +#: octoprint_mrbeam/wizard_config.py:87 msgid "Your user" msgstr "Votre utilisateur" -#: octoprint_mrbeam/wizard_config.py:89 +#: octoprint_mrbeam/wizard_config.py:96 msgid "For your safety" msgstr "Pour votre sécurité" -#: octoprint_mrbeam/wizard_config.py:120 +#: octoprint_mrbeam/wizard_config.py:127 msgid "Improved camera" msgstr "Caméra améliorée" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_1.jinja2:2 -#: octoprint_mrbeam/wizard_config.py:129 +#: octoprint_mrbeam/wizard_config.py:136 msgid "Custom material backup" msgstr "Sauvegarde des Matériaux Personnalisés" -#: octoprint_mrbeam/wizard_config.py:138 +#: octoprint_mrbeam/wizard_config.py:145 msgid "SVG split" msgstr "Séparation SVG" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_3.jinja2:2 -#: octoprint_mrbeam/wizard_config.py:147 +#: octoprint_mrbeam/wizard_config.py:154 msgid "...and more!" msgstr "...et plus encore !" +#: octoprint_mrbeam/wizard_config.py:186 +msgid "Design Store" +msgstr "Design Store" + #: octoprint_mrbeam/printing/comm_acc2.py:314 #: octoprint_mrbeam/printing/comm_acc2.py:353 msgid "Please contact Mr Beam support team and attach octoprint.log." @@ -179,8 +183,8 @@ msgstr "gravure uniquement" #: octoprint_mrbeam/static/js/convert.js:409 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:135 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:306 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:178 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:242 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:180 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:244 msgid "mm" msgstr "mm" @@ -443,7 +447,7 @@ msgstr "Acrylique" #: octoprint_mrbeam/static/js/material_settings.js:226 #: octoprint_mrbeam/static/js/material_settings.js:227 msgid " " -msgstr "" +msgstr " " #: octoprint_mrbeam/static/js/material_settings.js:50 msgid "Anodized Aluminum" @@ -711,7 +715,7 @@ msgstr "Prêt pour la découpe ?" #: octoprint_mrbeam/templates/calibration/watterott/tab_corner_calibration.jinja2:101 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:152 #: octoprint_mrbeam/templates/settings.jinja2:52 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:128 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:130 #: octoprint_mrbeam/templates/take_photo.jinja2:10 msgid "Cancel" msgstr "Annuler" @@ -773,7 +777,7 @@ msgstr "" #: octoprint_mrbeam/static/js/mrbeam.js:369 msgid "Beta user: Please consider enabling Mr Beam analytics!" msgstr "" -"Utilisateur de la version bêta : Pensez à activer l'analyse des données de " +"Utilisateur de la version Bêta : Pensez à activer l'analyse des données de " "Mr Beam !" #: octoprint_mrbeam/static/js/mrbeam.js:370 @@ -784,7 +788,7 @@ msgid "" "experience working with the%(br)s Mr Beam. Thank you!%(br)s%(open)sGo to " "analytics settings%(close)s" msgstr "" -"Comme vous êtes actuellement sur notre canal Beta, vous nous aidez énormément" +"Comme vous êtes actuellement sur notre canal Bêta, vous nous aidez énormément" "%(br)ssi vous partagez votre expérience avec nous,%(br)safin que nous en " "améliorons l'utilisation globale. Merci!%(br)s%(open)sParamètres de partages " "de données%(close)s" @@ -1287,21 +1291,21 @@ msgstr "" "Impossible d'enregistrer vos paramètres pour le partage de données pour le " "moment. %(br)sVérifiez votre connexion à Mr Beam et réessayer." -#: octoprint_mrbeam/static/js/wizard_general.js:37 +#: octoprint_mrbeam/static/js/wizard_general.js:38 msgid "Let's go!" msgstr "C'est parti !" #: octoprint_mrbeam/static/js/wizard_general.js:42 -msgid "What's New" -msgstr "Quoi de Neuf" +msgid "Welcome dialog" +msgstr "Dialogue de bienvenue" #: octoprint_mrbeam/static/js/wizard_general.js:44 -msgid "What's New in the Stable Channel" -msgstr "Les nouveautés du Canal Stable" +msgid "What's New" +msgstr "Quoi de Neuf" -#: octoprint_mrbeam/static/js/wizard_general.js:47 -msgid "Welcome dialog" -msgstr "Dialogue de bienvenue" +#: octoprint_mrbeam/static/js/wizard_general.js:46 +msgid "What's New in Beta" +msgstr "Quoi de Neuf pour la Bêta" #: octoprint_mrbeam/static/js/working_area.js:84 msgid "Rectangle" @@ -1319,11 +1323,11 @@ msgstr "Étoile" msgid "Heart" msgstr "Coeur" -#: octoprint_mrbeam/static/js/working_area.js:938 +#: octoprint_mrbeam/static/js/working_area.js:941 msgid "Limited split result." msgstr "Résultat de la séparation limitée." -#: octoprint_mrbeam/static/js/working_area.js:939 +#: octoprint_mrbeam/static/js/working_area.js:942 msgid "" "Splitting this design would result in too many parts. Here are " "${split_result.length} parts. You can split the last one again if necessary." @@ -1331,27 +1335,27 @@ msgstr "" "Ce design se sépare en trop d'éléments. Voici ${split_result.length} " "éléments. Vous pouvez séparer le dernier à nouveau si besoin." -#: octoprint_mrbeam/static/js/working_area.js:948 +#: octoprint_mrbeam/static/js/working_area.js:951 msgid "No different line colors found." msgstr "Toutes les lignes sont de la même couleur." -#: octoprint_mrbeam/static/js/working_area.js:951 +#: octoprint_mrbeam/static/js/working_area.js:954 msgid "No non-intersecting shapes found." msgstr "Toutes les silhouettes s'intersectent." -#: octoprint_mrbeam/static/js/working_area.js:956 +#: octoprint_mrbeam/static/js/working_area.js:959 msgid "Looks like a single path." msgstr "Il semblerait que ce soit un seul tracé." -#: octoprint_mrbeam/static/js/working_area.js:959 +#: octoprint_mrbeam/static/js/working_area.js:962 msgid "Element not splittable with this method." msgstr "Cet élément n'est pas séparable avec cette méthode." -#: octoprint_mrbeam/static/js/working_area.js:960 +#: octoprint_mrbeam/static/js/working_area.js:963 msgid "Can't split this design." msgstr "Impossible de séparer ce design." -#: octoprint_mrbeam/static/js/working_area.js:1287 +#: octoprint_mrbeam/static/js/working_area.js:1290 #, python-format msgid "" "The SVG file contains unsupported elements: '%(elemName)s' These elements " @@ -1360,12 +1364,12 @@ msgstr "" "Le fichier SVG contient des éléments non supportés : \"%(elemName)s\" Ces " "éléments ont été supprimés." -#: octoprint_mrbeam/static/js/working_area.js:1289 +#: octoprint_mrbeam/static/js/working_area.js:1292 #, python-format msgid "Unsupported elements in SVG: '%(elemName)s'" msgstr "Éléments non pris en charge dans SVG: \"%(elemName)s''" -#: octoprint_mrbeam/static/js/working_area.js:1297 +#: octoprint_mrbeam/static/js/working_area.js:1300 #, python-format msgid "" "The SVG file contains text elements.%(br)sIf you want to laser just their " @@ -1376,11 +1380,11 @@ msgstr "" "graver le contour, %(br)s veuillez en convertir le tracé;%(br)ssinon seul " "l'intérieur des lettres sera gravé." -#: octoprint_mrbeam/static/js/working_area.js:1299 +#: octoprint_mrbeam/static/js/working_area.js:1302 msgid "Text elements found" msgstr "Texte détecté" -#: octoprint_mrbeam/static/js/working_area.js:1310 +#: octoprint_mrbeam/static/js/working_area.js:1313 msgid "" "The SVG file contained style elements with online references. Since online " "references are not supported, we removed them. The image might look a bit " @@ -1390,11 +1394,11 @@ msgstr "" "Internet. Comme les références en ligne ne sont pas prises en charge, nous " "les avons supprimées. L'image peut sembler un peu différente maintenant." -#: octoprint_mrbeam/static/js/working_area.js:1312 +#: octoprint_mrbeam/static/js/working_area.js:1315 msgid "Style elements removed" msgstr "Éléments de style enlevés" -#: octoprint_mrbeam/static/js/working_area.js:1323 +#: octoprint_mrbeam/static/js/working_area.js:1326 msgid "" "The selected design file can not be handled. Please make sure it is a valid " "design file." @@ -1402,23 +1406,23 @@ msgstr "" "Impossible d'utiliser le fichier sélectionné. Veuillez vérifier que ce soit " "un design valide." -#: octoprint_mrbeam/static/js/working_area.js:1325 +#: octoprint_mrbeam/static/js/working_area.js:1328 msgid "File error." msgstr "Erreur de Fichier." -#: octoprint_mrbeam/static/js/working_area.js:1336 +#: octoprint_mrbeam/static/js/working_area.js:1339 msgid "The selected design file does not have any content." msgstr "Le ficher design sélectionné ne contient rien." -#: octoprint_mrbeam/static/js/working_area.js:1338 +#: octoprint_mrbeam/static/js/working_area.js:1341 msgid "Empty File." msgstr "Fichier vide." -#: octoprint_mrbeam/static/js/working_area.js:1349 +#: octoprint_mrbeam/static/js/working_area.js:1352 msgid "An unknown error occurred while processing this design file." msgstr "Une erreur inconnue s'est produite lors du traitement du fichier." -#: octoprint_mrbeam/static/js/working_area.js:1350 +#: octoprint_mrbeam/static/js/working_area.js:1353 msgid "" "Please try reloading this browser window and try again. If this error " "remains, contact the Mr Beam Support Team. Make sure you provide the error " @@ -1432,8 +1436,8 @@ msgstr "" #: octoprint_mrbeam/static/js/calibration/camera_calibration.js:219 #: octoprint_mrbeam/static/js/calibration/camera_calibration.js:811 #: octoprint_mrbeam/static/js/calibration/camera_calibration.js:839 -#: octoprint_mrbeam/static/js/working_area.js:1351 -#: octoprint_mrbeam/static/js/working_area.js:1353 +#: octoprint_mrbeam/static/js/working_area.js:1354 +#: octoprint_mrbeam/static/js/working_area.js:1356 msgid "Error" msgstr "Erreur" @@ -1990,7 +1994,7 @@ msgid "Basic" msgstr "Basique" #: octoprint_mrbeam/templates/conversion_dialog.jinja2:338 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:443 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:445 msgid "Image Preprocessing" msgstr "Traitement de l'image" @@ -2559,13 +2563,13 @@ msgid "Something went wrong" msgstr "Quelque chose s'est mal passé" #: octoprint_mrbeam/templates/loading_overlay.jinja2:222 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:767 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:769 msgid "Serial" msgstr "N° de série" #: octoprint_mrbeam/templates/loading_overlay.jinja2:223 #: octoprint_mrbeam/templates/loginscreen_viewmodel.jinja2:13 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:768 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:770 msgid "Mr Beam Name" msgstr "Nom du Mr Beam" @@ -2914,7 +2918,7 @@ msgstr "" #: octoprint_mrbeam/templates/software_channel_selector.jinja2:17 msgid "Beta Channel" -msgstr "Canal Beta" +msgstr "Canal Bêta" #: octoprint_mrbeam/templates/software_channel_selector.jinja2:18 msgid "" @@ -3061,11 +3065,11 @@ msgstr "Télécharger" #: octoprint_mrbeam/templates/tab_designlib.jinja2:223 #: octoprint_mrbeam/templates/tab_designlib.jinja2:255 #: octoprint_mrbeam/templates/tab_designlib.jinja2:286 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:301 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:319 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:395 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:566 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:622 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:303 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:321 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:397 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:568 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:624 msgid "Remove" msgstr "Supprimer" @@ -3229,7 +3233,7 @@ msgid "set units to millimeters" msgstr "afficher les unités en millimètres" #: octoprint_mrbeam/templates/tab_terminal.jinja2:138 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:130 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:132 msgid "Send" msgstr "Envoyer" @@ -3254,7 +3258,7 @@ msgid "Offline" msgstr "Hors ligne" #: octoprint_mrbeam/templates/tab_workingarea.jinja2:25 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:279 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:281 msgid "File" msgstr "Fichier" @@ -3308,15 +3312,20 @@ msgstr "" " Assurez vous " "que les quatre cercles sont visibles." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:95 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:88 +msgid "More info" +msgstr "" + +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:90 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:97 msgid "Send image to Mr Beam" msgstr "Envoyer l'image à Mr Beam" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:99 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:101 msgid "Send the current image to Mr Beam Lasers for review." msgstr "Envoyer l'image affichée à Mr Beam Lasers pour être analysée." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:100 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:102 msgid "" "This helps us to improve the camera system to work better in even more " "difficult conditions." @@ -3324,13 +3333,13 @@ msgstr "" "Ceci nous aide a améliorer le système de caméra pour le faire fonctionner " "dans des conditions difficiles." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:106 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:108 msgid "Mr Beam Lasers might store your image in it's camera training data set." msgstr "" "Mr Beam Lasers peut sauvegarder votre image dans son répertoire " "d'entraînement." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:107 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:109 msgid "" "Please understand that Mr Beam Lasers can not send you any response " "regarding this image." @@ -3338,7 +3347,7 @@ msgstr "" "Veuillez comprendre que Mr Beam Lasers ne peut pas vous envoyer de réponse " "vis-à-vis de votre image." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:108 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:110 msgid "Mr Beam Lasers will not publish the image nor sell it to third parties." msgstr "" "Mr Beam Lasers ne va pas publier ou vendre ces informations et images à un " @@ -3346,12 +3355,12 @@ msgstr "" #: octoprint_mrbeam/templates/settings/about_settings.jinja2:94 #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:10 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:109 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:111 #: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:9 msgid "/plugin/mrbeam/static/docs/MrBeamAnalytics-PrivacyPolicy_en.pdf" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:110 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:112 #, python-format msgid "" "Your image is sent within the context of Mr Beam Analytics. (See " @@ -3360,7 +3369,7 @@ msgstr "" "Votre image est envoyée dans le contexte des paratges de données de Mr Beam. " "(Voir %(open)sla politique de confidentialité%(close)s.)" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:111 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:113 msgid "" "The upload of your image to Mr Beam's servers will happen in the background. " "If you're not online, the image will be uploaded next time you're online." @@ -3368,15 +3377,15 @@ msgstr "" "L'image est envoyée aux serveurs de Mr Beam en tâche de fond maintenant ou " "la prochaine fois que vous êtes en ligne." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:115 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:117 msgid "We appreciate your support. Thank you!" msgstr "Nous apprécions votre soutien. Merci!" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:119 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:121 msgid "Activate Mr Beam Analytics:" msgstr "Activer les partages de données de Mr Beam:" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:121 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:123 msgid "" "This functionality is part of Mr Beam Analytics which needs to be " "enabled to use this functionality." @@ -3384,22 +3393,22 @@ msgstr "" "Cette fonctionnalité fait parti des partages de données de Mr Beam qui " "nécessitent d'être activées." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:122 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:124 #, python-format msgid "Please go to %(open)sMr Beam Analytics%(close)s to enable it." msgstr "" "Veuillez aller aux %(open)spartages de données Mr Beam%(close)s pour " "l'activer." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:137 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 msgid "Low" msgstr "Basse" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:137 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 msgid "Picture Quality" msgstr "Qualité d'image" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:141 msgid "" "- Open the lid and keep your hands off the working area for a few seconds to " "receive a higher resolution image" @@ -3408,213 +3417,213 @@ msgstr "" "quelques secondes afin de recevoir une image de meilleure résolution" #: octoprint_mrbeam/templates/settings/leds_settings.jinja2:6 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:144 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:146 msgid "Brightness" msgstr "Luminosité" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:154 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:156 msgid "Zoom" msgstr "Zoom" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:169 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:171 msgid "Scroll to zoom" msgstr "Utiliser la molette pour zoomer" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:173 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:175 msgid "Object height" msgstr "Hauteur de l'objet" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:186 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:188 msgid "Firmware update in progress" msgstr "Mise à jour du firmware en cours" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:191 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:193 msgid "Do not power off the machine during the flashing process." msgstr "Ne pas éteindre la machine pendant le clignotement." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:196 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:198 msgid "Position" msgstr "Position" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:207 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:209 msgid "XY-Axes" msgstr "Axe XY" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:223 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:225 msgid "Z-Axis" msgstr "Axe Z" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:237 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:239 msgid "Jog distance:" msgstr "Distance de parcours :" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:251 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:253 msgid "Serial Port" msgstr "Port série" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:253 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:255 msgid "Baudrate" msgstr "Vitesse de transmission" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:256 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:258 msgid "Save connection settings" msgstr "Enregistrer les paramètres de connexion" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:259 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:261 msgid "Auto-connect on server startup" msgstr "Auto-connection au démarrage du serveur" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:261 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:263 #: octoprint_mrbeam/templates/wizard/wizard_wifi.jinja2:54 msgid "Connect" msgstr "Connecter" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:273 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:275 msgid "Designs" msgstr "Conception" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:274 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:276 msgid "Clear all" msgstr "Tout retirer" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:280 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:282 msgid "Text" msgstr "Texte" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:281 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:283 msgid "Shape" msgstr "Forme" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:318 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:394 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:563 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:621 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:320 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:396 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:565 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:623 msgid "Transform" msgstr "Transformer" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:323 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:399 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:570 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:626 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:325 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:401 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:572 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:628 msgid "translation" msgstr "déplacer" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:327 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:403 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:575 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:630 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:329 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:405 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:577 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:632 msgid "rotation" msgstr "rotation" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:332 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:408 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:580 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:635 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:334 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:410 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:582 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:637 msgid "horizontal" msgstr "horizontal" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:337 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:413 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:585 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:640 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:339 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:415 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:587 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:642 msgid "vertical" msgstr "vertical" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:342 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:418 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:590 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:645 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:344 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:420 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:592 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:647 msgid "scale" msgstr "taille" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:347 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:423 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:595 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:650 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:349 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:425 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:597 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:652 msgid "multiply" msgstr "multiplier" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:352 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:355 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:427 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:430 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:599 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:602 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:654 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:657 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:354 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:357 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:429 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:432 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:601 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:604 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:656 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:659 msgid "duplicate" msgstr "dupliquer" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:362 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:364 msgid "split" msgstr "séparer" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:365 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:367 msgid "by stroke color" msgstr "selon la couleur du tracé" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:368 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:370 msgid "into shapes (keep overlapping)" msgstr "en différentes silhouettes (garde le chevauchage)" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:371 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:373 msgid "vertically" msgstr "verticalement" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:374 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:376 msgid "horizontally" msgstr "horizontalement" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:381 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:544 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:605 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:660 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:383 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:546 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:607 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:662 msgid "exceeds working area" msgstr "dépasse l'espace de travail" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:382 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:545 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:606 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:661 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:384 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:547 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:608 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:663 msgid "Design exceeds the working area." msgstr "La conception dépasse l'espace de travail." -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:383 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:547 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:607 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:662 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:385 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:549 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:609 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:664 msgid "Make it fit" msgstr "Arranger ça" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:455 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:457 msgid "contrast" msgstr "contraste" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:466 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:468 msgid "brightness" msgstr "luminosité" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:478 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:480 msgid "sharpen" msgstr "régler la netteté" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:489 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:491 msgid "gamma" msgstr "gamma" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:516 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:518 msgid "crop" msgstr "rogner" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:560 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:620 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:562 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:622 msgid "Edit" msgstr "Modifier" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:747 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:750 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:753 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:756 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:749 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:752 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:755 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:758 msgid "" "The system can not find the pink marker in the device in this corner of the " "workin area. Please make sure that it is visible for the camera." @@ -4125,15 +4134,17 @@ msgid "Usernames, email addresses or passwords." msgstr "Noms d'utilisateur, adresses électroniques ou mots de passe." #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:50 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:50 msgid "Camera pictures (except if explicitly and actively sent by you.)" msgstr "Images de la Caméra (à moins d'être envoyées par vous explicitement)" #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:51 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:51 msgid "Location or public IP addresses." msgstr "Emplacement ou adresses IP publiques." #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:59 -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:61 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:62 #, python-format msgid "" "Want more detailed information? You can check our %(open)sprivacy policy" @@ -4772,17 +4783,38 @@ msgstr "" msgid "No, I’d rather not share the analytics data." msgstr "Non, je préfère ne pas partager ces données." -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:50 -msgid "Location, camera pictures, public IP addresses." -msgstr "Emplacement, images de caméra, adresses IP publiques." - -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:58 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:59 msgid "" "You can change you choice any time in the menu \"Settings > Analytics\"." msgstr "" "Vous pouvez modifier votre choix à tout moment dans le menu \"Paramètres > " "Analytics\"." +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:3 +msgid "The new Mr Beam Design Store" +msgstr "Le nouveau Design Store de Mr Beam" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:19 +msgid "Buy beautiful designs, integrated in your Mr Beam software" +msgstr "Achete des beaux graphiques intégrés à votre programme Mr Beam" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:23 +msgid "Create wonderful objects" +msgstr "Crée des objets merveilleux" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:32 +msgid "All Beta users get 300 Beam Coins for free!" +msgstr "Tous les utilisateurs de la Bêta reçoivent 300 Beam Coins gratuits!" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:40 +#, python-format +msgid "" +"For more information about the Design Store, visit our %(tag_open)sKnowledge " +"Base%(tag_close)s." +msgstr "" +"Pour plus d'information concernant de Design Store, visite notre " +"%(tag_open)sBase de Connaissances%(tag_close)s." + #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_0.jinja2:1 msgid "Improved Camera" msgstr "Caméra améliorée" @@ -4971,6 +5003,12 @@ msgstr "Daemon hors ligne" msgid "Reset daemon" msgstr "Réinitialiser le daemon" +#~ msgid "What's New in the Stable Channel" +#~ msgstr "Les nouveautés du Canal Stable" + +#~ msgid "Location, camera pictures, public IP addresses." +#~ msgstr "Emplacement, images de caméra, adresses IP publiques." + #~ msgid "Quick Shapes" #~ msgstr "Formes Rapides" diff --git a/octoprint_mrbeam/wizard_config.py b/octoprint_mrbeam/wizard_config.py index f43f5d684..9d86b169b 100644 --- a/octoprint_mrbeam/wizard_config.py +++ b/octoprint_mrbeam/wizard_config.py @@ -4,7 +4,10 @@ class WizardConfig: def __init__(self, plugin): - self.WIZARD_VERSION = 19 # (v0.7.0) random number. but we can't go down anymore, just up. + # Just a random number, but we can't go down anymore, just up. + # If we want to release Beta, then WIZARD_VERSION_BETA should be a higher number than the old WIZARD_VERSION_STABLE + self.WIZARD_VERSION_STABLE = 19 # v0.7.0: camera, custom materials backup, SVG split, ... + self.WIZARD_VERSION_BETA = 20 # v0.7.4: design store self._logger = mrb_logger("octoprint.plugins.mrbeam.wizard_config") @@ -14,18 +17,24 @@ def __init__(self, plugin): self._settings = plugin._settings self._is_welcome_wizard = plugin.isFirstRun() - self._is_whatsnew_wizard = not plugin.isFirstRun() + self._is_whatsnew_wizard = not plugin.isFirstRun() and not self._plugin.is_beta_channel() + self._is_beta_news_wizard = not self._plugin.isFirstRun() and self._plugin.is_beta_channel() self._current_wizard_config = None def get_wizard_version(self): - return self.WIZARD_VERSION + if self._plugin.is_beta_channel(): + return self.WIZARD_VERSION_BETA + else: + return self.WIZARD_VERSION_STABLE def get_wizard_name(self): if self._is_welcome_wizard: return "WELCOME" elif self._is_whatsnew_wizard: return "WHATSNEW" + elif self._is_beta_news_wizard: + return "BETA_NEWS" else: return None @@ -36,6 +45,8 @@ def get_wizard_config_to_show(self): self._current_wizard_config = self._welcome_wizard_config() elif self._is_whatsnew_wizard: self._current_wizard_config = self._whatsnew_wizard_config() + elif self._is_beta_news_wizard: + self._current_wizard_config = self._beta_news_wizard_config() for wizard, config in self._current_wizard_config.iteritems(): required = config.get('required', False) @@ -53,6 +64,8 @@ def get_current_wizard_link_ids(self): wizard_tabs = self._welcome_wizard_config() elif self._is_whatsnew_wizard: wizard_tabs = self._whatsnew_wizard_config() + elif self._is_beta_news_wizard: + wizard_tabs = self._beta_news_wizard_config() for tab, data in wizard_tabs.iteritems(): link_ids.append(data['div']+'_link') @@ -164,6 +177,29 @@ def _whatsnew_wizard_config(self): return whatsnew_wizard_tabs + @staticmethod + def _beta_news_wizard_config(): + """ + Add here the tabs that should be present in the beta news wizard. Remove when unnecessary. + The order of the tabs is set in __init__.py > __plugin_load__() > __plugin_settings_overlay__['appearance']['order]. + The welcome, what's new and beta news wizards are actually the same wizard, so all are configured in the same place. + + Change the "required" to False if that slide should not be present in the dialog, revert otherwise. + """ + beta_news_wizard_tabs = dict( + wizard_beta_news_0=dict( + type='wizard', + name=gettext("Design Store"), + required=True, + mandatory=False, + suffix='_beta_news_0', + template='wizard/wizard_beta_news_0.jinja2', + div='wizard_plugin_corewizard_beta_news_0', + ), + ) + + return beta_news_wizard_tabs + def _is_wifi_wizard_required(self): required = False try: diff --git a/translations/messages.pot b/translations/messages.pot index 9a4bd6934..38f13bf1f 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-08-20 09:34+0200\n" +"POT-Creation-Date: 2020-09-07 08:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgstr "" #: octoprint_mrbeam/__init__.py:685 #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:9 #: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:8 -#: octoprint_mrbeam/wizard_config.py:98 octoprint_mrbeam/wizard_config.py:156 +#: octoprint_mrbeam/wizard_config.py:105 octoprint_mrbeam/wizard_config.py:163 msgid "Analytics" msgstr "" @@ -78,36 +78,40 @@ msgstr "" msgid "Either the camera is busy or the lid is not open." msgstr "" -#: octoprint_mrbeam/wizard_config.py:71 +#: octoprint_mrbeam/wizard_config.py:78 msgid "Connection" msgstr "" -#: octoprint_mrbeam/wizard_config.py:80 +#: octoprint_mrbeam/wizard_config.py:87 msgid "Your user" msgstr "" -#: octoprint_mrbeam/wizard_config.py:89 +#: octoprint_mrbeam/wizard_config.py:96 msgid "For your safety" msgstr "" -#: octoprint_mrbeam/wizard_config.py:120 +#: octoprint_mrbeam/wizard_config.py:127 msgid "Improved camera" msgstr "" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_1.jinja2:2 -#: octoprint_mrbeam/wizard_config.py:129 +#: octoprint_mrbeam/wizard_config.py:136 msgid "Custom material backup" msgstr "" -#: octoprint_mrbeam/wizard_config.py:138 +#: octoprint_mrbeam/wizard_config.py:145 msgid "SVG split" msgstr "" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_3.jinja2:2 -#: octoprint_mrbeam/wizard_config.py:147 +#: octoprint_mrbeam/wizard_config.py:154 msgid "...and more!" msgstr "" +#: octoprint_mrbeam/wizard_config.py:186 +msgid "Design Store" +msgstr "" + #: octoprint_mrbeam/printing/comm_acc2.py:314 #: octoprint_mrbeam/printing/comm_acc2.py:353 msgid "Please contact Mr Beam support team and attach octoprint.log." @@ -178,8 +182,8 @@ msgstr "" #: octoprint_mrbeam/static/js/convert.js:409 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:135 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:306 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:178 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:242 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:180 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:244 msgid "mm" msgstr "" @@ -657,7 +661,7 @@ msgstr "" #: octoprint_mrbeam/templates/calibration/watterott/tab_corner_calibration.jinja2:101 #: octoprint_mrbeam/templates/conversion_dialog.jinja2:152 #: octoprint_mrbeam/templates/settings.jinja2:52 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:128 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:130 #: octoprint_mrbeam/templates/take_photo.jinja2:10 msgid "Cancel" msgstr "" @@ -1158,20 +1162,20 @@ msgid "" "to Mr Beam and try again." msgstr "" -#: octoprint_mrbeam/static/js/wizard_general.js:37 +#: octoprint_mrbeam/static/js/wizard_general.js:38 msgid "Let's go!" msgstr "" #: octoprint_mrbeam/static/js/wizard_general.js:42 -msgid "What's New" +msgid "Welcome dialog" msgstr "" #: octoprint_mrbeam/static/js/wizard_general.js:44 -msgid "What's New in the Stable Channel" +msgid "What's New" msgstr "" -#: octoprint_mrbeam/static/js/wizard_general.js:47 -msgid "Welcome dialog" +#: octoprint_mrbeam/static/js/wizard_general.js:46 +msgid "What's New in Beta" msgstr "" #: octoprint_mrbeam/static/js/working_area.js:84 @@ -1780,7 +1784,7 @@ msgid "Basic" msgstr "" #: octoprint_mrbeam/templates/conversion_dialog.jinja2:338 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:443 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:445 msgid "Image Preprocessing" msgstr "" @@ -2263,13 +2267,13 @@ msgid "Something went wrong" msgstr "" #: octoprint_mrbeam/templates/loading_overlay.jinja2:222 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:767 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:769 msgid "Serial" msgstr "" #: octoprint_mrbeam/templates/loading_overlay.jinja2:223 #: octoprint_mrbeam/templates/loginscreen_viewmodel.jinja2:13 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:768 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:770 msgid "Mr Beam Name" msgstr "" @@ -2730,11 +2734,11 @@ msgstr "" #: octoprint_mrbeam/templates/tab_designlib.jinja2:223 #: octoprint_mrbeam/templates/tab_designlib.jinja2:255 #: octoprint_mrbeam/templates/tab_designlib.jinja2:286 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:301 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:319 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:395 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:566 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:622 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:303 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:321 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:397 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:568 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:624 msgid "Remove" msgstr "" @@ -2894,7 +2898,7 @@ msgid "set units to millimeters" msgstr "" #: octoprint_mrbeam/templates/tab_terminal.jinja2:138 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:130 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:132 msgid "Send" msgstr "" @@ -2919,7 +2923,7 @@ msgid "Offline" msgstr "" #: octoprint_mrbeam/templates/tab_workingarea.jinja2:25 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:279 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:281 msgid "File" msgstr "" @@ -2970,296 +2974,301 @@ msgid "" " that all four markers are visible." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:95 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:88 +msgid "More info" +msgstr "" + +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:90 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:97 msgid "Send image to Mr Beam" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:99 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:101 msgid "Send the current image to Mr Beam Lasers for review." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:100 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:102 msgid "" "This helps us to improve the camera system to work better in even more " "difficult conditions." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:106 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:108 msgid "Mr Beam Lasers might store your image in it's camera training data set." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:107 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:109 msgid "" "Please understand that Mr Beam Lasers can not send you any response " "regarding this image." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:108 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:110 msgid "Mr Beam Lasers will not publish the image nor sell it to third parties." msgstr "" #: octoprint_mrbeam/templates/settings/about_settings.jinja2:94 #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:10 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:109 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:111 #: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:9 msgid "/plugin/mrbeam/static/docs/MrBeamAnalytics-PrivacyPolicy_en.pdf" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:110 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:112 #, python-format msgid "" "Your image is sent within the context of Mr Beam Analytics. (See " "%(open)sprivacy policy%(close)s.)" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:111 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:113 msgid "" "The upload of your image to Mr Beam's servers will happen in the " "background. If you're not online, the image will be uploaded next time " "you're online." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:115 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:117 msgid "We appreciate your support. Thank you!" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:119 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:121 msgid "Activate Mr Beam Analytics:" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:121 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:123 msgid "" "This functionality is part of Mr Beam Analytics which needs to be " "enabled to use this functionality." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:122 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:124 #, python-format msgid "Please go to %(open)sMr Beam Analytics%(close)s to enable it." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:137 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 msgid "Low" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:137 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 msgid "Picture Quality" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:139 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:141 msgid "" "- Open the lid and keep your hands off the working area for a few seconds" " to receive a higher resolution image" msgstr "" #: octoprint_mrbeam/templates/settings/leds_settings.jinja2:6 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:144 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:146 msgid "Brightness" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:154 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:156 msgid "Zoom" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:169 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:171 msgid "Scroll to zoom" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:173 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:175 msgid "Object height" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:186 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:188 msgid "Firmware update in progress" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:191 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:193 msgid "Do not power off the machine during the flashing process." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:196 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:198 msgid "Position" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:207 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:209 msgid "XY-Axes" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:223 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:225 msgid "Z-Axis" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:237 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:239 msgid "Jog distance:" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:251 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:253 msgid "Serial Port" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:253 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:255 msgid "Baudrate" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:256 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:258 msgid "Save connection settings" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:259 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:261 msgid "Auto-connect on server startup" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:261 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:263 #: octoprint_mrbeam/templates/wizard/wizard_wifi.jinja2:54 msgid "Connect" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:273 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:275 msgid "Designs" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:274 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:276 msgid "Clear all" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:280 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:282 msgid "Text" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:281 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:283 msgid "Shape" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:318 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:394 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:563 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:621 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:320 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:396 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:565 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:623 msgid "Transform" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:323 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:399 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:570 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:626 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:325 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:401 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:572 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:628 msgid "translation" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:327 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:403 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:575 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:630 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:329 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:405 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:577 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:632 msgid "rotation" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:332 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:408 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:580 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:635 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:334 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:410 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:582 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:637 msgid "horizontal" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:337 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:413 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:585 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:640 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:339 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:415 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:587 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:642 msgid "vertical" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:342 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:418 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:590 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:645 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:344 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:420 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:592 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:647 msgid "scale" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:347 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:423 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:595 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:650 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:349 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:425 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:597 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:652 msgid "multiply" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:352 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:355 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:427 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:430 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:599 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:602 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:654 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:657 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:354 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:357 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:429 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:432 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:601 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:604 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:656 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:659 msgid "duplicate" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:362 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:364 msgid "split" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:365 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:367 msgid "by stroke color" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:368 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:370 msgid "into shapes (keep overlapping)" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:371 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:373 msgid "vertically" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:374 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:376 msgid "horizontally" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:381 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:544 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:605 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:660 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:383 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:546 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:607 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:662 msgid "exceeds working area" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:382 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:545 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:606 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:661 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:384 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:547 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:608 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:663 msgid "Design exceeds the working area." msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:383 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:547 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:607 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:662 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:385 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:549 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:609 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:664 msgid "Make it fit" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:455 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:457 msgid "contrast" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:466 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:468 msgid "brightness" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:478 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:480 msgid "sharpen" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:489 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:491 msgid "gamma" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:516 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:518 msgid "crop" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:560 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:620 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:562 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:622 msgid "Edit" msgstr "" -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:747 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:750 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:753 -#: octoprint_mrbeam/templates/tab_workingarea.jinja2:756 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:749 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:752 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:755 +#: octoprint_mrbeam/templates/tab_workingarea.jinja2:758 msgid "" "The system can not find the pink marker in the device in this corner of " "the workin area. Please make sure that it is visible for the camera." @@ -3745,15 +3754,17 @@ msgid "Usernames, email addresses or passwords." msgstr "" #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:50 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:50 msgid "Camera pictures (except if explicitly and actively sent by you.)" msgstr "" #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:51 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:51 msgid "Location or public IP addresses." msgstr "" #: octoprint_mrbeam/templates/settings/analytics_settings.jinja2:59 -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:61 +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:62 #, python-format msgid "" "Want more detailed information? You can check our %(open)sprivacy " @@ -4268,12 +4279,31 @@ msgstr "" msgid "No, I’d rather not share the analytics data." msgstr "" -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:50 -msgid "Location, camera pictures, public IP addresses." +#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:59 +msgid "You can change you choice any time in the menu \"Settings > Analytics\"." msgstr "" -#: octoprint_mrbeam/templates/wizard/wizard_analytics.jinja2:58 -msgid "You can change you choice any time in the menu \"Settings > Analytics\"." +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:3 +msgid "The new Mr Beam Design Store" +msgstr "" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:19 +msgid "Buy beautiful designs, integrated in your Mr Beam software" +msgstr "" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:23 +msgid "Create wonderful objects" +msgstr "" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:32 +msgid "All Beta users get 300 Beam Coins for free!" +msgstr "" + +#: octoprint_mrbeam/templates/wizard/wizard_beta_news_0.jinja2:40 +#, python-format +msgid "" +"For more information about the Design Store, visit our " +"%(tag_open)sKnowledge Base%(tag_close)s." msgstr "" #: octoprint_mrbeam/templates/wizard/wizard_whatsnew_0.jinja2:1