3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
Enrico Turri 2018-05-15 08:41:59 +02:00
commit 0155f4a7f7
9 changed files with 7677 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Build.PL
View file

@ -12,6 +12,7 @@ my %prereqs = qw(
ExtUtils::ParseXS 3.22
ExtUtils::XSpp 0
ExtUtils::Typemaps 0
ExtUtils::Typemaps::Basic 0
File::Basename 0
File::Spec 0
Getopt::Long 0

1284
resources/localization/Slic3rPE.pot
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/es/Slic3rPE.mo Normal file
View file

Binary file not shown.

3512
resources/localization/es/Slic3rPE_es.po Normal file
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/it/Slic3rPE.mo
View file

Binary file not shown.

10
resources/localization/it/Slic3rPE_it.po
View file

@ -214,7 +214,7 @@ msgstr "&Carica Gruppo di Configurazioni…"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:254
msgid "&Load Config…\tCtrl+L"
msgstr "Carica Configurazione…\tCtrl+&L"
msgstr "&Carica Configurazione…\tCtrl+L"
#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:339
msgid "&Localization"
@ -1856,7 +1856,7 @@ msgstr "Aprire un modello"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:251
msgid "Open STL/OBJ/AMF…\tCtrl+O"
msgstr "Aprire un STL/OBJ/AMF… Ctrl+O"
msgstr "Aprire un STL/OBJ/AMF… \tCtrl+O"
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2102
msgid "Open the 3D cutting tool"
@ -2003,7 +2003,7 @@ msgstr "Preferenze"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:299
msgid "Preferences…\tCtrl+,"
msgstr "Preferenze…Ctrl+,"
msgstr "Preferenze…\tCtrl+,"
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1171
msgid "Preferred direction of the seam"
@ -2079,7 +2079,7 @@ msgstr "Versioni Prusa Edition"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:268
msgid "Q&uick Slice…\tCtrl+U"
msgstr "Slice Rapido… \tCtrl+&U"
msgstr "Slice &Rapido… \tCtrl+U"
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:335
msgid "Quality (slower slicing)"
@ -2593,7 +2593,7 @@ msgstr "Processa ora"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:287
msgid "Slice to SV&G…\tCtrl+G"
msgstr "Processa a SV&G…\tCtrl+G"
msgstr "Processa a SV&G…\tCtrl+G"
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:438
msgid "Sliced Info"

BIN
resources/localization/pl/Slic3rPE.mo Normal file
View file

Binary file not shown.

3511
resources/localization/pl/Slic3rPE_pl.po Normal file
View file

File diff suppressed because it is too large Load diff

2
xs/src/slic3r/GUI/Tab.cpp
View file

@ -2125,7 +2125,7 @@ void Tab::save_preset(std::string name /*= ""*/)
return;
}
if (existing && (existing->is_external)) {
show_error(this, _(L("Cannot overwrite an external.")));
show_error(this, _(L("Cannot overwrite an external profile.")));
return;
}
}