Merge branch 'master' into lexelby/lettering-features

1 files changed, 121 insertions, 104 deletions

diff --git a/translations/messages_de_DE.po b/translations/messages_de_DE.po
index 285246ac..8449b0f0 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-04-11 02:59+0000\n"
+"PO-Revision-Date: 2019-04-11 02:59\n"
 "Last-Translator: lexelby <github.com@lexneva.name>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -131,91 +131,100 @@ msgstr "Fehler: Es gibt mehr als einen %(command)s-Befehl in dem Dokument, aber
 msgid "%(command)s: %(description)s"
 msgstr "%(command)s: %(description)s"
 
-#: lib/elements/auto_fill.py:15
+#: lib/elements/auto_fill.py:16
 msgid "AutoFill"
 msgstr "AutoFüllung"
 
-#: lib/elements/auto_fill.py:18
+#: lib/elements/auto_fill.py:19
 msgid "Automatically routed fill stitching"
 msgstr "Automatisch geführte Füllstiche"
 
-#: lib/elements/auto_fill.py:38
+#: lib/elements/auto_fill.py:39
 msgid "Running stitch length (traversal between sections)"
 msgstr "Laufstichlänge (Durchlauf zwischen Sektionen)"
 
-#: lib/elements/auto_fill.py:39
+#: lib/elements/auto_fill.py:40
 msgid "Length of stitches around the outline of the fill region used when moving from section to section."
 msgstr "Stichlänge um den Umriss des Füllbereichs, der beim Übergang von Abschnitt zu Abschnitt verwendet wird."
 
-#: lib/elements/auto_fill.py:47
+#: lib/elements/auto_fill.py:48
 msgid "Underlay"
 msgstr "Unterlage"
 
-#: lib/elements/auto_fill.py:47 lib/elements/auto_fill.py:56
-#: lib/elements/auto_fill.py:72 lib/elements/auto_fill.py:83
-#: lib/elements/auto_fill.py:93 lib/elements/auto_fill.py:105
+#: lib/elements/auto_fill.py:48 lib/elements/auto_fill.py:57
+#: lib/elements/auto_fill.py:73 lib/elements/auto_fill.py:84
+#: lib/elements/auto_fill.py:94 lib/elements/auto_fill.py:106
+#: lib/elements/auto_fill.py:140
 msgid "AutoFill Underlay"
 msgstr "AutoFill-Unterlage"
 
-#: lib/elements/auto_fill.py:53
+#: lib/elements/auto_fill.py:54
 msgid "Fill angle"
 msgstr "Füllwinkel"
 
-#: lib/elements/auto_fill.py:54
+#: lib/elements/auto_fill.py:55
 msgid "default: fill angle + 90 deg"
 msgstr "Standard: Füllwinkel + 90°"
 
-#: lib/elements/auto_fill.py:69
+#: lib/elements/auto_fill.py:70
 msgid "Row spacing"
 msgstr "Reihenabstand"
 
-#: lib/elements/auto_fill.py:70
+#: lib/elements/auto_fill.py:71
 msgid "default: 3x fill row spacing"
 msgstr "Standard: 3x Füllreihenabstand"
 
-#: lib/elements/auto_fill.py:80
+#: lib/elements/auto_fill.py:81
 msgid "Max stitch length"
 msgstr "Maximale Stichlänge"
 
-#: lib/elements/auto_fill.py:81
+#: lib/elements/auto_fill.py:82
 msgid "default: equal to fill max stitch length"
 msgstr "Standard: entspricht der maximalen Stichlänge"
 
-#: lib/elements/auto_fill.py:90
+#: lib/elements/auto_fill.py:91
 msgid "Inset"
 msgstr "Einzug"
 
-#: lib/elements/auto_fill.py:91
+#: lib/elements/auto_fill.py:92
 msgid "Shrink the shape before doing underlay, to prevent underlay from showing around the outside of the fill."
 msgstr "Schrumpfen Sie die Form vor der Unterlage, um zu verhindern, dass die Unterlage um die Außenseite der Füllung herum sichtbar wird."
 
-#: lib/elements/auto_fill.py:102 lib/elements/fill.py:47
+#: lib/elements/auto_fill.py:103 lib/elements/fill.py:47
 msgid "Skip last stitch in each row"
 msgstr ""
 
-#: lib/elements/auto_fill.py:103 lib/elements/fill.py:48
+#: lib/elements/auto_fill.py:104 lib/elements/fill.py:48
 msgid "The last stitch in each row is quite close to the first stitch in the next row.  Skipping it decreases stitch count and density."
 msgstr ""
 
-#: lib/elements/auto_fill.py:113
+#: lib/elements/auto_fill.py:114
 msgid "Expand"
 msgstr "Erweitern"
 
-#: lib/elements/auto_fill.py:114
+#: lib/elements/auto_fill.py:115
 msgid "Expand the shape before fill stitching, to compensate for gaps between shapes."
 msgstr "Erweitern der Form vor dem Füllstich, um Lücken zwischen den Formen auszugleichen."
 
-#: lib/elements/auto_fill.py:186
+#: lib/elements/auto_fill.py:124 lib/elements/auto_fill.py:136
+msgid "Underpath"
+msgstr ""
+
+#: lib/elements/auto_fill.py:125 lib/elements/auto_fill.py:137
+msgid "Travel inside the shape when moving from section to section.  Underpath stitches avoid traveling in the direction of the row angle so that they are not visible.  This gives them a jagged appearance."
+msgstr ""
+
+#: lib/elements/auto_fill.py:213
 msgid "Unable to autofill: "
 msgstr ""
 
