General dialog captions updated (made more clear ), standard template fix,...

General dialog captions updated (made more clear ), standard template fix, icons.cpp remove from common

common/CMakeLists.txt

@@ -29,7 +29,6 @@ set(COMMON_SRCS
     toolbars.cpp
     trigo.cpp
     worksheet.cpp
-    wxwineda.cpp
-    icons.cpp)
+    wxwineda.cpp)
 
 add_library(common ${COMMON_SRCS})

eeschema/viewlibs.cpp

@@ -115,9 +115,14 @@ wxString msg;
 LibraryStruct * Lib;
 
 	Lib = FindLibrary(g_CurrentViewLibraryName);
-	msg = _("Browse library: ");
-	if ( Lib ) msg += g_CurrentViewLibraryName;
-	else msg += _("None");
+	msg = _("Library browser");
+
+        msg << wxT(" [");
+
+	if ( Lib ) msg << g_CurrentViewLibraryName;
+	else msg += _("none selected");
+
+        msg << wxT("]");
 	SetTitle(msg);
 }
 

internat/nl/kicad.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KiCad\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-01 20:22+0100\n"
-"PO-Revision-Date: 2008-10-01 20:28+0100\n"
+"POT-Creation-Date: 2008-10-01 22:49+0100\n"
+"PO-Revision-Date: 2008-10-01 22:49+0100\n"
 "Last-Translator: Jerry Jacobs <jerkejacobs@gmail.com>\n"
 "Language-Team: KiCad Team <jerkejacobs@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -401,9 +401,9 @@ msgstr "Module [%s] niet gevonden"
 #: pcbnew/librairi.cpp:454
 #: pcbnew/librairi.cpp:604
 #: pcbnew/librairi.cpp:808
-#: pcbnew/gen_modules_placefile.cpp:128
 #: pcbnew/gen_modules_placefile.cpp:139
-#: pcbnew/gen_modules_placefile.cpp:292
+#: pcbnew/gen_modules_placefile.cpp:155
+#: pcbnew/gen_modules_placefile.cpp:318
 #: pcbnew/files.cpp:352
 #: pcbnew/plothpgl.cpp:67
 #: pcbnew/export_gencad.cpp:83
@@ -970,19 +970,19 @@ msgstr "Geen Verandering"
 msgid "Deselect this layer to select the No Change state"
 msgstr ""
 
-#: pcbnew/gen_modules_placefile.cpp:117
+#: pcbnew/gen_modules_placefile.cpp:125
 msgid "No Modules for Automated Placement"
 msgstr "Geen Modules voor Automatisch Plaatsen"
 
-#: pcbnew/gen_modules_placefile.cpp:151
+#: pcbnew/gen_modules_placefile.cpp:167
 msgid "Component side place file:"
 msgstr ""
 
-#: pcbnew/gen_modules_placefile.cpp:154
+#: pcbnew/gen_modules_placefile.cpp:170
 msgid "Copper side place file:"
 msgstr ""
 
-#: pcbnew/gen_modules_placefile.cpp:157
+#: pcbnew/gen_modules_placefile.cpp:173
 msgid "Module count"
 msgstr "Module teller"
 
@@ -1284,11 +1284,9 @@ msgstr ""
 
 #: pcbnew/dialog_gendrill.cpp:205
 #: pcbnew/dialog_gendrill.cpp:215
-#: eeschema/viewlibs.cpp:120
 #: eeschema/libedit.cpp:41
-#, fuzzy
 msgid "None"
-msgstr "Niks"
+msgstr "geen"
 
 #: pcbnew/dialog_gendrill.cpp:206
 msgid "drill sheet (HPGL)"
@@ -1315,9 +1313,8 @@ msgid "Drill Report:"
 msgstr ""
 
 #: pcbnew/dialog_gendrill.cpp:220
-#, fuzzy
 msgid "Creates a plain text report"
-msgstr "Creëer een Nieuwe Map"
+msgstr "geen"
 
 #: pcbnew/dialog_gendrill.cpp:223
 msgid "HPGL plotter Options:"
@@ -3224,8 +3221,8 @@ msgid "Place anchor"
 msgstr "Plaats anker"
 
 #: pcbnew/loadcmp.cpp:103
-msgid "Module name:"
-msgstr "Module naam:"
+msgid "Place module"
+msgstr "Plaats module"
 
 #: pcbnew/loadcmp.cpp:215
 #: eeschema/eelibs_read_libraryfiles.cpp:64
@@ -3254,8 +3251,18 @@ msgstr "Bibliotheek:"
 #: pcbnew/loadcmp.cpp:433
 #: pcbnew/loadcmp.cpp:584
 #, c-format
-msgid "Modules (%d items)"
-msgstr "Modules (%d items)"
+msgid "Modules [%d items]"
+msgstr "Modules [%d items]"
+
+#: pcbnew/loadcmp.cpp:485
+#, fuzzy
+msgid "No Doc"
+msgstr "Kopieer Doc"
+
+#: pcbnew/loadcmp.cpp:487
+#, fuzzy
+msgid "No Keyword"
+msgstr "Sleutelwoorden"
 
 #: pcbnew/dialog_freeroute_exchange.cpp:187
 msgid "Export a Specctra Design (*.dsn) File"
