KiCad

Merge lp:~mark-roszko/kicad/module_rename into lp:kicad/product

  1. module_rename
  2. Merge into product
Proposed by Mark Roszko
Status: Merged
Merged at revision: 5173
Proposed branch: lp:~mark-roszko/kicad/module_rename
Merge into: lp:kicad/product
Diff against target: 631 lines (+80/-80)
17 files modified
pcbnew/class_module.cpp (+1/-1)
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp (+3/-3)
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp (+5/-5)
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h (+2/-2)
pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp (+1/-1)
pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp (+3/-3)
pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h (+2/-2)
pcbnew/footprint_wizard_frame.cpp (+1/-1)
pcbnew/loadcmp.cpp (+1/-1)
pcbnew/menubar_modedit.cpp (+15/-15)
pcbnew/menubar_pcbframe.cpp (+9/-9)
pcbnew/modedit_onclick.cpp (+6/-6)
pcbnew/moduleframe.cpp (+4/-4)
pcbnew/modules.cpp (+2/-2)
pcbnew/onrightclick.cpp (+7/-7)
pcbnew/tool_modedit.cpp (+15/-15)
pcbnew/tool_pcb.cpp (+3/-3)
To merge this branch: bzr merge lp:~mark-roszko/kicad/module_rename
Reviewer Review Type Date Requested Status
KiCad Lead Developers Pending
Review via email: mp+237665@code.launchpad.net

Description of the change

Rename most instances of Module to Footprint.
Rename instances of "Footprint Module" to "footprint"
Fix "Get and Move Footprint Dialog" text. "Name" should be
"Reference", title should be "Search for footprint".

To post a comment you must log in.
Revision history for this message
Wayne Stambaugh (stambaughw) wrote :

Merge request committed in product branch r5173. Thank you for your
contribution. If you happen to find any other places where module is
used instead of footprint, please send me a patch.

Thanks,

Wayne

