Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Fix some typos and improve wording

6.0.7
Jonathan Haas 5 years ago
parent
3199a88d54
commit
f90164f7cf
16 changed files with 25 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      common/dialogs/panel_common_settings.cpp
  2. 2
      common/kiway.cpp
  3. 2
      eeschema/dialogs/dialog_edit_label.cpp
  4. 2
      eeschema/dialogs/dialog_spice_model_base.cpp
  5. 2
      eeschema/dialogs/dialog_spice_model_base.fbp
  6. 2
      eeschema/sch_marker.cpp
  7. 6
      eeschema/tools/ee_actions.cpp
  8. 8
      pcbnew/dialogs/dialog_board_reannotate_base.cpp
  9. 8
      pcbnew/dialogs/dialog_board_reannotate_base.fbp
  10. 4
      pcbnew/dialogs/dialog_copper_zones_base.cpp
  11. 2
      pcbnew/dialogs/dialog_copper_zones_base.fbp
  12. 2
      pcbnew/dialogs/dialog_export_svg_base.cpp
  13. 2
      pcbnew/dialogs/dialog_export_svg_base.fbp
  14. 2
      pcbnew/dialogs/dialog_net_inspector.cpp
  15. 2
      pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp
  16. 2
      pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp

2
common/dialogs/panel_common_settings.cpp
View File

@ -285,7 +285,7 @@ void PANEL_COMMON_SETTINGS::OnPDFViewerClick( wxCommandEvent& event )
Pgm().ReadPdfBrowserInfos();
wxFileName fn = Pgm().GetPdfBrowserName();
wxFileDialog dlg( this, _( "Select Preferred PDF Browser" ), fn.GetPath(), fn.GetFullPath(),
wxFileDialog dlg( this, _( "Select Preferred PDF Viewer" ), fn.GetPath(), fn.GetFullPath(),
wildcard, wxFD_OPEN | wxFD_FILE_MUST_EXIST );
if( dlg.ShowModal() == wxID_CANCEL )

2
common/kiway.cpp
View File

@ -234,7 +234,7 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
// Failure: error reporting UI was done via wxLogSysError().
// No further reporting required here. Assume the same thing applies here as
// above with the Load() call. This has not been tested.
msg.Printf( _( "Could not read instance name and version symbol form kiface "
msg.Printf( _( "Could not read instance name and version symbol from kiface "
"library \"%s\"." ),
dname );
THROW_IO_ERROR( msg );

2
eeschema/dialogs/dialog_edit_label.cpp
View File

@ -324,7 +324,7 @@ bool DIALOG_LABEL_EDITOR::TransferDataFromWindow()
}
else if( !m_CurrentText->IsNew() )
{
DisplayError( this, _( "Empty Text!" ) );
DisplayError( this, _( "Label requires non-empty text." ) );
return false;
}

2
eeschema/dialogs/dialog_spice_model_base.cpp
View File

@ -64,7 +64,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
wxBoxSizer* bSizerUnits;
bSizerUnits = new wxBoxSizer( wxVERTICAL );
m_staticText32 = new wxStaticText( m_passive, wxID_ANY, _("In Spice values,the decimal separator is the point.\nValues can use Spice unit symbols."), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText32 = new wxStaticText( m_passive, wxID_ANY, _("In Spice values, the decimal separator is the point.\nValues can use Spice unit symbols."), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText32->Wrap( -1 );
bSizerUnits->Add( m_staticText32, 0, wxALL, 5 );

2
eeschema/dialogs/dialog_spice_model_base.fbp
View File

@ -668,7 +668,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">In Spice values,the decimal separator is the point.&#x0A;Values can use Spice unit symbols.</property>
<property name="label">In Spice values, the decimal separator is the point.&#x0A;Values can use Spice unit symbols.</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>

2
eeschema/sch_marker.cpp
View File

@ -162,7 +162,7 @@ const EDA_RECT SCH_MARKER::GetBoundingBox() const
void SCH_MARKER::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS& aList )
{
aList.push_back( MSG_PANEL_ITEM( _( "Electronics Rule Check Error" ),
aList.push_back( MSG_PANEL_ITEM( _( "Electrical Rule Check Error" ),
m_rcItem->GetErrorMessage() ) );
}

6
eeschema/tools/ee_actions.cpp
View File

@ -620,7 +620,7 @@ TOOL_ACTION EE_ACTIONS::generateBOM( "eeschema.EditorControl.generateBOM",
TOOL_ACTION EE_ACTIONS::explicitCrossProbe( "eeschema.EditorControl.explicitCrossProbe",
AS_GLOBAL, 0, "",
_( "Highlight on PCB" ), _( "Highlight corresponding items in board editor" ),
_( "Highlight on PCB" ), _( "Highlight corresponding items in PCB editor" ),
select_same_sheet_xpm );
TOOL_ACTION EE_ACTIONS::toggleHiddenPins( "eeschema.EditorControl.showHiddenPins",
@ -643,13 +643,13 @@ TOOL_ACTION EE_ACTIONS::toggleForceHV( "eeschema.EditorControl.forceHVLines",
//
TOOL_ACTION EE_ACTIONS::enterSheet( "eeschema.NavigateTool.enterSheet",
AS_GLOBAL, 0, "",
_( "Enter Sheet" ), _( "Display the selected sheet's contents in the Eeschema window" ),
_( "Enter Sheet" ), _( "Display the selected sheet's contents in the schematic editor" ),
enter_sheet_xpm );
TOOL_ACTION EE_ACTIONS::leaveSheet( "eeschema.NavigateTool.leaveSheet",
AS_GLOBAL,
MD_ALT + WXK_BACK, LEGACY_HK_NAME( "Leave Sheet" ),
_( "Leave Sheet" ), _( "Display the parent sheet in the Eeschema window" ),
_( "Leave Sheet" ), _( "Display the parent sheet in the schematic editor" ),
leave_sheet_xpm );
TOOL_ACTION EE_ACTIONS::navigateHierarchy( "eeschema.NavigateTool.navigateHierarchy",

8
pcbnew/dialogs/dialog_board_reannotate_base.cpp
View File

@ -245,23 +245,23 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx
m_FrontPrefixText = new wxStaticText( m_Advanced, wxID_ANY, _("Front prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
m_FrontPrefixText->Wrap( -1 );
m_FrontPrefixText->SetToolTip( _("Optional prefix for component side reference designations (i.e. F_)") );
m_FrontPrefixText->SetToolTip( _("Optional prefix for component side reference designations (e.g. F_)") );
gbSizer1->Add( m_FrontPrefixText, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
m_FrontPrefix = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_FrontPrefix->SetToolTip( _("Optional prefix for component side reference designations (i.e. F_)") );
m_FrontPrefix->SetToolTip( _("Optional prefix for component side reference designations (e.g. F_)") );
gbSizer1->Add( m_FrontPrefix, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_BackPrefixText = new wxStaticText( m_Advanced, wxID_ANY, _("Back prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
m_BackPrefixText->Wrap( -1 );
m_BackPrefixText->SetToolTip( _("Optional prefix for solder side reference designations (i.e. B_)") );
m_BackPrefixText->SetToolTip( _("Optional prefix for solder side reference designations (e.g. B_)") );
gbSizer1->Add( m_BackPrefixText, wxGBPosition( 1, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
m_BackPrefix = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_BackPrefix->SetToolTip( _("Optional prefix for solder side reference designations (i.e. B_)") );
m_BackPrefix->SetToolTip( _("Optional prefix for solder side reference designations (e.g. B_)") );
gbSizer1->Add( m_BackPrefix, wxGBPosition( 1, 4 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

8
pcbnew/dialogs/dialog_board_reannotate_base.fbp
View File

@ -2465,7 +2465,7 @@
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Optional prefix for component side reference designations (i.e. F_)</property>
<property name="tooltip">Optional prefix for component side reference designations (e.g. F_)</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@ -2528,7 +2528,7 @@
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Optional prefix for component side reference designations (i.e. F_)</property>
<property name="tooltip">Optional prefix for component side reference designations (e.g. F_)</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_ALPHA</property>
<property name="validator_type">wxGenericValidator</property>
@ -2597,7 +2597,7 @@
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Optional prefix for solder side reference designations (i.e. B_)</property>
<property name="tooltip">Optional prefix for solder side reference designations (e.g. B_)</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@ -2660,7 +2660,7 @@
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Optional prefix for solder side reference designations (i.e. B_)</property>
<property name="tooltip">Optional prefix for solder side reference designations (e.g. B_)</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_ALPHA|wxFILTER_NONE</property>
<property name="validator_type">wxGenericValidator</property>

4
pcbnew/dialogs/dialog_copper_zones_base.cpp
View File

@ -226,7 +226,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
m_connectionLabel = new wxStaticText( sbSizer5->GetStaticBox(), wxID_ANY, _("Pad connections:"), wxDefaultPosition, wxDefaultSize, 0 );
m_connectionLabel->Wrap( -1 );
m_connectionLabel->SetToolTip( _("Default pad connection type to zone.\nThis setting can be overridden by local pad settings") );
m_connectionLabel->SetToolTip( _("Default pad connection type to zone.\nThis setting can be overridden by local pad settings") );
gbSizerSettings->Add( m_connectionLabel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
@ -282,7 +282,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
m_staticTextGridFillType->Wrap( -1 );
gbSizer3->Add( m_staticTextGridFillType, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxString m_GridStyleCtrlChoices[] = { _("Solid shape"), _("Hatch pattern") };
wxString m_GridStyleCtrlChoices[] = { _("Solid fill"), _("Hatch pattern") };
int m_GridStyleCtrlNChoices = sizeof( m_GridStyleCtrlChoices ) / sizeof( wxString );
m_GridStyleCtrl = new wxChoice( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_GridStyleCtrlNChoices, m_GridStyleCtrlChoices, 0 );
m_GridStyleCtrl->SetSelection( 0 );

2
pcbnew/dialogs/dialog_copper_zones_base.fbp
View File

@ -2959,7 +2959,7 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">&quot;Solid shape&quot; &quot;Hatch pattern&quot;</property>
<property name="choices">&quot;Solid fill&quot; &quot;Hatch pattern&quot;</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>

2
pcbnew/dialogs/dialog_export_svg_base.cpp
View File

@ -81,7 +81,7 @@ DIALOG_EXPORT_SVG_BASE::DIALOG_EXPORT_SVG_BASE( wxWindow* parent, wxWindowID id,
int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
m_ModeColorOption = new wxRadioBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Print Mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
m_ModeColorOption->SetSelection( 1 );
m_ModeColorOption->SetToolTip( _("Choose if you want to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using black and white printers") );
m_ModeColorOption->SetToolTip( _("Export as black elements on a white background") );
sbOptionsSizer->Add( m_ModeColorOption, 0, wxEXPAND|wxALL, 5 );

2
pcbnew/dialogs/dialog_export_svg_base.fbp
View File

@ -631,7 +631,7 @@
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Choose if you want to draw the sheet like it appears on screen,&#x0A;or in black and white mode, better to print it when using black and white printers</property>
<property name="tooltip">Export as black elements on a white background</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>

2
pcbnew/dialogs/dialog_net_inspector.cpp
View File

@ -72,7 +72,7 @@ def_col( COLUMN_NAME, 1, _( "Name" ), _( "Net Name" ), CSV_Q
def_col( COLUMN_PAD_COUNT, 2, _( "Pad Count" ), _( "Pad Count" ), CSV_NONE );
def_col( COLUMN_VIA_COUNT, 3, _( "Via Count" ), _( "Via Count" ), CSV_NONE );
def_col( COLUMN_VIA_LENGTH, 4, _( "Via Length" ), _( "Via Length" ), CSV_NONE );
def_col( COLUMN_BOARD_LENGTH, 5, _( "Board Length" ), _( "Board Length" ), CSV_NONE );
def_col( COLUMN_BOARD_LENGTH, 5, _( "Track Length" ), _( "Track Length" ), CSV_NONE );
def_col( COLUMN_CHIP_LENGTH, 6, _( "Die Length" ), _( "Die Length" ), CSV_NONE );
def_col( COLUMN_TOTAL_LENGTH, 7, _( "Total Length" ), _( "Net Length" ), CSV_NONE );

2
pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp
View File

@ -114,7 +114,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE(
m_staticTextGridFillType->Wrap( -1 );
fgSizer1->Add( m_staticTextGridFillType, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
wxString m_GridStyleCtrlChoices[] = { _("Solid shape"), _("HatchBorder pattern") };
wxString m_GridStyleCtrlChoices[] = { _("Solid fill"), _("HatchBorder pattern") };
int m_GridStyleCtrlNChoices = sizeof( m_GridStyleCtrlChoices ) / sizeof( wxString );
m_GridStyleCtrl = new wxChoice( sbFill->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_GridStyleCtrlNChoices, m_GridStyleCtrlChoices, 0 );
m_GridStyleCtrl->SetSelection( 0 );

2
pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
View File

@ -740,7 +740,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryAreas( const SYMDEF_PCB& aComponent,
wxLogError(
wxString::Format( _( "The CADSTAR area '%s' in library component '%s' does not "
"have a KiCad equivalent. The area is neither a via or"
"have a KiCad equivalent. The area is neither a via nor "
"route keepout area. The area was not imported." ),
area.ID, libName ) );
}

Write Preview
Loading…
Cancel
Save