From f30dba6728faf9c3ce8ad948a8ef5af6dfb83a95 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Fri, 8 Mar 2019 19:55:13 -0500 Subject: don't do density compensation in underlay --- lib/elements/satin_column.py | 83 +++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py index 4dea0534..bfa39384 100644 --- a/lib/elements/satin_column.py +++ b/lib/elements/satin_column.py @@ -590,7 +590,7 @@ class SatinColumn(EmbroideryElement): return spacings, paths - def plot_points_on_rails(self, spacing, offset): + def plot_points_on_rails(self, spacing, offset, compensation=True): # Take a section from each rail in turn, and plot out an equal number # of points on both rails. Return the points plotted. The points will # be contracted or expanded by offset using self.offset_points(). @@ -625,43 +625,44 @@ class SatinColumn(EmbroideryElement): pos0, index0 = self.walk(paths[0], pos0, index0, spacing0) pos1, index1 = self.walk(paths[1], pos1, index1, spacing1) - try: - # Adjust for rails that contract or expand from each other. - # Without any compensation, rail sections that spread out or come - # together are longer than parallel rails, and we'll plot stitches - # too densely as a result. We can compensate by using some trig, - # as described here: - # - # https://github.com/inkstitch/inkstitch/issues/379#issuecomment-467262685 - stitch_direction = (pos1 - pos0).unit() - peak_to_peak0 = pos0 - old_pos0 - peak_to_peak1 = pos1 - old_pos1 - - # The dot product of two unit vectors is the cosine of the angle - # between them. We want the cosine of the angle minus 90 degrees, - # so we rotate left by 90 degrees first. - # - # We take the absolute value to correct for the different direction - # of the angles on the opposing rails. - cos1 = abs(peak_to_peak0.unit() * stitch_direction.rotate_left()) - cos2 = abs(peak_to_peak1.unit() * stitch_direction.rotate_left()) - - # Use the smaller of the two angles to avoid spacing out - # too far on the other rail. Note that the cosine of 0 - # is 1, so we use min here to mean a bigger angle. - cos = min(cos1, cos2) - - # Beyond 0.55 (about 56 degrees), we end up distorting the - # stitching and it looks bad. - cos = max(cos, 0.55) - - pos0, index0 = self.walk(paths[0], pos0, index0, spacing0 / cos - spacing0) - pos1, index1 = self.walk(paths[1], pos1, index1, spacing1 / cos - spacing1) - except ZeroDivisionError: - # These can occur in unit() if the vector has a length of zero, - # which can happen in certain cases. We'll just skip the - # compensation. - continue + if compensation: + try: + # Adjust for rails that contract or expand from each other. + # Without any compensation, rail sections that spread out or come + # together are longer than parallel rails, and we'll plot stitches + # too densely as a result. We can compensate by using some trig, + # as described here: + # + # https://github.com/inkstitch/inkstitch/issues/379#issuecomment-467262685 + stitch_direction = (pos1 - pos0).unit() + peak_to_peak0 = pos0 - old_pos0 + peak_to_peak1 = pos1 - old_pos1 + + # The dot product of two unit vectors is the cosine of the angle + # between them. We want the cosine of the angle minus 90 degrees, + # so we rotate left by 90 degrees first. + # + # We take the absolute value to correct for the different direction + # of the angles on the opposing rails. + cos1 = abs(peak_to_peak0.unit() * stitch_direction.rotate_left()) + cos2 = abs(peak_to_peak1.unit() * stitch_direction.rotate_left()) + + # Use the smaller of the two angles to avoid spacing out + # too far on the other rail. Note that the cosine of 0 + # is 1, so we use min here to mean a bigger angle. + cos = min(cos1, cos2) + + # Beyond 0.55 (about 56 degrees), we end up distorting the + # stitching and it looks bad. + cos = max(cos, 0.55) + + pos0, index0 = self.walk(paths[0], pos0, index0, spacing0 / cos - spacing0) + pos1, index1 = self.walk(paths[1], pos1, index1, spacing1 / cos - spacing1) + except ZeroDivisionError: + # These can occur in unit() if the vector has a length of zero, + # which can happen in certain cases. We'll just skip the + # compensation. + continue # We're off by one in the algorithm above, so we need one more # pair of points. We'd like to add points at the very end to @@ -678,7 +679,8 @@ class SatinColumn(EmbroideryElement): # "contour walk" underlay: do stitches up one side and down the # other. forward, back = self.plot_points_on_rails(self.contour_underlay_stitch_length, - -self.contour_underlay_inset) + -self.contour_underlay_inset, + compensation=False) return Patch(color=self.color, stitches=(forward + list(reversed(back)))) def do_center_walk(self): @@ -687,7 +689,8 @@ class SatinColumn(EmbroideryElement): # Do it like contour underlay, but inset all the way to the center. forward, back = self.plot_points_on_rails(self.center_walk_underlay_stitch_length, - -100000) + -100000, + compensation=False) return Patch(color=self.color, stitches=(forward + list(reversed(back)))) def do_zigzag_underlay(self): -- cgit v1.3.1 From f435520663d59378546426ea7263e78d51362c44 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Tue, 26 Mar 2019 18:24:02 +0100 Subject: Add Custom Page to Print PDF (#418) --- lib/extensions/print_pdf.py | 8 +- print/resources/inkstitch-logo.svg | 125 ++++++++++++++++++------ print/resources/inkstitch.js | 170 +++++++++++++++++++-------------- print/resources/style.css | 139 ++++++++++++++++----------- print/templates/custom-page.html | 40 ++++++++ print/templates/index.html | 19 ++-- print/templates/operator_overview.html | 2 +- print/templates/ui.html | 67 ++++++++----- 8 files changed, 378 insertions(+), 192 deletions(-) create mode 100644 print/templates/custom-page.html diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py index c718fa09..4913a32a 100644 --- a/lib/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py @@ -353,7 +353,13 @@ class Print(InkstitchExtension): template = env.get_template('index.html') return template.render( - view={'client_overview': False, 'client_detailedview': False, 'operator_overview': True, 'operator_detailedview': True}, + view={ + 'client_overview': False, + 'client_detailedview': False, + 'operator_overview': True, + 'operator_detailedview': True, + 'custom_page': False + }, logo={'src': '', 'title': 'LOGO'}, date=date.today(), client="", diff --git a/print/resources/inkstitch-logo.svg b/print/resources/inkstitch-logo.svg index d9a298cf..138318b9 100644 --- a/print/resources/inkstitch-logo.svg +++ b/print/resources/inkstitch-logo.svg @@ -1,27 +1,98 @@ - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + \ No newline at end of file diff --git a/print/resources/inkstitch.js b/print/resources/inkstitch.js index ac8c72b4..79c6d9c3 100644 --- a/print/resources/inkstitch.js +++ b/print/resources/inkstitch.js @@ -285,7 +285,7 @@ $(function() { /* Contendeditable Fields */ - $('body').on('focusout', '[contenteditable="true"]:not(.footer-info)', function() { + $('body').on('focusout', '[contenteditable="true"]:not(.info-text)', function() { /* change svg scale */ var content = $(this).text(); var field_name = $(this).attr('data-field-name'); @@ -326,6 +326,8 @@ $(function() { } else if (item.is('div.footer-info')) { $('#footer-info-text').html(value); item.html(value); + } else if (item.is('#custom-page-content')) { + $('#custom-page-content').html(value); } else { item.text(value); } @@ -339,7 +341,7 @@ $(function() { }, 500); }); - $('body').on('keypress', '[contenteditable="true"]:not(#footer-info-text)', function(e) { + $('body').on('keypress', '[contenteditable="true"]:not(.info-text)', function(e) { if (e.which == 13) { // pressing enter defocuses the element this.blur(); @@ -360,8 +362,8 @@ $(function() { } }); - $('#footer-info-text[contenteditable="true"]').focusout(function() { - updateFooter(); + $('.info-text[contenteditable="true"]').focusout(function() { + updateEditableText($(this)); }); /* Settings Bar */ @@ -415,119 +417,142 @@ $(function() { }); // Footer - function getEditMode(){ - return $('#switch-mode').prop('checked'); + function getEditMode(element){ + return element.closest('fieldset').find('.switch-mode').prop('checked'); } - $('#switch-mode').change(function() { - var editMode = getEditMode(); + $('.switch-mode').change(function() { + var element = $(this); + var info_text = element.closest('fieldset').find('.info-text'); + var editMode = getEditMode(element); if (editMode) { - $('#footer-info-text').text( $('#footer-info-text' ).html()); - $('#tool-bar .edit-only').prop("disabled", true); + info_text.text( info_text.html() ); + element.closest('.tool-bar').find('.tb-button.edit-only').prop("disabled", true); } else { - $('#footer-info-text').css('display', 'block'); - var sourceText = $('#footer-info-text').text(); - $('#footer-info-text').html( sourceText ); - $('#tool-bar .tb-button.edit-only').prop('disabled', false); + info_text.css('display', 'block'); + var sourceText = info_text.text(); + info_text.html( sourceText ); + element.closest('.tool-bar').find('.tb-button.edit-only').prop('disabled', false); } }); - function updateFooter() { - var editMode = getEditMode(); - var footerText = ''; + function updateEditableText(element) { + var editMode = getEditMode(element); + var info_text = element.closest('fieldset').find('.info-text'); + var content = info_text.html(); + var editableText = ''; + if (editMode) { - footerText = $('#footer-info-text' ).text(); + editableText = info_text.text(); + } else { + editableText = info_text.html(); + } + + if(info_text.is('#footer-info-text')) { + $('div.footer-info').html(editableText); + $.postJSON('/settings/footer-info', {value: content}); } else { - footerText = $('#footer-info-text').html(); + $.postJSON('/settings/custom-page-content', {value: content}); } - $('.footer-info').html(footerText); - var content = $('.footer-info').html(); - $.postJSON('/settings/footer-info', {value: content}); } function formatText(selection, value) { - var htmlMode = getEditMode(); - if(!htmlMode) { if(window.getSelection().toString()){ document.execCommand(selection, false, value); - updateFooter(); } - } } - $('#tb-bold').click(function(selection) { - formatText('bold'); + $('.tb-bold').click(function() { + if(!getEditMode($(this))) { + formatText('bold'); + updateEditableText($(this)); + } }); - $('#tb-italic').click(function() { - formatText('italic'); + $('.tb-italic').click(function() { + if(!getEditMode($(this))) { + formatText('italic'); + updateEditableText($(this)); + } }); - $('#tb-underline').click(function() { - formatText('underline'); + $('.tb-underline').click(function() { + if(!getEditMode($(this))) { + formatText('underline'); + updateEditableText($(this)); + } }); - $('#tb-remove').click(function() { - formatText('removeFormat'); + $('.tb-remove').click(function() { + if(!getEditMode($(this))) { + formatText('removeFormat'); + updateEditableText($(this)); + } }); - $('#tb-hyperlink').click(function() { - formatText('createlink', 'tempurl'); - $('#footer-url').css('display', 'block'); + $('.tb-hyperlink').click(function() { + if(!getEditMode($(this))) { + formatText('createlink', 'tempurl'); + updateEditableText($(this)); + $(this).closest('.tool-bar').children('.url-window').css('display', 'block'); + } }); - $('#url-ok').click(function() { - var link = $('#footer-link').val(); - $('#footer-info-text a[href="tempurl"]').attr('href', link); - $('#footer-link').val('https://'); - $('#footer-url').css('display', 'none'); - updateFooter(); + $('.url-ok').click(function() { + var link = $(this).closest('.tool-bar').find('.user-url').val(); + $(this).closest('fieldset').find('.info-text').find('a[href="tempurl"]').attr('href', link); + $('.user-url').val('https://'); + $('.url-window').css('display', 'none'); + updateEditableText($(this)); }); - $('#url-cancel').click(function() { - $('#footer-info-text a[href="tempurl"]').contents().unwrap(); - $('#footer-link').val('https://'); - $('#footer-url').css('display', 'none'); - updateFooter(); + $('.url-cancel').click(function() { + $(this).closest('fieldset').find('.info-text').find('a[href="tempurl"]').contents().unwrap(); + $('.user-url').val('https://'); + $('.url-window').css('display', 'none'); + updateEditableText($(this)); }); - $('#tb-mail').click(function() { - formatText('createlink', 'tempurl'); - $('#footer-email').css('display', 'block'); + $('.tb-mail').click(function() { + if(!getEditMode($(this))) { + formatText('createlink', 'tempurl'); + updateEditableText($(this)); + $(this).closest('.tool-bar').find('.mail-window').css('display', 'block'); + } }); - $('#mail-ok').click(function() { - var link = 'mailto:' + $('#footer-mail').val(); - $('#footer-info-text a[href="tempurl"]').attr('href', link); - $('#footer-mail').val('@'); - $('#footer-email').css('display', 'none'); - updateFooter(); + $('.mail-ok').click(function() { + var link = 'mailto:' + $(this).closest('.tool-bar').find('.user-mail').val(); + $(this).closest('fieldset').find('.info-text').find('a[href="tempurl"]').attr('href', link); + $('.user-mail').val('@'); + $('.mail-window').css('display', 'none'); + updateEditableText($(this)); }); - $('#mail-cancel').click(function() { - $('#footer-info-text a[href="tempurl"]').contents().unwrap(); - $('#footer-mail').val('@'); - $('#footer-email').css('display', 'none'); - updateFooter(); + $('.mail-cancel').click(function() { + $(this).closest('fieldset').find('.info-text').find('a[href="tempurl"]').contents().unwrap(); + $('.user-mail').val('@'); + $('.mail-window').css('display', 'none'); + updateEditableText($(this)); }); - $('#tb-reset').click(function() { - $('#footer-reset').css('display', 'block'); + $('.tb-reset').click(function() { + $(this).closest('.tool-bar').find('.reset-window').css('display', 'block'); }); - $('#reset-ok').click(function() { - var htmlMode = getEditMode(); + $('.reset-ok').click(function() { + var htmlMode = getEditMode($(this)); if(!htmlMode) { - $('#footer-info-text').html($('#footer-info-original').html()); + $(this).closest('fieldset').find('.info-text').html($(this).closest('.tool-bar').find('.original-info').html()); } else { - $('#footer-info-text').text($('#footer-info-original').html()); + $(this).closest('fieldset').find('.info-text').text($(this).closest('.tool-bar').find('.original-info').html()); } - $('#footer-reset').css('display', 'none'); - updateFooter(); + $('.reset-window').css('display', 'none'); + updateEditableText($(this)); }); - $('#reset-cancel').click(function() { - $('#footer-reset').css('display', 'none'); + $('.reset-cancel').click(function() { + $('.reset-window').css('display', 'none'); }); $('body').on("click", ".edit-footer-link", function() { @@ -713,6 +738,7 @@ $(function() { settings["operator-overview"] = $("[data-field-name='operator-overview']").is(':checked'); settings["operator-detailedview"] = $("[data-field-name='operator-detailedview']").is(':checked'); settings["operator-detailedview-thumbnail-size"] = $("[data-field-name='operator-detailedview-thumbnail-size']").val(); + settings["custom-page"] = $("[data-field-name='custom-page']").is(':checked'); settings["paper-size"] = $('select#printing-size').find(':selected').val(); var logo = $("figure.brandlogo img").attr('src'); diff --git a/print/resources/style.css b/print/resources/style.css index f697c7dc..9ffff07d 100644 --- a/print/resources/style.css +++ b/print/resources/style.css @@ -66,30 +66,6 @@ body { position: relative; } -/* Printing Size */ - .page.a4 { - width: 205mm; - height: 292mm; - padding: 15mm; - } - - .page.client-overview.a4 header, .page.operator-overview.a4 header { - height: 50mm; - flex-direction: row; - } - - .page.client-overview.a4 div.job-details, .page.operator-overview.a4 div.job-details { - width: 100%; - } - - .page.client-overview.a4 .client-overview-main figure.inksimulation { - height: 150mm; - } - - .page.client-overview.a4 figure.brandlogo, .page.operator-overview.a4 figure.brandlogo { - margin: -6mm 2.5mm; - } - /* Settings */ .ui { @@ -289,7 +265,7 @@ body { position: relative; } - #footer-info-text { + .info-text { width: 100%; min-height: 5em; border: 1px solid darkgrey; @@ -298,23 +274,25 @@ body { background: white; } - #tool-bar .tb-button { - border: 1px solid darkgrey; + .tb-button { + border: 1px solid darkgrey !important; border-bottom: none; margin-bottom: -0.2em; - cursor: pointer; - color: #413232; height: 2.2em; vertical-align: top; + padding: 5px; + cursor: pointer; + background: white; + color: black; } - #tool-bar .tb-button:disabled { - background: #eaeaea; - color: white; - cursor: auto; + .tb-button:disabled { + background: #eaeaea !important; + color: white !important; + cursor: auto !important; } - #edit-mode { + .edit-mode { display: inline; position: relative; border: 1px solid darkgray; @@ -322,18 +300,18 @@ body { vertical-align: top; } - #edit-mode input { + .edit-mode input { visibility: hidden; } - #edit-mode label { + .edit-mode label { cursor: pointer; vertical-align: middle; background: white; color: #413232; } - #edit-mode label:after { + .edit-mode label:after { opacity: 0.1; content: ''; position: absolute; @@ -348,21 +326,21 @@ body { transform: rotate(-45deg); } - #edit-mode label:hover::after { + .edit-mode label:hover::after { opacity: 0.5; } - #edit-mode input[type=checkbox]:checked + label:after { + .edit-mode input[type=checkbox]:checked + label:after { opacity: 1; } - #edit-mode span { + .edit-mode span { margin-left: 1em; } - div#footer-url, div#footer-email, div#footer-reset { + div.tb-popup { display: none; - position: absolute; + position: absolute !important; background: white; border: 1px solid black; padding: 5mm; @@ -371,7 +349,7 @@ body { z-index: 10; } - div#footer-info-original { + div.original-info { visibility: hidden; width: 0; height: 0; @@ -418,7 +396,6 @@ body { /* Header */ - header { width: 100%; height: 40mm; @@ -434,13 +411,11 @@ body { figure.brandlogo { height: 30mm; width: 30mm; - margin: 2.5mm; + margin: 0 4mm 0 0; } figure.brandlogo label { display: block; - width: 100%; - height: 100%; text-align: center; position: relative; } @@ -472,13 +447,6 @@ body { cursor: pointer; } - .operator-detailedview figure.brandlogo { - height: 20mm; - width: 30mm; - margin: 0 2.5mm; - text-align: left; - } - .operator-detailedview figure.brandlogo img { max-width: 30mm; max-height: 20mm; @@ -488,7 +456,7 @@ body { display: flex; display: -webkit-flex; /* old webkit */ display: -ms-flexbox; /* IE 10 */ - width: calc(100% - 50mm); + width: calc(100% - 40mm); height: 50%; flex-grow: 1; } @@ -515,6 +483,10 @@ body { padding-top: 6mm; } + .operator-overview figure.inksimulation { + height: 210mm; + } + .operator-overview div.job-details, .client-overview div.job-details { padding-top: 2mm; } @@ -904,6 +876,11 @@ body { .opd-color-block.large { display: block; margin: 5mm 0; + font-size: 14pt; + } + + .opd-color-block.large .operator-colorswatch { + font-size: 8pt; } .opd-color-block.large:first-child { @@ -987,6 +964,23 @@ body { display: none; } +/* Custom information sheet */ + .custom-page header { + height: 30mm; + } + + .custom-page main { + height: 230mm + } + #custom-page-tool-bar { + margin-bottom: 0.5em; + } + + #custom-page-content { + height: 200mm; + overflow-y: hidden; + text-align: left; + } /* Color Swatch Logic */ /* reference : http://jsfiddle.net/jrulle/btg63ezy/3/ */ @@ -1120,7 +1114,33 @@ body { height: calc(100% / 5); width: calc(100% / 12); } - + + +/* Print Size A4 */ + + .page.a4 { + width: 210mm; + height: 296mm; + padding: 15mm; + } + + .page.client-overview.a4 header, .page.operator-overview.a4 header { + height: 50mm; + flex-direction: row; + } + + .page.client-overview.a4 div.job-details, .page.operator-overview.a4 div.job-details { + width: 100%; + } + + .page.client-overview.a4 .client-overview-main figure.inksimulation { + height: 150mm; + } + + .page.client-overview.a4 figure.brandlogo, .page.operator-overview.a4 figure.brandlogo { + margin: 0 4mm -2mm 0; + } + @media screen { .page { margin-top: 20mm !important; @@ -1153,8 +1173,11 @@ body { .ui, #settings-ui, #errors, - span.logo-instructions { - display: none; + span.logo-instructions, + #custom-page-tool-bar, + #custom-page-content, + .notice--warning { + display: none !important; } .header-field:not(:empty)::before { diff --git a/print/templates/custom-page.html b/print/templates/custom-page.html new file mode 100644 index 00000000..1ed15dae --- /dev/null +++ b/print/templates/custom-page.html @@ -0,0 +1,40 @@ +
+ {% include 'headline.html' %} +
+
+
+
+ + + + + + + +

