minor changes (typo, about dialog) before release

common/about_kicad.cpp

@@ -9,6 +9,25 @@
 
 extern wxString g_Main_Title; // Import program title
 
+/**********************************/
+wxString SetMsg ( const wxString & msg )
+/**********************************/
+/* add \n at the beginning of msg under Windows, and do nothing under other version of wxWidgets
+ * Needed under wxWidgets 2.8 because wxGTK and wxMSW do not have the same behavior
+ * AddDeveloper needs \n between names under wxGTK, and nothing under wxMSW
+ * when displaying developer and others.
+ * can be removed for next wxWidgets versions when this wxWidgets bug will be solved
+*/
+{
+    wxString tmp;
+    #ifdef __WINDOWS__
+    tmp = wxT("\n");
+    #endif
+
+    tmp << msg;
+    return tmp;
+}
+
 
 /**************************************************/
 void InitKiCadAbout(wxAboutDialogInfo& info)
@@ -24,31 +43,36 @@ void InitKiCadAbout(wxAboutDialogInfo& info)
 
 /* Check for unicode */
 #if wxUSE_UNICODE
-    description << (_(" Unicode " ));
+    description << (wxT(" Unicode " ));
 #else
-    description << (_(" Ansi "));
+    description << (wxT(" Ansi "));
 #endif
 
 /* Check for wxMSW */
-#if wxMSW
-    description << (_("on Windows"));
-#endif
+#if defined __WINDOWS__
+    description << (wxT("on Windows"));
 
 /* Check for wxMAC */
-#if wxMAC
-    description << (_("on Macintosch"));
-#endif
+#elif defined __WXMAC__
+    description << (wxT("on Macintosch"));
 
 /* Check for linux and arch */
-#if __gnu_linux__
-   description << (_("on GNU/Linux "));
+#elif defined __LINUX__
+   description << (wxT("on GNU/Linux "));
+#endif
 #ifdef _LP64
-   description << (_("64 bits"));
+   description << (wxT(" 64 bits"));
 #else
-   description << (_("32 bits"));
-#endif
+   description << (wxT(" 32 bits"));
 #endif
 
+    description << wxT("\n\nWeb sites:\n");
+    description << wxT("http://iut-tice.ujf-grenoble.fr/kicad/" );
+    description << wxT("\n");
+    description <<  wxT("http://kicad.sourceforge.net/" );
+    description << wxT("\n");
+
+
     info.SetDescription(description);
 
     /* Set copyright */
@@ -60,24 +84,28 @@ void InitKiCadAbout(wxAboutDialogInfo& info)
       "The complete KiCad EDA Suite is released under the following license: \n"
       "\n"
       "GNU General Public License version 2\n"
-      "\n"
       "See <http://www.gnu.org/licenses/> for more information"
     ));
 
     /* Add developers */
-    info.AddDeveloper(_T("Dick Hollenbeck <dick@softplc.com>"));
-    info.AddDeveloper(_T("\nJean-Pierre Charras <jean-pierre.charras@inpg.fr>"));
+    info.AddDeveloper(wxT("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"));
+    info.AddDeveloper(SetMsg(wxT("Dick Hollenbeck <dick@softplc.com>")));
 
     /* Add document writers */
-    info.AddDocWriter(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"));
-    info.AddDocWriter(_T("\nIgor Plyatov <plyatov@gmail.com>"));
+    info.AddDocWriter(wxT("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"));
+    info.AddDocWriter(SetMsg(wxT("Igor Plyatov <plyatov@gmail.com>")));
 
     /* Add translators */
     info.AddTranslator(wxT("Czech (CZ) Milan Horák <stranger@tiscali.cz>")); /* fix for translation ! */
-    info.AddTranslator(_("\nDutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>"));
-    info.AddTranslator(_("\nFrench (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"));
-    info.AddTranslator(_("\nPolish (PL) Mateusz Skowronski <skowri@gmail.com>"));
-    info.AddTranslator(_("\nPortuguese (PT) Renie Marquet <reniemarquet@uol.com.br>"));
-    info.AddTranslator(_("\nRussian (RU) Igor Plyatov <plyatov@gmail.com>"));
+    info.AddTranslator(SetMsg(wxT("Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>")));
+    info.AddTranslator(SetMsg(wxT("French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")));
+    info.AddTranslator(SetMsg(wxT("Polish (PL) Mateusz Skowronski <skowri@gmail.com>")));
+    info.AddTranslator(SetMsg(wxT("Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>")));
+    info.AddTranslator(SetMsg(wxT("Russian (RU) Igor Plyatov <plyatov@gmail.com>")));
+
+    /* Add programm credits */
+#if 0   // TODO
+    info.AddArtist(wxT(""));
+#endif
 
 }

