partial move back towards UIpolicy.txt

eeschema/dialog_edit_component_in_schematic.h

@@ -49,7 +49,7 @@ class wxNotebook;
 #define ID_CHECKBOX_FILED_ORIENT 10011
 #define ID_RESTORE_CMP_DEFAULTS 10006
 #define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER
-#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_TITLE _("Component properties")
+#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_TITLE _("Component Properties")
 #define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_IDNAME ID_DIALOG
 #define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_SIZE wxSize(400, 300)
 #define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_POSITION wxDefaultPosition

eeschema/edit_component_in_lib.cpp

@@ -472,10 +472,12 @@ void WinEDA_PartPropertiesFrame::BuildPanelEditField()
  *  of the component
  */
 {
-    wxString Hjustify_list[] =
+    static const wxString Hjustify_list[] =
     { _( "Align left" ), _( "Align center" ), _( "Align right" ) };
-    wxString Vjustify_list[] =
+
+    static const wxString Vjustify_list[] =
     { _( "Align bottom" ), _( "Align center" ), _( "Align top" ) };
+
     int      FieldId = m_CurrentFieldId;
 
     m_PanelField = new                      wxPanel( m_NoteBook, ID_PANEL_FIELD );
@@ -548,7 +550,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelEditField()
         else
             fieldnamelist[ii] = m_FieldName[ii];
     }
-	fieldnamelist[VALUE] << wxT("/") << _("Chip Name");
+    fieldnamelist[VALUE] << wxT("/") << _("Chip Name");
 
     m_FieldSelection = new wxRadioBox( m_PanelField, ID_ON_SELECT_FIELD,
                                        _( "Field to edit" ), wxDefaultPosition, wxDefaultSize,
@@ -653,7 +655,7 @@ void WinEDA_PartPropertiesFrame::PartPropertiesAccept( wxCommandEvent& event )
         Close(); return;
     }
 
-	m_Parent->GetScreen()->SetModify();
+    m_Parent->GetScreen()->SetModify();
     m_Parent->SaveCopyInUndoList( CurrentLibEntry );
 
     CopyPanelFieldToData();
