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 );

eeschema/libedit_onrightclick.cpp

@@ -165,7 +165,7 @@ bool BlockActive = (GetScreen()->BlockLocate.m_Command !=  BLOCK_IDLE);
         case COMPONENT_FIELD_DRAW_TYPE:
             if( DrawEntry->m_Flags == 0 )
             {
-				msg = AddHotkeyName( _( "Move field " ), s_Libedit_Hokeys_Descr, HK_MOVE_PIN );
+                msg = AddHotkeyName( _( "Move Field " ), s_Libedit_Hokeys_Descr, HK_MOVE_PIN );
                 ADD_MENUITEM(PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, move_field_xpm);
             }
             ADD_MENUITEM(PopMenu, ID_POPUP_LIBEDIT_FIELD_ROTATE_ITEM,
@@ -211,13 +211,13 @@ bool not_in_move = (Pin->m_Flags == 0);
     ADD_MENUITEM_WITH_SUBMENU(PopMenu, global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_ITEM,
                 _("Global"), pin_to_xpm);
     ADD_MENUITEM(global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINSIZE_ITEM,
-				selected ? _("Pin Size to selected pins"): _("Pin Size to others"),
+                selected ? _("Pin Size to selected pins"): _("Pin Size to Others"),
                 pin_size_to_xpm);
     ADD_MENUITEM(global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNAMESIZE_ITEM,
-				selected ? _("Pin Name Size to selected pin") :  _("Pin Name Size to others"),
+                selected ? _("Pin Name Size to selected pin") :  _("Pin Name Size to Others"),
                 pin_name_to_xpm);
     ADD_MENUITEM(global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNUMSIZE_ITEM,
-				selected ?_("Pin Num Size to selected pin") :  _("Pin Num Size to others"),
+                selected ?_("Pin Num Size to selected pin") :  _("Pin Num Size to Others"),
                 pin_number_to_xpm);
 }
 
@@ -230,21 +230,21 @@ void AddMenusForBlock(wxMenu * PopMenu, WinEDA_LibeditFrame * frame)
 {
     ADD_MENUITEM(PopMenu, ID_POPUP_LIBEDIT_CANCEL_EDITING, _("Cancel Block"), cancel_xpm);
 
-	if ( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )
+    if( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )
             ADD_MENUITEM(PopMenu, ID_POPUP_ZOOM_BLOCK, _("Zoom Block (drag middle mouse)"), zoom_selected_xpm);
 
     PopMenu->AppendSeparator();
 
     ADD_MENUITEM(PopMenu, ID_POPUP_PLACE_BLOCK, _("Place Block"), apply_xpm );
 
-	if ( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )
+    if( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )
     {
-		ADD_MENUITEM(PopMenu, ID_POPUP_SELECT_ITEMS_BLOCK, _("Select items"), green_xpm);
+        ADD_MENUITEM(PopMenu, ID_POPUP_SELECT_ITEMS_BLOCK, _("Select Items"), green_xpm);
         ADD_MENUITEM(PopMenu, ID_POPUP_COPY_BLOCK,
-			_("Copy block"), copyblock_xpm);
-		ADD_MENUITEM(PopMenu, ID_POPUP_INVERT_BLOCK, _("Mirror block"), mirror_H_xpm );
+            _("Copy Block"), copyblock_xpm);
+        ADD_MENUITEM(PopMenu, ID_POPUP_INVERT_BLOCK, _("Mirror Block"), mirror_H_xpm );
         ADD_MENUITEM(PopMenu, ID_POPUP_DELETE_BLOCK,
-			_("Delete block"), delete_xpm );
+            _("Delete Block"), delete_xpm );
     }
 }
 

eeschema/pinedit-dialog.cpp

@@ -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 );

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);