Commit 4e626d44 authored by jean-pierre charras's avatar jean-pierre charras

Make some messages translatable.

parent 609abb2f
...@@ -565,9 +565,10 @@ wxString DRAWSEGMENT::GetSelectMenuText() const ...@@ -565,9 +565,10 @@ wxString DRAWSEGMENT::GetSelectMenuText() const
wxString text; wxString text;
wxString temp; wxString temp;
text << _( "Pcb Graphic" ) << wxT(": ") << ShowShape( (Track_Shapes)m_Shape ) text.Printf( _( "Pcb Graphic: %s length: %s on %s" ),
<< wxChar(' ') << _( "Length:" ) << valeur_param( GetLength(), temp ) GetChars( ShowShape( (Track_Shapes)m_Shape ) ),
<< _( " on " ) << GetLayerName(); GetChars( valeur_param( GetLength(), temp ) ),
GetChars( GetLayerName() ) );
return text; return text;
} }
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "pcbcommon.h" #include "pcbcommon.h"
#include "colors_selection.h" #include "colors_selection.h"
#include "trigo.h" #include "trigo.h"
#include "macros.h"
#include "protos.h" #include "protos.h"
#include "richio.h" #include "richio.h"
...@@ -245,8 +246,8 @@ wxString PCB_TARGET::GetSelectMenuText() const ...@@ -245,8 +246,8 @@ wxString PCB_TARGET::GetSelectMenuText() const
valeur_param( m_Size, msg ); valeur_param( m_Size, msg );
text << _( "Target" ) << _( " on " ) << GetLayerName() << wxT( " " ) << _( "size" ) text.Printf( _( "Target on %s size %s" ),
<< wxT( " " ) << msg; GetChars( GetLayerName() ), GetChars( msg ) );
return text; return text;
} }
...@@ -932,20 +932,22 @@ wxString D_PAD::ShowPadAttr() const ...@@ -932,20 +932,22 @@ wxString D_PAD::ShowPadAttr() const
wxString D_PAD::GetSelectMenuText() const wxString D_PAD::GetSelectMenuText() const
{ {
wxString text; wxString text;
wxString padlayers;
BOARD * board = GetBoard(); BOARD * board = GetBoard();
text << _( "Pad" ) << wxT( " \"" ) << ReturnStringPadName() << wxT( "\" (" );
if ( (m_layerMask & ALL_CU_LAYERS) == ALL_CU_LAYERS ) if ( (m_layerMask & ALL_CU_LAYERS) == ALL_CU_LAYERS )
text << _("all copper layers"); padlayers = _("all copper layers");
else if( (m_layerMask & LAYER_BACK ) == LAYER_BACK ) else if( (m_layerMask & LAYER_BACK ) == LAYER_BACK )
text << board->GetLayerName(LAYER_N_BACK); padlayers = board->GetLayerName(LAYER_N_BACK);
else if( (m_layerMask & LAYER_FRONT) == LAYER_FRONT ) else if( (m_layerMask & LAYER_FRONT) == LAYER_FRONT )
text << board->GetLayerName(LAYER_N_FRONT); padlayers = board->GetLayerName(LAYER_N_FRONT);
else else
text << _( "???" ); padlayers = _( "???" );
text << _( ") of " ) << ( (MODULE*) GetParent() )->GetReference(); text.Printf( _( "Pad [%s] (%s) of %s" ),
GetChars(ReturnStringPadName() ), GetChars( padlayers ),
GetChars(( (MODULE*) GetParent() )->GetReference() ) );
return text; return text;
} }
......
...@@ -328,16 +328,15 @@ void TEXTE_PCB::Flip(const wxPoint& aCentre ) ...@@ -328,16 +328,15 @@ void TEXTE_PCB::Flip(const wxPoint& aCentre )
wxString TEXTE_PCB::GetSelectMenuText() const wxString TEXTE_PCB::GetSelectMenuText() const
{ {
wxString text; wxString text, shorttxt;
text << _( "Pcb Text" ) << wxT( " " );
if( m_Text.Len() < 12 ) if( m_Text.Len() < 12 )
text << m_Text; shorttxt << m_Text;
else else
text += m_Text.Left( 10 ) + wxT( ".." ); shorttxt += m_Text.Left( 10 ) + wxT( ".." );
text << _( " on " ) << GetLayerName(); text.Printf( _( "Pcb Text %s on %s"),
GetChars ( shorttxt ), GetChars( GetLayerName() ) );
return text; return text;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment