Commit fb3a12ad authored by charras's avatar charras

fixed typo and minor problems. updated German translation

parent f3590e51
......@@ -107,8 +107,11 @@ check_find_package_result(OPENGL_FOUND "OpenGL")
######################
# Find Boost library #
######################
find_package(Boost 1.36 QUIET)
check_find_package_result(Boost_FOUND "Boost")
# kicad now includes needed boost files.
# the two next lines can be uncommented to use the native boost lib.
# but this is not a good idea
#find_package(Boost 1.36 QUIET)
#check_find_package_result(Boost_FOUND "Boost")
##########################
# Find wxWidgets library #
......
......@@ -153,7 +153,7 @@ void InitKiCadAbout( wxAboutDialogInfo& info )
info.AddTranslator( SetMsg( wxT( "Russian (RU) Igor Plyatov <plyatov@gmail.com>" ) ) );
info.AddTranslator( SetMsg( wxT( "Spanish (ES) Pedro Martin del Valle <pkicad@yahoo.es>" ) ) );
info.AddTranslator( SetMsg( wxT( "Spanish (ES) Iñigo Zuluaga <inigo_zuluaga@yahoo.es>" ) ) );
info.AddTranslator( SetMsg( wxT( "German (DE) Rafael.Sokolowski <rafael.sokolowski@web.de>" ) ) );
info.AddTranslator( SetMsg( wxT( "German (DE) Rafael Sokolowski <rafael.sokolowski@web.de>" ) ) );
/* TODO are these all russian translators, placed them here now TODO
TODO or else align them below other language maintainer with mail adres TODO*/
......
......@@ -48,7 +48,7 @@ public:
// Filename extension for BOM list
static const wxString BomFileExtension( wxT( "lst" ) );
static const wxString BomFileWildcard( wxT( "Bill of Materials file (*.lst)|*.lst" ) );
#define BomFileWildcard _( "Bill of Materials file (*.lst)|*.lst" )
/* Local functions */
......
......@@ -44,9 +44,9 @@ wxString DRC_ITEM::GetErrorText() const
case ERCE_PIN_NOT_DRIVEN:
return wxString( _("Pin connected to some others pins but no pin to drive it") );
case ERCE_PIN_TO_PIN_WARNING:
return wxString( _("Confict problem between pins. Severity: warning") );
return wxString( _("Conflict problem between pins. Severity: warning") );
case ERCE_PIN_TO_PIN_ERROR:
return wxString( _("Confict problem between pins. Severity: error") );
return wxString( _("Conflict problem between pins. Severity: error") );
case ERCE_HIERACHICAL_LABEL:
return wxString( _("Mismatch between hierarchical labels and pins sheets"));
case ERCE_NOCONNECT_CONNECTED:
......
......@@ -21,7 +21,7 @@
static const wxChar* duplicate_name_msg = _( "Component library <%s> has \
duplicate entry name <%s>. This may cause some expected behavior when \
duplicate entry name <%s>. This may cause some unexpected behavior when \
loading components into a schematic." );
......
......@@ -93,7 +93,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
m_OptionPartsLocked = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Parts are locked"), wxDefaultPosition, wxDefaultSize, 0 );
m_OptionPartsLocked->SetToolTip( _("Check this option if Eeschema cannot change parts selections inside a given package\nThis happens when parts are differents in this package.") );
m_OptionPartsLocked->SetToolTip( _("Check this option if Eeschema cannot change parts selections inside a given package\nThis happens when parts are different in this package.") );
bSizerBasicPanel->Add( m_OptionPartsLocked, 0, wxALL, 5 );
......
......@@ -815,7 +815,7 @@
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">Check this option if Eeschema cannot change parts selections inside a given package&#x0A;This happens when parts are differents in this package.</property>
<property name="tooltip">Check this option if Eeschema cannot change parts selections inside a given package&#x0A;This happens when parts are different in this package.</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......
......@@ -438,7 +438,7 @@ void WinEDA_LibeditFrame::DeleteOnePart( wxCommandEvent& event )
*/
if( GetScreen()->IsModify()
&& !IsOK( this, _( "The component being deleted has been modified. \
&& !IsOK( this, _( "The component being deleted has been modified. \
All changes will be lost. Discard changes?" ) ) )
return;
......
......@@ -140,7 +140,7 @@ WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName,
filetypes += _("Top solder resist (*.GTS)|*.GTS;*.gts|");
filetypes += _("Bottom overlay (*.GBO)|*.GBO;*.gbo|");
filetypes += _("Top overlay (*.GTO)|*.GTO;*.gto|");
filetypes += _("Bottom paste (*.GBP)|*.GBP;*.gto|");
filetypes += _("Bottom paste (*.GBP)|*.GBP;*.gbp|");
filetypes += _("Top paste (*.GTP)|*.GTP;*.gtp|");
filetypes += _("Keep-out layer (*.GKO)|*.GKO;*.gko|");
filetypes += _("Mechanical layers (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|");
......
No preview for this file type
This diff is collapsed.
......@@ -73,7 +73,7 @@ void WinEDA_PcbFrame::InstallTextPCBOptionsFrame( TEXTE_PCB* TextPCB, wxDC* DC )
WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* parent,
TEXTE_PCB* TextPCB,
wxDC* DC ) :
wxDialog( parent, -1, _( "TextPCB properties" ), wxDefaultPosition,
wxDialog( parent, -1, _( "PCB Text properties" ), wxDefaultPosition,
wxSize( 390, 340 ) )
{
wxButton* Button;
......
......@@ -152,7 +152,7 @@ bool WinEDA_PcbFrame::Clear_Pcb( bool aQuery )
|| GetBoard()->m_Track || GetBoard()->m_Zone )
{
if( !IsOK( this,
_( "Current Board will be lost and this operation and cannot be undone. Continue ?" ) ) )
_( "Current Board will be lost and this operation cannot be undone. Continue ?" ) ) )
return FALSE;
}
}
......@@ -198,7 +198,7 @@ bool WinEDA_ModuleEditFrame::Clear_Pcb( bool aQuery )
if( GetBoard()->m_Modules )
{
if( !IsOK( this,
_( "Current Footprint will be lost and this operation and cannot be undone. Continue ?" ) ) )
_( "Current Footprint will be lost and this operation cannot be undone. Continue ?" ) ) )
return FALSE;
}
}
......
......@@ -31,7 +31,7 @@
const wxString ModExportFileExtension( wxT( "emp" ) );
const wxString ModExportFileWildcard( _( "Kicad foot print export files (*.emp)|*.emp" ) );
#define ModExportFileWildcard _( "Kicad foot print export files (*.emp)|*.emp" )
/* Fonctions locales */
......
......@@ -194,6 +194,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
WinEDA_PcbFrame::Process_Special_Functions )
// popup menus
EVT_MENU( ID_POPUP_PCB_DELETE_TRACKSEG, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE,
WinEDA_PcbFrame::Process_Special_Functions )
......
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