diff --git a/Core/GDCore/Events/ExpressionParser.cpp b/Core/GDCore/Events/ExpressionParser.cpp index e2c91da99f..8cb70b19f5 100644 --- a/Core/GDCore/Events/ExpressionParser.cpp +++ b/Core/GDCore/Events/ExpressionParser.cpp @@ -111,7 +111,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) { if ( requestNumber ) { - firstErrorStr = GD_T("Number excepted"); + firstErrorStr = _("Number excepted"); return false; } @@ -134,14 +134,14 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) { if ( !parsingNumber ) { - firstErrorStr = GD_T("Syntax error"); + firstErrorStr = _("Syntax error"); return false; } if ( parsingDecimalNumber ) { - firstErrorStr = GD_T("Syntax error in a number."); + firstErrorStr = _("Syntax error in a number."); return false; } @@ -153,7 +153,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) { if ( parsingScientificNotationNumber ) { - firstErrorStr = GD_T("Syntax error in a number."); + firstErrorStr = _("Syntax error in a number."); return false; } @@ -164,7 +164,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) if ( numberWasParsedLast ) { - firstErrorStr = GD_T("Operator missing before a number"); + firstErrorStr = _("Operator missing before a number"); return false; } @@ -176,7 +176,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) { if ( requestNumber ) { - firstErrorStr = GD_T("Number excepted"); + firstErrorStr = _("Number excepted"); return false; } @@ -192,7 +192,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) if ( !numberWasParsedLast ) { - firstErrorStr = GD_T("Superfluous operator before a paranthesis"); + firstErrorStr = _("Superfluous operator before a paranthesis"); return false; } @@ -200,14 +200,14 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) if (parenthesisLevel>0) parenthesisLevel--; else { - firstErrorStr = GD_T("Bad closing paranthesis"); + firstErrorStr = _("Bad closing paranthesis"); return false; } if ( str[parsePos-1] == U'(' ) { - firstErrorStr = GD_T("Empty paranthesis"); + firstErrorStr = _("Empty paranthesis"); return false; } @@ -216,7 +216,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) { if ( requestNumber ) { - firstErrorStr = GD_T("Number excepted"); + firstErrorStr = _("Number excepted"); return false; } @@ -232,7 +232,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) if ( numberWasParsedLast ) { - firstErrorStr = GD_T("Operator missing before a paranthesis"); + firstErrorStr = _("Operator missing before a paranthesis"); return false; } @@ -251,7 +251,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) { if ( requestNumber ) { - firstErrorStr = GD_T("Number excepted"); + firstErrorStr = _("Number excepted"); return false; } @@ -267,7 +267,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) if ( str[parsePos] != U'-' && str[parsePos] != U'+' && !numberWasParsedLast ) { - firstErrorStr = GD_T("Operators without any number between them"); + firstErrorStr = _("Operators without any number between them"); return false; } @@ -277,7 +277,7 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) } else { - firstErrorStr = GD_T("Syntax error"); + firstErrorStr = _("Syntax error"); return false; } @@ -293,21 +293,21 @@ bool ExpressionParser::ValidSyntax(const gd::String & str) } else if ( requestNumber ) { - firstErrorStr = GD_T("Number excepted"); + firstErrorStr = _("Number excepted"); return false; } if ( parenthesisLevel != 0 ) { - firstErrorStr = GD_T("Paranthesis mismatch"); + firstErrorStr = _("Paranthesis mismatch"); return false; } if (!numberWasParsedLast) { - firstErrorStr = GD_T("Alone operator at the end of the expression"); + firstErrorStr = _("Alone operator at the end of the expression"); return false; } @@ -450,7 +450,7 @@ bool ExpressionParser::ParseMathExpression(const gd::Platform & platform, const //Testing function call is properly closed if(parametersEnd == expression.length() || expression[parametersEnd] != U')') { - firstErrorStr = GD_T("Paranthesis not closed"); + firstErrorStr = _("Paranthesis not closed"); firstErrorPos = parametersEnd-1; return false; @@ -460,9 +460,9 @@ bool ExpressionParser::ParseMathExpression(const gd::Platform & platform, const if ( parameters.size() > GetMaximalParametersNumber(instructionInfos.parameters) || parameters.size() < GetMinimalParametersNumber(instructionInfos.parameters) ) { firstErrorPos = functionNameEnd; - firstErrorStr = GD_T("Incorrect number of parameters"); + firstErrorStr = _("Incorrect number of parameters"); firstErrorStr += " "; - firstErrorStr += GD_T("Excepted ( maximum ) :"); + firstErrorStr += _("Excepted ( maximum ) :"); firstErrorStr += gd::String::FromUInt(GetMaximalParametersNumber(instructionInfos.parameters)); return false; @@ -479,7 +479,7 @@ bool ExpressionParser::ParseMathExpression(const gd::Platform & platform, const else { firstErrorPos = functionNameEnd; - firstErrorStr = GD_T("Parameters' parenthesis missing"); + firstErrorStr = _("Parameters' parenthesis missing"); return false; } @@ -543,7 +543,7 @@ bool ExpressionParser::ParseStringExpression(const gd::Platform & platform, cons if ( firstPointPos == string::npos && firstParPos == string::npos && firstQuotePos == string::npos ) { firstErrorPos = 0; - firstErrorStr = GD_T("The expression is invalid or empty. Enter a text ( surrounded by quotes ) or a function."); + firstErrorStr = _("The expression is invalid or empty. Enter a text ( surrounded by quotes ) or a function."); return false; } @@ -562,7 +562,7 @@ bool ExpressionParser::ParseStringExpression(const gd::Platform & platform, cons if ( finalQuotePosition == string::npos ) { firstErrorPos = firstQuotePos; - firstErrorStr = GD_T("Quotes not closed."); + firstErrorStr = _("Quotes not closed."); return false; } @@ -644,7 +644,7 @@ bool ExpressionParser::ParseStringExpression(const gd::Platform & platform, cons if ( parametersEnd == expression.length() || expression[parametersEnd] != U')' ) { firstErrorPos = parametersEnd-1; - firstErrorStr = GD_T("Paranthesis not closed"); + firstErrorStr = _("Paranthesis not closed"); return false; } @@ -667,7 +667,7 @@ bool ExpressionParser::ParseStringExpression(const gd::Platform & platform, cons if ( parameters.size() > GetMaximalParametersNumber(expressionInfo.parameters) || parameters.size() < GetMinimalParametersNumber(expressionInfo.parameters)) { firstErrorPos = functionNameEnd; - firstErrorStr = GD_T("Incorrect number of parameters"); + firstErrorStr = _("Incorrect number of parameters"); return false; } @@ -692,7 +692,7 @@ bool ExpressionParser::ParseStringExpression(const gd::Platform & platform, cons if ( parameters.size() > GetMaximalParametersNumber(expressionInfo.parameters) || parameters.size() < GetMinimalParametersNumber(expressionInfo.parameters)) { firstErrorPos = functionNameEnd; - firstErrorStr = GD_T("Incorrect number of parameters"); + firstErrorStr = _("Incorrect number of parameters"); for (unsigned int i = 0;i GetMaximalParametersNumber(expressionInfo.parameters) || parameters.size() < GetMinimalParametersNumber(expressionInfo.parameters)) { firstErrorPos = functionNameEnd; - firstErrorStr = GD_T("Incorrect number of parameters"); + firstErrorStr = _("Incorrect number of parameters"); return false; } @@ -767,7 +767,7 @@ bool ExpressionParser::ParseStringExpression(const gd::Platform & platform, cons if ( !functionFound ) //Function was not found { firstErrorPos = nameStart; - firstErrorStr = GD_T("Function not recognized."); + firstErrorStr = _("Function not recognized."); return false; } @@ -791,14 +791,14 @@ bool ExpressionParser::ParseStringExpression(const gd::Platform & platform, cons if (nextTokenPos < firstPlusPos) { firstErrorPos = nextTokenPos; - firstErrorStr = GD_T("Symbol missing between two +."); + firstErrorStr = _("Symbol missing between two +."); return false; } else if ( expression.find("+", firstPlusPos+1) < nextTokenPos ) { firstErrorPos = firstPlusPos; - firstErrorStr = GD_T("Symbol missing between two +."); + firstErrorStr = _("Symbol missing between two +."); return false; } @@ -808,7 +808,7 @@ bool ExpressionParser::ParseStringExpression(const gd::Platform & platform, cons if ( expression.substr(parsePosition, expression.length()).find_first_not_of(" \n") != gd::String::npos ) { firstErrorPos = parsePosition; - firstErrorStr = GD_T("Bad symbol at the end of the expression."); + firstErrorStr = _("Bad symbol at the end of the expression."); return false; } diff --git a/Core/GDCore/Events/InstructionMetadata.cpp b/Core/GDCore/Events/InstructionMetadata.cpp index 93a30cfded..2f672eda3e 100644 --- a/Core/GDCore/Events/InstructionMetadata.cpp +++ b/Core/GDCore/Events/InstructionMetadata.cpp @@ -15,7 +15,7 @@ namespace gd { InstructionMetadata::InstructionMetadata() : - sentence(GD_T("Unknown or unsupported instruction")), + sentence(_("Unknown or unsupported instruction")), canHaveSubInstructions(false), hidden(true) { diff --git a/Core/GDCore/Events/VariableParser.cpp b/Core/GDCore/Events/VariableParser.cpp index 05ad798829..6e13a1d5fd 100644 --- a/Core/GDCore/Events/VariableParser.cpp +++ b/Core/GDCore/Events/VariableParser.cpp @@ -79,7 +79,7 @@ void VariableParser::S() ReadToken(); if (currentTokenType != TS_VARNAME) { - firstErrorStr = GD_T("Expecting a variable name."); + firstErrorStr = _("Expecting a variable name."); firstErrorPos = currentPosition; return; } @@ -109,7 +109,7 @@ void VariableParser::X() ReadToken(); if (currentTokenType != TS_CLOSING_BRACKET) { - firstErrorStr = GD_T("Expecting ]"); + firstErrorStr = _("Expecting ]"); firstErrorPos = currentPosition; return; } diff --git a/Core/GDCore/IDE/Dialogs/ChooseAutomatismDialog.cpp b/Core/GDCore/IDE/Dialogs/ChooseAutomatismDialog.cpp index 4847694da1..f07002261a 100644 --- a/Core/GDCore/IDE/Dialogs/ChooseAutomatismDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/ChooseAutomatismDialog.cpp @@ -119,7 +119,7 @@ bool ChooseAutomatismDialog::DeduceAutomatism() MetadataProvider::GetAutomatismMetadata(project.GetCurrentPlatform(), automatismTypeAllowed); if (metadata.GetFullName().empty()) - gd::LogMessage(GD_T("This object doesn't have the appropriate automatism attached to it.\nCheck that you selected the right object or add the automatism in the object properties.")); + gd::LogMessage(_("This object doesn't have the appropriate automatism attached to it.\nCheck that you selected the right object or add the automatism in the object properties.")); else { gd::LogMessage( diff --git a/Core/GDCore/IDE/Dialogs/ChooseLayerDialog.cpp b/Core/GDCore/IDE/Dialogs/ChooseLayerDialog.cpp index 113f1acaca..4d3c545eec 100644 --- a/Core/GDCore/IDE/Dialogs/ChooseLayerDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/ChooseLayerDialog.cpp @@ -65,7 +65,7 @@ addQuotes(addQuotes_) for (unsigned int i =0;iInsert(name, 0); } } @@ -79,7 +79,7 @@ ChooseLayerDialog::~ChooseLayerDialog() void ChooseLayerDialog::OnokBtClick(wxCommandEvent& event) { chosenLayer = layersList->GetStringSelection(); - if ( chosenLayer == GD_T("Base layer") ) chosenLayer = ""; + if ( chosenLayer == _("Base layer") ) chosenLayer = ""; if ( addQuotes ) chosenLayer = "\""+chosenLayer+"\""; diff --git a/Core/GDCore/IDE/Dialogs/ChooseVariableDialog.cpp b/Core/GDCore/IDE/Dialogs/ChooseVariableDialog.cpp index 8064becf3b..15b3034012 100644 --- a/Core/GDCore/IDE/Dialogs/ChooseVariableDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/ChooseVariableDialog.cpp @@ -297,11 +297,11 @@ void ChooseVariableDialog::OncancelBtClick(wxCommandEvent& event) void ChooseVariableDialog::OnAddVarSelected(wxCommandEvent& event) { //Find a new unique name - gd::String newName = GD_T("NewVariable"); + gd::String newName = _("NewVariable"); unsigned int tries = 2; while ( temporaryContainer->Has(newName) ) { - newName = GD_T("NewVariable")+gd::String::FromUInt(tries); + newName = _("NewVariable")+gd::String::FromUInt(tries); tries++; } @@ -310,7 +310,7 @@ void ChooseVariableDialog::OnAddVarSelected(wxCommandEvent& event) if ( temporaryContainer->Has(newName) ) { - gd::LogMessage(GD_T("A variable with this name already exists!")); + gd::LogMessage(_("A variable with this name already exists!")); return; } @@ -391,7 +391,7 @@ void ChooseVariableDialog::OnRightClick(wxTreeListEvent& event) */ void ChooseVariableDialog::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/global_variables")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/global_variables")); } /** @@ -487,7 +487,7 @@ void ChooseVariableDialog::OnRenameSelected(wxCommandEvent& event) { if ( parentVariable->HasChild(newName) ) { - gd::LogMessage(GD_T("A child variable with this name already exists!")); + gd::LogMessage(_("A child variable with this name already exists!")); return; } @@ -499,7 +499,7 @@ void ChooseVariableDialog::OnRenameSelected(wxCommandEvent& event) { if ( temporaryContainer->Has(newName) ) { - gd::LogMessage(GD_T("A variable with this name already exists!")); + gd::LogMessage(_("A variable with this name already exists!")); return; } @@ -516,9 +516,9 @@ void ChooseVariableDialog::OnAddChildSelected(wxCommandEvent& event) UpdateSelectedAndParentVariable(); if(!selectedVariable) return; - gd::String newChildName = GD_T("NewChild"); + gd::String newChildName = _("NewChild"); for(unsigned int i = 2;selectedVariable->HasChild(newChildName);++i ) - newChildName = GD_T("NewChild")+ToString(i); + newChildName = _("NewChild")+ToString(i); selectedVariable->GetChild(newChildName); UpdateSelectedAndParentVariable(); diff --git a/Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp b/Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp index caba539b8e..2d8ce0aa6d 100644 --- a/Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp @@ -680,7 +680,7 @@ gd::String EditExpressionDialog::ShowParameterDialog(const gd::ParameterMetadata { if ( parameterMetadata.type == "expression" ) { - gd::AdvancedTextEntryDialog dialog(this, GD_T("Parameter"), parameterMetadata.description, "0", AdvancedTextEntryDialog::MathExpression, &project, &layout); + gd::AdvancedTextEntryDialog dialog(this, _("Parameter"), parameterMetadata.description, "0", AdvancedTextEntryDialog::MathExpression, &project, &layout); if ( dialog.ShowModal() == wxOK ) return dialog.text; else @@ -688,7 +688,7 @@ gd::String EditExpressionDialog::ShowParameterDialog(const gd::ParameterMetadata } else if ( parameterMetadata.type == "string" ) { - gd::AdvancedTextEntryDialog dialog(this, GD_T("Parameter"), parameterMetadata.description, "\"\"", AdvancedTextEntryDialog::TextExpression, &project, &layout); + gd::AdvancedTextEntryDialog dialog(this, _("Parameter"), parameterMetadata.description, "\"\"", AdvancedTextEntryDialog::TextExpression, &project, &layout); if ( dialog.ShowModal() == wxOK ) return dialog.text; else diff --git a/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp b/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp index a379534e05..9df12af332 100644 --- a/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp @@ -221,7 +221,7 @@ void EditLayerDialog::OnokBtClick(wxCommandEvent& event) //Obligation d'avoir un nom sauf pour le calque de base if ( nameEdit->GetValue() == "" && nameEdit->IsEnabled() ) { - gd::LogWarning(GD_T("The name is incorrect")); + gd::LogWarning(_("The name is incorrect")); return; } @@ -411,7 +411,7 @@ void EditLayerDialog::OndeleteCameraBtClick(wxCommandEvent& event) if ( tempLayer.GetCameraCount() == 1 ) { - gd::LogMessage(GD_T("The layer must have at least one camera.")); + gd::LogMessage(_("The layer must have at least one camera.")); return; } @@ -425,7 +425,7 @@ void EditLayerDialog::OndeleteCameraBtClick(wxCommandEvent& event) void EditLayerDialog::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/editors/scene_editor/edit_layer")); + gd::HelpFileAccess::Get()->OpenURL(_("http://wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/editors/scene_editor/edit_layer")); } } diff --git a/Core/GDCore/IDE/Dialogs/EditStrExpressionDialog.cpp b/Core/GDCore/IDE/Dialogs/EditStrExpressionDialog.cpp index f80e35a332..5316add05b 100644 --- a/Core/GDCore/IDE/Dialogs/EditStrExpressionDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/EditStrExpressionDialog.cpp @@ -417,7 +417,7 @@ gd::String EditStrExpressionDialog::ShowParameterDialog(const gd::ParameterMetad { if ( parameterMetadata.type == "expression" ) { - gd::AdvancedTextEntryDialog dialog(this, GD_T("Parameter"), parameterMetadata.description, "0", gd::AdvancedTextEntryDialog::MathExpression, &project, &layout); + gd::AdvancedTextEntryDialog dialog(this, _("Parameter"), parameterMetadata.description, "0", gd::AdvancedTextEntryDialog::MathExpression, &project, &layout); if ( dialog.ShowModal() == wxOK ) return dialog.text; else @@ -432,7 +432,7 @@ gd::String EditStrExpressionDialog::ShowParameterDialog(const gd::ParameterMetad } else if ( parameterMetadata.type == "string" ) { - gd::AdvancedTextEntryDialog dialog(this, GD_T("Parameter"), parameterMetadata.description, "\"\"", gd::AdvancedTextEntryDialog::TextExpression, &project, &layout); + gd::AdvancedTextEntryDialog dialog(this, _("Parameter"), parameterMetadata.description, "\"\"", gd::AdvancedTextEntryDialog::TextExpression, &project, &layout); if ( dialog.ShowModal() == wxOK ) return dialog.text; else diff --git a/Core/GDCore/IDE/Dialogs/GridSetupDialog.cpp b/Core/GDCore/IDE/Dialogs/GridSetupDialog.cpp index b48dbd6720..bfa644f56e 100644 --- a/Core/GDCore/IDE/Dialogs/GridSetupDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/GridSetupDialog.cpp @@ -150,12 +150,12 @@ void GridSetupDialog::OnokBtClick(wxCommandEvent& event) snap = snapCheck->GetValue(); if ( ToInt(static_cast(widthEdit->GetValue())) < 1) { - gd::LogWarning(GD_T("The width of the grid is wrong.")); + gd::LogWarning(_("The width of the grid is wrong.")); return; } if ( ToInt(static_cast(heightEdit->GetValue())) < 1) { - gd::LogWarning(GD_T("The height of the grid is wrong.")); + gd::LogWarning(_("The height of the grid is wrong.")); return; } @@ -191,7 +191,7 @@ void GridSetupDialog::OncolorPanelLeftUp(wxMouseEvent& event) void GridSetupDialog::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/editors/scene_editor/edit_scene_edit")); + gd::HelpFileAccess::Get()->OpenURL(_("http://wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/editors/scene_editor/edit_scene_edit")); } diff --git a/Core/GDCore/IDE/Dialogs/LayersEditorPanel.cpp b/Core/GDCore/IDE/Dialogs/LayersEditorPanel.cpp index 1326f48e61..39de2bc54d 100644 --- a/Core/GDCore/IDE/Dialogs/LayersEditorPanel.cpp +++ b/Core/GDCore/IDE/Dialogs/LayersEditorPanel.cpp @@ -99,7 +99,7 @@ void LayersEditorPanel::Refresh() for (unsigned int i = 0; i < m_layout.GetLayersCount(); ++i) { gd::String name = m_layout.GetLayer(i).GetName(); - if ( name == "" ) name = GD_T("Base layer"); + if ( name == "" ) name = _("Base layer"); m_layersList->InsertItem(0, name); if ( m_layout.GetLayer(i).GetVisibility() ) @@ -240,7 +240,7 @@ void LayersEditorPanel::OnlayersListItemRClick(wxListEvent& event) void LayersEditorPanel::OnAddLayerClicked(wxCommandEvent& event) { - gd::String name = GD_T("New layer"); + gd::String name = _("New layer"); bool alreadyExist = false; unsigned int nb = 0; @@ -252,7 +252,7 @@ void LayersEditorPanel::OnAddLayerClicked(wxCommandEvent& event) while ( alreadyExist ) { ++nb; - name = GD_T("New layer ") + gd::String::FromUInt(nb); + name = _("New layer ") + gd::String::FromUInt(nb); alreadyExist = false; for (unsigned int i = 0;iOpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/editors/scene_editor/edit_layer")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/editors/scene_editor/edit_layer")); } void LayersEditorPanel::OnLayerDownClicked(wxCommandEvent& event) @@ -344,7 +344,7 @@ void LayersEditorPanel::OnLayerDownClicked(wxCommandEvent& event) return; } } - gd::LogWarning(GD_T("Can't find the layer to move !")); + gd::LogWarning(_("Can't find the layer to move !")); } void LayersEditorPanel::OnLayerUpClicked(wxCommandEvent& event) @@ -369,7 +369,7 @@ void LayersEditorPanel::OnLayerUpClicked(wxCommandEvent& event) return; } } - gd::LogWarning(GD_T("Can't find the layer to move !")); + gd::LogWarning(_("Can't find the layer to move !")); } void LayersEditorPanel::OnRefreshClicked(wxCommandEvent& event) diff --git a/Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas.cpp b/Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas.cpp index c7123c8426..807a491b31 100644 --- a/Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas.cpp +++ b/Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas.cpp @@ -442,7 +442,7 @@ void LayoutEditorCanvas::OnPreviewBtClick( wxCommandEvent & event ) if ( !editing ) return; if ( !currentPreviewer ) { - gd::LogMessage(GD_T("This platform does not support launching previews.")); + gd::LogMessage(_("This platform does not support launching previews.")); return; } diff --git a/Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas2.cpp b/Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas2.cpp index d41168bd44..36336bf5d9 100644 --- a/Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas2.cpp +++ b/Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas2.cpp @@ -425,9 +425,9 @@ void LayoutEditorCanvas::OnCreateObjectSelected(wxCommandEvent & event) return; //Find a new unique name for the object - gd::String name = GD_T("NewObject"); + gd::String name = _("NewObject"); for (unsigned int i = 2;layout.HasObjectNamed(name);++i) - name = GD_T("NewObject")+ToString(i); + name = _("NewObject")+ToString(i); //Add a new object of selected type to objects list layout.InsertNewObject(project, chooseTypeDialog.GetSelectedObjectType(), name, layout.GetObjectsCount()); @@ -758,7 +758,7 @@ void LayoutEditorCanvas::UpdateViewAccordingToZoomFactor() void LayoutEditorCanvas::OnHelpBtClick( wxCommandEvent & event ) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/project_develop/documentation/manual/edit_layout")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/project_develop/documentation/manual/edit_layout")); } diff --git a/Core/GDCore/IDE/Dialogs/ObjectsOnBadLayerDialog.cpp b/Core/GDCore/IDE/Dialogs/ObjectsOnBadLayerDialog.cpp index b167811c60..52466e8a9e 100644 --- a/Core/GDCore/IDE/Dialogs/ObjectsOnBadLayerDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/ObjectsOnBadLayerDialog.cpp @@ -87,7 +87,7 @@ ObjectsOnBadLayerDialog::ObjectsOnBadLayerDialog(wxWindow* parent, const std::ve for (unsigned int i =0;iInsert(name, 0); } Choice1->SetSelection(0); @@ -110,7 +110,7 @@ void ObjectsOnBadLayerDialog::OnMoveClick(wxCommandEvent& event) if ( Choice1->GetStringSelection() != "" ) { moveOnLayerNamed = Choice1->GetStringSelection(); - if ( moveOnLayerNamed == GD_T("Base layer") ) moveOnLayerNamed = ""; + if ( moveOnLayerNamed == _("Base layer") ) moveOnLayerNamed = ""; EndModal(2); } } diff --git a/Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp b/Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp index 1ff05bdd26..fe28898994 100644 --- a/Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp @@ -393,7 +393,7 @@ void ProjectExtensionsDialog::OnFermerBtClick(wxCommandEvent& event) void ProjectExtensionsDialog::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/extensions")); + gd::HelpFileAccess::Get()->OpenURL(_("http://wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/extensions")); } void ProjectExtensionsDialog::OnResize(wxSizeEvent& event) @@ -413,7 +413,7 @@ void ProjectExtensionsDialog::OnremovePlatformMenuItemSelected(wxCommandEvent& e { if ( !project.RemovePlatform(currentPlatform->GetName()) ) { - gd::LogWarning(GD_T("Unable to remove this platform: The project must use at least one plaform.")); + gd::LogWarning(_("Unable to remove this platform: The project must use at least one plaform.")); } RefreshPlatformList(); RefreshExtensionList(); diff --git a/Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp b/Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp index 60bb2adea4..4c55ef429a 100644 --- a/Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp +++ b/Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp @@ -354,7 +354,7 @@ void ResourcesEditor::OnAddImageBtClick( wxCommandEvent& event ) if ( FileDialog.ShowModal() == wxID_OK ) { - gd::LogStatus( GD_T( "Adding images" ) ); + gd::LogStatus( _( "Adding images" ) ); wxArrayString files; FileDialog.GetPaths( files ); @@ -367,7 +367,7 @@ void ResourcesEditor::OnAddImageBtClick( wxCommandEvent& event ) AddResources(filenames); - gd::LogStatus( GD_T( "Resources successfully added" ) ); + gd::LogStatus( _( "Resources successfully added" ) ); } } @@ -386,7 +386,7 @@ std::vector ResourcesEditor::CopyAndAddResources(std::vector ResourcesEditor::AddResources(const std::vector ResourcesEditor::AddResources(const std::vectorDelete(m_itemSelected); } else - gd::LogStatus( GD_T( "No image selected" ) ); + gd::LogStatus( _( "No image selected" ) ); } /** @@ -535,7 +535,7 @@ void ResourcesEditor::OnDelImageBtClick( wxCommandEvent& event ) } else { - gd::LogStatus( GD_T( "No image selected" ) ); + gd::LogStatus( _( "No image selected" ) ); } } } @@ -545,7 +545,7 @@ void ResourcesEditor::OnModNameImageBtClick( wxCommandEvent& event ) if ( m_itemSelected.IsOk() && resourcesTree->GetChildrenCount( m_itemSelected ) == 0 ) resourcesTree->EditLabel( m_itemSelected ); else - gd::LogStatus( GD_T( "No image selected" ) ); + gd::LogStatus( _( "No image selected" ) ); } void ResourcesEditor::OnresourcesTreeItemMenu( wxTreeEvent& event ) @@ -784,7 +784,7 @@ void ResourcesEditor::OnPropertyChanging(wxPropertyGridEvent& event) { if ( project.GetResourcesManager().HasResource(propertyNewValue) ) { - gd::LogWarning( GD_T( "Unable to rename the image: another image has already this name." ) ); + gd::LogWarning( _( "Unable to rename the image: another image has already this name." ) ); event.Veto(); return; } @@ -797,7 +797,7 @@ void ResourcesEditor::OnPropertyChanging(wxPropertyGridEvent& event) { if ( project.GetResourcesManager().HasFolder(propertyNewValue) ) { - gd::LogWarning( GD_T( "Unable to rename the folder: another folder has already this name." ) ); + gd::LogWarning( _( "Unable to rename the folder: another folder has already this name." ) ); event.Veto(); return; } @@ -846,7 +846,7 @@ void ResourcesEditor::OnresourcesTreeEndLabelEdit( wxTreeEvent& event ) { if ( project.GetResourcesManager().HasFolder(newName) ) { - gd::LogWarning( GD_T( "Unable to rename the folder: another folder has already this name." ) ); + gd::LogWarning( _( "Unable to rename the folder: another folder has already this name." ) ); event.Veto(); return; } @@ -860,7 +860,7 @@ void ResourcesEditor::OnresourcesTreeEndLabelEdit( wxTreeEvent& event ) { if ( project.GetResourcesManager().HasResource(newName) ) { - gd::LogWarning( GD_T( "Unable to rename the image: another image has already this name." ) ); + gd::LogWarning( _( "Unable to rename the image: another image has already this name." ) ); event.Veto(); return; } @@ -988,7 +988,7 @@ void ResourcesEditor::OnShowPropertyGridBtClick( wxCommandEvent& event ) void ResourcesEditor::OnAideBtClick( wxCommandEvent& event ) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/edit_image")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/edit_image")); } void ResourcesEditor::OnresourcesTreeItemActivated(wxTreeEvent& event) @@ -1226,11 +1226,11 @@ void ResourcesEditor::ForceRefreshRibbonAndConnect() void ResourcesEditor::OnAddFolderSelected(wxCommandEvent& event) { - gd::String newName = GD_T("New folder"); + gd::String newName = _("New folder"); unsigned int i = 1; while( project.GetResourcesManager().HasFolder(newName) ) { - newName = GD_T("New folder") + " " + gd::String::FromInt(i); + newName = _("New folder") + " " + gd::String::FromInt(i); ++i; } diff --git a/Core/GDCore/IDE/InstructionSentenceFormatter.cpp b/Core/GDCore/IDE/InstructionSentenceFormatter.cpp index 99f47227ba..448615cb26 100644 --- a/Core/GDCore/IDE/InstructionSentenceFormatter.cpp +++ b/Core/GDCore/IDE/InstructionSentenceFormatter.cpp @@ -118,29 +118,29 @@ TextFormatting InstructionSentenceFormatter::GetFormattingFromType(const gd::Str gd::String InstructionSentenceFormatter::LabelFromType(const gd::String & type) { if ( type.empty() ) return ""; - else if ( type == "expression" ) return GD_T("Expression"); - else if ( gd::ParameterMetadata::IsObject(type) ) return GD_T("Object"); - else if ( type == "automatism" ) return GD_T("Automatism"); - else if ( type == "operator" ) return GD_T("Operator"); - else if ( type == "relationalOperator" ) return GD_T( "Relational operator" ); - else if ( type == "file" ) return GD_T("File"); - else if ( type == "key" ) return GD_T( "Key" ); - else if ( type == "mouse" ) return GD_T( "Mouse button" ); - else if ( type == "yesorno" ) return GD_T("Yes or no"); - else if ( type == "police" ) return GD_T("Font"); - else if ( type == "color" ) return GD_T("Color"); - else if ( type == "trueorfalse" ) return GD_T( "True or False" ); - else if ( type == "string" ) return GD_T("String"); - else if ( type == "musicfile" ) return GD_T("Music"); - else if ( type == "soundfile" ) return GD_T("Sound"); - else if ( type == "password" ) return GD_T("Password"); - else if ( type == "layer" ) return GD_T("Layer"); - else if ( type == "joyaxis" ) return GD_T("Joystick axis"); - else if ( type == "objectvar" ) return GD_T("Variable of the object"); - else if ( type == "scenevar" ) return GD_T("Scene variable"); - else if ( type == "globalvar" ) return GD_T("Global variable"); + else if ( type == "expression" ) return _("Expression"); + else if ( gd::ParameterMetadata::IsObject(type) ) return _("Object"); + else if ( type == "automatism" ) return _("Automatism"); + else if ( type == "operator" ) return _("Operator"); + else if ( type == "relationalOperator" ) return _( "Relational operator" ); + else if ( type == "file" ) return _("File"); + else if ( type == "key" ) return _( "Key" ); + else if ( type == "mouse" ) return _( "Mouse button" ); + else if ( type == "yesorno" ) return _("Yes or no"); + else if ( type == "police" ) return _("Font"); + else if ( type == "color" ) return _("Color"); + else if ( type == "trueorfalse" ) return _( "True or False" ); + else if ( type == "string" ) return _("String"); + else if ( type == "musicfile" ) return _("Music"); + else if ( type == "soundfile" ) return _("Sound"); + else if ( type == "password" ) return _("Password"); + else if ( type == "layer" ) return _("Layer"); + else if ( type == "joyaxis" ) return _("Joystick axis"); + else if ( type == "objectvar" ) return _("Variable of the object"); + else if ( type == "scenevar" ) return _("Scene variable"); + else if ( type == "globalvar" ) return _("Global variable"); - return GD_T("Unknown"); + return _("Unknown"); } void InstructionSentenceFormatter::LoadTypesFormattingFromConfig() diff --git a/Core/GDCore/IDE/ProjectResourcesCopier.cpp b/Core/GDCore/IDE/ProjectResourcesCopier.cpp index 3d3c565c29..b06dd12625 100644 --- a/Core/GDCore/IDE/ProjectResourcesCopier.cpp +++ b/Core/GDCore/IDE/ProjectResourcesCopier.cpp @@ -89,7 +89,7 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(gd::Project & originalProject, A //We can now copy the file if ( !fs.CopyFile(it->first, destinationFile) ) { - gd::LogWarning( GD_T( "Unable to copy \"")+it->first+GD_T("\" to \"")+destinationFile+GD_T("\".")); + gd::LogWarning( _( "Unable to copy \"")+it->first+_("\" to \"")+destinationFile+_("\".")); } } } diff --git a/Core/GDCore/PlatformDefinition/Project.cpp b/Core/GDCore/PlatformDefinition/Project.cpp index d3a6b31814..680fc34ed5 100644 --- a/Core/GDCore/PlatformDefinition/Project.cpp +++ b/Core/GDCore/PlatformDefinition/Project.cpp @@ -57,7 +57,7 @@ namespace gd Project::Project() : #if defined(GD_IDE_ONLY) - name(GD_T("Project")), + name(_("Project")), #endif windowWidth(800), windowHeight(600), @@ -499,21 +499,21 @@ void Project::UnserializeFrom(const SerializerElement & element) int revision = gdVersionElement.GetIntAttribute("revision", 0, "Revision"); if ( GDMajorVersion > gd::VersionWrapper::Major() ) - gd::LogWarning( GD_T( "The version of GDevelop used to create this game seems to be a new version.\nGDevelop may fail to open the game, or data may be missing.\nYou should check if a new version of GDevelop is available." ) ); + gd::LogWarning( _( "The version of GDevelop used to create this game seems to be a new version.\nGDevelop may fail to open the game, or data may be missing.\nYou should check if a new version of GDevelop is available." ) ); else { if ( (GDMajorVersion == gd::VersionWrapper::Major() && GDMinorVersion > gd::VersionWrapper::Minor()) || (GDMajorVersion == gd::VersionWrapper::Major() && GDMinorVersion == gd::VersionWrapper::Minor() && build > gd::VersionWrapper::Build()) || (GDMajorVersion == gd::VersionWrapper::Major() && GDMinorVersion == gd::VersionWrapper::Minor() && build == gd::VersionWrapper::Build() && revision > gd::VersionWrapper::Revision()) ) { - gd::LogWarning( GD_T( "The version of GDevelop used to create this game seems to be greater.\nGDevelop may fail to open the game, or data may be missing.\nYou should check if a new version of GDevelop is available." ) ); + gd::LogWarning( _( "The version of GDevelop used to create this game seems to be greater.\nGDevelop may fail to open the game, or data may be missing.\nYou should check if a new version of GDevelop is available." ) ); } } //Compatibility code if ( GDMajorVersion <= 1 ) { - gd::LogError( GD_T("The game was saved with version of GDevelop which is too old. Please open and save the game with one of the first version of GDevelop 2. You will then be able to open your game with this GDevelop version.")); + gd::LogError( _("The game was saved with version of GDevelop which is too old. Please open and save the game with one of the first version of GDevelop 2. You will then be able to open your game with this GDevelop version.")); return; } //End of Compatibility code @@ -598,9 +598,9 @@ void Project::UnserializeFrom(const SerializerElement & element) #if defined(GD_IDE_ONLY) if ( VersionWrapper::IsOlder(GDMajorVersion, 0, 0, 0, 3, 0, 0, 0) ) { - updateText += GD_T("Sprite scaling has changed since GD 2: The resizing is made so that the origin point of the object won't move whatever the scale of the object.\n"); - updateText += GD_T("You may have to slightly change the position of some objects if you have changed their size.\n\n"); - updateText += GD_T("Thank you for your understanding.\n"); + updateText += _("Sprite scaling has changed since GD 2: The resizing is made so that the origin point of the object won't move whatever the scale of the object.\n"); + updateText += _("You may have to slightly change the position of some objects if you have changed their size.\n\n"); + updateText += _("Thank you for your understanding.\n"); } #endif @@ -623,8 +623,8 @@ void Project::UnserializeFrom(const SerializerElement & element) { GetUsedExtensions().erase( std::remove( GetUsedExtensions().begin(), GetUsedExtensions().end(), "AStarAutomatism" ), GetUsedExtensions().end() ); GetUsedExtensions().push_back("PathfindingAutomatism"); - updateText += GD_T("The project is using the pathfinding automatism. This automatism has been replaced by a new one:\n"); - updateText += GD_T("You must add the new 'Pathfinding' automatism to the objects that need to be moved, and add the 'Pathfinding Obstacle' to the objects that must act as obstacles."); + updateText += _("The project is using the pathfinding automatism. This automatism has been replaced by a new one:\n"); + updateText += _("You must add the new 'Pathfinding' automatism to the objects that need to be moved, and add the 'Pathfinding Obstacle' to the objects that must act as obstacles."); } } #endif @@ -714,7 +714,7 @@ bool Project::LoadFromFile(const gd::String & filename) if ( !doc.LoadFile(filename.ToLocale().c_str(), TIXML_ENCODING_UTF8) ) { gd::String errorTinyXmlDesc = doc.ErrorDesc(); - gd::String error = GD_T( "Error while loading :" ) + "\n" + errorTinyXmlDesc + "\n\n" +GD_T("Make sure the file exists and that you have the right to open the file."); + gd::String error = _( "Error while loading :" ) + "\n" + errorTinyXmlDesc + "\n\n" +_("Make sure the file exists and that you have the right to open the file."); gd::LogError( error ); return false; @@ -791,7 +791,7 @@ bool Project::LoadFromJSONFile(const gd::String & filename) std::ifstream ifs(filename.ToLocale().c_str()); if (!ifs.is_open()) { - gd::String error = GD_T( "Unable to open the file") + GD_T("Make sure the file exists and that you have the right to open the file."); + gd::String error = _( "Unable to open the file") + _("Make sure the file exists and that you have the right to open the file."); gd::LogError( error ); return false; } @@ -902,7 +902,7 @@ bool Project::SaveToFile(const gd::String & filename) //Write XML to file if ( !doc.SaveFile( filename.ToLocale().c_str() ) ) { - gd::LogError( GD_T( "Unable to save file ") + filename + GD_T("!\nCheck that the drive has enough free space, is not write-protected and that you have read/write permissions." ) ); + gd::LogError( _( "Unable to save file ") + filename + _("!\nCheck that the drive has enough free space, is not write-protected and that you have read/write permissions." ) ); return false; } @@ -920,7 +920,7 @@ bool Project::SaveToJSONFile(const gd::String & filename) ofstream ofs(filename.ToLocale().c_str()); if (!ofs.is_open()) { - gd::LogError( GD_T( "Unable to save file ")+ filename + GD_T("!\nCheck that the drive has enough free space, is not write-protected and that you have read/write permissions." ) ); + gd::LogError( _( "Unable to save file ")+ filename + _("!\nCheck that the drive has enough free space, is not write-protected and that you have read/write permissions." ) ); return false; } @@ -938,7 +938,7 @@ bool Project::ValidateObjectName(const gd::String & name) gd::String Project::GetBadObjectNameWarning() { - return GD_T("Please use only letters, digits\nand underscores ( _ )."); + return _("Please use only letters, digits\nand underscores ( _ )."); } void Project::ExposeResources(gd::ArbitraryResourceWorker & worker) diff --git a/Core/GDCore/PlatformDefinition/ResourcesManager.cpp b/Core/GDCore/PlatformDefinition/ResourcesManager.cpp index ba4be7ffdf..ffff6f04ab 100644 --- a/Core/GDCore/PlatformDefinition/ResourcesManager.cpp +++ b/Core/GDCore/PlatformDefinition/ResourcesManager.cpp @@ -164,9 +164,9 @@ bool ImageResource::EditProperty(gd::Project & project, const gd::String & prope bool ImageResource::ChangeProperty(gd::Project & project, const gd::String & property, const gd::String & newValue) { if ( property == "smooth" ) - smooth = (newValue == GD_T("Yes")); + smooth = (newValue == _("Yes")); else if ( property == "alwaysLoaded" ) - alwaysLoaded = (newValue == GD_T("Yes")); + alwaysLoaded = (newValue == _("Yes")); return true; } @@ -175,13 +175,13 @@ void ImageResource::GetPropertyInformation(gd::Project & project, const gd::Stri { if ( property == "smooth" ) { - userFriendlyName = GD_T("Smooth the image"); - description = GD_T("Set this to \"Yes\" to set a smooth filter on the image"); + userFriendlyName = _("Smooth the image"); + description = _("Set this to \"Yes\" to set a smooth filter on the image"); } else if ( property == "alwaysLoaded" ) { - userFriendlyName = GD_T("Always loaded in memory"); - description = GD_T("Set this to \"Yes\" to let the image always loaded in memory.\nUseful when the image is used by actions."); + userFriendlyName = _("Always loaded in memory"); + description = _("Set this to \"Yes\" to let the image always loaded in memory.\nUseful when the image is used by actions."); } } @@ -189,11 +189,11 @@ gd::String ImageResource::GetProperty(gd::Project & project, const gd::String & { if ( property == "smooth" ) { - return smooth ? GD_T("Yes") : GD_T("No"); + return smooth ? _("Yes") : _("No"); } else if ( property == "alwaysLoaded" ) { - return alwaysLoaded ? GD_T("Yes") : GD_T("No"); + return alwaysLoaded ? _("Yes") : _("No"); } return ""; diff --git a/Core/GDCore/Tools/Localization.h b/Core/GDCore/Tools/Localization.h index 3be5f31eb0..7954f7476f 100644 --- a/Core/GDCore/Tools/Localization.h +++ b/Core/GDCore/Tools/Localization.h @@ -8,21 +8,16 @@ #if defined(GD_IDE_ONLY) && !defined(GD_NO_WX_GUI) #include - #include "GDCore/Utf8Tools.h" + #include "GDCore/Utf8Tools.h" #include "GDCore/Utf8String.h" //Create a new macro to return UTF8 gd::String from a translation - #if defined(_) + #if defined(_) #undef _ #endif #define _(s) gd::String(wxGetTranslation(u8##s)) - - #define GD_T(s) gd::String(wxGetTranslation(u8##s)) #else - //Ensure the internationalization macro is still defined as code rely on it: - #define GD_T(s) gd::String(u8##s) - //Create a new macro to return UTF8 gd::String from a translation - #if defined(_) + #if defined(_) #undef _ #endif #define _(s) gd::String(u8##s) diff --git a/Core/GDCore/Utf8Tools.h b/Core/GDCore/Utf8Tools.h index 21d0a697da..8613ddd6c3 100644 --- a/Core/GDCore/Utf8Tools.h +++ b/Core/GDCore/Utf8Tools.h @@ -30,10 +30,10 @@ class wxString; * This does not mean that it can not be encoded in UTF8. In fact, on most Linux OSes, the locale is UTF8, so, paths will still be encoded in UTF8. * On Windows, the locale is not UTF8 but an ASCII codepage so paths will be encoded in an ASCII codepage. * - * \section utf8translations How to handle translations correctly ? Difference between _() and GD_T() ? + * \section utf8translations How to handle translations correctly ? Difference between _() and _() ? * As all std::strings are encoded in UTF8, GDevelop can not rely on the default conversion between std::string and wxString. * So, each of these two macros creates a translatable string but not the same type of string. - * - GD_T() creates a translatable string as an std::string (useful for actions/conditions declaration and everywhere a std::string is needed) + * - _() creates a translatable string as an std::string (useful for actions/conditions declaration and everywhere a std::string is needed) * - _() creates a translatable string as an wxString (useful everywhere a wxString is needed, like in GUI) * \warning If you use the wrong macro, the compilation might still work but strange behaviors with special characters might occur (particulary on Windows). * diff --git a/Extensions/AES/Extension.cpp b/Extensions/AES/Extension.cpp index 3026b774ee..6a9962e099 100644 --- a/Extensions/AES/Extension.cpp +++ b/Extensions/AES/Extension.cpp @@ -22,8 +22,8 @@ public: Extension() { SetExtensionInformation("AES", - GD_T("AES encryption algorithm"), - GD_T("Extension to encrypt files with AES algorithm."), + _("AES encryption algorithm"), + _("Extension to encrypt files with AES algorithm."), "Florian Rival", "Open source (MIT License)"); @@ -32,14 +32,14 @@ public: AddAction("EncryptFile", _("Crypt a file"), _("Crypt a file with AES."), - GD_T("Crypt file _PARAM0_ to _PARAM1_ with AES"), + _("Crypt file _PARAM0_ to _PARAM1_ with AES"), _("Encryption"), "CppPlatform/Extensions/AESicon24.png", "CppPlatform/Extensions/AESicon16.png") - .AddParameter("file", GD_T("Source file")) - .AddParameter("file", GD_T("Destination file")) - .AddParameter("string", GD_T("Password ( 24 characters )")) + .AddParameter("file", _("Source file")) + .AddParameter("file", _("Destination file")) + .AddParameter("string", _("Password ( 24 characters )")) .SetFunctionName("GDpriv::AES::EncryptFile").SetIncludeFile("AES/AESTools.h"); @@ -47,14 +47,14 @@ public: AddAction("DecryptFile", _("Decrypt a file"), _("Decrypt a file with AES."), - GD_T("Decrypt file _PARAM0_ to _PARAM1_ with AES"), + _("Decrypt file _PARAM0_ to _PARAM1_ with AES"), _("Encryption"), "CppPlatform/Extensions/AESicon24.png", "CppPlatform/Extensions/AESicon16.png") - .AddParameter("file", GD_T("Source file")) - .AddParameter("file", GD_T("Destination file")) - .AddParameter("string", GD_T("Password ( 24 characters )")) + .AddParameter("file", _("Source file")) + .AddParameter("file", _("Destination file")) + .AddParameter("string", _("Password ( 24 characters )")) .SetFunctionName("GDpriv::AES::DecryptFile").SetIncludeFile("AES/AESTools.h"); diff --git a/Extensions/AdvancedXML/src/Extension.cpp b/Extensions/AdvancedXML/src/Extension.cpp index c2f5aa508d..1fd6495a62 100644 --- a/Extensions/AdvancedXML/src/Extension.cpp +++ b/Extensions/AdvancedXML/src/Extension.cpp @@ -28,8 +28,8 @@ public: Extension() { SetExtensionInformation("AdvancedXML", - GD_T("Advanced XML 1.0"), - GD_T("Extension allowing to manipulate XML files."), + _("Advanced XML 1.0"), + _("Extension allowing to manipulate XML files."), "Victor Levasseur", "Open source (MIT License)"); @@ -38,78 +38,78 @@ public: AddAction("NewFile", _("Create an XML document"), _("Create an XML document"), - GD_T("Create an XML document into reference _PARAM0_"), + _("Create an XML document into reference _PARAM0_"), _("Advanced XML : Documents"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference (allow to access later to the element)")) + .AddParameter("string", _("Reference (allow to access later to the element)")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::CreateNewDocument").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("LoadFile", _("Load an XML file"), _("Load an XML file."), - GD_T("Load XML File _PARAM0_ into reference _PARAM1_"), + _("Load XML File _PARAM0_ into reference _PARAM1_"), _("Advanced XML : Documents"), "res/AdvancedXML/AdvancedXMLOpen.png", "res/AdvancedXML/AdvancedXMLOpen16.png") - .AddParameter("file", GD_T("Source file")) - .AddParameter("string", GD_T("Reference (allow to access later to the element)")) + .AddParameter("file", _("Source file")) + .AddParameter("string", _("Reference (allow to access later to the element)")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::LoadXmlFile").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("SaveFile", _("Save an XML file"), _("Save an XML file."), - GD_T("Save XML file _PARAM1_ into _PARAM0_"), + _("Save XML file _PARAM1_ into _PARAM0_"), _("Advanced XML : Documents"), "res/AdvancedXML/AdvancedXMLSave.png", "res/AdvancedXML/AdvancedXMLSave16.png") - .AddParameter("file", GD_T("File where to save the document")) - .AddParameter("string", GD_T("Reference to the XML document")) + .AddParameter("file", _("File where to save the document")) + .AddParameter("string", _("Reference to the XML document")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::SaveXmlFile").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("BrowseTo", _("Load an element into a reference"), _("Load an element (relative to another) in a reference.\nNote: References allows to access to an element using the name of the reference pointing to it."), - GD_T("Load path _PARAM2_ (relative to the element _PARAM0_) into reference _PARAM1_"), + _("Load path _PARAM2_ (relative to the element _PARAM0_) into reference _PARAM1_"), _("Advanced XML: General"), "res/AdvancedXML/AdvancedXMLRef.png", "res/AdvancedXML/AdvancedXMLRef16.png") - .AddParameter("string", GD_T("Reference of an existing element ( The path of the element will be relative to this element )")) - .AddParameter("string", GD_T("Name of the reference to the newly created element")) - .AddParameter("string", GD_T("Path ( tags can be browsed by separating them using /. Use * to go to the first child element without knowing the tag name )")) + .AddParameter("string", _("Reference of an existing element ( The path of the element will be relative to this element )")) + .AddParameter("string", _("Name of the reference to the newly created element")) + .AddParameter("string", _("Path ( tags can be browsed by separating them using /. Use * to go to the first child element without knowing the tag name )")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::BrowseTo").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("NextSibling", _("Go to next element"), _("Create a reference on the element following the specified element.\nNote: The reference will be invalid if there is no valid element following the specified one.Conditions are available to check if an element is valid."), - GD_T("Load the element called _PARAM2_ following _PARAM1_ into reference _PARAM0_"), + _("Load the element called _PARAM2_ following _PARAM1_ into reference _PARAM0_"), _("Advanced XML: General"), "res/AdvancedXML/AdvancedXMLRef.png", "res/AdvancedXML/AdvancedXMLRef16.png") - .AddParameter("string", GD_T("Reference to create")) - .AddParameter("string", GD_T("Reference to the element preceeding the element to be accessed")) - .AddParameter("string", GD_T("Tag name filter "), "", true) + .AddParameter("string", _("Reference to create")) + .AddParameter("string", _("Reference to the element preceeding the element to be accessed")) + .AddParameter("string", _("Tag name filter "), "", true) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::NextSibling").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddCondition("IsRefValid", _("The reference is valid"), _("Is valid only when the reference is pointing to an existing and valid element."), - GD_T("_PARAM0_ exists and is valid"), + _("_PARAM0_ exists and is valid"), _("Advanced XML: General"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference to the element to be tested")) + .AddParameter("string", _("Reference to the element to be tested")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::IsRefValid").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -118,26 +118,26 @@ public: AddCondition("GetElementType", _("Element type"), _("Test the type of the element.\n(0-> Tag, 1-> Text, 2-> Comment, 3-> XML Document, -1 -> Unknown )"), - GD_T("Type of _PARAM0_ _PARAM1__PARAM2_"), + _("Type of _PARAM0_ _PARAM1__PARAM2_"), _("Advanced XML: General"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference to the element to be tested")) - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Type")) + .AddParameter("string", _("Reference to the element to be tested")) + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Type")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::GetRefType").SetManipulatedType("number").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddExpression("GetElementType", - GD_T("Element type"), - GD_T("Return the type of the element.\n(0-> Tag, 1-> Text, 2-> Comment, 3-> XML Document, -1 -> Unknown )"), - GD_T("Advanced XML: General"), + _("Element type"), + _("Return the type of the element.\n(0-> Tag, 1-> Text, 2-> Comment, 3-> XML Document, -1 -> Unknown )"), + _("Advanced XML: General"), "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Element reference")) + .AddParameter("string", _("Element reference")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::GetRefType").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -146,64 +146,64 @@ public: AddAction("CreateNewElement", _("Create a new element"), _("Create a new element.\nNote: References allows to access to an element using the name of the reference pointing to it."), - GD_T("Create a new element of type _PARAM1_ and attach to it the reference _PARAM0_"), + _("Create a new element of type _PARAM1_ and attach to it the reference _PARAM0_"), _("Advanced XML: General"), "res/AdvancedXML/AdvancedXMLAdd.png", "res/AdvancedXML/AdvancedXMLAdd16.png") - .AddParameter("string", GD_T("Reference which will be used to access to the element")) - .AddParameter("expression", GD_T("Tye of the element to be created\n(0-> Tag, 1-> Text, 2-> Comment )")) - .AddParameter("string", GD_T("Text of the element\nIf the element is a tag, it will be the tag name,if the element is a text or a comment, it will be the content.")) + .AddParameter("string", _("Reference which will be used to access to the element")) + .AddParameter("expression", _("Tye of the element to be created\n(0-> Tag, 1-> Text, 2-> Comment )")) + .AddParameter("string", _("Text of the element\nIf the element is a tag, it will be the tag name,if the element is a text or a comment, it will be the content.")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::CreateNewElement").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("DeleteAnElement", _("Delete an element"), _("Delete an element (The element will be removed from its parent and will be destroyed)."), - GD_T("Delete element _PARAM0_"), + _("Delete element _PARAM0_"), _("Advanced XML: General"), "res/AdvancedXML/AdvancedXMLRemove.png", "res/AdvancedXML/AdvancedXMLRemove16.png") - .AddParameter("string", GD_T("Reference to the element to be deleted")) + .AddParameter("string", _("Reference to the element to be deleted")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::DeleteAnElement").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("InsertElementIntoAnother", _("Add an element inside another"), _("Add an element into another: The element will be a \"child\" of its \"parent\"."), - GD_T("Add _PARAM0_ as a child of _PARAM1_ (before _PARAM2_)"), + _("Add _PARAM0_ as a child of _PARAM1_ (before _PARAM2_)"), _("Advanced XML: Tag"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference to the element to be added")) - .AddParameter("string", GD_T("Reference to the parent element (must be a Tag element)")) - .AddParameter("string", GD_T("The element will be added before this element (if not defined, the element will be added at the end)"), "", true) + .AddParameter("string", _("Reference to the element to be added")) + .AddParameter("string", _("Reference to the parent element (must be a Tag element)")) + .AddParameter("string", _("The element will be added before this element (if not defined, the element will be added at the end)"), "", true) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::InsertElementIntoAnother").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("SetTagName", _("Change the tag name"), _("Change the tag name"), - GD_T("Do _PARAM1__PARAM2_ to the name of tag _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the name of tag _PARAM0_"), _("Advanced XML: Tag"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference to the Tag element")) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("string", GD_T("Tag name")) + .AddParameter("string", _("Reference to the Tag element")) + .AddParameter("operator", _("Modification sign")) + .AddParameter("string", _("Tag name")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::SetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetGetter("AdvancedXML::GetText").SetManipulatedType("string"); AddStrExpression("GetTagName", - GD_T("Tag name"), - GD_T("Get the name of a tag"), - GD_T("Advanced XML: Tag"), + _("Tag name"), + _("Get the name of a tag"), + _("Advanced XML: Tag"), "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Element reference")) + .AddParameter("string", _("Element reference")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::GetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -212,37 +212,37 @@ public: AddAction("SetContent", _("Change the content of the element"), _("Change the content (text) of the element ( For text and comments elements only )."), - GD_T("Do _PARAM1__PARAM2_ to the content of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the content of _PARAM0_"), _("Advanced XML : Text and comments"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference to the element")) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("string", GD_T("Contents")) + .AddParameter("string", _("Reference to the element")) + .AddParameter("operator", _("Modification sign")) + .AddParameter("string", _("Contents")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::SetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetGetter("AdvancedXML::GetText").SetManipulatedType("string"); AddStrExpression("GetContent", - GD_T("Contents"), - GD_T("Get the content of a text or comment element"), - GD_T("Advanced XML : Text and comments"), + _("Contents"), + _("Get the content of a text or comment element"), + _("Advanced XML : Text and comments"), "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Element reference")) + .AddParameter("string", _("Element reference")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::GetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddExpression("GetAttributeNumber", - GD_T("Value of an attribute of an element"), - GD_T("Get the value of an attribute of an element"), - GD_T("Advanced XML: Tag"), + _("Value of an attribute of an element"), + _("Get the value of an attribute of an element"), + _("Advanced XML: Tag"), "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Element reference")) - .AddParameter("string", GD_T("Name of the attribute")) + .AddParameter("string", _("Element reference")) + .AddParameter("string", _("Name of the attribute")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::GetAttributeNumber").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -251,26 +251,26 @@ public: AddAction("SetAttributeNumber", _("Change the value of an attribute"), _("Change the value of an attribute of an element ( which must be a Tag element )."), - GD_T("Do _PARAM2__PARAM3_ to the attribute _PARAM1_ of element _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the attribute _PARAM1_ of element _PARAM0_"), _("Advanced XML: Tag"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference to the element")) - .AddParameter("string", GD_T("Name of the attribute")) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("string", _("Reference to the element")) + .AddParameter("string", _("Name of the attribute")) + .AddParameter("operator", _("Modification sign")) + .AddParameter("expression", _("Value")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::SetAttributeNumber").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetGetter("AdvancedXML::GetAttributeNumber").SetManipulatedType("number"); AddStrExpression("GetAttributeString", - GD_T("Text of an attribute of an element"), - GD_T("Get the text of an attribute of an element"), - GD_T("Advanced XML: Tag"), + _("Text of an attribute of an element"), + _("Get the text of an attribute of an element"), + _("Advanced XML: Tag"), "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Element reference")) - .AddParameter("string", GD_T("Name of the attribute")) + .AddParameter("string", _("Element reference")) + .AddParameter("string", _("Name of the attribute")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::GetAttributeString").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -279,28 +279,28 @@ public: AddAction("SetAttributeString", _("Change the text of an attribute"), _("Change the text of an attribute of an element ( which must be a Tag element )."), - GD_T("Do _PARAM2__PARAM3_ to the attribute _PARAM1_ of element _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the attribute _PARAM1_ of element _PARAM0_"), _("Advanced XML: Tag"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference to the element")) - .AddParameter("string", GD_T("Name of the attribute")) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("string", GD_T("Value")) + .AddParameter("string", _("Reference to the element")) + .AddParameter("string", _("Name of the attribute")) + .AddParameter("operator", _("Modification sign")) + .AddParameter("string", _("Value")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::SetAttributeString").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetGetter("AdvancedXML::GetAttributeString").SetManipulatedType("string"); AddAction("RemoveAttribute", _("Delete an attribute"), _("Delete an attribute from an element ( which must be a Tag element)."), - GD_T("Delete attribute _PARAM1_ from the element _PARAM0_"), + _("Delete attribute _PARAM1_ from the element _PARAM0_"), _("Advanced XML: Tag"), "res/AdvancedXML/AdvancedXML.png", "res/AdvancedXML/AdvancedXML16.png") - .AddParameter("string", GD_T("Reference to the element")) - .AddParameter("string", GD_T("Name of the attribute")) + .AddParameter("string", _("Reference to the element")) + .AddParameter("string", _("Name of the attribute")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AdvancedXML::RemoveAttribute").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); diff --git a/Extensions/Box3DObject/Box3DObject.cpp b/Extensions/Box3DObject/Box3DObject.cpp index 3704a310d7..417117d375 100644 --- a/Extensions/Box3DObject/Box3DObject.cpp +++ b/Extensions/Box3DObject/Box3DObject.cpp @@ -360,15 +360,15 @@ void Box3DObject::EditObject( wxWindow* parent, gd::Project & game, gd::MainFram std::map Box3DObject::GetInitialInstanceProperties(const gd::InitialInstance & position, gd::Project & game, gd::Layout & scene) { std::map properties; - properties[GD_T("Z")] = position.floatInfos.find("z") != position.floatInfos.end() ? + properties[_("Z")] = position.floatInfos.find("z") != position.floatInfos.end() ? ToString(position.floatInfos.find("z")->second) : "0"; - properties[GD_T("Pitch")] = position.floatInfos.find("pitch") != position.floatInfos.end() ? + properties[_("Pitch")] = position.floatInfos.find("pitch") != position.floatInfos.end() ? ToString(position.floatInfos.find("pitch")->second) : "0"; - properties[GD_T("Roll")] = position.floatInfos.find("roll") != position.floatInfos.end() ? + properties[_("Roll")] = position.floatInfos.find("roll") != position.floatInfos.end() ? ToString(position.floatInfos.find("roll")->second) : "0"; @@ -377,22 +377,22 @@ std::map Box3DObject::GetInitialInstancePro bool Box3DObject::UpdateInitialInstanceProperty(gd::InitialInstance & position, const std::string & name, const std::string & value, gd::Project & game, gd::Layout & scene) { - if ( name == GD_T("Z") ) position.floatInfos["z"] = ToFloat(value); - if ( name == GD_T("Pitch") ) position.floatInfos["pitch"] = ToFloat(value); - if ( name == GD_T("Roll") ) position.floatInfos["roll"] = ToFloat(value); + if ( name == _("Z") ) position.floatInfos["z"] = ToFloat(value); + if ( name == _("Pitch") ) position.floatInfos["pitch"] = ToFloat(value); + if ( name == _("Roll") ) position.floatInfos["roll"] = ToFloat(value); return true; } void RuntimeBox3DObject::GetPropertyForDebugger(unsigned int propertyNb, string & name, string & value) const { - if ( propertyNb == 0 ) {name = GD_T("Width"); value = ToString(width);} - else if ( propertyNb == 1 ) {name = GD_T("Height"); value = ToString(height);} - else if ( propertyNb == 2 ) {name = GD_T("Depth"); value = ToString(depth);} - else if ( propertyNb == 3 ) {name = GD_T("Z Coordinate"); value = ToString(zPosition);} - else if ( propertyNb == 4 ) {name = GD_T("Yaw"); value = ToString(yaw);} - else if ( propertyNb == 5 ) {name = GD_T("Pitch"); value = ToString(pitch);} - else if ( propertyNb == 6 ) {name = GD_T("Roll"); value = ToString(roll);} + if ( propertyNb == 0 ) {name = _("Width"); value = ToString(width);} + else if ( propertyNb == 1 ) {name = _("Height"); value = ToString(height);} + else if ( propertyNb == 2 ) {name = _("Depth"); value = ToString(depth);} + else if ( propertyNb == 3 ) {name = _("Z Coordinate"); value = ToString(zPosition);} + else if ( propertyNb == 4 ) {name = _("Yaw"); value = ToString(yaw);} + else if ( propertyNb == 5 ) {name = _("Pitch"); value = ToString(pitch);} + else if ( propertyNb == 6 ) {name = _("Roll"); value = ToString(roll);} } bool RuntimeBox3DObject::ChangeProperty(unsigned int propertyNb, string newValue) diff --git a/Extensions/Box3DObject/Box3DObjectEditor.cpp b/Extensions/Box3DObject/Box3DObjectEditor.cpp index 8e86fe6c95..eedd721dc0 100644 --- a/Extensions/Box3DObject/Box3DObjectEditor.cpp +++ b/Extensions/Box3DObject/Box3DObjectEditor.cpp @@ -245,7 +245,7 @@ void Box3DObjectEditor::OnfrontAddFromBtClick(wxCommandEvent& event) { if ( !m_mgr.GetPane( resourcesEditor ).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } @@ -256,7 +256,7 @@ void Box3DObjectEditor::OntopAddFromBtClick(wxCommandEvent& event) { if ( !m_mgr.GetPane( resourcesEditor ).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } @@ -268,7 +268,7 @@ void Box3DObjectEditor::OnbottomAddFromBtClick(wxCommandEvent& event) { if ( !m_mgr.GetPane( resourcesEditor ).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } @@ -279,7 +279,7 @@ void Box3DObjectEditor::OnleftAddFromBtClick(wxCommandEvent& event) { if ( !m_mgr.GetPane( resourcesEditor ).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } @@ -290,7 +290,7 @@ void Box3DObjectEditor::OnrightAddFromBtClick(wxCommandEvent& event) { if ( !m_mgr.GetPane( resourcesEditor ).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } @@ -301,7 +301,7 @@ void Box3DObjectEditor::OnbackAddFromBtClick(wxCommandEvent& event) { if ( !m_mgr.GetPane( resourcesEditor ).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } diff --git a/Extensions/Box3DObject/Extension.cpp b/Extensions/Box3DObject/Extension.cpp index 52ecd1239c..3e5380fdfc 100644 --- a/Extensions/Box3DObject/Extension.cpp +++ b/Extensions/Box3DObject/Extension.cpp @@ -24,15 +24,15 @@ public: Extension() { SetExtensionInformation("Box3DObject", - GD_T("3D Box Object"), - GD_T("Extension allowing to use 3D Box objects."), + _("3D Box Object"), + _("Extension allowing to use 3D Box objects."), "Florian Rival", "Open source (MIT License)"); { gd::ObjectMetadata & obj = AddObject("Box3D", - GD_T("3D Box"), - GD_T("Displays a 3D Box"), + _("3D Box"), + _("Displays a 3D Box"), "CppPlatform/Extensions/Box3Dicon.png", &CreateBox3DObject); @@ -45,28 +45,28 @@ public: obj.AddAction("Width", _("Width"), _("Modify the width of a 3D Box."), - GD_T("Do _PARAM1__PARAM2_ to the width of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the width of _PARAM0_"), _("Size"), "res/actions/scaleWidth24.png", "res/actions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetWidth").SetManipulatedType("number").SetGetter("GetWidth").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddCondition("Width", _("Width"), _("Compare the width of a 3D Box."), - GD_T("width of _PARAM0_ is _PARAM1__PARAM2_"), + _("width of _PARAM0_ is _PARAM1__PARAM2_"), _("Size"), "res/conditions/scaleWidth24.png", "res/conditions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -74,14 +74,14 @@ public: obj.AddAction("Height", _("Height"), _("Modify the height of a 3D Box."), - GD_T("Do _PARAM1__PARAM2_ to the height of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the height of _PARAM0_"), _("Size"), "res/actions/scaleHeight24.png", "res/actions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetHeight").SetManipulatedType("number").SetGetter("GetHeight").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -89,14 +89,14 @@ public: obj.AddCondition("Height", _("Height"), _("Compare the height of a 3D Box."), - GD_T("height of _PARAM0_ is _PARAM1__PARAM2_"), + _("height of _PARAM0_ is _PARAM1__PARAM2_"), _("Size"), "res/conditions/scaleHeight24.png", "res/conditions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("SetHeight").SetManipulatedType("number").SetGetter("GetHeight").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -104,14 +104,14 @@ public: obj.AddAction("Depth", _("Depth"), _("Modify the depth of a 3D Box."), - GD_T("Do _PARAM1__PARAM2_ to the depth of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the depth of _PARAM0_"), _("Size"), "res/actions/depth24.png", "res/actions/depth.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetDepth").SetManipulatedType("number").SetGetter("GetDepth").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -119,14 +119,14 @@ public: obj.AddCondition("Depth", _("Depth"), _("Compare the depth of a 3D Box."), - GD_T("depth of _PARAM0_ is _PARAM1__PARAM2_"), + _("depth of _PARAM0_ is _PARAM1__PARAM2_"), _("Size"), "res/conditions/depth24.png", "res/conditions/depth.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetDepth").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -134,14 +134,14 @@ public: obj.AddAction("ZPosition", _("Z Position"), _("Modify the Z Position of a 3D Box."), - GD_T("Do _PARAM1__PARAM2_ to the Z position of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the Z position of _PARAM0_"), _(""), "res/actions/position24.png", "res/actions/position.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetZPosition").SetManipulatedType("number").SetGetter("GetZPosition").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -149,14 +149,14 @@ public: obj.AddCondition("ZPosition", _("Z Position"), _("Compare Z position of a 3D Box."), - GD_T("Z position of _PARAM0_ is _PARAM1__PARAM2_"), + _("Z position of _PARAM0_ is _PARAM1__PARAM2_"), _(""), "res/conditions/position24.png", "res/conditions/position.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetZPosition").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -164,14 +164,14 @@ public: obj.AddAction("Yaw", _("Yaw"), _("Modify Yaw of a 3D Box object."), - GD_T("Do _PARAM1__PARAM2_ to yaw of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to yaw of _PARAM0_"), _("Angle"), "res/actions/rotate24.png", "res/actions/rotate.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -179,14 +179,14 @@ public: obj.AddCondition("Yaw", _("Yaw"), _("Compare Yaw of a 3D Box object."), - GD_T("Yaw of _PARAM0_ is _PARAM1__PARAM2_"), + _("Yaw of _PARAM0_ is _PARAM1__PARAM2_"), _("Angle"), "res/conditions/rotate24.png", "res/conditions/rotate.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -194,14 +194,14 @@ public: obj.AddAction("Pitch", _("Pitch"), _("Modify Pitch of a 3D Box object."), - GD_T("Do _PARAM1__PARAM2_ to pitch of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to pitch of _PARAM0_"), _("Angle"), "res/actions/rotate24.png", "res/actions/rotate.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetPitch").SetManipulatedType("number").SetGetter("GetPitch").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -209,14 +209,14 @@ public: obj.AddCondition("Pitch", _("Pitch"), _("Compare Pitch of a 3D Box object."), - GD_T("Pitch of _PARAM0_ is _PARAM1__PARAM2_"), + _("Pitch of _PARAM0_ is _PARAM1__PARAM2_"), _("Angle"), "res/conditions/rotate24.png", "res/conditions/rotate.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetPitch").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -224,13 +224,13 @@ public: obj.AddAction("Roll", _("Roll"), _("Modify Roll of a 3D Box object."), - GD_T("Do _PARAM1__PARAM2_ to roll of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to roll of _PARAM0_"), _("Angle"), "res/actions/rotate24.png", "res/actions/rotate.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetRoll").SetManipulatedType("number").SetGetter("GetRoll").SetIncludeFile("Box3DObject/Box3DObject.h"); @@ -238,34 +238,34 @@ public: obj.AddCondition("Roll", _("Roll"), _("Compare Roll of a 3D Box object."), - GD_T("Roll of _PARAM0_ is _PARAM1__PARAM2_"), + _("Roll of _PARAM0_ is _PARAM1__PARAM2_"), _("Angle"), "res/conditions/rotate24.png", "res/conditions/rotate.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Box3D", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetRoll").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); - obj.AddExpression("Depth", GD_T("Depth of the 3D Box"), GD_T("Depth of the 3D Box"), GD_T("Size"), "res/actions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) + obj.AddExpression("Depth", _("Depth of the 3D Box"), _("Depth of the 3D Box"), _("Size"), "res/actions/scaleHeight.png") + .AddParameter("object", _("Object"), "Box3D", false) .codeExtraInformation.SetFunctionName("GetDepth").SetIncludeFile("Box3DObject/Box3DObject.h"); - obj.AddExpression("Z", GD_T("Z Position"), GD_T("Z Position"), GD_T("Position"), "res/actions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) + obj.AddExpression("Z", _("Z Position"), _("Z Position"), _("Position"), "res/actions/scaleHeight.png") + .AddParameter("object", _("Object"), "Box3D", false) .SetFunctionName("GetZPosition").SetIncludeFile("Box3DObject/Box3DObject.h"); - obj.AddExpression("Yaw", GD_T("Yaw"), GD_T("Yaw"), GD_T("Angle"), "res/actions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) + obj.AddExpression("Yaw", _("Yaw"), _("Yaw"), _("Angle"), "res/actions/scaleHeight.png") + .AddParameter("object", _("Object"), "Box3D", false) .SetFunctionName("GetAngle").SetIncludeFile("Box3DObject/Box3DObject.h"); - obj.AddExpression("Pitch", GD_T("Pitch"), GD_T("Pitch"), GD_T("Angle"), "res/actions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) + obj.AddExpression("Pitch", _("Pitch"), _("Pitch"), _("Angle"), "res/actions/scaleHeight.png") + .AddParameter("object", _("Object"), "Box3D", false) .SetFunctionName("GetPitch").SetIncludeFile("Box3DObject/Box3DObject.h"); - obj.AddExpression("Roll", GD_T("Roll"), GD_T("Roll"), GD_T("Angle"), "res/actions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "Box3D", false) + obj.AddExpression("Roll", _("Roll"), _("Roll"), _("Angle"), "res/actions/scaleHeight.png") + .AddParameter("object", _("Object"), "Box3D", false) .SetFunctionName("GetRoll").SetIncludeFile("Box3DObject/Box3DObject.h"); #endif diff --git a/Extensions/CommonDialogs/Extension.cpp b/Extensions/CommonDialogs/Extension.cpp index 0cad4a57e3..67b3f47fcb 100644 --- a/Extensions/CommonDialogs/Extension.cpp +++ b/Extensions/CommonDialogs/Extension.cpp @@ -22,8 +22,8 @@ public: Extension() { SetExtensionInformation("CommonDialogs", - GD_T("Common dialogs"), - GD_T("Extension allowing to display common dialogs ( Message box, open file dialog... )"), + _("Common dialogs"), + _("Extension allowing to display common dialogs ( Message box, open file dialog... )"), "Florian Rival", "Open source (MIT License)"); #if defined(GD_IDE_ONLY) @@ -31,59 +31,59 @@ public: AddAction("ShowMsgBox", _("Show a message box"), _("Display a message box with specified text, and a Ok button."), - GD_T("Display message \"_PARAM1_\" with title \"_PARAM2_\""), + _("Display message \"_PARAM1_\" with title \"_PARAM2_\""), _("Interfaces"), "res/actions/msgbox24.png", "res/actions/msgbox.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("string", GD_T("Message")) - .AddParameter("string", GD_T("Title")) + .AddParameter("string", _("Message")) + .AddParameter("string", _("Title")) .SetFunctionName("GDpriv::CommonDialogs::ShowMessageBox").SetIncludeFile("CommonDialogs/CommonDialogs.h"); AddAction("ShowOpenFile", _("Show a window to choose a file"), _("Display a window allowing to choose a file.\nThe name and the directory of the file will be saved in the specified variable."), - GD_T("Open a window so as to choose a file, and save the result in _PARAM1_"), + _("Open a window so as to choose a file, and save the result in _PARAM1_"), _("Interfaces"), "res/actions/openfile24.png", "res/actions/openfile.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("scenevar", GD_T("Save result to scene variable")) - .AddParameter("string", GD_T("Title")) - .AddParameter("string", GD_T("Wildcard filter ( \"FileType|*.ext;*.ext2|2ndFileType|*.ext3\" ) ( Windows only ) ")) + .AddParameter("scenevar", _("Save result to scene variable")) + .AddParameter("string", _("Title")) + .AddParameter("string", _("Wildcard filter ( \"FileType|*.ext;*.ext2|2ndFileType|*.ext3\" ) ( Windows only ) ")) .SetFunctionName("GDpriv::CommonDialogs::ShowOpenFile").SetIncludeFile("CommonDialogs/CommonDialogs.h"); AddAction("ShowTextInput", _("Show a window to enter a text"), _("Show a window allowing to enter a text.\nThe text will be saved in the specified scene variable."), - GD_T("Open a text input dialog, and save the result in _PARAM1_"), + _("Open a text input dialog, and save the result in _PARAM1_"), _("Interfaces"), "res/actions/textenter24.png", "res/actions/textenter.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("scenevar", GD_T("Save result to scene variable")) - .AddParameter("string", GD_T("Message")) - .AddParameter("string", GD_T("Title")) + .AddParameter("scenevar", _("Save result to scene variable")) + .AddParameter("string", _("Message")) + .AddParameter("string", _("Title")) .SetFunctionName("GDpriv::CommonDialogs::ShowTextInput").SetIncludeFile("CommonDialogs/CommonDialogs.h"); AddAction("ShowYesNoMsgBox", _("Display a Yes/No message box"), _("Open a message box allowing to choose Yes or No.\nThe answer ( \"yes\"/\"no\" ) will be saved in the specified variable."), - GD_T("Open a Yes/No message box, and save the result in _PARAM1_"), + _("Open a Yes/No message box, and save the result in _PARAM1_"), _("Interfaces"), "res/actions/msgbox24.png", "res/actions/msgbox.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("scenevar", GD_T("Save result to scene variable")) - .AddParameter("string", GD_T("Message")) - .AddParameter("string", GD_T("Title")) + .AddParameter("scenevar", _("Save result to scene variable")) + .AddParameter("string", _("Message")) + .AddParameter("string", _("Title")) .SetFunctionName("GDpriv::CommonDialogs::ShowYesNoMsgBox").SetIncludeFile("CommonDialogs/CommonDialogs.h"); diff --git a/Extensions/DestroyOutsideAutomatism/Extension.cpp b/Extensions/DestroyOutsideAutomatism/Extension.cpp index 961d03f8c0..2343c66ff2 100644 --- a/Extensions/DestroyOutsideAutomatism/Extension.cpp +++ b/Extensions/DestroyOutsideAutomatism/Extension.cpp @@ -13,15 +13,15 @@ This project is released under the MIT License. void DeclareDestroyOutsideAutomatismExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("DestroyOutsideAutomatism", - GD_T("Destroy Outside Screen Automatism"), - GD_T("Automatism destroying object when they go outside the screen"), + _("Destroy Outside Screen Automatism"), + _("Automatism destroying object when they go outside the screen"), "Florian Rival", "Open source (MIT License)"); gd::AutomatismMetadata & aut = extension.AddAutomatism("DestroyOutside", - GD_T("Destroy when outside the screen"), - GD_T("DestroyOutside"), - GD_T("Automatically destroy the object when it goes outside the screen"), + _("Destroy when outside the screen"), + _("DestroyOutside"), + _("Automatically destroy the object when it goes outside the screen"), "", "CppPlatform/Extensions/destroyoutsideicon.png", "DestroyOutsideAutomatism", @@ -34,28 +34,28 @@ void DeclareDestroyOutsideAutomatismExtension(gd::PlatformExtension & extension) aut.AddCondition("ExtraBorder", _("Additional border"), _("Compare the additional border that the object must cross before being deleted."), - GD_T("The additional border of _PARAM0_ is _PARAM2__PARAM3_"), + _("The additional border of _PARAM0_ is _PARAM2__PARAM3_"), _(""), "CppPlatform/Extensions/destroyoutsideicon24.png", "CppPlatform/Extensions/destroyoutsideicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "DestroyOutside", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "DestroyOutside", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/DestroyOutsideAutomatism.h"); aut.AddAction("ExtraBorder", _("Additional border"), _("Change the additional border that the object must cross before being deleted."), - GD_T("Do _PARAM2__PARAM3_ to the additional border of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the additional border of _PARAM0_"), _(""), "CppPlatform/Extensions/destroyoutsideicon24.png", "CppPlatform/Extensions/destroyoutsideicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "DestroyOutside", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "DestroyOutside", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetExtraBorder").SetManipulatedType("number") .SetGetter("GetExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/DestroyOutsideAutomatism.h"); diff --git a/Extensions/DestroyOutsideAutomatism/JsExtension.cpp b/Extensions/DestroyOutsideAutomatism/JsExtension.cpp index a68fa145f7..a9cd946924 100644 --- a/Extensions/DestroyOutsideAutomatism/JsExtension.cpp +++ b/Extensions/DestroyOutsideAutomatism/JsExtension.cpp @@ -26,8 +26,8 @@ public: DestroyOutsideAutomatismJsExtension() { SetExtensionInformation("DestroyOutsideAutomatism", - GD_T("Destroy Outside Screen Automatism"), - GD_T("Automatism destroying object when they go outside the screen"), + _("Destroy Outside Screen Automatism"), + _("Automatism destroying object when they go outside the screen"), "Florian Rival", "Open source (MIT License)"); DeclareDestroyOutsideAutomatismExtension(*this); diff --git a/Extensions/DraggableAutomatism/Extension.cpp b/Extensions/DraggableAutomatism/Extension.cpp index fdedd80b39..e7ed7724d3 100644 --- a/Extensions/DraggableAutomatism/Extension.cpp +++ b/Extensions/DraggableAutomatism/Extension.cpp @@ -13,15 +13,15 @@ This project is released under the MIT License. void DeclareDraggableAutomatismExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("DraggableAutomatism", - GD_T("Draggable Automatism"), - GD_T("Automatism allowing to move objects with the mouse"), + _("Draggable Automatism"), + _("Automatism allowing to move objects with the mouse"), "Florian Rival", "Open source (MIT License)"); gd::AutomatismMetadata & aut = extension.AddAutomatism("Draggable", - GD_T("Draggable object"), - GD_T("Draggable"), - GD_T("Allows objects to be moved using the mouse."), + _("Draggable object"), + _("Draggable"), + _("Allows objects to be moved using the mouse."), "", "CppPlatform/Extensions/draggableicon.png", "DraggableAutomatism", @@ -34,13 +34,13 @@ void DeclareDraggableAutomatismExtension(gd::PlatformExtension & extension) aut.AddCondition("Dragged", _("Being dragged"), _("Check if the object is being dragged"), - GD_T("_PARAM0_ is being dragged"), + _("_PARAM0_ is being dragged"), _(""), "CppPlatform/Extensions/draggableicon24.png", "CppPlatform/Extensions/draggableicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "Draggable", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "Draggable", false) .SetFunctionName("IsDragged").SetIncludeFile("DraggableAutomatism/DraggableAutomatism.h"); #endif diff --git a/Extensions/DraggableAutomatism/JsExtension.cpp b/Extensions/DraggableAutomatism/JsExtension.cpp index 0bd5c35fa4..8a87901a30 100644 --- a/Extensions/DraggableAutomatism/JsExtension.cpp +++ b/Extensions/DraggableAutomatism/JsExtension.cpp @@ -26,8 +26,8 @@ public: DraggableAutomatismJsExtension() { SetExtensionInformation("DraggableAutomatism", - GD_T("Draggable Automatism"), - GD_T("Automatism allowing to move objects with the mouse"), + _("Draggable Automatism"), + _("Automatism allowing to move objects with the mouse"), "Florian Rival", "Open source (MIT License)"); diff --git a/Extensions/Function/Extension.cpp b/Extensions/Function/Extension.cpp index 282f84b9d6..41787414e2 100644 --- a/Extensions/Function/Extension.cpp +++ b/Extensions/Function/Extension.cpp @@ -35,8 +35,8 @@ public: Extension() { SetExtensionInformation("Function", - GD_T("Function events"), - GD_T("Extension allowing to use events behaving as functions."), + _("Function events"), + _("Extension allowing to use events behaving as functions."), "Florian Rival", "Open source (MIT License)"); diff --git a/Extensions/Function/FunctionEvent.cpp b/Extensions/Function/FunctionEvent.cpp index 03e10664bd..49f93e6999 100644 --- a/Extensions/Function/FunctionEvent.cpp +++ b/Extensions/Function/FunctionEvent.cpp @@ -100,8 +100,8 @@ void FunctionEvent::Render(wxDC & dc, int x, int y, unsigned int width, gd::Even //Name dc.SetFont( renderingHelper->GetNiceFont().Bold() ); dc.SetTextForeground(wxColour(0,0,0)); - wxString caption = GD_T("Function") + " " + name; - if ( !objectsPassedAsArgument.empty() ) caption += " "+GD_T("( Objects passed as parameters : ")+objectsPassedAsArgument+_(")"); + wxString caption = _("Function") + " " + name; + if ( !objectsPassedAsArgument.empty() ) caption += " "+_("( Objects passed as parameters : ")+objectsPassedAsArgument+_(")"); dc.DrawText( caption, x + 4, y + 3 ); //Draw conditions rectangle diff --git a/Extensions/Light/Extension.cpp b/Extensions/Light/Extension.cpp index 2dc299f122..ecfe78d1e8 100644 --- a/Extensions/Light/Extension.cpp +++ b/Extensions/Light/Extension.cpp @@ -25,14 +25,14 @@ public: Extension() { SetExtensionInformation("Light", - GD_T("Light"), - GD_T("Allow to display lights and use light obstacles."), + _("Light"), + _("Allow to display lights and use light obstacles."), "Florian Rival", "Open source (MIT License)"); gd::ObjectMetadata & obj = AddObject("Light", - GD_T("Light"), - GD_T("Emits light that can be stopped by objects"), + _("Light"), + _("Emits light that can be stopped by objects"), "CppPlatform/Extensions/lightIcon32.png", &CreateLightObject); @@ -45,12 +45,12 @@ public: obj.AddAction("ChangeColor", _("Color"), _("Change light color."), - GD_T("Change color of _PARAM0_ to _PARAM1_"), + _("Change color of _PARAM0_ to _PARAM1_"), _("Setup"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("color", GD_T("Color")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("color", _("Color")) .SetFunctionName("SetColor").SetIncludeFile("Light/LightObject.h"); @@ -58,13 +58,13 @@ public: obj.AddAction("Intensity", _("Intensity"), _("Modify the intensity of a light"), - GD_T("Do _PARAM1__PARAM2_ to the intensity of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the intensity of _PARAM0_"), _("Setup"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetIntensity").SetManipulatedType("number").SetGetter("GetIntensity").SetIncludeFile("Light/LightObject.h"); @@ -72,13 +72,13 @@ public: obj.AddCondition("Intensity", _("Intensity"), _("Test the intensity of a light."), - GD_T("Intensity of _PARAM0_ is _PARAM1__PARAM2_"), + _("Intensity of _PARAM0_ is _PARAM1__PARAM2_"), _("Setup"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetIntensity").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); @@ -86,13 +86,13 @@ public: obj.AddAction("Radius", _("Radius"), _("Modify the radius of a light"), - GD_T("Do _PARAM1__PARAM2_ to radius of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to radius of _PARAM0_"), _("Setup"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetRadius").SetManipulatedType("number").SetGetter("GetRadius").SetIncludeFile("Light/LightObject.h"); @@ -100,13 +100,13 @@ public: obj.AddCondition("Radius", _("Radius"), _("Test the radius of a light."), - GD_T("The radius of _PARAM0_ is _PARAM2_ _PARAM1_"), + _("The radius of _PARAM0_ is _PARAM2_ _PARAM1_"), _("Setup"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetRadius").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); @@ -114,13 +114,13 @@ public: obj.AddAction("Quality", _("Quality"), _("Modify the quality of a light"), - GD_T("Do _PARAM1__PARAM2_ to the quality of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the quality of _PARAM0_"), _("Setup"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetQuality").SetManipulatedType("number").SetGetter("GetQuality").SetIncludeFile("Light/LightObject.h"); @@ -128,13 +128,13 @@ public: obj.AddCondition("Quality", _("Quality"), _("Test the quality of a light"), - GD_T("The quality of _PARAM0_ is _PARAM1__PARAM2_"), + _("The quality of _PARAM0_ is _PARAM1__PARAM2_"), _("Setup"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetQuality").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); @@ -142,12 +142,12 @@ public: obj.AddAction("ChangeGlobalColor", _("Global color"), _("Change scene color for a global light."), - GD_T("Change scene global color of _PARAM0_ to _PARAM1_"), + _("Change scene global color of _PARAM0_ to _PARAM1_"), _("Setup"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("color", GD_T("Color")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("color", _("Color")) .SetFunctionName("SetGlobalColor").SetIncludeFile("Light/LightObject.h"); @@ -155,12 +155,12 @@ public: obj.AddAction("SetGlobalLight", _("Make a light global"), _("Make a light global or simple."), - GD_T("Make _PARAM0_ global : _PARAM1_"), + _("Make _PARAM0_ global : _PARAM1_"), _("Light type"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) - .AddParameter("yesorno", GD_T("Make light global")) + .AddParameter("object", _("Object"), "Light", false) + .AddParameter("yesorno", _("Make light global")) .SetFunctionName("SetGlobalLight").SetIncludeFile("Light/LightObject.h"); @@ -168,31 +168,31 @@ public: obj.AddCondition("GlobalLight", _("A light is global"), _("Return true if light is global"), - GD_T("_PARAM0_ is a global light"), + _("_PARAM0_ is a global light"), _("Light type"), "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) + .AddParameter("object", _("Object"), "Light", false) .SetFunctionName("IsGlobalLight").SetIncludeFile("Light/LightObject.h"); - obj.AddExpression("Intensity", GD_T("Intensity"), GD_T("Intensity"), GD_T("Setup"), "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) + obj.AddExpression("Intensity", _("Intensity"), _("Intensity"), _("Setup"), "CppPlatform/Extensions/lightIcon16.png") + .AddParameter("object", _("Object"), "Light", false) .SetFunctionName("GetIntensity").SetIncludeFile("Light/LightObject.h"); - obj.AddExpression("Radius", GD_T("Radius"), GD_T("Radius"), GD_T("Setup"), "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) + obj.AddExpression("Radius", _("Radius"), _("Radius"), _("Setup"), "CppPlatform/Extensions/lightIcon16.png") + .AddParameter("object", _("Object"), "Light", false) .SetFunctionName("GetRadius").SetIncludeFile("Light/LightObject.h"); - obj.AddExpression("Quality", GD_T("Quality"), GD_T("Quality"), GD_T("Setup"), "CppPlatform/Extensions/lightIcon16.png") - .AddParameter("object", GD_T("Object"), "Light", false) + obj.AddExpression("Quality", _("Quality"), _("Quality"), _("Setup"), "CppPlatform/Extensions/lightIcon16.png") + .AddParameter("object", _("Object"), "Light", false) .SetFunctionName("GetQuality").SetIncludeFile("Light/LightObject.h"); #endif AddAutomatism("LightObstacleAutomatism", - GD_T("Light obstacle"), - GD_T("LightObstacle"), - GD_T("Mark the objects as obstacles for Light objects."), + _("Light obstacle"), + _("LightObstacle"), + _("Mark the objects as obstacles for Light objects."), "", "CppPlatform/Extensions/lightObstacleIcon32.png", "LightObstacleAutomatism", diff --git a/Extensions/Light/LightObject.cpp b/Extensions/Light/LightObject.cpp index fe6e2ac99a..3d24f9f407 100644 --- a/Extensions/Light/LightObject.cpp +++ b/Extensions/Light/LightObject.cpp @@ -229,10 +229,10 @@ void LightObject::EditObject( wxWindow* parent, gd::Project & game, gd::MainFram void RuntimeLightObject::GetPropertyForDebugger(unsigned int propertyNb, string & name, string & value) const { - if ( propertyNb == 0 ) {name = GD_T("Color"); value = ToString(GetColor().r)+";"+ToString(GetColor().g)+";"+ToString(GetColor().b);} - else if ( propertyNb == 1 ) {name = GD_T("Intensity"); value = ToString(GetIntensity());} - else if ( propertyNb == 2 ) {name = GD_T("Radius"); value = ToString(GetRadius());} - else if ( propertyNb == 2 ) {name = GD_T("Quality"); value = ToString(GetQuality());} + if ( propertyNb == 0 ) {name = _("Color"); value = ToString(GetColor().r)+";"+ToString(GetColor().g)+";"+ToString(GetColor().b);} + else if ( propertyNb == 1 ) {name = _("Intensity"); value = ToString(GetIntensity());} + else if ( propertyNb == 2 ) {name = _("Radius"); value = ToString(GetRadius());} + else if ( propertyNb == 2 ) {name = _("Quality"); value = ToString(GetQuality());} } bool RuntimeLightObject::ChangeProperty(unsigned int propertyNb, string newValue) diff --git a/Extensions/LinkedObjects/Extension.cpp b/Extensions/LinkedObjects/Extension.cpp index 74925a453b..691fdd6813 100644 --- a/Extensions/LinkedObjects/Extension.cpp +++ b/Extensions/LinkedObjects/Extension.cpp @@ -24,8 +24,8 @@ public: Extension() { SetExtensionInformation("LinkedObjects", - GD_T("Linked objects"), - GD_T("Extension allowing to virtually link two objects."), + _("Linked objects"), + _("Extension allowing to virtually link two objects."), "Florian Rival", "Open source (MIT License)"); @@ -34,55 +34,55 @@ public: AddAction("LinkObjects", _("Link two objects"), _("Link two objects together, so as to be able to get one from the other."), - GD_T("Link _PARAM1_ and _PARAM2_"), + _("Link _PARAM1_ and _PARAM2_"), _("Linked objects"), "CppPlatform/Extensions/LinkedObjectsicon24.png", "CppPlatform/Extensions/LinkedObjectsicon16.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("objectPtr", GD_T("Object 1")) - .AddParameter("objectPtr", GD_T("Object 2")) + .AddParameter("objectPtr", _("Object 1")) + .AddParameter("objectPtr", _("Object 2")) .SetFunctionName("GDpriv::LinkedObjects::LinkObjects").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); AddAction("RemoveLinkBetween", _("Unlink two objects"), _("Unlink two objects."), - GD_T("Unlink _PARAM1_ and _PARAM2_"), + _("Unlink _PARAM1_ and _PARAM2_"), _("Linked objects"), "CppPlatform/Extensions/LinkedObjectsicon24.png", "CppPlatform/Extensions/LinkedObjectsicon16.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("objectPtr", GD_T("Object 1")) - .AddParameter("objectPtr", GD_T("Object 2")) + .AddParameter("objectPtr", _("Object 1")) + .AddParameter("objectPtr", _("Object 2")) .SetFunctionName("GDpriv::LinkedObjects::RemoveLinkBetween").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); AddAction("RemoveAllLinksOf", _("Unlink all objects from an object"), _("Unlink all objects from an object."), - GD_T("Unlink all objects from _PARAM1_"), + _("Unlink all objects from _PARAM1_"), _("Linked objects"), "CppPlatform/Extensions/LinkedObjectsicon24.png", "CppPlatform/Extensions/LinkedObjectsicon16.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("objectPtr", GD_T("Object")) + .AddParameter("objectPtr", _("Object")) .SetFunctionName("GDpriv::LinkedObjects::RemoveAllLinksOf").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); AddCondition("PickObjectsLinkedTo", _("Take into account linked objects"), _("Take some objects linked to the object into account for next conditions and actions.\nThe condition will return false if no object was taken into account."), - GD_T("Take into account all \"_PARAM1_\" linked to _PARAM2_"), + _("Take into account all \"_PARAM1_\" linked to _PARAM2_"), _("Linked objects"), "CppPlatform/Extensions/LinkedObjectsicon24.png", "CppPlatform/Extensions/LinkedObjectsicon16.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("objectList", GD_T("Pick these objects...")) - .AddParameter("objectPtr", GD_T("...if they are linked to this object")) + .AddParameter("objectList", _("Pick these objects...")) + .AddParameter("objectPtr", _("...if they are linked to this object")) .SetFunctionName("GDpriv::LinkedObjects::PickObjectsLinkedTo").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); @@ -90,14 +90,14 @@ public: AddAction("PickObjectsLinkedTo", _("Take into account linked objects"), _("Take objects linked to the object into account for next actions."), - GD_T("Take into account all \"_PARAM1_\" linked to _PARAM2_"), + _("Take into account all \"_PARAM1_\" linked to _PARAM2_"), _("Linked objects"), "CppPlatform/Extensions/LinkedObjectsicon24.png", "CppPlatform/Extensions/LinkedObjectsicon16.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("objectList", GD_T("Pick these objects...")) - .AddParameter("objectPtr", GD_T("...if they are linked to this object")) + .AddParameter("objectList", _("Pick these objects...")) + .AddParameter("objectPtr", _("...if they are linked to this object")) .SetFunctionName("GDpriv::LinkedObjects::PickObjectsLinkedTo").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); diff --git a/Extensions/LinkedObjects/JsExtension.cpp b/Extensions/LinkedObjects/JsExtension.cpp index de0dc07135..13c15a82cc 100644 --- a/Extensions/LinkedObjects/JsExtension.cpp +++ b/Extensions/LinkedObjects/JsExtension.cpp @@ -24,8 +24,8 @@ public: JsExtension() { SetExtensionInformation("LinkedObjects", - GD_T("Linked objects"), - GD_T("Extension allowing to virtually link two objects."), + _("Linked objects"), + _("Extension allowing to virtually link two objects."), "Florian Rival", "Open source (MIT License)"); diff --git a/Extensions/Network/Extension.cpp b/Extensions/Network/Extension.cpp index 3ce6e8f95c..7b3dcd2627 100644 --- a/Extensions/Network/Extension.cpp +++ b/Extensions/Network/Extension.cpp @@ -26,8 +26,8 @@ public: Extension() { SetExtensionInformation("Network", - GD_T("Network features"), - GD_T("Built-in extension allowing to exchange data on the network between games."), + _("Network features"), + _("Built-in extension allowing to exchange data on the network between games."), "Florian Rival", "Open source (MIT License)"); @@ -36,20 +36,20 @@ public: AddAction("AddRecipient", _("Add a recipient"), _("Add the computer with the corresponding IP Adress as a recipient of sent data."), - GD_T("Add _PARAM0_ to recipients"), + _("Add _PARAM0_ to recipients"), _("Network: Sending"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .AddParameter("string", GD_T("Recipient IP address.")) - .AddParameter("expression", GD_T("Recipient port (Default : 50001)"), "", true) + .AddParameter("string", _("Recipient IP address.")) + .AddParameter("expression", _("Recipient port (Default : 50001)"), "", true) .SetFunctionName("GDpriv::NetworkExtension::AddRecipient").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("RemoveAllRecipients", _("Delete all recipients"), _("Clear the list of the recipients of sent data"), - GD_T("Clear the list of recipients"), + _("Clear the list of recipients"), _("Network: Sending"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") @@ -60,18 +60,18 @@ public: AddAction("ListenToPort", _("Initialize data reception"), _("Initialize the network so as to be able te receive data from other computers."), - GD_T("Initialize data reception"), + _("Initialize data reception"), _("Network: Reception"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .AddParameter("expression", GD_T("Listening port (Default : 50001)"), "", true).SetDefaultValue("50001") + .AddParameter("expression", _("Listening port (Default : 50001)"), "", true).SetDefaultValue("50001") .SetFunctionName("GDpriv::NetworkExtension::ListenToPort").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("StopListening", _("Stop data reception"), _("Stop data reception."), - GD_T("Stop data reception"), + _("Stop data reception"), _("Network: Reception"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") @@ -81,33 +81,33 @@ public: AddAction("SendValue", _("Send a value"), _("Send a value to recipients"), - GD_T("Send value _PARAM1_ with title _PARAM0_ to recipients"), + _("Send value _PARAM1_ with title _PARAM0_ to recipients"), _("Network: Sending"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .AddParameter("string", GD_T("Group")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("string", _("Group")) + .AddParameter("expression", _("Value")) .SetFunctionName("GDpriv::NetworkExtension::SendValue").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("SendString", _("Send a text"), _("Send a text to recipients"), - GD_T("Send text _PARAM1_ with title _PARAM0_ to recipients"), + _("Send text _PARAM1_ with title _PARAM0_ to recipients"), _("Network: Sending"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .AddParameter("string", GD_T("Group")) - .AddParameter("string", GD_T("Text")) + .AddParameter("string", _("Group")) + .AddParameter("string", _("Text")) .SetFunctionName("GDpriv::NetworkExtension::SendString").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("ReceivePackets", _("Receive waiting data"), _("Receive data sent by other computers.\nYou can then access to them with the appropriate expressions."), - GD_T("Receive data"), + _("Receive data"), _("Network: Reception"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") @@ -117,37 +117,37 @@ public: AddAction("ResetReceivedData", _("Delete all received data stored in memory"), _("Delete every received data stored in memory"), - GD_T("Delete every received data stored in memory"), + _("Delete every received data stored in memory"), _("Network: Reception"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") .SetFunctionName("GDpriv::NetworkExtension::ResetReceivedData").SetIncludeFile("Network/NetworkManagerFunctions.h"); - AddStrExpression("GetReceivedDataString", GD_T("Get the text of a data"), GD_T("Get the text contained in a data"), GD_T("Network: Reception"), "CppPlatform/Extensions/networkicon.png") - .AddParameter("string", GD_T("Name of the data containing the text to get")) + AddStrExpression("GetReceivedDataString", _("Get the text of a data"), _("Get the text contained in a data"), _("Network: Reception"), "CppPlatform/Extensions/networkicon.png") + .AddParameter("string", _("Name of the data containing the text to get")) .SetFunctionName("GDpriv::NetworkExtension::GetReceivedDataString").SetIncludeFile("Network/NetworkManagerFunctions.h"); - AddExpression("GetReceivedDataValue", GD_T("Get the value of a data"), GD_T("Get the value contained in a data"), GD_T("Network: Reception"), "CppPlatform/Extensions/networkicon.png") - .AddParameter("string", GD_T("Name of the data containing the text to get")) + AddExpression("GetReceivedDataValue", _("Get the value of a data"), _("Get the value contained in a data"), _("Network: Reception"), "CppPlatform/Extensions/networkicon.png") + .AddParameter("string", _("Name of the data containing the text to get")) .SetFunctionName("GDpriv::NetworkExtension::GetReceivedDataValue").SetIncludeFile("Network/NetworkManagerFunctions.h"); - AddStrExpression("GetLastError", GD_T("Last error occured"), GD_T("Get the text describing the last error which occured."), GD_T("Network: Errors"), "res/error.png") + AddStrExpression("GetLastError", _("Last error occured"), _("Get the text describing the last error which occured."), _("Network: Errors"), "res/error.png") .SetFunctionName("GDpriv::NetworkExtension::GetLastError").SetIncludeFile("Network/NetworkManagerFunctions.h"); - AddStrExpression("GetPublicAddress", GD_T("IP address"), GD_T("Allow to get the public IP Address of the computer."), GD_T("Network"), "CppPlatform/Extensions/networkicon.png") - .AddParameter("expression", GD_T("Maximum time to wait before getting the address ( in seconds ) ( 0 = no timeout )"), "", true) + AddStrExpression("GetPublicAddress", _("IP address"), _("Allow to get the public IP Address of the computer."), _("Network"), "CppPlatform/Extensions/networkicon.png") + .AddParameter("expression", _("Maximum time to wait before getting the address ( in seconds ) ( 0 = no timeout )"), "", true) .SetFunctionName("GDpriv::NetworkExtension::GetPublicAddress").SetIncludeFile("Network/NetworkManagerFunctions.h"); - AddStrExpression("GetLocalAddress", GD_T("Local IP address ( local/LAN )"), GD_T("Allow to get the public IP Address of the computer."), GD_T("Network"), "CppPlatform/Extensions/networkicon.png") + AddStrExpression("GetLocalAddress", _("Local IP address ( local/LAN )"), _("Allow to get the public IP Address of the computer."), _("Network"), "CppPlatform/Extensions/networkicon.png") .SetFunctionName("GDpriv::NetworkExtension::GetLocalAddress").SetIncludeFile("Network/NetworkManagerFunctions.h"); @@ -155,22 +155,22 @@ public: AddAction("GenerateObjectNetworkId", _("Generate objects' identifiers"), _("Generate automatically identifiers for these objects.\nNote that this action must be preferably used at the start of the scene for example, so as to be sure objects\nhave the same unique identifiers on the different computers."), - GD_T("Generate unique network identifiers for _PARAM0_"), + _("Generate unique network identifiers for _PARAM0_"), _("Automatism Automatic Network Updater"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .AddParameter("objectList", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "NetworkAutomatism", false) + .AddParameter("objectList", _("Object")) + .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) .SetFunctionName("NetworkAutomatism::GenerateObjectNetworkIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); #endif { gd::AutomatismMetadata & aut = AddAutomatism("NetworkAutomatism", - GD_T("Automatic network update"), - GD_T("NetworkUpdater"), - GD_T("Allows to automatically synchronize the objects of a game on the network."), + _("Automatic network update"), + _("NetworkUpdater"), + _("Allows to automatically synchronize the objects of a game on the network."), "", "CppPlatform/Extensions/networkicon32.png", "NetworkAutomatism", @@ -183,43 +183,43 @@ public: aut.AddAction("SetAsSender", _("Set to send data"), _("The automatism will send the data of the objects.\nBe sure to have generated identifiers for these objects before."), - GD_T("Set _PARAM0_ to send data"), + _("Set _PARAM0_ to send data"), _("Automatism Automatic Network Updater"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "NetworkAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) .SetFunctionName("SetAsSender").SetIncludeFile("Network/NetworkAutomatism.h"); aut.AddAction("SetAsReceiver", _("Set to receive data"), _("The automatism will receive the data and will update the objects.\nBe sure to have generated identifiers for these objects before."), - GD_T("Set _PARAM0_ to receive data"), + _("Set _PARAM0_ to receive data"), _("Automatism Automatic Network Updater"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "NetworkAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) .SetFunctionName("SetAsReceiver").SetIncludeFile("Network/NetworkAutomatism.h"); aut.AddAction("SetIdentifier", _("Change object's identifier"), _("Each object need a unique identifier, the same on all computers, so as to be identified and updated"), - GD_T("Set identifier of _PARAM0_ to _PARAM2_"), + _("Set identifier of _PARAM0_ to _PARAM2_"), _("Automatism Automatic Network Updater"), "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "NetworkAutomatism", false) - .AddParameter("expression", GD_T("Identifier")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) + .AddParameter("expression", _("Identifier")) .SetFunctionName("SetIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); - aut.AddExpression("GetIdentifier", GD_T("Get the identifier of the object"), GD_T("Get the identifier of the object"), GD_T("Automatism Automatic Network Updater"), "res/texteicon.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "NetworkAutomatism", false) + aut.AddExpression("GetIdentifier", _("Get the identifier of the object"), _("Get the identifier of the object"), _("Automatism Automatic Network Updater"), "res/texteicon.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) .SetFunctionName("GetIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); #endif @@ -235,10 +235,10 @@ public: { if ( propertyNb == 0 ) { - name = GD_T("List of recipients"); + name = _("List of recipients"); const std::vector< std::pair > & list = NetworkManager::Get()->GetRecipientsList(); for (unsigned int i = 0;iparticleSystem ) return; - if ( propertyNb == 0 ) {name = GD_T("Particles number"); value = ToString(GetParticleSystem()->particleSystem->getNbParticles());} + if ( propertyNb == 0 ) {name = _("Particles number"); value = ToString(GetParticleSystem()->particleSystem->getNbParticles());} } bool RuntimeParticleEmitterObject::ChangeProperty(unsigned int propertyNb, string newValue) diff --git a/Extensions/ParticleSystem/ParticleEmitterObjectEditor.cpp b/Extensions/ParticleSystem/ParticleEmitterObjectEditor.cpp index 051ea88121..a2bb0975d0 100644 --- a/Extensions/ParticleSystem/ParticleEmitterObjectEditor.cpp +++ b/Extensions/ParticleSystem/ParticleEmitterObjectEditor.cpp @@ -490,13 +490,13 @@ object(object_) FlexGridSizer57->Add(StaticText41, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); angle1Edit = new wxTextCtrl(Core, ID_TEXTCTRL28, wxEmptyString, wxDefaultPosition, wxSize(55,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL28")); FlexGridSizer57->Add(angle1Edit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); - StaticText55 = new wxStaticText(Core, ID_STATICTEXT58, _("°"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT58")); + StaticText55 = new wxStaticText(Core, ID_STATICTEXT58, _("�"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT58")); FlexGridSizer57->Add(StaticText55, 1, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText56 = new wxStaticText(Core, ID_STATICTEXT59, _("and"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT59")); FlexGridSizer57->Add(StaticText56, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); angle2Edit = new wxTextCtrl(Core, ID_TEXTCTRL27, wxEmptyString, wxDefaultPosition, wxSize(55,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL27")); FlexGridSizer57->Add(angle2Edit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); - StaticText57 = new wxStaticText(Core, ID_STATICTEXT60, _("°"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT60")); + StaticText57 = new wxStaticText(Core, ID_STATICTEXT60, _("�"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT60")); FlexGridSizer57->Add(StaticText57, 1, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText18 = new wxStaticText(Core, ID_STATICTEXT20, _("Random variation\nbetween:"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT20")); StaticText18->SetToolTip(_("Ampltiude of the random variation of the initial transparency")); @@ -588,7 +588,7 @@ object(object_) FlexGridSizer49->Add(StaticText45, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); simpleConeAngleEdit = new wxTextCtrl(Panel4, ID_TEXTCTRL22, wxEmptyString, wxDefaultPosition, wxSize(66,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL22")); FlexGridSizer49->Add(simpleConeAngleEdit, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); - StaticText46 = new wxStaticText(Panel4, ID_STATICTEXT49, _("°"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT49")); + StaticText46 = new wxStaticText(Panel4, ID_STATICTEXT49, _("�"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT49")); FlexGridSizer49->Add(StaticText46, 1, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer46->Add(FlexGridSizer49, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Panel4->SetSizer(FlexGridSizer46); @@ -615,14 +615,14 @@ object(object_) FlexGridSizer41->Add(StaticText35, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); emitterAngleAEdit = new wxTextCtrl(Panel3, ID_TEXTCTRL15, wxEmptyString, wxDefaultPosition, wxSize(62,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL15")); FlexGridSizer41->Add(emitterAngleAEdit, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); - StaticText9 = new wxStaticText(Panel3, ID_STATICTEXT11, _("°"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT11")); + StaticText9 = new wxStaticText(Panel3, ID_STATICTEXT11, _("�"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT11")); FlexGridSizer41->Add(StaticText9, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer41->Add(8,9,1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText36 = new wxStaticText(Panel3, ID_STATICTEXT39, _("2nd angle :"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT39")); FlexGridSizer41->Add(StaticText36, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); emitterAngleBEdit = new wxTextCtrl(Panel3, ID_TEXTCTRL16, wxEmptyString, wxDefaultPosition, wxSize(62,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL16")); FlexGridSizer41->Add(emitterAngleBEdit, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); - StaticText12 = new wxStaticText(Panel3, ID_STATICTEXT14, _("°"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT14")); + StaticText12 = new wxStaticText(Panel3, ID_STATICTEXT14, _("�"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT14")); FlexGridSizer41->Add(StaticText12, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer34->Add(FlexGridSizer41, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Panel3->SetSizer(FlexGridSizer34); @@ -656,7 +656,7 @@ object(object_) simpleGravityAngleEdit = new wxTextCtrl(Panel6, ID_TEXTCTRL25, wxEmptyString, wxDefaultPosition, wxSize(62,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL25")); simpleGravityAngleEdit->SetToolTip(_("Gravity on Z axis ( depth )")); FlexGridSizer51->Add(simpleGravityAngleEdit, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); - StaticText50 = new wxStaticText(Panel6, ID_STATICTEXT53, _("°"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT53")); + StaticText50 = new wxStaticText(Panel6, ID_STATICTEXT53, _("�"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT53")); FlexGridSizer51->Add(StaticText50, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); BoxSizer3->Add(FlexGridSizer51, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); FlexGridSizer50->Add(BoxSizer3, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); @@ -1117,7 +1117,7 @@ void ParticleEmitterObjectEditor::OnimageChooseBtClick(wxCommandEvent& event) { if ( !m_mgr.GetPane( editorImagesPnl ).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } diff --git a/Extensions/PathAutomatism/Extension.cpp b/Extensions/PathAutomatism/Extension.cpp index 695b989ed0..17f370b1f8 100644 --- a/Extensions/PathAutomatism/Extension.cpp +++ b/Extensions/PathAutomatism/Extension.cpp @@ -28,16 +28,16 @@ public: Extension() { SetExtensionInformation("PathAutomatism", - GD_T("Path Automatism"), - GD_T("Automatism allowing to move objects on a predefined path"), + _("Path Automatism"), + _("Automatism allowing to move objects on a predefined path"), "Florian Rival", "Open source (MIT License)"); { gd::AutomatismMetadata & aut = AddAutomatism("PathAutomatism", - GD_T("Path"), - GD_T("Path"), - GD_T("Make objects move on a predefined path."), + _("Path"), + _("Path"), + _("Make objects move on a predefined path."), "", "CppPlatform/Extensions/pathicon.png", "PathAutomatism", @@ -51,338 +51,338 @@ public: aut.AddAction("SetReverseAtEnd", _("De/activate rounding"), _("Activate or desactivate rounding"), - GD_T("Activate rounding for _PARAM0_: _PARAM2_"), + _("Activate rounding for _PARAM0_: _PARAM2_"), _("Options"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("yesorno", GD_T("Activate")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("yesorno", _("Activate")) .SetFunctionName("SetReverseAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetStopAtEnd", _("De/activate the stop at the end of the path"), _("Activate or deactivate the stop at the end of the object"), - GD_T("Stop _PARAM0_ when the end of the path is reached: _PARAM2_"), + _("Stop _PARAM0_ when the end of the path is reached: _PARAM2_"), _("Options"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("yesorno", GD_T("Activate")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("yesorno", _("Activate")) .SetFunctionName("SetStopAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("ReverseAtEnd", _("Rounds"), _("Return true if the object round"), - GD_T("_PARAM0_ is rounding"), + _("_PARAM0_ is rounding"), _("Options"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("ReverseAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("StopAtEnd", _("Stop at the end of the path"), _("Return true if the object stops at the end of its path."), - GD_T("_PARAM0_ stops at the end of the path"), + _("_PARAM0_ stops at the end of the path"), _("Options"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("StopAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("Reverse", _("Invert the movement on the path"), _("Invert the movement on the path."), - GD_T("Invert the sens of the movement of _PARAM0_ on its path"), + _("Invert the sens of the movement of _PARAM0_ on its path"), _("Movement"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("Reverse").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetSegment", _("Number of the segment on the path"), _("True if the number of the current segment on the path satisfies the test."), - GD_T("The number of the current segment of the path of _PARAM0_ is _PARAM2__PARAM3_"), + _("The number of the current segment of the path of _PARAM0_ is _PARAM2__PARAM3_"), _("Position"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetCurrentSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("EnterSegment", _("Position on the segment of a path"), _("Put the object directly on specific segment of the path"), - GD_T("Do _PARAM2__PARAM3_ to number of the current segment of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to number of the current segment of _PARAM0_"), _("Position"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("operator", _("Modification sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetCurrentSegment").SetGetter("GetCurrentSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); - aut.AddExpression("Segment", GD_T("Current segment"), GD_T("Number of the current segment"), GD_T("Position"), "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + aut.AddExpression("Segment", _("Current segment"), _("Number of the current segment"), _("Position"), "CppPlatform/Extensions/pathicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("GetCurrentSegment").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetPosition", _("Position of the object on the segment"), _("Return true if the position on the path satisfy the test.\nPosition on a segment is a value between 0 and 1."), - GD_T("The position of _PARAM0_ on the current segment is _PARAM2__PARAM3_"), + _("The position of _PARAM0_ on the current segment is _PARAM2__PARAM3_"), _("Position"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetPositionOnSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetPosition", _("Put the object on a precise position of the current segment"), _("Put the object on a precise position on the current segment."), - GD_T("Put _PARAM0_ on _PARAM2__PARAM3_ on the current segment"), + _("Put _PARAM0_ on _PARAM2__PARAM3_ on the current segment"), _("Position"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("operator", _("Modification sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetPositionOnSegment").SetGetter("GetPositionOnSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); - aut.AddExpression("Position", GD_T("Position on the segment"), GD_T("Position on the segment ( value between 0 and 1 )"), GD_T("Position"), "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + aut.AddExpression("Position", _("Position on the segment"), _("Position on the segment ( value between 0 and 1 )"), _("Position"), "CppPlatform/Extensions/pathicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("GetPositionOnSegment").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetPathName", _("Path name"), _("Test the path name."), - GD_T("The name of the current path of _PARAM0_ is _PARAM1__PARAM2_"), + _("The name of the current path of _PARAM0_ is _PARAM1__PARAM2_"), _("Path"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("string", GD_T("Name")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("string", _("Name")) .SetFunctionName("GetCurrentPathName").SetManipulatedType("string").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetPathName", _("Change the path"), _("Change the path used."), - GD_T("Set _PARAM2_ as the current path of _PARAM0_"), + _("Set _PARAM2_ as the current path of _PARAM0_"), _("Path"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("string", GD_T("Name")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("string", _("Name")) .SetFunctionName("ChangeCurrentPath").SetIncludeFile("PathAutomatism/PathAutomatism.h"); - aut.AddStrExpression("CurrentPathName", GD_T("Current path name"), GD_T("Current path name"), GD_T("Path"), "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + aut.AddStrExpression("CurrentPathName", _("Current path name"), _("Current path name"), _("Path"), "CppPlatform/Extensions/pathicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("GetCurrentPathName").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetOffsetX", _("X position of the path"), _("Return true if the X position satisfies the test."), - GD_T("The X position of the path of _PARAM0_ is _PARAM2__PARAM3_"), + _("The X position of the path of _PARAM0_ is _PARAM2__PARAM3_"), _("Path position"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetOffsetX").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetOffsetX", _("Modify the path X position"), _("Change the path X position."), - GD_T("Do _PARAM2__PARAM3_ to the X position of the path of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the X position of the path of _PARAM0_"), _("Path position"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("operator", _("Modification sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetOffsetX").SetGetter("GetOffsetX").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); - aut.AddExpression("PathX", GD_T("X position of the path"), GD_T("X position of the path"), GD_T("Path position"), "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + aut.AddExpression("PathX", _("X position of the path"), _("X position of the path"), _("Path position"), "CppPlatform/Extensions/pathicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("GetOffsetX").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetOffsetY", _("Path Y position"), _("Return true if the Y position satisfies the test."), - GD_T("The Y position of the path of _PARAM0_ is _PARAM2__PARAM3_"), + _("The Y position of the path of _PARAM0_ is _PARAM2__PARAM3_"), _("Path position"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetOffsetY").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetOffsetY", _("Modify the path Y position"), _("Change the path Y position."), - GD_T("Do _PARAM2__PARAM3_ to the Y position of the path of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the Y position of the path of _PARAM0_"), _("Path position"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("operator", _("Modification sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetOffsetY").SetGetter("GetOffsetY").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); - aut.AddExpression("PathY", GD_T("Path Y position"), GD_T("Path Y position"), GD_T("Path position"), "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + aut.AddExpression("PathY", _("Path Y position"), _("Path Y position"), _("Path position"), "CppPlatform/Extensions/pathicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("GetOffsetY").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetFollowAngle", _("Automatic rotation"), _("Return true if the object's angle is automatically updated."), - GD_T("The angle of _PARAM0_ is automatically updated on the path"), + _("The angle of _PARAM0_ is automatically updated on the path"), _("Options"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("FollowAngle").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetFollowAngle", _("De/activate automatic rotation"), _("Activate or deactivate the automatic update of the angle of the object on the path."), - GD_T("Activate automatic rotation of _PARAM0_: _PARAM2_"), + _("Activate automatic rotation of _PARAM0_: _PARAM2_"), _("Options"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("yesorno", GD_T("Activate \?")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("yesorno", _("Activate \?")) .SetFunctionName("SetFollowAngle").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetAngleOffset", _("Angle offset"), _("Return true if the angle offset satifies the condition."), - GD_T("The angle offset of _PARAM0_ is _PARAM2__PARAM3_"), + _("The angle offset of _PARAM0_ is _PARAM2__PARAM3_"), _("Options"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetAngleOffset", _("Change the angle offset"), _("Change the angle offset"), - GD_T("Do _PARAM2__PARAM3_ to angle offset of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to angle offset of _PARAM0_"), _("Options"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("operator", _("Modification sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetAngleOffset").SetGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); - aut.AddExpression("AngleOffset", GD_T("Angle offset"), GD_T("Add an offset to the angle of the object"), GD_T("Options"), "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + aut.AddExpression("AngleOffset", _("Angle offset"), _("Add an offset to the angle of the object"), _("Options"), "CppPlatform/Extensions/pathicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("GetAngleOffset").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetSpeed", _("Speed"), _("Return true if the speed satisfy the condition."), - GD_T("The speed of _PARAM0_ on the path is _PARAM2__PARAM3_"), + _("The speed of _PARAM0_ on the path is _PARAM2__PARAM3_"), _("Movement"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetSpeed", _("Change the speed"), _("Change the speed of the object on the path."), - GD_T("Do _PARAM1__PARAM2_ to the speed of _PARAM0_ on the path"), + _("Do _PARAM1__PARAM2_ to the speed of _PARAM0_ on the path"), _("Movement"), "CppPlatform/Extensions/pathicon24.png", "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) - .AddParameter("operator", GD_T("Modification sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) + .AddParameter("operator", _("Modification sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetSpeed").SetGetter("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); - aut.AddExpression("Speed", GD_T("Speed"), GD_T("Moving speed on the path"), GD_T("Movement"), "CppPlatform/Extensions/pathicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathAutomatism", false) + aut.AddExpression("Speed", _("Speed"), _("Moving speed on the path"), _("Movement"), "CppPlatform/Extensions/pathicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .SetFunctionName("GetSpeed").SetIncludeFile("PathAutomatism/PathAutomatism.h"); diff --git a/Extensions/PathAutomatism/PathAutomatismEditor.cpp b/Extensions/PathAutomatism/PathAutomatismEditor.cpp index fae9bae32a..3daf953204 100644 --- a/Extensions/PathAutomatism/PathAutomatismEditor.cpp +++ b/Extensions/PathAutomatism/PathAutomatismEditor.cpp @@ -324,7 +324,7 @@ PathAutomatismEditor::PathAutomatismEditor(wxWindow* parent, gd::Project & game_ //Setup shared datas if ( !scene || scene->automatismsInitialSharedDatas.find(automatism.GetName()) == scene->automatismsInitialSharedDatas.end()) { - gd::LogError(GD_T("Unable to access to shared datas.")); + gd::LogError(_("Unable to access to shared datas.")); return; } @@ -332,7 +332,7 @@ PathAutomatismEditor::PathAutomatismEditor(wxWindow* parent, gd::Project & game_ if ( sharedDatas == std::shared_ptr() ) { - gd::LogError(GD_T("Unable to access to shared datas : Bad data type.")); + gd::LogError(_("Unable to access to shared datas : Bad data type.")); return; } diff --git a/Extensions/PathfindingAutomatism/Extension.cpp b/Extensions/PathfindingAutomatism/Extension.cpp index 67863ac437..2c2ea242fd 100644 --- a/Extensions/PathfindingAutomatism/Extension.cpp +++ b/Extensions/PathfindingAutomatism/Extension.cpp @@ -25,16 +25,16 @@ public: Extension() { SetExtensionInformation("PathfindingAutomatism", - GD_T("Pathfinding automatism"), - GD_T("Compute paths for objects avoiding obstacles."), + _("Pathfinding automatism"), + _("Compute paths for objects avoiding obstacles."), "Florian Rival", "Open source (MIT License)"); { gd::AutomatismMetadata & aut = AddAutomatism("PathfindingAutomatism", - GD_T("Pathfinding"), + _("Pathfinding"), "Pathfinding", - GD_T("Automatism which move objects and avoid objects flagged as obstacles."), + _("Automatism which move objects and avoid objects flagged as obstacles."), "", "CppPlatform/Extensions/AStaricon.png", "PathfindingAutomatism", @@ -48,428 +48,428 @@ public: aut.AddAction("SetDestination", _("Move to a position"), _("Move the object to a position"), - GD_T("Move _PARAM0_ to _PARAM3_;_PARAM4_"), + _("Move _PARAM0_ to _PARAM3_;_PARAM4_"), _(""), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddCodeOnlyParameter("currentScene", "") - .AddParameter("expression", GD_T("Destination X position")) - .AddParameter("expression", GD_T("Destination Y position")) + .AddParameter("expression", _("Destination X position")) + .AddParameter("expression", _("Destination Y position")) .SetFunctionName("MoveTo").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("PathFound", _("Path found"), _("Return true if a path has been found."), - GD_T("A path has been found for _PARAM0_"), + _("A path has been found for _PARAM0_"), _(""), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("PathFound").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("DestinationReached", _("Destination reached"), _("Return true if destination was reached."), - GD_T("_PARAM0_ reached its destination"), + _("_PARAM0_ reached its destination"), _(""), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("DestinationReached").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("CellWidth", _("Width of the cells"), _("Change the width of the cells of the virtual grid."), - GD_T("Do _PARAM2__PARAM3_ to the width of the virtual cells of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the width of the virtual cells of _PARAM0_"), _("Virtual grid"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Width (pixels)")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Width (pixels)")) .SetFunctionName("SetCellWidth").SetGetter("GetCellWidth").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("CellWidth", _("Width of the virtual grid"), _("Compare the width of the cells of the virtual grid."), - GD_T("Width of the virtual cells of _PARAM0_ is _PARAM2__PARAM3_"), + _("Width of the virtual cells of _PARAM0_ is _PARAM2__PARAM3_"), _("Virtual grid"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Width (pixels)")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Width (pixels)")) .SetFunctionName("GetCellWidth").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("CellHeight", _("Height of the cells"), _("Change the height of the cells of the virtual grid."), - GD_T("Do _PARAM2__PARAM3_ to the height of the virtual cells of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the height of the virtual cells of _PARAM0_"), _("Virtual grid"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Height (pixels)")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Height (pixels)")) .SetFunctionName("SetCellHeight").SetGetter("GetCellHeight").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("CellHeight", _("Height of the virtual grid"), _("Compare the height of the cells of the virtual grid."), - GD_T("Height of the virtual cells of _PARAM0_ is _PARAM2__PARAM3_"), + _("Height of the virtual cells of _PARAM0_ is _PARAM2__PARAM3_"), _("Virtual grid"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Height (pixels)")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Height (pixels)")) .SetFunctionName("GetCellHeight").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("Acceleration", _("Acceleration"), _("Change the acceleration when moving the object"), - GD_T("Do _PARAM2__PARAM3_ to the acceleration of _PARAM0_ on the path"), + _("Do _PARAM2__PARAM3_ to the acceleration of _PARAM0_ on the path"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetAcceleration").SetGetter("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("Acceleration", _("Acceleration"), _("Compare the acceleration when moving the object"), - GD_T("Acceleration of _PARAM0_ is _PARAM2__PARAM3_"), + _("Acceleration of _PARAM0_ is _PARAM2__PARAM3_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("MaxSpeed", _("Maximum speed"), _("Change the maximum speed when moving the object"), - GD_T("Do _PARAM2__PARAM3_ to the max. speed of _PARAM0_ on the path"), + _("Do _PARAM2__PARAM3_ to the max. speed of _PARAM0_ on the path"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetMaxSpeed").SetGetter("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("MaxSpeed", _("Maximum speed"), _("Compare the maximum speed when moving the object"), - GD_T("Max. speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("Max. speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("Speed", _("Speed"), _("Change the speed of the object on the path"), - GD_T("Do _PARAM2__PARAM3_ to the speed of _PARAM0_ on the path"), + _("Do _PARAM2__PARAM3_ to the speed of _PARAM0_ on the path"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetSpeed").SetGetter("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("Speed", _("Speed"), _("Compare the speed of the object on the path"), - GD_T("Speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("Speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("AngularMaxSpeed", _("Angular maximum speed"), _("Change the maximum angular speed when moving the object"), - GD_T("Do _PARAM2__PARAM3_ to the max. angular speed of _PARAM0_ on the path"), + _("Do _PARAM2__PARAM3_ to the max. angular speed of _PARAM0_ on the path"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetAngularMaxSpeed").SetGetter("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("AngularMaxSpeed", _("Angular maximum speed"), _("Compare the maximum angular speed when moving the object"), - GD_T("Max. angular speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("Max. angular speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("AngleOffset", _("Rotation offset"), _("Change the rotation offset applied when moving the object"), - GD_T("Do _PARAM2__PARAM3_ to the rotation offset of _PARAM0_ on the path"), + _("Do _PARAM2__PARAM3_ to the rotation offset of _PARAM0_ on the path"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetAngleOffset").SetGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("AngleOffset", _("Rotation offset"), _("Compare the rotation offset when moving the object"), - GD_T("Rotation offset of _PARAM0_ is _PARAM2__PARAM3_"), + _("Rotation offset of _PARAM0_ is _PARAM2__PARAM3_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("ExtraBorder", _("Extra border"), _("Change the size of the extra border applied to the object when planning a path"), - GD_T("Do _PARAM2__PARAM3_ to the extra border of _PARAM0_ on the path"), + _("Do _PARAM2__PARAM3_ to the extra border of _PARAM0_ on the path"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value (in pixels)")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value (in pixels)")) .SetFunctionName("SetExtraBorder").SetGetter("GetExtraBorder").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("ExtraBorder", _("Extra border"), _("Compare the size of the extra border applied to the object when planning a path"), - GD_T("Size of the extra border applied to _PARAM0_ is _PARAM2__PARAM3_"), + _("Size of the extra border applied to _PARAM0_ is _PARAM2__PARAM3_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value (in pixels)")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value (in pixels)")) .SetFunctionName("GetExtraBorder").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("AllowDiagonals", _("Diagonals moves"), _("Allow or restrict diagonal moves on the path"), - GD_T("Allow diagonal moves for _PARAM0_ on the path: _PARAM2_"), + _("Allow diagonal moves for _PARAM0_ on the path: _PARAM2_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("yesorno", GD_T("Allow?")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("yesorno", _("Allow?")) .SetFunctionName("SetAllowDiagonals").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("DiagonalsAllowed", _("Diagonals moves"), _("Return true if the object is allowed to do diagonal moves on the path"), - GD_T("Diagonal moves allowed for _PARAM0_"), + _("Diagonal moves allowed for _PARAM0_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("DiagonalsAllowed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("RotateObject", _("Rotate the object"), _("Enable or disable rotation of the object on the path"), - GD_T("Enable rotation of _PARAM0_ on the path: _PARAM2_"), + _("Enable rotation of _PARAM0_ on the path: _PARAM2_"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("yesorno", GD_T("Rotate object?")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("yesorno", _("Rotate object?")) .SetFunctionName("SetRotateObject").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("ObjectRotated", _("Object rotated"), _("Return true if the object is rotated when traveling on its path."), - GD_T("_PARAM0_ is rotated when traveling on its path"), + _("_PARAM0_ is rotated when traveling on its path"), _("Path"), "CppPlatform/Extensions/AStaricon24.png", "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("IsObjectRotated").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("GetNodeX", GD_T("Get a waypoint X position"), GD_T("Get next waypoint X position"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("expression", GD_T("Node index (start at 0!)")) + aut.AddExpression("GetNodeX", _("Get a waypoint X position"), _("Get next waypoint X position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("expression", _("Node index (start at 0!)")) .SetFunctionName("GetNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("GetNodeY", GD_T("Get a waypoint Y position"), GD_T("Get next waypoint Y position"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) - .AddParameter("expression", GD_T("Node index (start at 0!)")) + aut.AddExpression("GetNodeY", _("Get a waypoint Y position"), _("Get next waypoint Y position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) + .AddParameter("expression", _("Node index (start at 0!)")) .SetFunctionName("GetNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("NextNodeIndex", GD_T("Index of the next waypoint"), GD_T("Get the index of the next waypoint to reach"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("NextNodeIndex", _("Index of the next waypoint"), _("Get the index of the next waypoint to reach"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetNextNodeIndex").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("NodeCount", GD_T("Waypoint count"), GD_T("Get the number of waypoints on the path"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("NodeCount", _("Waypoint count"), _("Get the number of waypoints on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetNodeCount").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("NextNodeX", GD_T("Get next waypoint X position"), GD_T("Get next waypoint X position"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("NextNodeX", _("Get next waypoint X position"), _("Get next waypoint X position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetNextNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("NextNodeY", GD_T("Get next waypoint Y position"), GD_T("Get next waypoint Y position"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("NextNodeY", _("Get next waypoint Y position"), _("Get next waypoint Y position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetNextNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("LastNodeX", GD_T("Last waypoint X position"), GD_T("Last waypoint X position"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("LastNodeX", _("Last waypoint X position"), _("Last waypoint X position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetLastNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("LastNodeY", GD_T("Last waypoint Y position"), GD_T("Last waypoint Y position"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("LastNodeY", _("Last waypoint Y position"), _("Last waypoint Y position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetLastNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("DestinationX", GD_T("Destination X position"), GD_T("Destination X position"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("DestinationX", _("Destination X position"), _("Destination X position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetDestinationX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("DestinationY", GD_T("Destination Y position"), GD_T("Destination Y position"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("DestinationY", _("Destination Y position"), _("Destination Y position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetDestinationY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("Acceleration", GD_T("Acceleration"), GD_T("Acceleration of the object on the path"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("Acceleration", _("Acceleration"), _("Acceleration of the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetAcceleration").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("MaxSpeed", GD_T("Maximum speed"), GD_T("Maximum speed of the object on the path"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("MaxSpeed", _("Maximum speed"), _("Maximum speed of the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetMaxSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("Speed", GD_T("Speed"), GD_T("Speed of the object on the path"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("Speed", _("Speed"), _("Speed of the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("AngularMaxSpeed", GD_T("Angular maximum speed"), GD_T("Angular maximum speed of the object on the path"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("AngularMaxSpeed", _("Angular maximum speed"), _("Angular maximum speed of the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetAngularMaxSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("AngleOffset", GD_T("Rotation offset"), GD_T("Rotation offset applied the object on the path"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("AngleOffset", _("Rotation offset"), _("Rotation offset applied the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetAngleOffset").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("ExtraBorder", GD_T("Extra border size"), GD_T("Extra border applied the object on the path"), GD_T("Path"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("ExtraBorder", _("Extra border size"), _("Extra border applied the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetExtraBorder").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("CellWidth", GD_T("Width of a cell"), GD_T("Width of the virtual grid"), GD_T("Virtual grid"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("CellWidth", _("Width of a cell"), _("Width of the virtual grid"), _("Virtual grid"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetCellWidth").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); - aut.AddExpression("CellHeight", GD_T("Height of a cell"), GD_T("Height of the virtual grid"), GD_T("Virtual grid"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingAutomatism", false) + aut.AddExpression("CellHeight", _("Height of a cell"), _("Height of the virtual grid"), _("Virtual grid"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .SetFunctionName("GetCellHeight").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); #endif @@ -477,9 +477,9 @@ public: } { gd::AutomatismMetadata & aut = AddAutomatism("PathfindingObstacleAutomatism", - GD_T("Obstacle for pathfinding"), + _("Obstacle for pathfinding"), "PathfindingObstacle", - GD_T("Flag the object as being an obstacle for pathfinding."), + _("Flag the object as being an obstacle for pathfinding."), "", "CppPlatform/Extensions/pathfindingobstacleicon.png", "PathfindingObstacleAutomatism", @@ -492,62 +492,62 @@ public: aut.AddAction("Cost", _("Cost"), _("Change the cost of going through the object."), - GD_T("Do _PARAM2__PARAM3_ to the cost of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the cost of _PARAM0_"), _("Obstacles"), "CppPlatform/Extensions/pathfindingobstacleicon24.png", "CppPlatform/Extensions/pathfindingobstacleicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingObstacleAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Difficulty")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Difficulty")) .SetFunctionName("SetCost").SetGetter("GetCost").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); aut.AddCondition("Cost", _("Cost"), _("Compare the cost of going through the object"), - GD_T("Cost of _PARAM0_ is _PARAM2__PARAM3_"), + _("Cost of _PARAM0_ is _PARAM2__PARAM3_"), _("Obstacles"), "CppPlatform/Extensions/pathfindingobstacleicon24.png", "CppPlatform/Extensions/pathfindingobstacleicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingObstacleAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Difficulty")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Difficulty")) .SetFunctionName("GetCost").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); aut.AddAction("SetImpassable", _("Set impassable"), _("Set the object as being an impassable obstacle or not"), - GD_T("Set _PARAM0_ as an impassable obstacle: _PARAM2_"), + _("Set _PARAM0_ as an impassable obstacle: _PARAM2_"), _("Obstacles"), "CppPlatform/Extensions/pathfindingobstacleicon24.png", "CppPlatform/Extensions/pathfindingobstacleicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingObstacleAutomatism", false) - .AddParameter("yesorno", GD_T("Impassable?")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) + .AddParameter("yesorno", _("Impassable?")) .SetFunctionName("SetImpassable").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); aut.AddCondition("IsImpassable", _("Is impassable"), _("Return true if the obstacle is impassable"), - GD_T("_PARAM0_ is impassable"), + _("_PARAM0_ is impassable"), _("Obstacles"), "CppPlatform/Extensions/pathfindingobstacleicon24.png", "CppPlatform/Extensions/pathfindingobstacleicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingObstacleAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) .SetFunctionName("IsImpassable").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); - aut.AddExpression("Cost", GD_T("Cost"), GD_T("Obstacle cost"), GD_T("Obstacles"), "CppPlatform/Extensions/AStaricon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PathfindingObstacleAutomatism", false) + aut.AddExpression("Cost", _("Cost"), _("Obstacle cost"), _("Obstacles"), "CppPlatform/Extensions/AStaricon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) .SetFunctionName("GetCost").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); #endif diff --git a/Extensions/PathfindingAutomatism/JsExtension.cpp b/Extensions/PathfindingAutomatism/JsExtension.cpp index ec810e5850..8ae72a3173 100644 --- a/Extensions/PathfindingAutomatism/JsExtension.cpp +++ b/Extensions/PathfindingAutomatism/JsExtension.cpp @@ -23,8 +23,8 @@ public: JsExtension() { SetExtensionInformation("PathfindingAutomatism", - GD_T("Pathfinding automatism"), - GD_T("Compute paths for objects avoiding obstacles."), + _("Pathfinding automatism"), + _("Compute paths for objects avoiding obstacles."), "Florian Rival", "Open source (MIT License)"); CloneExtension("GDevelop C++ platform", "PathfindingAutomatism"); diff --git a/Extensions/PathfindingAutomatism/PathfindingAutomatism.cpp b/Extensions/PathfindingAutomatism/PathfindingAutomatism.cpp index c703140672..b9947e532e 100644 --- a/Extensions/PathfindingAutomatism/PathfindingAutomatism.cpp +++ b/Extensions/PathfindingAutomatism/PathfindingAutomatism.cpp @@ -631,47 +631,47 @@ std::map PathfindingAutomatism::GetProperti { std::map properties; - properties[GD_T("Allows diagonals")].SetValue(allowDiagonals ? "true" : "false").SetType("Boolean"); - properties[GD_T("Acceleration")].SetValue(ToString(acceleration)); - properties[GD_T("Max. speed")].SetValue(ToString(maxSpeed)); - properties[GD_T("Rotate speed")].SetValue(ToString(angularMaxSpeed)); - properties[GD_T("Rotate object")].SetValue(rotateObject ? "true" : "false").SetType("Boolean"); - properties[GD_T("Angle offset")].SetValue(ToString(angleOffset)); - properties[GD_T("Virtual cell width")].SetValue(ToString(cellWidth)); - properties[GD_T("Virtual cell height")].SetValue(ToString(cellHeight)); - properties[GD_T("Extra border size")].SetValue(ToString(extraBorder)); + properties[_("Allows diagonals")].SetValue(allowDiagonals ? "true" : "false").SetType("Boolean"); + properties[_("Acceleration")].SetValue(ToString(acceleration)); + properties[_("Max. speed")].SetValue(ToString(maxSpeed)); + properties[_("Rotate speed")].SetValue(ToString(angularMaxSpeed)); + properties[_("Rotate object")].SetValue(rotateObject ? "true" : "false").SetType("Boolean"); + properties[_("Angle offset")].SetValue(ToString(angleOffset)); + properties[_("Virtual cell width")].SetValue(ToString(cellWidth)); + properties[_("Virtual cell height")].SetValue(ToString(cellHeight)); + properties[_("Extra border size")].SetValue(ToString(extraBorder)); return properties; } bool PathfindingAutomatism::UpdateProperty(const std::string & name, const std::string & value, gd::Project & project) { - if ( name == GD_T("Allows diagonals") ) { + if ( name == _("Allows diagonals") ) { allowDiagonals = (value != "0"); return true; } - if ( name == GD_T("Rotate object") ) { + if ( name == _("Rotate object") ) { rotateObject = (value != "0"); return true; } - if ( name == GD_T("Extra border size") ) { + if ( name == _("Extra border size") ) { extraBorder = ToDouble(value); return true; } if ( ToDouble(value) < 0 ) return false; - if ( name == GD_T("Acceleration") ) + if ( name == _("Acceleration") ) acceleration = ToDouble(value); - else if ( name == GD_T("Max. speed") ) + else if ( name == _("Max. speed") ) maxSpeed = ToDouble(value); - else if ( name == GD_T("Rotate speed") ) + else if ( name == _("Rotate speed") ) angularMaxSpeed = ToDouble(value); - else if ( name == GD_T("Angle offset") ) + else if ( name == _("Angle offset") ) angleOffset = ToDouble(value); - else if ( name == GD_T("Virtual cell width") ) + else if ( name == _("Virtual cell width") ) cellWidth = ToInt(value); - else if ( name == GD_T("Virtual cell height") ) + else if ( name == _("Virtual cell height") ) cellHeight = ToInt(value); else return false; diff --git a/Extensions/PathfindingAutomatism/PathfindingObstacleAutomatism.cpp b/Extensions/PathfindingAutomatism/PathfindingObstacleAutomatism.cpp index c4a9e1b09c..42a72af0b0 100644 --- a/Extensions/PathfindingAutomatism/PathfindingObstacleAutomatism.cpp +++ b/Extensions/PathfindingAutomatism/PathfindingObstacleAutomatism.cpp @@ -100,22 +100,22 @@ void PathfindingObstacleAutomatism::SerializeTo(gd::SerializerElement & element) std::map PathfindingObstacleAutomatism::GetProperties(gd::Project & project) const { std::map properties; - properties[GD_T("Impassable obstacle")].SetValue(impassable ? "true" : "false").SetType("Boolean"); - properties[GD_T("Cost (if not impassable)")].SetValue(ToString(cost)); + properties[_("Impassable obstacle")].SetValue(impassable ? "true" : "false").SetType("Boolean"); + properties[_("Cost (if not impassable)")].SetValue(ToString(cost)); return properties; } bool PathfindingObstacleAutomatism::UpdateProperty(const std::string & name, const std::string & value, gd::Project & project) { - if ( name == GD_T("Impassable obstacle") ) { + if ( name == _("Impassable obstacle") ) { impassable = (value != "0"); return true; } if ( ToDouble(value) < 0 ) return false; - if ( name == GD_T("Cost (if not impassable)") ) + if ( name == _("Cost (if not impassable)") ) cost = ToDouble(value); else return false; diff --git a/Extensions/PhysicsAutomatism/Extension.cpp b/Extensions/PhysicsAutomatism/Extension.cpp index b2222a560b..4a81547b23 100644 --- a/Extensions/PhysicsAutomatism/Extension.cpp +++ b/Extensions/PhysicsAutomatism/Extension.cpp @@ -28,16 +28,16 @@ public: Extension() { SetExtensionInformation("PhysicsAutomatism", - GD_T("Physics automatism"), - GD_T("Automatism allowing to move objects as if they were subject to the laws of physics."), + _("Physics automatism"), + _("Automatism allowing to move objects as if they were subject to the laws of physics."), "Florian Rival", "Open source (MIT License)"); { gd::AutomatismMetadata & aut = AddAutomatism("PhysicsAutomatism", - GD_T("Physics engine"), - GD_T("Physics"), - GD_T("Make objects move as if they were subject to the laws of physics."), + _("Physics engine"), + _("Physics"), + _("Make objects move as if they were subject to the laws of physics."), "", "res/physics32.png", "PhysicsAutomatism", @@ -50,516 +50,516 @@ public: aut.AddAction("SetStatic", _("Make the object static"), _("Make object immovable."), - GD_T("Make _PARAM0_ static"), + _("Make _PARAM0_ static"), _("Movement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetStatic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetDynamic", _("Make the object dynamic"), _("Make object dynamic ( affected by forces and other objects )."), - GD_T("Make _PARAM0_ dynamic"), + _("Make _PARAM0_ dynamic"), _("Movement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetDynamic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("IsDynamic", _("The object is dynamic"), _("Test if an object is dynamic ( affected by forces and the other objects )."), - GD_T("_PARAM0_ is dynamic"), + _("_PARAM0_ is dynamic"), _("Movement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .SetFunctionName("IsDynamic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetFixedRotation", _("Fix rotation"), _("Prevent the object from rotating"), - GD_T("Fix rotation of _PARAM0_"), + _("Fix rotation of _PARAM0_"), _("Rotation"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetFixedRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("AddRevoluteJoint", _("Add a hinge"), _("Add a hinge about which the object will rotate.\nDistance between hinge and object will remain identical."), - GD_T("Add a hinge to _PARAM0_ at _PARAM2_;_PARAM3_"), + _("Add a hinge to _PARAM0_ at _PARAM2_;_PARAM3_"), _("Joints"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Hinge X position")) - .AddParameter("expression", GD_T("Hinge Y position")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Hinge X position")) + .AddParameter("expression", _("Hinge Y position")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AddRevoluteJoint").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("AddRevoluteJointBetweenObjects", _("Add a hinge between two objects"), _("Add a hinge about which the object will rotate."), - GD_T("Add a hinge between _PARAM0_ and _PARAM2_"), + _("Add a hinge between _PARAM0_ and _PARAM2_"), _("Joints"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("objectPtr", GD_T("Object")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("objectPtr", _("Object")) .AddCodeOnlyParameter("currentScene", "") - .AddParameter("expression", GD_T("X position of the hinge, from the first object mass center"), "", true).SetDefaultValue("0") - .AddParameter("expression", GD_T("Y position of the hinge, from the first object mass center"), "", true).SetDefaultValue("0") + .AddParameter("expression", _("X position of the hinge, from the first object mass center"), "", true).SetDefaultValue("0") + .AddParameter("expression", _("Y position of the hinge, from the first object mass center"), "", true).SetDefaultValue("0") .SetFunctionName("AddRevoluteJointBetweenObjects").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ActAddGearJointBetweenObjects", _("Add a gear between two objects"), _("Add a virtual gear between two objects."), - GD_T("Add a gear between _PARAM0_ and _PARAM2_"), + _("Add a gear between _PARAM0_ and _PARAM2_"), _("Joints"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("objectPtr", GD_T("Object")) - .AddParameter("expression", GD_T("Ratio"), "", true).SetDefaultValue("1") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("objectPtr", _("Object")) + .AddParameter("expression", _("Ratio"), "", true).SetDefaultValue("1") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("AddGearJointBetweenObjects").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetFreeRotation", _("Make object's rotation free"), _("Allows object to rotate."), - GD_T("Allow _PARAM0_ to rotate"), + _("Allow _PARAM0_ to rotate"), _("Rotation"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetFreeRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("IsFixedRotation", _("Fixed rotation"), _("Test if object is rotation fixed."), - GD_T("_PARAM0_ is rotation fixed."), + _("_PARAM0_ is rotation fixed."), _("Rotation"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("IsFixedRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetAsBullet", _("Consider as a bullet."), _("Consider the object as a bullet, so as to have better collision handling."), - GD_T("Consider _PARAM0_ as a bullet"), + _("Consider _PARAM0_ as a bullet"), _("Other"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetAsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("DontSetAsBullet", _("Do not consider as a bullet"), _("Do not consider object as a bullet, so as to use standard collision handling."), - GD_T("Do not consider _PARAM0_ as a bullet."), + _("Do not consider _PARAM0_ as a bullet."), _("Other"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("DontSetAsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("IsBullet", _("Object is considered as a bullet"), _("Test if object is considered as a bullet"), - GD_T("_PARAM0_ is considered as a bullet"), + _("_PARAM0_ is considered as a bullet"), _("Other"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("IsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyImpulse", _("Apply an impulse"), _("Apply an impulse to the object."), - GD_T("Apply to _PARAM0_ impulse _PARAM2_;_PARAM3_"), + _("Apply to _PARAM0_ impulse _PARAM2_;_PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("X component ( Newtons/Seconds )")) - .AddParameter("expression", GD_T("Y component ( Newtons/Seconds )")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("X component ( Newtons/Seconds )")) + .AddParameter("expression", _("Y component ( Newtons/Seconds )")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("ApplyImpulse").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyImpulseUsingPolarCoordinates", _("Apply an impulse (angle)"), _("Apply an impulse to an object, using a angle and a length as coordinates."), - GD_T("Apply to _PARAM0_ impulse _PARAM3_ with angle: _PARAM2_°"), + _("Apply to _PARAM0_ impulse _PARAM3_ with angle: _PARAM2_�"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Angle")) - .AddParameter("expression", GD_T("Impulse value ( Newton/seconds )")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Angle")) + .AddParameter("expression", _("Impulse value ( Newton/seconds )")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("ApplyImpulseUsingPolarCoordinates").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyImpulseTowardPosition", _("Apply an impulse toward a position"), _("Apply an impulse, directed toward a position, to the object."), - GD_T("Apply to _PARAM0_ impulse _PARAM4_ toward position _PARAM2_;_PARAM3_"), + _("Apply to _PARAM0_ impulse _PARAM4_ toward position _PARAM2_;_PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("X position")) - .AddParameter("expression", GD_T("Y position")) - .AddParameter("expression", GD_T("Impulse value ( Newton/seconds )")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("X position")) + .AddParameter("expression", _("Y position")) + .AddParameter("expression", _("Impulse value ( Newton/seconds )")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("ApplyImpulseTowardPosition").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyForce", _("Add a force"), _("Add a force to object"), - GD_T("Apply to _PARAM0_ force _PARAM2_;_PARAM3_"), + _("Apply to _PARAM0_ force _PARAM2_;_PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("X component ( Newtons )")) - .AddParameter("expression", GD_T("Y component ( Newtons )")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("X component ( Newtons )")) + .AddParameter("expression", _("Y component ( Newtons )")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("ApplyForce").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyForceUsingPolarCoordinates", _("Apply a force ( angle )"), _("Apply a force to an object, using an angle and a length as coordinates."), - GD_T("Apply to _PARAM0_ force _PARAM3_ at angle _PARAM2_"), + _("Apply to _PARAM0_ force _PARAM3_ at angle _PARAM2_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Angle")) - .AddParameter("expression", GD_T("Length of the force ( Newtons )")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Angle")) + .AddParameter("expression", _("Length of the force ( Newtons )")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("ApplyForceUsingPolarCoordinates").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyForceTowardPosition", _("Apply a force toward a position"), _("Apply a force, directed toward a position, to the object."), - GD_T("Add to _PARAM0_ force _PARAM4_ toward position _PARAM2_;_PARAM3_"), + _("Add to _PARAM0_ force _PARAM4_ toward position _PARAM2_;_PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("X position")) - .AddParameter("expression", GD_T("Y position")) - .AddParameter("expression", GD_T("Length of the force ( Newtons )")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("X position")) + .AddParameter("expression", _("Y position")) + .AddParameter("expression", _("Length of the force ( Newtons )")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("ApplyForceTowardPosition").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyTorque", _("Add a torque (a rotation)"), _("Add a torque (a rotation) to object."), - GD_T("Add to _PARAM0_ torque _PARAM2_"), + _("Add to _PARAM0_ torque _PARAM2_"), _("Rotation"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Torque value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Torque value")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("ApplyTorque").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetLinearVelocity", _("Linear velocity"), _("Modify velocity of an object."), - GD_T("Set linear velocity of _PARAM0_ to _PARAM2_;_PARAM3_"), + _("Set linear velocity of _PARAM0_ to _PARAM2_;_PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("X Coordinate")) - .AddParameter("expression", GD_T("Y Coordinate")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("X Coordinate")) + .AddParameter("expression", _("Y Coordinate")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetLinearVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("LinearVelocityX", _("X component"), _("Compare the linear velocity on X axis of object."), - GD_T("Linear velocity on X axis of _PARAM0_ is _PARAM2__PARAM3_"), + _("Linear velocity on X axis of _PARAM0_ is _PARAM2__PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetLinearVelocityX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("LinearVelocityY", _("Y component"), _("Compare the linear velocity on Y axis of object."), - GD_T("Linear velocity on Y axis of _PARAM0_ is _PARAM2__PARAM3_"), + _("Linear velocity on Y axis of _PARAM0_ is _PARAM2__PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetLinearVelocityY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("LinearVelocity", _("Linear speed"), _("Compare the linear velocity of the object."), - GD_T("Linear velocity of _PARAM0_ is _PARAM2__PARAM3_"), + _("Linear velocity of _PARAM0_ is _PARAM2__PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetLinearVelocity").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetAngularVelocity", _("Angular speed"), _("Modify angular velocity of object."), - GD_T("Set angular speed of _PARAM0_ to _PARAM2_"), + _("Set angular speed of _PARAM0_ to _PARAM2_"), _("Rotation"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("New value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("New value")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetAngularVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("AngularVelocity", _("Angular speed"), _("Compare the angular speed of the object."), - GD_T("Angular speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("Angular speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Rotation"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetAngularVelocity").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("LinearDamping", _("Linear damping"), _("Compare the linear damping of the object."), - GD_T("Linear damping of _PARAM0_ is _PARAM2__PARAM3_"), + _("Linear damping of _PARAM0_ is _PARAM2__PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetLinearDamping").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("CollisionWith", _("Collision"), _("Test if two objects are colliding.\nAttention! Only objects specified in the first parameter will be taken in account by the next actions and conditions, if they are colliding with the other objects."), - GD_T("_PARAM0_ is in collision with a _PARAM2_"), + _("_PARAM0_ is in collision with a _PARAM2_"), _(""), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("objectList", GD_T("Object")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("objectList", _("Object")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("CollisionWith").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetLinearDamping", _("Linear damping"), _("Modify linear damping of object."), - GD_T("Put linear damping of _PARAM0_ to _PARAM2_"), + _("Put linear damping of _PARAM0_ to _PARAM2_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Value")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetLinearDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("AngularDamping", _("Angular damping"), _("Test object's angular damping"), - GD_T("Angular damping of _PARAM0_ is _PARAM2__PARAM3_"), + _("Angular damping of _PARAM0_ is _PARAM2__PARAM3_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetAngularDamping").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetAngularDamping", _("Angular damping"), _("Modify angular damping of object."), - GD_T("Set angular damping of _PARAM0_ to _PARAM2_"), + _("Set angular damping of _PARAM0_ to _PARAM2_"), _("Displacement"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Value")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetAngularDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetGravity", _("Gravity"), _("Modify the gravity"), - GD_T("Set gravity force to _PARAM2_;_PARAM3_"), + _("Set gravity force to _PARAM2_;_PARAM3_"), _("Global options"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("X Coordinate")) - .AddParameter("expression", GD_T("Y Coordinate")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("X Coordinate")) + .AddParameter("expression", _("Y Coordinate")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetGravity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetPolygonScaleX", _("Change collision polygon X scale"), _("Change the X scale of the polygon. Use a value greater than 1 to enlarge the polygon, less than 1 to reduce it."), - GD_T("Change collision polygon of _PARAM0_ X scale to _PARAM2_"), + _("Change collision polygon of _PARAM0_ X scale to _PARAM2_"), _("Collision polygon"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Scale")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Scale")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetPolygonScaleY", _("Change collision polygon Y scale"), _("Change the Y scale of the polygon. Use a value greater than 1 to enlarge the polygon, less than 1 to reduce it."), - GD_T("Change collision polygon of _PARAM0_ Y scale to _PARAM2_"), + _("Change collision polygon of _PARAM0_ Y scale to _PARAM2_"), _("Collision polygon"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Scale")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Scale")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("GetPolygonScaleX", _("Collision polygon X scale"), _("Test the value of the collision polygon X scale."), - GD_T("Collision polygon of _PARAM0_ X scale is _PARAM2__PARAM3_"), + _("Collision polygon of _PARAM0_ X scale is _PARAM2__PARAM3_"), _("Collision polygon"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetPolygonScaleX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("GetPolygonScaleY", _("Collision polygon Y scale"), _("Test the value of the collision polygon Y scale."), - GD_T("Collision polygon of _PARAM0_ Y scale is _PARAM2__PARAM3_"), + _("Collision polygon of _PARAM0_ Y scale is _PARAM2__PARAM3_"), _("Collision polygon"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetPolygonScaleY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("PolygonScaleX", GD_T("Collision polygon X scale"), GD_T("Collision polygon X scale"), GD_T("Collision polygon"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("PolygonScaleX", _("Collision polygon X scale"), _("Collision polygon X scale"), _("Collision polygon"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("PolygonScaleY", GD_T("Collision polygon Y scale"), GD_T("Collision polygon Y scale"), GD_T("Collision polygon"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("PolygonScaleY", _("Collision polygon Y scale"), _("Collision polygon Y scale"), _("Collision polygon"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("LinearVelocity", GD_T("Linear speed"), GD_T("Linear speed"), GD_T("Displacement"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("LinearVelocity", _("Linear speed"), _("Linear speed"), _("Displacement"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetLinearVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("LinearVelocityX", GD_T("X component"), GD_T("X component"), GD_T("Displacement"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("LinearVelocityX", _("X component"), _("X component"), _("Displacement"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetLinearVelocityX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("LinearVelocityY", GD_T("Y component"), GD_T("Y component"), GD_T("Displacement"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("LinearVelocityY", _("Y component"), _("Y component"), _("Displacement"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetLinearVelocityY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("AngularVelocity", GD_T("Angular speed"), GD_T("Angular speed"), GD_T("Rotation"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("AngularVelocity", _("Angular speed"), _("Angular speed"), _("Rotation"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetAngularVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("LinearDamping", GD_T("Linear damping"), GD_T("Linear damping"), GD_T("Displacement"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("LinearDamping", _("Linear damping"), _("Linear damping"), _("Displacement"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetLinearDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("AngularDamping", GD_T("Angular damping"), GD_T("Angular damping"), GD_T("Rotation"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("AngularDamping", _("Angular damping"), _("Angular damping"), _("Rotation"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetAngularDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); diff --git a/Extensions/PhysicsAutomatism/JsExtension.cpp b/Extensions/PhysicsAutomatism/JsExtension.cpp index dac0e0004c..6a427b8478 100644 --- a/Extensions/PhysicsAutomatism/JsExtension.cpp +++ b/Extensions/PhysicsAutomatism/JsExtension.cpp @@ -24,8 +24,8 @@ public: JsExtension() { SetExtensionInformation("PhysicsAutomatism", - GD_T("Physics automatism"), - GD_T("Automatism allowing to move objects as if they were subject to the laws of physics."), + _("Physics automatism"), + _("Automatism allowing to move objects as if they were subject to the laws of physics."), "Florian Rival", "Open source (MIT License)"); CloneExtension("GDevelop C++ platform", "PhysicsAutomatism"); @@ -78,68 +78,68 @@ public: /* aut.AddAction("SetPolygonScaleX", - GD_T("Change collision polygon X scale"), - GD_T("Change the X scale of the polygon. Use a value greater than 1 to enlarge the polygon, less than 1 to reduce it."), - GD_T("Change collision polygon of _PARAM0_ X scale to _PARAM2_"), - GD_T("Collision polygon"), + _("Change collision polygon X scale"), + _("Change the X scale of the polygon. Use a value greater than 1 to enlarge the polygon, less than 1 to reduce it."), + _("Change collision polygon of _PARAM0_ X scale to _PARAM2_"), + _("Collision polygon"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Scale")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Scale")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetPolygonScaleY", - GD_T("Change collision polygon Y scale"), - GD_T("Change the Y scale of the polygon. Use a value greater than 1 to enlarge the polygon, less than 1 to reduce it."), - GD_T("Change collision polygon of _PARAM0_ Y scale to _PARAM2_"), - GD_T("Collision polygon"), + _("Change collision polygon Y scale"), + _("Change the Y scale of the polygon. Use a value greater than 1 to enlarge the polygon, less than 1 to reduce it."), + _("Change collision polygon of _PARAM0_ Y scale to _PARAM2_"), + _("Collision polygon"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("expression", GD_T("Scale")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("expression", _("Scale")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("SetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("GetPolygonScaleX", - GD_T("Collision polygon X scale"), - GD_T("Test the value of the collision polygon X scale."), - GD_T("Collision polygon of _PARAM0_ X scale is _PARAM2__PARAM3_"), - GD_T("Collision polygon"), + _("Collision polygon X scale"), + _("Test the value of the collision polygon X scale."), + _("Collision polygon of _PARAM0_ X scale is _PARAM2__PARAM3_"), + _("Collision polygon"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetPolygonScaleX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("GetPolygonScaleY", - GD_T("Collision polygon Y scale"), - GD_T("Test the value of the collision polygon Y scale."), - GD_T("Collision polygon of _PARAM0_ Y scale is _PARAM2__PARAM3_"), - GD_T("Collision polygon"), + _("Collision polygon Y scale"), + _("Test the value of the collision polygon Y scale."), + _("Collision polygon of _PARAM0_ Y scale is _PARAM2__PARAM3_"), + _("Collision polygon"), "res/physics24.png", "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetPolygonScaleY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("PolygonScaleX", GD_T("Collision polygon X scale"), GD_T("Collision polygon X scale"), GD_T("Collision polygon"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("PolygonScaleX", _("Collision polygon X scale"), _("Collision polygon X scale"), _("Collision polygon"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); - aut.AddExpression("PolygonScaleY", GD_T("Collision polygon Y scale"), GD_T("Collision polygon Y scale"), GD_T("Collision polygon"), "res/physics16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PhysicsAutomatism") + aut.AddExpression("PolygonScaleY", _("Collision polygon Y scale"), _("Collision polygon Y scale"), _("Collision polygon"), "res/physics16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); */ diff --git a/Extensions/PhysicsAutomatism/PhysicsAutomatismEditor.cpp b/Extensions/PhysicsAutomatism/PhysicsAutomatismEditor.cpp index c0292610ff..5bcf5d0b8f 100644 --- a/Extensions/PhysicsAutomatism/PhysicsAutomatismEditor.cpp +++ b/Extensions/PhysicsAutomatism/PhysicsAutomatismEditor.cpp @@ -243,7 +243,7 @@ scene(scene_) //Setup shared datas if ( !scene || scene->automatismsInitialSharedDatas.find(automatism.GetName()) == scene->automatismsInitialSharedDatas.end()) { - gd::LogError(GD_T("Unable to access to shared datas.")); + gd::LogError(_("Unable to access to shared datas.")); return; } @@ -251,7 +251,7 @@ scene(scene_) if ( sharedDatas == std::shared_ptr() ) { - gd::LogError(GD_T("Unable to access to shared datas : Bad data type.")); + gd::LogError(_("Unable to access to shared datas : Bad data type.")); return; } diff --git a/Extensions/PlatformAutomatism/Extension.cpp b/Extensions/PlatformAutomatism/Extension.cpp index 155b57c58a..2946a7c6f3 100644 --- a/Extensions/PlatformAutomatism/Extension.cpp +++ b/Extensions/PlatformAutomatism/Extension.cpp @@ -15,16 +15,16 @@ This project is released under the MIT License. void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("PlatformAutomatism", - GD_T("Platform Automatism"), - GD_T("Allows to use controllable objects which can run and jump on platforms."), + _("Platform Automatism"), + _("Allows to use controllable objects which can run and jump on platforms."), "Florian Rival", "Open source (MIT License)"); { gd::AutomatismMetadata & aut = extension.AddAutomatism("PlatformerObjectAutomatism", - GD_T("Platformer character"), + _("Platformer character"), "PlatformerObject", - GD_T("Controllable character which can jump and run on platforms."), + _("Controllable character which can jump and run on platforms."), "", "CppPlatform/Extensions/platformerobjecticon.png", "PlatformerObjectAutomatism", @@ -37,373 +37,373 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) aut.AddCondition("IsMoving", _("Is moving"), _("Check if the object is moving (whether it is on the floor or in the air)."), - GD_T("_PARAM0_ is moving"), + _("_PARAM0_ is moving"), _(""), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsSimple() .SetFunctionName("IsMoving").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("IsOnFloor", _("Is on floor"), _("Check if the object is on a platform."), - GD_T("_PARAM0_ is on floor"), + _("_PARAM0_ is on floor"), _(""), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsSimple() .SetFunctionName("IsOnFloor").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("IsOnLadder", _("Is on ladder"), _("Check if the object is on a ladder."), - GD_T("_PARAM0_ is on ladder"), + _("_PARAM0_ is on ladder"), _(""), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() .SetFunctionName("IsOnLadder").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("IsJumping", _("Is jumping"), _("Check if the object is jumping."), - GD_T("_PARAM0_ is jumping"), + _("_PARAM0_ is jumping"), _(""), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsSimple() .SetFunctionName("IsJumping").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("IsFalling", _("Is falling"), _("Check if the object is falling.\nNote that the object can be flagged as jumping and falling at the same time: At the end of a jump, the fall speed becomes higher that the jump speed."), - GD_T("_PARAM0_ is falling"), + _("_PARAM0_ is falling"), _(""), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .SetFunctionName("IsFalling").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("Gravity", _("Gravity"), _("Compare the gravity applied on the object (in pixels per second per second)."), - GD_T("Gravity of _PARAM0_ is _PARAM2__PARAM3_"), + _("Gravity of _PARAM0_ is _PARAM2__PARAM3_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetGravity").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("Gravity", _("Gravity"), _("Change the gravity applied on an object (in pixels per second per second)."), - GD_T("Do _PARAM2__PARAM3_ to the gravity applied on _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the gravity applied on _PARAM0_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetGravity").SetManipulatedType("number").SetGetter("GetGravity").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("MaxFallingSpeed", _("Maximum falling speed"), _("Compare the maximum falling speed of the object (in pixels per second)."), - GD_T("The maximum falling speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("The maximum falling speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetMaxFallingSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("MaxFallingSpeed", _("Maximum falling speed"), _("Change the maximum falling speed of an object (in pixels per second)."), - GD_T("Do _PARAM2__PARAM3_ to the maximum falling speed of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the maximum falling speed of _PARAM0_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetMaxFallingSpeed").SetManipulatedType("number").SetGetter("GetMaxFallingSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("Acceleration", _("Acceleration"), _("Compare the acceleration of the object (in pixels per second per second)."), - GD_T("The acceleration of _PARAM0_ is _PARAM2__PARAM3_"), + _("The acceleration of _PARAM0_ is _PARAM2__PARAM3_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("Acceleration", _("Acceleration"), _("Change the acceleration of an object (in pixels per second per second)."), - GD_T("Do _PARAM2__PARAM3_ to the acceleration of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the acceleration of _PARAM0_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetAcceleration").SetManipulatedType("number").SetGetter("GetAcceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("Deceleration", _("Deceleration"), _("Compare the deceleration of the object (in pixels per second per second)."), - GD_T("The deceleration of _PARAM0_ is _PARAM2__PARAM3_"), + _("The deceleration of _PARAM0_ is _PARAM2__PARAM3_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetDeceleration").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("Deceleration", _("Deceleration"), _("Change the deceleration of an object (in pixels per second per second)."), - GD_T("Do _PARAM2__PARAM3_ to the deceleration of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the deceleration of _PARAM0_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetDeceleration").SetManipulatedType("number").SetGetter("GetDeceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("MaxSpeed", _("Maximum speed"), _("Compare the maximum speed of the object (in pixels per second)."), - GD_T("The maximum speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("The maximum speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("MaxSpeed", _("Maximum speed"), _("Change the maximum speed of an object (in pixels per second)."), - GD_T("Do _PARAM2__PARAM3_ to the maximum speed of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the maximum speed of _PARAM0_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetMaxSpeed").SetManipulatedType("number").SetGetter("GetMaxSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("JumpSpeed", _("Jump speed"), _("Compare the jump speed of the object (in pixels per second)."), - GD_T("The jump speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("The jump speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("relationalOperator", GD_T("Comparison sign")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("relationalOperator", _("Comparison sign")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetJumpSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("JumpSpeed", _("Jump speed"), _("Change the jump speed of an object (in pixels per second)."), - GD_T("Do _PARAM2__PARAM3_ to the jump speed of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the jump speed of _PARAM0_"), _("Options"), "CppPlatform/Extensions/platformerobjecticon24.png", "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetJumpSpeed").SetManipulatedType("number").SetGetter("GetJumpSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SetCanJump", _("Allow again jumping"), _("Allow the object to jump again, even if it is in the air: this can be useful to allow double jump for example."), - GD_T("Allow _PARAM0_ to jump again"), + _("Allow _PARAM0_ to jump again"), _("Options"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsSimple() .SetFunctionName("SetCanJump").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateLeftKey", _("Simulate left key press"), _("Simulate a pressing on left key."), - GD_T("Simulate pressing Left for _PARAM0_"), + _("Simulate pressing Left for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() .SetFunctionName("SimulateLeftKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateRightKey", _("Simulate right key press"), _("Simulate a pressing on right key."), - GD_T("Simulate pressing Right for _PARAM0_"), + _("Simulate pressing Right for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() .SetFunctionName("SimulateRightKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateUpKey", _("Simulate up key press"), _("Simulate a pressing on up key ( Used when on a ladder )."), - GD_T("Simulate pressing Up for _PARAM0_"), + _("Simulate pressing Up for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() .SetFunctionName("SimulateUpKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateDownKey", _("Simulate down key press"), _("Simulate a pressing on down key ( Used when on a ladder )."), - GD_T("Simulate pressing Down for _PARAM0_"), + _("Simulate pressing Down for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() .SetFunctionName("SimulateDownKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateLadderKey", _("Simulate ladder key press"), _("Simulate a pressing on ladder key ( Used to grab a ladder )."), - GD_T("Simulate pressing Ladder key for _PARAM0_"), + _("Simulate pressing Ladder key for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() .SetFunctionName("SimulateLadderKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateJumpKey", _("Simulate jump key press"), _("Simulate a pressing on jump key."), - GD_T("Simulate pressing Jump key for _PARAM0_"), + _("Simulate pressing Jump key for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .SetFunctionName("SimulateJumpKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateControl", _("Simulate control"), _("Simulate a pressing on a key.\nValid keys are Left, Right, Jump, Ladder, Up, Down."), - GD_T("Simulate pressing _PARAM2_ key for _PARAM0_"), + _("Simulate pressing _PARAM2_ key for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("string", GD_T("Key")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("string", _("Key")) .MarkAsAdvanced() .SetFunctionName("SimulateControl").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("IgnoreDefaultControls", _("Ignore default controls"), _("De/activate the use of default controls.\nIf deactivated, use the simulate actions to move the object."), - GD_T("Ignore default controls for _PARAM0_: _PARAM2_"), + _("Ignore default controls for _PARAM0_: _PARAM2_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") - .AddParameter("yesorno", GD_T("Ignore controls")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") + .AddParameter("yesorno", _("Ignore controls")) .MarkAsAdvanced() .SetFunctionName("IgnoreDefaultControls").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); - aut.AddExpression("Gravity", GD_T("Gravity"), GD_T("Get the gravity applied on the object"), GD_T("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + aut.AddExpression("Gravity", _("Gravity"), _("Get the gravity applied on the object"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .SetFunctionName("GetGravity").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); - aut.AddExpression("MaxFallingSpeed", GD_T("Maximum falling speed"), GD_T("Get the maximum falling speed"), GD_T("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + aut.AddExpression("MaxFallingSpeed", _("Maximum falling speed"), _("Get the maximum falling speed"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .SetFunctionName("GetMaxFallingSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); - aut.AddExpression("Acceleration", GD_T("Acceleration"), GD_T("Acceleration"), GD_T("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + aut.AddExpression("Acceleration", _("Acceleration"), _("Acceleration"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .SetFunctionName("GetAcceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); - aut.AddExpression("Deceleration", GD_T("Deceleration"), GD_T("Deceleration"), GD_T("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + aut.AddExpression("Deceleration", _("Deceleration"), _("Deceleration"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .SetFunctionName("GetDeceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); - aut.AddExpression("MaxSpeed", GD_T("Maximum speed"), GD_T("Maximum speed"), GD_T("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + aut.AddExpression("MaxSpeed", _("Maximum speed"), _("Maximum speed"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .SetFunctionName("GetMaxSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); - aut.AddExpression("JumpSpeed", GD_T("Jump speed"), GD_T("Jump speed"), GD_T("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformerObjectAutomatism") + aut.AddExpression("JumpSpeed", _("Jump speed"), _("Jump speed"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .SetFunctionName("GetJumpSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); #endif } { gd::AutomatismMetadata & aut = extension.AddAutomatism("PlatformAutomatism", - GD_T("Platform"), + _("Platform"), "Platform", - GD_T("Platform on which Platformer characters can run."), + _("Platform on which Platformer characters can run."), "", "CppPlatform/Extensions/platformicon.png", "PlatformAutomatism", @@ -416,13 +416,13 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) aut.AddAction("ChangePlatformType", _("Change platform type"), _("Change the platform type of the object: Platform, Jumpthru or Ladder."), - GD_T("Set platform type of _PARAM0_ to _PARAM2_"), + _("Set platform type of _PARAM0_ to _PARAM2_"), _("Platforms"), "CppPlatform/Extensions/platformicon24.png", "CppPlatform/Extensions/platformicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "PlatformAutomatism") - .AddParameter("string", GD_T("Platform type (\"Platform\", \"Jumpthru\" or \"Ladder\")")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "PlatformAutomatism") + .AddParameter("string", _("Platform type (\"Platform\", \"Jumpthru\" or \"Ladder\")")) .MarkAsAdvanced() .SetFunctionName("ChangePlatformType").SetIncludeFile("PlatformAutomatism/PlatformAutomatism.h"); #endif diff --git a/Extensions/PlatformAutomatism/JsExtension.cpp b/Extensions/PlatformAutomatism/JsExtension.cpp index 5d8ba82d49..b7bd9c59dc 100644 --- a/Extensions/PlatformAutomatism/JsExtension.cpp +++ b/Extensions/PlatformAutomatism/JsExtension.cpp @@ -26,8 +26,8 @@ public: PlatformAutomatismJsExtension() { SetExtensionInformation("PlatformAutomatism", - GD_T("Platform Automatism"), - GD_T("Allows to use controllable objects which can run and jump on platforms."), + _("Platform Automatism"), + _("Allows to use controllable objects which can run and jump on platforms."), "Florian Rival", "Open source (MIT License)"); DeclarePlatformAutomatismExtension(*this); diff --git a/Extensions/PlatformAutomatism/PlatformAutomatism.cpp b/Extensions/PlatformAutomatism/PlatformAutomatism.cpp index 4b58f83883..44a9dc4330 100644 --- a/Extensions/PlatformAutomatism/PlatformAutomatism.cpp +++ b/Extensions/PlatformAutomatism/PlatformAutomatism.cpp @@ -113,29 +113,29 @@ std::map PlatformAutomatism::GetProperties( { std::map properties; - std::string platformTypeStr = GD_T("Platform"); + std::string platformTypeStr = _("Platform"); if ( platformType == Ladder) - platformTypeStr = GD_T("Ladder"); + platformTypeStr = _("Ladder"); else if ( platformType == Jumpthru ) - platformTypeStr = GD_T("Jumpthru platform"); + platformTypeStr = _("Jumpthru platform"); - properties[GD_T("Type")] + properties[_("Type")] .SetValue(platformTypeStr) .SetType("Choice") - .AddExtraInfo(GD_T("Platform")) - .AddExtraInfo(GD_T("Jumpthru platform")) - .AddExtraInfo(GD_T("Ladder")); + .AddExtraInfo(_("Platform")) + .AddExtraInfo(_("Jumpthru platform")) + .AddExtraInfo(_("Ladder")); return properties; } bool PlatformAutomatism::UpdateProperty(const std::string & name, const std::string & value, gd::Project & project) { - if ( name == GD_T("Type") ) + if ( name == _("Type") ) { - if ( value == GD_T("Jumpthru platform") ) + if ( value == _("Jumpthru platform") ) platformType = Jumpthru; - else if ( value == GD_T("Ladder") ) + else if ( value == _("Ladder") ) platformType = Ladder; else platformType = NormalPlatform; diff --git a/Extensions/PlatformAutomatism/PlatformerObjectAutomatism.cpp b/Extensions/PlatformAutomatism/PlatformerObjectAutomatism.cpp index bc3f8a630e..4d32fee48c 100644 --- a/Extensions/PlatformAutomatism/PlatformerObjectAutomatism.cpp +++ b/Extensions/PlatformAutomatism/PlatformerObjectAutomatism.cpp @@ -563,40 +563,40 @@ std::map PlatformerObjectAutomatism::GetPro { std::map properties; - properties[GD_T("Gravity")].SetValue(ToString(gravity)); - properties[GD_T("Jump speed")].SetValue(ToString(jumpSpeed)); - properties[GD_T("Max. falling speed")].SetValue(ToString(maxFallingSpeed)); - properties[GD_T("Acceleration")].SetValue(ToString(acceleration)); - properties[GD_T("Deceleration")].SetValue(ToString(deceleration)); - properties[GD_T("Max. speed")].SetValue(ToString(maxSpeed)); - properties[GD_T("Default controls")].SetValue(ignoreDefaultControls ? "false" : "true").SetType("Boolean"); - properties[GD_T("Slope max. angle")].SetValue(ToString(slopeMaxAngle)); + properties[_("Gravity")].SetValue(ToString(gravity)); + properties[_("Jump speed")].SetValue(ToString(jumpSpeed)); + properties[_("Max. falling speed")].SetValue(ToString(maxFallingSpeed)); + properties[_("Acceleration")].SetValue(ToString(acceleration)); + properties[_("Deceleration")].SetValue(ToString(deceleration)); + properties[_("Max. speed")].SetValue(ToString(maxSpeed)); + properties[_("Default controls")].SetValue(ignoreDefaultControls ? "false" : "true").SetType("Boolean"); + properties[_("Slope max. angle")].SetValue(ToString(slopeMaxAngle)); return properties; } bool PlatformerObjectAutomatism::UpdateProperty(const std::string & name, const std::string & value, gd::Project & project) { - if ( name == GD_T("Default controls") ) { + if ( name == _("Default controls") ) { ignoreDefaultControls = (value == "0"); return true; } if ( ToDouble(value) < 0 ) return false; - if ( name == GD_T("Gravity") ) + if ( name == _("Gravity") ) gravity = ToDouble(value); - else if ( name == GD_T("Max. falling speed") ) + else if ( name == _("Max. falling speed") ) maxFallingSpeed = ToDouble(value); - else if ( name == GD_T("Acceleration") ) + else if ( name == _("Acceleration") ) acceleration = ToDouble(value); - else if ( name == GD_T("Deceleration") ) + else if ( name == _("Deceleration") ) deceleration = ToDouble(value); - else if ( name == GD_T("Max. speed") ) + else if ( name == _("Max. speed") ) maxSpeed = ToDouble(value); - else if ( name == GD_T("Jump speed") ) + else if ( name == _("Jump speed") ) jumpSpeed = ToDouble(value); - else if ( name == GD_T("Slope max. angle") ) + else if ( name == _("Slope max. angle") ) return SetSlopeMaxAngle(ToDouble(value)); else return false; diff --git a/Extensions/PrimitiveDrawing/Extension.cpp b/Extensions/PrimitiveDrawing/Extension.cpp index 67752fc937..3d2f9533c6 100644 --- a/Extensions/PrimitiveDrawing/Extension.cpp +++ b/Extensions/PrimitiveDrawing/Extension.cpp @@ -13,14 +13,14 @@ This project is released under the MIT License. void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("PrimitiveDrawing", - GD_T("Primitive drawing"), - GD_T("Extension allowing to draw shapes and manipulate images."), + _("Primitive drawing"), + _("Extension allowing to draw shapes and manipulate images."), "Florian Rival", "Open source (MIT License)"); gd::ObjectMetadata & obj = extension.AddObject("Drawer", //"Drawer" is kept for compatibility with GD<=3.6.76 - GD_T("Shape painter"), - GD_T("Allows to draw simple shapes on the screen"), + _("Shape painter"), + _("Allows to draw simple shapes on the screen"), "CppPlatform/Extensions/primitivedrawingicon.png", &CreateShapePainterObject); @@ -31,116 +31,116 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) obj.AddAction("Rectangle", _("Rectangle"), _("Draw a rectangle on screen"), - GD_T("Draw from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ a rectangle with _PARAM0_"), + _("Draw from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ a rectangle with _PARAM0_"), _("Drawing"), "res/actions/rectangle24.png", "res/actions/rectangle.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("expression", GD_T("Top left side: X Position")) - .AddParameter("expression", GD_T("Top left side : Y Position")) - .AddParameter("expression", GD_T("Bottom right side : X Position")) - .AddParameter("expression", GD_T("Bottom right side : Y Position")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("expression", _("Top left side: X Position")) + .AddParameter("expression", _("Top left side : Y Position")) + .AddParameter("expression", _("Bottom right side : X Position")) + .AddParameter("expression", _("Bottom right side : Y Position")) .SetFunctionName("DrawRectangle").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("Circle", _("Circle"), _("Draw a circle on screen"), - GD_T("Draw at _PARAM1_;_PARAM2_ a circle of radius _PARAM3_ with _PARAM0_"), + _("Draw at _PARAM1_;_PARAM2_ a circle of radius _PARAM3_ with _PARAM0_"), _("Drawing"), "res/actions/circle24.png", "res/actions/circle.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("expression", GD_T("X position of center")) - .AddParameter("expression", GD_T("Y position of center")) - .AddParameter("expression", GD_T("Radius ( in pixels )")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("expression", _("X position of center")) + .AddParameter("expression", _("Y position of center")) + .AddParameter("expression", _("Radius ( in pixels )")) .SetFunctionName("DrawCircle").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("Line", _("Line"), _("Draw a line on screen"), - GD_T("Draw from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ a line (thickness : _PARAM5_) with _PARAM0_"), + _("Draw from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ a line (thickness : _PARAM5_) with _PARAM0_"), _("Drawing"), "res/actions/line24.png", "res/actions/line.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("expression", GD_T("X Position of start point")) - .AddParameter("expression", GD_T("Y Position of start point")) - .AddParameter("expression", GD_T("X Position of end point")) - .AddParameter("expression", GD_T("Y Position of end point")) - .AddParameter("expression", GD_T("Thickness ( in pixels )")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("expression", _("X Position of start point")) + .AddParameter("expression", _("Y Position of start point")) + .AddParameter("expression", _("X Position of end point")) + .AddParameter("expression", _("Y Position of end point")) + .AddParameter("expression", _("Thickness ( in pixels )")) .SetFunctionName("DrawLine").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("FillColor", _("Fill color"), _("Change the color of filling"), - GD_T("Change fill color of _PARAM0_ to _PARAM1_"), + _("Change fill color of _PARAM0_ to _PARAM1_"), _("Setup"), "res/actions/text24.png", "res/actions/text.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("color", GD_T("Fill color")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("color", _("Fill color")) .SetFunctionName("SetFillColor").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("OutlineColor", _("Outline color"), _("Modify the color of the outline of future drawings."), - GD_T("Change outline color of _PARAM0_ to _PARAM1_"), + _("Change outline color of _PARAM0_ to _PARAM1_"), _("Setup"), "res/actions/color24.png", "res/actions/color.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("color", GD_T("Color")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("color", _("Color")) .SetFunctionName("SetOutlineColor").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("OutlineSize", _("Outline size"), _("Modify the size of the outline of future drawings."), - GD_T("Do _PARAM1__PARAM2_ to the size of the outline of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the size of the outline of _PARAM0_"), _("Setup"), "res/actions/outlineSize24.png", "res/actions/outlineSize.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Size in pixels")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Size in pixels")) .SetFunctionName("SetOutlineSize").SetManipulatedType("number").SetGetter("GetOutlineSize").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddCondition("OutlineSize", _("Outline size"), _("Test the size of the outline."), - GD_T("The size of the outline of _PARAM0_ is _PARAM1__PARAM2_"), + _("The size of the outline of _PARAM0_ is _PARAM1__PARAM2_"), _("Setup"), "res/conditions/outlineSize24.png", "res/conditions/outlineSize.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Size to test")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Size to test")) .SetFunctionName("GetOutlineSize").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("FillOpacity", _("Fill opacity"), _("Modify the opacity of filling of future drawings."), - GD_T("Do _PARAM1__PARAM2_ to the opacity of filling of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the opacity of filling of _PARAM0_"), _("Setup"), "res/actions/opacity24.png", "res/actions/opacity.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetFillOpacity").SetManipulatedType("number").SetGetter("GetFillOpacity").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); @@ -148,42 +148,42 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) obj.AddCondition("FillOpacity", _("Fill opacity"), _("Test the value of the opacity of the filling."), - GD_T("The opacity of filling of _PARAM0_ is _PARAM1__PARAM2_"), + _("The opacity of filling of _PARAM0_ is _PARAM1__PARAM2_"), _("Setup"), "res/conditions/opacity24.png", "res/conditions/opacity.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetFillOpacity").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("OutlineOpacity", _("Outline opacity"), _("Modify the opacity of the outline of future drawings."), - GD_T("Do _PARAM1__PARAM2_ to the opacity of the outline of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the opacity of the outline of _PARAM0_"), _("Setup"), "res/actions/opacity24.png", "res/actions/opacity.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetOutlineOpacity").SetManipulatedType("number").SetGetter("GetOutlineOpacity").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddCondition("OutlineOpacity", _("Outline opacity"), _("Test the opacity of the outline."), - GD_T("The opacity of the outline of _PARAM0_ is _PARAM1__PARAM2_"), + _("The opacity of the outline of _PARAM0_ is _PARAM1__PARAM2_"), _("Setup"), "res/conditions/opacity24.png", "res/conditions/opacity.png") - .AddParameter("object", GD_T("Shape Painter object"), "Drawer", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Shape Painter object"), "Drawer", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetOutlineOpacity").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); #endif @@ -209,16 +209,16 @@ public: AddAction("CopyImageOnAnother", _("Copy an image on another"), _("Copy an image on another.\nNote that the source image must be preferably kept loaded in memory."), - GD_T("Copy the image _PARAM1_ on _PARAM0_ at _PARAM2_;_PARAM3_"), + _("Copy the image _PARAM1_ on _PARAM0_ at _PARAM2_;_PARAM3_"), _("Images"), "res/copy24.png", "res/copyicon.png") - .AddParameter("string", GD_T("Name of the image to modify")) - .AddParameter("string", GD_T("Name of the source image")) - .AddParameter("expression", GD_T("X position")) - .AddParameter("expression", GD_T("Y position")) - .AddParameter("yesorno", GD_T("Should the copy take in account the source transparency\?"), "",false) + .AddParameter("string", _("Name of the image to modify")) + .AddParameter("string", _("Name of the source image")) + .AddParameter("expression", _("X position")) + .AddParameter("expression", _("Y position")) + .AddParameter("yesorno", _("Should the copy take in account the source transparency\?"), "",false) .AddCodeOnlyParameter("currentScene", "") .SetFunctionName("GDpriv::PrimitiveDrawingTools::CopyImageOnAnother").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); @@ -227,58 +227,58 @@ public: AddAction("CaptureScreen", _("Capture the screen"), _("Capture the screen and save it into the specified folder and/or\nin the specified image."), - GD_T("Capture the screen ( Save it in file _PARAM1_ and/or in image _PARAM2_ )"), + _("Capture the screen ( Save it in file _PARAM1_ and/or in image _PARAM2_ )"), _("Images"), "res/imageicon24.png", "res/imageicon.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("string", GD_T("File where save capture"), "", true).SetDefaultValue("").CantUseUtf8() - .AddParameter("string", GD_T("Name of the image where capture must be saved"), "", true).SetDefaultValue("") + .AddParameter("string", _("File where save capture"), "", true).SetDefaultValue("").CantUseUtf8() + .AddParameter("string", _("Name of the image where capture must be saved"), "", true).SetDefaultValue("") .SetFunctionName("GDpriv::PrimitiveDrawingTools::CaptureScreen").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); AddAction("CreateSFMLTexture", _("Create an image in memory"), _("Create an image in memory."), - GD_T("Create image _PARAM1_ in memory ( Width: _PARAM2_, Height: _PARAM3_, Color: _PARAM4_ )"), + _("Create image _PARAM1_ in memory ( Width: _PARAM2_, Height: _PARAM3_, Color: _PARAM4_ )"), _("Images"), "res/imageicon24.png", "res/imageicon.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("string", GD_T("Name of the image")) - .AddParameter("expression", GD_T("Width"), "", true) - .AddParameter("expression", GD_T("Height"), "", true) - .AddParameter("color", GD_T("Initial color"), "", true).SetDefaultValue("0;0;0") + .AddParameter("string", _("Name of the image")) + .AddParameter("expression", _("Width"), "", true) + .AddParameter("expression", _("Height"), "", true) + .AddParameter("color", _("Initial color"), "", true).SetDefaultValue("0;0;0") .SetFunctionName("GDpriv::PrimitiveDrawingTools::CreateSFMLTexture").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); AddAction("OpenSFMLTextureFromFile", _("Open an image from a file"), _("Load in memory an image from a file."), - GD_T("Load in memory file _PARAM1_ inside image _PARAM2_"), + _("Load in memory file _PARAM1_ inside image _PARAM2_"), _("Images"), "res/imageicon24.png", "res/imageicon.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("file", GD_T("File")).CantUseUtf8() - .AddParameter("string", GD_T("Name of the image")) + .AddParameter("file", _("File")).CantUseUtf8() + .AddParameter("string", _("Name of the image")) .SetFunctionName("GDpriv::PrimitiveDrawingTools::OpenSFMLTextureFromFile").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); AddAction("SaveSFMLTextureToFile", _("Save an image to a file"), _("Save an image to a file"), - GD_T("Save image _PARAM2_ to file _PARAM1_"), + _("Save image _PARAM2_ to file _PARAM1_"), _("Images"), "res/imageicon24.png", "res/imageicon.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("file", GD_T("File")).CantUseUtf8() - .AddParameter("string", GD_T("Name of the image")) + .AddParameter("file", _("File")).CantUseUtf8() + .AddParameter("string", _("Name of the image")) .SetFunctionName("GDpriv::PrimitiveDrawingTools::SaveSFMLTextureToFile").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); diff --git a/Extensions/PrimitiveDrawing/ShapePainterObject.cpp b/Extensions/PrimitiveDrawing/ShapePainterObject.cpp index f56a0e29cc..73f34da88f 100644 --- a/Extensions/PrimitiveDrawing/ShapePainterObject.cpp +++ b/Extensions/PrimitiveDrawing/ShapePainterObject.cpp @@ -163,11 +163,11 @@ void ShapePainterObject::EditObject( wxWindow* parent, gd::Project & game, gd::M void RuntimeShapePainterObject::GetPropertyForDebugger(unsigned int propertyNb, string & name, string & value) const { - if ( propertyNb == 0 ) {name = GD_T("Fill color"); value = ToString(GetFillColorR())+";"+ToString(GetFillColorG())+";"+ToString(GetFillColorB());} - else if ( propertyNb == 1 ) {name = GD_T("Fill opacity"); value = ToString(GetFillOpacity());} - else if ( propertyNb == 2 ) {name = GD_T("Outline size"); value = ToString(GetOutlineSize());} - else if ( propertyNb == 3 ) {name = GD_T("Outline color"); value = ToString(GetOutlineColorR())+";"+ToString(GetOutlineColorG())+";"+ToString(GetOutlineColorB());} - else if ( propertyNb == 4 ) {name = GD_T("Outline opacity"); value = ToString(GetOutlineOpacity());} + if ( propertyNb == 0 ) {name = _("Fill color"); value = ToString(GetFillColorR())+";"+ToString(GetFillColorG())+";"+ToString(GetFillColorB());} + else if ( propertyNb == 1 ) {name = _("Fill opacity"); value = ToString(GetFillOpacity());} + else if ( propertyNb == 2 ) {name = _("Outline size"); value = ToString(GetOutlineSize());} + else if ( propertyNb == 3 ) {name = _("Outline color"); value = ToString(GetOutlineColorR())+";"+ToString(GetOutlineColorG())+";"+ToString(GetOutlineColorB());} + else if ( propertyNb == 4 ) {name = _("Outline opacity"); value = ToString(GetOutlineOpacity());} } bool RuntimeShapePainterObject::ChangeProperty(unsigned int propertyNb, string newValue) diff --git a/Extensions/SoundObject/Extension.cpp b/Extensions/SoundObject/Extension.cpp index a2137bb6a9..bb27325818 100644 --- a/Extensions/SoundObject/Extension.cpp +++ b/Extensions/SoundObject/Extension.cpp @@ -28,8 +28,8 @@ public: Extension() { SetExtensionInformation("SoundObject", - GD_T("Sound object"), - GD_T("Extension allowing to use spatialized sounds."), + _("Sound object"), + _("Extension allowing to use spatialized sounds."), "Thomas Flecy, Victor Levasseur et al.", "Open source (MIT License)"); @@ -37,8 +37,8 @@ public: //Declaration of all objects available { gd::ObjectMetadata & obj = AddObject("Sound", - GD_T("Sound"), - GD_T("Invisible object emitting a sound which can be moved in the space."), + _("Sound"), + _("Invisible object emitting a sound which can be moved in the space."), "CppPlatform/Extensions/soundicon32.png", &CreateSoundObject); @@ -51,290 +51,290 @@ public: obj.AddAction("Volume", _("Sound level"), _("Modify the sound level of a Sound object."), - GD_T("Do _PARAM1__PARAM2_ to the sound level of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the sound level of _PARAM0_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetVolume").SetManipulatedType("number").SetGetter("GetVolume").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Pitch", _("Pitch"), _("Change the pitch of a sound object."), - GD_T("Do _PARAM1__PARAM2_ to Pitch of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to Pitch of _PARAM0_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetPitch").SetManipulatedType("number").SetGetter("GetPitch").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Attenuation", _("Attenuation"), _("Change the attenuation of a sound object."), - GD_T("Do _PARAM1__PARAM2_ to the attenuation of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the attenuation of _PARAM0_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetAttenuation").SetManipulatedType("number").SetGetter("GetAttenuation").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("ZPos", _("Z Position"), _("Modify the sound level of a Sound object."), - GD_T("Do _PARAM1__PARAM2_ to the sound level of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the sound level of _PARAM0_"), _("Position"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetZPos").SetManipulatedType("number").SetGetter("GetZPos").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Loop", _("Automatic restart"), _("Activate or desactivate the looping of a sound."), - GD_T("Activate looping for _PARAM0_: _PARAM1_"), + _("Activate looping for _PARAM0_: _PARAM1_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("yesorno", GD_T("Loop")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("yesorno", _("Loop")) .SetFunctionName("SetLoop").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("RelativeToListener", _("Listener relation"), _("Activate or desactivate the sound spatialisation relative to the listener."), - GD_T("Set _PARAM0_ as relative to the listener position: _PARAM1_"), + _("Set _PARAM0_ as relative to the listener position: _PARAM1_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("yesorno", GD_T("Relative to the listener")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("yesorno", _("Relative to the listener")) .SetFunctionName("SetRelativeToListener").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Play", _("Play"), _("Play a sound."), - GD_T("Play sound _PARAM0_"), + _("Play sound _PARAM0_"), _(""), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("Play").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Stop", _("Stop"), _("Stop a sound."), - GD_T("Stop _PARAM0_"), + _("Stop _PARAM0_"), _(""), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("Stop").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Pause", _("Pause"), _("Pause a sound."), - GD_T("Pause _PARAM0_"), + _("Pause _PARAM0_"), _(""), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("Pause").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Volume", _("Sound level"), _("Test the sound level of a Sound object."), - GD_T("Th sound level of _PARAM0_ is _PARAM2_ _PARAM1_"), + _("Th sound level of _PARAM0_ is _PARAM2_ _PARAM1_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetVolume").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Pitch", _("Pitch"), _("Test the pitch value of a sound."), - GD_T("Pitch of _PARAM0_ is _PARAM1__PARAM2_"), + _("Pitch of _PARAM0_ is _PARAM1__PARAM2_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetPitch").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Attenuation", _("Attenuation"), _("Test the attenuation of a sound."), - GD_T("The attenuation of _PARAM0_ is _PARAM1__PARAM2_"), + _("The attenuation of _PARAM0_ is _PARAM1__PARAM2_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetAttenuation").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("MinDistance", _("Minimal distance"), _("Test the minimal distance of a sound"), - GD_T("The minimal distance of _PARAM0_ is _PARAM1__PARAM2_"), + _("The minimal distance of _PARAM0_ is _PARAM1__PARAM2_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetMinDistance").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("ZPos", _("Z Position"), _("Test Z position of a sound."), - GD_T("The Z position of _PARAM0_ is _PARAM1__PARAM2_"), + _("The Z position of _PARAM0_ is _PARAM1__PARAM2_"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Sound", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetZPos").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Loop", _("Automatic restart"), _("Test if an sound is looping."), - GD_T("_PARAM0_ is looping"), + _("_PARAM0_ is looping"), _("Parameters"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("GetLoop").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Playing", _("Being played"), _("Test if a sound is being played."), - GD_T("_PARAM0_ is being played"), + _("_PARAM0_ is being played"), _(""), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("IsPlaying").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Paused", _("Paused"), _("A sound is paused"), - GD_T("_PARAM0_ is paused"), + _("_PARAM0_ is paused"), _(""), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("IsPaused").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Stopped", _("Stopped"), _("Test if a sound is stopped."), - GD_T("_PARAM0_ is stopped"), + _("_PARAM0_ is stopped"), _(""), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("IsStopped").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("RelativeToListener", _("Listener relation"), _("Test if a sound is relative to the listener."), - GD_T("_PARAM0_ is relative to the listener"), + _("_PARAM0_ is relative to the listener"), _("Parameters"), "res/conditions/son24.png", "res/conditions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("IsRelativeToListener").SetIncludeFile("SoundObject/SoundObject.h"); - obj.AddExpression("Volume", GD_T("Sound level"), GD_T("Sound level"), GD_T("Parameters"), "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + obj.AddExpression("Volume", _("Sound level"), _("Sound level"), _("Parameters"), "res/actions/son.png") + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("GetVolume").SetIncludeFile("SoundObject/SoundObject.h"); - obj.AddExpression("Pitch", GD_T("Pitch"), GD_T("Pitch"), GD_T("Parameters"), "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + obj.AddExpression("Pitch", _("Pitch"), _("Pitch"), _("Parameters"), "res/actions/son.png") + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("GetPitch").SetIncludeFile("SoundObject/SoundObject.h"); - obj.AddExpression("Attenuation", GD_T("Attenuation"), GD_T("Attenuation"), GD_T("Parameters"), "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + obj.AddExpression("Attenuation", _("Attenuation"), _("Attenuation"), _("Parameters"), "res/actions/son.png") + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("GetAttenuation").SetIncludeFile("SoundObject/SoundObject.h"); - obj.AddExpression("MinDistance", GD_T("Minimal distance"), GD_T("Minimal distance"), GD_T("Parameters"), "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + obj.AddExpression("MinDistance", _("Minimal distance"), _("Minimal distance"), _("Parameters"), "res/actions/son.png") + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("GetMinDistance").SetIncludeFile("SoundObject/SoundObject.h"); - obj.AddExpression("ZPos", GD_T("Z Position"), GD_T("Z Position"), GD_T("Position"), "res/actions/son.png") - .AddParameter("object", GD_T("Object"), "Sound", false) + obj.AddExpression("ZPos", _("Z Position"), _("Z Position"), _("Position"), "res/actions/son.png") + .AddParameter("object", _("Object"), "Sound", false) .SetFunctionName("GetZPos").SetIncludeFile("SoundObject/SoundObject.h"); #endif } - // Actions liées à l'écouteur + // Actions li�es � l'�couteur #if defined(GD_IDE_ONLY) AddAction("ListenerX", _("X position"), _("Modify the X position of the listener."), - GD_T("Do _PARAM0__PARAM1_ to the X position of the listener"), + _("Do _PARAM0__PARAM1_ to the X position of the listener"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetListenerX").SetManipulatedType("number").SetGetter("GetListenerX").SetIncludeFile("SoundObject/SoundListener.h"); @@ -342,13 +342,13 @@ public: AddAction("ListenerY", _("Y position"), _("Modify the Y position of the listener."), - GD_T("Do _PARAM0__PARAM1_ to the Y position of the listener"), + _("Do _PARAM0__PARAM1_ to the Y position of the listener"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetListenerY").SetManipulatedType("number").SetGetter("GetListenerY").SetIncludeFile("SoundObject/SoundListener.h"); @@ -356,13 +356,13 @@ public: AddAction("ListenerZ", _("Z position"), _("Modify the Z position of the listener."), - GD_T("Do _PARAM0__PARAM1_ to the Z position of the listener"), + _("Do _PARAM0__PARAM1_ to the Z position of the listener"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetListenerZ").SetManipulatedType("number").SetGetter("GetListenerZ").SetIncludeFile("SoundObject/SoundListener.h"); @@ -370,13 +370,13 @@ public: AddAction("ListenerDirectionX", _("Direction on X axis"), _("Change the direction of the listener on X axis."), - GD_T("Do _PARAM1__PARAM2_ to the direction on X axis of the listener"), + _("Do _PARAM1__PARAM2_ to the direction on X axis of the listener"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetListenerDirectionX").SetManipulatedType("number").SetGetter("GetListenerDirectionX").SetIncludeFile("SoundObject/SoundListener.h"); @@ -384,13 +384,13 @@ public: AddAction("ListenerDirectionY", _("Direction on Y axis"), _("Change the direction of the listener on Y axis."), - GD_T("Do _PARAM1__PARAM2_ to the direction on Y axis of the listener"), + _("Do _PARAM1__PARAM2_ to the direction on Y axis of the listener"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetListenerDirectionY").SetManipulatedType("number").SetGetter("GetListenerDirectionY").SetIncludeFile("SoundObject/SoundListener.h"); @@ -398,80 +398,80 @@ public: AddAction("ListenerDirectionZ", _("Direction on Z axis"), _("Change the direction of the listener on Z axis."), - GD_T("Do _PARAM1__PARAM2_ to the direction on Z axis of the listener"), + _("Do _PARAM1__PARAM2_ to the direction on Z axis of the listener"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetListenerDirectionZ").SetManipulatedType("number").SetGetter("GetListenerDirectionZ").SetIncludeFile("SoundObject/SoundListener.h"); - // Conditions liées à l'écouteur + // Conditions li�es � l'�couteur AddCondition("ListenerX", _("X position"), _("Test the position of the listener on X axis."), - GD_T("The listener X position is _PARAM1__PARAM0_"), + _("The listener X position is _PARAM1__PARAM0_"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetListenerX").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddCondition("ListenerY", _("Y position"), _("Test the position of the listener on Y axis."), - GD_T("The listener Y position is _PARAM1__PARAM0_"), + _("The listener Y position is _PARAM1__PARAM0_"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetListenerY").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddCondition("ListenerZ", _("Z position"), _("Test the position of the listener on Z axis."), - GD_T("The listener Z position is _PARAM1__PARAM0_"), + _("The listener Z position is _PARAM1__PARAM0_"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetListenerZ").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddCondition("ListenerDirectionX", _("X direction"), _("Test the direction of the listener on X axis."), - GD_T("The listener X direction is _PARAM1__PARAM0_"), + _("The listener X direction is _PARAM1__PARAM0_"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetListenerDirectionX").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddCondition("ListenerDirectionY", _("Y direction"), _("Test the direction of the listener on Y axis."), - GD_T("The listener Y direction is _PARAM1__PARAM0_"), + _("The listener Y direction is _PARAM1__PARAM0_"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetListenerDirectionY").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); @@ -481,13 +481,13 @@ public: AddCondition("ListenerDirectionZ", _("Z direction"), _("Test the direction of the listener on Z axis."), - GD_T("The listener Z direction is _PARAM1__PARAM0_"), + _("The listener Z direction is _PARAM1__PARAM0_"), _("Listener"), "res/actions/son24.png", "res/actions/son.png") - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetListenerDirectionZ").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); @@ -495,27 +495,27 @@ public: - AddExpression("ListenerX", GD_T("X position"), GD_T("Listener X position"), GD_T("Listener"), "res/actions/son.png") + AddExpression("ListenerX", _("X position"), _("Listener X position"), _("Listener"), "res/actions/son.png") .SetFunctionName("GetListenerX").SetIncludeFile("SoundObject/SoundListener.h"); - AddExpression("ListenerY", GD_T("Y position"), GD_T("Listener Y position"), GD_T("Listener"), "res/actions/son.png") + AddExpression("ListenerY", _("Y position"), _("Listener Y position"), _("Listener"), "res/actions/son.png") .SetFunctionName("GetListenerY").SetIncludeFile("SoundObject/SoundListener.h"); - AddExpression("ListenerZ", GD_T("Z position"), GD_T("Listener Z position"), GD_T("Listener"), "res/actions/son.png") + AddExpression("ListenerZ", _("Z position"), _("Listener Z position"), _("Listener"), "res/actions/son.png") .SetFunctionName("GetListenerZ").SetIncludeFile("SoundObject/SoundListener.h"); - AddExpression("ListenerDirectionX", GD_T("Direction on X axis"), GD_T("Listener x direction"), GD_T("Listener"), "res/actions/son.png") + AddExpression("ListenerDirectionX", _("Direction on X axis"), _("Listener x direction"), _("Listener"), "res/actions/son.png") .SetFunctionName("GetListenerDirectionX").SetIncludeFile("SoundObject/SoundListener.h"); - AddExpression("ListenerDirectionY", GD_T("Direction on Y axis"), GD_T("Listener y direction"), GD_T("Listener"), "res/actions/son.png") + AddExpression("ListenerDirectionY", _("Direction on Y axis"), _("Listener y direction"), _("Listener"), "res/actions/son.png") .SetFunctionName("GetListenerDirectionY").SetIncludeFile("SoundObject/SoundListener.h"); - AddExpression("ListenerDirectionZ", GD_T("Direction on Z axis"), GD_T("Listener z direction"), GD_T("Listener"), "res/actions/son.png") + AddExpression("ListenerDirectionZ", _("Direction on Z axis"), _("Listener z direction"), _("Listener"), "res/actions/son.png") .SetFunctionName("GetListenerDirectionZ").SetIncludeFile("SoundObject/SoundListener.h"); #endif diff --git a/Extensions/SoundObject/SoundObject.cpp b/Extensions/SoundObject/SoundObject.cpp index 0c475b79e1..f6e94a6420 100644 --- a/Extensions/SoundObject/SoundObject.cpp +++ b/Extensions/SoundObject/SoundObject.cpp @@ -153,7 +153,7 @@ void SoundObject::LoadEdittimeIcon() std::map SoundObject::GetInitialInstanceProperties(const gd::InitialInstance & position, gd::Project & game, gd::Layout & scene) { std::map properties; - properties[GD_T("Z")] = position.floatInfos.find("z") != position.floatInfos.end() ? + properties[_("Z")] = position.floatInfos.find("z") != position.floatInfos.end() ? ToString(position.floatInfos.find("z")->second) : "0"; @@ -162,7 +162,7 @@ std::map SoundObject::GetInitialInstancePro bool SoundObject::UpdateInitialInstanceProperty(gd::InitialInstance & position, const std::string & name, const std::string & value, gd::Project & game, gd::Layout & scene) { - if ( name == GD_T("Z") ) position.floatInfos["z"] = ToFloat(value); + if ( name == _("Z") ) position.floatInfos["z"] = ToFloat(value); return true; } @@ -191,11 +191,11 @@ void SoundObject::EditObject( wxWindow* parent, gd::Project & game, gd::MainFram void RuntimeSoundObject::GetPropertyForDebugger(unsigned int propertyNb, string & name, string & value) const { - if ( propertyNb == 0 ) {name = GD_T("Sound level"); value = ToString(GetVolume());} - else if ( propertyNb == 1 ) {name = GD_T("Minimal distance"); value = ToString(GetMinDistance());} - else if ( propertyNb == 2 ) {name = GD_T("Attenuation"); value = ToString(GetAttenuation());} - else if ( propertyNb == 3 ) {name = GD_T("Loop"); value = IsLooping() ? GD_T("Yes") : GD_T("No");} - else if ( propertyNb == 4 ) {name = GD_T("Z Position"); value = ToString(GetZPos());} + if ( propertyNb == 0 ) {name = _("Sound level"); value = ToString(GetVolume());} + else if ( propertyNb == 1 ) {name = _("Minimal distance"); value = ToString(GetMinDistance());} + else if ( propertyNb == 2 ) {name = _("Attenuation"); value = ToString(GetAttenuation());} + else if ( propertyNb == 3 ) {name = _("Loop"); value = IsLooping() ? _("Yes") : _("No");} + else if ( propertyNb == 4 ) {name = _("Z Position"); value = ToString(GetZPos());} } bool RuntimeSoundObject::ChangeProperty(unsigned int propertyNb, string newValue) @@ -203,7 +203,7 @@ bool RuntimeSoundObject::ChangeProperty(unsigned int propertyNb, string newValue if(propertyNb == 0) {SetVolume(ToFloat(newValue));} else if (propertyNb == 1) {SetMinDistance(ToFloat(newValue));} else if (propertyNb == 2) {SetAttenuation(ToFloat(newValue));} - else if (propertyNb == 3) {SetLooping(!(newValue == GD_T("No")));} + else if (propertyNb == 3) {SetLooping(!(newValue == _("No")));} else if (propertyNb == 4) {SetZPos(ToFloat(newValue));} return true; } diff --git a/Extensions/TextEntryObject/Extension.cpp b/Extensions/TextEntryObject/Extension.cpp index 3e77fb7d8e..c650fac6fc 100644 --- a/Extensions/TextEntryObject/Extension.cpp +++ b/Extensions/TextEntryObject/Extension.cpp @@ -13,14 +13,14 @@ This project is released under the MIT License. void DeclareTextEntryObjectExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("TextEntryObject", - GD_T("Text entry object"), - GD_T("Extension allowing to use an object capturing text entered with keyboard."), + _("Text entry object"), + _("Extension allowing to use an object capturing text entered with keyboard."), "Florian Rival", "Open source (MIT License)"); gd::ObjectMetadata & obj = extension.AddObject("TextEntry", - GD_T("Text entry"), - GD_T("Invisible object used to get the text entered with the keyboard"), + _("Text entry"), + _("Invisible object used to get the text entered with the keyboard"), "CppPlatform/Extensions/textentry.png", &CreateTextEntryObject); @@ -31,55 +31,55 @@ void DeclareTextEntryObjectExtension(gd::PlatformExtension & extension) obj.AddAction("String", _("Text in memory"), _("Modify text in memory of the object"), - GD_T("Do _PARAM1__PARAM2_ to the text in memory of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the text in memory of _PARAM0_"), _(""), "CppPlatform/Extensions/textentry24.png", "CppPlatform/Extensions/textentryicon.png") - .AddParameter("object", GD_T("Object"), "TextEntry", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("string", GD_T("Text")) + .AddParameter("object", _("Object"), "TextEntry", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("string", _("Text")) .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString").SetIncludeFile("TextEntryObject/TextEntryObject.h"); obj.AddCondition("String", _("Text in memory"), _("Test the text of a Text Entry object."), - GD_T("The text of _PARAM0_ is _PARAM1__PARAM2_"), + _("The text of _PARAM0_ is _PARAM1__PARAM2_"), _(""), "CppPlatform/Extensions/textentry24.png", "CppPlatform/Extensions/textentryicon.png") - .AddParameter("object", GD_T("Object"), "TextEntry", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("string", GD_T("Text to test")) + .AddParameter("object", _("Object"), "TextEntry", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("string", _("Text to test")) .SetFunctionName("GetString").SetManipulatedType("string").SetIncludeFile("TextEntryObject/TextEntryObject.h"); obj.AddAction("Activate", _("De/activate capturing text input"), _("Activate or desactivate the capture of text entered with keyboard."), - GD_T("Activate capture by _PARAM0_ of the text entered with keyboard: _PARAM1_"), + _("Activate capture by _PARAM0_ of the text entered with keyboard: _PARAM1_"), _("Setup"), "CppPlatform/Extensions/textentry24.png", "CppPlatform/Extensions/textentryicon.png") - .AddParameter("object", GD_T("Object"), "TextEntry", false) - .AddParameter("yesorno", GD_T("Activate")) + .AddParameter("object", _("Object"), "TextEntry", false) + .AddParameter("yesorno", _("Activate")) .SetFunctionName("Activate").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Activated", _("Text input"), _("Test if the object capture text entered with keyboard."), - GD_T("_PARAM0_ capture the text entered with keyboard"), + _("_PARAM0_ capture the text entered with keyboard"), _("Setup"), "CppPlatform/Extensions/textentry24.png", "CppPlatform/Extensions/textentryicon.png") - .AddParameter("object", GD_T("Object"), "TextEntry", false) + .AddParameter("object", _("Object"), "TextEntry", false) .SetFunctionName("IsActivated").SetIncludeFile("TextObject/TextObject.h"); - obj.AddStrExpression("String", GD_T("Text entered with keyboard"), GD_T("Text entered with keyboard"), GD_T("Text entered with keyboard"), "res/texteicon.png") - .AddParameter("object", GD_T("Object"), "TextEntry", false) + obj.AddStrExpression("String", _("Text entered with keyboard"), _("Text entered with keyboard"), _("Text entered with keyboard"), "res/texteicon.png") + .AddParameter("object", _("Object"), "TextEntry", false) .SetFunctionName("GetString").SetIncludeFile("TextObject/TextObject.h"); #endif } diff --git a/Extensions/TextEntryObject/JsExtension.cpp b/Extensions/TextEntryObject/JsExtension.cpp index 8f12aade27..669a260e06 100644 --- a/Extensions/TextEntryObject/JsExtension.cpp +++ b/Extensions/TextEntryObject/JsExtension.cpp @@ -27,8 +27,8 @@ public: TextEntryObjectJsExtension() { SetExtensionInformation("TextEntryObject", - GD_T("Text entry object"), - GD_T("Extension allowing to use an object capturing text entered with keyboard."), + _("Text entry object"), + _("Extension allowing to use an object capturing text entered with keyboard."), "Florian Rival", "Open source (MIT License)"); diff --git a/Extensions/TextEntryObject/TextEntryObject.cpp b/Extensions/TextEntryObject/TextEntryObject.cpp index 7a2cdf43d6..a8b4fac1c0 100644 --- a/Extensions/TextEntryObject/TextEntryObject.cpp +++ b/Extensions/TextEntryObject/TextEntryObject.cpp @@ -98,14 +98,14 @@ bool TextEntryObject::GenerateThumbnail(const gd::Project & project, wxBitmap & void RuntimeTextEntryObject::GetPropertyForDebugger(unsigned int propertyNb, string & name, string & value) const { - if ( propertyNb == 0 ) {name = GD_T("Text in memory"); value = GetString();} - else if ( propertyNb == 1 ) {name = GD_T("Activated \?"); value = activated ? GD_T("Yes") : GD_T("No");} + if ( propertyNb == 0 ) {name = _("Text in memory"); value = GetString();} + else if ( propertyNb == 1 ) {name = _("Activated \?"); value = activated ? _("Yes") : _("No");} } bool RuntimeTextEntryObject::ChangeProperty(unsigned int propertyNb, string newValue) { if ( propertyNb == 0 ) { SetString(newValue); return true; } - else if ( propertyNb == 1 ) { activated = (newValue != GD_T("No")); return true; } + else if ( propertyNb == 1 ) { activated = (newValue != _("No")); return true; } return true; } diff --git a/Extensions/TextObject/Extension.cpp b/Extensions/TextObject/Extension.cpp index f4fd5e9e0e..ce668a046b 100644 --- a/Extensions/TextObject/Extension.cpp +++ b/Extensions/TextObject/Extension.cpp @@ -18,14 +18,14 @@ This project is released under the MIT License. void DeclareTextObjectExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("TextObject", - GD_T("Text object"), - GD_T("Extension allowing to use an object displaying a text."), + _("Text object"), + _("Extension allowing to use an object displaying a text."), "Florian Rival", "Open source (MIT License)"); gd::ObjectMetadata & obj = extension.AddObject("Text", - GD_T("Text"), - GD_T("Displays a text"), + _("Text"), + _("Displays a text"), "CppPlatform/Extensions/texticon.png", &CreateTextObject); @@ -35,103 +35,103 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) obj.AddAction("String", _("Modify the text"), _("Modify the text of a Text object."), - GD_T("Do _PARAM1__PARAM2_ to the text of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the text of _PARAM0_"), _(""), "res/actions/text24.png", "res/actions/text.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("string", GD_T("Text")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("string", _("Text")) .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("String", _("Compare the text"), _("Compare the text of a Text object."), - GD_T("Text of _PARAM0_ is _PARAM1__PARAM2_"), + _("Text of _PARAM0_ is _PARAM1__PARAM2_"), _(""), "res/conditions/text24.png", "res/conditions/text.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("string", GD_T("Text to test")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("string", _("Text to test")) .SetFunctionName("GetString").SetManipulatedType("string").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("Font", _("Font"), _("Modify the font of the text."), - GD_T("Change font of _PARAM0_ to _PARAM1_"), + _("Change font of _PARAM0_ to _PARAM1_"), _("Font"), "res/actions/font24.png", "res/actions/font.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("police", GD_T("Font")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("police", _("Font")) .SetFunctionName("ChangeFont").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("Size", _("Size"), _("Modify the size of the text."), - GD_T("Do _PARAM1__PARAM2_ to the size of the text of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the size of the text of _PARAM0_"), _(""), "res/actions/characterSize24.png", "res/actions/characterSize.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetCharacterSize").SetManipulatedType("number").SetGetter("GetCharacterSize").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Size", _("Size"), _("Test the size of the text"), - GD_T("The size of the text of _PARAM0_ is _PARAM1__PARAM2_"), + _("The size of the text of _PARAM0_ is _PARAM1__PARAM2_"), _(""), "res/conditions/characterSize24.png", "res/conditions/characterSize.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Size to test")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Size to test")) .SetFunctionName("GetCharacterSize").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("ChangeColor", _("Color"), _("Change the color of the text. The color is white by default."), - GD_T("Change color of _PARAM0_ to _PARAM1_"), + _("Change color of _PARAM0_ to _PARAM1_"), _("Effects"), "res/actions/color24.png", "res/actions/color.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("color", GD_T("Color")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("color", _("Color")) .SetFunctionName("SetColor").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("Opacity", _("Opacity"), _("Modify the opacity of a Text object."), - GD_T("Do _PARAM1__PARAM2_ to the opacity of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the opacity of _PARAM0_"), _(""), "res/actions/opacity24.png", "res/actions/opacity.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetOpacity").SetManipulatedType("number").SetGetter("GetOpacity").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Opacity", _("Opacity"), _("Test the value of the opacity of a text object."), - GD_T("The opacity of _PARAM0_ is _PARAM1__PARAM2_"), + _("The opacity of _PARAM0_ is _PARAM1__PARAM2_"), _(""), "res/conditions/opacity24.png", "res/conditions/opacity.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetOpacity").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); @@ -139,131 +139,131 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) obj.AddAction("SetSmooth", _("Smoothing"), _("Activate or desactivate text smoothing."), - GD_T("Smooth _PARAM0_: _PARAM1_"), + _("Smooth _PARAM0_: _PARAM1_"), _("Style"), "res/actions/opacity24.png", "res/actions/opacity.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("yesorno", GD_T("Smooth the text")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("yesorno", _("Smooth the text")) .SetFunctionName("SetSmooth").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Smoothed", _("Smoothing"), _("Test if an object is smoothed"), - GD_T("_PARAM0_ is smoothed"), + _("_PARAM0_ is smoothed"), _("Style"), "res/conditions/opacity24.png", "res/conditions/opacity.png") - .AddParameter("object", GD_T("Object"), "Text", false) + .AddParameter("object", _("Object"), "Text", false) .SetFunctionName("IsSmoothed").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("SetBold", _("Bold"), _("De/activate bold"), - GD_T("Set bold style of _PARAM0_ : _PARAM1_"), + _("Set bold style of _PARAM0_ : _PARAM1_"), _("Style"), "res/actions/bold.png", "res/actions/bold16.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("yesorno", GD_T("Set bold style")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("yesorno", _("Set bold style")) .SetFunctionName("SetBold").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("IsBold", _("Bold"), _("Test if bold style is activated"), - GD_T("_PARAM0_ bold style is set"), + _("_PARAM0_ bold style is set"), _("Style"), "res/conditions/bold.png", "res/conditions/bold16.png") - .AddParameter("object", GD_T("Object"), "Text", false) + .AddParameter("object", _("Object"), "Text", false) .SetFunctionName("IsBold").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("SetItalic", _("Italic"), _("De/activate italic."), - GD_T("Set italic style for _PARAM0_ : _PARAM1_"), + _("Set italic style for _PARAM0_ : _PARAM1_"), _("Style"), "res/actions/italic.png", "res/actions/italic16.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("yesorno", GD_T("Set italic")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("yesorno", _("Set italic")) .SetFunctionName("SetItalic").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("IsItalic", _("Italic"), _("Test if the italic style is activated"), - GD_T("_PARAM0_ italic style is set"), + _("_PARAM0_ italic style is set"), _("Style"), "res/conditions/italic.png", "res/conditions/italic16.png") - .AddParameter("object", GD_T("Object"), "Text", false) + .AddParameter("object", _("Object"), "Text", false) .SetFunctionName("IsItalic").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("SetUnderlined", _("Underlined"), _("De/activate underlined style."), - GD_T("Set underlined style of _PARAM0_: _PARAM1_"), + _("Set underlined style of _PARAM0_: _PARAM1_"), _("Style"), "res/actions/underline.png", "res/actions/underline16.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("yesorno", GD_T("Underline")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("yesorno", _("Underline")) .SetFunctionName("SetUnderlined").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("IsUnderlined", _("Underlined"), _("Test if the underlined style of an object is set."), - GD_T("_PARAM0_ underlined style is activated"), + _("_PARAM0_ underlined style is activated"), _("Style"), "res/conditions/underline.png", "res/conditions/underline16.png") - .AddParameter("object", GD_T("Object"), "Text", false) + .AddParameter("object", _("Object"), "Text", false) .SetFunctionName("IsUnderlined").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("Angle", _("Angle"), _("Modify the angle of a Text object."), - GD_T("Do _PARAM1__PARAM2_ to the angle of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the angle of _PARAM0_"), _("Rotation"), "res/actions/rotate24.png", "res/actions/rotate.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Angle", _("Angle"), _("Test the value of the angle of a text object."), - GD_T("The angle of _PARAM0_ is _PARAM1__PARAM2_"), + _("The angle of _PARAM0_ is _PARAM1__PARAM2_"), _("Rotation"), "res/conditions/rotate24.png", "res/conditions/rotate.png") - .AddParameter("object", GD_T("Object"), "Text", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "Text", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); - obj.AddExpression("Opacity", GD_T("Opacity"), GD_T("Opacity"), GD_T("Opacity"), "res/actions/opacity.png") - .AddParameter("object", GD_T("Object"), "Text", false) + obj.AddExpression("Opacity", _("Opacity"), _("Opacity"), _("Opacity"), "res/actions/opacity.png") + .AddParameter("object", _("Object"), "Text", false) .SetFunctionName("GetOpacity").SetIncludeFile("TextObject/TextObject.h"); - obj.AddExpression("Angle", GD_T("Angle"), GD_T("Angle"), GD_T("Rotation"), "res/actions/rotate.png") - .AddParameter("object", GD_T("Object"), "Text", false) + obj.AddExpression("Angle", _("Angle"), _("Angle"), _("Rotation"), "res/actions/rotate.png") + .AddParameter("object", _("Object"), "Text", false) .SetFunctionName("GetAngle").SetIncludeFile("TextObject/TextObject.h"); - obj.AddStrExpression("String", GD_T("Text"), GD_T("Text"), GD_T("Text"), "res/texteicon.png") - .AddParameter("object", GD_T("Object"), "Text", false) + obj.AddStrExpression("String", _("Text"), _("Text"), _("Text"), "res/texteicon.png") + .AddParameter("object", _("Object"), "Text", false) .SetFunctionName("GetString").SetIncludeFile("TextObject/TextObject.h"); #endif } diff --git a/Extensions/TextObject/JsExtension.cpp b/Extensions/TextObject/JsExtension.cpp index 84adb3d60d..c8ced3f46a 100644 --- a/Extensions/TextObject/JsExtension.cpp +++ b/Extensions/TextObject/JsExtension.cpp @@ -27,8 +27,8 @@ public: TextObjectJsExtension() { SetExtensionInformation("TextObject", - GD_T("Text object"), - GD_T("Extension allowing to use an object displaying a text."), + _("Text object"), + _("Extension allowing to use an object displaying a text."), "Compil Games", "Open source (MIT License)"); diff --git a/Extensions/TextObject/TextObject.cpp b/Extensions/TextObject/TextObject.cpp index 64d7b17c46..3f648fda17 100644 --- a/Extensions/TextObject/TextObject.cpp +++ b/Extensions/TextObject/TextObject.cpp @@ -344,12 +344,12 @@ void RuntimeTextObject::SetSmooth(bool smooth) #if defined(GD_IDE_ONLY) void RuntimeTextObject::GetPropertyForDebugger(unsigned int propertyNb, gd::String & name, gd::String & value) const { - if ( propertyNb == 0 ) {name = GD_T("Text"); value = GetString();} - else if ( propertyNb == 1 ) {name = GD_T("Font"); value = GetFontFilename();} - else if ( propertyNb == 2 ) {name = GD_T("Font Size"); value = gd::String::FromFloat(GetCharacterSize());} - else if ( propertyNb == 3 ) {name = GD_T("Color"); value = gd::String::FromFloat(GetColorR())+";"+gd::String::FromFloat(GetColorG())+";"+gd::String::FromFloat(GetColorB());} - else if ( propertyNb == 4 ) {name = GD_T("Opacity"); value = gd::String::FromFloat(GetOpacity());} - else if ( propertyNb == 5 ) {name = GD_T("Smoothing"); value = smoothed ? GD_T("Yes") : GD_T("No");} + if ( propertyNb == 0 ) {name = _("Text"); value = GetString();} + else if ( propertyNb == 1 ) {name = _("Font"); value = GetFontFilename();} + else if ( propertyNb == 2 ) {name = _("Font Size"); value = gd::String::FromFloat(GetCharacterSize());} + else if ( propertyNb == 3 ) {name = _("Color"); value = gd::String::FromFloat(GetColorR())+";"+gd::String::FromFloat(GetColorG())+";"+gd::String::FromFloat(GetColorB());} + else if ( propertyNb == 4 ) {name = _("Opacity"); value = gd::String::FromFloat(GetOpacity());} + else if ( propertyNb == 5 ) {name = _("Smoothing"); value = smoothed ? _("Yes") : _("No");} } bool RuntimeTextObject::ChangeProperty(unsigned int propertyNb, gd::String newValue) @@ -383,7 +383,7 @@ bool RuntimeTextObject::ChangeProperty(unsigned int propertyNb, gd::String newVa SetColor(r.ToInt(), g.ToInt(), b.ToInt()); } else if ( propertyNb == 4 ) { SetOpacity(newValue.ToFloat()); } - else if ( propertyNb == 5 ) { SetSmooth(!(newValue == GD_T("No"))); } + else if ( propertyNb == 5 ) { SetSmooth(!(newValue == _("No"))); } return true; } diff --git a/Extensions/TileMapObject/Extension.cpp b/Extensions/TileMapObject/Extension.cpp index 8de6eeb00b..ca2c0aedfc 100644 --- a/Extensions/TileMapObject/Extension.cpp +++ b/Extensions/TileMapObject/Extension.cpp @@ -19,14 +19,14 @@ This project is released under the MIT License. void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("TileMapObject", - GD_T("Tile Map Object"), - GD_T("Extension allowing to use tile map objects."), + _("Tile Map Object"), + _("Extension allowing to use tile map objects."), "Victor Levasseur and Florian Rival", "Open source (MIT License)"); gd::ObjectMetadata & obj = extension.AddObject("TileMap", - GD_T("Tile Map"), - GD_T("Displays a tile map"), + _("Tile Map"), + _("Displays a tile map"), "CppPlatform/Extensions/TileMapIcon.png", &CreateTileMapObject); @@ -36,26 +36,26 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) obj.AddCondition("Width", _("Width"), _("Test the width of a Tile Map Object."), - GD_T("The width of _PARAM0_ is _PARAM1__PARAM2_"), + _("The width of _PARAM0_ is _PARAM1__PARAM2_"), _("Size"), "res/conditions/scaleWidth24.png", "res/conditions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "TileMap", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddCondition("Height", _("Height"), _("Test the height of a Tile Map Object."), - GD_T("The height of _PARAM0_ is _PARAM1__PARAM2_"), + _("The height of _PARAM0_ is _PARAM1__PARAM2_"), _("Size"), "res/conditions/scaleHeight24.png", "res/conditions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "TileMap", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetHeight").SetManipulatedType("number").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); @@ -75,88 +75,88 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) extension.AddCondition("SingleTileCollision", _("Collision with one tile"), _("Test if an object collides a specific tile."), - GD_T("_PARAM4_ is in collision with the tile at _PARAM2_;_PARAM3_ (layer _PARAM1_) of _PARAM0_"), + _("_PARAM4_ is in collision with the tile at _PARAM2_;_PARAM3_ (layer _PARAM1_) of _PARAM0_"), _("Collisions"), "res/conditions/collision24.png", "res/conditions/collision.png") - .AddParameter("objectList", GD_T("Tile Map Object"), "TileMap", false) - .AddParameter("expression", GD_T("Tile layer (0: Back, 1: Middle, 2: Top)")) - .AddParameter("expression", GD_T("Tile column")) - .AddParameter("expression", GD_T("Tile row")) - .AddParameter("objectList", GD_T("Object")) + .AddParameter("objectList", _("Tile Map Object"), "TileMap", false) + .AddParameter("expression", _("Tile layer (0: Back, 1: Middle, 2: Top)")) + .AddParameter("expression", _("Tile column")) + .AddParameter("expression", _("Tile row")) + .AddParameter("objectList", _("Object")) .AddCodeOnlyParameter("conditionInverted", "") .MarkAsSimple() .SetFunctionName("SingleTileCollision").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); - obj.AddExpression("TileWidth", GD_T("Tile width"), GD_T("Tile width"), GD_T("Tiles"), "res/TileMapIcon16.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) + obj.AddExpression("TileWidth", _("Tile width"), _("Tile width"), _("Tiles"), "res/TileMapIcon16.png") + .AddParameter("object", _("Object"), "TileMap", false) .SetFunctionName("GetTileWidth").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); - obj.AddExpression("TileHeight", GD_T("Tile height"), GD_T("Tile height"), GD_T("Tiles"), "res/TileMapIcon16.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) + obj.AddExpression("TileHeight", _("Tile height"), _("Tile height"), _("Tiles"), "res/TileMapIcon16.png") + .AddParameter("object", _("Object"), "TileMap", false) .SetFunctionName("GetTileHeight").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); - obj.AddExpression("MapWidth", GD_T("Map width (tiles)"), GD_T("Map width"), GD_T("Map"), "res/TileMapIcon16.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) + obj.AddExpression("MapWidth", _("Map width (tiles)"), _("Map width"), _("Map"), "res/TileMapIcon16.png") + .AddParameter("object", _("Object"), "TileMap", false) .SetFunctionName("GetMapWidth").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); - obj.AddExpression("MapHeight", GD_T("Map height (tiles)"), GD_T("Map height"), GD_T("Map"), "res/TileMapIcon16.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) + obj.AddExpression("MapHeight", _("Map height (tiles)"), _("Map height"), _("Map"), "res/TileMapIcon16.png") + .AddParameter("object", _("Object"), "TileMap", false) .SetFunctionName("GetMapHeight").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); - obj.AddExpression("GetTile", GD_T("Get the Tile (id)"), GD_T("Get the Tile (id)"), GD_T("Map"), "res/TileMapIcon16.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) - .AddParameter("expression", GD_T("Layer"), "", false) - .AddParameter("expression", GD_T("Column"), "", false) - .AddParameter("expression", GD_T("Row"), "", false) + obj.AddExpression("GetTile", _("Get the Tile (id)"), _("Get the Tile (id)"), _("Map"), "res/TileMapIcon16.png") + .AddParameter("object", _("Object"), "TileMap", false) + .AddParameter("expression", _("Layer"), "", false) + .AddParameter("expression", _("Column"), "", false) + .AddParameter("expression", _("Row"), "", false) .SetFunctionName("GetTile").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddAction("SetTile", _("Change a tile"), _("Change a tile at a specific cell."), - GD_T("Set tile #_PARAM4_ at the cell _PARAM2_;_PARAM3_ (layer: _PARAM1_) in _PARAM0_"), + _("Set tile #_PARAM4_ at the cell _PARAM2_;_PARAM3_ (layer: _PARAM1_) in _PARAM0_"), _("Tiles"), "CppPlatform/Extensions/TileMapIcon24.png", "res/TileMapIcon16.png") - .AddParameter("objectList", GD_T("Tile Map Object"), "TileMap", false) - .AddParameter("expression", GD_T("Tile layer (0: Back, 1: Middle, 2: Top)")) - .AddParameter("expression", GD_T("Tile column")) - .AddParameter("expression", GD_T("Tile row")) - .AddParameter("expression", GD_T("New tile Id (-1 to delete the tile)")) + .AddParameter("objectList", _("Tile Map Object"), "TileMap", false) + .AddParameter("expression", _("Tile layer (0: Back, 1: Middle, 2: Top)")) + .AddParameter("expression", _("Tile column")) + .AddParameter("expression", _("Tile row")) + .AddParameter("expression", _("New tile Id (-1 to delete the tile)")) .MarkAsSimple() .SetFunctionName("SetTile").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); - obj.AddExpression("GetColumnAt", GD_T("Get tile column from X coordinates"), GD_T("Get tile column from X coordinates"), GD_T("Map"), "res/TileMapIcon16.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) - .AddParameter("expression", GD_T("X"), "", false) + obj.AddExpression("GetColumnAt", _("Get tile column from X coordinates"), _("Get tile column from X coordinates"), _("Map"), "res/TileMapIcon16.png") + .AddParameter("object", _("Object"), "TileMap", false) + .AddParameter("expression", _("X"), "", false) .SetFunctionName("GetColumnAt").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); - obj.AddExpression("GetRowAt", GD_T("Get tile row from Y coordinates"), GD_T("Get tile row from Y coordinates"), GD_T("Map"), "res/TileMapIcon16.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) - .AddParameter("expression", GD_T("Y"), "", false) + obj.AddExpression("GetRowAt", _("Get tile row from Y coordinates"), _("Get tile row from Y coordinates"), _("Map"), "res/TileMapIcon16.png") + .AddParameter("object", _("Object"), "TileMap", false) + .AddParameter("expression", _("Y"), "", false) .SetFunctionName("GetRowAt").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); - obj.AddStrExpression("SaveTiles", GD_T("Save the tile map"), GD_T("Save the tile map content in a string"), GD_T("Saving"), "res/TileMapIcon16.png") - .AddParameter("object", GD_T("Object"), "TileMap", false) + obj.AddStrExpression("SaveTiles", _("Save the tile map"), _("Save the tile map content in a string"), _("Saving"), "res/TileMapIcon16.png") + .AddParameter("object", _("Object"), "TileMap", false) .SetFunctionName("SaveAsString").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddAction("LoadTiles", _("Load the tiles from a string"), _("Load the tiles from a string."), - GD_T("Load the tiles of _PARAM0_ from _PARAM1_"), + _("Load the tiles of _PARAM0_ from _PARAM1_"), _("Loading"), "CppPlatform/Extensions/TileMapIcon24.png", "res/TileMapIcon16.png") - .AddParameter("objectList", GD_T("Tile Map Object"), "TileMap", false) - .AddParameter("string", GD_T("The string representing the tiles")) + .AddParameter("objectList", _("Tile Map Object"), "TileMap", false) + .AddParameter("string", _("The string representing the tiles")) .MarkAsSimple() .SetFunctionName("LoadFromString").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); @@ -165,12 +165,12 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) obj.AddAction("ChangeTexture", _("Change the tileset texture"), _("Change the tileset texture."), - GD_T("Change the tileset texture of _PARAM0_ to _PARAM1_"), + _("Change the tileset texture of _PARAM0_ to _PARAM1_"), _("Tileset"), "CppPlatform/Extensions/TileMapIcon24.png", "res/TileMapIcon16.png") - .AddParameter("objectList", GD_T("Tile Map Object"), "TileMap", false) - .AddParameter("string", GD_T("The new texture name")) + .AddParameter("objectList", _("Tile Map Object"), "TileMap", false) + .AddParameter("string", _("The new texture name")) .AddCodeOnlyParameter("currentScene", "") .MarkAsSimple() .SetFunctionName("ChangeTexture").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); diff --git a/Extensions/TileMapObject/TileSetConfigurationEditor.cpp b/Extensions/TileMapObject/TileSetConfigurationEditor.cpp index 00439a402d..38d214cac9 100644 --- a/Extensions/TileMapObject/TileSetConfigurationEditor.cpp +++ b/Extensions/TileMapObject/TileSetConfigurationEditor.cpp @@ -79,7 +79,7 @@ void TileSetConfigurationEditor::OnSetTextureButtonClicked(wxCommandEvent& event { if ( !m_auimgr->GetPane(resourcesEditorPnl).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } @@ -115,7 +115,7 @@ void TileSetConfigurationEditor::OnTileSetParameterUpdated(wxSpinEvent& event) void TileSetConfigurationEditor::OnHelpButtonClicked(wxHyperlinkEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/built_tilemap/tilesetconfig")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/built_tilemap/tilesetconfig")); } #endif diff --git a/Extensions/TiledSpriteObject/Extension.cpp b/Extensions/TiledSpriteObject/Extension.cpp index 56528db67f..bb2541eb14 100644 --- a/Extensions/TiledSpriteObject/Extension.cpp +++ b/Extensions/TiledSpriteObject/Extension.cpp @@ -15,14 +15,14 @@ This project is released under the MIT License. void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("TiledSpriteObject", - GD_T("Tiled Sprite Object"), - GD_T("Extension allowing to use tiled sprite objects."), + _("Tiled Sprite Object"), + _("Extension allowing to use tiled sprite objects."), "Victor Levasseur and Florian Rival", "Open source (MIT License)"); gd::ObjectMetadata & obj = extension.AddObject("TiledSprite", - GD_T("Tiled Sprite"), - GD_T("Displays an image repeated over an area"), + _("Tiled Sprite"), + _("Displays an image repeated over an area"), "CppPlatform/Extensions/TiledSpriteIcon.png", &CreateTiledSpriteObject); @@ -32,26 +32,26 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) obj.AddAction("Width", _("Width"), _("Modify the width of a Tiled Sprite."), - GD_T("Do _PARAM1__PARAM2_ to the width of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the width of _PARAM0_"), _("Size and angle"), "res/actions/scaleWidth24.png", "res/actions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetWidth").SetManipulatedType("number").SetGetter("GetWidth").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddCondition("Width", _("Width"), _("Test the width of a Tiled Sprite."), - GD_T("The width of _PARAM0_ is _PARAM1__PARAM2_"), + _("The width of _PARAM0_ is _PARAM1__PARAM2_"), _("Size and angle"), "res/conditions/scaleWidth24.png", "res/conditions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); @@ -59,27 +59,27 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) obj.AddAction("Height", _("Height"), _("Modify the height of a Tiled Sprite."), - GD_T("Do _PARAM1__PARAM2_ to the height of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the height of _PARAM0_"), _("Size and angle"), "res/actions/scaleHeight24.png", "res/actions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetHeight").SetManipulatedType("number").SetGetter("GetHeight").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddCondition("Height", _("Height"), _("Test the height of a Tiled Sprite."), - GD_T("The height of _PARAM0_ is _PARAM1__PARAM2_"), + _("The height of _PARAM0_ is _PARAM1__PARAM2_"), _("Size and angle"), "res/conditions/scaleHeight24.png", "res/conditions/scaleHeight.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetHeight").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); @@ -87,14 +87,14 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) obj.AddAction("Angle", _("Angle"), _("Modify the angle of a Tiled Sprite."), - GD_T("Do _PARAM1__PARAM2_ to the angle of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the angle of _PARAM0_"), _("Size and angle"), "res/actions/rotate24.png", "res/actions/rotate.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); @@ -102,27 +102,27 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) obj.AddCondition("Angle", _("Angle"), _("Test the angle of a Tiled Sprite."), - GD_T("The angle of _PARAM0_ is _PARAM1__PARAM2_"), + _("The angle of _PARAM0_ is _PARAM1__PARAM2_"), _("Size and angle"), "res/conditions/rotate24.png", "res/conditions/rotate.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .SetHidden() //Now available for all objects .SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddAction("XOffset", _("Image X Offset"), _("Modify the offset used on the X axis when displaying the image."), - GD_T("Do _PARAM1__PARAM2_ to the X offset of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the X offset of _PARAM0_"), _("Image offset"), "res/conditions/scaleWidth24.png", "res/conditions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetXOffset").SetManipulatedType("number").SetGetter("GetXOffset").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); @@ -130,26 +130,26 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) obj.AddCondition("XOffset", _("Image X Offset"), _("Test the offset used on the X axis when displaying the image."), - GD_T("The X offset of _PARAM0_ is _PARAM1__PARAM2_"), + _("The X offset of _PARAM0_ is _PARAM1__PARAM2_"), _("Image offset"), "res/conditions/scaleWidth24.png", "res/conditions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetXOffset").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddAction("YOffset", _("Image Y Offset"), _("Modify the offset used on the Y axis when displaying the image."), - GD_T("Do _PARAM1__PARAM2_ to the Y offset of _PARAM0_"), + _("Do _PARAM1__PARAM2_ to the Y offset of _PARAM0_"), _("Image offset"), "res/conditions/scaleWidth24.png", "res/conditions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetYOffset").SetManipulatedType("number").SetGetter("GetYOffset").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); @@ -157,13 +157,13 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) obj.AddCondition("YOffset", _("Image Y Offset"), _("Test the offset used on the Y axis when displaying the image."), - GD_T("The Y offset of _PARAM0_ is _PARAM1__PARAM2_"), + _("The Y offset of _PARAM0_ is _PARAM1__PARAM2_"), _("Image offset"), "res/conditions/scaleWidth24.png", "res/conditions/scaleWidth.png") - .AddParameter("object", GD_T("Object"), "TiledSprite", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value to test")) + .AddParameter("object", _("Object"), "TiledSprite", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() .SetFunctionName("GetYOffset").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); #endif diff --git a/Extensions/TiledSpriteObject/TiledSpriteObject.cpp b/Extensions/TiledSpriteObject/TiledSpriteObject.cpp index ae383df088..d90d265a5e 100644 --- a/Extensions/TiledSpriteObject/TiledSpriteObject.cpp +++ b/Extensions/TiledSpriteObject/TiledSpriteObject.cpp @@ -177,9 +177,9 @@ void TiledSpriteObject::EditObject( wxWindow* parent, gd::Project & game, gd::Ma void RuntimeTiledSpriteObject::GetPropertyForDebugger(unsigned int propertyNb, string & name, string & value) const { - if ( propertyNb == 0 ) {name = GD_T("Width"); value = ToString(width);} - else if ( propertyNb == 1 ) {name = GD_T("Height"); value = ToString(height);} - else if ( propertyNb == 2 ) {name = GD_T("Angle"); value = ToString(angle);} + if ( propertyNb == 0 ) {name = _("Width"); value = ToString(width);} + else if ( propertyNb == 1 ) {name = _("Height"); value = ToString(height);} + else if ( propertyNb == 2 ) {name = _("Angle"); value = ToString(angle);} } bool RuntimeTiledSpriteObject::ChangeProperty(unsigned int propertyNb, string newValue) diff --git a/Extensions/TiledSpriteObject/TiledSpriteObjectEditor.cpp b/Extensions/TiledSpriteObject/TiledSpriteObjectEditor.cpp index ca7923c7ab..98e4adbf22 100644 --- a/Extensions/TiledSpriteObject/TiledSpriteObjectEditor.cpp +++ b/Extensions/TiledSpriteObject/TiledSpriteObjectEditor.cpp @@ -179,7 +179,7 @@ void TiledSpriteObjectEditor::OnfrontAddFromBtClick(wxCommandEvent& event) { if ( !m_mgr.GetPane( resourcesEditor ).IsShown() ) { - gd::LogMessage(GD_T("Please display the image bank's editor and select an image before clicking on this button.")); + gd::LogMessage(_("Please display the image bank's editor and select an image before clicking on this button.")); return; } diff --git a/Extensions/TimedEvent/Extension.cpp b/Extensions/TimedEvent/Extension.cpp index d7df832ac9..96b8021f71 100644 --- a/Extensions/TimedEvent/Extension.cpp +++ b/Extensions/TimedEvent/Extension.cpp @@ -31,8 +31,8 @@ public: Extension() { SetExtensionInformation("TimedEvent", - GD_T("Timed events"), - GD_T("Event which launch its conditions and actions only after a amount of time is reached."), + _("Timed events"), + _("Event which launch its conditions and actions only after a amount of time is reached."), "Florian Rival", "Open source (MIT License)"); @@ -183,7 +183,7 @@ public: if ( name.find("GDNamedTimedEvent_") == 0 && name.length() > 18 ) name = name.substr(18, name.length()); else - name = GD_T("No name"); + name = _("No name"); value = ToString(static_cast(iter->second.GetTime())/1000000.0)+"s"; diff --git a/Extensions/TimedEvent/TimedEvent.cpp b/Extensions/TimedEvent/TimedEvent.cpp index ac017295b5..0729137ae3 100644 --- a/Extensions/TimedEvent/TimedEvent.cpp +++ b/Extensions/TimedEvent/TimedEvent.cpp @@ -120,7 +120,7 @@ void TimedEvent::Render(wxDC & dc, int x, int y, unsigned int width, gd::EventsE dc.SetTextForeground(wxColour(0,0,0)); std::string nameTxt; if ( !name.empty() ) nameTxt = _T(" (Nom : "+name + ")"); - dc.DrawText( GD_T("Delayed execution after ")+timeout.GetPlainString()+GD_T(" seconds.")+" "+nameTxt, x + 4, y + 3 ); + dc.DrawText( _("Delayed execution after ")+timeout.GetPlainString()+_(" seconds.")+" "+nameTxt, x + 4, y + 3 ); //Draw conditions rectangle wxRect rect(x, y+functionTextHeight, renderingHelper->GetConditionsColumnWidth()+border, GetRenderedHeight(width, platform)-functionTextHeight); diff --git a/Extensions/TopDownMovementAutomatism/Extension.cpp b/Extensions/TopDownMovementAutomatism/Extension.cpp index 21f850e78f..18d5300104 100644 --- a/Extensions/TopDownMovementAutomatism/Extension.cpp +++ b/Extensions/TopDownMovementAutomatism/Extension.cpp @@ -14,15 +14,15 @@ This project is released under the MIT License. void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension) { extension.SetExtensionInformation("TopDownMovementAutomatism", - GD_T("Top-down movement"), - GD_T("Move objects in 4 or 8 directions"), + _("Top-down movement"), + _("Move objects in 4 or 8 directions"), "Florian Rival", "Open source (MIT License)"); gd::AutomatismMetadata & aut = extension.AddAutomatism("TopDownMovementAutomatism", - GD_T("Top-down movement (4 or 8 directions)"), + _("Top-down movement (4 or 8 directions)"), "TopDownMovement", - GD_T("The object can be moved left, up, right, down and optionally diagonals."), + _("The object can be moved left, up, right, down and optionally diagonals."), "", "CppPlatform/Extensions/topdownmovementicon.png", "TopDownMovementAutomatism", @@ -36,318 +36,318 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension aut.AddAction("SimulateLeftKey", _("Simulate left key press"), _("Simulate a pressing on left key."), - GD_T("Simulate pressing Left for _PARAM0_"), + _("Simulate pressing Left for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() .SetFunctionName("SimulateLeftKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("SimulateRightKey", _("Simulate right key press"), _("Simulate a pressing on right key."), - GD_T("Simulate pressing Right for _PARAM0_"), + _("Simulate pressing Right for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() .SetFunctionName("SimulateRightKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("SimulateUpKey", _("Simulate up key press"), _("Simulate a pressing on up key ( Used when on a ladder )."), - GD_T("Simulate pressing Up for _PARAM0_"), + _("Simulate pressing Up for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() .SetFunctionName("SimulateUpKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("SimulateDownKey", _("Simulate down key press"), _("Simulate a pressing on down key ( Used when on a ladder )."), - GD_T("Simulate pressing Down for _PARAM0_"), + _("Simulate pressing Down for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() .SetFunctionName("SimulateDownKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("SimulateControl", _("Simulate control"), _("Simulate a pressing on a key.\nValid keys are Left, Right, Up, Down."), - GD_T("Simulate pressing _PARAM2_ key for _PARAM0_"), + _("Simulate pressing _PARAM2_ key for _PARAM0_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("string", GD_T("Key")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("string", _("Key")) .MarkAsAdvanced() .SetFunctionName("SimulateControl").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("IgnoreDefaultControls", _("Ignore default controls"), _("De/activate the use of default controls.\nIf deactivated, use the simulate actions to move the object."), - GD_T("Ignore default controls for _PARAM0_: _PARAM2_"), + _("Ignore default controls for _PARAM0_: _PARAM2_"), _("Controls"), "res/conditions/keyboard24.png", "res/conditions/keyboard.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("yesorno", GD_T("Ignore controls")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("yesorno", _("Ignore controls")) .MarkAsAdvanced() .SetFunctionName("IgnoreDefaultControls").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("IsMoving", _("Is moving"), _("Check if the object is moving."), - GD_T("_PARAM0_ is moving"), + _("_PARAM0_ is moving"), _(""), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .SetFunctionName("IsMoving").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("Acceleration", _("Acceleration"), _("Change the acceleration of the object"), - GD_T("Do _PARAM2__PARAM3_ to the acceleration of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the acceleration of _PARAM0_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetAcceleration").SetGetter("GetAcceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("Acceleration", _("Acceleration"), _("Compare the acceleration of the object"), - GD_T("Acceleration of _PARAM0_ is _PARAM2__PARAM3_"), + _("Acceleration of _PARAM0_ is _PARAM2__PARAM3_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("Deceleration", _("Deceleration"), _("Change the deceleration of the object"), - GD_T("Do _PARAM2__PARAM3_ to the deceleration of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the deceleration of _PARAM0_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetDeceleration").SetGetter("GetDeceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("Deceleration", _("Deceleration"), _("Compare the deceleration of the object"), - GD_T("Deceleration of _PARAM0_ is _PARAM2__PARAM3_"), + _("Deceleration of _PARAM0_ is _PARAM2__PARAM3_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("GetDeceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("MaxSpeed", _("Maximum speed"), _("Change the maximum speed of the object"), - GD_T("Do _PARAM2__PARAM3_ to the max. speed of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the max. speed of _PARAM0_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .SetFunctionName("SetMaxSpeed").SetGetter("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("MaxSpeed", _("Maximum speed"), _("Compare the maximum speed of the object"), - GD_T("Max. speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("Max. speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("Speed", _("Speed"), _("Compare the speed of the object"), - GD_T("Speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("Speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("AngularMaxSpeed", _("Angular maximum speed"), _("Change the maximum angular speed of the object"), - GD_T("Do _PARAM2__PARAM3_ to the max. angular speed of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the max. angular speed of _PARAM0_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetAngularMaxSpeed").SetGetter("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("AngularMaxSpeed", _("Angular maximum speed"), _("Compare the maximum angular speed of the object"), - GD_T("Max. angular speed of _PARAM0_ is _PARAM2__PARAM3_"), + _("Max. angular speed of _PARAM0_ is _PARAM2__PARAM3_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("AngleOffset", _("Rotation offset"), _("Change the rotation offset applied when moving the object"), - GD_T("Do _PARAM2__PARAM3_ to the rotation offset of _PARAM0_"), + _("Do _PARAM2__PARAM3_ to the rotation offset of _PARAM0_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("operator", GD_T("Modification's sign")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("operator", _("Modification's sign")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("SetAngleOffset").SetGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("AngleOffset", _("Rotation offset"), _("Compare the rotation offset applied when moving the object"), - GD_T("Rotation offset of _PARAM0_ is _PARAM2__PARAM3_"), + _("Rotation offset of _PARAM0_ is _PARAM2__PARAM3_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("relationalOperator", GD_T("Sign of the test")) - .AddParameter("expression", GD_T("Value")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("relationalOperator", _("Sign of the test")) + .AddParameter("expression", _("Value")) .MarkAsAdvanced() .SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("AllowDiagonals", _("Diagonals moves"), _("Allow or restrict diagonal moves"), - GD_T("Allow diagonal moves for _PARAM0_: _PARAM2_"), + _("Allow diagonal moves for _PARAM0_: _PARAM2_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("yesorno", GD_T("Allow?")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("yesorno", _("Allow?")) .SetFunctionName("SetAllowDiagonals").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("DiagonalsAllowed", _("Diagonals moves"), _("Return true if the object is allowed to do diagonal moves"), - GD_T("Size of the extra border applied to _PARAM0_ is _PARAM2__PARAM3_"), + _("Size of the extra border applied to _PARAM0_ is _PARAM2__PARAM3_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() .SetFunctionName("DiagonalsAllowed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("RotateObject", _("Rotate the object"), _("Enable or disable rotation of the object"), - GD_T("Enable rotation of _PARAM0_: _PARAM2_"), + _("Enable rotation of _PARAM0_: _PARAM2_"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) - .AddParameter("yesorno", GD_T("Rotate object?")) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("yesorno", _("Rotate object?")) .MarkAsAdvanced() .SetFunctionName("SetRotateObject").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("ObjectRotated", _("Object rotated"), _("Return true if the object is rotated when traveling on its path."), - GD_T("_PARAM0_ is rotated when moving"), + _("_PARAM0_ is rotated when moving"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon24.png", "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() .SetFunctionName("IsObjectRotated").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); - aut.AddExpression("Acceleration", GD_T("Acceleration"), GD_T("Acceleration of the object"), GD_T("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + aut.AddExpression("Acceleration", _("Acceleration"), _("Acceleration of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .SetFunctionName("GetAcceleration").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); - aut.AddExpression("Deceleration", GD_T("Deceleration"), GD_T("Deceleration of the object"), GD_T("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + aut.AddExpression("Deceleration", _("Deceleration"), _("Deceleration of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .SetFunctionName("GetDeceleration").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); - aut.AddExpression("MaxSpeed", GD_T("Maximum speed"), GD_T("Maximum speed of the object"), GD_T("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + aut.AddExpression("MaxSpeed", _("Maximum speed"), _("Maximum speed of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .SetFunctionName("GetMaxSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); - aut.AddExpression("Speed", GD_T("Speed"), GD_T("Speed of the object"), GD_T("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + aut.AddExpression("Speed", _("Speed"), _("Speed of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .SetFunctionName("GetSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); - aut.AddExpression("AngularMaxSpeed", GD_T("Angular maximum speed"), GD_T("Angular maximum speed of the object"), GD_T("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + aut.AddExpression("AngularMaxSpeed", _("Angular maximum speed"), _("Angular maximum speed of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .SetFunctionName("GetAngularMaxSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); - aut.AddExpression("AngleOffset", GD_T("Rotation offset"), GD_T("Rotation offset applied to the object"), GD_T("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("automatism", GD_T("Automatism"), "TopDownMovementAutomatism", false) + aut.AddExpression("AngleOffset", _("Rotation offset"), _("Rotation offset applied to the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") + .AddParameter("object", _("Object")) + .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .SetFunctionName("GetAngleOffset").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); #endif } diff --git a/Extensions/TopDownMovementAutomatism/TopDownMovementAutomatism.cpp b/Extensions/TopDownMovementAutomatism/TopDownMovementAutomatism.cpp index 7bda858a09..21f8985dd6 100644 --- a/Extensions/TopDownMovementAutomatism/TopDownMovementAutomatism.cpp +++ b/Extensions/TopDownMovementAutomatism/TopDownMovementAutomatism.cpp @@ -187,44 +187,44 @@ std::map TopDownMovementAutomatism::GetProp { std::map properties; - properties[GD_T("Allows diagonals")].SetValue(allowDiagonals ? "true" : "false").SetType("Boolean"); - properties[GD_T("Acceleration")].SetValue(ToString(acceleration)); - properties[GD_T("Deceleration")].SetValue(ToString(deceleration)); - properties[GD_T("Max. speed")].SetValue(ToString(maxSpeed)); - properties[GD_T("Rotate speed")].SetValue(ToString(angularMaxSpeed)); - properties[GD_T("Rotate object")].SetValue(rotateObject ? "true" : "false").SetType("Boolean"); - properties[GD_T("Angle offset")].SetValue(ToString(angleOffset)); - properties[GD_T("Default controls")].SetValue(ignoreDefaultControls ? "false" : "true").SetType("Boolean"); + properties[_("Allows diagonals")].SetValue(allowDiagonals ? "true" : "false").SetType("Boolean"); + properties[_("Acceleration")].SetValue(ToString(acceleration)); + properties[_("Deceleration")].SetValue(ToString(deceleration)); + properties[_("Max. speed")].SetValue(ToString(maxSpeed)); + properties[_("Rotate speed")].SetValue(ToString(angularMaxSpeed)); + properties[_("Rotate object")].SetValue(rotateObject ? "true" : "false").SetType("Boolean"); + properties[_("Angle offset")].SetValue(ToString(angleOffset)); + properties[_("Default controls")].SetValue(ignoreDefaultControls ? "false" : "true").SetType("Boolean"); return properties; } bool TopDownMovementAutomatism::UpdateProperty(const std::string & name, const std::string & value, gd::Project & project) { - if ( name == GD_T("Default controls") ) { + if ( name == _("Default controls") ) { ignoreDefaultControls = (value == "0"); return true; } - if ( name == GD_T("Allows diagonals") ) { + if ( name == _("Allows diagonals") ) { allowDiagonals = (value != "0"); return true; } - if ( name == GD_T("Rotate object") ) { + if ( name == _("Rotate object") ) { rotateObject = (value != "0"); return true; } if ( ToDouble(value) < 0 ) return false; - if ( name == GD_T("Acceleration") ) + if ( name == _("Acceleration") ) acceleration = ToDouble(value); - else if ( name == GD_T("Deceleration") ) + else if ( name == _("Deceleration") ) deceleration = ToDouble(value); - else if ( name == GD_T("Max. speed") ) + else if ( name == _("Max. speed") ) maxSpeed = ToDouble(value); - else if ( name == GD_T("Rotate speed") ) + else if ( name == _("Rotate speed") ) angularMaxSpeed = ToDouble(value); - else if ( name == GD_T("Angle offset") ) + else if ( name == _("Angle offset") ) angleOffset = ToDouble(value); else return false; diff --git a/GDCpp/GDCpp/BuiltinExtensions/AudioExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/AudioExtension.cpp index d3fbe834fd..b409293a15 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/AudioExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/AudioExtension.cpp @@ -79,7 +79,7 @@ void AudioExtension::GetPropertyForDebugger(RuntimeScene & scene, unsigned int p { if ( propertyNb == 0 ) { - name = GD_T("Global volume:"); + name = _("Global volume:"); value = gd::String::FromFloat(SoundManager::Get()->GetGlobalVolume()); } else if ( propertyNb < 1+SoundManager::Get()->sounds.size()*3 ) @@ -92,23 +92,23 @@ void AudioExtension::GetPropertyForDebugger(RuntimeScene & scene, unsigned int p sf::Sound::Status soundStatus = SoundManager::Get()->sounds[soundNb]->GetStatus(); if ( soundStatus == sf::Sound::Playing) - name = GD_T("Sound played:"); + name = _("Sound played:"); else if ( soundStatus == sf::Sound::Stopped) - name = GD_T("Sound stopped:"); + name = _("Sound stopped:"); else if ( soundStatus == sf::Sound::Paused) - name = GD_T("Paused sound:"); + name = _("Paused sound:"); value = SoundManager::Get()->sounds[soundNb]->file; } else if ( propertyNb % 3 == 2) { - name = GD_T(" -Volume/Pitch:"); + name = _(" -Volume/Pitch:"); value = gd::String::FromFloat(SoundManager::Get()->sounds[soundNb]->GetVolume()) +"/"+gd::String::FromFloat(SoundManager::Get()->sounds[soundNb]->GetPitch()); } else { - name = GD_T(" -Progress (seconds) :"); + name = _(" -Progress (seconds) :"); value = gd::String::FromFloat(SoundManager::Get()->sounds[soundNb]->GetPlayingOffset()); } @@ -123,23 +123,23 @@ void AudioExtension::GetPropertyForDebugger(RuntimeScene & scene, unsigned int p sf::Sound::Status soundStatus = SoundManager::Get()->musics[musicNb]->GetStatus(); if ( soundStatus == sf::Sound::Playing) - name = GD_T("Played music:"); + name = _("Played music:"); else if ( soundStatus == sf::Sound::Stopped) - name = GD_T("Stopped music:"); + name = _("Stopped music:"); else if ( soundStatus == sf::Sound::Paused) - name = GD_T("Paused music:"); + name = _("Paused music:"); value = SoundManager::Get()->musics[musicNb]->file; } else if ( propertyNb % 3 == 2) { - name = GD_T(" -Volume/Pitch:"); + name = _(" -Volume/Pitch:"); value = gd::String::FromFloat(SoundManager::Get()->musics[musicNb]->GetVolume()) +"/"+gd::String::FromFloat(SoundManager::Get()->musics[musicNb]->GetPitch()); } else { - name = GD_T(" -Progress (seconds) :"); + name = _(" -Progress (seconds) :"); value = gd::String::FromFloat(SoundManager::Get()->musics[musicNb]->GetPlayingOffset()); } } diff --git a/GDCpp/GDCpp/BuiltinExtensions/FileExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/FileExtension.cpp index 63111dd2d5..6f460e35a6 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/FileExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/FileExtension.cpp @@ -36,7 +36,7 @@ void FileExtension::GetPropertyForDebugger(RuntimeScene & scene, unsigned int pr { if ( propertyNb == i ) { - name = GD_T("Opened file:"); + name = _("Opened file:"); value = iter->first; return; diff --git a/GDCpp/GDCpp/CppPlatform.cpp b/GDCpp/GDCpp/CppPlatform.cpp index 532406597d..7a34ee82de 100644 --- a/GDCpp/GDCpp/CppPlatform.cpp +++ b/GDCpp/GDCpp/CppPlatform.cpp @@ -147,7 +147,7 @@ std::shared_ptr CppPlatform::CreateRuntimeObject(RuntimeScene & s #if defined(GD_IDE_ONLY) gd::String CppPlatform::GetDescription() const { - return GD_T("Allows to create 2D games which can be compiled and played on Windows or Linux."); + return _("Allows to create 2D games which can be compiled and played on Windows or Linux."); } #if !defined(GD_NO_WX_GUI) diff --git a/GDCpp/GDCpp/CppPlatform.h b/GDCpp/GDCpp/CppPlatform.h index cce88d2ab5..adcce83fdd 100644 --- a/GDCpp/GDCpp/CppPlatform.h +++ b/GDCpp/GDCpp/CppPlatform.h @@ -31,8 +31,8 @@ public: virtual gd::String GetName() const { return "GDevelop C++ platform"; } #if defined(GD_IDE_ONLY) - virtual gd::String GetFullName() const { return GD_T("Native (Windows or Linux games)"); } - virtual gd::String GetSubtitle() const { return GD_T("C++ and OpenGL based games for Windows or Linux."); } + virtual gd::String GetFullName() const { return _("Native (Windows or Linux games)"); } + virtual gd::String GetSubtitle() const { return _("C++ and OpenGL based games for Windows or Linux."); } virtual gd::String GetDescription() const; #endif diff --git a/GDCpp/GDCpp/IDE/CodeCompiler.cpp b/GDCpp/GDCpp/IDE/CodeCompiler.cpp index fc54b36f0e..7a5c6eaa32 100644 --- a/GDCpp/GDCpp/IDE/CodeCompiler.cpp +++ b/GDCpp/GDCpp/IDE/CodeCompiler.cpp @@ -310,7 +310,7 @@ void CodeCompiler::StartTheNextTask() currentTaskProcess->Redirect(); if ( wxExecute(currentTask.compilerCall.GetFullCall(), wxEXEC_ASYNC, currentTaskProcess) == 0 ) { - gd::LogError(GD_T("Unable to launch the internal compiler: Try to reinstall GDevelop to make sure that every needed file are present.")); + gd::LogError(_("Unable to launch the internal compiler: Try to reinstall GDevelop to make sure that every needed file are present.")); delete currentTaskProcess; currentTaskProcess = NULL; } @@ -573,7 +573,7 @@ void CodeCompiler::ClearOutputDirectory() while ( !file.empty() ) { if ( !wxRemoveFile( file ) ) - std::cout << GD_T( "Unable to delete file" ) + file + GD_T(" in compiler output directory.\n" ); + std::cout << _( "Unable to delete file" ) + file + _(" in compiler output directory.\n" ); file = wxFindNextFile(); } diff --git a/GDCpp/GDCpp/IDE/Dialogs/CppLayoutPreviewer.cpp b/GDCpp/GDCpp/IDE/Dialogs/CppLayoutPreviewer.cpp index 8c6bcd4dd1..63609890c9 100644 --- a/GDCpp/GDCpp/IDE/Dialogs/CppLayoutPreviewer.cpp +++ b/GDCpp/GDCpp/IDE/Dialogs/CppLayoutPreviewer.cpp @@ -66,7 +66,7 @@ CppLayoutPreviewer::CppLayoutPreviewer(gd::LayoutEditorCanvas & editor_) : reloadingIconImage.loadFromFile("res/compile128.png"); reloadingIconSprite.setTexture(reloadingIconImage); reloadingText.setColor(sf::Color(0,0,0,128)); - reloadingText.setString(GD_T("Compiling...")); + reloadingText.setString(_("Compiling...")); reloadingText.setCharacterSize(40); reloadingText.setFont(*FontManager::Get()->GetFont("")); @@ -224,7 +224,7 @@ void CppLayoutPreviewer::RefreshFromLayoutSecondPart() if ( !previewScene.GetCodeExecutionEngine()->LoadFromDynamicLibrary(editor.GetLayout().GetCompiledEventsFile(), "GDSceneEvents"+gd::SceneNameMangler::GetMangledSceneName(editor.GetLayout().GetName())) ) { - gd::LogError(GD_T("Compilation of events failed, and scene cannot be previewed. Please report this problem to GDevelop's developer, joining this file:\n") + gd::LogError(_("Compilation of events failed, and scene cannot be previewed. Please report this problem to GDevelop's developer, joining this file:\n") +CodeCompiler::Get()->GetOutputDirectory()+"LatestCompilationOutput.txt"); editor.GoToEditingState(); diff --git a/GDCpp/GDCpp/IDE/Dialogs/DebuggerGUI.cpp b/GDCpp/GDCpp/IDE/Dialogs/DebuggerGUI.cpp index e4d3d62749..b54047decd 100644 --- a/GDCpp/GDCpp/IDE/Dialogs/DebuggerGUI.cpp +++ b/GDCpp/GDCpp/IDE/Dialogs/DebuggerGUI.cpp @@ -409,7 +409,7 @@ void DebuggerGUI::OnobjectListItemActivated(wxListEvent& event) if ( !object->RuntimeObject::ChangeProperty(propNb, newValue) ) { - gd::LogWarning(GD_T("Unable to modify the value.\nThe value entered is either incorrect or the property is read-only.")); + gd::LogWarning(_("Unable to modify the value.\nThe value entered is either incorrect or the property is read-only.")); } } //A specific property @@ -424,7 +424,7 @@ void DebuggerGUI::OnobjectListItemActivated(wxListEvent& event) if ( !object->ChangeProperty(propNb, newValue) ) { - gd::LogWarning(GD_T("Unable to modify the value.\nThe value entered is either incorrect or the property is read-only.")); + gd::LogWarning(_("Unable to modify the value.\nThe value entered is either incorrect or the property is read-only.")); } } else //Or a variable @@ -491,7 +491,7 @@ void DebuggerGUI::OnExtensionListItemActivated(wxListEvent& event) if ( !extension->ChangeProperty(scene, propNb, newValue) ) { - gd::LogWarning(GD_T("Unable to modify the value.\nThe value entered is either incorrect or the property is read-only.")); + gd::LogWarning(_("Unable to modify the value.\nThe value entered is either incorrect or the property is read-only.")); } } @@ -583,7 +583,7 @@ void DebuggerGUI::OnAddVarSceneBtClick( wxCommandEvent & event ) if ( variableName == "" ) return; if ( scene.GetVariables().Has(variableName) ) { - gd::LogMessage(GD_T("A variable with this name already exists!")); + gd::LogMessage(_("A variable with this name already exists!")); return; } @@ -602,7 +602,7 @@ void DebuggerGUI::OnAddVarGlobalBtClick( wxCommandEvent & event ) if ( variableName == "" ) return; if ( scene.game->GetVariables().Has(variableName) ) { - gd::LogMessage(GD_T("A variable with this name already exists!")); + gd::LogMessage(_("A variable with this name already exists!")); return; } @@ -630,7 +630,7 @@ void DebuggerGUI::OnAddObjBtClick( wxCommandEvent & event ) if ( newObject == std::shared_ptr () ) { - gd::LogWarning(GD_T("Unable to create object.")); + gd::LogWarning(_("Unable to create object.")); return; } diff --git a/GDCpp/GDCpp/IDE/Exporter.cpp b/GDCpp/GDCpp/IDE/Exporter.cpp index 9d219a41ab..afeba2179e 100644 --- a/GDCpp/GDCpp/IDE/Exporter.cpp +++ b/GDCpp/GDCpp/IDE/Exporter.cpp @@ -18,7 +18,7 @@ void Exporter::ShowProjectExportDialog(gd::Project & project) gd::String Exporter::GetProjectExportButtonLabel() { - return GD_T("Compile to a native executable"); + return _("Compile to a native executable"); } Exporter::~Exporter() diff --git a/GDCpp/GDCpp/IDE/FullProjectCompiler.cpp b/GDCpp/GDCpp/IDE/FullProjectCompiler.cpp index b62d84021a..bf1f5ada6b 100644 --- a/GDCpp/GDCpp/IDE/FullProjectCompiler.cpp +++ b/GDCpp/GDCpp/IDE/FullProjectCompiler.cpp @@ -154,10 +154,10 @@ void FullProjectCompiler::LaunchProjectCompilation() gd::String linuxExecutableName = gameToCompile.linuxExecutableFilename.empty() ? "GameLinux" : gameToCompile.linuxExecutableFilename; gd::String macExecutableName = gameToCompile.macExecutableFilename.empty() ? "GameMac" : gameToCompile.macExecutableFilename; - diagnosticManager.OnMessage(GD_T("Project compilation launching")); + diagnosticManager.OnMessage(_("Project compilation launching")); if ( !windowsTarget && !linuxTarget && !macTarget) { - diagnosticManager.AddError(GD_T("No chosen target system.")); + diagnosticManager.AddError(_("No chosen target system.")); diagnosticManager.OnCompilationFailed(); return; } @@ -173,7 +173,7 @@ void FullProjectCompiler::LaunchProjectCompilation() //Wait current compilations to end if ( CodeCompiler::Get()->CompilationInProcess() ) { - diagnosticManager.OnMessage(GD_T("Compilation waiting for other task to finish...")); + diagnosticManager.OnMessage(_("Compilation waiting for other task to finish...")); wxStopWatch yieldClock; while (CodeCompiler::Get()->CompilationInProcess()) @@ -190,13 +190,13 @@ void FullProjectCompiler::LaunchProjectCompilation() gd::Project game = gameToCompile; //Prepare resources to copy - diagnosticManager.OnMessage( GD_T("Preparing resources...") ); + diagnosticManager.OnMessage( _("Preparing resources...") ); //Add images std::vector allResources = game.GetResourcesManager().GetAllResourcesList(); for ( unsigned int i = 0;i < allResources.size() ;i++ ) { - diagnosticManager.OnMessage( GD_T("Preparing resources..."), allResources[i] ); + diagnosticManager.OnMessage( _("Preparing resources..."), allResources[i] ); if ( game.GetResourcesManager().GetResource(allResources[i]).UseFile() ) resourcesMergingHelper.ExposeResource(game.GetResourcesManager().GetResource(allResources[i])); @@ -224,7 +224,7 @@ void FullProjectCompiler::LaunchProjectCompilation() { if ( game.GetLayout(i).GetProfiler() ) game.GetLayout(i).GetProfiler()->profilingActivated = false; - diagnosticManager.OnMessage(GD_T("Compiling scene ")+game.GetLayout(i).GetName()+GD_T(".")); + diagnosticManager.OnMessage(_("Compiling scene ")+game.GetLayout(i).GetName()+_(".")); CodeCompilerTask task; task.compilerCall.compilationForRuntime = true; task.compilerCall.optimize = optimize; @@ -249,28 +249,28 @@ void FullProjectCompiler::LaunchProjectCompilation() if ( !wxFileExists(task.compilerCall.outputFile) ) { - diagnosticManager.AddError(GD_T("Compilation of scene ")+game.GetLayout(i).GetName()+GD_T(" failed: Please go on our website to report this error, joining this file:\n") + diagnosticManager.AddError(_("Compilation of scene ")+game.GetLayout(i).GetName()+_(" failed: Please go on our website to report this error, joining this file:\n") +CodeCompiler::Get()->GetOutputDirectory()+"LatestCompilationOutput.txt" - +GD_T("\n\nIf you think the error is related to an extension, please contact its developer.")); + +_("\n\nIf you think the error is related to an extension, please contact its developer.")); diagnosticManager.OnCompilationFailed(); return; } else - diagnosticManager.OnMessage(GD_T("Compiling scene ")+game.GetLayout(i).GetName()+GD_T(" succeeded")); + diagnosticManager.OnMessage(_("Compiling scene ")+game.GetLayout(i).GetName()+_(" succeeded")); diagnosticManager.OnPercentUpdate( static_cast(i) / static_cast(game.GetLayoutsCount())*50.0 ); } //Now copy resources - diagnosticManager.OnMessage( GD_T("Copying resources...") ); + diagnosticManager.OnMessage( _("Copying resources...") ); map & resourcesNewFilename = resourcesMergingHelper.GetAllResourcesOldAndNewFilename(); unsigned int i = 0; for(auto it = resourcesNewFilename.begin(); it != resourcesNewFilename.end(); ++it) { - diagnosticManager.OnMessage( GD_T("Copying resources..."), it->first ); + diagnosticManager.OnMessage( _("Copying resources..."), it->first ); if ( !it->first.empty() && wxCopyFile( it->first, tempDir + "/" + it->second, true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to copy " )+it->first+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to copy " )+it->first+_(" in compilation directory.\n" )); ++i; diagnosticManager.OnPercentUpdate( 50.0 + static_cast(i) / static_cast(resourcesNewFilename.size())*25.0 ); @@ -278,14 +278,14 @@ void FullProjectCompiler::LaunchProjectCompilation() } gd::SafeYield::Do(); - diagnosticManager.OnMessage(GD_T( "Copying resources..." ), GD_T( "Step 1 out of 3" )); + diagnosticManager.OnMessage(_( "Copying resources..." ), _( "Step 1 out of 3" )); gd::Project strippedProject = game; gd::ProjectStripper::StripProject(strippedProject); strippedProject.SaveToFile( tempDir + "/GDProjectSrcFile.gdg" ); diagnosticManager.OnPercentUpdate(80); gd::SafeYield::Do(); - diagnosticManager.OnMessage(GD_T( "Copying resources..." ), GD_T( "Step 2 out of 3" )); + diagnosticManager.OnMessage(_( "Copying resources..." ), _( "Step 2 out of 3" )); //Encrypt the source file. { @@ -328,7 +328,7 @@ void FullProjectCompiler::LaunchProjectCompilation() diagnosticManager.OnPercentUpdate(85); //Cr�ation du fichier gam.egd - diagnosticManager.OnMessage(GD_T( "Copying resources..." ), GD_T( "Step 3 out of 3" )); + diagnosticManager.OnMessage(_( "Copying resources..." ), _( "Step 3 out of 3" )); gd::SafeYield::Do(); //On cr�� une liste avec tous les fichiers @@ -357,7 +357,7 @@ void FullProjectCompiler::LaunchProjectCompilation() if ( filename.GetFullName() != "gam.egd" ) //On supprime tout sauf gam.egd { if ( !wxRemoveFile( file ) ) - diagnosticManager.AddError(GD_T( "Unable to delete the file" ) + file + GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to delete the file" ) + file + _(" in compilation directory.\n" )); } file = wxFindNextFile(); @@ -366,7 +366,7 @@ void FullProjectCompiler::LaunchProjectCompilation() //Link all the object files to the final object { - diagnosticManager.OnMessage(GD_T( "Linking project files..." )); + diagnosticManager.OnMessage(_( "Linking project files..." )); #if defined(WINDOWS) gd::String codeOutputFile = "Code.dll"; #else @@ -392,18 +392,18 @@ void FullProjectCompiler::LaunchProjectCompilation() if ( !wxFileExists(codeOutputFile) ) { - diagnosticManager.AddError(GD_T("Linking of project failed: Please go on our website to report this error, joining this file:\n") + diagnosticManager.AddError(_("Linking of project failed: Please go on our website to report this error, joining this file:\n") +CodeCompiler::Get()->GetOutputDirectory()+"LatestCompilationOutput.txt" - +GD_T("\n\nIf you think the error is related to an extension, please contact its developer.")); + +_("\n\nIf you think the error is related to an extension, please contact its developer.")); diagnosticManager.OnCompilationFailed(); return; } else - diagnosticManager.OnMessage(GD_T("Linking project ")+game.GetName()+GD_T(" succeeded")); + diagnosticManager.OnMessage(_("Linking project ")+game.GetName()+_(" succeeded")); } diagnosticManager.OnPercentUpdate(90); - diagnosticManager.OnMessage(GD_T( "Exporting game..." )); + diagnosticManager.OnMessage(_( "Exporting game..." )); gd::SafeYield::Do(); //Copy extensions @@ -421,19 +421,19 @@ void FullProjectCompiler::LaunchProjectCompilation() if ( windowsTarget) { if ( wxCopyFile( "CppPlatform/Extensions/Runtime/"+game.GetUsedExtensions()[i]+".xgdw", tempDir + "/" + game.GetUsedExtensions()[i]+".xgdw", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to copy extension ")+game.GetUsedExtensions()[i]+GD_T(" for Windows in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to copy extension ")+game.GetUsedExtensions()[i]+_(" for Windows in compilation directory.\n" )); } if ( linuxTarget ) { if ( wxCopyFile( "CppPlatform/Extensions/Runtime/"+game.GetUsedExtensions()[i]+".xgd", tempDir + "/"+game.GetUsedExtensions()[i]+".xgd", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to copy extension ")+game.GetUsedExtensions()[i]+GD_T(" for Linux in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to copy extension ")+game.GetUsedExtensions()[i]+_(" for Linux in compilation directory.\n" )); } if ( macTarget ) { if ( wxCopyFile( "CppPlatform/Extensions/Runtime/"+game.GetUsedExtensions()[i]+".xgd", tempDir + "/"+game.GetUsedExtensions()[i]+".xgd", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to copy extension ")+game.GetUsedExtensions()[i]+GD_T(" for Mac OS in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to copy extension ")+game.GetUsedExtensions()[i]+_(" for Mac OS in compilation directory.\n" )); } } @@ -446,14 +446,14 @@ void FullProjectCompiler::LaunchProjectCompilation() { if ( wxCopyFile( supplementaryFiles[i].second, tempDir + "/" + wxFileName::FileName(supplementaryFiles[i].second).GetFullName(), true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to copy ")+supplementaryFiles[i].second+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to copy ")+supplementaryFiles[i].second+_(" in compilation directory.\n" )); } } } if ( game.UseExternalSourceFiles() ) { if ( wxCopyFile( "dynext.dxgd", tempDir + "/" + "dynext.dxgd", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to copy C++ sources ( dynext.dxgd ) in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to copy C++ sources ( dynext.dxgd ) in compilation directory.\n" )); } //Copie des derniers fichiers @@ -463,31 +463,31 @@ void FullProjectCompiler::LaunchProjectCompilation() if ( windowsTarget ) { if ( wxCopyFile( "CppPlatform/Runtime/PlayWin.exe", tempDir + "/" + winExecutableName, true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create ")+"l'executable Windows"+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create ")+"l'executable Windows"+_(" in compilation directory.\n" )); if ( wxCopyFile( "CppPlatform/Runtime/GDCpp.dll", tempDir + "/GDCpp.dll", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create ")+"GDCpp.dll"+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create ")+"GDCpp.dll"+_(" in compilation directory.\n" )); } //Fichiers pour linux if ( linuxTarget ) { if ( wxCopyFile( "CppPlatform/Runtime/ExeLinux", tempDir + "/ExeLinux", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create ")+"l'executable Linux"+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create ")+"l'executable Linux"+_(" in compilation directory.\n" )); if ( wxCopyFile( "CppPlatform/Runtime/PlayLinux", tempDir + "/" + linuxExecutableName, true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create ")+"le script executable Linux"+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create ")+"le script executable Linux"+_(" in compilation directory.\n" )); if ( wxCopyFile( "CppPlatform/Runtime/libGDCpp.so", tempDir + "/libGDCpp.so", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create ")+"libGDCpp.so"+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create ")+"libGDCpp.so"+_(" in compilation directory.\n" )); } if ( macTarget ) { if ( wxCopyFile( "CppPlatform/MacRuntime/MacExe", tempDir + "/MacExe", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create ")+"l'executable Mac OS"+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create ")+"l'executable Mac OS"+_(" in compilation directory.\n" )); if ( wxCopyFile( "CppPlatform/MacRuntime/libGDCpp.dylib", tempDir + "/libGDCpp.dylib", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create ")+"libGDCpp.dylib"+GD_T(" in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create ")+"libGDCpp.dylib"+_(" in compilation directory.\n" )); } //Copie du tout dans le r�pertoire final @@ -496,7 +496,7 @@ void FullProjectCompiler::LaunchProjectCompilation() { wxFileName fileName(file); if ( !wxCopyFile( file, outDir + "/" + fileName.GetFullName(), true ) ) - diagnosticManager.AddError(GD_T("Unable to copy file") + gd::utf8::FromWxString(file) + GD_T(" from compilation directory to final directory.\n" )); + diagnosticManager.AddError(_("Unable to copy file") + gd::utf8::FromWxString(file) + _(" from compilation directory to final directory.\n" )); file = wxFindNextFile(); } @@ -506,13 +506,13 @@ void FullProjectCompiler::LaunchProjectCompilation() if ( windowsTarget ) { if ( wxCopyFile( "CppPlatform/Runtime/PlayWin.exe", tempDir + "/internalstart.exe", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create the Windows executable in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create the Windows executable in compilation directory.\n" )); if ( wxCopyFile( "CppPlatform/Runtime/GDCpp.dll", tempDir + "/GDCpp.dll", true ) == false ) - diagnosticManager.AddError(GD_T( "Unable to create GDCpp.dll in compilation directory.\n" )); + diagnosticManager.AddError(_( "Unable to create GDCpp.dll in compilation directory.\n" )); //Use 7zip to create a single archive - diagnosticManager.OnMessage( GD_T("Exporting game... ( Compressing )") ); + diagnosticManager.OnMessage( _("Exporting game... ( Compressing )") ); wxArrayString arrStdOut, arrStdErr; wxExecute( _T( "7za.exe a \""+ tempDir +"/archive.7z\" \"" + tempDir + "/*\"" ), arrStdOut, arrStdErr, wxEXEC_SYNC ); @@ -533,7 +533,7 @@ void FullProjectCompiler::LaunchProjectCompilation() file.close(); } else - diagnosticManager.AddError( GD_T("Unable to open 7zS.sfx") ); + diagnosticManager.AddError( _("Unable to open 7zS.sfx") ); } { std::ifstream file; @@ -549,7 +549,7 @@ void FullProjectCompiler::LaunchProjectCompilation() file.close(); } else - diagnosticManager.AddError( GD_T("Unable to open config.txt") ); + diagnosticManager.AddError( _("Unable to open config.txt") ); } { std::ifstream file; @@ -565,7 +565,7 @@ void FullProjectCompiler::LaunchProjectCompilation() file.close(); } else - diagnosticManager.AddError( GD_T("Unable to open ")+gd::String(tempDir +"/archive.7z") ); + diagnosticManager.AddError( _("Unable to open ")+gd::String(tempDir +"/archive.7z") ); } outFile.close(); @@ -578,7 +578,7 @@ void FullProjectCompiler::LaunchProjectCompilation() ExecutableIconChanger::ChangeWindowsExecutableIcon(outDir+"/"+winExecutableName, game.winExecutableIconFile); #endif - diagnosticManager.OnMessage(GD_T( "Compilation finished" )); + diagnosticManager.OnMessage(_( "Compilation finished" )); diagnosticManager.OnPercentUpdate(100); diagnosticManager.OnCompilationSucceeded(); @@ -614,13 +614,13 @@ void FullProjectCompiler::ClearDirectory(gd::String directory) { #if !defined(GD_NO_WX_GUI) if ( !wxDirExists( directory ) && !wxMkdir( directory ) ) - diagnosticManager.AddError(GD_T( "Unable to create directory:" ) + gd::utf8::FromWxString(directory) + "\n"); + diagnosticManager.AddError(_( "Unable to create directory:" ) + gd::utf8::FromWxString(directory) + "\n"); wxString file = wxFindFirstFile( directory + "/*" ); while ( !file.empty() ) { if ( !wxRemoveFile( file ) ) - diagnosticManager.AddError(GD_T("Unable to delete ") + gd::utf8::FromWxString(file) + GD_T("in directory ")+gd::utf8::FromWxString(directory)+"\n" ); + diagnosticManager.AddError(_("Unable to delete ") + gd::utf8::FromWxString(file) + _("in directory ")+gd::utf8::FromWxString(directory)+"\n" ); file = wxFindNextFile(); } @@ -630,13 +630,13 @@ void FullProjectCompiler::ClearDirectory(gd::String directory) void FullProjectCompilerConsoleDiagnosticManager::OnCompilationFailed() { - cout << GD_T("Compilation failed with these errors:") << endl; + cout << _("Compilation failed with these errors:") << endl; cout << GetErrors(); } void FullProjectCompilerConsoleDiagnosticManager::OnCompilationSucceeded() { - cout << GD_T("Compilation succeeded.") << endl; + cout << _("Compilation succeeded.") << endl; } void FullProjectCompilerConsoleDiagnosticManager::OnMessage(gd::String message, gd::String message2) @@ -649,7 +649,7 @@ void FullProjectCompilerConsoleDiagnosticManager::OnMessage(gd::String message, void FullProjectCompilerConsoleDiagnosticManager::OnPercentUpdate(float percents) { - cout << GD_T("Progress:") << gd::ToString(percents) << endl; + cout << _("Progress:") << gd::ToString(percents) << endl; } diff --git a/GDCpp/GDCpp/RuntimeObject.cpp b/GDCpp/GDCpp/RuntimeObject.cpp index 41e7433614..0b52f52a05 100644 --- a/GDCpp/GDCpp/RuntimeObject.cpp +++ b/GDCpp/GDCpp/RuntimeObject.cpp @@ -80,16 +80,16 @@ void RuntimeObject::Init(const RuntimeObject & object) #if defined(GD_IDE_ONLY) void RuntimeObject::GetPropertyForDebugger(unsigned int propertyNb, gd::String & name, gd::String & value) const { - if ( propertyNb == 0 ) {name = GD_T("Position"); value = gd::String::FromFloat(GetX())+";"+gd::String::FromFloat(GetY());} - else if ( propertyNb == 1 ) {name = GD_T("Angle"); value = gd::String::FromFloat(GetAngle())+u8"°";} - else if ( propertyNb == 2 ) {name = GD_T("Size"); value = gd::String::FromFloat(GetWidth())+";"+gd::String::FromFloat(GetHeight());} - else if ( propertyNb == 3 ) {name = GD_T("Visibility"); value = hidden ? GD_T("Hidden") : GD_T("Displayed");} - else if ( propertyNb == 4 ) {name = GD_T("Layer"); value = layer;} - else if ( propertyNb == 5 ) {name = GD_T("Z order"); value = gd::String::FromInt(zOrder);} - else if ( propertyNb == 6 ) {name = GD_T("Speed"); value = gd::String::FromFloat(TotalForceLength());} - else if ( propertyNb == 7 ) {name = GD_T("Angle of moving"); value = gd::String::FromFloat(TotalForceAngle());} - else if ( propertyNb == 8 ) {name = GD_T("X coordinate of moving"); value = gd::String::FromFloat(TotalForceX());} - else if ( propertyNb == 9 ) {name = GD_T("Y coordinate of moving"); value = gd::String::FromFloat(TotalForceY());} + if ( propertyNb == 0 ) {name = _("Position"); value = gd::String::FromFloat(GetX())+";"+gd::String::FromFloat(GetY());} + else if ( propertyNb == 1 ) {name = _("Angle"); value = gd::String::FromFloat(GetAngle())+u8"°";} + else if ( propertyNb == 2 ) {name = _("Size"); value = gd::String::FromFloat(GetWidth())+";"+gd::String::FromFloat(GetHeight());} + else if ( propertyNb == 3 ) {name = _("Visibility"); value = hidden ? _("Hidden") : _("Displayed");} + else if ( propertyNb == 4 ) {name = _("Layer"); value = layer;} + else if ( propertyNb == 5 ) {name = _("Z order"); value = gd::String::FromInt(zOrder);} + else if ( propertyNb == 6 ) {name = _("Speed"); value = gd::String::FromFloat(TotalForceLength());} + else if ( propertyNb == 7 ) {name = _("Angle of moving"); value = gd::String::FromFloat(TotalForceAngle());} + else if ( propertyNb == 8 ) {name = _("X coordinate of moving"); value = gd::String::FromFloat(TotalForceX());} + else if ( propertyNb == 9 ) {name = _("Y coordinate of moving"); value = gd::String::FromFloat(TotalForceY());} } bool RuntimeObject::ChangeProperty(unsigned int propertyNb, gd::String newValue) @@ -111,7 +111,7 @@ bool RuntimeObject::ChangeProperty(unsigned int propertyNb, gd::String newValue) else if ( propertyNb == 2 ) {return false;} else if ( propertyNb == 3 ) { - if ( newValue == GD_T("Hidden") ) + if ( newValue == _("Hidden") ) { SetHidden(); } diff --git a/GDCpp/GDCpp/RuntimeSpriteObject.cpp b/GDCpp/GDCpp/RuntimeSpriteObject.cpp index 0119c1b8ec..e2e388964a 100644 --- a/GDCpp/GDCpp/RuntimeSpriteObject.cpp +++ b/GDCpp/GDCpp/RuntimeSpriteObject.cpp @@ -565,16 +565,16 @@ void RuntimeSpriteObject::TurnTowardObject(RuntimeObject * object, RuntimeScene #if defined(GD_IDE_ONLY) void RuntimeSpriteObject::GetPropertyForDebugger(unsigned int propertyNb, gd::String & name, gd::String & value) const { - if ( propertyNb == 0 ) {name = GD_T("Animation"); value = gd::String::FromUInt(GetCurrentAnimation());} - else if ( propertyNb == 1 ) {name = GD_T("Direction"); value = gd::String::FromUInt(GetCurrentDirection());} - else if ( propertyNb == 2 ) {name = GD_T("Image"); value = gd::String::FromUInt(GetSpriteNb());} - else if ( propertyNb == 3 ) {name = GD_T("Opacity"); value = gd::String::FromFloat(GetOpacity());} - else if ( propertyNb == 4 ) {name = GD_T("Blend mode"); if ( blendMode == 0) value = "0 (Alpha)"; + if ( propertyNb == 0 ) {name = _("Animation"); value = gd::String::FromUInt(GetCurrentAnimation());} + else if ( propertyNb == 1 ) {name = _("Direction"); value = gd::String::FromUInt(GetCurrentDirection());} + else if ( propertyNb == 2 ) {name = _("Image"); value = gd::String::FromUInt(GetSpriteNb());} + else if ( propertyNb == 3 ) {name = _("Opacity"); value = gd::String::FromFloat(GetOpacity());} + else if ( propertyNb == 4 ) {name = _("Blend mode"); if ( blendMode == 0) value = "0 (Alpha)"; else if ( blendMode == 1) value = "1 (Add)"; else if ( blendMode == 2) value = "2 (Multiply)"; else if ( blendMode == 3) value = "3 (None)";} - else if ( propertyNb == 5 ) {name = GD_T("X Scale"); value = gd::String::FromFloat(GetScaleX());} - else if ( propertyNb == 6 ) {name = GD_T("Y Scale"); value = gd::String::FromFloat(GetScaleY());} + else if ( propertyNb == 5 ) {name = _("X Scale"); value = gd::String::FromFloat(GetScaleX());} + else if ( propertyNb == 6 ) {name = _("Y Scale"); value = gd::String::FromFloat(GetScaleY());} } bool RuntimeSpriteObject::ChangeProperty(unsigned int propertyNb, gd::String newValue) diff --git a/GDJS/GDJS/BuiltinExtensions/AdvancedExtension.cpp b/GDJS/GDJS/BuiltinExtensions/AdvancedExtension.cpp index 3633595ed7..98051cc329 100644 --- a/GDJS/GDJS/BuiltinExtensions/AdvancedExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/AdvancedExtension.cpp @@ -17,8 +17,8 @@ AdvancedExtension::AdvancedExtension() gd::BuiltinExtensionsImplementer::ImplementsAdvancedExtension(*this); SetExtensionInformation("BuiltinAdvanced", - GD_T("Advanced control features"), - GD_T("Built-in extension providing advanced control features."), + _("Advanced control features"), + _("Built-in extension providing advanced control features."), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp b/GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp index 4b9627e462..923ce32568 100644 --- a/GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp @@ -18,8 +18,8 @@ AudioExtension::AudioExtension() gd::BuiltinExtensionsImplementer::ImplementsAudioExtension(*this); SetExtensionInformation("BuiltinAudio", - GD_T("Audio"), - GD_T("Builtin audio extension"), + _("Audio"), + _("Builtin audio extension"), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp b/GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp index 0dfe264765..3bde3549a7 100644 --- a/GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp @@ -20,8 +20,8 @@ BaseObjectExtension::BaseObjectExtension() gd::BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(*this); SetExtensionInformation("BuiltinObject", - GD_T("Base object"), - GD_T("Base object"), + _("Base object"), + _("Base object"), "Florian Rival", "Open source (MIT License)"); @@ -174,34 +174,34 @@ BaseObjectExtension::BaseObjectExtension() StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: /* obj.AddAction("AddForceTournePos", - GD_T("Add a force so as to move around a position"), - GD_T("Add a force to an object so as it rotates toward a position.\nNote that the moving is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in the category \"Position\"."), - GD_T("Rotate _PARAM0_ around _PARAM1_;_PARAM2_ with _PARAM3_�/sec and _PARAM4_ pixels away"), - GD_T("Displacement"), + _("Add a force so as to move around a position"), + _("Add a force to an object so as it rotates toward a position.\nNote that the moving is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in the category \"Position\"."), + _("Rotate _PARAM0_ around _PARAM1_;_PARAM2_ with _PARAM3_�/sec and _PARAM4_ pixels away"), + _("Displacement"), "res/actions/forceTourne24.png", "res/actions/forceTourne.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("expression", GD_T("X position of the center")) - .AddParameter("expression", GD_T("Y position of the center")) - .AddParameter("expression", GD_T("Speed ( in Degrees per seconds )")) - .AddParameter("expression", GD_T("Distance ( in pixels )")) - .AddParameter("expression", GD_T("Damping ( Default : 0 )")) + .AddParameter("object", _("Object")) + .AddParameter("expression", _("X position of the center")) + .AddParameter("expression", _("Y position of the center")) + .AddParameter("expression", _("Speed ( in Degrees per seconds )")) + .AddParameter("expression", _("Distance ( in pixels )")) + .AddParameter("expression", _("Damping ( Default : 0 )")) .SetFunctionName("AddForceToMoveAround"); obj.AddAction("AddForceTourne", - GD_T("Add a force so as to move around an object"), - GD_T("Add a force to an object so as it rotates around another.\nNote that the moving is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in the category \"Position\"."), - GD_T("Rotate _PARAM0_ around _PARAM1_ with _PARAM2_�/sec and _PARAM3_ pixels away"), - GD_T("Displacement"), + _("Add a force so as to move around an object"), + _("Add a force to an object so as it rotates around another.\nNote that the moving is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in the category \"Position\"."), + _("Rotate _PARAM0_ around _PARAM1_ with _PARAM2_�/sec and _PARAM3_ pixels away"), + _("Displacement"), "res/actions/forceTourne24.png", "res/actions/forceTourne.png") - .AddParameter("object", GD_T("Object")) - .AddParameter("objectPtr", GD_T("Rotate around this object")) - .AddParameter("expression", GD_T("Speed ( Degrees per second )")) - .AddParameter("expression", GD_T("Distance ( in pixel )")) - .AddParameter("expression", GD_T("Damping ( Default : 0 )")) + .AddParameter("object", _("Object")) + .AddParameter("objectPtr", _("Rotate around this object")) + .AddParameter("expression", _("Speed ( Degrees per second )")) + .AddParameter("expression", _("Distance ( in pixel )")) + .AddParameter("expression", _("Damping ( Default : 0 )")) .SetFunctionName("AddForceToMoveAroundObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); */ } diff --git a/GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp b/GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp index 63ba08e3ad..e2fd61b4fe 100644 --- a/GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp @@ -16,8 +16,8 @@ CameraExtension::CameraExtension() gd::BuiltinExtensionsImplementer::ImplementsCameraExtension(*this); SetExtensionInformation("BuiltinCamera", - GD_T("Cameras and layers features"), - GD_T("Builtin camera extension"), + _("Cameras and layers features"), + _("Builtin camera extension"), "Florian Rival", "Open source (MIT License)"); @@ -49,89 +49,89 @@ CameraExtension::CameraExtension() StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: /* AddAction("AddCamera", - GD_T("Add a camera to a layer"), - GD_T("This action add a camera to a layer"), - GD_T("Add a camera to layer _PARAM1_"), - GD_T("Layers and cameras"), + _("Add a camera to a layer"), + _("This action add a camera to a layer"), + _("Add a camera to layer _PARAM1_"), + _("Layers and cameras"), "res/actions/camera24.png", "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("layer", GD_T("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") - .AddParameter("expression", GD_T("Width"), "",true) - .AddParameter("expression", GD_T("Height"), "",true) - .AddParameter("expression", GD_T("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",true) - .AddParameter("expression", GD_T("Render zone: Top left side: Y Position ( Between 0 and 1 )"), "",true) - .AddParameter("expression", GD_T("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",true) - .AddParameter("expression", GD_T("Render zone: Bottom right side: Y Position ( Between 0 and 1 )"), "",true) + .AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") + .AddParameter("expression", _("Width"), "",true) + .AddParameter("expression", _("Height"), "",true) + .AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",true) + .AddParameter("expression", _("Render zone: Top left side: Y Position ( Between 0 and 1 )"), "",true) + .AddParameter("expression", _("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",true) + .AddParameter("expression", _("Render zone: Bottom right side: Y Position ( Between 0 and 1 )"), "",true) .SetFunctionName("AddCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddAction("DeleteCamera", - GD_T("Delete a camera of a layer"), - GD_T("Remove the specified camera from a layer"), - GD_T("Delete camera _PARAM2_ from layer _PARAM1_"), - GD_T("Layers and cameras"), + _("Delete a camera of a layer"), + _("Remove the specified camera from a layer"), + _("Delete camera _PARAM2_ from layer _PARAM1_"), + _("Layers and cameras"), "res/actions/camera24.png", "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("layer", GD_T("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") - .AddParameter("expression", GD_T("Camera number"), "",false) + .AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") + .AddParameter("expression", _("Camera number"), "",false) .SetFunctionName("DeleteCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddAction("CameraSize", - GD_T("Modify the size of a camera"), - GD_T("This action modify the size of a camera of the specified layer. The zoom will be reset."), - GD_T("Change the size of camera _PARAM2_ of _PARAM1_ to _PARAM3_*_PARAM4_"), - GD_T("Layers and cameras"), + _("Modify the size of a camera"), + _("This action modify the size of a camera of the specified layer. The zoom will be reset."), + _("Change the size of camera _PARAM2_ of _PARAM1_ to _PARAM3_*_PARAM4_"), + _("Layers and cameras"), "res/actions/camera24.png", "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("layer", GD_T("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") - .AddParameter("expression", GD_T("Camera number"), "",false) - .AddParameter("expression", GD_T("Width"), "",false) - .AddParameter("expression", GD_T("Height"), "",false) + .AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") + .AddParameter("expression", _("Camera number"), "",false) + .AddParameter("expression", _("Width"), "",false) + .AddParameter("expression", _("Height"), "",false) .SetFunctionName("SetCameraSize").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddAction("CameraViewport", - GD_T("Modify the render zone of a camera"), - GD_T("This action modify the render zone of a camera of the specified layer."), - GD_T("Set the render zone of camera _PARAM2_ from layer _PARAM1_ to PARAM3_;_PARAM4_ _PARAM5_;_PARAM6_"), - GD_T("Layers and cameras"), + _("Modify the render zone of a camera"), + _("This action modify the render zone of a camera of the specified layer."), + _("Set the render zone of camera _PARAM2_ from layer _PARAM1_ to PARAM3_;_PARAM4_ _PARAM5_;_PARAM6_"), + _("Layers and cameras"), "res/actions/camera24.png", "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("layer", GD_T("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") - .AddParameter("expression", GD_T("Camera number"), "",false) - .AddParameter("expression", GD_T("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",false) - .AddParameter("expression", GD_T("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",false) - .AddParameter("expression", GD_T("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",false) - .AddParameter("expression", GD_T("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",false) + .AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") + .AddParameter("expression", _("Camera number"), "",false) + .AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",false) + .AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",false) + .AddParameter("expression", _("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",false) + .AddParameter("expression", _("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",false) .SetFunctionName("SetCameraViewport").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - AddExpression("CameraViewportLeft", GD_T("X position of the top left side point of a render zone"), GD_T("X position of the top left side point of a render zone"), GD_T("Camera"), "res/actions/camera.png") + AddExpression("CameraViewportLeft", _("X position of the top left side point of a render zone"), _("X position of the top left side point of a render zone"), _("Camera"), "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("layer", GD_T("Layer"), "",false) - .AddParameter("expression", GD_T("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") + .AddParameter("layer", _("Layer"), "",false) + .AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") .SetFunctionName("GetCameraViewportLeft").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - AddExpression("CameraViewportTop", GD_T("Y position of the top left side point of a render zone"), GD_T("Y position of the top left side point of a render zone"), GD_T("Camera"), "res/actions/camera.png") + AddExpression("CameraViewportTop", _("Y position of the top left side point of a render zone"), _("Y position of the top left side point of a render zone"), _("Camera"), "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("layer", GD_T("Layer"), "",false) - .AddParameter("expression", GD_T("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") + .AddParameter("layer", _("Layer"), "",false) + .AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") .SetFunctionName("GetCameraViewportTop").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - AddExpression("CameraViewportRight", GD_T("X position of the bottom right side point of a render zone"), GD_T("X position of the bottom right side point of a render zone"), GD_T("Camera"), "res/actions/camera.png") + AddExpression("CameraViewportRight", _("X position of the bottom right side point of a render zone"), _("X position of the bottom right side point of a render zone"), _("Camera"), "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("layer", GD_T("Layer"), "",false) - .AddParameter("expression", GD_T("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") + .AddParameter("layer", _("Layer"), "",false) + .AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") .SetFunctionName("GetCameraViewportRight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - AddExpression("CameraViewportBottom", GD_T("Y position of the bottom right side point of a render zone"), GD_T("Y position of the bottom right side point of a render zone"), GD_T("Camera"), "res/actions/camera.png") + AddExpression("CameraViewportBottom", _("Y position of the bottom right side point of a render zone"), _("Y position of the bottom right side point of a render zone"), _("Camera"), "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("layer", GD_T("Layer"), "",false) - .AddParameter("expression", GD_T("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") + .AddParameter("layer", _("Layer"), "",false) + .AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") .SetFunctionName("GetCameraViewportBottom").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); diff --git a/GDJS/GDJS/BuiltinExtensions/CommonConversionsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/CommonConversionsExtension.cpp index 834ede8a49..ed404da9fb 100644 --- a/GDJS/GDJS/BuiltinExtensions/CommonConversionsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/CommonConversionsExtension.cpp @@ -18,8 +18,8 @@ CommonConversionsExtension::CommonConversionsExtension() gd::BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(*this); SetExtensionInformation("BuiltinCommonConversions", - GD_T("Standard Conversions"), - GD_T("Built-in extension providing standard conversions expressions."), + _("Standard Conversions"), + _("Built-in extension providing standard conversions expressions."), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/CommonInstructionsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/CommonInstructionsExtension.cpp index f6df0a214b..87bfeb9479 100644 --- a/GDJS/GDJS/BuiltinExtensions/CommonInstructionsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/CommonInstructionsExtension.cpp @@ -38,8 +38,8 @@ CommonInstructionsExtension::CommonInstructionsExtension() gd::BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(*this); SetExtensionInformation("BuiltinCommonInstructions", - GD_T("Standard events"), - GD_T("Built-in extension providing standard events."), + _("Standard events"), + _("Built-in extension providing standard events."), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/ExternalLayoutsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/ExternalLayoutsExtension.cpp index b5fb31facf..7d53128778 100644 --- a/GDJS/GDJS/BuiltinExtensions/ExternalLayoutsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/ExternalLayoutsExtension.cpp @@ -18,8 +18,8 @@ ExternalLayoutsExtension::ExternalLayoutsExtension() gd::BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(*this); SetExtensionInformation("BuiltinExternalLayouts", - GD_T("External layouts"), - GD_T("Built-in extension providing actions and conditions related to external layouts"), + _("External layouts"), + _("Built-in extension providing actions and conditions related to external layouts"), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp b/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp index 7465f8723e..b36c6904a7 100644 --- a/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp @@ -18,8 +18,8 @@ FileExtension::FileExtension() gd::BuiltinExtensionsImplementer::ImplementsFileExtension(*this); SetExtensionInformation("BuiltinFile", - GD_T("Files"), - GD_T("Built-in extension providing functions for storing data."), + _("Files"), + _("Built-in extension providing functions for storing data."), "Florian Rival", "Open source (MIT License)"); @@ -47,23 +47,23 @@ FileExtension::FileExtension() StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: /* AddCondition("FileExists", - GD_T("A file exists"), - GD_T("Test if the file exists."), - GD_T("The file _PARAM0_ exists"), - GD_T("Files"), + _("A file exists"), + _("Test if the file exists."), + _("The file _PARAM0_ exists"), + _("Files"), "res/conditions/fichier24.png", "res/conditions/fichier.png") - .AddParameter("file", GD_T("Filename"), "",false) + .AddParameter("file", _("Filename"), "",false) .SetFunctionName("FileExists").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); AddAction("ExecuteCmd", - GD_T("Execute a command"), - GD_T("This action execute the specified command."), - GD_T("Execute _PARAM0_"), - GD_T("Files"), + _("Execute a command"), + _("This action execute the specified command."), + _("Execute _PARAM0_"), + _("Files"), "res/actions/launchFile24.png", "res/actions/launchFile.png") - .AddParameter("string", GD_T("Command"), "",false) + .AddParameter("string", _("Command"), "",false) .SetFunctionName("ExecuteCmd").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); */ } diff --git a/GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp b/GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp index 6f5e5cc631..9087957e3a 100644 --- a/GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp @@ -20,8 +20,8 @@ JoystickExtension::JoystickExtension() gd::BuiltinExtensionsImplementer::ImplementsJoystickExtension(*this); SetExtensionInformation("BuiltinJoystick", - GD_T("Joysticks features"), - GD_T("Built-in extension allowing to use joysticks"), + _("Joysticks features"), + _("Built-in extension allowing to use joysticks"), "Florian Rival", "Open source (MIT License)"); @@ -29,57 +29,57 @@ JoystickExtension::JoystickExtension() StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: /* AddCondition("JoystickButtonDown", - GD_T("A button of a joystick is pressed"), - GD_T("Test if a button of a joystick is pressed."), - GD_T("The button _PARAM2_ of joystick _PARAM1_ is pressed"), - GD_T("Joystick"), + _("A button of a joystick is pressed"), + _("Test if a button of a joystick is pressed."), + _("The button _PARAM2_ of joystick _PARAM1_ is pressed"), + _("Joystick"), "res/conditions/joystick24.png", "res/conditions/joystick.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("expression", GD_T("Joystick number ( First joystick: 0 )"), "",false) - .AddParameter("expression", GD_T("Button"), "",false) + .AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false) + .AddParameter("expression", _("Button"), "",false) .SetFunctionName("JoystickButtonDown").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); AddCondition("JoystickAxis", - GD_T("Value of an axis of a joystick"), - GD_T("Test the value of an axis of a joystick."), - GD_T("The value of the axis _PARAM2_ of joystick _PARAM1_ is _PARAM3__PARAM4_"), - GD_T("Joystick"), + _("Value of an axis of a joystick"), + _("Test the value of an axis of a joystick."), + _("The value of the axis _PARAM2_ of joystick _PARAM1_ is _PARAM3__PARAM4_"), + _("Joystick"), "res/conditions/joystick24.png", "res/conditions/joystick.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("expression", GD_T("Joystick number ( First joystick: 0 )"), "",false) - .AddParameter("joyaxis", GD_T("Axis"), "",false) - .AddParameter("relationalOperator", GD_T("Sign of the test"), "",false) - .AddParameter("expression", GD_T("Value to test"), "",false) + .AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false) + .AddParameter("joyaxis", _("Axis"), "",false) + .AddParameter("relationalOperator", _("Sign of the test"), "",false) + .AddParameter("expression", _("Value to test"), "",false) .SetFunctionName("GetJoystickAxisValue").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); AddAction("GetJoystickAxis", - GD_T("Get the value of the axis of a joystick"), - GD_T("Save in the variable the value of the axis of the joystick ( from -100 to 100 )."), - GD_T("Save in _PARAM3_ the value of axis _PARAM2_ of joystick _PARAM1_"), - GD_T("Joystick"), + _("Get the value of the axis of a joystick"), + _("Save in the variable the value of the axis of the joystick ( from -100 to 100 )."), + _("Save in _PARAM3_ the value of axis _PARAM2_ of joystick _PARAM1_"), + _("Joystick"), "res/actions/joystick24.png", "res/actions/joystick.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("expression", GD_T("Joystick number ( First joystick: 0 )"), "",false) - .AddParameter("joyaxis", GD_T("Axis"), "",false) - .AddParameter("scenevar", GD_T("Save result to scene variable"), "",false) + .AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false) + .AddParameter("joyaxis", _("Axis"), "",false) + .AddParameter("scenevar", _("Save result to scene variable"), "",false) .SetFunctionName("JoystickAxisValueToVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); AddExpression("GetJoystickAxis", - GD_T("Joystick axis"), - GD_T("Value of an axis of a joystick"), - GD_T("Joystick"), + _("Joystick axis"), + _("Value of an axis of a joystick"), + _("Joystick"), "res/conditions/joystick.png") .AddCodeOnlyParameter("currentScene", "") - .AddParameter("expression", GD_T("Joystick number ( First joystick: 0 )"), "",false) - .AddParameter("joyaxis", GD_T("Axis"), "",false) + .AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false) + .AddParameter("joyaxis", _("Axis"), "",false) .SetFunctionName("GetJoystickAxisValue").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); */ diff --git a/GDJS/GDJS/BuiltinExtensions/MathematicalToolsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/MathematicalToolsExtension.cpp index 7345f1f284..df4102701d 100644 --- a/GDJS/GDJS/BuiltinExtensions/MathematicalToolsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/MathematicalToolsExtension.cpp @@ -20,8 +20,8 @@ MathematicalToolsExtension::MathematicalToolsExtension() gd::BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(*this); SetExtensionInformation("BuiltinMathematicalTools", - GD_T("Mathematical tools"), - GD_T("Built-in extension providing mathematical tools"), + _("Mathematical tools"), + _("Built-in extension providing mathematical tools"), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/MouseExtension.cpp b/GDJS/GDJS/BuiltinExtensions/MouseExtension.cpp index df02d6ffc2..a85e3ace65 100644 --- a/GDJS/GDJS/BuiltinExtensions/MouseExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/MouseExtension.cpp @@ -20,8 +20,8 @@ MouseExtension::MouseExtension() gd::BuiltinExtensionsImplementer::ImplementsMouseExtension(*this); SetExtensionInformation("BuiltinMouse", - GD_T("Mouse features"), - GD_T("Built-in extensions allowing to use the mouse"), + _("Mouse features"), + _("Built-in extensions allowing to use the mouse"), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp b/GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp index 04f42f82d8..a66bdd46c4 100644 --- a/GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp @@ -18,8 +18,8 @@ NetworkExtension::NetworkExtension() gd::BuiltinExtensionsImplementer::ImplementsNetworkExtension(*this); SetExtensionInformation("BuiltinNetwork", - GD_T("Basic internet features"), - GD_T("Built-in extension providing network features."), + _("Basic internet features"), + _("Built-in extension providing network features."), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp b/GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp index bda49a7840..9be5615091 100644 --- a/GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp @@ -20,8 +20,8 @@ SceneExtension::SceneExtension() gd::BuiltinExtensionsImplementer::ImplementsSceneExtension(*this); SetExtensionInformation("BuiltinScene", - GD_T("Scene management features"), - GD_T("Built-in extension allowing to manipulate scenes"), + _("Scene management features"), + _("Built-in extension allowing to manipulate scenes"), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp b/GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp index b64f9a5099..610ccc9d4b 100644 --- a/GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp @@ -16,8 +16,8 @@ SpriteExtension::SpriteExtension() gd::BuiltinExtensionsImplementer::ImplementsSpriteExtension(*this); SetExtensionInformation("Sprite", - GD_T("Sprite"), - GD_T("Extension for adding animated objects in the scene, which can contain animations with directions within each."), + _("Sprite"), + _("Extension for adding animated objects in the scene, which can contain animations with directions within each."), "Florian Rival", "Open source (MIT License)"); @@ -78,33 +78,33 @@ SpriteExtension::SpriteExtension() //Objects instructions: { obj.AddAction("CopyImageOnImageOfSprite", - GD_T("Copy an image on the current one of an object"), - GD_T("Copy an image on the current image of an object.\nNote that the source image must be preferably kept loaded in memory."), - GD_T("Copy image _PARAM2_ on the current of _PARAM0_ at _PARAM3_;_PARAM4_"), - GD_T("Effects"), + _("Copy an image on the current one of an object"), + _("Copy an image on the current image of an object.\nNote that the source image must be preferably kept loaded in memory."), + _("Copy image _PARAM2_ on the current of _PARAM0_ at _PARAM3_;_PARAM4_"), + _("Effects"), "res/copy24.png", "res/copyicon.png") - .AddParameter("object", GD_T("Object"), "Sprite", false) + .AddParameter("object", _("Object"), "Sprite", false) .AddCodeOnlyParameter("currentScene", "") - .AddParameter("string", GD_T("Name of the source image"), "",false) - .AddParameter("expression", GD_T("X position"), "",false) - .AddParameter("expression", GD_T("Y position"), "",false) - .AddParameter("yesorno", GD_T("Should the copy take in account the source transparency\?"), "",false) + .AddParameter("string", _("Name of the source image"), "",false) + .AddParameter("expression", _("X position"), "",false) + .AddParameter("expression", _("Y position"), "",false) + .AddParameter("yesorno", _("Should the copy take in account the source transparency\?"), "",false) .SetFunctionName("CopyImageOnImageOfCurrentSprite").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); obj.AddAction("CreateMaskFromColorOnActualImage", //Actual is indeed a mistake : Current should have been chosen. - GD_T("Make a color of the image of an object transparent"), - GD_T("Make a color of the image of an object transparent."), - GD_T("Make color _PARAM1_ of the current image of _PARAM0_ transparent"), - GD_T("Effects"), + _("Make a color of the image of an object transparent"), + _("Make a color of the image of an object transparent."), + _("Make color _PARAM1_ of the current image of _PARAM0_ transparent"), + _("Effects"), "res/actions/opacity24.png", "res/actions/opacity.png") - .AddParameter("object", GD_T("Object"), "Sprite", false) - .AddParameter("color", GD_T("Color to make transparent"), "",false) + .AddParameter("object", _("Object"), "Sprite", false) + .AddParameter("color", _("Color to make transparent"), "",false) .SetFunctionName("MakeColorTransparent").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); } diff --git a/GDJS/GDJS/BuiltinExtensions/StringInstructionsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/StringInstructionsExtension.cpp index 1785a28ad4..b1aed16608 100644 --- a/GDJS/GDJS/BuiltinExtensions/StringInstructionsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/StringInstructionsExtension.cpp @@ -18,8 +18,8 @@ StringInstructionsExtension::StringInstructionsExtension() gd::BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(*this); SetExtensionInformation("BuiltinStringInstructions", - GD_T("Text manipulation"), - GD_T("Built-in extension providing expressions related to strings."), + _("Text manipulation"), + _("Built-in extension providing expressions related to strings."), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/TimeExtension.cpp b/GDJS/GDJS/BuiltinExtensions/TimeExtension.cpp index bd6a0d4bb8..cf77df81ae 100644 --- a/GDJS/GDJS/BuiltinExtensions/TimeExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/TimeExtension.cpp @@ -20,8 +20,8 @@ TimeExtension::TimeExtension() gd::BuiltinExtensionsImplementer::ImplementsTimeExtension(*this); SetExtensionInformation("BuiltinTime", - GD_T("Time"), - GD_T("Built-in extension providing actions and conditions about the time."), + _("Time"), + _("Built-in extension providing actions and conditions about the time."), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp b/GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp index 546aa45742..65d49ddcc1 100644 --- a/GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp @@ -25,8 +25,8 @@ VariablesExtension::VariablesExtension() gd::BuiltinExtensionsImplementer::ImplementsVariablesExtension(*this); SetExtensionInformation("BuiltinVariables", - GD_T("Variable features"), - GD_T("Built-in extension allowing to manipulate variables"), + _("Variable features"), + _("Built-in extension allowing to manipulate variables"), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/BuiltinExtensions/WindowExtension.cpp b/GDJS/GDJS/BuiltinExtensions/WindowExtension.cpp index 9bab92d52d..a8b1bd2f9f 100644 --- a/GDJS/GDJS/BuiltinExtensions/WindowExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/WindowExtension.cpp @@ -18,8 +18,8 @@ WindowExtension::WindowExtension() gd::BuiltinExtensionsImplementer::ImplementsWindowExtension(*this); SetExtensionInformation("BuiltinWindow", - GD_T("Window features"), - GD_T("Built-in extension allowing to manipulate the game's window"), + _("Window features"), + _("Built-in extension allowing to manipulate the game's window"), "Florian Rival", "Open source (MIT License)"); diff --git a/GDJS/GDJS/Exporter.cpp b/GDJS/GDJS/Exporter.cpp index 6833662b7e..ca807fac72 100644 --- a/GDJS/GDJS/Exporter.cpp +++ b/GDJS/GDJS/Exporter.cpp @@ -93,7 +93,7 @@ bool Exporter::ExportLayoutForPreview(gd::Project & project, gd::Layout & layout //Export source files if ( !ExportExternalSourceFiles(exportedProject, fs.GetTempDir()+"/GDTemporaries/JSCodeTemp/", includesFiles) ) { - gd::LogError(GD_T("Error during exporting! Unable to export source files:\n")+lastError); + gd::LogError(_("Error during exporting! Unable to export source files:\n")+lastError); return false; } std::cout << "c" << std::endl; @@ -346,7 +346,7 @@ bool Exporter::ExportEventsCode(gd::Project & project, gd::String outputDir, std InsertUnique(includesFiles, gd::String(outputDir+"code"+gd::ToString(i)+".js")); } else { - lastError = GD_T("Unable to write ")+outputDir+"code"+gd::ToString(i)+".js"; + lastError = _("Unable to write ")+outputDir+"code"+gd::ToString(i)+".js"; return false; } } @@ -368,7 +368,7 @@ bool Exporter::ExportExternalSourceFiles(gd::Project & project, gd::String outpu fs.MakeAbsolute(filename, fs.DirNameFrom(project.GetProjectFile())); gd::String outFilename = "ext-code"+gd::String::FromUInt(i)+".js"; if (!fs.CopyFile(filename, outputDir+outFilename)) - gd::LogWarning(GD_T("Could not copy external file") + filename); + gd::LogWarning(_("Could not copy external file") + filename); InsertUnique(includesFiles, outputDir+outFilename); } @@ -386,7 +386,7 @@ bool Exporter::ExportIncludesAndLibs(std::vector & includesFiles, gd if ( nodeExec.empty() || !fs.FileExists(nodeExec) ) { std::cout << "Node.js executable not found." << std::endl; - gd::LogWarning(GD_T("The exported script could not be minified: Please check that you installed Node.js on your system.")); + gd::LogWarning(_("The exported script could not be minified: Please check that you installed Node.js on your system.")); minify = false; } else @@ -420,7 +420,7 @@ bool Exporter::ExportIncludesAndLibs(std::vector & includesFiles, gd for (size_t i = 0;i & openedFi { gd::String file = openedFiles[i]; if (!wxFileExists(file+".autosave")) - file += GD_T(" (Autosave not found!)"); + file += _(" (Autosave not found!)"); openedFilesEdit->AppendText(file+"\n"); } if (openedFiles.empty()) { @@ -189,7 +189,7 @@ BugReport::BugReport( wxWindow* parent, const std::vector & openedFi } CreateRapportBt->Disable(); - bugListBt->SetURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/knownbugs/gd")+gd::ToString(gd::VersionWrapper::Major())+gd::ToString(gd::VersionWrapper::Minor())+gd::ToString(gd::VersionWrapper::Build())); + bugListBt->SetURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/knownbugs/gd")+gd::ToString(gd::VersionWrapper::Major())+gd::ToString(gd::VersionWrapper::Minor())+gd::ToString(gd::VersionWrapper::Build())); } BugReport::~BugReport() @@ -253,7 +253,7 @@ void BugReport::OnCreateRapportBtClick( wxCommandEvent& event ) if (response.getStatus() != sf::Http::Response::Ok) std::cout << "Unable to connect to the server for sending the report!" << std::endl; else { - gd::LogMessage(GD_T("Thanks for reporting the error!")); + gd::LogMessage(_("Thanks for reporting the error!")); CreateRapportBt->Disable(); } } diff --git a/IDE/Dialogs/ExternalLayoutEditor.cpp b/IDE/Dialogs/ExternalLayoutEditor.cpp index 986fad34b5..b88b1d1f0a 100644 --- a/IDE/Dialogs/ExternalLayoutEditor.cpp +++ b/IDE/Dialogs/ExternalLayoutEditor.cpp @@ -275,7 +275,7 @@ void ExternalLayoutEditor::OnparentSceneComboBoxSelected(wxCommandEvent& event) scene = &emptyLayout; else if ( scene == NULL) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } diff --git a/IDE/Dialogs/ObjectsEditor.cpp b/IDE/Dialogs/ObjectsEditor.cpp index bd4578829d..fe39270c3e 100644 --- a/IDE/Dialogs/ObjectsEditor.cpp +++ b/IDE/Dialogs/ObjectsEditor.cpp @@ -140,7 +140,7 @@ namespace //Notify the game of the new group for ( unsigned int j = 0; j < project.GetUsedPlatforms().size();++j) project.GetUsedPlatforms()[j]->GetChangesNotifier().OnObjectGroupAdded(project, &layout, name); - gd::LogStatus( GD_T( "The group was correctly added." ) ); + gd::LogStatus( _( "The group was correctly added." ) ); //Expand the new group item treeCtrl->Expand(itemAdded); @@ -615,7 +615,7 @@ void ObjectsEditor::OnobjectsListEndLabelEdit(wxTreeEvent& event) unsigned int nameCheckResult = nameChecker.HasObjectOrGroupNamed(newName, globalObject); if ( nameCheckResult != gd::ObjectOrGroupFinder::No ) { - gd::LogWarning( GD_T( "Unable to rename the object : \n" ) + GetExistingObjectsErrorMessage(nameCheckResult, nameChecker.GetLayoutsWithSameObjectName()) ); + gd::LogWarning( _( "Unable to rename the object : \n" ) + GetExistingObjectsErrorMessage(nameCheckResult, nameChecker.GetLayoutsWithSameObjectName()) ); event.Veto(); return; @@ -701,7 +701,7 @@ void ObjectsEditor::OnobjectsListEndLabelEdit(wxTreeEvent& event) unsigned int nameCheckResult = nameChecker.HasObjectOrGroupNamed(event.GetLabel(), globalGroup); if ( nameCheckResult != gd::ObjectOrGroupFinder::No ) { - gd::LogWarning( GD_T( "Unable to rename the group : \n" ) + GetExistingObjectsErrorMessage(nameCheckResult, nameChecker.GetLayoutsWithSameObjectName()) ); + gd::LogWarning( _( "Unable to rename the group : \n" ) + GetExistingObjectsErrorMessage(nameCheckResult, nameChecker.GetLayoutsWithSameObjectName()) ); event.Veto(); return; @@ -897,9 +897,9 @@ void ObjectsEditor::OnAddObjectSelected(wxCommandEvent& event) gd::ObjectOrGroupFinder nameChecker(project, &layout); //Find a new unique name for the object - gd::String name = GD_T("NewObject"); + gd::String name = _("NewObject"); for (unsigned int i = 2; nameChecker.HasObjectOrGroupNamed(name)!=gd::ObjectOrGroupFinder::No ;++i) - name = GD_T("NewObject")+gd::String::FromUInt(i); + name = _("NewObject")+gd::String::FromUInt(i); //Add a new object of selected type to objects list gd::Object & object = layout.InsertNewObject(project, chooseTypeDialog.GetSelectedObjectType(), @@ -921,7 +921,7 @@ void ObjectsEditor::OnAddObjectSelected(wxCommandEvent& event) objectsList->EditLabel(itemAdded); renamedItemOldName = name; //With wxGTK, calling EditLabel do not update renamedItemOldName with the name of the new object. - gd::LogStatus( GD_T( "The object was correctly added" ) ); + gd::LogStatus( _( "The object was correctly added" ) ); objectsList->Expand(objectsRootItem); } @@ -933,11 +933,11 @@ void ObjectsEditor::OnAddGroupSelected(wxCommandEvent& event) gd::ObjectOrGroupFinder nameChecker(project, &layout); - gd::String name = GD_T("NewGroup"); + gd::String name = _("NewGroup"); for (unsigned int i = 2; nameChecker.HasObjectOrGroupNamed(name) != gd::ObjectOrGroupFinder::No; ++i) - name = GD_T("NewGroup")+gd::String::FromUInt(i); + name = _("NewGroup")+gd::String::FromUInt(i); newGroup.SetName( name ); @@ -954,7 +954,7 @@ void ObjectsEditor::OnAddGroupSelected(wxCommandEvent& event) for ( unsigned int j = 0; j < project.GetUsedPlatforms().size();++j) project.GetUsedPlatforms()[j]->GetChangesNotifier().OnObjectGroupAdded(project, &layout, name); - gd::LogStatus( GD_T( "The group was correctly added." ) ); + gd::LogStatus( _( "The group was correctly added." ) ); //Make sure that the group root item is expanded objectsList->Expand(groupsRootItem); @@ -1272,9 +1272,9 @@ void ObjectsEditor::OnPasteSelected(wxCommandEvent& event) //Add a number to the new name if necessary if ( nameChecker.HasObjectOrGroupNamed(name, globalObject /* Only search other layouts if it's a global object */) != gd::ObjectOrGroupFinder::No ) { - name = GD_T( "CopyOf" ) + object->GetName(); + name = _( "CopyOf" ) + object->GetName(); for (unsigned int i = 2;nameChecker.HasObjectOrGroupNamed(name, globalObject /* Only search other layouts if it's a global object */)!=gd::ObjectOrGroupFinder::No;++i) - name = GD_T("CopyOf")+ object->GetName()+gd::String::FromUInt(i); + name = _("CopyOf")+ object->GetName()+gd::String::FromUInt(i); } //Name the object @@ -1298,9 +1298,9 @@ void ObjectsEditor::OnPasteSelected(wxCommandEvent& event) //Add a number to the new name if necessary if ( nameChecker.HasObjectOrGroupNamed(name, globalGroup /* Only search other layouts if it's a global object */) != gd::ObjectOrGroupFinder::No ) { - name = GD_T( "CopyOf" ) + name; + name = _( "CopyOf" ) + name; for (unsigned int i = 2;nameChecker.HasObjectOrGroupNamed(name, globalGroup /* Only search other layouts if it's a global object */)!=gd::ObjectOrGroupFinder::No;++i) - name = GD_T("CopyOf")+ groupPasted.GetName()+gd::String::FromUInt(i); + name = _("CopyOf")+ groupPasted.GetName()+gd::String::FromUInt(i); } groupPasted.SetName(name); objectsGroups.push_back( groupPasted ); @@ -1340,7 +1340,7 @@ void ObjectsEditor::OnSetGlobalSelected(wxCommandEvent& event) //Test if there is a global object/group or an object/group in another layout with the same name //Indeed the object in the same layout with the same name is not taken into account because it's the object we want to set global. { - gd::String errorMessage = GD_T("Can't set \"") + objectName + GD_T("\" global because :\n") + + gd::String errorMessage = _("Can't set \"") + objectName + _("\" global because :\n") + GetExistingObjectsErrorMessage(searchSameNames & ~gd::ObjectOrGroupFinder::InLayout, nameChecker.GetLayoutsWithSameObjectName() ); gd::LogWarning(errorMessage); return; @@ -1383,7 +1383,7 @@ void ObjectsEditor::OnSetGlobalSelected(wxCommandEvent& event) //Test if there is a global object/group or an object/group in another layout with the same name //Indeed the object in the same layout with the same name is not taken into account because it's the object we want to set global. { - gd::String errorMessage = GD_T("Can't set \"") + groupName + GD_T("\" global because :\n") + + gd::String errorMessage = _("Can't set \"") + groupName + _("\" global because :\n") + GetExistingObjectsErrorMessage(searchSameNames & ~gd::ObjectOrGroupFinder::InLayout, nameChecker.GetLayoutsWithSameObjectName() ); gd::LogWarning(errorMessage); @@ -1615,11 +1615,11 @@ gd::String ObjectsEditor::GetExistingObjectsErrorMessage(unsigned int nameCheckR errorMessage += " - "; if((nameCheckResult & gd::ObjectOrGroupFinder::AsObjectInLayout) != 0) - errorMessage += GD_T("an object") + " "; + errorMessage += _("an object") + " "; else - errorMessage += GD_T("a group") + " "; + errorMessage += _("a group") + " "; - errorMessage += GD_T("with the same name exists in the current scene"); + errorMessage += _("with the same name exists in the current scene"); } if((nameCheckResult & gd::ObjectOrGroupFinder::InAnotherLayout) != 0) { @@ -1629,13 +1629,13 @@ gd::String ObjectsEditor::GetExistingObjectsErrorMessage(unsigned int nameCheckR errorMessage += " - "; if((nameCheckResult & gd::ObjectOrGroupFinder::AsObjectInAnotherLayout) != 0) - errorMessage += GD_T("objects") + " "; + errorMessage += _("objects") + " "; if((nameCheckResult & gd::ObjectOrGroupFinder::AsGroupInAnotherLayout) != 0) errorMessage += ((nameCheckResult & gd::ObjectOrGroupFinder::AsObjectInAnotherLayout) != 0) ? - GD_T("/ groups") : - GD_T("groups") + " "; + _("/ groups") : + _("groups") + " "; - errorMessage += GD_T("with the same name exist in these scenes : "); + errorMessage += _("with the same name exist in these scenes : "); for(auto it = layoutsWithSameName.begin(); it != layoutsWithSameName.end(); ++it) { @@ -1650,9 +1650,9 @@ gd::String ObjectsEditor::GetExistingObjectsErrorMessage(unsigned int nameCheckR errorMessage += " - "; if((nameCheckResult & gd::ObjectOrGroupFinder::AsGlobalObject) != 0) - errorMessage += GD_T("a global object with the same name exists"); + errorMessage += _("a global object with the same name exists"); else - errorMessage += GD_T("a global group with the same name exists"); + errorMessage += _("a global group with the same name exists"); } return errorMessage; diff --git a/IDE/Dialogs/ReminderDialog.cpp b/IDE/Dialogs/ReminderDialog.cpp index 03546276cb..1f168e213e 100644 --- a/IDE/Dialogs/ReminderDialog.cpp +++ b/IDE/Dialogs/ReminderDialog.cpp @@ -154,7 +154,7 @@ void ReminderDialog::OpenLink(wxString link) void ReminderDialog::OnHyperlinkCtrl1Click(wxCommandEvent& event) { - wxString link = GD_T("http://www.compilgames.net/donate.php"); + wxString link = _("http://www.compilgames.net/donate.php"); if ( !link.StartsWith("http://www.compilgames.net/") ) link = "http://www.compilgames.net/donate.php"; link += "?utm_source=GD&utm_medium=ReminderDialog&utm_campaign=donateorcontribute"; @@ -185,7 +185,7 @@ void ReminderDialog::OnClose(wxCloseEvent& event) void ReminderDialog::OnsendBtClick(wxCommandEvent& event) { if (feedbackEdit->GetValue().empty() || !feedbackWritten ) { - gd::LogMessage(GD_T("You didn't entered any feedback! :O")); + gd::LogMessage(_("You didn't entered any feedback! :O")); return; } wxString report; @@ -212,7 +212,7 @@ void ReminderDialog::OnsendBtClick(wxCommandEvent& event) if (response.getStatus() != sf::Http::Response::Ok) std::cout << "Unable to connect to the server for sending the feedback!" << std::endl; else { - gd::LogMessage(GD_T("Thanks for your feedback!")); + gd::LogMessage(_("Thanks for your feedback!")); sendBt->Disable(); } } diff --git a/IDE/EditObjectGroup.cpp b/IDE/EditObjectGroup.cpp index 3cef021288..aed44a6229 100644 --- a/IDE/EditObjectGroup.cpp +++ b/IDE/EditObjectGroup.cpp @@ -201,7 +201,7 @@ void EditObjectGroup::OnAddObjetSelected(wxCommandEvent& event) { group.AddObject( dialog.GetChosenObjects()[i] ); ObjetsList->AppendItem( ObjetsList->GetRootItem(), dialog.GetChosenObjects()[i] ); - } else { gd::LogWarning(GD_T("Object ")+dialog.GetChosenObjects()[i]+GD_T(" is already in this group."));} + } else { gd::LogWarning(_("Object ")+dialog.GetChosenObjects()[i]+_(" is already in this group."));} } modificationCount += dialog.GetChosenObjects().size(); @@ -232,5 +232,5 @@ void EditObjectGroup::OnDelObjetSelected(wxCommandEvent& event) void EditObjectGroup::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/edit_group")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/edit_group")); } diff --git a/IDE/EventsEditor.cpp b/IDE/EventsEditor.cpp index bae3904642..62ab4c9ba7 100644 --- a/IDE/EventsEditor.cpp +++ b/IDE/EventsEditor.cpp @@ -1267,7 +1267,7 @@ void EventsEditor::AddEvent(gd::EventItem & previousEventItem) ChangesMadeOnEvents(); } else - gd::LogError(GD_T("Unable to create standard event.")); + gd::LogError(_("Unable to create standard event.")); } void EventsEditor::OnaddEventBtClick(wxCommandEvent& event) @@ -1314,7 +1314,7 @@ void EventsEditor::OnRibbonAddCommentBtClick(wxRibbonButtonBarEvent& evt) ChangesMadeOnEvents(); } else - gd::LogError(GD_T("Unable to create a comment event.")); + gd::LogError(_("Unable to create a comment event.")); } /** @@ -1334,7 +1334,7 @@ void EventsEditor::AddSubEvent(gd::EventItem & parentEventItem) ChangesMadeOnEvents(); } else - gd::LogError(GD_T("Unable to create standard event.")); + gd::LogError(_("Unable to create standard event.")); } void EventsEditor::OnaddSubEventBtClick(wxCommandEvent& event) @@ -1606,7 +1606,7 @@ void EventsEditor::OnredoMenuSelected(wxCommandEvent& event) void EventsEditor::OnHelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/edit_event")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/edit_event")); } void EventsEditor::OnEventStoreBtClick( wxCommandEvent& event ) @@ -1650,7 +1650,7 @@ void EventsEditor::OnProfilingBtClick(wxCommandEvent& event) { if ( !profilingActivated && !sceneCanvas->GetProfileDialog()->profilingActivated) { - gd::LogMessage(GD_T("Profiling is not activated. Activate profiling thanks to the Profiling window when previewing a scene.")); + gd::LogMessage(_("Profiling is not activated. Activate profiling thanks to the Profiling window when previewing a scene.")); return; } } diff --git a/IDE/ExternalEventsEditor.cpp b/IDE/ExternalEventsEditor.cpp index 3b7ffe2133..dd4065690e 100644 --- a/IDE/ExternalEventsEditor.cpp +++ b/IDE/ExternalEventsEditor.cpp @@ -106,7 +106,7 @@ void ExternalEventsEditor::OnparentSceneComboBoxSelect(wxCommandEvent& event) scene = &emptyScene; else if ( scene == NULL) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } diff --git a/IDE/ImportImage.cpp b/IDE/ImportImage.cpp index 4d2d0a231c..634149a8a8 100644 --- a/IDE/ImportImage.cpp +++ b/IDE/ImportImage.cpp @@ -331,7 +331,7 @@ void ImportImage::OnFermerBtClick(wxCommandEvent& event) //////////////////////////////////////////////////////////// void ImportImage::OnBrowseGIFBtClick(wxCommandEvent& event) { - wxFileDialog dialog(this, _("Choose the animated GIF to decompose"), "", "", "GIF animé (*.gif)|*.gif"); + wxFileDialog dialog(this, _("Choose the animated GIF to decompose"), "", "", "GIF anim� (*.gif)|*.gif"); dialog.ShowModal(); if ( dialog.GetPath() != "" ) @@ -340,7 +340,7 @@ void ImportImage::OnBrowseGIFBtClick(wxCommandEvent& event) } //////////////////////////////////////////////////////////// -///Mise à jour en temps réel du nombre d'image d'un fichier gif +///Mise � jour en temps r�el du nombre d'image d'un fichier gif //////////////////////////////////////////////////////////// void ImportImage::OnFileGIFEditText(wxCommandEvent& event) { @@ -352,14 +352,14 @@ void ImportImage::OnFileGIFEditText(wxCommandEvent& event) } //////////////////////////////////////////////////////////// -///Décomposition du fichier GIF +///D�composition du fichier GIF //////////////////////////////////////////////////////////// void ImportImage::OnDecomposeGIFBtClick(wxCommandEvent& event) { wxAnimation animation; if ( !animation.LoadFile(FileGIFEdit->GetValue()) ) { - gd::LogWarning(GD_T("Unable to open the GIF file!")); + gd::LogWarning(_("Unable to open the GIF file!")); return; } @@ -372,7 +372,7 @@ void ImportImage::OnDecomposeGIFBtClick(wxCommandEvent& event) img.SaveFile(path+"/"+DecomposeGIFEdit->GetValue()+gd::ToString(i)+".png", wxBITMAP_TYPE_PNG); } - gd::LogMessage(GD_T("Decomposition of the GIF completed!")); + gd::LogMessage(_("Decomposition of the GIF completed!")); } //////////////////////////////////////////////////////////// @@ -400,7 +400,7 @@ void ImportImage::OnBrowseSSBtClick(wxCommandEvent& event) } //////////////////////////////////////////////////////////// -///Mise à jour en temps réel de la taille d'une image après décomposition +///Mise � jour en temps r�el de la taille d'une image apr�s d�composition //////////////////////////////////////////////////////////// void ImportImage::OnfileRPGEditText(wxCommandEvent& event) { @@ -412,14 +412,14 @@ void ImportImage::OnfileRPGEditText(wxCommandEvent& event) } //////////////////////////////////////////////////////////// -///Décomposition de la feuille de sprite RPG Maker +///D�composition de la feuille de sprite RPG Maker //////////////////////////////////////////////////////////// void ImportImage::OnDecomposeRPGEditClick(wxCommandEvent& event) { wxImage image; if ( !image.LoadFile(fileRPGEdit->GetValue()) ) { - gd::LogWarning(GD_T("Unable to open the file !")); + gd::LogWarning(_("Unable to open the file !")); return; } @@ -430,13 +430,13 @@ void ImportImage::OnDecomposeRPGEditClick(wxCommandEvent& event) { for (unsigned int i = 0;i<4;++i) { - //On récupère la sous image + //On r�cup�re la sous image wxImage subImage = image.GetSubImage(wxRect(image.GetWidth()/4*i, image.GetHeight()/4*j, image.GetWidth()/4, image.GetHeight()/4)); - //La direction est noté sous forme Down, Left, Right, Up + //La direction est not� sous forme Down, Left, Right, Up string direc = ""; if ( j == 0 ) direc = "D"; if ( j == 1 ) direc = "L"; @@ -446,18 +446,18 @@ void ImportImage::OnDecomposeRPGEditClick(wxCommandEvent& event) } } - gd::LogMessage(GD_T("The decomposition of the image is completed !")); + gd::LogMessage(_("The decomposition of the image is completed !")); } //////////////////////////////////////////////////////////// -///Décomposition d'une feuille de sprite générique +///D�composition d'une feuille de sprite g�n�rique //////////////////////////////////////////////////////////// void ImportImage::OnDecomposeSSBtClick(wxCommandEvent& event) { wxImage image; if ( !image.LoadFile(fileSSEdit->GetValue()) ) { - gd::LogWarning(GD_T("Unable to open the file !")); + gd::LogWarning(_("Unable to open the file !")); return; } @@ -473,14 +473,14 @@ void ImportImage::OnDecomposeSSBtClick(wxCommandEvent& event) int lineNb = ToInt(static_cast(linesSSEdit->GetValue())); if ( lineNb <= 0 ) { - gd::LogWarning(GD_T("The number of lines is invalid: The minimum is one line.")); + gd::LogWarning(_("The number of lines is invalid: The minimum is one line.")); return; } int columnNb = ToInt(static_cast(columnsSSEdit->GetValue())); if ( columnNb <= 0 ) { - gd::LogWarning(GD_T("The number of columns is invalid: The minimum is one column.")); + gd::LogWarning(_("The number of columns is invalid: The minimum is one column.")); return; } @@ -491,24 +491,24 @@ void ImportImage::OnDecomposeSSBtClick(wxCommandEvent& event) int height = ToInt(static_cast(heightSSEdit->GetValue())); if ( width <= 0 || height <= 0) { - gd::LogWarning(GD_T("The size of a sprite is invalid.")); + gd::LogWarning(_("The size of a sprite is invalid.")); return; } int spaceH = ToInt(static_cast(spaceHSSEdit->GetValue())); if ( spaceH < 0 ) { - gd::LogWarning(GD_T("The horizontal spacing is invalid (must be greater than or equal to 0).")); + gd::LogWarning(_("The horizontal spacing is invalid (must be greater than or equal to 0).")); return; } int spaceV = ToInt(static_cast(spaceVSSEdit->GetValue())); if ( spaceV < 0 ) { - gd::LogWarning(GD_T("The vertical spacing is invalid (must be greater than or equal to 0).")); + gd::LogWarning(_("The vertical spacing is invalid (must be greater than or equal to 0).")); return; } - //Décomposition ligne par ligne + //D�composition ligne par ligne int Y = origineY; for (unsigned int line = 0;line(lineNb);++line) { diff --git a/IDE/InstructionSelectorDialog.cpp b/IDE/InstructionSelectorDialog.cpp index 126f67224b..f18d0d13c1 100644 --- a/IDE/InstructionSelectorDialog.cpp +++ b/IDE/InstructionSelectorDialog.cpp @@ -457,7 +457,7 @@ void InstructionSelectorDialog::OnOkBtClick(wxCommandEvent& event) if (ParaEdit.size() < instructionMetadata.parameters.size()) { - gd::LogWarning(GD_T("The instruction has to many parameters. This can be a bug of GDevelop.\nRead Help to know how report a bug.")); + gd::LogWarning(_("The instruction has to many parameters. This can be a bug of GDevelop.\nRead Help to know how report a bug.")); return; } @@ -525,8 +525,8 @@ void InstructionSelectorDialog::OnCancelBtClick(wxCommandEvent& event) void InstructionSelectorDialog::OnHelpBtClick(wxCommandEvent& event) { gd::HelpFileAccess::Get()->OpenURL(editingAction ? - GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/action") : - GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/condition")); + _("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/action") : + _("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/condition")); } void InstructionSelectorDialog::OnmoreBtClick(wxCommandEvent& event) diff --git a/IDE/MAJ.cpp b/IDE/MAJ.cpp index 4141233887..8e77ad2e68 100644 --- a/IDE/MAJ.cpp +++ b/IDE/MAJ.cpp @@ -182,7 +182,7 @@ void MAJ::OnLienBtClick(wxCommandEvent& event) { if ( linkCtrl->GetLabel() == _("No link")) { - gd::LogMessage(GD_T("No download link is available.\nGo on our web site so as to download the last version of GDevelop.")); + gd::LogMessage(_("No download link is available.\nGo on our web site so as to download the last version of GDevelop.")); return; } @@ -252,7 +252,7 @@ void MAJ::OndownloadAndInstallBtClick(wxCommandEvent& event) } else { - gd::LogWarning( GD_T( "Unable to connect to the server so as to check for updates.\nCheck :\n-Your internet connection\n-Your firewall-If you can manually access our site.\n\nYou can disable Check for updates in the preferences of GDevelop." ) ); + gd::LogWarning( _( "Unable to connect to the server so as to check for updates.\nCheck :\n-Your internet connection\n-Your firewall-If you can manually access our site.\n\nYou can disable Check for updates in the preferences of GDevelop." ) ); return; } @@ -263,7 +263,7 @@ void MAJ::OndownloadAndInstallBtClick(wxCommandEvent& event) void MAJ::OnHelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/update")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/update")); } #endif diff --git a/IDE/MainFrame.cpp b/IDE/MainFrame.cpp index 7009510174..697f1bf920 100644 --- a/IDE/MainFrame.cpp +++ b/IDE/MainFrame.cpp @@ -617,9 +617,9 @@ void MainFrame::OnClose( wxCloseEvent& event ) if (whatToDo == wxCANCEL) return; else if ( whatToDo == wxYES ) { if (!Save(*games[i], games[i]->GetProjectFile())) - gd::LogError( GD_T("Save failed!") ); + gd::LogError( _("Save failed!") ); else - gd::LogStatus( GD_T("Project properly saved.") ); + gd::LogStatus( _("Project properly saved.") ); } } @@ -811,7 +811,7 @@ void MainFrame::OnautoSaveTimerTrigger(wxTimerEvent& event) wxString autosaveFilename = filename.GetPath() + "/" + filename.GetName()+".gdg.autosave"; if ( !games[i]->SaveToFile(autosaveFilename) ) - gd::LogStatus( GD_T("Autosave failed!") ); + gd::LogStatus( _("Autosave failed!") ); } } diff --git a/IDE/MainFrame_Files.cpp b/IDE/MainFrame_Files.cpp index 41f4f35a78..919a568feb 100644 --- a/IDE/MainFrame_Files.cpp +++ b/IDE/MainFrame_Files.cpp @@ -81,7 +81,7 @@ void MainFrame::CreateNewProject() wxSetWorkingDirectory(mainFrameWrapper.GetIDEWorkingDirectory()); if ( newProject->GetLayoutsCount() > 0 ) projectManager->EditLayout(*newProject, newProject->GetLayout(0)); } - else gd::LogError(GD_T("Unable to find the platform associated with the template.\n\nPlease report this error to GDevelop developer.")); + else gd::LogError(_("Unable to find the platform associated with the template.\n\nPlease report this error to GDevelop developer.")); } else if ( dialog.UserWantToBrowseExamples() ) { @@ -234,9 +234,9 @@ void MainFrame::OnMenuSaveSelected( wxCommandEvent& event ) else { if (Save(*GetCurrentGame(), GetCurrentGame()->GetProjectFile())) - gd::LogStatus( GD_T("Save ended.")); + gd::LogStatus( _("Save ended.")); else - gd::LogError( GD_T("Save failed!") ); + gd::LogError( _("Save failed!") ); SetLastUsedFile( GetCurrentGame()->GetProjectFile() ); return; @@ -283,7 +283,7 @@ void MainFrame::OnRibbonSaveAllClicked(wxRibbonButtonBarEvent& evt) //oui, donc on l'enregistre games[i]->SetProjectFile(path); - if ( !Save(*games[i], games[i]->GetProjectFile()) ) gd::LogError( GD_T("Save failed!") ); + if ( !Save(*games[i], games[i]->GetProjectFile()) ) gd::LogError( _("Save failed!") ); SetLastUsedFile( games[i]->GetProjectFile() ); if ( games[i] == GetCurrentGame() ) @@ -293,11 +293,11 @@ void MainFrame::OnRibbonSaveAllClicked(wxRibbonButtonBarEvent& evt) } else { - if ( !Save(*games[i], games[i]->GetProjectFile()) ) gd::LogError( GD_T("Save failed!") ); + if ( !Save(*games[i], games[i]->GetProjectFile()) ) gd::LogError( _("Save failed!") ); } } - gd::LogStatus( GD_T("Saves ended.")); + gd::LogStatus( _("Saves ended.")); } void MainFrame::OnMenuSaveAllSelected(wxCommandEvent& event) { @@ -365,7 +365,7 @@ void MainFrame::SaveAs() if ( !Save(*GetCurrentGame(), GetCurrentGame()->GetProjectFile()) ) { - gd::LogError( GD_T("The project could not be saved properly!") ); + gd::LogError( _("The project could not be saved properly!") ); } SetLastUsedFile( GetCurrentGame()->GetProjectFile() ); diff --git a/IDE/ProjectManager.cpp b/IDE/ProjectManager.cpp index 9627cd8fcd..1fd6f675be 100644 --- a/IDE/ProjectManager.cpp +++ b/IDE/ProjectManager.cpp @@ -700,7 +700,7 @@ void ProjectManager::EditSourceFile(gd::Project * game, gd::String filename, siz //As we're opening a "real" file, first check if it exists if ( !wxFileExists(filename) ) { - gd::LogWarning(GD_T("Unable to open ")+filename+GD_T(", the file does not exists")); + gd::LogWarning(_("Unable to open ")+filename+_(", the file does not exists")); return; } @@ -735,7 +735,7 @@ void ProjectManager::EditSourceFile(gd::Project * game, gd::String filename, siz CodeEditor * editorScene = new CodeEditor(mainEditor.GetEditorsNotebook(), filename, associatedGame, mainEditor.GetMainFrameWrapper()); if ( !mainEditor.GetEditorsNotebook()->AddPage(editorScene, wxFileName(filename).GetFullName(), true, gd::SkinHelper::GetIcon("source_cpp", 16)) ) { - gd::LogError(GD_T("Unable to add a new tab !")); + gd::LogError(_("Unable to add a new tab !")); } if ( line != gd::String::npos ) editorScene->SelectLine(line); } @@ -749,13 +749,13 @@ void ProjectManager::OneditSceneMenuItemSelected(wxCommandEvent& event) gdTreeItemProjectData * data; if ( !GetGameOfSelectedItem(game, data) ) { - gd::LogWarning(GD_T("Choose a scene to edit in the project's manager")); + gd::LogWarning(_("Choose a scene to edit in the project's manager")); return; } if ( !game->HasLayoutNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } @@ -792,7 +792,7 @@ void ProjectManager::EditLayout(gd::Project & project, gd::Layout & layout) EditorScene * editorScene = new EditorScene(mainEditor.GetEditorsNotebook(), project, layout, mainEditor.GetMainFrameWrapper()); if ( !mainEditor.GetEditorsNotebook()->AddPage(editorScene, prefix+layout.GetName(), true, gd::SkinHelper::GetIcon("scene", 16)) ) { - gd::LogError(GD_T("Unable to add a new tab !")); + gd::LogError(_("Unable to add a new tab !")); } } @@ -805,13 +805,13 @@ void ProjectManager::OneditScenePropMenuItemSelected(wxCommandEvent& event) gdTreeItemProjectData * data; if ( !GetGameOfSelectedItem(game, data) ) { - gd::LogWarning(GD_T("Choose a scene to edit in the project's manager")); + gd::LogWarning(_("Choose a scene to edit in the project's manager")); return; } if ( !game->HasLayoutNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } @@ -830,13 +830,13 @@ void ProjectManager::OnmodVarSceneMenuISelected(wxCommandEvent& event) gdTreeItemProjectData * data; if ( !GetGameOfSelectedItem(game, data) ) { - gd::LogWarning(GD_T("Choose a scene to edit in the project's manager")); + gd::LogWarning(_("Choose a scene to edit in the project's manager")); return; } if ( !game->HasLayoutNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } gd::Layout & layout = game->GetLayout(data->GetSecondString()); @@ -893,7 +893,7 @@ void ProjectManager::OnprojectsTreeEndLabelEdit(wxTreeEvent& event) { if (newName.find_first_of("/\\?%*:|\"<>")!=gd::String::npos) { - gd::LogMessage(GD_T("You can not use this name, it contains invalid characters.")); + gd::LogMessage(_("You can not use this name, it contains invalid characters.")); event.Veto(); return; } @@ -905,7 +905,7 @@ void ProjectManager::OnprojectsTreeEndLabelEdit(wxTreeEvent& event) { if ( !game->HasLayoutNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } @@ -913,7 +913,7 @@ void ProjectManager::OnprojectsTreeEndLabelEdit(wxTreeEvent& event) if ( game->HasLayoutNamed(newName) ) { - gd::LogWarning( GD_T( "Unable to rename: a scene has already the same name." ) ); + gd::LogWarning( _( "Unable to rename: a scene has already the same name." ) ); event.Veto(); return; } @@ -939,13 +939,13 @@ void ProjectManager::OnprojectsTreeEndLabelEdit(wxTreeEvent& event) { if ( !game->HasExternalEventsNamed(itemTextBeforeEditing) ) { - gd::LogWarning(GD_T("Unable to found events.")); + gd::LogWarning(_("Unable to found events.")); return; } if ( game->HasExternalEventsNamed(newName) ) { - gd::LogWarning( GD_T( "Unable to rename: some external events have already the same name." ) ); + gd::LogWarning( _( "Unable to rename: some external events have already the same name." ) ); event.Veto(); return; } @@ -971,13 +971,13 @@ void ProjectManager::OnprojectsTreeEndLabelEdit(wxTreeEvent& event) { if ( !game->HasExternalLayoutNamed(itemTextBeforeEditing) ) { - gd::LogWarning(GD_T("Unable to found events.")); + gd::LogWarning(_("Unable to found events.")); return; } if ( game->HasExternalLayoutNamed(newName) ) { - gd::LogWarning( GD_T( "Unable to rename: some external events have already the same name." ) ); + gd::LogWarning( _( "Unable to rename: some external events have already the same name." ) ); event.Veto(); return; } @@ -1034,11 +1034,11 @@ void ProjectManager::AddLayoutToProject(gd::Project * project, unsigned int posi if ( !project ) return; //Finding a new, unique name for the scene - gd::String newSceneName = GD_T("New scene"); + gd::String newSceneName = _("New scene"); int i = 2; while(project->HasLayoutNamed(newSceneName)) { - newSceneName = GD_T("New scene") + " " + ToString(i); + newSceneName = _("New scene") + " " + ToString(i); ++i; } @@ -1050,7 +1050,7 @@ void ProjectManager::AddLayoutToProject(gd::Project * project, unsigned int posi project->GetUsedPlatforms()[j]->GetChangesNotifier().OnLayoutAdded(*project, project->GetLayout(newSceneName)); } else - gd::LogError(GD_T("Unable to add the new layout!")); + gd::LogError(_("Unable to add the new layout!")); } /** @@ -1106,7 +1106,7 @@ void ProjectManager::OndeleteSceneMenuItemSelected(wxCommandEvent& event) gd::String sceneName = data->GetSecondString(); if ( !game->HasLayoutNamed(sceneName) ) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } @@ -1155,7 +1155,7 @@ void ProjectManager::OncopySceneMenuItemSelected(wxCommandEvent& event) if ( !game->HasLayoutNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } @@ -1174,7 +1174,7 @@ void ProjectManager::OncutSceneMenuItemSelected(wxCommandEvent& event) gd::String layoutName = data->GetSecondString(); if ( !game->HasLayoutNamed(layoutName) ) { - gd::LogWarning(GD_T("Scene not found.")); + gd::LogWarning(_("Scene not found.")); return; } @@ -1228,7 +1228,7 @@ void ProjectManager::OnpasteSceneMenuItemSelected(wxCommandEvent& event) int i = 1; while(game->HasLayoutNamed(newLayoutName)) { - newLayoutName = GD_T("Copy of") + " " + newLayout.GetName() + (i == 1 ? "" : " "+ToString(i)); + newLayoutName = _("Copy of") + " " + newLayout.GetName() + (i == 1 ? "" : " "+ToString(i)); ++i; } @@ -1463,7 +1463,7 @@ void ProjectManager::OnEditExternalEventsSelected(wxCommandEvent& event) if ( !game->HasExternalEventsNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Unable to found external events.")); + gd::LogWarning(_("Unable to found external events.")); return; } @@ -1492,7 +1492,7 @@ void ProjectManager::OnEditExternalEventsSelected(wxCommandEvent& event) ExternalEventsEditor * editor = new ExternalEventsEditor(mainEditor.GetEditorsNotebook(), *game, game->GetExternalEvents(data->GetSecondString()), mainEditor.GetMainFrameWrapper()); if ( !mainEditor.GetEditorsNotebook()->AddPage(editor, prefix+data->GetSecondString(), true, gd::SkinHelper::GetIcon("events", 16)) ) { - gd::LogError(GD_T("Unable to add a new tab !")); + gd::LogError(_("Unable to add a new tab !")); } } @@ -1529,11 +1529,11 @@ void ProjectManager::OnRibbonAddExternalEventsSelected(wxRibbonButtonBarEvent& e void ProjectManager::AddExternalEventsToGame(gd::Project * project) { //Finding a new, unique name for the scene - gd::String newName = GD_T("External events"); + gd::String newName = _("External events"); int i = 2; while(project->HasExternalEventsNamed(newName)) { - newName = GD_T("External events") + " " + ToString(i); + newName = _("External events") + " " + ToString(i); ++i; } @@ -1556,7 +1556,7 @@ void ProjectManager::OnDeleteExternalEventsSelected(wxCommandEvent& event) gd::String externalEventsName = data->GetSecondString(); if ( !game->HasExternalEventsNamed(externalEventsName) ) { - gd::LogWarning(GD_T("Unable to found events.")); + gd::LogWarning(_("Unable to found events.")); return; } @@ -1590,7 +1590,7 @@ void ProjectManager::OnCopyExternalEventsSelected(wxCommandEvent& event) if ( !game->HasExternalEventsNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Unable to found events.")); + gd::LogWarning(_("Unable to found events.")); return; } @@ -1606,7 +1606,7 @@ void ProjectManager::OnCutExternalEventsSelected(wxCommandEvent& event) gd::String externalEventsName = data->GetSecondString(); if ( !game->HasExternalEventsNamed(externalEventsName) ) { - gd::LogWarning(GD_T("Unable to found events.")); + gd::LogWarning(_("Unable to found events.")); return; } @@ -1648,7 +1648,7 @@ void ProjectManager::OnPasteExternalEventsSelected(wxCommandEvent& event) int i = 1; while(game->HasExternalEventsNamed(newName)) { - newName = GD_T("Copy of") + " " + newEvents.GetName() + " " + ( i==1 ? "" : ToString(i)); + newName = _("Copy of") + " " + newEvents.GetName() + " " + ( i==1 ? "" : ToString(i)); ++i; } @@ -1671,11 +1671,11 @@ void ProjectManager::OnPasteExternalEventsSelected(wxCommandEvent& event) void ProjectManager::AddExternalLayoutToGame(gd::Project * project) { //Finding a new, unique name for the scene - gd::String newName = GD_T("External layout"); + gd::String newName = _("External layout"); int i = 2; while(project->HasExternalLayoutNamed(newName)) { - newName = GD_T("External layout") + " " + ToString(i); + newName = _("External layout") + " " + ToString(i); ++i; } @@ -1715,7 +1715,7 @@ void ProjectManager::OnEditExternalLayoutSelected(wxCommandEvent& event) if ( !game->HasExternalLayoutNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Unable to found external events.")); + gd::LogWarning(_("Unable to found external events.")); return; } @@ -1744,7 +1744,7 @@ void ProjectManager::OnEditExternalLayoutSelected(wxCommandEvent& event) ExternalLayoutEditor * editor = new ExternalLayoutEditor(mainEditor.GetEditorsNotebook(), *game, game->GetExternalLayout(data->GetSecondString()), mainEditor.GetMainFrameWrapper()); if ( !mainEditor.GetEditorsNotebook()->AddPage(editor, prefix+data->GetSecondString(), true, gd::SkinHelper::GetIcon("scene", 16)) ) { - gd::LogError(GD_T("Unable to add a new tab !")); + gd::LogError(_("Unable to add a new tab !")); } } @@ -1762,7 +1762,7 @@ void ProjectManager::OnDeleteExternalLayoutSelected(wxCommandEvent& event) gd::String externalLayoutName = data->GetSecondString(); if ( !game->HasExternalLayoutNamed(externalLayoutName) ) { - gd::LogWarning(GD_T("Unable to found external layout.")); + gd::LogWarning(_("Unable to found external layout.")); return; } @@ -1796,7 +1796,7 @@ void ProjectManager::OnCopyExternalLayoutSelected(wxCommandEvent& event) if ( !game->HasExternalLayoutNamed(data->GetSecondString()) ) { - gd::LogWarning(GD_T("Unable to found external layout.")); + gd::LogWarning(_("Unable to found external layout.")); return; } @@ -1812,7 +1812,7 @@ void ProjectManager::OnCutExternalLayoutSelected(wxCommandEvent& event) gd::String externalLayoutName = data->GetSecondString(); if ( !game->HasExternalLayoutNamed(externalLayoutName) ) { - gd::LogWarning(GD_T("Unable to found external layout.")); + gd::LogWarning(_("Unable to found external layout.")); return; } @@ -1854,7 +1854,7 @@ void ProjectManager::OnPasteExternalLayoutSelected(wxCommandEvent& event) int i = 1; while(game->HasExternalLayoutNamed(newName)) { - newName = GD_T("Copy of") + " " + newExternalLayout.GetName() + " " + (i==1 ? "" : ToString(i)); + newName = _("Copy of") + " " + newExternalLayout.GetName() + " " + (i==1 ? "" : ToString(i)); ++i; } @@ -1906,7 +1906,7 @@ void ProjectManager::OnDeleteSourceFileSelected(wxCommandEvent& event) gd::String name = data->GetSecondString(); if (!game->HasSourceFile(name)) { - gd::LogWarning(GD_T("File not found")); + gd::LogWarning(_("File not found")); return; } @@ -1977,7 +1977,7 @@ void ProjectManager::OnCreateNewCppFileSelected(wxCommandEvent& event) */ void ProjectManager::OnRibbonHelpSelected(wxRibbonButtonBarEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://wiki.compilgames.net/doku.php/en/game_develop/documentation")); + gd::HelpFileAccess::Get()->OpenURL(_("http://wiki.compilgames.net/doku.php/en/game_develop/documentation")); } namespace { diff --git a/IDE/SearchEvents.cpp b/IDE/SearchEvents.cpp index 687de9ccbb..f5061a0f44 100644 --- a/IDE/SearchEvents.cpp +++ b/IDE/SearchEvents.cpp @@ -344,7 +344,7 @@ void SearchEvents::OnpreviousBtClick(wxCommandEvent&) void SearchEvents::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/edit_event_find")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/edit_event_find")); } void SearchEvents::OnKeyDown(wxKeyEvent& event) diff --git a/IDE/SigneModification.cpp b/IDE/SigneModification.cpp index 6c46f2bb4d..03058e1ab9 100644 --- a/IDE/SigneModification.cpp +++ b/IDE/SigneModification.cpp @@ -76,5 +76,5 @@ void SigneModification::OnOkBtClick(wxCommandEvent& event) void SigneModification::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/parameters")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/parameters")); } diff --git a/IDE/SigneTest.cpp b/IDE/SigneTest.cpp index 472ad67bd1..4878d3c436 100644 --- a/IDE/SigneTest.cpp +++ b/IDE/SigneTest.cpp @@ -83,5 +83,5 @@ void SigneTest::OnOkBtClick(wxCommandEvent& event) void SigneTest::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/parameters")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/parameters")); } diff --git a/IDE/TrueOrFalse.cpp b/IDE/TrueOrFalse.cpp index f5c33fd490..6b1ef2e603 100644 --- a/IDE/TrueOrFalse.cpp +++ b/IDE/TrueOrFalse.cpp @@ -97,5 +97,5 @@ void TrueOrFalse::OnButton1Click(wxCommandEvent& event) void TrueOrFalse::OnhelpBtClick(wxCommandEvent& event) { - gd::HelpFileAccess::Get()->OpenURL(GD_T("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/parameters")); + gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/events_editor/parameters")); } diff --git a/IDE/UpdateChecker.cpp b/IDE/UpdateChecker.cpp index f67f8b54dc..03bc600fda 100644 --- a/IDE/UpdateChecker.cpp +++ b/IDE/UpdateChecker.cpp @@ -54,11 +54,11 @@ void UpdateChecker::DownloadInformation(bool excludeFromStatistics) input->Read(out); } else - gd::LogWarning( GD_T( "Error while downloading the update file.\nPlease check your internet connection and your firewall.\n\nYou can disable Check for updates in the preferences of GDevelop." ) ); + gd::LogWarning( _( "Error while downloading the update file.\nPlease check your internet connection and your firewall.\n\nYou can disable Check for updates in the preferences of GDevelop." ) ); delete input; } else { - gd::LogWarning( GD_T( "Unable to connect to the server so as to check for updates.\nPlease check your internet connection, your firewall and if you can go on GD website.\n\nYou can disable Check for updates in the preferences of GDevelop." ) ); + gd::LogWarning( _( "Unable to connect to the server so as to check for updates.\nPlease check your internet connection, your firewall and if you can go on GD website.\n\nYou can disable Check for updates in the preferences of GDevelop." ) ); return; } @@ -66,7 +66,7 @@ void UpdateChecker::DownloadInformation(bool excludeFromStatistics) TiXmlDocument doc( updateInfoFileName.ToLocale().c_str() ); if ( !doc.LoadFile() ) { - gd::LogWarning( GD_T( "Error while loading the update file.\nPlease check your internet connection and your firewall.\n\nYou can disable Check for updates in the preferences of GDevelop." ) ); + gd::LogWarning( _( "Error while loading the update file.\nPlease check your internet connection and your firewall.\n\nYou can disable Check for updates in the preferences of GDevelop." ) ); return; } diff --git a/IDE/mp3ogg.cpp b/IDE/mp3ogg.cpp index ed6004c74a..5d8adf8cf4 100644 --- a/IDE/mp3ogg.cpp +++ b/IDE/mp3ogg.cpp @@ -145,7 +145,7 @@ void mp3ogg::OnEncoderBtClick(wxCommandEvent& event) filename.SetExt("ogg"); wxRenameFile(originalFile+".ogg", filename.GetFullPath()); - gd::LogMessage(GD_T("The encoding is finished. The OGG file is located in the same directory as the MP3 file.")); + gd::LogMessage(_("The encoding is finished. The OGG file is located in the same directory as the MP3 file.")); } @@ -169,5 +169,5 @@ void mp3ogg::OnEncoderWAVBtClick(wxCommandEvent& event) filename.SetExt("wav"); wxRenameFile(rep+".wav", filename.GetFullPath()); - gd::LogMessage(GD_T("The encoding is finished. The WAV file is located in the same directory as the MP3 file.")); + gd::LogMessage(_("The encoding is finished. The WAV file is located in the same directory as the MP3 file.")); }