@@ -761,7 +763,7 @@ void WinEDA_PartPropertiesFrame::PartPropertiesAccept( wxCommandEvent& event )
                 {
                     if( ii < FIELD1 || Field->m_Name.IsEmpty() )
                     {
-						SAFE_DELETE( Field );
+                        SAFE_DELETE( Field );
                         if( previousField )
                             previousField->Pnext = NextField;
                         else

eeschema/pinedit-dialog.cpp

@@ -36,20 +36,20 @@ void InstallPineditFrame(WinEDA_LibeditFrame * parent, wxDC * DC, const wxPoint
 {
 wxPoint MousePos = parent->GetScreen()->m_Curseur;
 int accept = TRUE;
-	if ( (CurrentDrawItem == NULL) || (CurrentDrawItem->Type() == COMPONENT_PIN_DRAW_TYPE) )
-	{
-		LibDrawPin * Pin = (LibDrawPin *) CurrentDrawItem;
-		WinEDA_PinPropertiesFrame * frame = new WinEDA_PinPropertiesFrame(parent);
-		accept = frame->ShowModal(); frame->Destroy();
-		if ( !accept && Pin && ( Pin->m_Flags & IS_NEW ) )	// Abord create new pin
-		{
-			if ( parent->DrawPanel->ForceCloseManageCurseur && DC)
-				parent->DrawPanel->ForceCloseManageCurseur(parent->DrawPanel, DC);
-		}
-	}
-	else DisplayError(parent, wxT("Error: Not a Pin!") );
-	parent->GetScreen()->m_Curseur = MousePos;
-	parent->DrawPanel->MouseToCursorSchema();
+    if ( (CurrentDrawItem == NULL) || (CurrentDrawItem->Type() == COMPONENT_PIN_DRAW_TYPE) )
+    {
+        LibDrawPin * Pin = (LibDrawPin *) CurrentDrawItem;
+        WinEDA_PinPropertiesFrame * frame = new WinEDA_PinPropertiesFrame(parent);
+        accept = frame->ShowModal(); frame->Destroy();
+        if ( !accept && Pin && ( Pin->m_Flags & IS_NEW ) )	// Abord create new pin
+        {
+            if ( parent->DrawPanel->ForceCloseManageCurseur && DC)
+                parent->DrawPanel->ForceCloseManageCurseur(parent->DrawPanel, DC);
+        }
+    }
+    else DisplayError(parent, wxT("Error: Not a Pin!") );
+    parent->GetScreen()->m_Curseur = MousePos;
+    parent->DrawPanel->MouseToCursorSchema();
 }
 
 /*!
@@ -88,14 +88,14 @@ WinEDA_PinPropertiesFrame::WinEDA_PinPropertiesFrame( WinEDA_LibeditFrame* paren
 {
 LibDrawPin * CurrentPin = (LibDrawPin *) CurrentDrawItem;
 
-	m_Parent = parent;
-	if ( CurrentPin )
-	{
-		m_Parent->InitEditOnePin();
-	}
+    m_Parent = parent;
+    if ( CurrentPin )
+    {
+        m_Parent->InitEditOnePin();
+    }
     Create(parent, id, caption, pos, size, style);
 
-	/* Init dialog pin name and pin name size values */
+    /* Init dialog pin name and pin name size values */
     SetValuesInDialog( );
 }
 
@@ -144,7 +144,7 @@ bool WinEDA_PinPropertiesFrame::Create( wxWindow* parent, wxWindowID id, const w
 
 void WinEDA_PinPropertiesFrame::CreateControls()
 {
-	SetFont(*g_DialogFont);
+    SetFont(*g_DialogFont);
 
 ////@begin WinEDA_PinPropertiesFrame content construction
     // Generated by DialogBlocks, 11/08/2008 19:12:48 (unregistered)
@@ -187,7 +187,7 @@ void WinEDA_PinPropertiesFrame::CreateControls()
     m_PinSizeIncDecButton->SetValue(0);
     itemBoxSizer10->Add(m_PinSizeIncDecButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
 
-    m_PinSizeText = new wxStaticText( itemDialog1, wxID_STATIC, _("Pin lenght"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_PinSizeText = new wxStaticText( itemDialog1, wxID_STATIC, _("Pin length"), wxDefaultPosition, wxDefaultSize, 0 );
     itemStaticBoxSizer9->Add(m_PinSizeText, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
     m_CommonUnit = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMON_UNITS, _("Common to units"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
@@ -321,8 +321,8 @@ wxIcon WinEDA_PinPropertiesFrame::GetIconResource( const wxString& name )
 
 void WinEDA_PinPropertiesFrame::OnOkClick( wxCommandEvent& event )
 {
-	PinPropertiesAccept(event);
-	EndModal(1);
+    PinPropertiesAccept(event);
+    EndModal(1);
 }
 
 /*!
@@ -331,7 +331,7 @@ void WinEDA_PinPropertiesFrame::OnOkClick( wxCommandEvent& event )
 
 void WinEDA_PinPropertiesFrame::OnCancelClick( wxCommandEvent& event )
 {
-	EndModal(0);
+    EndModal(0);
 }
 
 /*******************************************************/
@@ -344,92 +344,92 @@ void WinEDA_PinPropertiesFrame::SetValuesInDialog(void)
     int tmp, ii;
 
     // Init values and texts for pin name:
-	if ( CurrentPin ) msg = CurrentPin->m_PinName;
-	else msg = wxEmptyString;
-	m_PinNameCtrl->SetValue(msg);
-	tmp = CurrentPin ? CurrentPin->m_PinNameSize : LastPinNameSize;
-	msg = ReturnStringFromValue(g_UnitMetric, tmp, m_Parent->m_InternalUnits);
-	m_PinNameSizeCtrl->SetValue(msg);
-	msg = m_PinNameSizeText->GetLabel() + ReturnUnitSymbol();
-	m_PinNameSizeText->SetLabel(msg);
-
-	/* Init dialog pin num and pin num size values */
-	if ( CurrentPin ) CurrentPin->ReturnPinStringNum(msg);
-	else msg = wxEmptyString;
-	m_PinNumCtrl->SetValue(msg);
-	tmp = CurrentPin ? CurrentPin->m_PinNumSize : LastPinNumSize;
-	msg = ReturnStringFromValue(g_UnitMetric, tmp, m_Parent->m_InternalUnits);
-	m_PinNumSizeCtrl->SetValue(msg);
-	msg = m_PinNumSizeText->GetLabel() + ReturnUnitSymbol();
-	m_PinNumSizeText->SetLabel(msg);
-
-	/* init dialog pin size */
-	msg = m_PinSizeText->GetLabel() + ReturnUnitSymbol();
-	m_PinSizeText->SetLabel(msg);
+    if ( CurrentPin ) msg = CurrentPin->m_PinName;
+    else msg = wxEmptyString;
+    m_PinNameCtrl->SetValue(msg);
+    tmp = CurrentPin ? CurrentPin->m_PinNameSize : LastPinNameSize;
+    msg = ReturnStringFromValue(g_UnitMetric, tmp, m_Parent->m_InternalUnits);
+    m_PinNameSizeCtrl->SetValue(msg);
+    msg = m_PinNameSizeText->GetLabel() + ReturnUnitSymbol();
+    m_PinNameSizeText->SetLabel(msg);
+
+    /* Init dialog pin num and pin num size values */
+    if ( CurrentPin ) CurrentPin->ReturnPinStringNum(msg);
+    else msg = wxEmptyString;
+    m_PinNumCtrl->SetValue(msg);
+    tmp = CurrentPin ? CurrentPin->m_PinNumSize : LastPinNumSize;
+    msg = ReturnStringFromValue(g_UnitMetric, tmp, m_Parent->m_InternalUnits);
+    m_PinNumSizeCtrl->SetValue(msg);
+    msg = m_PinNumSizeText->GetLabel() + ReturnUnitSymbol();
+    m_PinNumSizeText->SetLabel(msg);
+
+    /* init dialog pin size */
+    msg = m_PinSizeText->GetLabel() + ReturnUnitSymbol();
+    m_PinSizeText->SetLabel(msg);
 
     int pinsize = CurrentPin ? CurrentPin->m_PinLen : LastPinSize;
-	msg = ReturnStringFromValue(g_UnitMetric, pinsize, m_Parent->m_InternalUnits);
-	m_PinSizeCtrl->SetValue(msg);
+    msg = ReturnStringFromValue(g_UnitMetric, pinsize, m_Parent->m_InternalUnits);
+    m_PinSizeCtrl->SetValue(msg);
     m_PinSizeIncDecButton->SetValue(pinsize);
 
     /* init pin options */
-	if ( CurrentPin )
-		{
-		if ( CurrentPin->m_Unit == 0 ) m_CommonUnit->SetValue(TRUE);
-		}
-	else m_CommonUnit->SetValue(LastPinCommonUnit);
-	if ( CurrentPin )
-		{
-		if ( CurrentPin->m_Convert == 0 ) m_CommonConvert->SetValue(TRUE);
-		}
-	else m_CommonConvert->SetValue(LastPinCommonConvert);
-	if ( CurrentPin )
-		{
-		if ( CurrentPin->m_Attributs & PINNOTDRAW ) m_NoDraw->SetValue(TRUE);
-		}
-	else m_NoDraw->SetValue(LastPinNoDraw);
-
-	tmp = CurrentPin ? CurrentPin->m_Orient : LastPinOrient;
-	switch ( tmp )
-	{
-		case PIN_RIGHT:
-			m_PinOrient->SetSelection(0);
-			break;
-
-		case PIN_LEFT:
-			m_PinOrient->SetSelection(1);
-			break;
-
-		case PIN_UP:
-			m_PinOrient->SetSelection(2);
-			break;
-
-		case PIN_DOWN:
-			m_PinOrient->SetSelection(3);
-			break;
-	}
-
-	tmp = CurrentPin ? CurrentPin->m_PinShape : LastPinShape;
-	m_PinShape->SetSelection( 0 );
-	for ( ii = 0; ii < NBSHAPES; ii++ )
-	{
-		if ( CodeShape[ii] == tmp )
-		{
-			m_PinShape->SetSelection( ii ); break ;
-		}
-	}
-
-	tmp = CurrentPin ? CurrentPin->m_PinShape : LastPinShape;
-	m_PinShape->SetSelection( 0 );
-	for ( ii = 0; ii < NBSHAPES; ii++ )
-	{
-		if ( CodeShape[ii] == tmp )
-		{
-			m_PinShape->SetSelection( ii ); break ;
-		}
-	}
-
-	m_PinElectricalType->SetSelection( CurrentPin ? CurrentPin->m_PinType : LastPinType);
+    if ( CurrentPin )
+        {
+        if ( CurrentPin->m_Unit == 0 ) m_CommonUnit->SetValue(TRUE);
+        }
+    else m_CommonUnit->SetValue(LastPinCommonUnit);
+    if ( CurrentPin )
+        {
+        if ( CurrentPin->m_Convert == 0 ) m_CommonConvert->SetValue(TRUE);
+        }
+    else m_CommonConvert->SetValue(LastPinCommonConvert);
+    if ( CurrentPin )
+        {
+        if ( CurrentPin->m_Attributs & PINNOTDRAW ) m_NoDraw->SetValue(TRUE);
+        }
+    else m_NoDraw->SetValue(LastPinNoDraw);
+
+    tmp = CurrentPin ? CurrentPin->m_Orient : LastPinOrient;
+    switch ( tmp )
+    {
+        case PIN_RIGHT:
+            m_PinOrient->SetSelection(0);
+            break;
+
+        case PIN_LEFT:
+            m_PinOrient->SetSelection(1);
+            break;
+
+        case PIN_UP:
+            m_PinOrient->SetSelection(2);
+            break;
+
+        case PIN_DOWN:
+            m_PinOrient->SetSelection(3);
+            break;
+    }
+
+    tmp = CurrentPin ? CurrentPin->m_PinShape : LastPinShape;
+    m_PinShape->SetSelection( 0 );
+    for ( ii = 0; ii < NBSHAPES; ii++ )
+    {
+        if ( CodeShape[ii] == tmp )
+        {
+            m_PinShape->SetSelection( ii ); break ;
+        }
+    }
+
+    tmp = CurrentPin ? CurrentPin->m_PinShape : LastPinShape;
+    m_PinShape->SetSelection( 0 );
+    for ( ii = 0; ii < NBSHAPES; ii++ )
+    {
+        if ( CodeShape[ii] == tmp )
+        {
+            m_PinShape->SetSelection( ii ); break ;
+        }
+    }
+
+    m_PinElectricalType->SetSelection( CurrentPin ? CurrentPin->m_PinType : LastPinType);
 }
 
 
@@ -448,8 +448,8 @@ wxString msg;
     pinsize += 10;
     if ( pinsize < 0 ) pinsize = 0;
     if ( pinsize > 2000 ) pinsize = 2000;
-	msg = ReturnStringFromValue(g_UnitMetric, pinsize, m_Parent->m_InternalUnits);
-	m_PinSizeCtrl->SetValue(msg);
+    msg = ReturnStringFromValue(g_UnitMetric, pinsize, m_Parent->m_InternalUnits);
+    m_PinSizeCtrl->SetValue(msg);
     m_PinSizeIncDecButton->SetValue(pinsize);
 }
 
@@ -469,8 +469,8 @@ wxString msg;
     pinsize -= 10;
     if ( pinsize < 0 ) pinsize = 0;
     if ( pinsize > 2000 ) pinsize = 2000;
-	msg = ReturnStringFromValue(g_UnitMetric, pinsize, m_Parent->m_InternalUnits);
-	m_PinSizeCtrl->SetValue(msg);
+    msg = ReturnStringFromValue(g_UnitMetric, pinsize, m_Parent->m_InternalUnits);
+    m_PinSizeCtrl->SetValue(msg);
     m_PinSizeIncDecButton->SetValue(pinsize);
 }
 

kicad/buildmnu.cpp

@@ -89,26 +89,26 @@ void WinEDA_MainFrame::ReCreateMenuBar()
 
         m_FilesMenu = new wxMenu;
         wxMenuItem *item = new wxMenuItem(m_FilesMenu, ID_LOAD_PROJECT,
-                     _("&Open project"),
+                     _("&Open Project"),
                      _("Select an existing project") );
         item->SetBitmap(open_project_xpm);
         m_FilesMenu->Append(item);
 
         item = new wxMenuItem(m_FilesMenu, ID_NEW_PROJECT,
-                     _("&New project"),
+                     _("&New Project"),
                      _("Create new project") );
         item->SetBitmap(new_project_xpm);
         m_FilesMenu->Append(item);
 
         item = new wxMenuItem(m_FilesMenu, ID_SAVE_PROJECT,
-                     _("&Save project"),
+                     _("&Save Project"),
                      _("Save current project") );
         item->SetBitmap(save_project_xpm);
         m_FilesMenu->Append(item);
 
         m_FilesMenu->AppendSeparator();
         item = new wxMenuItem(m_FilesMenu, ID_SAVE_AND_ZIP_FILES,
-                     _("Save &project files"),
+                     _("Save &Project Files"),
                      _("Save and Zip all project files") );
         item->SetBitmap(zip_xpm);
         m_FilesMenu->Append(item);
@@ -138,19 +138,19 @@ void WinEDA_MainFrame::ReCreateMenuBar()
         item->SetBitmap(editor_xpm);
         browseMenu->Append(item);
         item = new wxMenuItem(browseMenu, ID_BROWSE_AN_SELECT_FILE,
-                _("&Browse files"), _("Read or edit files") );
+                _("&Browse Files"), _("Read or edit files") );
         item->SetBitmap(browse_files_xpm);
         browseMenu->Append(item);
         browseMenu->AppendSeparator();
         item = new wxMenuItem(browseMenu, ID_SELECT_PREFERED_EDITOR,
-                _("&Select editor"), _("Select your prefered editor for file browsing") );
+                _("&Select Editor"), _("Select your prefered editor for file browsing") );
         item->SetBitmap(editor_xpm);
         browseMenu->Append(item);
 
         // Preferences menu:
         wxMenu *PreferencesMenu = new wxMenu;
         item = new wxMenuItem(PreferencesMenu , ID_PREFERENCES_FONT_INFOSCREEN,
-                _("Select fonts"), _("Font preferences"));
+                _("Select Fonts"), _("Font preferences"));
         item->SetBitmap(fonts_xpm);
         PreferencesMenu->Append(item);
 
@@ -192,7 +192,7 @@ void WinEDA_MainFrame::ReCreateMenuBar()
         helpMenu->Append(item);
 
         item = new wxMenuItem(helpMenu , ID_KICAD_ABOUT,
-                _("&About kicad"), _("About kicad project manager"));
+                _("&About Kicad"), _("About kicad project manager"));
         item->SetBitmap(info_xpm);
         helpMenu->Append(item);
 

pcbnew/menubarpcb.cpp

@@ -39,22 +39,22 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
 
         // New board
         wxMenuItem *item = new wxMenuItem(m_FilesMenu, ID_MENU_NEW_BOARD,
-                     _("&New board"),
-                     _("Clear old PCB and init a new one"));
+                     _("&New Board"),
+                     _("Clear old board and initialize a new one"));
         item->SetBitmap(new_xpm);
         m_FilesMenu->Append(item);
 
         // Load board
         item = new wxMenuItem(m_FilesMenu, ID_MENU_LOAD_FILE,
-                     _("&Load board"),
-                    _("Delete old Board and Load new Board"));
+                     _("&Load Board"),
+                    _("Delete old board and load new board"));
         item->SetBitmap(open_xpm);
         m_FilesMenu->Append(item);
 
         // Append board
         item = new wxMenuItem(m_FilesMenu, ID_MENU_APPEND_FILE,
                      _("Append Board"),
-                     _("Add Board to old Board"));
+                     _("Add board to old board"));
         item->SetBitmap(import_xpm);
         m_FilesMenu->Append(item);
 
