diff --git a/README.md b/README.md index 1eb1f8a37..97f83a2b8 100644 --- a/README.md +++ b/README.md @@ -103,11 +103,11 @@ user-level: Beginner --- ``` -These categories then can be used to list tutorials with a specific keyword, e.g. `{% include tutorial_list key="stitch-type" value="Fill Stitch" %}` would display a list of all tutorial files which have fill stitch specified in their header. +These categories then can be used to list tutorials with a specific keyword, e.g. `{% include tutorials/tutorial_list key="stitch-type" value="Fill Stitch" %}` would display a list of all tutorial files which have fill stitch specified in their header. They can also be used to display a full list of categories. In this case categories need to be specified by every call of tutorial lists. Example: ``` {% assign tutorial_cats = 'Tutorial Type*Stitch Type*Techniques*Field Of Use*User Level' | split: '*' %} -{% include display_tutorials tutorial_cats=tutorial_cats %} +{% include tutorials/display_tutorials tutorial_cats=tutorial_cats %} ``` diff --git a/_config.yml b/_config.yml index 6f71170fc..f3e6028ae 100644 --- a/_config.yml +++ b/_config.yml @@ -94,7 +94,6 @@ analytics: google: tracking_id : - # Site Author author: name : "Ink/Stitch Community" @@ -128,7 +127,6 @@ author: xing : youtube : # "https://youtube.com/c/MichaelRoseDesign" - # Reading Files include: - .htaccess @@ -252,7 +250,21 @@ compress_html: ignore: envs: development - +# Languages + +languages: + - + - + - English + - + - de + - Deutsch + +# Directories +collections_dir: collections +layouts_dir: _jekyll/_layouts +includes_dir: _jekyll/_includes + # Collections collections: docs: @@ -267,101 +279,130 @@ collections: developers: output: true permalink: /:colleciton/:path/ - i18n: - output: true - permalink: /:collection/:path/ - + # Defaults defaults: - # _posts + # default - scope: path: "" - type: posts values: - lang: en layout: single author_profile: false - read_time: true + read_time: false comments: false + share: false + related: false + # _posts + - scope: + type: posts + values: share: true + read_time: true related: true sidebar: nav: "pages" + # en + - scope: + path: "_posts/en" + values: + lang: en + # de + - scope: + path: "_posts/de" + values: + lang: de # _pages - scope: - path: "" type: pages values: - lang: en - layout: single - author_profile: false sidebar: nav: "pages" + # en + - scope: + path: "_pages/en" + values: + lang: en + # de + - scope: + path: "_pages/de" + values: + lang: de # _docs - scope: - path: "" type: docs values: - lang: en - layout: single - lang: en - read_time: false - author_profile: false - share: false - comments: false sidebar: nav: "docs" - # de/_docs + # en - scope: - path: "" - type: i18n + path: "_docs/en" + values: + lang: en + # de + - scope: + path: "_docs/de" values: - layout: single lang: de - read_time: false - author_profile: false - share: false - comments: false - sidebar: - nav: "docs" # _tutorials - scope: - path: "" type: tutorials values: - lang: en - layout: single - read_time: true - author_profile: false - share: false - comments: false sidebar: nav: "tutorials" + # en + - scope: + path: "_tutorials/en" + values: + lang: en + # de + - scope: + path: "_tutorials/de" + values: + lang: de # _tutorial - scope: - path: "" type: tutorial values: - lang: en - layout: single read_time: true - author_profile: false - share: false - comments: false sidebar: nav: "tutorials" - # _developers - - scope: - path: "" - type: developers + # en + - scope: + path: "_tutorial/en" values: lang: en - layout: single - read_time: false - author_profile: false - share: false - comments: false + # de + - scope: + path: "_tutorial/de" + values: + lang: de + # _developers + - scope: + type: developers + values: sidebar: nav: "developers" + #en + - scope: + path: "_developers/en" + values: + lang: en + # de + - scope: + path: "_developers/de" + values: + lang: de + + +# It'd be nice to have "lang" set through wildcard, using * for directories: +# https://jekyllrb.com/docs/configuration/front-matter-defaults/ +# this doesn't seem to work +# e.g.: +# - scope: +# path: "*/de" +# values: +# lang: de + + diff --git a/_data/navigation_de.yml b/_data/navigation_de.yml index 6d5768e19..f0f948998 100644 --- a/_data/navigation_de.yml +++ b/_data/navigation_de.yml @@ -1,7 +1,7 @@ # main links main: - title: "Features" - url: /features/ + url: /de/features/ - title: "Dokumentation" url: /de/docs/install/ - title: "Tutorials" diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 968118e29..a6aa9adbf 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -43,6 +43,7 @@ en: &DEFAULT_EN search_placeholder_text : "Enter your search term..." results_found : "Result(s) found" back_to_top : "Back to top" + choose_language : "Choose your language" en-US: <<: *DEFAULT_EN en-CA: @@ -92,6 +93,7 @@ es: &DEFAULT_ES comment_success_msg : "Gracias por su comentario!, Este se visualizará en el sitio una vez haya sido aprobado" comment_error_msg : "Lo sentimos, ha ocurrido un error al enviar su comentario. Por favor asegurese que todos los campos han sido diligenciados e intente de nuevo" loading_label : "Cargando..." + choose_language : "Choose your language" es-ES: <<: *DEFAULT_ES es-CO: @@ -138,6 +140,7 @@ fr: &DEFAULT_FR comment_success_msg : "Merci pour votre commentaire, il sera visible sur le site une fois approuvé." comment_error_msg : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez." loading_label : "Chargement..." + choose_language : "Choose your language" fr-FR: <<: *DEFAULT_FR fr-BE: @@ -185,6 +188,7 @@ tr: &DEFAULT_TR comment_success_msg : "Yorumunuz için teşekkürler! Yorumunuz onaylandıktan sonra sitede gösterilecektir." comment_error_msg : "Maalesef bir hata oluştu. Lütfen zorunlu olan tüm alanları doldurduğunuzdan emin olun ve sonrasında tekrar deneyin." loading_label : "Yükleniyor..." + choose_language : "Choose your language" tr-TR: <<: *DEFAULT_TR @@ -228,6 +232,7 @@ pt: &DEFAULT_PT comment_success_msg : "Obrigado pelo seu comentário! Será visível no site logo que aprovado." comment_error_msg : "Lamento, ocorreu um erro na sua submissão. Por favor verifique se todos os campos obrigatórios estão corretamente preenchidos e tente novamente." loading_label : "A carregar..." + choose_language : "Choose your language" pt-PT: <<: *DEFAULT_PT # Brazilian Portuguese @@ -269,6 +274,7 @@ pt-BR: comment_success_msg : "Obrigado pelo seu comentário! Ele aparecerá no site assim que for aprovado." comment_error_msg : "Desculpe, ocorreu um erro no envio. Por favor verifique se todos os campos obrigatórios foram preenchidos e tente novamente." loading_label : "Carregando..." + choose_language : "Choose your language" # Italian # ------- @@ -310,6 +316,7 @@ it: &DEFAULT_IT comment_success_msg : "Grazie per il tuo commento! Verrà visualizzato nel sito una volta che sarà approvato." comment_error_msg : "C'è stato un errore con il tuo invio. Assicurati che tutti i campi richiesti siano stati completati e riprova." loading_label : "Caricamento..." + choose_language : "Choose your language" it-IT: <<: *DEFAULT_IT @@ -353,6 +360,7 @@ zh: &DEFAULT_ZH_HANS comment_success_msg : "感谢您的评论！被批准后它会立即在此站点展示。" comment_error_msg : "很抱歉，您的提交存在错误。请确保所有必填字段都已填写正确，然后再试一次。" loading_label : "正在加载..." + choose_language : "Choose your language" zh-CN: <<: *DEFAULT_ZH_HANS zh-SG: @@ -396,6 +404,7 @@ zh-TW: &DEFAULT_ZH_HANT comment_success_msg : "感謝您的留言！ 審核後將會顯示在站上。" comment_error_msg : "抱歉，部份資料輸入有問題。請確認資料填寫正確後再試一次。" loading_label : "載入中..." + choose_language : "Choose your language" zh-HK: <<: *DEFAULT_ZH_HANT @@ -441,6 +450,7 @@ de: &DEFAULT_DE loading_label : "Lade..." search_placeholder_text : "Suchbegriff eingeben..." results_found : "Ergebnis(se) gefunden" + choose_language : "Wähle deine Sprache" de-DE: <<: *DEFAULT_DE de-AT: @@ -494,6 +504,7 @@ ne: &DEFAULT_NE comment_success_msg : "तपाईंको टिप्पणीको लागि धन्यवाद! एक पटक यो अनुमोदन गरेपछी यो साइटमा देखाउनेछ।" comment_error_msg : "माफ गर्नुहोस्, तपाईंको टिप्पणी त्रुटि थियो।सबै आवश्यक जानकारीहरु पूरा गरिएको छ भने निश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।" loading_label : "लोड हुँदैछ ..." + choose_language : "Choose your language" ne-NP: <<: *DEFAULT_NE @@ -537,6 +548,7 @@ ko: &DEFAULT_KO comment_success_msg : "감사합니다! 댓글이 머지된 후 확인하실 수 있습니다." comment_error_msg : "댓글 등록에 문제가 있습니다. 필요 필드를 작성했는지 확인하고 다시 시도하세요." loading_label : "로딩중..." + choose_language : "Choose your language" ko-KR: <<: *DEFAULT_KO @@ -582,6 +594,7 @@ ru: &DEFAULT_RU loading_label : "Отправка..." search_placeholder_text : "Введите поисковый запрос..." results_found : "Найдено" + choose_language : "Choose your language" ru-RU: <<: *DEFAULT_RU @@ -625,6 +638,7 @@ lt: &DEFAULT_LT comment_success_msg : "Ačiū už komentarą! Jis bus parodytas kai bus patvirtintas." comment_error_msg : "Atleiskite, įvyko netikėta klaida įrašant komentarą. Pasitikrinkite ar užpildėte visus būtinus laukus ir pamėginkite dar kartą." loading_label : "Kraunama..." + choose_language : "Choose your language" lt-LT: <<: *DEFAULT_LT @@ -670,6 +684,7 @@ gr: &DEFAULT_GR loading_label : "Φόρτωση..." search_placeholder_text : "Εισάγετε όρο αναζήτησης..." results_found : "Αποτελέσματα" + choose_language : "Choose your language" gr-GR: <<: *DEFAULT_GR @@ -713,6 +728,7 @@ sv: &DEFAULT_SV comment_success_msg : "Tack för din kommentar! Den kommer att visas på sidan så fort den har godkännts." comment_error_msg : "Tyvärr det har blivit något fel i en av fälten, se till att du fyller i alla rutor och försök igen." loading_label : "Laddar..." + choose_language : "Choose your language" sv-SE: <<: *DEFAULT_SV sv-FI: @@ -758,6 +774,7 @@ nl: &DEFAULT_NL comment_success_msg : "Bedankt voor uw reactie! Het zal op de site worden weergegeven zodra het is goedgekeurd." comment_error_msg : "Sorry, er is een fout opgetreden bij uw inzending. Zorg ervoor dat alle vereiste velden zijn voltooid en probeer het opnieuw." loading_label : "Laden..." + choose_language : "Choose your language" nl-BE: <<: *DEFAULT_NL nl-NL: @@ -803,6 +820,7 @@ id: &DEFAULT_ID comment_success_msg : "Terimakasih atas komentar Anda! Komentar ini akan tampil setelah disetujui." comment_error_msg : "Maaf, ada kesalahan pada submisi Anda. Pastikan seluruh kolom sudah dilengkapi dan coba kembali." loading_label : "Sedang meload..." + choose_language : "Choose your language" id-ID: <<: *DEFAULT_ID @@ -846,6 +864,7 @@ vi: &DEFAULT_VI comment_success_msg : "Cảm ơn bạn đã bình luận! Bình luận sẽ xuất hiện sau khi được duyệt." comment_error_msg : "Rất tiếc, có lỗi trong việc gửi bình luận. Hãy đảm bảo toàn bộ các phần bắt buộc đã được điền đầy đủ và thử lại." loading_label : "Đang tải..." + choose_language : "Choose your language" vi-VN: <<: *DEFAULT_VI @@ -892,6 +911,7 @@ da: &DEFAULT_DA search_placeholder_text : "Hvad leder du efter..." results_found : "Resultat(er) fundet" back_to_top : "Tilbage til toppen" + choose_language : "Choose your language" da-DK: <<: *DEFAULT_DA @@ -935,6 +955,7 @@ pl: &DEFAULT_PL comment_success_msg : "Dziękuję za Twój komentarz! Zostanie dodany po akceptacji." comment_error_msg : "Niestety wystąpił błąd. Proszę upewnij się, że wszystkie wymagane pola zostały wypełnione i spróbuj ponownie." loading_label : "Trwa ładowanie strony..." + choose_language : "Choose your language" pl-PL: <<: *DEFAULT_PL @@ -980,6 +1001,7 @@ ja: &DEFAULT_JA loading_label : "読み込み中..." search_placeholder_text : "検索キーワードを入力してください..." results_found : "件" + choose_language : "Choose your language" ja-JP: <<: *DEFAULT_JA diff --git a/_i18n/de/_images/grids_de.png b/_i18n/de/_images/grids_de.png deleted file mode 100644 index a9c165b4b..000000000 Binary files a/_i18n/de/_images/grids_de.png and /dev/null differ diff --git a/_includes/folder-galleries b/_jekyll/_includes/folder-galleries similarity index 100% rename from _includes/folder-galleries rename to _jekyll/_includes/folder-galleries diff --git a/_includes/footer.html b/_jekyll/_includes/footer.html similarity index 97% rename from _includes/footer.html rename to _jekyll/_includes/footer.html index 6fe7d22c7..3d8bdd496 100644 --- a/_includes/footer.html +++ b/_jekyll/_includes/footer.html @@ -1,6 +1,6 @@
diff --git a/_pages/de/about.md b/_pages/de/about.md new file mode 100644 index 000000000..76cdb600e --- /dev/null +++ b/_pages/de/about.md @@ -0,0 +1,35 @@ +--- +title: "Ink/Stitch: Ein auf Inkscape basierendes Open Source Programm für Stickmaschinen" +permalink: /de/about/ +excerpt: "" +last_modified_at: 2018-06-23 +--- +## Background and Philosophy + +_von @lexelby, ein Ink/Stitch Programmierer_ + +Möchten Sie Stickmusterdateien (PES, DST und viele mehr) mit einer **kostenlosen, Open-Source-Software** entwerfen? + +Ink/Stitch soll eine vollwertige Stickdigitalisierungssoftware werden, die vollständig auf freier Open-Source-Software basiert. Unser Ziel ist es sowohl für Hobbyisten als auch für professionelle Digitalisierer die benötigten Werkzeuge bereitzustellen. + +Willst du mehr erfahren? + +* [Übersicht der Funktionen](https://inkstitch.org/features/) +* [Installation](https://inkstitch.org/docs/install/) (Mac-Unterstützung ist in Arbeit!) +* [Screenshots](https://inkstitch.org/tutorials/inspiration/) +* [Videos](https://inkstitch.org/tutorials/video/) +* [Website](https://inkstitch.org) + +# Hintergrund und Philosophie + +_von @lexelby, ein Ink/Stitch Programmierer (translated by @kaalleen & @AkiraNorthstar)_ + +Ich erhielt ein wirklich wunderbares Weihnachtsgeschenk für einen Programmierer: eine [Stickmaschine](http://www.brother-usa.com/homesewing/ModelDetail.aspx?ProductID=SE400). Es ähnelt so ziemlich einer CNC-Maschine ... Ich musste einfach herausfinden wie man Programme dafür erstellt. Das Problem daran ist, **alle kostenlosen Stickdesign-Software Varianten** haben ein Defizit, vor allem wenn die Anforderung ist unter Linux, meinem Betriebssystem der Wahl, zu laufen. + +Ich fing an [inkscape-embroidery](http://www.jonh.net/~jonh/inkscape-embroidery/) zu modifizieren. +Es hatte einige der grundlegenden Funktionen die ich benötigte und ich sah eine Menge Potenzial. Ich mag die Idee, einen vorhandenen, ultrastarken SVG-Editor wie [Inkscape](https://inkscape.org) als Basis für eine Stickdesign-Software zu verwenden. + +Von dort ging es los. Ich fügte fortwährend Funktionen hinzu, so wie ich sie brauchte und zu diesem Zeitpunkt ist nur noch sehr wenig von dem ursprünglichen Code übrig. + +Das Ziel von Ink/Stitch ist es, eine leistungsfähige Digitalisierungssoftware für Stickereien für jedermann **völlig kostenlos** zur Verfügung zu stellen. Ich möchte das Gebiet des Stickdesigns öffnen und es auch für diejenigen zugänglich machen, die nicht Hunderte oder Tausende für eine Software ausgeben können oder wollen. Und ich möchte Leuten wie mir, die es lieben Programierung mit Kunst zu verbinden, eine offene, erweiterbare und zugängliche Software geben, auf der man selbst aktiv sein kann. + diff --git a/_pages/de/category-archive.md b/_pages/de/category-archive.md new file mode 100644 index 000000000..d896a9a9d --- /dev/null +++ b/_pages/de/category-archive.md @@ -0,0 +1,5 @@ +--- +title: "Posts by Category" +layout: categories +permalink: /de/categories/ +--- diff --git a/_pages/de/features.md b/_pages/de/features.md new file mode 100644 index 000000000..b2b73b713 --- /dev/null +++ b/_pages/de/features.md @@ -0,0 +1,63 @@ +--- +title: "Ink/Stitch Features" +permalink: /de/features/ +excerpt: "Ink/Stitch features" +last_modified_at: 2018-06-10 +sidebar: + nav: pages +--- +* Digitize machine embroidery designs using Inkscape (SVG) +* Supported Stitches: + * fill stitch + * automatically fill arbitrary shapes with stitches + * adjust the stitch length, row spacing, and row angle + * underlay + * satin stitch + * custom-design your satin column with varying width + * mix and match 3 kinds of underlay + * center-walk + * contour + * zig-zag + * e stitch + * running stitch + * bean stitch + * manual stitch + * plot each stitch exactly where you want it +* Cross Platform + * all code libraries built in, no need to install anything else! +* User interface translated to several languages ([translation help appreciated](https://crowdin.com/project/inkstitch)!) +* Import and Export many popular machine embroidery formats +* Add Trims and Stops +* Edit Stitch Order +* Set custom origin point as (0, 0) in the design file +* Animated stitch-out preview + * including live-preview as you adjust settings like row spacing underlay, etc. +* Print to PDF + * realistic rendering + * line-drawing mode available as well + * embroidery machine operator layout with color blocks, thread names, stitch counts, and custom notes + * client-oriented layout designed for you to send to your customer + * highly customizable through your web browser +* Thread manufacturer palettes (over 60 manufacturers included) + * automated installation of Inkscape palettes for use in your designs + * thread names and catalog numbers included in PDF printouts + +## Supported File Formats + +### Writing +PEC, PES, EXP, DST, JEF, VP3 + +### Reading +PEC, PES, EXP, DST, JEF, VP3, XXX, SEW, u01, SHV, 10o, 100, BRO, DSB, DSZ, EMD, INB, TBF, KSM, TAP, STX + +## Roadmap + +Here are features we're hoping to add, though not necessarily in this order: + +* Lettering +* Gradient Fill (already realised as a [hidden feature](https://github.com/inkstitch/inkstitch/pull/108#issuecomment-369444197)) +* Pattern Fill +* 32-bit Linux support (build engineers needed!) +* bean stitch +* "E" stitch + diff --git a/_pages/de/namespace.md b/_pages/de/namespace.md new file mode 100644 index 000000000..730822931 --- /dev/null +++ b/_pages/de/namespace.md @@ -0,0 +1,10 @@ +--- +title: "Ink/Stitch XML Namespace" +permalink: /de/namespace/ +excerpt: "Document of all metadata tags and embroidery attributes - in future" +last_modified_at: 2018-07-27 + +classes: wide +--- +{% include namespace %} + diff --git a/_pages/de/news.md b/_pages/de/news.md new file mode 100644 index 000000000..1d5070576 --- /dev/null +++ b/_pages/de/news.md @@ -0,0 +1,7 @@ +--- +title: "News" +permalink: /de/news/ +layout: posts +sidebar: + nav: "pages" +--- diff --git a/_pages/de/sitemap.md b/_pages/de/sitemap.md new file mode 100644 index 000000000..07162e204 --- /dev/null +++ b/_pages/de/sitemap.md @@ -0,0 +1,34 @@ +--- +layout: archive +title: "Sitemap" +permalink: /de/sitemap/ +--- + +A list of all the posts and pages found on the site. For you robots out there is an [XML version]({{ "sitemap.xml" | relative_url }}) available for digesting as well. + +## Pages +{% for post in site.pages %} + {% include archive-single.html %} +{% endfor %} + +{% capture written_label %}'None'{% endcapture %} + +{% for collection in site.collections %} +{% unless collection.output == false or collection.label == "posts" %} + {% capture label %}{{ collection.label }}{% endcapture %} + {% if label != written_label %} +

{{ label }}

+ {% capture written_label %}{{ label }}{% endcapture %} + {% endif %} +{% endunless %} +{% for post in collection.docs %} + {% unless collection.output == false or collection.label == "posts" %} + {% include archive-single.html %} + {% endunless %} +{% endfor %} +{% endfor %} + +## Posts +{% for post in site.posts %} + {% include archive-single.html %} +{% endfor %} diff --git a/_pages/about.md b/_pages/en/about.md similarity index 99% rename from _pages/about.md rename to _pages/en/about.md index e7bfb3e76..d23657a34 100644 --- a/_pages/about.md +++ b/_pages/en/about.md @@ -1,4 +1,5 @@ --- +lang: en title: "Ink/Stitch: An open source machine embroidery design platform based on Inkscape" permalink: /about/ excerpt: "" diff --git a/_pages/category-archive.md b/_pages/en/category-archive.md similarity index 100% rename from _pages/category-archive.md rename to _pages/en/category-archive.md diff --git a/_pages/features.md b/_pages/en/features.md similarity index 100% rename from _pages/features.md rename to _pages/en/features.md diff --git a/_pages/namespace.md b/_pages/en/namespace.md similarity index 100% rename from _pages/namespace.md rename to _pages/en/namespace.md diff --git a/_pages/news.md b/_pages/en/news.md similarity index 100% rename from _pages/news.md rename to _pages/en/news.md diff --git a/_pages/sitemap.md b/_pages/en/sitemap.md similarity index 100% rename from _pages/sitemap.md rename to _pages/en/sitemap.md diff --git a/_pages/terms.md b/_pages/en/terms.md similarity index 100% rename from _pages/terms.md rename to _pages/en/terms.md diff --git a/assets/css/main.scss b/assets/css/main.scss index 7fbeec2c3..189c61e62 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -49,7 +49,8 @@ key { padding: 0 0.3em; margin: 0.1em 0.3em; border-radius: 5px; - background: radial-gradient(#f2f3f3, #eaeaea); + background: #f2f3f3; + background: radial-gradient(#f2f3f3 60%, #cecece); display: inline-block; min-width: 2em; text-align: center; @@ -149,6 +150,10 @@ table tr td:first-child { padding-left: 1em; */ } + #language_switcher { + margin-top: 2.5em; + } + /* Masthead */ .masthead { box-shadow: 1px 1px 5px #ccc; diff --git a/assets/images/docs/embroider.jpg b/assets/images/docs/en/embroider.jpg similarity index 100% rename from assets/images/docs/embroider.jpg rename to assets/images/docs/en/embroider.jpg diff --git a/assets/images/docs/export-batch.jpg b/assets/images/docs/en/export-batch.jpg similarity index 100% rename from assets/images/docs/export-batch.jpg rename to assets/images/docs/en/export-batch.jpg diff --git a/assets/images/docs/export-selection-field.jpg b/assets/images/docs/en/export-selection-field.jpg similarity index 100% rename from assets/images/docs/export-selection-field.jpg rename to assets/images/docs/en/export-selection-field.jpg diff --git a/assets/images/docs/flip-satin-column.jpg b/assets/images/docs/en/flip-satin-column.jpg similarity index 100% rename from assets/images/docs/flip-satin-column.jpg rename to assets/images/docs/en/flip-satin-column.jpg diff --git a/assets/images/docs/flip-satin-columns-02.jpg b/assets/images/docs/en/flip-satin-columns-02.jpg similarity index 100% rename from assets/images/docs/flip-satin-columns-02.jpg rename to assets/images/docs/en/flip-satin-columns-02.jpg diff --git a/assets/images/docs/params-autofill-underlay.jpg b/assets/images/docs/en/params-autofill-underlay.jpg similarity index 100% rename from assets/images/docs/params-autofill-underlay.jpg rename to assets/images/docs/en/params-autofill-underlay.jpg diff --git a/assets/images/docs/params-autofill.jpg b/assets/images/docs/en/params-autofill.jpg similarity index 100% rename from assets/images/docs/params-autofill.jpg rename to assets/images/docs/en/params-autofill.jpg diff --git a/assets/images/docs/params-manualfill.jpg b/assets/images/docs/en/params-manualfill.jpg similarity index 100% rename from assets/images/docs/params-manualfill.jpg rename to assets/images/docs/en/params-manualfill.jpg diff --git a/assets/images/docs/params-presets.jpg b/assets/images/docs/en/params-presets.jpg similarity index 100% rename from assets/images/docs/params-presets.jpg rename to assets/images/docs/en/params-presets.jpg diff --git a/assets/images/docs/params-satincolumn.jpg b/assets/images/docs/en/params-satincolumn.jpg similarity index 100% rename from assets/images/docs/params-satincolumn.jpg rename to assets/images/docs/en/params-satincolumn.jpg diff --git a/assets/images/docs/params-stroke.jpg b/assets/images/docs/en/params-stroke.jpg similarity index 100% rename from assets/images/docs/params-stroke.jpg rename to assets/images/docs/en/params-stroke.jpg diff --git a/assets/images/docs/print-realistic-rendering.jpg b/assets/images/docs/en/print-realistic-rendering.jpg similarity index 100% rename from assets/images/docs/print-realistic-rendering.jpg rename to assets/images/docs/en/print-realistic-rendering.jpg diff --git a/assets/images/docs/split-path.jpg b/assets/images/docs/en/split-path.jpg similarity index 100% rename from assets/images/docs/split-path.jpg rename to assets/images/docs/en/split-path.jpg diff --git a/assets/images/docs/visual-commands-attach.jpg b/assets/images/docs/en/visual-commands-attach.jpg similarity index 100% rename from assets/images/docs/visual-commands-attach.jpg rename to assets/images/docs/en/visual-commands-attach.jpg diff --git a/assets/images/docs/visual-commands-symbol-set.jpg b/assets/images/docs/en/visual-commands-symbol-set.jpg similarity index 100% rename from assets/images/docs/visual-commands-symbol-set.jpg rename to assets/images/docs/en/visual-commands-symbol-set.jpg diff --git a/collections/_developers/de/001-001-introduction.md b/collections/_developers/de/001-001-introduction.md new file mode 100644 index 000000000..119ccb34b --- /dev/null +++ b/collections/_developers/de/001-001-introduction.md @@ -0,0 +1,15 @@ +--- +title: "Get Involved" +permalink: /de/developers/introduction/ +last_modified_at: 2018-07-21 +toc: false +--- +This section will provide information for developers, translators and documenters. +Please visit the particular sections to get more informations. + +* [Developing Ink/Stitch](/developers/inkstitch/) +* [Documentation](/developers/documentation/) +* [Localization](/developers/localize/) +* [Bug Reports](/developers/report-bugs/) + +Whenever you have questions or remarks, please don't hesitate to get in touch with us through the [github issues](https://github.com/inkstitch/inkstitch/issues). diff --git a/collections/_developers/de/002-001-inkstitch.md b/collections/_developers/de/002-001-inkstitch.md new file mode 100644 index 000000000..af8aa54f8 --- /dev/null +++ b/collections/_developers/de/002-001-inkstitch.md @@ -0,0 +1,21 @@ +--- +title: "Developing Ink/Stitch" +permalink: /de/developers/inkstitch/ +last_modified_at: 2018-07-21 +toc: true +--- +## Ink/Stitch Organization +The [plugin code](https://github.com/inkstitch/inkstitch) as well as the [pyembroidery repository](https://github.com/inkstitch/pyembroidery) can be found within the [Ink/Stitch organization](https://github.com/inkstitch/) on github. Additionaly you will find some other useful things like [embroidery fonts](https://github.com/inkstitch/embroidery-fonts). + +## Inkscape Plugin +Ink/Stitch is an [Inkscape](https://inkscape.org/) plugin. See their website to read a short introduction about [how to write Inkscape plugins](https://inkscape.org/en/develop/extensions/). + +## Ink/Stitch Languages + +Ink/Stitch and pyembroidery are written in [Python](https://www.python.org/) 2.
We cannot use Python 3 because inkex.py, the extension framework for Inkscape, is in Python 2 only. + +Print PDF, which will be displayed in your operating systems default browser, uses web languages such as HTML5, CSS and JQuery. It is build with the help of the [Jinja Template Framework](http://jinja.pocoo.org/). + +## Developers Documentation +* [Manual Setup](/developers/inkstitch/manual-setup/) +* [Python Modules](/developers/inkstitch/python-modules/) diff --git a/collections/_developers/de/002-002-manual-setup.md b/collections/_developers/de/002-002-manual-setup.md new file mode 100644 index 000000000..95cc660c9 --- /dev/null +++ b/collections/_developers/de/002-002-manual-setup.md @@ -0,0 +1,36 @@ +--- +title: "Manual Setup" +permalink: /de/developers/inkstitch/manual-setup/ +last_modified_at: 2018-07-21 +toc: false +--- +A manual setup will allow you to edit the code while running the extension. + +1. Clone the extension source + + ``` + git clone https://github.com/inkstitch/inkstitch + ``` +2. Python Dependencies + + A few python modules are needed. In some cases this extension uses features that aren’t available in the versions of the modules pre-packaged in distributions, so I recommend installing them directly with pip: + ``` + pip install -r requirements.txt + ``` + + **Info:** You might need to remove wxPython and [install](https://wiki.wxpython.org/How%20to%20install%20wxPython) a platform specific package (e.g. Debian uses `python-wxgtk3.0`). + {: .notice--info } +3. Symbolically link into the Inkscape extensions directory + + ``` + cd ~/.config/inkscape/extensions + ln -s /path/to/inkstitch + for i in inkstitch/inx/inkstitch_*.inx; do ln -s $i; done + ln -s inkstitch/inkstitch.py + ``` + +4. Run Inkscape. + + +**Info:** Changes to the Python code take effect the next time the extension is run. Changes to the extension description files (*.inx) take effect the next time Inkscape is restarted. +{: .notice--info } diff --git a/collections/_developers/de/002-003-python-modules.md b/collections/_developers/de/002-003-python-modules.md new file mode 100644 index 000000000..5f07b7b46 --- /dev/null +++ b/collections/_developers/de/002-003-python-modules.md @@ -0,0 +1,63 @@ +--- +title: "Python Modules" +permalink: /de/developers/inkstitch/python-modules/ +last_modified_at: 2018-07-22 +toc: false +--- +Ink/Stitch uses various Python modules. Follow the links to learn more about specific ones. Bold modules are not part of the standard python library and are also listed in the `requirement.txt` file. The ones being displayed in cursive style belong to the [Inkscape Python modules for extensions](http://wiki.inkscape.org/wiki/index.php/Python_modules_for_extensions). + +--- + +[**appdirs**](https://pypi.org/project/appdirs/), +[argparse](https://docs.python.org/2.7/library/argparse.html), +[**backports.functools_lru_cache**](https://pypi.org/project/backports/), +[base64](https://docs.python.org/2.7/library/base64.html#module-base64), +[collections](https://docs.python.org/2.7/library/collections.html), +[**colormath**](https://python-colormath.readthedocs.io/en/latest/), +[colorsys](https://docs.python.org/2/library/colorsys.html), +[copy](https://docs.python.org/2/library/copy.html), +[*cspsubdiv*](http://wiki.inkscape.org/wiki/index.php/Python_modules_for_extensions#cspsubdiv.py), +[cStringIO](https://docs.python.org/2/library/stringio.html), +[*cubicsuperpath*](http://wiki.inkscape.org/wiki/index.php/Python_modules_for_extensions#cubicsuperpath.py), +[datetime](https://docs.python.org/2.7/library/datetime.html#module-datetime), +[errno](https://docs.python.org/2/library/errno.html), +[**flask**](http://flask.pocoo.org/), +[functools](https://docs.python.org/2/library/functools.html#module-functools), +[glob](https://docs.python.org/2/library/glob.html), +[i18n](https://docs.python.org/2/library/i18n.html), +[*inkex*](http://wiki.inkscape.org/wiki/index.php/Python_modules_for_extensions#inkex.py), +[io](https://docs.python.org/2/library/io.html), +[itertools](https://docs.python.org/2/library/itertools.html), +[**jinja2**](https://pypi.org/project/Jinja2/), +[json](https://docs.python.org/2/library/json.html), +[logging](https://docs.python.org/2/library/logging.html), +[math](https://docs.python.org/2/library/math.html), +[**lxml**](https://lxml.de/compatibility.html), +[**networkx**](https://networkx.github.io/), +[**numpy**](http://www.numpy.org/), +[os](https://docs.python.org/2/library/os.html), +[**pyembroidery**](https://github.com/inkstitch/pyembroidery), +[random](https://docs.python.org/2/library/random.html), +[re](https://docs.python.org/2/library/re.html), +[**requests**](https://pypi.org/project/requests/), +[**shapely**](https://pypi.org/project/Shapely/), +[shutil](https://docs.python.org/2/library/shutil.html), +[*simplepath*](http://wiki.inkscape.org/wiki/index.php/Python_modules_for_extensions#simplepath.py), +[*simpletransform*](http://wiki.inkscape.org/wiki/index.php/Python_modules_for_extensions#simpletransform.py), +[*simplestyle*](http://wiki.inkscape.org/wiki/index.php/Python_modules_for_extensions#simplestyle.py), +[socket](https://docs.python.org/2/library/socket.html), +[subprocess](https://docs.python.org/2/library/subprocess.html), +[sys](https://docs.python.org/2/library/sys.html), +[tempfile](https://docs.python.org/2/library/tempfile.html), +[threading](https://docs.python.org/2/library/threading.html), +[time](https://docs.python.org/2/library/time.html), +[traceback](https://docs.python.org/2/library/traceback.html), +[webbrowser](https://docs.python.org/2/library/webbrowser.html), +[**win32api**](https://github.com/mhammond/pywin32), +[**winutils**](https://pypi.org/project/pywinutils/), +[**wx**](https://docs.wxpython.org/wx.1moduleindex.html), +[**wx.lib**](https://docs.wxpython.org/wx.lib.html), +[zipfile](https://docs.python.org/2/library/zipfile.html) + +--- + diff --git a/collections/_developers/de/002-004-namespace.md b/collections/_developers/de/002-004-namespace.md new file mode 100644 index 000000000..ef265761e --- /dev/null +++ b/collections/_developers/de/002-004-namespace.md @@ -0,0 +1,7 @@ +--- +title: "Ink/Stitch XML Namespace" +permalink: /de/developers/inkstitch/namespace/ +last_modified_at: 2018-07-27 +toc: true +--- +{% include namespace %} diff --git a/collections/_developers/de/003-001-documentation.md b/collections/_developers/de/003-001-documentation.md new file mode 100644 index 000000000..75989d259 --- /dev/null +++ b/collections/_developers/de/003-001-documentation.md @@ -0,0 +1,16 @@ +--- +title: "Documentation" +permalink: /de/developers/documentation/ +excerpt: "" +last_modified_at: 2018-07-21 +--- +We want to describe every possible function with text, images and/or videos. Also provide instructions about the installation process and give an overview of the best workflow. Additionally we want to provide sample files which other users can make use of. It also would be nice to get some example images of embroidered designs to prove what Ink/Stitch is able to do. + +An other and quiet unfinished part of the documentation will be, to help other developers to get started diving into the code. Enable them to introduce new functionalities to Ink/Stitch or whatever they might come up with. + +## Get involved +This website needs a lot of care. Generating new content and updating existing content with the ongoing developement of Ink/Stitch. We could use any helpful hand. + +You do not need to know how to build a website, since we use [Markdown](https://help.github.com/articles/basic-writing-and-formatting-syntax/) for text formatting. More information about the documentation project can be found in the [README](https://github.com/inkstitch/inkstitch/tree/gh-pages) file on github. That is also where you will find all files needed to build this website. + +If you have interest to help with the documentation, file an issue on [github](https://github.com/inkstitch/inkstitch/issues) and tell us, that you are willing to help. diff --git a/collections/_developers/de/005-001-localize.md b/collections/_developers/de/005-001-localize.md new file mode 100644 index 000000000..0768d4a5c --- /dev/null +++ b/collections/_developers/de/005-001-localize.md @@ -0,0 +1,26 @@ +--- +title: "Ink/Stitch Localization" +permalink: /de/developers/localize/ +excerpt: "" +last_modified_at: 2018-04-14 +toc: false +--- +The goal of the Ink/Stitch project is to put free, high-quality embroidery design tools in the hands of folks that might normally not have access to such tools. To further that goal, we seek to support as many languages and locales as possible. + +Ink/Stitch supports displaying text in the user's preferred language in the Params dialog and in error messages displayed by the Embroider extension. Future work will add translations for the extension settings window (displayed by Inkscape) and project documentation (such as this file). + +## Help wanted! + +Want to help translate? We'd really appreciate your contributions! Ink/Stitch uses a the collaborative translation platform CrowdIn to facilitate community translations. Through their generous open source program, we're able to use their platform free of charge, and we greatly appreciate their support. + +To start translating, visit our project page on CrowdIn. It's easy to sign in using your GitHub account. Pick a language and start suggesting translations! + +Approved contributors can accept your translations, which causes them to be submitted to this GitHub repository as a pull request. If you'd like to become an approver, please ping [**@lexelby**](https://github.com/lexelby) or another approved contributor, or email **inkstitch-l10n** at **lex** dot **gd**. + +**Please note that our [code of conduct](CODE_OF_CONDUCT.md) also covers contributions and interactions on our CrowdIn page.** + +## Continuous Translation + +When new code is added to ink/stitch, user-facing text can change and new messages can be added. CrowdIn picks these changes up automatically and makes the new messages available to translators. + +When CrowdIn creates a pull request, our [Travis-CI](http://travis-ci.org) integration (also generously provided for free!) picks up the new translations and builds a new version of Ink/Stitch as a development release. Once Travis-CI finishes building, the new version is posted to our releases page [here](https://github.com/inkstitch/inkstitch/releases/tag/dev-build-l10n), and you can install it and make sure everything looks right before we merge. diff --git a/collections/_developers/de/006-001-report-bugs.md b/collections/_developers/de/006-001-report-bugs.md new file mode 100644 index 000000000..0c2b52404 --- /dev/null +++ b/collections/_developers/de/006-001-report-bugs.md @@ -0,0 +1,14 @@ +--- +title: "Report Bugs " +permalink: /de/developers/report-bugs/ +excerpt: "" +last_modified_at: 2018-06-05 +--- + +**Having Issues with Ink/Stitch?** + +It would be very helpful, if you reported this back to us on github: + +Also have look at these existing issues: +* [Reported Bugs](https://github.com/inkstitch/inkstitch/issues?q=is%3Aissue+is%3Aopen+label%3Abug) +* [Feature Requests](https://github.com/inkstitch/inkstitch/issues?q=is%3Aissue+is%3Aopen+label%3A%22feature+request%22) diff --git a/_developers/001-001-introduction.md b/collections/_developers/en/001-001-introduction.md similarity index 100% rename from _developers/001-001-introduction.md rename to collections/_developers/en/001-001-introduction.md diff --git a/_developers/002-001-inkstitch.md b/collections/_developers/en/002-001-inkstitch.md similarity index 100% rename from _developers/002-001-inkstitch.md rename to collections/_developers/en/002-001-inkstitch.md diff --git a/_developers/002-002-manual-setup.md b/collections/_developers/en/002-002-manual-setup.md similarity index 100% rename from _developers/002-002-manual-setup.md rename to collections/_developers/en/002-002-manual-setup.md diff --git a/_developers/002-003-python-modules.md b/collections/_developers/en/002-003-python-modules.md similarity index 100% rename from _developers/002-003-python-modules.md rename to collections/_developers/en/002-003-python-modules.md diff --git a/_developers/002-004-namespace.md b/collections/_developers/en/002-004-namespace.md similarity index 100% rename from _developers/002-004-namespace.md rename to collections/_developers/en/002-004-namespace.md diff --git a/_developers/003-001-documentation.md b/collections/_developers/en/003-001-documentation.md similarity index 100% rename from _developers/003-001-documentation.md rename to collections/_developers/en/003-001-documentation.md diff --git a/_developers/005-001-localize.md b/collections/_developers/en/005-001-localize.md similarity index 100% rename from _developers/005-001-localize.md rename to collections/_developers/en/005-001-localize.md diff --git a/_developers/006-001-report-bugs.md b/collections/_developers/en/006-001-report-bugs.md similarity index 100% rename from _developers/006-001-report-bugs.md rename to collections/_developers/en/006-001-report-bugs.md diff --git a/_i18n/de/_docs/001-001-install.md b/collections/_docs/de/001-001-install.md similarity index 100% rename from _i18n/de/_docs/001-001-install.md rename to collections/_docs/de/001-001-install.md diff --git a/_i18n/de/_docs/001-002-customize.md b/collections/_docs/de/001-002-customize.md similarity index 100% rename from _i18n/de/_docs/001-002-customize.md rename to collections/_docs/de/001-002-customize.md diff --git a/_i18n/de/_docs/001-003-basic-usage.md b/collections/_docs/de/001-003-basic-usage.md similarity index 100% rename from _i18n/de/_docs/001-003-basic-usage.md rename to collections/_docs/de/001-003-basic-usage.md diff --git a/_i18n/de/_docs/001-004-workflow.md b/collections/_docs/de/001-004-workflow.md similarity index 100% rename from _i18n/de/_docs/001-004-workflow.md rename to collections/_docs/de/001-004-workflow.md diff --git a/_i18n/de/_docs/002-001-params.md b/collections/_docs/de/002-001-params.md similarity index 95% rename from _i18n/de/_docs/002-001-params.md rename to collections/_docs/de/002-001-params.md index 1b5197c90..77092a796 100644 --- a/_i18n/de/_docs/002-001-params.md +++ b/collections/_docs/de/002-001-params.md @@ -27,4 +27,4 @@ Schaue das Dokument [Stichtypen](/assets/images/docs/stitch-types.svg){: downloa Es besteht auch die Möglichkeit, die bevorzugten Sticheinstellungen zu speichern und bei Bedarf zu laden. -![Presets Dialog](/assets/images/docs/params-presets.jpg) +![Presets Dialog](/assets/images/docs/en/params-presets.jpg) diff --git a/_i18n/de/_docs/002-002-simulate.md b/collections/_docs/de/002-002-simulate.md similarity index 100% rename from _i18n/de/_docs/002-002-simulate.md rename to collections/_docs/de/002-002-simulate.md diff --git a/_i18n/de/_docs/002-003-flip-satin-columns.md b/collections/_docs/de/002-003-flip-satin-columns.md similarity index 82% rename from _i18n/de/_docs/002-003-flip-satin-columns.md rename to collections/_docs/de/002-003-flip-satin-columns.md index 39e2d266b..45f7ba39d 100644 --- a/_i18n/de/_docs/002-003-flip-satin-columns.md +++ b/collections/_docs/de/002-003-flip-satin-columns.md @@ -17,11 +17,11 @@ Dies ist ein kleines Werkzeug, mit dem der Stichpfad genau geplant werden kann. Kehrt eine Satinkolumne, die auf der linken Seite beginnt und auf der rechten Seite endet, um. Diese wird nun auf der rechten Seite beginnen und auf der linken Seite enden. Sonst wird nichts an der Satinkolumne verändert. -![Satinkolumne umkehren](/assets/images/docs/flip-satin-column.jpg) +![Satinkolumne umkehren](/assets/images/docs/en/flip-satin-column.jpg) **Beispiel** Satinkolumne umkehren, um die Verbindungen zwischen zwei verschiedenen Abschnitten zu verkürzen. -![Satinkolumne umkehren](/assets/images/docs/flip-satin-columns-02.jpg) +![Satinkolumne umkehren](/assets/images/docs/en/flip-satin-columns-02.jpg) diff --git a/_i18n/de/_docs/002-004-addons.md b/collections/_docs/de/002-004-addons.md similarity index 97% rename from _i18n/de/_docs/002-004-addons.md rename to collections/_docs/de/002-004-addons.md index 4a94087cb..f2aafca5e 100644 --- a/_i18n/de/_docs/002-004-addons.md +++ b/collections/_docs/de/002-004-addons.md @@ -57,13 +57,13 @@ Start- und Endpunkt gelten derzeit nur für Objekte mit Füllstich, während Tri * Aktiviere die gewünschten Befehle und wenden sie an * Automatische Füllung: Verschiebe Start- und Endpunkte. Der Endpunkt der Verknüpfung, der dem Füllobjekt am nächsten ist, ist der Punkt, an dem das Sticken beginnt oder endet. -![Visiual Commands - Attach](/assets/images/docs/visual-commands-attach.jpg) +![Visiual Commands - Attach](/assets/images/docs/en/visual-commands-attach.jpg) ### Visuelle Befehle manuell anhängen * Gehe zu `Objekt -> Symbole` oder benutze `Shift+Strg+Y`, um über den Symboldialog auf die Marker zuzugreifen. * Wähle "Ink/Stitch Commands" als Symbolsatz. -! [Symbolsatz](/assets/images/docs/visual-commands-symbol-set.jpg) +! [Symbolsatz](/assets/images/docs/en/visual-commands-symbol-set.jpg) * Ziehe einen Marker auf den Arbeitsbereich (egal wo). * Verwende das Flussdiagramm-Werkzeug ("Diagramm-Konnektoren erstellen", `Strg + F2`), um eine Verbindung zwischen dem Marker und dem Füllobjekt zu erstellen, auf das es angewendet werden soll. Dies wird einen Verbindungspfad hinzufügen. * Wenn der Marker verschoben wird, ändert sich die Position der Verknüpfung. Die Endpunkte der Verknüpfung kann auch manuell verschoben werden. Der Endpunkt der Verknüpfung, der dem Füllobjekt am nächsten ist, ist der Punkt, an dem das Sticken beginnt oder endet. diff --git a/_i18n/de/_docs/002-005-print.md b/collections/_docs/de/002-005-print.md similarity index 98% rename from _i18n/de/_docs/002-005-print.md rename to collections/_docs/de/002-005-print.md index aef0ae449..42778d089 100644 --- a/_i18n/de/_docs/002-005-print.md +++ b/collections/_docs/de/002-005-print.md @@ -28,7 +28,7 @@ Die Designvorschau hat auch verschiedene Optionen. Dort können die Größe entw Standardmäßig verwendet die Druckvorschau den Linienzeichnungsmodus. Aktiviere `Realistisch`, wenn eine realistische Vorschau gewünscht wird. Es wird eine Weile dauern um diese Ansicht darzustellen, aber es lohnt sich zu warten. Diese Einstellung muss für jede einzelne Seite aktiviert werden, die verwendet werden soll. -![Linienzeichnung und realistische Vorschau](/assets/images/docs/print-realistic-rendering.jpg){: width="450x" } +![Linienzeichnung und realistische Vorschau](/assets/images/docs/en/print-realistic-rendering.jpg){: width="450x" } ### Einstellungen diff --git a/_i18n/de/_docs/002-006-import-export.md b/collections/_docs/de/002-006-import-export.md similarity index 93% rename from _i18n/de/_docs/002-006-import-export.md rename to collections/_docs/de/002-006-import-export.md index 0b5ca14fa..b23ed108d 100644 --- a/_i18n/de/_docs/002-006-import-export.md +++ b/collections/_docs/de/002-006-import-export.md @@ -33,14 +33,14 @@ Die Version 1.10.0 von Ink/Stitch hat die Möglichkeit, Dateien direkt über den Wähle ein Dateiformat, das die Stickmaschine lesen kann, und speichere die Datei im gewünschten Ausgabeverzeichnis. -![Ausgabeformat](/assets/images/docs/export-selection-field.jpg) +![Ausgabeformat](/assets/images/docs/en/export-selection-field.jpg) Für zukünftige Änderungen stelle sicher, dass auch eine SVG-Version des Designs behalten wird. ### Methode 2 (Stichplan anzeigen) Um Designs zu exportieren, starte `Erweiterungen -> Ink/Stitch -> Sticken ...`. -![Sticken ...](/assets/images/docs/embroider.jpg){: width="450" } +![Sticken ...](/assets/images/docs/en/embroider.jpg){: width="450" } Einstellungen|Beschreibung ---|--- @@ -61,6 +61,6 @@ Unter `Datei -> Speichern unter ...` wähle den kleinen Pfeil im Dateiformat-Aus Navigiere zum gewünschten Ausgabeverzeichnis und wähle dort das `Ink/Stitch: Export von mehreren Formaten (.zip)` aus. Klicke auf "Speichern". Dort wird gefragt, welche Dateiformate hinein sollen. -![Batch Export](/assets/images/docs/export-batch.jpg) +![Batch Export](/assets/images/docs/en/export-batch.jpg) diff --git a/_i18n/de/_docs/003-001-stroke.md b/collections/_docs/de/003-001-stroke.md similarity index 95% rename from _i18n/de/_docs/003-001-stroke.md rename to collections/_docs/de/003-001-stroke.md index 847d79b99..b7a74ae4c 100644 --- a/_i18n/de/_docs/003-001-stroke.md +++ b/collections/_docs/de/003-001-stroke.md @@ -9,7 +9,7 @@ toc: true Wähle eine Linie aus und öffne `Erweiterungen -> Ink/Stitch -> Parameter`. -![Kontur Parameter](/assets/images/docs/params-stroke.jpg) +![Kontur Parameter](/assets/images/docs/en/params-stroke.jpg) Einstellung|Beschreibung ---|--- @@ -37,7 +37,7 @@ Gehe zu `Objekt -> Füllung und Kontur ...` oder benutze `Umschalt + Strg + F` u {: .notice--info style="clear: both;" } **Sample inklusive Laufstich** -{% include tutorial_list key="stitch-type" value="Running Stitch" %} +{% include tutorials/tutorial_list key="stitch-type" value="Running Stitch" %} ## Bean Stitch Modus @@ -55,7 +55,7 @@ Aktiviere `Manuelle Stichplatzierung`, um den manuellen Stichmodus zu verwenden. **Sample inklusive Manueller Stich** {: style="clear: both;" } -{% include tutorial_list key="stitch-type" value="Manual Stitch" %} +{% include tutorials/tutorial_list key="stitch-type" value="Manual Stitch" %} ## Zick-Zack Modus (vormals Simple Satin) Zick-Zack-Stiche können durch Setzen einer **durchgehenden Linie** (ohne gestrichelte Linie) erstellt werden. Mit Ink/Stich werden Stiche entlang des Pfads mit der angegebenen Linienbreite erstellt. diff --git a/_i18n/de/_docs/003-002-satin.md b/collections/_docs/de/003-002-satin.md similarity index 97% rename from _i18n/de/_docs/003-002-satin.md rename to collections/_docs/de/003-002-satin.md index 77c97bf7a..2ee663407 100644 --- a/_i18n/de/_docs/003-002-satin.md +++ b/collections/_docs/de/003-002-satin.md @@ -52,7 +52,7 @@ Original Design von [Liv Iko](https://thenounproject.com/liv_iko/collection/bird ## Parameter -![Parameter Satinkolumne.jpg](/assets/images/docs/params-satincolumn.jpg) +![Parameter Satinkolumne.jpg](/assets/images/docs/en/params-satincolumn.jpg) Einstellung|Beschreibung ---|--- @@ -78,5 +78,5 @@ Dies ist eine Reihe von Laufstichen die auf einer Seite der Kolumne hoch und auf Dies ist im Wesentlichen ein Satinstich mit geringerer Dichte, der an das Ende der Kolumne und zurück an den Anfang genäht wird. Wird eine Konturunterlage hinzugefügt, erhält man, wie im oben verlinkten Artikel erwähnt, die "Deutsche Unterlage". Für breite Kolumnen oder anspruchsvolle Stoffe können alle drei Unterlagentypen zusammen verwendet werden. ## Sample inklusive einer Satinkolumne -{% include tutorial_list key="stitch-type" value="Satin Stitch" %} +{% include tutorials/tutorial_list key="stitch-type" value="Satin Stitch" %} diff --git a/_i18n/de/_docs/003-003-fill.md b/collections/_docs/de/003-003-fill.md similarity index 94% rename from _i18n/de/_docs/003-003-fill.md rename to collections/_docs/de/003-003-fill.md index 6095eb538..9deb779b0 100644 --- a/_i18n/de/_docs/003-003-fill.md +++ b/collections/_docs/de/003-003-fill.md @@ -20,7 +20,7 @@ Seit Ink/Stitch v1.11.0 können Start- und Endpunkte für automatisch gefüllte ### Parameter -![Parameter Automatische Füllung](/assets/images/docs/params-autofill.jpg) +![Parameter Automatische Füllung](/assets/images/docs/en/params-autofill.jpg) Einstellung|Beschreibung ---|--- @@ -40,7 +40,7 @@ Um dies zu lösen, benötigt man eine Unterlage: eine erste Lage von Stichen, di In den **Parametern** sieht man neben der Registerkarte "Auto-Füllung" eine andere mit dem Namen AutoFill-Unterlage. Aktiviert wird sie, indem das Kontrollkästchen `Unterlage` aktiviert wird. -![Parameter AutoFill-Unterlage](/assets/images/docs/params-autofill-underlay.jpg) +![Parameter AutoFill-Unterlage](/assets/images/docs/en/params-autofill-underlay.jpg) Einstellung|Beschreibung ---|--- @@ -51,7 +51,7 @@ Maximale Stichlänge | Stiche können am Anfang oder am Ende einer Reihe verkür Reihenabstand | Reihenabstand der Unterlage. Standard ist der 3fache Abstand der obersten Ebene. ### Sample inklusive Füllstiche -{% include tutorial_list key="stitch-type" value="Fill Stitch" %} +{% include tutorials/tutorial_list key="stitch-type" value="Fill Stitch" %} ## Manuelle Füllung Manuelle Füllung ist der alte Modus, bevor die automatische Füllfunktion implementiert wurde. In einigen Fällen ist Automatische Füllung möglicherweise keine Option, z. B. wenn die Laufstiche zwischen den Abschnitten für das Design nicht akzeptabel sind. In der Regel werden die Kanten der Füllbereiche von Satin bedeckt, aber nicht immer. @@ -60,7 +60,7 @@ Bei dem Manuellen Füllen zerlegt die Erweiterung die Form in Abschnitte auf, vo Mit ziemlicher Sicherheit wird man die Form in kleinere zerlegen und diese mit [Laufstichen](/docs/stitches/stroke/#running-stitch-mode) verbinden wollen. Es ist eine mühsame Arbeit, die zeitaufwendig ist, weil es zweimal gemacht werden muss: einmal für die Unterlage und das zweite mal für die daraufliegnde Lage. -![Parameter Automatische Füllung](/assets/images/docs/params-manualfill.jpg) +![Parameter Automatische Füllung](/assets/images/docs/en/params-manualfill.jpg) Einstellung|Beschreibung ---|--- diff --git a/_i18n/de/_docs/005-001-get-help.md b/collections/_docs/de/005-001-get-help.md similarity index 100% rename from _i18n/de/_docs/005-001-get-help.md rename to collections/_docs/de/005-001-get-help.md diff --git a/_i18n/de/_docs/005-002-faq.md b/collections/_docs/de/005-002-faq.md similarity index 100% rename from _i18n/de/_docs/005-002-faq.md rename to collections/_docs/de/005-002-faq.md diff --git a/_docs/001-001-install.md b/collections/_docs/en/001-001-install.md similarity index 100% rename from _docs/001-001-install.md rename to collections/_docs/en/001-001-install.md diff --git a/_docs/001-002-customize.md b/collections/_docs/en/001-002-customize.md similarity index 100% rename from _docs/001-002-customize.md rename to collections/_docs/en/001-002-customize.md diff --git a/_docs/001-003-basic-usage.md b/collections/_docs/en/001-003-basic-usage.md similarity index 100% rename from _docs/001-003-basic-usage.md rename to collections/_docs/en/001-003-basic-usage.md diff --git a/_docs/001-004-workflow.md b/collections/_docs/en/001-004-workflow.md similarity index 100% rename from _docs/001-004-workflow.md rename to collections/_docs/en/001-004-workflow.md diff --git a/_docs/002-001-params.md b/collections/_docs/en/002-001-params.md similarity index 94% rename from _docs/002-001-params.md rename to collections/_docs/en/002-001-params.md index a2812418a..58f812ac6 100644 --- a/_docs/002-001-params.md +++ b/collections/_docs/en/002-001-params.md @@ -27,4 +27,4 @@ Ink/Stitch can produce the following stitch types You also have the possibility to save your preferred stitch settings and load them when needed. -![Presets Dialog](/assets/images/docs/params-presets.jpg) +![Presets Dialog](/assets/images/docs/en/params-presets.jpg) diff --git a/_docs/002-002-simulate.md b/collections/_docs/en/002-002-simulate.md similarity index 100% rename from _docs/002-002-simulate.md rename to collections/_docs/en/002-002-simulate.md diff --git a/_docs/002-003-flip-satin-columns.md b/collections/_docs/en/002-003-flip-satin-columns.md similarity index 81% rename from _docs/002-003-flip-satin-columns.md rename to collections/_docs/en/002-003-flip-satin-columns.md index 810c8da1a..caa84205a 100644 --- a/_docs/002-003-flip-satin-columns.md +++ b/collections/_docs/en/002-003-flip-satin-columns.md @@ -18,11 +18,11 @@ This is a little tool to help you to plan your stitch path precisely. If you have a satin column that starts on the left rail and ends on the right, this will make it start on the right rail and end on the left. Nothing else about the satin is changed. -![Flip Satin Columns](/assets/images/docs/flip-satin-column.jpg) +![Flip Satin Columns](/assets/images/docs/en/flip-satin-column.jpg) **Usage Example** Flip satin columns to shorten connections between two different sections. -![Flip Satin Columns](/assets/images/docs/flip-satin-columns-02.jpg) +![Flip Satin Columns](/assets/images/docs/en/flip-satin-columns-02.jpg) diff --git a/_docs/002-004-addons.md b/collections/_docs/en/002-004-addons.md similarity index 96% rename from _docs/002-004-addons.md rename to collections/_docs/en/002-004-addons.md index 9127433ef..df6ff0c22 100644 --- a/_docs/002-004-addons.md +++ b/collections/_docs/en/002-004-addons.md @@ -57,13 +57,13 @@ Starting and ending point currently apply only to fill-stitch objects, while tri * Enable desired commands and apply * Auto-Fill: Move starting and ending points. The connector's endpoint nearest to the fill object is the point at which stitching will start or end. -![Visiual Commands - Attach](/assets/images/docs/visual-commands-attach.jpg) +![Visiual Commands - Attach](/assets/images/docs/en/visual-commands-attach.jpg) ### Attach visual commands manually * Go to `Object > Symbols` or hit `Shift+Ctrl+Y` to access the markers through the symbols dialog. * Select "Ink/Stitch Commands" as the symbol set. -![Symbol Set](/assets/images/docs/visual-commands-symbol-set.jpg) +![Symbol Set](/assets/images/docs/en/visual-commands-symbol-set.jpg) * Drag a marker out onto your canvas (doesn't matter where). * Use the Flow-Chart Tool ("create diagram connectors" `Ctrl+F2`) to draw a connection between the marker and the fill object to which it should apply. This will add a connector path. * Moving the marker will change the connector's position to match. You can also move the endpoints of the connector manually. The connector's endpoint nearest to the fill object is the point at which stitching will start or end. diff --git a/_docs/002-005-print.md b/collections/_docs/en/002-005-print.md similarity index 96% rename from _docs/002-005-print.md rename to collections/_docs/en/002-005-print.md index 609a24811..396dc98fb 100644 --- a/_docs/002-005-print.md +++ b/collections/_docs/en/002-005-print.md @@ -28,7 +28,7 @@ The design preview also has different options. You can adjust the size either by By default the print preview uses the line drawing mode. Check `Realistic` if you wish a realistic rendering preview. It will take a little while to calculate this view, but it's worth waiting. This setting needs to be activated to each single page where you want to use it. -![Line Drawing and Realistic render](/assets/images/docs/print-realistic-rendering.jpg){: width="450x" } +![Line Drawing and Realistic render](/assets/images/docs/en/print-realistic-rendering.jpg){: width="450x" } ### Settings diff --git a/_docs/002-006-import-export.md b/collections/_docs/en/002-006-import-export.md similarity index 92% rename from _docs/002-006-import-export.md rename to collections/_docs/en/002-006-import-export.md index 3ab4d3b4f..6999b2351 100644 --- a/_docs/002-006-import-export.md +++ b/collections/_docs/en/002-006-import-export.md @@ -33,14 +33,14 @@ Ink/Stitch version 1.10.0 introduced the possibility to export files directly th Select a file format that your embroidery machine can read and `Save` the file in your desired output directory. -![File Format Field](/assets/images/docs/export-selection-field.jpg) +![File Format Field](/assets/images/docs/en/export-selection-field.jpg) For later changes make sure that you keep an SVG version of your design as well. ### Method 2 (Display Stitch Plan) To export your designs run `Extensions > Embroidery > Embroider...`. -![Embroider...](/assets/images/docs/embroider.jpg){: width="450" } +![Embroider...](/assets/images/docs/en/embroider.jpg){: width="450" } Settings|Description ---|--- @@ -61,6 +61,6 @@ Go to `File > Save as...` and click on the little arrow on the file format selec Navigate to your desired output folder and choose the Ink/Stitch ZIP file format. Click `Save`. You then will be asked which file formats you wish to be included. -![Batch Export](/assets/images/docs/export-batch.jpg) +![Batch Export](/assets/images/docs/en/export-batch.jpg) diff --git a/_docs/003-001-stroke.md b/collections/_docs/en/003-001-stroke.md similarity index 95% rename from _docs/003-001-stroke.md rename to collections/_docs/en/003-001-stroke.md index e6180cba9..e0f325914 100644 --- a/_docs/003-001-stroke.md +++ b/collections/_docs/en/003-001-stroke.md @@ -9,7 +9,7 @@ toc: true Select a stroke and open `Extensions > Embroidery > Params`. -![Params Stroke](/assets/images/docs/params-stroke.jpg) +![Params Stroke](/assets/images/docs/en/params-stroke.jpg) Settings|Description ---|--- @@ -37,7 +37,7 @@ Go to `Object > Fill and Stroke...` or hit `Shift+Ctrl+F` and choose one of the {: .notice--info style="clear: both;" } **Sample Files Including Running Stitch** -{% include tutorial_list key="stitch-type" value="Running Stitch" %} +{% include tutorials/tutorial_list key="stitch-type" value="Running Stitch" %} ## Bean Stitch Mode @@ -55,7 +55,7 @@ Enable `Manual stitch placement` to make use of the manual stitch mode. Line sty **Sample Files Including Manual Stitch** {: style="clear: both;" } -{% include tutorial_list key="stitch-type" value="Manual Stitch" %} +{% include tutorials/tutorial_list key="stitch-type" value="Manual Stitch" %} ## Zig-Zag Stitch Mode (previously Simple Satin) Zig-Zag stitches can be created by setting a **continuous line** (without dashes). Ink/Stitch will create stitches along the path using the stroke width you specified. diff --git a/_docs/003-002-satin.md b/collections/_docs/en/003-002-satin.md similarity index 97% rename from _docs/003-002-satin.md rename to collections/_docs/en/003-002-satin.md index f91cb1ec6..d02227410 100644 --- a/_docs/003-002-satin.md +++ b/collections/_docs/en/003-002-satin.md @@ -52,7 +52,7 @@ Original design by [Liv Iko](https://thenounproject.com/liv_iko/collection/birds ## Params -![Params Satin Column.jpg](/assets/images/docs/params-satincolumn.jpg) +![Params Satin Column.jpg](/assets/images/docs/en/params-satincolumn.jpg) Settings|Description ---|--- @@ -78,5 +78,5 @@ This is a row of running stitch up one side of the column and back down the othe This is essentially a lower-density satin stitch sewn to the end of the column and back to the start. Added with contour underlay, you get the "German Underlay" mentioned in the article linked above. For wide columns or challenging fabrics, you can use all three underlay types together. ## Sample Files Including Satin Column -{% include tutorial_list key="stitch-type" value="Satin Stitch" %} +{% include tutorials/tutorial_list key="stitch-type" value="Satin Stitch" %} diff --git a/_docs/003-003-fill.md b/collections/_docs/en/003-003-fill.md similarity index 95% rename from _docs/003-003-fill.md rename to collections/_docs/en/003-003-fill.md index a804cef78..2ed7a5af7 100644 --- a/_docs/003-003-fill.md +++ b/collections/_docs/en/003-003-fill.md @@ -20,7 +20,7 @@ Since Ink/Stitch v1.11.0 it is possible to set start and end points for autofill ### Params -![Params AutoFill](/assets/images/docs/params-autofill.jpg) +![Params AutoFill](/assets/images/docs/en/params-autofill.jpg) Settings|Description ---|--- @@ -40,7 +40,7 @@ To solve this, you need underlay: an initial layer of stitches that hold up the In **Params**, you'll see an underlay tab next to the AutoFill tab. Enable it by checking the box. -![Params AutoFill](/assets/images/docs/params-autofill-underlay.jpg) +![Params AutoFill](/assets/images/docs/en/params-autofill-underlay.jpg) Settings|Description ---|--- @@ -51,7 +51,7 @@ Max stitch length|Maximum stitch length. Stitches can be shortened at the start Row spacing|Underlay row spacing. Defaults to 3x the spacing of the top layer. ### Samples Files Including Fill Stitches -{% include tutorial_list key="stitch-type" value="Fill Stitch" %} +{% include tutorials/tutorial_list key="stitch-type" value="Fill Stitch" %} ## Manual-Fill Manual Fill is the old mode before automatic fill routing was implemented. In some cases, AutoFill may not be an option, such as when the running stitches between sections are not acceptable for your design. Usually, fill region edges are covered over by satin, but not always. @@ -60,7 +60,7 @@ In manual fill, the extension will still break up the shape into sections, each You'll almost certainly want to break your shape up into smaller shapes and connect them using [running stitches](/docs/stitches/stroke/#running-stitch-mode). It's a painstaking process, made more so because you'll need to do it twice: once for the underlay and again for the top stitching. -![Params AutoFill](/assets/images/docs/params-manualfill.jpg) +![Params AutoFill](/assets/images/docs/en/params-manualfill.jpg) Settings|Description ---|--- diff --git a/_docs/004-001-fonts.md b/collections/_docs/en/004-001-fonts.md similarity index 100% rename from _docs/004-001-fonts.md rename to collections/_docs/en/004-001-fonts.md diff --git a/_docs/004-002-features.md b/collections/_docs/en/004-002-features.md similarity index 100% rename from _docs/004-002-features.md rename to collections/_docs/en/004-002-features.md diff --git a/_docs/004-003-inkscape-tips.md b/collections/_docs/en/004-003-inkscape-tips.md similarity index 100% rename from _docs/004-003-inkscape-tips.md rename to collections/_docs/en/004-003-inkscape-tips.md diff --git a/_docs/005-001-get-help.md b/collections/_docs/en/005-001-get-help.md similarity index 100% rename from _docs/005-001-get-help.md rename to collections/_docs/en/005-001-get-help.md diff --git a/_docs/005-002-faq.md b/collections/_docs/en/005-002-faq.md similarity index 100% rename from _docs/005-002-faq.md rename to collections/_docs/en/005-002-faq.md diff --git a/_docs/005-003-error-messages.md b/collections/_docs/en/005-003-error-messages.md similarity index 96% rename from _docs/005-003-error-messages.md rename to collections/_docs/en/005-003-error-messages.md index b578a65e2..c1f9d5650 100644 --- a/_docs/005-003-error-messages.md +++ b/collections/_docs/en/005-003-error-messages.md @@ -50,7 +50,7 @@ No embroiderable paths found in document.
Tip: use Path -> Object to Path t Error Message|Description ---|--- -One or more rails crosses itself, and this is not allowed.
Please split into multiple satin columns.|With *Node Edit Tool* select a node at the position where you want to split your path. Click on `Break path at selected nodes` within the *Tool Controls Bar*.

