Merge branch 'fork_release'

This commit is contained in:
supermerill 2018-08-01 19:02:56 +02:00
commit cb7f23fee5
21 changed files with 86 additions and 84 deletions

View File

@ -246,12 +246,13 @@ sub copyright_info
my (%params) = @_;
my %tag = Slic3r::tags($params{format});
my $out =
'Copyright &copy; 2018 Durand Rémi. <br />' .
'Copyright &copy; 2016 Vojtech Bubnik, Prusa Research. <br />' .
'Copyright &copy; 2011-2016 Alessandro Ranellucci. <br />' .
'<a href="http://slic3r.org/">Slic3r</a> is licensed under the ' .
'<a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License, version 3</a>.' .
'<br /><br /><br />' .
'Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Y. Sapir, Mike Sheldrake and numerous others. ' .
'Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Y. Sapir, Mike Sheldrake, Durand Rémi and numerous others. ' .
'Manual by Gary Hodgson. Inspired by the RepRap community. <br />' .
'Slic3r logo designed by Corey Daniels, <a href="http://www.famfamfam.com/lab/icons/silk/">Silk Icon Set</a> designed by Mark James. ';
return $out;

View File

@ -63,7 +63,7 @@ sub new {
# initialize status bar
$self->{statusbar} = Slic3r::GUI::ProgressStatusBar->new($self, Wx::NewId);
$self->{statusbar}->SetStatusText(L("Version ").$Slic3r::VERSION.L(" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"));
$self->{statusbar}->SetStatusText(L("Version ").$Slic3r::VERSION.L(" - Remember to check for updates at http://github.com/supermerill/slic3r/releases"));
$self->SetStatusBar($self->{statusbar});
# Make the global status bar and its progress indicator available in C++
@ -335,11 +335,11 @@ sub _init_menubar {
# Help menu
my $helpMenu = Wx::Menu->new;
{
$self->_append_menu_item($helpMenu, L("Prusa 3D Drivers"), L('Open the Prusa3D drivers download page in your browser'), sub {
Wx::LaunchDefaultBrowser('http://www.prusa3d.com/drivers/');
});
$self->_append_menu_item($helpMenu, L("Prusa Edition Releases"), L('Open the Prusa Edition releases page in your browser'), sub {
Wx::LaunchDefaultBrowser('http://github.com/prusa3d/slic3r/releases');
$self->_append_menu_item($helpMenu, L("Slic3r++ Releases"), L('Open the Slic3r++ releases page in your browser'), sub {
Wx::LaunchDefaultBrowser('http://github.com/supermerill/slic3r/releases');
});
# my $versioncheck = $self->_append_menu_item($helpMenu, "Check for &Updates...", 'Check for new Slic3r versions', sub {
# wxTheApp->check_version(1);

View File

@ -86,8 +86,8 @@ msgstr ""
"Nečíselná hodnota."
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
msgid " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
msgstr " - Nezapomeňte zkontrolovat aktualizace na http://github.com/prusa3d/slic3r/releases"
msgid " - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr " - Nezapomeňte zkontrolovat aktualizace na http://github.com/supermerill/slic3r/releases"
# Used in this context: _("Save ") + title + _(" as:")
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
@ -1604,8 +1604,8 @@ msgstr "Výška obrysu vyjádřená ve vrstvách. Nastavte tuto hodnotu vysokou,
#: xs/src/slic3r/GUI/ConfigWizard.cpp:213
#, c-format
msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Zdravím, vítejte ve Slic3r Prusa Edition! Tento %s vám pomůže se základní konfigurací; jen několik nastavení a budete připraveni k tisku."
msgid "Hello, welcome to Slic3r Slic3r++! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Zdravím, vítejte ve Slic3r Slic3r++! Tento %s vám pomůže se základní konfigurací; jen několik nastavení a budete připraveni k tisku."
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:218
msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
@ -2346,7 +2346,7 @@ msgid "Open the object editor dialog"
msgstr "Otevře dialogové okno editoru objektů"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Open the Prusa Edition releases page in your browser"
msgid "Open the Slic3r++ releases page in your browser"
msgstr "Otavřít stránku vydání Prusa Edice ve vašem prohlížeči"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
@ -2593,7 +2593,7 @@ msgid "Prusa 3D Drivers"
msgstr "Prusa 3D Ovladače"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Prusa Edition Releases"
msgid "Slic3r++ Releases"
msgstr "Vydání Prusa Edice"
#: xs/src/slic3r/GUI/GUI.cpp:908
@ -2752,7 +2752,7 @@ msgid "Report an Issue"
msgstr "Nahlásit chybu"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
msgid "Report an issue on the Slic3r Prusa Edition"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr "Nahlásit chybu ve Slic3eru Prusa Edice"
#: xs/src/slic3r/Utils/PresetUpdater.cpp:514

View File

@ -86,8 +86,8 @@ msgstr ""
"Kein numerischer Wert."
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
msgid " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
msgstr " - Denken Sie an die Überprüfung von Updates auf http://github.com/prusa3d/slic3r/releases"
msgid " - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr " - Denken Sie an die Überprüfung von Updates auf http://github.com/supermerill/slic3r/releases"
# Used in this context: _("Save ") + title + _(" as:")
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
@ -1598,8 +1598,8 @@ msgstr "Höhe der Schürze in Schichten. Eine hohe Schürze kann gegen Zugluft
#: xs/src/slic3r/GUI/ConfigWizard.cpp:213
#, c-format
msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Hallo, willkommen bei Slic3r Prusa Edition! Dieses %s hilft Ihnen bei der Erstkonfiguration; nur ein paar Einstellungen und Sie sind bereit zum Drucken."
msgid "Hello, welcome to Slic3r Slic3r++! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Hallo, willkommen bei Slic3r Slic3r++! Dieses %s hilft Ihnen bei der Erstkonfiguration; nur ein paar Einstellungen und Sie sind bereit zum Drucken."
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:218
msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
@ -2342,8 +2342,8 @@ msgid "Open the object editor dialog"
msgstr "Objekteditor-Dialog öffnen"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Open the Prusa Edition releases page in your browser"
msgstr "Seite mit den Prusa Edition-Releases in Ihrem Browser öffnen"
msgid "Open the Slic3r++ releases page in your browser"
msgstr "Seite mit den Slic3r++-Releases in Ihrem Browser öffnen"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
msgid "Open the Prusa3D drivers download page in your browser"
@ -2589,8 +2589,8 @@ msgid "Prusa 3D Drivers"
msgstr "Prusa 3D Treiber"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Prusa Edition Releases"
msgstr "Prusa Edition Release"
msgid "Slic3r++ Releases"
msgstr "Slic3r++ Release"
#: xs/src/slic3r/GUI/GUI.cpp:908
msgid "Purging volumes"
@ -2748,8 +2748,8 @@ msgid "Report an Issue"
msgstr "Einen Fehler melden"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
msgid "Report an issue on the Slic3r Prusa Edition"
msgstr "Einen Fehler in der Slic3r Prusa Edition melden"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr "Einen Fehler in der Slic3r Slic3r++ melden"
#: xs/src/slic3r/Utils/PresetUpdater.cpp:514
#, c-format

View File

@ -3353,9 +3353,9 @@ msgstr "Version "
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
msgid ""
" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
" - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr ""
" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
" - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:118
msgid "Plater"
@ -3626,12 +3626,12 @@ msgid "Open the Prusa3D drivers download page in your browser"
msgstr "Open the Prusa3D drivers download page in your browser"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Prusa Edition Releases"
msgstr "Prusa Edition Releases"
msgid "Slic3r++ Releases"
msgstr "Slic3r++ Releases"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Open the Prusa Edition releases page in your browser"
msgstr "Open the Prusa Edition releases page in your browser"
msgid "Open the Slic3r++ releases page in your browser"
msgstr "Open the Slic3r++ releases page in your browser"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:395
msgid "Slic3r &Website"
@ -3662,8 +3662,8 @@ msgid "Report an Issue"
msgstr "Report an Issue"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
msgid "Report an issue on the Slic3r Prusa Edition"
msgstr "Report an issue on the Slic3r Prusa Edition"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr "Report an issue on the Slic3r Slic3r++"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:408
msgid "&About Slic3r"

View File

@ -86,8 +86,8 @@ msgstr ""
"No es un valor numérico."
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
msgid " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
msgstr " - Recuerda comprobar si hay actualizaciones en http://github.com/prusa3d/slic3r/releases"
msgid " - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr " - Recuerda comprobar si hay actualizaciones en http://github.com/supermerill/slic3r/releases"
# Used in this context: _("Save ") + title + _(" as:")
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
@ -1605,8 +1605,8 @@ msgstr "Altura de la falda expresada en capas. Establezca esto en un valor alto
#: xs/src/slic3r/GUI/ConfigWizard.cpp:213
#, c-format
msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Hola, bienvenido a Slic3r Prusa Edition! Este %s te ayuda con la configuración inicial; sólo unos pocos ajustes y estarás preparado para imprimir."
msgid "Hello, welcome to Slic3r Slic3r++! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Hola, bienvenido a Slic3r Slic3r++! Este %s te ayuda con la configuración inicial; sólo unos pocos ajustes y estarás preparado para imprimir."
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:218
msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
@ -2347,8 +2347,8 @@ msgid "Open the object editor dialog"
msgstr "Abrir el cuadro del editor de objetos"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Open the Prusa Edition releases page in your browser"
msgstr "Abrir la página de lanzamientos de Prusa Edition en su navegador"
msgid "Open the Slic3r++ releases page in your browser"
msgstr "Abrir la página de lanzamientos de Slic3r++ en su navegador"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
msgid "Open the Prusa3D drivers download page in your browser"
@ -2594,7 +2594,7 @@ msgid "Prusa 3D Drivers"
msgstr "Controladores de Prusa 3D"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Prusa Edition Releases"
msgid "Slic3r++ Releases"
msgstr "Lanzamientos de la Edición Prusa"
#: xs/src/slic3r/GUI/GUI.cpp:908
@ -2753,7 +2753,7 @@ msgid "Report an Issue"
msgstr "Informar de un problema"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
msgid "Report an issue on the Slic3r Prusa Edition"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr "Informar de un problema de Slic3r Edición Prusa"
#: xs/src/slic3r/Utils/PresetUpdater.cpp:514

View File

@ -86,8 +86,8 @@ msgstr ""
"Valeur non-numérique."
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
msgid " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
msgstr " - Pensez à vérifier les mises à jours sur http://github.com/prusa3d/slic3r/releases"
msgid " - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr " - Pensez à vérifier les mises à jours sur http://github.com/supermerill/slic3r/releases"
# Used in this context: _("Save ") + title + _(" as:")
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
@ -1600,8 +1600,8 @@ msgstr "Hauteur de la jupe exprimée en couches. Mettez une valeur élevée pour
#: xs/src/slic3r/GUI/ConfigWizard.cpp:213
#, c-format
msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Bonjour, bienvenu dans Slic3r Prusa Edition ! Ce %s vous aide à la configuration initiale ; juste quelques paramètres et vous serez prêt à imprimer."
msgid "Hello, welcome to Slic3r Slic3r++! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Bonjour, bienvenu dans Slic3r Slic3r++ ! Ce %s vous aide à la configuration initiale ; juste quelques paramètres et vous serez prêt à imprimer."
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:218
msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
@ -2340,8 +2340,8 @@ msgid "Open the object editor dialog"
msgstr "Ouvrir la boîte de dialogue d'édition d'objet"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Open the Prusa Edition releases page in your browser"
msgstr "Ouvrir la page des publications de la Prusa Edition dans votre navigateur"
msgid "Open the Slic3r++ releases page in your browser"
msgstr "Ouvrir la page des publications de la Slic3r++ dans votre navigateur"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
msgid "Open the Prusa3D drivers download page in your browser"
@ -2587,8 +2587,8 @@ msgid "Prusa 3D Drivers"
msgstr "Drivers Prusa 3D"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Prusa Edition Releases"
msgstr "Publication de la Prusa Edition"
msgid "Slic3r++ Releases"
msgstr "Publication de la Slic3r++"
#: xs/src/slic3r/GUI/GUI.cpp:908
msgid "Purging volumes"
@ -2746,8 +2746,8 @@ msgid "Report an Issue"
msgstr "Signaler un problème"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
msgid "Report an issue on the Slic3r Prusa Edition"
msgstr "Signaler un problème sur la Prusa Edition de Slic3r"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr "Signaler un problème sur la Slic3r++ de Slic3r"
#: xs/src/slic3r/Utils/PresetUpdater.cpp:514
#, c-format

View File

@ -86,8 +86,8 @@ msgstr ""
"Valore non numerico."
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
msgid " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
msgstr " - Ricorda di controllare gli aggiornamenti su http://github.com/prusa3d/slic3r/releases"
msgid " - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr " - Ricorda di controllare gli aggiornamenti su http://github.com/supermerill/slic3r/releases"
# Used in this context: _("Save ") + title + _(" as:")
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
@ -1605,8 +1605,8 @@ msgstr "Altezza dello skirt espresso in layer. Imposta un valore alto per utiliz
#: xs/src/slic3r/GUI/ConfigWizard.cpp:213
#, c-format
msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Ciao, benvenuto su Slic3r Prusa Edition! Questo %s ti aiuterà con la configurazione iniziale; giusto un paio di impostazioni e sarai pronto a stampare."
msgid "Hello, welcome to Slic3r Slic3r++! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Ciao, benvenuto su Slic3r Slic3r++! Questo %s ti aiuterà con la configurazione iniziale; giusto un paio di impostazioni e sarai pronto a stampare."
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:218
msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
@ -2346,8 +2346,8 @@ msgid "Open the object editor dialog"
msgstr "Apri la finestra di dialogo di modifica oggetto"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Open the Prusa Edition releases page in your browser"
msgstr "Apri la pagina delle versioni Prusa Edition sul tuo browser"
msgid "Open the Slic3r++ releases page in your browser"
msgstr "Apri la pagina delle versioni Slic3r++ sul tuo browser"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
msgid "Open the Prusa3D drivers download page in your browser"
@ -2593,8 +2593,8 @@ msgid "Prusa 3D Drivers"
msgstr "Driver Prusa 3D"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Prusa Edition Releases"
msgstr "Versioni Prusa Edition"
msgid "Slic3r++ Releases"
msgstr "Versioni Slic3r++"
#: xs/src/slic3r/GUI/GUI.cpp:908
msgid "Purging volumes"
@ -2752,8 +2752,8 @@ msgid "Report an Issue"
msgstr "Segnala un problema"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
msgid "Report an issue on the Slic3r Prusa Edition"
msgstr "Segnala un problema su Slic3r Prusa Edition"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr "Segnala un problema su Slic3r Slic3r++"
#: xs/src/slic3r/Utils/PresetUpdater.cpp:514
#, c-format

View File

@ -86,8 +86,8 @@ msgstr ""
"Wartość nie jest liczbą."
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
msgid " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
msgstr " - Pamiętaj aby sprawdzać aktualizacja na http://github.com/prusa3d/slic3r/releases"
msgid " - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr " - Pamiętaj aby sprawdzać aktualizacja na http://github.com/supermerill/slic3r/releases"
# Used in this context: _("Save ") + title + _(" as:")
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
@ -1605,8 +1605,8 @@ msgstr "Wysokość skirtu wyrażona w warstwach. Ustawienie wysokiej wartości s
#: xs/src/slic3r/GUI/ConfigWizard.cpp:213
#, c-format
msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Witaj w Slic3r Prusa Edition! Ten %s pomoże we wstępnej konfiguracji - tylko kilka ustawień dzieli Cię od gotowości do drukowania."
msgid "Hello, welcome to Slic3r Slic3r++! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Witaj w Slic3r Slic3r++! Ten %s pomoże we wstępnej konfiguracji - tylko kilka ustawień dzieli Cię od gotowości do drukowania."
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:218
msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
@ -2348,8 +2348,8 @@ msgid "Open the object editor dialog"
msgstr "Otwórz menu edytora modelu"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Open the Prusa Edition releases page in your browser"
msgstr "Otwórz stronę z wydaniami Prusa Edition w przeglądarce"
msgid "Open the Slic3r++ releases page in your browser"
msgstr "Otwórz stronę z wydaniami Slic3r++ w przeglądarce"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
msgid "Open the Prusa3D drivers download page in your browser"
@ -2595,8 +2595,8 @@ msgid "Prusa 3D Drivers"
msgstr "Sterowniki Prusa3D"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Prusa Edition Releases"
msgstr "Wydania Prusa Edition"
msgid "Slic3r++ Releases"
msgstr "Wydania Slic3r++"
#: xs/src/slic3r/GUI/GUI.cpp:908
msgid "Purging volumes"
@ -2754,8 +2754,8 @@ msgid "Report an Issue"
msgstr "Zgłoś problem"
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
msgid "Report an issue on the Slic3r Prusa Edition"
msgstr "Zgłoś problem z Slic3r Prusa Edition"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr "Zgłoś problem z Slic3r Slic3r++"
#: xs/src/slic3r/Utils/PresetUpdater.cpp:514
#, c-format

View File

@ -4693,8 +4693,8 @@ msgstr "Версія "
#: lib/Slic3r/GUI/MainFrame.pm:66
msgid ""
" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
msgstr " - Пам'ятайте оновлювати з http://github.com/prusa3d/slic3r/releases"
" - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr " - Пам'ятайте оновлювати з http://github.com/supermerill/slic3r/releases"
#: lib/Slic3r/GUI/MainFrame.pm:135
msgid "Plater"
@ -4925,12 +4925,12 @@ msgid "Open the Prusa3D drivers download page in your browser"
msgstr "Відкрити сторінку завантаження драйверів Prusa3D у своєму браузері"
#: lib/Slic3r/GUI/MainFrame.pm:341
msgid "Prusa Edition Releases"
msgstr "Випуски(релізи) Prusa Edition"
msgid "Slic3r++ Releases"
msgstr "Випуски(релізи) Slic3r++"
#: lib/Slic3r/GUI/MainFrame.pm:341
msgid "Open the Prusa Edition releases page in your browser"
msgstr "Відкрити сторінку релізів Prusa Edition у своєму браузері"
msgid "Open the Slic3r++ releases page in your browser"
msgstr "Відкрити сторінку релізів Slic3r++ у своєму браузері"
#: lib/Slic3r/GUI/MainFrame.pm:348
msgid "Slic3r &Website"
@ -4969,8 +4969,8 @@ msgid "Report an Issue"
msgstr "Повідомити про проблему"
#: lib/Slic3r/GUI/MainFrame.pm:361
msgid "Report an issue on the Slic3r Prusa Edition"
msgstr "Повідомити про проблему на Slic3r Prusa Edition"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr "Повідомити про проблему на Slic3r Slic3r++"
#: lib/Slic3r/GUI/MainFrame.pm:364
msgid "&About Slic3r"

View File

@ -3017,7 +3017,7 @@ msgstr ""
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
msgid ""
" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
" - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
msgstr ""
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:118
@ -3289,11 +3289,11 @@ msgid "Open the Prusa3D drivers download page in your browser"
msgstr ""
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Prusa Edition Releases"
msgid "Slic3r++ Releases"
msgstr ""
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
msgid "Open the Prusa Edition releases page in your browser"
msgid "Open the Slic3r++ releases page in your browser"
msgstr ""
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:395
@ -3325,7 +3325,7 @@ msgid "Report an Issue"
msgstr ""
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
msgid "Report an issue on the Slic3r Prusa Edition"
msgid "Report an issue on the Slic3r Slic3r++"
msgstr ""
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:408

View File

@ -92,12 +92,13 @@ AboutDialog::AboutDialog()
"<html>"
"<body bgcolor= %s link= %s>"
"<font color=%s>"
"Copyright &copy; 2018 Durand Rémi. <br />"
"Copyright &copy; 2016-2018 Prusa Research. <br />"
"Copyright &copy; 2011-2017 Alessandro Ranellucci. <br />"
"<a href=\"http://slic3r.org/\">Slic3r</a> is licensed under the "
"<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\">GNU Affero General Public License, version 3</a>."
"<br /><br />"
"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and numerous others. "
"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik, Durand Rémi and numerous others. "
"Manual by Gary Hodgson. Inspired by the RepRap community. <br />"
"Slic3r logo designed by Corey Daniels, <a href=\"http://www.famfamfam.com/lab/icons/silk/\">Silk Icon Set</a> designed by Mark James. "
"</font>"

View File

@ -233,7 +233,7 @@ PageWelcome::PageWelcome(ConfigWizard *parent, bool check_first_variant) :
if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) {
wxString::Format(_(L("Run %s")), ConfigWizard::name());
append_text(wxString::Format(
_(L("Hello, welcome to Slic3r++ (fork of Slic3r Prusa Edition)! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
_(L("Hello, welcome to Slic3r++ (fork of Slic3r Slic3r++)! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
ConfigWizard::name())
);
} else {