haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few I18n issues. 

Especially, only ASCII7 chars can be used in messages.
Do not mark debug messages as I18n strings
This commit is contained in:
jean-pierre charras 2020-08-16 21:10:18 +02:00
parent b06e605255
commit 5b365053db
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Aug 13 2020) // C++ code generated with wxFormBuilder (version Jul 10 2019)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -520,11 +520,11 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
fgSizer11->Add( 0, 0, 1, 0, 5 ); fgSizer11->Add( 0, 0, 1, 0, 5 );
m_staticText20 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation °"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText20 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation (degrees)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText20->Wrap( -1 ); m_staticText20->Wrap( -1 );
fgSizer11->Add( m_staticText20, 0, wxALL, 5 ); fgSizer11->Add( m_staticText20, 0, wxALL, 5 );
m_staticText18 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth °"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth (degrees)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText18->Wrap( -1 ); m_staticText18->Wrap( -1 );
fgSizer11->Add( m_staticText18, 0, wxALL, 5 ); fgSizer11->Add( m_staticText18, 0, wxALL, 5 );
@ -537,11 +537,11 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
fgSizer11->Add( 0, 0, 1, 0, 5 ); fgSizer11->Add( 0, 0, 1, 0, 5 );
m_staticText27 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation °"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText27 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation (degrees)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText27->Wrap( -1 ); m_staticText27->Wrap( -1 );
fgSizer11->Add( m_staticText27, 0, wxALL, 5 ); fgSizer11->Add( m_staticText27, 0, wxALL, 5 );
m_staticText28 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth °"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText28 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth (degrees)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText28->Wrap( -1 ); m_staticText28->Wrap( -1 );
fgSizer11->Add( m_staticText28, 0, wxALL, 5 ); fgSizer11->Add( m_staticText28, 0, wxALL, 5 );

16
3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp
View File

@ -47,7 +47,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">DIALOG_3D_VIEW_OPTIONS_BASE</property> <property name="name">DIALOG_3D_VIEW_OPTIONS_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">659,567</property> <property name="size">810,567</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property> <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">3D Display Options</property> <property name="title">3D Display Options</property>
@ -3603,7 +3603,7 @@
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="0"> <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Raytracing Render Options</property> <property name="label">Raytracing Render Options</property>
<property name="minimum_size">-1,32</property> <property name="minimum_size">-1,32</property>
@ -4153,7 +4153,7 @@
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="0"> <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Lights configuration</property> <property name="label">Lights configuration</property>
<property name="minimum_size">-1,-1</property> <property name="minimum_size">-1,-1</property>
@ -4605,7 +4605,7 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
@ -4673,7 +4673,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Elevation °</property> <property name="label">Elevation (degrees)</property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
@ -4734,7 +4734,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Azimuth °</property> <property name="label">Azimuth (degrees)</property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
@ -4825,7 +4825,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Elevation °</property> <property name="label">Elevation (degrees)</property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
@ -4886,7 +4886,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Azimuth °</property> <property name="label">Azimuth (degrees)</property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>

4
3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Aug 13 2020) // C++ code generated with wxFormBuilder (version Jul 10 2019)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -155,7 +155,7 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
public: public:
DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 659,567 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 810,567 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_3D_VIEW_OPTIONS_BASE(); ~DIALOG_3D_VIEW_OPTIONS_BASE();
}; };

6
include/class_pcb_group.h
View File

@ -110,7 +110,7 @@ public:
///> @copydoc BOARD_ITEM::SetLayer ///> @copydoc BOARD_ITEM::SetLayer
void SetLayer( PCB_LAYER_ID aLayer ) override void SetLayer( PCB_LAYER_ID aLayer ) override
{ {
wxFAIL_MSG( _( "groups don't support layer SetLayer" ) ); wxFAIL_MSG( "groups don't support layer SetLayer" );
} }
///> @copydoc EDA_ITEM::Clone ///> @copydoc EDA_ITEM::Clone
@ -132,7 +132,7 @@ public:
///> @copydoc BOARD_ITEM::IsOnLayer ///> @copydoc BOARD_ITEM::IsOnLayer
bool IsOnLayer( PCB_LAYER_ID aLayer ) const override bool IsOnLayer( PCB_LAYER_ID aLayer ) const override
{ {
wxFAIL_MSG( _( "groups don't support layer IsOnLayer" ) ); wxFAIL_MSG( "groups don't support layer IsOnLayer" );
return false; return false;
} }
@ -181,7 +181,7 @@ public:
/** /**
* Invokes a function on all descendents of the group. * Invokes a function on all descendents of the group.
* Note that this function should not add or remove items to the group or descendent * Note that this function should not add or remove items to the group or descendent
* groups. * groups.
* @param aFunction is the function to be invoked. * @param aFunction is the function to be invoked.
*/ */

18
pcbnew/class_board.cpp
View File