@@ -66,7 +66,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         m_FilesMenu->Append(item);
 
         item = new wxMenuItem(m_FilesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD,
-                     _("&Previous version"),
+                     _("&Previous Version"),
                      _("Clear old board and get old version of board") );
         item->SetBitmap(jigsaw_xpm);
         m_FilesMenu->Append(item);
@@ -74,13 +74,13 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         // Add save menu
         m_FilesMenu->AppendSeparator();
         item = new wxMenuItem(m_FilesMenu, ID_MENU_SAVE_BOARD,
-                     _("&Save board    Ctrl-S"),
+                     _("&Save Board    Ctrl-S"),
                      _("Save current board") );
         item->SetBitmap(save_xpm);
         m_FilesMenu->Append(item);
 
         item = new wxMenuItem(m_FilesMenu, ID_MENU_SAVE_BOARD_AS,
-                     _("Save board as..."),
+                     _("Save Board as..."),
                      _("Save current board as..") );
         item->SetBitmap(save_as_xpm);
         m_FilesMenu->Append(item);
@@ -113,7 +113,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         submenuexport->Append(item);
 
         item = new wxMenuItem(submenuexport, ID_GEN_EXPORT_FILE_MODULE_REPORT,
-            _("&Module report"), _("Create a pcb report (footprint report)") );
+            _("&Module Report"), _("Create a board report (footprint report)") );
         item->SetBitmap(tools_xpm);
         submenuexport->Append(item);
         ADD_MENUITEM_WITH_HELP_AND_SUBMENU(m_FilesMenu, submenuexport,
@@ -144,23 +144,23 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         m_FilesMenu->AppendSeparator();
         wxMenu * submenuarchive = new wxMenu();
         item = new wxMenuItem(submenuarchive, ID_MENU_ARCHIVE_NEW_MODULES,
-                _("Add new footprints"),
+                _("Add New Footprints"),
                 _("Archive new footprints only in a library (keep other footprints in this lib)") );
         item->SetBitmap(library_update_xpm);
         submenuarchive->Append(item);
         item = new wxMenuItem(submenuarchive, ID_MENU_ARCHIVE_ALL_MODULES,
-                _("Create footprint archive"),
+                _("Create Footprint Archive"),
                 _("Archive all footprints  in a library(old lib will be deleted)") );
         item->SetBitmap(library_xpm);
         submenuarchive->Append(item);
         ADD_MENUITEM_WITH_HELP_AND_SUBMENU(m_FilesMenu, submenuarchive,
                 ID_MENU_ARCHIVE_MODULES,
-                _("Archive footprints"),
-                _("Archive or Add footprints in a library file"), library_xpm);
+                _("Archive Footprints"),
+                _("Archive or add footprints in a library file"), library_xpm);
 
         // Add exit menu
         m_FilesMenu->AppendSeparator();