@@ -5847,20 +5854,25 @@ msgid "New FootprintFilter:"
 msgstr ""
 
 #: eeschema/viewlibs.cpp:118
-msgid "Browse library: "
-msgstr "Bibliotheek doorzoeken:"
+#: eeschema/viewlib_frame.cpp:53
+msgid "Library browser"
+msgstr "Bibliotheek verkenner"
+
+#: eeschema/viewlibs.cpp:123
+msgid "none selected"
+msgstr "geen geselecteerd"
 
-#: eeschema/viewlibs.cpp:307
+#: eeschema/viewlibs.cpp:312
 #, c-format
 msgid "Current Part: <%s> (is Alias of <%s>)"
 msgstr ""
 
-#: eeschema/viewlibs.cpp:313
+#: eeschema/viewlibs.cpp:318
 #, fuzzy, c-format
 msgid "Error: Root Part <%s> not found"
 msgstr "Fout: Hoofd onderdeel <%s> niet gevonden"
 
-#: eeschema/viewlibs.cpp:332
+#: eeschema/viewlibs.cpp:337
 #, c-format
 msgid "Current Part: <%s>"
 msgstr "Huidige Onderdeel: <%s>"
@@ -6858,10 +6870,6 @@ msgstr "standaard"
 msgid "Sheet %s (file %s) modified. Save it?"
 msgstr ""
 
-#: eeschema/viewlib_frame.cpp:53
-msgid "Library browser"
-msgstr "Bibliotheek Verkenner"
-
 #: eeschema/libedit.cpp:38
 msgid " Part:   "
 msgstr " Onderdeel:"
@@ -8455,14 +8463,6 @@ msgstr "Kan doc lib niet creëren"
 msgid "Ok to cleanup this sheet"
 msgstr "OK voor opschonen van sheet"
 
-#: eeschema/class_drawsheet.cpp:350
-msgid "Sheet: "
-msgstr "Pagina: "
-
-#: eeschema/class_drawsheet.cpp:351
-msgid "File: "
-msgstr "Bestand: "
-
 #: eeschema/class_drawsheet.cpp:560
 #, c-format
 msgid "A Sub Hierarchy named %s exists, Use it (The data in this sheet will be replaced)?"
@@ -11186,6 +11186,17 @@ msgstr "Pagina Instellingen"
 msgid "Print"
 msgstr "Printen"
 
+#, fuzzy
+#~ msgid "none"
+#~ msgstr "naamloos"
+#~ msgid "Browse library: "
+#~ msgstr "Bibliotheek doorzoeken:"
+#~ msgid "Module name:"
+#~ msgstr "Module naam:"
+#~ msgid "Sheet: "
+#~ msgstr "Pagina: "
+#~ msgid "File: "
+#~ msgstr "Bestand: "
 #~ msgid "File %s not found (new project ?)"
 #~ msgstr "File %s not found (new project ?)"
 #~ msgid "&Plot CURRENT"

pcbnew/loadcmp.cpp

@@ -100,7 +100,7 @@ MODULE* WinEDA_BasePcbFrame::Load_Module_From_Library( const wxString& library,
     bool AllowWildSeach = TRUE;
 
     /* Ask for a component name or key words */
-    ModuleName = GetComponentName( this, HistoryList, _( "Module name:" ), NULL );
+    ModuleName = GetComponentName( this, HistoryList, _( "Place module" ), NULL );
     ModuleName.MakeUpper();
     if( ModuleName.IsEmpty() )  /* Cancel command */
     {
@@ -430,7 +430,7 @@ wxString WinEDA_BasePcbFrame::Select_1_Module_From_List(
 
     wxEndBusyCursor();
 
-    msg.Printf( _( "Modules (%d items)" ), NbModules );
+    msg.Printf( _( "Modules [%d items]" ), NbModules );
     ListBox->SetTitle( msg );
     ListBox->SortList();
 
@@ -581,7 +581,7 @@ MODULE* WinEDA_BasePcbFrame::Select_1_Module_From_BOARD( BOARD* Pcb )
         ListBox->Append( Module->m_Reference->m_Text );
     }
 
-    msg.Printf( _( "Modules (%d items)" ), ii );
+    msg.Printf( _( "Modules [%d items]" ), ii );
     ListBox->SetTitle( msg );
 
     ListBox->SortList();

template/kicad.pro

@@ -115,7 +115,7 @@ LabSize=60
 [eeschema/libraries]
 LibName1=power
 LibName2=device
-LibName3=transistors
+LibName3=transistor
 LibName4=conn
 LibName5=linear
 LibName6=regul
@@ -143,3 +143,4 @@ LibName27=opto
 LibName28=atmel
 LibName29=contrib
 LibName30=valves
+LibName31=atmel