From cf918c05a70e33018936fa1ea39d982df3e7f355 Mon Sep 17 00:00:00 2001
From: plyatov <Unknown>
Date: Sat, 10 Nov 2007 22:36:36 +0000
Subject: [PATCH] Some terminology corrections and russian translation update.

---
 eeschema/dialog_create_component.cpp      |   70 +-
 eeschema/dialog_create_component.h        |   10 +-
 eeschema/dialog_create_component.pjd      |  246 ++-
 eeschema/dialog_edit_component_in_lib.cpp |    2 +-
 eeschema/lib_export.cpp                   |    6 +-
 eeschema/libedit.cpp                      |   24 +-
 eeschema/libframe.cpp                     |    8 +-
 eeschema/tool_lib.cpp                     |   16 +-
 internat/ru/kicad.mo                      |  Bin 82694 -> 86206 bytes
 internat/ru/kicad.po                      | 1743 ++++++++++-----------
 10 files changed, 1142 insertions(+), 983 deletions(-)

diff --git a/eeschema/dialog_create_component.cpp b/eeschema/dialog_create_component.cpp
index 55f5e69053..99c035b0ae 100644
--- a/eeschema/dialog_create_component.cpp
+++ b/eeschema/dialog_create_component.cpp
@@ -96,12 +96,14 @@ bool WinEDA_CreateCmpDialog::Create( WinEDA_DrawFrame* parent, wxWindowID id, co
 ////@end WinEDA_CreateCmpDialog member initialisation
 
 ////@begin WinEDA_CreateCmpDialog creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
+    SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
     CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
+    if (GetSizer())
+    {
+        GetSizer()->SetSizeHints(this);
+    }
     Centre();
 ////@end WinEDA_CreateCmpDialog creation
     return TRUE;
@@ -141,8 +143,6 @@ void WinEDA_CreateCmpDialog::CreateControls()
 	SetFont(*g_DialogFont);
 
 ////@begin WinEDA_CreateCmpDialog content construction
-    // Generated by DialogBlocks, 30/05/2006 08:00:22 (unregistered)
-
     WinEDA_CreateCmpDialog* itemDialog1 = this;
 
     wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
@@ -207,35 +207,35 @@ void WinEDA_CreateCmpDialog::CreateControls()
     wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxHORIZONTAL);
     itemBoxSizer2->Add(itemBoxSizer19, 0, wxGROW|wxALL, 5);
 
