Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste

This commit is contained in:
Enrico Turri 2019-04-25 09:58:41 +02:00
commit 5cfa164776
3 changed files with 2874 additions and 2878 deletions

View file

@ -2016,7 +2016,12 @@ msgstr ""
msgid "Iso View" msgid "Iso View"
msgstr "" msgstr ""
#: src/slic3r/GUI/MainFrame.cpp:450 src/libslic3r/PrintConfig.cpp:2041 #: src/slic3r/GUI/MainFrame.cpp:450
msgid "Top"
msgstr ""
#: src/libslic3r/PrintConfig.cpp:2041
msgctxt "Layers"
msgid "Top" msgid "Top"
msgstr "" msgstr ""
@ -2024,7 +2029,12 @@ msgstr ""
msgid "Top View" msgid "Top View"
msgstr "" msgstr ""
#: src/slic3r/GUI/MainFrame.cpp:451 src/libslic3r/PrintConfig.cpp:148 #: src/slic3r/GUI/MainFrame.cpp:451
msgid "Bottom"
msgstr ""
#: src/libslic3r/PrintConfig.cpp:148
msgctxt "Layers"
msgid "Bottom" msgid "Bottom"
msgstr "" msgstr ""

File diff suppressed because it is too large Load diff