+ + +

+
+

{{ _("Enter URL") }}:

+

+
+
+

{{ _("Enter E-Mail") }}:

+

+
+
{{ _("Custom Information Sheet") }}
+
+

{{ _("This will reset your custom text to the default.") }}

+

{{ _("All changes will be lost.") }}

+

+
+
+
{{ _("Custom Information Sheet") }}
+

Note: If you are using Firefox, use visible URLs. Links will not be printed to PDF with this browser.

+
+
+ {% include 'footer.html' %} diff --git a/print/templates/index.html b/print/templates/index.html index c7fa5d74..d0ab848f 100644 --- a/print/templates/index.html +++ b/print/templates/index.html @@ -9,22 +9,23 @@ {% include 'ui.html' %} - {# client overview #} -
{% include 'print_overview.html' %}
+
{% include 'print_overview.html' %}
{# client detailedview #} - {% set printview = 'detailedview' %} - {% for color_block in color_blocks %} - {% set outer_loop = loop %} -
{% include 'print_detail.html' %}
- {% endfor %} + {% set printview = 'detailedview' %} + {% for color_block in color_blocks %} + {% set outer_loop = loop %} +
{% include 'print_detail.html' %}
+ {% endfor %} {# operator overview #} -
{% include 'operator_overview.html' %}
+
{% include 'operator_overview.html' %}
{# operator detailed view #} - {% include 'operator_detailedview.html' %} + {% include 'operator_detailedview.html' %} +{# custom pages #} +
{% include 'custom-page.html' %}
diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html index 8f70b4f0..a3090c1f 100644 --- a/print/templates/operator_overview.html +++ b/print/templates/operator_overview.html @@ -25,7 +25,7 @@
-
+
{{ svg_overview|replace("
  • ", "")|replace("
    • ", "")|safe }} {% include 'ui_svg_action_buttons.html' %}
    diff --git a/print/templates/ui.html b/print/templates/ui.html index 71908b52..23e39145 100644 --- a/print/templates/ui.html +++ b/print/templates/ui.html @@ -36,11 +36,30 @@
    {{ _('Print Layouts') }} -

    -

    -

    -

    -

    {{ _('Thumbnail size') }}: 15mm

    +

    + + +

    +

    + + +

    +

    + + +

    +

    + + +

    +

    {{ _('Thumbnail size') }}: + + 15mm +

    +

    + + +

    @@ -58,31 +77,31 @@ -- cgit v1.3.1 From 5315c34c4dac3e7efee9039de74b831d49f1970a Mon Sep 17 00:00:00 2001 From: Ink/Stitch Crowdin integration Date: Wed, 27 Mar 2019 02:53:07 +0000 Subject: new translations from Crowdin --- translations/messages_af_ZA.po | 125 ++++++++++++++++++++++------------------- translations/messages_ar_SA.po | 125 ++++++++++++++++++++++------------------- translations/messages_ca_ES.po | 125 ++++++++++++++++++++++------------------- translations/messages_cs_CZ.po | 125 ++++++++++++++++++++++------------------- translations/messages_da_DK.po | 125 ++++++++++++++++++++++------------------- translations/messages_de_DE.po | 125 ++++++++++++++++++++++------------------- translations/messages_el_GR.po | 125 ++++++++++++++++++++++------------------- translations/messages_en_US.po | 125 ++++++++++++++++++++++------------------- translations/messages_es_ES.po | 125 ++++++++++++++++++++++------------------- translations/messages_fi_FI.po | 125 ++++++++++++++++++++++------------------- translations/messages_fr_FR.po | 125 ++++++++++++++++++++++------------------- translations/messages_he_IL.po | 125 ++++++++++++++++++++++------------------- translations/messages_hu_HU.po | 125 ++++++++++++++++++++++------------------- translations/messages_it_IT.po | 125 ++++++++++++++++++++++------------------- translations/messages_ja_JP.po | 125 ++++++++++++++++++++++------------------- translations/messages_ko_KR.po | 125 ++++++++++++++++++++++------------------- translations/messages_nl_NL.po | 125 ++++++++++++++++++++++------------------- translations/messages_no_NO.po | 125 ++++++++++++++++++++++------------------- translations/messages_pl_PL.po | 125 ++++++++++++++++++++++------------------- translations/messages_pt_BR.po | 125 ++++++++++++++++++++++------------------- translations/messages_pt_PT.po | 125 ++++++++++++++++++++++------------------- translations/messages_ro_RO.po | 125 ++++++++++++++++++++++------------------- translations/messages_ru_RU.po | 125 ++++++++++++++++++++++------------------- translations/messages_sr_SP.po | 125 ++++++++++++++++++++++------------------- translations/messages_sv_SE.po | 125 ++++++++++++++++++++++------------------- translations/messages_tr_TR.po | 125 ++++++++++++++++++++++------------------- translations/messages_uk_UA.po | 125 ++++++++++++++++++++++------------------- translations/messages_vi_VN.po | 125 ++++++++++++++++++++++------------------- translations/messages_zh_CN.po | 125 ++++++++++++++++++++++------------------- translations/messages_zh_TW.po | 125 ++++++++++++++++++++++------------------- 30 files changed, 2040 insertions(+), 1710 deletions(-) diff --git a/translations/messages_af_ZA.po b/translations/messages_af_ZA.po index 3fbe3bd6..0fd01c33 100644 --- a/translations/messages_af_ZA.po +++ b/translations/messages_af_ZA.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:33\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Afrikaans\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_ar_SA.po b/translations/messages_ar_SA.po index 6f292a7c..ba432232 100644 --- a/translations/messages_ar_SA.po +++ b/translations/messages_ar_SA.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:33\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Arabic\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_ca_ES.po b/translations/messages_ca_ES.po index 281035a1..3b5b3c23 100644 --- a/translations/messages_ca_ES.po +++ b/translations/messages_ca_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:33\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Catalan\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_cs_CZ.po b/translations/messages_cs_CZ.po index 759e8c90..f06b2a85 100644 --- a/translations/messages_cs_CZ.po +++ b/translations/messages_cs_CZ.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:33\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_da_DK.po b/translations/messages_da_DK.po index f9f903dc..700e0289 100644 --- a/translations/messages_da_DK.po +++ b/translations/messages_da_DK.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:33\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_de_DE.po b/translations/messages_de_DE.po index 285246ac..682eaddd 100644 --- a/translations/messages_de_DE.po +++ b/translations/messages_de_DE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -510,7 +510,7 @@ msgstr "Bitte wähle mindestens eine Zeile aus, die in eine Satinkolumne konvert msgid "Only simple lines may be converted to satin columns." msgstr "Nur einfache Linien können in Satinkolumnen konvertiert werden." -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "%s kann nicht in eine Satinkolumne konvertiert werden, da sie sich selbst berührt. Versuche es in mehrere Pfade aufzuteilen." @@ -552,8 +552,10 @@ msgid "Install" msgstr "Installieren" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "Abbrechen" @@ -682,7 +684,7 @@ msgid "A print preview has been opened in your web browser. This window will st msgstr "Eine Druckvorschau wurde im Webbrowser geöffnet. Dieses Fenster dient zur Sicherstellung der Kommunikation zwischen Inkscape und dem Browser.\n\n" "Dieses Fenster schließt automatisch, wenn die Druckvorschau geschlossen wird. Es kann auch manuell beendet werden, falls nötig." -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "Ink/Stitch Drucken" @@ -901,12 +903,38 @@ msgstr "nein" msgid "Enter thread name..." msgstr "Garnbezeichnung eingeben..." +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "URL eingeben" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "OK" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "E-Mail eingeben" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "Dadurch wird Ihr benutzerdefinierter Text auf den Standard zurückgesetzt." + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "Alle Änderungen gehen verloren." + #: print/templates/footer.html:2 msgid "Page" msgstr "Seite" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "Erstellt mit" @@ -1059,11 +1087,11 @@ msgstr "Dokumenteinstellungen" msgid "Branding" msgstr "Branding" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "Voraussichtliche Dauer" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "Design" @@ -1075,125 +1103,108 @@ msgstr "Papierformat" msgid "Print Layouts" msgstr "Druck-Layouts" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "Kundenlayout: Übersicht" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "Kundenlayout: Detailansicht" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "Ausführungslayout: Übersicht" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "Ausführungslayout: Detailansicht" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "Vorschaugröße" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "Dies umfasst die Einstellungen zum Dokument, zur Berechnung der voraussichtlichen Dauer und das Logo." -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "Als Standardeinstellung speichern" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "Logo" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "Fußzeile: Kontaktinformationen des Bedieners" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "URL eingeben" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "OK" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "E-Mail eingeben" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "Dadurch wird Ihr benutzerdefinierter Text auf den Standard zurückgesetzt." - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "Alle Änderungen gehen verloren." - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "Angaben zur Stickmaschine" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "Durchschnittliche Geschwindigkeit" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "Stiche pro Minute " -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "Zeitfaktoren" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "Umfasst die durchschnittliche Zeit für die Vorbereitung der Maschine, Fadenbruch und/oder das Wechseln der Spule, etc." -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "Sekunden die der berechneten Gesamtdauer hinzugefügt werden*" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "Dies wird auf die Gesamtdauer angerechnet." -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "Sekunden für den Farbwechsel*" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "Sekunden die beim Trim-Befehl benötigt werden" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "Zeige Dauer in" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "Enthält Seiteneinrichtung, geschätzte Zeit und auch das Branding." -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "Garnpalette" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "Keine" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "Bei einer Änderung der Garnpalette werden die Garnnamen und Bestellnummern neu berechnet. Vorherige Änderungen gehen dabei verloren. Soll die Aktion ausgeführt werden?" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "Ja" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "Nein" diff --git a/translations/messages_el_GR.po b/translations/messages_el_GR.po index c0032cc9..11f2ba41 100644 --- a/translations/messages_el_GR.po +++ b/translations/messages_el_GR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Greek\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_en_US.po b/translations/messages_en_US.po index e6d4246c..dfa008d8 100644 --- a/translations/messages_en_US.po +++ b/translations/messages_en_US.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:53\n" "Last-Translator: lexelby \n" "Language-Team: English\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_es_ES.po b/translations/messages_es_ES.po index e830af7a..37e85589 100644 --- a/translations/messages_es_ES.po +++ b/translations/messages_es_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:33\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_fi_FI.po b/translations/messages_fi_FI.po index 97a7abf6..cf99d589 100644 --- a/translations/messages_fi_FI.po +++ b/translations/messages_fi_FI.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Finnish\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_fr_FR.po b/translations/messages_fr_FR.po index 1b27fd04..37f1ef70 100644 --- a/translations/messages_fr_FR.po +++ b/translations/messages_fr_FR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:33\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "Veuillez sélectionner au moins une ligne pour convertir en colonne sati msgid "Only simple lines may be converted to satin columns." msgstr "Seulement les lignes simples peuvent être converties en colonnes satinées." -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "Impossible de convertir %s à une colonne satinée, car elle se croise elle-même. Essayez de la séparer en plusieurs chemins." @@ -551,8 +551,10 @@ msgid "Install" msgstr "Installer" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "Quitter" @@ -680,7 +682,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "Un aperçu avant impression a été ouvert dans votre navigateur web. Cette fenêtre reste ouverte pour communiquer avec le code JavaScript s’exécutant dans votre navigateur. Cette fenêtre se fermera après avoir fermer l’aperçu avant impression dans le navigateur, vous pouvez la fermer manuellement si nécessaire." -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "Imprimer Ink/Stitch" @@ -899,12 +901,38 @@ msgstr "non" msgid "Enter thread name..." msgstr "Entrez le nom du fil..." +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "Entrez l’URL" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "OK" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "Entrez votre adresse E-Mail" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "Cela réinitialisera votre texte personnalisé au défaut." + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "Toutes les modifications seront perdues." + #: print/templates/footer.html:2 msgid "Page" msgstr "Page" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "Fièrement généré avec" @@ -1057,11 +1085,11 @@ msgstr "Mise en page" msgid "Branding" msgstr "Image de marque" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "Durée estimée" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "Conception" @@ -1073,125 +1101,108 @@ msgstr "Taille d’impression" msgid "Print Layouts" msgstr "Mises en page d’impression" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "Vue d’ensemble du client" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "Vue détaillée de client" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "Vue d’ensemble de l’exécution" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "Vue détaillée de l'exécution" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "Taille de la miniature" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "Comprend ces paramètres de mise en page, le réglage de l'heure et l’icône." -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "Enregistrer comme valeurs par défaut" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "Logo" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "Pied de page : Coordonnées de l'opérateur" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "Entrez l’URL" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "OK" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "Entrez votre adresse E-Mail" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "Cela réinitialisera votre texte personnalisé au défaut." - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "Toutes les modifications seront perdues." - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "Réglages de la machine" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "Vitesse moyenne de la machine" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "Points par minute " -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "Facteurs de temps" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "Comprend le temps moyen de préparation de la machine, coupures de fils et/ou changement de canette, etc." -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "secondes à ajouter à la durée totale *" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "Cela s’ajoutera à la durée totale." -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "secondes nécessaires pour un changement de couleur *" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "secondes nécessaires pour une coupe de fil" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "Affichage de l’heure sur" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "Comprend la mise en page, temps estimé et aussi l’image de marque." -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "Palette de fil" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "Aucune" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "Changer la palette de fil recalculera les noms de fils et les numéros de catalogue, basé sur la nouvelle palette. Toutes les modifications apportées aux couleurs ou noms de fils seront perdues. Êtes-vous sûr/e ?" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "Oui" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "Non" diff --git a/translations/messages_he_IL.po b/translations/messages_he_IL.po index 505c2292..8265e963 100644 --- a/translations/messages_he_IL.po +++ b/translations/messages_he_IL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Hebrew\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_hu_HU.po b/translations/messages_hu_HU.po index 0880e3da..15e585b8 100644 --- a/translations/messages_hu_HU.po +++ b/translations/messages_hu_HU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_it_IT.po b/translations/messages_it_IT.po index 1e1c890c..d11514aa 100644 --- a/translations/messages_it_IT.po +++ b/translations/messages_it_IT.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_ja_JP.po b/translations/messages_ja_JP.po index 5eb6df0d..2ace3a01 100644 --- a/translations/messages_ja_JP.po +++ b/translations/messages_ja_JP.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_ko_KR.po b/translations/messages_ko_KR.po index ff42f4f4..bcca397e 100644 --- a/translations/messages_ko_KR.po +++ b/translations/messages_ko_KR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Korean\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_nl_NL.po b/translations/messages_nl_NL.po index 7b19727f..42db9651 100644 --- a/translations/messages_nl_NL.po +++ b/translations/messages_nl_NL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Dutch\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_no_NO.po b/translations/messages_no_NO.po index d05cc5ff..5c302c7f 100644 --- a/translations/messages_no_NO.po +++ b/translations/messages_no_NO.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Norwegian\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_pl_PL.po b/translations/messages_pl_PL.po index 6a65e847..0993f50a 100644 --- a/translations/messages_pl_PL.po +++ b/translations/messages_pl_PL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Polish\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_pt_BR.po b/translations/messages_pt_BR.po index 9081f1b0..b5309cdd 100644 --- a/translations/messages_pt_BR.po +++ b/translations/messages_pt_BR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:53\n" "Last-Translator: lexelby \n" "Language-Team: Portuguese, Brazilian\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_pt_PT.po b/translations/messages_pt_PT.po index 7e2f9e9e..55e78740 100644 --- a/translations/messages_pt_PT.po +++ b/translations/messages_pt_PT.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -551,8 +551,10 @@ msgid "Install" msgstr "Instalar" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "Cancelar" @@ -680,7 +682,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -899,12 +901,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "Página" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1057,11 +1085,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1073,125 +1101,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_ro_RO.po b/translations/messages_ro_RO.po index d51c1029..da820fab 100644 --- a/translations/messages_ro_RO.po +++ b/translations/messages_ro_RO.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:33\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Romanian\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_ru_RU.po b/translations/messages_ru_RU.po index 7fb8754c..b58a38dc 100644 --- a/translations/messages_ru_RU.po +++ b/translations/messages_ru_RU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_sr_SP.po b/translations/messages_sr_SP.po index 0802ad40..c6685d1b 100644 --- a/translations/messages_sr_SP.po +++ b/translations/messages_sr_SP.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Serbian (Cyrillic)\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_sv_SE.po b/translations/messages_sv_SE.po index ba221f53..5359654b 100644 --- a/translations/messages_sv_SE.po +++ b/translations/messages_sv_SE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_tr_TR.po b/translations/messages_tr_TR.po index 02603868..e5b0e806 100644 --- a/translations/messages_tr_TR.po +++ b/translations/messages_tr_TR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Turkish\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_uk_UA.po b/translations/messages_uk_UA.po index 43adbf45..3609cd74 100644 --- a/translations/messages_uk_UA.po +++ b/translations/messages_uk_UA.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:52\n" "Last-Translator: lexelby \n" "Language-Team: Ukrainian\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_vi_VN.po b/translations/messages_vi_VN.po index 376c61cc..6a78625a 100644 --- a/translations/messages_vi_VN.po +++ b/translations/messages_vi_VN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:53\n" "Last-Translator: lexelby \n" "Language-Team: Vietnamese\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_zh_CN.po b/translations/messages_zh_CN.po index 3aedc1a8..980c46a5 100644 --- a/translations/messages_zh_CN.po +++ b/translations/messages_zh_CN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:53\n" "Last-Translator: lexelby \n" "Language-Team: Chinese Simplified\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" diff --git a/translations/messages_zh_TW.po b/translations/messages_zh_TW.po index 72b2e41a..8100d71a 100644 --- a/translations/messages_zh_TW.po +++ b/translations/messages_zh_TW.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: inkstitch\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-02-17 02:33+0000\n" -"PO-Revision-Date: 2019-02-17 02:34\n" +"POT-Creation-Date: 2019-03-27 02:52+0000\n" +"PO-Revision-Date: 2019-03-27 02:53\n" "Last-Translator: lexelby \n" "Language-Team: Chinese Traditional\n" "MIME-Version: 1.0\n" @@ -509,7 +509,7 @@ msgstr "" msgid "Only simple lines may be converted to satin columns." msgstr "" -#: lib/extensions/convert_to_satin.py:57 +#: lib/extensions/convert_to_satin.py:58 #, python-format msgid "Cannot convert %s to a satin column because it intersects itself. Try breaking it up into multiple paths." msgstr "" @@ -550,8 +550,10 @@ msgid "Install" msgstr "" #: lib/extensions/install.py:40 lib/extensions/lettering.py:50 -#: lib/extensions/params.py:327 print/templates/ui.html:72 -#: print/templates/ui.html:76 print/templates/ui.html:82 +#: lib/extensions/params.py:327 print/templates/custom-page.html:23 +#: print/templates/custom-page.html:27 print/templates/custom-page.html:33 +#: print/templates/ui.html:91 print/templates/ui.html:95 +#: print/templates/ui.html:101 msgid "Cancel" msgstr "" @@ -679,7 +681,7 @@ msgid "A print preview has been opened in your web browser. This window will st "This window will close after you close the print preview in your browser, or you can close it manually if necessary." msgstr "" -#: lib/extensions/print_pdf.py:411 +#: lib/extensions/print_pdf.py:417 msgid "Ink/Stitch Print" msgstr "" @@ -898,12 +900,38 @@ msgstr "" msgid "Enter thread name..." msgstr "" +#: print/templates/custom-page.html:22 print/templates/ui.html:90 +msgid "Enter URL" +msgstr "" + +#: print/templates/custom-page.html:23 print/templates/custom-page.html:27 +#: print/templates/custom-page.html:33 print/templates/ui.html:91 +#: print/templates/ui.html:95 print/templates/ui.html:101 +msgid "OK" +msgstr "" + +#: print/templates/custom-page.html:26 print/templates/ui.html:94 +msgid "Enter E-Mail" +msgstr "" + +#: print/templates/custom-page.html:29 print/templates/custom-page.html:36 +msgid "Custom Information Sheet" +msgstr "" + +#: print/templates/custom-page.html:31 print/templates/ui.html:99 +msgid "This will reset your custom text to the default." +msgstr "" + +#: print/templates/custom-page.html:32 print/templates/ui.html:100 +msgid "All changes will be lost." +msgstr "" + #: print/templates/footer.html:2 msgid "Page" msgstr "" -#: print/templates/footer.html:3 print/templates/ui.html:78 -#: print/templates/ui.html:85 +#: print/templates/footer.html:3 print/templates/ui.html:97 +#: print/templates/ui.html:104 msgid "Proudly generated with" msgstr "" @@ -1056,11 +1084,11 @@ msgstr "" msgid "Branding" msgstr "" -#: print/templates/ui.html:20 print/templates/ui.html:92 +#: print/templates/ui.html:20 print/templates/ui.html:111 msgid "Estimated Time" msgstr "" -#: print/templates/ui.html:21 print/templates/ui.html:126 +#: print/templates/ui.html:21 print/templates/ui.html:145 msgid "Design" msgstr "" @@ -1072,125 +1100,108 @@ msgstr "" msgid "Print Layouts" msgstr "" -#: print/templates/ui.html:39 print/templates/ui.html:116 +#: print/templates/ui.html:41 print/templates/ui.html:135 msgid "Client Overview" msgstr "" -#: print/templates/ui.html:40 print/templates/ui.html:117 +#: print/templates/ui.html:45 print/templates/ui.html:136 msgid "Client Detailed View" msgstr "" -#: print/templates/ui.html:41 print/templates/ui.html:118 +#: print/templates/ui.html:49 print/templates/ui.html:137 msgid "Operator Overview" msgstr "" -#: print/templates/ui.html:42 print/templates/ui.html:119 +#: print/templates/ui.html:53 print/templates/ui.html:138 msgid "Operator Detailed View" msgstr "" -#: print/templates/ui.html:43 +#: print/templates/ui.html:55 msgid "Thumbnail size" msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 +#: print/templates/ui.html:61 +msgid "Custom information sheet" +msgstr "" + +#: print/templates/ui.html:64 print/templates/ui.html:107 msgid "Includes these Page Setup, estimated time settings and also the icon." msgstr "" -#: print/templates/ui.html:45 print/templates/ui.html:88 -#: print/templates/ui.html:122 +#: print/templates/ui.html:64 print/templates/ui.html:107 +#: print/templates/ui.html:141 msgid "Save as defaults" msgstr "" -#: print/templates/ui.html:50 +#: print/templates/ui.html:69 msgid "Logo" msgstr "" -#: print/templates/ui.html:60 +#: print/templates/ui.html:79 msgid "Footer: Operator contact information" msgstr "" -#: print/templates/ui.html:71 -msgid "Enter URL" -msgstr "" - -#: print/templates/ui.html:72 print/templates/ui.html:76 -#: print/templates/ui.html:82 -msgid "OK" -msgstr "" - -#: print/templates/ui.html:75 -msgid "Enter E-Mail" -msgstr "" - -#: print/templates/ui.html:80 -msgid "This will reset your custom text to the default." -msgstr "" - -#: print/templates/ui.html:81 -msgid "All changes will be lost." -msgstr "" - -#: print/templates/ui.html:94 +#: print/templates/ui.html:113 msgid "Machine Settings" msgstr "" -#: print/templates/ui.html:96 +#: print/templates/ui.html:115 msgid "Average Machine Speed" msgstr "" -#: print/templates/ui.html:97 +#: print/templates/ui.html:116 msgid "stitches per minute " msgstr "" -#: print/templates/ui.html:101 +#: print/templates/ui.html:120 msgid "Time Factors" msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc." msgstr "" -#: print/templates/ui.html:104 +#: print/templates/ui.html:123 msgid "seconds to add to total time*" msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "This will be added to the total time." msgstr "" -#: print/templates/ui.html:108 +#: print/templates/ui.html:127 msgid "seconds needed for a color change*" msgstr "" -#: print/templates/ui.html:111 +#: print/templates/ui.html:130 msgid "seconds needed for trim" msgstr "" -#: print/templates/ui.html:114 +#: print/templates/ui.html:133 msgid "Display Time On" msgstr "" -#: print/templates/ui.html:122 +#: print/templates/ui.html:141 msgid "Includes page setup, estimated time and also the branding." msgstr "" -#: print/templates/ui.html:127 +#: print/templates/ui.html:146 msgid "Thread Palette" msgstr "" -#: print/templates/ui.html:130 +#: print/templates/ui.html:149 msgid "None" msgstr "" -#: print/templates/ui.html:146 +#: print/templates/ui.html:165 msgid "Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette. Any changes you have made to color or thread names will be lost. Are you sure?" msgstr "" -#: print/templates/ui.html:149 +#: print/templates/ui.html:168 msgid "Yes" msgstr "" -#: print/templates/ui.html:150 +#: print/templates/ui.html:169 msgid "No" msgstr "" -- cgit v1.3.1 From c8a43bbe1df0ecc11022794ef94538f3b1ba31f2 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Tue, 2 Apr 2019 06:21:53 +0200 Subject: prevent html from showing up in custom text field (#421) --- print/resources/inkstitch.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/print/resources/inkstitch.js b/print/resources/inkstitch.js index 79c6d9c3..86bc213e 100644 --- a/print/resources/inkstitch.js +++ b/print/resources/inkstitch.js @@ -324,10 +324,10 @@ $(function() { } else if (item.is('figure.inksimulation')) { setSVGTransform(item, value); } else if (item.is('div.footer-info')) { - $('#footer-info-text').html(value); - item.html(value); + $('#footer-info-text').html($.parseHTML(value)); + item.html($.parseHTML(value)); } else if (item.is('#custom-page-content')) { - $('#custom-page-content').html(value); + $('#custom-page-content').html($.parseHTML(value)); } else { item.text(value); } @@ -431,7 +431,7 @@ $(function() { } else { info_text.css('display', 'block'); var sourceText = info_text.text(); - info_text.html( sourceText ); + info_text.html( $.parseHTML(sourceText) ); element.closest('.tool-bar').find('.tb-button.edit-only').prop('disabled', false); } }); @@ -439,7 +439,6 @@ $(function() { function updateEditableText(element) { var editMode = getEditMode(element); var info_text = element.closest('fieldset').find('.info-text'); - var content = info_text.html(); var editableText = ''; if (editMode) { @@ -449,10 +448,10 @@ $(function() { } if(info_text.is('#footer-info-text')) { - $('div.footer-info').html(editableText); - $.postJSON('/settings/footer-info', {value: content}); + $('div.footer-info').html($.parseHTML(editableText)); + $.postJSON('/settings/footer-info', {value: editableText}); } else { - $.postJSON('/settings/custom-page-content', {value: content}); + $.postJSON('/settings/custom-page-content', {value: editableText}); } } -- cgit v1.3.1 From 211561eabc1444135e0a000d8ec4ba822c2ebbd5 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Tue, 2 Apr 2019 06:27:33 +0200 Subject: simulator stitch box improvement (#402) --- lib/gui/simulator.py | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/lib/gui/simulator.py b/lib/gui/simulator.py index e0d78983..d64e50c0 100644 --- a/lib/gui/simulator.py +++ b/lib/gui/simulator.py @@ -74,8 +74,12 @@ class ControlPanel(wx.Panel): self.slider = wx.Slider(self, -1, value=1, minValue=1, maxValue=2, style=wx.SL_HORIZONTAL | wx.SL_LABELS) self.slider.Bind(wx.EVT_SLIDER, self.on_slider) - self.stitchBox = IntCtrl(self, -1, value=1, min=1, max=2, limited=True, allow_none=False) - self.stitchBox.Bind(wx.EVT_TEXT, self.on_stitch_box) + self.stitchBox = IntCtrl(self, -1, value=1, min=1, max=2, limited=True, allow_none=True, style=wx.TE_PROCESS_ENTER) + self.stitchBox.Bind(wx.EVT_LEFT_DOWN, self.on_stitch_box_focus) + self.stitchBox.Bind(wx.EVT_SET_FOCUS, self.on_stitch_box_focus) + self.stitchBox.Bind(wx.EVT_TEXT_ENTER, self.on_stitch_box_focusout) + self.stitchBox.Bind(wx.EVT_KILL_FOCUS, self.on_stitch_box_focusout) + self.Bind(wx.EVT_LEFT_DOWN, self.on_stitch_box_focusout) # Layout self.vbSizer = vbSizer = wx.BoxSizer(wx.VERTICAL) @@ -120,15 +124,15 @@ class ControlPanel(wx.Panel): (wx.ACCEL_NORMAL, wx.WXK_SPACE, self.on_pause_start_button), (wx.ACCEL_NORMAL, ord('q'), self.animation_quit)] - accel_entries = [] + self.accel_entries = [] for shortcut_key in shortcut_keys: eventId = wx.NewId() - accel_entries.append((shortcut_key[0], shortcut_key[1], eventId)) + self.accel_entries.append((shortcut_key[0], shortcut_key[1], eventId)) self.Bind(wx.EVT_MENU, shortcut_key[2], id=eventId) - accel_table = wx.AcceleratorTable(accel_entries) - self.SetAcceleratorTable(accel_table) + self.accel_table = wx.AcceleratorTable(self.accel_entries) + self.SetAcceleratorTable(self.accel_table) self.SetFocus() def set_drawing_panel(self, drawing_panel): @@ -186,6 +190,8 @@ class ControlPanel(wx.Panel): if self.drawing_panel: self.drawing_panel.set_current_stitch(stitch) + self.parent.SetFocus() + def on_current_stitch(self, stitch, command): if self.current_stitch != stitch: self.current_stitch = stitch @@ -193,8 +199,20 @@ class ControlPanel(wx.Panel): self.stitchBox.SetValue(stitch) self.statusbar.SetStatusText(COMMAND_NAMES[command], 1) - def on_stitch_box(self, event): + def on_stitch_box_focus(self, event): + self.animation_pause() + self.SetAcceleratorTable(wx.AcceleratorTable([])) + event.Skip() + + def on_stitch_box_focusout(self, event): + self.SetAcceleratorTable(self.accel_table) stitch = self.stitchBox.GetValue() + self.parent.SetFocus() + + if stitch is None: + stitch = 1 + self.stitchBox.SetValue(1) + self.slider.SetValue(stitch) if self.drawing_panel: @@ -629,6 +647,7 @@ class EmbroiderySimulator(wx.Frame): if self.on_close_hook: self.on_close_hook() + self.SetFocus() self.Destroy() def go(self): -- cgit v1.3.1 From 70bb53bc4c21b8e02169f4adf2543ea4208b1b5f Mon Sep 17 00:00:00 2001 From: Catherine Holloway Date: Sat, 6 Apr 2019 14:06:49 -0400 Subject: adding minimum version requirement on jinja2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e81b32e3..44d0e5fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ shapely lxml appdirs numpy<1.16.0 -jinja2 +jinja2>2.9 requests colormath stringcase -- cgit v1.3.1 From 3d2aa93e8bcffc6eb599137d5067e8e0fd249ddb Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Sun, 7 Apr 2019 09:16:02 +0200 Subject: fix realistic detailed view (#424) --- print/templates/operator_overview.html | 5 ++++- print/templates/print_detail.html | 5 ++++- print/templates/print_overview.html | 5 ++++- print/templates/ui_svg_action_buttons.html | 9 +++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html index a3090c1f..71c5ea2e 100644 --- a/print/templates/operator_overview.html +++ b/print/templates/operator_overview.html @@ -27,7 +27,10 @@
    {{ svg_overview|replace("
  • ", "")|replace("
    • ", "")|safe }} - {% include 'ui_svg_action_buttons.html' %} + {% with %} + {% set realistic_id='realistic-operator-overview' %} + {% include 'ui_svg_action_buttons.html' with context %} + {% endwith %}
    {% include 'footer.html' %} diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html index 0dca4978..f076fc04 100644 --- a/print/templates/print_detail.html +++ b/print/templates/print_detail.html @@ -17,7 +17,10 @@
    {{color_block.svg_preview|replace("
  • ", "")|replace("
    • ", "")|safe}} - {% include 'ui_svg_action_buttons.html' %} + {% with %} + {% set loop_index=loop.index0 %} + {% include 'ui_svg_action_buttons.html' with context %} + {% endwith %}
    {% include 'color_swatch.html' %} diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html index d5111562..34478438 100644 --- a/print/templates/print_overview.html +++ b/print/templates/print_overview.html @@ -27,7 +27,10 @@
    {{ svg_overview|replace("
  • ", "")|replace("
    • ", "")|safe }} - {% include 'ui_svg_action_buttons.html' %} + {% with %} + {% set realistic_id='realistic-client-overview' %} + {% include 'ui_svg_action_buttons.html' with context %} + {% endwith %}
    diff --git a/print/templates/ui_svg_action_buttons.html b/print/templates/ui_svg_action_buttons.html index c111d634..6b199383 100644 --- a/print/templates/ui_svg_action_buttons.html +++ b/print/templates/ui_svg_action_buttons.html @@ -4,7 +4,12 @@
    -- cgit v1.3.1 From c94a28756d805aad2ec6bda946e37099ce46310d Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Sun, 7 Apr 2019 21:00:14 +0200 Subject: simulate needle penetration points --- lib/gui/simulator.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/gui/simulator.py b/lib/gui/simulator.py index d64e50c0..3c51c7f2 100644 --- a/lib/gui/simulator.py +++ b/lib/gui/simulator.py @@ -68,6 +68,9 @@ class ControlPanel(wx.Panel): self.restartBtn = wx.Button(self, -1, label=_('Restart')) self.restartBtn.Bind(wx.EVT_BUTTON, self.animation_restart) self.restartBtn.SetToolTip(_('Restart (R)')) + self.nppBtn = wx.ToggleButton(self, -1, label=_('O')) + self.nppBtn.Bind(wx.EVT_TOGGLEBUTTON, self.toggle_npp) + self.nppBtn.SetToolTip(_('Display needle penetration point (O)')) self.quitBtn = wx.Button(self, -1, label=_('Quit')) self.quitBtn.Bind(wx.EVT_BUTTON, self.animation_quit) self.quitBtn.SetToolTip(_('Quit (Q)')) @@ -95,6 +98,7 @@ class ControlPanel(wx.Panel): hbSizer2.Add(self.directionBtn, 0, wx.EXPAND | wx.ALL, 2) hbSizer2.Add(self.pauseBtn, 0, wx.EXPAND | wx.ALL, 2) hbSizer2.Add(self.restartBtn, 0, wx.EXPAND | wx.ALL, 2) + hbSizer2.Add(self.nppBtn, 0, wx.EXPAND | wx.ALL, 2) hbSizer2.Add(self.quitBtn, 0, wx.EXPAND | wx.ALL, 2) vbSizer.Add(hbSizer2, 0, wx.EXPAND | wx.ALL, 3) self.SetSizerAndFit(vbSizer) @@ -120,6 +124,7 @@ class ControlPanel(wx.Panel): (wx.ACCEL_NORMAL, wx.WXK_SUBTRACT, self.animation_one_stitch_backward), (wx.ACCEL_NORMAL, wx.WXK_NUMPAD_SUBTRACT, self.animation_one_stitch_backward), (wx.ACCEL_NORMAL, ord('r'), self.animation_restart), + (wx.ACCEL_NORMAL, ord('o'), self.on_toggle_npp_shortcut), (wx.ACCEL_NORMAL, ord('p'), self.on_pause_start_button), (wx.ACCEL_NORMAL, wx.WXK_SPACE, self.on_pause_start_button), (wx.ACCEL_NORMAL, ord('q'), self.animation_quit)] @@ -259,6 +264,15 @@ class ControlPanel(wx.Panel): def animation_restart(self, event): self.drawing_panel.restart() + def on_toggle_npp_shortcut(self, event): + self.nppBtn.SetValue(not self.nppBtn.GetValue()) + self.toggle_npp(event) + + def toggle_npp(self, event): + if self.pauseBtn.GetLabel() == _('Start'): + stitch = self.stitchBox.GetValue() + self.drawing_panel.set_current_stitch(stitch) + class DrawingPanel(wx.Panel): """""" @@ -364,11 +378,13 @@ class DrawingPanel(wx.Panel): stitch += len(stitches) if len(stitches) > 1: canvas.DrawLines(stitches) + self.draw_needle_penetration_points(canvas, pen, stitches) last_stitch = stitches[-1] else: stitches = stitches[:self.current_stitch - stitch] if len(stitches) > 1: canvas.DrawLines(stitches) + self.draw_needle_penetration_points(canvas, pen, stitches) last_stitch = stitches[-1] break self.last_frame_duration = time.time() - start @@ -383,6 +399,12 @@ class DrawingPanel(wx.Panel): canvas.DrawLines(((x - crosshair_radius, y), (x + crosshair_radius, y))) canvas.DrawLines(((x, y - crosshair_radius), (x, y + crosshair_radius))) + def draw_needle_penetration_points(self, canvas, pen, stitches): + if self.control_panel.nppBtn.GetValue(): + npp_pen = wx.Pen(pen.GetColour(), width=int(0.3 * PIXELS_PER_MM * self.PIXEL_DENSITY)) + canvas.SetPen(npp_pen) + canvas.StrokeLineSegments(stitches, stitches) + def clear(self): dc = wx.ClientDC(self) dc.Clear() @@ -719,6 +741,14 @@ class SimulatorPreview(Thread): def update_patches(self): patches = self.parent.generate_patches(self.refresh_needed) + try: + patches = self.parent.generate_patches(self.refresh_needed) + except: # noqa: E722 + # If something goes wrong when rendering patches, it's not great, + # but we don't really want the simulator thread to crash. Instead, + # just swallow the exception and abort. It'll show up when they + # try to actually embroider the shape. + return if patches and not self.refresh_needed.is_set(): stitch_plan = patches_to_stitch_plan(patches) -- cgit v1.3.1