eeschema/menubar.cpp

@@ -224,7 +224,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
             placeMenu,
             ID_BUS_BUTT,
             _( "&Bus" ),
-            _( "Place the bus" ),
+            _( "Place a bus" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_bus_xpm );
@@ -234,7 +234,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
             placeMenu,
             ID_WIRETOBUS_ENTRY_BUTT,
             _( "W&ire to bus entry" ),
-            _( "Place the wire to bus entry" ),
+            _( "Place a wire to bus entry" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_line2bus_xpm );
@@ -244,7 +244,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
             placeMenu,
             ID_BUSTOBUS_ENTRY_BUTT,
             _( "B&us to bus entry" ),
-            _( "Place the bus to bus entry" ),
+            _( "Place a bus to bus entry" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_bus2bus_xpm );
@@ -254,7 +254,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
             placeMenu,
             ID_NOCONN_BUTT,
             _( "No connect flag" ),
-            _( "Place the no connect flag" ),
+            _( "Place a no connect flag" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( noconn_button );
@@ -264,7 +264,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
             placeMenu,
             ID_LABEL_BUTT,
             _( "Net name" ),
-            _( "Place the net name" ),
+            _( "Place a net name" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_line_label_xpm );
@@ -272,7 +272,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
 
         item = new wxMenuItem( placeMenu, ID_GLABEL_BUTT,
             _( "Global label" ),
-            _( "Place the global label. Warning: all global labels with the same name are connected in whole hierarchy" ),
+            _( "Place a global label. Warning: all global labels with the same name are connected in whole hierarchy" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_glabel_xpm );
@@ -282,7 +282,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
             placeMenu,
             ID_JUNCTION_BUTT,
             _( "Junction" ),
-            _( "Place the junction" ),
+            _( "Place a junction" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_junction_xpm );
@@ -294,7 +294,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
             placeMenu,
             ID_HIERLABEL_BUTT,
             _( "Hierarchical label" ),
-            _( "Place the hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ),
+            _( "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_hierarchical_label_xpm );
@@ -304,7 +304,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
             placeMenu,
             ID_SHEET_SYMBOL_BUTT,
             _( "Hierarchical sheet" ),
-            _( "Place the hierarchical sheet" ),
+            _( "Create a hierarchical sheet" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_hierarchical_subsheet_xpm );
@@ -313,8 +313,8 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
         item = new wxMenuItem(
             placeMenu,
             ID_IMPORT_GLABEL_BUTT,
-            _( "Imported hierarchical label" ),
-            _( "Place the pin sheet (imported hierarchical label from sheet)" ),
+            _( "Import Hierarchical Label" ),
+            _( "Place a pin sheet created by importing a hierarchical label from sheet" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( import_hierarchical_label_xpm );
@@ -323,8 +323,8 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
         item = new wxMenuItem(
             placeMenu,
             ID_SHEET_LABEL_BUTT,
-            _( "Hierarchical pin to sheet" ),
-            _( "Place the hierarchical pin to sheet" ),
+            _( "Add Hierarchical Pin to Sheet" ),
+            _( "Place a hierarchical pin to sheet" ),
             wxITEM_NORMAL
             );
         item->SetBitmap( add_hierar_pin_xpm );

include/build_version.h

@@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion
 #    include "config.h"
      (wxT(KICAD_SVN_VERSION))
 #  else
-     (wxT("(20080818.r1197)"))
+     (wxT("(20080825)"))
 #  endif
 #endif
 ;

internat/fr/kicad.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-23 13:52+0100\n"
-"PO-Revision-Date: 2008-08-23 14:01+0100\n"
+"POT-Creation-Date: 2008-08-25 08:23+0100\n"
+"PO-Revision-Date: 2008-08-25 08:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
@@ -6867,87 +6867,87 @@ msgid "&Bus"
 msgstr "&Bus"
 
 #: eeschema/menubar.cpp:227
-msgid "Place the bus"
-msgstr "Placer le Bus"
+msgid "Place a bus"
+msgstr "Placer un Bus"
 
 #: eeschema/menubar.cpp:236
 msgid "W&ire to bus entry"
 msgstr "Entrées de bus (type fil vers bus)"
 
 #: eeschema/menubar.cpp:237
-msgid "Place the wire to bus entry"
-msgstr "Placer des entrées de bus (type fil vers bus)"
+msgid "Place a wire to bus entry"
+msgstr "Placer une Entrée de Bus (type fil vers bus)"
 
 #: eeschema/menubar.cpp:246
 msgid "B&us to bus entry"
 msgstr "Entrées de bus (type bus vers bus)"
 
 #: eeschema/menubar.cpp:247
-msgid "Place the bus to bus entry"
-msgstr "Placer des entrées de bus (type bus vers bus)"
+msgid "Place a bus to bus entry"
+msgstr "Placer une Entrée de Bus (type bus vers bus)"
 
 #: eeschema/menubar.cpp:256
 msgid "No connect flag"
 msgstr "Symbole de Non Connexion"
 
 #: eeschema/menubar.cpp:257
-msgid "Place the no connect flag"
-msgstr "Placer le symbole de non connexion"
+msgid "Place a no connect flag"
+msgstr "Placer un Symbole de Non Connexion"
 
 #: eeschema/menubar.cpp:266
 msgid "Net name"
 msgstr "Net Name"
 
 #: eeschema/menubar.cpp:267
-msgid "Place the net name"
-msgstr "Placer le nom de net"
+msgid "Place a net name"
+msgstr "Placer un Nom de Net"
 
 #: eeschema/menubar.cpp:274
 msgid "Global label"
 msgstr "Label Global"
 
 #: eeschema/menubar.cpp:275
-msgid "Place the global label. Warning: all global labels with the same name are connected in whole hierarchy"
-msgstr "Placerun label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hierarchie"
+msgid "Place a global label. Warning: all global labels with the same name are connected in whole hierarchy"
+msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hierarchie"
 
 #: eeschema/menubar.cpp:284
 msgid "Junction"
 msgstr "Jonction"
 
 #: eeschema/menubar.cpp:285
-msgid "Place the junction"
-msgstr "Placer la Jonction"
+msgid "Place a junction"
+msgstr "Placer une Jonction"
 
 #: eeschema/menubar.cpp:296
 msgid "Hierarchical label"
 msgstr "Label Hiérarchique"
 
 #: eeschema/menubar.cpp:297
-msgid "Place the hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
-msgstr "Placer le label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
+msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
+msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
 
 #: eeschema/menubar.cpp:306
 msgid "Hierarchical sheet"
 msgstr "Feuille Hiérrachique"
 
 #: eeschema/menubar.cpp:307
-msgid "Place the hierarchical sheet"
-msgstr "Placer la Feuille Hiérachique"
+msgid "Create a hierarchical sheet"
+msgstr "Créer une Feuille Hiérachique"
 
 #: eeschema/menubar.cpp:316
-msgid "Imported hierarchical label"
-msgstr "Importer label hiérarchique"
+msgid "Import Hierarchical Label"
+msgstr "Importer Label Hiérarchique"
 
 #: eeschema/menubar.cpp:317
-msgid "Place the pin sheet (imported hierarchical label from sheet)"
-msgstr "Placer la pin hiérarchique ( Importer un label hiérarchique vers la feuille)"
+msgid "Place a pin sheet created by importing a hierarchical label from sheet"
+msgstr "Placer une pin hiérarchique créée par importation d'un label hiérarchique de la feuille"
 
 #: eeschema/menubar.cpp:326
-msgid "Hierarchical pin to sheet"
-msgstr "Ppins de hierarchie vers feuille"
+msgid "Add Hierarchical Pin to Sheet"
+msgstr "Ajouter Pins de Hierarchie dans feuille"
 
 #: eeschema/menubar.cpp:327
-msgid "Place the hierarchical pin to sheet"
+msgid "Place a hierarchical pin to sheet"
 msgstr "Addition de pins de hierarchie dans les feuilles symboles de hierarchie"
 
 #: eeschema/menubar.cpp:338
@@ -7837,6 +7837,26 @@ msgstr "Rétroannotation Module"
 msgid "Hierarchy Push/Pop"
 msgstr "Navigation dans la hierarchie"
 
+#: eeschema/tool_sch.cpp:169
+msgid "Place the bus"
+msgstr "Placer le Bus"
+
+#: eeschema/tool_sch.cpp:173
+msgid "Place the wire to bus entry"
+msgstr "Placer des entrées de bus (type fil vers bus)"
+
+#: eeschema/tool_sch.cpp:177
+msgid "Place the bus to bus entry"
+msgstr "Placer des entrées de bus (type bus vers bus)"
+
+#: eeschema/tool_sch.cpp:182
+msgid "Place the no connect flag"
+msgstr "Placer le symbole de non connexion"
+
+#: eeschema/tool_sch.cpp:186
+msgid "Place the net name"
+msgstr "Placer le nom de net"
+
 #: eeschema/tool_sch.cpp:190
 msgid ""
 "Place the global label.\n"
@@ -7845,6 +7865,22 @@ msgstr ""
 "Placer le label global.\n"
 "Attention: tous les labels globaux de même nom sont connecté dans toute la hiérarchie"
 
+#: eeschema/tool_sch.cpp:195
+msgid "Place the junction"
+msgstr "Placer la Jonction"
+
+#: eeschema/tool_sch.cpp:200
+msgid "Place the hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
+msgstr "Placer le label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
+
+#: eeschema/tool_sch.cpp:205
+msgid "Place the hierarchical sheet"
+msgstr "Placer la Feuille Hiérachique"
+
+#: eeschema/tool_sch.cpp:209
+msgid "Place the pin sheet (imported hierarchical label from sheet)"
+msgstr "Placer la pin hiérarchique ( Importer un label hiérarchique vers la feuille)"
+
 #: eeschema/tool_sch.cpp:214
 msgid "Place the hierachical pin to sheet"
 msgstr "Place une pin de hierarchie dans la feuille"
@@ -9556,66 +9592,6 @@ msgstr "BAD INDEX"
 msgid "Help file %s not found"
 msgstr "Fichier d'aide %s non trouvé"
 
-#: common/about_kicad.cpp:27
-msgid " Unicode "
-msgstr " Unicode "
-
-#: common/about_kicad.cpp:29
-msgid " Ansi "
-msgstr " Ansi "
-
-#: common/about_kicad.cpp:34
-msgid "on Windows"
-msgstr ""
-
-#: common/about_kicad.cpp:39
-msgid "on Macintosch"
-msgstr ""
-
-#: common/about_kicad.cpp:44
-msgid "on GNU/Linux "
-msgstr ""
-
-#: common/about_kicad.cpp:46
-msgid "64 bits"
-msgstr "64 bits"
-
-#: common/about_kicad.cpp:48
-msgid "32 bits"
-msgstr "32 bits"
-
-#: common/about_kicad.cpp:77
-msgid ""
-"\n"
-"Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>"
-msgstr ""
-"\n"
-"Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>"
-
-#: common/about_kicad.cpp:78
-msgid ""
-"\n"
-"French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"
-msgstr ""
-"\n"
-"French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"
-
-#: common/about_kicad.cpp:80
-msgid ""
-"\n"
-"Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>"
-msgstr ""
-"\n"
-"Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>"
-
-#: common/about_kicad.cpp:81
-msgid ""
-"\n"
-"Russian (RU) Igor Plyatov <plyatov@gmail.com>"
-msgstr ""
-"\n"
-"Russian (RU) Igor Plyatov <plyatov@gmail.com>"
-
 #: 3d-viewer/3d_aux.cpp:207
 msgid "Vertex "
 msgstr "Vertex "
@@ -10470,6 +10446,38 @@ msgstr "Ajustage opt Page"
 msgid "Create SVG file"
 msgstr "Créer Fichier SVG"
 
+#~ msgid " Unicode "
+#~ msgstr " Unicode "
+#~ msgid " Ansi "
+#~ msgstr " Ansi "
+#~ msgid "64 bits"
+#~ msgstr "64 bits"
+#~ msgid "32 bits"
+#~ msgstr "32 bits"
+#~ msgid ""
+#~ "\n"
+#~ "Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>"
+#~ msgstr ""
+#~ "\n"
+#~ "Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>"
+#~ msgid ""
+#~ "\n"
+#~ "French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"
+#~ msgstr ""
+#~ "\n"
+#~ "French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"
+#~ msgid ""
+#~ "\n"
+#~ "Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>"
+#~ msgstr ""
+#~ "\n"
+#~ "Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>"
+#~ msgid ""
+#~ "\n"
+#~ "Russian (RU) Igor Plyatov <plyatov@gmail.com>"
+#~ msgstr ""
+#~ "\n"
+#~ "Russian (RU) Igor Plyatov <plyatov@gmail.com>"
 #~ msgid "Move Feild "
 #~ msgstr "Déplace Champ"
 #~ msgid "&Plot CURRENT"

nsis_win_installer/install.nsi

@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2008.07.15"
+!define PRODUCT_VERSION "2008.08.25"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""