diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp index 5f76091db9..89bed3959a 100644 --- a/eeschema/connection_graph.cpp +++ b/eeschema/connection_graph.cpp @@ -855,12 +855,12 @@ void CONNECTION_GRAPH::buildConnectionGraph() if( m_global_label_cache.count( name ) || ( m_local_label_cache.count( std::make_pair( subgraph->m_sheet, local_name ) ) ) ) { - auto new_name = wxString::Format( _( "%s%u" ), name, suffix ); + auto new_name = wxString::Format( "%s%u", name, suffix ); wxLogTrace( "CONN", "Subgraph %ld default name %s conflicts with a label. Changing to %s.", subgraph->m_code, name, new_name ); - conn->SetSuffix( wxString::Format( _( "%u" ), suffix ) ); + conn->SetSuffix( wxString::Format( "%u", suffix ) ); suffix++; name = new_name; } @@ -883,13 +883,13 @@ void CONNECTION_GRAPH::buildConnectionGraph() if( check_name == name ) { - auto new_name = wxString::Format( _( "%s%u" ), name, suffix ); + auto new_name = wxString::Format( "%s%u", name, suffix ); wxLogTrace( "CONN", "Subgraph %ld and %ld both have name %s. Changing %ld to %s.", subgraph->m_code, candidate->m_code, name, candidate->m_code, new_name ); - c_conn->SetSuffix( wxString::Format( _( "%u" ), suffix ) ); + c_conn->SetSuffix( wxString::Format( "%u", suffix ) ); candidate->m_dirty = false; suffix++; diff --git a/eeschema/sch_connection.cpp b/eeschema/sch_connection.cpp index 4592471a6f..9da150ce35 100644 --- a/eeschema/sch_connection.cpp +++ b/eeschema/sch_connection.cpp @@ -329,24 +329,25 @@ void SCH_CONNECTION::AppendDebugInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity ) return; + // These messages are not flagged as translatable, because they are only debug messges wxString msg; AppendInfoToMsgPanel( aList ); msg.Printf( "%d", m_bus_code ); - aList.push_back( MSG_PANEL_ITEM( _( "Bus Code" ), msg, BROWN ) ); + aList.push_back( MSG_PANEL_ITEM( "Bus Code", msg, BROWN ) ); msg.Printf( "%d", m_subgraph_code ); - aList.push_back( MSG_PANEL_ITEM( _( "Subgraph Code" ), msg, BROWN ) ); + aList.push_back( MSG_PANEL_ITEM( "Subgraph Code", msg, BROWN ) ); if( auto driver = Driver() ) { msg.Printf( "%s at %p", driver->GetSelectMenuText( MILLIMETRES ), driver ); - aList.push_back( MSG_PANEL_ITEM( _( "Connection Source" ), msg, RED ) ); + aList.push_back( MSG_PANEL_ITEM( "Connection Source", msg, RED ) ); } msg.Printf( "%s at %p", Parent()->GetSelectMenuText( MILLIMETRES ), Parent() ); - aList.push_back( MSG_PANEL_ITEM( _( "Attached To" ), msg, RED ) ); + aList.push_back( MSG_PANEL_ITEM( "Attached To", msg, RED ) ); } diff --git a/eeschema/sch_pin.cpp b/eeschema/sch_pin.cpp index 301b11f4f9..681621280e 100644 --- a/eeschema/sch_pin.cpp +++ b/eeschema/sch_pin.cpp @@ -49,13 +49,13 @@ wxString SCH_PIN::GetSelectMenuText( EDA_UNITS_T aUnits ) const wxString tmp; #ifdef DEBUG - tmp.Printf( _( "SCH_PIN for %s %s" ), - GetChars( m_comp->GetSelectMenuText( aUnits ) ), - GetChars( m_pin->GetSelectMenuText( aUnits ) ) ); + tmp.Printf( "SCH_PIN for %s %s", + m_comp->GetSelectMenuText( aUnits ), + m_pin->GetSelectMenuText( aUnits ) ); #else - tmp.Printf( _( "%s %s" ), - GetChars( m_comp->GetSelectMenuText( aUnits ) ), - GetChars( m_pin->GetSelectMenuText( aUnits ) ) ); + tmp.Printf( "%s %s", + m_comp->GetSelectMenuText( aUnits ), + m_pin->GetSelectMenuText( aUnits ) ); #endif return tmp; @@ -72,7 +72,7 @@ wxString SCH_PIN::GetDefaultNetName( const SCH_SHEET_PATH aPath ) if( m_net_name_map.count( aPath ) > 0 ) return m_net_name_map.at( aPath ); - wxString name = wxT( "Net-(" ); + wxString name = "Net-("; name << m_comp->GetRef( &aPath ); @@ -80,7 +80,7 @@ wxString SCH_PIN::GetDefaultNetName( const SCH_SHEET_PATH aPath ) if( /* adoptTimestamp && */ name.Last() == '?' ) name << m_comp->GetTimeStamp(); - name << _( "-Pad" ) << m_pin->GetNumber() << _( ")" ); + name << "-Pad" << m_pin->GetNumber() << ")"; m_net_name_map[ aPath ] = name; diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index 14eb355acd..b1cbce6fcf 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -647,7 +647,7 @@ void SCH_TEXT::GetMsgPanelInfo( EDA_UNITS_T aUnits, MSG_PANEL_ITEMS& aList ) } msg.Printf( "%p", this ); - aList.push_back( MSG_PANEL_ITEM( _( "Object Address" ), msg, RED ) ); + aList.push_back( MSG_PANEL_ITEM( "Object Address", msg, RED ) ); #endif } diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 7601e65db7..48410ee668 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -871,7 +871,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE, _( "&Drill Files (.drl)..." ), - _( "Generate excellon2 drill file(s)" ), + _( "Generate Excellon drill file(s)" ), KiBitmap( post_drill_xpm ) ); AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE, diff --git a/pcbnew/toolbars_update_user_interface.cpp b/pcbnew/toolbars_update_user_interface.cpp index fd63215dbd..2fa53c2abb 100644 --- a/pcbnew/toolbars_update_user_interface.cpp +++ b/pcbnew/toolbars_update_user_interface.cpp @@ -153,8 +153,8 @@ void PCB_EDIT_FRAME::OnUpdateCurvedRatsnest( wxUpdateUIEvent& aEvent ) aEvent.Check( displ_opts->m_DisplayRatsnestLinesCurved ); m_optionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_CURVED_RATSNEST_LINES, !displ_opts->m_DisplayRatsnestLinesCurved ? - _( "Show ratlines as curves" ) : - _( "Show ratlines as straight lines" ) ); + _( "Show airwires as curves" ) : + _( "Show airwires as straight lines" ) ); }