On 10/8/2014 2:36 PM, Mark Roszko wrote:
> Mark Roszko has proposed merging lp:~mark-roszko/kicad/module_rename into lp:kicad.
>
> Requested reviews:
> kicad-product-committers (kicad-product-committers)
>
> For more details, see:
> https://code.launchpad.net/~mark-roszko/kicad/module_rename/+merge/237665
>
> Rename most instances of Module to Footprint.
> Rename instances of "Footprint Module" to "footprint"
> Fix "Get and Move Footprint Dialog" text. "Name" should be
> "Reference", title should be "Search for footprint".
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pcbnew/class_module.cpp'
2--- pcbnew/class_module.cpp 2014-09-24 16:42:56 +0000
3+++ pcbnew/class_module.cpp 2014-10-08 18:35:11 +0000
4@@ -602,7 +602,7 @@
5 }
6
7 aList.push_back( MSG_PANEL_ITEM( _( "Attrib" ), msg, BROWN ) );
8- aList.push_back( MSG_PANEL_ITEM( _( "Module" ), FROM_UTF8( m_fpid.Format().c_str() ), BLUE ) );
9+ aList.push_back( MSG_PANEL_ITEM( _( "Footprint" ), FROM_UTF8( m_fpid.Format().c_str() ), BLUE ) );
10
11 msg = _( "No 3D shape" );
12 // Search the first active 3D shape in list
13
14=== modified file 'pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp'
15--- pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp 2014-02-21 10:05:28 +0000
16+++ pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp 2014-10-08 18:35:11 +0000
17@@ -1,5 +1,5 @@
18 ///////////////////////////////////////////////////////////////////////////
19-// C++ code generated with wxFormBuilder (version Nov 6 2013)
20+// C++ code generated with wxFormBuilder (version Jun 6 2014)
21 // http://www.wxformbuilder.org/
22 //
23 // PLEASE DO "NOT" EDIT THIS FILE!
24@@ -128,10 +128,10 @@
25
26 m_PropRightSizer = new wxBoxSizer( wxVERTICAL );
27
28- m_buttonExchange = new wxButton( m_PanelProperties, ID_MODULE_PROPERTIES_EXCHANGE, _("Change Module(s)"), wxDefaultPosition, wxDefaultSize, 0 );
29+ m_buttonExchange = new wxButton( m_PanelProperties, ID_MODULE_PROPERTIES_EXCHANGE, _("Change Footprint(s)"), wxDefaultPosition, wxDefaultSize, 0 );
30 m_PropRightSizer->Add( m_buttonExchange, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
31
32- m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Module Editor"), wxDefaultPosition, wxDefaultSize, 0 );
33+ m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Footprint Editor"), wxDefaultPosition, wxDefaultSize, 0 );
34 m_PropRightSizer->Add( m_buttonModuleEditor, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
35
36 wxBoxSizer* bSizerAttrib;
37
38=== modified file 'pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp'
39--- pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp 2014-02-21 10:05:28 +0000
40+++ pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp 2014-10-08 18:35:11 +0000
41@@ -1,6 +1,6 @@
42 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
43 <wxFormBuilder_Project>
44- <FileVersion major="1" minor="11" />
45+ <FileVersion major="1" minor="13" />
46 <object class="Project" expanded="1">
47 <property name="class_decoration"></property>
48 <property name="code_generation">C++</property>
49@@ -44,10 +44,10 @@
50 <property name="minimum_size"></property>
51 <property name="name">DIALOG_MODULE_BOARD_EDITOR_BASE</property>
52 <property name="pos"></property>
53- <property name="size">499,591</property>
54+ <property name="size">499,630</property>
55 <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
56 <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
57- <property name="title">Module Properties</property>
58+ <property name="title">Footprint Properties</property>
59 <property name="tooltip"></property>
60 <property name="window_extra_style"></property>
61 <property name="window_name"></property>
62@@ -2000,7 +2000,7 @@
63 <property name="gripper">0</property>
64 <property name="hidden">0</property>
65 <property name="id">ID_MODULE_PROPERTIES_EXCHANGE</property>
66- <property name="label">Change Module(s)</property>
67+ <property name="label">Change Footprint(s)</property>
68 <property name="max_size"></property>
69 <property name="maximize_button">0</property>
70 <property name="maximum_size"></property>
71@@ -2088,7 +2088,7 @@
72 <property name="gripper">0</property>
73 <property name="hidden">0</property>
74 <property name="id">ID_GOTO_MODULE_EDITOR</property>
75- <property name="label">Module Editor</property>
76+ <property name="label">Footprint Editor</property>
77 <property name="max_size"></property>
78 <property name="maximize_button">0</property>
79 <property name="maximum_size"></property>
80
81=== modified file 'pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h'
82--- pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h 2014-02-21 10:05:28 +0000
83+++ pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h 2014-10-08 18:35:11 +0000
84@@ -1,5 +1,5 @@
85 ///////////////////////////////////////////////////////////////////////////
86-// C++ code generated with wxFormBuilder (version Nov 6 2013)
87+// C++ code generated with wxFormBuilder (version Jun 6 2014)
88 // http://www.wxformbuilder.org/
89 //
90 // PLEASE DO "NOT" EDIT THIS FILE!
91@@ -138,7 +138,7 @@
92 public:
93 wxStaticBoxSizer* m_Sizer3DValues;
94
95- DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 499,591 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
96+ DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 499,630 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
97 ~DIALOG_MODULE_BOARD_EDITOR_BASE();
98
99 };
100
101=== modified file 'pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp'
102--- pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp 2014-08-24 07:05:07 +0000
103+++ pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp 2014-10-08 18:35:11 +0000
104@@ -1,5 +1,5 @@
105 ///////////////////////////////////////////////////////////////////////////
106-// C++ code generated with wxFormBuilder (version Nov 6 2013)
107+// C++ code generated with wxFormBuilder (version Jun 6 2014)
108 // http://www.wxformbuilder.org/
109 //
110 // PLEASE DO "NOT" EDIT THIS FILE!
111
112=== modified file 'pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp'
113--- pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp 2014-08-24 07:05:07 +0000
114+++ pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp 2014-10-08 18:35:11 +0000
115@@ -1,6 +1,6 @@
116 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
117 <wxFormBuilder_Project>
118- <FileVersion major="1" minor="11" />
119+ <FileVersion major="1" minor="13" />
120 <object class="Project" expanded="1">
121 <property name="class_decoration"></property>
122 <property name="code_generation">C++</property>
123@@ -44,10 +44,10 @@
124 <property name="minimum_size"></property>
125 <property name="name">DIALOG_MODULE_MODULE_EDITOR_BASE</property>
126 <property name="pos"></property>
127- <property name="size">486,462</property>
128+ <property name="size">486,510</property>
129 <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
130 <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
131- <property name="title">Module Properties</property>
132+ <property name="title">Footprint Properties</property>
133 <property name="tooltip"></property>
134 <property name="window_extra_style"></property>
135 <property name="window_name"></property>
136
137=== modified file 'pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h'
138--- pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h 2014-08-24 07:05:07 +0000
139+++ pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h 2014-10-08 18:35:11 +0000
140@@ -1,5 +1,5 @@
141 ///////////////////////////////////////////////////////////////////////////
142-// C++ code generated with wxFormBuilder (version Nov 6 2013)
143+// C++ code generated with wxFormBuilder (version Jun 6 2014)
144 // http://www.wxformbuilder.org/
145 //
146 // PLEASE DO "NOT" EDIT THIS FILE!
147@@ -117,7 +117,7 @@
148
149 public:
150
151- DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 486,462 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
152+ DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 486,510 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
153 ~DIALOG_MODULE_MODULE_EDITOR_BASE();
154
155 };
156
157=== modified file 'pcbnew/footprint_wizard_frame.cpp'
158--- pcbnew/footprint_wizard_frame.cpp 2014-08-29 20:23:40 +0000
159+++ pcbnew/footprint_wizard_frame.cpp 2014-10-08 18:35:11 +0000
160@@ -620,7 +620,7 @@
161 m_mainToolBar->AddSeparator();
162 m_mainToolBar->AddTool( ID_FOOTPRINT_WIZARD_DONE,
163 wxEmptyString, KiBitmap( export_footprint_names_xpm ),
164- _( "Insert footprint in board" ) );
165+ _( "Add footprint to board" ) );
166 }
167
168 // after adding the buttons to the toolbar, must call Realize() to
169
170=== modified file 'pcbnew/loadcmp.cpp'
171--- pcbnew/loadcmp.cpp 2014-09-18 10:29:52 +0000
172+++ pcbnew/loadcmp.cpp 2014-10-08 18:35:11 +0000
173@@ -164,7 +164,7 @@
174 static wxString lastComponentName;
175
176 // Ask for a component name or key words
177- DIALOG_GET_COMPONENT dlg( this, HistoryList, _( "Load Module" ), aUseFootprintViewer );
178+ DIALOG_GET_COMPONENT dlg( this, HistoryList, _( "Load Footprint" ), aUseFootprintViewer );
179
180 dlg.SetComponentName( lastComponentName );
181
182
183=== modified file 'pcbnew/menubar_modedit.cpp'
184--- pcbnew/menubar_modedit.cpp 2014-07-09 13:02:56 +0000
185+++ pcbnew/menubar_modedit.cpp 2014-10-08 18:35:11 +0000
186@@ -69,7 +69,7 @@
187
188 // New module
189 AddMenuItem( fileMenu, ID_MODEDIT_NEW_MODULE,
190- _( "&New Module" ), _( "Create new module" ),
191+ _( "&New Footprint" ), _( "Create new footprint" ),
192 KiBitmap( new_footprint_xpm ) );
193
194 // Open submenu
195@@ -77,26 +77,26 @@
196
197 // from File
198 AddMenuItem( openSubmenu, ID_MODEDIT_IMPORT_PART,
199- _( "&Import Module From File" ),
200+ _( "&Import Footprint From File" ),
201 _( "Import footprint from an existing file" ),
202 KiBitmap( import_module_xpm ) );
203
204 // from Library
205 AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE,
206- _( "Load Module From Current Li&brary" ),
207- _( "Open a footprint module from library" ),
208+ _( "Load Footprint From Current Li&brary" ),
209+ _( "Open a footprint from library" ),
210 KiBitmap( module_xpm ) );
211
212 // from current Board
213 AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE_FROM_BOARD,
214- _( "Load Module From &Current Board" ),
215- _( "Load a footprint module from the current board" ),
216+ _( "Load Footprint From &Current Board" ),
217+ _( "Load a footprint from the current board" ),
218 KiBitmap( load_module_board_xpm ) );
219
220 /* Append openSubmenu to fileMenu */
221 AddMenuItem( fileMenu, openSubmenu, -1,
222- _( "&Load Module" ),
223- _( "Load footprint module" ),
224+ _( "&Load Footprint" ),
225+ _( "Load footprint" ),
226 KiBitmap( open_document_xpm ) );
227 fileMenu->AppendSeparator();
228
229@@ -107,23 +107,23 @@
230 KiBitmap( copy_library_xpm ) );
231
232 // Save module
233- text = AddHotkeyName( _( "&Save Module in Active Library" ),
234+ text = AddHotkeyName( _( "&Save Footprint in Active Library" ),
235 g_Module_Editor_Hokeys_Descr, HK_SAVE_MODULE );
236
237 AddMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBMODULE, text,
238- _( "Save module in active library" ),
239+ _( "Save footprint in active library" ),
240 KiBitmap( save_library_xpm ) );
241
242 // Save module in new lib
243 AddMenuItem( fileMenu, ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART,
244- _( "S&ave Module in New Library" ),
245+ _( "S&ave Footprint in New Library" ),
246 _( "Create a new library and save current module into it" ),
247 KiBitmap( new_library_xpm ) );
248
249 // Export module
250 AddMenuItem( fileMenu, ID_MODEDIT_EXPORT_PART,
251- _( "&Export Module" ),
252- _( "Save current loaded module into file" ),
253+ _( "&Export Footprint" ),
254+ _( "Save currently loaded footprint into file" ),
255 KiBitmap( export_module_xpm ) );
256
257 // Import DXF File
258@@ -137,7 +137,7 @@
259 // Print
260 AddMenuItem( fileMenu, wxID_PRINT,
261 _( "&Print" ),
262- _( "Print current module" ),
263+ _( "Print current footprint" ),
264 KiBitmap( plot_xpm ) );
265
266 // Separator
267@@ -175,7 +175,7 @@
268 // Properties
269 AddMenuItem( editMenu, ID_MODEDIT_EDIT_MODULE_PROPERTIES,
270 _( "Edit &Properties" ),
271- _( "Edit module properties" ),
272+ _( "Edit footprint properties" ),
273 KiBitmap( module_options_xpm ) );
274
275 // Dimensions submenu
276
277=== modified file 'pcbnew/menubar_pcbframe.cpp'
278--- pcbnew/menubar_pcbframe.cpp 2014-09-24 16:56:20 +0000
279+++ pcbnew/menubar_pcbframe.cpp 2014-10-08 18:35:11 +0000
280@@ -134,8 +134,8 @@
281 //----- Fabrication Outputs submenu -----------------------------------------
282 wxMenu* fabricationOutputsMenu = new wxMenu;
283 AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE,
284- _( "&Modules Position (.pos) File" ),
285- _( "Generate modules position file for pick and place" ),
286+ _( "&Footprint Position (.pos) File" ),
287+ _( "Generate footprint position file for pick and place" ),
288 KiBitmap( post_compo_xpm ) );
289
290 AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE,
291@@ -144,8 +144,8 @@
292 KiBitmap( post_drill_xpm ) );
293
294 AddMenuItem( fabricationOutputsMenu, ID_GEN_EXPORT_FILE_MODULE_REPORT,
295- _( "&Module (.rpt) Report" ),
296- _( "Create a report of all modules on the current board" ),
297+ _( "&Footprint (.rpt) Report" ),
298+ _( "Create a report of all footprints on the current board" ),
299 KiBitmap( tools_xpm ) );
300
301 AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_D356_FILE,
302@@ -279,7 +279,7 @@
303
304 AddMenuItem( editMenu, ID_PCB_GLOBAL_DELETE,
305 _( "&Global Deletions" ),
306- _( "Delete tracks, modules, texts... on board" ),
307+ _( "Delete tracks, footprints, texts... on board" ),
308 KiBitmap( general_deletions_xpm ) );
309
310 AddMenuItem( editMenu, ID_MENU_PCB_CLEAN,
311@@ -293,8 +293,8 @@
312 KiBitmap( swap_layer_xpm ) );
313
314 AddMenuItem( editMenu, ID_MENU_PCB_RESET_TEXTMODULE_FIELDS_SIZES,
315- _( "&Reset Module Field Sizes" ),
316- _( "Reset text size and width of all module fields to current defaults" ),
317+ _( "&Reset Footprint Field Sizes" ),
318+ _( "Reset text size and width of all footprint fields to current defaults" ),
319 KiBitmap( reset_text_xpm ) );
320
321 //----- View menu -----------------------------------------------------------
322@@ -365,10 +365,10 @@
323 //----- Place Menu ----------------------------------------------------------
324 wxMenu* placeMenu = new wxMenu;
325
326- text = AddHotkeyName( _( "&Module" ), g_Pcbnew_Editor_Hokeys_Descr,
327+ text = AddHotkeyName( _( "&Footprint" ), g_Pcbnew_Editor_Hokeys_Descr,
328 HK_ADD_MODULE );
329 AddMenuItem( placeMenu, ID_PCB_MODULE_BUTT, text,
330- _( "Add modules" ), KiBitmap( module_xpm ) );
331+ _( "Add footprints" ), KiBitmap( module_xpm ) );
332
333 text = AddHotkeyName( _( "&Track" ), g_Pcbnew_Editor_Hokeys_Descr,
334 HK_ADD_NEW_TRACK, IS_COMMENT );
335
336=== modified file 'pcbnew/modedit_onclick.cpp'
337--- pcbnew/modedit_onclick.cpp 2014-09-10 15:18:42 +0000
338+++ pcbnew/modedit_onclick.cpp 2014-10-08 18:35:11 +0000
339@@ -262,10 +262,10 @@
340 KiBitmap( rotate_module_ccw_xpm ) );
341 AddMenuItem( transform_choice, ID_MODEDIT_MODULE_MIRROR, _( "Mirror" ),
342 KiBitmap( mirror_footprint_axisY_xpm ) );
343- msg = AddHotkeyName( _( "Edit Module" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM );
344+ msg = AddHotkeyName( _( "Edit Footprint" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM );
345 AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_MODULE_PRMS, msg, KiBitmap( edit_module_xpm ) );
346 AddMenuItem( PopMenu, transform_choice, ID_MODEDIT_TRANSFORM_MODULE,
347- _( "Transform Module" ), KiBitmap( edit_xpm ) );
348+ _( "Transform Footprint" ), KiBitmap( edit_xpm ) );
349 break;
350 }
351
352@@ -297,25 +297,25 @@
353 case PCB_MODULE_TEXT_T:
354 if( !flags )
355 {
356- msg = AddHotkeyName( _("Move Text Mod." ), g_Module_Editor_Hokeys_Descr,
357+ msg = AddHotkeyName( _("Move Text" ), g_Module_Editor_Hokeys_Descr,
358 HK_MOVE_ITEM );
359 AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST, msg,
360 KiBitmap( move_field_xpm ) );
361 }
362
363- msg = AddHotkeyName( _("Rotate Text Mod." ), g_Module_Editor_Hokeys_Descr,
364+ msg = AddHotkeyName( _("Rotate Text" ), g_Module_Editor_Hokeys_Descr,
365 HK_ROTATE_ITEM );
366 AddMenuItem( PopMenu, ID_POPUP_PCB_ROTATE_TEXTMODULE, msg, KiBitmap( rotate_field_xpm ) );
367
368 if( !flags )
369 {
370- msg = AddHotkeyName( _("Edit Text Mod." ), g_Module_Editor_Hokeys_Descr,
371+ msg = AddHotkeyName( _("Edit Text" ), g_Module_Editor_Hokeys_Descr,
372 HK_EDIT_ITEM );
373 AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TEXTMODULE, msg, KiBitmap( edit_text_xpm ) );
374
375 if( ( static_cast<TEXTE_MODULE*>( item ) )->GetType() == TEXTE_MODULE::TEXT_is_DIVERS )
376 {
377- msg = AddHotkeyName( _("Delete Text Mod." ), g_Module_Editor_Hokeys_Descr,
378+ msg = AddHotkeyName( _("Delete Text" ), g_Module_Editor_Hokeys_Descr,
379 HK_DELETE );
380 AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_TEXTMODULE, msg,
381 KiBitmap( delete_text_xpm ) );
382
383=== modified file 'pcbnew/moduleframe.cpp'
384--- pcbnew/moduleframe.cpp 2014-09-17 16:04:04 +0000
385+++ pcbnew/moduleframe.cpp 2014-10-08 18:35:11 +0000
386@@ -461,7 +461,7 @@
387 {
388 if( GetScreen()->IsModify() )
389 {
390- int ii = DisplayExitDialog( this, _( "Save the changes in the module before closing?" ) );
391+ int ii = DisplayExitDialog( this, _( "Save the changes to the footprint before closing?" ) );
392
393 switch( ii )
394 {
395@@ -482,7 +482,7 @@
396 }
397 else
398 {
399- DisplayError( this, _( "Library is not set, the module could not be saved." ) );
400+ DisplayError( this, _( "Library is not set, the footprint could not be saved." ) );
401 }
402 // fall through: cancel the close because of an error
403
404@@ -672,7 +672,7 @@
405
406 void FOOTPRINT_EDIT_FRAME::updateTitle()
407 {
408- wxString title = _( "Module Editor " );
409+ wxString title = _( "Footprint Editor " );
410
411 wxString nickname = GetCurrentLib();
412
413@@ -688,7 +688,7 @@
414 bool writable = Prj().PcbFootprintLibs()->IsFootprintLibWritable( nickname );
415
416 // no exception was thrown, this means libPath is valid, but it may be read only.
417- title = _( "Module Editor (active library: " ) + nickname + wxT( ")" );
418+ title = _( "Footprint Editor (active library: " ) + nickname + wxT( ")" );
419
420 if( !writable )
421 title += _( " [Read Only]" );
422
423=== modified file 'pcbnew/modules.cpp'
424--- pcbnew/modules.cpp 2014-08-24 07:05:07 +0000
425+++ pcbnew/modules.cpp 2014-10-08 18:35:11 +0000
426@@ -64,7 +64,7 @@
427 wxString moduleName;
428 MODULE* module = NULL;
429
430- wxTextEntryDialog dlg( this, _( "Name:" ), _( "Search footprint" ), moduleName );
431+ wxTextEntryDialog dlg( this, _( "Reference:" ), _( "Search for footprint" ), moduleName );
432
433 if( dlg.ShowModal() != wxID_OK )
434 return NULL; //Aborted by user
435@@ -262,7 +262,7 @@
436 /* Confirm module delete. */
437 if( aAskBeforeDeleting )
438 {
439- msg.Printf( _( "Delete Module %s (value %s) ?" ),
440+ msg.Printf( _( "Delete Footprint %s (value %s) ?" ),
441 GetChars( aModule->GetReference() ),
442 GetChars( aModule->GetValue() ) );
443
444
445=== modified file 'pcbnew/onrightclick.cpp'
446--- pcbnew/onrightclick.cpp 2014-09-28 14:44:47 +0000
447+++ pcbnew/onrightclick.cpp 2014-10-08 18:35:11 +0000
448@@ -153,14 +153,14 @@
449
450 if( !( (MODULE*) item )->IsLocked() )
451 {
452- msg = AddHotkeyName( _("Lock Module" ), g_Board_Editor_Hokeys_Descr,
453+ msg = AddHotkeyName( _("Lock Footprint" ), g_Board_Editor_Hokeys_Descr,
454 HK_LOCK_UNLOCK_FOOTPRINT );
455 AddMenuItem( aPopMenu, ID_POPUP_PCB_AUTOPLACE_FIXE_MODULE, msg,
456 KiBitmap( locked_xpm ) );
457 }
458 else
459 {
460- msg = AddHotkeyName( _( "Unlock Module" ), g_Board_Editor_Hokeys_Descr,
461+ msg = AddHotkeyName( _( "Unlock Footprint" ), g_Board_Editor_Hokeys_Descr,
462 HK_LOCK_UNLOCK_FOOTPRINT );
463 AddMenuItem( aPopMenu, ID_POPUP_PCB_AUTOPLACE_FREE_MODULE, msg,
464 KiBitmap( unlocked_xpm ) );
465@@ -168,14 +168,14 @@
466
467 if( !flags )
468 aPopMenu->Append( ID_POPUP_PCB_AUTOPLACE_CURRENT_MODULE,
469- _( "Automatically Place Module" ) );
470+ _( "Automatically Place Footprint" ) );
471 }
472
473 if( m_mainToolBar->GetToolToggled( ID_TOOLBARH_PCB_MODE_TRACKS ) )
474 {
475 if( !flags )
476 aPopMenu->Append( ID_POPUP_PCB_AUTOROUTE_MODULE,
477- _( "Automatically Route Module" ) );
478+ _( "Automatically Route Footprint" ) );
479 }
480 break;
481
482@@ -413,7 +413,7 @@
483 _( "Select Layer Pair" ), KiBitmap( select_layer_pair_xpm ) );
484 commands->AppendSeparator();
485 commands->Append( ID_POPUP_PCB_AUTOROUTE_ALL_MODULES,
486- _( "Automatically Route All Modules" ) );
487+ _( "Automatically Route All Footprints" ) );
488 commands->AppendSeparator();
489 commands->Append( ID_POPUP_PCB_AUTOROUTE_RESET_UNROUTED, _( "Reset Unrouted" ) );
490 aPopMenu->AppendSeparator();
491@@ -758,10 +758,10 @@
492 AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EDIT_MODULE_PRMS, msg,
493 KiBitmap( edit_module_xpm ) );
494 AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EDIT_MODULE_WITH_MODEDIT,
495- _( "Edit with Module Editor" ),
496+ _( "Edit with Footprint Editor" ),
497 KiBitmap( module_editor_xpm ) );
498 sub_menu_footprint->AppendSeparator();
499- msg = AddHotkeyName( _( "Delete Module" ),
500+ msg = AddHotkeyName( _( "Delete Footprint" ),
501 g_Board_Editor_Hokeys_Descr, HK_DELETE );
502 AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_DELETE_MODULE,
503 msg, KiBitmap( delete_module_xpm ) );
504
505=== modified file 'pcbnew/tool_modedit.cpp'
506--- pcbnew/tool_modedit.cpp 2013-03-12 00:37:45 +0000
507+++ pcbnew/tool_modedit.cpp 2014-10-08 18:35:11 +0000
508@@ -61,14 +61,14 @@
509 _( "Select active library" ) );
510
511 m_mainToolBar->AddTool( ID_MODEDIT_SAVE_LIBMODULE, wxEmptyString, KiBitmap( save_library_xpm ),
512- _( "Save module in active library" ) );
513+ _( "Save footprint in active library" ) );
514
515 m_mainToolBar->AddTool( ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART, wxEmptyString,
516 KiBitmap( new_library_xpm ),
517- _( "Create new library and save current module" ) );
518+ _( "Create new library and save current footprint" ) );
519
520 m_mainToolBar->AddTool( ID_OPEN_MODULE_VIEWER, wxEmptyString, KiBitmap( modview_icon_xpm ),
521- _( "Open module viewer" ) );
522+ _( "Open footprint viewer" ) );
523
524 m_mainToolBar->AddSeparator();
525 m_mainToolBar->AddTool( ID_MODEDIT_DELETE_PART, wxEmptyString, KiBitmap( delete_xpm ),
526@@ -76,38 +76,38 @@
527
528 m_mainToolBar->AddSeparator();
529 m_mainToolBar->AddTool( ID_MODEDIT_NEW_MODULE, wxEmptyString, KiBitmap( new_footprint_xpm ),
530- _( "New module" ) );
531+ _( "New footprint" ) );
532
533 #ifdef KICAD_SCRIPTING
534 m_mainToolBar->AddTool( ID_MODEDIT_NEW_MODULE_FROM_WIZARD, wxEmptyString,
535 KiBitmap( module_wizard_xpm ),
536- _( "New module from footprint wizard" ) );
537+ _( "New footprint using wizard" ) );
538 #endif
539
540
541 m_mainToolBar->AddTool( ID_MODEDIT_LOAD_MODULE, wxEmptyString,
542 KiBitmap( load_module_lib_xpm ),
543- _( "Load module from library" ) );
544+ _( "Load footprint from library" ) );
545
546 m_mainToolBar->AddSeparator();
547 m_mainToolBar->AddTool( ID_MODEDIT_LOAD_MODULE_FROM_BOARD, wxEmptyString,
548 KiBitmap( load_module_board_xpm ),
549- _( "Load module from current board" ) );
550+ _( "Load footprint from current board" ) );
551
552 m_mainToolBar->AddTool( ID_MODEDIT_UPDATE_MODULE_IN_BOARD, wxEmptyString,
553 KiBitmap( update_module_board_xpm ),
554- _( "Update module in current board" ) );
555+ _( "Update footprint in current board" ) );
556
557 m_mainToolBar->AddTool( ID_MODEDIT_INSERT_MODULE_IN_BOARD, wxEmptyString,
558 KiBitmap( insert_module_board_xpm ),
559- _( "Insert module into current board" ) );
560+ _( "Insert footprint into current board" ) );
561
562 m_mainToolBar->AddSeparator();
563 m_mainToolBar->AddTool( ID_MODEDIT_IMPORT_PART, wxEmptyString, KiBitmap( import_module_xpm ),
564- _( "Import module" ) );
565+ _( "Import footprint" ) );
566
567 m_mainToolBar->AddTool( ID_MODEDIT_EXPORT_PART, wxEmptyString, KiBitmap( export_module_xpm ),
568- _( "Export module" ) );
569+ _( "Export footprint" ) );
570
571
572 m_mainToolBar->AddSeparator();
573@@ -119,11 +119,11 @@
574 m_mainToolBar->AddSeparator();
575 m_mainToolBar->AddTool( ID_MODEDIT_EDIT_MODULE_PROPERTIES, wxEmptyString,
576 KiBitmap( module_options_xpm ),
577- _( "Module properties" ) );
578+ _( "Footprint properties" ) );
579
580 m_mainToolBar->AddSeparator();
581 m_mainToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button_xpm ),
582- _( "Print module" ) );
583+ _( "Print footprint" ) );
584
585 m_mainToolBar->AddSeparator();
586 msg = AddHotkeyName( _( "Zoom in" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT );
587@@ -146,7 +146,7 @@
588 m_mainToolBar->AddSeparator();
589 m_mainToolBar->AddTool( ID_MODEDIT_CHECK, wxEmptyString,
590 KiBitmap( module_check_xpm ),
591- _( "Check module" ) );
592+ _( "Check footprint" ) );
593
594 // after adding the buttons to the toolbar, must call Realize() to reflect the changes
595 m_mainToolBar->Realize();
596@@ -184,7 +184,7 @@
597
598 m_drawToolBar->AddSeparator();
599 m_drawToolBar->AddTool( ID_MODEDIT_ANCHOR_TOOL, wxEmptyString, KiBitmap( anchor_xpm ),
600- _( "Place the footprint module reference anchor" ),
601+ _( "Place the footprint reference anchor" ),
602 wxITEM_CHECK );
603
604 m_drawToolBar->AddSeparator();
605
606=== modified file 'pcbnew/tool_pcb.cpp'
607--- pcbnew/tool_pcb.cpp 2014-06-30 05:46:18 +0000
608+++ pcbnew/tool_pcb.cpp 2014-10-08 18:35:11 +0000
609@@ -237,11 +237,11 @@
610 m_mainToolBar->AddSeparator();
611 m_mainToolBar->AddTool( ID_OPEN_MODULE_EDITOR, wxEmptyString,
612 KiBitmap( module_editor_xpm ),
613- _( "Open module editor" ) );
614+ _( "Open footprint editor" ) );
615
616 m_mainToolBar->AddTool( ID_OPEN_MODULE_VIEWER, wxEmptyString,
617 KiBitmap( modview_icon_xpm ),
618- _( "Open module viewer" ) );
619+ _( "Open footprint viewer" ) );
620
621 m_mainToolBar->AddSeparator();
622 msg = AddHotkeyName( HELP_UNDO, g_Board_Editor_Hokeys_Descr, HK_UNDO, IS_COMMENT );
623@@ -297,7 +297,7 @@
624
625 m_mainToolBar->AddSeparator();
626 m_mainToolBar->AddTool( ID_TOOLBARH_PCB_MODE_MODULE, wxEmptyString, KiBitmap( mode_module_xpm ),
627- _( "Mode footprint: manual and automatic move and place modules" ),
628+ _( "Mode footprint: manual and automatic movement and placement" ),
629 wxITEM_CHECK );
630 m_mainToolBar->AddTool( ID_TOOLBARH_PCB_MODE_TRACKS, wxEmptyString, KiBitmap( mode_track_xpm ),
631 _( "Mode track: autorouting" ), wxITEM_CHECK );