-        item = new wxMenuItem(m_FilesMenu, ID_EXIT, _("E&xit"), _("Quit pcbnew") );
+        item = new wxMenuItem(m_FilesMenu, ID_EXIT, _("E&xit"), _("Quit PCBNEW") );
         item->SetBitmap(exit_xpm);
         m_FilesMenu->Append(item);
 
@@ -179,17 +179,17 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         ///////////////////////////////////
         wxMenu * configmenu = new wxMenu;
         item = new wxMenuItem(configmenu, ID_CONFIG_REQ, _("&Library"),
-            _("Setting Libraries, Directories and others..."));
+            _("Setting libraries, directories and others..."));
         item->SetBitmap(library_xpm);
         configmenu->Append(item);
 
         item = new wxMenuItem(configmenu, ID_COLORS_SETUP, _("&Colors"),
-            _("Select Colors and Display for PCB items"));
+            _("Select colors and display for board items"));
         item->SetBitmap(palette_xpm);
         configmenu->Append(item);
 
         item = new wxMenuItem(configmenu, ID_OPTIONS_SETUP, _("&General"),
-            _("Select general options for pcbnew"));
+            _("Select general options for PCBNEW"));
         item->SetBitmap(preference_xpm);
         configmenu->Append(item);
 
@@ -204,12 +204,12 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         m_Parent->SetLanguageList(configmenu);
 
         configmenu->AppendSeparator();