@ -2079,7 +2079,7 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair )
return wxString::Format( _( "Two groups of identical name: %s" ), group.GetName() ); return wxString::Format( _( "Two groups of identical name: %s" ), group.GetName() );
} }
wxCHECK( groupNames.insert( group.GetName() ).second == true, wxCHECK( groupNames.insert( group.GetName() ).second == true,
_( "Insert failed of new group" ) ); "Insert failed of new group" );
} }
for( const BOARD_ITEM* member : group.GetItems() ) for( const BOARD_ITEM* member : group.GetItems() )
@ -2119,7 +2119,7 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair )
item->m_Uuid.AsString() ); item->m_Uuid.AsString() );
} }
wxCHECK( allMembers.insert( member->m_Uuid.AsString() ).second == true, wxCHECK( allMembers.insert( member->m_Uuid.AsString() ).second == true,
_( "Insert failed of new member" ) ); "Insert failed of new member" );
if( item->Type() == PCB_GROUP_T ) if( item->Type() == PCB_GROUP_T )
{ {
@ -2130,10 +2130,10 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair )
// is not found in the groups list, then the board.GetItem() // is not found in the groups list, then the board.GetItem()
// check above should have failed. // check above should have failed.
wxCHECK( childIdx >= 0 && childIdx < groups.size(), wxCHECK( childIdx >= 0 && childIdx < groups.size(),
wxString::Format( _( "Group %s not found in groups list" ), wxString::Format( "Group %s not found in groups list",
item->m_Uuid.AsString() ) ); item->m_Uuid.AsString() ) );
wxCHECK( parentGroupIdx[childIdx] == -1, wxCHECK( parentGroupIdx[childIdx] == -1,
wxString::Format( _( "Duplicate group despite allMembers check previously: %s" ), wxString::Format( "Duplicate group despite allMembers check previously: %s",
item->m_Uuid.AsString() ) ); item->m_Uuid.AsString() ) );
parentGroupIdx[childIdx] = idx; parentGroupIdx[childIdx] = idx;
} }
@ -2167,7 +2167,7 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair )
// Initialize set of groups to check that could participate in a cycle. // Initialize set of groups to check that could participate in a cycle.
for( size_t idx = 0; idx < groups.size(); idx++ ) for( size_t idx = 0; idx < groups.size(); idx++ )
{ {
wxCHECK( toCheckGroups.insert( idx ).second == true, _( "Insert of ints failed" ) ); wxCHECK( toCheckGroups.insert( idx ).second == true, "Insert of ints failed" );
} }
while( !toCheckGroups.empty() ) while( !toCheckGroups.empty() )
@ -2180,7 +2180,7 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair )
{ {
if( repair ) if( repair )
board.Groups().erase( board.Groups().begin() + currIdx ); board.Groups().erase( board.Groups().begin() + currIdx );
return _( "Cycle detected in group membership" ); return "Cycle detected in group membership";
} }
else if( knownCycleFreeGroups.find( currIdx ) != knownCycleFreeGroups.end() ) else if( knownCycleFreeGroups.find( currIdx ) != knownCycleFreeGroups.end() )
{ {
@ -2188,10 +2188,10 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair )
break; break;
} }
wxCHECK( currentChainGroups.insert( currIdx ).second == true, wxCHECK( currentChainGroups.insert( currIdx ).second == true,
_( "Insert of new group to check failed" ) ); "Insert of new group to check failed" );
// We haven't visited currIdx yet, so it must be in toCheckGroups // We haven't visited currIdx yet, so it must be in toCheckGroups
wxCHECK( toCheckGroups.erase( currIdx ) == 1, wxCHECK( toCheckGroups.erase( currIdx ) == 1,
_( "Erase of idx for group just checked failed" ) ); "Erase of idx for group just checked failed" );
currIdx = parentGroupIdx[currIdx]; currIdx = parentGroupIdx[currIdx];
if( currIdx == -1 ) if( currIdx == -1 )
{ {
@ -2371,7 +2371,7 @@ void BOARD::GroupRemoveItems( const PCBNEW_SELECTION& selection, BOARD_COMMIT* c
removedSomething = true; removedSomething = true;
} }
} }
wxCHECK_RET( removedSomething, _( "Item to be removed not found in it's parent group" ) ); wxCHECK_RET( removedSomething, "Item to be removed not found in it's parent group" );
} }
} }

2
pcbnew/dialogs/dialog_board_reannotate.cpp
View File

@ -297,7 +297,7 @@ void DIALOG_BOARD_REANNOTATE::MakeSampleText( wxString& aMessage )
{ {
wxString tmp; wxString tmp;
aMessage.Printf( _( "\n%s footprints will be reannotated. " ), aMessage.Printf( _( "\n%s footprints will be reannotated." ),
_( AnnotateString[m_AnnotationChoice] ) ); _( AnnotateString[m_AnnotationChoice] ) );
if( !m_ExcludeList->GetValue().empty() ) if( !m_ExcludeList->GetValue().empty() )