Skip to content

Commit

Permalink
typos & trad
Browse files Browse the repository at this point in the history
  • Loading branch information
supermerill committed Dec 17, 2018
1 parent eaedfde commit a1a6bec
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 14 deletions.
19 changes: 14 additions & 5 deletions resources/localization/fr_FR/Slic3rPE_fr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2442,8 +2442,8 @@ msgid "perimeters"
msgstr "périmètres"

#: xs/src/slic3r/GUI/ConfigWizard.cpp:297
msgid "Pick another vendor supported by Slic3r PE:"
msgstr "Choisissez un autre fabriquant supporté par Slic3r PE :"
msgid "Pick another vendor supported by Slic3r++:"
msgstr "Choisissez un autre fabriquant supporté par Slic3r++ :"

#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2024
msgid "Place one more copy of the selected object"
Expand Down Expand Up @@ -3229,14 +3229,14 @@ msgstr "Incompatibilité avec Slic3r"
#: xs/src/slic3r/GUI/UpdateDialogs.cpp:165
#, c-format
msgid ""
"Slic3r PE now uses an updated configuration structure.\n"
"Slic3r++ now uses an updated configuration structure.\n"
"\n"
"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n"
"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n"
"\n"
"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates."
msgstr ""
"Slic3r PE utilise à présent une structure de configuration mise à jour.\n"
"Slic3r++ utilise à présent une nouvelle structure de configurations avec mise à jour automatique.\n"
"\n"
"Il existe à présent des \"préréglages Système\", qui intègrent les réglages par défaut pour les différentes imprimantes. Ces préréglages Système ne peuvent pas être modifiés, mais les utilisateurs peuvent désormais créer leurs propres préréglages héritant des paramètres de l'un des préréglages Système.\n"
"Un tel préréglage peut ainsi hériter d'une valeur particulière de son parent ou la remplacer par une valeur personnalisée.\n"
Expand Down Expand Up @@ -4772,7 +4772,7 @@ msgstr "Ajoute un fort coût aux déplacement pour les minimiser davantage."
msgid "The convex holes will be grown / shrunk in the XY plane by the configured value"
" (negative = inwards, positive = outwards, should be positive as the holes are always a bit smaller)."
" This might be useful for fine-tuning hole sizes."
msgstr "Les trous convexes vont être agrandis/rétécis en XY par cette valeur pour compenser la rétractation du palstique. (negatif = vers l'intérieur de la pièce, positif = vers l'extérieur) !!! Devrait être négative (<0) afin d'agrandir le trou!!!"
msgstr "Les trous convexes vont être agrandis/rétécis en XY par cette valeur pour compenser la rétractation du plastique. (negatif = vers l'intérieur de la pièce, positif = vers l'extérieur) !!! Devrait être négative (<0) afin d'agrandir le trou!!!"

#: supermerill's add: PrintConfig.cpp
msgid "Invalid value for --over-bridge-flow-ratio"
Expand Down Expand Up @@ -4829,3 +4829,12 @@ msgstr "Aligné"

msgid "Concentric"
msgstr "Concentrique"

msgid "Default value"
msgstr "Valeur par défaut"

msgid "false"
msgstr "faux"

msgid "true"
msgstr "vrai"
4 changes: 0 additions & 4 deletions xs/src/libslic3r/PrintConfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,6 @@ PrintConfigDef::PrintConfigDef()
def->enum_values.push_back("archimedeanchords");
def->enum_values.push_back("octagramspiral");
def->enum_values.push_back("smooth");
def->enum_values.push_back("smoothtriple");
def->enum_values.push_back("smoothhilbert");
def->enum_labels.push_back(L("Rectilinear"));
def->enum_labels.push_back(L("Concentric"));
def->enum_labels.push_back(L("Concentric (filled)"));
Expand Down Expand Up @@ -823,7 +821,6 @@ PrintConfigDef::PrintConfigDef()
def->enum_values.push_back("cubic");
def->enum_values.push_back("line");
def->enum_values.push_back("concentric");
def->enum_values.push_back("concentricgapfill");
def->enum_values.push_back("honeycomb");
def->enum_values.push_back("3dhoneycomb");
def->enum_values.push_back("gyroid");
Expand All @@ -837,7 +834,6 @@ PrintConfigDef::PrintConfigDef()
def->enum_labels.push_back(L("Cubic"));
def->enum_labels.push_back(L("Line"));
def->enum_labels.push_back(L("Concentric"));
def->enum_labels.push_back(L("Concentric (filled)"));
def->enum_labels.push_back(L("Honeycomb"));
def->enum_labels.push_back(L("3D Honeycomb"));
def->enum_labels.push_back(L("Gyroid"));
Expand Down
13 changes: 8 additions & 5 deletions xs/src/slic3r/GUI/ConfigWizard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ PageUpdate::PageUpdate(ConfigWizard *parent) :
auto *box_slic3r = new wxCheckBox(this, wxID_ANY, _(L("Check for application updates")));
box_slic3r->SetValue(app_config->get("version_check") == "1");
append(box_slic3r);
append_text(_(L("If enabled, Slic3r checks for new versions of Slic3r PE online. When a new version becomes available a notification is displayed at the next application startup (never during program usage). This is only a notification mechanisms, no automatic installation is done.")));
append_text(_(L("If enabled, Slic3r checks for new versions of Slic3r++ online. When a new version becomes available a notification is displayed at the next application startup (never during program usage). This is only a notification mechanisms, no automatic installation is done.")));

append_spacer(VERTICAL_SPACING);

Expand All @@ -322,7 +322,7 @@ PageUpdate::PageUpdate(ConfigWizard *parent) :
PageVendors::PageVendors(ConfigWizard *parent) :
ConfigWizardPage(parent, _(L("Other Vendors")), _(L("Other Vendors")))
{
append_text(_(L("Pick another vendor supported by Slic3r PE:")));
append_text(_(L("Pick another vendor supported by Slic3r++:")));

auto boldfont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
boldfont.SetWeight(wxFONTWEIGHT_BOLD);
Expand Down Expand Up @@ -744,7 +744,7 @@ void ConfigWizard::priv::on_custom_setup()
{
page_welcome->chain(page_firmware);
page_temps->chain(page_update);
set_page(page_firmware);
set_page(page_firmware);
}

void ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater)
Expand Down Expand Up @@ -870,13 +870,16 @@ ConfigWizard::ConfigWizard(wxWindow *parent, RunReason reason) :
p->hscroll->SetScrollRate(30, 30);
// Compare current ("ideal") wizard size with the size of the current screen.
// If the screen is smaller, resize wizrad to match, which will enable scrollbars.
auto wizard_size = GetSize();
SetSize(1000, 600);
wxSize wizard_size = GetSize();
std::cout << "size = " << wizard_size.GetWidth() << " : " << wizard_size.GetHeight() << "\n";
unsigned width, height;
if (GUI::get_current_screen_size(this, width, height)) {
wizard_size.SetWidth(std::min(wizard_size.GetWidth(), (int)(width - 2 * DIALOG_MARGIN)));
wizard_size.SetHeight(std::min(wizard_size.GetHeight(), (int)(height - 2 * DIALOG_MARGIN)));
SetMinSize(wizard_size);
}
}
std::cout << "size reduced = " << wizard_size.GetWidth() << " : " << wizard_size.GetHeight() << "\n";
Fit();

p->btn_prev->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &evt) { this->p->go_prev(); });
Expand Down

0 comments on commit a1a6bec

Please sign in to comment.