-    wxString m_PartsCountStrings[] = {
-        _("&1"),
-        _("&2"),
-        _("&3"),
-        _("&4"),
-        _("&5"),
-        _("&6"),
-        _("&7"),
-        _("&8"),
-        _("&9"),
-        _("&10"),
-        _("&11"),
-        _("&12"),
-        _("&13"),
-        _("&14"),
-        _("&15"),
-        _("&16"),
-        _("&17"),
-        _("&18"),
-        _("&19"),
-        _("&20"),
-        _("&21"),
-        _("&22"),
-        _("&23"),
-        _("&24"),
-        _("&25"),
-        _("&26")
-    };
-    m_PartsCount = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Parts per package"), wxDefaultPosition, wxDefaultSize, 26, m_PartsCountStrings, 9, wxRA_SPECIFY_ROWS );
+    wxArrayString m_PartsCountStrings;
+    m_PartsCountStrings.Add(_("&1"));
+    m_PartsCountStrings.Add(_("&2"));
+    m_PartsCountStrings.Add(_("&3"));
+    m_PartsCountStrings.Add(_("&4"));
+    m_PartsCountStrings.Add(_("&5"));
+    m_PartsCountStrings.Add(_("&6"));
+    m_PartsCountStrings.Add(_("&7"));
+    m_PartsCountStrings.Add(_("&8"));
+    m_PartsCountStrings.Add(_("&9"));
+    m_PartsCountStrings.Add(_("&10"));
+    m_PartsCountStrings.Add(_("&11"));
+    m_PartsCountStrings.Add(_("&12"));
+    m_PartsCountStrings.Add(_("&13"));
+    m_PartsCountStrings.Add(_("&14"));
+    m_PartsCountStrings.Add(_("&15"));
+    m_PartsCountStrings.Add(_("&16"));
+    m_PartsCountStrings.Add(_("&17"));
+    m_PartsCountStrings.Add(_("&18"));
+    m_PartsCountStrings.Add(_("&19"));
+    m_PartsCountStrings.Add(_("&20"));
+    m_PartsCountStrings.Add(_("&21"));
+    m_PartsCountStrings.Add(_("&22"));
+    m_PartsCountStrings.Add(_("&23"));
+    m_PartsCountStrings.Add(_("&24"));
+    m_PartsCountStrings.Add(_("&25"));
+    m_PartsCountStrings.Add(_("&26"));
+    m_PartsCount = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Parts per component"), wxDefaultPosition, wxDefaultSize, m_PartsCountStrings, 9, wxRA_SPECIFY_ROWS );
+    m_PartsCount->SetSelection(0);
     itemBoxSizer19->Add(m_PartsCount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     itemBoxSizer19->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
@@ -244,7 +244,7 @@ void WinEDA_CreateCmpDialog::CreateControls()
     wxStaticBoxSizer* itemStaticBoxSizer22 = new wxStaticBoxSizer(itemStaticBoxSizer22Static, wxVERTICAL);
     itemBoxSizer19->Add(itemStaticBoxSizer22, 0, wxGROW|wxALL, 5);
 
-    m_ShowPinNum = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Show Pin Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
+    m_ShowPinNum = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Show Pin Number"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_ShowPinNum->SetValue(true);
     itemStaticBoxSizer22->Add(m_ShowPinNum, 0, wxALIGN_LEFT|wxALL, 5);
 
diff --git a/eeschema/dialog_create_component.h b/eeschema/dialog_create_component.h
index 79b086d0af..affe55f546 100644
--- a/eeschema/dialog_create_component.h
+++ b/eeschema/dialog_create_component.h
@@ -41,11 +41,6 @@ class wxSpinCtrl;
 
 ////@begin control identifiers
 #define ID_DIALOG 10000
-#define SYMBOL_WINEDA_CREATECMPDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
-#define SYMBOL_WINEDA_CREATECMPDIALOG_TITLE _("Component Creation")
-#define SYMBOL_WINEDA_CREATECMPDIALOG_IDNAME ID_DIALOG
-#define SYMBOL_WINEDA_CREATECMPDIALOG_SIZE wxSize(400, 300)
-#define SYMBOL_WINEDA_CREATECMPDIALOG_POSITION wxDefaultPosition
 #define ID_TEXTCTRL1 10009
 #define ID_TEXTCTRL 10008
 #define ID_CHECKBOX3 10005
@@ -56,6 +51,11 @@ class wxSpinCtrl;
 #define ID_CHECKBOX5 10007
 #define ID_CHECKBOX 10001
 #define ID_SPINCTRL 10010
+#define SYMBOL_WINEDA_CREATECMPDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
+#define SYMBOL_WINEDA_CREATECMPDIALOG_TITLE _("Component Creation")
+#define SYMBOL_WINEDA_CREATECMPDIALOG_IDNAME ID_DIALOG
+#define SYMBOL_WINEDA_CREATECMPDIALOG_SIZE wxSize(400, 300)
+#define SYMBOL_WINEDA_CREATECMPDIALOG_POSITION wxDefaultPosition
 ////@end control identifiers
 
 /*!
diff --git a/eeschema/dialog_create_component.pjd b/eeschema/dialog_create_component.pjd
index eaf4aa1d4f..8ac212f137 100644
--- a/eeschema/dialog_create_component.pjd
+++ b/eeschema/dialog_create_component.pjd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1252"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <anthemion-project version="1.0.0.0" xmlns="http://www.anthemion.co.uk">
   <header>
     <long name="name_counter">0</long>
@@ -6,18 +6,20 @@
     <string name="title">""</string>
     <string name="author">""</string>
     <string name="description">""</string>
-    <long name="doc_count">35</long>
     <string name="xrc_filename">""</string>
     <bool name="convert_images_to_xpm">0</bool>
     <bool name="inline_images">0</bool>
     <bool name="generate_cpp_for_xrc">0</bool>
+    <long name="working_mode">1</long>
     <bool name="use_help_text_for_tooltips">1</bool>
     <bool name="translate_strings">1</bool>
+    <bool name="make_unicode_strings">1</bool>
     <bool name="extract_strings">0</bool>
     <string name="user_name">"jean-pierre Charras"</string>
     <string name="copyright_string">"GNU license"</string>
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
+    <bool name="use_enums">0</bool>
     <string name="current_platform">"&lt;All platforms&gt;"</string>
     <string name="target_wx_version">"&lt;Any&gt;"</string>
     <string name="cpp_header_comment">"/////////////////////////////////////////////////////////////////////////////
@@ -43,11 +45,6 @@
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
 
-"</string>
-    <string name="cpp_function_comment">"/*!
- * %BODY%
- */
-
 "</string>
     <string name="cpp_symbols_file_comment">"/////////////////////////////////////////////////////////////////////////////
 // Name:        %SYMBOLS-FILENAME%
@@ -81,6 +78,14 @@
 #include &quot;wx/wx.h&quot;
 #endif
 
+"</string>
+    <string name="cpp_function_declaration_comment">"	/// %BODY%
+"</string>
+    <string name="cpp_function_implementation_comment">"
+/*!
+ * %BODY%
+ */
+
 "</string>
     <string name="resource_file_header">"app_resources.h"</string>
     <string name="resource_file_implementation">"app_resources.cpp"</string>
@@ -92,11 +97,22 @@
     <string name="external_symbol_filenames">""</string>
     <string name="configuration">"&lt;None&gt;"</string>
     <string name="source_encoding">"&lt;System&gt;"</string>
+    <string name="xrc_encoding">"utf-8"</string>
     <string name="project_encoding">"&lt;System&gt;"</string>
     <string name="resource_archive">""</string>
+    <long name="text_file_type">0</long>
+    <bool name="use_tabs">0</bool>
+    <long name="indent_size">4</long>
+    <string name="whitespace_after_return_type">" "</string>
+    <string name="resource_xrc_cpp">""</string>
     <bool name="use_resource_archive">0</bool>
+    <bool name="use_generated_xrc_cpp">0</bool>
+    <bool name="always_generate_xrc">1</bool>
     <bool name="archive_xrc_files">1</bool>
     <bool name="archive_image_files">1</bool>
+    <bool name="archive_all_image_files">0</bool>
+    <bool name="xrc_retain_relative_paths">1</bool>
+    <bool name="xrc_generate_id_tags">0</bool>
   </header>
   <data>
     <document>
@@ -184,6 +200,7 @@
           <string name="Use OpenGL">"No"</string>
           <string name="Use wx-config">"Yes"</string>
           <string name="Use installed wxWidgets">"No"</string>
+          <string name="Enable universal binaries">"No"</string>
           <string name="wxWidgets version">"%WXVERSION%"</string>
           <string name="Executable name">"%EXECUTABLE%"</string>
           <string name="Program arguments">""</string>
@@ -229,7 +246,7 @@
       <long name="is-transient">1</long>
       <long name="owns-file">1</long>
       <long name="title-mode">0</long>
-      <long name="locked">0</long>
+      <long name="locked">1</long>
       <document>
         <string name="title">"Windows"</string>
         <string name="type">"html-document"</string>
@@ -253,7 +270,10 @@
           <long name="base-id">10000</long>
           <bool name="use-id-prefix">0</bool>
           <string name="id-prefix">""</string>
+          <bool name="use-id-suffix">0</bool>
+          <string name="id-suffix">""</string>
           <long name="use-xrc">0</long>
+          <long name="working-mode">0</long>
           <string name="proxy-Id name">"ID_DIALOG"</string>
           <long name="proxy-Id value">10000</long>
           <string name="proxy-Class">"WinEDA_CreateCmpDialog"</string>
@@ -274,6 +294,13 @@
           <bool name="proxy-Hidden">0</bool>
           <bool name="proxy-Enabled">1</bool>
           <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+          <string name="proxy-Data source">""</string>
+          <string name="proxy-Data class name">""</string>
+          <string name="proxy-Data class implementation filename">""</string>
+          <string name="proxy-Data class header filename">""</string>
+          <string name="proxy-Data class manager window">""</string>
+          <string name="proxy-Texture">""</string>
+          <string name="proxy-Texture style">"Tiled"</string>
           <bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
           <bool name="proxy-wxCAPTION">1</bool>
           <bool name="proxy-wxRESIZE_BORDER">0</bool>
@@ -292,7 +319,9 @@
           <bool name="proxy-wxRAISED_BORDER">0</bool>
           <bool name="proxy-wxSTATIC_BORDER">0</bool>
           <bool name="proxy-wxWANTS_CHARS">0</bool>
-          <bool name="proxy-wxCLIP_CHILDREN ">0</bool>
+          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+          <bool name="proxy-wxCLIP_CHILDREN">0</bool>
           <bool name="proxy-wxTAB_TRAVERSAL">0</bool>
           <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
           <bool name="proxy-wxWS_EX_BLOCK_EVENTS">1</bool>
@@ -304,6 +333,7 @@
           <long name="proxy-Y">-1</long>
           <long name="proxy-Width">400</long>
           <long name="proxy-Height">300</long>
+          <bool name="proxy-AUI manager">0</bool>
           <string name="proxy-Event sources">"ID_BUTTON,ID_BUTTON1"</string>
           <document>
             <string name="title">"wxBoxSizer V"</string>
@@ -385,13 +415,14 @@
                   <string name="proxy-Id name">"wxID_ANY"</string>
                   <long name="proxy-Id value">-1</long>
                   <string name="proxy-Label">"Name"</string>
+                  <string name="proxy-Member variable name">""</string>
                   <string name="proxy-Sizer member variable name">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
+                  <string name="proxy-Static box class">"wxStaticBox"</string>
                   <string name="proxy-Orientation">"Vertical"</string>
-                  <string name="proxy-Member variable name">""</string>
                   <string name="proxy-AlignH">"Centre"</string>
                   <string name="proxy-AlignV">"Centre"</string>
                   <long name="proxy-Stretch factor">0</long>
@@ -417,7 +448,13 @@
                     <string name="proxy-type">"wbTextCtrlProxy"</string>
                     <string name="proxy-Id name">"ID_TEXTCTRL1"</string>
                     <long name="proxy-Id value">10009</long>
+                    <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxTextCtrl"</string>
+                    <string name="proxy-Base class">"wxTextCtrl"</string>
+                    <bool name="proxy-External implementation">1</bool>
+                    <bool name="proxy-Separate files">0</bool>
+                    <string name="proxy-Implementation filename">""</string>
+                    <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_CmpName"</string>
                     <string name="proxy-Initial value">""</string>
                     <long name="proxy-Max length">0</long>
@@ -431,6 +468,11 @@
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
+                    <string name="proxy-Data source">""</string>
+                    <string name="proxy-Data class name">""</string>
+                    <string name="proxy-Data class implementation filename">""</string>
+                    <string name="proxy-Data class header filename">""</string>
+                    <string name="proxy-Data class manager window">""</string>
                     <bool name="proxy-wxTE_MULTILINE">0</bool>
                     <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
                     <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
@@ -444,8 +486,9 @@
                     <bool name="proxy-wxTE_CENTRE">0</bool>
                     <bool name="proxy-wxTE_RIGHT">0</bool>
                     <bool name="proxy-wxHSCROLL">0</bool>
-                    <bool name="proxy-wxTE_LINEWRAP">0</bool>
+                    <bool name="proxy-wxTE_CHARWRAP">0</bool>
                     <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                    <bool name="proxy-wxTE_CAPITALIZE">0</bool>
                     <bool name="proxy-wxNO_BORDER">0</bool>
                     <bool name="proxy-wxSIMPLE_BORDER">0</bool>
                     <bool name="proxy-wxDOUBLE_BORDER">0</bool>
@@ -453,6 +496,8 @@
                     <bool name="proxy-wxRAISED_BORDER">0</bool>
                     <bool name="proxy-wxSTATIC_BORDER">0</bool>
                     <bool name="proxy-wxWANTS_CHARS">0</bool>
+                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                     <string name="proxy-Custom styles">""</string>
                     <long name="proxy-X">-1</long>
                     <long name="proxy-Y">-1</long>
@@ -471,6 +516,7 @@
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
+                    <bool name="proxy-wxTE_LINEWRAP">0</bool>
                   </document>
                 </document>
                 <document>
@@ -487,13 +533,14 @@
                   <string name="proxy-Id name">"wxID_ANY"</string>
                   <long name="proxy-Id value">-1</long>
                   <string name="proxy-Label">"Reference"</string>
+                  <string name="proxy-Member variable name">""</string>
                   <string name="proxy-Sizer member variable name">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
+                  <string name="proxy-Static box class">"wxStaticBox"</string>
                   <string name="proxy-Orientation">"Vertical"</string>
-                  <string name="proxy-Member variable name">""</string>
                   <string name="proxy-AlignH">"Centre"</string>
                   <string name="proxy-AlignV">"Centre"</string>
                   <long name="proxy-Stretch factor">0</long>
@@ -519,7 +566,13 @@
                     <string name="proxy-type">"wbTextCtrlProxy"</string>
                     <string name="proxy-Id name">"ID_TEXTCTRL"</string>
                     <long name="proxy-Id value">10008</long>
+                    <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxTextCtrl"</string>
+                    <string name="proxy-Base class">"wxTextCtrl"</string>
+                    <bool name="proxy-External implementation">1</bool>
+                    <bool name="proxy-Separate files">0</bool>
+                    <string name="proxy-Implementation filename">""</string>
+                    <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_Reference"</string>
                     <string name="proxy-Initial value">"U"</string>
                     <long name="proxy-Max length">0</long>
@@ -533,6 +586,11 @@
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
+                    <string name="proxy-Data source">""</string>
+                    <string name="proxy-Data class name">""</string>
+                    <string name="proxy-Data class implementation filename">""</string>
+                    <string name="proxy-Data class header filename">""</string>
+                    <string name="proxy-Data class manager window">""</string>
                     <bool name="proxy-wxTE_MULTILINE">0</bool>
                     <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
                     <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
@@ -546,8 +604,9 @@
                     <bool name="proxy-wxTE_CENTRE">0</bool>
                     <bool name="proxy-wxTE_RIGHT">0</bool>
                     <bool name="proxy-wxHSCROLL">0</bool>
-                    <bool name="proxy-wxTE_LINEWRAP">0</bool>
+                    <bool name="proxy-wxTE_CHARWRAP">0</bool>
                     <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                    <bool name="proxy-wxTE_CAPITALIZE">0</bool>
                     <bool name="proxy-wxNO_BORDER">0</bool>
                     <bool name="proxy-wxSIMPLE_BORDER">0</bool>
                     <bool name="proxy-wxDOUBLE_BORDER">0</bool>
@@ -555,6 +614,8 @@
                     <bool name="proxy-wxRAISED_BORDER">0</bool>
                     <bool name="proxy-wxSTATIC_BORDER">0</bool>
                     <bool name="proxy-wxWANTS_CHARS">0</bool>
+                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                     <string name="proxy-Custom styles">""</string>
                     <long name="proxy-X">-1</long>
                     <long name="proxy-Y">-1</long>
@@ -573,6 +634,7 @@
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
+                    <bool name="proxy-wxTE_LINEWRAP">0</bool>
                   </document>
                 </document>
               </document>
@@ -641,13 +703,14 @@
                   <string name="proxy-Id name">"wxID_ANY"</string>
                   <long name="proxy-Id value">-1</long>
                   <string name="proxy-Label">"Options"</string>
+                  <string name="proxy-Member variable name">""</string>
                   <string name="proxy-Sizer member variable name">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
+                  <string name="proxy-Static box class">"wxStaticBox"</string>
                   <string name="proxy-Orientation">"Vertical"</string>
-                  <string name="proxy-Member variable name">""</string>
                   <string name="proxy-AlignH">"Centre"</string>
                   <string name="proxy-AlignV">"Centre"</string>
                   <long name="proxy-Stretch factor">0</long>
@@ -673,7 +736,13 @@
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
                     <string name="proxy-Id name">"ID_CHECKBOX3"</string>
                     <long name="proxy-Id value">10005</long>
+                    <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxCheckBox"</string>
+                    <string name="proxy-Base class">"wxCheckBox"</string>
+                    <bool name="proxy-External implementation">1</bool>
+                    <bool name="proxy-Separate files">0</bool>
+                    <string name="proxy-Implementation filename">""</string>
+                    <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_AsConvert"</string>
                     <string name="proxy-Label">"As Convert"</string>
                     <bool name="proxy-Initial value">0</bool>
@@ -681,6 +750,11 @@
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
+                    <string name="proxy-Data source">""</string>
+                    <string name="proxy-Data class name">""</string>
+                    <string name="proxy-Data class implementation filename">""</string>
+                    <string name="proxy-Data class header filename">""</string>
+                    <string name="proxy-Data class manager window">""</string>
                     <string name="proxy-Background colour">""</string>
                     <string name="proxy-Foreground colour">""</string>
                     <string name="proxy-Font">""</string>
@@ -692,6 +766,8 @@
                     <bool name="proxy-wxCHK_3STATE">0</bool>
                     <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                     <bool name="proxy-wxWANTS_CHARS">0</bool>
+                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                     <string name="proxy-Custom styles">""</string>
                     <long name="proxy-X">-1</long>
                     <long name="proxy-Y">-1</long>
@@ -724,7 +800,13 @@
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
                     <string name="proxy-Id name">"ID_CHECKBOX4"</string>
                     <long name="proxy-Id value">10006</long>
+                    <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxCheckBox"</string>
+                    <string name="proxy-Base class">"wxCheckBox"</string>
+                    <bool name="proxy-External implementation">1</bool>
+                    <bool name="proxy-Separate files">0</bool>
+                    <string name="proxy-Implementation filename">""</string>
+                    <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_IsPowerSymbol"</string>
                     <string name="proxy-Label">"Power Symbol"</string>
                     <bool name="proxy-Initial value">0</bool>
@@ -732,6 +814,11 @@
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
+                    <string name="proxy-Data source">""</string>
+                    <string name="proxy-Data class name">""</string>
+                    <string name="proxy-Data class implementation filename">""</string>
+                    <string name="proxy-Data class header filename">""</string>
+                    <string name="proxy-Data class manager window">""</string>
                     <string name="proxy-Background colour">""</string>
                     <string name="proxy-Foreground colour">""</string>
                     <string name="proxy-Font">""</string>
@@ -743,6 +830,8 @@
                     <bool name="proxy-wxCHK_3STATE">0</bool>
                     <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                     <bool name="proxy-wxWANTS_CHARS">0</bool>
+                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                     <string name="proxy-Custom styles">""</string>
                     <long name="proxy-X">-1</long>
                     <long name="proxy-Y">-1</long>
@@ -775,7 +864,13 @@
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
                     <string name="proxy-Id name">"ID_CHECKBOX2"</string>
                     <long name="proxy-Id value">10004</long>
+                    <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxCheckBox"</string>
+                    <string name="proxy-Base class">"wxCheckBox"</string>
+                    <bool name="proxy-External implementation">1</bool>
+                    <bool name="proxy-Separate files">0</bool>
+                    <string name="proxy-Implementation filename">""</string>
+                    <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_PartsAreLocked"</string>
                     <string name="proxy-Label">"Parts are locked"</string>
                     <bool name="proxy-Initial value">0</bool>
@@ -783,6 +878,11 @@
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
+                    <string name="proxy-Data source">""</string>
+                    <string name="proxy-Data class name">""</string>
+                    <string name="proxy-Data class implementation filename">""</string>
+                    <string name="proxy-Data class header filename">""</string>
+                    <string name="proxy-Data class manager window">""</string>
                     <string name="proxy-Background colour">""</string>
                     <string name="proxy-Foreground colour">""</string>
                     <string name="proxy-Font">""</string>
@@ -794,6 +894,8 @@
                     <bool name="proxy-wxCHK_3STATE">0</bool>
                     <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                     <bool name="proxy-wxWANTS_CHARS">0</bool>
+                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                     <string name="proxy-Custom styles">""</string>
                     <long name="proxy-X">-1</long>
                     <long name="proxy-Y">-1</long>
@@ -854,12 +956,25 @@
                   <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick"</string>
                   <string name="proxy-Id name">"wxID_OK"</string>
                   <long name="proxy-Id value">5100</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxButton"</string>
+                  <string name="proxy-Base class">"wxButton"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">""</string>
                   <string name="proxy-Label">"&amp;OK"</string>
                   <bool name="proxy-Default">1</bool>
                   <string name="proxy-Help text">""</string>
                   <string name="proxy-Tooltip text">""</string>
+                  <string name="proxy-Data variable">""</string>
+                  <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">"BC0000"</string>
                   <string name="proxy-Font">""</string>
@@ -873,6 +988,8 @@
                   <bool name="proxy-wxBU_EXACTFIT">0</bool>
                   <bool name="proxy-wxNO_BORDER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -906,12 +1023,25 @@
                   <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick"</string>
                   <string name="proxy-Id name">"wxID_CANCEL"</string>
                   <long name="proxy-Id value">5101</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxButton"</string>
+                  <string name="proxy-Base class">"wxButton"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">""</string>
                   <string name="proxy-Label">"&amp;Cancel"</string>
                   <bool name="proxy-Default">0</bool>
                   <string name="proxy-Help text">""</string>
                   <string name="proxy-Tooltip text">""</string>
+                  <string name="proxy-Data variable">""</string>
+                  <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">"0000DD"</string>
                   <string name="proxy-Font">""</string>
@@ -925,6 +1055,8 @@
                   <bool name="proxy-wxBU_EXACTFIT">0</bool>
                   <bool name="proxy-wxNO_BORDER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -959,7 +1091,13 @@
               <string name="proxy-type">"wbStaticLineProxy"</string>
               <string name="proxy-Id name">"wxID_STATIC"</string>
               <long name="proxy-Id value">5105</long>
+              <string name="proxy-Name">""</string>
               <string name="proxy-Class">"wxStaticLine"</string>
+              <string name="proxy-Base class">"wxStaticLine"</string>
+              <bool name="proxy-External implementation">1</bool>
+              <bool name="proxy-Separate files">0</bool>
+              <string name="proxy-Implementation filename">""</string>
+              <string name="proxy-Header filename">""</string>
               <string name="proxy-Member variable name">""</string>
               <string name="proxy-Background colour">""</string>
               <string name="proxy-Foreground colour">""</string>
@@ -976,6 +1114,8 @@
               <bool name="proxy-wxRAISED_BORDER">0</bool>
               <bool name="proxy-wxSTATIC_BORDER">0</bool>
               <bool name="proxy-wxWANTS_CHARS">0</bool>
+              <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+              <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
               <string name="proxy-Custom styles">""</string>
               <long name="proxy-X">-1</long>
               <long name="proxy-Y">-1</long>
@@ -1031,10 +1171,18 @@
                 <string name="proxy-type">"wbRadioBoxProxy"</string>
                 <string name="proxy-Id name">"ID_RADIOBOX"</string>
                 <long name="proxy-Id value">10003</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxRadioBox"</string>
+                <string name="proxy-Base class">"wxRadioBox"</string>
+                <bool name="proxy-External implementation">1</bool>
+                <bool name="proxy-Separate files">0</bool>
+                <string name="proxy-Implementation filename">""</string>
+                <string name="proxy-Header filename">""</string>
                 <string name="proxy-Member variable name">"m_PartsCount"</string>
-                <string name="proxy-Label">"Parts per package"</string>
+                <string name="proxy-Label">"Parts per component"</string>
                 <long name="proxy-Major dimension count">9</long>
+                <string name="proxy-Items">"&amp;1|&amp;2|&amp;3|&amp;4|&amp;5|&amp;6|&amp;7|&amp;8|&amp;9|&amp;10|&amp;11|&amp;12|&amp;13|&amp;14|&amp;15|&amp;16|&amp;17|&amp;18|&amp;19|&amp;20|&amp;21|&amp;22|&amp;23|&amp;24|&amp;25|&amp;26"</string>
+                <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
                 <string name="proxy-Background colour">""</string>
@@ -1045,10 +1193,16 @@
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <string name="proxy-Data variable">""</string>
                 <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <bool name="proxy-wxRA_SPECIFY_ROWS">1</bool>
                 <bool name="proxy-wxRA_SPECIFY_COLS">0</bool>
-                <string name="proxy-Items">"&amp;1|&amp;2|&amp;3|&amp;4|&amp;5|&amp;6|&amp;7|&amp;8|&amp;9|&amp;10|&amp;11|&amp;12|&amp;13|&amp;14|&amp;15|&amp;16|&amp;17|&amp;18|&amp;19|&amp;20|&amp;21|&amp;22|&amp;23|&amp;24|&amp;25|&amp;26"</string>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
+                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                 <string name="proxy-Custom styles">""</string>
                 <long name="proxy-X">-1</long>
                 <long name="proxy-Y">-1</long>
@@ -1108,13 +1262,14 @@
                 <string name="proxy-Id name">"wxID_ANY"</string>
                 <long name="proxy-Id value">-1</long>
                 <string name="proxy-Label">"Draw options"</string>
+                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-Sizer member variable name">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Static box class">"wxStaticBox"</string>
                 <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-AlignH">"Centre"</string>
                 <string name="proxy-AlignV">"Expand"</string>
                 <long name="proxy-Stretch factor">0</long>
@@ -1140,14 +1295,25 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX1"</string>
                   <long name="proxy-Id value">10002</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_ShowPinNum"</string>
-                  <string name="proxy-Label">"Show Pin Num"</string>
+                  <string name="proxy-Label">"Show Pin Number"</string>
                   <bool name="proxy-Initial value">1</bool>
                   <string name="proxy-Help text">""</string>
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -1159,6 +1325,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1191,7 +1359,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX5"</string>
                   <long name="proxy-Id value">10007</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_ShowPinname"</string>
                   <string name="proxy-Label">"Show Pin Name"</string>
                   <bool name="proxy-Initial value">1</bool>
@@ -1199,6 +1373,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -1210,6 +1389,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1242,7 +1423,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX"</string>
                   <long name="proxy-Id value">10001</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_PinNameInside"</string>
                   <string name="proxy-Label">"Pin Name Inside"</string>
                   <bool name="proxy-Initial value">1</bool>
@@ -1250,6 +1437,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -1261,6 +1453,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1294,13 +1488,14 @@
                   <string name="proxy-Id name">"wxID_ANY"</string>
                   <long name="proxy-Id value">-1</long>
                   <string name="proxy-Label">"Skew:"</string>
+                  <string name="proxy-Member variable name">""</string>
                   <string name="proxy-Sizer member variable name">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
+                  <string name="proxy-Static box class">"wxStaticBox"</string>
                   <string name="proxy-Orientation">"Vertical"</string>
-                  <string name="proxy-Member variable name">""</string>
                   <string name="proxy-AlignH">"Left"</string>
                   <string name="proxy-AlignV">"Centre"</string>
                   <long name="proxy-Stretch factor">0</long>
@@ -1326,7 +1521,13 @@
                     <string name="proxy-type">"wbSpinCtrlProxy"</string>
                     <string name="proxy-Id name">"ID_SPINCTRL"</string>
                     <long name="proxy-Id value">10010</long>
+                    <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxSpinCtrl"</string>
+                    <string name="proxy-Base class">"wxSpinCtrl"</string>
+                    <bool name="proxy-External implementation">1</bool>
+                    <bool name="proxy-Separate files">0</bool>
+                    <string name="proxy-Implementation filename">""</string>
+                    <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_SetSkew"</string>
                     <long name="proxy-Minimum value">0</long>
                     <long name="proxy-Maximum value">100</long>
@@ -1341,6 +1542,11 @@
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
+                    <string name="proxy-Data source">""</string>
+                    <string name="proxy-Data class name">""</string>
+                    <string name="proxy-Data class implementation filename">""</string>
+                    <string name="proxy-Data class header filename">""</string>
+                    <string name="proxy-Data class manager window">""</string>
                     <bool name="proxy-wxSP_ARROW_KEYS">1</bool>
                     <bool name="proxy-wxSP_WRAP">0</bool>
                     <bool name="proxy-wxNO_BORDER">0</bool>
@@ -1350,6 +1556,8 @@
                     <bool name="proxy-wxRAISED_BORDER">0</bool>
                     <bool name="proxy-wxSTATIC_BORDER">0</bool>
                     <bool name="proxy-wxWANTS_CHARS">0</bool>
+                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                     <string name="proxy-Custom styles">""</string>
                     <long name="proxy-X">-1</long>
                     <long name="proxy-Y">-1</long>
diff --git a/eeschema/dialog_edit_component_in_lib.cpp b/eeschema/dialog_edit_component_in_lib.cpp
index af2e63faeb..11cc09e1f5 100644
--- a/eeschema/dialog_edit_component_in_lib.cpp
+++ b/eeschema/dialog_edit_component_in_lib.cpp
@@ -141,7 +141,7 @@ void WinEDA_PartPropertiesFrame::CreateControls()
     m_PanelBasicBoxSizer->Add(itemBoxSizer7, 0, wxALIGN_LEFT|wxALL, 5);
     wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
     itemBoxSizer7->Add(itemBoxSizer8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    wxStaticText* itemStaticText9 = new wxStaticText( m_PanelBasic, wxID_STATIC, _("Number of Units:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText* itemStaticText9 = new wxStaticText( m_PanelBasic, wxID_STATIC, _("Number of Parts:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer8->Add(itemStaticText9, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
     SelNumberOfUnits = new wxSpinCtrl( m_PanelBasic, ID_SPINCTRL1, _T("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 26, 0 );
diff --git a/eeschema/lib_export.cpp b/eeschema/lib_export.cpp
index acad1c66e0..d66d31a563 100644
--- a/eeschema/lib_export.cpp
+++ b/eeschema/lib_export.cpp
@@ -36,7 +36,7 @@ EDA_LibComponentStruct *LibEntry;
 int err = 1;
 
 	mask = wxT("*") + g_LibExtBuffer;
-	Name = EDA_FileSelector( _("Import part:"),
+	Name = EDA_FileSelector( _("Import component:"),
 					wxEmptyString,				/* Chemin par defaut */
 					wxEmptyString,		 	/* nom fichier par defaut */
 					g_LibExtBuffer,	/* extension par defaut */
@@ -98,7 +98,7 @@ int err;
 	mask = wxT("*") + g_LibExtBuffer;
 	wxString def_path;
 	if ( create_lib ) def_path = g_RealLibDirBuffer;
-	Name = EDA_FileSelector( create_lib ? _("New Library") : _("Export part:"),
+	Name = EDA_FileSelector( create_lib ? _("New Library") : _("Export component:"),
 					def_path,	/* Chemin par defaut */
 					Name,		 	/* nom fichier par defaut */
 					g_LibExtBuffer,	/* extension par defaut */
@@ -134,7 +134,7 @@ wxString msg;
 	{
 		msg = Name + _("0k");
 		DisplayInfo(this,
-_("Note: this new library will be available only if it is loaded by eeschema\nModify eeschema config if you want use it") );
+_("Note: this new library will be available only if it is loaded by eeschema.\nModify eeschema config if you want use it.") );
 	}
 	else msg = _("Error while create ") + Name;
 	Affiche_Message(msg);
diff --git a/eeschema/libedit.cpp b/eeschema/libedit.cpp
index 4cca9f3a27..a18f1bffb1 100644
--- a/eeschema/libedit.cpp
+++ b/eeschema/libedit.cpp
@@ -232,7 +232,7 @@ int err;
 
 	Name = MakeFileName(g_RealLibDirBuffer, CurrentLib->m_Name, g_LibExtBuffer);
 
-	msg = _("Ok to modify Library File ") + Name;
+	msg = _("Modify Library File \"") + Name + _("\" ?");
 	if( ! IsOK(this, msg) ) return;
 
 	err = SaveOneLibrary(this, Name, CurrentLib);
@@ -241,15 +241,15 @@ int err;
 
 	if ( err )
 	{
-		msg = _("Error while saving Library File ") + Name;
+		msg = _("Error while saving Library File \"") + Name + _("\"");
 		Affiche_1_Parametre(this, 1, wxT(" *** ERROR : **"), msg,BLUE);
 		DisplayError(this, msg);
 	}
 	else
 	{
-		msg = _("Library File ") + Name + wxT(" Ok");
+		msg = _("Library File \"") + Name + wxT("\" Ok");
 		ChangeFileNameExt(Name,DOC_EXT);
-		wxString msg1 = _("Document File ") + Name + wxT(" Ok");
+		wxString msg1 = _("Document File \"") + Name + wxT("\" Ok");
 		Affiche_1_Parametre(this, 1,msg, msg1,BLUE);
 	}
 }
@@ -345,8 +345,8 @@ wxString msg;
 
 		else
 		{
-			msg = _("Delete component ") + LibEntry->m_Name.m_Text +
-				_(" in library ") + CurrentLib->m_Name + wxT("?");
+			msg = _("Delete component \"") + LibEntry->m_Name.m_Text +
+				_("\" from library \"") + CurrentLib->m_Name + wxT("\"?");
 			if( IsOK(this, msg) )
 			{
 				DeletePartInLib( CurrentLib, LibEntry );
@@ -370,7 +370,7 @@ EDA_LibComponentStruct * NewStruct;
 int diag;
 
 	if( CurrentLibEntry )
-		if( ! IsOK(this, _("Delete old component ?")) ) return;
+		if( ! IsOK(this, _("Delete old component?")) ) return;
 
 	CurrentDrawItem = NULL;
 
@@ -387,8 +387,8 @@ int diag;
 		 if( FindLibPart(msg.GetData(), CurrentLib->m_Name, FIND_ALIAS) )
 		{
 			wxString msg;
-			msg << _("Component ") << msg <<
-					_(" exists in library ") << CurrentLib->m_Name;
+			msg << _("Component \"") << Dialogbox.ReturnCmpName() <<
+					_("\" exists in library \"") << CurrentLib->m_Name << _("\".");
 			DisplayError(this, msg);
 			return;
 		}
@@ -555,14 +555,14 @@ bool NewCmp = TRUE;
 
 	if(CurrentLibEntry == NULL)
 	{
-		DisplayError(this, _("Warning: No component to Save") ); return;
+		DisplayError(this, _("No component to Save.") ); return;
 	}
 
 	if(CurrentLib == NULL) SelectActiveLibrary();
 
 	if(CurrentLib == NULL)
 	{
-		DisplayError(this, _("No Library specified"), 20); return;
+		DisplayError(this, _("No Library specified."), 20); return;
 	}
 
 	CurrentLib->m_Modified = 1;
@@ -573,7 +573,7 @@ bool NewCmp = TRUE;
 	if( (Entry = FindLibPart(CurrentLibEntry->m_Name.m_Text.GetData(),
 				CurrentLib->m_Name, FIND_ROOT)) != NULL)
 	{
-		msg.Printf( _("Component %s exists, Change it ?"),
+		msg.Printf( _("Component \"%s\" exists. Change it?"),
 					Entry->m_Name.m_Text.GetData());
 		if( !IsOK(this, msg) ) return;
 		NewCmp = FALSE;
diff --git a/eeschema/libframe.cpp b/eeschema/libframe.cpp
index f6283be6fa..e2ea4661e3 100644
--- a/eeschema/libframe.cpp
+++ b/eeschema/libframe.cpp
@@ -102,7 +102,7 @@ void WinEDA_LibeditFrame::OnCloseWindow( wxCloseEvent& Event )
 
     if( m_CurrentScreen->IsModify() )
     {
-        if( !IsOK( this, _( "LibEdit: Part modified!, Continue ?" ) ) )
+        if( !IsOK( this, _( "Component was modified!\nDiscard changes?" ) ) )
         {
             Event.Veto(); return;
         }
@@ -115,7 +115,7 @@ void WinEDA_LibeditFrame::OnCloseWindow( wxCloseEvent& Event )
         if( Lib->m_Modified )
         {
             wxString msg;
-            msg.Printf( _( "Library %s modified!, Continue ?" ), Lib->m_Name.GetData() );
+            msg.Printf( _( "Library \"%s\" was modified!\nDiscard changes?" ), Lib->m_Name.GetData() );
             if( !IsOK( this, msg ) )
             {
                 Event.Veto(); return;
@@ -404,7 +404,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
     case ID_LIBEDIT_CHECK_PART:
         if( CurrentLibEntry )
             if( TestPins( CurrentLibEntry ) == FALSE )
-                DisplayInfo( this, _( " Tst Pins OK!" ) );
+                DisplayInfo( this, _( " Pins Test OK!" ) );
         break;
 
     case ID_DE_MORGAN_NORMAL_BUTT:
@@ -482,7 +482,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
         }
         else
         {
-            SetToolID( id, wxCURSOR_ARROW, _( "Set Pin Opt" ) );
+            SetToolID( id, wxCURSOR_ARROW, _( "Set Pin Options" ) );
             InstallPineditFrame( this, &dc, pos );
             SetToolID( 0, wxCURSOR_ARROW, wxEmptyString );
         }
diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp
index c364d7a9bd..163d3001cf 100644
--- a/eeschema/tool_lib.cpp
+++ b/eeschema/tool_lib.cpp
@@ -123,28 +123,28 @@ void WinEDA_LibeditFrame::ReCreateHToolbar()
                             _( "Select working library" ) );
 
         m_HToolBar->AddTool( ID_LIBEDIT_DELETE_PART, wxEmptyString, BITMAP( delete_xpm ),
-                            _( "Delete part in current library" ) );
+                            _( "Delete component in current library" ) );
 
         m_HToolBar->AddSeparator();
         m_HToolBar->AddTool( ID_LIBEDIT_NEW_PART, wxEmptyString, BITMAP( new_component_xpm ),
-                            _( "New part" ) );
+                            _( "New component" ) );
 
         m_HToolBar->AddTool( ID_LIBEDIT_SELECT_PART, BITMAP( add_component_xpm ),
-                            _( "Select part to edit" ) );
+                            _( "Select component to edit" ) );
 
         m_HToolBar->AddTool( ID_LIBEDIT_SAVE_CURRENT_PART, wxEmptyString,
                             BITMAP( save_part_in_mem_xpm ),
-                            _( "Save current part into current loaded library (in memory)" ) );
+                            _( "Save current component into current loaded library (in memory)" ) );
 
         m_HToolBar->AddTool( ID_LIBEDIT_IMPORT_PART, wxEmptyString, BITMAP( import_xpm ),
-                            _( "import part" ) );
+                            _( "import component" ) );
 
         m_HToolBar->AddTool( ID_LIBEDIT_EXPORT_PART, wxEmptyString, BITMAP( export_xpm ),
-                            _( "export part" ) );
+                            _( "export component" ) );
 
         m_HToolBar->AddTool( ID_LIBEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART,
                             wxEmptyString, BITMAP( new_library_xpm ),
-                            _( "Create a new library an save current part into" ) );
+                            _( "Create a new library an save current component into" ) );
 
         m_HToolBar->AddSeparator();
 		msg = AddHotkeyName( _( "Undo last edition" ), s_Schematic_Hokeys_Descr, HK_UNDO );
@@ -157,7 +157,7 @@ void WinEDA_LibeditFrame::ReCreateHToolbar()
                             wxNullBitmap,
                             FALSE,
                             -1, -1, (wxObject*) NULL,
-                            _( "Edit Part Properties" ) );
+                            _( "Edit component properties" ) );
 
         m_HToolBar->AddSeparator();
         m_HToolBar->AddTool( ID_LIBEDIT_CHECK_PART, BITMAP( erc_xpm ),
diff --git a/internat/ru/kicad.mo b/internat/ru/kicad.mo
index 693f08778b36585383c7078fd2e38bd7425393f4..5a637e74d381d72854c85413c08e61edcb0716be 100644
GIT binary patch
delta 27314
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
Pl`fFvjwkiqS=0X?T+Xpe

delta 24428
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

diff --git a/internat/ru/kicad.po b/internat/ru/kicad.po
index 898ffcda96..9b5bc525a7 100644
--- a/internat/ru/kicad.po
+++ b/internat/ru/kicad.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-11-04 21:36+0300\n"
+"PO-Revision-Date: 2007-11-11 01:36+0300\n"
 "Last-Translator: Igor Plyatov <plyatov@mail.ru>\n"
 "Language-Team: russian\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr "Список истории:"
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/set_color.cpp:249
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheetlab.cpp:93
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.cpp:248
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:117
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:118
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/pcbtexte.cpp:111
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/sel_layer.cpp:158
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/sel_layer.cpp:316
@@ -45,7 +45,7 @@ msgstr "Список истории:"
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/block.cpp:160
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/cotation.cpp:105
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/mirepcb.cpp:99
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:275
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:353
 msgid "OK"
 msgstr ""
 
@@ -69,7 +69,7 @@ msgstr "Поиск ключевого слова"
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/onrightclick.cpp:133
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheetlab.cpp:97
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.cpp:252
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:121
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:122
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/pcbtexte.cpp:116
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/sel_layer.cpp:162
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/sel_layer.cpp:320
@@ -82,7 +82,7 @@ msgstr "Поиск ключевого слова"
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/globaleditpad.cpp:108
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/cotation.cpp:109
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/mirepcb.cpp:103
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:280
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:357
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -194,7 +194,7 @@ msgid "Inner L14"
 msgstr "Внутренний L14"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/common/common.cpp:280
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:233
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:234
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/exporttogerber.cpp:142
 msgid "Component"
 msgstr "Компонент"
@@ -255,11 +255,11 @@ msgstr "Контур платы"
 msgid "---      "
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/common/gestfich.cpp:619
+#: /home/plyatov/Projects/Programming/kicad-svn/common/gestfich.cpp:620
 msgid "No default editor found, you must choose it"
 msgstr "Редактор по умолчанию не найден. Вы должны выбрать его"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/common/gestfich.cpp:625
+#: /home/plyatov/Projects/Programming/kicad-svn/common/gestfich.cpp:626
 #: /home/plyatov/Projects/Programming/kicad-svn/kicad/preferences.cpp:97
 msgid "Prefered Editor:"
 msgstr "Предпочтительный редактор:"
@@ -356,104 +356,6 @@ msgstr "Инверсия блока"
 msgid "Block Mirror"
 msgstr "Зеркалирование блока"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:183
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:243
-#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:236
-msgid "Pen width mini"
-msgstr "Миним. толщина пера"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:190
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:193
-#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:183
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plotps.cpp:185
-msgid "Color"
-msgstr "Цвет"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:191
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:194
-msgid "Black and White"
-msgstr "Чёрно-белый"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:193
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:196
-msgid "Print mode"
-msgstr "Режим печати"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:197
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:200
-#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:174
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plotps.cpp:191
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/pcbplot.cpp:266
-msgid "Print Sheet Ref"
-msgstr ""
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:204
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:210
-#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:199
-msgid "Current"
-msgstr "Текущий"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:205
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:211
-#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:200
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:169
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:175
-msgid "All"
-msgstr "Все"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:207
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:213
-#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:194
-#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:202
-msgid "Page Print:"
-msgstr "Печать страниц:"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:216
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:217
-msgid "Create &File"
-msgstr "Создать файл (&F)"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:220
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:222
-#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:225
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate_dialog.cpp:154
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:181
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plotps.cpp:208
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:124
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:274
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:235
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/gendrill.cpp:263
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_netlist.cpp:178
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_drc.cpp:201
-msgid "&Close"
-msgstr "Закрыть (&C)"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:224
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:226
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheet.cpp:162
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:232
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:232
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_drc.cpp:215
-msgid "Messages:"
-msgstr "Сообщения :"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:364
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:377
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:363
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:377
-msgid "Create file "
-msgstr "Создать файл"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:365
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.cpp:378
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:364
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:378
-msgid " error"
-msgstr " ошибка"
-
 #: /home/plyatov/Projects/Programming/kicad-svn/common/eda_doc.cpp:129
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:1144
 msgid "Doc Files"
@@ -666,9 +568,7 @@ msgstr "Показать номер ножки"
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_display_options.cpp:177
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:131
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:161
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:116
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:153
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:108
 msgid "Save Cfg"
 msgstr "Сохранить настройки"
 
@@ -681,9 +581,9 @@ msgstr "Сохранить настройки"
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:346
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheet.cpp:221
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_lib.cpp:218
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:176
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:174
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:195
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:243
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:240
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_cmp_graphic_properties.cpp:178
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:308
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_general_options.cpp:368
@@ -694,7 +594,7 @@ msgstr "Сохранить настройки"
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_display_options.cpp:282
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_grid.cpp:171
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_pad_edit.cpp:217
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:218
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:219
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/exporttogerber.cpp:152
 msgid "&OK"
 msgstr ""
@@ -704,11 +604,17 @@ msgstr ""
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/select_layers_to_pcb.cpp:287
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plothpgl.cpp:274
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/symbtext.cpp:178
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate_dialog.cpp:154
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_options.cpp:278
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:350
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:218
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheet.cpp:216
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_lib.cpp:214
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:179
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:200
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:251
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:375
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:232
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_cmp_graphic_properties.cpp:182
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:304
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_general_options.cpp:372
@@ -720,13 +626,14 @@ msgstr ""
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/zones.cpp:217
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_grid.cpp:176
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_pad_edit.cpp:221
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:222
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:223
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/exporttogerber.cpp:155
 msgid "&Cancel"
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_display_options.cpp:195
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:354
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.cpp:256
 msgid "&Apply"
 msgstr ""
 
@@ -757,9 +664,7 @@ msgstr "Ошибка Netlist: %s"
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:76
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/reglage.cpp:90
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:105
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:111
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:97
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:101
 msgid "from "
 msgstr "из"
 
@@ -780,52 +685,41 @@ msgid "View &Net + Pkg"
 msgstr "Просмотр &Net + Pkg"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:147
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:174
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:303
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:169
 msgid "NetList Formats:"
 msgstr "Форматы NetList:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:151
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:180
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:148
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:178
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:159
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:148
 msgid "Files ext:"
 msgstr "Типы файлов:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:170
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:202
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:196
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:120
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:175
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:112
 msgid "Del"
 msgstr "Удалить"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:174
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:206
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:200
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:197
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:233
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:312
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:124
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:179
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:116
 msgid "Add"
 msgstr "Добавить"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:178
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:210
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:204
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:128
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:203
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:183
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:120
 msgid "Ins"
 msgstr "Вставить"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.cpp:185
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/menucfg.cpp:231
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:211
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:139
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:213
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:191
 msgid "Libraries"
 msgstr "Библиотеки"
@@ -919,7 +813,6 @@ msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/menucfg.cpp:91
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:206
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:176
 msgid "Module Doc File:"
 msgstr "Файл документации модуля:"
 
@@ -1264,6 +1157,83 @@ msgstr "Проблема с печатью"
 msgid "Print page %d"
 msgstr "Печать страницы %d"
 
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:193
+#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:183
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plotps.cpp:185
+msgid "Color"
+msgstr "Цвет"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:194
+msgid "Black and White"
+msgstr "Чёрно-белый"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:196
+msgid "Print mode"
+msgstr "Режим печати"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:200
+#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:174
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plotps.cpp:191
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/pcbplot.cpp:266
+msgid "Print Sheet Ref"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:210
+#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:199
+msgid "Current"
+msgstr "Текущий"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:211
+#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:200
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:169
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:175
+msgid "All"
+msgstr "Все"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:213
+#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:194
+#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:202
+msgid "Page Print:"
+msgstr "Печать страниц:"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:217
+msgid "Create &File"
+msgstr "Создать файл (&F)"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:222
+#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:225
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plotps.cpp:208
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/gendrill.cpp:263
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_netlist.cpp:178
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_drc.cpp:201
+msgid "&Close"
+msgstr "Закрыть (&C)"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:226
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheet.cpp:162
+msgid "Filename:"
+msgstr "Имя файла:"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:232
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_drc.cpp:215
+msgid "Messages:"
+msgstr "Сообщения :"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:243
+#: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:236
+msgid "Pen width mini"
+msgstr "Миним. толщина пера"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:363
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:377
+msgid "Create file "
+msgstr "Создать файл"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:364
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.cpp:378
+msgid " error"
+msgstr " ошибка"
+
 #: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:136
 msgid "fit in page"
 msgstr "Уместить в страницу"
@@ -1318,7 +1288,7 @@ msgstr "Подстройка масштаба Y"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:167
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:285
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:94
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:228
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_cmp_graphic_properties.cpp:151
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_general_options.cpp:315
 msgid "Options:"
@@ -1335,6 +1305,7 @@ msgid "Mirror"
 msgstr "Зеркалирование"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.cpp:184
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.cpp:234
 msgid "Black"
 msgstr "Черный"
 
@@ -1362,101 +1333,6 @@ msgstr "П&редварительный просмотр"
 msgid "&Print"
 msgstr "&Печать"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:48
-msgid "Build Version:"
-msgstr "Версия программы:  "
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:63
-msgid "Author:"
-msgstr "Автор:"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:64
-msgid "Based on wxWidgets "
-msgstr "Основано на wxWidgets"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:69
-msgid ""
-"\n"
-"\n"
-"GPL License"
-msgstr ""
-"\n"
-"\n"
-"Лицензия GPL"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:70
-msgid ""
-"\n"
-"\n"
-"Author's sites:\n"
-msgstr ""
-"\n"
-"\n"
-"Авторские сайты:\n"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:73
-msgid ""
-"\n"
-"\n"
-"International wiki:\n"
-msgstr ""
-"\n"
-"\n"
-"Интернациональная wiki:\n"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:322
-msgid "Zoom: "
-msgstr "Масштаб: "
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:323
-msgid "Grid: "
-msgstr "Сетка:"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:356
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:476
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:478
-msgid "Center"
-msgstr "Центр"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:357
-#: /home/plyatov/Projects/Programming/kicad-svn/3d-viewer/3d_canvas.cpp:318
-msgid "Zoom +"
-msgstr "Масштаб +"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:358
-#: /home/plyatov/Projects/Programming/kicad-svn/3d-viewer/3d_canvas.cpp:323
-msgid "Zoom -"
-msgstr "Масштаб -"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:362
-msgid "Zoom Select"
-msgstr "Выбор масштаба"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:364
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plotps.cpp:169
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_modedit.cpp:285
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_pcb.cpp:567
-msgid "Auto"
-msgstr "Авто"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:365
-msgid "Redraw"
-msgstr "Обновить"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:381
-msgid "Grid Select"
-msgstr "Выбор сетки"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:403
-msgid "grid user"
-msgstr "сетка пользователя"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:445
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/pcbplot.cpp:209
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/xchgmod.cpp:137
-msgid "Close"
-msgstr ""
-
 #: /home/plyatov/Projects/Programming/kicad-svn/share/setpage.cpp:198
 msgid "Size A4"
 msgstr "Размер A4"
@@ -1528,7 +1404,7 @@ msgid "Revision:"
 msgstr "Ревизия:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/share/setpage.cpp:262
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:318
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:428
 msgid "Title:"
 msgstr "Заголовок:"
 
@@ -1562,6 +1438,101 @@ msgstr "Комментарий4:"
 msgid "Export to other sheets"
 msgstr "Экспорт в другие листы"
 
+#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:47
+msgid "Build Version:"
+msgstr "Версия программы:  "
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:62
+msgid "Author:"
+msgstr "Автор:"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:63
+msgid "Based on wxWidgets "
+msgstr "Основано на wxWidgets"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:68
+msgid ""
+"\n"
+"\n"
+"GPL License"
+msgstr ""
+"\n"
+"\n"
+"Лицензия GPL"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:69
+msgid ""
+"\n"
+"\n"
+"Author's sites:\n"
+msgstr ""
+"\n"
+"\n"
+"Авторские сайты:\n"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/infospgm.cpp:72
+msgid ""
+"\n"
+"\n"
+"International wiki:\n"
+msgstr ""
+"\n"
+"\n"
+"Интернациональная wiki:\n"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:322
+msgid "Zoom: "
+msgstr "Масштаб: "
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:323
+msgid "Grid: "
+msgstr "Сетка:"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:356
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:476
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:478
+msgid "Center"
+msgstr "Центр"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:357
+#: /home/plyatov/Projects/Programming/kicad-svn/3d-viewer/3d_canvas.cpp:318
+msgid "Zoom +"
+msgstr "Масштаб +"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:358
+#: /home/plyatov/Projects/Programming/kicad-svn/3d-viewer/3d_canvas.cpp:323
+msgid "Zoom -"
+msgstr "Масштаб -"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:362
+msgid "Zoom Select"
+msgstr "Выбор масштаба"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:364
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/plotps.cpp:169
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_modedit.cpp:285
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_pcb.cpp:567
+msgid "Auto"
+msgstr "Авто"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:365
+msgid "Redraw"
+msgstr "Обновить"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:381
+msgid "Grid Select"
+msgstr "Выбор сетки"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:403
+msgid "grid user"
+msgstr "сетка пользователя"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/share/zoom.cpp:445
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/pcbplot.cpp:209
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/xchgmod.cpp:137
+msgid "Close"
+msgstr ""
+
 #: /home/plyatov/Projects/Programming/kicad-svn/3d-viewer/3d_canvas.cpp:329
 msgid "Top View"
 msgstr "Вид сверху"
@@ -2042,8 +2013,8 @@ msgid "Add layer alignment target"
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/tool_gerber.cpp:385
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/schedit.cpp:314
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:503
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/schedit.cpp:314
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/edit.cpp:283
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_modedit.cpp:180
 msgid "Add Text"
@@ -2140,7 +2111,7 @@ msgstr "Да"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/affiche.cpp:49
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:117
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:245
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:246
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/class_text_mod.cpp:383
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/class_pcb_text.cpp:209
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/class_pad.cpp:1104
@@ -2203,7 +2174,7 @@ msgid "????"
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/affiche.cpp:109
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:234
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:235
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/class_text_mod.cpp:369
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/class_text_mod.cpp:373
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/sel_layer.cpp:145
@@ -2279,8 +2250,8 @@ msgid "format 3.4"
 msgstr "формат: 3.4"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/options.cpp:201
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:98
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:251
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:231
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:348
 msgid "Default format"
 msgstr "Формат по умолчанию"
 
@@ -2364,18 +2335,18 @@ msgid "GerbView Layer Colors:"
 msgstr "Цвета слоев Gerbview:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/set_color.cpp:236
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:264
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:278
 msgid "Show All"
 msgstr "Показывать все"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/set_color.cpp:241
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:270
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:269
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:296
 msgid "Show None"
 msgstr "Не показывать все"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/set_color.cpp:257
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.cpp:256
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:285
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:361
 msgid "Apply"
 msgstr ""
 
@@ -2411,7 +2382,7 @@ msgid "Gerber layer "
 msgstr "Слой Gerber "
 
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/select_layers_to_pcb.cpp:237
-#: /home/plyatov/Projects/Programming/kicad-svn/gerbview/select_layers_to_pcb.cpp:326
+#: /home/plyatov/Projects/Programming/kicad-svn/gerbview/select_layers_to_pcb.cpp:327
 msgid "Do not export"
 msgstr "Не экспортировать"
 
@@ -2440,7 +2411,7 @@ msgstr "Файлы схем:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/save_schemas.cpp:94
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netform.cpp:55
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netform.cpp:254
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netform.cpp:243
 msgid "Failed to create file "
 msgstr "Не удалось создать файл "
 
@@ -2930,6 +2901,117 @@ msgstr ""
 msgid "HV orientation for Wires and Bus"
 msgstr ""
 
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:38
+msgid " Part:   "
+msgstr " Элемент: "
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:41
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/viewlibs.cpp:120
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/gendrill.cpp:222
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/gendrill.cpp:230
+msgid "None"
+msgstr "Отсутствует"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:52
+msgid "   Convert"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:53
+msgid "   Normal"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:56
+msgid "  (Power Symbol)"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:90
+msgid "Current Part not saved, continue ?"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:113
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/librairi.cpp:642
+msgid "Component "
+msgstr "Компонент"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:235
+msgid "Modify Library File \""
+msgstr "Изменить файл библиотеки \""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:235
+msgid "\" ?"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:244
+msgid "Error while saving Library File \""
+msgstr "Ошибка записи в файл библиотеки \""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:244
+msgid "\""
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:250
+msgid "Library File \""
+msgstr "Файл библиотеки \""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:252
+msgid "Document File \""
+msgstr "Файл документа \""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:305
+msgid "No Active Library"
+msgstr "Нет активной библиотеки"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:321
+#, c-format
+msgid "Select Component (%d items)"
+msgstr "Выбор компонента (%d позиций)"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:344
+msgid "Component not found"
+msgstr "Компонент не найден"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:348
+msgid "Delete component \""
+msgstr "Удалить компонент \""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:349
+msgid "\" from library \""
+msgstr "\" из библиотеки \""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:373
+msgid "Delete old component?"
+msgstr "Удалить старый компонент?"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:390
+msgid "Component \""
+msgstr "Компонент \""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:391
+msgid "\" exists in library \""
+msgstr "\" уже существует в библиотеке \""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:391
+msgid "\"."
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:558
+msgid "No component to Save."
+msgstr "Нет компонента для сохранения."
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:565
+msgid "No Library specified."
+msgstr "Не указана библиотека."
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:576
+#, c-format
+msgid "Component \"%s\" exists. Change it?"
+msgstr "Компонент\"%s\" существует. Изменить его?"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:615
+#, c-format
+msgid "Component %s saved in %s"
+msgstr "Компонент %s сохранен в %s"
+
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/symbtext.cpp:130
 msgid " Text : "
 msgstr "Текст : "
@@ -2956,7 +3038,7 @@ msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/symbtext.cpp:167
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:502
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:218
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:215
 msgid "Vertical"
 msgstr ""
 
@@ -3147,8 +3229,8 @@ msgid " is NOT EESchema file"
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/lib_export.cpp:39
-msgid "Import part:"
-msgstr "Импорт элемента:"
+msgid "Import component:"
+msgstr "Импорт компонента:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/lib_export.cpp:71
 msgid "File is empty"
@@ -3163,8 +3245,8 @@ msgid "New Library"
 msgstr "Новая библиотека"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/lib_export.cpp:101
-msgid "Export part:"
-msgstr "Экспорт элемента:"
+msgid "Export component:"
+msgstr "Экспорт компонента:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/lib_export.cpp:135
 msgid "0k"
@@ -3172,11 +3254,11 @@ msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/lib_export.cpp:137
 msgid ""
-"Note: this new library will be available only if it is loaded by eeschema\n"
-"Modify eeschema config if you want use it"
+"Note: this new library will be available only if it is loaded by eeschema.\n"
+"Modify eeschema config if you want use it."
 msgstr ""
-"Заметка: эта новая библиотека будет доступна только если она загружена в eeschema\n"
-".Измените настройки eeschema если вы хотите использовать ее."
+"Заметка: эта новая библиотека будет доступна только если она загружена в eeschema.\n"
+"Измените настройки eeschema если вы хотите использовать эту библиотеку."
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/lib_export.cpp:139
 msgid "Error while create "
@@ -3230,9 +3312,9 @@ msgstr "Размер сетки"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_options.cpp:229
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/onrightclick.cpp:305
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:182
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:242
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:288
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:180
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:243
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:289
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/pcbtexte.cpp:176
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/muonde.cpp:360
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/cotation.cpp:113
@@ -3365,60 +3447,49 @@ msgid "Footprint"
 msgstr "Псадочное место"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:304
-#, fuzzy
 msgid "Field 1"
-msgstr "Поле"
+msgstr "Поле 1"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:308
-#, fuzzy
 msgid "Field 2"
-msgstr "Поле"
+msgstr "Поле 2"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:312
-#, fuzzy
 msgid "Field 3"
-msgstr "Поле"
+msgstr "Поле 3"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:316
-#, fuzzy
 msgid "Field 4"
-msgstr "Поле"
+msgstr "Поле 4"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:320
-#, fuzzy
 msgid "Field 5"
-msgstr "Поле"
+msgstr "Поле 5"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:324
-#, fuzzy
 msgid "Field 6"
-msgstr "Поле"
+msgstr "Поле 6"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:328
-#, fuzzy
 msgid "Field 7"
-msgstr "Поле"
+msgstr "Поле 7"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:332
-#, fuzzy
 msgid "Field 8"
-msgstr "Поле"
+msgstr "Поле 8"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:338
-#, fuzzy
 msgid "Create &List"
-msgstr "&Créer Liste"
+msgstr "Создать список"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:560
-#, fuzzy
 msgid "Bill of material:"
-msgstr "Liste du Matériel"
+msgstr "Перечень материалов:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:610
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:666
-#, fuzzy
 msgid "Failed to open file "
-msgstr "Erreur ouverture "
+msgstr "Не удалось открыть файл "
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:738
 #, c-format
@@ -3428,23 +3499,18 @@ msgid ""
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:749
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "#Glob labels ( order = Alphab. ) count = %d\n"
 "\n"
 msgstr ""
-"\n"
-"#Glob labels ( ordre = Numéro de feuiller )\n"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:756
-#, fuzzy
 msgid ""
 "\n"
 "#End List\n"
 msgstr ""
-"\n"
-"#End List\n"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1126
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/component_class.cpp:58
@@ -3455,80 +3521,67 @@ msgstr ""
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/component_class.cpp:63
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/component_class.cpp:64
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/component_class.cpp:65
-#, fuzzy
 msgid "Field"
 msgstr "Поле"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1134
-#, fuzzy
 msgid ""
 "\n"
 "#Cmp ( order = Reference )"
 msgstr ""
-"\n"
-"#Cmp ( ordre = Reference )"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1137
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1217
-#, fuzzy
 msgid " (with SubCmp)"
-msgstr "Заменить с %s: %s"
+msgstr " (с СубКомп)"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1197
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1258
-#, fuzzy
 msgid "#End Cmp\n"
-msgstr "#End Cmp\n"
+msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1214
-#, fuzzy
 msgid ""
 "\n"
 "#Cmp ( order = Value )"
 msgstr ""
 "\n"
-"#Cmp ( ordre = Valeur )"
+"#Cmp ( порядок = Значение )"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1283
-#, fuzzy, c-format
+#, c-format
 msgid "> %-28.28s Global        (Sheet %.2d) pos: %3.3f, %3.3f\n"
-msgstr "> %-28.28s Global        (feuille %.2d) pos: %3.3f, %3.3f\n"
+msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1302
-#, fuzzy, c-format
+#, c-format
 msgid "> %-28.28s Sheet %-7.7s (Sheet %.2d) pos: %3.3f, %3.3f\n"
-msgstr "> %-28.28s Sheet %-7.7s (feuille %.2d) pos: %3.3f, %3.3f\n"
+msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_build_BOM.cpp:1316
-#, fuzzy
 msgid "#End labels\n"
-msgstr "#End labels\n"
+msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_label.cpp:49
-#, fuzzy
 msgid "Empty Text!"
-msgstr "Пустой текстовый слой"
+msgstr "Нет Текста!"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:171
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:202
-#, fuzzy
 msgid "Erc File Report:"
-msgstr "Fichier rapport d'erreurs:"
+msgstr "Файл отчета ERC:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:176
-#, fuzzy
 msgid "-> Total Errors:  "
-msgstr "-> Total Erreurs:  "
+msgstr "-> Всего ошибок:  "
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:179
-#, fuzzy
 msgid "-> Last Warnings: "
-msgstr "-> Dern. Warnings: "
+msgstr "-> Последних предупреждений: "
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:183
-#, fuzzy
 msgid "-> Last Errors:   "
-msgstr "-> Dern. Erreurs:   "
+msgstr "-> Последних ошибок:   "
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:189
 msgid "0000"
@@ -3536,47 +3589,36 @@ msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:192
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:196
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:172
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:171
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/clean.cpp:462
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_pad_edit.cpp:186
-#, fuzzy
 msgid "0"
-msgstr "0"
+msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:205
-#, fuzzy
 msgid "Write erc report"
-msgstr "Rapport d'erreur"
+msgstr "Записать отчет ERC"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:211
-#, fuzzy
 msgid "&Test Erc"
-msgstr "&Test Erc"
+msgstr "&Тест ERC"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:215
-#, fuzzy
 msgid "&Del Markers"
-msgstr "&Effacer Marqueurs"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:218
-#, fuzzy
-msgid "&Quit"
-msgstr "&Выход"
+msgstr "У&далить маркеры"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:222
-#, fuzzy
 msgid "erc"
-msgstr "Erc"
+msgstr "ERC"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:228
-#, fuzzy
 msgid "Reset"
-msgstr "Défaut"
+msgstr "Сброс"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.cpp:237
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_lib.cpp:166
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:176
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:204
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:201
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_drc.cpp:141
 msgid "Options"
 msgstr "Параметры"
@@ -3586,136 +3628,90 @@ msgid "Sheetname:"
 msgstr "Имя листа:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheet.cpp:284
-#, fuzzy
 msgid "No Filename! Aborted"
-msgstr "Pas de Nom de Fichier! Abandon"
+msgstr "Нет имени файла! Отменено"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheet.cpp:297
-#, fuzzy, c-format
+#, c-format
 msgid "A file named %s exists, load it ?"
-msgstr "Файл существует, но не может быть перезаписан."
+msgstr "Файл с именем %s существует. Загрузить его?"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/sheet.cpp:564
 msgid "Ok to cleanup this sheet"
 msgstr "Ok для очистки этого листа"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:38
-#, fuzzy
-msgid " Part:   "
-msgstr "Composant   "
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:41
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/viewlibs.cpp:120
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/gendrill.cpp:222
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/gendrill.cpp:230
-#, fuzzy
-msgid "None"
-msgstr "Aucun"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:52
-#, fuzzy
-msgid "   Convert"
-msgstr "  Convert"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:53
-#, fuzzy
-msgid "   Normal"
-msgstr "  Normal"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:56
-#, fuzzy
-msgid "  (Power Symbol)"
-msgstr "  (Symbole Alimentation)"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:90
-msgid "Current Part not saved, continue ?"
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:105
+msgid ""
+"Component was modified!\n"
+"Discard changes?"
 msgstr ""
+"Компонент был изменен!\n"
+"Игнорировать изменения?"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:113
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:390
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/librairi.cpp:642
-#, fuzzy
-msgid "Component "
-msgstr "Composant"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:235
-#, fuzzy
-msgid "Ok to modify Library File "
-msgstr "Fichier %s existant, OK pour remplacer ?"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:244
-#, fuzzy
-msgid "Error while saving Library File "
-msgstr "Ошибка записи в файл \"%s\"."
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:250
-#, fuzzy
-msgid "Library File "
-msgstr "N'est pas un fichier Librairie"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:252
-#, fuzzy
-msgid "Document File "
-msgstr "Sauver fichier <%s>"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:305
-#, fuzzy
-msgid "No Active Library"
-msgstr "Pas de Librairie Active"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:321
-#, fuzzy, c-format
-msgid "Select Component (%d items)"
-msgstr "Selection composant (%d items)"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:344
-#, fuzzy
-msgid "Component not found"
-msgstr " fichier %s non trouvé"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:348
-#, fuzzy
-msgid "Delete component "
-msgstr "Supprime Composant"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:349
-#, fuzzy
-msgid " in library "
-msgstr " en librairie"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:373
-#, fuzzy
-msgid "Delete old component ?"
-msgstr "Удалить старые комментарии"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:391
-#, fuzzy
-msgid " exists in library "
-msgstr "Librairie déjà en usage"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:558
-msgid "Warning: No component to Save"
-msgstr "Внимание: Нет компонента для сохранения"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:565
-#, fuzzy
-msgid "No Library specified"
-msgstr "Не указано синтаксиса"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:576
-#, fuzzy, c-format
-msgid "Component %s exists, Change it ?"
-msgstr "Le composant %s existe, Le changer ?"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libedit.cpp:615
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:118
 #, c-format
-msgid "Component %s saved in %s"
-msgstr "Компонент %s сохранен в %s"
+msgid ""
+"Library \"%s\" was modified!\n"
+"Discard changes?"
+msgstr ""
+"Библиотека была изменена!\n"
+"Игнорировать изменения?"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:344
+msgid "Include last component changes"
+msgstr "Включая последние изменения компонента"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:407
+msgid " Pins Test OK!"
+msgstr " Тест выводов OK!"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:481
+msgid "Add Pin"
+msgstr "Добавить вывод\""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:485
+msgid "Set Pin Options"
+msgstr "Установка параметров вывода"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:507
+msgid "Add Rectangle"
+msgstr "Добавить прямоугольник"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:511
+msgid "Add Circle"
+msgstr "Добавить окружность"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:515
+msgid "Add Arc"
+msgstr "Добавить дугу"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:519
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/muwave_command.cpp:52
+msgid "Add Line"
+msgstr "Добавить линию"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:523
+msgid "Anchor"
+msgstr "Якорь"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:527
+msgid "Import"
+msgstr "Импорт"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:533
+msgid "Export"
+msgstr "Экспорт"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:579
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/schedit.cpp:454
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/edit.cpp:461
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit.cpp:426
+msgid "Delete item"
+msgstr "Удалить элемент"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/schedit.cpp:282
-#, fuzzy
 msgid "Push/Pop Hierarchy"
-msgstr "Navigation dans la hierarchie"
+msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/schedit.cpp:286
 #, fuzzy
@@ -3790,14 +3786,6 @@ msgstr "Déplace Composant \t(M)"
 msgid "Add Power"
 msgstr "Power In"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/schedit.cpp:454
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:579
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/edit.cpp:461
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit.cpp:426
-#, fuzzy
-msgid "Delete item"
-msgstr "Effacements d'éléments"
-
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit.cpp:22
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:317
 #, fuzzy
@@ -3865,6 +3853,136 @@ msgstr "  Convert"
 msgid "  Normal"
 msgstr "  Normal"
 
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:48
+#, fuzzy
+msgid "deselect current tool"
+msgstr "Активировать инструмент Винт (крутить по спирали)"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:54
+#, fuzzy
+msgid "Add Pins"
+msgstr "Addition de \"pins\""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:58
+#, fuzzy
+msgid "Add graphic text"
+msgstr "Addition de textes graphiques (commentaires)"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:62
+#, fuzzy
+msgid "Add rectangles"
+msgstr "Addition de rectangles"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:66
+#, fuzzy
+msgid "Add circles"
+msgstr "Addition de cercles"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:70
+#, fuzzy
+msgid "Add arcs"
+msgstr "Addition d'arc"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:74
+#, fuzzy
+msgid "Add lines and polygons"
+msgstr "Addition de lignes ou polygones graphiques"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:79
+#, fuzzy
+msgid "Move part anchor"
+msgstr "Positionner l'ancre du composant"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:84
+#, fuzzy
+msgid "Import existing drawings"
+msgstr "Importer des dessins existants"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:88
+#, fuzzy
+msgid "Export current drawing"
+msgstr "Exporter le dessin en cours"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:120
+msgid "Save current loaded library on disk (file update)"
+msgstr "Сохранить на диск текущую загруженную библиотеку (обновление файла)"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:123
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_modedit.cpp:53
+#, fuzzy
+msgid "Select working library"
+msgstr "Sélection de la librairie de travail"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:126
+#, fuzzy
+msgid "Delete component in current library"
+msgstr "Effacer composant en librairie de travail"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:130
+#, fuzzy
+msgid "New component"
+msgstr "Pas de composants"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:133
+#, fuzzy
+msgid "Select component to edit"
+msgstr "Sélectionner le composant a éditer"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:137
+#, fuzzy
+msgid "Save current component into current loaded library (in memory)"
+msgstr "Сохранить текущий компонент в текущей загруженной библиотеке (в память)"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:140
+#, fuzzy
+msgid "import component"
+msgstr "Pas de composants"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:143
+#, fuzzy
+msgid "export component"
+msgstr "Pas de composants"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:147
+msgid "Create a new library an save current component into"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:160
+#, fuzzy
+msgid "Edit component properties"
+msgstr "Propriétés des Mires"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:167
+#, fuzzy
+msgid "Test duplicate pins"
+msgstr "Test duplicate pins"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:189
+#, fuzzy
+msgid "show as \"De Morgan\" normal part"
+msgstr "Afficher sous représentation normale"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:195
+#, fuzzy
+msgid "show as \"De Morgan\" convert part"
+msgstr "Afficher sous présentation \" De Morgan\""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:204
+#, fuzzy
+msgid "Documents"
+msgstr "Документы"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:221
+#, fuzzy
+msgid "Edit pins part per part (Carefully use!)"
+msgstr "Editer pins unité par unité (Utiliser en connaissance de cause)"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:241
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_viewlib.cpp:131
+#, fuzzy, c-format
+msgid "Part %c"
+msgstr "Composant %c"
+
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eeschema.cpp:57
 msgid "Eeschema is already running, Continue?"
 msgstr "Eeschema уже запущена. Продолжить?"
@@ -3909,12 +4027,6 @@ msgstr "Документы/Простой текст"
 msgid "Export to schematic"
 msgstr "Экспортировать в .anyone"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_viewlib.cpp:131
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:241
-#, fuzzy, c-format
-msgid "Part %c"
-msgstr "Composant %c"
-
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_schematic.cpp:195
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:554
 #, fuzzy
@@ -4033,7 +4145,7 @@ msgid "Rotate Field"
 msgstr "Повернуть поле"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/onrightclick.cpp:268
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:221
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:222
 msgid "Edit Field"
 msgstr "Правка поля"
 
@@ -4052,12 +4164,12 @@ msgid "Rotate +"
 msgstr "Вращать +"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/onrightclick.cpp:300
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:661
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:665
 msgid "Rotate -"
 msgstr "Вращать -"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/onrightclick.cpp:301
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:183
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:181
 #, fuzzy
 msgid "Mirror --"
 msgstr "Miroir--"
@@ -4073,14 +4185,14 @@ msgstr "Ориент. компонента"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/onrightclick.cpp:312
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit_onclick.cpp:317
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:666
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:700
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:797
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:670
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:704
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:801
 msgid "Edit"
 msgstr "Правка"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/onrightclick.cpp:320
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:193
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:190
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:182
 msgid "Convert"
 msgstr ""
@@ -4109,7 +4221,7 @@ msgstr "Удалить компонент"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/onrightclick.cpp:348
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_lib.cpp:203
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:192
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:193
 msgid "Doc"
 msgstr ""
 
@@ -4310,130 +4422,6 @@ msgstr ""
 "\n"
 "***** feuille %d (%s)\n"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:48
-#, fuzzy
-msgid "deselect current tool"
-msgstr "Активировать инструмент Винт (крутить по спирали)"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:54
-#, fuzzy
-msgid "Add Pins"
-msgstr "Addition de \"pins\""
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:58
-#, fuzzy
-msgid "Add graphic text"
-msgstr "Addition de textes graphiques (commentaires)"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:62
-#, fuzzy
-msgid "Add rectangles"
-msgstr "Addition de rectangles"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:66
-#, fuzzy
-msgid "Add circles"
-msgstr "Addition de cercles"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:70
-#, fuzzy
-msgid "Add arcs"
-msgstr "Addition d'arc"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:74
-#, fuzzy
-msgid "Add lines and polygons"
-msgstr "Addition de lignes ou polygones graphiques"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:79
-#, fuzzy
-msgid "Move part anchor"
-msgstr "Positionner l'ancre du composant"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:84
-#, fuzzy
-msgid "Import existing drawings"
-msgstr "Importer des dessins existants"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:88
-#, fuzzy
-msgid "Export current drawing"
-msgstr "Exporter le dessin en cours"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:120
-msgid "Save current loaded library on disk (file update)"
-msgstr "Сохранить на диск текущую загруженную библиотеку (обновление файла)"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:123
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_modedit.cpp:53
-#, fuzzy
-msgid "Select working library"
-msgstr "Sélection de la librairie de travail"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:126
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_modedit.cpp:65
-#, fuzzy
-msgid "Delete part in current library"
-msgstr "Effacer composant en librairie de travail"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:130
-#, fuzzy
-msgid "New part"
-msgstr "Nouveau composant"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:133
-#, fuzzy
-msgid "Select part to edit"
-msgstr "Sélectionner le composant a éditer"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:137
-msgid "Save current part into current loaded library (in memory)"
-msgstr "Сохранить текущий компонент в текущей загруженной библиотеке (в память)"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:140
-#, fuzzy
-msgid "import part"
-msgstr "Importer un composant"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:143
-#, fuzzy
-msgid "export part"
-msgstr "Exporter un composant"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:147
-msgid "Create a new library an save current part into"
-msgstr ""
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:160
-#, fuzzy
-msgid "Edit Part Properties"
-msgstr "Editer les propriétés du composant"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:167
-#, fuzzy
-msgid "Test duplicate pins"
-msgstr "Test duplicate pins"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:189
-#, fuzzy
-msgid "show as \"De Morgan\" normal part"
-msgstr "Afficher sous représentation normale"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:195
-#, fuzzy
-msgid "show as \"De Morgan\" convert part"
-msgstr "Afficher sous présentation \" De Morgan\""
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:204
-#, fuzzy
-msgid "Documents"
-msgstr "Документы"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/tool_lib.cpp:221
-#, fuzzy
-msgid "Edit pins part per part (Carefully use!)"
-msgstr "Editer pins unité par unité (Utiliser en connaissance de cause)"
-
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libarch.cpp:80
 #, fuzzy
 msgid "Failed to create archive lib file "
@@ -4451,8 +4439,8 @@ msgstr " Général : "
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_lib.cpp:144
 #, fuzzy
-msgid "Number of Units:"
-msgstr "Nombre de parts:"
+msgid "Number of Parts:"
+msgstr "Кол-во слоев:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_lib.cpp:152
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:259
@@ -4468,7 +4456,7 @@ msgstr "Symbole Alimentation"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_lib.cpp:162
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:188
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:190
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:187
 #, fuzzy
 msgid "Parts are locked"
 msgstr "Piste verrouillée: Oui"
@@ -4503,93 +4491,93 @@ msgstr "Examen Fichiers de Doc"
 msgid "Alias"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:70
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:68
 #, fuzzy
 msgid "Global Label properties"
 msgstr "Propriétés du Label Global"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:74
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:72
 #, fuzzy
 msgid "Label properties"
 msgstr "Propriétés du label"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:78
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:76
 #, fuzzy
 msgid "Text properties"
 msgstr "Propriétés du texte"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:134
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:132
 #, fuzzy
 msgid "Text "
 msgstr "Texte"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:144
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:142
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:111
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:288
 #, fuzzy
 msgid "Right"
 msgstr "Droite"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:145
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:143
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:102
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:290
 #, fuzzy
 msgid "Up"
 msgstr "Haut"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:146
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:144
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:108
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:289
 #, fuzzy
 msgid "Left"
 msgstr "Gauche"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:147
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:145
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/affiche.cpp:105
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:291
 #, fuzzy
 msgid "Down"
 msgstr "Bas"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:149
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:146
 #, fuzzy
 msgid "Text Orient:"
 msgstr "Orient:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:155
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:153
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:331
 #, fuzzy
 msgid "Input"
 msgstr "Entrée"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:156
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:154
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:332
 #, fuzzy
 msgid "Output"
 msgstr "Sortie"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:157
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:155
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:333
 #, fuzzy
 msgid "Bidi"
 msgstr "Bidi"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:158
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:156
 msgid "TriState"
 msgstr "ТриСостояния"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:159
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:157
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/pinedit-dialog.cpp:335
 #, fuzzy
 msgid "Passive"
 msgstr "Passive"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:161
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:158
 #, fuzzy
 msgid "Glabel Shape:"
 msgstr "Forme GLabel:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:168
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.cpp:166
 #, fuzzy
 msgid "Size "
 msgstr "Taille "
@@ -4730,19 +4718,18 @@ msgstr "25%"
 msgid "&26"
 msgstr "Imigre-26..."
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:238
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:237
 #, fuzzy
-msgid "Parts per package"
-msgstr "Установить пакет cdrdao."
+msgid "Parts per component"
+msgstr "все компоненты"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:243
 msgid "Draw options"
 msgstr "Параметры черчения"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:247
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:407
 #, fuzzy
-msgid "Show Pin Num"
+msgid "Show Pin Number"
 msgstr "Montre Numéro de Pin"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.cpp:251
@@ -4761,43 +4748,43 @@ msgstr "Nom de pin a l'intérieur"
 msgid "You must provide a name for this component"
 msgstr "Вы должны указать имя этому компоненту"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:181
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:182
 msgid "Previous Annotation will be deleted. Continue ?"
 msgstr "Предыдущее аннотирование будет удалено. Продолжить?"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:688
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:689
 #, fuzzy, c-format
 msgid "item not annotated: %s%s"
 msgstr "item non numéroté: %s%s"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:692
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:693
 #, fuzzy, c-format
 msgid "( unit %d)"
 msgstr "Unité %d"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:708
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:709
 #, fuzzy, c-format
 msgid "Error item %s%s"
 msgstr "Erreur item %s%s"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:710
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:711
 #, fuzzy, c-format
 msgid " unit %d and no more than %d parts"
 msgstr " unité %d et plus que %d parts"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:742
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:765
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:743
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:766
 #, fuzzy, c-format
 msgid "Multiple item %s%s"
 msgstr "Multipleélément %s%s"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:747
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:769
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:748
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:770
 #, fuzzy, c-format
 msgid " (unit %d)"
 msgstr "Unité %d"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:785
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/annotate.cpp:786
 #, fuzzy, c-format
 msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)"
 msgstr "Valeurs différentes pour %s%d%c (%s) et %s%d%c (%s)"
@@ -4876,161 +4863,176 @@ msgstr "Tri"
 msgid "Bad Bus Label: "
 msgstr "Addition de labels sur fils ou bus"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:168
-#, fuzzy
-msgid "PcbNew"
-msgstr "Quitter Pcbnew"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:169
-msgid "&OrcadPcb2"
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:163
+msgid "save current configuration setting in the local .pro file"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:170
-msgid "&CadStar"
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:191
+#, fuzzy
+msgid "Remove"
+msgstr "Переместить"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:193
+#, fuzzy
+msgid "Unload the selected library"
+msgstr "Ножка не выбрана"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:199
+msgid "Add a new library after the selected library, add load it"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:171
-msgid "&Spice"
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:204
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:206
+msgid "Add a new library beforer the selected library, add load it"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:172
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.h:271
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:221
 #, fuzzy
-msgid "Other"
-msgstr "Прочее"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:219
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:174
-#, fuzzy
-msgid "Library files path:"
+msgid "Default library file path:"
 msgstr "Chemin Fichiers Librairies:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:227
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:394
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:228
+msgid ""
+"Default path to search libraries which have no absolute path in name,\n"
+"or a name which does not start by ./ or ../\n"
+"If void, the default path is kicad/library"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:231
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:395
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_drc.cpp:208
 #, fuzzy
 msgid "Browse"
 msgstr "Examiner"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:232
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:150
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:236
 #, fuzzy
 msgid "Cmp file Ext: "
 msgstr "Ext fichier Cmp: "
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:236
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:154
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:240
 #, fuzzy
 msgid "Net file Ext: "
 msgstr "Ext fichier Netliste: "
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:240
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:158
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:244
 #, fuzzy
 msgid "Library file Ext: "
 msgstr "Ext fichier Librairie: "
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:244
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:162
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:248
 #, fuzzy
 msgid "Symbol file Ext: "
 msgstr "Ext fichier Symbole: "
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:248
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:166
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:252
 #, fuzzy
 msgid "Schematic file Ext: "
 msgstr "Ext fichier Schema: "
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:350
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:249
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:367
 #, fuzzy
 msgid "Library files:"
 msgstr "Fichiers Librairies:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:373
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eestatus.cpp:272
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:390
 msgid "Library already in use"
 msgstr "Библиотека уже используется"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:473
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.cpp:463
 #, fuzzy
 msgid " Default Path for libraries"
 msgstr "Исходный путь для окна выбора файла."
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:112
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:244
 #, fuzzy
 msgid "&Browse Plugin"
 msgstr "Загрузить Плагин"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:117
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:246
 #, fuzzy
 msgid "&Netlist"
 msgstr "&Netliste"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:181
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:261
+msgid "&Ok"
+msgstr ""
+
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:266
 #, fuzzy
+msgid "&Delete"
+msgstr "Effacer"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:275
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:367
+#, fuzzy
 msgid "Netlist"
 msgstr "Netliste"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:255
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:352
 #, fuzzy
 msgid "Use Net Names"
 msgstr "Utiliser nom de net"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:255
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:352
 #, fuzzy
 msgid "Use Net Numbers"
 msgstr "Utiliser numéro de net"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:256
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:353
 msgid "Netlist Options:"
 msgstr "Параметры списка цепей:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:263
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:362
 #, fuzzy
 msgid "Simulator command:"
 msgstr "Simulateur commande:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:270
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:371
 #, fuzzy
 msgid "&Run Simulator"
 msgstr "&Simulateur"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:302
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:407
 #, fuzzy
 msgid "Add Plugin"
 msgstr "Добавить дополнение"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:314
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:422
 #, fuzzy
 msgid "Netlist command:"
 msgstr "Simulateur commande:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:333
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:446
 #, fuzzy
 msgid "Plugin files:"
 msgstr "Fichiers C.I.:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:353
-msgid ""
-"Now, you must choose a title for this netlist control page\n"
-"and close the dialog box"
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:470
+#, fuzzy
+msgid "Do not forget to choose a title for this netlist control page"
 msgstr ""
 "Сейчас, вы должны выбрать заголовок для этой страницы списка цепей\n"
 "и закрыть диалоговое окно"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:432
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:562
 #, fuzzy
 msgid "Netlist files:"
 msgstr "Fichiers Netlist:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:448
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:579
 #, fuzzy
 msgid "Must be Annotated, Continue ?"
 msgstr "Annotation nécessaire, continuer?"
 
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:737
+msgid "Error. You must provide a command String"
+msgstr ""
+
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/netlist_control.cpp:742
+msgid "Error. You must provide a Title"
+msgstr ""
+
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:168
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_lib.h:43
 #, fuzzy
@@ -5050,9 +5052,9 @@ msgstr "(alias de "
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:239
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:320
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_netlist.cpp:141
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:597
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:704
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:801
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:598
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:708
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:805
 #, fuzzy
 msgid "Delete"
 msgstr "Effacer"
@@ -5072,6 +5074,11 @@ msgstr "Filtre Piste"
 msgid "Footprints"
 msgstr "Посадочные места"
 
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:407
+#, fuzzy
+msgid "Show Pin Num"
+msgstr "Montre Numéro de Pin"
+
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:476
 #, fuzzy
 msgid "Left justify"
@@ -5093,14 +5100,14 @@ msgid "Top justify"
 msgstr "Justifié en haut"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:484
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:228
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:225
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.h:164
 #, fuzzy
 msgid "Fields"
 msgstr "Поля"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/edit_component_in_lib.cpp:497
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:214
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:211
 #, fuzzy
 msgid "Show Text"
 msgstr "Texte visible"
@@ -5355,49 +5362,49 @@ msgstr "Обычный X.25"
 msgid "Unit 26"
 msgstr "Imigre-26..."
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:163
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:162
 #, fuzzy
 msgid "Unit:"
 msgstr "Unité:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:173
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:172
 #, fuzzy
 msgid "+90"
 msgstr "90%"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:174
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:173
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_pad_edit.cpp:189
 #, fuzzy
 msgid "180"
 msgstr "Rot 180"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:175
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:174
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_pad_edit.cpp:188
 #, fuzzy
 msgid "-90"
 msgstr "90%"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:177
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:175
 #, fuzzy
 msgid "Orient:"
 msgstr "Orient:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:184
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:182
 #, fuzzy
 msgid "Mirror !"
 msgstr "Miroir"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:186
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:183
 #, fuzzy
 msgid "Mirror:"
 msgstr "Miroir:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:197
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:194
 #, fuzzy
 msgid "Chip Name:"
 msgstr "Nom en librairie"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:239
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_component_in_schematic.cpp:236
 #, fuzzy
 msgid "Defaults"
 msgstr "Defauts"
@@ -5567,72 +5574,6 @@ msgstr "Incapable de créer <%s>"
 msgid "Save Symbol in [%s]"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:105
-#, fuzzy
-msgid "LibEdit: Part modified!, Continue ?"
-msgstr "LibEdit: composant modifié,  Continuer ?"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:118
-#, fuzzy, c-format
-msgid "Library %s modified!, Continue ?"
-msgstr "Librairie %s modifiée!, Continuer ?"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:344
-#, fuzzy
-msgid "Include last component changes"
-msgstr "Последняя попытка включения была '%s',\n"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:407
-#, fuzzy
-msgid " Tst Pins OK!"
-msgstr " Test Pins OK!"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:481
-#, fuzzy
-msgid "Add Pin"
-msgstr "Addition de \"pins\""
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:485
-#, fuzzy
-msgid "Set Pin Opt"
-msgstr "Choix Options des pins"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:507
-#, fuzzy
-msgid "Add Rectangle"
-msgstr "Addition de rectangles"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:511
-#, fuzzy
-msgid "Add Circle"
-msgstr "Addition de cercle"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:515
-#, fuzzy
-msgid "Add Arc"
-msgstr "Addition d' arc"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:519
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/muwave_command.cpp:52
-#, fuzzy
-msgid "Add Line"
-msgstr "Addition de lignes"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:523
-#, fuzzy
-msgid "Anchor"
-msgstr "Ancre"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:527
-#, fuzzy
-msgid "Import"
-msgstr "Importer"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/libframe.cpp:533
-#, fuzzy
-msgid "Export"
-msgstr "Exporter"
-
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/hierarch.cpp:123
 msgid "Navigator"
 msgstr "Навигатор"
@@ -5788,23 +5729,18 @@ msgstr "Cmp Courant: <%s>"
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_pcb.cpp:585
 #: /home/plyatov/Projects/Programming/kicad-svn/gerbview/set_color.h:246
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.h:209
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:335
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:414
 msgid "Grid"
 msgstr "Сетка"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.cpp:233
 #, fuzzy
-msgid "White Background"
-msgstr "Fond Blanc"
-
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.cpp:234
-#, fuzzy
-msgid "Black Background"
-msgstr "Fond Noir"
+msgid "White"
+msgstr "Каркас"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.cpp:235
 #, fuzzy
-msgid "Background Color"
+msgid "Background Color:"
 msgstr "Couleur du fond"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/symbdraw.cpp:795
@@ -6140,106 +6076,106 @@ msgstr "Заархивировать файлы проекта"
 msgid "Refresh project tree"
 msgstr "Обновить дерево проекта"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:82
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:76
 msgid "&Run"
 msgstr "Запустить"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:83
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:77
 msgid "Run the Python Script"
 msgstr "Выполнить скрипт Python"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:90
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:144
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:84
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:138
 msgid "&Edit in a text editor"
 msgstr "Редактировать в текстовом редакторе"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:91
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:85
 #, fuzzy
 msgid "&Open the file in a Text Editor"
 msgstr "Редактировать скрипт Python в текстовом редакторе"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:105
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:99
 msgid "New D&irectory"
 msgstr "Новая папка"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:106
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:100
 msgid "Create a New Directory"
 msgstr "Создать новую папку"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:112
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:106
 msgid "New P&ython Script"
 msgstr "Новый скрипт Python"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:113
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:107
 msgid "Create a New Python Script"
 msgstr "Создать новый скрипт Python"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:119
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:113
 msgid "New &Text File"
 msgstr "Новый текстовый файл"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:120
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:114
 msgid "Create a New Txt File"
 msgstr "Создать новый текстовый файл"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:125
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:119
 msgid "New &File"
 msgstr "Новый файл"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:125
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:119
 msgid "Create a New File"
 msgstr "Создать новый файл"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:136
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:130
 msgid "&Rename File"
 msgstr "Переименовать файл"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:136
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:130
 msgid "&Rename Directory"
 msgstr "Переименовать папку"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:137
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:131
 msgid "Rename the File"
 msgstr "Переименовать файл"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:137
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:131
 msgid "&Rename the Directory"
 msgstr "Переименовать папку"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:145
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:139
 #, fuzzy
 msgid "Open the file in a Text Editor"
 msgstr "Редактировать скрипт Python в текстовом редакторе"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:151
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:145
 msgid "&Delete File"
 msgstr "Удалить файл"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:151
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:145
 msgid "&Delete Directory"
 msgstr "Удалить папку"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:152
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:146
 msgid "Delete the File"
 msgstr "Удалить файл"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:153
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:147
 msgid "&Delete the Directory and its content"
 msgstr "Удалить папку и все ее содержимое"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:418
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:412
 msgid "Create New File:"
 msgstr "Создать новый файл:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:418
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:412
 msgid "Create New Directory"
 msgstr "Создать новую папку"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:420
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:414
 msgid "noname"
 msgstr "без имени"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:848
+#: /home/plyatov/Projects/Programming/kicad-svn/kicad/treeprj_frame.cpp:842
 msgid "Change File Name: "
 msgstr "Изменить имя файла: "
 
@@ -6578,79 +6514,79 @@ msgstr "Подсветка цепи"
 msgid "Local Ratsnest"
 msgstr "Monter le chevelu général"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:39
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:40
 msgid "Module properties"
 msgstr "Свойства модуля"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:94
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:95
 msgid "Properties"
 msgstr "Свойства"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:98
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:107
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:136
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:99
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:108
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:137
 msgid "3D settings"
 msgstr "Настройки 3D"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:181
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:182
 msgid "Change module(s)"
 msgstr "Изменить модуль(и)"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:185
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:186
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit_onclick.cpp:261
 #, fuzzy
 msgid "Edit Module"
 msgstr "Edit Module"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:199
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:200
 msgid "Keywords"
 msgstr "Ключевые слова"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:206
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:207
 msgid "Fields:"
 msgstr "Поля:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:216
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:217
 msgid "Add Field"
 msgstr "Добавить поле"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:226
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:227
 msgid "Delete Field"
 msgstr "Удалить поле"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:233
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:234
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/exporttogerber.cpp:133
 msgid "Copper"
 msgstr "Медь"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:242
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:243
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_pad_edit.cpp:190
 msgid "User"
 msgstr "Пользователь"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:278
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:279
 msgid "Orient (0.1 deg)"
 msgstr "Ориент (0.1 гр)"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:288
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:289
 #, fuzzy
 msgid "Normal+Insert"
 msgstr "Normal+Insert"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:288
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:289
 msgid "Virtual"
 msgstr "Виртуальный"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:289
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:290
 #, fuzzy
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:292
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:293
 msgid "Use this attribute for most non smd components"
 msgstr "Использовать этот атрибут для большинства SMD компонентов"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:294
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:295
 msgid ""
 "Use this attribute for smd components.\n"
 "Only components with this option are put in the footprint position list file"
@@ -6658,71 +6594,71 @@ msgstr ""
 "Использовать этот атрибут для SMD компонентов.\n"
 "В файл расположений посадочных мест попадут компонеты только с таким параметром"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:296
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:297
 msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)"
 msgstr "Используйте этот атрибут для \"виртуальных\" компонентов отображаемых на плате (таких как старый разъем шины ISA PC)"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:320
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:321
 msgid "Free"
 msgstr "Свободно"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:320
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:321
 msgid "Locked"
 msgstr "Заблокировано"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:322
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:323
 msgid "Move and Auto Place"
 msgstr "Перемещение и Авто Расположение"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:327
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:328
 msgid "Enable hotkey move commands and Auto Placement"
 msgstr "Включить \"горячие\" клавиши команд перемещения и Авто Расположения"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:328
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:329
 msgid "Disable hotkey move commands and Auto Placement"
 msgstr "Отключить \"горячие\" клавиши команд перемещения и Авто Расположения"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:332
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:333
 msgid "Rot 90"
 msgstr "Вращ 90"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:340
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:341
 msgid "Rot 180"
 msgstr "Вращ 180"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:377
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:378
 msgid "3D Shape Name"
 msgstr "Имя 3D образа"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:398
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:399
 msgid "Add 3D Shape"
 msgstr "Добавить 3D образ"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:404
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:405
 msgid "Remove 3D Shape"
 msgstr "Удалить 3D образ:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:410
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:411
 msgid "Shape Scale:"
 msgstr "Масштабирование образа:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:417
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:418
 msgid "Shape Offset:"
 msgstr "Смещение образа:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:426
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:427
 msgid "Shape Rotation:"
 msgstr "Вращение образа"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:466
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:467
 msgid "3D Shape:"
 msgstr "3D образ:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:771
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:772
 msgid "Reference or Value cannot be deleted"
 msgstr "Обозначение или значение не могут быть удалены"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:775
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_edit_module.cpp:776
 #, c-format
 msgid "Delete [%s]"
 msgstr "Удалить [%s]"
@@ -6772,37 +6708,30 @@ msgid "Module count"
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:199
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:169
 msgid "Lib Modules Dir:"
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:216
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:151
 msgid "Board ext: "
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:220
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:155
 msgid "Cmp ext: "
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:224
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:159
 msgid "Lib ext: "
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:228
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:163
 msgid "Net ext: "
 msgstr ""
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:367
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:258
 msgid "library files:"
 msgstr "файлы библиотеки:"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.cpp:390
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:279
 msgid "Library exists! No Change"
 msgstr "Библиотека существует! Не изменено"
 
@@ -7465,6 +7394,11 @@ msgstr ""
 msgid "Create new library and save current module"
 msgstr ""
 
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_modedit.cpp:65
+#, fuzzy
+msgid "Delete part in current library"
+msgstr "Effacer composant en librairie de travail"
+
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_modedit.cpp:70
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/xchgmod.cpp:156
 #, fuzzy
@@ -8125,8 +8059,8 @@ msgid "Delete Block (shift+ctrl + drag mouse)"
 msgstr "Удаление блока (SHIFT+CTRL+протяг. мышью)"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit_onclick.cpp:252
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:698
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:795
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:702
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:799
 msgid "Rotate"
 msgstr "Вращать"
 
@@ -8156,19 +8090,19 @@ msgid "Move Pad"
 msgstr "Déplace Pad"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit_onclick.cpp:274
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:737
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:741
 #, fuzzy
 msgid "Edit Pad"
 msgstr "Edit Pad"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit_onclick.cpp:276
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:741
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:745
 #, fuzzy
 msgid "New Pad Settings"
 msgstr "Nouvelles Caract. Pads"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit_onclick.cpp:278
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:743
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:747
 #, fuzzy
 msgid "Export Pad Settings"
 msgstr "Exporte Caract. Pads"
@@ -8179,7 +8113,7 @@ msgid "delete Pad"
 msgstr "Effacer Pad"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modedit_onclick.cpp:285
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:748
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:752
 #, fuzzy
 msgid "Global Pad Settings"
 msgstr "Edition Globale des pads"
@@ -8485,17 +8419,13 @@ msgstr "Afficher le n° de pad"
 msgid "Show Pad NoConnect"
 msgstr "Montrer non conn"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/reglage.cpp:124
-msgid "Lib Modules:"
-msgstr ""
-
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modules.cpp:81
 #, fuzzy
 msgid "Footprint name:"
 msgstr "Equipot"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/modules.cpp:281
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:672
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:676
 #, fuzzy
 msgid "Delete Module"
 msgstr "Efface Module"
@@ -8976,6 +8906,7 @@ msgid "Drag Via"
 msgstr "Via %.1f"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:515
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:579
 #, fuzzy
 msgid "Edit Via"
 msgstr "Editer TOUTES Vias"
@@ -9054,115 +8985,120 @@ msgstr "Epais. Piste"
 msgid "Edit Segment"
 msgstr "Edit Segment"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:583
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:584
 #, fuzzy
 msgid "Edit Track"
 msgstr "Editer Piste"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:585
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:586
 #, fuzzy
 msgid "Edit Net"
 msgstr "Edit Net"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:587
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:588
 #, fuzzy
 msgid "Edit ALL Tracks and Vias"
 msgstr "Editer TOUTES Pistes et Vias"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:589
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:590
 #, fuzzy
 msgid "Edit ALL Vias (no track)"
 msgstr "Editer TOUTES Vias (pas les pistes)"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:591
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:592
 #, fuzzy
 msgid "Edit ALL Tracks (no via)"
 msgstr "Editer TOUTES Pistes (pas les vias)"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:598
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:600
+#, fuzzy
+msgid "Delete Via"
+msgstr "Effacements d'éléments"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:600
 #, fuzzy
 msgid "Delete Segment"
 msgstr "Удалить лист"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:603
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:607
 #, fuzzy
 msgid "Delete Track"
 msgstr "Effacer Pistes"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:607
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:611
 #, fuzzy
 msgid "Delete Net"
 msgstr "Effacer Net"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:612
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:616
 #, fuzzy
 msgid "Set Flags"
 msgstr "Ajust. Flags"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:613
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:617
 #, fuzzy
 msgid "Locked: Yes"
 msgstr "Verrou: Oui"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:614
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:618
 #, fuzzy
 msgid "Locked: No"
 msgstr "Verrou: Non"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:624
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:628
 #, fuzzy
 msgid "Track Locked: Yes"
 msgstr "Piste verrouillée: Oui"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:625
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:629
 #, fuzzy
 msgid "Track Locked: No"
 msgstr "Piste verrouillée: Non"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:627
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:631
 #, fuzzy
 msgid "Net Locked: Yes"
 msgstr "Net verrouillé: Oui"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:628
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:632
 #, fuzzy
 msgid "Net Locked: No"
 msgstr "Net verrouillé: Non"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:650
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:695
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:733
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:792
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:654
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:699
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:737
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:796
 #, fuzzy
 msgid "Move"
 msgstr "Переместить"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:653
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:735
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:657
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:739
 #, fuzzy
 msgid "Drag"
 msgstr "Drag Module  (G)"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:657
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:661
 msgid "Rotate  +"
 msgstr "Вращать +"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:662
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:666
 #, fuzzy
 msgid "Flip"
 msgstr "Переворот"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:752
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:756
 #, fuzzy
 msgid "delete"
 msgstr "удалить"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:759
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:763
 #, fuzzy
 msgid "Autoroute Pad"
 msgstr "Autoroute Pad"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:760
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/onrightclick.cpp:764
 #, fuzzy
 msgid "Autoroute Net"
 msgstr "Autoroute Net"
@@ -9609,7 +9545,7 @@ msgstr "Ne pas monter Zones"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/pcbframe.cpp:412
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/tool_pcb.cpp:361
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:344
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:423
 msgid "Show Zones"
 msgstr "Показать зоны"
 
@@ -10208,9 +10144,15 @@ msgstr "Черновой слой"
 msgid "Abort routing?"
 msgstr "Прервать разводку?"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:149
-msgid "Colors:"
-msgstr "Цвета:"
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:290
+#, fuzzy
+msgid "Switch on all of the copper layers"
+msgstr "Медный слой"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.cpp:299
+#, fuzzy
+msgid "Switch off all of the copper layers"
+msgstr "Медный слой"
 
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/xchgmod.cpp:80
 msgid "Exchange Modules"
@@ -10281,13 +10223,13 @@ msgstr ""
 msgid "Swap Layers:"
 msgstr "Обменять слои:"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:186
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:191
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:273
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:187
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:192
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:275
 msgid "No Change"
 msgstr "Нет изменений"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:264
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/swap_layers.cpp:265
 msgid "Deselect this layer to select the No Change state"
 msgstr ""
 
@@ -10534,16 +10476,15 @@ msgstr "Внутренний L7 "
 msgid "Inner 8"
 msgstr "Внутренний L8"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/common/svg_print.h:52
-#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.h:50
-msgid "Create SVG file"
-msgstr "Создать SVG файл"
-
 #: /home/plyatov/Projects/Programming/kicad-svn/cvpcb/dialog_cvpcb_config.h:50
 #, fuzzy
 msgid "Cvpcb Configuration"
 msgstr "Конфигурация"
 
+#: /home/plyatov/Projects/Programming/kicad-svn/share/svg_print.h:50
+msgid "Create SVG file"
+msgstr "Создать SVG файл"
+
 #: /home/plyatov/Projects/Programming/kicad-svn/share/dialog_print.h:51
 msgid "Print"
 msgstr "Печать"
@@ -10713,7 +10654,7 @@ msgstr "EESchema печать PS"
 msgid "List of Material"
 msgstr "Liste du Matériel"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.h:45
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_create_component.h:55
 msgid "Component Creation"
 msgstr "Создание компонента"
 
@@ -10735,7 +10676,7 @@ msgstr "Общие параметры"
 msgid "EESchema Plot HPGL"
 msgstr "EESchema печать HPGL"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.h:40
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_edit_label.h:44
 #: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_eeschema_config.h:50
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/dialog_setup_libs.h:43
 msgid "Dialog"
@@ -10753,7 +10694,7 @@ msgstr "EESchema поиск"
 msgid "EESchema Annotation"
 msgstr "EESchema аннотация"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.h:59
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/dialog_erc.h:57
 msgid "EESchema Erc"
 msgstr "EESchema Erc"
 
@@ -10852,6 +10793,11 @@ msgstr "Nombre de feuille&: %d"
 msgid "Erc Mark"
 msgstr "Petite marque"
 
+#: /home/plyatov/Projects/Programming/kicad-svn/eeschema/eelayer.h:271
+#, fuzzy
+msgid "Other"
+msgstr "Прочее"
+
 #: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/zones.h:54
 msgid "Fill Zones Options"
 msgstr "Настройка зон заливки"
@@ -10905,51 +10851,56 @@ msgstr "Размеры дорожек и переходных отверстий
 msgid "Netlist: "
 msgstr "Netlist: "
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:5
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:38
+#, fuzzy
+msgid "Pcbnew Layer Colors:"
+msgstr "Цвета слоев Gerbview:"
+
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:81
 msgid "Copper Layers"
 msgstr "Медные слои."
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:139
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:216
 msgid "Tech Layers"
 msgstr "Технические слои."
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:278
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:357
 msgid "Ratsnest"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:287
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:366
 msgid "Pad Cu"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:295
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:374
 msgid "Pad Cmp"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:303
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:382
 msgid "Text Module Cu"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:311
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:390
 msgid "Text Module Cmp"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:319
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:398
 msgid "Text Module invisible"
 msgstr "Невидимый текст модуля"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:327
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:406
 msgid "Anchors"
 msgstr "Привязки"
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:353
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:432
 msgid "Show Noconnect"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:362
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:441
 msgid "Show Modules Cmp"
 msgstr ""
 
-#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:371
+#: /home/plyatov/Projects/Programming/kicad-svn/pcbnew/set_color.h:450
 msgid "Show Modules Cu"
 msgstr ""