-        item = new wxMenuItem(configmenu, ID_CONFIG_SAVE, _("&Save preferences"),
+        item = new wxMenuItem(configmenu, ID_CONFIG_SAVE, _("&Save Preferences"),
                 _("Save application preferences"));
         item->SetBitmap(save_setup_xpm);
         configmenu->Append(item);
 
-        item = new wxMenuItem(configmenu, ID_CONFIG_READ, _("&Read preferences"),
+        item = new wxMenuItem(configmenu, ID_CONFIG_READ, _("&Read Preferences"),
                 _("Read application preferences"));
         item->SetBitmap(read_setup_xpm);
         configmenu->Append(item);
@@ -232,13 +232,13 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         item->SetBitmap(grid_xpm);
         sizes_menu->Append(item);
 
-        item = new wxMenuItem(sizes_menu, ID_PCB_DRAWINGS_WIDTHS_SETUP, _("Texts and drawings"),
+        item = new wxMenuItem(sizes_menu, ID_PCB_DRAWINGS_WIDTHS_SETUP, _("Texts and Drawings"),
             _("Adjust width for texts and drawings"));
         item->SetBitmap(options_text_xpm);
         sizes_menu->Append(item);
 
         item = new wxMenuItem(sizes_menu, ID_PCB_PAD_SETUP, _("Pads"),
-            _("Adjust size,shape,layers... for Pads"));
+            _("Adjust size,shape,layers... for pads"));
         item->SetBitmap(pad_xpm);
         sizes_menu->Append(item);
 
@@ -253,17 +253,17 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         //////////////////////////////////////////////////////////////////
         wxMenu *postprocess_menu = new wxMenu;
         item = new wxMenuItem(postprocess_menu, ID_PCB_GEN_POS_MODULES_FILE,
-                    _("Generate &modules position"),
+                    _("Generate &Modules Position"),
                     _("Generate modules position file"));
         item->SetBitmap(post_compo_xpm);
         postprocess_menu->Append(item);
 
-        item = new wxMenuItem(postprocess_menu, ID_PCB_GEN_DRILL_FILE, _("Create &drill file"),
+        item = new wxMenuItem(postprocess_menu, ID_PCB_GEN_DRILL_FILE, _("Create &Drill File"),
                     _("Generate excellon drill file"));
         item->SetBitmap(post_drill_xpm);
         postprocess_menu->Append(item);
 
-        item = new wxMenuItem(postprocess_menu, ID_PCB_GEN_CMP_FILE, _("Create &component file"),
+        item = new wxMenuItem(postprocess_menu, ID_PCB_GEN_CMP_FILE, _("Create &Component File"),
                     _("Recreate .cmp file for CvPcb"));
         item->SetBitmap(save_cmpstuff_xpm);
         postprocess_menu->Append(item);
@@ -273,21 +273,21 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         //////////////////////////
         wxMenu *miscellaneous_menu = new wxMenu;
         item = new wxMenuItem(miscellaneous_menu, ID_PCB_GLOBAL_DELETE, _("Global &Deletions"),
-                _("Delete Tracks, Modules, Texts... on Board"));
+                _("Delete tracks, modules, texts... on board"));
         item->SetBitmap(general_deletions_xpm);
         miscellaneous_menu->Append(item);
 
-        item = new wxMenuItem(miscellaneous_menu, ID_MENU_LIST_NETS, _("&List nets"),
+        item = new wxMenuItem(miscellaneous_menu, ID_MENU_LIST_NETS, _("&List Nets"),
                 _("List nets (names and id)"));
         item->SetBitmap(tools_xpm);
         miscellaneous_menu->Append(item);
 
-        item = new wxMenuItem(miscellaneous_menu, ID_MENU_PCB_CLEAN, _("&Track operations"),
+        item = new wxMenuItem(miscellaneous_menu, ID_MENU_PCB_CLEAN, _("&Track Operations"),
                 _("Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias"));
         item->SetBitmap(delete_body_xpm);
         miscellaneous_menu->Append(item);
 
-        item = new wxMenuItem(miscellaneous_menu, ID_MENU_PCB_SWAP_LAYERS, _("&Swap layers"),
+        item = new wxMenuItem(miscellaneous_menu, ID_MENU_PCB_SWAP_LAYERS, _("&Swap Layers"),
                 _("Swap tracks on copper layers or drawings on others layers"));
         item->SetBitmap(swap_layer_xpm);
         miscellaneous_menu->Append(item);
@@ -296,11 +296,11 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
         // Menu Help: //
         ////////////////
         wxMenu *helpMenu = new wxMenu;
-        item = new wxMenuItem(helpMenu , ID_GENERAL_HELP, _("&Contents"), _("Open the pcbnew manual"));
+        item = new wxMenuItem(helpMenu , ID_GENERAL_HELP, _("&Contents"), _("Open the PCBNEW manual"));
         item->SetBitmap(help_xpm);
         helpMenu->Append(item);
 
-        item = new wxMenuItem(helpMenu , ID_KICAD_ABOUT, _("&About pcbnew"), _("About pcbnew PCB designer"));
+        item = new wxMenuItem(helpMenu , ID_KICAD_ABOUT, _("&About PCBNEW"), _("About PCBNEW printed circuit board designer"));
         item->SetBitmap(info_xpm);
         helpMenu->Append(item);