[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-216-gb297d32)

To: geda-cvs@xxxxxxxx
Subject: gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-216-gb297d32)
From: git@xxxxxxxxxx
Date: Sat, 28 Mar 2009 11:55:58 -0700
Delivered-to: archiver@xxxxxxxx
Delivered-to: geda-cvs@xxxxxxxx
Delivery-date: Sat, 28 Mar 2009 15:10:00 -0400
List-archive: <http://www.seul.org/pipermail/geda-cvs>
List-help: <mailto:geda-cvs-request@moria.seul.org?subject=help>
List-id: gEDA CVS commits mailing list <geda-cvs.moria.seul.org>
List-post: <mailto:geda-cvs@moria.seul.org>
List-subscribe: <http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs>, <mailto:geda-cvs-request@moria.seul.org?subject=subscribe>
List-unsubscribe: <http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs>, <mailto:geda-cvs-request@moria.seul.org?subject=unsubscribe>
Reply-to: gEDA CVS commits mailing list <geda-cvs@xxxxxxxxxxxxxx>
Sender: geda-cvs-bounces@xxxxxxxxxxxxxx

The branch, master has been updated
       via  b297d32b70c02bfe800b7bf4c434d1fd4447e2f5 (commit)
      from  03fa830460f97518b3fdba0dd96f5932c9885281 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gattrib/po/de.po    |    2 +-
 gattrib/po/es.po    |    2 +-
 gattrib/po/nl.po    |    2 +-
 gschem/po/af.po     | 1052 +++++++++++++++++++++++++++-----------------------
 gschem/po/de.po     | 1057 +++++++++++++++++++++++++++------------------------
 gschem/po/en_GB.po  |  689 ++++++++++++++++++---------------
 gschem/po/es.po     | 1056 +++++++++++++++++++++++++++-----------------------
 gschem/po/fr.po     | 1059 +++++++++++++++++++++++++++------------------------
 gschem/po/it.po     | 1056 +++++++++++++++++++++++++++-----------------------
 gschem/po/ja.po     | 1030 ++++++++++++++++++++++++++-----------------------
 gschem/po/nl.po     |  693 ++++++++++++++++++---------------
 gschem/po/pt_BR.po  | 1030 ++++++++++++++++++++++++++-----------------------
 gschem/po/ru.po     | 1060 +++++++++++++++++++++++++++------------------------
 libgeda/po/de.po    |  247 +++++++------
 libgeda/po/en_GB.po |  222 ++++++------
 libgeda/po/es.po    |  253 +++++++------
 libgeda/po/nl.po    |  222 ++++++------
 17 files changed, 5753 insertions(+), 4979 deletions(-)


=================
 Commit Messages
=================

commit b297d32b70c02bfe800b7bf4c434d1fd4447e2f5
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Commit: Ales Hvezda <ahvezda@xxxxxxxx>

    Updated all po files by running make update-po

:100644 100644 084a269... e3c2f97... M	gattrib/po/de.po
:100644 100644 0839650... 59e926f... M	gattrib/po/es.po
:100644 100644 c28e3e9... 3127914... M	gattrib/po/nl.po
:100644 100644 93573a9... 33fdfae... M	gschem/po/af.po
:100644 100644 fc05a6a... 4452e44... M	gschem/po/de.po
:100644 100644 9973f1f... 1f10e3d... M	gschem/po/en_GB.po
:100644 100644 277ae37... b2ca73d... M	gschem/po/es.po
:100644 100644 cfe8b9d... e1979d8... M	gschem/po/fr.po
:100644 100644 72c8340... 805159f... M	gschem/po/it.po
:100644 100644 c5647c1... f6f3c43... M	gschem/po/ja.po
:100644 100644 e209e6d... de049c6... M	gschem/po/nl.po
:100644 100644 20df932... ac3adda... M	gschem/po/pt_BR.po
:100644 100644 ebf96b5... 8b9b556... M	gschem/po/ru.po
:100644 100644 a856373... 9504077... M	libgeda/po/de.po
:100644 100644 d2f8bb3... 8f585d2... M	libgeda/po/en_GB.po
:100644 100644 fbcf581... c660bce... M	libgeda/po/es.po
:100644 100644 296b7af... b2d5ccf... M	libgeda/po/nl.po

=========
 Changes
=========

commit b297d32b70c02bfe800b7bf4c434d1fd4447e2f5
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Commit: Ales Hvezda <ahvezda@xxxxxxxx>

    Updated all po files by running make update-po

diff --git a/gattrib/po/de.po b/gattrib/po/de.po
index 084a269..e3c2f97 100644
--- a/gattrib/po/de.po
+++ b/gattrib/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de_DE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:47-0500\n"
+"POT-Creation-Date: 2009-03-28 14:51-0400\n"
 "PO-Revision-Date: 2008-12-20 14:37+0000\n"
 "Last-Translator: Werner Hoch <werner.ho@xxxxxx>\n"
 "Language-Team: deutsch <de@xxxxxx>\n"
diff --git a/gattrib/po/es.po b/gattrib/po/es.po
index 0839650..59e926f 100644
--- a/gattrib/po/es.po
+++ b/gattrib/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gattrib VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:47-0500\n"
+"POT-Creation-Date: 2009-03-28 14:51-0400\n"
 "PO-Revision-Date: 2008-12-20 14:03+0000\n"
 "Last-Translator: Carlos Nieves Ã?nega <cnieves@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxxxxxxx>Report-Msgid-Bugs-To: MIME-"
diff --git a/gattrib/po/nl.po b/gattrib/po/nl.po
index c28e3e9..3127914 100644
--- a/gattrib/po/nl.po
+++ b/gattrib/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geda-gattrib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:47-0500\n"
+"POT-Creation-Date: 2009-03-28 14:51-0400\n"
 "PO-Revision-Date: 2008-12-20 14:03+0000\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: gEDA developers <geda-dev@xxxxxxxxxxxxxx>\n"
diff --git a/gschem/po/af.po b/gschem/po/af.po
index 93573a9..33fdfae 100644
--- a/gschem/po/af.po
+++ b/gschem/po/af.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geda-gschem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:41-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-20 14:27+0000\n"
 "Last-Translator: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>\n"
 "Language-Team: <geda-dev@xxxxxxxxxxxxxx>\n"
@@ -60,7 +60,7 @@ msgstr "Druk..."
 msgid "Write image..."
 msgstr "Skryf afbeelding..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:498
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 msgid "Recent files"
 msgstr "Onlangse lÃªers"
 
@@ -76,33 +76,36 @@ msgstr "Sluit Venster"
 msgid "Quit"
 msgstr "Sluit"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Bewerk"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:390
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "Maak Ongedaan"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:397
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Herstel"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:573
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "Uitsoekmodus"
 
 #: ../src/rcstrings.c:22
-msgid "Cut Buffer"
-msgstr "Sny Buffer"
+#, fuzzy
+msgid "Cut"
+msgstr "Sny 1"
 
-#: ../src/rcstrings.c:23
-msgid "Copy Buffer"
-msgstr "Kopieer Buffer"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "Kopieer"
 
 #: ../src/rcstrings.c:24
-msgid "Paste Buffer"
-msgstr "Plak Buffer"
+#, fuzzy
+msgid "Paste"
+msgstr "Plak 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -124,7 +127,7 @@ msgstr "Meervoudige Kopieermodus"
 msgid "Move Mode"
 msgstr "Skuifmodus"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "Verwyder"
 
@@ -144,11 +147,11 @@ msgstr "Gleuf..."
 msgid "Color..."
 msgstr "Kleur..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2233
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Sluit"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Ontsluit"
 
@@ -258,7 +261,7 @@ msgid "Redraw"
 msgstr "Herteken"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1504 ../src/i_callbacks.c:1576
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Skuif Aansig"
 
@@ -282,231 +285,239 @@ msgstr "Zoem Uit"
 msgid "Zoom Full"
 msgstr "Zoem Ten Volle"
 
+#: ../src/rcstrings.c:71
+msgid "Dark color scheme"
+msgstr ""
+
 #: ../src/rcstrings.c:72
+msgid "Light color scheme"
+msgstr ""
+
+#: ../src/rcstrings.c:74
 msgid "Page"
 msgstr "Bladsy"
 
-#: ../src/rcstrings.c:73
+#: ../src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Bestuurder..."
 
-#: ../src/rcstrings.c:74
+#: ../src/rcstrings.c:76
 msgid "Next"
 msgstr "Volgende"
 
-#: ../src/rcstrings.c:75
+#: ../src/rcstrings.c:77
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../src/rcstrings.c:76 ../src/x_window.c:368
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "Nuwe"
 
-#: ../src/rcstrings.c:77
+#: ../src/rcstrings.c:79
 msgid "Revert"
 msgstr "Gaan Terug"
 
-#: ../src/rcstrings.c:78
+#: ../src/rcstrings.c:80
 msgid "Close"
 msgstr "Sluit Af"
 
-#: ../src/rcstrings.c:79
+#: ../src/rcstrings.c:81
 msgid "Discard"
 msgstr "Werp Weg"
 
-#: ../src/rcstrings.c:81
+#: ../src/rcstrings.c:83
 msgid "Add"
 msgstr "Voeg By"
 
-#: ../src/rcstrings.c:82
+#: ../src/rcstrings.c:84
 msgid "Component..."
 msgstr "Komponent..."
 
 #. need to click
-#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2306 ../src/i_callbacks.c:2333
-#: ../src/x_dialog.c:2200
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "Skakeling"
 
 #. need to click
-#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2377 ../src/i_callbacks.c:2404
-#: ../src/x_dialog.c:2218 ../src/x_window.c:426
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:85
+#: ../src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Eienskap..."
 
-#: ../src/rcstrings.c:86
+#: ../src/rcstrings.c:88
 msgid "Text..."
 msgstr "Teks..."
 
-#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2485 ../src/i_callbacks.c:2508
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Lyn"
 
-#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2530 ../src/i_callbacks.c:2553
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "Reghoek"
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2609 ../src/i_callbacks.c:2633
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "Sirkel"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2655 ../src/i_callbacks.c:2678
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Boog"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2700 ../src/i_callbacks.c:2723
-#: ../src/x_dialog.c:2191
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "Pen"
 
-#: ../src/rcstrings.c:92
+#: ../src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Afbeelding"
 
-#: ../src/rcstrings.c:94
+#: ../src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hierargie"
 
-#: ../src/rcstrings.c:95
+#: ../src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Stroombaandiagram Af"
 
-#: ../src/rcstrings.c:96
+#: ../src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Simbool Af"
 
-#: ../src/rcstrings.c:97
+#: ../src/rcstrings.c:99
 msgid "Up"
 msgstr "Op"
 
-#: ../src/rcstrings.c:98
+#: ../src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Dokumentasie"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100 ../src/x_compselect.c:1418
+#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
 #: ../src/x_multiattrib.c:1543
 msgid "Attributes"
 msgstr "Eienskappe"
 
-#: ../src/rcstrings.c:101 ../src/i_callbacks.c:3000
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Heg aan"
 
-#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3046
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "Heg af"
 
-#: ../src/rcstrings.c:103
+#: ../src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Toon Waarde"
 
-#: ../src/rcstrings.c:104
+#: ../src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Toon Naam"
 
-#: ../src/rcstrings.c:105
+#: ../src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Toon Beide"
 
-#: ../src/rcstrings.c:106
+#: ../src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Skakel Sigbaarheid"
 
-#: ../src/rcstrings.c:107
+#: ../src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Vind Spesifieke Teks..."
 
-#: ../src/rcstrings.c:108
+#: ../src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Verskuil Spesifieke Teks..."
 
-#: ../src/rcstrings.c:109
+#: ../src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Toon Spesifieke Teks..."
 
-#: ../src/rcstrings.c:110
+#: ../src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Nommereer Teks Outomaties..."
 
-#: ../src/rcstrings.c:112
+#: ../src/rcstrings.c:114
 msgid "Options"
 msgstr "Opsies"
 
-#: ../src/rcstrings.c:113
+#: ../src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Teksgrootte..."
 
-#: ../src/rcstrings.c:114
-msgid "Toggle Grid On/Off"
-msgstr "Skakel Rooster Aan/Af"
+#: ../src/rcstrings.c:116
+msgid "Cycle grid styles"
+msgstr ""
 
-#: ../src/rcstrings.c:115
+#: ../src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr ""
 
 # FIXME: Find a better expression for "Snap Grid".
-#: ../src/rcstrings.c:116
+#: ../src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "SnaproosterspasiÃ«ring"
 
-#: ../src/rcstrings.c:117
+#: ../src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr "Vergroot RoosterspasiÃ«ring"
 
-#: ../src/rcstrings.c:118
+#: ../src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr "Verklein RoosterspasiÃ«ring"
 
-#: ../src/rcstrings.c:119
+#: ../src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Skakel Skets/Omtrekreghoek"
 
-#: ../src/rcstrings.c:120
+#: ../src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Skakel Net Rubberband"
 
-#: ../src/rcstrings.c:121
+#: ../src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Wys Aantekeningevenster"
 
-#: ../src/rcstrings.c:122
+#: ../src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Wys Koordinatevenster"
 
-#: ../src/rcstrings.c:124
+#: ../src/rcstrings.c:126
 msgid "Help"
 msgstr "Help"
 
-#: ../src/rcstrings.c:125
+#: ../src/rcstrings.c:127
 msgid "Manual"
 msgstr "Handleiding"
 
-#: ../src/rcstrings.c:126
+#: ../src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "gEDA Dokumentasie"
 
-#: ../src/rcstrings.c:127
+#: ../src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "gschem FAQ"
 
-#: ../src/rcstrings.c:128
+#: ../src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Komponent Dokumentasie"
 
-#: ../src/rcstrings.c:129
+#: ../src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Oor gschem"
 
-#: ../src/rcstrings.c:130 ../src/x_dialog.c:2541
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 msgid "Hotkeys"
 msgstr ""
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Zoem is te klein!  Kan nie verder zoem nie.\n"
 
@@ -527,93 +538,93 @@ msgstr "Kon nie %s oproep nie\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Dokumentasieopdragte werk nie onder MinGW nie.\n"
 
-#: ../src/g_rc.c:140
-#, c-format
-msgid "Invalid color [%s] passed to %s\n"
-msgstr "Ongeldige kleur [%s] aan %s gegee\n"
-
-#: ../src/g_rc.c:448
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ongeldige zoemmaat [%d] aan %s gegee\n"
 
-#: ../src/g_rc.c:574
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ongeldige grootte [%d] gegee aan text-size\n"
 
-#: ../src/g_rc.c:601
+#: ../src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ongeldige grootte [%f] aan postscript-font-scale gegee\n"
 
-#: ../src/g_rc.c:644
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ongeldige grootte [%d] aan snap-size gegee\n"
 
-#: ../src/g_rc.c:1116
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Ongeldige getal vlakke [%d] gegee aan undo-levels\n"
 
-#: ../src/g_rc.c:1374
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Ongeldige grootte [%d] gegee aan bus-ripper-size\n"
 
-#: ../src/g_rc.c:1449
-#, c-format
-msgid "Invalid dot size [%d] passed to grid-dot-size\n"
+#: ../src/g_rc.c:1293
+#, fuzzy, c-format
+msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Ongeldige puntgrootte [%d] gegee aan grid-dot-size\n"
 
-#: ../src/g_rc.c:1490
-#, c-format
-msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
-msgstr ""
+#: ../src/g_rc.c:1334
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
+msgstr "Ongeldige puntgrootte [%d] gegee aan grid-dot-size\n"
 
-#: ../src/g_rc.c:1534
+#: ../src/g_rc.c:1360
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
+msgstr "Ongeldige puntgrootte [%d] gegee aan grid-dot-size\n"
+
+#: ../src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ongeldige verkuiwing [%d] gegee aan add-attribute-offset\n"
 
-#: ../src/g_rc.c:1558
+#: ../src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Ongeldige hoeveelheid sekondes [%d] gegee aan auto-save-interval\n"
 
-#: ../src/g_rc.c:1599
+#: ../src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ongeldige versterking [%d] gegee aan mousepan-gain\n"
 
-#: ../src/g_rc.c:1622
+#: ../src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ongeldige versterking [%d] gegee aan keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1668
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 
-#: ../src/g_rc.c:1694
+#: ../src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ongeldige versterking [%d] gegee aan mousepan-gain\n"
 
-#: ../src/g_rc.c:1719
+#: ../src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Ongeldige hoeveelheid sekondes [%d] gegee aan auto-save-interval\n"
 
-#: ../src/gschem.c:189 ../src/gschem.c:200
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem uitgawe %s%s.%s\n"
 
 # FIXME: Best to get a real lawyer to translate this into Afrikaans legalese.
-#: ../src/gschem.c:192 ../src/gschem.c:203
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -623,61 +634,74 @@ msgstr ""
 "details.\n"
 
 # FIXME: Track down other projects' translations of the GPL boilerplate.
-#: ../src/gschem.c:194 ../src/gschem.c:205
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 
-#: ../src/gschem.c:196 ../src/gschem.c:207
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
 "\n"
 msgstr ""
 
-#: ../src/gschem.c:211
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr ""
 
-#: ../src/gschem.c:215
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr ""
 
-#: ../src/gschem.c:228
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "Jy moet die GEDADATA omgewingswaarde stel!\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:245
+#: ../src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Het misluk of scm-aanvangslÃªer [%s] te lees\n"
 
-#: ../src/gschem.c:249
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Het scm-aanvangslÃªer [%s] gelees\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:253
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Het misluk of scm-aanvangslÃªer [%s] te lees\n"
 
-#: ../src/gschem.c:315
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Scheme-gids is NIE gestel nie!\n"
 
-#: ../src/gschem.c:322 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Voer guile script [%s] uit\n"
 
+#: ../src/gschem_cairo.c:310
+#, c-format
+msgid "Unknown end for line (%d)\n"
+msgstr "Onbekende einde vir lyn (%d)\n"
+
+#: ../src/gschem_cairo.c:318
+#, fuzzy, c-format
+msgid "Unknown type for stroke (%d) !\n"
+msgstr "Onbekende tipe vir lyn (%d)!\n"
+
 #: ../src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Komponentmodus"
@@ -736,15 +760,11 @@ msgstr "Boogmodus"
 msgid "Pin Mode"
 msgstr "Penmodus"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Kopieer"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "Beweeg"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Veelvoudige Kopieer"
 
@@ -756,27 +776,35 @@ msgstr "Toon Verskuilde"
 msgid "Snap Off"
 msgstr ""
 
-#: ../src/i_basic.c:252 ../src/x_window.c:547
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "Handeling"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2230 ../src/x_window.c:542
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr "Wyserslag"
 
-#: ../src/i_basic.c:264 ../src/x_window.c:544
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "geen"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Herhaal/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr "AF"
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
+msgid "NONE"
+msgstr ""
+
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Rooster(%s, %s)"
@@ -786,210 +814,220 @@ msgstr "Rooster(%s, %s)"
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentasie vir [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1701
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nuwe bladsy geskep [%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:467
+#: ../src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nuwe Venster geskep [%s]\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Misluk om alles te bewaar"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Alles Bewaar"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Sluit Venster\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Kies eers voorwerpe"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Bewerk Lyntipe"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Bewerk Teks"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Gleuf"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Kleur"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Roteer"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Weerkaats"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1623
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Verskuif"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "LÃª In"
 
 # FIXME: too klunky!
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Ont-lÃª In"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr ""
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "ToonVerskuil"
 
-#: ../src/i_callbacks.c:1142
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "MaakSigbaar"
 
-#: ../src/i_callbacks.c:1259
-msgid "Edit Line Type"
-msgstr "Bewerk Lyntipe"
-
-#: ../src/i_callbacks.c:1301 ../src/x_dialog.c:1243
-msgid "Edit Fill Type"
-msgstr "Bewerk Vultipe"
-
-#: ../src/i_callbacks.c:1595
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr ""
 
-#: ../src/i_callbacks.c:1745
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr ""
 
-#: ../src/i_callbacks.c:1817
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Plak vanuit 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Maak buffer leeg"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Kopieer 1"
 
-#: ../src/i_callbacks.c:1836
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Kopieer 2"
 
-#: ../src/i_callbacks.c:1855
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Kopieer 3"
 
-#: ../src/i_callbacks.c:1874
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Kopieer 4"
 
-#: ../src/i_callbacks.c:1893
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Kopieer 5"
 
-#: ../src/i_callbacks.c:1912
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Sny 1"
 
-#: ../src/i_callbacks.c:1931
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Sny 2"
 
-#: ../src/i_callbacks.c:1950
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Sny 3"
 
-#: ../src/i_callbacks.c:1969
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Sny 4"
 
-#: ../src/i_callbacks.c:1988
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Sny 5"
 
-#: ../src/i_callbacks.c:2004
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "Plak 1"
 
-#: ../src/i_callbacks.c:2011 ../src/i_callbacks.c:2033
-#: ../src/i_callbacks.c:2055 ../src/i_callbacks.c:2077
-#: ../src/i_callbacks.c:2099
-msgid "Empty buffer"
-msgstr "Maak buffer leeg"
-
-#: ../src/i_callbacks.c:2026
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "Plak 2"
 
-#: ../src/i_callbacks.c:2048
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "Plak 3"
 
-#: ../src/i_callbacks.c:2070
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "Plak 4"
 
-#: ../src/i_callbacks.c:2092
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "Plak 5"
 
-#: ../src/i_callbacks.c:2229 ../src/x_window.c:406
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Komponent"
 
-#: ../src/i_callbacks.c:2265 ../src/i_callbacks.c:2284 ../src/x_dialog.c:2203
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Eienskap"
 
-#: ../src/i_callbacks.c:2781
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Soek vir bron [%s]\n"
 
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Kan nie bron [%s] vind nie\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Soek vir simbool [%s]\n"
 
-#: ../src/i_callbacks.c:2878
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
 # FIXME: "aangeduide".
-#: ../src/i_callbacks.c:2972
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -997,144 +1035,110 @@ msgstr ""
 "Hierdie opdrag haal die komponentdokumentasie van die web, maar daar is geen "
 "aangeduide komponent nie"
 
-#: ../src/i_callbacks.c:3084
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "ToonN"
 
-#: ../src/i_callbacks.c:3120
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "ToonW"
 
-#: ../src/i_callbacks.c:3156
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "ToonB"
 
-#: ../src/i_callbacks.c:3193
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "SigSkakel"
 
-#: ../src/i_callbacks.c:3223
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Jammer, maar hierdie opsie werk nie\n"
 
-#: ../src/i_callbacks.c:3311
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Handelingsterugvoermodus na SKETS gestel\n"
 
-#: ../src/i_callbacks.c:3314
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Handelingsterugvoermodus na OMTREKREGHOEK\n"
 
-#: ../src/i_callbacks.c:3331
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Rooster AF\n"
 
-#: ../src/i_callbacks.c:3334
-msgid "Grid ON\n"
-msgstr "Rooster AAN\n"
+#: ../src/i_callbacks.c:3435
+msgid "Dot grid selected\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3436
+msgid "Mesh grid selected\n"
+msgstr ""
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3374
+#: ../src/i_callbacks.c:3463
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr "Rubberband AF\n"
 
-#: ../src/i_callbacks.c:3377
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr "Rubberband AAN\n"
 
-#: ../src/i_callbacks.c:3392
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3395
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_arc.c:120
-#, c-format
-msgid "Unknown end for arc (%d)\n"
-msgstr "Onbekende einde vir boog (%d)\n"
-
-#: ../src/o_arc.c:160
-#, c-format
-msgid "Unknown type for arc !\n"
-msgstr "Onbekende tipe vir boog!\n"
-
-#: ../src/o_box.c:136
-#, c-format
-msgid "Unknown end for box (%d)\n"
-msgstr "Onbekende einde vir reghoek (%d)\n"
-
-#: ../src/o_box.c:176
-#, c-format
-msgid "Unknown type for box !\n"
-msgstr "Onbekende tipe vir reghoek!\n"
-
-#: ../src/o_box.c:260
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Onbekende tipe vir reghoek (vul)!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
-msgstr "Het 'n ongeldige buffer_number gekry [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
-msgstr "Het 'n ongeldige buffer_number gekry [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Het 'n ongeldige buffer_number gekry [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:183
-#, c-format
-msgid "Got an invalid which one in o_bus_draw_xor_single\n"
+#: ../src/o_bus.c:135
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Het 'n ongeldige whichone in o_bus_draw_xor_single gekry\n"
 
-#: ../src/o_circle.c:127
-#, c-format
-msgid "Unknown end for circle\n"
-msgstr "Onbekende einde vir sirkel\n"
-
-#. just to be careful
-#: ../src/o_circle.c:163
-#, c-format
-msgid "Unknown type for circle!\n"
-msgstr "Onbekende tipe vir sirkel!\n"
-
-#: ../src/o_circle.c:245
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Onbekende tipe vir sirkel (vul)!\n"
 
-#: ../src/o_complex.c:251 ../src/o_complex.c:255
+#: ../src/o_complex.c:250 ../src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Verskuif stroombaandiagram [%d %d]\n"
 
-#: ../src/o_line.c:111
-#, c-format
-msgid "Unknown end for line (%d)\n"
-msgstr "Onbekende einde vir lyn (%d)\n"
-
-#. just to be careful
-#: ../src/o_line.c:151
-#, c-format
-msgid "Unknown type for line (%d) !\n"
-msgstr "Onbekende tipe vir lyn (%d)!\n"
-
 #: ../src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
@@ -1148,35 +1152,35 @@ msgstr "Voorwerp klaar gesluit\n"
 msgid "Object already unlocked\n"
 msgstr "Voorwerp klaar ontsluit\n"
 
-#: ../src/o_misc.c:444
+#: ../src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Verskuilde teks is nou sigbaar\n"
 
-#: ../src/o_misc.c:446
+#: ../src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Verskuilde teks is nou onsigbaar\n"
 
-#: ../src/o_misc.c:694
+#: ../src/o_misc.c:697
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:837
+#: ../src/o_misc.c:840
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: Kan nie die egte lÃªernaam van %s kry nie."
 
-#: ../src/o_misc.c:881
+#: ../src/o_misc.c:884
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Kon NIE vorige bestandlÃªer [%s] lees-skryf stel nie\n"
 
-#: ../src/o_misc.c:899
+#: ../src/o_misc.c:902
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Kon NIE bestandlÃªer [%s] lees-slegs stel nie\n"
 
-#: ../src/o_misc.c:904
+#: ../src/o_misc.c:907
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Kon NIE bestandlÃªer [%s] bewaar nie\n"
@@ -1187,59 +1191,49 @@ msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "FOUT: NULL voorwerp in o_move_end!\n"
 
 # Thanks to Frank Shearar for reminding me of BLIKSEM!
-#: ../src/o_move.c:385
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 "BLIKSEM!  Het probeer om die whichone te vind, maar kon dit nie kry nie!\n"
 
-#: ../src/o_move.c:406
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Het 'n voorwerp wat nie 'n lyn is nie in o_move_check_endpoint gekry\n"
 
-#: ../src/o_net.c:253
-#, c-format
-msgid "Got an invalid which one in o_net_draw_xor_single\n"
+#: ../src/o_net.c:176
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Het 'n ongeldige whichone in o_net_draw_xor_single gekry\n"
 
-#: ../src/o_net.c:630
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:692
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
 #. try to exit gracefully
-#: ../src/o_net.c:1080 ../src/o_net.c:1117 ../src/o_net.c:1188
-#: ../src/o_net.c:1224
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Het probeer om meer as twee busrippers bytevoeg.  Interne gschem fout.\n"
 
-#: ../src/o_net.c:1294
+#: ../src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Busrippersimbool [%s] is nie in enige komponentbiblioteek gevind nie\n"
 
-#: ../src/o_path.c:483
-#, fuzzy, c-format
-msgid "Unknown end for path (%d)\n"
-msgstr "Onbekende einde vir boog (%d)\n"
-
-#: ../src/o_path.c:524
-#, fuzzy, c-format
-msgid "Unknown type for path !\n"
-msgstr "Onbekende tipe vir boog!\n"
-
-#: ../src/o_path.c:594
+#: ../src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Onbekende tipe vir reghoek (vul)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:627
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Kon nie afbeelding laai nie: %s"
@@ -1248,7 +1242,7 @@ msgstr "Kon nie afbeelding laai nie: %s"
 msgid "Picture"
 msgstr "Afbeelding"
 
-#: ../src/o_picture.c:535 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "FOUT: NULL voorwerp!\n"
@@ -1357,7 +1351,7 @@ msgid "Components"
 msgstr "Komponente"
 
 # FIXME: "Nette"
-#: ../src/x_attribedit.c:471 ../src/x_window.c:416
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "Nette"
 
@@ -1365,151 +1359,150 @@ msgstr "Nette"
 msgid "Replace existing attributes"
 msgstr "Vervang bestaande eienskappe"
 
-#: ../src/x_autonumber.c:412
+#: ../src/x_autonumber.c:413
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
 #. duplicate slot in used_slots
-#: ../src/x_autonumber.c:427
+#: ../src/x_autonumber.c:428
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 "duplikaatgleuf mag probleme veroorsaak: [symbolname=%s, number=%d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:695
+#: ../src/x_autonumber.c:696
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:746
+#: ../src/x_autonumber.c:748
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:880
+#: ../src/x_autonumber.c:883
 msgid "Diagonal"
 msgstr "Diagonaal"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Top to bottom"
 msgstr "Bo to onder"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Bottom to top"
 msgstr "Onder tot bo"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Left to right"
 msgstr "Links tot regs"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Right to left"
 msgstr "Regs tot links"
 
-#: ../src/x_autonumber.c:883
+#: ../src/x_autonumber.c:886
 msgid "File order"
 msgstr "LÃªerorde"
 
-#: ../src/x_autonumber.c:1219
+#: ../src/x_autonumber.c:1222
 msgid "Autonumber text"
 msgstr ""
 
 #. scope section
-#: ../src/x_autonumber.c:1243
+#: ../src/x_autonumber.c:1246
 msgid "<b>Scope</b>"
 msgstr "<b>Bestek</b>"
 
-#: ../src/x_autonumber.c:1265
+#: ../src/x_autonumber.c:1268
 msgid "Search for:"
 msgstr "Soek vir:"
 
-#: ../src/x_autonumber.c:1279
+#: ../src/x_autonumber.c:1282
 msgid "Autonumber text in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1286
+#: ../src/x_autonumber.c:1289
 msgid "Skip numbers found in:"
 msgstr "Slaan nommers oor in:"
 
-#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
 msgid "Selected objects"
 msgstr ""
 
-#: ../src/x_autonumber.c:1299 ../src/x_autonumber.c:1308
+#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
 msgid "Current page"
 msgstr "Lopende bladsy"
 
-#: ../src/x_autonumber.c:1300 ../src/x_autonumber.c:1309
+#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
 msgid "Whole hierarchy"
 msgstr "Hele hierargie"
 
-#: ../src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1314
 msgid "Overwrite existing numbers"
 msgstr "Vervang bestaande nommers"
 
 #. Options section
-#: ../src/x_autonumber.c:1316
+#: ../src/x_autonumber.c:1319
 msgid "<b>Options</b>"
 msgstr "<b>Opsies</b>"
 
-#: ../src/x_autonumber.c:1338
+#: ../src/x_autonumber.c:1341
 msgid "Starting number:"
 msgstr "Begin by nommer:"
 
-#: ../src/x_autonumber.c:1345
+#: ../src/x_autonumber.c:1348
 msgid "Sort order:"
 msgstr "Rangskikkingsorde:"
 
-#: ../src/x_autonumber.c:1366
+#: ../src/x_autonumber.c:1369
 msgid "Remove numbers"
 msgstr "Verwyder syfers"
 
-#: ../src/x_autonumber.c:1370
+#: ../src/x_autonumber.c:1373
 msgid "Automatic slotting"
 msgstr "Outomatiese begleuwing"
 
-#: ../src/x_color.c:52 ../src/x_color.c:61 ../src/x_color.c:124
-#: ../src/x_color.c:172
+#: ../src/x_color.c:94 ../src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Kon nie aanspraak maak op die kleur %s nie!\n"
 
-#: ../src/x_color.c:52
+#: ../src/x_color.c:94
 msgid "black"
 msgstr "swart"
 
-#: ../src/x_color.c:61
+#: ../src/x_color.c:103
 msgid "white"
 msgstr "wit"
 
-#: ../src/x_color.c:103 ../src/x_color.c:140
-#, c-format
-msgid "Could not find the color %s!\n"
-msgstr "Kon nie die kleur %s vind nie!\n"
-
-#: ../src/x_color.c:106 ../src/x_color.c:143
-#, c-format
-msgid "Defaulting color to white\n"
-msgstr ""
+#: ../src/x_color.c:125
+#, fuzzy, c-format
+msgid "Could not allocate display color %i!\n"
+msgstr "Kon nie aanspraak maak op die kleur %s nie!\n"
 
-#: ../src/x_color.c:113 ../src/x_color.c:150
-#, c-format
-msgid "Ack! Cannot allocate white!\n"
-msgstr "Ag! Kon nie aanspraak maak op wit nie!\n"
+#: ../src/x_color.c:147
+#, fuzzy, c-format
+msgid "Could not allocate outline color %i!\n"
+msgstr "Kon nie aanspraak maak op die kleur %s nie!\n"
 
-#: ../src/x_color.c:191 ../src/x_color.c:207
+#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Het probeer om 'n ongeldige kleur te kry: %d\n"
 
+#: ../src/x_color.c:214
+#, fuzzy, c-format
+msgid "Tried to get an invalid outline color: %d\n"
+msgstr "Het probeer om 'n ongeldige kleur te kry: %d\n"
+
 #. GtkLabel
 #: ../src/x_compselect.c:1040
 msgid "Filter:"
 msgstr "Deursyfer:"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3591
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Naam"
@@ -1550,193 +1543,196 @@ msgid "Preview"
 msgstr "Voorskou"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Teksaantekening..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
 "Middle button to rotate while placing."
 msgstr ""
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "Links Onder"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Middel Links"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "Links Bo"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "Middel Onder"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Middel Middel"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "Middel Bo"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "Regs Onder"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Middel Regs"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "Regs Bo"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Bewerk Tekseienskappe"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Teksinhoud</b>"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Tekseienskappe</b>"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 msgid "Color:"
 msgstr "Kleur:"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr "Grootte:"
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Sporing:"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "Solied"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Gestippeld"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Gebroke"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "Sentreer"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Spook"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:964 ../src/x_dialog.c:965 ../src/x_dialog.c:966
-#: ../src/x_dialog.c:974 ../src/x_dialog.c:1157 ../src/x_dialog.c:1159
-#: ../src/x_dialog.c:1161 ../src/x_dialog.c:1163 ../src/x_dialog.c:1165
-#: ../src/x_dialog.c:1368 ../src/x_dialog.c:1369 ../src/x_dialog.c:1370
-#: ../src/x_dialog.c:1371 ../src/x_dialog.c:1372 ../src/x_dialog.c:1380
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*onveranderd*"
 
-#: ../src/x_dialog.c:858
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Bewerk Lynwyddte & -styl"
 
-#: ../src/x_dialog.c:897
-msgid "Width:"
-msgstr "Wydte:"
-
-#: ../src/x_dialog.c:901 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 msgid "Type:"
 msgstr "Styl:"
 
-#: ../src/x_dialog.c:905
+#: ../src/x_dialog.c:1021
+msgid "Width:"
+msgstr "Wydte:"
+
+#: ../src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Streeplengte"
 
-#: ../src/x_dialog.c:909
+#: ../src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Streepspasie"
 
-#: ../src/x_dialog.c:1014
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Hol"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Gevul"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Rooster"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Arseer"
 
-#: ../src/x_dialog.c:1281
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Bewerk Vultipe"
+
+#: ../src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Vultipe:"
 
-#: ../src/x_dialog.c:1285
+#: ../src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Lynwydte:"
 
-#: ../src/x_dialog.c:1289
+#: ../src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Hoek 1:"
 
-#: ../src/x_dialog.c:1293
+#: ../src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Steek 1:"
 
-#: ../src/x_dialog.c:1297
+#: ../src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Hoek 2:"
 
-#: ../src/x_dialog.c:1301
+#: ../src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Steek 2:"
 
-#: ../src/x_dialog.c:1480
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Boogparameters"
 
-#: ../src/x_dialog.c:1520
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1528
+#: ../src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Beginhoek:"
 
-#: ../src/x_dialog.c:1536
+#: ../src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Grade van Kromming:"
 
-#: ../src/x_dialog.c:1653
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1744,44 +1740,44 @@ msgstr ""
 "Afwyking om te verskuif?\n"
 "(0 vir oorsprong)"
 
-#: ../src/x_dialog.c:1721
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Teksgrootte"
 
-#: ../src/x_dialog.c:1751
+#: ../src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Gee nuwe teksgrootte aan:"
 
-#: ../src/x_dialog.c:1826
+#: ../src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr ""
 
-#: ../src/x_dialog.c:1856
+#: ../src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr ""
 
-#: ../src/x_dialog.c:1929
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "Bewerk gleufnommer"
 
-#: ../src/x_dialog.c:1960
+#: ../src/x_dialog.c:2138
 msgid "Edit slot number:"
 msgstr "Bewerk gleufnommer:"
 
-#: ../src/x_dialog.c:2022
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "Omtrent..."
 
-#: ../src/x_dialog.c:2042
+#: ../src/x_dialog.c:2220
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Elektroniese Ontwerp Outomatisering</b>"
 
-#: ../src/x_dialog.c:2046
+#: ../src/x_dialog.c:2224
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem uitgawe %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2054
+#: ../src/x_dialog.c:2232
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1794,134 +1790,142 @@ msgstr ""
 "en vele andere (Sien AUTHORS lÃªer)"
 
 # FIXME: May need to have a deÃ«lteken on second 'o'.
-#: ../src/x_dialog.c:2119
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Koordinate"
 
-#: ../src/x_dialog.c:2140
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "Skerm"
 
-#: ../src/x_dialog.c:2149
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "WÃªreld"
 
-#: ../src/x_dialog.c:2188
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2194
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2206
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2388
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Voeg Eienskap By"
 
-#: ../src/x_dialog.c:2215 ../src/x_window.c:434
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Teks"
 
-#: ../src/x_dialog.c:2221
+#: ../src/x_dialog.c:2397
 #, fuzzy
 msgid "Selection"
 msgstr "Kies"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2403
 #, fuzzy
 msgid "Zoom box"
 msgstr "Zoem Reghoek"
 
-#: ../src/x_dialog.c:2236
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2415
 #, fuzzy
 msgid "Net junction"
 msgstr "Funksie"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2390
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "FOUT: NULL voorwerp in color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2452
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "Kleurbewerking"
 
-#: ../src/x_dialog.c:2483
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr "Voorwerpkleur:"
 
-#: ../src/x_dialog.c:2605
+#: ../src/x_dialog.c:2786
 msgid "Function"
 msgstr "Funksie"
 
-#: ../src/x_dialog.c:2612
+#: ../src/x_dialog.c:2793
 msgid "Keystroke(s)"
 msgstr "Sleutelslae"
 
-#: ../src/x_dialog.c:2921
+#: ../src/x_dialog.c:3102
 msgid "Find Text"
 msgstr "Vind Teks"
 
-#: ../src/x_dialog.c:2952
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Teks om te vind:"
 
-#: ../src/x_dialog.c:2962
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "daal in hierargie af"
 
-#: ../src/x_dialog.c:3026
+#: ../src/x_dialog.c:3208
 msgid "Hide Text"
 msgstr "Verskuil Teks"
 
-#: ../src/x_dialog.c:3057
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Verskuil teks beginnende met:"
 
-#: ../src/x_dialog.c:3125
+#: ../src/x_dialog.c:3308
 msgid "Show Text"
 msgstr "Toon Teks"
 
-#: ../src/x_dialog.c:3156
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Toon Teks beginnende met:"
 
-#: ../src/x_dialog.c:3613
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr "Kies die stroombaandiagramme wat jy wil bewaar:"
 
-#: ../src/x_dialog.c:3707
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 "Wil jy veranderinge aan stroombaandiagram \"%s\" bewaar voor jy afsluit?"
 
-#: ../src/x_dialog.c:3713
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1930,15 +1934,15 @@ msgstr ""
 "veranderinge bewaar voor jy afsluit?"
 
 #. secondary label
-#: ../src/x_dialog.c:3742
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "As jy nie bewaar nie, sal al jou veranderinge permanent verloregaan."
 
-#: ../src/x_dialog.c:3762
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr "Sluit sonder om te bewaar"
 
-#: ../src/x_dialog.c:4096
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1956,10 +1960,24 @@ msgstr ""
 "Die naam mag nie met 'n spasie eindig nie.\n"
 "Die waarde mag nie met 'n spasie begin nie."
 
-#: ../src/x_dialog.c:4098
+#: ../src/x_dialog.c:4281
 msgid "Invalid Attribute"
 msgstr "Ongeldige Eienskap"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Penmodus"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "Funksie"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Stroombaandiagramme"
@@ -2103,49 +2121,54 @@ msgid "/Edit..."
 msgstr "/Bewerk"
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Bewerk Lyntipe"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Kopieer"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/Skuif"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Verwyder"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Stroombaandiagram Af"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Simbool Af"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Op"
 
-#: ../src/x_menus.c:323
+#: ../src/x_menus.c:316
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Het probeer om gevoeligheid op nie-bestaande menu-artikel '%s'\n"
 
-#: ../src/x_menus.c:347
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "popup_menu artikelfabriek bestaan nie!\n"
 
-#: ../src/x_menus.c:360
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:455
+#: ../src/x_menus.c:462
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Kon nie lÃªer %s oopmaak nie\n"
 
-#: ../src/x_menus.c:516
+#: ../src/x_menus.c:524
 msgid "Clear"
 msgstr "Maak Skoon"
 
@@ -2211,6 +2234,11 @@ msgstr "Veranderd"
 msgid "Right click on the filename for more options..."
 msgstr "Regs-klik op die lÃªernaam vir meer opsies..."
 
+#: ../src/x_preview.c:223
+#, fuzzy
+msgid "Preview Buffer"
+msgstr "Plak Buffer"
+
 #: ../src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Kies PostScript LÃªernaam"
@@ -2289,55 +2317,35 @@ msgstr "Het lopende stroombaandiagram na [%s] gedruk\n"
 msgid "Couldn't allocate gc\n"
 msgstr "Kon nie aanspraak maak op gc nie\n"
 
-#: ../src/x_window.c:94
-#, c-format
-msgid "Couldn't allocate xor_gc\n"
-msgstr "Kon nie aanspraak maak op xor_gc nie\n"
-
-#: ../src/x_window.c:107
-#, c-format
-msgid "Couldn't allocate outline_xor_gc\n"
-msgstr "Kon nie aanspraak maak op outline_xor_gc nie\n"
-
-#: ../src/x_window.c:123
-#, c-format
-msgid "Couldn't allocate bounding_xor_gc\n"
-msgstr "Kon nie aanspraak maak op bounding_xor_gc nie\n"
-
-#: ../src/x_window.c:130
-#, c-format
-msgid "Couldn't allocate bus_gc\n"
-msgstr "Kon nie aanspraak maak op bus_gc nie\n"
-
-#: ../src/x_window.c:369
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "Nuwe lÃªer"
 
-#: ../src/x_window.c:375
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Maak Oop"
 
-#: ../src/x_window.c:376
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Maak lÃªer oop..."
 
-#: ../src/x_window.c:382
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Bewaar"
 
-#: ../src/x_window.c:383
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Bewaar lÃªer"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Maak laaste handeling ongedaan"
 
-#: ../src/x_window.c:398
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Herhaal laas-ongedane handeling"
 
-#: ../src/x_window.c:407
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2345,90 +2353,90 @@ msgid ""
 "Right mouse button to cancel"
 msgstr ""
 
-#: ../src/x_window.c:417
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
 msgstr ""
 
-#: ../src/x_window.c:427
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
 msgstr ""
 
-#: ../src/x_window.c:435
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "Voeg Teks By..."
 
-#: ../src/x_window.c:445
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "Kies"
 
-#: ../src/x_window.c:446
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "Kiesmodus"
 
-#: ../src/x_window.c:533
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "Kies"
 
-#: ../src/x_window.c:549
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Herhaal/geen"
 
-#: ../src/x_window.c:559
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Kanselleer"
 
-#: ../src/x_window.c:561
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr ""
 
-#: ../src/x_window.c:783
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Laai stroombaandiagram [%s]\n"
 
-#: ../src/x_window.c:795
+#: ../src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Misluk om lÃªer te laai"
 
-#: ../src/x_window.c:804
+#: ../src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "Nuwe lÃªer [%s]\n"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:909
+#: ../src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Kon nie bladsy [%s] bewaar nie\n"
 
-#: ../src/x_window.c:910
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Fout gedurende poging om te bewaar"
 
-#: ../src/x_window.c:919
+#: ../src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Bewaar as [%s]\n"
 
-#: ../src/x_window.c:921
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Bewaar [%s]\n"
 
-#: ../src/x_window.c:923
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Bewaar"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Werp bladsy [%s] weg\n"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Sluit [%s]\n"
@@ -2441,6 +2449,74 @@ msgstr "Skep en bewerk stroombaandiagramme en simbole met gschem"
 msgid "gEDA Schematic Editor"
 msgstr "gEDA Stroombaandiagram Bewerker"
 
+#~ msgid "Cut Buffer"
+#~ msgstr "Sny Buffer"
+
+#~ msgid "Copy Buffer"
+#~ msgstr "Kopieer Buffer"
+
+#~ msgid "Toggle Grid On/Off"
+#~ msgstr "Skakel Rooster Aan/Af"
+
+#~ msgid "Invalid color [%s] passed to %s\n"
+#~ msgstr "Ongeldige kleur [%s] aan %s gegee\n"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "Jy moet die GEDADATA omgewingswaarde stel!\n"
+
+#~ msgid "Grid ON\n"
+#~ msgstr "Rooster AAN\n"
+
+#~ msgid "Unknown end for arc (%d)\n"
+#~ msgstr "Onbekende einde vir boog (%d)\n"
+
+#~ msgid "Unknown type for arc !\n"
+#~ msgstr "Onbekende tipe vir boog!\n"
+
+#~ msgid "Unknown end for box (%d)\n"
+#~ msgstr "Onbekende einde vir reghoek (%d)\n"
+
+#~ msgid "Unknown type for box !\n"
+#~ msgstr "Onbekende tipe vir reghoek!\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+#~ msgstr "Het 'n ongeldige buffer_number gekry [o_buffer_copy]\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+#~ msgstr "Het 'n ongeldige buffer_number gekry [o_buffer_cut]\n"
+
+#~ msgid "Unknown end for circle\n"
+#~ msgstr "Onbekende einde vir sirkel\n"
+
+#~ msgid "Unknown type for circle!\n"
+#~ msgstr "Onbekende tipe vir sirkel!\n"
+
+#, fuzzy
+#~ msgid "Unknown end for path (%d)\n"
+#~ msgstr "Onbekende einde vir boog (%d)\n"
+
+#, fuzzy
+#~ msgid "Unknown type for path !\n"
+#~ msgstr "Onbekende tipe vir boog!\n"
+
+#~ msgid "Could not find the color %s!\n"
+#~ msgstr "Kon nie die kleur %s vind nie!\n"
+
+#~ msgid "Ack! Cannot allocate white!\n"
+#~ msgstr "Ag! Kon nie aanspraak maak op wit nie!\n"
+
+#~ msgid "Couldn't allocate xor_gc\n"
+#~ msgstr "Kon nie aanspraak maak op xor_gc nie\n"
+
+#~ msgid "Couldn't allocate outline_xor_gc\n"
+#~ msgstr "Kon nie aanspraak maak op outline_xor_gc nie\n"
+
+#~ msgid "Couldn't allocate bounding_xor_gc\n"
+#~ msgstr "Kon nie aanspraak maak op bounding_xor_gc nie\n"
+
+#~ msgid "Couldn't allocate bus_gc\n"
+#~ msgstr "Kon nie aanspraak maak op bus_gc nie\n"
+
 #~ msgid "Got NULL in o_attrib_toggle_visibility\n"
 #~ msgstr "Kry NULL in o_attrib_toggle_visibility\n"
 
diff --git a/gschem/po/de.po b/gschem/po/de.po
index fc05a6a..4452e44 100644
--- a/gschem/po/de.po
+++ b/gschem/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:41-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-21 12:10+0100\n"
 "Last-Translator: Werner Hoch <werner.ho@xxxxxx>\n"
 "Language-Team: deutsch <de@xxxxxx>\n"
@@ -63,7 +63,7 @@ msgstr "Drucken..."
 msgid "Write image..."
 msgstr "Speichere Bild..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:498
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 msgid "Recent files"
 msgstr "Zuletzt verwendete Dateien"
 
@@ -79,33 +79,36 @@ msgstr "Fenster schlieÃ?en"
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:390
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "RÃ¼ckgÃ¤ngig"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:397
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:573
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "Auswahl Modus"
 
 #: ../src/rcstrings.c:22
-msgid "Cut Buffer"
-msgstr "Auswahl ausschneiden"
+#, fuzzy
+msgid "Cut"
+msgstr "Ausschneiden 1"
 
-#: ../src/rcstrings.c:23
-msgid "Copy Buffer"
-msgstr "Auswahl kopieren"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "Kopieren"
 
 #: ../src/rcstrings.c:24
-msgid "Paste Buffer"
-msgstr "Auswahl einfÃ¼gen"
+#, fuzzy
+msgid "Paste"
+msgstr "EinfÃ¼gen 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -127,7 +130,7 @@ msgstr "Mehrfach Kopier Modus"
 msgid "Move Mode"
 msgstr "Verschiebe Modus"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "LÃ¶schen"
 
@@ -147,11 +150,11 @@ msgstr "Slot..."
 msgid "Color..."
 msgstr "Farbe..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2233
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Sperren"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Entsperren"
 
@@ -260,7 +263,7 @@ msgid "Redraw"
 msgstr "Neu zeichnen"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1504 ../src/i_callbacks.c:1576
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Ausschnitt verschieben"
 
@@ -284,230 +287,238 @@ msgstr "Verkleinern"
 msgid "Zoom Full"
 msgstr "Ganze Seite"
 
+#: ../src/rcstrings.c:71
+msgid "Dark color scheme"
+msgstr ""
+
 #: ../src/rcstrings.c:72
+msgid "Light color scheme"
+msgstr ""
+
+#: ../src/rcstrings.c:74
 msgid "Page"
 msgstr "Seite"
 
-#: ../src/rcstrings.c:73
+#: ../src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Manager..."
 
-#: ../src/rcstrings.c:74
+#: ../src/rcstrings.c:76
 msgid "Next"
 msgstr "NÃ¤chste"
 
-#: ../src/rcstrings.c:75
+#: ../src/rcstrings.c:77
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../src/rcstrings.c:76 ../src/x_window.c:368
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "Neu"
 
-#: ../src/rcstrings.c:77
+#: ../src/rcstrings.c:79
 msgid "Revert"
 msgstr "Wiederherstellen"
 
-#: ../src/rcstrings.c:78
+#: ../src/rcstrings.c:80
 msgid "Close"
 msgstr "SchlieÃ?en"
 
-#: ../src/rcstrings.c:79
+#: ../src/rcstrings.c:81
 msgid "Discard"
 msgstr "Ablegen"
 
-#: ../src/rcstrings.c:81
+#: ../src/rcstrings.c:83
 msgid "Add"
 msgstr "EinfÃ¼gen"
 
-#: ../src/rcstrings.c:82
+#: ../src/rcstrings.c:84
 msgid "Component..."
 msgstr "Bauteil..."
 
 #. need to click
-#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2306 ../src/i_callbacks.c:2333
-#: ../src/x_dialog.c:2200
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "Netz"
 
 #. need to click
-#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2377 ../src/i_callbacks.c:2404
-#: ../src/x_dialog.c:2218 ../src/x_window.c:426
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:85
+#: ../src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Attribut..."
 
-#: ../src/rcstrings.c:86
+#: ../src/rcstrings.c:88
 msgid "Text..."
 msgstr "Text..."
 
-#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2485 ../src/i_callbacks.c:2508
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Linie"
 
-#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2530 ../src/i_callbacks.c:2553
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "Rechteck"
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2609 ../src/i_callbacks.c:2633
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "Kreis"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2655 ../src/i_callbacks.c:2678
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Bogen"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2700 ../src/i_callbacks.c:2723
-#: ../src/x_dialog.c:2191
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "AnschluÃ?"
 
-#: ../src/rcstrings.c:92
+#: ../src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Bild..."
 
-#: ../src/rcstrings.c:94
+#: ../src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-#: ../src/rcstrings.c:95
+#: ../src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "zum Schaltplan hinab"
 
-#: ../src/rcstrings.c:96
+#: ../src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "zum Symbol hinab"
 
-#: ../src/rcstrings.c:97
+#: ../src/rcstrings.c:99
 msgid "Up"
 msgstr "Hinauf"
 
-#: ../src/rcstrings.c:98
+#: ../src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Dokumentation"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100 ../src/x_compselect.c:1418
+#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
 #: ../src/x_multiattrib.c:1543
 msgid "Attributes"
 msgstr "Attribut"
 
-#: ../src/rcstrings.c:101 ../src/i_callbacks.c:3000
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Anbringen"
 
-#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3046
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "AblÃ¶sen"
 
-#: ../src/rcstrings.c:103
+#: ../src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Wert zeigen"
 
-#: ../src/rcstrings.c:104
+#: ../src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Name zeigen"
 
-#: ../src/rcstrings.c:105
+#: ../src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Name & Wert zeigen"
 
-#: ../src/rcstrings.c:106
+#: ../src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Sichbarkeit EIN/AUS"
 
-#: ../src/rcstrings.c:107
+#: ../src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Suche Text..."
 
-#: ../src/rcstrings.c:108
+#: ../src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Verberge Text..."
 
-#: ../src/rcstrings.c:109
+#: ../src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Zeige Text..."
 
-#: ../src/rcstrings.c:110
+#: ../src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Text durchnummerieren..."
 
-#: ../src/rcstrings.c:112
+#: ../src/rcstrings.c:114
 msgid "Options"
 msgstr "Optionen"
 
-#: ../src/rcstrings.c:113
+#: ../src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Text GrÃ¶Ã?e..."
 
-#: ../src/rcstrings.c:114
-msgid "Toggle Grid On/Off"
-msgstr "Raster EIN/AUS"
+#: ../src/rcstrings.c:116
+msgid "Cycle grid styles"
+msgstr ""
 
-#: ../src/rcstrings.c:115
+#: ../src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "am Raster ausrichten EIN/AUS"
 
-#: ../src/rcstrings.c:116
+#: ../src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "RastermaÃ? eingeben..."
 
-#: ../src/rcstrings.c:117
+#: ../src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr "RastermaÃ? vergrÃ¶Ã?ern"
 
-#: ../src/rcstrings.c:118
+#: ../src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr "RastermaÃ? verkleinern"
 
-#: ../src/rcstrings.c:119
+#: ../src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Auswahl Umgebung/Lokal"
 
-#: ../src/rcstrings.c:120
+#: ../src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "GummifÃ¤den EIN/AUS"
 
-#: ../src/rcstrings.c:121
+#: ../src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Statusmeldungen anzeigen..."
 
-#: ../src/rcstrings.c:122
+#: ../src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Koordinaten anzeigen..."
 
-#: ../src/rcstrings.c:124
+#: ../src/rcstrings.c:126
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../src/rcstrings.c:125
+#: ../src/rcstrings.c:127
 msgid "Manual"
 msgstr "Handbuch"
 
-#: ../src/rcstrings.c:126
+#: ../src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "gEDA Dokumentation"
 
-#: ../src/rcstrings.c:127
+#: ../src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "gschem FAQ"
 
-#: ../src/rcstrings.c:128
+#: ../src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Bauteil Dokumentation"
 
-#: ../src/rcstrings.c:129
+#: ../src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Ã?ber gschem"
 
-#: ../src/rcstrings.c:130 ../src/x_dialog.c:2541
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 msgid "Hotkeys"
 msgstr "TastenkÃ¼rzel"
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Bereich zu klein! Eine weitere VergrÃ¶Ã?erung ist nicht mÃ¶glich.\n"
 
@@ -528,98 +539,99 @@ msgstr "Konnte %s nicht aufrufen\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Die Funktion \"Dokumentation\" wird unter MinGW nicht unterstÃ¼tzt.\n"
 
-#: ../src/g_rc.c:140
-#, c-format
-msgid "Invalid color [%s] passed to %s\n"
-msgstr "Eine ungÃ¼ltige Farbe [%s] wurde an %s Ã¼bergeben.\n"
-
-#: ../src/g_rc.c:448
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ein ungÃ¼ltiger VergrÃ¶sserungsfaktor [%d] wurde an %s Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:574
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Eine ungÃ¼ltige GrÃ¶Ã?e [%d] wurde an text-size Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:601
+#: ../src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ein ungÃ¼ltiger Wert [%f] wurde an postscript-font-scale Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:644
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Eine ungÃ¼ltige GrÃ¶Ã?e [%d] wurde an snap-size Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:1116
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Eine ungÃ¼ltige Ebenenanzahl [%d] wurde an undo-levels Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:1374
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Eine ungÃ¼ltige GrÃ¶Ã?e [%d] wurde an bus-ripper-size Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:1449
-#, c-format
-msgid "Invalid dot size [%d] passed to grid-dot-size\n"
+#: ../src/g_rc.c:1293
+#, fuzzy, c-format
+msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "An \"grid-dot-size\" wurde eine falsche PunktgrÃ¶Ã?e [%d] Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:1490
-#, c-format
-msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
+#: ../src/g_rc.c:1334
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
 "An \"grid-fixed-threshold\" wurde ein falscher Punktabstand [%d] Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:1534
+#: ../src/g_rc.c:1360
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
+msgstr ""
+"An \"grid-fixed-threshold\" wurde ein falscher Punktabstand [%d] Ã¼bergeben.\n"
+
+#: ../src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ein ungÃ¼ltiger Offset [%d] wurde an add-attribute-offset Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:1558
+#: ../src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr ""
 "An \"auto-save-interval\" wurde eine ungÃ¼ltige Sekundenanzahl [%d] "
 "Ã¼bergeben\n"
 
-#: ../src/g_rc.c:1599
+#: ../src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ein ungÃ¼ltiger Werte [%d] wurde an mousepan-gain Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:1622
+#: ../src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ein ungÃ¼ltiger Wert [%d] wurde an keyboardpan-gain Ã¼bergeben.\n"
 
-#: ../src/g_rc.c:1668
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 "An \"select-slack-pixels\" wurde eine ungÃ¼ltige Pixelzahl [%d] Ã¼bergeben\n"
 
-#: ../src/g_rc.c:1694
+#: ../src/g_rc.c:1564
 #, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ein unzulÃ¤ssiger Wert [%d] wurde an zoom-gain Ã¼bergeben\n"
 
-#: ../src/g_rc.c:1719
+#: ../src/g_rc.c:1589
 #, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr ""
 "Eine unzulÃ¤ssige Anzahl von Schritten [%d] wurde an scrollpan-steps "
 "Ã¼bergeben\n"
 
-#: ../src/gschem.c:189 ../src/gschem.c:200
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem Version %s%s.%s\n"
 
-#: ../src/gschem.c:192 ../src/gschem.c:203
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -628,7 +640,7 @@ msgstr ""
 "gEDA/gschem kommt OHNE JEGLICHE GARANTIE. Bitte lies die Datei COPYING "
 "fÃ¼rnÃ¤here Informationen.\n"
 
-#: ../src/gschem.c:194 ../src/gschem.c:205
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -636,7 +648,7 @@ msgstr ""
 "Dies ist Freie Software. Sie darf gerne weitergegeben werden. Bitte lies "
 "die\n"
 
-#: ../src/gschem.c:196 ../src/gschem.c:207
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -645,48 +657,61 @@ msgstr ""
 "Lizenzbestimmungen in der Datei COPYING fÃ¼r nÃ¤here Informationen.\n"
 "\n"
 
-#: ../src/gschem.c:211
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Dies ist die MINGW32 Portierung.\n"
 
-#: ../src/gschem.c:215
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Aktuelle Spracheinstellungen: %s\n"
 
-#: ../src/gschem.c:228
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "Die Umgebungsvariable GEDADATA muÃ? gesetzt werden!\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:245
+#: ../src/gschem.c:251
 #, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Die init scm Datei wurde nicht gefunden [%s]\n"
 
-#: ../src/gschem.c:249
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lese init scm Datei [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:253
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Die Datei init scm [%s] konnte nicht gelesen werden.\n"
 
-#: ../src/gschem.c:315
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Das scheme Verzeichnis wurde nicht definiert!\n"
 
-#: ../src/gschem.c:322 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "FÃ¼hre guile scipt aus [%s]\n"
 
+#: ../src/gschem_cairo.c:310
+#, c-format
+msgid "Unknown end for line (%d)\n"
+msgstr "Undefiniertes Ende einer Linie (%d)\n"
+
+#: ../src/gschem_cairo.c:318
+#, fuzzy, c-format
+msgid "Unknown type for stroke (%d) !\n"
+msgstr "Undefinierter Type der Linie (%d).\n"
+
 #: ../src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Bauteil Modus"
@@ -744,15 +769,11 @@ msgstr "Bogen Modus"
 msgid "Pin Mode"
 msgstr "AnschluÃ? Modus"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Kopieren"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "Verschieben"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Mehrfaches Kopieren"
 
@@ -764,27 +785,35 @@ msgstr "Zeige Unsichbares"
 msgid "Snap Off"
 msgstr "Am Raster ausrichten aus"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:547
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "Aktion"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2230 ../src/x_window.c:542
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr "Taste"
 
-#: ../src/i_basic.c:264 ../src/x_window.c:544
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "nichts"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Wiederhole/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr "AUS"
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
+msgid "NONE"
+msgstr ""
+
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Raster(%s, %s)"
@@ -794,72 +823,77 @@ msgstr "Raster(%s, %s)"
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Dokumentation von [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1701
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Neue Seite erzeugt [%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:467
+#: ../src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Neues Fenster geÃ¶ffnet [%s]\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Alles speichern fehlgeschlagen"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Alles gespeichert"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "SchlieÃ?e Fenster\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "WÃ¤hle erst Objekte aus"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Editiere Linienart"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Text bearbeiten"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Farbe"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Drehen"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Spiegeln"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1623
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Verschieben nach"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr ""
 "ACHTUNG: Keine Transformation mit ausgeschalteter Ausrichtung am Raster!\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr ""
 "ACHTUNG:\"am Raster ausrichten\" wird aktiviert und mit der Transformation "
 "fortgefahren.\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ACHTUNG: Das Raster ist ungleich 100!\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -867,140 +901,145 @@ msgstr ""
 "ACHTUNG: Wenn ein Symbol transformiert wird, sollte das Raster auf 100 "
 "gesetzt sein.\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Einbetten"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Ausbetten"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "Zeige Unsichbares"
 
-#: ../src/i_callbacks.c:1142
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "Sichbar Machen"
 
-#: ../src/i_callbacks.c:1259
-msgid "Edit Line Type"
-msgstr "Editiere Linienart"
-
-#: ../src/i_callbacks.c:1301 ../src/x_dialog.c:1243
-msgid "Edit Fill Type"
-msgstr "Editiere FÃ¼llmuster"
-
-#: ../src/i_callbacks.c:1595
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr "Ansicht aktualisieren (update cues)"
 
-#: ../src/i_callbacks.c:1745
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr "Seite wirklich wiederherstellen?"
 
-#: ../src/i_callbacks.c:1817
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "EinfÃ¼gen aus 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Leerer Zwischenspeicher"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Kopie 1"
 
-#: ../src/i_callbacks.c:1836
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Kopie 2"
 
-#: ../src/i_callbacks.c:1855
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Kopie 3"
 
-#: ../src/i_callbacks.c:1874
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Kopie 4"
 
-#: ../src/i_callbacks.c:1893
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Kopie 5"
 
-#: ../src/i_callbacks.c:1912
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Ausschneiden 1"
 
-#: ../src/i_callbacks.c:1931
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Ausschneiden 2"
 
-#: ../src/i_callbacks.c:1950
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Ausschneiden 3"
 
-#: ../src/i_callbacks.c:1969
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Ausschneiden 4"
 
-#: ../src/i_callbacks.c:1988
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Ausschneiden 5"
 
-#: ../src/i_callbacks.c:2004
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "EinfÃ¼gen 1"
 
-#: ../src/i_callbacks.c:2011 ../src/i_callbacks.c:2033
-#: ../src/i_callbacks.c:2055 ../src/i_callbacks.c:2077
-#: ../src/i_callbacks.c:2099
-msgid "Empty buffer"
-msgstr "Leerer Zwischenspeicher"
-
-#: ../src/i_callbacks.c:2026
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "EinfÃ¼gen 2"
 
-#: ../src/i_callbacks.c:2048
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "EinfÃ¼gen 3"
 
-#: ../src/i_callbacks.c:2070
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "EinfÃ¼gen 4"
 
-#: ../src/i_callbacks.c:2092
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "EinfÃ¼gen 5"
 
-#: ../src/i_callbacks.c:2229 ../src/x_window.c:406
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Bauteil"
 
-#: ../src/i_callbacks.c:2265 ../src/i_callbacks.c:2284 ../src/x_dialog.c:2203
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Attribut"
 
-#: ../src/i_callbacks.c:2781
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Suche nach der Quelle [%s]\n"
 
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Die Quelle [%s] konnte nicht gefunden werden.\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Suche nach dem Symbol [%s]\n"
 
-#: ../src/i_callbacks.c:2878
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr "Das Symbol ist keine reale Datei. Symbol kann nicht geÃ¶ffnet werden.\n"
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr "Konnte keinen Ã¼bergeordneten Schaltplan finden!\n"
 
-#: ../src/i_callbacks.c:2972
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1008,148 +1047,114 @@ msgstr ""
 "Dieser Befehl sucht die Dokumentation eines Bauteils im Internet, aber es "
 "wurde kein Bauteil ausgewÃ¤hlt"
 
-#: ../src/i_callbacks.c:3084
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "ShowN"
 
-#: ../src/i_callbacks.c:3120
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "ShowV"
 
-#: ../src/i_callbacks.c:3156
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "ShowB"
 
-#: ../src/i_callbacks.c:3193
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "VisToggle"
 
-#: ../src/i_callbacks.c:3223
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Dieser Menupunkt funktioniert nicht. Sorry.\n"
 
-#: ../src/i_callbacks.c:3311
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Aktions-RÃ¼ckmelde-Modus wurde auf OUTLINE gesetzt.\n"
 
-#: ../src/i_callbacks.c:3314
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Aktions-RÃ¼ckmelde-Modus wurde auf BOUNDINGBOX gesetzt.\n"
 
-#: ../src/i_callbacks.c:3331
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Raster AUS\n"
 
-#: ../src/i_callbacks.c:3334
-msgid "Grid ON\n"
-msgstr "Raster EIN\n"
+#: ../src/i_callbacks.c:3435
+msgid "Dot grid selected\n"
+msgstr ""
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3436
+msgid "Mesh grid selected\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Freihandmodus (ACHTUNG! Ausrichten am Raster abgeschaltet)\n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "Am Raster ausrichten\n"
 
-#: ../src/i_callbacks.c:3374
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "Freihandmodus (ACHTUNG! Ausrichten am Raster abgeschaltet)\n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr "GummifÃ¤den AUS\n"
 
-#: ../src/i_callbacks.c:3377
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr "GummifÃ¤den EIN\n"
 
-#: ../src/i_callbacks.c:3392
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr "magnetischer Netz Modus: Ein\n"
 
-#: ../src/i_callbacks.c:3395
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr "magnetischer Netz Modus: Aus\n"
 
-#: ../src/o_arc.c:120
-#, c-format
-msgid "Unknown end for arc (%d)\n"
-msgstr "Undefiniertes Ende des Kreisbogens (%d)\n"
-
-#: ../src/o_arc.c:160
-#, c-format
-msgid "Unknown type for arc !\n"
-msgstr "Undefinierter Typ fÃ¼r einen Kreisbogen\n"
-
-#: ../src/o_box.c:136
-#, c-format
-msgid "Unknown end for box (%d)\n"
-msgstr "Undefiniertes Ende fÃ¼r ein Rechteck (%d)\n"
-
-#: ../src/o_box.c:176
-#, c-format
-msgid "Unknown type for box !\n"
-msgstr "Undefinierter Typ fÃ¼r das Rechteck!\n"
-
-#: ../src/o_box.c:260
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Undefinierter Typ fÃ¼r das Rechteck (FÃ¼llung)!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
-"Eine ungÃ¼ltige Zwischenspeichernummer wurde Ã¼bergeben [o_buffer_copy]\n"
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
-msgstr "Eine ungÃ¼ltige Zwischenspeichernummer wurde Ã¼bergeben [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 "Eine ungÃ¼ltige Zwischenspeichernummer wurde Ã¼bergeben "
 "[o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:183
-#, c-format
-msgid "Got an invalid which one in o_bus_draw_xor_single\n"
+#: ../src/o_bus.c:135
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr ""
 "UngÃ¼ltiger Wert in Variable whichone in der Funktion o_bus_draw_xor_single\n"
 
-#: ../src/o_circle.c:127
-#, c-format
-msgid "Unknown end for circle\n"
-msgstr "Undefiniertes Ende eines Kreises\n"
-
-#. just to be careful
-#: ../src/o_circle.c:163
-#, c-format
-msgid "Unknown type for circle!\n"
-msgstr "Undefinierter Typ fÃ¼r einen Kreis\n"
-
-#: ../src/o_circle.c:245
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Undefinierter Typ fÃ¼r einen Kreis (FÃ¼llung).\n"
 
-#: ../src/o_complex.c:251 ../src/o_complex.c:255
+#: ../src/o_complex.c:250 ../src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Verschiebe Schaltplan [%d %d]\n"
 
-#: ../src/o_line.c:111
-#, c-format
-msgid "Unknown end for line (%d)\n"
-msgstr "Undefiniertes Ende einer Linie (%d)\n"
-
-#. just to be careful
-#: ../src/o_line.c:151
-#, c-format
-msgid "Unknown type for line (%d) !\n"
-msgstr "Undefinierter Type der Linie (%d).\n"
-
 #: ../src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
@@ -1163,40 +1168,40 @@ msgstr "Objekt bereits gesperrt\n"
 msgid "Object already unlocked\n"
 msgstr "Objekt bereits entsperrt\n"
 
-#: ../src/o_misc.c:444
+#: ../src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Verborgener Text ist jetzt sichtbar.\n"
 
-#: ../src/o_misc.c:446
+#: ../src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Verborgener Text ist jetzt unsichbar.\n"
 
-#: ../src/o_misc.c:694
+#: ../src/o_misc.c:697
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 "Das Symbol [%s] konnte nicht gefunden werden. Aktualisierung "
 "fehlgeschlagen.\n"
 
-#: ../src/o_misc.c:837
+#: ../src/o_misc.c:840
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 "o_autosave_backups: Konnte den tatsÃ¤chlichen Dateinamen von %s nicht "
 "ermitteln."
 
-#: ../src/o_misc.c:881
+#: ../src/o_misc.c:884
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Die vorherige Backup-Datei [%s] konnte nicht auf read-write gesetzt werden.\n"
 
-#: ../src/o_misc.c:899
+#: ../src/o_misc.c:902
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Die Backup-Datei [%s] konnte nicht auf readonly gesetzt werden.\n"
 
-#: ../src/o_misc.c:904
+#: ../src/o_misc.c:907
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Die Backup-Datei [%s] konnte nicht gespeichert werden.\n"
@@ -1206,63 +1211,53 @@ msgstr "Die Backup-Datei [%s] konnte nicht gespeichert werden.\n"
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "FEHLER: NULL Objekt innerhalb von o_move_end.\n"
 
-#: ../src/o_move.c:385
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 "Versuchte vergebens das Objekt innerhalb von o_move_return_whichone zu "
 "finden.\n"
 
-#: ../src/o_move.c:406
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Da ist ein Objekt in o_move_check_endpoint, welches keine Linie ist.\n"
 
-#: ../src/o_net.c:253
-#, c-format
-msgid "Got an invalid which one in o_net_draw_xor_single\n"
+#: ../src/o_net.c:176
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 "UngÃ¼ltiger Wert der Variablen whichone innerhalb von o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:630
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 "Achtung: Der Startpunkt des Netzes befindet sich nicht auf dem Raster\n"
 
-#: ../src/o_net.c:692
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr "Achtung: Das Ende des Netzes befindet sich nicht auf dem Raster\n"
 
 #. try to exit gracefully
-#: ../src/o_net.c:1080 ../src/o_net.c:1117 ../src/o_net.c:1188
-#: ../src/o_net.c:1224
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Interner gschem Fehler: Versuchte mehr als zwei Bus Abzweigungen "
 "hinzuzufÃ¼gen\n"
 
-#: ../src/o_net.c:1294
+#: ../src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Das Busripper Symbol [%s] wurde in keiner Bauteilbibliothek gefunden\n"
 
-#: ../src/o_path.c:483
-#, c-format
-msgid "Unknown end for path (%d)\n"
-msgstr "Unbekanntes Linienende einer Pfad-Definition (%d)\n"
-
-#: ../src/o_path.c:524
-#, c-format
-msgid "Unknown type for path !\n"
-msgstr "Unbekannter Linientyp einer Pfad-Definition!\n"
-
-#: ../src/o_path.c:594
+#: ../src/o_path.c:356
 #, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Unbekannte FÃ¼llart einer Pfad-Definition!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:627
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Das Bild [%s] konnte nicht geladen werden"
@@ -1271,7 +1266,7 @@ msgstr "Das Bild [%s] konnte nicht geladen werden"
 msgid "Picture"
 msgstr "Bild"
 
-#: ../src/o_picture.c:535 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "FEHLER: NULL Objekt!\n"
@@ -1388,7 +1383,7 @@ msgstr "Alle"
 msgid "Components"
 msgstr "Bauteile"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:416
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "Netz"
 
@@ -1396,7 +1391,7 @@ msgstr "Netz"
 msgid "Replace existing attributes"
 msgstr "Vorhandene Attribute ersetzen"
 
-#: ../src/x_autonumber.c:412
+#: ../src/x_autonumber.c:413
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1405,7 +1400,7 @@ msgstr ""
 "automatischen Nummerieren von Bauteilen Probleme verursachen.\n"
 
 #. duplicate slot in used_slots
-#: ../src/x_autonumber.c:427
+#: ../src/x_autonumber.c:428
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
@@ -1413,137 +1408,136 @@ msgstr ""
 "Doppelt vergebener slot kann Probleme verursachen: [Symbolname=%s, Number=%"
 "d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:695
+#: ../src/x_autonumber.c:696
 msgid "No searchstring given in autonumber text.\n"
 msgstr "Es wurde kein Suchstring im Dialog eingegeben.\n"
 
-#: ../src/x_autonumber.c:746
+#: ../src/x_autonumber.c:748
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr "Am Ende des Suchstrings fehlt ein '*' oder ein '?'.\n"
 
-#: ../src/x_autonumber.c:880
+#: ../src/x_autonumber.c:883
 msgid "Diagonal"
 msgstr "Diagonal"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Top to bottom"
 msgstr "Von oben nach unten"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Bottom to top"
 msgstr "Von unten nach oben"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Left to right"
 msgstr "Von links nach rechts"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Right to left"
 msgstr "Von rechts nach links"
 
-#: ../src/x_autonumber.c:883
+#: ../src/x_autonumber.c:886
 msgid "File order"
 msgstr "Dateireihenfolge"
 
-#: ../src/x_autonumber.c:1219
+#: ../src/x_autonumber.c:1222
 msgid "Autonumber text"
 msgstr "Nummeriere Text automatisch"
 
 #. scope section
-#: ../src/x_autonumber.c:1243
+#: ../src/x_autonumber.c:1246
 msgid "<b>Scope</b>"
 msgstr "<b>Suchbereich</b>"
 
-#: ../src/x_autonumber.c:1265
+#: ../src/x_autonumber.c:1268
 msgid "Search for:"
 msgstr "Suchen nach:"
 
-#: ../src/x_autonumber.c:1279
+#: ../src/x_autonumber.c:1282
 msgid "Autonumber text in:"
 msgstr "Nummeriere Text in:"
 
-#: ../src/x_autonumber.c:1286
+#: ../src/x_autonumber.c:1289
 msgid "Skip numbers found in:"
 msgstr "Ã?berspringe Nummern:"
 
-#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
 msgid "Selected objects"
 msgstr "AusgewÃ¤hlte Objekte"
 
-#: ../src/x_autonumber.c:1299 ../src/x_autonumber.c:1308
+#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
 msgid "Current page"
 msgstr "Aktuelle Seite"
 
-#: ../src/x_autonumber.c:1300 ../src/x_autonumber.c:1309
+#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
 msgid "Whole hierarchy"
 msgstr "Gesamte Hierarchie"
 
-#: ../src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1314
 msgid "Overwrite existing numbers"
 msgstr "Vorhandene Nummern Ã¼berschreiben"
 
 #. Options section
-#: ../src/x_autonumber.c:1316
+#: ../src/x_autonumber.c:1319
 msgid "<b>Options</b>"
 msgstr "<b>Optionen</b>"
 
-#: ../src/x_autonumber.c:1338
+#: ../src/x_autonumber.c:1341
 msgid "Starting number:"
 msgstr "Startnummer:"
 
-#: ../src/x_autonumber.c:1345
+#: ../src/x_autonumber.c:1348
 msgid "Sort order:"
 msgstr "Sortierung:"
 
-#: ../src/x_autonumber.c:1366
+#: ../src/x_autonumber.c:1369
 msgid "Remove numbers"
 msgstr "Nummern entfernen"
 
-#: ../src/x_autonumber.c:1370
+#: ../src/x_autonumber.c:1373
 msgid "Automatic slotting"
 msgstr "Automatische Nummerierung von Slots"
 
-#: ../src/x_color.c:52 ../src/x_color.c:61 ../src/x_color.c:124
-#: ../src/x_color.c:172
+#: ../src/x_color.c:94 ../src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Konnte die Farbe %s nicht zuteilen!\n"
 
-#: ../src/x_color.c:52
+#: ../src/x_color.c:94
 msgid "black"
 msgstr "schwarz"
 
-#: ../src/x_color.c:61
+#: ../src/x_color.c:103
 msgid "white"
 msgstr "weiss"
 
-#: ../src/x_color.c:103 ../src/x_color.c:140
-#, c-format
-msgid "Could not find the color %s!\n"
-msgstr "Die Farbe %s wurde nicht gefunden.\n"
-
-#: ../src/x_color.c:106 ../src/x_color.c:143
-#, c-format
-msgid "Defaulting color to white\n"
-msgstr "Nehme als Voreinstellung die Farbe weiÃ?\n"
+#: ../src/x_color.c:125
+#, fuzzy, c-format
+msgid "Could not allocate display color %i!\n"
+msgstr "Konnte die Farbe %s nicht zuteilen!\n"
 
-#: ../src/x_color.c:113 ../src/x_color.c:150
-#, c-format
-msgid "Ack! Cannot allocate white!\n"
-msgstr "Ups! Kann die Farbe weiÃ? nicht zuteilen.\n"
+#: ../src/x_color.c:147
+#, fuzzy, c-format
+msgid "Could not allocate outline color %i!\n"
+msgstr "Konnte die Farbe %s nicht zuteilen!\n"
 
-#: ../src/x_color.c:191 ../src/x_color.c:207
+#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Versuchte eine ungÃ¼ltige Farbe zuzuteilen: %d\n"
 
+#: ../src/x_color.c:214
+#, fuzzy, c-format
+msgid "Tried to get an invalid outline color: %d\n"
+msgstr "Versuchte eine ungÃ¼ltige Farbe zuzuteilen: %d\n"
+
 #. GtkLabel
 #: ../src/x_compselect.c:1040
 msgid "Filter:"
 msgstr "Filter:"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3591
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Name"
@@ -1584,11 +1578,11 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Text Eingabe..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1598,182 +1592,185 @@ msgstr ""
 "bewege den Cursor ins Fenster, klicke um den Text zu plazieren.\n"
 "Mittlere Maustaste dreht wÃ¤hrend des Plazierens."
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "Unten Links"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Mitte Links"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "Oben Links"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "Unten Mitte"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Mitte Mitte"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "Oben Mitte"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "Unten Rechts"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Mitte Rechts"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "0ben Rechts"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Text Eigenschaften bearbeiten"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Textinhalt</b>"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Texteigenschaften</b>"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 msgid "Color:"
 msgstr "Farbe:"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr "GrÃ¶Ã?e:"
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Ausrichtung:"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "Durchgehend"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Gepunktet"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Gestrichelt"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "StrichPunkt"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "StrichZweiPunkt"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:964 ../src/x_dialog.c:965 ../src/x_dialog.c:966
-#: ../src/x_dialog.c:974 ../src/x_dialog.c:1157 ../src/x_dialog.c:1159
-#: ../src/x_dialog.c:1161 ../src/x_dialog.c:1163 ../src/x_dialog.c:1165
-#: ../src/x_dialog.c:1368 ../src/x_dialog.c:1369 ../src/x_dialog.c:1370
-#: ../src/x_dialog.c:1371 ../src/x_dialog.c:1372 ../src/x_dialog.c:1380
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*unverÃ¤ndert*"
 
-#: ../src/x_dialog.c:858
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Linieneigenschaften bearbeiten"
 
-#: ../src/x_dialog.c:897
-msgid "Width:"
-msgstr "Breite:"
-
-#: ../src/x_dialog.c:901 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/x_dialog.c:905
+#: ../src/x_dialog.c:1021
+msgid "Width:"
+msgstr "Breite:"
+
+#: ../src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "LinienlÃ¤nge:"
 
-#: ../src/x_dialog.c:909
+#: ../src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "LinienlÃ¼cke:"
 
-#: ../src/x_dialog.c:1014
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Leer"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "GefÃ¼llt"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Gitter"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Schraffiert"
 
-#: ../src/x_dialog.c:1281
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Editiere FÃ¼llmuster"
+
+#: ../src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "FÃ¼llmuster:"
 
-#: ../src/x_dialog.c:1285
+#: ../src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Linienbreite:"
 
-#: ../src/x_dialog.c:1289
+#: ../src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Winkel 1:"
 
-#: ../src/x_dialog.c:1293
+#: ../src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Abstand 1:"
 
-#: ../src/x_dialog.c:1297
+#: ../src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Winkel 2:"
 
-#: ../src/x_dialog.c:1301
+#: ../src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Abstand 2:"
 
-#: ../src/x_dialog.c:1480
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Bogen Parameter"
 
-#: ../src/x_dialog.c:1520
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr "Bogen Radius:"
 
-#: ../src/x_dialog.c:1528
+#: ../src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Start Winkel:"
 
-#: ../src/x_dialog.c:1536
+#: ../src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Ã?ffnungswinkel:"
 
-#: ../src/x_dialog.c:1653
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1781,44 +1778,44 @@ msgstr ""
 "Wie weit soll verschoben werden?\n"
 "(0 verschiebt zum Ursprung)"
 
-#: ../src/x_dialog.c:1721
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Text GrÃ¶Ã?e"
 
-#: ../src/x_dialog.c:1751
+#: ../src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Neue TextgrÃ¶Ã?e eingeben:"
 
-#: ../src/x_dialog.c:1826
+#: ../src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Rasterabstand"
 
-#: ../src/x_dialog.c:1856
+#: ../src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Neuen Rasterabstand eingeben"
 
-#: ../src/x_dialog.c:1929
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "Editiere slot Nummer"
 
-#: ../src/x_dialog.c:1960
+#: ../src/x_dialog.c:2138
 msgid "Edit slot number:"
 msgstr "Editiere slot Nummer:"
 
-#: ../src/x_dialog.c:2022
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "Ã?ber..."
 
-#: ../src/x_dialog.c:2042
+#: ../src/x_dialog.c:2220
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA : GPL Electronic Design Automation</b>"
 
-#: ../src/x_dialog.c:2046
+#: ../src/x_dialog.c:2224
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem Version %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2054
+#: ../src/x_dialog.c:2232
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1830,131 +1827,139 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "und vielen anderen (siehe Datei: AUTHORS)"
 
-#: ../src/x_dialog.c:2119
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Koordinaten"
 
-#: ../src/x_dialog.c:2140
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "Bildschirm (Pixel)"
 
-#: ../src/x_dialog.c:2149
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "Global (0.001\")"
 
-#: ../src/x_dialog.c:2188
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr "Hintergrund"
 
-#: ../src/x_dialog.c:2194
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr "Netz-Endemarkierung"
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr "Graphik"
 
-#: ../src/x_dialog.c:2206
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr "Logik Markierung"
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr "Rasterpunkt"
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2388
 msgid "Detached attribute"
 msgstr "Attribut ablÃ¶sen"
 
-#: ../src/x_dialog.c:2215 ../src/x_window.c:434
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Text"
 
-#: ../src/x_dialog.c:2221
+#: ../src/x_dialog.c:2397
 msgid "Selection"
 msgstr "Auswahl"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr "Randmarkierung"
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2403
 msgid "Zoom box"
 msgstr "Ausschnitt wÃ¤hlen"
 
-#: ../src/x_dialog.c:2236
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr "Ausgabehintergrund"
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2415
 msgid "Net junction"
 msgstr "Netzverbindung"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/x_dialog.c:2390
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "FEHLER: NULL Objekt innerhalb von color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2452
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "Farbe bearbeiten"
 
-#: ../src/x_dialog.c:2483
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr "Objekt Farbe:"
 
-#: ../src/x_dialog.c:2605
+#: ../src/x_dialog.c:2786
 msgid "Function"
 msgstr "Funktion"
 
-#: ../src/x_dialog.c:2612
+#: ../src/x_dialog.c:2793
 msgid "Keystroke(s)"
 msgstr "TastenkÃ¼rzel"
 
-#: ../src/x_dialog.c:2921
+#: ../src/x_dialog.c:3102
 msgid "Find Text"
 msgstr "Suche Text"
 
-#: ../src/x_dialog.c:2952
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Zu suchender Text:"
 
-#: ../src/x_dialog.c:2962
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "In der Hierachie hinabsteigen"
 
-#: ../src/x_dialog.c:3026
+#: ../src/x_dialog.c:3208
 msgid "Hide Text"
 msgstr "Verberge Text"
 
-#: ../src/x_dialog.c:3057
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Verberge Text, der beginnt mit:"
 
-#: ../src/x_dialog.c:3125
+#: ../src/x_dialog.c:3308
 msgid "Show Text"
 msgstr "Zeige Text"
 
-#: ../src/x_dialog.c:3156
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Zeige Text, der beginnt mit:"
 
-#: ../src/x_dialog.c:3613
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr "_WÃ¤hlen Sie die zu speichernden Seiten:"
 
-#: ../src/x_dialog.c:3707
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 "Sollen die Ã?nderungen am Schaltplan \"%s\" vor dem SchlieÃ?en gespeichert "
 "werden?"
 
-#: ../src/x_dialog.c:3713
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1963,15 +1968,15 @@ msgstr ""
 "gespeichert werden?"
 
 #. secondary label
-#: ../src/x_dialog.c:3742
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Wenn Sie nicht speichern, werden Sie alle Ã?nderungen verlieren."
 
-#: ../src/x_dialog.c:3762
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr "SchlieÃ?en _ohne Speichern"
 
-#: ../src/x_dialog.c:4096
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1989,10 +1994,24 @@ msgstr ""
 "Der Name darf nicht mit einem Leerzeichen enden.\n"
 "Der Wert darf nicht mit einem Leerzeichen beginnen."
 
-#: ../src/x_dialog.c:4098
+#: ../src/x_dialog.c:4281
 msgid "Invalid Attribute"
 msgstr "Fehlerhaftes Attribut"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Linien Typ"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "Netz-Endemarkierung"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "SchaltplÃ¤ne"
@@ -2141,53 +2160,58 @@ msgid "/Edit..."
 msgstr "/Bearbeiten..."
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Editiere Linienart"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Kopieren"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/Verschieben"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/LÃ¶schen"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/zum Schaltplan hinab"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/zum Symbol hinab"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Hinauf"
 
-#: ../src/x_menus.c:323
+#: ../src/x_menus.c:316
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 "Es wurde versucht die Empfindlichkeit des nicht existenten Menueintrags '%s' "
 "zu setzen\n"
 
-#: ../src/x_menus.c:347
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory existiert nicht\n"
 
-#: ../src/x_menus.c:360
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Es wurde versucht die SensibilitÃ¤t fÃ¼r einen nichtexistierenden Menueintrag "
 "zu setzen\n"
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:455
+#: ../src/x_menus.c:462
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Konnte Datei %s nicht Ã¶ffnen\n"
 
-#: ../src/x_menus.c:516
+#: ../src/x_menus.c:524
 msgid "Clear"
 msgstr "Entfernen"
 
@@ -2254,6 +2278,11 @@ msgstr "GeÃ¤ndert"
 msgid "Right click on the filename for more options..."
 msgstr "Rechtsklick auf den Dateinamen fÃ¼r mehr Optionen..."
 
+#: ../src/x_preview.c:223
+#, fuzzy
+msgid "Preview Buffer"
+msgstr "Auswahl einfÃ¼gen"
+
 #: ../src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "PostScript Dateinamen auswÃ¤hlen..."
@@ -2332,55 +2361,35 @@ msgstr "Aktueller Schalplan in [%s] ausgedruckt\n"
 msgid "Couldn't allocate gc\n"
 msgstr "Konnte gc in x_window_setup_gc nicht zuweisen\n"
 
-#: ../src/x_window.c:94
-#, c-format
-msgid "Couldn't allocate xor_gc\n"
-msgstr "Konnte xor_gc in x_window_setup_gc nicht zuweisen\n"
-
-#: ../src/x_window.c:107
-#, c-format
-msgid "Couldn't allocate outline_xor_gc\n"
-msgstr "Konnte outline_xor_gc in x_window_setup_gc nicht zuweisen\n"
-
-#: ../src/x_window.c:123
-#, c-format
-msgid "Couldn't allocate bounding_xor_gc\n"
-msgstr "Konnte bounding_xor_gc in x_window_setup_gc nicht zuweisen\n"
-
-#: ../src/x_window.c:130
-#, c-format
-msgid "Couldn't allocate bus_gc\n"
-msgstr "Konnte bus_gc in x_window_setup_gc nicht zuweisen\n"
-
-#: ../src/x_window.c:369
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "Neue Datei"
 
-#: ../src/x_window.c:375
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Ã?ffnen"
 
-#: ../src/x_window.c:376
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Datei Ã¶ffnen..."
 
-#: ../src/x_window.c:382
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/x_window.c:383
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Datei speichern"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "letzte Aktion rÃ¼ckgÃ¤ngig machen"
 
-#: ../src/x_window.c:398
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "letzte Aktion wiederherstellen"
 
-#: ../src/x_window.c:407
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2392,7 +2401,7 @@ msgstr ""
 "und klicke um es zu plazieren\n"
 "mit rechter Maustaste abbrechen"
 
-#: ../src/x_window.c:417
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2400,7 +2409,7 @@ msgstr ""
 "Netz einfÃ¼gen\n"
 "mit rechter Maustaste abbrechen"
 
-#: ../src/x_window.c:427
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2408,78 +2417,78 @@ msgstr ""
 "Bus einfÃ¼gen\n"
 "mit rechter Maustaste abbrechen"
 
-#: ../src/x_window.c:435
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "Text einfÃ¼gen..."
 
-#: ../src/x_window.c:445
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "AuswÃ¤hlen"
 
-#: ../src/x_window.c:446
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "Auswahl Modus"
 
-#: ../src/x_window.c:533
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "AuswÃ¤hlen"
 
-#: ../src/x_window.c:549
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Wiederholen/nichts"
 
-#: ../src/x_window.c:559
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Cancel"
 
-#: ../src/x_window.c:561
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Ausschnitt/Cancel"
 
-#: ../src/x_window.c:783
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Lade Schaltplan [%s]\n"
 
-#: ../src/x_window.c:795
+#: ../src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Eine Datei konnte nicht geladen werden"
 
-#: ../src/x_window.c:804
+#: ../src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "Neue Datei [%s]\n"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:909
+#: ../src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Die Seite [%s] konnte nicht gespeichert werden.\n"
 
-#: ../src/x_window.c:910
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Fehler wÃ¤hrend des Speicherns"
 
-#: ../src/x_window.c:919
+#: ../src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Gespeichert unter [%s]\n"
 
-#: ../src/x_window.c:921
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Gespeichert [%s]\n"
 
-#: ../src/x_window.c:923
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "SchlieÃ?e Schaltplan [%s]\n"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "SchlieÃ?e [%s]\n"
@@ -2494,6 +2503,77 @@ msgstr ""
 msgid "gEDA Schematic Editor"
 msgstr "gEDA Schaltplan Editor"
 
+#~ msgid "Cut Buffer"
+#~ msgstr "Auswahl ausschneiden"
+
+#~ msgid "Copy Buffer"
+#~ msgstr "Auswahl kopieren"
+
+#~ msgid "Toggle Grid On/Off"
+#~ msgstr "Raster EIN/AUS"
+
+#~ msgid "Invalid color [%s] passed to %s\n"
+#~ msgstr "Eine ungÃ¼ltige Farbe [%s] wurde an %s Ã¼bergeben.\n"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "Die Umgebungsvariable GEDADATA muÃ? gesetzt werden!\n"
+
+#~ msgid "Grid ON\n"
+#~ msgstr "Raster EIN\n"
+
+#~ msgid "Unknown end for arc (%d)\n"
+#~ msgstr "Undefiniertes Ende des Kreisbogens (%d)\n"
+
+#~ msgid "Unknown type for arc !\n"
+#~ msgstr "Undefinierter Typ fÃ¼r einen Kreisbogen\n"
+
+#~ msgid "Unknown end for box (%d)\n"
+#~ msgstr "Undefiniertes Ende fÃ¼r ein Rechteck (%d)\n"
+
+#~ msgid "Unknown type for box !\n"
+#~ msgstr "Undefinierter Typ fÃ¼r das Rechteck!\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+#~ msgstr ""
+#~ "Eine ungÃ¼ltige Zwischenspeichernummer wurde Ã¼bergeben [o_buffer_copy]\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+#~ msgstr ""
+#~ "Eine ungÃ¼ltige Zwischenspeichernummer wurde Ã¼bergeben [o_buffer_cut]\n"
+
+#~ msgid "Unknown end for circle\n"
+#~ msgstr "Undefiniertes Ende eines Kreises\n"
+
+#~ msgid "Unknown type for circle!\n"
+#~ msgstr "Undefinierter Typ fÃ¼r einen Kreis\n"
+
+#~ msgid "Unknown end for path (%d)\n"
+#~ msgstr "Unbekanntes Linienende einer Pfad-Definition (%d)\n"
+
+#~ msgid "Unknown type for path !\n"
+#~ msgstr "Unbekannter Linientyp einer Pfad-Definition!\n"
+
+#~ msgid "Could not find the color %s!\n"
+#~ msgstr "Die Farbe %s wurde nicht gefunden.\n"
+
+#~ msgid "Defaulting color to white\n"
+#~ msgstr "Nehme als Voreinstellung die Farbe weiÃ?\n"
+
+#~ msgid "Ack! Cannot allocate white!\n"
+#~ msgstr "Ups! Kann die Farbe weiÃ? nicht zuteilen.\n"
+
+#~ msgid "Couldn't allocate xor_gc\n"
+#~ msgstr "Konnte xor_gc in x_window_setup_gc nicht zuweisen\n"
+
+#~ msgid "Couldn't allocate outline_xor_gc\n"
+#~ msgstr "Konnte outline_xor_gc in x_window_setup_gc nicht zuweisen\n"
+
+#~ msgid "Couldn't allocate bounding_xor_gc\n"
+#~ msgstr "Konnte bounding_xor_gc in x_window_setup_gc nicht zuweisen\n"
+
+#~ msgid "Couldn't allocate bus_gc\n"
+#~ msgstr "Konnte bus_gc in x_window_setup_gc nicht zuweisen\n"
+
 #~ msgid "Got NULL in o_attrib_toggle_visibility\n"
 #~ msgstr "Erhielt NULL von o_attrib_toggle_visibility\n"
 
@@ -2653,9 +2733,6 @@ msgstr "gEDA Schaltplan Editor"
 #~ msgid "Edit Text Color"
 #~ msgstr "Textfarbe bearbeiten"
 
-#~ msgid "Line Type"
-#~ msgstr "Linien Typ"
-
 #~ msgid "String too long... hack!\n"
 #~ msgstr "Zeichenkette zu lang... Hack!\n"
 
diff --git a/gschem/po/en_GB.po b/gschem/po/en_GB.po
index 9973f1f..1f10e3d 100644
--- a/gschem/po/en_GB.po
+++ b/gschem/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geda-schem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-02 21:29+0000\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2009-01-02 14:32+0100\n"
 "Last-Translator: Peter Clifton <pcjc2@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -61,7 +61,7 @@ msgstr "Print..."
 msgid "Write image..."
 msgstr "Write image..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:490
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 msgid "Recent files"
 msgstr "Recent files"
 
@@ -77,33 +77,36 @@ msgstr "Close Window"
 msgid "Quit"
 msgstr "Quit"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Edit"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:335
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "Undo"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:342
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Redo"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:518
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "Select Mode"
 
 #: ../src/rcstrings.c:22
-msgid "Cut Buffer"
-msgstr "Cut Buffer"
+#, fuzzy
+msgid "Cut"
+msgstr "Cut 1"
 
-#: ../src/rcstrings.c:23
-msgid "Copy Buffer"
-msgstr "Copy Buffer"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "Copy"
 
 #: ../src/rcstrings.c:24
-msgid "Paste Buffer"
-msgstr "Paste Buffer"
+#, fuzzy
+msgid "Paste"
+msgstr "Paste 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -125,7 +128,7 @@ msgstr "Multiple Copy Mode"
 msgid "Move Mode"
 msgstr "Move Mode"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "Delete"
 
@@ -145,11 +148,11 @@ msgstr "Slot..."
 msgid "Color..."
 msgstr "Colour..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2236
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Lock"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Unlock"
 
@@ -258,7 +261,7 @@ msgid "Redraw"
 msgstr "Redraw"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1507 ../src/i_callbacks.c:1579
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Pan"
 
@@ -306,7 +309,7 @@ msgstr "Next"
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:313
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "New"
 
@@ -331,14 +334,14 @@ msgid "Component..."
 msgstr "Component..."
 
 #. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2343 ../src/i_callbacks.c:2370
-#: ../src/x_dialog.c:2203
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "Net"
 
 #. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2414 ../src/i_callbacks.c:2441
-#: ../src/x_dialog.c:2221 ../src/x_window.c:371
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
@@ -350,24 +353,24 @@ msgstr "Attribute..."
 msgid "Text..."
 msgstr "Text..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2522 ../src/i_callbacks.c:2545
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Line"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2567 ../src/i_callbacks.c:2590
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "Box"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2646 ../src/i_callbacks.c:2670
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "Circle"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2692 ../src/i_callbacks.c:2715
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Arc"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2737 ../src/i_callbacks.c:2760
-#: ../src/x_dialog.c:2194
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "Pin"
 
@@ -401,11 +404,11 @@ msgstr "Documentation"
 msgid "Attributes"
 msgstr "Attributes"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3037
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Attach"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3084
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "Detach"
 
@@ -509,11 +512,11 @@ msgstr "Component Documentation"
 msgid "About gschem"
 msgstr "About gschem"
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2549
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Zoom too small!  Cannot zoom further.\n"
 
@@ -534,92 +537,92 @@ msgstr "Could not invoke %s\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Documentation commands not supported under MinGW.\n"
 
-#: ../src/g_rc.c:299
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Invalid zoomfactor [%d] passed to %s\n"
 
-#: ../src/g_rc.c:425
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Invalid size [%d] passed to text-size\n"
 
-#: ../src/g_rc.c:452
+#: ../src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Invalid size [%f] passed to postscript-font-scale\n"
 
-#: ../src/g_rc.c:495
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Invalid size [%d] passed to snap-size\n"
 
-#: ../src/g_rc.c:967
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Invalid num levels [%d] passed to undo-levels\n"
 
-#: ../src/g_rc.c:1225
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Invalid size [%d] passed to bus-ripper-size\n"
 
-#: ../src/g_rc.c:1300
+#: ../src/g_rc.c:1293
 #, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 
-#: ../src/g_rc.c:1341
+#: ../src/g_rc.c:1334
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1367
+#: ../src/g_rc.c:1360
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 
-#: ../src/g_rc.c:1411
+#: ../src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Invalid offset [%d] passed to add-attribute-offset\n"
 
-#: ../src/g_rc.c:1435
+#: ../src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Invalid number of seconds [%d] passed to auto-save-interval\n"
 
-#: ../src/g_rc.c:1476
+#: ../src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Invalid gain [%d] passed to mousepan-gain\n"
 
-#: ../src/g_rc.c:1499
+#: ../src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Invalid gain [%d] passed to keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1545
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 
-#: ../src/g_rc.c:1571
+#: ../src/g_rc.c:1564
 #, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Invalid gain [%d] passed to zoom-gain\n"
 
-#: ../src/g_rc.c:1596
+#: ../src/g_rc.c:1589
 #, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Invalid number of steps [%d] scrollpan-steps\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem version %s%s.%s\n"
 
-#: ../src/gschem.c:191 ../src/gschem.c:202
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -628,14 +631,14 @@ msgstr ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
 "details.\n"
 
-#: ../src/gschem.c:193 ../src/gschem.c:204
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 "This is free software, and you are welcome to redistribute it under certain\n"
 
-#: ../src/gschem.c:195 ../src/gschem.c:206
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -644,54 +647,57 @@ msgstr ""
 "conditions; please see the COPYING file for more details.\n"
 "\n"
 
-#: ../src/gschem.c:210
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "This is the MINGW32 port.\n"
 
-#: ../src/gschem.c:214
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Current locale settings: %s\n"
 
-#: ../src/gschem.c:230
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "You must set the GEDADATA environment variable!\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:247
+#: ../src/gschem.c:251
 #, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Couldn't find init scm file [%s]\n"
 
-#: ../src/gschem.c:251
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Read init scm file [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:255
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Failed to read init scm file [%s]\n"
 
-#: ../src/gschem.c:316
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Scheme directory NOT set!\n"
 
-#: ../src/gschem.c:323 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Executing guile script [%s]\n"
 
-#: ../src/gschem_cairo.c:133
+#: ../src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Unknown end for line (%d)\n"
 
-#: ../src/gschem_cairo.c:141
+#: ../src/gschem_cairo.c:318
 #, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Unknown type for stroke (%d) !\n"
@@ -753,15 +759,11 @@ msgstr "Arc Mode"
 msgid "Pin Mode"
 msgstr "Pin Mode"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Copy"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "Move"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Multiple Copy"
 
@@ -773,31 +775,35 @@ msgstr "Show Hidden"
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:492
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "Action"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2233 ../src/x_window.c:487
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr "Stroke"
 
-#: ../src/i_basic.c:264 ../src/x_window.c:489
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "none"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Repeat/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr "OFF"
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
 msgid "NONE"
 msgstr "NONE"
 
-#: ../src/i_basic.c:545
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Grid(%s, %s)"
@@ -807,69 +813,74 @@ msgstr "Grid(%s, %s)"
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentation for [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "New page created [%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:459
+#: ../src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "New Window created [%s]\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Failed to Save All"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Saved All"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Closing Window\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Select objs first"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Edit Line Type"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Edit Text"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Rotate"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Mirror"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1625
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Translate"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "WARNING: Do not translate with snap off!\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "WARNING: Turning snap on and continuing with translate.\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "WARNING: Snap grid size is not equal to 100!\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -877,140 +888,145 @@ msgstr ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Embed"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Unembed"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "Update"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "ShowHidden"
 
-#: ../src/i_callbacks.c:1143
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "MakeVisible"
 
-#: ../src/i_callbacks.c:1261
-msgid "Edit Line Type"
-msgstr "Edit Line Type"
-
-#: ../src/i_callbacks.c:1303 ../src/x_dialog.c:1245
-msgid "Edit Fill Type"
-msgstr "Edit Fill Type"
-
-#: ../src/i_callbacks.c:1598
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr "Update Cues"
 
-#: ../src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr "Really revert page?"
 
-#: ../src/i_callbacks.c:1854
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Paste from 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Empty buffer"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Copy 1"
 
-#: ../src/i_callbacks.c:1873
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Copy 2"
 
-#: ../src/i_callbacks.c:1892
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Copy 3"
 
-#: ../src/i_callbacks.c:1911
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Copy 4"
 
-#: ../src/i_callbacks.c:1930
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Copy 5"
 
-#: ../src/i_callbacks.c:1949
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Cut 1"
 
-#: ../src/i_callbacks.c:1968
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Cut 2"
 
-#: ../src/i_callbacks.c:1987
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Cut 3"
 
-#: ../src/i_callbacks.c:2006
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Cut 4"
 
-#: ../src/i_callbacks.c:2025
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Cut 5"
 
-#: ../src/i_callbacks.c:2041
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "Paste 1"
 
-#: ../src/i_callbacks.c:2048 ../src/i_callbacks.c:2070
-#: ../src/i_callbacks.c:2092 ../src/i_callbacks.c:2114
-#: ../src/i_callbacks.c:2136
-msgid "Empty buffer"
-msgstr "Empty buffer"
-
-#: ../src/i_callbacks.c:2063
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "Paste 2"
 
-#: ../src/i_callbacks.c:2085
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "Paste 3"
 
-#: ../src/i_callbacks.c:2107
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "Paste 4"
 
-#: ../src/i_callbacks.c:2129
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "Paste 5"
 
-#: ../src/i_callbacks.c:2266 ../src/x_window.c:351
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Component"
 
-#: ../src/i_callbacks.c:2302 ../src/i_callbacks.c:2321 ../src/x_dialog.c:2206
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Attribute"
 
-#: ../src/i_callbacks.c:2818
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Searching for source [%s]\n"
 
-#: ../src/i_callbacks.c:2842
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Cannot find source [%s]\n"
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Searching for symbol [%s]\n"
 
-#: ../src/i_callbacks.c:2915
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr "Symbol is not a real file. Symbol cannot be loaded.\n"
 
-#: ../src/i_callbacks.c:2946
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr "Cannot find any schematics above the current one!\n"
 
-#: ../src/i_callbacks.c:3009
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1018,97 +1034,102 @@ msgstr ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 
-#: ../src/i_callbacks.c:3122
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "ShowN"
 
-#: ../src/i_callbacks.c:3158
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "ShowV"
 
-#: ../src/i_callbacks.c:3194
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "ShowB"
 
-#: ../src/i_callbacks.c:3231
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "VisToggle"
 
-#: ../src/i_callbacks.c:3261
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Sorry but this is a non-functioning menu option\n"
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Action feedback mode set to OUTLINE\n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Action feedback mode set to BOUNDINGBOX\n"
 
-#: ../src/i_callbacks.c:3379
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Grid OFF\n"
 
-#: ../src/i_callbacks.c:3380
+#: ../src/i_callbacks.c:3435
 msgid "Dot grid selected\n"
 msgstr "Dot grid selected\n"
 
-#: ../src/i_callbacks.c:3381
+#: ../src/i_callbacks.c:3436
 msgid "Mesh grid selected\n"
 msgstr "Mesh grid selected\n"
 
-#: ../src/i_callbacks.c:3399
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (CAUTION!)\n"
 
-#: ../src/i_callbacks.c:3402
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: ../src/i_callbacks.c:3423
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "Snap OFF (CAUTION!)\n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr "Rubber band OFF \n"
 
-#: ../src/i_callbacks.c:3426
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr "Rubber band ON\n"
 
-#: ../src/i_callbacks.c:3441
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr "magnetic net mode: ON\n"
 
-#: ../src/i_callbacks.c:3444
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr "magnetic net mode: OFF\n"
 
-#: ../src/o_box.c:192
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Unknown type for box (fill)!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
-msgstr "Got an invalid buffer_number [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
-msgstr "Got an invalid buffer_number [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Got an invalid buffer_number [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:159
+#: ../src/o_bus.c:135
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Got an invalid which one in o_bus_draw_stretch\n"
 
-#: ../src/o_circle.c:171
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Unknown type for circle (fill)!\n"
@@ -1169,47 +1190,47 @@ msgstr "Could NOT save backup file [%s]\n"
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERROR: NULL object in o_move_end!\n"
 
-#: ../src/o_move.c:410
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "DOH! tried to find the whichone, but didn't find it!\n"
 
-#: ../src/o_move.c:431
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Got a non line object in o_move_check_endpoint\n"
 
-#: ../src/o_net.c:201
+#: ../src/o_net.c:176
 #, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Got an invalid which one in o_net_draw_stretch\n"
 
-#: ../src/o_net.c:582
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr "Warning: Starting net at off grid coordinate\n"
 
-#: ../src/o_net.c:644
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr "Warning: Ending net at off grid coordinate\n"
 
 #. try to exit gracefully
-#: ../src/o_net.c:1021 ../src/o_net.c:1058 ../src/o_net.c:1129
-#: ../src/o_net.c:1165
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr "Tried to add more than two bus rippers. Internal gschem error.\n"
 
-#: ../src/o_net.c:1235
+#: ../src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Bus ripper symbol [%s] was not found in any component library\n"
 
-#: ../src/o_path.c:373
+#: ../src/o_path.c:356
 #, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Unknown type for path (fill)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:568
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Failed to load picture: %s"
@@ -1218,7 +1239,7 @@ msgstr "Failed to load picture: %s"
 msgid "Picture"
 msgstr "Picture"
 
-#: ../src/o_picture.c:476 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERROR: NULL object!\n"
@@ -1335,7 +1356,7 @@ msgstr "All"
 msgid "Components"
 msgstr "Components"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:361
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "Nets"
 
@@ -1488,7 +1509,7 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3601
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Name"
@@ -1529,11 +1550,11 @@ msgid "Preview"
 msgstr "Preview"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Text Entry..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1543,182 +1564,185 @@ msgstr ""
 "move cursor into window, click to place text.\n"
 "Middle button to rotate while placing."
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "Lower Left"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Middle Left"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "Upper Left"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "Lower Middle"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Middle Middle"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "Upper Middle"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "Lower Right"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Middle Right"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "Upper Right"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Edit Text Properties"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Text Content</b>"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Text Properties</b>"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr "Size:"
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Alignment:"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "Solid"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Dotted"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Dashed"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "Center"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Phantom"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:965 ../src/x_dialog.c:966 ../src/x_dialog.c:967
-#: ../src/x_dialog.c:975 ../src/x_dialog.c:1158 ../src/x_dialog.c:1160
-#: ../src/x_dialog.c:1162 ../src/x_dialog.c:1164 ../src/x_dialog.c:1166
-#: ../src/x_dialog.c:1370 ../src/x_dialog.c:1371 ../src/x_dialog.c:1372
-#: ../src/x_dialog.c:1373 ../src/x_dialog.c:1374 ../src/x_dialog.c:1382
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*unchanged*"
 
-#: ../src/x_dialog.c:859
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Edit Line Width & Type"
 
-#: ../src/x_dialog.c:898
-msgid "Width:"
-msgstr "Width:"
-
-#: ../src/x_dialog.c:902 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/x_dialog.c:906
+#: ../src/x_dialog.c:1021
+msgid "Width:"
+msgstr "Width:"
+
+#: ../src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Dash Length:"
 
-#: ../src/x_dialog.c:910
+#: ../src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Dash Space:"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Hollow"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Filled"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../src/x_dialog.c:1018
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Hatch"
 
-#: ../src/x_dialog.c:1283
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Edit Fill Type"
+
+#: ../src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Fill Type:"
 
-#: ../src/x_dialog.c:1287
+#: ../src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Line Width:"
 
-#: ../src/x_dialog.c:1291
+#: ../src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Angle 1:"
 
-#: ../src/x_dialog.c:1295
+#: ../src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Pitch 1:"
 
-#: ../src/x_dialog.c:1299
+#: ../src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Angle 2:"
 
-#: ../src/x_dialog.c:1303
+#: ../src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Pitch 2:"
 
-#: ../src/x_dialog.c:1482
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Arc Params"
 
-#: ../src/x_dialog.c:1522
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr "Arc Radius:"
 
-#: ../src/x_dialog.c:1530
+#: ../src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Start Angle:"
 
-#: ../src/x_dialog.c:1538
+#: ../src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Degrees of Sweep:"
 
-#: ../src/x_dialog.c:1655
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1726,44 +1750,44 @@ msgstr ""
 "Offset to translate?\n"
 "(0 for origin)"
 
-#: ../src/x_dialog.c:1723
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Text Size"
 
-#: ../src/x_dialog.c:1753
+#: ../src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Enter new text size:"
 
-#: ../src/x_dialog.c:1829
+#: ../src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Snap Size"
 
-#: ../src/x_dialog.c:1859
+#: ../src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Enter new snap grid spacing:"
 
-#: ../src/x_dialog.c:1932
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "Edit slot number"
 
-#: ../src/x_dialog.c:1963
+#: ../src/x_dialog.c:2138
 msgid "Edit slot number:"
 msgstr "Edit slot number:"
 
-#: ../src/x_dialog.c:2025
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "About..."
 
-#: ../src/x_dialog.c:2045
+#: ../src/x_dialog.c:2220
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Electronic Design Automation</b>"
 
-#: ../src/x_dialog.c:2049
+#: ../src/x_dialog.c:2224
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem version %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2057
+#: ../src/x_dialog.c:2232
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1775,137 +1799,137 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "And many others (See AUTHORS file)"
 
-#: ../src/x_dialog.c:2122
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Coords"
 
-#: ../src/x_dialog.c:2143
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "Screen"
 
-#: ../src/x_dialog.c:2152
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "World"
 
-#: ../src/x_dialog.c:2191
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr "Background"
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr "Net endpoint"
 
-#: ../src/x_dialog.c:2200
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr "Graphic"
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr "Logic bubble"
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr "Grid point"
 
-#: ../src/x_dialog.c:2215
+#: ../src/x_dialog.c:2388
 msgid "Detached attribute"
 msgstr "Detached attribute"
 
-#: ../src/x_dialog.c:2218 ../src/x_window.c:379
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Text"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2397
 msgid "Selection"
 msgstr "Selection"
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr "Bounding box"
 
-#: ../src/x_dialog.c:2230
+#: ../src/x_dialog.c:2403
 msgid "Zoom box"
 msgstr "Zoom box"
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr "Output background"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2415
 msgid "Net junction"
 msgstr "Net junction"
 
-#: ../src/x_dialog.c:2245
+#: ../src/x_dialog.c:2418
 msgid "Mesh grid major"
 msgstr "Mesh grid major"
 
-#: ../src/x_dialog.c:2248
+#: ../src/x_dialog.c:2421
 msgid "Mesh grid minor"
 msgstr "Mesh grid minor"
 
-#: ../src/x_dialog.c:2251
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/x_dialog.c:2397
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "ERROR: NULL object in color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2460
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "Colour Edit"
 
-#: ../src/x_dialog.c:2491
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr "Object colour:"
 
-#: ../src/x_dialog.c:2613
+#: ../src/x_dialog.c:2786
 msgid "Function"
 msgstr "Function"
 
-#: ../src/x_dialog.c:2620
+#: ../src/x_dialog.c:2793
 msgid "Keystroke(s)"
 msgstr "Keystroke(s)"
 
-#: ../src/x_dialog.c:2929
+#: ../src/x_dialog.c:3102
 msgid "Find Text"
 msgstr "Find Text"
 
-#: ../src/x_dialog.c:2960
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Text to find:"
 
-#: ../src/x_dialog.c:2970
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "descend into hierarchy"
 
-#: ../src/x_dialog.c:3035
+#: ../src/x_dialog.c:3208
 msgid "Hide Text"
 msgstr "Hide Text"
 
-#: ../src/x_dialog.c:3066
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Hide text starting with:"
 
-#: ../src/x_dialog.c:3135
+#: ../src/x_dialog.c:3308
 msgid "Show Text"
 msgstr "Show Text"
 
-#: ../src/x_dialog.c:3166
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Show text starting with:"
 
-#: ../src/x_dialog.c:3623
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr "S_elect the schematics you want to save:"
 
-#: ../src/x_dialog.c:3717
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "Save the changes to schematic \"%s\" before closing?"
 
-#: ../src/x_dialog.c:3723
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1913,15 +1937,15 @@ msgstr ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 
 #. secondary label
-#: ../src/x_dialog.c:3752
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "If you don't save, all your changes will be permanently lost."
 
-#: ../src/x_dialog.c:3772
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr "_Close without saving"
 
-#: ../src/x_dialog.c:4106
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1938,10 +1962,24 @@ msgstr ""
 "The name cannot end with a space.\n"
 "The value cannot start with a space."
 
-#: ../src/x_dialog.c:4108
+#: ../src/x_dialog.c:4281
 msgid "Invalid Attribute"
 msgstr "Invalid Attribute"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Pin Mode"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "Net endpoint"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Schematics"
@@ -2088,49 +2126,54 @@ msgid "/Edit..."
 msgstr "/Edit..."
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Edit Line Type"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copy"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/Move"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Delete"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Down Schematic"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Down Symbol"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Up"
 
-#: ../src/x_menus.c:315
+#: ../src/x_menus.c:316
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Tried to set the sensitivity on non-existent menu item '%s'\n"
 
-#: ../src/x_menus.c:339
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory doesn't exist!\n"
 
-#: ../src/x_menus.c:352
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr "Tried to set the sensitivity on a non-existent popup menu_item\n"
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:447
+#: ../src/x_menus.c:462
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Couldn't open file %s\n"
 
-#: ../src/x_menus.c:508
+#: ../src/x_menus.c:524
 msgid "Clear"
 msgstr "Clear"
 
@@ -2273,40 +2316,40 @@ msgstr ""
 msgid "Printed current schematic to [%s]\n"
 msgstr "Printed current schematic to [%s]\n"
 
-#: ../src/x_window.c:78
+#: ../src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Couldn't allocate gc\n"
 
-#: ../src/x_window.c:314
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "New file"
 
-#: ../src/x_window.c:320
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Open"
 
-#: ../src/x_window.c:321
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Open file..."
 
-#: ../src/x_window.c:327
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Save"
 
-#: ../src/x_window.c:328
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Save file"
 
-#: ../src/x_window.c:336
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Undo last operation"
 
-#: ../src/x_window.c:343
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Redo last undo"
 
-#: ../src/x_window.c:352
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2318,7 +2361,7 @@ msgstr ""
 "click to place\n"
 "Right mouse button to cancel"
 
-#: ../src/x_window.c:362
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2326,7 +2369,7 @@ msgstr ""
 "Add nets mode\n"
 "Right mouse button to cancel"
 
-#: ../src/x_window.c:372
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2334,78 +2377,78 @@ msgstr ""
 "Add buses mode\n"
 "Right mouse button to cancel"
 
-#: ../src/x_window.c:380
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "Add Text..."
 
-#: ../src/x_window.c:390
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "Select"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "Select mode"
 
-#: ../src/x_window.c:478
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "Pick"
 
-#: ../src/x_window.c:494
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Repeat/none"
 
-#: ../src/x_window.c:504
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Cancel"
 
-#: ../src/x_window.c:506
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Pan/Cancel"
 
-#: ../src/x_window.c:728
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Loading schematic [%s]\n"
 
-#: ../src/x_window.c:740
+#: ../src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Failed to load file"
 
-#: ../src/x_window.c:749
+#: ../src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "New file [%s]\n"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:854
+#: ../src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Could NOT save page [%s]\n"
 
-#: ../src/x_window.c:855
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Error while trying to save"
 
-#: ../src/x_window.c:864
+#: ../src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Saved as [%s]\n"
 
-#: ../src/x_window.c:866
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Saved [%s]\n"
 
-#: ../src/x_window.c:868
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Saved"
 
-#: ../src/x_window.c:942
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Discarding page [%s]\n"
 
-#: ../src/x_window.c:942
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Closing [%s]\n"
@@ -2417,3 +2460,21 @@ msgstr "Create and edit electrical schematics and symbols with gschem"
 #: ../data/geda-gschem.desktop.in.h:2
 msgid "gEDA Schematic Editor"
 msgstr "gEDA Schematic Editor"
+
+#~ msgid "Cut Buffer"
+#~ msgstr "Cut Buffer"
+
+#~ msgid "Copy Buffer"
+#~ msgstr "Copy Buffer"
+
+#~ msgid "Paste Buffer"
+#~ msgstr "Paste Buffer"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "You must set the GEDADATA environment variable!\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+#~ msgstr "Got an invalid buffer_number [o_buffer_copy]\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+#~ msgstr "Got an invalid buffer_number [o_buffer_cut]\n"
diff --git a/gschem/po/es.po b/gschem/po/es.po
index 277ae37..b2ca73d 100644
--- a/gschem/po/es.po
+++ b/gschem/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gschem VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 21:52+0100\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-21 21:20+0100\n"
 "Last-Translator: Carlos Nieves Ã?nega <cnieves@xxxxxxxxxx>\n"
 "Language-Team: Spanish/SpainMIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgstr "Imprimir..."
 msgid "Write image..."
 msgstr "Guardar imagen..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:498
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 msgid "Recent files"
 msgstr "Archivos recientes"
 
@@ -78,33 +78,36 @@ msgstr "Cerrar ventana"
 msgid "Quit"
 msgstr "Salir"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:390
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:397
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:573
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "Seleccionar"
 
 #: ../src/rcstrings.c:22
-msgid "Cut Buffer"
-msgstr "Cortar"
+#, fuzzy
+msgid "Cut"
+msgstr "Cortar 1"
 
-#: ../src/rcstrings.c:23
-msgid "Copy Buffer"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
 msgstr "Copiar"
 
 #: ../src/rcstrings.c:24
-msgid "Paste Buffer"
-msgstr "Pegar"
+#, fuzzy
+msgid "Paste"
+msgstr "Pegar 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -126,7 +129,7 @@ msgstr "Modo de copia mÃºltiple"
 msgid "Move Mode"
 msgstr "Mover"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "Borrar"
 
@@ -146,11 +149,11 @@ msgstr "Elemento..."
 msgid "Color..."
 msgstr "Color..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2233
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Fijar"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Desfijar"
 
@@ -259,7 +262,7 @@ msgid "Redraw"
 msgstr "Redibujar"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1504 ../src/i_callbacks.c:1576
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Centrar respecto al cursor"
 
@@ -283,230 +286,238 @@ msgstr "Disminuir ampliaciÃ³n"
 msgid "Zoom Full"
 msgstr "Vista completa"
 
+#: ../src/rcstrings.c:71
+msgid "Dark color scheme"
+msgstr ""
+
 #: ../src/rcstrings.c:72
+msgid "Light color scheme"
+msgstr ""
+
+#: ../src/rcstrings.c:74
 msgid "Page"
 msgstr "PÃ¡gina"
 
-#: ../src/rcstrings.c:73
+#: ../src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Administrador..."
 
-#: ../src/rcstrings.c:74
+#: ../src/rcstrings.c:76
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../src/rcstrings.c:75
+#: ../src/rcstrings.c:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/rcstrings.c:76 ../src/x_window.c:368
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "Nuevo"
 
-#: ../src/rcstrings.c:77
+#: ../src/rcstrings.c:79
 msgid "Revert"
 msgstr "Recargar"
 
-#: ../src/rcstrings.c:78
+#: ../src/rcstrings.c:80
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/rcstrings.c:79
+#: ../src/rcstrings.c:81
 msgid "Discard"
 msgstr "Descartar"
 
-#: ../src/rcstrings.c:81
+#: ../src/rcstrings.c:83
 msgid "Add"
 msgstr "AÃ±adir"
 
-#: ../src/rcstrings.c:82
+#: ../src/rcstrings.c:84
 msgid "Component..."
 msgstr "Componente..."
 
 #. need to click
-#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2306 ../src/i_callbacks.c:2333
-#: ../src/x_dialog.c:2200
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "ConexiÃ³n"
 
 #. need to click
-#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2377 ../src/i_callbacks.c:2404
-#: ../src/x_dialog.c:2218 ../src/x_window.c:426
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:85
+#: ../src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Propiedad..."
 
-#: ../src/rcstrings.c:86
+#: ../src/rcstrings.c:88
 msgid "Text..."
 msgstr "Texto..."
 
-#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2485 ../src/i_callbacks.c:2508
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "LÃnea"
 
-#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2530 ../src/i_callbacks.c:2553
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "RectÃ¡ngulo"
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2609 ../src/i_callbacks.c:2633
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "CÃrculo"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2655 ../src/i_callbacks.c:2678
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Arco"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2700 ../src/i_callbacks.c:2723
-#: ../src/x_dialog.c:2191
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "Pin"
 
-#: ../src/rcstrings.c:92
+#: ../src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Imagen..."
 
-#: ../src/rcstrings.c:94
+#: ../src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "JerarquÃa"
 
-#: ../src/rcstrings.c:95
+#: ../src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Descender en esquema"
 
-#: ../src/rcstrings.c:96
+#: ../src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Descender en sÃmbolo"
 
-#: ../src/rcstrings.c:97
+#: ../src/rcstrings.c:99
 msgid "Up"
 msgstr "Arriba"
 
-#: ../src/rcstrings.c:98
+#: ../src/rcstrings.c:100
 msgid "Documentation"
 msgstr "DocumentaciÃ³n"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100 ../src/x_compselect.c:1418
+#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
 #: ../src/x_multiattrib.c:1543
 msgid "Attributes"
 msgstr "Propiedades"
 
-#: ../src/rcstrings.c:101 ../src/i_callbacks.c:3000
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3046
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "No adjuntar"
 
-#: ../src/rcstrings.c:103
+#: ../src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Mostrar valor"
 
-#: ../src/rcstrings.c:104
+#: ../src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Mostrar nombre"
 
-#: ../src/rcstrings.c:105
+#: ../src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Mostrar ambos"
 
-#: ../src/rcstrings.c:106
+#: ../src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Cambiar visibilidad"
 
-#: ../src/rcstrings.c:107
+#: ../src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Encontrar texto especÃfico..."
 
-#: ../src/rcstrings.c:108
+#: ../src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Ocultar texto especÃfico..."
 
-#: ../src/rcstrings.c:109
+#: ../src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Mostrar texto especÃfico..."
 
-#: ../src/rcstrings.c:110
+#: ../src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Autonumerar texto..."
 
-#: ../src/rcstrings.c:112
+#: ../src/rcstrings.c:114
 msgid "Options"
 msgstr "Opciones"
 
-#: ../src/rcstrings.c:113
+#: ../src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "TamaÃ±o de texto..."
 
-#: ../src/rcstrings.c:114
-msgid "Toggle Grid On/Off"
-msgstr "Act/Desact rejilla"
+#: ../src/rcstrings.c:116
+msgid "Cycle grid styles"
+msgstr ""
 
-#: ../src/rcstrings.c:115
+#: ../src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Act/Desact ajuste a la rejilla"
 
-#: ../src/rcstrings.c:116
+#: ../src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Espaciado de la rejilla..."
 
-#: ../src/rcstrings.c:117
+#: ../src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr "Aumentar espaciado de la rejilla..."
 
-#: ../src/rcstrings.c:118
+#: ../src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr "Disminuir espaciado de la rejilla..."
 
-#: ../src/rcstrings.c:119
+#: ../src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Cambiar Silueta/RectÃ¡ngulo"
 
-#: ../src/rcstrings.c:120
+#: ../src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Act/Desact conservar conexiones"
 
-#: ../src/rcstrings.c:121
+#: ../src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Mostrar ventana de registro..."
 
-#: ../src/rcstrings.c:122
+#: ../src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Mostrar ventana de coordenadas..."
 
-#: ../src/rcstrings.c:124
+#: ../src/rcstrings.c:126
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/rcstrings.c:125
+#: ../src/rcstrings.c:127
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/rcstrings.c:126
+#: ../src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "DocumentaciÃ³n de gEDA"
 
-#: ../src/rcstrings.c:127
+#: ../src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "PUF de gschem"
 
-#: ../src/rcstrings.c:128
+#: ../src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "DocumentaciÃ³n del componente"
 
-#: ../src/rcstrings.c:129
+#: ../src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Acerca de gschem"
 
-#: ../src/rcstrings.c:130 ../src/x_dialog.c:2541
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 msgid "Hotkeys"
 msgstr "Teclas rÃ¡pidas"
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Â¡Vista demasiado ampliada! No se puede ampliar mÃ¡s.\n"
 
@@ -527,110 +538,112 @@ msgstr "No se ha podido llamar a %s\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "No se pueden utilizar los comandos de documentaciÃ³n bajo MinGW.\n"
 
-#: ../src/g_rc.c:140
-#, c-format
-msgid "Invalid color [%s] passed to %s\n"
-msgstr "Se ha especificado un color no vÃ¡lido [%s] a la funciÃ³n %s\n"
-
-#: ../src/g_rc.c:448
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr ""
 "Se ha especificado un factor de ampliaciÃ³n no vÃ¡lido [%d] a la funciÃ³n %s\n"
 
-#: ../src/g_rc.c:574
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Se ha especificado un tamaÃ±o no vÃ¡lido [%d] a la funciÃ³n text-size\n"
 
-#: ../src/g_rc.c:601
+#: ../src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr ""
 "Se ha especificado un tamaÃ±o no vÃ¡lido [%f] a la funciÃ³n postscript-font-"
 "scale\n"
 
-#: ../src/g_rc.c:644
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Se ha especificado un tamaÃ±o no vÃ¡lido [%d] a la funciÃ³n snap-size\n"
 
-#: ../src/g_rc.c:1116
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr ""
 "NÃºmero de niveles [%d] no vÃ¡lidos especificados a la funciÃ³n undo-levels\n"
 
-#: ../src/g_rc.c:1374
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "TamaÃ±o no vÃ¡lido [%d] especificado a la funciÃ³n bus-ripper-size\n"
 
-#: ../src/g_rc.c:1449
-#, c-format
-msgid "Invalid dot size [%d] passed to grid-dot-size\n"
+#: ../src/g_rc.c:1293
+#, fuzzy, c-format
+msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr ""
 "TamaÃ±o de punto no vÃ¡lido [%d] especificado a la funciÃ³n grid-dot-size\n"
 
-#: ../src/g_rc.c:1490
-#, c-format
-msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
+#: ../src/g_rc.c:1334
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
+msgstr ""
+"Espaciado de punto no vÃ¡lido [%d] especificado a la funciÃ³n grid-fixed-"
+"threshold\n"
+
+#: ../src/g_rc.c:1360
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr ""
 "Espaciado de punto no vÃ¡lido [%d] especificado a la funciÃ³n grid-fixed-"
 "threshold\n"
 
-#: ../src/g_rc.c:1534
+#: ../src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr ""
 "Se ha especificado un desplazamiento no vÃ¡lido [%d] a la funciÃ³n add-"
 "attribute-offset\n"
 
-#: ../src/g_rc.c:1558
+#: ../src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr ""
 "Se ha especificado un nÃºmero de segundos no vÃ¡lido [%d] a la funciÃ³n auto-"
 "save-interval\n"
 
-#: ../src/g_rc.c:1599
+#: ../src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr ""
 "Se ha especificado un aumento no vÃ¡lido [%d] a la funciÃ³n mousepan-gain\n"
 
-#: ../src/g_rc.c:1622
+#: ../src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr ""
 "Se ha especificado un aumento no vÃ¡lido [%d] a la funciÃ³n keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1668
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 "Se ha especificado un nÃºmero de pixels no vÃ¡lido [%d] a la funciÃ³n select-"
 "slack-pixels\n"
 
-#: ../src/g_rc.c:1694
+#: ../src/g_rc.c:1564
 #, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr ""
 "Se ha llamado a la funciÃ³n zoom-gain con un nivel de aumento [%d] no vÃ¡lido\n"
 
-#: ../src/g_rc.c:1719
+#: ../src/g_rc.c:1589
 #, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr ""
 "Se ha llamado a la funciÃ³n scrollpan-steps con un nÃºmero de pasos no vÃ¡lido "
 "[%d]\n"
 
-#: ../src/gschem.c:189 ../src/gschem.c:200
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "VersiÃ³n de gEDA/gschem %s%s.%s\n"
 
-#: ../src/gschem.c:192 ../src/gschem.c:203
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -639,13 +652,13 @@ msgstr ""
 "gEDA/gschem no incluye NINGUNA GARANTÃ?A; vÃ©ase el fichero COPYING para mÃ¡s "
 "detalles.\n"
 
-#: ../src/gschem.c:194 ../src/gschem.c:205
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr "Esto es software libre, y puede redistribuirlo bajo ciertas\n"
 
-#: ../src/gschem.c:196 ../src/gschem.c:207
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -654,48 +667,61 @@ msgstr ""
 "condiciones; por favor vea el fichero COPYING para mÃ¡s detalles.\n"
 "\n"
 
-#: ../src/gschem.c:211
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Ã?sta es la adaptaciÃ³n MINGW32.\n"
 
-#: ../src/gschem.c:215
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Entorno actual de locale: %s\n"
 
-#: ../src/gschem.c:228
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "Â¡Debe de especificar la variable de entorno GEDADATA!\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:245
+#: ../src/gschem.c:251
 #, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "No se ha podido encontrar el fichero de inicializaciÃ³n scm [%s]\n"
 
-#: ../src/gschem.c:249
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "LeÃdo fichero de inicializaciÃ³n scm [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:253
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Fallo al leer fichero de inicializaciÃ³n scm [%s]\n"
 
-#: ../src/gschem.c:315
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Â¡Directorio de Scheme no especificado!\n"
 
-#: ../src/gschem.c:322 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Ejecutando programa de guile [%s]\n"
 
+#: ../src/gschem_cairo.c:310
+#, c-format
+msgid "Unknown end for line (%d)\n"
+msgstr "Final de lÃnea desconocido (%d)\n"
+
+#: ../src/gschem_cairo.c:318
+#, fuzzy, c-format
+msgid "Unknown type for stroke (%d) !\n"
+msgstr "Tipo de lÃnea desconocido (%d)\n"
+
 #: ../src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Modo Componentes"
@@ -753,15 +779,11 @@ msgstr "Modo Arco"
 msgid "Pin Mode"
 msgstr "Modo Pin"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Copiar"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Copia mÃºltiple"
 
@@ -773,27 +795,35 @@ msgstr "Mostrar ocultos"
 msgid "Snap Off"
 msgstr "Desactivado el ajuste a la rejilla"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:547
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "AcciÃ³n"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2230 ../src/x_window.c:542
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr "Gesto"
 
-#: ../src/i_basic.c:264 ../src/x_window.c:544
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "ninguno"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Repetir/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr "NO"
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
+msgid "NONE"
+msgstr ""
+
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Rejilla(%s, %s)"
@@ -803,72 +833,77 @@ msgstr "Rejilla(%s, %s)"
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "DocumentaciÃ³n de [%s, %s, %s, %s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1701
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Se ha creado una pÃ¡gina nueva [%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:467
+#: ../src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Se ha creado una nueva ventana [%s]\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "No se ha podido guardar todo"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Guardado todo"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Cerrando ventana\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Antes seleccione objetos"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Editar tipo de lÃnea"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Editar texto"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Elemento"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Color"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Rotar"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Voltear"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1623
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Mover"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr ""
 "ADVERTENCIA: Â¡No mueva objetos con el ajuste a la rejilla desactivado!\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr ""
 "ADVERTENCIA: Activando el ajuste a la rejilla y continuando con el "
 "movimiento.\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ADVERTENCIA: Â¡El tamaÃ±o de la rejilla no es 100!\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -876,140 +911,145 @@ msgstr ""
 "ADVERTENCIA: Si estÃ¡ moviendo un sÃmbolo al origen, el tamaÃ±o de la "
 "rejilladebe ser de 100\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Incrustar"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Desincrustar"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "Mostrar ocultos"
 
-#: ../src/i_callbacks.c:1142
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "Hacer visible"
 
-#: ../src/i_callbacks.c:1259
-msgid "Edit Line Type"
-msgstr "Editar tipo de lÃnea"
-
-#: ../src/i_callbacks.c:1301 ../src/x_dialog.c:1243
-msgid "Edit Fill Type"
-msgstr "Editar tipo de relleno"
-
-#: ../src/i_callbacks.c:1595
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr "Actualizar entradas"
 
-#: ../src/i_callbacks.c:1745
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr "Â¿Seguro que quiere recargar la pÃ¡gina?"
 
-#: ../src/i_callbacks.c:1817
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Pegar memoria intermedia 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Buffer vacÃo"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Copiar 1"
 
-#: ../src/i_callbacks.c:1836
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Copiar 2"
 
-#: ../src/i_callbacks.c:1855
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Copiar 3"
 
-#: ../src/i_callbacks.c:1874
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Copiar 4"
 
-#: ../src/i_callbacks.c:1893
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Copiar 5"
 
-#: ../src/i_callbacks.c:1912
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Cortar 1"
 
-#: ../src/i_callbacks.c:1931
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Cortar 2"
 
-#: ../src/i_callbacks.c:1950
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Cortar 3"
 
-#: ../src/i_callbacks.c:1969
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Cortar 4"
 
-#: ../src/i_callbacks.c:1988
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Cortar 5"
 
-#: ../src/i_callbacks.c:2004
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "Pegar 1"
 
-#: ../src/i_callbacks.c:2011 ../src/i_callbacks.c:2033
-#: ../src/i_callbacks.c:2055 ../src/i_callbacks.c:2077
-#: ../src/i_callbacks.c:2099
-msgid "Empty buffer"
-msgstr "Buffer vacÃo"
-
-#: ../src/i_callbacks.c:2026
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "Pegar 2"
 
-#: ../src/i_callbacks.c:2048
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "Pegar 3"
 
-#: ../src/i_callbacks.c:2070
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "Pegar 4"
 
-#: ../src/i_callbacks.c:2092
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "Pegar 5"
 
-#: ../src/i_callbacks.c:2229 ../src/x_window.c:406
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Componente"
 
-#: ../src/i_callbacks.c:2265 ../src/i_callbacks.c:2284 ../src/x_dialog.c:2203
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Propiedad"
 
-#: ../src/i_callbacks.c:2781
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Buscando origen [%s]\n"
 
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "No se ha podido encontrar la fuente [%s]\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Buscando sÃmbolo [%s]\n"
 
-#: ../src/i_callbacks.c:2878
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr "El sÃmbolo no es un archivo fÃsico. No se puede cargar el sÃmbolo.\n"
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr "Â¡No se ha podido encontrar ningÃºn esquema jerÃ¡rquico superior!\n"
 
-#: ../src/i_callbacks.c:2972
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1017,152 +1057,115 @@ msgstr ""
 "Este comando consigue la informaciÃ³n del componente de internet, pero no hay "
 "ningÃºn componente seleccionado"
 
-#: ../src/i_callbacks.c:3084
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "Mostrar nombre"
 
-#: ../src/i_callbacks.c:3120
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "Mostrar valor"
 
-#: ../src/i_callbacks.c:3156
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "Mostrar ambos"
 
-#: ../src/i_callbacks.c:3193
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "Cambiar visibilidad"
 
-#: ../src/i_callbacks.c:3223
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Disculpe. Esta opciÃ³n del menÃº no funciona\n"
 
-#: ../src/i_callbacks.c:3311
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Modo de realimentaciÃ³n seleccionado: SILUETA\n"
 
-#: ../src/i_callbacks.c:3314
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Modo de realimentaciÃ³n seleccionado: CONTENEDOR\n"
 
-#: ../src/i_callbacks.c:3331
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Rejilla DESACTIVADA\n"
 
-#: ../src/i_callbacks.c:3334
-msgid "Grid ON\n"
-msgstr "Rejilla ACTIVADA\n"
+#: ../src/i_callbacks.c:3435
+msgid "Dot grid selected\n"
+msgstr ""
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3436
+msgid "Mesh grid selected\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Â¡PRECAUCIÃ?N!: Ajuste a la rejilla DESACTIVADO \n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "Ajuste a la rejilla ACTIVADO\n"
 
-#: ../src/i_callbacks.c:3374
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "Â¡PRECAUCIÃ?N!: Ajuste a la rejilla DESACTIVADO \n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr "Goma de borrar DESACT\n"
 
-#: ../src/i_callbacks.c:3377
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr "Goma de borrar ACT\n"
 
-#: ../src/i_callbacks.c:3392
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr "Modo de Ayuda a la conexiÃ³n: ACTIVADO\n"
 
-#: ../src/i_callbacks.c:3395
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr "Modo de Ayuda a la conexiÃ³n: DESACTIVADO\n"
 
-#: ../src/o_arc.c:120
-#, c-format
-msgid "Unknown end for arc (%d)\n"
-msgstr "Final de arco desconocido (%d)\n"
-
-#: ../src/o_arc.c:160
-#, c-format
-msgid "Unknown type for arc !\n"
-msgstr "Â¡Tipo de arco desconocido!\n"
-
-#: ../src/o_box.c:136
-#, c-format
-msgid "Unknown end for box (%d)\n"
-msgstr "Final de rectÃ¡ngulo desconocido (%d)\n"
-
-#: ../src/o_box.c:176
-#, c-format
-msgid "Unknown type for box !\n"
-msgstr "Â¡Tipo de rectÃ¡ngulo desconocido!\n"
-
-#: ../src/o_box.c:260
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Â¡Tipo de relleno de rectÃ¡ngulo desconocido!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
-"Se ha recibido un nÃºmero de memoria intermedia no vÃ¡lida en la funciÃ³n "
-"o_buffer_copy\n"
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
-"Se ha recibido un nÃºmero de memoria intermedia no vÃ¡lida en la funciÃ³n "
-"o_buffer_cut\n"
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 "Se ha recibido un nÃºmero de memoria intermedia no vÃ¡lida en la funciÃ³n "
 "o_buffer_paste_start\n"
 
-#: ../src/o_bus.c:183
-#, c-format
-msgid "Got an invalid which one in o_bus_draw_xor_single\n"
+#: ../src/o_bus.c:135
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr ""
 "Se ha recibido un parÃ¡metro no vÃ¡lido (\"whichone\") en la funciÃ³n "
 "o_bus_draw_xor_single\n"
 
-#: ../src/o_circle.c:127
-#, c-format
-msgid "Unknown end for circle\n"
-msgstr "Final de cÃrculo desconocido\n"
-
-#. just to be careful
-#: ../src/o_circle.c:163
-#, c-format
-msgid "Unknown type for circle!\n"
-msgstr "Â¡Tipo de cÃrculo desconocido!\n"
-
-#: ../src/o_circle.c:245
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Â¡Tipo de relleno de cÃrculo desconocido!\n"
 
-#: ../src/o_complex.c:251 ../src/o_complex.c:255
+#: ../src/o_complex.c:250 ../src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Convirtiendo esquema [%d %d]\n"
 
-#: ../src/o_line.c:111
-#, c-format
-msgid "Unknown end for line (%d)\n"
-msgstr "Final de lÃnea desconocido (%d)\n"
-
-#. just to be careful
-#: ../src/o_line.c:151
-#, c-format
-msgid "Unknown type for line (%d) !\n"
-msgstr "Tipo de lÃnea desconocido (%d)\n"
-
 #: ../src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
@@ -1176,41 +1179,41 @@ msgstr "Objeto previamente fijado\n"
 msgid "Object already unlocked\n"
 msgstr "El objeto no estaba fijado\n"
 
-#: ../src/o_misc.c:444
+#: ../src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "El texto oculto es ahora visible\n"
 
-#: ../src/o_misc.c:446
+#: ../src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "El texto oculto es ahora invisible\n"
 
-#: ../src/o_misc.c:694
+#: ../src/o_misc.c:697
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 "No se pudo encontrar el sÃmbolo [%s] en la librerÃa. Error al actualizar.\n"
 
-#: ../src/o_misc.c:837
+#: ../src/o_misc.c:840
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 "o_autosave_backups: Imposible averiguar el nombre de archivo real de %s."
 
-#: ../src/o_misc.c:881
+#: ../src/o_misc.c:884
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "NO se han podido cambiar los permisos de la copia de seguridad anterior [%s] "
 "a lectura-escritura\n"
 
-#: ../src/o_misc.c:899
+#: ../src/o_misc.c:902
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr ""
 "NO se han podido cambiar los permisos de la copia de seguridad anterior [%s] "
 "a sÃ³lo lectura\n"
 
-#: ../src/o_misc.c:904
+#: ../src/o_misc.c:907
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "NO se ha podido guardar la copia de seguridad [%s]\n"
@@ -1220,69 +1223,59 @@ msgstr "NO se ha podido guardar la copia de seguridad [%s]\n"
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERROR: en la funciÃ³n o_move_end, Â¡el objeto es NULL!\n"
 
-#: ../src/o_move.c:385
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 "Â¡Eh! Se ha intentado encontrar el parÃ¡metro \"whichone\", pero Â¡no se ha "
 "encontrado!\n"
 
-#: ../src/o_move.c:406
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr ""
 "Se ha recibido un objeto que no es una lÃnea en la funciÃ³n "
 "o_move_check_endpoint\n"
 
-#: ../src/o_net.c:253
-#, c-format
-msgid "Got an invalid which one in o_net_draw_xor_single\n"
+#: ../src/o_net.c:176
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 "Se ha recibido un parÃ¡metro no vÃ¡lido (\"whichone\") en la funciÃ³n "
 "o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:630
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 "Advertencia: se ha iniciado la conexiÃ³n en una coordenada fuera de la "
 "rejilla\n"
 
-#: ../src/o_net.c:692
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 "Advertencia: se ha finalizado la conexiÃ³n en una coordenada fuera de la "
 "rejilla\n"
 
 #. try to exit gracefully
-#: ../src/o_net.c:1080 ../src/o_net.c:1117 ../src/o_net.c:1188
-#: ../src/o_net.c:1224
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Se ha intentado aÃ±adir mÃ¡s de dos conexiones a bus. Error interno de "
 "gschem.\n"
 
-#: ../src/o_net.c:1294
+#: ../src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "No se ha encontrado el sÃmbolo %s en ninguna librerÃa de componentes\n"
 
-#: ../src/o_path.c:483
-#, c-format
-msgid "Unknown end for path (%d)\n"
-msgstr "Final de camino desconocido (%d)\n"
-
-#: ../src/o_path.c:524
-#, c-format
-msgid "Unknown type for path !\n"
-msgstr "Â¡Tipo de camino desconocido!\n"
-
-#: ../src/o_path.c:594
+#: ../src/o_path.c:356
 #, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Â¡Tipo de camino (relleno) desconocido!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:627
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fallo al cargar la imagen: %s"
@@ -1291,7 +1284,7 @@ msgstr "Fallo al cargar la imagen: %s"
 msgid "Picture"
 msgstr "Imagen"
 
-#: ../src/o_picture.c:535 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERROR: Â¡objeto vacÃo (NULL)!\n"
@@ -1408,7 +1401,7 @@ msgstr "Todo"
 msgid "Components"
 msgstr "Componentes"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:416
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "Conexiones"
 
@@ -1416,7 +1409,7 @@ msgstr "Conexiones"
 msgid "Replace existing attributes"
 msgstr "Reemplazar las propiedades existentes"
 
-#: ../src/x_autonumber.c:412
+#: ../src/x_autonumber.c:413
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1425,7 +1418,7 @@ msgstr ""
 "problemas al autonumerar los nÃºmeros de elemento\n"
 
 #. duplicate slot in used_slots
-#: ../src/x_autonumber.c:427
+#: ../src/x_autonumber.c:428
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
@@ -1433,137 +1426,136 @@ msgstr ""
 "La duplicidad de la propiedad 'slot' puede causar problemas: [nombre del "
 "sÃmbolo=%s, nÃºmero=%d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:695
+#: ../src/x_autonumber.c:696
 msgid "No searchstring given in autonumber text.\n"
 msgstr "No se ha especificado una cadena de bÃºsqueda para autonumerar texto.\n"
 
-#: ../src/x_autonumber.c:746
+#: ../src/x_autonumber.c:748
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr "No se ha especificado '*' o '?' al final del texto a autonumerar.\n"
 
-#: ../src/x_autonumber.c:880
+#: ../src/x_autonumber.c:883
 msgid "Diagonal"
 msgstr "Diagonal"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Top to bottom"
 msgstr "De arriba hacia abajo"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Bottom to top"
 msgstr "De abajo hacia arriba"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Left to right"
 msgstr "De izquierda hacia derecha"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Right to left"
 msgstr "De derecha hacia izquierda"
 
-#: ../src/x_autonumber.c:883
+#: ../src/x_autonumber.c:886
 msgid "File order"
 msgstr "Orden de archivos:"
 
-#: ../src/x_autonumber.c:1219
+#: ../src/x_autonumber.c:1222
 msgid "Autonumber text"
 msgstr "Autoenumerar texto"
 
 #. scope section
-#: ../src/x_autonumber.c:1243
+#: ../src/x_autonumber.c:1246
 msgid "<b>Scope</b>"
 msgstr "<b>Ã?mbito</b>"
 
-#: ../src/x_autonumber.c:1265
+#: ../src/x_autonumber.c:1268
 msgid "Search for:"
 msgstr "Buscar:"
 
-#: ../src/x_autonumber.c:1279
+#: ../src/x_autonumber.c:1282
 msgid "Autonumber text in:"
 msgstr "Autoenumerar texto en:"
 
-#: ../src/x_autonumber.c:1286
+#: ../src/x_autonumber.c:1289
 msgid "Skip numbers found in:"
 msgstr "Ignorar nÃºmeros encontrados en:"
 
-#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
 msgid "Selected objects"
 msgstr "Objetos seleccionados"
 
-#: ../src/x_autonumber.c:1299 ../src/x_autonumber.c:1308
+#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
 msgid "Current page"
 msgstr "Hoja actual"
 
-#: ../src/x_autonumber.c:1300 ../src/x_autonumber.c:1309
+#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
 msgid "Whole hierarchy"
 msgstr "JerarquÃa completa"
 
-#: ../src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1314
 msgid "Overwrite existing numbers"
 msgstr "Sobreescribir los nÃºmeros existentes"
 
 #. Options section
-#: ../src/x_autonumber.c:1316
+#: ../src/x_autonumber.c:1319
 msgid "<b>Options</b>"
 msgstr "<b>Opciones</b>"
 
-#: ../src/x_autonumber.c:1338
+#: ../src/x_autonumber.c:1341
 msgid "Starting number:"
 msgstr "NÃºmero inicial:"
 
-#: ../src/x_autonumber.c:1345
+#: ../src/x_autonumber.c:1348
 msgid "Sort order:"
 msgstr "MÃ©todo de ordenaciÃ³n:"
 
-#: ../src/x_autonumber.c:1366
+#: ../src/x_autonumber.c:1369
 msgid "Remove numbers"
 msgstr "Borrar los nÃºmeros"
 
-#: ../src/x_autonumber.c:1370
+#: ../src/x_autonumber.c:1373
 msgid "Automatic slotting"
 msgstr "Asignar nÃºmeros de elemento automÃ¡ticamente"
 
-#: ../src/x_color.c:52 ../src/x_color.c:61 ../src/x_color.c:124
-#: ../src/x_color.c:172
+#: ../src/x_color.c:94 ../src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Â¡No se puede reservar memoria para el color %s!\n"
 
-#: ../src/x_color.c:52
+#: ../src/x_color.c:94
 msgid "black"
 msgstr "negro"
 
-#: ../src/x_color.c:61
+#: ../src/x_color.c:103
 msgid "white"
 msgstr "blanco"
 
-#: ../src/x_color.c:103 ../src/x_color.c:140
-#, c-format
-msgid "Could not find the color %s!\n"
-msgstr "Â¡No se ha podido encontrar el color %s!\n"
-
-#: ../src/x_color.c:106 ../src/x_color.c:143
-#, c-format
-msgid "Defaulting color to white\n"
-msgstr "Utilizando color blanco por defecto\n"
+#: ../src/x_color.c:125
+#, fuzzy, c-format
+msgid "Could not allocate display color %i!\n"
+msgstr "Â¡No se puede reservar memoria para el color %s!\n"
 
-#: ../src/x_color.c:113 ../src/x_color.c:150
-#, c-format
-msgid "Ack! Cannot allocate white!\n"
-msgstr "Â¡Eh! Â¡No se puede reservar memoria para el color blanco!\n"
+#: ../src/x_color.c:147
+#, fuzzy, c-format
+msgid "Could not allocate outline color %i!\n"
+msgstr "Â¡No se puede reservar memoria para el color %s!\n"
 
-#: ../src/x_color.c:191 ../src/x_color.c:207
+#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Se ha intentado obtener un color no vÃ¡lido: %d\n"
 
+#: ../src/x_color.c:214
+#, fuzzy, c-format
+msgid "Tried to get an invalid outline color: %d\n"
+msgstr "Se ha intentado obtener un color no vÃ¡lido: %d\n"
+
 #. GtkLabel
 #: ../src/x_compselect.c:1040
 msgid "Filter:"
 msgstr "Filtro:"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3591
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Nombre"
@@ -1604,11 +1596,11 @@ msgid "Preview"
 msgstr "Vista preliminar"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "IntroducciÃ³n de texto..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1619,182 +1611,185 @@ msgstr ""
 "para colocar el texto.\n"
 "BotÃ³n intermedio para rotar mientras estÃ¡ colocando el texto."
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "Abajo a la izquierda"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Centrado a la izquierda"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "Arriba a la izquierda"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "Abajo centrado"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Centrado Centrado"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "Arriba centrado"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "Abajo a la derecha"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Centrado a la derecha"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "Arriba a la derecha"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Editar las propiedades del texto"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Contenido del texto</b>"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Propiedades del texto</b>"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 msgid "Color:"
 msgstr "Color:"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr "TamaÃ±o:"
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "AlineaciÃ³n:"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "SÃ³lido"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Punteado"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "GuiÃ³n"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "Centrar"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Fantasma"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:964 ../src/x_dialog.c:965 ../src/x_dialog.c:966
-#: ../src/x_dialog.c:974 ../src/x_dialog.c:1157 ../src/x_dialog.c:1159
-#: ../src/x_dialog.c:1161 ../src/x_dialog.c:1163 ../src/x_dialog.c:1165
-#: ../src/x_dialog.c:1368 ../src/x_dialog.c:1369 ../src/x_dialog.c:1370
-#: ../src/x_dialog.c:1371 ../src/x_dialog.c:1372 ../src/x_dialog.c:1380
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*sin modificar*"
 
-#: ../src/x_dialog.c:858
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Editar ancho y tipo de lÃnea"
 
-#: ../src/x_dialog.c:897
-msgid "Width:"
-msgstr "Ancho:"
-
-#: ../src/x_dialog.c:901 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/x_dialog.c:905
+#: ../src/x_dialog.c:1021
+msgid "Width:"
+msgstr "Ancho:"
+
+#: ../src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Longitud de la lÃnea en la discontinuidad:"
 
-#: ../src/x_dialog.c:909
+#: ../src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Espaciado de la discontinuidad:"
 
-#: ../src/x_dialog.c:1014
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Hueco"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Relleno"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Malla"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Trama"
 
-#: ../src/x_dialog.c:1281
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Editar tipo de relleno"
+
+#: ../src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Tipo de relleno:"
 
-#: ../src/x_dialog.c:1285
+#: ../src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Ancho de lÃnea:"
 
-#: ../src/x_dialog.c:1289
+#: ../src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Ã?ngulo 1:"
 
-#: ../src/x_dialog.c:1293
+#: ../src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "SeparaciÃ³n 1:"
 
-#: ../src/x_dialog.c:1297
+#: ../src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Ã?ngulo 2:"
 
-#: ../src/x_dialog.c:1301
+#: ../src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "SeparaciÃ³n 2:"
 
-#: ../src/x_dialog.c:1480
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "ParÃ¡metros de arco"
 
-#: ../src/x_dialog.c:1520
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr "Radio de arco:"
 
-#: ../src/x_dialog.c:1528
+#: ../src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Ã?ngulo de comienzo:"
 
-#: ../src/x_dialog.c:1536
+#: ../src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Grados de barrido:"
 
-#: ../src/x_dialog.c:1653
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1802,44 +1797,44 @@ msgstr ""
 "Â¿Desplazamiento del movimiento?\n"
 "(0 para el origen)"
 
-#: ../src/x_dialog.c:1721
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "TamaÃ±o de texto"
 
-#: ../src/x_dialog.c:1751
+#: ../src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Introduzca nuevo tamaÃ±o de texto:"
 
-#: ../src/x_dialog.c:1826
+#: ../src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "TamaÃ±o de la rejilla"
 
-#: ../src/x_dialog.c:1856
+#: ../src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Introduzca el nuevo espaciado de la rejilla:"
 
-#: ../src/x_dialog.c:1929
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "Editar nÃºmero de elemento"
 
-#: ../src/x_dialog.c:1960
+#: ../src/x_dialog.c:2138
 msgid "Edit slot number:"
 msgstr "Editar nÃºmero de elemento:"
 
-#: ../src/x_dialog.c:2022
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "Acerca de..."
 
-#: ../src/x_dialog.c:2042
+#: ../src/x_dialog.c:2220
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: AutomatizaciÃ³n de DiseÃ±o ElectrÃ³nico GPL</b>"
 
-#: ../src/x_dialog.c:2046
+#: ../src/x_dialog.c:2224
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>versiÃ³n de gschem %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2054
+#: ../src/x_dialog.c:2232
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1851,129 +1846,137 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "Y muchos otros (VÃ©ase el archivo AUTHORS)"
 
-#: ../src/x_dialog.c:2119
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Coordenadas"
 
-#: ../src/x_dialog.c:2140
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "Pantalla"
 
-#: ../src/x_dialog.c:2149
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "Mundo"
 
-#: ../src/x_dialog.c:2188
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr "Fondo"
 
-#: ../src/x_dialog.c:2194
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr "Punto final de conexiÃ³n"
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr "GrÃ¡fico"
 
-#: ../src/x_dialog.c:2206
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr "NegaciÃ³n lÃ³gica"
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr "Punto de rejilla"
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2388
 msgid "Detached attribute"
 msgstr "Desvincular propiedad"
 
-#: ../src/x_dialog.c:2215 ../src/x_window.c:434
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/x_dialog.c:2221
+#: ../src/x_dialog.c:2397
 msgid "Selection"
 msgstr "SelecciÃ³n"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr "Envolvente"
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2403
 msgid "Zoom box"
 msgstr "Ventana de ampliado"
 
-#: ../src/x_dialog.c:2236
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr "Fondo de salida"
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2415
 msgid "Net junction"
 msgstr "UniÃ³n de conexiones"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../src/x_dialog.c:2390
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "ERROR: Â¡objeto vacÃo (NULL) en la funciÃ³n color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2452
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "Editar color"
 
-#: ../src/x_dialog.c:2483
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr "Color del componente:"
 
-#: ../src/x_dialog.c:2605
+#: ../src/x_dialog.c:2786
 msgid "Function"
 msgstr "FunciÃ³n"
 
-#: ../src/x_dialog.c:2612
+#: ../src/x_dialog.c:2793
 msgid "Keystroke(s)"
 msgstr "PulsaciÃ³n(es)"
 
-#: ../src/x_dialog.c:2921
+#: ../src/x_dialog.c:3102
 msgid "Find Text"
 msgstr "Encontrar texto:"
 
-#: ../src/x_dialog.c:2952
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Texto a encontrar:"
 
-#: ../src/x_dialog.c:2962
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "Descender en la jerarquÃa"
 
-#: ../src/x_dialog.c:3026
+#: ../src/x_dialog.c:3208
 msgid "Hide Text"
 msgstr "Ocultar texto:"
 
-#: ../src/x_dialog.c:3057
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Ocultar texto que comienza por:"
 
-#: ../src/x_dialog.c:3125
+#: ../src/x_dialog.c:3308
 msgid "Show Text"
 msgstr "Mostrar texto"
 
-#: ../src/x_dialog.c:3156
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Mostrar texto que comienza por:"
 
-#: ../src/x_dialog.c:3613
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr "S_eleccione los esquemas que quiere guardar:"
 
-#: ../src/x_dialog.c:3707
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "Â¿Guardar cambios del esquema \"%s\" antes de salir?"
 
-#: ../src/x_dialog.c:3713
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1981,15 +1984,15 @@ msgstr ""
 "Hay %d esquemas con cambios sin guardar. Â¿Guardar cambios antes de cerrar?"
 
 #. secondary label
-#: ../src/x_dialog.c:3742
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Si no los guarda, todos los cambios se perderÃ¡n definitivamente."
 
-#: ../src/x_dialog.c:3762
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr "_Cerrar sin guardar"
 
-#: ../src/x_dialog.c:4096
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -2007,10 +2010,24 @@ msgstr ""
 "El nombre no puede finalizar en un espacio.\n"
 "El valor no puede empezar con un espacio."
 
-#: ../src/x_dialog.c:4098
+#: ../src/x_dialog.c:4281
 msgid "Invalid Attribute"
 msgstr "Propiedad incorrecta"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Modo Pin"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "Punto final de conexiÃ³n"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Esquemas"
@@ -2159,53 +2176,58 @@ msgid "/Edit..."
 msgstr "/Editar..."
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Editar tipo de lÃnea"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copiar"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/Mover"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Borrar"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Descender en esquema"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Descender en sÃmbolo"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Arriba"
 
-#: ../src/x_menus.c:323
+#: ../src/x_menus.c:316
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 "Se ha intentado modificar la sensibilidad de una opciÃ³n de menÃº que no "
 "existe '%s'\n"
 
-#: ../src/x_menus.c:347
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Â¡No existen menÃºes contextuales!\n"
 
-#: ../src/x_menus.c:360
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Se ha intentado modificar la sensibilidad de una opciÃ³n de menÃº que no "
 "existe\n"
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:455
+#: ../src/x_menus.c:462
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "No se ha podido abrir el archivo %s\n"
 
-#: ../src/x_menus.c:516
+#: ../src/x_menus.c:524
 msgid "Clear"
 msgstr "Borrar"
 
@@ -2272,6 +2294,11 @@ msgstr "Modificado"
 msgid "Right click on the filename for more options..."
 msgstr "Pulse con el botÃ³n derecho para ver mÃ¡s opciones..."
 
+#: ../src/x_preview.c:223
+#, fuzzy
+msgid "Preview Buffer"
+msgstr "Pegar"
+
 #: ../src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Seleccionar archivo PostScript..."
@@ -2350,55 +2377,35 @@ msgstr "Se ha imprimido el esquema actual a [%s]\n"
 msgid "Couldn't allocate gc\n"
 msgstr "No se ha podido reservar memoria para la variable gc\n"
 
-#: ../src/x_window.c:94
-#, c-format
-msgid "Couldn't allocate xor_gc\n"
-msgstr "No se ha podido reservar memoria para la variable xor_gc\n"
-
-#: ../src/x_window.c:107
-#, c-format
-msgid "Couldn't allocate outline_xor_gc\n"
-msgstr "No se ha podido reservar memoria para la variable outline_xor_gc\n"
-
-#: ../src/x_window.c:123
-#, c-format
-msgid "Couldn't allocate bounding_xor_gc\n"
-msgstr "No se ha podido reservar memoria para la variable bounding_xor_gc\n"
-
-#: ../src/x_window.c:130
-#, c-format
-msgid "Couldn't allocate bus_gc\n"
-msgstr "No se ha podido reservar memoria para la variable bus_gc\n"
-
-#: ../src/x_window.c:369
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "Nuevo archivo"
 
-#: ../src/x_window.c:375
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/x_window.c:376
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Abrir archivo"
 
-#: ../src/x_window.c:382
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/x_window.c:383
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Guardar archivo"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Deshacer Ãºltima operaciÃ³n"
 
-#: ../src/x_window.c:398
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Rehacer el Ãºltimo deshacer"
 
-#: ../src/x_window.c:407
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2410,7 +2417,7 @@ msgstr ""
 "ventana principal, y presione el botÃ³n izq. del ratÃ³n para colocarlo.\n"
 "BotÃ³n derecho del ratÃ³n para cancelar"
 
-#: ../src/x_window.c:417
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2418,7 +2425,7 @@ msgstr ""
 "AÃ±adir conexiÃ³n\n"
 "BotÃ³n derecho del ratÃ³n para cancelar"
 
-#: ../src/x_window.c:427
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2426,78 +2433,78 @@ msgstr ""
 "AÃ±adir bus\n"
 "BotÃ³n derecho del ratÃ³n para cancelar"
 
-#: ../src/x_window.c:435
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "AÃ±adir texto..."
 
-#: ../src/x_window.c:445
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../src/x_window.c:446
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "Seleccionar"
 
-#: ../src/x_window.c:533
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "Coger"
 
-#: ../src/x_window.c:549
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Repetir/ninguno"
 
-#: ../src/x_window.c:559
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "MenÃº/Cancelar"
 
-#: ../src/x_window.c:561
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "PanorÃ¡mica/Cancelar"
 
-#: ../src/x_window.c:783
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Cargando esquema [%s]\n"
 
-#: ../src/x_window.c:795
+#: ../src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Fallo al cargar el archivo"
 
-#: ../src/x_window.c:804
+#: ../src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "Nuevo archivo [%s]\n"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:909
+#: ../src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "NO se ha podido guardar la pÃ¡gina [%s]\n"
 
-#: ../src/x_window.c:910
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Error al intentar guardar"
 
-#: ../src/x_window.c:919
+#: ../src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Guardado como [%s]\n"
 
-#: ../src/x_window.c:921
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Guardado [%s]\n"
 
-#: ../src/x_window.c:923
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Guardado"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Descartando pÃ¡gina [%s]\n"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Cerrando [%s]\n"
@@ -2510,6 +2517,79 @@ msgstr "Crear y modificar esquemas y sÃmbolos con gschem"
 msgid "gEDA Schematic Editor"
 msgstr "Editor de esquemas gEDA"
 
+#~ msgid "Cut Buffer"
+#~ msgstr "Cortar"
+
+#~ msgid "Copy Buffer"
+#~ msgstr "Copiar"
+
+#~ msgid "Toggle Grid On/Off"
+#~ msgstr "Act/Desact rejilla"
+
+#~ msgid "Invalid color [%s] passed to %s\n"
+#~ msgstr "Se ha especificado un color no vÃ¡lido [%s] a la funciÃ³n %s\n"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "Â¡Debe de especificar la variable de entorno GEDADATA!\n"
+
+#~ msgid "Grid ON\n"
+#~ msgstr "Rejilla ACTIVADA\n"
+
+#~ msgid "Unknown end for arc (%d)\n"
+#~ msgstr "Final de arco desconocido (%d)\n"
+
+#~ msgid "Unknown type for arc !\n"
+#~ msgstr "Â¡Tipo de arco desconocido!\n"
+
+#~ msgid "Unknown end for box (%d)\n"
+#~ msgstr "Final de rectÃ¡ngulo desconocido (%d)\n"
+
+#~ msgid "Unknown type for box !\n"
+#~ msgstr "Â¡Tipo de rectÃ¡ngulo desconocido!\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+#~ msgstr ""
+#~ "Se ha recibido un nÃºmero de memoria intermedia no vÃ¡lida en la funciÃ³n "
+#~ "o_buffer_copy\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+#~ msgstr ""
+#~ "Se ha recibido un nÃºmero de memoria intermedia no vÃ¡lida en la funciÃ³n "
+#~ "o_buffer_cut\n"
+
+#~ msgid "Unknown end for circle\n"
+#~ msgstr "Final de cÃrculo desconocido\n"
+
+#~ msgid "Unknown type for circle!\n"
+#~ msgstr "Â¡Tipo de cÃrculo desconocido!\n"
+
+#~ msgid "Unknown end for path (%d)\n"
+#~ msgstr "Final de camino desconocido (%d)\n"
+
+#~ msgid "Unknown type for path !\n"
+#~ msgstr "Â¡Tipo de camino desconocido!\n"
+
+#~ msgid "Could not find the color %s!\n"
+#~ msgstr "Â¡No se ha podido encontrar el color %s!\n"
+
+#~ msgid "Defaulting color to white\n"
+#~ msgstr "Utilizando color blanco por defecto\n"
+
+#~ msgid "Ack! Cannot allocate white!\n"
+#~ msgstr "Â¡Eh! Â¡No se puede reservar memoria para el color blanco!\n"
+
+#~ msgid "Couldn't allocate xor_gc\n"
+#~ msgstr "No se ha podido reservar memoria para la variable xor_gc\n"
+
+#~ msgid "Couldn't allocate outline_xor_gc\n"
+#~ msgstr "No se ha podido reservar memoria para la variable outline_xor_gc\n"
+
+#~ msgid "Couldn't allocate bounding_xor_gc\n"
+#~ msgstr "No se ha podido reservar memoria para la variable bounding_xor_gc\n"
+
+#~ msgid "Couldn't allocate bus_gc\n"
+#~ msgstr "No se ha podido reservar memoria para la variable bus_gc\n"
+
 #~ msgid "Got NULL in o_attrib_toggle_visibility\n"
 #~ msgstr "Se ha recibido NULL de la funciÃ³n o_attrib_toggle_visibility\n"
 
diff --git a/gschem/po/fr.po b/gschem/po/fr.po
index cfe8b9d..e1979d8 100644
--- a/gschem/po/fr.po
+++ b/gschem/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr_FR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:41-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-20 14:26+0000\n"
 "Last-Translator: Patrick Bernaud <b-patrick@xxxxxxxxxx>\n"
 "Language-Team: French\n"
@@ -65,7 +65,7 @@ msgstr "Imprimer..."
 msgid "Write image..."
 msgstr "Exporter l'image..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:498
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 #, fuzzy
 msgid "Recent files"
 msgstr "Nouveau fichier"
@@ -82,36 +82,36 @@ msgstr "Fermer la fenÃªtre"
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Ã?dition"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:390
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "DÃ©faire"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:397
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Refaire"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:573
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "Mode SÃ©lection"
 
 #: ../src/rcstrings.c:22
 #, fuzzy
-msgid "Cut Buffer"
-msgstr "Tampon"
+msgid "Cut"
+msgstr "Couper 1"
 
-#: ../src/rcstrings.c:23
-#, fuzzy
-msgid "Copy Buffer"
-msgstr "Tampon"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "Copier"
 
 #: ../src/rcstrings.c:24
 #, fuzzy
-msgid "Paste Buffer"
-msgstr "Tampon"
+msgid "Paste"
+msgstr "Coller 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -133,7 +133,7 @@ msgstr "Mode Copie Multiple"
 msgid "Move Mode"
 msgstr "Mode DÃ©placement"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -153,11 +153,11 @@ msgstr "Slot..."
 msgid "Color..."
 msgstr "Couleur..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2233
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "DÃ©verrouiller"
 
@@ -266,7 +266,7 @@ msgid "Redraw"
 msgstr "Redessiner"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1504 ../src/i_callbacks.c:1576
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Panoramique"
 
@@ -290,235 +290,243 @@ msgstr "Agrandissement"
 msgid "Zoom Full"
 msgstr "Agrandissement minimum"
 
+#: ../src/rcstrings.c:71
+msgid "Dark color scheme"
+msgstr ""
+
 #: ../src/rcstrings.c:72
+msgid "Light color scheme"
+msgstr ""
+
+#: ../src/rcstrings.c:74
 msgid "Page"
 msgstr "Page"
 
-#: ../src/rcstrings.c:73
+#: ../src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Gestionnaire..."
 
-#: ../src/rcstrings.c:74
+#: ../src/rcstrings.c:76
 msgid "Next"
 msgstr "Suivante"
 
-#: ../src/rcstrings.c:75
+#: ../src/rcstrings.c:77
 msgid "Previous"
 msgstr "PrÃ©cÃ©dente"
 
-#: ../src/rcstrings.c:76 ../src/x_window.c:368
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "Nouvelle"
 
-#: ../src/rcstrings.c:77
+#: ../src/rcstrings.c:79
 msgid "Revert"
 msgstr "Restaurer"
 
-#: ../src/rcstrings.c:78
+#: ../src/rcstrings.c:80
 msgid "Close"
 msgstr "Fermer"
 
-#: ../src/rcstrings.c:79
+#: ../src/rcstrings.c:81
 msgid "Discard"
 msgstr "Abandonner"
 
-#: ../src/rcstrings.c:81
+#: ../src/rcstrings.c:83
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../src/rcstrings.c:82
+#: ../src/rcstrings.c:84
 msgid "Component..."
 msgstr "Composant..."
 
 #. need to click
-#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2306 ../src/i_callbacks.c:2333
-#: ../src/x_dialog.c:2200
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "Piste"
 
 #. need to click
-#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2377 ../src/i_callbacks.c:2404
-#: ../src/x_dialog.c:2218 ../src/x_window.c:426
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:85
+#: ../src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Attribut..."
 
-#: ../src/rcstrings.c:86
+#: ../src/rcstrings.c:88
 msgid "Text..."
 msgstr "Texte..."
 
-#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2485 ../src/i_callbacks.c:2508
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Ligne"
 
-#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2530 ../src/i_callbacks.c:2553
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "BoÃ®te"
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2609 ../src/i_callbacks.c:2633
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "Cercle"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2655 ../src/i_callbacks.c:2678
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Arc"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2700 ../src/i_callbacks.c:2723
-#: ../src/x_dialog.c:2191
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "Broche"
 
-#: ../src/rcstrings.c:92
+#: ../src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Image..."
 
-#: ../src/rcstrings.c:94
+#: ../src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "HiÃ©rarchie"
 
-#: ../src/rcstrings.c:95
+#: ../src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Descendre dans la hiÃ©rarchie"
 
-#: ../src/rcstrings.c:96
+#: ../src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Descendre dans le symbole"
 
-#: ../src/rcstrings.c:97
+#: ../src/rcstrings.c:99
 msgid "Up"
 msgstr "Remonter"
 
-#: ../src/rcstrings.c:98
+#: ../src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Documentation"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100 ../src/x_compselect.c:1418
+#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
 #: ../src/x_multiattrib.c:1543
 msgid "Attributes"
 msgstr "Attributs"
 
-#: ../src/rcstrings.c:101 ../src/i_callbacks.c:3000
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Attacher"
 
-#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3046
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "DÃ©tacher"
 
-#: ../src/rcstrings.c:103
+#: ../src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Montrer la valeur"
 
-#: ../src/rcstrings.c:104
+#: ../src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Montrer le nom"
 
-#: ../src/rcstrings.c:105
+#: ../src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Montrer le nom et la valeur"
 
-#: ../src/rcstrings.c:106
+#: ../src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Afficher/Cacher"
 
-#: ../src/rcstrings.c:107
+#: ../src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Rechercher le texte..."
 
-#: ../src/rcstrings.c:108
+#: ../src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Cacher le texte..."
 
-#: ../src/rcstrings.c:109
+#: ../src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Montrer le texte..."
 
-#: ../src/rcstrings.c:110
+#: ../src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Annotation automatique..."
 
-#: ../src/rcstrings.c:112
+#: ../src/rcstrings.c:114
 msgid "Options"
 msgstr "Options"
 
-#: ../src/rcstrings.c:113
+#: ../src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Taille de texte..."
 
-#: ../src/rcstrings.c:114
-msgid "Toggle Grid On/Off"
-msgstr "Afficher/Cacher la grille"
+#: ../src/rcstrings.c:116
+msgid "Cycle grid styles"
+msgstr ""
 
-#: ../src/rcstrings.c:115
+#: ../src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Activer/DÃ©sactiver le snap"
 
-#: ../src/rcstrings.c:116
+#: ../src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Espacement de la grille de snap..."
 
-#: ../src/rcstrings.c:117
+#: ../src/rcstrings.c:119
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Espacement de la grille de snap..."
 
-#: ../src/rcstrings.c:118
+#: ../src/rcstrings.c:120
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Espacement de la grille de snap..."
 
-#: ../src/rcstrings.c:119
+#: ../src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr ""
 
-#: ../src/rcstrings.c:120
+#: ../src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: ../src/rcstrings.c:121
+#: ../src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Montrer la fenÃªtre de messages..."
 
-#: ../src/rcstrings.c:122
+#: ../src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Montrer la fenÃªtre de coordonnÃ©es..."
 
-#: ../src/rcstrings.c:124
+#: ../src/rcstrings.c:126
 msgid "Help"
 msgstr "Aide"
 
-#: ../src/rcstrings.c:125
+#: ../src/rcstrings.c:127
 #, fuzzy
 msgid "Manual"
 msgstr "Manuel..."
 
-#: ../src/rcstrings.c:126
+#: ../src/rcstrings.c:128
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "Documentation"
 
-#: ../src/rcstrings.c:127
+#: ../src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr ""
 
-#: ../src/rcstrings.c:128
+#: ../src/rcstrings.c:130
 #, fuzzy
 msgid "Component Documentation"
 msgstr "Documentation"
 
-#: ../src/rcstrings.c:129
+#: ../src/rcstrings.c:131
 msgid "About gschem"
 msgstr ""
 
-#: ../src/rcstrings.c:130 ../src/x_dialog.c:2541
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 msgid "Hotkeys"
 msgstr "Raccourcis"
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Agrandissement maximum ! Impossible d'agrandir plus.\n"
 
@@ -539,100 +547,101 @@ msgstr "Impossible de lancer %s\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Commandes de documentation non supportÃ©es sous MinGW.\n"
 
-#: ../src/g_rc.c:140
-#, c-format
-msgid "Invalid color [%s] passed to %s\n"
-msgstr "Couleur [%s] passÃ©e Ã  %s invalide\n"
-
-#: ../src/g_rc.c:448
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Agrandissement [%d] passÃ© Ã  %s invalide\n"
 
-#: ../src/g_rc.c:574
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Taille [%d] passÃ©e Ã  text-size invalide\n"
 
-#: ../src/g_rc.c:601
+#: ../src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Taille [%f] passÃ©e Ã  postscript-font-scale invalide\n"
 
-#: ../src/g_rc.c:644
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Taille [%d] passÃ©e Ã  snap-size invalide\n"
 
-#: ../src/g_rc.c:1116
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Nombre de niveaux [%d] passÃ© Ã  undo-levels invalide\n"
 
-#: ../src/g_rc.c:1374
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Taille [%d] passÃ©e Ã  bus-ripper-size invalide\n"
 
-#: ../src/g_rc.c:1449
-#, c-format
-msgid "Invalid dot size [%d] passed to grid-dot-size\n"
+#: ../src/g_rc.c:1293
+#, fuzzy, c-format
+msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Taille de point [%d] passÃ©e Ã  grid-dot-size invalide\n"
 
-#: ../src/g_rc.c:1490
-#, c-format
-msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
+#: ../src/g_rc.c:1334
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
 "Seuil d'affichage de grille [%d] passÃ© Ã  grid-fixed-threshold invalide\n"
 
-#: ../src/g_rc.c:1534
+#: ../src/g_rc.c:1360
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
+msgstr ""
+"Seuil d'affichage de grille [%d] passÃ© Ã  grid-fixed-threshold invalide\n"
+
+#: ../src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Offset [%d] passÃ© Ã  add-attribute-offset invalide\n"
 
-#: ../src/g_rc.c:1558
+#: ../src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Nombre de secondes [%d] passÃ©Â  auto-save-interval invalide\n"
 
-#: ../src/g_rc.c:1599
+#: ../src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Gain [%d] passÃ© Ã  mousepan-gain invalide\n"
 
-#: ../src/g_rc.c:1622
+#: ../src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Gain [%d] passÃ© Ã  keyboardpan-gain invalide\n"
 
-#: ../src/g_rc.c:1668
+#: ../src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Nombre de secondes [%d] passÃ©Â  auto-save-interval invalide\n"
 
-#: ../src/g_rc.c:1694
+#: ../src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Gain [%d] passÃ© Ã  mousepan-gain invalide\n"
 
-#: ../src/g_rc.c:1719
+#: ../src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Nombre de secondes [%d] passÃ©Â  auto-save-interval invalide\n"
 
-#: ../src/gschem.c:189 ../src/gschem.c:200
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem version %s%s.%s\n"
 
-#: ../src/gschem.c:192 ../src/gschem.c:203
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
 "details.\n"
 msgstr "gEDA/gschem n'est accompagnÃ© d'ABSOLUMENT AUCUNE GARANTIE.\n"
 
-#: ../src/gschem.c:194 ../src/gschem.c:205
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -640,7 +649,7 @@ msgstr ""
 "Ceci est un logiciel libre et vous Ãªtes invitÃ© Ã  le redistribuer en "
 "respectant\n"
 
-#: ../src/gschem.c:196 ../src/gschem.c:207
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -650,48 +659,61 @@ msgstr ""
 "COPYING.\n"
 "\n"
 
-#: ../src/gschem.c:211
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Ceci est le portage sous MINGW32\n"
 
-#: ../src/gschem.c:215
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Locale en cours : %s\n"
 
-#: ../src/gschem.c:228
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "Vous devez positionner la variable d'environnement GEDADATA !\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:245
+#: ../src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Ã?chec de la lecture du fichier scm de dÃ©marrage [%s]\n"
 
-#: ../src/gschem.c:249
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lecture du fichier scm de dÃ©marrage [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:253
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Ã?chec de la lecture du fichier scm de dÃ©marrage [%s]\n"
 
-#: ../src/gschem.c:315
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "RÃ©pertoire Scheme NON initialisÃ© !\n"
 
-#: ../src/gschem.c:322 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "ExÃ©cution du script guile [%s]\n"
 
+#: ../src/gschem_cairo.c:310
+#, c-format
+msgid "Unknown end for line (%d)\n"
+msgstr "ExtrÃ©mitÃ© de ligne inconnue (%d)\n"
+
+#: ../src/gschem_cairo.c:318
+#, fuzzy, c-format
+msgid "Unknown type for stroke (%d) !\n"
+msgstr "Type de ligne pour ligne inconnu (%d) !\n"
+
 #: ../src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Mode Composant"
@@ -750,15 +772,11 @@ msgstr "Mode Arc"
 msgid "Pin Mode"
 msgstr "Mode Broche"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Copier"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "DÃ©placer"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Copie Multiple"
 
@@ -770,27 +788,35 @@ msgstr "Montrer cachÃ©"
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:547
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "Action"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2230 ../src/x_window.c:542
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr ""
 
-#: ../src/i_basic.c:264 ../src/x_window.c:544
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "aucun"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "RÃ©pÃ©ter"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr ""
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
+msgid "NONE"
+msgstr ""
+
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Grille(%s,%s)"
@@ -800,69 +826,74 @@ msgstr "Grille(%s,%s)"
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentation pour [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1701
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nouvelle page [%s] crÃ©Ã©e\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:467
+#: ../src/i_callbacks.c:163
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nouvelle fenÃªtre crÃ©Ã©e\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Ã?chec de la sauvegarde de toutes les pages"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Toutes les pages enregistrÃ©es"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Fermeture de la fenÃªtre\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "SÃ©lectionnez d'abord des objets"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Ã?diter le type de ligne"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Ã?diter le texte"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Couleur"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Pivoter"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Miroir"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1623
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Translater"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "ATTENTION : ne translatez pas quand le snap est dÃ©sactivÃ© !\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "ATTENTION : activation du snap et poursuite de la translation.\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ATTENTION : la taille du snap sur la grille n'est pas Ã©gale Ã  100 !\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -870,283 +901,255 @@ msgstr ""
 "ATTENTION : si vous dÃ©placez un symbole Ã  l'origine, la taille de snap de la "
 "grille devrait Ãªtre de 100 !\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Embarquer"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "DÃ©barquer"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "Mettre Ã  jour"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "AfficheCachÃ©"
 
-#: ../src/i_callbacks.c:1142
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "RendVisible"
 
-#: ../src/i_callbacks.c:1259
-msgid "Edit Line Type"
-msgstr "Ã?diter le type de ligne"
-
-#: ../src/i_callbacks.c:1301 ../src/x_dialog.c:1243
-msgid "Edit Fill Type"
-msgstr "Ã?diter le type de remplissage"
-
-#: ../src/i_callbacks.c:1595
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr "Met Ã  jour les extrÃ©mitÃ©s"
 
-#: ../src/i_callbacks.c:1745
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr "Abandonner les modifications ?"
 
-#: ../src/i_callbacks.c:1817
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Coller depuis 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Tampon vide"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Copier 1"
 
-#: ../src/i_callbacks.c:1836
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Copier 2"
 
-#: ../src/i_callbacks.c:1855
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Copier 3"
 
-#: ../src/i_callbacks.c:1874
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Copier 4"
 
-#: ../src/i_callbacks.c:1893
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Copier 5"
 
-#: ../src/i_callbacks.c:1912
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Couper 1"
 
-#: ../src/i_callbacks.c:1931
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Couper 2"
 
-#: ../src/i_callbacks.c:1950
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Couper 3"
 
-#: ../src/i_callbacks.c:1969
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Couper 4"
 
-#: ../src/i_callbacks.c:1988
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Couper 5"
 
-#: ../src/i_callbacks.c:2004
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "Coller 1"
 
-#: ../src/i_callbacks.c:2011 ../src/i_callbacks.c:2033
-#: ../src/i_callbacks.c:2055 ../src/i_callbacks.c:2077
-#: ../src/i_callbacks.c:2099
-msgid "Empty buffer"
-msgstr "Tampon vide"
-
-#: ../src/i_callbacks.c:2026
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "Coller 2"
 
-#: ../src/i_callbacks.c:2048
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "Coller 3"
 
-#: ../src/i_callbacks.c:2070
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "Coller 4"
 
-#: ../src/i_callbacks.c:2092
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "Coller 5"
 
-#: ../src/i_callbacks.c:2229 ../src/x_window.c:406
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Composant"
 
-#: ../src/i_callbacks.c:2265 ../src/i_callbacks.c:2284 ../src/x_dialog.c:2203
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Attribut"
 
-#: ../src/i_callbacks.c:2781
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Recherche de source [%s]\n"
 
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Impossible de trouver source [%s]\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Recherche du symbole [%s]\n"
 
-#: ../src/i_callbacks.c:2878
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2972
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: ../src/i_callbacks.c:3084
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "MontrerN"
 
-#: ../src/i_callbacks.c:3120
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "MontrerV"
 
-#: ../src/i_callbacks.c:3156
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "MontrerNV"
 
-#: ../src/i_callbacks.c:3193
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr ""
 
-#: ../src/i_callbacks.c:3223
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "DÃ©solÃ© mais c'est une option de menu non fonctionnelle\n"
 
-#: ../src/i_callbacks.c:3311
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Mode de retour utilisateur positionnÃ© Ã  OUTLINE\n"
 
-#: ../src/i_callbacks.c:3314
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Mode de retour utilisateur positionnÃ© Ã  BOUNDINGBOX\n"
 
-#: ../src/i_callbacks.c:3331
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Grille OFF\n"
 
-#: ../src/i_callbacks.c:3334
-msgid "Grid ON\n"
-msgstr "Grille ON\n"
+#: ../src/i_callbacks.c:3435
+msgid "Dot grid selected\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3436
+msgid "Mesh grid selected\n"
+msgstr ""
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (ATTENTION)\n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: ../src/i_callbacks.c:3374
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "Snap OFF (ATTENTION)\n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3377
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3392
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3395
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_arc.c:120
-#, c-format
-msgid "Unknown end for arc (%d)\n"
-msgstr "ExtrÃ©mitÃ© d'arc inconnue (%d)\n"
-
-#: ../src/o_arc.c:160
-#, c-format
-msgid "Unknown type for arc !\n"
-msgstr "Type pour arc inconnu !\n"
-
-#: ../src/o_box.c:136
-#, c-format
-msgid "Unknown end for box (%d)\n"
-msgstr "Type d'extrÃ©mitÃ© de boÃ®te inconnue (%d)\n"
-
-#: ../src/o_box.c:176
-#, c-format
-msgid "Unknown type for box !\n"
-msgstr "Type de ligne inconnu pour boÃ®te !\n"
-
-#: ../src/o_box.c:260
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Type de remplissage de boÃ®te inconnu !\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
-msgstr "Valeur de buffer_number incorrecte [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
-msgstr "Valeur de buffer_number incorrecte [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Valeur de buffer_number incorrecte [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:183
-#, c-format
-msgid "Got an invalid which one in o_bus_draw_xor_single\n"
+#: ../src/o_bus.c:135
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Valeur de whichone incorrecte dans o_bus_draw_xor_single\n"
 
-#: ../src/o_circle.c:127
-#, c-format
-msgid "Unknown end for circle\n"
-msgstr "ExtrÃ©mitÃ© de cercle inconnue\n"
-
-#. just to be careful
-#: ../src/o_circle.c:163
-#, c-format
-msgid "Unknown type for circle!\n"
-msgstr "Type de ligne pour cercle inconnu !\n"
-
-#: ../src/o_circle.c:245
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Type de remplissage pour cercle inconnu !\n"
 
-#: ../src/o_complex.c:251 ../src/o_complex.c:255
+#: ../src/o_complex.c:250 ../src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Translation du schÃ©ma [%d %d]\n"
 
-#: ../src/o_line.c:111
-#, c-format
-msgid "Unknown end for line (%d)\n"
-msgstr "ExtrÃ©mitÃ© de ligne inconnue (%d)\n"
-
-#. just to be careful
-#: ../src/o_line.c:151
-#, c-format
-msgid "Unknown type for line (%d) !\n"
-msgstr "Type de ligne pour ligne inconnu (%d) !\n"
-
 #: ../src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
@@ -1162,39 +1165,39 @@ msgstr "Objet dÃ©jÃ  verrouillÃ©\n"
 msgid "Object already unlocked\n"
 msgstr "Objet dÃ©jÃ  dÃ©verrouillÃ©\n"
 
-#: ../src/o_misc.c:444
+#: ../src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Le texte normalement cachÃ© est maintenant visible\n"
 
-#: ../src/o_misc.c:446
+#: ../src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Le texte normalement cachÃ© est maintenant invisible\n"
 
-#: ../src/o_misc.c:694
+#: ../src/o_misc.c:697
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:837
+#: ../src/o_misc.c:840
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 "o_autosave_backups() : Impossible de rÃ©cupÃ©rer le vÃ©ritable nom du fichier %s"
 
-#: ../src/o_misc.c:881
+#: ../src/o_misc.c:884
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Impossible de passer le fichier copie de sauvegarde [%s] en lecture/"
 "Ã©criture\n"
 
-#: ../src/o_misc.c:899
+#: ../src/o_misc.c:902
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr ""
 "Impossible de passer le fichier copie de sauvegarde [%s] en lecture seule\n"
 
-#: ../src/o_misc.c:904
+#: ../src/o_misc.c:907
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Ã?chec lors de la crÃ©ation de la copie de sauvegarde [%s]\n"
@@ -1204,58 +1207,48 @@ msgstr "Ã?chec lors de la crÃ©ation de la copie de sauvegarde [%s]\n"
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERREUR : object==NULL dans o_move_end !\n"
 
-#: ../src/o_move.c:385
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "Incapable de dÃ©terminer le whichone de l'object !\n"
 
-#: ../src/o_move.c:406
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "L'objet passÃ© n'est pas une ligne dans o_move_check_endpoint\n"
 
-#: ../src/o_net.c:253
-#, c-format
-msgid "Got an invalid which one in o_net_draw_xor_single\n"
+#: ../src/o_net.c:176
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Valeur de whichone incorrecte dans o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:630
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:692
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
 #. try to exit gracefully
-#: ../src/o_net.c:1080 ../src/o_net.c:1117 ../src/o_net.c:1188
-#: ../src/o_net.c:1224
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Tentative d'ajout de plus de deux jonctions de bus. Erreur interne gschem.\n"
 
-#: ../src/o_net.c:1294
+#: ../src/o_net.c:1196
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Impossible de trouver %s dans toutes les bibliothÃ¨ques de composants\n"
 
-#: ../src/o_path.c:483
-#, fuzzy, c-format
-msgid "Unknown end for path (%d)\n"
-msgstr "ExtrÃ©mitÃ© d'arc inconnue (%d)\n"
-
-#: ../src/o_path.c:524
-#, fuzzy, c-format
-msgid "Unknown type for path !\n"
-msgstr "Type pour arc inconnu !\n"
-
-#: ../src/o_path.c:594
+#: ../src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Type de remplissage de boÃ®te inconnu !\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:627
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Ã?chec lors du chargement de l'image : %s"
@@ -1264,7 +1257,7 @@ msgstr "Ã?chec lors du chargement de l'image : %s"
 msgid "Picture"
 msgstr "Image"
 
-#: ../src/o_picture.c:535 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERREUR : object==NULL !\n"
@@ -1383,7 +1376,7 @@ msgstr "Tous"
 msgid "Components"
 msgstr "Composants"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:416
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "Pistes"
 
@@ -1391,7 +1384,7 @@ msgstr "Pistes"
 msgid "Replace existing attributes"
 msgstr "Remplacer les attributs existants"
 
-#: ../src/x_autonumber.c:412
+#: ../src/x_autonumber.c:413
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1400,7 +1393,7 @@ msgstr ""
 "problÃ¨mes durant l'annotation automatique\n"
 
 #. duplicate slot in used_slots
-#: ../src/x_autonumber.c:427
+#: ../src/x_autonumber.c:428
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
@@ -1408,139 +1401,138 @@ msgstr ""
 "Les slots dupliquÃ©s sont susceptibles de crÃ©er des problÃ¨mes : [symbolname=%"
 "s, number=%d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:695
+#: ../src/x_autonumber.c:696
 msgid "No searchstring given in autonumber text.\n"
 msgstr "Pas de motif de recherche fourni pour l'annotation automatique.\n"
 
-#: ../src/x_autonumber.c:746
+#: ../src/x_autonumber.c:748
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 "Pas de caractÃ¨re '*' ou '?' Ã  la fin du motif de recherche pour annotation "
 "automatique.\n"
 
-#: ../src/x_autonumber.c:880
+#: ../src/x_autonumber.c:883
 msgid "Diagonal"
 msgstr "en diagonal"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Top to bottom"
 msgstr "de haut en bas"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Bottom to top"
 msgstr "de bas en haut"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Left to right"
 msgstr "de gauche Ã  droite"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Right to left"
 msgstr "de droite Ã  gauche"
 
-#: ../src/x_autonumber.c:883
+#: ../src/x_autonumber.c:886
 msgid "File order"
 msgstr "dans ordre des Ã©lÃ©ments du fichier"
 
-#: ../src/x_autonumber.c:1219
+#: ../src/x_autonumber.c:1222
 msgid "Autonumber text"
 msgstr "Annotation automatique"
 
 #. scope section
-#: ../src/x_autonumber.c:1243
+#: ../src/x_autonumber.c:1246
 msgid "<b>Scope</b>"
 msgstr "<b>PortÃ©e</b>"
 
-#: ../src/x_autonumber.c:1265
+#: ../src/x_autonumber.c:1268
 msgid "Search for:"
 msgstr "Motif de recherche :"
 
-#: ../src/x_autonumber.c:1279
+#: ../src/x_autonumber.c:1282
 msgid "Autonumber text in:"
 msgstr "Annoter automatiquement :"
 
-#: ../src/x_autonumber.c:1286
+#: ../src/x_autonumber.c:1289
 msgid "Skip numbers found in:"
 msgstr "Passer les nombres trouvÃ©s dans :"
 
-#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
 msgid "Selected objects"
 msgstr "les objets sÃ©lectionnÃ©s"
 
-#: ../src/x_autonumber.c:1299 ../src/x_autonumber.c:1308
+#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
 msgid "Current page"
 msgstr "la page en cours"
 
-#: ../src/x_autonumber.c:1300 ../src/x_autonumber.c:1309
+#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
 msgid "Whole hierarchy"
 msgstr "la hiÃ©rarchie complÃ¨te"
 
-#: ../src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1314
 msgid "Overwrite existing numbers"
 msgstr "Remplacer les annotations existantes"
 
 #. Options section
-#: ../src/x_autonumber.c:1316
+#: ../src/x_autonumber.c:1319
 msgid "<b>Options</b>"
 msgstr "<b>Options</b>"
 
-#: ../src/x_autonumber.c:1338
+#: ../src/x_autonumber.c:1341
 msgid "Starting number:"
 msgstr "Indice de dÃ©part :"
 
-#: ../src/x_autonumber.c:1345
+#: ../src/x_autonumber.c:1348
 msgid "Sort order:"
 msgstr "Ordre :"
 
-#: ../src/x_autonumber.c:1366
+#: ../src/x_autonumber.c:1369
 msgid "Remove numbers"
 msgstr "Supprimer les annotations"
 
-#: ../src/x_autonumber.c:1370
+#: ../src/x_autonumber.c:1373
 msgid "Automatic slotting"
 msgstr "Slotting automatique"
 
-#: ../src/x_color.c:52 ../src/x_color.c:61 ../src/x_color.c:124
-#: ../src/x_color.c:172
+#: ../src/x_color.c:94 ../src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Impossible d'allouer la couleur %s !\n"
 
-#: ../src/x_color.c:52
+#: ../src/x_color.c:94
 msgid "black"
 msgstr "noir"
 
-#: ../src/x_color.c:61
+#: ../src/x_color.c:103
 msgid "white"
 msgstr "blanc"
 
-#: ../src/x_color.c:103 ../src/x_color.c:140
-#, c-format
-msgid "Could not find the color %s!\n"
-msgstr "Impossible de trouver la couleur %s !\n"
-
-#: ../src/x_color.c:106 ../src/x_color.c:143
-#, c-format
-msgid "Defaulting color to white\n"
-msgstr "Repli sur la couleur par dÃ©faut, blanc\n"
+#: ../src/x_color.c:125
+#, fuzzy, c-format
+msgid "Could not allocate display color %i!\n"
+msgstr "Impossible d'allouer la couleur %s !\n"
 
-#: ../src/x_color.c:113 ../src/x_color.c:150
-#, c-format
-msgid "Ack! Cannot allocate white!\n"
-msgstr "Hum ! allocation de 'white' impossible !\n"
+#: ../src/x_color.c:147
+#, fuzzy, c-format
+msgid "Could not allocate outline color %i!\n"
+msgstr "Impossible d'allouer la couleur %s !\n"
 
-#: ../src/x_color.c:191 ../src/x_color.c:207
+#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Tentative d'obtention d'une couleur invalide : %d\n"
 
+#: ../src/x_color.c:214
+#, fuzzy, c-format
+msgid "Tried to get an invalid outline color: %d\n"
+msgstr "Tentative d'obtention d'une couleur invalide : %d\n"
+
 #. GtkLabel
 #: ../src/x_compselect.c:1040
 msgid "Filter:"
 msgstr "Filtre:"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3591
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Nom"
@@ -1581,11 +1573,11 @@ msgid "Preview"
 msgstr "PrÃ©visualisation"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Ajout de texte..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1595,182 +1587,185 @@ msgstr ""
 "dÃ©placez le curseur dans la fenÃªtre, cliquez pour placer le texte.\n"
 "Bouton du milieu pour pivoter le texte avant placement."
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "En bas Ã  gauche"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Au milieu Ã  gauche"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "En haut Ã  gauche"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "En bas au milieu"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Au centre"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "En haut au milieu"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "En bas Ã  droite"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Au milieu Ã  droite"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "En haut Ã  droite"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Editer les propriÃ©tÃ©s du texte"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Texte</b>"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>PropriÃ©tÃ©s du texte</b>"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 msgid "Color:"
 msgstr "Couleur :"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr "Taille :"
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Alignement du texte :"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "Continu"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "PointillÃ©s"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Tirets"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "CentrÃ©"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "FantÃ´me"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:964 ../src/x_dialog.c:965 ../src/x_dialog.c:966
-#: ../src/x_dialog.c:974 ../src/x_dialog.c:1157 ../src/x_dialog.c:1159
-#: ../src/x_dialog.c:1161 ../src/x_dialog.c:1163 ../src/x_dialog.c:1165
-#: ../src/x_dialog.c:1368 ../src/x_dialog.c:1369 ../src/x_dialog.c:1370
-#: ../src/x_dialog.c:1371 ../src/x_dialog.c:1372 ../src/x_dialog.c:1380
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*inchangÃ©*"
 
-#: ../src/x_dialog.c:858
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Ã?paisseur et type de ligne"
 
-#: ../src/x_dialog.c:897
-msgid "Width:"
-msgstr "Largeur :"
-
-#: ../src/x_dialog.c:901 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 msgid "Type:"
 msgstr "Type :"
 
-#: ../src/x_dialog.c:905
+#: ../src/x_dialog.c:1021
+msgid "Width:"
+msgstr "Largeur :"
+
+#: ../src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Longueur du tiret :"
 
-#: ../src/x_dialog.c:909
+#: ../src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Espace entre tirets :"
 
-#: ../src/x_dialog.c:1014
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Vide"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Plein"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Quadrillage"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Rayures"
 
-#: ../src/x_dialog.c:1281
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Ã?diter le type de remplissage"
+
+#: ../src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Type de remplissage :"
 
-#: ../src/x_dialog.c:1285
+#: ../src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Ã?paisseur :"
 
-#: ../src/x_dialog.c:1289
+#: ../src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Angle1 :"
 
-#: ../src/x_dialog.c:1293
+#: ../src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Ã?cart1 :"
 
-#: ../src/x_dialog.c:1297
+#: ../src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Angle2 :"
 
-#: ../src/x_dialog.c:1301
+#: ../src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Ã?cart2 :"
 
-#: ../src/x_dialog.c:1480
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "ParamÃ¨tres d'arc"
 
-#: ../src/x_dialog.c:1520
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1528
+#: ../src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Angle de dÃ©part :"
 
-#: ../src/x_dialog.c:1536
+#: ../src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Balayage :"
 
-#: ../src/x_dialog.c:1653
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1778,44 +1773,44 @@ msgstr ""
 "Cible pour translation ?\n"
 "(0 pour translation Ã  l'origine)"
 
-#: ../src/x_dialog.c:1721
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Taille de texte :"
 
-#: ../src/x_dialog.c:1751
+#: ../src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Entrez la nouvelle taille de texte :"
 
-#: ../src/x_dialog.c:1826
+#: ../src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Grille de snap"
 
-#: ../src/x_dialog.c:1856
+#: ../src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Entrez le nouvel espacement de la grille de snap :"
 
-#: ../src/x_dialog.c:1929
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "NumÃ©ro de slot"
 
-#: ../src/x_dialog.c:1960
+#: ../src/x_dialog.c:2138
 msgid "Edit slot number:"
 msgstr "NumÃ©ro de slot :"
 
-#: ../src/x_dialog.c:2022
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "Ã? propos..."
 
-#: ../src/x_dialog.c:2042
+#: ../src/x_dialog.c:2220
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA : GPL Electronic Design Automation</b>"
 
-#: ../src/x_dialog.c:2046
+#: ../src/x_dialog.c:2224
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem version %s%s.$s</b>"
 
-#: ../src/x_dialog.c:2054
+#: ../src/x_dialog.c:2232
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1828,137 +1823,145 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "Et bien d'autres (consultez le fichier AUTHORS)"
 
-#: ../src/x_dialog.c:2119
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Coords"
 
-#: ../src/x_dialog.c:2140
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "Ã?cran"
 
-#: ../src/x_dialog.c:2149
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "Monde"
 
-#: ../src/x_dialog.c:2188
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2194
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2206
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2388
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Ajouter un attribut"
 
-#: ../src/x_dialog.c:2215 ../src/x_window.c:434
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/x_dialog.c:2221
+#: ../src/x_dialog.c:2397
 #, fuzzy
 msgid "Selection"
 msgstr "SÃ©lection"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2403
 #, fuzzy
 msgid "Zoom box"
 msgstr "Zoom boÃ®te"
 
-#: ../src/x_dialog.c:2236
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2415
 #, fuzzy
 msgid "Net junction"
 msgstr "Action"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2390
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "ERREUR : object==NULL dans color_edit_dialog_apply !\n"
 
-#: ../src/x_dialog.c:2452
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "SÃ©lecteur de couleur"
 
-#: ../src/x_dialog.c:2483
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr "Couleur de l'objet :"
 
-#: ../src/x_dialog.c:2605
+#: ../src/x_dialog.c:2786
 #, fuzzy
 msgid "Function"
 msgstr "Action"
 
-#: ../src/x_dialog.c:2612
+#: ../src/x_dialog.c:2793
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "Action : raccourci(s)"
 
-#: ../src/x_dialog.c:2921
+#: ../src/x_dialog.c:3102
 msgid "Find Text"
 msgstr "Recherche de texte"
 
-#: ../src/x_dialog.c:2952
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Texte Ã  rechercher :"
 
-#: ../src/x_dialog.c:2962
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "descendre dans la hiÃ©rarchie"
 
-#: ../src/x_dialog.c:3026
+#: ../src/x_dialog.c:3208
 msgid "Hide Text"
 msgstr "Cacher le texte"
 
-#: ../src/x_dialog.c:3057
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Cacher le texte commenÃ§ant par :"
 
-#: ../src/x_dialog.c:3125
+#: ../src/x_dialog.c:3308
 msgid "Show Text"
 msgstr "Montrer le texte"
 
-#: ../src/x_dialog.c:3156
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Montrer le texte commenÃ§ant par :"
 
-#: ../src/x_dialog.c:3613
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr "_SÃ©lectionnez les schÃ©mas que vous souhaitez enregistrer :"
 
-#: ../src/x_dialog.c:3707
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 "Voulez-vous enregistrer les modifications dans le schÃ©ma \"%s\" avant de le "
 "fermer ?"
 
-#: ../src/x_dialog.c:3713
+#: ../src/x_dialog.c:3896
 #, fuzzy, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1967,17 +1970,17 @@ msgstr ""
 "enregistrer les modifications avant de fermer ?"
 
 #. secondary label
-#: ../src/x_dialog.c:3742
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 "Si vous n'enregistrez pas, les modifications effectuÃ©es seront "
 "dÃ©finitivement perdues."
 
-#: ../src/x_dialog.c:3762
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr "Fermer sans sa_uvegarder"
 
-#: ../src/x_dialog.c:4096
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1988,11 +1991,25 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: ../src/x_dialog.c:4098
+#: ../src/x_dialog.c:4281
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Ajouter un attribut"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Type :"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "Action"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "sch - SchÃ©mas"
@@ -2137,50 +2154,55 @@ msgid "/Edit..."
 msgstr "/Ã?diter..."
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Ã?diter le type de ligne"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copier"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/DÃ©placer"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Supprimer"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Descendre dans le schÃ©ma"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Descendre dans le symbole"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Remonter"
 
-#: ../src/x_menus.c:323
+#: ../src/x_menus.c:316
 #, fuzzy, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Tentative de rendre sensible un Ã©lÃ©ment de menu inexistant\n"
 
-#: ../src/x_menus.c:347
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory n'existe pas !\n"
 
-#: ../src/x_menus.c:360
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Tentative de rendre sensible un Ã©lÃ©ment de menu contextuel inexistant\n"
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:455
+#: ../src/x_menus.c:462
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Impossible de lancer %s\n"
 
-#: ../src/x_menus.c:516
+#: ../src/x_menus.c:524
 msgid "Clear"
 msgstr "Effacer"
 
@@ -2246,6 +2268,11 @@ msgstr "ModifiÃ©"
 msgid "Right click on the filename for more options..."
 msgstr "Utilisez le clic droit sur le nom de fichier pour plus d'options..."
 
+#: ../src/x_preview.c:223
+#, fuzzy
+msgid "Preview Buffer"
+msgstr "Tampon"
+
 #: ../src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Enregistrer en PostScript sous..."
@@ -2324,55 +2351,35 @@ msgstr "SchÃ©ma en cours imprimÃ© dans fichier [%s]\n"
 msgid "Couldn't allocate gc\n"
 msgstr "Allocation gc impossible\n"
 
-#: ../src/x_window.c:94
-#, c-format
-msgid "Couldn't allocate xor_gc\n"
-msgstr "Allocation xor_gc impossible\n"
-
-#: ../src/x_window.c:107
-#, c-format
-msgid "Couldn't allocate outline_xor_gc\n"
-msgstr "Allocation outline_xor_gc impossible\n"
-
-#: ../src/x_window.c:123
-#, c-format
-msgid "Couldn't allocate bounding_xor_gc\n"
-msgstr "Allocation bounding_xor_gc impossible\n"
-
-#: ../src/x_window.c:130
-#, c-format
-msgid "Couldn't allocate bus_gc\n"
-msgstr "Allocation bus_gc impossible\n"
-
-#: ../src/x_window.c:369
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "Nouveau fichier"
 
-#: ../src/x_window.c:375
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../src/x_window.c:376
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Ouvrir fichier..."
 
-#: ../src/x_window.c:382
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/x_window.c:383
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Sauvegarder le fichier"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "DÃ©faire la derniÃ¨re opÃ©ration"
 
-#: ../src/x_window.c:398
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Refaire le dernier dÃ©fait"
 
-#: ../src/x_window.c:407
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2384,7 +2391,7 @@ msgstr ""
 "pointeur dans la fenÃªtre principale.\n"
 "Clic gauche pour placer, clic droit pour annuler."
 
-#: ../src/x_window.c:417
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2392,7 +2399,7 @@ msgstr ""
 "Mode ajout de piste\n"
 "Clic droit pour annuler"
 
-#: ../src/x_window.c:427
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2400,79 +2407,79 @@ msgstr ""
 "Mode ajout de bus\n"
 "Clic droit pour annuler"
 
-#: ../src/x_window.c:435
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "Ajouter du texte..."
 
-#: ../src/x_window.c:445
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "SÃ©lectionner"
 
-#: ../src/x_window.c:446
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "Mode sÃ©lection"
 
-#: ../src/x_window.c:533
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "Prendre"
 
-#: ../src/x_window.c:549
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "RÃ©pÃ©ter/aucun"
 
-#: ../src/x_window.c:559
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Annuler"
 
-#: ../src/x_window.c:561
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Panoramique/Annuler"
 
-#: ../src/x_window.c:783
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Chargement du schÃ©ma [%s]\n"
 
-#: ../src/x_window.c:795
+#: ../src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "Ã?chec lors du chargement de l'image : %s"
 
-#: ../src/x_window.c:804
+#: ../src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "Nouveau fichier"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:909
+#: ../src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Ã?chec sauvegarde de la page [%s]\n"
 
-#: ../src/x_window.c:910
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Erreur lors de la tentative de sauvegarde"
 
-#: ../src/x_window.c:919
+#: ../src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "EnregistrÃ© sous [%s]\n"
 
-#: ../src/x_window.c:921
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Sauvegarder [%s]\n"
 
-#: ../src/x_window.c:923
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Sauvegarder"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Abandonne page [%s]\n"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Ferme [%s]\n"
@@ -2486,6 +2493,79 @@ msgstr ""
 msgid "gEDA Schematic Editor"
 msgstr "Descendre dans la hiÃ©rarchie"
 
+#, fuzzy
+#~ msgid "Cut Buffer"
+#~ msgstr "Tampon"
+
+#, fuzzy
+#~ msgid "Copy Buffer"
+#~ msgstr "Tampon"
+
+#~ msgid "Toggle Grid On/Off"
+#~ msgstr "Afficher/Cacher la grille"
+
+#~ msgid "Invalid color [%s] passed to %s\n"
+#~ msgstr "Couleur [%s] passÃ©e Ã  %s invalide\n"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "Vous devez positionner la variable d'environnement GEDADATA !\n"
+
+#~ msgid "Grid ON\n"
+#~ msgstr "Grille ON\n"
+
+#~ msgid "Unknown end for arc (%d)\n"
+#~ msgstr "ExtrÃ©mitÃ© d'arc inconnue (%d)\n"
+
+#~ msgid "Unknown type for arc !\n"
+#~ msgstr "Type pour arc inconnu !\n"
+
+#~ msgid "Unknown end for box (%d)\n"
+#~ msgstr "Type d'extrÃ©mitÃ© de boÃ®te inconnue (%d)\n"
+
+#~ msgid "Unknown type for box !\n"
+#~ msgstr "Type de ligne inconnu pour boÃ®te !\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+#~ msgstr "Valeur de buffer_number incorrecte [o_buffer_copy]\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+#~ msgstr "Valeur de buffer_number incorrecte [o_buffer_cut]\n"
+
+#~ msgid "Unknown end for circle\n"
+#~ msgstr "ExtrÃ©mitÃ© de cercle inconnue\n"
+
+#~ msgid "Unknown type for circle!\n"
+#~ msgstr "Type de ligne pour cercle inconnu !\n"
+
+#, fuzzy
+#~ msgid "Unknown end for path (%d)\n"
+#~ msgstr "ExtrÃ©mitÃ© d'arc inconnue (%d)\n"
+
+#, fuzzy
+#~ msgid "Unknown type for path !\n"
+#~ msgstr "Type pour arc inconnu !\n"
+
+#~ msgid "Could not find the color %s!\n"
+#~ msgstr "Impossible de trouver la couleur %s !\n"
+
+#~ msgid "Defaulting color to white\n"
+#~ msgstr "Repli sur la couleur par dÃ©faut, blanc\n"
+
+#~ msgid "Ack! Cannot allocate white!\n"
+#~ msgstr "Hum ! allocation de 'white' impossible !\n"
+
+#~ msgid "Couldn't allocate xor_gc\n"
+#~ msgstr "Allocation xor_gc impossible\n"
+
+#~ msgid "Couldn't allocate outline_xor_gc\n"
+#~ msgstr "Allocation outline_xor_gc impossible\n"
+
+#~ msgid "Couldn't allocate bounding_xor_gc\n"
+#~ msgstr "Allocation bounding_xor_gc impossible\n"
+
+#~ msgid "Couldn't allocate bus_gc\n"
+#~ msgstr "Allocation bus_gc impossible\n"
+
 #~ msgid "Got NULL in o_attrib_toggle_visibility\n"
 #~ msgstr "object==NULL dans o_attrib_toggle_visibility()\n"
 
@@ -2619,9 +2699,6 @@ msgstr "Descendre dans la hiÃ©rarchie"
 #~ msgid "Edit Text Color"
 #~ msgstr "Couleur du texte :"
 
-#~ msgid "Line Type"
-#~ msgstr "Type :"
-
 #~ msgid "String too long... hack!\n"
 #~ msgstr "ChaÃ®ne de caractÃ¨res trop longue... !\n"
 
diff --git a/gschem/po/it.po b/gschem/po/it.po
index 72c8340..805159f 100644
--- a/gschem/po/it.po
+++ b/gschem/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it_IT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:41-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-20 14:38+0000\n"
 "Last-Translator: Michele <michelinux@xxxxxxxx>\n"
 "Language-Team: Italiano <michelinux@xxxxxxxx>\n"
@@ -63,7 +63,7 @@ msgstr "Stampa..."
 msgid "Write image..."
 msgstr "Scrivi immagine..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:498
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 msgid "Recent files"
 msgstr "File recenti"
 
@@ -79,33 +79,36 @@ msgstr "Chiudi finestra"
 msgid "Quit"
 msgstr "Esci"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:390
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "Annulla"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:397
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Ripristina"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:573
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "ModalitÃ  selezione"
 
 #: ../src/rcstrings.c:22
-msgid "Cut Buffer"
-msgstr "Svuota buffer"
+#, fuzzy
+msgid "Cut"
+msgstr "Taglia 1"
 
-#: ../src/rcstrings.c:23
-msgid "Copy Buffer"
-msgstr "Copia buffer"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "Copia"
 
 #: ../src/rcstrings.c:24
-msgid "Paste Buffer"
-msgstr "Incolla buffer"
+#, fuzzy
+msgid "Paste"
+msgstr "Incolla 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -127,7 +130,7 @@ msgstr "ModalitÃ  di copiatura multipla"
 msgid "Move Mode"
 msgstr "ModalitÃ  spostamento"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "Cancella"
 
@@ -147,11 +150,11 @@ msgstr "Slot..."
 msgid "Color..."
 msgstr "Colore..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2233
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Blocca"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Sblocca"
 
@@ -260,7 +263,7 @@ msgid "Redraw"
 msgstr "Aggiorna"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1504 ../src/i_callbacks.c:1576
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Pan"
 
@@ -284,230 +287,238 @@ msgstr "Riduci"
 msgid "Zoom Full"
 msgstr "Riduci al Massimo"
 
+#: ../src/rcstrings.c:71
+msgid "Dark color scheme"
+msgstr ""
+
 #: ../src/rcstrings.c:72
+msgid "Light color scheme"
+msgstr ""
+
+#: ../src/rcstrings.c:74
 msgid "Page"
 msgstr "Pagina"
 
-#: ../src/rcstrings.c:73
+#: ../src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Gestore..."
 
-#: ../src/rcstrings.c:74
+#: ../src/rcstrings.c:76
 msgid "Next"
 msgstr "Successiva"
 
-#: ../src/rcstrings.c:75
+#: ../src/rcstrings.c:77
 msgid "Previous"
 msgstr "Precedente"
 
-#: ../src/rcstrings.c:76 ../src/x_window.c:368
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "Nuovo"
 
-#: ../src/rcstrings.c:77
+#: ../src/rcstrings.c:79
 msgid "Revert"
 msgstr "Riduce e Centra lo Schema"
 
-#: ../src/rcstrings.c:78
+#: ../src/rcstrings.c:80
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../src/rcstrings.c:79
+#: ../src/rcstrings.c:81
 msgid "Discard"
 msgstr "Annulla"
 
-#: ../src/rcstrings.c:81
+#: ../src/rcstrings.c:83
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../src/rcstrings.c:82
+#: ../src/rcstrings.c:84
 msgid "Component..."
 msgstr "Componente..."
 
 #. need to click
-#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2306 ../src/i_callbacks.c:2333
-#: ../src/x_dialog.c:2200
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "Collegamento"
 
 #. need to click
-#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2377 ../src/i_callbacks.c:2404
-#: ../src/x_dialog.c:2218 ../src/x_window.c:426
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:85
+#: ../src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Caratteristica..."
 
-#: ../src/rcstrings.c:86
+#: ../src/rcstrings.c:88
 msgid "Text..."
 msgstr "Testo..."
 
-#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2485 ../src/i_callbacks.c:2508
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Linea"
 
-#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2530 ../src/i_callbacks.c:2553
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "Box"
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2609 ../src/i_callbacks.c:2633
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "Cerchio"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2655 ../src/i_callbacks.c:2678
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Arco"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2700 ../src/i_callbacks.c:2723
-#: ../src/x_dialog.c:2191
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "Pin"
 
-#: ../src/rcstrings.c:92
+#: ../src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Immagine..."
 
-#: ../src/rcstrings.c:94
+#: ../src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Gerarchia"
 
-#: ../src/rcstrings.c:95
+#: ../src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Scarica Schematico"
 
-#: ../src/rcstrings.c:96
+#: ../src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Scarica Simbolo"
 
-#: ../src/rcstrings.c:97
+#: ../src/rcstrings.c:99
 msgid "Up"
 msgstr "Sopra"
 
-#: ../src/rcstrings.c:98
+#: ../src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Documentazione"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100 ../src/x_compselect.c:1418
+#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
 #: ../src/x_multiattrib.c:1543
 msgid "Attributes"
 msgstr "Caratteristiche"
 
-#: ../src/rcstrings.c:101 ../src/i_callbacks.c:3000
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Collega"
 
-#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3046
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "Scollega"
 
-#: ../src/rcstrings.c:103
+#: ../src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Mostra Valore"
 
-#: ../src/rcstrings.c:104
+#: ../src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Mostra Nome"
 
-#: ../src/rcstrings.c:105
+#: ../src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Mostra Entrambi"
 
-#: ../src/rcstrings.c:106
+#: ../src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Pulsante VisibilitÃ "
 
-#: ../src/rcstrings.c:107
+#: ../src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Trova Testo Specifico..."
 
-#: ../src/rcstrings.c:108
+#: ../src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Nascondi Testo Specifico..."
 
-#: ../src/rcstrings.c:109
+#: ../src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Mostra Testo Specifico..."
 
-#: ../src/rcstrings.c:110
+#: ../src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr ""
 
-#: ../src/rcstrings.c:112
+#: ../src/rcstrings.c:114
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../src/rcstrings.c:113
+#: ../src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Ampiezza Testo..."
 
-#: ../src/rcstrings.c:114
-msgid "Toggle Grid On/Off"
-msgstr "ModalitÃ  Griglia Visibile/Non Visibile"
+#: ../src/rcstrings.c:116
+msgid "Cycle grid styles"
+msgstr ""
 
-#: ../src/rcstrings.c:115
+#: ../src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr ""
 
-#: ../src/rcstrings.c:116
+#: ../src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Ampiezza Griglia"
 
-#: ../src/rcstrings.c:117
+#: ../src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr ""
 
-#: ../src/rcstrings.c:118
+#: ../src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr ""
 
-#: ../src/rcstrings.c:119
+#: ../src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr ""
 
-#: ../src/rcstrings.c:120
+#: ../src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: ../src/rcstrings.c:121
+#: ../src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Mostra Finestra File di Log..."
 
-#: ../src/rcstrings.c:122
+#: ../src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Mostra Coordinate Finestra..."
 
-#: ../src/rcstrings.c:124
+#: ../src/rcstrings.c:126
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../src/rcstrings.c:125
+#: ../src/rcstrings.c:127
 msgid "Manual"
 msgstr "Manuale"
 
-#: ../src/rcstrings.c:126
+#: ../src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "Documentazione gEDA"
 
-#: ../src/rcstrings.c:127
+#: ../src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "FAQ gschem"
 
-#: ../src/rcstrings.c:128
+#: ../src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Documentazione componente"
 
-#: ../src/rcstrings.c:129
+#: ../src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Informazioni su gschem"
 
-#: ../src/rcstrings.c:130 ../src/x_dialog.c:2541
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr ""
 "Eccessiva riduzione dell'immagine!  Non Ã¨ possibile ridurla ulteriormente.\n"
@@ -529,97 +540,99 @@ msgstr "Non Ã¨ possibile invocare %s\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Comandi documentazione non supportati sotto MinGW.\n"
 
-#: ../src/g_rc.c:140
-#, c-format
-msgid "Invalid color [%s] passed to %s\n"
-msgstr "Colore [%s] non valido passato a %s\n"
-
-#: ../src/g_rc.c:448
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Fattore di ingrandimento [%d] passato a %s non valido.\n"
 
-#: ../src/g_rc.c:574
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Grandezza [%d] passata alla dimensione del testo, non valida\n"
 
-#: ../src/g_rc.c:601
+#: ../src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "L'ampiezza [%f] passata al postscript-font-scale non Ã¨ valida\n"
 
-#: ../src/g_rc.c:644
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "L'ampiezza [%d] , assegnata alla snap size, non Ã¨ corretta\n"
 
-#: ../src/g_rc.c:1116
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Il numero di livelli [%d] assegnato ai livelli Cancella non Ã¨ valido\n"
 
-#: ../src/g_rc.c:1374
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr ""
 
-#: ../src/g_rc.c:1449
-#, c-format
-msgid "Invalid dot size [%d] passed to grid-dot-size\n"
+#: ../src/g_rc.c:1293
+#, fuzzy, c-format
+msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr ""
 "Il valore [%d] dell'ampiezza dei punti passata alla griglia non Ã¨ valida\n"
 
-#: ../src/g_rc.c:1490
-#, c-format
-msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
+#: ../src/g_rc.c:1334
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
+"Il valore [%d] dell'ampiezza dei punti passata alla griglia non Ã¨ valida\n"
 
-#: ../src/g_rc.c:1534
+#: ../src/g_rc.c:1360
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
+msgstr ""
+"Il valore [%d] dell'ampiezza dei punti passata alla griglia non Ã¨ valida\n"
+
+#: ../src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr ""
 
-#: ../src/g_rc.c:1558
+#: ../src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr ""
 "Il numero di secondi indicati [%d] non Ã¨ valido ai fini dell'intervallo di "
 "auto salvataggio\n"
 
-#: ../src/g_rc.c:1599
+#: ../src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr ""
 
-#: ../src/g_rc.c:1622
+#: ../src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr ""
 
-#: ../src/g_rc.c:1668
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Il numero [%d] di pixel indicati non Ã¨ valido\n"
 
-#: ../src/g_rc.c:1694
+#: ../src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Grandezza [%d] passata alla dimensione del testo, non valida\n"
 
-#: ../src/g_rc.c:1719
+#: ../src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr ""
 "Il numero di secondi indicati [%d] non Ã¨ valido ai fini dell'intervallo di "
 "auto salvataggio\n"
 
-#: ../src/gschem.c:189 ../src/gschem.c:200
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versione %s%s.%s\n"
 
-#: ../src/gschem.c:192 ../src/gschem.c:203
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -628,7 +641,7 @@ msgstr ""
 "gEDA/gschem viene rilasciato SENZA GARANZIA ALCUNA A CAUSA DEL SUO SVILUPPO "
 "IN FASE ALFA; leggere il file COPYING per ulteriori informazioni.\n"
 
-#: ../src/gschem.c:194 ../src/gschem.c:205
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -636,55 +649,68 @@ msgstr ""
 "Questo software Ã¨ rilasciato sotto licenza GPL e puÃ² essere ridistribuito "
 "sotto determinate\n"
 
-#: ../src/gschem.c:196 ../src/gschem.c:207
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
 "\n"
 msgstr "condizioni; per favore leggi il file COPYNG per ulteriori dettagli.\n"
 
-#: ../src/gschem.c:211
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Port per MINGW32.\n"
 
-#: ../src/gschem.c:215
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Impostazioni locali correnti: %s\n"
 
-#: ../src/gschem.c:228
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "Devi impostare la variabile d'ambiente GEDADATA!\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:245
+#: ../src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Fallita la lettura del file init scm [%s]\n"
 
-#: ../src/gschem.c:249
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lettura del file init scm [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:253
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Fallita la lettura del file init scm [%s]\n"
 
-#: ../src/gschem.c:315
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Cartelle degli schemi non impostata!\n"
 
-#: ../src/gschem.c:322 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Esecuzione dello script guile [%s]\n"
 
+#: ../src/gschem_cairo.c:310
+#, c-format
+msgid "Unknown end for line (%d)\n"
+msgstr "Non corretta terminazione per la linea (%d)\n"
+
+#: ../src/gschem_cairo.c:318
+#, fuzzy, c-format
+msgid "Unknown type for stroke (%d) !\n"
+msgstr "Tipo di linea sconosciuta per (%d) !\n"
+
 #: ../src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Scelta Componente"
@@ -743,15 +769,11 @@ msgstr "ModalitÃ  Arco"
 msgid "Pin Mode"
 msgstr "ModalitÃ  Pin"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Copia"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "Sposta"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Copia Multipla"
 
@@ -763,27 +785,35 @@ msgstr "Mostra Nascosto"
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:547
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "Azione"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2230 ../src/x_window.c:542
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr ""
 
-#: ../src/i_basic.c:264 ../src/x_window.c:544
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "none"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Ripeti/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr "OFF"
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
+msgid "NONE"
+msgstr ""
+
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Griglia(%s, %s)"
@@ -793,71 +823,76 @@ msgstr "Griglia(%s, %s)"
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentazione per [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1701
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nuova Pagina Creata [%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:467
+#: ../src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Creata Nuova Finestra [%s]\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Salvataggio Fallito"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Salvato Tutto"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Chiusura Finestra\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Seleziona prima un oggetto"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Modifica il Tipo di Linea"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Modifica Testo"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Colore"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Ruota"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Specchio"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1623
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Converti"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "ATTENZIONE: Non effettuare la conversione in modalitÃ  snap off!\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr ""
 "ATTENZIONE: Sei in modalitÃ  snap off; passa prima in modalitÃ  snap on e poi "
 "continua con la conversione.\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ATTENZIONE: L'ampiezza snap gride non Ã¨ uguale a 100!\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -865,140 +900,145 @@ msgstr ""
 "ATTENZIONE: se stai convertendo un simbolo dalla sua origine, Ã¨ opportuno "
 "che l'ampiezza snap gride venga impostata a 100\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Posizionato"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Non posizionato"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "Mostra Nascosto"
 
-#: ../src/i_callbacks.c:1142
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "Rendi Visibile"
 
-#: ../src/i_callbacks.c:1259
-msgid "Edit Line Type"
-msgstr "Modifica il Tipo di Linea"
-
-#: ../src/i_callbacks.c:1301 ../src/x_dialog.c:1243
-msgid "Edit Fill Type"
-msgstr "Modifica il Tipo di Riempimento"
-
-#: ../src/i_callbacks.c:1595
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr ""
 
-#: ../src/i_callbacks.c:1745
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr "Vuoi veramente ritornare alla pagina precedente?"
 
-#: ../src/i_callbacks.c:1817
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Incolla da 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Buffer vuoto"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Copia 1"
 
-#: ../src/i_callbacks.c:1836
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Copia 2"
 
-#: ../src/i_callbacks.c:1855
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Copia 3"
 
-#: ../src/i_callbacks.c:1874
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Copia 4"
 
-#: ../src/i_callbacks.c:1893
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Copia 5"
 
-#: ../src/i_callbacks.c:1912
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Taglia 1"
 
-#: ../src/i_callbacks.c:1931
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Taglia 2"
 
-#: ../src/i_callbacks.c:1950
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Taglia 3"
 
-#: ../src/i_callbacks.c:1969
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Taglia 4"
 
-#: ../src/i_callbacks.c:1988
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Taglia 5"
 
-#: ../src/i_callbacks.c:2004
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "Incolla 1"
 
-#: ../src/i_callbacks.c:2011 ../src/i_callbacks.c:2033
-#: ../src/i_callbacks.c:2055 ../src/i_callbacks.c:2077
-#: ../src/i_callbacks.c:2099
-msgid "Empty buffer"
-msgstr "Buffer vuoto"
-
-#: ../src/i_callbacks.c:2026
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "Incolla 2"
 
-#: ../src/i_callbacks.c:2048
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "Incolla 3"
 
-#: ../src/i_callbacks.c:2070
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "Incolla 4"
 
-#: ../src/i_callbacks.c:2092
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "Incolla 5"
 
-#: ../src/i_callbacks.c:2229 ../src/x_window.c:406
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Componente"
 
-#: ../src/i_callbacks.c:2265 ../src/i_callbacks.c:2284 ../src/x_dialog.c:2203
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Caratteristica"
 
-#: ../src/i_callbacks.c:2781
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Ricerca del sorgente [%s]\n"
 
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Impossibile trovare il sorgente [%s]\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Ricerca del simbolo [%s]\n"
 
-#: ../src/i_callbacks.c:2878
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2972
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1006,144 +1046,111 @@ msgstr ""
 "Questo comando reperisce la documentazione del componente da Internet, ma "
 "non hai selezionato nessun componente da cercare."
 
-#: ../src/i_callbacks.c:3084
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "MostraN"
 
-#: ../src/i_callbacks.c:3120
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "MostraV"
 
-#: ../src/i_callbacks.c:3156
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "MostraB"
 
-#: ../src/i_callbacks.c:3193
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "VisibilitÃ  Strumenti"
 
-#: ../src/i_callbacks.c:3223
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Spiacente, ma questa non Ã¨ una funzione del menÃ¹ opzioni\n"
 
-#: ../src/i_callbacks.c:3311
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3314
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3331
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Griglia NON ATTIVA\n"
 
-#: ../src/i_callbacks.c:3334
-msgid "Grid ON\n"
-msgstr "Griglia ATTIVA\n"
+#: ../src/i_callbacks.c:3435
+msgid "Dot grid selected\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3436
+msgid "Mesh grid selected\n"
+msgstr ""
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (ATTENZIONE!)\n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: ../src/i_callbacks.c:3374
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "Snap OFF (ATTENZIONE!)\n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr "Rubber band OFF \n"
 
-#: ../src/i_callbacks.c:3377
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr "Rubber band ON\n"
 
-#: ../src/i_callbacks.c:3392
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3395
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_arc.c:120
-#, c-format
-msgid "Unknown end for arc (%d)\n"
-msgstr "Non corretta terminazione per l'arco (%d)\n"
-
-#: ../src/o_arc.c:160
-#, c-format
-msgid "Unknown type for arc !\n"
-msgstr "Tipo sconosciuto per l'arco!\n"
-
-#: ../src/o_box.c:136
-#, c-format
-msgid "Unknown end for box (%d)\n"
-msgstr "Non corretta terminazione per il riquadro (%d)\n"
-
-#: ../src/o_box.c:176
-#, c-format
-msgid "Unknown type for box !\n"
-msgstr "Sconosciuto tipo per il riquadro!\n"
-
-#: ../src/o_box.c:260
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Sconosciuto tipo per il riquadro (riempimento)!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
-msgstr "Ottenuto un non valido buffer_number [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
-msgstr "Ottenuto un non valido buffer_number [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Ottenuto un non valido buffer_number [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:183
-#, c-format
-msgid "Got an invalid which one in o_bus_draw_xor_single\n"
-msgstr ""
-
-#: ../src/o_circle.c:127
-#, c-format
-msgid "Unknown end for circle\n"
-msgstr "Non corretta terminazione per il cerchio\n"
-
-#. just to be careful
-#: ../src/o_circle.c:163
-#, c-format
-msgid "Unknown type for circle!\n"
-msgstr "Tipo sconosciuto per il cerchio!\n"
+#: ../src/o_bus.c:135
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_bus_draw_stretch\n"
+msgstr "Ottenuto un non valido buffer_number [o_buffer_paste_start]\n"
 
-#: ../src/o_circle.c:245
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Tipo sconosciuto per il cerchio (riempimento)!\n"
 
-#: ../src/o_complex.c:251 ../src/o_complex.c:255
+#: ../src/o_complex.c:250 ../src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Spostamento schema [%d %d]\n"
 
-#: ../src/o_line.c:111
-#, c-format
-msgid "Unknown end for line (%d)\n"
-msgstr "Non corretta terminazione per la linea (%d)\n"
-
-#. just to be careful
-#: ../src/o_line.c:151
-#, c-format
-msgid "Unknown type for line (%d) !\n"
-msgstr "Tipo di linea sconosciuta per (%d) !\n"
-
 #: ../src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
@@ -1157,41 +1164,41 @@ msgstr "Oggetto giÃ  bloccato\n"
 msgid "Object already unlocked\n"
 msgstr "Oggetto giÃ  sbloccato\n"
 
-#: ../src/o_misc.c:444
+#: ../src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Il testo nascosto Ã¨ ora visibile\n"
 
-#: ../src/o_misc.c:446
+#: ../src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Il testo ora Ã¨ non visibile\n"
 
-#: ../src/o_misc.c:694
+#: ../src/o_misc.c:697
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 "Non Ã¨ possibile trovare il simbolo [%s] nella libreria. Aggiornamento "
 "fallito.\n"
 
-#: ../src/o_misc.c:837
+#: ../src/o_misc.c:840
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: Non Ã¨ possibile ottenere il vero nome del file %s."
 
-#: ../src/o_misc.c:881
+#: ../src/o_misc.c:884
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "NOn Ã¨ possibile impostare il precedente file di ripristino [%s] in lettura-"
 "scrittura\n"
 
-#: ../src/o_misc.c:899
+#: ../src/o_misc.c:902
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr ""
 "Non Ã¨ possibile impostare il precedente file di ripristino [%s] in sola "
 "lettura\n"
 
-#: ../src/o_misc.c:904
+#: ../src/o_misc.c:907
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Non Ã¨ possibile salvare il file di ripristino [%s]\n"
@@ -1201,57 +1208,47 @@ msgstr "Non Ã¨ possibile salvare il file di ripristino [%s]\n"
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERRORE: oggetto NULLO in o_move_end!\n"
 
-#: ../src/o_move.c:385
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: ../src/o_move.c:406
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Ottenuto un oggetto non in linea in o_move_check_endpoint\n"
 
-#: ../src/o_net.c:253
+#: ../src/o_net.c:176
 #, c-format
-msgid "Got an invalid which one in o_net_draw_xor_single\n"
+msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_net.c:630
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:692
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
 #. try to exit gracefully
-#: ../src/o_net.c:1080 ../src/o_net.c:1117 ../src/o_net.c:1188
-#: ../src/o_net.c:1224
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: ../src/o_net.c:1294
+#: ../src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr ""
 
-#: ../src/o_path.c:483
-#, fuzzy, c-format
-msgid "Unknown end for path (%d)\n"
-msgstr "Non corretta terminazione per l'arco (%d)\n"
-
-#: ../src/o_path.c:524
-#, fuzzy, c-format
-msgid "Unknown type for path !\n"
-msgstr "Tipo sconosciuto per l'arco!\n"
-
-#: ../src/o_path.c:594
+#: ../src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Sconosciuto tipo per il riquadro (riempimento)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:627
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fallito il caricamento dell'immagine: [%s]"
@@ -1260,7 +1257,7 @@ msgstr "Fallito il caricamento dell'immagine: [%s]"
 msgid "Picture"
 msgstr "Immagine"
 
-#: ../src/o_picture.c:535 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERRORE: oggetto NULLO!\n"
@@ -1377,7 +1374,7 @@ msgstr "Tutto"
 msgid "Components"
 msgstr "Componenti"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:416
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "Collegamenti"
 
@@ -1385,150 +1382,149 @@ msgstr "Collegamenti"
 msgid "Replace existing attributes"
 msgstr "Ridefinisci le caratteristiche esistenti"
 
-#: ../src/x_autonumber.c:412
+#: ../src/x_autonumber.c:413
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
 #. duplicate slot in used_slots
-#: ../src/x_autonumber.c:427
+#: ../src/x_autonumber.c:428
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:695
+#: ../src/x_autonumber.c:696
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:746
+#: ../src/x_autonumber.c:748
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:880
+#: ../src/x_autonumber.c:883
 msgid "Diagonal"
 msgstr "Diagonale"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Top to bottom"
 msgstr "Dall'alto verso il basso"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Bottom to top"
 msgstr "Dal basso verso l'alto"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Left to right"
 msgstr "Da sinistra a destra"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Right to left"
 msgstr "Da destra a sinistra"
 
-#: ../src/x_autonumber.c:883
+#: ../src/x_autonumber.c:886
 msgid "File order"
 msgstr "Sequenza dei file"
 
-#: ../src/x_autonumber.c:1219
+#: ../src/x_autonumber.c:1222
 msgid "Autonumber text"
 msgstr ""
 
 #. scope section
-#: ../src/x_autonumber.c:1243
+#: ../src/x_autonumber.c:1246
 msgid "<b>Scope</b>"
 msgstr "<b>VisibilitÃ </b>"
 
-#: ../src/x_autonumber.c:1265
+#: ../src/x_autonumber.c:1268
 msgid "Search for:"
 msgstr "Ricerca di:"
 
-#: ../src/x_autonumber.c:1279
+#: ../src/x_autonumber.c:1282
 msgid "Autonumber text in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1286
+#: ../src/x_autonumber.c:1289
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
 msgid "Selected objects"
 msgstr "Oggetti selezionati"
 
-#: ../src/x_autonumber.c:1299 ../src/x_autonumber.c:1308
+#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
 msgid "Current page"
 msgstr "Pagina corrente"
 
-#: ../src/x_autonumber.c:1300 ../src/x_autonumber.c:1309
+#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
 msgid "Whole hierarchy"
 msgstr "Intera gerarchia"
 
-#: ../src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1314
 msgid "Overwrite existing numbers"
 msgstr "Sovrascrivi i numeri esistenti"
 
 #. Options section
-#: ../src/x_autonumber.c:1316
+#: ../src/x_autonumber.c:1319
 msgid "<b>Options</b>"
 msgstr "<b>Opzioni</b>"
 
-#: ../src/x_autonumber.c:1338
+#: ../src/x_autonumber.c:1341
 msgid "Starting number:"
 msgstr "Numero iniziale:"
 
-#: ../src/x_autonumber.c:1345
+#: ../src/x_autonumber.c:1348
 msgid "Sort order:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1366
+#: ../src/x_autonumber.c:1369
 msgid "Remove numbers"
 msgstr "Rimuovi numeri"
 
-#: ../src/x_autonumber.c:1370
+#: ../src/x_autonumber.c:1373
 msgid "Automatic slotting"
 msgstr ""
 
-#: ../src/x_color.c:52 ../src/x_color.c:61 ../src/x_color.c:124
-#: ../src/x_color.c:172
+#: ../src/x_color.c:94 ../src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Non Ã¨ possibile inserire il colore %s!\n"
 
-#: ../src/x_color.c:52
+#: ../src/x_color.c:94
 msgid "black"
 msgstr "nero"
 
-#: ../src/x_color.c:61
+#: ../src/x_color.c:103
 msgid "white"
 msgstr "bianco"
 
-#: ../src/x_color.c:103 ../src/x_color.c:140
-#, c-format
-msgid "Could not find the color %s!\n"
-msgstr "Non Ã¨ possibile trovare il colore %s!\n"
-
-#: ../src/x_color.c:106 ../src/x_color.c:143
-#, c-format
-msgid "Defaulting color to white\n"
-msgstr "Colore predefinito; il bianco\n"
+#: ../src/x_color.c:125
+#, fuzzy, c-format
+msgid "Could not allocate display color %i!\n"
+msgstr "Non Ã¨ possibile inserire il colore %s!\n"
 
-#: ../src/x_color.c:113 ../src/x_color.c:150
-#, c-format
-msgid "Ack! Cannot allocate white!\n"
-msgstr "Non Ã¨ possibile inserire il bianco!\n"
+#: ../src/x_color.c:147
+#, fuzzy, c-format
+msgid "Could not allocate outline color %i!\n"
+msgstr "Non Ã¨ possibile inserire il colore %s!\n"
 
-#: ../src/x_color.c:191 ../src/x_color.c:207
+#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Provato a ottenere un colore non valido: %d\n"
 
+#: ../src/x_color.c:214
+#, fuzzy, c-format
+msgid "Tried to get an invalid outline color: %d\n"
+msgstr "Provato a ottenere un colore non valido: %d\n"
+
 #. GtkLabel
 #: ../src/x_compselect.c:1040
 msgid "Filter:"
 msgstr "Filtro:"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3591
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Nome"
@@ -1569,11 +1565,11 @@ msgid "Preview"
 msgstr "Anteprima"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Inserisci Testo..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1584,225 +1580,228 @@ msgstr ""
 "e clicca con il tasto sinistro per rilasciare il testo.\n"
 "Il pulsante centrale del mouse ruota il testo."
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "In basso a sinistra"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Regione centrale a sinistra"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "In alto a sinistra"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "Regione centrale in basso"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Centro della regione centrale"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "Regione centrale in alto"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "In basso a destra"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Zona centrale a destra"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "In alto a destra"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Modifica proprietÃ  del testo"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr ""
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>ProprietÃ  del testo</b>"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 msgid "Color:"
 msgstr "Colore:"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr "Ampiezza:"
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Allineamento:"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "Continua"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Punteggiata"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Tratteggiata"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "Centro"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr ""
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:964 ../src/x_dialog.c:965 ../src/x_dialog.c:966
-#: ../src/x_dialog.c:974 ../src/x_dialog.c:1157 ../src/x_dialog.c:1159
-#: ../src/x_dialog.c:1161 ../src/x_dialog.c:1163 ../src/x_dialog.c:1165
-#: ../src/x_dialog.c:1368 ../src/x_dialog.c:1369 ../src/x_dialog.c:1370
-#: ../src/x_dialog.c:1371 ../src/x_dialog.c:1372 ../src/x_dialog.c:1380
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*non cambiato*"
 
-#: ../src/x_dialog.c:858
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Modifica Larghezza & Tipo di Linea"
 
-#: ../src/x_dialog.c:897
-msgid "Width:"
-msgstr "Larghezza:"
-
-#: ../src/x_dialog.c:901 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/x_dialog.c:905
+#: ../src/x_dialog.c:1021
+msgid "Width:"
+msgstr "Larghezza:"
+
+#: ../src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Lunghezza linea tratteggiata:"
 
-#: ../src/x_dialog.c:909
+#: ../src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Spazio linea tratteggiata:"
 
-#: ../src/x_dialog.c:1014
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Vuoto"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Riempito"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Rete"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Tratteggio"
 
-#: ../src/x_dialog.c:1281
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Modifica il Tipo di Riempimento"
+
+#: ../src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Tipo di riempimento:"
 
-#: ../src/x_dialog.c:1285
+#: ../src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Larghezza linea:"
 
-#: ../src/x_dialog.c:1289
+#: ../src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Angolo 1:"
 
-#: ../src/x_dialog.c:1293
+#: ../src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Livello 1:"
 
-#: ../src/x_dialog.c:1297
+#: ../src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Angolo 2:"
 
-#: ../src/x_dialog.c:1301
+#: ../src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Livello 2:"
 
-#: ../src/x_dialog.c:1480
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Parametri Arco"
 
-#: ../src/x_dialog.c:1520
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1528
+#: ../src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Angolo di Attacco:"
 
-#: ../src/x_dialog.c:1536
+#: ../src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Gradi di sviluppo dell'arco:"
 
-#: ../src/x_dialog.c:1653
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
 msgstr ""
 
-#: ../src/x_dialog.c:1721
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Dimensione Testo"
 
-#: ../src/x_dialog.c:1751
+#: ../src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Inserisci nuova ampiezza del testo:"
 
-#: ../src/x_dialog.c:1826
+#: ../src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr ""
 
-#: ../src/x_dialog.c:1856
+#: ../src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr ""
 
-#: ../src/x_dialog.c:1929
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "Modifica numero slot"
 
-#: ../src/x_dialog.c:1960
+#: ../src/x_dialog.c:2138
 msgid "Edit slot number:"
 msgstr "Modifica numero slot:"
 
-#: ../src/x_dialog.c:2022
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "Altro..."
 
-#: ../src/x_dialog.c:2042
+#: ../src/x_dialog.c:2220
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Electronic Design Automation</b>"
 
-#: ../src/x_dialog.c:2046
+#: ../src/x_dialog.c:2224
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>versione di gschem %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2054
+#: ../src/x_dialog.c:2232
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1814,133 +1813,141 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "...e molti altri (leggere il file AUTHORS)"
 
-#: ../src/x_dialog.c:2119
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Coordinate"
 
-#: ../src/x_dialog.c:2140
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "Schermo"
 
-#: ../src/x_dialog.c:2149
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr ""
 
-#: ../src/x_dialog.c:2188
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2194
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2206
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2388
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Aggiungi Attributo"
 
-#: ../src/x_dialog.c:2215 ../src/x_window.c:434
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/x_dialog.c:2221
+#: ../src/x_dialog.c:2397
 #, fuzzy
 msgid "Selection"
 msgstr "Seleziona"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2403
 #, fuzzy
 msgid "Zoom box"
 msgstr "Ingrandisci Riquadro"
 
-#: ../src/x_dialog.c:2236
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2415
 #, fuzzy
 msgid "Net junction"
 msgstr "Funzione"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2390
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "ERRORE: oggetto NULLO in color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2452
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "Modifica Colore"
 
-#: ../src/x_dialog.c:2483
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr "Colore dell'oggetto:"
 
-#: ../src/x_dialog.c:2605
+#: ../src/x_dialog.c:2786
 msgid "Function"
 msgstr "Funzione"
 
-#: ../src/x_dialog.c:2612
+#: ../src/x_dialog.c:2793
 msgid "Keystroke(s)"
 msgstr ""
 
-#: ../src/x_dialog.c:2921
+#: ../src/x_dialog.c:3102
 msgid "Find Text"
 msgstr "Trova testo"
 
-#: ../src/x_dialog.c:2952
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Testo da cercare:"
 
-#: ../src/x_dialog.c:2962
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "discende nella gerarchia"
 
-#: ../src/x_dialog.c:3026
+#: ../src/x_dialog.c:3208
 msgid "Hide Text"
 msgstr "Nascondi testo"
 
-#: ../src/x_dialog.c:3057
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Nascondi il testo iniziando con:"
 
-#: ../src/x_dialog.c:3125
+#: ../src/x_dialog.c:3308
 msgid "Show Text"
 msgstr "Mostra testo"
 
-#: ../src/x_dialog.c:3156
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Mostra il testo iniziando con:"
 
-#: ../src/x_dialog.c:3613
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr "S_eleziona lo schematico che vuoi salvare:"
 
-#: ../src/x_dialog.c:3707
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "Salvare i cambi allo schematico \"%s\" prima di chiudere?"
 
-#: ../src/x_dialog.c:3713
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1949,17 +1956,17 @@ msgstr ""
 "chiudere?"
 
 #. secondary label
-#: ../src/x_dialog.c:3742
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 "Se non effettui un salvataggio dei cambi, essi verranno definitivamente "
 "persi."
 
-#: ../src/x_dialog.c:3762
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr "_Chiudi senza salvare"
 
-#: ../src/x_dialog.c:4096
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1977,10 +1984,24 @@ msgstr ""
 "Il nome non deve terminare con uno spazio.\n"
 "Il valore non deve iniziare con uno spazio."
 
-#: ../src/x_dialog.c:4098
+#: ../src/x_dialog.c:4281
 msgid "Invalid Attribute"
 msgstr "Caratteristica non valida"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "ModalitÃ  Pin"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "Funzione"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Schematici"
@@ -2123,50 +2144,55 @@ msgid "/Edit..."
 msgstr "/Modifica..."
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Modifica il Tipo di Linea"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copia"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/Sposta"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Cancella"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Rilascia schematico"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Rilascia simbolo"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Sopra"
 
-#: ../src/x_menus.c:323
+#: ../src/x_menus.c:316
 #, fuzzy, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Provato a impostare la sensibilitÃ Â  su un menÃ¹ di voci non esistenti\n"
 
-#: ../src/x_menus.c:347
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "La voce Popup_menu_item_factory non esiste!\n"
 
-#: ../src/x_menus.c:360
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Provato a impostare la sensibilitÃ  su una finestra di popup menu_itemi\n"
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:455
+#: ../src/x_menus.c:462
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Non Ã¨ possibile aprire il file %s\n"
 
-#: ../src/x_menus.c:516
+#: ../src/x_menus.c:524
 msgid "Clear"
 msgstr "Pulisci"
 
@@ -2235,6 +2261,11 @@ msgstr ""
 "Clicca con il tasto destro del mouse sul nome del file per ulteriori "
 "opzioni..."
 
+#: ../src/x_preview.c:223
+#, fuzzy
+msgid "Preview Buffer"
+msgstr "Incolla buffer"
+
 #: ../src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Seleziona il nome del file Psotscript..."
@@ -2313,55 +2344,35 @@ msgstr "Lo schema corrente Ã¨ stato stampato in [%s]\n"
 msgid "Couldn't allocate gc\n"
 msgstr "Impossibile l'allocazione di gc\n"
 
-#: ../src/x_window.c:94
-#, c-format
-msgid "Couldn't allocate xor_gc\n"
-msgstr "Impossibile l'allocazione di xor_gc\n"
-
-#: ../src/x_window.c:107
-#, c-format
-msgid "Couldn't allocate outline_xor_gc\n"
-msgstr "Impossibile l'allocazione di outline_xor_gc\n"
-
-#: ../src/x_window.c:123
-#, c-format
-msgid "Couldn't allocate bounding_xor_gc\n"
-msgstr "Impossibile l'allocazione di bounding_xor_gc\n"
-
-#: ../src/x_window.c:130
-#, c-format
-msgid "Couldn't allocate bus_gc\n"
-msgstr "Impossibile l'allocazione di bus_gc\n"
-
-#: ../src/x_window.c:369
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "Nuovo file"
 
-#: ../src/x_window.c:375
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Apri"
 
-#: ../src/x_window.c:376
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Apri file..."
 
-#: ../src/x_window.c:382
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/x_window.c:383
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Salva file"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Annulla l'ultima operazione"
 
-#: ../src/x_window.c:398
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Ripristina ultima operazione annullata"
 
-#: ../src/x_window.c:407
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2375,7 +2386,7 @@ msgstr ""
 "Il tasto destro del mouse serve ad abbandonare il componente al fine di "
 "sceglierne un altro."
 
-#: ../src/x_window.c:417
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2384,7 +2395,7 @@ msgstr ""
 "Tasto destro del mouse per\n"
 "cancellare il collegamento"
 
-#: ../src/x_window.c:427
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2393,79 +2404,79 @@ msgstr ""
 "Tasto destro del mouse per\n"
 "cancellare il collegamento"
 
-#: ../src/x_window.c:435
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "Aggiungi Testo..."
 
-#: ../src/x_window.c:445
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "Seleziona"
 
-#: ../src/x_window.c:446
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "ModalitÃ  Selezione"
 
-#: ../src/x_window.c:533
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "Prendi"
 
-#: ../src/x_window.c:549
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Ripeti/Niente"
 
-#: ../src/x_window.c:559
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "MenÃ¹/Cancella"
 
-#: ../src/x_window.c:561
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Pan/Cancella"
 
-#: ../src/x_window.c:783
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Caricamento schema [%s]\n"
 
-#: ../src/x_window.c:795
+#: ../src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "Fallito il caricamento dell'immagine: [%s]"
 
-#: ../src/x_window.c:804
+#: ../src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "Nuovo file"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:909
+#: ../src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Non Ã¨ possibile salvare la pagina [%s]\n"
 
-#: ../src/x_window.c:910
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Errore durante il salvataggio"
 
-#: ../src/x_window.c:919
+#: ../src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Salvato con il nome [%s]\n"
 
-#: ../src/x_window.c:921
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Salvato [%s]\n"
 
-#: ../src/x_window.c:923
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Salvato"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Annulla pagina [%s]\n"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Chiusura [%s]\n"
@@ -2479,6 +2490,77 @@ msgstr ""
 msgid "gEDA Schematic Editor"
 msgstr "Scarica Schematico"
 
+#~ msgid "Cut Buffer"
+#~ msgstr "Svuota buffer"
+
+#~ msgid "Copy Buffer"
+#~ msgstr "Copia buffer"
+
+#~ msgid "Toggle Grid On/Off"
+#~ msgstr "ModalitÃ  Griglia Visibile/Non Visibile"
+
+#~ msgid "Invalid color [%s] passed to %s\n"
+#~ msgstr "Colore [%s] non valido passato a %s\n"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "Devi impostare la variabile d'ambiente GEDADATA!\n"
+
+#~ msgid "Grid ON\n"
+#~ msgstr "Griglia ATTIVA\n"
+
+#~ msgid "Unknown end for arc (%d)\n"
+#~ msgstr "Non corretta terminazione per l'arco (%d)\n"
+
+#~ msgid "Unknown type for arc !\n"
+#~ msgstr "Tipo sconosciuto per l'arco!\n"
+
+#~ msgid "Unknown end for box (%d)\n"
+#~ msgstr "Non corretta terminazione per il riquadro (%d)\n"
+
+#~ msgid "Unknown type for box !\n"
+#~ msgstr "Sconosciuto tipo per il riquadro!\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+#~ msgstr "Ottenuto un non valido buffer_number [o_buffer_copy]\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+#~ msgstr "Ottenuto un non valido buffer_number [o_buffer_cut]\n"
+
+#~ msgid "Unknown end for circle\n"
+#~ msgstr "Non corretta terminazione per il cerchio\n"
+
+#~ msgid "Unknown type for circle!\n"
+#~ msgstr "Tipo sconosciuto per il cerchio!\n"
+
+#, fuzzy
+#~ msgid "Unknown end for path (%d)\n"
+#~ msgstr "Non corretta terminazione per l'arco (%d)\n"
+
+#, fuzzy
+#~ msgid "Unknown type for path !\n"
+#~ msgstr "Tipo sconosciuto per l'arco!\n"
+
+#~ msgid "Could not find the color %s!\n"
+#~ msgstr "Non Ã¨ possibile trovare il colore %s!\n"
+
+#~ msgid "Defaulting color to white\n"
+#~ msgstr "Colore predefinito; il bianco\n"
+
+#~ msgid "Ack! Cannot allocate white!\n"
+#~ msgstr "Non Ã¨ possibile inserire il bianco!\n"
+
+#~ msgid "Couldn't allocate xor_gc\n"
+#~ msgstr "Impossibile l'allocazione di xor_gc\n"
+
+#~ msgid "Couldn't allocate outline_xor_gc\n"
+#~ msgstr "Impossibile l'allocazione di outline_xor_gc\n"
+
+#~ msgid "Couldn't allocate bounding_xor_gc\n"
+#~ msgstr "Impossibile l'allocazione di bounding_xor_gc\n"
+
+#~ msgid "Couldn't allocate bus_gc\n"
+#~ msgstr "Impossibile l'allocazione di bus_gc\n"
+
 #~ msgid "Got NULL in o_attrib_toggle_visibility\n"
 #~ msgstr "Ottenuto un NULLO in o_attrib_toggle_visibility\n"
 
diff --git a/gschem/po/ja.po b/gschem/po/ja.po
index c5647c1..f6f3c43 100644
--- a/gschem/po/ja.po
+++ b/gschem/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geda-gschem-CVS-2002-09-26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:41-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-20 14:22+0000\n"
 "Last-Translator: MIYAMOTO Takanori <pnms@xxxxxxxxxxxxxxx>\n"
 "Language-Team: japanese <ja@xxxxxx>\n"
@@ -62,7 +62,7 @@ msgstr "°õºþ..."
 msgid "Write image..."
 msgstr "¥¤¥á¡¼¥¸½ÐÎÏ..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:498
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 #, fuzzy
 msgid "Recent files"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
@@ -79,36 +79,36 @@ msgstr "¥¦¥£¥ó¥É¥¦¤òÊÄ¤¸¤ë"
 msgid "Quit"
 msgstr "½ªÎ»"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:390
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "¥¢¥ó¥É¥¥"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:397
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "¥ê¥É¥¥"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:573
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "ÁªÂò¥â¡¼¥É"
 
 #: ../src/rcstrings.c:22
 #, fuzzy
-msgid "Cut Buffer"
-msgstr "¥Ð¥Ã¥Õ¥¡"
+msgid "Cut"
+msgstr "¥«¥Ã¥È1"
 
-#: ../src/rcstrings.c:23
-#, fuzzy
-msgid "Copy Buffer"
-msgstr "¥Ð¥Ã¥Õ¥¡"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "¥³¥Ô¡¼"
 
 #: ../src/rcstrings.c:24
 #, fuzzy
-msgid "Paste Buffer"
-msgstr "¥Ð¥Ã¥Õ¥¡"
+msgid "Paste"
+msgstr "¥Ú¡¼¥¹¥È1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -131,7 +131,7 @@ msgstr "¥³¥Ô¡¼¥â¡¼¥É"
 msgid "Move Mode"
 msgstr "°ÜÆ°¥â¡¼¥É"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "ºï½ü"
 
@@ -151,11 +151,11 @@ msgstr "¥¹¥í¥Ã¥È..."
 msgid "Color..."
 msgstr "¿§..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2233
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "¥í¥Ã¥¯"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "¥í¥Ã¥¯²ò½ü"
 
@@ -266,7 +266,7 @@ msgid "Redraw"
 msgstr "²èÌÌ¹¹¿·"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1504 ../src/i_callbacks.c:1576
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "¥Ñ¥ó"
 
@@ -290,237 +290,245 @@ msgstr "½Ì¾®"
 msgid "Zoom Full"
 msgstr "ºÇÂç³ÈÂç"
 
+#: ../src/rcstrings.c:71
+msgid "Dark color scheme"
+msgstr ""
+
 #: ../src/rcstrings.c:72
+msgid "Light color scheme"
+msgstr ""
+
+#: ../src/rcstrings.c:74
 msgid "Page"
 msgstr "¥Ú¡¼¥¸"
 
-#: ../src/rcstrings.c:73
+#: ../src/rcstrings.c:75
 msgid "Manager..."
 msgstr "¥Þ¥Í¡¼¥¸¥ã..."
 
-#: ../src/rcstrings.c:74
+#: ../src/rcstrings.c:76
 msgid "Next"
 msgstr "¼¡"
 
-#: ../src/rcstrings.c:75
+#: ../src/rcstrings.c:77
 msgid "Previous"
 msgstr "Á°"
 
-#: ../src/rcstrings.c:76 ../src/x_window.c:368
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "¿·µ¬"
 
-#: ../src/rcstrings.c:77
+#: ../src/rcstrings.c:79
 msgid "Revert"
 msgstr "Ìá¤ë"
 
-#: ../src/rcstrings.c:78
+#: ../src/rcstrings.c:80
 msgid "Close"
 msgstr "ÊÄ¤¸¤ë"
 
-#: ../src/rcstrings.c:79
+#: ../src/rcstrings.c:81
 msgid "Discard"
 msgstr "ÇË´þ"
 
-#: ../src/rcstrings.c:81
+#: ../src/rcstrings.c:83
 msgid "Add"
 msgstr "ÄÉ²Ã"
 
-#: ../src/rcstrings.c:82
+#: ../src/rcstrings.c:84
 msgid "Component..."
 msgstr "ÉôÉÊ..."
 
 #. need to click
-#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2306 ../src/i_callbacks.c:2333
-#: ../src/x_dialog.c:2200
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "¥Í¥Ã¥È"
 
 #. need to click
-#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2377 ../src/i_callbacks.c:2404
-#: ../src/x_dialog.c:2218 ../src/x_window.c:426
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "¥Ð¥¹"
 
-#: ../src/rcstrings.c:85
+#: ../src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È..."
 
-#: ../src/rcstrings.c:86
+#: ../src/rcstrings.c:88
 msgid "Text..."
 msgstr "¥Æ¥¥¹¥È..."
 
-#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2485 ../src/i_callbacks.c:2508
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Àþ"
 
-#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2530 ../src/i_callbacks.c:2553
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "¥Ü¥Ã¥¯¥¹"
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2609 ../src/i_callbacks.c:2633
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "±ß"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2655 ../src/i_callbacks.c:2678
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "±ß¸Ì"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2700 ../src/i_callbacks.c:2723
-#: ../src/x_dialog.c:2191
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "¥Ô¥ó"
 
-#: ../src/rcstrings.c:92
+#: ../src/rcstrings.c:94
 #, fuzzy
 msgid "Picture..."
 msgstr "°õºþ..."
 
-#: ../src/rcstrings.c:94
+#: ../src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "³¬ÁØ"
 
-#: ../src/rcstrings.c:95
+#: ../src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 
-#: ../src/rcstrings.c:96
+#: ../src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "¥·¥ó¥Ü¥ë¤Ø"
 
-#: ../src/rcstrings.c:97
+#: ../src/rcstrings.c:99
 msgid "Up"
 msgstr "¾å¤Ø"
 
-#: ../src/rcstrings.c:98
+#: ../src/rcstrings.c:100
 msgid "Documentation"
 msgstr "¥É¥¥å¥á¥ó¥ÈÉ½¼¨/¸¡º÷"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100 ../src/x_compselect.c:1418
+#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
 #: ../src/x_multiattrib.c:1543
 msgid "Attributes"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È"
 
-#: ../src/rcstrings.c:101 ../src/i_callbacks.c:3000
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "¥¢¥¿¥Ã¥Á"
 
-#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3046
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "¥¢¥¿¥Ã¥Á²ò½ü"
 
-#: ../src/rcstrings.c:103
+#: ../src/rcstrings.c:105
 msgid "Show Value"
 msgstr "ÃÍÉ½¼¨"
 
-#: ../src/rcstrings.c:104
+#: ../src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Ì¾Á°É½¼¨"
 
-#: ../src/rcstrings.c:105
+#: ../src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Ì¾Á°¤ÈÃÍ¤òÉ½¼¨"
 
-#: ../src/rcstrings.c:106
+#: ../src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "É½¼¨/ÈóÉ½¼¨"
 
-#: ../src/rcstrings.c:107
+#: ../src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "¥Æ¥¥¹¥È¸¡º÷..."
 
-#: ../src/rcstrings.c:108
+#: ../src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "¥Æ¥¥¹¥È¤ò±£¤¹..."
 
-#: ../src/rcstrings.c:109
+#: ../src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "¥Æ¥¥¹¥È¤òÉ½¼¨..."
 
-#: ../src/rcstrings.c:110
+#: ../src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥¥¹¥È"
 
-#: ../src/rcstrings.c:112
+#: ../src/rcstrings.c:114
 msgid "Options"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/rcstrings.c:113
+#: ../src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "¥Æ¥¥¹¥È¥µ¥¤¥º..."
 
-#: ../src/rcstrings.c:114
-msgid "Toggle Grid On/Off"
-msgstr "¥°¥ê¥Ã¥É ¥ª¥ó/¥ª¥Õ"
+#: ../src/rcstrings.c:116
+msgid "Cycle grid styles"
+msgstr ""
 
-#: ../src/rcstrings.c:115
+#: ../src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "¥¹¥Ê¥Ã¥× ¥ª¥ó/¥ª¥Õ"
 
-#: ../src/rcstrings.c:116
+#: ../src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: ../src/rcstrings.c:117
+#: ../src/rcstrings.c:119
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: ../src/rcstrings.c:118
+#: ../src/rcstrings.c:120
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: ../src/rcstrings.c:119
+#: ../src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "¥¢¥¦¥È¥é¥¤¥ó/¥Ü¥Ã¥¯¥¹"
 
-#: ../src/rcstrings.c:120
+#: ../src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥ÉÀÚÂØ¤¨"
 
-#: ../src/rcstrings.c:121
+#: ../src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "¥í¥°¥¦¥£¥ó¥É¥¦É½¼¨..."
 
-#: ../src/rcstrings.c:122
+#: ../src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "ºÂÉ¸¥¦¥£¥ó¥É¥¦É½¼¨..."
 
-#: ../src/rcstrings.c:124
+#: ../src/rcstrings.c:126
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: ../src/rcstrings.c:125
+#: ../src/rcstrings.c:127
 #, fuzzy
 msgid "Manual"
 msgstr "¥Þ¥Ë¥å¥¢¥ë..."
 
-#: ../src/rcstrings.c:126
+#: ../src/rcstrings.c:128
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "¥É¥¥å¥á¥ó¥ÈÉ½¼¨/¸¡º÷"
 
-#: ../src/rcstrings.c:127
+#: ../src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr ""
 
-#: ../src/rcstrings.c:128
+#: ../src/rcstrings.c:130
 #, fuzzy
 msgid "Component Documentation"
 msgstr "¥É¥¥å¥á¥ó¥ÈÉ½¼¨/¸¡º÷"
 
-#: ../src/rcstrings.c:129
+#: ../src/rcstrings.c:131
 msgid "About gschem"
 msgstr ""
 
-#: ../src/rcstrings.c:130 ../src/x_dialog.c:2541
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 #, fuzzy
 msgid "Hotkeys"
 msgstr "¥Û¥Ã¥È¥¡¼..."
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "¤³¤ì°Ê¾å¥º¡¼¥à¤Ç¤¤Þ¤»¤ó¡£\n"
 
@@ -541,92 +549,92 @@ msgstr ""
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr ""
 
-#: ../src/g_rc.c:140
-#, c-format
-msgid "Invalid color [%s] passed to %s\n"
-msgstr "Ìµ¸ú¤Ê¿§[%s]¤¬%s¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
-
-#: ../src/g_rc.c:448
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ìµ¸ú¤Ê³ÈÂçÎ¨[%d]¤¬%s¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:574
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:601
+#: ../src/g_rc.c:445
 #, fuzzy, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:644
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1116
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Ìµ¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1374
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬bus-ripper¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1449
+#: ../src/g_rc.c:1293
+#, fuzzy, c-format
+msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
+msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
+
+#: ../src/g_rc.c:1334
 #, fuzzy, c-format
-msgid "Invalid dot size [%d] passed to grid-dot-size\n"
+msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1490
+#: ../src/g_rc.c:1360
 #, fuzzy, c-format
-msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
+msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1534
+#: ../src/g_rc.c:1404
 #, fuzzy, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1558
+#: ../src/g_rc.c:1428
 #, fuzzy, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Ìµ¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1599
+#: ../src/g_rc.c:1469
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1622
+#: ../src/g_rc.c:1492
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1668
+#: ../src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Ìµ¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1694
+#: ../src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ìµ¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1719
+#: ../src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Ìµ¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/gschem.c:189 ../src/gschem.c:200
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, fuzzy, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem¥Ð¡¼¥¸¥ç¥ó%s%s.%s\n"
 
-#: ../src/gschem.c:192 ../src/gschem.c:203
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -635,7 +643,7 @@ msgstr ""
 "gEDA/gschem¤Ï´°Á´¤ËÌµÊÝ¾Ú¤ÇÄó¶¡¤µ¤ì¤Þ¤¹¡£¾Ü¤·¤¯¤ÏCOPYING¥Õ¥¡¥¤¥ë¤ò¤´Í÷¤¯¤À¤µ"
 "¤¤¡£\n"
 
-#: ../src/gschem.c:194 ../src/gschem.c:205
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -643,7 +651,7 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¢¤ê¡¢¤¢¤ë¾ò·ï¤Î²¼¤ÇºÆÈÒÉÛ¤¹¤ë¤³¤È¤¬¾©Îå¤µ¤ì¤Æ¤¤¤Þ"
 "¤¹¡£\n"
 
-#: ../src/gschem.c:196 ../src/gschem.c:207
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -652,48 +660,61 @@ msgstr ""
 "¾Ü¤·¤¯¤ÏCOPYING¥Õ¥¡¥¤¥ë¤ò¤´Í÷¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: ../src/gschem.c:211
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "MIGW32ÈÇ¤Ç¤¹¡£\n"
 
-#: ../src/gschem.c:215
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr ""
 
-#: ../src/gschem.c:228
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "´Ä¶ÊÑ¿ôGEDADATA¤òÀßÄê¤·¤Æ¤¯¤À¤µ¤¤!\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:245
+#: ../src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆÉ¤ß¹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: ../src/gschem.c:249
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤òÆÉ¤ß¹þ¤ó¤Ç¤¤¤Þ¤¹¡£[%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:253
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆÉ¤ß¹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: ../src/gschem.c:315
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "scheme¥Ç¥£¥ì¥¯¥È¥ê¤¬ÀßÄê¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
 
-#: ../src/gschem.c:322 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "guile¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Æ¤¤¤Þ¤¹¡£[%s]\n"
 
+#: ../src/gschem_cairo.c:310
+#, c-format
+msgid "Unknown end for line (%d)\n"
+msgstr "ÉÔÌÀ¤ÊÀþ¤ÎÀèÃ¼(%d)\n"
+
+#: ../src/gschem_cairo.c:318
+#, fuzzy, c-format
+msgid "Unknown type for stroke (%d) !\n"
+msgstr "ÉÔÌÀ¤ÊÀþ¤Î¼ïÎà(%d)!\n"
+
 #: ../src/i_basic.c:79
 msgid "Component Mode"
 msgstr "ÉôÉÊ¥â¡¼¥É"
@@ -753,15 +774,11 @@ msgstr "±ß¸Ì¥â¡¼¥É"
 msgid "Pin Mode"
 msgstr "¥Ô¥ó¥â¡¼¥É"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "¥³¥Ô¡¼"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "°ÜÆ°"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 #, fuzzy
 msgid "Multiple Copy"
 msgstr "Â¿½Å¥¢¥¿¥Ã¥Á"
@@ -774,27 +791,35 @@ msgstr "±£¤·¥Æ¥¥¹¥ÈÉ½¼¨"
 msgid "Snap Off"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:547
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2230 ../src/x_window.c:542
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr "¥¹¥È¥í¡¼¥¯"
 
-#: ../src/i_basic.c:264 ../src/x_window.c:544
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "¤Ê¤·"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "·«¤êÊÖ¤·/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr ""
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
+msgid "NONE"
+msgstr ""
+
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
@@ -804,70 +829,75 @@ msgstr ""
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1701
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, fuzzy, c-format
 msgid "New page created [%s]\n"
 msgstr "¿·µ¬¥Ú¡¼¥¸¤òºîÀ®¤·¤Þ¤·¤¿¡£[%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:467
+#: ../src/i_callbacks.c:163
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤òºîÀ®¤·¤Þ¤·¤¿¡£\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 #, fuzzy
 msgid "Failed to Save All"
 msgstr "¤¹¤Ù¤ÆÊÝÂ¸"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "¤¹¤Ù¤ÆÊÝÂ¸"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊÄ¤¸¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "¤Þ¤º¥ª¥Ö¥¸¥§¥¯¥È¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Àþ¼ï¤òÊÔ½¸"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "¥Æ¥¥¹¥ÈÊÔ½¸"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "¥¹¥í¥Ã¥È"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "¿§"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "²óÅ¾"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "È¿Å¾"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1623
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Å¾Á÷"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "·Ù¹ð:¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ¤ÇÅ¾Á÷¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤!\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "·Ù¹ð:¥¹¥Ê¥Ã¥×¤ò¥ª¥ó¤·¤Æ¤«¤éÅ¾Á÷¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "·Ù¹ð:¥°¥ê¥Ã¥É¥µ¥¤¥º¤¬100¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -875,284 +905,256 @@ msgstr ""
 "·Ù¹ð:¸¶ÅÀ¤ØÅ¾Á÷¤¹¤ë¤È¤¤Ï¥¹¥Ê¥Ã¥×¤Î¥°¥ê¥Ã¥É¥µ¥¤¥º¤ò\n"
 "100¤ËÀßÄê¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "ÁÈ¤ß¹þ¤ß"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "ÁÈ¤ß¹þ¤ß²ò½ü"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "¹¹¿·"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "±£¤·¥Æ¥¥¹¥ÈÉ½¼¨"
 
-#: ../src/i_callbacks.c:1142
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "É½¼¨¤¹¤ë"
 
-#: ../src/i_callbacks.c:1259
-msgid "Edit Line Type"
-msgstr "Àþ¼ï¤òÊÔ½¸"
-
-#: ../src/i_callbacks.c:1301 ../src/x_dialog.c:1243
-msgid "Edit Fill Type"
-msgstr "ÅÉ¤ê¤Ä¤Ö¤·¤òÊÔ½¸"
-
-#: ../src/i_callbacks.c:1595
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr "¥¥å¡¼¹¹¿·"
 
-#: ../src/i_callbacks.c:1745
+#: ../src/i_callbacks.c:1746
 #, fuzzy
 msgid "Really revert page?"
 msgstr "Ìá¤¹"
 
-#: ../src/i_callbacks.c:1817
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "¥Ú¡¼¥¹¥È1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Ç¤¹¡£"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "¥³¥Ô¡¼1"
 
-#: ../src/i_callbacks.c:1836
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "¥³¥Ô¡¼2"
 
-#: ../src/i_callbacks.c:1855
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "¥³¥Ô¡¼3"
 
-#: ../src/i_callbacks.c:1874
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "¥³¥Ô¡¼4"
 
-#: ../src/i_callbacks.c:1893
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "¥³¥Ô¡¼5"
 
-#: ../src/i_callbacks.c:1912
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "¥«¥Ã¥È1"
 
-#: ../src/i_callbacks.c:1931
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "¥«¥Ã¥È2"
 
-#: ../src/i_callbacks.c:1950
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "¥«¥Ã¥È3"
 
-#: ../src/i_callbacks.c:1969
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "¥«¥Ã¥È4"
 
-#: ../src/i_callbacks.c:1988
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "¥«¥Ã¥È5"
 
-#: ../src/i_callbacks.c:2004
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "¥Ú¡¼¥¹¥È1"
 
-#: ../src/i_callbacks.c:2011 ../src/i_callbacks.c:2033
-#: ../src/i_callbacks.c:2055 ../src/i_callbacks.c:2077
-#: ../src/i_callbacks.c:2099
-msgid "Empty buffer"
-msgstr "¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Ç¤¹¡£"
-
-#: ../src/i_callbacks.c:2026
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "¥Ú¡¼¥¹¥È 2"
 
-#: ../src/i_callbacks.c:2048
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "¥Ú¡¼¥¹¥È 3"
 
-#: ../src/i_callbacks.c:2070
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "¥Ú¡¼¥¹¥È 4"
 
-#: ../src/i_callbacks.c:2092
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "¥Ú¡¼¥¹¥È 5"
 
-#: ../src/i_callbacks.c:2229 ../src/x_window.c:406
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "ÉôÉÊ"
 
-#: ../src/i_callbacks.c:2265 ../src/i_callbacks.c:2284 ../src/x_dialog.c:2203
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È"
 
-#: ../src/i_callbacks.c:2781
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "¥½¡¼¥¹¸¡º÷Ãæ[%s]\n"
 
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "¥½¡¼¥¹¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "¥·¥ó¥Ü¥ë¸¡º÷Ãæ[%s]\n"
 
-#: ../src/i_callbacks.c:2878
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2972
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: ../src/i_callbacks.c:3084
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "NÉ½¼¨"
 
-#: ../src/i_callbacks.c:3120
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "É½¼¨V"
 
-#: ../src/i_callbacks.c:3156
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "É½¼¨B"
 
-#: ../src/i_callbacks.c:3193
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "É½¼¨ÀÚÂØ¤¨"
 
-#: ../src/i_callbacks.c:3223
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "µ¡Ç½¤·¤Ê¤¤¥á¥Ë¥å¡¼¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
 
-#: ../src/i_callbacks.c:3311
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3314
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3331
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "¥°¥ê¥Ã¥É¡¦¥ª¥Õ\n"
 
-#: ../src/i_callbacks.c:3334
-msgid "Grid ON\n"
-msgstr "¥°¥ê¥Ã¥É¡¦¥ª¥ó\n"
+#: ../src/i_callbacks.c:3435
+msgid "Dot grid selected\n"
+msgstr ""
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3436
+msgid "Mesh grid selected\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ(Ãí°Õ!)\n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥ó\n"
 
-#: ../src/i_callbacks.c:3374
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ(Ãí°Õ!)\n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥É¡¦¥ª¥Õ\n"
 
-#: ../src/i_callbacks.c:3377
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥É¡¦¥ª¥ó\n"
 
-#: ../src/i_callbacks.c:3392
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3395
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_arc.c:120
-#, c-format
-msgid "Unknown end for arc (%d)\n"
-msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤ÎÀèÃ¼(%d)\n"
-
-#: ../src/o_arc.c:160
-#, c-format
-msgid "Unknown type for arc !\n"
-msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤Î¼ïÎà!\n"
-
-#: ../src/o_box.c:136
-#, c-format
-msgid "Unknown end for box (%d)\n"
-msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤ÎÀèÃ¼(%d)\n"
-
-#: ../src/o_box.c:176
-#, c-format
-msgid "Unknown type for box !\n"
-msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤Î¼ïÎà!\n"
-
-#: ../src/o_box.c:260
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤Î¼ïÎà(ÅÉ¤ê¤Ä¤Ö¤·)!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 
-#: ../src/o_bus.c:183
+#: ../src/o_bus.c:135
 #, c-format
-msgid "Got an invalid which one in o_bus_draw_xor_single\n"
+msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_circle.c:127
-#, c-format
-msgid "Unknown end for circle\n"
-msgstr "ÉÔÌÀ¤Ê±ß¤ÎÀèÃ¼\n"
-
-#. just to be careful
-#: ../src/o_circle.c:163
-#, c-format
-msgid "Unknown type for circle!\n"
-msgstr "ÉÔÌÀ¤Ê±ß¤Î¼ïÎà!\n"
-
-#: ../src/o_circle.c:245
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "ÉÔÌÀ¤Ê±ß¤Î¼ïÎà(ÅÉ¤ê¤Ä¤Ö¤·)!\n"
 
-#: ../src/o_complex.c:251 ../src/o_complex.c:255
+#: ../src/o_complex.c:250 ../src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤òÅ¾Á÷¤·¤Æ¤¤¤Þ¤¹¡£[%d %d]\n"
 
-#: ../src/o_line.c:111
-#, c-format
-msgid "Unknown end for line (%d)\n"
-msgstr "ÉÔÌÀ¤ÊÀþ¤ÎÀèÃ¼(%d)\n"
-
-#. just to be careful
-#: ../src/o_line.c:151
-#, c-format
-msgid "Unknown type for line (%d) !\n"
-msgstr "ÉÔÌÀ¤ÊÀþ¤Î¼ïÎà(%d)!\n"
-
 #: ../src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
@@ -1168,35 +1170,35 @@ msgstr "¤³¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤¹¤Ç¤Ë¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 msgid "Object already unlocked\n"
 msgstr "¤³¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤¹¤Ç¤Ë¥í¥Ã¥¯²ò½ü¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: ../src/o_misc.c:444
+#: ../src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "±£¤·¥Æ¥¥¹¥È¤¬É½¼¨¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/o_misc.c:446
+#: ../src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "±£¤·¥Æ¥¥¹¥È¤¬ÈóÉ½¼¨¤Ë¤Ê¤ê¤Þ¤·¤¿¡£\n"
 
-#: ../src/o_misc.c:694
+#: ../src/o_misc.c:697
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:837
+#: ../src/o_misc.c:840
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 
-#: ../src/o_misc.c:881
+#: ../src/o_misc.c:884
 #, fuzzy, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "ÊÝÂ¸¤Ç¤¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/o_misc.c:899
+#: ../src/o_misc.c:902
 #, fuzzy, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "ÊÝÂ¸¤Ç¤¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/o_misc.c:904
+#: ../src/o_misc.c:907
 #, fuzzy, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "ÊÝÂ¸¤Ç¤¤Þ¤»¤ó¡£[%s]\n"
@@ -1206,57 +1208,47 @@ msgstr "ÊÝÂ¸¤Ç¤¤Þ¤»¤ó¡£[%s]\n"
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr ""
 
-#: ../src/o_move.c:385
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: ../src/o_move.c:406
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr ""
 
-#: ../src/o_net.c:253
+#: ../src/o_net.c:176
 #, c-format
-msgid "Got an invalid which one in o_net_draw_xor_single\n"
+msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_net.c:630
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:692
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
 #. try to exit gracefully
-#: ../src/o_net.c:1080 ../src/o_net.c:1117 ../src/o_net.c:1188
-#: ../src/o_net.c:1224
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: ../src/o_net.c:1294
+#: ../src/o_net.c:1196
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Ìµ¸ú¤Ê¥Ñ¥¹[%s]¤¬component-library¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/o_path.c:483
-#, fuzzy, c-format
-msgid "Unknown end for path (%d)\n"
-msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤ÎÀèÃ¼(%d)\n"
-
-#: ../src/o_path.c:524
-#, fuzzy, c-format
-msgid "Unknown type for path !\n"
-msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤Î¼ïÎà!\n"
-
-#: ../src/o_path.c:594
+#: ../src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤Î¼ïÎà(ÅÉ¤ê¤Ä¤Ö¤·)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:627
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, fuzzy, c-format
 msgid "Failed to load picture: %s"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆÉ¤ß¹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
@@ -1265,7 +1257,7 @@ msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆÉ¤ß¹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 msgid "Picture"
 msgstr ""
 
-#: ../src/o_picture.c:535 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr ""
@@ -1375,7 +1367,7 @@ msgstr "¤¹¤Ù¤Æ"
 msgid "Components"
 msgstr "ÉôÉÊ"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:416
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "¥Í¥Ã¥È"
 
@@ -1383,151 +1375,150 @@ msgstr "¥Í¥Ã¥È"
 msgid "Replace existing attributes"
 msgstr ""
 
-#: ../src/x_autonumber.c:412
+#: ../src/x_autonumber.c:413
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
 #. duplicate slot in used_slots
-#: ../src/x_autonumber.c:427
+#: ../src/x_autonumber.c:428
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:695
+#: ../src/x_autonumber.c:696
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:746
+#: ../src/x_autonumber.c:748
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:880
+#: ../src/x_autonumber.c:883
 msgid "Diagonal"
 msgstr ""
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Top to bottom"
 msgstr ""
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Bottom to top"
 msgstr ""
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 #, fuzzy
 msgid "Left to right"
 msgstr "Ãæ±û ±¦"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Right to left"
 msgstr ""
 
-#: ../src/x_autonumber.c:883
+#: ../src/x_autonumber.c:886
 #, fuzzy
 msgid "File order"
 msgstr "±ß¥â¡¼¥É"
 
-#: ../src/x_autonumber.c:1219
+#: ../src/x_autonumber.c:1222
 msgid "Autonumber text"
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥¥¹¥È"
 
 #. scope section
-#: ../src/x_autonumber.c:1243
+#: ../src/x_autonumber.c:1246
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../src/x_autonumber.c:1265
+#: ../src/x_autonumber.c:1268
 msgid "Search for:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1279
+#: ../src/x_autonumber.c:1282
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥¥¹¥È"
 
-#: ../src/x_autonumber.c:1286
+#: ../src/x_autonumber.c:1289
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
 #, fuzzy
 msgid "Selected objects"
 msgstr "Â¸ºß¤·¤Ê¤¤¥ª¥Ö¥¸¥§¥¯¥È¤¬ÁªÂò¤µ¤ì¤Þ¤·¤¿!\n"
 
-#: ../src/x_autonumber.c:1299 ../src/x_autonumber.c:1308
+#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
 #, fuzzy
 msgid "Current page"
 msgstr "¥Æ¥¹¥È¥·¡¼¥È"
 
-#: ../src/x_autonumber.c:1300 ../src/x_autonumber.c:1309
+#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "³¬ÁØ"
 
-#: ../src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1314
 msgid "Overwrite existing numbers"
 msgstr ""
 
 #. Options section
-#: ../src/x_autonumber.c:1316
+#: ../src/x_autonumber.c:1319
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/x_autonumber.c:1338
+#: ../src/x_autonumber.c:1341
 #, fuzzy
 msgid "Starting number:"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: ../src/x_autonumber.c:1345
+#: ../src/x_autonumber.c:1348
 msgid "Sort order:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1366
+#: ../src/x_autonumber.c:1369
 msgid "Remove numbers"
 msgstr ""
 
-#: ../src/x_autonumber.c:1370
+#: ../src/x_autonumber.c:1373
 msgid "Automatic slotting"
 msgstr ""
 
-#: ../src/x_color.c:52 ../src/x_color.c:61 ../src/x_color.c:124
-#: ../src/x_color.c:172
+#: ../src/x_color.c:94 ../src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "»ØÄê¤Ç¤¤Ê¤¤¿§[%s]¤Ç¤¹!\n"
 
-#: ../src/x_color.c:52
+#: ../src/x_color.c:94
 msgid "black"
 msgstr "¹õ"
 
-#: ../src/x_color.c:61
+#: ../src/x_color.c:103
 msgid "white"
 msgstr "Çò"
 
-#: ../src/x_color.c:103 ../src/x_color.c:140
-#, c-format
-msgid "Could not find the color %s!\n"
-msgstr "¿§%s¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó!\n"
-
-#: ../src/x_color.c:106 ../src/x_color.c:143
-#, c-format
-msgid "Defaulting color to white\n"
-msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¿§¤òÇò¤Ë¤·¤Þ¤¹¡£\n"
+#: ../src/x_color.c:125
+#, fuzzy, c-format
+msgid "Could not allocate display color %i!\n"
+msgstr "»ØÄê¤Ç¤¤Ê¤¤¿§[%s]¤Ç¤¹!\n"
 
-#: ../src/x_color.c:113 ../src/x_color.c:150
-#, c-format
-msgid "Ack! Cannot allocate white!\n"
-msgstr "¤¢¤Ã! Çò¤ò»ØÄê¤Ç¤¤Þ¤»¤ó!\n"
+#: ../src/x_color.c:147
+#, fuzzy, c-format
+msgid "Could not allocate outline color %i!\n"
+msgstr "»ØÄê¤Ç¤¤Ê¤¤¿§[%s]¤Ç¤¹!\n"
 
-#: ../src/x_color.c:191 ../src/x_color.c:207
+#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Ìµ¸ú¤Ê¿§¤Î»ØÄê¤Ç¤¹¡£ : %d\n"
 
+#: ../src/x_color.c:214
+#, fuzzy, c-format
+msgid "Tried to get an invalid outline color: %d\n"
+msgstr "Ìµ¸ú¤Ê¿§¤Î»ØÄê¤Ç¤¹¡£ : %d\n"
+
 #. GtkLabel
 #: ../src/x_compselect.c:1040
 #, fuzzy
@@ -1535,7 +1526,7 @@ msgid "Filter:"
 msgstr "¥Õ¥£¥ë¥¿"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3591
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Ì¾Á°"
@@ -1577,11 +1568,11 @@ msgid "Preview"
 msgstr "¥×¥ì¥Ó¥å¡¼"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "¥Æ¥¥¹¥È..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1591,199 +1582,202 @@ msgstr ""
 "¥¦¥£¥ó¥É¥¦Æâ¤Ç¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥Æ¥¥¹¥È¤òÇÛÃÖ¤·¤Þ¤¹¡£\n"
 "Ãæ¥Ü¥¿¥ó¤Ç²óÅ¾¤·¤Þ¤¹¡£"
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "²¼ º¸"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Ãæ±û º¸"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "¾å º¸"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "²¼ Ãæ±û"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Ãæ±û Ãæ±û"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "¾å Ãæ±û"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "²¼ ±¦"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Ãæ±û ±¦"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "¾å ±¦"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "¥µ¥¤¥º"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 #, fuzzy
 msgid "Color:"
 msgstr "¿§"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr ""
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 #, fuzzy
 msgid "Alignment:"
 msgstr "ÇÛÃÖ"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "¼ÂÀþ"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "ÅÀÀþ"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "ÇËÀþ"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "Ãæ±û"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "¥Õ¥¡¥ó¥È¥à"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:964 ../src/x_dialog.c:965 ../src/x_dialog.c:966
-#: ../src/x_dialog.c:974 ../src/x_dialog.c:1157 ../src/x_dialog.c:1159
-#: ../src/x_dialog.c:1161 ../src/x_dialog.c:1163 ../src/x_dialog.c:1165
-#: ../src/x_dialog.c:1368 ../src/x_dialog.c:1369 ../src/x_dialog.c:1370
-#: ../src/x_dialog.c:1371 ../src/x_dialog.c:1372 ../src/x_dialog.c:1380
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr ""
 
-#: ../src/x_dialog.c:858
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Àþ¼ï¤ÈÉýÊÔ½¸"
 
-#: ../src/x_dialog.c:897
-#, fuzzy
-msgid "Width:"
-msgstr "Éý"
-
-#: ../src/x_dialog.c:901 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 #, fuzzy
 msgid "Type:"
 msgstr "¼ïÎà"
 
-#: ../src/x_dialog.c:905
+#: ../src/x_dialog.c:1021
+#, fuzzy
+msgid "Width:"
+msgstr "Éý"
+
+#: ../src/x_dialog.c:1025
 #, fuzzy
 msgid "Dash Length:"
 msgstr "ÇËÀþ¤ÎÄ¹¤µ"
 
-#: ../src/x_dialog.c:909
+#: ../src/x_dialog.c:1029
 #, fuzzy
 msgid "Dash Space:"
 msgstr "ÇËÀþ¤Î´Ö³Ö"
 
-#: ../src/x_dialog.c:1014
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "¶õÆ¶"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "ÅÉ¤ê¤Ä¤Ö¤·"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "¥á¥Ã¥·¥å"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "¥Ï¥Ã¥Á"
 
-#: ../src/x_dialog.c:1281
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "ÅÉ¤ê¤Ä¤Ö¤·¤òÊÔ½¸"
+
+#: ../src/x_dialog.c:1508
 #, fuzzy
 msgid "Fill Type:"
 msgstr "ÅÉ¤ê¤Ä¤Ö¤·¼ïÎà"
 
-#: ../src/x_dialog.c:1285
+#: ../src/x_dialog.c:1512
 #, fuzzy
 msgid "Line Width:"
 msgstr "Àþ¤ÎÉý"
 
-#: ../src/x_dialog.c:1289
+#: ../src/x_dialog.c:1516
 #, fuzzy
 msgid "Angle 1:"
 msgstr "³ÑÅÙ1"
 
-#: ../src/x_dialog.c:1293
+#: ../src/x_dialog.c:1520
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "¥Ô¥Ã¥Á1"
 
-#: ../src/x_dialog.c:1297
+#: ../src/x_dialog.c:1524
 #, fuzzy
 msgid "Angle 2:"
 msgstr "³ÑÅÙ2"
 
-#: ../src/x_dialog.c:1301
+#: ../src/x_dialog.c:1528
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "¥Ô¥Ã¥Á2"
 
-#: ../src/x_dialog.c:1480
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "±ß¸Ì¥Ñ¥é¥á¡¼¥¿"
 
-#: ../src/x_dialog.c:1520
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1528
+#: ../src/x_dialog.c:1705
 #, fuzzy
 msgid "Start Angle:"
 msgstr "³«»Ï³Ñ"
 
-#: ../src/x_dialog.c:1536
+#: ../src/x_dialog.c:1713
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "¥¹¥¤¡¼¥×³Ñ"
 
-#: ../src/x_dialog.c:1653
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1791,49 +1785,49 @@ msgstr ""
 "Å¾Á÷¤·¤Þ¤¹¤«?\n"
 "(0¤Ç¸¶ÅÀ)"
 
-#: ../src/x_dialog.c:1721
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "¥Æ¥¥¹¥È¥µ¥¤¥º"
 
-#: ../src/x_dialog.c:1751
+#: ../src/x_dialog.c:1928
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "¥Æ¥¥¹¥È¥µ¥¤¥º¤òÆþÎÏ¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: ../src/x_dialog.c:1826
+#: ../src/x_dialog.c:2004
 #, fuzzy
 msgid "Snap Size"
 msgstr "¥¹¥Ê¥Ã¥×¥°¥ê¥Ã¥É"
 
-#: ../src/x_dialog.c:1856
+#: ../src/x_dialog.c:2034
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "¥°¥ê¥Ã¥É¥µ¥¤¥º¤òÆþÎÏ¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: ../src/x_dialog.c:1929
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: ../src/x_dialog.c:1960
+#: ../src/x_dialog.c:2138
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: ../src/x_dialog.c:2022
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "gschem¤Ë¤Ä¤¤¤Æ..."
 
-#: ../src/x_dialog.c:2042
+#: ../src/x_dialog.c:2220
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "gEDA : GPL Electronic Design Automation"
 
-#: ../src/x_dialog.c:2046
+#: ../src/x_dialog.c:2224
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "gschem¥Ð¡¼¥¸¥ç¥ó%s%s.%s"
 
-#: ../src/x_dialog.c:2054
+#: ../src/x_dialog.c:2232
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1846,153 +1840,161 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "¤ª¤è¤ÓÂçÀª¤Î¿Í¡¹(¥Õ¥¡¥¤¥ëAUTHORS»²¾È)"
 
-#: ../src/x_dialog.c:2119
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "ºÂÉ¸"
 
-#: ../src/x_dialog.c:2140
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: ../src/x_dialog.c:2149
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "¥ï¡¼¥ë¥É"
 
-#: ../src/x_dialog.c:2188
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2194
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2206
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2388
 #, fuzzy
 msgid "Detached attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄÉ²Ã/ÊÔ½¸"
 
-#: ../src/x_dialog.c:2215 ../src/x_window.c:434
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "¥Æ¥¥¹¥È"
 
-#: ../src/x_dialog.c:2221
+#: ../src/x_dialog.c:2397
 #, fuzzy
 msgid "Selection"
 msgstr "ÁªÂò"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2403
 #, fuzzy
 msgid "Zoom box"
 msgstr "³ÈÂç"
 
-#: ../src/x_dialog.c:2236
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2415
 #, fuzzy
 msgid "Net junction"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2390
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr ""
 
-#: ../src/x_dialog.c:2452
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "¿§ÊÔ½¸"
 
-#: ../src/x_dialog.c:2483
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr ""
 
-#: ../src/x_dialog.c:2605
+#: ../src/x_dialog.c:2786
 #, fuzzy
 msgid "Function"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:2612
+#: ../src/x_dialog.c:2793
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "´Ø¿ô : ¥¡¼¥¹¥È¥í¡¼¥¯"
 
-#: ../src/x_dialog.c:2921
+#: ../src/x_dialog.c:3102
 #, fuzzy
 msgid "Find Text"
 msgstr "¥Æ¥¥¹¥È¸¡º÷"
 
-#: ../src/x_dialog.c:2952
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "¸¡º÷¥Æ¥¥¹¥È"
 
-#: ../src/x_dialog.c:2962
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "²¼¤Î³¬ÁØ¤â¸¡º÷"
 
-#: ../src/x_dialog.c:3026
+#: ../src/x_dialog.c:3208
 #, fuzzy
 msgid "Hide Text"
 msgstr "¥Æ¥¥¹¥È¤ò±£¤¹"
 
-#: ../src/x_dialog.c:3057
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "±£¤·¥Æ¥¥¹¥È"
 
-#: ../src/x_dialog.c:3125
+#: ../src/x_dialog.c:3308
 #, fuzzy
 msgid "Show Text"
 msgstr "¥Æ¥¥¹¥ÈÉ½¼¨"
 
-#: ../src/x_dialog.c:3156
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "¥Æ¥¥¹¥È"
 
-#: ../src/x_dialog.c:3613
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: ../src/x_dialog.c:3707
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: ../src/x_dialog.c:3713
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
 #. secondary label
-#: ../src/x_dialog.c:3742
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: ../src/x_dialog.c:3762
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr ""
 
-#: ../src/x_dialog.c:4096
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -2003,11 +2005,25 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: ../src/x_dialog.c:4098
+#: ../src/x_dialog.c:4281
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄÉ²Ã/ÊÔ½¸"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Àþ¼ï"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "¥¢¥¯¥·¥ç¥ó"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 #, fuzzy
 msgid "Schematics"
@@ -2167,54 +2183,59 @@ msgstr "ÊÔ½¸..."
 
 #: ../src/x_menus.c:49
 #, fuzzy
+msgid "/Edit pin type..."
+msgstr "Àþ¼ï¤òÊÔ½¸"
+
+#: ../src/x_menus.c:50
+#, fuzzy
 msgid "/Copy"
 msgstr "¥³¥Ô¡¼"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 #, fuzzy
 msgid "/Move"
 msgstr "°ÜÆ°"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 #, fuzzy
 msgid "/Delete"
 msgstr "ºï½ü"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 #, fuzzy
 msgid "/Down Schematic"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 #, fuzzy
 msgid "/Down Symbol"
 msgstr "¥·¥ó¥Ü¥ë¤Ø"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 #, fuzzy
 msgid "/Up"
 msgstr "¾å¤Ø"
 
-#: ../src/x_menus.c:323
+#: ../src/x_menus.c:316
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 
-#: ../src/x_menus.c:347
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr ""
 
-#: ../src/x_menus.c:360
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:455
+#: ../src/x_menus.c:462
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "¤ª¤Ã¤È¡¢¥Ç¥£¥ì¥¯¥È¥ê¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: ../src/x_menus.c:516
+#: ../src/x_menus.c:524
 msgid "Clear"
 msgstr "¥¯¥ê¥¢"
 
@@ -2282,6 +2303,11 @@ msgstr "ÊÑ¹¹"
 msgid "Right click on the filename for more options..."
 msgstr ""
 
+#: ../src/x_preview.c:223
+#, fuzzy
+msgid "Preview Buffer"
+msgstr "¥Ð¥Ã¥Õ¥¡"
+
 #: ../src/x_print.c:84
 #, fuzzy
 msgid "Select PostScript Filename..."
@@ -2363,55 +2389,35 @@ msgstr "¸½ºß¤Î¥¹¥±¥Þ¥Á¥Ã¥¯¤ò°õºþ¤·¤Þ¤·¤¿¡£[%s]\n"
 msgid "Couldn't allocate gc\n"
 msgstr ""
 
-#: ../src/x_window.c:94
-#, c-format
-msgid "Couldn't allocate xor_gc\n"
-msgstr ""
-
-#: ../src/x_window.c:107
-#, c-format
-msgid "Couldn't allocate outline_xor_gc\n"
-msgstr ""
-
-#: ../src/x_window.c:123
-#, c-format
-msgid "Couldn't allocate bounding_xor_gc\n"
-msgstr ""
-
-#: ../src/x_window.c:130
-#, c-format
-msgid "Couldn't allocate bus_gc\n"
-msgstr ""
-
-#: ../src/x_window.c:369
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
 
-#: ../src/x_window.c:375
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "³«¤¯"
 
-#: ../src/x_window.c:376
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: ../src/x_window.c:382
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "ÊÝÂ¸"
 
-#: ../src/x_window.c:383
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤òÊÝÂ¸"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "¥¢¥ó¥É¥¥"
 
-#: ../src/x_window.c:398
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "¥ê¥É¥¥"
 
-#: ../src/x_window.c:407
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2423,7 +2429,7 @@ msgstr ""
 "¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢ÇÛÃÖ¤·¤Þ¤¹¡£\n"
 "±¦¥Ü¥¿¥ó¤Ç¥¥ã¥ó¥»¥ë¤·¤Þ¤¹¡£"
 
-#: ../src/x_window.c:417
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2431,7 +2437,7 @@ msgstr ""
 "¥Í¥Ã¥ÈÄÉ²Ã¥â¡¼¥É\n"
 "±¦¥Ü¥¿¥ó¤Ç¥¥ã¥ó¥»¥ë"
 
-#: ../src/x_window.c:427
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2439,79 +2445,79 @@ msgstr ""
 "¥Ð¥¹ÄÉ²Ã¥â¡¼¥É\n"
 "±¦¥Ü¥¿¥ó¤Ç¥¥ã¥ó¥»¥ë"
 
-#: ../src/x_window.c:435
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "¥Æ¥¥¹¥ÈÄÉ²Ã..."
 
-#: ../src/x_window.c:445
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "ÁªÂò"
 
-#: ../src/x_window.c:446
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "ÁªÂò¥â¡¼¥É"
 
-#: ../src/x_window.c:533
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "¥Ô¥Ã¥¯"
 
-#: ../src/x_window.c:549
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "·«¤êÊÖ¤·/¤Ê¤·"
 
-#: ../src/x_window.c:559
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "¥á¥Ë¥å¡¼/¥¥ã¥ó¥»¥ë"
 
-#: ../src/x_window.c:561
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "¥Ñ¥ó/¥¥ã¥ó¥»¥ë"
 
-#: ../src/x_window.c:783
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤òÆÉ¤ß¹þ¤ó¤Ç¤¤¤Þ¤¹¡£[%s]\n"
 
-#: ../src/x_window.c:795
+#: ../src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆÉ¤ß¹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: ../src/x_window.c:804
+#: ../src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:909
+#: ../src/x_window.c:859
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "ÊÝÂ¸¤Ç¤¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/x_window.c:910
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "ÊÝÂ¸Ãæ¤Ë¥¨¥é¡¼È¯À¸"
 
-#: ../src/x_window.c:919
+#: ../src/x_window.c:869
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "[%s]¤È¤·¤ÆÊÝÂ¸¤·¤Þ¤·¤¿¡£\n"
 
-#: ../src/x_window.c:921
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "ÊÝÂ¸¤·¤Þ¤·¤¿¡£[%s]\n"
 
-#: ../src/x_window.c:923
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "ÊÝÂ¸¤·¤Þ¤·¤¿¡£"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "¥Ú¡¼¥¸¤òÇË´þ¤·¤Æ¤¤¤Þ¤¹¡£[%s]\n"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "ÊÄ¤¸¤Æ¤¤¤Þ¤¹¡£[%s]\n"
@@ -2525,6 +2531,61 @@ msgstr ""
 msgid "gEDA Schematic Editor"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 
+#, fuzzy
+#~ msgid "Cut Buffer"
+#~ msgstr "¥Ð¥Ã¥Õ¥¡"
+
+#, fuzzy
+#~ msgid "Copy Buffer"
+#~ msgstr "¥Ð¥Ã¥Õ¥¡"
+
+#~ msgid "Toggle Grid On/Off"
+#~ msgstr "¥°¥ê¥Ã¥É ¥ª¥ó/¥ª¥Õ"
+
+#~ msgid "Invalid color [%s] passed to %s\n"
+#~ msgstr "Ìµ¸ú¤Ê¿§[%s]¤¬%s¤Ë»ØÄê¤µ¤ì¤Þ¤·¤¿¡£\n"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "´Ä¶ÊÑ¿ôGEDADATA¤òÀßÄê¤·¤Æ¤¯¤À¤µ¤¤!\n"
+
+#~ msgid "Grid ON\n"
+#~ msgstr "¥°¥ê¥Ã¥É¡¦¥ª¥ó\n"
+
+#~ msgid "Unknown end for arc (%d)\n"
+#~ msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤ÎÀèÃ¼(%d)\n"
+
+#~ msgid "Unknown type for arc !\n"
+#~ msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤Î¼ïÎà!\n"
+
+#~ msgid "Unknown end for box (%d)\n"
+#~ msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤ÎÀèÃ¼(%d)\n"
+
+#~ msgid "Unknown type for box !\n"
+#~ msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤Î¼ïÎà!\n"
+
+#~ msgid "Unknown end for circle\n"
+#~ msgstr "ÉÔÌÀ¤Ê±ß¤ÎÀèÃ¼\n"
+
+#~ msgid "Unknown type for circle!\n"
+#~ msgstr "ÉÔÌÀ¤Ê±ß¤Î¼ïÎà!\n"
+
+#, fuzzy
+#~ msgid "Unknown end for path (%d)\n"
+#~ msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤ÎÀèÃ¼(%d)\n"
+
+#, fuzzy
+#~ msgid "Unknown type for path !\n"
+#~ msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤Î¼ïÎà!\n"
+
+#~ msgid "Could not find the color %s!\n"
+#~ msgstr "¿§%s¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó!\n"
+
+#~ msgid "Defaulting color to white\n"
+#~ msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¿§¤òÇò¤Ë¤·¤Þ¤¹¡£\n"
+
+#~ msgid "Ack! Cannot allocate white!\n"
+#~ msgstr "¤¢¤Ã! Çò¤ò»ØÄê¤Ç¤¤Þ¤»¤ó!\n"
+
 #~ msgid "Attribute failed ot find.\n"
 #~ msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£\n"
 
@@ -2632,9 +2693,6 @@ msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 #~ msgid "Edit Text Color"
 #~ msgstr "¥Æ¥¥¹¥ÈÊÔ½¸"
 
-#~ msgid "Line Type"
-#~ msgstr "Àþ¼ï"
-
 #~ msgid "Ran out of space in the hotkey buffer...\n"
 #~ msgstr "¥Û¥Ã¥È¥¡¼¥Ð¥Ã¥Õ¥¡¤¬°î¤ì¤Þ¤·¤¿...\n"
 
diff --git a/gschem/po/nl.po b/gschem/po/nl.po
index e209e6d..de049c6 100644
--- a/gschem/po/nl.po
+++ b/gschem/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geda-gschem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-02 13:53+0000\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2009-01-02 07:40+0100\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: geda-dev@xxxxxxxxxxxxxx\n"
@@ -60,7 +60,7 @@ msgstr "Afdrukken..."
 msgid "Write image..."
 msgstr "Schrijf Afbeelding..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:490
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 msgid "Recent files"
 msgstr "Recente bestanden"
 
@@ -76,33 +76,36 @@ msgstr "Sluit venster"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Bewerk"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:335
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:342
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Herstel"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:518
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "Selectie Mode"
 
 #: ../src/rcstrings.c:22
-msgid "Cut Buffer"
-msgstr "Knip Buffer"
+#, fuzzy
+msgid "Cut"
+msgstr "Knip 1"
 
-#: ../src/rcstrings.c:23
-msgid "Copy Buffer"
-msgstr "Kopieer Buffer"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "Kopieer"
 
 #: ../src/rcstrings.c:24
-msgid "Paste Buffer"
-msgstr "Plak Buffer"
+#, fuzzy
+msgid "Paste"
+msgstr "Plak 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -124,7 +127,7 @@ msgstr "Meervoudige Kopieer Mode"
 msgid "Move Mode"
 msgstr "Verplaats Mode"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -144,11 +147,11 @@ msgstr "Slot..."
 msgid "Color..."
 msgstr "Kleur..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2236
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Vergrendel"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Ontgrendel"
 
@@ -257,7 +260,7 @@ msgid "Redraw"
 msgstr "Hertekenen"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1507 ../src/i_callbacks.c:1579
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Schuif"
 
@@ -305,7 +308,7 @@ msgstr "Volgende"
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:313
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "Nieuw"
 
@@ -330,14 +333,14 @@ msgid "Component..."
 msgstr "Component..."
 
 #. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2343 ../src/i_callbacks.c:2370
-#: ../src/x_dialog.c:2203
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "Draad"
 
 #. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2414 ../src/i_callbacks.c:2441
-#: ../src/x_dialog.c:2221 ../src/x_window.c:371
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
@@ -349,24 +352,24 @@ msgstr "Attribuut..."
 msgid "Text..."
 msgstr "Tekst..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2522 ../src/i_callbacks.c:2545
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Lijn"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2567 ../src/i_callbacks.c:2590
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "Rechthoek"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2646 ../src/i_callbacks.c:2670
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "Cirkel"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2692 ../src/i_callbacks.c:2715
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Boog"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2737 ../src/i_callbacks.c:2760
-#: ../src/x_dialog.c:2194
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "Pen"
 
@@ -400,11 +403,11 @@ msgstr "Documentatie"
 msgid "Attributes"
 msgstr "Attributen"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3037
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Vastmaken"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3084
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "Losmaken"
 
@@ -508,11 +511,11 @@ msgstr "Component Documentatie"
 msgid "About gschem"
 msgstr "Over gschem"
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2543
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 msgid "Hotkeys"
 msgstr "Sneltoets"
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Vergroting te klein! Kan niet verder vergroten.\n"
 
@@ -533,95 +536,95 @@ msgstr "Kan %s niet aanroepen\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Documentatie opdrachten niet ondersteund bij MinGW.\n"
 
-#: ../src/g_rc.c:299
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ongeldige vergrotingsfactor [%d] overgedragen aan %s\n"
 
-#: ../src/g_rc.c:425
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ongeldige waarde [%d] overgedragen aan text-size\n"
 
-#: ../src/g_rc.c:452
+#: ../src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ongeldige waarde [%f] overgedragen aan postscript-font-scale\n"
 
-#: ../src/g_rc.c:495
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ongeldige waarde [%d] overgedragen aan snap-size\n"
 
-#: ../src/g_rc.c:967
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Ongeldige num niveaus [%d] overgedragen naar undo-levels\n"
 
-#: ../src/g_rc.c:1225
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Ongeldige afmeting [%d] overgedragen aan bus-ripper-size\n"
 
-#: ../src/g_rc.c:1300
+#: ../src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Ongeldige beeldpunt afmeting [%d] overgedragen aan grid-dot-size\n"
 
-#: ../src/g_rc.c:1341
+#: ../src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
 "Ongeldige beeldpunt ruimte [%d] overgedragen aan grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1367
+#: ../src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr ""
 "Ongeldige beeldpunt ruimte [%d] overgedragen aan grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1411
+#: ../src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ongeldige offset waarde [%d] overgedragen aan add-attribute-offset\n"
 
-#: ../src/g_rc.c:1435
+#: ../src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Ongeldig aantal seconden [%d] overgedragen naar auto-save-interval\n"
 
-#: ../src/g_rc.c:1476
+#: ../src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ongeldige versterking [%d] overgedragen aan mousepan-gain\n"
 
-#: ../src/g_rc.c:1499
+#: ../src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ongeldige versterking [%d] overgedragen aan keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1545
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 "Ongeldig aantal beeldpunten [%d] overgedragen aan select-slack-pixels\n"
 
-#: ../src/g_rc.c:1571
+#: ../src/g_rc.c:1564
 #, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ongeldige versterking [%d] overgedragen aan zoom-gain\n"
 
-#: ../src/g_rc.c:1596
+#: ../src/g_rc.c:1589
 #, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Ongeldig aantal stappen [%d] scrollpan-steps\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versie %s%s.%s\n"
 
-#: ../src/gschem.c:191 ../src/gschem.c:202
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -630,7 +633,7 @@ msgstr ""
 "gEDA/gschem komt ABSOLUUT ZONDER GARANTIE; zie het COPYING bestand voor meer "
 "informatie.\n"
 
-#: ../src/gschem.c:193 ../src/gschem.c:204
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -638,7 +641,7 @@ msgstr ""
 "Dit is vrije software, en je wordt aangemoedigt dit te herdistribueren onder "
 "bepaalde\n"
 
-#: ../src/gschem.c:195 ../src/gschem.c:206
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -647,54 +650,57 @@ msgstr ""
 "condities; zie het COPYING bestand voor meer informatie.\n"
 "\n"
 
-#: ../src/gschem.c:210
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Dit is de MINGW32 versie.\n"
 
-#: ../src/gschem.c:214
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Huidige locale instellingen: %s\n"
 
-#: ../src/gschem.c:230
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "Je moet de GEDADATA variabele instellen!\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:247
+#: ../src/gschem.c:251
 #, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Kan init scm bestand [%s]niet vinden\n"
 
-#: ../src/gschem.c:251
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lees init scm bestand [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:255
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Fout bij het lezen van het init scm bestand [%s]\n"
 
-#: ../src/gschem.c:316
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Scheme bestandenmap is NIET ingesteld!\n"
 
-#: ../src/gschem.c:323 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Bezig met uitvoeren van guile script [%s]\n"
 
-#: ../src/gschem_cairo.c:133
+#: ../src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Onbekend einde voor lijn (%d)\n"
 
-#: ../src/gschem_cairo.c:141
+#: ../src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Onbekend type voor lijn (%d)!\n"
@@ -756,15 +762,11 @@ msgstr "Boog Mode"
 msgid "Pin Mode"
 msgstr "Pen Mode"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Kopieer"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "Verplaats"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Meervoudig Kopieren"
 
@@ -776,31 +778,35 @@ msgstr "Zichtbaar Verborgen"
 msgid "Snap Off"
 msgstr "Snap Aan"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:492
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "Aktie"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2233 ../src/x_window.c:487
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr "Slag"
 
-#: ../src/i_basic.c:264 ../src/x_window.c:489
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "geen"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Herhaal/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr "UIT"
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:545
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Raster(%s, %s)"
@@ -810,69 +816,74 @@ msgstr "Raster(%s, %s)"
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentatie voor [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nieuwe pagina gemaakt [%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:459
+#: ../src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nieuw venster gemaakt [%s]\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Fout tijdens Alles Opslaan"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Alles Opgeslagen"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Sluit Venster\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Selecteer voorwerpen eerst"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Bewerk Lijn Type"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Bewerk Tekst"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Kleur"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Roteer"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Spiegel"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1625
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Verplaats"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "WAARSCHUWING: Niet verplaatsen met snap uit!\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "WAARSCHUWING: Zet snap aan en vervolg de verplaatsing.\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "WAARSCHUWING: Snap grid waarde is niet gelijk aan 100!\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -880,140 +891,145 @@ msgstr ""
 "WAARSCHUWING: Als je een symbool naar de oorsprong verschuift, dan moet de "
 "snap grip waarde op 100 gezet worden\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Insluiten"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Uitsluiten"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "Vernieuw"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "ZichtbaarVerborgen"
 
-#: ../src/i_callbacks.c:1143
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "MaakZichtbaar"
 
-#: ../src/i_callbacks.c:1261
-msgid "Edit Line Type"
-msgstr "Bewerk Lijn Type"
-
-#: ../src/i_callbacks.c:1303 ../src/x_dialog.c:1245
-msgid "Edit Fill Type"
-msgstr "Bewerk Arcering Type"
-
-#: ../src/i_callbacks.c:1598
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr "Vernieuw aanwijzing"
 
-#: ../src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr "Echt Terughalen pagina?"
 
-#: ../src/i_callbacks.c:1854
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Plak vanuit 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Maak buffer leeg"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Kopieer 1"
 
-#: ../src/i_callbacks.c:1873
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Kopieer 2"
 
-#: ../src/i_callbacks.c:1892
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Kopieer 3"
 
-#: ../src/i_callbacks.c:1911
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Kopieer 4"
 
-#: ../src/i_callbacks.c:1930
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Kopieer 5"
 
-#: ../src/i_callbacks.c:1949
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Knip 1"
 
-#: ../src/i_callbacks.c:1968
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Knip 2"
 
-#: ../src/i_callbacks.c:1987
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Knip 3"
 
-#: ../src/i_callbacks.c:2006
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Knip 4"
 
-#: ../src/i_callbacks.c:2025
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Knip 5"
 
-#: ../src/i_callbacks.c:2041
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "Plak 1"
 
-#: ../src/i_callbacks.c:2048 ../src/i_callbacks.c:2070
-#: ../src/i_callbacks.c:2092 ../src/i_callbacks.c:2114
-#: ../src/i_callbacks.c:2136
-msgid "Empty buffer"
-msgstr "Maak buffer leeg"
-
-#: ../src/i_callbacks.c:2063
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "Plak 2"
 
-#: ../src/i_callbacks.c:2085
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "Plak 3"
 
-#: ../src/i_callbacks.c:2107
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "Plak 4"
 
-#: ../src/i_callbacks.c:2129
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "Plak 5"
 
-#: ../src/i_callbacks.c:2266 ../src/x_window.c:351
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Component"
 
-#: ../src/i_callbacks.c:2302 ../src/i_callbacks.c:2321 ../src/x_dialog.c:2206
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Attribuut"
 
-#: ../src/i_callbacks.c:2818
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Zoek naar bron [%s]\n"
 
-#: ../src/i_callbacks.c:2842
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Kan bron [%s] niet vinden\n"
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Zoek naar symbool [%s]\n"
 
-#: ../src/i_callbacks.c:2915
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2946
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr "Kan geen schema's vinden boven het huidige schema!\n"
 
-#: ../src/i_callbacks.c:3009
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1021,97 +1037,102 @@ msgstr ""
 "Dit commando haalt de component documentatie van het web, maar er is geen "
 "component geselecteerd"
 
-#: ../src/i_callbacks.c:3122
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "ToonN"
 
-#: ../src/i_callbacks.c:3158
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "ToonW"
 
-#: ../src/i_callbacks.c:3194
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "ToonB"
 
-#: ../src/i_callbacks.c:3231
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "SchakelZichtbaarheid"
 
-#: ../src/i_callbacks.c:3261
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Sorry, maar dit is een niet werkende menu optie\n"
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Aktie terugkoppel mode is ingesteld op OUTLINE\n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Aktie terugkoppel mode is ingesteld op BOUNDINGBOX.\n"
 
-#: ../src/i_callbacks.c:3379
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Grid UIT\n"
 
-#: ../src/i_callbacks.c:3380
+#: ../src/i_callbacks.c:3435
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3381
+#: ../src/i_callbacks.c:3436
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3399
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap UIT (PAS OP!)\n"
 
-#: ../src/i_callbacks.c:3402
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "Snap AAN\n"
 
-#: ../src/i_callbacks.c:3423
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "Snap UIT (PAS OP!)\n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr "Elastiek band UIT\n"
 
-#: ../src/i_callbacks.c:3426
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr "Elastiek band AAN\n"
 
-#: ../src/i_callbacks.c:3441
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr "magnetische net mode: AAN\n"
 
-#: ../src/i_callbacks.c:3444
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr "magnetische net mode: UIT\n"
 
-#: ../src/o_box.c:192
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Onbekend type voor rechthoek (arcering)!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
-msgstr "Ontving een ongeldig buffernummer [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
-msgstr "Ontving een ongeldig buffernummer [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Ontving een ongeldig buffernummer [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:159
+#: ../src/o_bus.c:135
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Ontving ereen die ongeldig is in [o_bus_draw_xor_single]\n"
 
-#: ../src/o_circle.c:171
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Onbekend type voor cirkel (arcering)!\n"
@@ -1174,49 +1195,49 @@ msgstr "Reserve bestand [%s] kan NIET opgeslagen worden\n"
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "FOUT: NULL object in o_move_end!\n"
 
-#: ../src/o_move.c:410
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "OH! probeerde er een te vinden, maar heb 'em niet gevonden!\n"
 
-#: ../src/o_move.c:431
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Ontving een niet lijn object in o_move_check_endpoint\n"
 
-#: ../src/o_net.c:201
+#: ../src/o_net.c:176
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Ontving er een die ongeldig is in o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:582
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr "Waarschuwing: begin van net niet op raster coordinaat\n"
 
-#: ../src/o_net.c:644
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr "Waarschuwing: einde van net niet op raster coordinaat\n"
 
 #. try to exit gracefully
-#: ../src/o_net.c:1021 ../src/o_net.c:1058 ../src/o_net.c:1129
-#: ../src/o_net.c:1165
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Probeerde meer dan twee busrippers toe te voegen. Interne gschem fout.\n"
 
-#: ../src/o_net.c:1235
+#: ../src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr ""
 "Bus ripper symbool [%s] niet gevonden in een van de component bibliotheken\n"
 
-#: ../src/o_path.c:373
+#: ../src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Onbekend type voor rechthoek (arcering)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:568
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fout bij het lezen van afbeelding: %s"
@@ -1225,7 +1246,7 @@ msgstr "Fout bij het lezen van afbeelding: %s"
 msgid "Picture"
 msgstr "Afbeelding"
 
-#: ../src/o_picture.c:476 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "FOUT: NULL object!\n"
@@ -1341,7 +1362,7 @@ msgstr "Alle"
 msgid "Components"
 msgstr "Componenten"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:361
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "Draden"
 
@@ -1494,7 +1515,7 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3595
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Naam"
@@ -1535,11 +1556,11 @@ msgid "Preview"
 msgstr "Vooraf zien"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Tekst Ingeven..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1549,182 +1570,185 @@ msgstr ""
 "verplaats cursor in het venster, klik om tekst te plaatsen.\n"
 "Middelste muisknop gebruiken om te plaatsen"
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "Onder Links"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Midden Links"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "Boven Links"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "Onder Midden"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Midden Midden"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "Boven Midden"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "Onder Rechts"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Midden Rechts"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "Boven Rechts"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Bewerk Tekst Eigenschappen"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Tekst Inhoud</b>"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Tekst Eigenschappen</b>"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 msgid "Color:"
 msgstr "Kleur:"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr "Grootte:"
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Uitlijning:"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "Getrokken lijn"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Gestippeld"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Gestreept"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "Hart"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Begrenzing"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:965 ../src/x_dialog.c:966 ../src/x_dialog.c:967
-#: ../src/x_dialog.c:975 ../src/x_dialog.c:1158 ../src/x_dialog.c:1160
-#: ../src/x_dialog.c:1162 ../src/x_dialog.c:1164 ../src/x_dialog.c:1166
-#: ../src/x_dialog.c:1370 ../src/x_dialog.c:1371 ../src/x_dialog.c:1372
-#: ../src/x_dialog.c:1373 ../src/x_dialog.c:1374 ../src/x_dialog.c:1382
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*onveranderd*"
 
-#: ../src/x_dialog.c:859
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Bewerk Lijn Dikte & Type"
 
-#: ../src/x_dialog.c:898
-msgid "Width:"
-msgstr "Breedte:"
-
-#: ../src/x_dialog.c:902 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/x_dialog.c:906
+#: ../src/x_dialog.c:1021
+msgid "Width:"
+msgstr "Breedte:"
+
+#: ../src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Lijn Streeplengte:"
 
-#: ../src/x_dialog.c:910
+#: ../src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Lijn Tussenruimte:"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Hol"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Gevuld"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Maas"
 
-#: ../src/x_dialog.c:1018
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Arcering"
 
-#: ../src/x_dialog.c:1283
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Bewerk Arcering Type"
+
+#: ../src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Arcering Type:"
 
-#: ../src/x_dialog.c:1287
+#: ../src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Lijn Dikte:"
 
-#: ../src/x_dialog.c:1291
+#: ../src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Hoek 1:"
 
-#: ../src/x_dialog.c:1295
+#: ../src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Steek 1:"
 
-#: ../src/x_dialog.c:1299
+#: ../src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Hoek 2:"
 
-#: ../src/x_dialog.c:1303
+#: ../src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Steek 2:"
 
-#: ../src/x_dialog.c:1482
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Boog parameters"
 
-#: ../src/x_dialog.c:1522
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1530
+#: ../src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Start Hoek:"
 
-#: ../src/x_dialog.c:1538
+#: ../src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Doorlopen Hoek:"
 
-#: ../src/x_dialog.c:1655
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1732,44 +1756,44 @@ msgstr ""
 "Offset van de verplaatsing?\n"
 "(0 voor oorsprong)"
 
-#: ../src/x_dialog.c:1723
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Tekst Hoogte"
 
-#: ../src/x_dialog.c:1753
+#: ../src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Voer nieuwe tekstgrootte in:"
 
-#: ../src/x_dialog.c:1829
+#: ../src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Snap Grootte"
 
-#: ../src/x_dialog.c:1859
+#: ../src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Voer nieuwe snap grid waarde in:"
 
-#: ../src/x_dialog.c:1932
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "Bewerk slot nummer"
 
-#: ../src/x_dialog.c:1963
+#: ../src/x_dialog.c:2138
 msgid "Edit slot number:"
 msgstr "Bewerk slot nummer:"
 
-#: ../src/x_dialog.c:2025
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "Omtrent..."
 
-#: ../src/x_dialog.c:2045
+#: ../src/x_dialog.c:2220
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Elektronische Ontwerp Automatisering</b>"
 
-#: ../src/x_dialog.c:2049
+#: ../src/x_dialog.c:2224
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem versie %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2057
+#: ../src/x_dialog.c:2232
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1781,133 +1805,141 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "En vele anderen (zie het AUTHORS bestand)"
 
-#: ../src/x_dialog.c:2122
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Coord."
 
-#: ../src/x_dialog.c:2143
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "Scherm"
 
-#: ../src/x_dialog.c:2152
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "Wereld"
 
-#: ../src/x_dialog.c:2191
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2200
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2215
+#: ../src/x_dialog.c:2388
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Plaats Attribuut"
 
-#: ../src/x_dialog.c:2218 ../src/x_window.c:379
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2397
 #, fuzzy
 msgid "Selection"
 msgstr "Selecteer"
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2230
+#: ../src/x_dialog.c:2403
 #, fuzzy
 msgid "Zoom box"
 msgstr "Vergroot Venster"
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2415
 #, fuzzy
 msgid "Net junction"
 msgstr "Funktie"
 
-#: ../src/x_dialog.c:2245
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2391
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "FOUT: NULL object in color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2454
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "Kleur Bewerken"
 
-#: ../src/x_dialog.c:2485
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr "Object kleur:"
 
-#: ../src/x_dialog.c:2607
+#: ../src/x_dialog.c:2786
 msgid "Function"
 msgstr "Funktie"
 
-#: ../src/x_dialog.c:2614
+#: ../src/x_dialog.c:2793
 msgid "Keystroke(s)"
 msgstr "Toetsaanslag(en)"
 
-#: ../src/x_dialog.c:2923
+#: ../src/x_dialog.c:3102
 msgid "Find Text"
 msgstr "Vind tekst"
 
-#: ../src/x_dialog.c:2954
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Te vinden tekst:"
 
-#: ../src/x_dialog.c:2964
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "afdalen in hierarchie"
 
-#: ../src/x_dialog.c:3029
+#: ../src/x_dialog.c:3208
 msgid "Hide Text"
 msgstr "Verberg tekst"
 
-#: ../src/x_dialog.c:3060
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Verberg tekst beginnend met:"
 
-#: ../src/x_dialog.c:3129
+#: ../src/x_dialog.c:3308
 msgid "Show Text"
 msgstr "Toon tekst"
 
-#: ../src/x_dialog.c:3160
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Toon tekst beginnend met:"
 
-#: ../src/x_dialog.c:3617
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr "S_electeer de schema's die je op wil slaan:"
 
-#: ../src/x_dialog.c:3711
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "Wijzigingen in schema \"%s\" opslaan voor het afsluiten?"
 
-#: ../src/x_dialog.c:3717
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1915,15 +1947,15 @@ msgstr ""
 "Er zijn %d schema's met wijzigingen. Wijzigingen opslaan voor het afsluiten?"
 
 #. secondary label
-#: ../src/x_dialog.c:3746
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Als je niet opslaat, verlies je alle wijzigingen definitief."
 
-#: ../src/x_dialog.c:3766
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr "Afsluiten zonder opslaan"
 
-#: ../src/x_dialog.c:4100
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1941,10 +1973,24 @@ msgstr ""
 "De naam mag niet eindigen met een spatie.\n"
 "De waarde mag niet met een spatie beginnen."
 
-#: ../src/x_dialog.c:4102
+#: ../src/x_dialog.c:4281
 msgid "Invalid Attribute"
 msgstr "Ongeldig Attribuut"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Pen Mode"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "Funktie"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Schema's"
@@ -2092,52 +2138,57 @@ msgid "/Edit..."
 msgstr "/Bewerk..."
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Bewerk Lijn Type"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Kopieer"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/Verplaats"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Verwijder"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Naar Schema"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Naar Symbool"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Omhoog"
 
-#: ../src/x_menus.c:315
+#: ../src/x_menus.c:316
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 "Probeerde de gevoeligheid in te stellen op een niet bestaand menu_item '%s'\n"
 
-#: ../src/x_menus.c:339
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory bestaat niet!\n"
 
-#: ../src/x_menus.c:352
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Probeerde de gevoeligheid in te stellen op een niet bestaand popup "
 "menu_item\n"
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:447
+#: ../src/x_menus.c:462
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Kan bestand %s niet openen\n"
 
-#: ../src/x_menus.c:508
+#: ../src/x_menus.c:524
 msgid "Clear"
 msgstr "Wis"
 
@@ -2282,40 +2333,40 @@ msgstr ""
 msgid "Printed current schematic to [%s]\n"
 msgstr "Huidig schema afgedrukt op [%s]\n"
 
-#: ../src/x_window.c:78
+#: ../src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Kan gc niet toewijzen\n"
 
-#: ../src/x_window.c:314
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "Nieuw bestand"
 
-#: ../src/x_window.c:320
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Open"
 
-#: ../src/x_window.c:321
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Open bestand..."
 
-#: ../src/x_window.c:327
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../src/x_window.c:328
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Opslaan bestand"
 
-#: ../src/x_window.c:336
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Maak laatste bewerking ongedaan"
 
-#: ../src/x_window.c:343
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Herstel de laatste ongedaanmaking"
 
-#: ../src/x_window.c:352
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2327,7 +2378,7 @@ msgstr ""
 "muisindicator in het hoofdvensterklik om component te plaatsen\n"
 "Rechter muisknop om af te breken"
 
-#: ../src/x_window.c:362
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2335,7 +2386,7 @@ msgstr ""
 "Plaats draden modus\n"
 "Rechter muisknop om af te breken"
 
-#: ../src/x_window.c:372
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2343,78 +2394,78 @@ msgstr ""
 "Plaats bussen modus\n"
 "Rechter muisknop om af te breken"
 
-#: ../src/x_window.c:380
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "Plaats een tekst..."
 
-#: ../src/x_window.c:390
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "Selecteer"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "Selectie mode"
 
-#: ../src/x_window.c:478
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "Pak"
 
-#: ../src/x_window.c:494
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Herhaal/geen"
 
-#: ../src/x_window.c:504
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Afbreken"
 
-#: ../src/x_window.c:506
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Schuif/Afbreken"
 
-#: ../src/x_window.c:728
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Bezig met laden van schema [%s]\n"
 
-#: ../src/x_window.c:740
+#: ../src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Fout bij het lezen van bestand"
 
-#: ../src/x_window.c:749
+#: ../src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "Nieuw bestand [%s]\n"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:854
+#: ../src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Pagina [%s] kan NIET opgeslagen worden\n"
 
-#: ../src/x_window.c:855
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Fout tijdens het opslaan"
 
-#: ../src/x_window.c:864
+#: ../src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Opgeslagen Als [%s]\n"
 
-#: ../src/x_window.c:866
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Opgeslagen [%s]\n"
 
-#: ../src/x_window.c:868
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Opgeslagen"
 
-#: ../src/x_window.c:942
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Pagina [%s] wegdoen\n"
 
-#: ../src/x_window.c:942
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Sluiten [%s]\n"
@@ -2427,6 +2478,24 @@ msgstr "Creer en bewerk elektrische schema's en symbolen met gschem"
 msgid "gEDA Schematic Editor"
 msgstr "gEDA schema bewerking"
 
+#~ msgid "Cut Buffer"
+#~ msgstr "Knip Buffer"
+
+#~ msgid "Copy Buffer"
+#~ msgstr "Kopieer Buffer"
+
+#~ msgid "Paste Buffer"
+#~ msgstr "Plak Buffer"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "Je moet de GEDADATA variabele instellen!\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+#~ msgstr "Ontving een ongeldig buffernummer [o_buffer_copy]\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+#~ msgstr "Ontving een ongeldig buffernummer [o_buffer_cut]\n"
+
 #~ msgid "Toggle Grid On/Off"
 #~ msgstr "Schakel Grid Aan/Uit"
 
diff --git a/gschem/po/pt_BR.po b/gschem/po/pt_BR.po
index 20df932..ac3adda 100644
--- a/gschem/po/pt_BR.po
+++ b/gschem/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:41-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-20 14:24+0000\n"
 "Last-Translator: \n"
 "Language-Team:  <pt@xxxxxx>\n"
@@ -63,7 +63,7 @@ msgstr "Imprimir..."
 msgid "Write image..."
 msgstr "Salvar Imagem..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:498
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 #, fuzzy
 msgid "Recent files"
 msgstr "Novo arquivo"
@@ -80,36 +80,36 @@ msgstr "Fechando Janela"
 msgid "Quit"
 msgstr "Sair"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:390
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:397
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Refazer"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:573
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "Modo de SeleÃ§Ã£o"
 
 #: ../src/rcstrings.c:22
 #, fuzzy
-msgid "Cut Buffer"
-msgstr "Buffer"
+msgid "Cut"
+msgstr "Cortar para 1"
 
-#: ../src/rcstrings.c:23
-#, fuzzy
-msgid "Copy Buffer"
-msgstr "Buffer"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "Copiar"
 
 #: ../src/rcstrings.c:24
 #, fuzzy
-msgid "Paste Buffer"
-msgstr "Buffer"
+msgid "Paste"
+msgstr "Colar de 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -131,7 +131,7 @@ msgstr "Modo de MÃºltipla CÃ³pia"
 msgid "Move Mode"
 msgstr "Modo de MovimentaÃ§Ã£o"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "Apagar"
 
@@ -151,11 +151,11 @@ msgstr ""
 msgid "Color..."
 msgstr "Cor..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2233
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Desbloquear"
 
@@ -264,7 +264,7 @@ msgid "Redraw"
 msgstr "Redesenhar"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1504 ../src/i_callbacks.c:1576
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Pan"
 
@@ -288,236 +288,244 @@ msgstr "Zoom menor"
 msgid "Zoom Full"
 msgstr "Zoom total"
 
+#: ../src/rcstrings.c:71
+msgid "Dark color scheme"
+msgstr ""
+
 #: ../src/rcstrings.c:72
+msgid "Light color scheme"
+msgstr ""
+
+#: ../src/rcstrings.c:74
 msgid "Page"
 msgstr "PÃ¡gina"
 
-#: ../src/rcstrings.c:73
+#: ../src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Gerenciador..."
 
-#: ../src/rcstrings.c:74
+#: ../src/rcstrings.c:76
 msgid "Next"
 msgstr "PrÃ³xima"
 
-#: ../src/rcstrings.c:75
+#: ../src/rcstrings.c:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/rcstrings.c:76 ../src/x_window.c:368
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "Novo"
 
-#: ../src/rcstrings.c:77
+#: ../src/rcstrings.c:79
 msgid "Revert"
 msgstr "Reverter"
 
-#: ../src/rcstrings.c:78
+#: ../src/rcstrings.c:80
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/rcstrings.c:79
+#: ../src/rcstrings.c:81
 msgid "Discard"
 msgstr "Descartar"
 
-#: ../src/rcstrings.c:81
+#: ../src/rcstrings.c:83
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/rcstrings.c:82
+#: ../src/rcstrings.c:84
 msgid "Component..."
 msgstr "Componente..."
 
 #. need to click
-#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2306 ../src/i_callbacks.c:2333
-#: ../src/x_dialog.c:2200
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "ConexÃ£o"
 
 #. need to click
-#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2377 ../src/i_callbacks.c:2404
-#: ../src/x_dialog.c:2218 ../src/x_window.c:426
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Barramento"
 
-#: ../src/rcstrings.c:85
+#: ../src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Atributo..."
 
-#: ../src/rcstrings.c:86
+#: ../src/rcstrings.c:88
 msgid "Text..."
 msgstr "Texto..."
 
-#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2485 ../src/i_callbacks.c:2508
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Linha"
 
-#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2530 ../src/i_callbacks.c:2553
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "Caixa"
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2609 ../src/i_callbacks.c:2633
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "CÃrculo"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2655 ../src/i_callbacks.c:2678
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Arco"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2700 ../src/i_callbacks.c:2723
-#: ../src/x_dialog.c:2191
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "Pino"
 
-#: ../src/rcstrings.c:92
+#: ../src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Imagem..."
 
-#: ../src/rcstrings.c:94
+#: ../src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hierarquia"
 
-#: ../src/rcstrings.c:95
+#: ../src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Descer ao EsquemÃ¡tico"
 
-#: ../src/rcstrings.c:96
+#: ../src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Descer ao SÃmbolo"
 
-#: ../src/rcstrings.c:97
+#: ../src/rcstrings.c:99
 msgid "Up"
 msgstr "Subir"
 
-#: ../src/rcstrings.c:98
+#: ../src/rcstrings.c:100
 msgid "Documentation"
 msgstr "DocumentaÃ§Ã£o"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100 ../src/x_compselect.c:1418
+#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
 #: ../src/x_multiattrib.c:1543
 msgid "Attributes"
 msgstr "Atributos"
 
-#: ../src/rcstrings.c:101 ../src/i_callbacks.c:3000
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3046
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "Desanexar"
 
-#: ../src/rcstrings.c:103
+#: ../src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Mostra Valor"
 
-#: ../src/rcstrings.c:104
+#: ../src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Mostra Nome"
 
-#: ../src/rcstrings.c:105
+#: ../src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Mostrar Ambos"
 
-#: ../src/rcstrings.c:106
+#: ../src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Comuta Visibilidade"
 
-#: ../src/rcstrings.c:107
+#: ../src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Procurar texto..."
 
-#: ../src/rcstrings.c:108
+#: ../src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Ocultar Texto..."
 
-#: ../src/rcstrings.c:109
+#: ../src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Exibir Texto..."
 
-#: ../src/rcstrings.c:110
+#: ../src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Autonumerar..."
 
-#: ../src/rcstrings.c:112
+#: ../src/rcstrings.c:114
 msgid "Options"
 msgstr "OpÃ§Ãµes"
 
-#: ../src/rcstrings.c:113
+#: ../src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Tamanho do Texto..."
 
-#: ../src/rcstrings.c:114
-msgid "Toggle Grid On/Off"
-msgstr "Liga/Desliga Grade"
+#: ../src/rcstrings.c:116
+msgid "Cycle grid styles"
+msgstr ""
 
-#: ../src/rcstrings.c:115
+#: ../src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Liga/Desliga Agarre"
 
-#: ../src/rcstrings.c:116
+#: ../src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Grade de Agarre..."
 
-#: ../src/rcstrings.c:117
+#: ../src/rcstrings.c:119
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Grade de Agarre..."
 
-#: ../src/rcstrings.c:118
+#: ../src/rcstrings.c:120
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Grade de Agarre..."
 
-#: ../src/rcstrings.c:119
+#: ../src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Silhueta/Caixa"
 
-#: ../src/rcstrings.c:120
+#: ../src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Lig/Desliga elÃ¡stico"
 
-#: ../src/rcstrings.c:121
+#: ../src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Exibir janela de Log"
 
-#: ../src/rcstrings.c:122
+#: ../src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Exibir janela de Coord."
 
-#: ../src/rcstrings.c:124
+#: ../src/rcstrings.c:126
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/rcstrings.c:125
+#: ../src/rcstrings.c:127
 #, fuzzy
 msgid "Manual"
 msgstr "Manual..."
 
-#: ../src/rcstrings.c:126
+#: ../src/rcstrings.c:128
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "DocumentaÃ§Ã£o"
 
-#: ../src/rcstrings.c:127
+#: ../src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr ""
 
-#: ../src/rcstrings.c:128
+#: ../src/rcstrings.c:130
 #, fuzzy
 msgid "Component Documentation"
 msgstr "DocumentaÃ§Ã£o"
 
-#: ../src/rcstrings.c:129
+#: ../src/rcstrings.c:131
 msgid "About gschem"
 msgstr ""
 
-#: ../src/rcstrings.c:130 ../src/x_dialog.c:2541
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 #, fuzzy
 msgid "Hotkeys"
 msgstr "Atalhos..."
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Zoom muito pequeno! NÃ£o posso diminuir. \n"
 
@@ -538,96 +546,96 @@ msgstr "ImpossÃvel invocar %s!\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr ""
 
-#: ../src/g_rc.c:140
-#, c-format
-msgid "Invalid color [%s] passed to %s\n"
-msgstr "Cor [%s] invÃ¡lida passada para %s\n"
-
-#: ../src/g_rc.c:448
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Fator de Zoom [%d] invÃ¡lido passado para %s\n"
 
-#: ../src/g_rc.c:574
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Tamanho [%d] invÃ¡lido (text-size)\n"
 
-#: ../src/g_rc.c:601
+#: ../src/g_rc.c:445
 #, fuzzy, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Tamanho [%d] invÃ¡lido (text-size)\n"
 
-#: ../src/g_rc.c:644
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Tamanho [%d] invÃ¡lido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1116
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr ""
 "NÃºmero de nÃveis [%d] invÃ¡lido para funÃ§Ã£o desfaz passado para undo-level\n"
 
-#: ../src/g_rc.c:1374
+#: ../src/g_rc.c:1218
 #, fuzzy, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Tamanho [%d] invÃ¡lido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1449
+#: ../src/g_rc.c:1293
+#, fuzzy, c-format
+msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
+msgstr "Tamanho [%d] invÃ¡lido (text-size)\n"
+
+#: ../src/g_rc.c:1334
 #, fuzzy, c-format
-msgid "Invalid dot size [%d] passed to grid-dot-size\n"
+msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr "Tamanho [%d] invÃ¡lido (text-size)\n"
 
-#: ../src/g_rc.c:1490
+#: ../src/g_rc.c:1360
 #, fuzzy, c-format
-msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
+msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "Tamanho [%d] invÃ¡lido (text-size)\n"
 
-#: ../src/g_rc.c:1534
+#: ../src/g_rc.c:1404
 #, fuzzy, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Tamanho [%d] invÃ¡lido (text-size)\n"
 
-#: ../src/g_rc.c:1558
+#: ../src/g_rc.c:1428
 #, fuzzy, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr ""
 "NÃºmero de nÃveis [%d] invÃ¡lido para funÃ§Ã£o desfaz passado para undo-level\n"
 
-#: ../src/g_rc.c:1599
+#: ../src/g_rc.c:1469
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Tamanho [%d] invÃ¡lido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1622
+#: ../src/g_rc.c:1492
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Tamanho [%d] invÃ¡lido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1668
+#: ../src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 "NÃºmero de nÃveis [%d] invÃ¡lido para funÃ§Ã£o desfaz passado para undo-level\n"
 
-#: ../src/g_rc.c:1694
+#: ../src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Tamanho [%d] invÃ¡lido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1719
+#: ../src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr ""
 "NÃºmero de nÃveis [%d] invÃ¡lido para funÃ§Ã£o desfaz passado para undo-level\n"
 
-#: ../src/gschem.c:189 ../src/gschem.c:200
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versÃ£o %s%s.%s\n"
 
-#: ../src/gschem.c:192 ../src/gschem.c:203
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -636,7 +644,7 @@ msgstr ""
 "gEDA/gschem vem com ABSOLUTAMENTE NENHUMA GARANTIA; leia o arquivo COPYING "
 "para maiores detalhes.\n"
 
-#: ../src/gschem.c:194 ../src/gschem.c:205
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -644,55 +652,68 @@ msgstr ""
 "Este programa Ã© um software livre, e vocÃª Ã© convidado a redistribui-lo sob "
 "certas\n"
 
-#: ../src/gschem.c:196 ../src/gschem.c:207
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
 "\n"
 msgstr "condiÃ§Ãµes; Leia o arquivo COPYING para maiores detalhes.\n"
 
-#: ../src/gschem.c:211
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Esta Ã© a versÃ£o portada para MINGW32.\n"
 
-#: ../src/gschem.c:215
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "ConfiguraÃ§Ã£o para LocalizaÃ§Ã£o: %s\n"
 
-#: ../src/gschem.c:228
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "VocÃª precisa acertar a variÃ¡vel de ambiente GEDADATA.\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:245
+#: ../src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Falhou ao ler o arquivo scm [%s]\n"
 
-#: ../src/gschem.c:249
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lendo o arquivo scm [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:253
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Falhou ao ler o arquivo scm [%s]\n"
 
-#: ../src/gschem.c:315
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "DiretÃ³rio Scheme NÃ?O ajustado!\n"
 
-#: ../src/gschem.c:322 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Executando script guile [%s]\n"
 
+#: ../src/gschem_cairo.c:310
+#, c-format
+msgid "Unknown end for line (%d)\n"
+msgstr "Fim desconhecido para linha (%d)!\n"
+
+#: ../src/gschem_cairo.c:318
+#, fuzzy, c-format
+msgid "Unknown type for stroke (%d) !\n"
+msgstr "Tipo desconhecido para linha (%d)!\n"
+
 #: ../src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Modo de Componente"
@@ -751,15 +772,11 @@ msgstr "Modo de Arco"
 msgid "Pin Mode"
 msgstr "Modo de Pino"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Copiar"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Multipla CÃ³pia"
 
@@ -771,27 +788,35 @@ msgstr "Mostrar Oculto"
 msgid "Snap Off"
 msgstr "Agarre desligado"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:547
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "AÃ§Ã£o"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2230 ../src/x_window.c:542
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr "Stroke"
 
-#: ../src/i_basic.c:264 ../src/x_window.c:544
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "nenhum"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Repetir/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr ""
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
+msgid "NONE"
+msgstr ""
+
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
@@ -801,352 +826,329 @@ msgstr ""
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "DocumentaÃ§Ã£o para [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1701
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Criada Nova PÃ¡gina [%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:467
+#: ../src/i_callbacks.c:163
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nova janela criada\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Falha ao salvar tudo"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Salvar Tudo"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Fechando Janela\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Selecione objetos antes"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Editar Tipo de Linha"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Editar Texto"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Cor"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Rotacionar"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Espelhar"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1623
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Transladar"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "ATENÃ?Ã?O: NÃ£o translade com o agarre (snap) desligado!\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "ATENÃ?Ã?O: Ligando o agarre e continuando o translado.\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ATENÃ?Ã?O: A grade de agarre nÃ£o estÃ¡ em 100!\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
 msgstr ""
 "ATENÃ?Ã?O: Se transladar um sÃmbolo para origem, a grade deve estar em 100\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Embutir"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Desembutir"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "Atualizar"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "Mostrar Oculto"
 
-#: ../src/i_callbacks.c:1142
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "Deixar VisÃvel"
 
-#: ../src/i_callbacks.c:1259
-msgid "Edit Line Type"
-msgstr "Editar Tipo de Linha"
-
-#: ../src/i_callbacks.c:1301 ../src/x_dialog.c:1243
-msgid "Edit Fill Type"
-msgstr "Editar Preenchimento"
-
-#: ../src/i_callbacks.c:1595
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr "Atualiza dicas"
 
-#: ../src/i_callbacks.c:1745
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr "Reverter PÃ¡gina?"
 
-#: ../src/i_callbacks.c:1817
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Colar de 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Buffer vazio"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Copiar para 1"
 
-#: ../src/i_callbacks.c:1836
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Copiar para 2"
 
-#: ../src/i_callbacks.c:1855
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Copiar para 3"
 
-#: ../src/i_callbacks.c:1874
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Copiar para 4"
 
-#: ../src/i_callbacks.c:1893
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Copiar para 5"
 
-#: ../src/i_callbacks.c:1912
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Cortar para 1"
 
-#: ../src/i_callbacks.c:1931
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Cortar para 2"
 
-#: ../src/i_callbacks.c:1950
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Cortar para 3"
 
-#: ../src/i_callbacks.c:1969
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Cortar para 4"
 
-#: ../src/i_callbacks.c:1988
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Cortar para 5"
 
-#: ../src/i_callbacks.c:2004
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "Colar de 1"
 
-#: ../src/i_callbacks.c:2011 ../src/i_callbacks.c:2033
-#: ../src/i_callbacks.c:2055 ../src/i_callbacks.c:2077
-#: ../src/i_callbacks.c:2099
-msgid "Empty buffer"
-msgstr "Buffer vazio"
-
-#: ../src/i_callbacks.c:2026
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "Colar de 2"
 
-#: ../src/i_callbacks.c:2048
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "Colar de 3"
 
-#: ../src/i_callbacks.c:2070
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "Colar de 4"
 
-#: ../src/i_callbacks.c:2092
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "Colar de 5"
 
-#: ../src/i_callbacks.c:2229 ../src/x_window.c:406
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Componente"
 
-#: ../src/i_callbacks.c:2265 ../src/i_callbacks.c:2284 ../src/x_dialog.c:2203
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Atributo"
 
-#: ../src/i_callbacks.c:2781
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Procurando por origem [%s]\n"
 
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "ImpossÃvel encontrar origem [%s]\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Procurando por sÃmbolo [%s]\n"
 
-#: ../src/i_callbacks.c:2878
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2972
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: ../src/i_callbacks.c:3084
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "Mostrar N"
 
-#: ../src/i_callbacks.c:3120
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "Mostrar V"
 
-#: ../src/i_callbacks.c:3156
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "Mostrar T"
 
-#: ../src/i_callbacks.c:3193
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "Comuta Visibilidade"
 
-#: ../src/i_callbacks.c:3223
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Desculpe, mas esta Ã© uma opÃ§Ã£o de menu sem funÃ§Ã£o\n"
 
-#: ../src/i_callbacks.c:3311
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Retorno de aÃ§Ã£o ajustado para silhueta\n"
 
-#: ../src/i_callbacks.c:3314
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Retorno de aÃ§Ã£o ajustado para caixa completa\n"
 
-#: ../src/i_callbacks.c:3331
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Grade DESLIGADA\n"
 
-#: ../src/i_callbacks.c:3334
-msgid "Grid ON\n"
-msgstr "Grade LIGADA\n"
+#: ../src/i_callbacks.c:3435
+msgid "Dot grid selected\n"
+msgstr ""
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3436
+msgid "Mesh grid selected\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Agarre desligado (CUIDADO!)\n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "Agarre ligado\n"
 
-#: ../src/i_callbacks.c:3374
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "Agarre desligado (CUIDADO!)\n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr "ElÃ¡stico desligado\n"
 
-#: ../src/i_callbacks.c:3377
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr "ElÃ¡stico ligado\n"
 
-#: ../src/i_callbacks.c:3392
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3395
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_arc.c:120
-#, c-format
-msgid "Unknown end for arc (%d)\n"
-msgstr "Fim de arco desconhecido:(%d)\n"
-
-#: ../src/o_arc.c:160
-#, c-format
-msgid "Unknown type for arc !\n"
-msgstr "Tipo para arco desconhecido!\n"
-
-#: ../src/o_box.c:136
-#, c-format
-msgid "Unknown end for box (%d)\n"
-msgstr "Fim desconhecido para caixa (%d)\n"
-
-#: ../src/o_box.c:176
-#, c-format
-msgid "Unknown type for box !\n"
-msgstr "Tipo desconhecido para caixa!\n"
-
-#: ../src/o_box.c:260
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Tipo desconhecido para enchimento da caixa!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 
-#: ../src/o_bus.c:183
+#: ../src/o_bus.c:135
 #, c-format
-msgid "Got an invalid which one in o_bus_draw_xor_single\n"
+msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_circle.c:127
-#, c-format
-msgid "Unknown end for circle\n"
-msgstr "Fim para arco desconhecido\n"
-
-#. just to be careful
-#: ../src/o_circle.c:163
-#, c-format
-msgid "Unknown type for circle!\n"
-msgstr "Tipo para arco desconhecido!\n"
-
-#: ../src/o_circle.c:245
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Tipo desconhecido para enchimento de arco!\n"
 
-#: ../src/o_complex.c:251 ../src/o_complex.c:255
+#: ../src/o_complex.c:250 ../src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Transladando diagrama [%d %d]\n"
 
-#: ../src/o_line.c:111
-#, c-format
-msgid "Unknown end for line (%d)\n"
-msgstr "Fim desconhecido para linha (%d)!\n"
-
-#. just to be careful
-#: ../src/o_line.c:151
-#, c-format
-msgid "Unknown type for line (%d) !\n"
-msgstr "Tipo desconhecido para linha (%d)!\n"
-
 #: ../src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
@@ -1162,35 +1164,35 @@ msgstr "Objeto jÃ¡ bloqueado\n"
 msgid "Object already unlocked\n"
 msgstr "Objeto jÃ¡ desbloqueado\n"
 
-#: ../src/o_misc.c:444
+#: ../src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Texto oculto agora estÃ¡ visÃvel\n"
 
-#: ../src/o_misc.c:446
+#: ../src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Texto oculto agora estÃ¡ invisÃvel\n"
 
-#: ../src/o_misc.c:694
+#: ../src/o_misc.c:697
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:837
+#: ../src/o_misc.c:840
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 
-#: ../src/o_misc.c:881
+#: ../src/o_misc.c:884
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "NÃ?O foi possÃvel deixar arquivo backup [%s] como leitura e gravaÃ§Ã£o\n"
 
-#: ../src/o_misc.c:899
+#: ../src/o_misc.c:902
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "NÃ?O foi possÃvel deixar arquivo backup [%s] apenas leitura!\n"
 
-#: ../src/o_misc.c:904
+#: ../src/o_misc.c:907
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "NÃ?O foi possÃvel salvar  arquivo backup [%s] !\n"
@@ -1200,57 +1202,47 @@ msgstr "NÃ?O foi possÃvel salvar  arquivo backup [%s] !\n"
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr ""
 
-#: ../src/o_move.c:385
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: ../src/o_move.c:406
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr ""
 
-#: ../src/o_net.c:253
+#: ../src/o_net.c:176
 #, c-format
-msgid "Got an invalid which one in o_net_draw_xor_single\n"
+msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_net.c:630
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:692
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
 #. try to exit gracefully
-#: ../src/o_net.c:1080 ../src/o_net.c:1117 ../src/o_net.c:1188
-#: ../src/o_net.c:1224
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: ../src/o_net.c:1294
+#: ../src/o_net.c:1196
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "NÃ£o consigo encontrar %s em nenhuma biblioteca\n"
 
-#: ../src/o_path.c:483
-#, fuzzy, c-format
-msgid "Unknown end for path (%d)\n"
-msgstr "Fim de arco desconhecido:(%d)\n"
-
-#: ../src/o_path.c:524
-#, fuzzy, c-format
-msgid "Unknown type for path !\n"
-msgstr "Tipo para arco desconhecido!\n"
-
-#: ../src/o_path.c:594
+#: ../src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Tipo desconhecido para enchimento da caixa!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:627
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Falhou ao ler imagem: %s"
@@ -1259,7 +1251,7 @@ msgstr "Falhou ao ler imagem: %s"
 msgid "Picture"
 msgstr "Imagem"
 
-#: ../src/o_picture.c:535 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERRO: NENHUM objeto!\n"
@@ -1379,7 +1371,7 @@ msgstr "Todos"
 msgid "Components"
 msgstr "Componentes"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:416
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "ConexÃµes"
 
@@ -1387,154 +1379,153 @@ msgstr "ConexÃµes"
 msgid "Replace existing attributes"
 msgstr ""
 
-#: ../src/x_autonumber.c:412
+#: ../src/x_autonumber.c:413
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
 #. duplicate slot in used_slots
-#: ../src/x_autonumber.c:427
+#: ../src/x_autonumber.c:428
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:695
+#: ../src/x_autonumber.c:696
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:746
+#: ../src/x_autonumber.c:748
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:880
+#: ../src/x_autonumber.c:883
 #, fuzzy
 msgid "Diagonal"
 msgstr "diagonal"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Top to bottom"
 msgstr ""
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Bottom to top"
 msgstr ""
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 #, fuzzy
 msgid "Left to right"
 msgstr "Esq Dir"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Right to left"
 msgstr ""
 
-#: ../src/x_autonumber.c:883
+#: ../src/x_autonumber.c:886
 #, fuzzy
 msgid "File order"
 msgstr "Ordena em arquivos"
 
-#: ../src/x_autonumber.c:1219
+#: ../src/x_autonumber.c:1222
 msgid "Autonumber text"
 msgstr "Autonumerar texto"
 
 #. scope section
-#: ../src/x_autonumber.c:1243
+#: ../src/x_autonumber.c:1246
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../src/x_autonumber.c:1265
+#: ../src/x_autonumber.c:1268
 #, fuzzy
 msgid "Search for:"
 msgstr "foco de procura"
 
-#: ../src/x_autonumber.c:1279
+#: ../src/x_autonumber.c:1282
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "Autonumerar texto"
 
-#: ../src/x_autonumber.c:1286
+#: ../src/x_autonumber.c:1289
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
 #, fuzzy
 msgid "Selected objects"
 msgstr "Objetos selecionados"
 
-#: ../src/x_autonumber.c:1299 ../src/x_autonumber.c:1308
+#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
 #, fuzzy
 msgid "Current page"
 msgstr "Folha corrente"
 
-#: ../src/x_autonumber.c:1300 ../src/x_autonumber.c:1309
+#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "Hierarquia"
 
-#: ../src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1314
 msgid "Overwrite existing numbers"
 msgstr ""
 
 #. Options section
-#: ../src/x_autonumber.c:1316
+#: ../src/x_autonumber.c:1319
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "OpÃ§Ãµes"
 
-#: ../src/x_autonumber.c:1338
+#: ../src/x_autonumber.c:1341
 #, fuzzy
 msgid "Starting number:"
 msgstr "NÃºmero inicial"
 
-#: ../src/x_autonumber.c:1345
+#: ../src/x_autonumber.c:1348
 #, fuzzy
 msgid "Sort order:"
 msgstr "OrdenaÃ§Ã£o"
 
-#: ../src/x_autonumber.c:1366
+#: ../src/x_autonumber.c:1369
 msgid "Remove numbers"
 msgstr ""
 
-#: ../src/x_autonumber.c:1370
+#: ../src/x_autonumber.c:1373
 msgid "Automatic slotting"
 msgstr ""
 
-#: ../src/x_color.c:52 ../src/x_color.c:61 ../src/x_color.c:124
-#: ../src/x_color.c:172
+#: ../src/x_color.c:94 ../src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "ImpossÃvel alocar a cor %s!\n"
 
-#: ../src/x_color.c:52
+#: ../src/x_color.c:94
 msgid "black"
 msgstr "preta"
 
-#: ../src/x_color.c:61
+#: ../src/x_color.c:103
 msgid "white"
 msgstr "branca"
 
-#: ../src/x_color.c:103 ../src/x_color.c:140
-#, c-format
-msgid "Could not find the color %s!\n"
-msgstr "ImpossÃvel encontrar a cor %s!\n"
-
-#: ../src/x_color.c:106 ../src/x_color.c:143
-#, c-format
-msgid "Defaulting color to white\n"
-msgstr "Cor padrÃ£o para branco\n"
+#: ../src/x_color.c:125
+#, fuzzy, c-format
+msgid "Could not allocate display color %i!\n"
+msgstr "ImpossÃvel alocar a cor %s!\n"
 
-#: ../src/x_color.c:113 ../src/x_color.c:150
-#, c-format
-msgid "Ack! Cannot allocate white!\n"
-msgstr "Ih! NÃ£o consigo alocar o branco!\n"
+#: ../src/x_color.c:147
+#, fuzzy, c-format
+msgid "Could not allocate outline color %i!\n"
+msgstr "ImpossÃvel alocar a cor %s!\n"
 
-#: ../src/x_color.c:191 ../src/x_color.c:207
+#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Tentou ter cor invÃ¡lida: %d\n"
 
+#: ../src/x_color.c:214
+#, fuzzy, c-format
+msgid "Tried to get an invalid outline color: %d\n"
+msgstr "Tentou ter cor invÃ¡lida: %d\n"
+
 #. GtkLabel
 #: ../src/x_compselect.c:1040
 #, fuzzy
@@ -1542,7 +1533,7 @@ msgid "Filter:"
 msgstr "Filtro"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3591
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Nome"
@@ -1583,11 +1574,11 @@ msgid "Preview"
 msgstr "PrÃ©via"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Entrada de texto..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1597,199 +1588,202 @@ msgstr ""
 "cursor na janela, clique para deixar o texto.\n"
 "Use botÃ£o do meio para rotacionar enquanto posiciona"
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "Esq Baixo"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Esq Centro"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "Esq Alto"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "Centro Baixo"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Centro Centro"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "Centro Alto"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "Dir Baixo"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Dir Centro"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "Dir Alto"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "Editar Tamanho do Texto"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "OpÃ§Ãµes"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "OpÃ§Ãµes"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 #, fuzzy
 msgid "Color:"
 msgstr "Cor"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr ""
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 #, fuzzy
 msgid "Alignment:"
 msgstr "Editar Alinhamento do Texto"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "Solido"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Pontilhado"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Tracejado"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "Centro"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Fantasma"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:964 ../src/x_dialog.c:965 ../src/x_dialog.c:966
-#: ../src/x_dialog.c:974 ../src/x_dialog.c:1157 ../src/x_dialog.c:1159
-#: ../src/x_dialog.c:1161 ../src/x_dialog.c:1163 ../src/x_dialog.c:1165
-#: ../src/x_dialog.c:1368 ../src/x_dialog.c:1369 ../src/x_dialog.c:1370
-#: ../src/x_dialog.c:1371 ../src/x_dialog.c:1372 ../src/x_dialog.c:1380
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*inalterado*"
 
-#: ../src/x_dialog.c:858
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Editar Largura e Tipo de Linha"
 
-#: ../src/x_dialog.c:897
-#, fuzzy
-msgid "Width:"
-msgstr "Largura"
-
-#: ../src/x_dialog.c:901 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 #, fuzzy
 msgid "Type:"
 msgstr "Origem da Imagem"
 
-#: ../src/x_dialog.c:905
+#: ../src/x_dialog.c:1021
+#, fuzzy
+msgid "Width:"
+msgstr "Largura"
+
+#: ../src/x_dialog.c:1025
 #, fuzzy
 msgid "Dash Length:"
 msgstr "Comprimento dos traÃ§os"
 
-#: ../src/x_dialog.c:909
+#: ../src/x_dialog.c:1029
 #, fuzzy
 msgid "Dash Space:"
 msgstr "Comprimento dos espaÃ§os"
 
-#: ../src/x_dialog.c:1014
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Vazio"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Preenchida"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Malha"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Linhas"
 
-#: ../src/x_dialog.c:1281
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Editar Preenchimento"
+
+#: ../src/x_dialog.c:1508
 #, fuzzy
 msgid "Fill Type:"
 msgstr "Tipo de Preenchimento"
 
-#: ../src/x_dialog.c:1285
+#: ../src/x_dialog.c:1512
 #, fuzzy
 msgid "Line Width:"
 msgstr "Largura da Linha"
 
-#: ../src/x_dialog.c:1289
+#: ../src/x_dialog.c:1516
 #, fuzzy
 msgid "Angle 1:"
 msgstr "Ã?ngulo1"
 
-#: ../src/x_dialog.c:1293
+#: ../src/x_dialog.c:1520
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "Passo1"
 
-#: ../src/x_dialog.c:1297
+#: ../src/x_dialog.c:1524
 #, fuzzy
 msgid "Angle 2:"
 msgstr "Ã?ngulo2"
 
-#: ../src/x_dialog.c:1301
+#: ../src/x_dialog.c:1528
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "Passo2"
 
-#: ../src/x_dialog.c:1480
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Parametros do Arco"
 
-#: ../src/x_dialog.c:1520
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1528
+#: ../src/x_dialog.c:1705
 #, fuzzy
 msgid "Start Angle:"
 msgstr "Ã?ngulo Inicial"
 
-#: ../src/x_dialog.c:1536
+#: ../src/x_dialog.c:1713
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "Graus de comprimento"
 
-#: ../src/x_dialog.c:1653
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1797,49 +1791,49 @@ msgstr ""
 "Valor a transladar?\n"
 "(0 para origem)"
 
-#: ../src/x_dialog.c:1721
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Tamanho do Texto"
 
-#: ../src/x_dialog.c:1751
+#: ../src/x_dialog.c:1928
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "Entre com novo tamanho de texto"
 
-#: ../src/x_dialog.c:1826
+#: ../src/x_dialog.c:2004
 #, fuzzy
 msgid "Snap Size"
 msgstr "Grade de agarre"
 
-#: ../src/x_dialog.c:1856
+#: ../src/x_dialog.c:2034
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "Entre com novo tamanho de grade"
 
-#: ../src/x_dialog.c:1929
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "Editar nÃºmero de SLOT"
 
-#: ../src/x_dialog.c:1960
+#: ../src/x_dialog.c:2138
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "Editar nÃºmero de SLOT"
 
-#: ../src/x_dialog.c:2022
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "Sobre..."
 
-#: ../src/x_dialog.c:2042
+#: ../src/x_dialog.c:2220
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "gEDA : GPL Electronic Design Automation"
 
-#: ../src/x_dialog.c:2046
+#: ../src/x_dialog.c:2224
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "gschem versÃ£o %s%s.%s"
 
-#: ../src/x_dialog.c:2054
+#: ../src/x_dialog.c:2232
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1852,153 +1846,161 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "e outros autores (ver arquivo AUTHORS)"
 
-#: ../src/x_dialog.c:2119
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Coordenadas"
 
-#: ../src/x_dialog.c:2140
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "Janela"
 
-#: ../src/x_dialog.c:2149
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "Universo"
 
-#: ../src/x_dialog.c:2188
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2194
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2206
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2388
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Inserir Atributo"
 
-#: ../src/x_dialog.c:2215 ../src/x_window.c:434
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/x_dialog.c:2221
+#: ../src/x_dialog.c:2397
 #, fuzzy
 msgid "Selection"
 msgstr "SeleÃ§Ã£o"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2403
 #, fuzzy
 msgid "Zoom box"
 msgstr "Caixa de Zoom"
 
-#: ../src/x_dialog.c:2236
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2415
 #, fuzzy
 msgid "Net junction"
 msgstr "AÃ§Ã£o"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2390
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr ""
 
-#: ../src/x_dialog.c:2452
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "EdiÃ§Ã£o de Cor"
 
-#: ../src/x_dialog.c:2483
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr ""
 
-#: ../src/x_dialog.c:2605
+#: ../src/x_dialog.c:2786
 #, fuzzy
 msgid "Function"
 msgstr "AÃ§Ã£o"
 
-#: ../src/x_dialog.c:2612
+#: ../src/x_dialog.c:2793
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "FunÃ§Ã£o : atalho(s)"
 
-#: ../src/x_dialog.c:2921
+#: ../src/x_dialog.c:3102
 #, fuzzy
 msgid "Find Text"
 msgstr "Localizar"
 
-#: ../src/x_dialog.c:2952
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Loc. Texto:"
 
-#: ../src/x_dialog.c:2962
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "Desce Ã  hierarquia"
 
-#: ../src/x_dialog.c:3026
+#: ../src/x_dialog.c:3208
 #, fuzzy
 msgid "Hide Text"
 msgstr "Ocultar texto"
 
-#: ../src/x_dialog.c:3057
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Ocultar texto iniciado com:"
 
-#: ../src/x_dialog.c:3125
+#: ../src/x_dialog.c:3308
 #, fuzzy
 msgid "Show Text"
 msgstr "Mostrar Texto"
 
-#: ../src/x_dialog.c:3156
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Mostrar texto iniciado com:"
 
-#: ../src/x_dialog.c:3613
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: ../src/x_dialog.c:3707
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: ../src/x_dialog.c:3713
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
 #. secondary label
-#: ../src/x_dialog.c:3742
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: ../src/x_dialog.c:3762
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr ""
 
-#: ../src/x_dialog.c:4096
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -2009,11 +2011,25 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: ../src/x_dialog.c:4098
+#: ../src/x_dialog.c:4281
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Inserir Atributo"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Tipo da Linha"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "AÃ§Ã£o"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Diagramas"
@@ -2157,49 +2173,54 @@ msgid "/Edit..."
 msgstr "/Editar..."
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Editar Tipo de Linha"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copiar"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/Mover"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Apagar"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Descer ao EsquemÃ¡tico"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Descer ao SÃmbolo"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Subir"
 
-#: ../src/x_menus.c:323
+#: ../src/x_menus.c:316
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 
-#: ../src/x_menus.c:347
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr ""
 
-#: ../src/x_menus.c:360
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:455
+#: ../src/x_menus.c:462
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "ImpossÃvel invocar %s!\n"
 
-#: ../src/x_menus.c:516
+#: ../src/x_menus.c:524
 #, fuzzy
 msgid "Clear"
 msgstr "Fechar"
@@ -2266,6 +2287,11 @@ msgstr "Alterado"
 msgid "Right click on the filename for more options..."
 msgstr "Clique direito no arquivo para opÃ§Ãµes..."
 
+#: ../src/x_preview.c:223
+#, fuzzy
+msgid "Preview Buffer"
+msgstr "Buffer"
+
 #: ../src/x_print.c:84
 #, fuzzy
 msgid "Select PostScript Filename..."
@@ -2347,55 +2373,35 @@ msgstr "Diagrama atual impresso para [%s]\n"
 msgid "Couldn't allocate gc\n"
 msgstr ""
 
-#: ../src/x_window.c:94
-#, c-format
-msgid "Couldn't allocate xor_gc\n"
-msgstr ""
-
-#: ../src/x_window.c:107
-#, c-format
-msgid "Couldn't allocate outline_xor_gc\n"
-msgstr ""
-
-#: ../src/x_window.c:123
-#, c-format
-msgid "Couldn't allocate bounding_xor_gc\n"
-msgstr ""
-
-#: ../src/x_window.c:130
-#, c-format
-msgid "Couldn't allocate bus_gc\n"
-msgstr ""
-
-#: ../src/x_window.c:369
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "Novo arquivo"
 
-#: ../src/x_window.c:375
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/x_window.c:376
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Abrir arquivo..."
 
-#: ../src/x_window.c:382
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/x_window.c:383
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Salvar arquivo"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Desfazer Ãºltima operaÃ§Ã£o"
 
-#: ../src/x_window.c:398
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Refaz o Ãºltimo Desfaz"
 
-#: ../src/x_window.c:407
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2407,7 +2413,7 @@ msgstr ""
 "para colocar o componente\n"
 "BotÃ£o Direito para cancelar"
 
-#: ../src/x_window.c:417
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2415,7 +2421,7 @@ msgstr ""
 "Modo de conexÃµes\n"
 "BotÃ£o Direito para cancelar"
 
-#: ../src/x_window.c:427
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2423,79 +2429,79 @@ msgstr ""
 "Modo de Barramentos\n"
 "BotÃ£o Direito do mouse para cancelar"
 
-#: ../src/x_window.c:435
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "Adicionar Texto..."
 
-#: ../src/x_window.c:445
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../src/x_window.c:446
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "Modo de SeleÃ§Ã£o"
 
-#: ../src/x_window.c:533
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr "Pegar"
 
-#: ../src/x_window.c:549
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Repetir/nenhum"
 
-#: ../src/x_window.c:559
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Cancelar"
 
-#: ../src/x_window.c:561
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Pan/Cancelar"
 
-#: ../src/x_window.c:783
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Carregando o diagrama [%s]\n"
 
-#: ../src/x_window.c:795
+#: ../src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "Falhou ao ler imagem: %s"
 
-#: ../src/x_window.c:804
+#: ../src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "Novo arquivo"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:909
+#: ../src/x_window.c:859
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "NÃ?O foi possÃvel salvar [%s] !\n"
 
-#: ../src/x_window.c:910
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Erro tentando salvar"
 
-#: ../src/x_window.c:919
+#: ../src/x_window.c:869
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "Salvo Como [%s]\n"
 
-#: ../src/x_window.c:921
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Salvo [%s]\n"
 
-#: ../src/x_window.c:923
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Salvo"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Descartando pÃ¡gina [%s]\n"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Fechando [%s]\n"
@@ -2509,6 +2515,61 @@ msgstr ""
 msgid "gEDA Schematic Editor"
 msgstr "Descer ao EsquemÃ¡tico"
 
+#, fuzzy
+#~ msgid "Cut Buffer"
+#~ msgstr "Buffer"
+
+#, fuzzy
+#~ msgid "Copy Buffer"
+#~ msgstr "Buffer"
+
+#~ msgid "Toggle Grid On/Off"
+#~ msgstr "Liga/Desliga Grade"
+
+#~ msgid "Invalid color [%s] passed to %s\n"
+#~ msgstr "Cor [%s] invÃ¡lida passada para %s\n"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "VocÃª precisa acertar a variÃ¡vel de ambiente GEDADATA.\n"
+
+#~ msgid "Grid ON\n"
+#~ msgstr "Grade LIGADA\n"
+
+#~ msgid "Unknown end for arc (%d)\n"
+#~ msgstr "Fim de arco desconhecido:(%d)\n"
+
+#~ msgid "Unknown type for arc !\n"
+#~ msgstr "Tipo para arco desconhecido!\n"
+
+#~ msgid "Unknown end for box (%d)\n"
+#~ msgstr "Fim desconhecido para caixa (%d)\n"
+
+#~ msgid "Unknown type for box !\n"
+#~ msgstr "Tipo desconhecido para caixa!\n"
+
+#~ msgid "Unknown end for circle\n"
+#~ msgstr "Fim para arco desconhecido\n"
+
+#~ msgid "Unknown type for circle!\n"
+#~ msgstr "Tipo para arco desconhecido!\n"
+
+#, fuzzy
+#~ msgid "Unknown end for path (%d)\n"
+#~ msgstr "Fim de arco desconhecido:(%d)\n"
+
+#, fuzzy
+#~ msgid "Unknown type for path !\n"
+#~ msgstr "Tipo para arco desconhecido!\n"
+
+#~ msgid "Could not find the color %s!\n"
+#~ msgstr "ImpossÃvel encontrar a cor %s!\n"
+
+#~ msgid "Defaulting color to white\n"
+#~ msgstr "Cor padrÃ£o para branco\n"
+
+#~ msgid "Ack! Cannot allocate white!\n"
+#~ msgstr "Ih! NÃ£o consigo alocar o branco!\n"
+
 #~ msgid "Got NULL in o_attrib_toggle_visibility\n"
 #~ msgstr "tem NULO em o_attrib_toggle_visibility\n"
 
@@ -2635,9 +2696,6 @@ msgstr "Descer ao EsquemÃ¡tico"
 #~ msgid "Edit Text Color"
 #~ msgstr "Editar Cor de Texto"
 
-#~ msgid "Line Type"
-#~ msgstr "Tipo da Linha"
-
 #~ msgid "String too long... hack!\n"
 #~ msgstr "String muito longa... abrevie!\n"
 
diff --git a/gschem/po/ru.po b/gschem/po/ru.po
index ebf96b5..8b9b556 100644
--- a/gschem/po/ru.po
+++ b/gschem/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:41-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2006-09-13 16:59+0300\n"
 "Last-Translator: Andy Shevchenko <andy@xxxxxxxxxxxx>\n"
 "Language-Team: Russian <ru@xxxxxx>\n"
@@ -65,7 +65,7 @@ msgstr "Ð?ÐµÑ?Ð°Ñ?Ñ?..."
 msgid "Write image..."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ð°Ñ?Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:498
+#: ../src/rcstrings.c:13 ../src/x_menus.c:501
 #, fuzzy
 msgid "Recent files"
 msgstr "Ð?Ð¾Ð²Ñ?Ð¹ Ñ?Ð°Ð¹Ð»"
@@ -82,36 +82,36 @@ msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ? Ð¾ÐºÐ½Ð¾"
 msgid "Quit"
 msgstr "Ð?Ñ?Ð¹Ñ?Ð¸"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:691
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Ð?Ñ?Ð°Ð²ÐºÐ°"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:390
+#: ../src/rcstrings.c:19 ../src/x_window.c:338
 msgid "Undo"
 msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:397
+#: ../src/rcstrings.c:20 ../src/x_window.c:345
 msgid "Redo"
 msgstr "Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:573
+#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
 msgid "Select Mode"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð²Ñ?Ð±Ð¾Ñ?ÐºÐ¸"
 
 #: ../src/rcstrings.c:22
 #, fuzzy
-msgid "Cut Buffer"
-msgstr "Ð?Ñ?Ñ?ÐµÑ?"
+msgid "Cut"
+msgstr "Ð?Ñ?Ñ?ÐµÐ·ÐºÐ° 1"
 
-#: ../src/rcstrings.c:23
-#, fuzzy
-msgid "Copy Buffer"
-msgstr "Ð?Ñ?Ñ?ÐµÑ?"
+#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
+#: ../src/i_callbacks.c:560
+msgid "Copy"
+msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
 #: ../src/rcstrings.c:24
 #, fuzzy
-msgid "Paste Buffer"
-msgstr "Ð?Ñ?Ñ?ÐµÑ?"
+msgid "Paste"
+msgstr "Ð?Ñ?Ñ?Ð°Ð²ÐºÐ° 1"
 
 #: ../src/rcstrings.c:25
 msgid "Edit..."
@@ -133,7 +133,7 @@ msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð¼Ð½Ð¾Ð¶ÐµÑ?Ñ?Ð²ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 msgid "Move Mode"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð¿ÐµÑ?ÐµÐ¼ÐµÑ?ÐµÐ½Ð¸Ñ?"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:666 ../src/x_multiattrib.c:1401
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ?"
 
@@ -153,11 +153,11 @@ msgstr "Ð¡Ð»Ð¾Ñ?..."
 msgid "Color..."
 msgstr "Ð¦Ð²ÐµÑ?..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:898 ../src/x_dialog.c:2233
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
 msgid "Lock"
 msgstr "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:916
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
@@ -266,7 +266,7 @@ msgid "Redraw"
 msgstr "Ð?ÐµÑ?ÐµÑ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1504 ../src/i_callbacks.c:1576
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
 msgid "Pan"
 msgstr "Ð¦ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
@@ -290,236 +290,244 @@ msgstr "Ð£Ð¼ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ñ?"
 msgid "Zoom Full"
 msgstr "Ð? Ð½Ð°Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð½Ñ?Ñ? Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ?"
 
+#: ../src/rcstrings.c:71
+msgid "Dark color scheme"
+msgstr ""
+
 #: ../src/rcstrings.c:72
+msgid "Light color scheme"
+msgstr ""
+
+#: ../src/rcstrings.c:74
 msgid "Page"
 msgstr "Ð¡Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°"
 
-#: ../src/rcstrings.c:73
+#: ../src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Ð?ÐµÐ½ÐµÐ´Ð¶ÐµÑ?..."
 
-#: ../src/rcstrings.c:74
+#: ../src/rcstrings.c:76
 msgid "Next"
 msgstr "Ð¡Ð»ÐµÐ´Ñ?Ñ?Ñ?Ð°Ñ?"
 
-#: ../src/rcstrings.c:75
+#: ../src/rcstrings.c:77
 msgid "Previous"
 msgstr "Ð?Ñ?ÐµÐ´Ñ?Ð´Ñ?Ñ?Ð°Ñ?"
 
-#: ../src/rcstrings.c:76 ../src/x_window.c:368
+#: ../src/rcstrings.c:78 ../src/x_window.c:316
 msgid "New"
 msgstr "Ð?Ð¾Ð²Ð°Ñ?"
 
-#: ../src/rcstrings.c:77
+#: ../src/rcstrings.c:79
 msgid "Revert"
 msgstr "Ð?Ð¾Ð·Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ñ?"
 
-#: ../src/rcstrings.c:78
+#: ../src/rcstrings.c:80
 msgid "Close"
 msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ?"
 
-#: ../src/rcstrings.c:79
+#: ../src/rcstrings.c:81
 msgid "Discard"
 msgstr "Ð?Ñ?Ð²ÐµÑ?Ð³Ð½Ñ?Ñ?Ñ?"
 
-#: ../src/rcstrings.c:81
+#: ../src/rcstrings.c:83
 msgid "Add"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ?"
 
-#: ../src/rcstrings.c:82
+#: ../src/rcstrings.c:84
 msgid "Component..."
 msgstr "Ð?Ð¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ?..."
 
 #. need to click
-#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2306 ../src/i_callbacks.c:2333
-#: ../src/x_dialog.c:2200
+#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
+#: ../src/x_dialog.c:2376
 msgid "Net"
 msgstr "Ð?Ñ?Ð¾Ð²Ð¾Ð´Ð½Ð¸Ðº"
 
 #. need to click
-#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2377 ../src/i_callbacks.c:2404
-#: ../src/x_dialog.c:2218 ../src/x_window.c:426
+#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
+#: ../src/x_dialog.c:2394 ../src/x_window.c:374
 msgid "Bus"
 msgstr "Ð¨Ð¸Ð½Ð°"
 
-#: ../src/rcstrings.c:85
+#: ../src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Ð?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?..."
 
-#: ../src/rcstrings.c:86
+#: ../src/rcstrings.c:88
 msgid "Text..."
 msgstr "Ð¢ÐµÐºÑ?Ñ?..."
 
-#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2485 ../src/i_callbacks.c:2508
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
 msgid "Line"
 msgstr "Ð?Ð¸Ð½Ð¸Ñ?"
 
-#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2530 ../src/i_callbacks.c:2553
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
 msgid "Box"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸Ðº"
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2609 ../src/i_callbacks.c:2633
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
 msgid "Circle"
 msgstr "Ð?ÐºÑ?Ñ?Ð¶Ð½Ð¾Ñ?Ñ?Ñ?"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2655 ../src/i_callbacks.c:2678
+#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
 msgid "Arc"
 msgstr "Ð?Ñ?Ð³Ð°"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2700 ../src/i_callbacks.c:2723
-#: ../src/x_dialog.c:2191
+#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
+#: ../src/x_dialog.c:2367
 msgid "Pin"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../src/rcstrings.c:92
+#: ../src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Ð?Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ..."
 
-#: ../src/rcstrings.c:94
+#: ../src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ñ?Ð¸Ñ?"
 
-#: ../src/rcstrings.c:95
+#: ../src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Ð?Ð³Ð»Ñ?Ð±Ñ? Ñ?Ñ?ÐµÐ¼Ñ?"
 
-#: ../src/rcstrings.c:96
+#: ../src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Ð?Ð³Ð»Ñ?Ð±Ñ? Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð°"
 
-#: ../src/rcstrings.c:97
+#: ../src/rcstrings.c:99
 msgid "Up"
 msgstr "Ð?Ð°Ð²ÐµÑ?Ñ?"
 
-#: ../src/rcstrings.c:98
+#: ../src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100 ../src/x_compselect.c:1418
+#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
 #: ../src/x_multiattrib.c:1543
 msgid "Attributes"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ñ?"
 
-#: ../src/rcstrings.c:101 ../src/i_callbacks.c:3000
+#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
 msgid "Attach"
 msgstr "Ð?Ñ?Ð¸Ñ?ÐµÐ¿Ð¸Ñ?Ñ?"
 
-#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3046
+#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
 msgid "Detach"
 msgstr "Ð?Ñ?Ñ?ÐµÐ¿Ð¸Ñ?Ñ?"
 
-#: ../src/rcstrings.c:103
+#: ../src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ðµ"
 
-#: ../src/rcstrings.c:104
+#: ../src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ð¸Ð¼Ñ?"
 
-#: ../src/rcstrings.c:105
+#: ../src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ð¾Ð±Ð° Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð°"
 
-#: ../src/rcstrings.c:106
+#: ../src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Ð?ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ð²Ð¸Ð´Ð¸Ð¼Ð¾Ñ?Ñ?Ð¸"
 
-#: ../src/rcstrings.c:107
+#: ../src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Ð?Ð°Ð¹Ñ?Ð¸ Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ?Ð¹ Ñ?ÐµÐºÑ?Ñ?..."
 
-#: ../src/rcstrings.c:108
+#: ../src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Ð¡ÐºÑ?Ñ?Ñ?Ñ? Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ?Ð¹ Ñ?ÐµÐºÑ?Ñ?..."
 
-#: ../src/rcstrings.c:109
+#: ../src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ?Ð¹ Ñ?ÐµÐºÑ?Ñ?..."
 
-#: ../src/rcstrings.c:110
+#: ../src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Ð?Ð²Ñ?Ð¾Ð½Ñ?Ð¼ÐµÑ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?..."
 
-#: ../src/rcstrings.c:112
+#: ../src/rcstrings.c:114
 msgid "Options"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../src/rcstrings.c:113
+#: ../src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°..."
 
-#: ../src/rcstrings.c:114
-msgid "Toggle Grid On/Off"
-msgstr "Ð?ÐµÑ?ÐµÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ Ñ?ÐµÑ?ÐºÐ¸"
+#: ../src/rcstrings.c:116
+msgid "Cycle grid styles"
+msgstr ""
 
-#: ../src/rcstrings.c:115
+#: ../src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Ð?ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¸"
 
-#: ../src/rcstrings.c:116
+#: ../src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Ð¨Ð°Ð³ Ñ?ÐµÑ?ÐºÐ¸ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¸..."
 
-#: ../src/rcstrings.c:117
+#: ../src/rcstrings.c:119
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Ð¨Ð°Ð³ Ñ?ÐµÑ?ÐºÐ¸ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¸..."
 
-#: ../src/rcstrings.c:118
+#: ../src/rcstrings.c:120
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Ð¨Ð°Ð³ Ñ?ÐµÑ?ÐºÐ¸ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¸..."
 
-#: ../src/rcstrings.c:119
+#: ../src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Ð?ÐµÑ?ÐµÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð²Ð½ÐµÑ?Ð½Ð¸Ð¹ ÐºÐ¾Ð½Ñ?Ñ?Ñ?/Ð±Ð¾ÐºÑ?"
 
-#: ../src/rcstrings.c:120
+#: ../src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: ../src/rcstrings.c:121
+#: ../src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ð¾ÐºÐ½Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð°"
 
-#: ../src/rcstrings.c:122
+#: ../src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ð¾ÐºÐ½Ð¾ ÐºÐ¾Ð¾Ñ?Ð´Ð¸Ð½Ð°Ñ?"
 
-#: ../src/rcstrings.c:124
+#: ../src/rcstrings.c:126
 msgid "Help"
 msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ñ?"
 
-#: ../src/rcstrings.c:125
+#: ../src/rcstrings.c:127
 #, fuzzy
 msgid "Manual"
 msgstr "Ð Ñ?ÐºÐ¾Ð²Ð¾Ð´Ñ?Ñ?Ð²Ð¾..."
 
-#: ../src/rcstrings.c:126
+#: ../src/rcstrings.c:128
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?"
 
-#: ../src/rcstrings.c:127
+#: ../src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr ""
 
-#: ../src/rcstrings.c:128
+#: ../src/rcstrings.c:130
 #, fuzzy
 msgid "Component Documentation"
 msgstr "Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?"
 
-#: ../src/rcstrings.c:129
+#: ../src/rcstrings.c:131
 msgid "About gschem"
 msgstr ""
 
-#: ../src/rcstrings.c:130 ../src/x_dialog.c:2541
+#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
 #, fuzzy
 msgid "Hotkeys"
 msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¸Ðµ ÐºÐ»Ð°Ð²Ð¸Ñ?Ð¸..."
 
-#: ../src/a_zoom.c:208
+#: ../src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð°Ð± Ð¾Ñ?ÐµÐ½Ñ? Ð¼Ð°Ð»! Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð°Ð»Ñ?Ð½ÐµÐ¹Ñ?ÐµÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ.\n"
 
@@ -540,92 +548,92 @@ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²Ñ?Ð·Ð²Ð°Ñ?Ñ? %s\n"
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ñ? Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ð¸ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ð² MinGW.\n"
 
-#: ../src/g_rc.c:140
-#, c-format
-msgid "Invalid color [%s] passed to %s\n"
-msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð²ÐµÑ? [%s] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ %s\n"
-
-#: ../src/g_rc.c:448
+#: ../src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¼Ð°Ñ?Ñ?Ñ?Ð°Ð± [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ %s\n"
 
-#: ../src/g_rc.c:574
+#: ../src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð°Ð·Ð¼ÐµÑ? [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ text-size\n"
 
-#: ../src/g_rc.c:601
+#: ../src/g_rc.c:445
 #, fuzzy, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð°Ð·Ð¼ÐµÑ? [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ text-size\n"
 
-#: ../src/g_rc.c:644
+#: ../src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð°Ð·Ð¼ÐµÑ? [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ snap-size\n"
 
-#: ../src/g_rc.c:1116
+#: ../src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ ÐºÐ¾Ð»Ð¸Ñ?ÐµÑ?Ñ?Ð²Ð¾ Ñ?Ñ?Ð¾Ð²Ð½ÐµÐ¹ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ undo-levels\n"
 
-#: ../src/g_rc.c:1374
+#: ../src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð°Ð·Ð¼ÐµÑ? [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ bus-ripper-size\n"
 
-#: ../src/g_rc.c:1449
-#, c-format
-msgid "Invalid dot size [%d] passed to grid-dot-size\n"
+#: ../src/g_rc.c:1293
+#, fuzzy, c-format
+msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð°Ð·Ð¼ÐµÑ? Ñ?Ð¾Ñ?ÐºÐ¸ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ grid-dot-size\n"
 
-#: ../src/g_rc.c:1490
-#, c-format
-msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
+#: ../src/g_rc.c:1334
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
+msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ðµ Ð¾Ñ?Ñ?Ñ?Ñ?Ð¿Ñ? [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ grid-fixed-threshold\n"
+
+#: ../src/g_rc.c:1360
+#, fuzzy, c-format
+msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ðµ Ð¾Ñ?Ñ?Ñ?Ñ?Ð¿Ñ? [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1534
+#: ../src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ñ?Ð¼ÐµÑ?ÐµÐ½Ð¸Ðµ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ add-attribute-offset\n"
 
-#: ../src/g_rc.c:1558
+#: ../src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ñ?Ð¸Ñ?Ð»Ð¾ Ñ?ÐµÐºÑ?Ð½Ð´ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ auto-save-interval\n"
 
-#: ../src/g_rc.c:1599
+#: ../src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ñ?Ñ?ÐºÐ¾Ñ?ÐµÐ½Ð¸Ðµ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ mousepan-gain\n"
 
-#: ../src/g_rc.c:1622
+#: ../src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ñ?Ñ?ÐºÐ¾Ñ?ÐµÐ½Ð¸Ðµ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1668
+#: ../src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ñ?Ð¸Ñ?Ð»Ð¾ Ñ?ÐµÐºÑ?Ð½Ð´ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ auto-save-interval\n"
 
-#: ../src/g_rc.c:1694
+#: ../src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ñ?Ñ?ÐºÐ¾Ñ?ÐµÐ½Ð¸Ðµ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ mousepan-gain\n"
 
-#: ../src/g_rc.c:1719
+#: ../src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ñ?Ð¸Ñ?Ð»Ð¾ Ñ?ÐµÐºÑ?Ð½Ð´ [%d] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ auto-save-interval\n"
 
-#: ../src/gschem.c:189 ../src/gschem.c:200
+#: ../src/gschem.c:183 ../src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "Ð?ÐµÑ?Ñ?Ð¸Ñ? gEDA/gschem %s%s.%s\n"
 
-#: ../src/gschem.c:192 ../src/gschem.c:203
+#: ../src/gschem.c:186 ../src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -633,7 +641,7 @@ msgid ""
 msgstr ""
 "gEDA/gschem Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð?Ð?Ð? Ð?Ð?Ð Ð?Ð?Ð¢Ð?Ð?; Ñ?Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ COPYING Ð´Ð»Ñ? Ð¿Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð¾Ñ?Ñ?ÐµÐ¹.\n"
 
-#: ../src/gschem.c:194 ../src/gschem.c:205
+#: ../src/gschem.c:188 ../src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -641,7 +649,7 @@ msgstr ""
 "ÐÑ?Ð¾ Ñ?Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?ÐµÐ½Ð¸Ðµ, Ð¸ ÐµÐ³Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð°Ñ?Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ñ? Ð¿Ñ?Ð¸ "
 "Ð¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ñ?\n"
 
-#: ../src/gschem.c:196 ../src/gschem.c:207
+#: ../src/gschem.c:190 ../src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -650,48 +658,61 @@ msgstr ""
 "Ñ?Ñ?Ð»Ð¾Ð²Ð¸Ñ?Ñ?; Ð¿Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ñ?Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð¹Ð» COPYING Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð¾Ñ?Ñ?ÐµÐ¹.\n"
 "\n"
 
-#: ../src/gschem.c:211
+#: ../src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "ÐÑ?Ð¾ MINGW32 Ð²ÐµÑ?Ñ?Ð¸Ñ?.\n"
 
-#: ../src/gschem.c:215
+#: ../src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Ð¢ÐµÐºÑ?Ñ?Ð¸Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð»Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ð¸: %s\n"
 
-#: ../src/gschem.c:228
-#, c-format
-msgid "You must set the GEDADATA environment variable!\n"
-msgstr "Ð?Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ñ? Ð¾ÐºÑ?Ñ?Ð¶ÐµÐ½Ð¸Ñ? GEDADATA!\n"
+#: ../src/gschem.c:224
+msgid ""
+"You must set the GEDADATA environment variable!\n"
+"\n"
+"gschem cannot locate its data files. You must set the GEDADATA\n"
+"environment variable to point to the correct location.\n"
+msgstr ""
 
-#: ../src/gschem.c:245
+#: ../src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð½Ð°Ñ?Ð°Ð»Ñ?Ð½Ñ?Ð¹ scm-Ñ?Ð°Ð¹Ð» [%s]\n"
 
-#: ../src/gschem.c:249
+#: ../src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Ð§Ñ?ÐµÐ½Ð¸Ðµ Ð½Ð°Ñ?Ð°Ð»Ñ?Ð½Ð¾Ð³Ð¾ scm-Ñ?Ð°Ð¹Ð»Ð° [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:253
+#: ../src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð½Ð°Ñ?Ð°Ð»Ñ?Ð½Ñ?Ð¹ scm-Ñ?Ð°Ð¹Ð» [%s]\n"
 
-#: ../src/gschem.c:315
+#: ../src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Ð?Ð°Ñ?Ð°Ð»Ð¾Ð³ Ñ?Ñ?ÐµÐ¼ Ð?Ð? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½!\n"
 
-#: ../src/gschem.c:322 ../src/x_script.c:66
+#: ../src/gschem.c:327 ../src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Ð?Ð°Ð¿Ñ?Ñ?ÐºÐ°ÐµÑ?Ñ?Ñ? guile-Ñ?ÐºÑ?Ð¸Ð¿Ñ? [%s]\n"
 
+#: ../src/gschem_cairo.c:310
+#, c-format
+msgid "Unknown end for line (%d)\n"
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð»Ð¸Ð½Ð¸Ð¸ (%d)\n"
+
+#: ../src/gschem_cairo.c:318
+#, fuzzy, c-format
+msgid "Unknown type for stroke (%d) !\n"
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð»Ð¸Ð½Ð¸Ð¸ (%d) !\n"
+
 #: ../src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ?Ð¾Ð²"
@@ -750,15 +771,11 @@ msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð´Ñ?Ð³Ð¸"
 msgid "Pin Mode"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¾Ð²"
 
-#: ../src/i_basic.c:135 ../src/i_callbacks.c:532 ../src/i_callbacks.c:556
-msgid "Copy"
-msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
-
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:622 ../src/i_callbacks.c:646
+#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
 msgid "Move"
 msgstr "Ð?ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:577 ../src/i_callbacks.c:601
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Ð?Ð½Ð¾Ð¶ÐµÑ?Ñ?Ð²ÐµÐ½Ð½Ð¾Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
@@ -770,27 +787,35 @@ msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ðµ"
 msgid "Snap Off"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ° Ð²Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð°"
 
-#: ../src/i_basic.c:252 ../src/x_window.c:547
+#: ../src/i_basic.c:173
+msgid "Resnap Active"
+msgstr ""
+
+#: ../src/i_basic.c:254 ../src/x_window.c:495
 msgid "Action"
 msgstr "Ð?ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
-#: ../src/i_basic.c:258 ../src/x_dialog.c:2230 ../src/x_window.c:542
+#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
 msgid "Stroke"
 msgstr "Ð¨Ñ?Ñ?Ð¸Ñ?"
 
-#: ../src/i_basic.c:264 ../src/x_window.c:544
+#: ../src/i_basic.c:266 ../src/x_window.c:492
 msgid "none"
 msgstr "Ð¿Ñ?Ñ?Ñ?Ð¾"
 
-#: ../src/i_basic.c:269
+#: ../src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ñ?/"
 
-#: ../src/i_basic.c:531 ../src/i_basic.c:536
+#: ../src/i_basic.c:549 ../src/i_basic.c:563
 msgid "OFF"
 msgstr ""
 
-#: ../src/i_basic.c:540
+#: ../src/i_basic.c:567
+msgid "NONE"
+msgstr ""
+
+#: ../src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
@@ -800,69 +825,74 @@ msgstr ""
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ? Ð´Ð»Ñ? [%s, %s, %s, %s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1701
+#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð° Ð½Ð¾Ð²Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð° [%s]\n"
 
-#: ../src/i_callbacks.c:159 ../src/x_menus.c:467
+#: ../src/i_callbacks.c:163
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¾ Ð½Ð¾Ð²Ð¾Ðµ Ð¾ÐºÐ½Ð¾\n"
 
-#: ../src/i_callbacks.c:277
+#: ../src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ð¸ Ð²Ñ?ÐµÐ³Ð¾"
 
-#: ../src/i_callbacks.c:279
+#: ../src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Ð?Ñ?Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¾"
 
-#: ../src/i_callbacks.c:369
+#: ../src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð¸Ðµ Ð¾ÐºÐ½Ð°\n"
 
-#: ../src/i_callbacks.c:537 ../src/i_callbacks.c:582 ../src/i_callbacks.c:627
+#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Ð¢Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð²Ñ?Ð±Ð¾Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð¾Ð²"
 
-#: ../src/i_callbacks.c:707
+#: ../src/i_callbacks.c:710
+#, fuzzy
+msgid "Edit pin type"
+msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð¸Ð¿Ð° Ð»Ð¸Ð½Ð¸Ð¸"
+
+#: ../src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#: ../src/i_callbacks.c:730
+#: ../src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Ð¡Ð»Ð¾Ñ?"
 
-#: ../src/i_callbacks.c:747
+#: ../src/i_callbacks.c:769
 msgid "Color"
 msgstr "Ð¦Ð²ÐµÑ?"
 
-#: ../src/i_callbacks.c:784 ../src/i_callbacks.c:829
+#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Ð?Ñ?Ð°Ñ?Ð°Ñ?Ñ?"
 
-#: ../src/i_callbacks.c:852 ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Ð?ÐµÑ?ÐºÐ°Ð»Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: ../src/i_callbacks.c:934 ../src/x_dialog.c:1623
+#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Ð?ÐµÑ?ÐµÐ²Ð¾Ð´"
 
-#: ../src/i_callbacks.c:937
+#: ../src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "Ð?Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð½Ðµ Ð¿ÐµÑ?ÐµÐ²Ð¾Ð´Ð¸Ñ?Ðµ c Ð²Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ð¾Ð¹ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¾Ð¹!\n"
 
-#: ../src/i_callbacks.c:938
+#: ../src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "Ð?Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÑ? Ð¿Ñ?Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¸Ñ?.\n"
 
-#: ../src/i_callbacks.c:945
+#: ../src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "Ð?Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ñ?Ð°Ð·Ð¼ÐµÑ? Ñ?ÐµÑ?ÐºÐ¸ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¸ Ð½Ðµ Ñ?Ð°Ð²ÐµÐ½ 100!\n"
 
-#: ../src/i_callbacks.c:947
+#: ../src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -870,283 +900,255 @@ msgstr ""
 "Ð?Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð?Ñ?Ð»Ð¸ Ð¾Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ²Ð¾Ð´ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð° Ðº Ð½Ð°Ñ?Ð°Ð»Ñ? Ð¾Ñ?Ñ?Ñ?ÐµÑ?Ð°, Ñ?Ð°Ð·Ð¼ÐµÑ? "
 "Ñ?ÐµÑ?ÐºÐ¸ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð² 100\n"
 
-#: ../src/i_callbacks.c:978
+#: ../src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Ð?Ð½ÐµÐ´Ñ?Ð¸Ñ?Ñ?"
 
-#: ../src/i_callbacks.c:1019
+#: ../src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../src/i_callbacks.c:1062
+#: ../src/i_callbacks.c:1084
 msgid "Update"
 msgstr "Ð?Ð±Ð½Ð¾Ð²Ð¸Ñ?Ñ?"
 
-#: ../src/i_callbacks.c:1119
+#: ../src/i_callbacks.c:1141
 msgid "ShowHidden"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ðµ"
 
-#: ../src/i_callbacks.c:1142
+#: ../src/i_callbacks.c:1165
 msgid "MakeVisible"
 msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ?Ñ? Ð²Ð¸Ð´Ð¸Ð¼Ñ?Ð¼"
 
-#: ../src/i_callbacks.c:1259
-msgid "Edit Line Type"
-msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð¸Ð¿Ð° Ð»Ð¸Ð½Ð¸Ð¸"
-
-#: ../src/i_callbacks.c:1301 ../src/x_dialog.c:1243
-msgid "Edit Fill Type"
-msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð¸Ð¿Ð° Ð·Ð°Ð»Ð¸Ð²ÐºÐ¸"
-
-#: ../src/i_callbacks.c:1595
+#: ../src/i_callbacks.c:1562
 msgid "Update Cues"
 msgstr "Ð?Ð±Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ñ?Ð¸Ð³Ð½Ð°Ð»Ñ?"
 
-#: ../src/i_callbacks.c:1745
+#: ../src/i_callbacks.c:1746
 msgid "Really revert page?"
 msgstr "Ð?ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾ Ð²Ð¾Ð·Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ??"
 
-#: ../src/i_callbacks.c:1817
+#: ../src/i_callbacks.c:1816
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1834
+msgid "Cut to clipboard"
+msgstr ""
+
+#: ../src/i_callbacks.c:1852
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¸Ð· 1"
+
+#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
+#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
+#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+msgid "Empty buffer"
+msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ð¹ Ð±Ñ?Ñ?ÐµÑ?"
+
+#: ../src/i_callbacks.c:1909
 msgid "Copy 1"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ 1"
 
-#: ../src/i_callbacks.c:1836
+#: ../src/i_callbacks.c:1928
 msgid "Copy 2"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ 2"
 
-#: ../src/i_callbacks.c:1855
+#: ../src/i_callbacks.c:1947
 msgid "Copy 3"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ 3"
 
-#: ../src/i_callbacks.c:1874
+#: ../src/i_callbacks.c:1966
 msgid "Copy 4"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ 4"
 
-#: ../src/i_callbacks.c:1893
+#: ../src/i_callbacks.c:1985
 msgid "Copy 5"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ 5"
 
-#: ../src/i_callbacks.c:1912
+#: ../src/i_callbacks.c:2004
 msgid "Cut 1"
 msgstr "Ð?Ñ?Ñ?ÐµÐ·ÐºÐ° 1"
 
-#: ../src/i_callbacks.c:1931
+#: ../src/i_callbacks.c:2023
 msgid "Cut 2"
 msgstr "Ð?Ñ?Ñ?ÐµÐ·ÐºÐ° 2"
 
-#: ../src/i_callbacks.c:1950
+#: ../src/i_callbacks.c:2042
 msgid "Cut 3"
 msgstr "Ð?Ñ?Ñ?ÐµÐ·ÐºÐ° 3"
 
-#: ../src/i_callbacks.c:1969
+#: ../src/i_callbacks.c:2061
 msgid "Cut 4"
 msgstr "Ð?Ñ?Ñ?ÐµÐ·ÐºÐ° 4"
 
-#: ../src/i_callbacks.c:1988
+#: ../src/i_callbacks.c:2080
 msgid "Cut 5"
 msgstr "Ð?Ñ?Ñ?ÐµÐ·ÐºÐ° 5"
 
-#: ../src/i_callbacks.c:2004
+#: ../src/i_callbacks.c:2096
 msgid "Paste 1"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²ÐºÐ° 1"
 
-#: ../src/i_callbacks.c:2011 ../src/i_callbacks.c:2033
-#: ../src/i_callbacks.c:2055 ../src/i_callbacks.c:2077
-#: ../src/i_callbacks.c:2099
-msgid "Empty buffer"
-msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ð¹ Ð±Ñ?Ñ?ÐµÑ?"
-
-#: ../src/i_callbacks.c:2026
+#: ../src/i_callbacks.c:2118
 msgid "Paste 2"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²ÐºÐ° 2"
 
-#: ../src/i_callbacks.c:2048
+#: ../src/i_callbacks.c:2140
 msgid "Paste 3"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²ÐºÐ° 3"
 
-#: ../src/i_callbacks.c:2070
+#: ../src/i_callbacks.c:2162
 msgid "Paste 4"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²ÐºÐ° 4"
 
-#: ../src/i_callbacks.c:2092
+#: ../src/i_callbacks.c:2184
 msgid "Paste 5"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²ÐºÐ° 5"
 
-#: ../src/i_callbacks.c:2229 ../src/x_window.c:406
+#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
 msgid "Component"
 msgstr "Ð?Ð¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ?"
 
-#: ../src/i_callbacks.c:2265 ../src/i_callbacks.c:2284 ../src/x_dialog.c:2203
+#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
 msgid "Attribute"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ñ?"
 
-#: ../src/i_callbacks.c:2781
+#: ../src/i_callbacks.c:2873
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðº Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸ÐºÐ° [%s]\n"
 
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2897
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ?Ð¸ Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº [%s]\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2964
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðº Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð° [%s]\n"
 
-#: ../src/i_callbacks.c:2878
+#: ../src/i_callbacks.c:2970
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2909
+#: ../src/i_callbacks.c:3001
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:2972
+#: ../src/i_callbacks.c:3064
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: ../src/i_callbacks.c:3084
+#: ../src/i_callbacks.c:3177
 msgid "ShowN"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? N"
 
-#: ../src/i_callbacks.c:3120
+#: ../src/i_callbacks.c:3213
 msgid "ShowV"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? V"
 
-#: ../src/i_callbacks.c:3156
+#: ../src/i_callbacks.c:3249
 msgid "ShowB"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? B"
 
-#: ../src/i_callbacks.c:3193
+#: ../src/i_callbacks.c:3286
 msgid "VisToggle"
 msgstr "Ð?ÐµÑ?ÐµÐºÐ». Ð²Ð¸Ð´Ð¸Ð¼Ð¾Ñ?Ñ?Ð¸"
 
-#: ../src/i_callbacks.c:3223
+#: ../src/i_callbacks.c:3316
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ6 Ð½Ð¾ Ñ?Ñ?Ð¾ Ð¾Ð¿Ñ?Ð¸Ñ? Ð½Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð°Ð»Ñ?Ð½Ð¾Ð³Ð¾ Ð¼ÐµÐ½Ñ?\n"
 
-#: ../src/i_callbacks.c:3311
+#: ../src/i_callbacks.c:3406
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3314
+#: ../src/i_callbacks.c:3409
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3331
+#: ../src/i_callbacks.c:3434
 msgid "Grid OFF\n"
 msgstr "Ð¡ÐµÑ?ÐºÐ° Ð²Ñ?ÐºÐ».\n"
 
-#: ../src/i_callbacks.c:3334
-msgid "Grid ON\n"
-msgstr "Ð¡ÐµÑ?ÐºÐ° Ð²ÐºÐ».\n"
+#: ../src/i_callbacks.c:3435
+msgid "Dot grid selected\n"
+msgstr ""
+
+#: ../src/i_callbacks.c:3436
+msgid "Mesh grid selected\n"
+msgstr ""
 
-#: ../src/i_callbacks.c:3351
+#: ../src/i_callbacks.c:3457
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ° Ð?Ð«Ð?Ð?Ð®Ð§Ð?Ð?Ð? (Ð?Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ!)\n"
 
-#: ../src/i_callbacks.c:3354
+#: ../src/i_callbacks.c:3460
 msgid "Snap ON\n"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ° Ð?Ð?Ð?Ð®Ð§Ð?Ð?Ð?\n"
 
-#: ../src/i_callbacks.c:3374
+#: ../src/i_callbacks.c:3463
+#, fuzzy
+msgid "Snap back to the grid (CAUTION!)\n"
+msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ° Ð?Ð«Ð?Ð?Ð®Ð§Ð?Ð?Ð? (Ð?Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ!)\n"
+
+#: ../src/i_callbacks.c:3489
 msgid "Rubber band OFF \n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3377
+#: ../src/i_callbacks.c:3492
 msgid "Rubber band ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3392
+#: ../src/i_callbacks.c:3507
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3395
+#: ../src/i_callbacks.c:3510
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_arc.c:120
-#, c-format
-msgid "Unknown end for arc (%d)\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð´Ñ?Ð³Ð¸ (%d)\n"
-
-#: ../src/o_arc.c:160
-#, c-format
-msgid "Unknown type for arc !\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð´Ñ?Ð³Ð¸ !\n"
-
-#: ../src/o_box.c:136
-#, c-format
-msgid "Unknown end for box (%d)\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ° (%d)\n"
-
-#: ../src/o_box.c:176
-#, c-format
-msgid "Unknown type for box !\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ° !\n"
-
-#: ../src/o_box.c:260
+#: ../src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ° (Ñ? Ð·Ð°Ð»Ð¸Ð²ÐºÐ¾Ð¹)!\n"
 
-#: ../src/o_buffer.c:40
+#: ../src/o_buffer.c:57
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_copy]\n"
-msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ buffer_number [o_buffer_copy]\n"
+msgid "o_buffer_copy: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:69
+#: ../src/o_buffer.c:72
 #, c-format
-msgid "Got an invalid buffer_number [o_buffer_cut]\n"
-msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ buffer_number [o_buffer_cut]\n"
+msgid "o_buffer_cut: Invalid buffer %i\n"
+msgstr ""
 
-#: ../src/o_buffer.c:101
+#: ../src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ buffer_number [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:183
-#, c-format
-msgid "Got an invalid which one in o_bus_draw_xor_single\n"
+#: ../src/o_bus.c:135
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ? Ð² o_bus_draw_xor_single\n"
 
-#: ../src/o_circle.c:127
-#, c-format
-msgid "Unknown end for circle\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð¾ÐºÑ?Ñ?Ð¶Ð½Ð¾Ñ?Ñ?Ð¸\n"
-
-#. just to be careful
-#: ../src/o_circle.c:163
-#, c-format
-msgid "Unknown type for circle!\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð¾ÐºÑ?Ñ?Ð¶Ð½Ð¾Ñ?Ñ?Ð¸!\n"
-
-#: ../src/o_circle.c:245
+#: ../src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð¾ÐºÑ?Ñ?Ð¶Ð½Ð¾Ñ?Ñ?Ð¸ (Ñ? Ð·Ð°Ð»Ð¸Ð²ÐºÐ¾Ð¹)!\n"
 
-#: ../src/o_complex.c:251 ../src/o_complex.c:255
+#: ../src/o_complex.c:250 ../src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Ð?ÐµÑ?ÐµÐ²Ð¾Ð´ Ñ?Ñ?ÐµÐ¼Ñ? [%d %d]\n"
 
-#: ../src/o_line.c:111
-#, c-format
-msgid "Unknown end for line (%d)\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð»Ð¸Ð½Ð¸Ð¸ (%d)\n"
-
-#. just to be careful
-#: ../src/o_line.c:151
-#, c-format
-msgid "Unknown type for line (%d) !\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð»Ð¸Ð½Ð¸Ð¸ (%d) !\n"
-
 #: ../src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
@@ -1162,37 +1164,37 @@ msgstr "Ð?Ð±Ñ?ÐµÐºÑ? Ñ?Ð¶Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½\n"
 msgid "Object already unlocked\n"
 msgstr "Ð?Ð±Ñ?ÐµÐºÑ? Ñ?Ð¶Ðµ Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½\n"
 
-#: ../src/o_misc.c:444
+#: ../src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Ð¡ÐºÑ?Ñ?Ñ?Ñ?Ð¹ Ñ?ÐµÐºÑ?Ñ? Ñ?ÐµÐ¹Ñ?Ð°Ñ? Ð²Ð¸Ð´Ð¸Ð¼\n"
 
-#: ../src/o_misc.c:446
+#: ../src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Ð¡ÐºÑ?Ñ?Ñ?Ñ?Ð¹ Ñ?ÐµÑ?ÐºÑ? Ñ?ÐµÐ¹Ñ?Ð°Ñ? Ð½ÐµÐ²Ð¸Ð´Ð¸Ð¼\n"
 
-#: ../src/o_misc.c:694
+#: ../src/o_misc.c:697
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:837
+#: ../src/o_misc.c:840
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?ÐµÐ°Ð»Ñ?Ð½Ð¾ Ð¸Ð¼Ñ? Ñ?Ð°Ð¹Ð»Ð° Ð´Ð»Ñ? %s."
 
-#: ../src/o_misc.c:881
+#: ../src/o_misc.c:884
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ñ?ÐµÐ¶Ð¸Ð¼ Ñ?Ñ?ÐµÐ½Ð¸Ñ?-Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ð´Ð»Ñ? Ð¿Ñ?ÐµÐ´Ñ?Ð´Ñ?Ñ?ÐµÐ¹ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ "
 "Ñ?Ð°Ð¹Ð»Ð° [%s]\n"
 
-#: ../src/o_misc.c:899
+#: ../src/o_misc.c:902
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ñ?ÐµÐ¶Ð¸Ð¼ Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð´Ð»Ñ? Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ð¾Ð³Ð¾ Ñ?Ð°Ð¹Ð»Ð° [%s]\n"
 
-#: ../src/o_misc.c:904
+#: ../src/o_misc.c:907
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ñ?Ð¹ Ñ?Ð°Ð¹Ð» [%s]\n"
@@ -1202,57 +1204,47 @@ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ñ?Ð¹ Ñ?Ð°Ð¹Ð» [%s]
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ°: Ð¾Ð±Ñ?ÐµÐºÑ? NULL Ð² o_move_end!\n"
 
-#: ../src/o_move.c:385
+#: ../src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "Ð?Ñ?! Ð?Ð¾Ð¿Ñ?Ñ?ÐºÐ° Ð½Ð°Ð¹Ñ?Ð¸ Ñ?Ñ?Ð¾-Ð»Ð¸Ð±Ð¾, Ð½Ð¾ Ð½Ð¸Ñ?ÐµÐ³Ð¾ Ð½Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°ÐµÑ?Ñ?Ñ?!\n"
 
-#: ../src/o_move.c:406
+#: ../src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð¾Ð±Ñ?ÐµÐºÑ? Ð½Ðµ Ð»Ð¸Ð½Ð¸Ñ? Ð² o_move_check_endpoint\n"
 
-#: ../src/o_net.c:253
-#, c-format
-msgid "Got an invalid which one in o_net_draw_xor_single\n"
+#: ../src/o_net.c:176
+#, fuzzy, c-format
+msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ? Ð² o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:630
+#: ../src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:692
+#: ../src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
 #. try to exit gracefully
-#: ../src/o_net.c:1080 ../src/o_net.c:1117 ../src/o_net.c:1188
-#: ../src/o_net.c:1224
+#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
+#: ../src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr "Ð?Ð¾Ð¿Ñ?Ñ?ÐºÐ° Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð±Ð¾Ð»ÐµÐµ Ð´Ð²Ñ?Ñ? Ñ?Ð°Ð·Ñ?Ñ?Ð²Ð¾Ð² Ñ?Ð¸Ð½Ñ?. Ð?Ð½Ñ?Ñ?Ñ?ÐµÐ½Ð½Ñ?Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ° gschem.\n"
 
-#: ../src/o_net.c:1294
+#: ../src/o_net.c:1196
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ?Ð¸ %s Ð½Ð¸ Ð² Ð¾Ð´Ð½Ð¾Ð¹ Ð¸Ð· Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñ?ÐµÐº ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ?Ð¾Ð²\n"
 
-#: ../src/o_path.c:483
-#, fuzzy, c-format
-msgid "Unknown end for path (%d)\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð´Ñ?Ð³Ð¸ (%d)\n"
-
-#: ../src/o_path.c:524
-#, fuzzy, c-format
-msgid "Unknown type for path !\n"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð´Ñ?Ð³Ð¸ !\n"
-
-#: ../src/o_path.c:594
+#: ../src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ° (Ñ? Ð·Ð°Ð»Ð¸Ð²ÐºÐ¾Ð¹)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:627
+#: ../src/o_picture.c:166 ../src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³Ñ?Ð·Ð¸Ñ?Ð°Ñ?Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ: [%s]"
@@ -1261,7 +1253,7 @@ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³Ñ?Ð·Ð¸Ñ?Ð°Ñ?Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ: [%s]"
 msgid "Picture"
 msgstr "Ð?Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: ../src/o_picture.c:535 ../src/x_attribedit.c:141
+#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ°: Ð¾Ð±Ñ?ÐµÐºÑ? NULL!\n"
@@ -1381,7 +1373,7 @@ msgstr "Ð?Ñ?Ðµ"
 msgid "Components"
 msgstr "Ð?Ð¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ?Ñ?"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:416
+#: ../src/x_attribedit.c:471 ../src/x_window.c:364
 msgid "Nets"
 msgstr "Ð?Ñ?Ð¾Ð²Ð¾Ð´Ð½Ð¸ÐºÐ¸"
 
@@ -1389,154 +1381,153 @@ msgstr "Ð?Ñ?Ð¾Ð²Ð¾Ð´Ð½Ð¸ÐºÐ¸"
 msgid "Replace existing attributes"
 msgstr ""
 
-#: ../src/x_autonumber.c:412
+#: ../src/x_autonumber.c:413
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
 #. duplicate slot in used_slots
-#: ../src/x_autonumber.c:427
+#: ../src/x_autonumber.c:428
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:695
+#: ../src/x_autonumber.c:696
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:746
+#: ../src/x_autonumber.c:748
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:880
+#: ../src/x_autonumber.c:883
 #, fuzzy
 msgid "Diagonal"
 msgstr "Ð´Ð¸Ð°Ð³Ð¾Ð½Ð°Ð»Ñ?Ð½Ñ?Ð¹"
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Top to bottom"
 msgstr ""
 
-#: ../src/x_autonumber.c:881
+#: ../src/x_autonumber.c:884
 msgid "Bottom to top"
 msgstr ""
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 #, fuzzy
 msgid "Left to right"
 msgstr "Ð»ÐµÐ²Ñ?Ð¹ Ð¿Ñ?Ð°Ð²Ñ?Ð¹"
 
-#: ../src/x_autonumber.c:882
+#: ../src/x_autonumber.c:885
 msgid "Right to left"
 msgstr ""
 
-#: ../src/x_autonumber.c:883
+#: ../src/x_autonumber.c:886
 #, fuzzy
 msgid "File order"
 msgstr "Ð¿Ð¾Ñ?Ñ?Ð´Ð¾Ðº Ñ?Ð°Ð¹Ð»Ð¾Ð²"
 
-#: ../src/x_autonumber.c:1219
+#: ../src/x_autonumber.c:1222
 msgid "Autonumber text"
 msgstr "Ð?Ð²Ñ?Ð¾Ð½Ñ?Ð¼ÐµÑ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?"
 
 #. scope section
-#: ../src/x_autonumber.c:1243
+#: ../src/x_autonumber.c:1246
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../src/x_autonumber.c:1265
+#: ../src/x_autonumber.c:1268
 #, fuzzy
 msgid "Search for:"
 msgstr "Ð¿Ð¾Ð¸Ñ?Ðº Ñ?Ð¾ÐºÑ?Ñ?Ð°"
 
-#: ../src/x_autonumber.c:1279
+#: ../src/x_autonumber.c:1282
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "Ð?Ð²Ñ?Ð¾Ð½Ñ?Ð¼ÐµÑ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../src/x_autonumber.c:1286
+#: ../src/x_autonumber.c:1289
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
 #, fuzzy
 msgid "Selected objects"
 msgstr "Ð²Ñ?Ð±Ñ?Ð°Ð½Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../src/x_autonumber.c:1299 ../src/x_autonumber.c:1308
+#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
 #, fuzzy
 msgid "Current page"
 msgstr "Ñ?ÐµÐºÑ?Ñ?Ð¸Ð¹ Ð»Ð¸Ñ?Ñ?"
 
-#: ../src/x_autonumber.c:1300 ../src/x_autonumber.c:1309
+#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ñ?Ð¸Ñ?"
 
-#: ../src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1314
 msgid "Overwrite existing numbers"
 msgstr ""
 
 #. Options section
-#: ../src/x_autonumber.c:1316
+#: ../src/x_autonumber.c:1319
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../src/x_autonumber.c:1338
+#: ../src/x_autonumber.c:1341
 #, fuzzy
 msgid "Starting number:"
 msgstr "Ñ?Ñ?Ð°Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ð½Ð¾Ð¼ÐµÑ?"
 
-#: ../src/x_autonumber.c:1345
+#: ../src/x_autonumber.c:1348
 #, fuzzy
 msgid "Sort order:"
 msgstr "Ð¿Ð¾Ñ?Ñ?Ð´Ð¾Ðº Ñ?Ð¾Ñ?Ñ?Ð¸Ñ?Ð¾Ð²ÐºÐ¸"
 
-#: ../src/x_autonumber.c:1366
+#: ../src/x_autonumber.c:1369
 msgid "Remove numbers"
 msgstr ""
 
-#: ../src/x_autonumber.c:1370
+#: ../src/x_autonumber.c:1373
 msgid "Automatic slotting"
 msgstr ""
 
-#: ../src/x_color.c:52 ../src/x_color.c:61 ../src/x_color.c:124
-#: ../src/x_color.c:172
+#: ../src/x_color.c:94 ../src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? Ñ?Ð²ÐµÑ? %s!\n"
 
-#: ../src/x_color.c:52
+#: ../src/x_color.c:94
 msgid "black"
 msgstr "Ñ?ÐµÑ?Ð½Ñ?Ð¹"
 
-#: ../src/x_color.c:61
+#: ../src/x_color.c:103
 msgid "white"
 msgstr "Ð±ÐµÐ»Ñ?Ð¹"
 
-#: ../src/x_color.c:103 ../src/x_color.c:140
-#, c-format
-msgid "Could not find the color %s!\n"
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ?Ð¸ Ñ?Ð²ÐµÑ? %s!\n"
-
-#: ../src/x_color.c:106 ../src/x_color.c:143
-#, c-format
-msgid "Defaulting color to white\n"
-msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ° Ð±ÐµÐ»Ð¾Ð³Ð¾ Ñ?Ð²ÐµÑ?Ð° Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?\n"
+#: ../src/x_color.c:125
+#, fuzzy, c-format
+msgid "Could not allocate display color %i!\n"
+msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? Ñ?Ð²ÐµÑ? %s!\n"
 
-#: ../src/x_color.c:113 ../src/x_color.c:150
-#, c-format
-msgid "Ack! Cannot allocate white!\n"
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? Ð±ÐµÐ»Ñ?Ð¹!\n"
+#: ../src/x_color.c:147
+#, fuzzy, c-format
+msgid "Could not allocate outline color %i!\n"
+msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? Ñ?Ð²ÐµÑ? %s!\n"
 
-#: ../src/x_color.c:191 ../src/x_color.c:207
+#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Ð?Ð¾Ð¿Ñ?Ñ?ÐºÐ° Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð½ÐµÐ²ÐµÑ?Ð½Ð¾Ð³Ð¾ Ñ?Ð²ÐµÑ?Ð°: %d\n"
 
+#: ../src/x_color.c:214
+#, fuzzy, c-format
+msgid "Tried to get an invalid outline color: %d\n"
+msgstr "Ð?Ð¾Ð¿Ñ?Ñ?ÐºÐ° Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð½ÐµÐ²ÐµÑ?Ð½Ð¾Ð³Ð¾ Ñ?Ð²ÐµÑ?Ð°: %d\n"
+
 #. GtkLabel
 #: ../src/x_compselect.c:1040
 #, fuzzy
@@ -1544,7 +1535,7 @@ msgid "Filter:"
 msgstr "Ð¤Ð¸Ð»Ñ?Ñ?Ñ?"
 
 #. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3591
+#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
 #: ../src/x_multiattrib.c:1601
 msgid "Name"
 msgstr "Ð?Ð¼Ñ?"
@@ -1585,11 +1576,11 @@ msgid "Preview"
 msgstr "Ð?Ñ?ÐµÐ´Ð²Ð°Ñ?Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?"
 
 #. dialog not created yet
-#: ../src/x_dialog.c:176
+#: ../src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Ð¢ÐµÐºÑ?Ñ?Ð¾Ð²Ð¾Ðµ Ð²Ñ?Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ..."
 
-#: ../src/x_dialog.c:207
+#: ../src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1599,199 +1590,202 @@ msgstr ""
 "Ð¿ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ñ?Ñ?Ð¾Ñ? Ð² Ð¾ÐºÐ½Ð¾, Ñ?ÐµÐ»ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð»Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ¸ Ñ?ÐµÐºÑ?Ñ?Ð°.\n"
 "Ð¡Ñ?ÐµÐ´Ð½Ñ?Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ° Ð¿Ñ?ÐµÐ´Ð½Ð°Ð·Ð½Ð°Ñ?ÐµÐ½Ð° Ð´Ð»Ñ? Ð²Ñ?Ð°Ñ?ÐµÐ½Ð¸Ñ? Ð²Ð¾ Ð²Ñ?ÐµÐ¼Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ¸."
 
-#: ../src/x_dialog.c:296
+#: ../src/x_dialog.c:294
 #, c-format
 msgid "Lower Left"
 msgstr "Ð?Ð¸Ð¶Ð½Ð¸Ð¹ Ð»ÐµÐ²Ñ?Ð¹"
 
-#: ../src/x_dialog.c:307
+#: ../src/x_dialog.c:305
 #, c-format
 msgid "Middle Left"
 msgstr "Ð¡Ñ?ÐµÐ´Ð½Ð¸Ð¹ Ð»ÐµÐ²Ñ?Ð¹"
 
-#: ../src/x_dialog.c:318
+#: ../src/x_dialog.c:316
 #, c-format
 msgid "Upper Left"
 msgstr "Ð?ÐµÑ?Ñ?Ð½Ð¸Ð¹ Ð»ÐµÐ²Ñ?Ð¹"
 
-#: ../src/x_dialog.c:329
+#: ../src/x_dialog.c:327
 #, c-format
 msgid "Lower Middle"
 msgstr "Ð?Ð¸Ð¶Ð½Ð¸Ð¹ Ñ?Ñ?ÐµÐ´Ð½Ð¸Ð¹"
 
-#: ../src/x_dialog.c:340
+#: ../src/x_dialog.c:338
 #, c-format
 msgid "Middle Middle"
 msgstr "Ð¡Ñ?ÐµÐ´Ð½Ð¸Ð¹ Ñ?Ñ?ÐµÐ´Ð½Ð¸Ð¹"
 
-#: ../src/x_dialog.c:351
+#: ../src/x_dialog.c:349
 #, c-format
 msgid "Upper Middle"
 msgstr "Ð?ÐµÑ?Ñ?Ð½Ð¸Ð¹ Ñ?Ñ?ÐµÐ´Ð½Ð¸Ð¹"
 
-#: ../src/x_dialog.c:362
+#: ../src/x_dialog.c:360
 #, c-format
 msgid "Lower Right"
 msgstr "Ð?Ð¸Ð¶Ð½Ð¸Ð¹ Ð¿Ñ?Ð°Ð²Ñ?Ð¹"
 
-#: ../src/x_dialog.c:373
+#: ../src/x_dialog.c:371
 #, c-format
 msgid "Middle Right"
 msgstr "Ð¡Ñ?ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ñ?Ð°Ð²Ñ?Ð¹"
 
-#: ../src/x_dialog.c:384
+#: ../src/x_dialog.c:382
 #, c-format
 msgid "Upper Right"
 msgstr "Ð?ÐµÑ?Ñ?Ð½Ð¸Ð¹ Ð¿Ñ?Ð°Ð²Ñ?Ð¹"
 
-#: ../src/x_dialog.c:498
+#: ../src/x_dialog.c:496
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð°Ð·Ð¼ÐµÑ?Ð° Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#: ../src/x_dialog.c:532
+#: ../src/x_dialog.c:530
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../src/x_dialog.c:564
+#: ../src/x_dialog.c:562
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../src/x_dialog.c:579
+#: ../src/x_dialog.c:577
 #, fuzzy
 msgid "Color:"
 msgstr "Ð¦Ð²ÐµÑ?"
 
-#: ../src/x_dialog.c:586
+#: ../src/x_dialog.c:584
 msgid "Size:"
 msgstr ""
 
-#: ../src/x_dialog.c:595
+#: ../src/x_dialog.c:593
 #, fuzzy
 msgid "Alignment:"
 msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ð²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ñ? Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#: ../src/x_dialog.c:649
+#: ../src/x_dialog.c:647
 msgid "Solid"
 msgstr "Ð¡Ð¿Ð»Ð¾Ñ?Ð½Ð¾Ð¹"
 
-#: ../src/x_dialog.c:650
+#: ../src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Ð?Ñ?Ð½ÐºÑ?Ð¸Ñ? Ñ? Ñ?Ð¾Ñ?ÐºÐ¾Ð¹"
 
-#: ../src/x_dialog.c:651
+#: ../src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Ð?Ñ?Ð½ÐºÑ?Ð¸Ñ? Ñ? Ð´ÐµÑ?Ð¸Ñ?Ð¾Ð¼"
 
-#: ../src/x_dialog.c:652
+#: ../src/x_dialog.c:650
 msgid "Center"
 msgstr "Ð¦ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ð¹"
 
-#: ../src/x_dialog.c:653
+#: ../src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ð²ÐµÐ½Ð½Ñ?Ð¹"
 
-#: ../src/x_dialog.c:779 ../src/x_dialog.c:781 ../src/x_dialog.c:783
-#: ../src/x_dialog.c:964 ../src/x_dialog.c:965 ../src/x_dialog.c:966
-#: ../src/x_dialog.c:974 ../src/x_dialog.c:1157 ../src/x_dialog.c:1159
-#: ../src/x_dialog.c:1161 ../src/x_dialog.c:1163 ../src/x_dialog.c:1165
-#: ../src/x_dialog.c:1368 ../src/x_dialog.c:1369 ../src/x_dialog.c:1370
-#: ../src/x_dialog.c:1371 ../src/x_dialog.c:1372 ../src/x_dialog.c:1380
-#, c-format
+#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
+#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
+#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
+#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
+#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
+#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*Ð½ÐµÐ¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾*"
 
-#: ../src/x_dialog.c:858
+#: ../src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð¸Ñ?Ð¸Ð½Ñ? Ð¸ Ñ?Ð¸Ð¿Ð° Ð»Ð¸Ð½Ð¸Ð¸"
 
-#: ../src/x_dialog.c:897
-#, fuzzy
-msgid "Width:"
-msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð°"
-
-#: ../src/x_dialog.c:901 ../src/x_print.c:307
+#: ../src/x_dialog.c:1017 ../src/x_print.c:307
 #, fuzzy
 msgid "Type:"
 msgstr "Ð¢Ð¸Ð¿"
 
-#: ../src/x_dialog.c:905
+#: ../src/x_dialog.c:1021
+#, fuzzy
+msgid "Width:"
+msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð°"
+
+#: ../src/x_dialog.c:1025
 #, fuzzy
 msgid "Dash Length:"
 msgstr "Ð?Ð»Ð¸Ð½Ð° Ð´ÐµÑ?Ð¸Ñ?Ð° Ð»Ð¸Ð½Ð¸Ð¸"
 
-#: ../src/x_dialog.c:909
+#: ../src/x_dialog.c:1029
 #, fuzzy
 msgid "Dash Space:"
 msgstr "Ð?ÐµÑ?Ð¸Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ð¾Ð±ÐµÐ» Ð»Ð¸Ð½Ð¸Ð¸"
 
-#: ../src/x_dialog.c:1014
+#: ../src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Ð?Ð¾Ð³Ð½Ñ?Ñ?Ñ?"
 
-#: ../src/x_dialog.c:1015
+#: ../src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Ð?Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾"
 
-#: ../src/x_dialog.c:1016
+#: ../src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Ð¯Ñ?ÐµÐ¹ÐºÐ°"
 
-#: ../src/x_dialog.c:1017
+#: ../src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Ð¨Ñ?Ñ?Ð¸Ñ?"
 
-#: ../src/x_dialog.c:1281
+#: ../src/x_dialog.c:1470
+msgid "Edit Fill Type"
+msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð¸Ð¿Ð° Ð·Ð°Ð»Ð¸Ð²ÐºÐ¸"
+
+#: ../src/x_dialog.c:1508
 #, fuzzy
 msgid "Fill Type:"
 msgstr "Ð¢Ð¸Ð¿ Ð·Ð°Ð»Ð¸Ð²ÐºÐ¸"
 
-#: ../src/x_dialog.c:1285
+#: ../src/x_dialog.c:1512
 #, fuzzy
 msgid "Line Width:"
 msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð° Ð»Ð¸Ð½Ð¸Ð¸"
 
-#: ../src/x_dialog.c:1289
+#: ../src/x_dialog.c:1516
 #, fuzzy
 msgid "Angle 1:"
 msgstr "Ð£Ð³Ð¾Ð»1"
 
-#: ../src/x_dialog.c:1293
+#: ../src/x_dialog.c:1520
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "Ð?Ð°ÐºÐ»Ð¾Ð½1"
 
-#: ../src/x_dialog.c:1297
+#: ../src/x_dialog.c:1524
 #, fuzzy
 msgid "Angle 2:"
 msgstr "Ð£Ð³Ð¾Ð»2"
 
-#: ../src/x_dialog.c:1301
+#: ../src/x_dialog.c:1528
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "Ð?Ð°ÐºÐ»Ð¾Ð½2"
 
-#: ../src/x_dialog.c:1480
+#: ../src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð´Ñ?Ð³Ð¸"
 
-#: ../src/x_dialog.c:1520
+#: ../src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1528
+#: ../src/x_dialog.c:1705
 #, fuzzy
 msgid "Start Angle:"
 msgstr "Ð?Ð°Ñ?Ð°Ð»Ð¾ Ñ?Ð³Ð»Ð°"
 
-#: ../src/x_dialog.c:1536
+#: ../src/x_dialog.c:1713
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "Ð£Ð³Ð¾Ð» Ñ?Ð°Ð·Ð²ÐµÑ?Ñ?ÐºÐ¸ Ð² Ð³Ñ?Ð°Ð´Ñ?Ñ?Ð°Ñ?"
 
-#: ../src/x_dialog.c:1653
+#: ../src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1799,50 +1793,50 @@ msgstr ""
 "Ð¡Ð¼ÐµÑ?ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ? Ð¿ÐµÑ?ÐµÐ²Ð¾Ð´Ð°?\n"
 "(Ð¾ Ð´Ð»Ñ? Ð½Ð°Ñ?Ð°Ð»Ð° Ð¾Ñ?Ñ?Ñ?ÐµÑ?Ð°)"
 
-#: ../src/x_dialog.c:1721
+#: ../src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#: ../src/x_dialog.c:1751
+#: ../src/x_dialog.c:1928
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ñ?Ð¹ Ñ?Ð°Ð·Ð¼ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#: ../src/x_dialog.c:1826
+#: ../src/x_dialog.c:2004
 #, fuzzy
 msgid "Snap Size"
 msgstr "Ð¡ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¸"
 
-#: ../src/x_dialog.c:1856
+#: ../src/x_dialog.c:2034
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ñ?Ð¹ Ñ?Ð°Ð³ Ñ?ÐµÑ?ÐºÐ¸ Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÐ¸"
 
-#: ../src/x_dialog.c:1929
+#: ../src/x_dialog.c:2107
 msgid "Edit slot number"
 msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ð½Ð¾Ð¼ÐµÑ?Ð° Ñ?Ð»Ð¾Ñ?Ð°"
 
-#: ../src/x_dialog.c:1960
+#: ../src/x_dialog.c:2138
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ð½Ð¾Ð¼ÐµÑ?Ð° Ñ?Ð»Ð¾Ñ?Ð°"
 
-#: ../src/x_dialog.c:2022
+#: ../src/x_dialog.c:2200
 msgid "About..."
 msgstr "Ð?..."
 
-#: ../src/x_dialog.c:2042
+#: ../src/x_dialog.c:2220
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr ""
 "gEDA: Ð¡Ð¸Ñ?Ñ?ÐµÐ¼Ð° Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð?Ð Ð¾ÐµÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ñ? Ñ?Ñ?ÐµÐ¼ (GPL)"
 
-#: ../src/x_dialog.c:2046
+#: ../src/x_dialog.c:2224
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "Ð²ÐµÑ?Ñ?Ð¸Ñ? gschem %s%s.%s"
 
-#: ../src/x_dialog.c:2054
+#: ../src/x_dialog.c:2232
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1856,153 +1850,161 @@ msgstr ""
 "Ð? Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ð¼Ð¸ (Ñ?Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð¹Ð» AUTHORS) \n"
 "Ð?ÐµÑ?ÐµÐ²Ð¾Ð´: Andy Shevchenko <andy@xxxxxxxxxxxx>"
 
-#: ../src/x_dialog.c:2119
+#: ../src/x_dialog.c:2295
 msgid "Coords"
 msgstr "Ð?Ð¾Ð¾Ñ?Ð´Ð¸Ð½Ð°Ñ?Ñ?"
 
-#: ../src/x_dialog.c:2140
+#: ../src/x_dialog.c:2316
 msgid "Screen"
 msgstr "ÐÐºÑ?Ð°Ð½"
 
-#: ../src/x_dialog.c:2149
+#: ../src/x_dialog.c:2325
 msgid "World"
 msgstr "Ð?Ð¸Ñ?"
 
-#: ../src/x_dialog.c:2188
+#: ../src/x_dialog.c:2364
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2194
+#: ../src/x_dialog.c:2370
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2197
+#: ../src/x_dialog.c:2373
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2206
+#: ../src/x_dialog.c:2382
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2209
+#: ../src/x_dialog.c:2385
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2212
+#: ../src/x_dialog.c:2388
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ?"
 
-#: ../src/x_dialog.c:2215 ../src/x_window.c:434
+#: ../src/x_dialog.c:2391 ../src/x_window.c:382
 msgid "Text"
 msgstr "Ð¢ÐµÐºÑ?Ñ?"
 
-#: ../src/x_dialog.c:2221
+#: ../src/x_dialog.c:2397
 #, fuzzy
 msgid "Selection"
 msgstr "Ð²Ñ?Ð±Ð¾Ñ?"
 
-#: ../src/x_dialog.c:2224
+#: ../src/x_dialog.c:2400
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2227
+#: ../src/x_dialog.c:2403
 #, fuzzy
 msgid "Zoom box"
 msgstr "Ð?Ð±Ð»Ð°Ñ?Ñ?Ñ? Ð´Ð»Ñ? Ð¼Ð°Ñ?Ñ?Ñ?Ð°Ð±Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../src/x_dialog.c:2236
+#: ../src/x_dialog.c:2412
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2239
+#: ../src/x_dialog.c:2415
 #, fuzzy
 msgid "Net junction"
 msgstr "Ð?ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
-#: ../src/x_dialog.c:2242
+#: ../src/x_dialog.c:2418
+msgid "Mesh grid major"
+msgstr ""
+
+#: ../src/x_dialog.c:2421
+msgid "Mesh grid minor"
+msgstr ""
+
+#: ../src/x_dialog.c:2424
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2390
+#: ../src/x_dialog.c:2570
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ°: Ð¾Ð±Ñ?ÐµÐºÑ? NULL Ð² color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2452
+#: ../src/x_dialog.c:2633
 msgid "Color Edit"
 msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð²ÐµÑ?Ð°"
 
-#: ../src/x_dialog.c:2483
+#: ../src/x_dialog.c:2664
 msgid "Object color:"
 msgstr ""
 
-#: ../src/x_dialog.c:2605
+#: ../src/x_dialog.c:2786
 #, fuzzy
 msgid "Function"
 msgstr "Ð?ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
-#: ../src/x_dialog.c:2612
+#: ../src/x_dialog.c:2793
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "Ð¤Ñ?Ð½ÐºÑ?Ð¸Ñ? : ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ?Ð¸Ñ? ÐºÐ»Ð°Ð²Ð¸Ñ?"
 
-#: ../src/x_dialog.c:2921
+#: ../src/x_dialog.c:3102
 #, fuzzy
 msgid "Find Text"
 msgstr "Ð?Ð°Ð¹Ñ?Ð¸ Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../src/x_dialog.c:2952
+#: ../src/x_dialog.c:3133
 msgid "Text to find:"
 msgstr "Ð¢ÐµÐºÑ?Ñ? Ð´Ð»Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ°:"
 
-#: ../src/x_dialog.c:2962
+#: ../src/x_dialog.c:3143
 msgid "descend into hierarchy"
 msgstr "Ð¡Ð¿Ñ?Ñ?Ðº Ð¿Ð¾ Ð¸ÐµÑ?Ð°Ñ?Ñ?Ð¸Ð¸"
 
-#: ../src/x_dialog.c:3026
+#: ../src/x_dialog.c:3208
 #, fuzzy
 msgid "Hide Text"
 msgstr "Ð¡ÐºÑ?Ñ?Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../src/x_dialog.c:3057
+#: ../src/x_dialog.c:3239
 msgid "Hide text starting with:"
 msgstr "Ð¡ÐºÑ?Ñ?Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?, Ð½Ð°Ñ?Ð¸Ð½Ð°Ñ?Ñ?Ð¸Ð¹Ñ?Ñ? Ñ?:"
 
-#: ../src/x_dialog.c:3125
+#: ../src/x_dialog.c:3308
 #, fuzzy
 msgid "Show Text"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../src/x_dialog.c:3156
+#: ../src/x_dialog.c:3339
 msgid "Show text starting with:"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?, Ð½Ð°Ñ?Ð¸Ð½Ð°Ñ?Ñ?Ð¸Ð¹Ñ?Ñ? Ñ?:"
 
-#: ../src/x_dialog.c:3613
+#: ../src/x_dialog.c:3796
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: ../src/x_dialog.c:3707
+#: ../src/x_dialog.c:3890
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: ../src/x_dialog.c:3713
+#: ../src/x_dialog.c:3896
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
 #. secondary label
-#: ../src/x_dialog.c:3742
+#: ../src/x_dialog.c:3925
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: ../src/x_dialog.c:3762
+#: ../src/x_dialog.c:3945
 msgid "_Close without saving"
 msgstr ""
 
-#: ../src/x_dialog.c:4096
+#: ../src/x_dialog.c:4279
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -2013,11 +2015,25 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: ../src/x_dialog.c:4098
+#: ../src/x_dialog.c:4281
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ?"
 
+#: ../src/x_dialog.c:4317
+#, fuzzy
+msgid "Pin type"
+msgstr "Ð¢Ð¸Ð¿ Ð»Ð¸Ð½Ð¸Ð¸"
+
+#: ../src/x_dialog.c:4341
+#, fuzzy
+msgid "Net pin"
+msgstr "Ð?ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
+
+#: ../src/x_dialog.c:4343
+msgid "Bus pin (graphical)"
+msgstr ""
+
 #: ../src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Ð¡Ñ?ÐµÐ¼Ñ?"
@@ -2162,51 +2178,56 @@ msgid "/Edit..."
 msgstr "/Ð?Ñ?Ð°Ð²ÐºÐ°..."
 
 #: ../src/x_menus.c:49
+#, fuzzy
+msgid "/Edit pin type..."
+msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð¸Ð¿Ð° Ð»Ð¸Ð½Ð¸Ð¸"
+
+#: ../src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
-#: ../src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Move"
 msgstr "/Ð?ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../src/x_menus.c:51
+#: ../src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ?"
 
-#: ../src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Ð?Ð³Ð»Ñ?Ð±Ñ? Ñ?Ñ?ÐµÐ¼Ñ?"
 
-#: ../src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Ð?Ð³Ð»Ñ?Ð±Ñ? Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð°"
 
-#: ../src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Up"
 msgstr "/Ð?Ð°Ð²ÐµÑ?Ñ?"
 
-#: ../src/x_menus.c:323
+#: ../src/x_menus.c:316
 #, fuzzy, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Ð?Ð¾Ð¿Ñ?Ñ?ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ¸ Ñ?Ñ?Ð²Ñ?Ñ?Ð²Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð´Ð»Ñ? Ð½ÐµÑ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ñ?Ñ?ÐµÐ³Ð¾ Ð¿Ñ?Ð½ÐºÑ?Ð° Ð¼ÐµÐ½Ñ?\n"
 
-#: ../src/x_menus.c:347
+#: ../src/x_menus.c:340
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?!\n"
 
-#: ../src/x_menus.c:360
+#: ../src/x_menus.c:353
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Ð?Ð¾Ð¿Ñ?Ñ?ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ¸ Ñ?Ñ?Ð²Ñ?Ñ?Ð²Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð´Ð»Ñ? Ð½ÐµÑ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ñ?Ñ?ÐµÐ³Ð¾ Ð²Ñ?Ñ?ÐºÐ°ÐºÐ¸Ð²Ð°Ñ?Ñ?ÐµÐ³Ð¾ "
 "menu_item\n"
 
 #. Remove this entry from all menus
-#: ../src/x_menus.c:455
+#: ../src/x_menus.c:462
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²Ñ?Ð·Ð²Ð°Ñ?Ñ? %s\n"
 
-#: ../src/x_menus.c:516
+#: ../src/x_menus.c:524
 #, fuzzy
 msgid "Clear"
 msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ?"
@@ -2273,6 +2294,11 @@ msgstr "Ð?Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾"
 msgid "Right click on the filename for more options..."
 msgstr "Ð©ÐµÐ»ÐºÐ½Ð¸Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð¾Ð¹ ÐºÐ½Ð¾Ð¿ÐºÐ¾Ð¹ Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ Ñ?Ð°Ð¹Ð»Ð° Ð´Ð»Ñ? Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ñ? Ð¾Ð¿Ñ?Ð¸Ð¹..."
 
+#: ../src/x_preview.c:223
+#, fuzzy
+msgid "Preview Buffer"
+msgstr "Ð?Ñ?Ñ?ÐµÑ?"
+
 #: ../src/x_print.c:84
 #, fuzzy
 msgid "Select PostScript Filename..."
@@ -2354,55 +2380,35 @@ msgstr "Ð¢ÐµÐºÑ?Ñ?Ð°Ñ? Ñ?Ñ?ÐµÐ¼Ð° Ñ?Ð°Ñ?Ð¿ÐµÑ?Ð°Ñ?Ð°Ð½Ð° Ð½Ð° [%s]\n"
 msgid "Couldn't allocate gc\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? gc\n"
 
-#: ../src/x_window.c:94
-#, c-format
-msgid "Couldn't allocate xor_gc\n"
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? xor_gc\n"
-
-#: ../src/x_window.c:107
-#, c-format
-msgid "Couldn't allocate outline_xor_gc\n"
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? outline_xor_gc\n"
-
-#: ../src/x_window.c:123
-#, c-format
-msgid "Couldn't allocate bounding_xor_gc\n"
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? bounding_xor_gc\n"
-
-#: ../src/x_window.c:130
-#, c-format
-msgid "Couldn't allocate bus_gc\n"
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? bus_gc\n"
-
-#: ../src/x_window.c:369
+#: ../src/x_window.c:317
 msgid "New file"
 msgstr "Ð?Ð¾Ð²Ñ?Ð¹ Ñ?Ð°Ð¹Ð»"
 
-#: ../src/x_window.c:375
+#: ../src/x_window.c:323
 msgid "Open"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ?"
 
-#: ../src/x_window.c:376
+#: ../src/x_window.c:324
 msgid "Open file..."
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ð»..."
 
-#: ../src/x_window.c:382
+#: ../src/x_window.c:330
 msgid "Save"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?"
 
-#: ../src/x_window.c:383
+#: ../src/x_window.c:331
 msgid "Save file"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ð»"
 
-#: ../src/x_window.c:391
+#: ../src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð½ÐµÐµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
-#: ../src/x_window.c:398
+#: ../src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð½Ð¾Ðµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
-#: ../src/x_window.c:407
+#: ../src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2414,7 +2420,7 @@ msgstr ""
 "Ñ?ÐµÐ»ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð»Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ¸\n"
 "Ð?Ñ?Ð°Ð²Ð°Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ° Ð¼Ñ?Ñ?Ð¸ Ð´Ð»Ñ? Ð¾Ñ?Ð¼ÐµÐ½Ñ?"
 
-#: ../src/x_window.c:417
+#: ../src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2422,7 +2428,7 @@ msgstr ""
 "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð¿Ñ?Ð¾Ð²Ð¾Ð´Ð½Ð¸ÐºÐ¸\n"
 "Ð?Ñ?Ð°Ð²Ð°Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ° Ð¼Ñ?Ñ?Ð¸ Ð´Ð»Ñ? Ð¾Ñ?Ð¼ÐµÐ½Ñ?"
 
-#: ../src/x_window.c:427
+#: ../src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2430,79 +2436,79 @@ msgstr ""
 "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¸Ð½Ñ?\n"
 "Ð?Ñ?Ð°Ð²Ð°Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ° Ð¼Ñ?Ñ?Ð¸ Ð´Ð»Ñ? Ð¾Ñ?Ð¼ÐµÐ½Ñ?"
 
-#: ../src/x_window.c:435
+#: ../src/x_window.c:383
 msgid "Add Text..."
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?..."
 
-#: ../src/x_window.c:445
+#: ../src/x_window.c:393
 msgid "Select"
 msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ?"
 
-#: ../src/x_window.c:446
+#: ../src/x_window.c:394
 msgid "Select mode"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð²Ñ?Ð±Ð¾Ñ?ÐºÐ¸"
 
-#: ../src/x_window.c:533
+#: ../src/x_window.c:481
 msgid "Pick"
 msgstr ""
 
-#: ../src/x_window.c:549
+#: ../src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Ð?Ð¾Ð²Ñ?Ð¾Ñ?/Ð¿Ñ?Ñ?Ñ?Ð¾"
 
-#: ../src/x_window.c:559
+#: ../src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Ð?ÐµÐ½Ñ?/Ð?Ñ?Ð¼ÐµÐ½Ð°"
 
-#: ../src/x_window.c:561
+#: ../src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Ð¦ÐµÐ½Ñ?Ñ?/Ð?Ñ?Ð¼ÐµÐ½Ð°"
 
-#: ../src/x_window.c:783
+#: ../src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Ð?Ð°Ð³Ñ?Ñ?Ð¶Ð°ÐµÑ?Ñ?Ñ? Ñ?Ñ?ÐµÐ¼Ð° [%s]\n"
 
-#: ../src/x_window.c:795
+#: ../src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³Ñ?Ð·Ð¸Ñ?Ð°Ñ?Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ: [%s]"
 
-#: ../src/x_window.c:804
+#: ../src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "Ð?Ð¾Ð²Ñ?Ð¹ Ñ?Ð°Ð¹Ð»"
 
 #. an error occured when saving page to file
-#: ../src/x_window.c:909
+#: ../src/x_window.c:859
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? [%s]\n"
 
-#: ../src/x_window.c:910
+#: ../src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð¿Ñ?Ñ?ÐºÐµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ?"
 
-#: ../src/x_window.c:919
+#: ../src/x_window.c:869
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ð°Ð½Ð¾ ÐºÐ°Ðº [%s]\n"
 
-#: ../src/x_window.c:921
+#: ../src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¾ [%s]\n"
 
-#: ../src/x_window.c:923
+#: ../src/x_window.c:873
 msgid "Saved"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¾"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Ð?Ñ?Ð²ÐµÑ?Ð¶ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? [%s]\n"
 
-#: ../src/x_window.c:997
+#: ../src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð¸Ðµ [%s]\n"
@@ -2516,6 +2522,79 @@ msgstr ""
 msgid "gEDA Schematic Editor"
 msgstr "Ð?Ð³Ð»Ñ?Ð±Ñ? Ñ?Ñ?ÐµÐ¼Ñ?"
 
+#, fuzzy
+#~ msgid "Cut Buffer"
+#~ msgstr "Ð?Ñ?Ñ?ÐµÑ?"
+
+#, fuzzy
+#~ msgid "Copy Buffer"
+#~ msgstr "Ð?Ñ?Ñ?ÐµÑ?"
+
+#~ msgid "Toggle Grid On/Off"
+#~ msgstr "Ð?ÐµÑ?ÐµÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ Ñ?ÐµÑ?ÐºÐ¸"
+
+#~ msgid "Invalid color [%s] passed to %s\n"
+#~ msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð²ÐµÑ? [%s] Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ %s\n"
+
+#~ msgid "You must set the GEDADATA environment variable!\n"
+#~ msgstr "Ð?Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ñ? Ð¾ÐºÑ?Ñ?Ð¶ÐµÐ½Ð¸Ñ? GEDADATA!\n"
+
+#~ msgid "Grid ON\n"
+#~ msgstr "Ð¡ÐµÑ?ÐºÐ° Ð²ÐºÐ».\n"
+
+#~ msgid "Unknown end for arc (%d)\n"
+#~ msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð´Ñ?Ð³Ð¸ (%d)\n"
+
+#~ msgid "Unknown type for arc !\n"
+#~ msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð´Ñ?Ð³Ð¸ !\n"
+
+#~ msgid "Unknown end for box (%d)\n"
+#~ msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ° (%d)\n"
+
+#~ msgid "Unknown type for box !\n"
+#~ msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ° !\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_copy]\n"
+#~ msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ buffer_number [o_buffer_copy]\n"
+
+#~ msgid "Got an invalid buffer_number [o_buffer_cut]\n"
+#~ msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ buffer_number [o_buffer_cut]\n"
+
+#~ msgid "Unknown end for circle\n"
+#~ msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð¾ÐºÑ?Ñ?Ð¶Ð½Ð¾Ñ?Ñ?Ð¸\n"
+
+#~ msgid "Unknown type for circle!\n"
+#~ msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð¾ÐºÑ?Ñ?Ð¶Ð½Ð¾Ñ?Ñ?Ð¸!\n"
+
+#, fuzzy
+#~ msgid "Unknown end for path (%d)\n"
+#~ msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½ÐµÑ? Ð´Ð»Ñ? Ð´Ñ?Ð³Ð¸ (%d)\n"
+
+#, fuzzy
+#~ msgid "Unknown type for path !\n"
+#~ msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð´Ð»Ñ? Ð´Ñ?Ð³Ð¸ !\n"
+
+#~ msgid "Could not find the color %s!\n"
+#~ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ?Ð¸ Ñ?Ð²ÐµÑ? %s!\n"
+
+#~ msgid "Defaulting color to white\n"
+#~ msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ° Ð±ÐµÐ»Ð¾Ð³Ð¾ Ñ?Ð²ÐµÑ?Ð° Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?\n"
+
+#~ msgid "Ack! Cannot allocate white!\n"
+#~ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? Ð±ÐµÐ»Ñ?Ð¹!\n"
+
+#~ msgid "Couldn't allocate xor_gc\n"
+#~ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? xor_gc\n"
+
+#~ msgid "Couldn't allocate outline_xor_gc\n"
+#~ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? outline_xor_gc\n"
+
+#~ msgid "Couldn't allocate bounding_xor_gc\n"
+#~ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? bounding_xor_gc\n"
+
+#~ msgid "Couldn't allocate bus_gc\n"
+#~ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ñ? bus_gc\n"
+
 #~ msgid "Got NULL in o_attrib_toggle_visibility\n"
 #~ msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ NULL Ð² o_attrib_toggle_visibility\n"
 
@@ -2663,9 +2742,6 @@ msgstr "Ð?Ð³Ð»Ñ?Ð±Ñ? Ñ?Ñ?ÐµÐ¼Ñ?"
 #~ msgid "Edit Text Color"
 #~ msgstr "Ð?Ñ?Ð°Ð²ÐºÐ° Ñ?Ð²ÐµÑ?Ð° Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#~ msgid "Line Type"
-#~ msgstr "Ð¢Ð¸Ð¿ Ð»Ð¸Ð½Ð¸Ð¸"
-
 #~ msgid "String too long... hack!\n"
 #~ msgstr "Ð¡Ð»Ð¸Ñ?ÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð¾ÐºÐ°... hack!\n"
 
diff --git a/libgeda/po/de.po b/libgeda/po/de.po
index a856373..9504077 100644
--- a/libgeda/po/de.po
+++ b/libgeda/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 13:41-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-21 12:20+0100\n"
 "Last-Translator: Werner Hoch <werner.ho@xxxxxx>\n"
 "Language-Team: deutsch <de@xxxxxx>\n"
@@ -45,17 +45,17 @@ msgstr "gEDA Schaltplansymbol"
 #. *  completely? In any case, failing gracefully is better
 #. *  than killing the program, which is what this used to
 #. *  do...
-#: ../src/a_basic.c:184
+#: ../src/a_basic.c:185
 #, c-format
 msgid "o_save_objects: object %p has unknown type '%c'\n"
 msgstr "o_save_objects: Das Objekt %p hat eine unbekannte Typangabe '%c'\n"
 
-#: ../src/a_basic.c:232
+#: ../src/a_basic.c:235
 #, c-format
 msgid "o_save: Could not open [%s]\n"
 msgstr "o_save: Konnte Datei [%s] nicht Ã¶ffnen\n"
 
-#: ../src/a_basic.c:424
+#: ../src/a_basic.c:440
 #, c-format
 msgid ""
 "Read unexpected embedded symbol start marker in [%s] :\n"
@@ -66,7 +66,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:453
+#: ../src/a_basic.c:469
 #, c-format
 msgid ""
 "Read unexpected embedded symbol end marker in [%s] :\n"
@@ -77,7 +77,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:482
+#: ../src/a_basic.c:498
 #, c-format
 msgid ""
 "Read an old format sym/sch file!\n"
@@ -88,7 +88,7 @@ msgstr ""
 "Bitte aktualisiere die Datei mit g[sym|sch]update:\n"
 "[%s]\n"
 
-#: ../src/a_basic.c:488
+#: ../src/a_basic.c:504
 #, c-format
 msgid ""
 "Read garbage in [%s] :\n"
@@ -99,17 +99,17 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:126 ../src/f_basic.c:139
+#: ../src/f_basic.c:123 ../src/f_basic.c:136
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "Konnte Dateiinformation nicht ermitteln [%s]: %s"
 
-#: ../src/f_basic.c:222
+#: ../src/f_basic.c:219
 #, c-format
 msgid "Cannot find file %s: %s"
 msgstr "Konnte Datei nicht finden %s: %s"
 
-#: ../src/f_basic.c:260
+#: ../src/f_basic.c:257
 #, c-format
 msgid ""
 "\n"
@@ -122,13 +122,13 @@ msgstr ""
 "  %s.\n"
 "\n"
 
-#: ../src/f_basic.c:262
+#: ../src/f_basic.c:259
 msgid "I could not guess if it is newer, so you have to do it manually.\n"
 msgstr ""
 "Konnte nicht feststellen ob die Backupdatei neuer ist oder nicht. Dies muss "
 "nun manuell durchgefÃ¼hrt werden.\n"
 
-#: ../src/f_basic.c:264
+#: ../src/f_basic.c:261
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
@@ -136,7 +136,7 @@ msgstr ""
 "Die Backupdatei ist neuer als die des Schaltplanes. Es sollte eventuell das "
 "Backup anstatt der originalen Datei geladen werden.\n"
 
-#: ../src/f_basic.c:266
+#: ../src/f_basic.c:263
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
@@ -144,7 +144,7 @@ msgstr ""
 "Gschem erstellt automatisch Backupdateien. StÃ¼rzt gschem ab oder wird es "
 "absichtlich getÃ¶tet, so ergibt sich diese Situation.\n"
 
-#: ../src/f_basic.c:269
+#: ../src/f_basic.c:266
 msgid ""
 "\n"
 "Run gschem and correct the situation.\n"
@@ -154,67 +154,67 @@ msgstr ""
 "Starte gschem und korrigiere diesen Zustand.\n"
 "\n"
 
-#: ../src/f_basic.c:378
+#: ../src/f_basic.c:375
 #, c-format
 msgid "Can't get the real filename of %s."
 msgstr "Konnte den wahren Dateinamen von %s nicht ermitteln."
 
-#: ../src/f_basic.c:398
+#: ../src/f_basic.c:395
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Konnte die Rechte der alten Backupdatei [%s] nicht auf lesen+schreiben "
 "setzen\n"
 
-#: ../src/f_basic.c:404
+#: ../src/f_basic.c:401
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "Konnte Backupdatei nicht speichern: %s."
 
-#: ../src/f_basic.c:414
+#: ../src/f_basic.c:411
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Konnte die Rechte der Backupdatei [%s] nicht auf nurlesend setzen\n"
 
-#: ../src/f_basic.c:703
+#: ../src/f_basic.c:700
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../src/f_print.c:111
+#: ../src/f_print.c:117
 msgid "Unable to get time of day in f_print_header()\n"
 msgstr "f_print_header(): Konnte die aktuelle Zeit nicht ermitteln\n"
 
-#: ../src/f_print.c:153
+#: ../src/f_print.c:159
 #, c-format
 msgid "Unable to open the prolog file `%s' for reading in f_print_header()\n"
 msgstr "f_print_header(): Konnte die Prologdatei '%s' nicht Ã¶ffnen.\n"
 
-#: ../src/f_print.c:170
+#: ../src/f_print.c:176
 #, c-format
 msgid "Error during reading of the prolog file `%s' in f_print_header()\n"
 msgstr "f_print_header(): Fehler beim Lesen der Prologdatei '%s'\n"
 
-#: ../src/f_print.c:176
+#: ../src/f_print.c:182
 msgid ""
 "Error during writing of the output postscript file in f_print_header()\n"
 msgstr "f_print_header(): Fehler beim Schreiben der Postscript-Datei.\n"
 
-#: ../src/f_print.c:189
+#: ../src/f_print.c:195
 msgid "Giving up on printing\n"
 msgstr "Gebe das Ausdrucken auf\n"
 
-#: ../src/f_print.c:381
+#: ../src/f_print.c:390
 #, c-format
 msgid "Could not open [%s] for printing\n"
 msgstr "Konnte die Datei [%s] nicht zum Drucken Ã¶ffnen\n"
 
-#: ../src/f_print.c:414
+#: ../src/f_print.c:423
 #, c-format
 msgid "Could not execute command [%s] for printing\n"
 msgstr "Konnte den Befehl [%s] zum Drucken nicht ausfÃ¼hren\n"
 
-#: ../src/f_print.c:687
+#: ../src/f_print.c:698
 msgid "Too many UTF-8 characters, cannot print\n"
 msgstr "Zu viele UTF-8 Zeichen. Es kann nicht gedruckt werden\n"
 
@@ -249,42 +249,42 @@ msgstr "Konnte [%s] fÃ¼r die Auswertung nicht finden\n"
 msgid "RC file [%s] already read in.\n"
 msgstr "Konfigurationsdatei [%s] wurde bereits gelesen.\n"
 
-#: ../src/g_rc.c:211
-#, c-format
-msgid "Read system-%s file [%%s]\n"
+#: ../src/g_rc.c:181
+#, fuzzy, c-format
+msgid "Read system config file [%%s]\n"
 msgstr "Lese die Systemdatei %s [%%s]\n"
 
-#: ../src/g_rc.c:213
-#, c-format
-msgid "Did not find required system-%s file [%%s]\n"
+#: ../src/g_rc.c:182
+#, fuzzy, c-format
+msgid "Did not find required system config file [%%s]\n"
 msgstr "Konnte die erforderliche Systemdatei %s nicht finden [%%s]\n"
 
-#: ../src/g_rc.c:255
-#, c-format
-msgid "Read ~/.gEDA/%s file [%%s]\n"
-msgstr "Lese die ~/.gEDA/%s Datei [%%s]\n"
+#: ../src/g_rc.c:216
+#, fuzzy, c-format
+msgid "Read user config file [%%s]\n"
+msgstr "Lese vorgegebene %s Datei [%%s]\n"
 
-#: ../src/g_rc.c:257
-#, c-format
-msgid "Did not find optional ~/.gEDA/%s file [%%s]\n"
-msgstr "Konnte die optionale ~/.gEDA/%s-Datei [%%s] nicht finden\n"
+#: ../src/g_rc.c:217
+#, fuzzy, c-format
+msgid "Did not find optional user config file [%%s]\n"
+msgstr "Konnte die optionale lokale %s-Datei [%%s] nicht finden\n"
 
-#: ../src/g_rc.c:289
-#, c-format
-msgid "Read local %s file [%%s]\n"
+#: ../src/g_rc.c:248
+#, fuzzy, c-format
+msgid "Read local config file [%%s]\n"
 msgstr "Lese die lokale %s-Datei [%%s]\n"
 
-#: ../src/g_rc.c:291
-#, c-format
-msgid "Did not find optional local %s file [%%s]\n"
+#: ../src/g_rc.c:249
+#, fuzzy, c-format
+msgid "Did not find optional local config file [%%s]\n"
 msgstr "Konnte die optionale lokale %s-Datei [%%s] nicht finden\n"
 
-#: ../src/g_rc.c:329
+#: ../src/g_rc.c:286
 #, c-format
 msgid "Read specified %s file [%%s]\n"
 msgstr "Lese vorgegebene %s Datei [%%s]\n"
 
-#: ../src/g_rc.c:331
+#: ../src/g_rc.c:288
 #, c-format
 msgid "Did not find specified %s file [%%s]\n"
 msgstr "Konnte die angegebene %s-Datei [%%s] nicht finden\n"
@@ -292,12 +292,12 @@ msgstr "Konnte die angegebene %s-Datei [%%s] nicht finden\n"
 #. ! \todo these two are basically the
 #. * same. Inefficient!
 #.
-#: ../src/g_rc.c:389
+#: ../src/g_rc.c:338
 #, c-format
 msgid "Could not find any %s file!\n"
 msgstr "Konnte keine %s-Dateien finden!\n"
 
-#: ../src/g_rc.c:1035
+#: ../src/g_rc.c:984
 msgid ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
@@ -311,54 +311,55 @@ msgstr ""
 msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 msgstr "Kreisbogen mit Radius 0 entdeckt [%c %d, %d, %d, %d, %d, %d ]\n"
 
-#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:172
+#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:188
 #: ../src/o_circle_basic.c:293 ../src/o_line_basic.c:269
-#: ../src/o_net_basic.c:164 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:175
-#: ../src/o_text_basic.c:1130
+#: ../src/o_net_basic.c:180 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:193
+#: ../src/o_text_basic.c:1155
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Fehlerhafte Farbangabe entdeckt [%s]\n"
 
-#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:173
+#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:189
 #: ../src/o_circle_basic.c:294 ../src/o_line_basic.c:270
-#: ../src/o_net_basic.c:165 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:176
-#: ../src/o_text_basic.c:1131
-msgid "Setting color to WHITE\n"
+#: ../src/o_net_basic.c:181 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:194
+#: ../src/o_text_basic.c:1156
+#, fuzzy
+msgid "Setting color to default color\n"
 msgstr "Verwende die Farbe WEISS\n"
 
-#: ../src/o_attrib.c:178
+#: ../src/o_attrib.c:191
 msgid "Attempt to attach non text item as an attribute!\n"
 msgstr "Es wurde versucht eine Attribut anzubringen, welches kein Text ist!\n"
 
-#: ../src/o_attrib.c:183
+#: ../src/o_attrib.c:196
 #, c-format
 msgid "Attempt to attach attribute [%s] to more than one object\n"
 msgstr ""
 "Es wurde versucht ein Attribute [%s] an mehr als ein Objekt anzubringen\n"
 
 #. only an error if there's a slot string
-#: ../src/o_attrib.c:1410 ../src/o_attrib.c:1510
+#: ../src/o_attrib.c:1414 ../src/o_attrib.c:1514
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "Es wurde kein slotdef=#:#,#,#... Attribut gefunden\n"
 
 #. Didn't find proper slotdef=#:... put warning into log
-#: ../src/o_attrib.c:1416
+#: ../src/o_attrib.c:1420
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Fehlerhafte slotdef syntax: \":\" fehlt.\n"
 
-#: ../src/o_attrib.c:1431 ../src/o_attrib.c:1529
+#: ../src/o_attrib.c:1435 ../src/o_attrib.c:1533
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "Kein korrektes Attribut slotdef=#:#,#,#... gefunden\n"
 
-#: ../src/o_attrib.c:1463 ../src/o_attrib.c:1558
+#: ../src/o_attrib.c:1467 ../src/o_attrib.c:1562
 msgid "component missing pinseq= attribute\n"
 msgstr "pinseq= Attribut fehlt.\n"
 
-#: ../src/o_basic.c:195 ../src/o_basic.c:207
+#: ../src/o_basic.c:199 ../src/o_basic.c:211
 msgid "Invalid space specified, setting to 100\n"
 msgstr "Fehlerhafte Abstandsangabe, verwende 100\n"
 
-#: ../src/o_basic.c:203
+#: ../src/o_basic.c:207
 msgid "Invalid length specified, setting to 100\n"
 msgstr "Fehlerhafte LÃ¤ngenangabe, verwende 100\n"
 
@@ -367,17 +368,17 @@ msgstr "Fehlerhafte LÃ¤ngenangabe, verwende 100\n"
 msgid "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 msgstr "Rechteck mit der KantenlÃ¤nge 0 entdeckt [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:163
+#: ../src/o_bus_basic.c:179
 #, c-format
 msgid "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 msgstr "Bus mit der LÃ¤nge 0 entdeckt [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:178
+#: ../src/o_bus_basic.c:194
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr "Fehlerhafte Richtungsangabe [%s] bei einem Busanschluss entdeckt\n"
 
-#: ../src/o_bus_basic.c:179
+#: ../src/o_bus_basic.c:195
 msgid "Resetting direction to neutral (no direction)\n"
 msgstr "Setze die Richtung auf neutral (keine Richtung)\n"
 
@@ -390,7 +391,7 @@ msgstr "Kreise mit dem Radius 0 sind nicht erlaubt\n"
 msgid "Found a zero radius circle [ %c %d %d %d %d ]\n"
 msgstr "Kreis mit dem Radius 0 entdeckt [ %c %d %d %d %d ]\n"
 
-#: ../src/o_complex_basic.c:476
+#: ../src/o_complex_basic.c:489
 #, c-format
 msgid ""
 "Component not found:\n"
@@ -399,13 +400,13 @@ msgstr ""
 "Bauteil wurde nicht gefunden:\n"
 " %s"
 
-#: ../src/o_complex_basic.c:690
+#: ../src/o_complex_basic.c:703
 #, c-format
 msgid "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
 "Bauteil mit fehlerhafter Rotationsangabe entdeckt [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:702
+#: ../src/o_complex_basic.c:715
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
@@ -413,7 +414,7 @@ msgstr ""
 "Bauteil mit fehlerhafter Spiegelungsangabe entdeckt [ %c %d %d %d %d %d %"
 "s ]\n"
 
-#: ../src/o_complex_basic.c:1403
+#: ../src/o_complex_basic.c:1416
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -423,7 +424,7 @@ msgstr ""
 "s':\n"
 "\tKonnte das Attribut symversion=%s nicht zerlegen\n"
 
-#: ../src/o_complex_basic.c:1407
+#: ../src/o_complex_basic.c:1420
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -433,7 +434,7 @@ msgstr ""
 "s':\n"
 "\tKonnte das Attribut symversion= nicht zerlegen\n"
 
-#: ../src/o_complex_basic.c:1423
+#: ../src/o_complex_basic.c:1436
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -443,7 +444,7 @@ msgstr ""
 "s':\n"
 "\tKonnte das angehÃ¤ngte Attribut symversion=%s nicht zerlegen\n"
 
-#: ../src/o_complex_basic.c:1448
+#: ../src/o_complex_basic.c:1461
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -455,7 +456,7 @@ msgstr ""
 "\tsymversion=%s existiert bei dem Symbol im Schaltplan, fehlt aber innerhalb "
 "der Schaltsymbol-Datei\n"
 
-#: ../src/o_complex_basic.c:1462
+#: ../src/o_complex_basic.c:1475
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -465,20 +466,20 @@ msgstr ""
 "s):\n"
 "\tDas Symbol in der Bibliothek ist neuer als das Symbol im Schaltplan\n"
 
-#: ../src/o_complex_basic.c:1490
+#: ../src/o_complex_basic.c:1503
 #, c-format
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgstr ""
 "\tGROSSE VERSIONSÃ?NDERUNG (Symboldatei %.3f, Symbol im Schaltplan %.3f, %"
 "s)!\n"
 
-#: ../src/o_complex_basic.c:1508
+#: ../src/o_complex_basic.c:1521
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr ""
 "\tKleine VersionsÃ¤nderung (Symboldatei %.3f, Symbol im Schaltplan %.3f)!\n"
 
-#: ../src/o_complex_basic.c:1519
+#: ../src/o_complex_basic.c:1532
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -512,90 +513,90 @@ msgstr "Das Bauteil [%s] wurde erfolgreich ausgebettet\n"
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
 msgstr "Linie mit der LÃ¤nge 0 entdeckt [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_net_basic.c:154
+#: ../src/o_net_basic.c:170
 #, c-format
 msgid "Found a zero length net [ %c %d %d %d %d %d ]\n"
 msgstr "Netz mit der LÃ¤nge 0 entdeckt [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:90
+#: ../src/o_picture.c:80
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Fehler beim Lesen der Bildinformation. Zeile: %s.\n"
 
-#: ../src/o_picture.c:104
+#: ../src/o_picture.c:94
 #, c-format
 msgid "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 msgstr "Bild mit der SeitenlÃ¤nge 0 entdeckt [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:109
+#: ../src/o_picture.c:99
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr "Bild mit fehlerhaften Spiegelungsparametern entdeckt: %c.\n"
 
-#: ../src/o_picture.c:111
+#: ../src/o_picture.c:101
 msgid "Setting mirrored to 0\n"
 msgstr "Setze die Spiegelung auf 0\n"
 
-#: ../src/o_picture.c:116
+#: ../src/o_picture.c:106
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr "Bild mit fehlerhaften Einbettungsparametern entdeckt. %c.\n"
 
-#: ../src/o_picture.c:118
+#: ../src/o_picture.c:108
 msgid "Setting embedded to 0\n"
 msgstr "Setze die Einbettung auf 0\n"
 
-#: ../src/o_picture.c:130
+#: ../src/o_picture.c:120
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr "Bild mit fehlerhafter Winkelangabe entdeckt [%d]\n"
 
-#: ../src/o_picture.c:131 ../src/o_text_basic.c:1102
+#: ../src/o_picture.c:121 ../src/o_text_basic.c:1127
 msgid "Setting angle to 0\n"
 msgstr "Setze die Winkelangabe auf 0\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:177 ../src/o_picture.c:919
+#: ../src/o_picture.c:156 ../src/o_picture.c:167 ../src/o_picture.c:924
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Fehler beim Laden der Daten eines eingebetteten Bildes [%s]: %s\n"
 
-#: ../src/o_picture.c:167
+#: ../src/o_picture.c:157
 msgid "Base64 decoding failed."
 msgstr "Base64 Dekodierung fehlgeschlagen."
 
-#: ../src/o_picture.c:168 ../src/o_picture.c:179 ../src/o_picture.c:921
+#: ../src/o_picture.c:158 ../src/o_picture.c:169 ../src/o_picture.c:926
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Lade das Bild aus der Datei. Das Bild ist ausgebettet.\n"
 
-#: ../src/o_picture.c:190 ../src/o_picture.c:907 ../src/o_picture.c:956
+#: ../src/o_picture.c:180 ../src/o_picture.c:912 ../src/o_picture.c:961
 #, c-format
 msgid "Failed to load image from file [%s]: %s\n"
 msgstr "Das Bild konnte nicht aus der Datei [%s] geladen werden: %s\n"
 
-#: ../src/o_picture.c:201
+#: ../src/o_picture.c:191
 msgid "Loading warning picture.\n"
 msgstr "Lade das Warnbild.\n"
 
-#: ../src/o_picture.c:207
+#: ../src/o_picture.c:197
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Fehler beim Laden des Bildes aus der Datei %s.\n"
 
-#: ../src/o_picture.c:267
+#: ../src/o_picture.c:257
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "FEHLER: o_picture_save: Kann das Bild nicht kodieren.\n"
 
-#: ../src/o_picture.c:934
+#: ../src/o_picture.c:939
 #, c-format
 msgid "Picture [%s] has been embedded\n"
 msgstr "Das Bild [%s] wurde eingebettet\n"
 
-#: ../src/o_picture.c:974
+#: ../src/o_picture.c:979
 #, c-format
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Das Bild [%s] wurde ausgebettet\n"
 
-#: ../src/o_pin_basic.c:162
+#: ../src/o_pin_basic.c:180
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
@@ -603,55 +604,55 @@ msgstr ""
 "Pin ohne Markierung (whichend) der aktiven Seite entdeckt.\n"
 "Kontrolliere die Markierung und korrigiere ggf. manuell.\n"
 
-#: ../src/o_pin_basic.c:165
+#: ../src/o_pin_basic.c:183
 #, c-format
 msgid "Found an invalid whichend on a pin (reseting to zero): %d\n"
 msgstr ""
 "Pin mit fehlerafter Markierung (whichend) der aktiven Seite entdeckt. "
 "Verwende 0: %d\n"
 
-#: ../src/o_pin_basic.c:171
+#: ../src/o_pin_basic.c:189
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Pin mit der LÃ¤nge 0 entdeckt: [ %s ]\n"
 
-#: ../src/o_text_basic.c:278
+#: ../src/o_text_basic.c:303
 #, c-format
 msgid "Could not find character '%s' definition.\n"
 msgstr "Konnte die Definition des Zeichens '%s' nicht finden.\n"
 
-#: ../src/o_text_basic.c:283
+#: ../src/o_text_basic.c:308
 #, c-format
 msgid "Could not load question font char -- check font-directory keyword\n"
 msgstr ""
 "Konnte das angefragte Zeichen nicht laden -- kontrolliere die Einstellung "
 "'font-directory'\n"
 
-#: ../src/o_text_basic.c:1088
+#: ../src/o_text_basic.c:1113
 #, c-format
 msgid "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Textstring mit der ZeichengrÃ¶Ã?e 0 entdeckt [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1100
+#: ../src/o_text_basic.c:1125
 #, c-format
 msgid "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Text mit nicht unterstÃ¼tzer Winkelangabe entdeckt [ %c %d %d %d %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_text_basic.c:1122
+#: ../src/o_text_basic.c:1147
 #, c-format
 msgid "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Text mit nicht unterstÃ¼tzer Ausrichtung entdeckt [ %c %d %d %d %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_text_basic.c:1124
+#: ../src/o_text_basic.c:1149
 msgid "Setting alignment to LOWER_LEFT\n"
 msgstr "Verwende die Ausrichtung 'Links Unten'\n"
 
-#: ../src/o_text_basic.c:1213
+#: ../src/o_text_basic.c:1238
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
 msgstr ""
@@ -747,6 +748,22 @@ msgstr ""
 msgid "More than one component found with name [%s]\n"
 msgstr "Mehr als ein Bauteil mit dem Namen [%s] gefunden\n"
 
+#: ../src/s_color.c:206
+msgid "Color index out of range"
+msgstr ""
+
+#: ../src/s_color.c:261
+msgid "Color map entry must be a two-element list"
+msgstr ""
+
+#: ../src/s_color.c:269
+msgid "Index in color map entry must be an integer"
+msgstr ""
+
+#: ../src/s_color.c:295
+msgid "Value in color map entry must be #f or a string"
+msgstr ""
+
 #: ../src/s_hierarchy.c:90
 #, c-format
 msgid ""
@@ -765,23 +782,23 @@ msgstr "Ã?ber diesem Schaltplan gibt es keinen weiteren!\n"
 msgid "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 msgstr "ERROR: s_hierarchy_traverse: Schaltplan [%s] wurde nicht gefunden.\n"
 
-#: ../src/s_page.c:169
+#: ../src/s_page.c:167
 #, c-format
 msgid "s_page_delete: Can't get the real filename of %s."
 msgstr ""
 "s_page_delete: Kann den tatsÃ¤chlichen Dateinamen von [%s] nicht ermitteln."
 
-#: ../src/s_page.c:180
+#: ../src/s_page.c:178
 #, c-format
 msgid "s_page_delete: Unable to delete backup file %s."
 msgstr "s_page_delete: Kann die Backupdatei [%s] nicht lÃ¶schen."
 
-#: ../src/s_page.c:382
+#: ../src/s_page.c:380
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Gespeichert [%s]\n"
 
-#: ../src/s_page.c:388
+#: ../src/s_page.c:386
 #, c-format
 msgid "Could NOT save [%s]\n"
 msgstr "ACHTUNG: Konnte Datei nicht speichern [%s]\n"
@@ -797,6 +814,12 @@ msgstr "[%s] gefunden\n"
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "Konnte [%s] in keiner Bibliothekenquelle finden\n"
 
+#~ msgid "Read ~/.gEDA/%s file [%%s]\n"
+#~ msgstr "Lese die ~/.gEDA/%s Datei [%%s]\n"
+
+#~ msgid "Did not find optional ~/.gEDA/%s file [%%s]\n"
+#~ msgstr "Konnte die optionale ~/.gEDA/%s-Datei [%%s] nicht finden\n"
+
 #~ msgid "Could not read symbolic link information for %s"
 #~ msgstr "Konnte die Information des symbolischen Links [%s] nicht lesen"
 
diff --git a/libgeda/po/en_GB.po b/libgeda/po/en_GB.po
index d2f8bb3..8f585d2 100644
--- a/libgeda/po/en_GB.po
+++ b/libgeda/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgeda\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-02 13:53+0000\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2009-01-02 14:31+0100\n"
 "Last-Translator: Peter Clifton <pcjc2@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -43,17 +43,17 @@ msgstr "gEDA Schematic Symbol"
 #. *  completely? In any case, failing gracefully is better
 #. *  than killing the program, which is what this used to
 #. *  do...
-#: ../src/a_basic.c:184
+#: ../src/a_basic.c:185
 #, c-format
 msgid "o_save_objects: object %p has unknown type '%c'\n"
 msgstr "o_save_objects: object %p has unknown type '%c'\n"
 
-#: ../src/a_basic.c:232
+#: ../src/a_basic.c:235
 #, c-format
 msgid "o_save: Could not open [%s]\n"
 msgstr "o_save: Could not open [%s]\n"
 
-#: ../src/a_basic.c:424
+#: ../src/a_basic.c:440
 #, c-format
 msgid ""
 "Read unexpected embedded symbol start marker in [%s] :\n"
@@ -64,7 +64,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:453
+#: ../src/a_basic.c:469
 #, c-format
 msgid ""
 "Read unexpected embedded symbol end marker in [%s] :\n"
@@ -75,7 +75,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:482
+#: ../src/a_basic.c:498
 #, c-format
 msgid ""
 "Read an old format sym/sch file!\n"
@@ -86,7 +86,7 @@ msgstr ""
 "Please run g[sym|sch]update on:\n"
 "[%s]\n"
 
-#: ../src/a_basic.c:488
+#: ../src/a_basic.c:504
 #, c-format
 msgid ""
 "Read garbage in [%s] :\n"
@@ -97,17 +97,17 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:126 ../src/f_basic.c:139
+#: ../src/f_basic.c:123 ../src/f_basic.c:136
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "Failed to stat [%s]: %s"
 
-#: ../src/f_basic.c:222
+#: ../src/f_basic.c:219
 #, c-format
 msgid "Cannot find file %s: %s"
 msgstr "Cannot find file: %s: %s"
 
-#: ../src/f_basic.c:260
+#: ../src/f_basic.c:257
 #, c-format
 msgid ""
 "\n"
@@ -120,11 +120,11 @@ msgstr ""
 "  %s.\n"
 "\n"
 
-#: ../src/f_basic.c:262
+#: ../src/f_basic.c:259
 msgid "I could not guess if it is newer, so you have to do it manually.\n"
 msgstr "I could not guess if it is newer, so you have to do it manually.\n"
 
-#: ../src/f_basic.c:264
+#: ../src/f_basic.c:261
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
@@ -132,7 +132,7 @@ msgstr ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
 
-#: ../src/f_basic.c:266
+#: ../src/f_basic.c:263
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
@@ -140,7 +140,7 @@ msgstr ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
 
-#: ../src/f_basic.c:269
+#: ../src/f_basic.c:266
 msgid ""
 "\n"
 "Run gschem and correct the situation.\n"
@@ -150,27 +150,27 @@ msgstr ""
 "Run gschem and correct the situation.\n"
 "\n"
 
-#: ../src/f_basic.c:378
+#: ../src/f_basic.c:375
 #, c-format
 msgid "Can't get the real filename of %s."
 msgstr "Can't get the real filename of %s."
 
-#: ../src/f_basic.c:398
+#: ../src/f_basic.c:395
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Could NOT set previous backup file [%s] read-write\n"
 
-#: ../src/f_basic.c:404
+#: ../src/f_basic.c:401
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "Can't save backup file: %s."
 
-#: ../src/f_basic.c:414
+#: ../src/f_basic.c:411
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Could NOT set backup file [%s] readonly\n"
 
-#: ../src/f_basic.c:703
+#: ../src/f_basic.c:700
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -199,17 +199,17 @@ msgstr ""
 msgid "Giving up on printing\n"
 msgstr "Giving up on printing\n"
 
-#: ../src/f_print.c:387
+#: ../src/f_print.c:390
 #, c-format
 msgid "Could not open [%s] for printing\n"
 msgstr "Could not open [%s] for printing\n"
 
-#: ../src/f_print.c:420
+#: ../src/f_print.c:423
 #, c-format
 msgid "Could not execute command [%s] for printing\n"
 msgstr "Could not execute command [%s] for printing\n"
 
-#: ../src/f_print.c:695
+#: ../src/f_print.c:698
 msgid "Too many UTF-8 characters, cannot print\n"
 msgstr "Too many UTF-8 characters, cannot print\n"
 
@@ -244,42 +244,42 @@ msgstr "Could not find [%s] for interpretation\n"
 msgid "RC file [%s] already read in.\n"
 msgstr "RC file [%s] already read in.\n"
 
-#: ../src/g_rc.c:211
-#, c-format
-msgid "Read system-%s file [%%s]\n"
+#: ../src/g_rc.c:181
+#, fuzzy, c-format
+msgid "Read system config file [%%s]\n"
 msgstr "Read system-%s file [%%s]\n"
 
-#: ../src/g_rc.c:213
-#, c-format
-msgid "Did not find required system-%s file [%%s]\n"
+#: ../src/g_rc.c:182
+#, fuzzy, c-format
+msgid "Did not find required system config file [%%s]\n"
 msgstr "Did not find required system-%s file [%%s]\n"
 
-#: ../src/g_rc.c:255
-#, c-format
-msgid "Read ~/.gEDA/%s file [%%s]\n"
-msgstr "Read ~/.gEDA/%s file [%%s]\n"
+#: ../src/g_rc.c:216
+#, fuzzy, c-format
+msgid "Read user config file [%%s]\n"
+msgstr "Read specified %s file [%%s]\n"
 
-#: ../src/g_rc.c:257
-#, c-format
-msgid "Did not find optional ~/.gEDA/%s file [%%s]\n"
-msgstr "Did not find optional ~/.gEDA/%s file [%%s]\n"
+#: ../src/g_rc.c:217
+#, fuzzy, c-format
+msgid "Did not find optional user config file [%%s]\n"
+msgstr "Did not find optional local %s file [%%s]\n"
 
-#: ../src/g_rc.c:289
-#, c-format
-msgid "Read local %s file [%%s]\n"
+#: ../src/g_rc.c:248
+#, fuzzy, c-format
+msgid "Read local config file [%%s]\n"
 msgstr "Read local %s file [%%s]\n"
 
-#: ../src/g_rc.c:291
-#, c-format
-msgid "Did not find optional local %s file [%%s]\n"
+#: ../src/g_rc.c:249
+#, fuzzy, c-format
+msgid "Did not find optional local config file [%%s]\n"
 msgstr "Did not find optional local %s file [%%s]\n"
 
-#: ../src/g_rc.c:329
+#: ../src/g_rc.c:286
 #, c-format
 msgid "Read specified %s file [%%s]\n"
 msgstr "Read specified %s file [%%s]\n"
 
-#: ../src/g_rc.c:331
+#: ../src/g_rc.c:288
 #, c-format
 msgid "Did not find specified %s file [%%s]\n"
 msgstr "Did not find specified %s file [%%s]\n"
@@ -287,12 +287,12 @@ msgstr "Did not find specified %s file [%%s]\n"
 #. ! \todo these two are basically the
 #. * same. Inefficient!
 #.
-#: ../src/g_rc.c:389
+#: ../src/g_rc.c:338
 #, c-format
 msgid "Could not find any %s file!\n"
 msgstr "Could not find any %s file!\n"
 
-#: ../src/g_rc.c:1035
+#: ../src/g_rc.c:984
 msgid ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
@@ -305,45 +305,45 @@ msgstr ""
 msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 msgstr "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 
-#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:172
+#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:188
 #: ../src/o_circle_basic.c:293 ../src/o_line_basic.c:269
-#: ../src/o_net_basic.c:164 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:175
-#: ../src/o_text_basic.c:1130
+#: ../src/o_net_basic.c:180 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:193
+#: ../src/o_text_basic.c:1155
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Found an invalid colour [ %s ]\n"
 
-#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:173
+#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:189
 #: ../src/o_circle_basic.c:294 ../src/o_line_basic.c:270
-#: ../src/o_net_basic.c:165 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:176
-#: ../src/o_text_basic.c:1131
+#: ../src/o_net_basic.c:181 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:194
+#: ../src/o_text_basic.c:1156
 msgid "Setting color to default color\n"
 msgstr "Setting colour to default colour\n"
 
-#: ../src/o_attrib.c:167
+#: ../src/o_attrib.c:191
 msgid "Attempt to attach non text item as an attribute!\n"
 msgstr "Attempt to attach non text item as an attribute!\n"
 
-#: ../src/o_attrib.c:172
+#: ../src/o_attrib.c:196
 #, c-format
 msgid "Attempt to attach attribute [%s] to more than one object\n"
 msgstr "Attempt to attach attribute [%s] to more than one object\n"
 
 #. only an error if there's a slot string
-#: ../src/o_attrib.c:1390 ../src/o_attrib.c:1490
+#: ../src/o_attrib.c:1414 ../src/o_attrib.c:1514
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "Did not find slotdef=#:#,#,#... attribute\n"
 
 #. Didn't find proper slotdef=#:... put warning into log
-#: ../src/o_attrib.c:1396
+#: ../src/o_attrib.c:1420
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Improper slotdef syntax: missing \":\".\n"
 
-#: ../src/o_attrib.c:1411 ../src/o_attrib.c:1509
+#: ../src/o_attrib.c:1435 ../src/o_attrib.c:1533
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "Did not find proper slotdef=#:#,#,#... attribute\n"
 
-#: ../src/o_attrib.c:1443 ../src/o_attrib.c:1538
+#: ../src/o_attrib.c:1467 ../src/o_attrib.c:1562
 msgid "component missing pinseq= attribute\n"
 msgstr "component missing pinseq= attribute\n"
 
@@ -360,17 +360,17 @@ msgstr "Invalid length specified, setting to 100\n"
 msgid "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 msgstr "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:163
+#: ../src/o_bus_basic.c:179
 #, c-format
 msgid "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 msgstr "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:178
+#: ../src/o_bus_basic.c:194
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr "Found an invalid bus ripper direction [ %s ]\n"
 
-#: ../src/o_bus_basic.c:179
+#: ../src/o_bus_basic.c:195
 msgid "Resetting direction to neutral (no direction)\n"
 msgstr "Resetting direction to neutral (no direction)\n"
 
@@ -383,7 +383,7 @@ msgstr "Null radius circles are not allowed\n"
 msgid "Found a zero radius circle [ %c %d %d %d %d ]\n"
 msgstr "Found a zero radius circle [ %c %d %d %d %d ]\n"
 
-#: ../src/o_complex_basic.c:471
+#: ../src/o_complex_basic.c:489
 #, c-format
 msgid ""
 "Component not found:\n"
@@ -392,19 +392,19 @@ msgstr ""
 "Component not found:\n"
 " %s"
 
-#: ../src/o_complex_basic.c:685
+#: ../src/o_complex_basic.c:703
 #, c-format
 msgid "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 msgstr "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:697
+#: ../src/o_complex_basic.c:715
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:1398
+#: ../src/o_complex_basic.c:1416
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -413,7 +413,7 @@ msgstr ""
 "WARNING: Symbol version parse error on refdes %s:\n"
 "\tCould not parse symbol file symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1402
+#: ../src/o_complex_basic.c:1420
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -422,7 +422,7 @@ msgstr ""
 "WARNING: Symbol version parse error on refdes %s:\n"
 "\tCould not parse symbol file symversion=\n"
 
-#: ../src/o_complex_basic.c:1418
+#: ../src/o_complex_basic.c:1436
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -431,7 +431,7 @@ msgstr ""
 "WARNING: Symbol version parse error on refdes %s:\n"
 "\tCould not parse attached symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1443
+#: ../src/o_complex_basic.c:1461
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -442,7 +442,7 @@ msgstr ""
 "\tsymversion=%s attached to instantiated symbol, but no symversion= inside "
 "symbol file\n"
 
-#: ../src/o_complex_basic.c:1457
+#: ../src/o_complex_basic.c:1475
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -451,17 +451,17 @@ msgstr ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
 "\tSymbol in library is newer than instantiated symbol\n"
 
-#: ../src/o_complex_basic.c:1485
+#: ../src/o_complex_basic.c:1503
 #, c-format
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgstr "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 
-#: ../src/o_complex_basic.c:1503
+#: ../src/o_complex_basic.c:1521
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr "\tMinor version change (file %.3f, instantiated %.3f)\n"
 
-#: ../src/o_complex_basic.c:1514
+#: ../src/o_complex_basic.c:1532
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -495,90 +495,90 @@ msgstr "Component [%s] has been successfully unembedded\n"
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
 msgstr "Found a zero length line [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_net_basic.c:154
+#: ../src/o_net_basic.c:170
 #, c-format
 msgid "Found a zero length net [ %c %d %d %d %d %d ]\n"
 msgstr "Found a zero length net [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:90
+#: ../src/o_picture.c:80
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Error reading picture definition line: %s.\n"
 
-#: ../src/o_picture.c:104
+#: ../src/o_picture.c:94
 #, c-format
 msgid "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 msgstr "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:109
+#: ../src/o_picture.c:99
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 
-#: ../src/o_picture.c:111
+#: ../src/o_picture.c:101
 msgid "Setting mirrored to 0\n"
 msgstr "Setting mirrored to 0\n"
 
-#: ../src/o_picture.c:116
+#: ../src/o_picture.c:106
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr "Found a picture with a wrong 'embedded' parameter: %c.\n"
 
-#: ../src/o_picture.c:118
+#: ../src/o_picture.c:108
 msgid "Setting embedded to 0\n"
 msgstr "Setting embedded to 0\n"
 
-#: ../src/o_picture.c:130
+#: ../src/o_picture.c:120
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr "Found an unsupported picture angle [ %d ]\n"
 
-#: ../src/o_picture.c:131 ../src/o_text_basic.c:1102
+#: ../src/o_picture.c:121 ../src/o_text_basic.c:1127
 msgid "Setting angle to 0\n"
 msgstr "Setting angle to 0\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:177 ../src/o_picture.c:919
+#: ../src/o_picture.c:156 ../src/o_picture.c:167 ../src/o_picture.c:924
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Failed to load image from embedded data [%s]: %s\n"
 
-#: ../src/o_picture.c:167
+#: ../src/o_picture.c:157
 msgid "Base64 decoding failed."
 msgstr "Base64 decoding failed."
 
-#: ../src/o_picture.c:168 ../src/o_picture.c:179 ../src/o_picture.c:921
+#: ../src/o_picture.c:158 ../src/o_picture.c:169 ../src/o_picture.c:926
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Falling back to file loading. Picture unembedded.\n"
 
-#: ../src/o_picture.c:190 ../src/o_picture.c:907 ../src/o_picture.c:956
+#: ../src/o_picture.c:180 ../src/o_picture.c:912 ../src/o_picture.c:961
 #, c-format
 msgid "Failed to load image from file [%s]: %s\n"
 msgstr "Failed to load image from file [%s]: %s\n"
 
-#: ../src/o_picture.c:201
+#: ../src/o_picture.c:191
 msgid "Loading warning picture.\n"
 msgstr "Loading warning picture.\n"
 
-#: ../src/o_picture.c:207
+#: ../src/o_picture.c:197
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Error loading picture from file: %s.\n"
 
-#: ../src/o_picture.c:267
+#: ../src/o_picture.c:257
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "ERROR: o_picture_save: unable to encode the picture.\n"
 
-#: ../src/o_picture.c:934
+#: ../src/o_picture.c:939
 #, c-format
 msgid "Picture [%s] has been embedded\n"
 msgstr "Picture [%s] has been embedded\n"
 
-#: ../src/o_picture.c:974
+#: ../src/o_picture.c:979
 #, c-format
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Picture [%s] has been unembedded\n"
 
-#: ../src/o_pin_basic.c:162
+#: ../src/o_pin_basic.c:180
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
@@ -586,46 +586,46 @@ msgstr ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
 
-#: ../src/o_pin_basic.c:165
+#: ../src/o_pin_basic.c:183
 #, c-format
 msgid "Found an invalid whichend on a pin (reseting to zero): %d\n"
 msgstr "Found an invalid whichend on a pin (reseting to zero): %d\n"
 
-#: ../src/o_pin_basic.c:171
+#: ../src/o_pin_basic.c:189
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Found a zero length pin: [ %s ]\n"
 
-#: ../src/o_text_basic.c:278
+#: ../src/o_text_basic.c:303
 #, c-format
 msgid "Could not find character '%s' definition.\n"
 msgstr "Could not find character '%s' definition.\n"
 
-#: ../src/o_text_basic.c:283
+#: ../src/o_text_basic.c:308
 #, c-format
 msgid "Could not load question font char -- check font-directory keyword\n"
 msgstr "Could not load question font char -- check font-directory keyword\n"
 
-#: ../src/o_text_basic.c:1088
+#: ../src/o_text_basic.c:1113
 #, c-format
 msgid "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1100
+#: ../src/o_text_basic.c:1125
 #, c-format
 msgid "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1122
+#: ../src/o_text_basic.c:1147
 #, c-format
 msgid "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1124
+#: ../src/o_text_basic.c:1149
 msgid "Setting alignment to LOWER_LEFT\n"
 msgstr "Setting alignment to LOWER_LEFT\n"
 
-#: ../src/o_text_basic.c:1213
+#: ../src/o_text_basic.c:1238
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
 msgstr "Failed to validate utf-8 character in font definition: \"%s\".\n"
@@ -711,19 +711,19 @@ msgstr "Component [%s] was not found in the component library\n"
 msgid "More than one component found with name [%s]\n"
 msgstr "More than one component found with name [%s]\n"
 
-#: ../src/s_color.c:202
+#: ../src/s_color.c:206
 msgid "Color index out of range"
 msgstr "Colour index out of range"
 
-#: ../src/s_color.c:257
+#: ../src/s_color.c:261
 msgid "Color map entry must be a two-element list"
 msgstr "Colour map entry must be a two-element list"
 
-#: ../src/s_color.c:265
+#: ../src/s_color.c:269
 msgid "Index in color map entry must be an integer"
 msgstr "Index in colour map entry must be an integer"
 
-#: ../src/s_color.c:291
+#: ../src/s_color.c:295
 msgid "Value in color map entry must be #f or a string"
 msgstr "Value in colour map entry must be #f or a string"
 
@@ -745,22 +745,22 @@ msgstr "There are no schematics above the current one!\n"
 msgid "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 msgstr "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 
-#: ../src/s_page.c:169
+#: ../src/s_page.c:167
 #, c-format
 msgid "s_page_delete: Can't get the real filename of %s."
 msgstr "s_page_delete: Can't get the real filename of %s."
 
-#: ../src/s_page.c:180
+#: ../src/s_page.c:178
 #, c-format
 msgid "s_page_delete: Unable to delete backup file %s."
 msgstr "s_page_delete: Unable to delete backup file %s."
 
-#: ../src/s_page.c:382
+#: ../src/s_page.c:380
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Saved [%s]\n"
 
-#: ../src/s_page.c:388
+#: ../src/s_page.c:386
 #, c-format
 msgid "Could NOT save [%s]\n"
 msgstr "Could NOT save [%s]\n"
@@ -775,3 +775,9 @@ msgstr "Found [%s]\n"
 #, c-format
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "Could not find [%s] in any SourceLibrary\n"
+
+#~ msgid "Read ~/.gEDA/%s file [%%s]\n"
+#~ msgstr "Read ~/.gEDA/%s file [%%s]\n"
+
+#~ msgid "Did not find optional ~/.gEDA/%s file [%%s]\n"
+#~ msgstr "Did not find optional ~/.gEDA/%s file [%%s]\n"
diff --git a/libgeda/po/es.po b/libgeda/po/es.po
index fbcf581..c660bce 100644
--- a/libgeda/po/es.po
+++ b/libgeda/po/es.po
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgeda\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 16:08-0500\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2008-12-21 21:07+0100\n"
 "Last-Translator: Carlos Nieves Ã?nega <cnieves@xxxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/libgeda.xml.in.h:1
 msgid "gEDA circuit schematic"
@@ -44,17 +44,17 @@ msgstr "SÃmbolo de esquema gEDA"
 #. *  completely? In any case, failing gracefully is better
 #. *  than killing the program, which is what this used to
 #. *  do...
-#: ../src/a_basic.c:184
+#: ../src/a_basic.c:185
 #, c-format
 msgid "o_save_objects: object %p has unknown type '%c'\n"
 msgstr "o_save_objects: el objeto %p tiene un tipo '%c' desconocido\n"
 
-#: ../src/a_basic.c:232
+#: ../src/a_basic.c:235
 #, c-format
 msgid "o_save: Could not open [%s]\n"
 msgstr "o_save: No se puede abrir [%s]\n"
 
-#: ../src/a_basic.c:424
+#: ../src/a_basic.c:440
 #, c-format
 msgid ""
 "Read unexpected embedded symbol start marker in [%s] :\n"
@@ -65,7 +65,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:453
+#: ../src/a_basic.c:469
 #, c-format
 msgid ""
 "Read unexpected embedded symbol end marker in [%s] :\n"
@@ -76,7 +76,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:482
+#: ../src/a_basic.c:498
 #, c-format
 msgid ""
 "Read an old format sym/sch file!\n"
@@ -87,7 +87,7 @@ msgstr ""
 "Por favor ejecute: g[sym|sch]update en: \n"
 "[%s]\n"
 
-#: ../src/a_basic.c:488
+#: ../src/a_basic.c:504
 #, c-format
 msgid ""
 "Read garbage in [%s] :\n"
@@ -98,17 +98,17 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:126 ../src/f_basic.c:139
+#: ../src/f_basic.c:123 ../src/f_basic.c:136
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "No se ha podido determinar [%s]: %s"
 
-#: ../src/f_basic.c:222
+#: ../src/f_basic.c:219
 #, c-format
 msgid "Cannot find file %s: %s"
 msgstr "No se puede encontrar el archivo %s: %s"
 
-#: ../src/f_basic.c:260
+#: ../src/f_basic.c:257
 #, c-format
 msgid ""
 "\n"
@@ -121,13 +121,13 @@ msgstr ""
 "  %s.\n"
 "\n"
 
-#: ../src/f_basic.c:262
+#: ../src/f_basic.c:259
 msgid "I could not guess if it is newer, so you have to do it manually.\n"
 msgstr ""
 "No se ha podido averiguar si es mÃ¡s reciente, asÃ que lo tendrÃ¡ que hacer "
 "usted manualmente.\n"
 
-#: ../src/f_basic.c:264
+#: ../src/f_basic.c:261
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
@@ -135,7 +135,7 @@ msgstr ""
 "La copia de seguridad es mÃ¡s reciente que el esquema. Parece que deberÃa "
 "cargar la copia de seguridad en vez del archivo original.\n"
 
-#: ../src/f_basic.c:266
+#: ../src/f_basic.c:263
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
@@ -143,7 +143,7 @@ msgstr ""
 "Gschem normalmente realiza copias de seguridad automÃ¡ticamente y esta "
 "situaciÃ³nocurre cuando ha fallado o se ha forzado una salida abrupta.\n"
 
-#: ../src/f_basic.c:269
+#: ../src/f_basic.c:266
 msgid ""
 "\n"
 "Run gschem and correct the situation.\n"
@@ -153,71 +153,71 @@ msgstr ""
 "Ejecute gschem y corrija la situaciÃ³n.\n"
 "\n"
 
-#: ../src/f_basic.c:378
+#: ../src/f_basic.c:375
 #, c-format
 msgid "Can't get the real filename of %s."
 msgstr "No se puede averiguar el nombre real del archivo %s."
 
-#: ../src/f_basic.c:398
+#: ../src/f_basic.c:395
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "No se ha podido poner el archivo de copia de seguridad anterior [%s] en modo "
 "de lectura-escritura\n"
 
-#: ../src/f_basic.c:404
+#: ../src/f_basic.c:401
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "No se puede guardar la copia de seguridad: %s"
 
-#: ../src/f_basic.c:414
+#: ../src/f_basic.c:411
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr ""
 "No se ha podido poner el archivo de copia de seguridad [%s] en modo de sÃ³lo "
 "lectura\n"
 
-#: ../src/f_basic.c:703
+#: ../src/f_basic.c:700
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../src/f_print.c:111
+#: ../src/f_print.c:117
 msgid "Unable to get time of day in f_print_header()\n"
 msgstr "Imposible obtener la hora en f_print_header()\n"
 
-#: ../src/f_print.c:153
+#: ../src/f_print.c:159
 #, c-format
 msgid "Unable to open the prolog file `%s' for reading in f_print_header()\n"
 msgstr ""
 "Imposible abrir el archivo de prÃ³logo '%s' para lectura en f_print_header()\n"
 
-#: ../src/f_print.c:170
+#: ../src/f_print.c:176
 #, c-format
 msgid "Error during reading of the prolog file `%s' in f_print_header()\n"
 msgstr "Error al leer el archivo de prÃ³logo '%s' en f_print_header()\n"
 
-#: ../src/f_print.c:176
+#: ../src/f_print.c:182
 msgid ""
 "Error during writing of the output postscript file in f_print_header()\n"
 msgstr ""
 "Error al escribir el archivo postscript de salida en f_print_header()\n"
 
-#: ../src/f_print.c:189
+#: ../src/f_print.c:195
 msgid "Giving up on printing\n"
 msgstr "Se desiste continuar con la impresiÃ³n\n"
 
-#: ../src/f_print.c:381
+#: ../src/f_print.c:390
 #, c-format
 msgid "Could not open [%s] for printing\n"
 msgstr "No se puede abrir [%s] para impresiÃ³n\n"
 
-#: ../src/f_print.c:414
+#: ../src/f_print.c:423
 #, c-format
 msgid "Could not execute command [%s] for printing\n"
 msgstr "No se puede ejecutar el comando [%s] para impresiÃ³n\n"
 
-#: ../src/f_print.c:687
+#: ../src/f_print.c:698
 msgid "Too many UTF-8 characters, cannot print\n"
 msgstr "Demasiados caracteres UTF-8, no se puede imprimir\n"
 
@@ -252,42 +252,42 @@ msgstr "No se puede encontrar [%s] para interpretar\n"
 msgid "RC file [%s] already read in.\n"
 msgstr "El archivo RC [%s] ya ha sido leÃdo.\n"
 
-#: ../src/g_rc.c:211
-#, c-format
-msgid "Read system-%s file [%%s]\n"
+#: ../src/g_rc.c:181
+#, fuzzy, c-format
+msgid "Read system config file [%%s]\n"
 msgstr "LeÃdo archivo system-%s [%%s]\n"
 
-#: ../src/g_rc.c:213
-#, c-format
-msgid "Did not find required system-%s file [%%s]\n"
+#: ../src/g_rc.c:182
+#, fuzzy, c-format
+msgid "Did not find required system config file [%%s]\n"
 msgstr "No se ha encontrado el archivo imprescindible system-%s [%%s]\n"
 
-#: ../src/g_rc.c:255
-#, c-format
-msgid "Read ~/.gEDA/%s file [%%s]\n"
-msgstr "LeÃdo el archivo ~/.gEDA/%s [%%s]\n"
+#: ../src/g_rc.c:216
+#, fuzzy, c-format
+msgid "Read user config file [%%s]\n"
+msgstr "LeÃdo el archivo especificado %s [%%s]\n"
 
-#: ../src/g_rc.c:257
-#, c-format
-msgid "Did not find optional ~/.gEDA/%s file [%%s]\n"
-msgstr "No se ha encontrado el archivo opcional ~/.gEDA/%s [%%s]\n"
+#: ../src/g_rc.c:217
+#, fuzzy, c-format
+msgid "Did not find optional user config file [%%s]\n"
+msgstr "No se ha podido encontrar el archivo local %s [%%s]\n"
 
-#: ../src/g_rc.c:289
-#, c-format
-msgid "Read local %s file [%%s]\n"
+#: ../src/g_rc.c:248
+#, fuzzy, c-format
+msgid "Read local config file [%%s]\n"
 msgstr "LeÃdo el archivo local %s [%%s]\n"
 
-#: ../src/g_rc.c:291
-#, c-format
-msgid "Did not find optional local %s file [%%s]\n"
+#: ../src/g_rc.c:249
+#, fuzzy, c-format
+msgid "Did not find optional local config file [%%s]\n"
 msgstr "No se ha podido encontrar el archivo local %s [%%s]\n"
 
-#: ../src/g_rc.c:329
+#: ../src/g_rc.c:286
 #, c-format
 msgid "Read specified %s file [%%s]\n"
 msgstr "LeÃdo el archivo especificado %s [%%s]\n"
 
-#: ../src/g_rc.c:331
+#: ../src/g_rc.c:288
 #, c-format
 msgid "Did not find specified %s file [%%s]\n"
 msgstr "No se ha podido encontrar el archivo especificado %s [%%s]\n"
@@ -295,16 +295,18 @@ msgstr "No se ha podido encontrar el archivo especificado %s [%%s]\n"
 #. ! \todo these two are basically the
 #. * same. Inefficient!
 #.
-#: ../src/g_rc.c:389
+#: ../src/g_rc.c:338
 #, c-format
 msgid "Could not find any %s file!\n"
 msgstr "Â¡No se puede encontrar ningÃºn archivo %s!\n"
 
-#: ../src/g_rc.c:1035
+#: ../src/g_rc.c:984
 msgid ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
-msgstr "ADVERTENCIA: el uso de la cadena 'always-promote-attributes' estÃ¡ obsoleto. Se recomienda utilizar una lista de cadenas en su lugar\n"
+msgstr ""
+"ADVERTENCIA: el uso de la cadena 'always-promote-attributes' estÃ¡ obsoleto. "
+"Se recomienda utilizar una lista de cadenas en su lugar\n"
 
 #: ../src/o_arc_basic.c:282
 #, c-format
@@ -312,53 +314,54 @@ msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 msgstr ""
 "Se ha encontrado un arco con radio cero [ %c %d, %d, %d, %d, %d, %d ]\n"
 
-#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:172
+#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:188
 #: ../src/o_circle_basic.c:293 ../src/o_line_basic.c:269
-#: ../src/o_net_basic.c:164 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:175
-#: ../src/o_text_basic.c:1130
+#: ../src/o_net_basic.c:180 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:193
+#: ../src/o_text_basic.c:1155
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Se ha encontrado un color no vÃ¡lido [%s]\n"
 
-#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:173
+#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:189
 #: ../src/o_circle_basic.c:294 ../src/o_line_basic.c:270
-#: ../src/o_net_basic.c:165 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:176
-#: ../src/o_text_basic.c:1131
-msgid "Setting color to WHITE\n"
+#: ../src/o_net_basic.c:181 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:194
+#: ../src/o_text_basic.c:1156
+#, fuzzy
+msgid "Setting color to default color\n"
 msgstr "Seleccionando color BLANCO\n"
 
-#: ../src/o_attrib.c:178
+#: ../src/o_attrib.c:191
 msgid "Attempt to attach non text item as an attribute!\n"
 msgstr "Â¡Se ha intentado aÃ±adir un objeto que no es texto como un attributo!\n"
 
-#: ../src/o_attrib.c:183
+#: ../src/o_attrib.c:196
 #, c-format
 msgid "Attempt to attach attribute [%s] to more than one object\n"
 msgstr "Se ha intentado aÃ±adir el attributo [%s] a mÃ¡s de un objeto\n"
 
 #. only an error if there's a slot string
-#: ../src/o_attrib.c:1410 ../src/o_attrib.c:1510
+#: ../src/o_attrib.c:1414 ../src/o_attrib.c:1514
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "No se ha encontrado un atributo slotdef=#:#,#,#...\n"
 
 #. Didn't find proper slotdef=#:... put warning into log
-#: ../src/o_attrib.c:1416
+#: ../src/o_attrib.c:1420
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Sintaxis de slotdef incorrecta: falta el carÃ¡cter \":\".\n"
 
-#: ../src/o_attrib.c:1431 ../src/o_attrib.c:1529
+#: ../src/o_attrib.c:1435 ../src/o_attrib.c:1533
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "No se ha encontrado un atributo vÃ¡lido slotdef=#:#,#,#...\n"
 
-#: ../src/o_attrib.c:1463 ../src/o_attrib.c:1558
+#: ../src/o_attrib.c:1467 ../src/o_attrib.c:1562
 msgid "component missing pinseq= attribute\n"
 msgstr "El componente no tiene el atributo pinseq\n"
 
-#: ../src/o_basic.c:195 ../src/o_basic.c:207
+#: ../src/o_basic.c:199 ../src/o_basic.c:211
 msgid "Invalid space specified, setting to 100\n"
 msgstr "Se ha especificado un espaciado no vÃ¡lido, se corrige a 100\n"
 
-#: ../src/o_basic.c:203
+#: ../src/o_basic.c:207
 msgid "Invalid length specified, setting to 100\n"
 msgstr "Se ha especificado una longitud no vÃ¡lida, se corrige a 100\n"
 
@@ -369,19 +372,19 @@ msgstr ""
 "Se ha encontrado un rectÃ¡ngulo con altura o anchura cero [ %c %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_bus_basic.c:163
+#: ../src/o_bus_basic.c:179
 #, c-format
 msgid "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 msgstr "Se ha encontrado un bus de longitud cero [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:178
+#: ../src/o_bus_basic.c:194
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr ""
 "Se ha encontrado una direcciÃ³n del sÃmbolo de extracciÃ³n de bus no vÃ¡lida [ %"
 "s ]\n"
 
-#: ../src/o_bus_basic.c:179
+#: ../src/o_bus_basic.c:195
 msgid "Resetting direction to neutral (no direction)\n"
 msgstr "Cambiando la direcciÃ³n al valor por defecto neutro (sin direcciÃ³n)\n"
 
@@ -394,7 +397,7 @@ msgstr "No se permiten cÃrculos con radio cero\n"
 msgid "Found a zero radius circle [ %c %d %d %d %d ]\n"
 msgstr "Se ha encontrado un cÃrculo con radio cero [ %c %d %d %d %d ]\n"
 
-#: ../src/o_complex_basic.c:476
+#: ../src/o_complex_basic.c:489
 #, c-format
 msgid ""
 "Component not found:\n"
@@ -403,14 +406,14 @@ msgstr ""
 "No se ha encontrado el componente:\n"
 " %s"
 
-#: ../src/o_complex_basic.c:690
+#: ../src/o_complex_basic.c:703
 #, c-format
 msgid "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
 "Se ha encontrado un componente con un Ã¡ngulo de rotaciÃ³n no vÃ¡lido [ %c %d %"
 "d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:702
+#: ../src/o_complex_basic.c:715
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
@@ -418,7 +421,7 @@ msgstr ""
 "Se ha encontrado un componente con un atributo de simetrÃa no vÃ¡lido [ %c %d "
 "%d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:1403
+#: ../src/o_complex_basic.c:1416
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -427,7 +430,7 @@ msgstr ""
 "ADVERTENCIA: Error al obtener la versiÃ³n de sÃmbolo en la referencia %s:\n"
 "\tNo se ha podido procesar el atributo de versiÃ³n de archivo symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1407
+#: ../src/o_complex_basic.c:1420
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -436,7 +439,7 @@ msgstr ""
 "ADVERTENCIA: Error al obtener la versiÃ³n de sÃmbolo en la referencia %s:\n"
 "\tNo se ha podido procesar el atributo de versiÃ³n de archivo symversion=\n"
 
-#: ../src/o_complex_basic.c:1423
+#: ../src/o_complex_basic.c:1436
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -445,7 +448,7 @@ msgstr ""
 "ADVERTENCIA: Error al obtener la versiÃ³n de sÃmbolo en la referencia %s:\n"
 "\tNo se ha podido procesar el atributo aÃ±adido symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1448
+#: ../src/o_complex_basic.c:1461
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -457,7 +460,7 @@ msgstr ""
 "\tse ha aÃ±adido el atributo symversion=%s a la instancia del sÃmbolo, pero "
 "no hay ningÃºn atributo symversion= dentro del archivo del sÃmbolo\n"
 
-#: ../src/o_complex_basic.c:1462
+#: ../src/o_complex_basic.c:1475
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -468,18 +471,18 @@ msgstr ""
 "\t El sÃmbolo en la librerÃa es mÃ¡s reciente que el instanciado en el "
 "esquema\n"
 
-#: ../src/o_complex_basic.c:1490
+#: ../src/o_complex_basic.c:1503
 #, c-format
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgstr ""
 "\tÂ¡CAMBIO DE VERSIÃ?N IMPORTANTE (archivo %.3f, instanciado %.3f, %s)!\n"
 
-#: ../src/o_complex_basic.c:1508
+#: ../src/o_complex_basic.c:1521
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr "\t Cambio menor en la versiÃ³n (archivo %.3f, instanciado %.3f)\n"
 
-#: ../src/o_complex_basic.c:1519
+#: ../src/o_complex_basic.c:1532
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -514,95 +517,95 @@ msgstr "Se ha desincrustado satisfactoriamente el componente [%s]\n"
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
 msgstr "Se ha encontrado una lÃnea con longitud cero [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_net_basic.c:154
+#: ../src/o_net_basic.c:170
 #, c-format
 msgid "Found a zero length net [ %c %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado una conexiÃ³n con longitud cero [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:90
+#: ../src/o_picture.c:80
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Error al leer la lÃnea de definiciÃ³n de la imagen: %s\n"
 
-#: ../src/o_picture.c:104
+#: ../src/o_picture.c:94
 #, c-format
 msgid "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado una imagen con altura Ã³ anchura cero [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:109
+#: ../src/o_picture.c:99
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr ""
 "Se ha encontrado una imagen con el parÃ¡metro 'volteado' incorrecto: %c.\n"
 
-#: ../src/o_picture.c:111
+#: ../src/o_picture.c:101
 msgid "Setting mirrored to 0\n"
 msgstr "Cambiando el parÃ¡metro 'volteado' a 0\n"
 
-#: ../src/o_picture.c:116
+#: ../src/o_picture.c:106
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr ""
 "Se ha encontrado una imagen con el parÃ¡metro 'incrustado' incorrecto: %c.\n"
 
-#: ../src/o_picture.c:118
+#: ../src/o_picture.c:108
 msgid "Setting embedded to 0\n"
 msgstr "Cambiando el parÃ¡metro 'incrustado' a 0\n"
 
-#: ../src/o_picture.c:130
+#: ../src/o_picture.c:120
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr ""
 "Se ha encontrado una imagen con un Ã¡ngulo de rotaciÃ³n no vÃ¡lido [ %d ]\n"
 
-#: ../src/o_picture.c:131 ../src/o_text_basic.c:1102
+#: ../src/o_picture.c:121 ../src/o_text_basic.c:1127
 msgid "Setting angle to 0\n"
 msgstr "Cambiando el parÃ¡metro 'Ã¡ngulo' a 0\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:177 ../src/o_picture.c:919
+#: ../src/o_picture.c:156 ../src/o_picture.c:167 ../src/o_picture.c:924
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Error al cargar imagen desde los datos embebidos [%s]: %s\n"
 
-#: ../src/o_picture.c:167
+#: ../src/o_picture.c:157
 msgid "Base64 decoding failed."
 msgstr "Ha fallado la decodificaciÃ³n Base64"
 
-#: ../src/o_picture.c:168 ../src/o_picture.c:179 ../src/o_picture.c:921
+#: ../src/o_picture.c:158 ../src/o_picture.c:169 ../src/o_picture.c:926
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Volviendo al modo de carga de archivo. Imagen desincrustada.\n"
 
-#: ../src/o_picture.c:190 ../src/o_picture.c:907 ../src/o_picture.c:956
+#: ../src/o_picture.c:180 ../src/o_picture.c:912 ../src/o_picture.c:961
 #, c-format
 msgid "Failed to load image from file [%s]: %s\n"
 msgstr "Error al cargar imagen desde el archivo [%s]: %s\n"
 
-#: ../src/o_picture.c:201
+#: ../src/o_picture.c:191
 msgid "Loading warning picture.\n"
 msgstr "Cargando imagen de advertencia.\n"
 
-#: ../src/o_picture.c:207
+#: ../src/o_picture.c:197
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Error al cargar la imagen desde el fichero: %s\n"
 
-#: ../src/o_picture.c:267
+#: ../src/o_picture.c:257
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "ERROR: o_picture_save: imposible codificar la imagen.\n"
 
-#: ../src/o_picture.c:934
+#: ../src/o_picture.c:939
 #, c-format
 msgid "Picture [%s] has been embedded\n"
 msgstr "Se ha incrustado la imagen [%s]\n"
 
-#: ../src/o_picture.c:974
+#: ../src/o_picture.c:979
 #, c-format
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Se ha desincrustado la imagen [%s]\n"
 
-#: ../src/o_pin_basic.c:162
+#: ../src/o_pin_basic.c:180
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
@@ -610,54 +613,54 @@ msgstr ""
 "Se ha encontrado una pata que no tiene el campo 'whichone'.\n"
 "Por favor, compruÃ©belo y corrÃjalo manualmente.\n"
 
-#: ../src/o_pin_basic.c:165
+#: ../src/o_pin_basic.c:183
 #, c-format
 msgid "Found an invalid whichend on a pin (reseting to zero): %d\n"
 msgstr ""
 "Se ha encontrado un parÃ¡metro 'whichone' en una pata (y se cambia a 0): %d\n"
 
-#: ../src/o_pin_basic.c:171
+#: ../src/o_pin_basic.c:189
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Se ha encontrado una pata con longitud cero [ %s ]\n"
 
-#: ../src/o_text_basic.c:278
+#: ../src/o_text_basic.c:303
 #, c-format
 msgid "Could not find character '%s' definition.\n"
 msgstr "No se puede encontrar la definiciÃ³n del carÃ¡cter '%s'.\n"
 
-#: ../src/o_text_basic.c:283
+#: ../src/o_text_basic.c:308
 #, c-format
 msgid "Could not load question font char -- check font-directory keyword\n"
 msgstr ""
 "No se puede cargar el carÃ¡cter de interrogaciÃ³n -- compruebe la variable "
 "font-directory\n"
 
-#: ../src/o_text_basic.c:1088
+#: ../src/o_text_basic.c:1113
 #, c-format
 msgid "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado un texto con tamaÃ±o cero [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1100
+#: ../src/o_text_basic.c:1125
 #, c-format
 msgid "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado un texto con Ã¡ngulo no vÃ¡lido [ %c %d %d %d %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_text_basic.c:1122
+#: ../src/o_text_basic.c:1147
 #, c-format
 msgid "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado un texto con alineamiento no vÃ¡lido [ %c %d %d %d %d %d %d %"
 "d %d ]\n"
 
-#: ../src/o_text_basic.c:1124
+#: ../src/o_text_basic.c:1149
 msgid "Setting alignment to LOWER_LEFT\n"
 msgstr "Cambiando el alineamiento a 'Abajo a la izquierda'\n"
 
-#: ../src/o_text_basic.c:1213
+#: ../src/o_text_basic.c:1238
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
 msgstr ""
@@ -752,6 +755,22 @@ msgstr "No se ha encontrado el componente [%s] en la librerÃa de componentes\n"
 msgid "More than one component found with name [%s]\n"
 msgstr "Se ha encontrado mÃ¡s de un componente con el nombre [%s]\n"
 
+#: ../src/s_color.c:206
+msgid "Color index out of range"
+msgstr ""
+
+#: ../src/s_color.c:261
+msgid "Color map entry must be a two-element list"
+msgstr ""
+
+#: ../src/s_color.c:269
+msgid "Index in color map entry must be an integer"
+msgstr ""
+
+#: ../src/s_color.c:295
+msgid "Value in color map entry must be #f or a string"
+msgstr ""
+
 #: ../src/s_hierarchy.c:90
 #, c-format
 msgid ""
@@ -770,23 +789,23 @@ msgstr "Â¡No hay mÃ¡s esquemas en un nivel de jerarquÃa superior al actual!\n"
 msgid "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 msgstr "ERROR: en s_hierarchy_traverse: no se encuentra el esquema %s\n"
 
-#: ../src/s_page.c:169
+#: ../src/s_page.c:167
 #, c-format
 msgid "s_page_delete: Can't get the real filename of %s."
 msgstr "s_page_delete: No se puede encontrar el nombre real del archivo %s."
 
-#: ../src/s_page.c:180
+#: ../src/s_page.c:178
 #, c-format
 msgid "s_page_delete: Unable to delete backup file %s."
 msgstr ""
 "s_page_delete: No se ha podido borrar el archivo de copia de seguridad %s."
 
-#: ../src/s_page.c:382
+#: ../src/s_page.c:380
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Guardado [%s]\n"
 
-#: ../src/s_page.c:388
+#: ../src/s_page.c:386
 #, c-format
 msgid "Could NOT save [%s]\n"
 msgstr "No se ha podido guardar [%s]\n"
@@ -802,6 +821,12 @@ msgstr "Encontrado [%s]\n"
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "No se ha podido encontrar [%s] en ninguna librerÃa fuente\n"
 
+#~ msgid "Read ~/.gEDA/%s file [%%s]\n"
+#~ msgstr "LeÃdo el archivo ~/.gEDA/%s [%%s]\n"
+
+#~ msgid "Did not find optional ~/.gEDA/%s file [%%s]\n"
+#~ msgstr "No se ha encontrado el archivo opcional ~/.gEDA/%s [%%s]\n"
+
 #~ msgid "Could not read symbolic link information for %s"
 #~ msgstr "No se puede leer la informaciÃ³n del enlace simbÃ³lico %s"
 
diff --git a/libgeda/po/nl.po b/libgeda/po/nl.po
index 296b7af..b2d5ccf 100644
--- a/libgeda/po/nl.po
+++ b/libgeda/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgeda\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-02 13:53+0000\n"
+"POT-Creation-Date: 2009-03-28 14:35-0400\n"
 "PO-Revision-Date: 2009-01-02 08:04+0100\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -46,17 +46,17 @@ msgstr "gEDA Schema Symbool"
 #. *  completely? In any case, failing gracefully is better
 #. *  than killing the program, which is what this used to
 #. *  do...
-#: ../src/a_basic.c:184
+#: ../src/a_basic.c:185
 #, c-format
 msgid "o_save_objects: object %p has unknown type '%c'\n"
 msgstr "o_save_objects: object %p heeft een onbekend type '%c'\n"
 
-#: ../src/a_basic.c:232
+#: ../src/a_basic.c:235
 #, c-format
 msgid "o_save: Could not open [%s]\n"
 msgstr "o_save: Kan [%s] niet openen\n"
 
-#: ../src/a_basic.c:424
+#: ../src/a_basic.c:440
 #, c-format
 msgid ""
 "Read unexpected embedded symbol start marker in [%s] :\n"
@@ -67,7 +67,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:453
+#: ../src/a_basic.c:469
 #, c-format
 msgid ""
 "Read unexpected embedded symbol end marker in [%s] :\n"
@@ -78,7 +78,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:482
+#: ../src/a_basic.c:498
 #, c-format
 msgid ""
 "Read an old format sym/sch file!\n"
@@ -89,7 +89,7 @@ msgstr ""
 "Voer g[sym|sch]update uit op:\n"
 "[%s]\n"
 
-#: ../src/a_basic.c:488
+#: ../src/a_basic.c:504
 #, c-format
 msgid ""
 "Read garbage in [%s] :\n"
@@ -100,17 +100,17 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:126 ../src/f_basic.c:139
+#: ../src/f_basic.c:123 ../src/f_basic.c:136
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "Status niet gelukt [%s]: %s"
 
-#: ../src/f_basic.c:222
+#: ../src/f_basic.c:219
 #, c-format
 msgid "Cannot find file %s: %s"
 msgstr "Kan bestand %s niet vinden: %s"
 
-#: ../src/f_basic.c:260
+#: ../src/f_basic.c:257
 #, c-format
 msgid ""
 "\n"
@@ -123,11 +123,11 @@ msgstr ""
 " %s.\n"
 "\n"
 
-#: ../src/f_basic.c:262
+#: ../src/f_basic.c:259
 msgid "I could not guess if it is newer, so you have to do it manually.\n"
 msgstr "Ik kan niet raden of het nieuwer is, je moet het dus handmatig doen.\n"
 
-#: ../src/f_basic.c:264
+#: ../src/f_basic.c:261
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
@@ -135,7 +135,7 @@ msgstr ""
 "De reservekopie is nieuwer dan het schema, het lijkt erop dat je deze zou "
 "moeten laden in plaats van het orginele bestand.\n"
 
-#: ../src/f_basic.c:266
+#: ../src/f_basic.c:263
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
@@ -144,7 +144,7 @@ msgstr ""
 "voor wanneer er een crash is of wanneer er een abrupte gedwongen beeindiging "
 "was.\n"
 
-#: ../src/f_basic.c:269
+#: ../src/f_basic.c:266
 msgid ""
 "\n"
 "Run gschem and correct the situation.\n"
@@ -154,27 +154,27 @@ msgstr ""
 "Voer gschem uit en corrigeer de situatie.\n"
 "\n"
 
-#: ../src/f_basic.c:378
+#: ../src/f_basic.c:375
 #, c-format
 msgid "Can't get the real filename of %s."
 msgstr "Kan de werkelijke bestandsnaam van %s niet krijgen."
 
-#: ../src/f_basic.c:398
+#: ../src/f_basic.c:395
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Kan vorige reservekopie [%s] NIET op lezen-schrijven instellen\n"
 
-#: ../src/f_basic.c:404
+#: ../src/f_basic.c:401
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "Kan reservekopie niet opslaan: %s."
 
-#: ../src/f_basic.c:414
+#: ../src/f_basic.c:411
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Kan reservekopie [%s] NIET op alleen-lezen instellen\n"
 
-#: ../src/f_basic.c:703
+#: ../src/f_basic.c:700
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -205,17 +205,17 @@ msgstr ""
 msgid "Giving up on printing\n"
 msgstr "Geef het afdrukken op\n"
 
-#: ../src/f_print.c:387
+#: ../src/f_print.c:390
 #, c-format
 msgid "Could not open [%s] for printing\n"
 msgstr "Kan [%s] niet openen voor afdrukken\n"
 
-#: ../src/f_print.c:420
+#: ../src/f_print.c:423
 #, c-format
 msgid "Could not execute command [%s] for printing\n"
 msgstr "Kan opdracht [%s] niet uitvoeren voor afdrukken\n"
 
-#: ../src/f_print.c:695
+#: ../src/f_print.c:698
 msgid "Too many UTF-8 characters, cannot print\n"
 msgstr "Te veel UTF-8 karakters, kan niet afdrukken\n"
 
@@ -252,42 +252,42 @@ msgstr "Kan [%s] niet vinden voor interpretatie\n"
 msgid "RC file [%s] already read in.\n"
 msgstr "RC bestand [%s] is reeds ingelezen.\n"
 
-#: ../src/g_rc.c:211
-#, c-format
-msgid "Read system-%s file [%%s]\n"
+#: ../src/g_rc.c:181
+#, fuzzy, c-format
+msgid "Read system config file [%%s]\n"
 msgstr "Lees system-%s bestand [%%s]\n"
 
-#: ../src/g_rc.c:213
-#, c-format
-msgid "Did not find required system-%s file [%%s]\n"
+#: ../src/g_rc.c:182
+#, fuzzy, c-format
+msgid "Did not find required system config file [%%s]\n"
 msgstr "Benodigde system-%s bestand is niet gevonden [%%s]\n"
 
-#: ../src/g_rc.c:255
-#, c-format
-msgid "Read ~/.gEDA/%s file [%%s]\n"
-msgstr "Lees ~/.gEDA/%s bestand [%%s]\n"
+#: ../src/g_rc.c:216
+#, fuzzy, c-format
+msgid "Read user config file [%%s]\n"
+msgstr "Lees gespecificeerd %s bestand [%%s]\n"
 
-#: ../src/g_rc.c:257
-#, c-format
-msgid "Did not find optional ~/.gEDA/%s file [%%s]\n"
-msgstr "Kan geen optioneel ~/.gEDA/%s file [%%s] bestand vinden\n"
+#: ../src/g_rc.c:217
+#, fuzzy, c-format
+msgid "Did not find optional user config file [%%s]\n"
+msgstr "Kan geen optioneel plaatselijk %s bestand [%%s] vinden\n"
 
-#: ../src/g_rc.c:289
-#, c-format
-msgid "Read local %s file [%%s]\n"
+#: ../src/g_rc.c:248
+#, fuzzy, c-format
+msgid "Read local config file [%%s]\n"
 msgstr "Lees plaatselijk %s bestand [%%s]\n"
 
-#: ../src/g_rc.c:291
-#, c-format
-msgid "Did not find optional local %s file [%%s]\n"
+#: ../src/g_rc.c:249
+#, fuzzy, c-format
+msgid "Did not find optional local config file [%%s]\n"
 msgstr "Kan geen optioneel plaatselijk %s bestand [%%s] vinden\n"
 
-#: ../src/g_rc.c:329
+#: ../src/g_rc.c:286
 #, c-format
 msgid "Read specified %s file [%%s]\n"
 msgstr "Lees gespecificeerd %s bestand [%%s]\n"
 
-#: ../src/g_rc.c:331
+#: ../src/g_rc.c:288
 #, c-format
 msgid "Did not find specified %s file [%%s]\n"
 msgstr "Kan geen gespecificeerd %s bestand [%%s] vinden\n"
@@ -296,12 +296,12 @@ msgstr "Kan geen gespecificeerd %s bestand [%%s] vinden\n"
 #. ! \todo these two are basically the
 #. * same. Inefficient!
 #.
-#: ../src/g_rc.c:389
+#: ../src/g_rc.c:338
 #, c-format
 msgid "Could not find any %s file!\n"
 msgstr "Kan geen enkel %s bestand vinden!\n"
 
-#: ../src/g_rc.c:1035
+#: ../src/g_rc.c:984
 msgid ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
@@ -312,47 +312,47 @@ msgstr ""
 msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 msgstr "Boog met een straal van nul gevonden [ %c %d, %d, %d, %d, %d, %d ]\n"
 
-#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:172
+#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:188
 #: ../src/o_circle_basic.c:293 ../src/o_line_basic.c:269
-#: ../src/o_net_basic.c:164 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:175
-#: ../src/o_text_basic.c:1130
+#: ../src/o_net_basic.c:180 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:193
+#: ../src/o_text_basic.c:1155
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Ongeldige kleur [ %s ] gevonden\n"
 
-#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:173
+#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:189
 #: ../src/o_circle_basic.c:294 ../src/o_line_basic.c:270
-#: ../src/o_net_basic.c:165 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:176
-#: ../src/o_text_basic.c:1131
+#: ../src/o_net_basic.c:181 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:194
+#: ../src/o_text_basic.c:1156
 #, fuzzy
 msgid "Setting color to default color\n"
 msgstr "Stel de kleur in op WIT \n"
 
-#: ../src/o_attrib.c:167
+#: ../src/o_attrib.c:191
 msgid "Attempt to attach non text item as an attribute!\n"
 msgstr "Probeerde een niet text item toe te voegen als een attribuut!\n"
 
-#: ../src/o_attrib.c:172
+#: ../src/o_attrib.c:196
 #, c-format
 msgid "Attempt to attach attribute [%s] to more than one object\n"
 msgstr "Probeerde attribuut [%s] aan meer dan een object toe te voegen\n"
 
 #. only an error if there's a slot string
-#: ../src/o_attrib.c:1390 ../src/o_attrib.c:1490
+#: ../src/o_attrib.c:1414 ../src/o_attrib.c:1514
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "Kan slotdef=#:#,#,#... attribuut niet vinden\n"
 
 # Geen gebruikelijke slotdef=#:... gevonden, doe een waarschuwing in het log
 #. Didn't find proper slotdef=#:... put warning into log
-#: ../src/o_attrib.c:1396
+#: ../src/o_attrib.c:1420
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Ongewenst slotdef syntax: \":\" ontbreekt.\n"
 
-#: ../src/o_attrib.c:1411 ../src/o_attrib.c:1509
+#: ../src/o_attrib.c:1435 ../src/o_attrib.c:1533
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "Kan het gewenste slotdef=#:#,#,#... attribuut niet vinden\n"
 
-#: ../src/o_attrib.c:1443 ../src/o_attrib.c:1538
+#: ../src/o_attrib.c:1467 ../src/o_attrib.c:1562
 msgid "component missing pinseq= attribute\n"
 msgstr "komponent mist het pinseq= attribuut\n"
 
@@ -370,17 +370,17 @@ msgid "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 msgstr ""
 "Rechthoek met een breedte/hoogte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:163
+#: ../src/o_bus_basic.c:179
 #, c-format
 msgid "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 msgstr "Bus met een lengte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:178
+#: ../src/o_bus_basic.c:194
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr "Ongeldige bus ripper richting gevonden [ %s ]\n"
 
-#: ../src/o_bus_basic.c:179
+#: ../src/o_bus_basic.c:195
 msgid "Resetting direction to neutral (no direction)\n"
 msgstr "Neutrale richting ingesteld (geen richting)\n"
 
@@ -393,7 +393,7 @@ msgstr "Cirkels met een radius van nul zijn niet toegestaan\n"
 msgid "Found a zero radius circle [ %c %d %d %d %d ]\n"
 msgstr "Een cirkel met een radius van nul gevonden [ %c %d %d %d %d ]\n"
 
-#: ../src/o_complex_basic.c:471
+#: ../src/o_complex_basic.c:489
 #, c-format
 msgid ""
 "Component not found:\n"
@@ -402,13 +402,13 @@ msgstr ""
 "Komponent niet gevonden:\n"
 " %s"
 
-#: ../src/o_complex_basic.c:685
+#: ../src/o_complex_basic.c:703
 #, c-format
 msgid "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
 "Een komponent met een ongeldige rotatie gevonden [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:697
+#: ../src/o_complex_basic.c:715
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
@@ -416,7 +416,7 @@ msgstr ""
 "Een komponent met een ongeldige spiegel vlag gevonden [ %c %d %d %d %d %d %"
 "s ]\n"
 
-#: ../src/o_complex_basic.c:1398
+#: ../src/o_complex_basic.c:1416
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -425,7 +425,7 @@ msgstr ""
 "WAARSCHUWING: Symbool versie zoek fout bij refdes %s:\n"
 "\tKan symboolbestand niet doorzoeken symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1402
+#: ../src/o_complex_basic.c:1420
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -434,7 +434,7 @@ msgstr ""
 "WAARSCHUWING: Symbool versie zoek fout bij refdes %s:\n"
 "\tKan symboolbestand niet doorzoeken symversion=\n"
 
-#: ../src/o_complex_basic.c:1418
+#: ../src/o_complex_basic.c:1436
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -443,7 +443,7 @@ msgstr ""
 "WAARSCHUWING: Symbool versie zoek fout bij refdes %s:\n"
 "\tKan bijgevoegd symboolbestand niet doorzoeken symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1443
+#: ../src/o_complex_basic.c:1461
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -454,7 +454,7 @@ msgstr ""
 "\tsymversion=%s bijgevoegd aan bedoelde symbool, maar geen symversion= in "
 "het symbool bestand\n"
 
-#: ../src/o_complex_basic.c:1457
+#: ../src/o_complex_basic.c:1475
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -463,17 +463,17 @@ msgstr ""
 "WAARSCHUWING: Symbool versie fout bij refdes %s (%s):\n"
 "\tSymbool in bibliotheek is nieuwer dan bedoelde symbool\n"
 
-#: ../src/o_complex_basic.c:1485
+#: ../src/o_complex_basic.c:1503
 #, c-format
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgstr "\tGROTE VERSIE VERANDERING (bestand %.3f, bedoeld %.3f, %s)!\n"
 
-#: ../src/o_complex_basic.c:1503
+#: ../src/o_complex_basic.c:1521
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr "\tKleine versie verandering (bestand %.3f, bedoeld %.3f)!\n"
 
-#: ../src/o_complex_basic.c:1514
+#: ../src/o_complex_basic.c:1532
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -508,91 +508,91 @@ msgstr "Komponent [%s] is succesvol uitgevoegd\n"
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
 msgstr "Lijn met een lengte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_net_basic.c:154
+#: ../src/o_net_basic.c:170
 #, c-format
 msgid "Found a zero length net [ %c %d %d %d %d %d ]\n"
 msgstr "Net met een lengte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:90
+#: ../src/o_picture.c:80
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Fout bij het lezen van afbeelding definitie regel: %s.\n"
 
-#: ../src/o_picture.c:104
+#: ../src/o_picture.c:94
 #, c-format
 msgid "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 msgstr ""
 "Afbeelding met een breedte/hoogte van nul gevonden [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:109
+#: ../src/o_picture.c:99
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr "Afbeelding met een verkeerde 'gespiegelde' parameter gevonden: %c.\n"
 
-#: ../src/o_picture.c:111
+#: ../src/o_picture.c:101
 msgid "Setting mirrored to 0\n"
 msgstr "Spiegelen op 0 ingesteld\n"
 
-#: ../src/o_picture.c:116
+#: ../src/o_picture.c:106
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr "Afbeelding met een verkeerd 'ingevoegde' waarde gevonden: %c.\n"
 
-#: ../src/o_picture.c:118
+#: ../src/o_picture.c:108
 msgid "Setting embedded to 0\n"
 msgstr "Invoegen op 0 ingesteld\n"
 
-#: ../src/o_picture.c:130
+#: ../src/o_picture.c:120
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr "Niet ondersteunde afbeelding hoek [ %d ] gevonden\n"
 
-#: ../src/o_picture.c:131 ../src/o_text_basic.c:1102
+#: ../src/o_picture.c:121 ../src/o_text_basic.c:1127
 msgid "Setting angle to 0\n"
 msgstr "Hoek op 0 ingesteld\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:177 ../src/o_picture.c:919
+#: ../src/o_picture.c:156 ../src/o_picture.c:167 ../src/o_picture.c:924
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Laden van afbeelding uit ingesloten data faalde [%s]: %s\n"
 
-#: ../src/o_picture.c:167
+#: ../src/o_picture.c:157
 msgid "Base64 decoding failed."
 msgstr "Base64 decodering faalde."
 
-#: ../src/o_picture.c:168 ../src/o_picture.c:179 ../src/o_picture.c:921
+#: ../src/o_picture.c:158 ../src/o_picture.c:169 ../src/o_picture.c:926
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Val terug op het laden van bestand. Afbeelding uitgevoegd.\n"
 
-#: ../src/o_picture.c:190 ../src/o_picture.c:907 ../src/o_picture.c:956
+#: ../src/o_picture.c:180 ../src/o_picture.c:912 ../src/o_picture.c:961
 #, c-format
 msgid "Failed to load image from file [%s]: %s\n"
 msgstr "Laden van afbeelding uit bestand faalde [%s]: %s\n"
 
-#: ../src/o_picture.c:201
+#: ../src/o_picture.c:191
 msgid "Loading warning picture.\n"
 msgstr "Laad de waarschuwing afbeelding.\n"
 
-#: ../src/o_picture.c:207
+#: ../src/o_picture.c:197
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Fout bij het laden van een afbeelding uit een bestand: %s.\n"
 
-#: ../src/o_picture.c:267
+#: ../src/o_picture.c:257
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "FOUT: o_picture_save: kan de afbeelding niet coderen.\n"
 
-#: ../src/o_picture.c:934
+#: ../src/o_picture.c:939
 #, c-format
 msgid "Picture [%s] has been embedded\n"
 msgstr "Afbeelding [%s] is ingevoegd\n"
 
-#: ../src/o_picture.c:974
+#: ../src/o_picture.c:979
 #, c-format
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Afbeelding [%s] is uitgevoegd\n"
 
-#: ../src/o_pin_basic.c:162
+#: ../src/o_pin_basic.c:180
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
@@ -600,50 +600,50 @@ msgstr ""
 "Pen die geen whichone veld ingesteld heeft gevonden.\n"
 "Verifieer en corigeer handmatig.\n"
 
-#: ../src/o_pin_basic.c:165
+#: ../src/o_pin_basic.c:183
 #, c-format
 msgid "Found an invalid whichend on a pin (reseting to zero): %d\n"
 msgstr "Pen met een ongeldige whichend gevonden (instellen op nul): %d\n"
 
-#: ../src/o_pin_basic.c:171
+#: ../src/o_pin_basic.c:189
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Pen met een lengte van nul gevonden: [ %s ]\n"
 
-#: ../src/o_text_basic.c:278
+#: ../src/o_text_basic.c:303
 #, c-format
 msgid "Could not find character '%s' definition.\n"
 msgstr "Kan karakter '%s' definitie niet vinden.\n"
 
-#: ../src/o_text_basic.c:283
+#: ../src/o_text_basic.c:308
 #, c-format
 msgid "Could not load question font char -- check font-directory keyword\n"
 msgstr ""
 "Kan vraag font karakter niet laden -- controleer font-map sleutelwoord\n"
 
-#: ../src/o_text_basic.c:1088
+#: ../src/o_text_basic.c:1113
 #, c-format
 msgid "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Tekst string met een afmeting van nul gevonden [ %c %d %d %d %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_text_basic.c:1100
+#: ../src/o_text_basic.c:1125
 #, c-format
 msgid "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr "Niet ondersteunde teksthoek gevonden [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1122
+#: ../src/o_text_basic.c:1147
 #, c-format
 msgid "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Niet ondersteunde tekst uitlijning gevonden [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1124
+#: ../src/o_text_basic.c:1149
 msgid "Setting alignment to LOWER_LEFT\n"
 msgstr "Uitlijning op LINKS_ONDER ingesteld\n"
 
-#: ../src/o_text_basic.c:1213
+#: ../src/o_text_basic.c:1238
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
 msgstr "Valideren van utf-8 karakter in font definitie: \"%s\" faalde.\n"
@@ -736,19 +736,19 @@ msgstr "Komponent [%s] is niet in de komponenten bibliotheek gevonden\n"
 msgid "More than one component found with name [%s]\n"
 msgstr "Meer dan een komponent gevonden met de naam [%s]\n"
 
-#: ../src/s_color.c:202
+#: ../src/s_color.c:206
 msgid "Color index out of range"
 msgstr ""
 
-#: ../src/s_color.c:257
+#: ../src/s_color.c:261
 msgid "Color map entry must be a two-element list"
 msgstr ""
 
-#: ../src/s_color.c:265
+#: ../src/s_color.c:269
 msgid "Index in color map entry must be an integer"
 msgstr ""
 
-#: ../src/s_color.c:291
+#: ../src/s_color.c:295
 msgid "Value in color map entry must be #f or a string"
 msgstr ""
 
@@ -770,22 +770,22 @@ msgstr "Er zijn geen schema's boven de huidige!\n"
 msgid "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 msgstr "FOUT in s_hierarchy_traverse: schema niet gevonden: %s\n"
 
-#: ../src/s_page.c:169
+#: ../src/s_page.c:167
 #, c-format
 msgid "s_page_delete: Can't get the real filename of %s."
 msgstr "s_page_delete: Kan de echte bestandsnaam van %s niet krijgen."
 
-#: ../src/s_page.c:180
+#: ../src/s_page.c:178
 #, c-format
 msgid "s_page_delete: Unable to delete backup file %s."
 msgstr "s_page_delete: Niet mogelijk om reservekopie %s te verwijderen."
 
-#: ../src/s_page.c:382
+#: ../src/s_page.c:380
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "[%s] opgeslagen\n"
 
-#: ../src/s_page.c:388
+#: ../src/s_page.c:386
 #, c-format
 msgid "Could NOT save [%s]\n"
 msgstr "Kan [%s] NIET opslaan\n"
@@ -800,3 +800,9 @@ msgstr "[%s] gevonden\n"
 #, c-format
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "Kan geen [%s] vinden in welke BronBibliotheek dan ook!\n"
+
+#~ msgid "Read ~/.gEDA/%s file [%%s]\n"
+#~ msgstr "Lees ~/.gEDA/%s bestand [%%s]\n"
+
+#~ msgid "Did not find optional ~/.gEDA/%s file [%%s]\n"
+#~ msgstr "Kan geen optioneel ~/.gEDA/%s file [%%s] bestand vinden\n"


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs

Prev by Author: gEDA-cvs: pcb.git: branch: master updated (b274cf8fe9c8caf5bcd4edc28935c88cf5bab7f4)
Next by Author: gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-217-g859abe6)
Previous by thread: gEDA-cvs: pcb.git: branch: master updated (b274cf8fe9c8caf5bcd4edc28935c88cf5bab7f4)
Next by thread: gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-217-g859abe6)
Index(es):
- Author
- Thread