-#: lib/elements/auto_fill.py:190
+#: lib/elements/auto_fill.py:221
 msgid "Error during autofill!  This means that there is a problem with Ink/Stitch."
 msgstr ""
 
 #. this message is followed by a URL:
 #. https://github.com/inkstitch/inkstitch/issues/new
-#: lib/elements/auto_fill.py:193
+#: lib/elements/auto_fill.py:224
 msgid "If you'd like to help us make Ink/Stitch better, please paste this whole message into a new issue at: "
 msgstr ""
 
@@ -474,15 +483,15 @@ msgstr "AutoSatin %d"
 msgid "AutoSatin Running Stitch %d"
 msgstr "AutoSatin Laufstich %d"
 
-#: lib/extensions/base.py:124
+#: lib/extensions/base.py:125
 msgid "No embroiderable paths selected."
 msgstr "Keine zu stickenden Pfade ausgewählt."
 
-#: lib/extensions/base.py:126
+#: lib/extensions/base.py:127
 msgid "No embroiderable paths found in document."
 msgstr "Keine zu stickenden Pfade im Dokument gefunden."
 
-#: lib/extensions/base.py:127
+#: lib/extensions/base.py:128
 msgid "Tip: use Path -> Object to Path to convert non-paths."
 msgstr "Tipp: Verwende Pfad -> Objekt zu Pfad umwandeln, um nicht-Pfade vor dem Sticken zu konvertieren."
 
@@ -510,7 +519,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 +561,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 +693,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"
 
@@ -769,7 +780,7 @@ msgstr "Schritt vorwärts (+)"
 msgid "Switch direction (arrow left | arrow right)"
 msgstr "Richtung wechseln (Pfeil Links | Pfeil Rechts)"
 
-#: lib/gui/simulator.py:65 lib/gui/simulator.py:218 lib/gui/simulator.py:225
+#: lib/gui/simulator.py:65 lib/gui/simulator.py:241 lib/gui/simulator.py:248
 msgid "Pause"
 msgstr "Pause"
 
@@ -786,31 +797,39 @@ msgid "Restart (R)"
 msgstr "Neustart (R)"
 
 #: lib/gui/simulator.py:71
+msgid "O"
+msgstr ""
+
+#: lib/gui/simulator.py:73
+msgid "Display needle penetration point (O)"
+msgstr ""
+
+#: lib/gui/simulator.py:74
 msgid "Quit"
 msgstr "Beenden"
 
-#: lib/gui/simulator.py:73
+#: lib/gui/simulator.py:76
 msgid "Quit (Q)"
 msgstr "Beenden (Q)"
 
-#: lib/gui/simulator.py:179
+#: lib/gui/simulator.py:188
 #, python-format
 msgid "Speed: %d stitches/sec"
 msgstr "Geschwindigkeit: %d Stiche/Sek"
 
-#: lib/gui/simulator.py:221
+#: lib/gui/simulator.py:244 lib/gui/simulator.py:272
 msgid "Start"
 msgstr "Start"
 
-#: lib/gui/simulator.py:729 lib/gui/simulator.py:741
+#: lib/gui/simulator.py:777 lib/gui/simulator.py:789
 msgid "Preview"
 msgstr "Vorschau"
 
-#: lib/gui/simulator.py:745
+#: lib/gui/simulator.py:793
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: lib/gui/simulator.py:774
+#: lib/gui/simulator.py:822
 msgid "Embroidery Simulation"
 msgstr "Stick Simulation"
 
@@ -832,18 +851,6 @@ msgstr "Ink/Stitch Text"
 msgid "Error writing to %(path)s: %(error)s"
 msgstr "Fehler beim Schreiben in %(path)s: %(error)s"
 
-#: lib/stitches/auto_fill.py:189
-msgid "This shape is so small that it cannot be filled with rows of stitches.  It would probably look best as a satin column or running stitch."
-msgstr ""
-
-#: lib/stitches/auto_fill.py:192
-msgid "Cannot parse shape.  This most often happens because your shape is made up of multiple sections that aren't connected."
-msgstr ""
-
-#: lib/stitches/auto_fill.py:421
-msgid "Unexpected error while generating fill stitches. Please send your SVG file to lexelby@github."
-msgstr "Unerwarteter Fehler beim Generieren der Füllstiche. Bitte senden Sie die SVG-Datei an lexelby@github."
-
 #: lib/svg/svg.py:97
 msgid "Stitch Plan"
 msgstr "Stich-Plan"
@@ -901,12 +908,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"
 
@@ -1027,7 +1060,7 @@ msgstr "FARBE"
 msgid "Estimated time"
 msgstr "Voraussichtliche Dauer"
 
-#: print/templates/print_overview.html:39
+#: print/templates/print_overview.html:42
 msgid "Client Signature"
 msgstr "Unterschrift Kunde"
 
@@ -1059,11 +1092,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 +1108,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"
 
@@ -1209,7 +1225,8 @@ msgstr "An Fenstergröße anpassen"
 msgid "Apply to all"
 msgstr "Auf alle anwenden"
 
-#: print/templates/ui_svg_action_buttons.html:8
+#: print/templates/ui_svg_action_buttons.html:9
+#: print/templates/ui_svg_action_buttons.html:12
 msgid "Realistic"
 msgstr "Realistische Vorschau"