![Split Path](/assets/images/docs/split-path.jpg)
Hit `Ctrl+Shift+K` to seperate all pieces. Recombine selected rails and rungs with `Ctrl+K`. Then apply param settings to both seperated satin columns. +One or more rails crosses itself, and this is not allowed.
Please split into multiple satin columns.|With *Node Edit Tool* select a node at the position where you want to split your path. Click on `Break path at selected nodes` within the *Tool Controls Bar*.

![Split Path](/assets/images/docs/en/split-path.jpg)
Hit `Ctrl+Shift+K` to seperate all pieces. Recombine selected rails and rungs with `Ctrl+K`. Then apply param settings to both seperated satin columns. satin column: One or more of the rungs doesn't intersect both rails.|Make sure rungs intersect both rails.
[More information](/docs/stitches/satin/#rung-method) Each rail should intersect both rungs once.|Make sure rungs intersect both rails once.
[More information](/docs/stitches/satin/#rung-method) satin column: One or more of the rungs intersects the rails more than once.|Make sure rungs intersect rails only once. If this is already the case and you still are receiving this message, one or more rungs might be longer than the rails. In this case you should consider using the [node method](/docs/stitches/satin/#node-method) or to prolong the rails. diff --git a/_docs/005-004-localization.md b/collections/_docs/en/005-004-localization.md similarity index 100% rename from _docs/005-004-localization.md rename to collections/_docs/en/005-004-localization.md diff --git a/collections/_posts/de/2018-06-16-v1.9.1.md b/collections/_posts/de/2018-06-16-v1.9.1.md new file mode 100644 index 000000000..9fa4a5773 --- /dev/null +++ b/collections/_posts/de/2018-06-16-v1.9.1.md @@ -0,0 +1,16 @@ +--- +layout: single +title: "Ink/Stitch v1.9.1: Viele Fehlerbehebungen" +date: 2018-06-16 +categories: Releases +--- +**Changelog:** + +* properly handle case where stroke width is not set (defaults to 1 per SVG spec) +* properly handle case where `` width and height not set (defaults to viewbox) +* properly handle case where fill is not set (defaults to "black" rather than "none") +* show error message (rather than crashing) if satin column set for a path with only one subpath +* don't leave the simulate window around after "use last settings" +* show a useful error message in Params if the user hasn't selected anything embroiderable + +[Download](https://github.com/lexelby/inkstitch/releases/tag/v1.9.1){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-06-18-v1.10.0.md b/collections/_posts/de/2018-06-18-v1.10.0.md new file mode 100644 index 000000000..ddb33eedc --- /dev/null +++ b/collections/_posts/de/2018-06-18-v1.10.0.md @@ -0,0 +1,18 @@ +--- +layout: single +title: "v1.10.0 Unterstützung von Datei > Kopie speichern und Massenexport" +date: 2018-06-18 +categories: Releases +--- +**Changelog:** + +This version adds an exciting new feature: File -> Save Copy support to +directly save your design in machine format (PES, DST, etc). Better still, +you can save as an Ink/Stitch ZIP file. Ink/Stitch will export your design +in your selected machine formats and zip it all together, ready for sale +as a stock design. + +In order to use the new output extensions, you'll need to restart Inkscape +after you install this version. + +[Download](https://github.com/lexelby/inkstitch/releases/tag/v1.10.0){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-06-21-v1.10.1.md b/collections/_posts/de/2018-06-21-v1.10.1.md new file mode 100644 index 000000000..2c261a88f --- /dev/null +++ b/collections/_posts/de/2018-06-21-v1.10.1.md @@ -0,0 +1,13 @@ +--- +layout: single +title: "Ink/Stitch v1.10.1: Kleine Fehlerbehebungen in der Druckausgabe" +date: 2018-06-21 +categories: Releases +--- +**Changelog:** + +* correctly hide the "choose file" button (#209) +* make the "close" button work even if the connection to ink/stitch is lost +* clean up some leftover commented-out code + +[Download](https://github.com/lexelby/inkstitch/releases/tag/v1.10.1){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-06-30-v1.11.0.md b/collections/_posts/de/2018-06-30-v1.11.0.md new file mode 100644 index 000000000..1a4a8e949 --- /dev/null +++ b/collections/_posts/de/2018-06-30-v1.11.0.md @@ -0,0 +1,17 @@ +--- +layout: single +title: "Ink/Stitch v1.11.0: Füllstich Start- und Endpunkt" +date: 2018-06-30 +categories: Releases +--- +**Changelog:** + +This version contains a long-awaited feature: the ability to specify the start and end point for autofill stitch. + +To use: + 1. Restart Inkscape after installing this version. + 2. Run the "Embroidery -> Install add-ons for Inkscape" extension. + 3. Restart Inkscape again. + 4. Take a look at images/examples/Fill Stitch Starting and Ending Point.svg for further instructions - or read on our website about the [add-on features](/docs/addons/). + +[Download](https://github.com/inkstitch/inkstitch/releases/tag/v1.11.0){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-07-13-v1.12.0.md b/collections/_posts/de/2018-07-13-v1.12.0.md new file mode 100644 index 000000000..947749e63 --- /dev/null +++ b/collections/_posts/de/2018-07-13-v1.12.0.md @@ -0,0 +1,15 @@ +--- +layout: single +title: "Ink/Stitch v1.12.0: Satinkolumne umkehren und dynamische Vorschaubild-Größe in Druckausgabe" +date: 2018-07-13 +categories: Releases +--- +**Changelog:** + + * new extension to swap the rails of a satin column + * Print PDF + * size of thumbnails in operator detailed view is now changeable + * when thumbnails are large, it switches to a more optimal row-based layout + * updated wxPython to the latest version + +[Download](https://github.com/inkstitch/inkstitch/releases/tag/v1.12.0){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-07-14-v1.13.0.md b/collections/_posts/de/2018-07-14-v1.13.0.md new file mode 100644 index 000000000..6a2c4714f --- /dev/null +++ b/collections/_posts/de/2018-07-14-v1.13.0.md @@ -0,0 +1,14 @@ +--- +layout: single +title: "Ink/Stitch v1.13.0: Neue Erweiterung: \"Kommandos anhängen\"" +date: 2018-07-14 +categories: Releases +--- +**Changelog:** + + * use the extension to add command symbols to any object: + * auto-fill start and end positions + * trim thread + * stop (pause) sewing + +[Download](https://github.com/inkstitch/inkstitch/releases/tag/v1.13.0){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-07-26-v1.14.0.md b/collections/_posts/de/2018-07-26-v1.14.0.md new file mode 100644 index 000000000..523c84b03 --- /dev/null +++ b/collections/_posts/de/2018-07-26-v1.14.0.md @@ -0,0 +1,18 @@ +--- +layout: single +title: "Ink/Stitch v1.14.0: Neue Bibliothek zum Speichern von Stickdateien" +date: 2018-07-26 +categories: Releases +--- +**Changelog:** + +This release integrates pyembroidery, a pure Python machine embroidery file format library. This fixes major bugs in several file formats and may make a Mac OS version significantly easier. + + * known working file formats: + * writing: PEC PES EXP DST JEF VP3 + * reading: PEC PES EXP DST JEF VP3 XXX SEW u01 SHV 10o 100 BRO DSB DSZ EMD INB TBF KSM TAP STX + * stop handling is much better + * Ink/Stitch ends the color block at a STOP + * Stop blocks are denoted in Print PDF's operator detail view + +[Download](https://github.com/inkstitch/inkstitch/releases/tag/v1.14.0){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-08-03-v1.15.0.md b/collections/_posts/de/2018-08-03-v1.15.0.md new file mode 100644 index 000000000..60b30507d --- /dev/null +++ b/collections/_posts/de/2018-08-03-v1.15.0.md @@ -0,0 +1,16 @@ +--- +layout: single +title: "Ink/Stitch v1.15.0: Mac Version!" +date: 2018-08-03 +categories: Releases +--- +**Changelog:** + +This is the first version of Ink/Stitch to officially support Mac OS X! + + * mac support + * known issue: simulation window appears off-screen to the top + * workaround: press q to close the window + * buttons in the simulator to speed up, slow down, pause, restart, and quit + +[Download](https://github.com/inkstitch/inkstitch/releases/tag/v1.15.0){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-08-13-v1.16.0.md b/collections/_posts/de/2018-08-13-v1.16.0.md new file mode 100644 index 000000000..594a31d44 --- /dev/null +++ b/collections/_posts/de/2018-08-13-v1.16.0.md @@ -0,0 +1,18 @@ +--- +layout: single +title: "Ink/Stitch v1.16.0: Neue Sticharten und ein Satinkolumnen-Konvertierungs-Werkzeug" +date: 2018-08-13 +categories: Releases +--- +**Changelog:** + + * new stitches: + * bean stitch + * E stitch (satin column only) + * new tool: convert line to satin column + * makes it easy to start a satin column + * use as-is or customize the rungs or rails + * added more tooltips in Params + * fix for JEF output corruption + +[Download](https://github.com/inkstitch/inkstitch/releases/tag/v1.16.0){: .btn .btn--primary .btn--large } diff --git a/collections/_posts/de/2018-08-18-v1.17.0.md b/collections/_posts/de/2018-08-18-v1.17.0.md new file mode 100644 index 000000000..bce935dfe --- /dev/null +++ b/collections/_posts/de/2018-08-18-v1.17.0.md @@ -0,0 +1,19 @@ +--- +layout: single +title: "Ink/Stitch v1.17.0 Verbesserter Simulator, \"Objekt ignorieren\"-Befehl und ein paar Fehlerbehebungen" +date: 2018-08-18 +categories: Releases +--- +**Changelog:** + + * improved simulator + * simulator window is positioned better on all platforms + * shortcut keys are consistent across all platforms and keyboard layouts + * current stitch number is displayed + * "ignore" commands + * "ignore object" command to ignore a specific object when stitching + * "ignore layer" command to ignore a whole layer + * try to avoid cutting corners in auto-fill + * bug fix: File -> Save as machine embroidery formats produced corrupted files on Windows + +[Download](https://github.com/inkstitch/inkstitch/releases/tag/v1.17.0){: .btn .btn--primary .btn--large } diff --git a/_posts/2017-12-06-video-demo.md b/collections/_posts/en/2017-12-06-video-demo.md similarity index 100% rename from _posts/2017-12-06-video-demo.md rename to collections/_posts/en/2017-12-06-video-demo.md diff --git a/_posts/2018-01-01-video-stitch-preview.md b/collections/_posts/en/2018-01-01-video-stitch-preview.md similarity index 100% rename from _posts/2018-01-01-video-stitch-preview.md rename to collections/_posts/en/2018-01-01-video-stitch-preview.md diff --git a/_posts/2018-01-05-dpi.md b/collections/_posts/en/2018-01-05-dpi.md similarity index 100% rename from _posts/2018-01-05-dpi.md rename to collections/_posts/en/2018-01-05-dpi.md diff --git a/_posts/2018-02-05-translation.md b/collections/_posts/en/2018-02-05-translation.md similarity index 100% rename from _posts/2018-02-05-translation.md rename to collections/_posts/en/2018-02-05-translation.md diff --git a/_posts/2018-02-22-windows-support.md b/collections/_posts/en/2018-02-22-windows-support.md similarity index 100% rename from _posts/2018-02-22-windows-support.md rename to collections/_posts/en/2018-02-22-windows-support.md diff --git a/_posts/2018-04-16-new-website.md b/collections/_posts/en/2018-04-16-new-website.md similarity index 100% rename from _posts/2018-04-16-new-website.md rename to collections/_posts/en/2018-04-16-new-website.md diff --git a/_posts/2018-05-05-v1.7.1.md b/collections/_posts/en/2018-05-05-v1.7.1.md similarity index 100% rename from _posts/2018-05-05-v1.7.1.md rename to collections/_posts/en/2018-05-05-v1.7.1.md diff --git a/_posts/2018-05-20-v1.8.0.md b/collections/_posts/en/2018-05-20-v1.8.0.md similarity index 100% rename from _posts/2018-05-20-v1.8.0.md rename to collections/_posts/en/2018-05-20-v1.8.0.md diff --git a/_posts/2018-05-30-v1.8.1.md b/collections/_posts/en/2018-05-30-v1.8.1.md similarity index 100% rename from _posts/2018-05-30-v1.8.1.md rename to collections/_posts/en/2018-05-30-v1.8.1.md diff --git a/_posts/2018-06-08-v1.8.2.md b/collections/_posts/en/2018-06-08-v1.8.2.md similarity index 100% rename from _posts/2018-06-08-v1.8.2.md rename to collections/_posts/en/2018-06-08-v1.8.2.md diff --git a/_posts/2018-06-10-v1.9.0.md b/collections/_posts/en/2018-06-10-v1.9.0.md similarity index 100% rename from _posts/2018-06-10-v1.9.0.md rename to collections/_posts/en/2018-06-10-v1.9.0.md diff --git a/_posts/2018-06-16-v1.9.1.md b/collections/_posts/en/2018-06-16-v1.9.1.md similarity index 100% rename from _posts/2018-06-16-v1.9.1.md rename to collections/_posts/en/2018-06-16-v1.9.1.md diff --git a/_posts/2018-06-18-v1.10.0.md b/collections/_posts/en/2018-06-18-v1.10.0.md similarity index 100% rename from _posts/2018-06-18-v1.10.0.md rename to collections/_posts/en/2018-06-18-v1.10.0.md diff --git a/_posts/2018-06-21-v1.10.1.md b/collections/_posts/en/2018-06-21-v1.10.1.md similarity index 100% rename from _posts/2018-06-21-v1.10.1.md rename to collections/_posts/en/2018-06-21-v1.10.1.md diff --git a/_posts/2018-06-30-v1.11.0.md b/collections/_posts/en/2018-06-30-v1.11.0.md similarity index 100% rename from _posts/2018-06-30-v1.11.0.md rename to collections/_posts/en/2018-06-30-v1.11.0.md diff --git a/_posts/2018-07-13-v1.12.0.md b/collections/_posts/en/2018-07-13-v1.12.0.md similarity index 100% rename from _posts/2018-07-13-v1.12.0.md rename to collections/_posts/en/2018-07-13-v1.12.0.md diff --git a/_posts/2018-07-14-v1.13.0.md b/collections/_posts/en/2018-07-14-v1.13.0.md similarity index 100% rename from _posts/2018-07-14-v1.13.0.md rename to collections/_posts/en/2018-07-14-v1.13.0.md diff --git a/_posts/2018-07-26-v1.14.0.md b/collections/_posts/en/2018-07-26-v1.14.0.md similarity index 100% rename from _posts/2018-07-26-v1.14.0.md rename to collections/_posts/en/2018-07-26-v1.14.0.md diff --git a/_posts/2018-08-03-v1.15.0.md b/collections/_posts/en/2018-08-03-v1.15.0.md similarity index 100% rename from _posts/2018-08-03-v1.15.0.md rename to collections/_posts/en/2018-08-03-v1.15.0.md diff --git a/_posts/2018-08-13-v1.16.0.md b/collections/_posts/en/2018-08-13-v1.16.0.md similarity index 100% rename from _posts/2018-08-13-v1.16.0.md rename to collections/_posts/en/2018-08-13-v1.16.0.md diff --git a/_posts/2018-08-18-v1.17.0.md b/collections/_posts/en/2018-08-18-v1.17.0.md similarity index 100% rename from _posts/2018-08-18-v1.17.0.md rename to collections/_posts/en/2018-08-18-v1.17.0.md diff --git a/_tutorial/applique.md b/collections/_tutorial/en/applique.md similarity index 100% rename from _tutorial/applique.md rename to collections/_tutorial/en/applique.md diff --git a/_tutorial/custom-origin.md b/collections/_tutorial/en/custom-origin.md similarity index 100% rename from _tutorial/custom-origin.md rename to collections/_tutorial/en/custom-origin.md diff --git a/_tutorial/embroidering-the-inkscape-logo.md b/collections/_tutorial/en/embroidering-the-inkscape-logo.md similarity index 100% rename from _tutorial/embroidering-the-inkscape-logo.md rename to collections/_tutorial/en/embroidering-the-inkscape-logo.md diff --git a/_tutorial/free-standing-lace.md b/collections/_tutorial/en/free-standing-lace.md similarity index 100% rename from _tutorial/free-standing-lace.md rename to collections/_tutorial/en/free-standing-lace.md diff --git a/_tutorial/fringe.md b/collections/_tutorial/en/fringe.md similarity index 100% rename from _tutorial/fringe.md rename to collections/_tutorial/en/fringe.md diff --git a/_tutorial/hoop-template.md b/collections/_tutorial/en/hoop-template.md similarity index 100% rename from _tutorial/hoop-template.md rename to collections/_tutorial/en/hoop-template.md diff --git a/_tutorial/inkstitch-logo.md b/collections/_tutorial/en/inkstitch-logo.md similarity index 100% rename from _tutorial/inkstitch-logo.md rename to collections/_tutorial/en/inkstitch-logo.md diff --git a/_tutorial/monogram.md b/collections/_tutorial/en/monogram.md similarity index 100% rename from _tutorial/monogram.md rename to collections/_tutorial/en/monogram.md diff --git a/_tutorial/puff.md b/collections/_tutorial/en/puff.md similarity index 100% rename from _tutorial/puff.md rename to collections/_tutorial/en/puff.md diff --git a/_tutorial/push-pull-compensation.md b/collections/_tutorial/en/push-pull-compensation.md similarity index 100% rename from _tutorial/push-pull-compensation.md rename to collections/_tutorial/en/push-pull-compensation.md diff --git a/_tutorials/001-001-galleries.md b/collections/_tutorials/en/001-001-galleries.md similarity index 100% rename from _tutorials/001-001-galleries.md rename to collections/_tutorials/en/001-001-galleries.md diff --git a/_tutorials/002-001-branding-guide.md b/collections/_tutorials/en/002-001-branding-guide.md similarity index 100% rename from _tutorials/002-001-branding-guide.md rename to collections/_tutorials/en/002-001-branding-guide.md diff --git a/_tutorials/002-002-samples.md b/collections/_tutorials/en/002-002-samples.md similarity index 59% rename from _tutorials/002-002-samples.md rename to collections/_tutorials/en/002-002-samples.md index 1e8211f99..577ae0d13 100644 --- a/_tutorials/002-002-samples.md +++ b/collections/_tutorials/en/002-002-samples.md @@ -7,4 +7,4 @@ read_time: false classes: wide --- -{% include tutorial_list key="tutorial-type" value="Sample File" %} +{% include tutorials/tutorial_list key="tutorial-type" value="Sample File" %} diff --git a/_tutorials/002-003-templates.md b/collections/_tutorials/en/002-003-templates.md similarity index 60% rename from _tutorials/002-003-templates.md rename to collections/_tutorials/en/002-003-templates.md index b589a1d9c..71fcf2505 100644 --- a/_tutorials/002-003-templates.md +++ b/collections/_tutorials/en/002-003-templates.md @@ -7,4 +7,4 @@ read_time: false classes: wide --- -{% include tutorial_list key="tutorial-type" value="Template" %} +{% include tutorials/tutorial_list key="tutorial-type" value="Template" %} diff --git a/_tutorials/003-001-inkstitch-tutorials.md b/collections/_tutorials/en/003-001-inkstitch-tutorials.md similarity index 84% rename from _tutorials/003-001-inkstitch-tutorials.md rename to collections/_tutorials/en/003-001-inkstitch-tutorials.md index cf4d4ef8d..bccd8a1df 100644 --- a/_tutorials/003-001-inkstitch-tutorials.md +++ b/collections/_tutorials/en/003-001-inkstitch-tutorials.md @@ -8,4 +8,4 @@ classes: wide {% comment %}This is the list of keys you can set to categorize tutorials, use slugified version in tutorial file: f.e. Tutorial Type would become tutorial-type{% endcomment %} {% assign tutorial_cats = 'Tutorial Type*Stitch Type*Techniques*User Level' | split: '*' %} -{% include display_tutorials tutorial_cats=tutorial_cats %} +{% include tutorials/display_tutorials tutorial_cats=tutorial_cats %} diff --git a/_tutorials/003-002-videos.md b/collections/_tutorials/en/003-002-videos.md similarity index 85% rename from _tutorials/003-002-videos.md rename to collections/_tutorials/en/003-002-videos.md index e5cd7004e..18b1a6b13 100644 --- a/_tutorials/003-002-videos.md +++ b/collections/_tutorials/en/003-002-videos.md @@ -9,6 +9,6 @@ classes: wide For now [Evan West inkStitch Tutotials - Youtube](https://www.youtube.com/watch?v=w7ZjgxdcAp4&list=PLMNtO24YQeCzjclRoMFO-fZFu4TrZUKs3) it is the closest thing to a user manual you get :) -{% include tutorial_list key="tutorial-type" value="Video" %} +{% include tutorials/tutorial_list key="tutorial-type" value="Video" %} Also make sure to checkout the [Ink/Stitch Youtube-Channel](https://www.youtube.com/channel/UCJCDCFuT_xQoI55e10HRiRw). diff --git a/index.html b/index.html index ea88886e6..cec1257e3 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ title: "Ink/Stitch" permalink: / sidebar: nav: "pages" +lang: en ---

An open source machine embroidery design platform based on Inkscape.

@@ -13,5 +14,6 @@ sidebar:

Download Ink/Stitch

News

- -

Read more

+{% assign posts = site.posts | where: "lang", "en" %} + +

{{ site.data.ui-text[page.lang].more_label | default: "Read more" }}

diff --git a/_i18n/de/index_de.html b/index_de.html similarity index 69% rename from _i18n/de/index_de.html rename to index_de.html index 2a7db93a5..50d8a0390 100644 --- a/_i18n/de/index_de.html +++ b/index_de.html @@ -15,5 +15,6 @@ sidebar:

Download Ink/Stitch

Neuigkeiten

- -

{{ f.btn_label | default: site.data.ui-text[page.lang].more_label }}

+{% assign posts = site.posts | where: "lang", "de" %} + +

{{ site.data.ui-text[page.lang].more_label | default: "Read more" }}