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

gEDA-cvs: branch: master updated (1.1.2.20070818-222-g7c82238)



The branch, master has been updated
       via  7c82238f3b2433607f8af6c873af99a642f05409 (commit)
      from  fe7d974a8c2dd0a5b96bbd41b2691cfd5c8a7ecb (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_DE.po |    3 +-
 gattrib/po/es_ES.po |   11 +-
 gattrib/po/nl_NL.po |    4 +-
 gschem/po/de_DE.po  |   63 ++-
 gschem/po/en_GB.po  |  453 ++++++++------------
 gschem/po/es_ES.po  | 1179 +++++++++++++++++++++++++++-----------------------
 gschem/po/fr_FR.po  | 1177 +++++++++++++++++++++++++++-----------------------
 gschem/po/it_IT.po  | 1205 +++++++++++++++++++++++++++------------------------
 gschem/po/ja_JP.po  | 1165 ++++++++++++++++++++++++++-----------------------
 gschem/po/nl_NL.po  | 1190 +++++++++++++++++++++++++++-----------------------
 gschem/po/pt_BR.po  | 1171 ++++++++++++++++++++++++++-----------------------
 gschem/po/ru.po     | 1177 +++++++++++++++++++++++++++-----------------------
 libgeda/po/en_GB.po |  204 ++++-----
 libgeda/po/es_ES.po |  221 ++++++----
 libgeda/po/nl_NL.po |  300 +++++++-------
 15 files changed, 5020 insertions(+), 4503 deletions(-)


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

commit 7c82238f3b2433607f8af6c873af99a642f05409
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date:   Sat Dec 29 09:22:38 2007 -0500

    Ran make update-po in all po directories in prep for a new release.

:100644 100644 65387aa... 8ab894f... M	gattrib/po/de_DE.po
:100644 100644 9c7b33e... a6f97d4... M	gattrib/po/es_ES.po
:100644 100644 e1b75b6... 3c9019f... M	gattrib/po/nl_NL.po
:100644 100644 382c7ef... 243ba43... M	gschem/po/de_DE.po
:100644 100644 810c4cc... 37ce041... M	gschem/po/en_GB.po
:100644 100644 f149023... b92c914... M	gschem/po/es_ES.po
:100644 100644 0c0f3b8... 9fe00d5... M	gschem/po/fr_FR.po
:100644 100644 7f814e0... 373cc9e... M	gschem/po/it_IT.po
:100644 100644 c817711... d0040ec... M	gschem/po/ja_JP.po
:100644 100644 c1748bb... cc06bfc... M	gschem/po/nl_NL.po
:100644 100644 285ec74... aee58b2... M	gschem/po/pt_BR.po
:100644 100644 5b019e4... fcdd773... M	gschem/po/ru.po
:100644 100644 97ce14c... 2aecd68... M	libgeda/po/en_GB.po
:100644 100644 8243e5a... 496b558... M	libgeda/po/es_ES.po
:100644 100644 80eeb61... 4aa562b... M	libgeda/po/nl_NL.po

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

commit 7c82238f3b2433607f8af6c873af99a642f05409
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date:   Sat Dec 29 09:22:38 2007 -0500

    Ran make update-po in all po directories in prep for a new release.

diff --git a/gattrib/po/de_DE.po b/gattrib/po/de_DE.po
index 65387aa..8ab894f 100644
--- a/gattrib/po/de_DE.po
+++ b/gattrib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de_DE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-29 09:08+0100\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-12-29 09:14+0100\n"
 "Last-Translator: Werner Hoch <werner.ho@xxxxxx>\n"
 "Language-Team: deutsch <de@xxxxxx>\n"
@@ -23,4 +23,3 @@ msgstr "Editieren von Bauteilattributen mit gattrib"
 #: ../data/geda-gattrib.desktop.in.h:2
 msgid "gEDA Attribute Editor"
 msgstr "gEDA Attributeditor"
-
diff --git a/gattrib/po/es_ES.po b/gattrib/po/es_ES.po
index 9c7b33e..a6f97d4 100644
--- a/gattrib/po/es_ES.po
+++ b/gattrib/po/es_ES.po
@@ -9,15 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gattrib VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-20 01:26+0000\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-12-28 20:41+0100\n"
 "Last-Translator: Carlos Nieves Ã?nega <cnieves@xxxxxxxxx>\n"
-"Language-Team: geda-dev <geda-dev@xxxxxxxxxxxxx>"
-"Report-Msgid-Bugs-To: "
-"MIME-Version: 1.0"
-"MIME-Version: 1.0\n"
+"Language-Team: geda-dev <geda-dev@xxxxxxxxxxxxx>Report-Msgid-Bugs-To: MIME-"
+"Version: 1.0MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/geda-gattrib.desktop.in.h:1
 msgid "Manipulate component attributes with gattrib"
@@ -26,4 +24,3 @@ msgstr "Manejar propiedades de componentes con gattrib"
 #: ../data/geda-gattrib.desktop.in.h:2
 msgid "gEDA Attribute Editor"
 msgstr "Editor de Propiedades de gEDA"
-
diff --git a/gattrib/po/nl_NL.po b/gattrib/po/nl_NL.po
index e1b75b6..3c9019f 100644
--- a/gattrib/po/nl_NL.po
+++ b/gattrib/po/nl_NL.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geda-gattrib\n"
-"Report-Msgid-Bugs-To: gEDA developers mailing-list <geda-dev@xxxxxxxxxxxxxx>\n"
-"POT-Creation-Date: 2007-12-20 01:26+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-12-29 06:58+0100\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: gEDA developers <geda-dev@xxxxxxxxxxxxxx>\n"
diff --git a/gschem/po/de_DE.po b/gschem/po/de_DE.po
index 382c7ef..243ba43 100644
--- a/gschem/po/de_DE.po
+++ b/gschem/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de_DE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-29 08:37+0100\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-12-29 08:51+0100\n"
 "Last-Translator: Werner Hoch <werner.ho@xxxxxx>\n"
 "Language-Team: deutsch <de@xxxxxx>\n"
@@ -573,7 +573,8 @@ msgstr "An \"grid-dot-size\" wurde eine falsche Punktgrö�e [%d] übergeben.\n"
 #: ../src/g_rc.c:1406
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
-msgstr "An \"grid-fixed-threshold\" wurde ein falscher Punktabstand [%d] übergeben.\n"
+msgstr ""
+"An \"grid-fixed-threshold\" wurde ein falscher Punktabstand [%d] übergeben.\n"
 
 #: ../src/g_rc.c:1450
 #, c-format
@@ -600,7 +601,8 @@ msgstr "Ein ungültiger Wert [%d] wurde an keyboardpan-gain übergeben.\n"
 #: ../src/g_rc.c:1584
 #, 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"
+msgstr ""
+"An \"select-slack-pixels\" wurde eine ungültige Pixelzahl [%d] übergeben\n"
 
 #: ../src/gschem.c:193 ../src/gschem.c:204
 #, c-format
@@ -618,7 +620,8 @@ msgstr ""
 
 #: ../src/gschem.c:198 ../src/gschem.c:209
 #, c-format
-msgid "This is free software, and you are welcome to redistribute it under certain\n"
+msgid ""
+"This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 "Dies ist Freie Software. Sie darf gerne weitergegeben werden. Bitte lies "
 "die\n"
@@ -824,7 +827,8 @@ msgstr "Verschieben nach"
 
 #: ../src/i_callbacks.c:991
 msgid "WARNING: Do not translate with snap off!\n"
-msgstr "ACHTUNG: Keine Transformation mit ausgeschalteter Ausrichtung am Raster!\n"
+msgstr ""
+"ACHTUNG: Keine Transformation mit ausgeschalteter Ausrichtung am Raster!\n"
 
 #: ../src/i_callbacks.c:992
 msgid "WARNING: Turning snap on and continuing with translate.\n"
@@ -1068,7 +1072,8 @@ msgstr "Undefinierter Typ für das Rechteck (Füllung)!\n"
 #: ../src/o_buffer.c:44
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_copy]\n"
-msgstr "Eine ungültige Zwischenspeichernummer wurde übergeben [o_buffer_copy]\n"
+msgstr ""
+"Eine ungültige Zwischenspeichernummer wurde übergeben [o_buffer_copy]\n"
 
 #: ../src/o_buffer.c:73
 #, c-format
@@ -1085,12 +1090,14 @@ msgstr ""
 #: ../src/o_buffer.c:164
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
-msgstr "Eine ungültige Zwischenspeichernummer wurde übergeben [o_buffer_paste_end]\n"
+msgstr ""
+"Eine ungültige Zwischenspeichernummer wurde übergeben [o_buffer_paste_end]\n"
 
 #: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\n"
-msgstr "Ungültiger Wert in Variable whichone in der Funktion o_bus_draw_xor_single\n"
+msgstr ""
+"Ungültiger Wert in Variable whichone in der Funktion o_bus_draw_xor_single\n"
 
 #: ../src/o_circle.c:138
 #, c-format
@@ -1111,7 +1118,8 @@ msgstr "Undefinierter Typ für einen Kreis (Füllung).\n"
 #: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
-msgstr "Konnte complex während des Hinzufügens eines neuen Bauteils nicht finden.\n"
+msgstr ""
+"Konnte complex während des Hinzufügens eines neuen Bauteils nicht finden.\n"
 
 #: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
@@ -1172,7 +1180,8 @@ msgstr ""
 #: ../src/o_misc.c:951
 #, 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"
+msgstr ""
+"Die vorherige Backup-Datei [%s] konnte nicht auf read-write gesetzt werden.\n"
 
 #: ../src/o_misc.c:969
 #, c-format
@@ -1204,7 +1213,8 @@ msgstr "Da ist ein Objekt in o_move_check_endpoint, welches keine Linie ist.\n"
 #: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\n"
-msgstr "Ungültiger Wert der Variablen whichone innerhalb von o_net_draw_xor_single\n"
+msgstr ""
+"Ungültiger Wert der Variablen whichone innerhalb von o_net_draw_xor_single\n"
 
 #. try to exit gracefully
 #: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
@@ -1364,7 +1374,8 @@ msgstr ""
 #. duplicate slot in used_slots
 #: ../src/x_autonumber.c:427
 #, c-format
-msgid "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
+msgid ""
+"duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 "Doppelt vergebener slot kann Probleme verursachen: [Symbolname=%s, Number=%"
 "d, slot=%d]\n"
@@ -1535,38 +1546,47 @@ msgstr ""
 "Mittlere Maustaste dreht während des Plazierens."
 
 #: ../src/x_dialog.c:313
+#, c-format
 msgid "Lower Left"
 msgstr "Unten Links"
 
 #: ../src/x_dialog.c:324
+#, c-format
 msgid "Middle Left"
 msgstr "Mitte Links"
 
 #: ../src/x_dialog.c:335
+#, c-format
 msgid "Upper Left"
 msgstr "Oben Links"
 
 #: ../src/x_dialog.c:346
+#, c-format
 msgid "Lower Middle"
 msgstr "Unten Mitte"
 
 #: ../src/x_dialog.c:357
+#, c-format
 msgid "Middle Middle"
 msgstr "Mitte Mitte"
 
 #: ../src/x_dialog.c:368
+#, c-format
 msgid "Upper Middle"
 msgstr "Oben Mitte"
 
 #: ../src/x_dialog.c:379
+#, c-format
 msgid "Lower Right"
 msgstr "Unten Rechts"
 
 #: ../src/x_dialog.c:390
+#, c-format
 msgid "Middle Right"
 msgstr "Mitte Rechts"
 
 #: ../src/x_dialog.c:401
+#, c-format
 msgid "Upper Right"
 msgstr "0ben Rechts"
 
@@ -1620,6 +1640,7 @@ msgstr "StrichZweiPunkt"
 #: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
 #: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
 #: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
+#, c-format
 msgid "*unchanged*"
 msgstr "*unverändert*"
 
@@ -1831,7 +1852,8 @@ msgstr ""
 
 #: ../src/x_dialog.c:3709
 #, c-format
-msgid "There are %d schematics with unsaved changes. Save changes before closing?"
+msgid ""
+"There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 "Es gibt %d ungesicherte Schaltpläne. Sollen die �nderungen vor dem Schlie�en "
 "gespeichert werden?"
@@ -1855,7 +1877,8 @@ msgid ""
 "The name cannot end with a space.\n"
 "The value cannot start with a space."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Das eingegebene Attribut \"%s\" ist nicht zulässig\n"
+"<span weight=\"bold\" size=\"larger\">Das eingegebene Attribut \"%s\" ist "
+"nicht zulässig\n"
 "Bitte korrigiere es um fortzufahren.</span>\n"
 "\n"
 "Der Name und der Wert dürfen nicht leer sein.\n"
@@ -2034,7 +2057,9 @@ msgstr "/Hinauf"
 #: ../src/x_menus.c:333
 #, 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"
+msgstr ""
+"Es wurde versucht die Empfindlichkeit des nicht existenten Menueintrags '%s' "
+"zu setzen\n"
 
 #: ../src/x_menus.c:357
 msgid "Popup_menu_item_factory doesn't exist!\n"
@@ -2058,7 +2083,8 @@ msgstr "Entfernen"
 
 #: ../src/x_multiattrib.c:708
 msgid "Attributes with empty name are not allowed. Please set a name."
-msgstr "Attribute mit leerem Namen sind nicht erlaubt. Gib bitte einen Namen ein."
+msgstr ""
+"Attribute mit leerem Namen sind nicht erlaubt. Gib bitte einen Namen ein."
 
 #: ../src/x_multiattrib.c:1218
 msgid "Show Value only"
@@ -2367,7 +2393,9 @@ msgstr "SchlieÃ?e [%s]\n"
 
 #: ../data/geda-gschem.desktop.in.h:1
 msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr "Erstellen oder editieren eines elektrischen Schaltplans oder Symbols mit gschem"
+msgstr ""
+"Erstellen oder editieren eines elektrischen Schaltplans oder Symbols mit "
+"gschem"
 
 #: ../data/geda-gschem.desktop.in.h:2
 msgid "gEDA Schematic Editor"
@@ -2801,4 +2829,3 @@ msgstr "gEDA Schaltplan Editor"
 #~ msgid "Invalid path [%s] passed to font-directory\n"
 #~ msgstr ""
 #~ "Ein ungültiges Verzeichnis [%s] wurde an font-directory übergeben.\n"
-
diff --git a/gschem/po/en_GB.po b/gschem/po/en_GB.po
index 810c4cc..37ce041 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: 2007-12-25 22:25+0000\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-12-25 22:43+0100\n"
 "Last-Translator: Peter Clifton <pcjc2@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -23,18 +23,15 @@ msgstr "File"
 msgid "New Window"
 msgstr "New Window"
 
-#: ../src/rcstrings.c:4
-#: ../src/x_pagesel.c:259
+#: ../src/rcstrings.c:4 ../src/x_pagesel.c:259
 msgid "New Page"
 msgstr "New Page"
 
-#: ../src/rcstrings.c:5
-#: ../src/x_pagesel.c:260
+#: ../src/rcstrings.c:5 ../src/x_pagesel.c:260
 msgid "Open Page..."
 msgstr "Open Page..."
 
-#: ../src/rcstrings.c:6
-#: ../src/x_pagesel.c:263
+#: ../src/rcstrings.c:6 ../src/x_pagesel.c:263
 msgid "Close Page"
 msgstr "Close Page"
 
@@ -42,8 +39,7 @@ msgstr "Close Page"
 msgid "Revert Page"
 msgstr "Revert Page"
 
-#: ../src/rcstrings.c:8
-#: ../src/x_pagesel.c:262
+#: ../src/rcstrings.c:8 ../src/x_pagesel.c:262
 msgid "Save Page"
 msgstr "Save Page"
 
@@ -56,24 +52,20 @@ msgid "Save All"
 msgstr "Save All"
 
 #. GtkWindow
-#: ../src/rcstrings.c:11
-#: ../src/x_print.c:284
+#: ../src/rcstrings.c:11 ../src/x_print.c:284
 msgid "Print..."
 msgstr "Print..."
 
 #. Create the dialog
-#: ../src/rcstrings.c:12
-#: ../src/x_image.c:509
+#: ../src/rcstrings.c:12 ../src/x_image.c:509
 msgid "Write image..."
 msgstr "Write image..."
 
-#: ../src/rcstrings.c:13
-#: ../src/x_menus.c:525
+#: ../src/rcstrings.c:13 ../src/x_menus.c:525
 msgid "Recent files"
 msgstr "Recent files"
 
-#: ../src/rcstrings.c:14
-#: ../src/x_script.c:51
+#: ../src/rcstrings.c:14 ../src/x_script.c:51
 msgid "Execute Script..."
 msgstr "Execute Script..."
 
@@ -85,24 +77,19 @@ msgstr "Close Window"
 msgid "Quit"
 msgstr "Quit"
 
-#: ../src/rcstrings.c:18
-#: ../src/i_callbacks.c:732
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:732
 msgid "Edit"
 msgstr "Edit"
 
-#: ../src/rcstrings.c:19
-#: ../src/x_window.c:423
+#: ../src/rcstrings.c:19 ../src/x_window.c:423
 msgid "Undo"
 msgstr "Undo"
 
-#: ../src/rcstrings.c:20
-#: ../src/x_window.c:430
+#: ../src/rcstrings.c:20 ../src/x_window.c:430
 msgid "Redo"
 msgstr "Redo"
 
-#: ../src/rcstrings.c:21
-#: ../src/i_basic.c:81
-#: ../src/x_window.c:594
+#: ../src/rcstrings.c:21 ../src/i_basic.c:81 ../src/x_window.c:594
 msgid "Select Mode"
 msgstr "Select Mode"
 
@@ -126,24 +113,19 @@ msgstr "Edit..."
 msgid "Edit Text..."
 msgstr "Edit Text..."
 
-#: ../src/rcstrings.c:27
-#: ../src/i_basic.c:91
+#: ../src/rcstrings.c:27 ../src/i_basic.c:91
 msgid "Copy Mode"
 msgstr "Copy Mode"
 
-#: ../src/rcstrings.c:28
-#: ../src/i_basic.c:146
+#: ../src/rcstrings.c:28 ../src/i_basic.c:146
 msgid "Multiple Copy Mode"
 msgstr "Multiple Copy Mode"
 
-#: ../src/rcstrings.c:29
-#: ../src/i_basic.c:94
+#: ../src/rcstrings.c:29 ../src/i_basic.c:94
 msgid "Move Mode"
 msgstr "Move Mode"
 
-#: ../src/rcstrings.c:30
-#: ../src/i_callbacks.c:708
-#: ../src/x_multiattrib.c:1248
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:708 ../src/x_multiattrib.c:1248
 msgid "Delete"
 msgstr "Delete"
 
@@ -151,8 +133,7 @@ msgstr "Delete"
 msgid "Rotate 90 Mode"
 msgstr "Rotate 90 Mode"
 
-#: ../src/rcstrings.c:32
-#: ../src/i_basic.c:98
+#: ../src/rcstrings.c:32 ../src/i_basic.c:98
 msgid "Mirror Mode"
 msgstr "Mirror Mode"
 
@@ -164,13 +145,11 @@ msgstr "Slot..."
 msgid "Color..."
 msgstr "Colour..."
 
-#: ../src/rcstrings.c:35
-#: ../src/i_callbacks.c:952
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:952
 msgid "Lock"
 msgstr "Lock"
 
-#: ../src/rcstrings.c:36
-#: ../src/i_callbacks.c:970
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:970
 msgid "Unlock"
 msgstr "Unlock"
 
@@ -279,14 +258,11 @@ msgid "Redraw"
 msgstr "Redraw"
 
 #. I don't know if this would get in the way
-#: ../src/rcstrings.c:65
-#: ../src/i_callbacks.c:1536
-#: ../src/i_callbacks.c:1605
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1542 ../src/i_callbacks.c:1611
 msgid "Pan"
 msgstr "Pan"
 
-#: ../src/rcstrings.c:66
-#: ../src/i_basic.c:102
+#: ../src/rcstrings.c:66 ../src/i_basic.c:102
 msgid "Zoom Box"
 msgstr "Zoom Box"
 
@@ -322,8 +298,7 @@ msgstr "Next"
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/rcstrings.c:76
-#: ../src/x_window.c:401
+#: ../src/rcstrings.c:76 ../src/x_window.c:401
 msgid "New"
 msgstr "New"
 
@@ -348,16 +323,12 @@ msgid "Component..."
 msgstr "Component..."
 
 #. need to click
-#: ../src/rcstrings.c:83
-#: ../src/i_callbacks.c:2334
-#: ../src/i_callbacks.c:2356
+#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2340 ../src/i_callbacks.c:2362
 msgid "Net"
 msgstr "Net"
 
 #. need to click
-#: ../src/rcstrings.c:84
-#: ../src/i_callbacks.c:2400
-#: ../src/i_callbacks.c:2423
+#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2406 ../src/i_callbacks.c:2429
 #: ../src/x_window.c:459
 msgid "Bus"
 msgstr "Bus"
@@ -370,33 +341,23 @@ msgstr "Attribute..."
 msgid "Text..."
 msgstr "Text..."
 
-#: ../src/rcstrings.c:87
-#: ../src/i_callbacks.c:2504
-#: ../src/i_callbacks.c:2523
+#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2510 ../src/i_callbacks.c:2529
 msgid "Line"
 msgstr "Line"
 
-#: ../src/rcstrings.c:88
-#: ../src/i_callbacks.c:2545
-#: ../src/i_callbacks.c:2564
+#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2551 ../src/i_callbacks.c:2570
 msgid "Box"
 msgstr "Box"
 
-#: ../src/rcstrings.c:89
-#: ../src/i_callbacks.c:2620
-#: ../src/i_callbacks.c:2640
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2626 ../src/i_callbacks.c:2646
 msgid "Circle"
 msgstr "Circle"
 
-#: ../src/rcstrings.c:90
-#: ../src/i_callbacks.c:2662
-#: ../src/i_callbacks.c:2681
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2668 ../src/i_callbacks.c:2687
 msgid "Arc"
 msgstr "Arc"
 
-#: ../src/rcstrings.c:91
-#: ../src/i_callbacks.c:2703
-#: ../src/i_callbacks.c:2722
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2709 ../src/i_callbacks.c:2728
 msgid "Pin"
 msgstr "Pin"
 
@@ -425,18 +386,15 @@ msgid "Documentation"
 msgstr "Documentation"
 
 #. GtkFrame
-#: ../src/rcstrings.c:100
-#: ../src/x_multiattrib.c:1539
+#: ../src/rcstrings.c:100 ../src/x_multiattrib.c:1539
 msgid "Attributes"
 msgstr "Attributes"
 
-#: ../src/rcstrings.c:101
-#: ../src/i_callbacks.c:2987
+#: ../src/rcstrings.c:101 ../src/i_callbacks.c:2993
 msgid "Attach"
 msgstr "Attach"
 
-#: ../src/rcstrings.c:102
-#: ../src/i_callbacks.c:3036
+#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3042
 msgid "Detach"
 msgstr "Detach"
 
@@ -540,8 +498,7 @@ msgstr "Component Documentation"
 msgid "About gschem"
 msgstr "About gschem"
 
-#: ../src/rcstrings.c:130
-#: ../src/x_dialog.c:2517
+#: ../src/rcstrings.c:130 ../src/x_dialog.c:2517
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
@@ -551,21 +508,18 @@ msgstr "Zoom too small!  Cannot zoom further.\n"
 
 #. Fork failed. Still in parent process, so can use the log
 #. * window
-#: ../src/g_funcs.c:343
-#: ../src/i_callbacks.c:138
+#: ../src/g_funcs.c:343 ../src/i_callbacks.c:138
 #, c-format
 msgid "Could not fork\n"
 msgstr "Could not fork\n"
 
 #. if we return, then nothing happened
-#: ../src/g_funcs.c:359
-#: ../src/i_callbacks.c:148
+#: ../src/g_funcs.c:359 ../src/i_callbacks.c:148
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Could not invoke %s\n"
 
-#: ../src/g_funcs.c:365
-#: ../src/i_callbacks.c:152
+#: ../src/g_funcs.c:365 ../src/i_callbacks.c:152
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Documentation commands not supported under MinGW.\n"
 
@@ -644,26 +598,28 @@ msgstr "Invalid gain [%d] passed to keyboardpan-gain\n"
 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/gschem.c:193
-#: ../src/gschem.c:204
+#: ../src/gschem.c:193 ../src/gschem.c:204
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem version %s%s.%s\n"
 
-#: ../src/gschem.c:196
-#: ../src/gschem.c:207
+#: ../src/gschem.c:196 ../src/gschem.c:207
 #, c-format
-msgid "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"
-msgstr "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"
+msgid ""
+"gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
+"details.\n"
+msgstr ""
+"gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
+"details.\n"
 
-#: ../src/gschem.c:198
-#: ../src/gschem.c:209
+#: ../src/gschem.c:198 ../src/gschem.c:209
 #, 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"
+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:200
-#: ../src/gschem.c:211
+#: ../src/gschem.c:200 ../src/gschem.c:211
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -694,8 +650,7 @@ msgstr "Read init scm file [%s]\n"
 
 #. ! \todo These two messages are the same. Should be
 #. * integrated.
-#: ../src/gschem.c:252
-#: ../src/gschem.c:255
+#: ../src/gschem.c:252 ../src/gschem.c:255
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Failed to read init scm file [%s]\n"
@@ -705,8 +660,7 @@ msgstr "Failed to read init scm file [%s]\n"
 msgid "Scheme directory NOT set!\n"
 msgstr "Scheme directory NOT set!\n"
 
-#: ../src/gschem.c:330
-#: ../src/x_script.c:72
+#: ../src/gschem.c:330 ../src/x_script.c:72
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Executing guile script [%s]\n"
@@ -764,21 +718,15 @@ msgstr "Arc Mode"
 msgid "Pin Mode"
 msgstr "Pin Mode"
 
-#: ../src/i_basic.c:139
-#: ../src/i_callbacks.c:589
-#: ../src/i_callbacks.c:608
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:589 ../src/i_callbacks.c:608
 msgid "Copy"
 msgstr "Copy"
 
-#: ../src/i_basic.c:141
-#: ../src/i_callbacks.c:669
-#: ../src/i_callbacks.c:688
+#: ../src/i_basic.c:141 ../src/i_callbacks.c:669 ../src/i_callbacks.c:688
 msgid "Move"
 msgstr "Move"
 
-#: ../src/i_basic.c:143
-#: ../src/i_callbacks.c:629
-#: ../src/i_callbacks.c:648
+#: ../src/i_basic.c:143 ../src/i_callbacks.c:629 ../src/i_callbacks.c:648
 msgid "Multiple Copy"
 msgstr "Multiple Copy"
 
@@ -790,18 +738,15 @@ msgstr "Show Hidden"
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: ../src/i_basic.c:256
-#: ../src/x_window.c:568
+#: ../src/i_basic.c:256 ../src/x_window.c:568
 msgid "Action"
 msgstr "Action"
 
-#: ../src/i_basic.c:262
-#: ../src/x_window.c:563
+#: ../src/i_basic.c:262 ../src/x_window.c:563
 msgid "Stroke"
 msgstr "Stroke"
 
-#: ../src/i_basic.c:268
-#: ../src/x_window.c:565
+#: ../src/i_basic.c:268 ../src/x_window.c:565
 msgid "none"
 msgstr "none"
 
@@ -809,8 +754,7 @@ msgstr "none"
 msgid "Repeat/"
 msgstr "Repeat/"
 
-#: ../src/i_basic.c:538
-#: ../src/i_basic.c:543
+#: ../src/i_basic.c:538 ../src/i_basic.c:543
 msgid "OFF"
 msgstr "OFF"
 
@@ -824,14 +768,12 @@ msgstr "Grid(%s, %s)"
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentation for [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:193
-#: ../src/i_callbacks.c:1748
+#: ../src/i_callbacks.c:193 ../src/i_callbacks.c:1754
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "New page created [%s]\n"
 
-#: ../src/i_callbacks.c:229
-#: ../src/x_menus.c:494
+#: ../src/i_callbacks.c:229 ../src/x_menus.c:494
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "New Window created [%s]\n"
@@ -848,9 +790,7 @@ msgstr "Saved All"
 msgid "Closing Window\n"
 msgstr "Closing Window\n"
 
-#: ../src/i_callbacks.c:593
-#: ../src/i_callbacks.c:633
-#: ../src/i_callbacks.c:673
+#: ../src/i_callbacks.c:593 ../src/i_callbacks.c:633 ../src/i_callbacks.c:673
 msgid "Select objs first"
 msgstr "Select objs first"
 
@@ -866,18 +806,15 @@ msgstr "Slot"
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/i_callbacks.c:830
-#: ../src/i_callbacks.c:877
+#: ../src/i_callbacks.c:830 ../src/i_callbacks.c:877
 msgid "Rotate"
 msgstr "Rotate"
 
-#: ../src/i_callbacks.c:904
-#: ../src/i_callbacks.c:926
+#: ../src/i_callbacks.c:904 ../src/i_callbacks.c:926
 msgid "Mirror"
 msgstr "Mirror"
 
-#: ../src/i_callbacks.c:988
-#: ../src/x_dialog.c:1611
+#: ../src/i_callbacks.c:988 ../src/x_dialog.c:1611
 msgid "Translate"
 msgstr "Translate"
 
@@ -894,194 +831,196 @@ 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:1001
-msgid "WARNING: If you are translating a symbol to the origin, the snap grid size should be set to 100\n"
-msgstr "WARNING: If you are translating a symbol to the origin, the snap grid size should be set to 100\n"
+msgid ""
+"WARNING: If you are translating a symbol to the origin, the snap grid size "
+"should be set to 100\n"
+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:1022
 msgid "Embed"
 msgstr "Embed"
 
-#: ../src/i_callbacks.c:1060
+#: ../src/i_callbacks.c:1063
 msgid "Unembed"
 msgstr "Unembed"
 
-#: ../src/i_callbacks.c:1100
+#: ../src/i_callbacks.c:1106
 msgid "Update"
 msgstr "Update"
 
-#: ../src/i_callbacks.c:1157
+#: ../src/i_callbacks.c:1163
 msgid "ShowHidden"
 msgstr "ShowHidden"
 
-#: ../src/i_callbacks.c:1180
+#: ../src/i_callbacks.c:1186
 msgid "MakeVisible"
 msgstr "MakeVisible"
 
-#: ../src/i_callbacks.c:1296
+#: ../src/i_callbacks.c:1302
 msgid "Edit Line Type"
 msgstr "Edit Line Type"
 
-#: ../src/i_callbacks.c:1337
-#: ../src/x_dialog.c:1268
+#: ../src/i_callbacks.c:1343 ../src/x_dialog.c:1268
 msgid "Edit Fill Type"
 msgstr "Edit Fill Type"
 
-#: ../src/i_callbacks.c:1642
+#: ../src/i_callbacks.c:1648
 msgid "Update Cues"
 msgstr "Update Cues"
 
-#: ../src/i_callbacks.c:1792
+#: ../src/i_callbacks.c:1798
 msgid "Really revert page?"
 msgstr "Really revert page?"
 
-#: ../src/i_callbacks.c:1866
+#: ../src/i_callbacks.c:1872
 msgid "Copy 1"
 msgstr "Copy 1"
 
-#: ../src/i_callbacks.c:1885
+#: ../src/i_callbacks.c:1891
 msgid "Copy 2"
 msgstr "Copy 2"
 
-#: ../src/i_callbacks.c:1904
+#: ../src/i_callbacks.c:1910
 msgid "Copy 3"
 msgstr "Copy 3"
 
-#: ../src/i_callbacks.c:1923
+#: ../src/i_callbacks.c:1929
 msgid "Copy 4"
 msgstr "Copy 4"
 
-#: ../src/i_callbacks.c:1942
+#: ../src/i_callbacks.c:1948
 msgid "Copy 5"
 msgstr "Copy 5"
 
-#: ../src/i_callbacks.c:1961
+#: ../src/i_callbacks.c:1967
 msgid "Cut 1"
 msgstr "Cut 1"
 
-#: ../src/i_callbacks.c:1980
+#: ../src/i_callbacks.c:1986
 msgid "Cut 2"
 msgstr "Cut 2"
 
-#: ../src/i_callbacks.c:1999
+#: ../src/i_callbacks.c:2005
 msgid "Cut 3"
 msgstr "Cut 3"
 
-#: ../src/i_callbacks.c:2018
+#: ../src/i_callbacks.c:2024
 msgid "Cut 4"
 msgstr "Cut 4"
 
-#: ../src/i_callbacks.c:2037
+#: ../src/i_callbacks.c:2043
 msgid "Cut 5"
 msgstr "Cut 5"
 
-#: ../src/i_callbacks.c:2053
+#: ../src/i_callbacks.c:2059
 msgid "Paste 1"
 msgstr "Paste 1"
 
-#: ../src/i_callbacks.c:2060
-#: ../src/i_callbacks.c:2082
-#: ../src/i_callbacks.c:2104
-#: ../src/i_callbacks.c:2126
-#: ../src/i_callbacks.c:2148
+#: ../src/i_callbacks.c:2066 ../src/i_callbacks.c:2088
+#: ../src/i_callbacks.c:2110 ../src/i_callbacks.c:2132
+#: ../src/i_callbacks.c:2154
 msgid "Empty buffer"
 msgstr "Empty buffer"
 
-#: ../src/i_callbacks.c:2075
+#: ../src/i_callbacks.c:2081
 msgid "Paste 2"
 msgstr "Paste 2"
 
-#: ../src/i_callbacks.c:2097
+#: ../src/i_callbacks.c:2103
 msgid "Paste 3"
 msgstr "Paste 3"
 
-#: ../src/i_callbacks.c:2119
+#: ../src/i_callbacks.c:2125
 msgid "Paste 4"
 msgstr "Paste 4"
 
-#: ../src/i_callbacks.c:2141
+#: ../src/i_callbacks.c:2147
 msgid "Paste 5"
 msgstr "Paste 5"
 
-#: ../src/i_callbacks.c:2258
-#: ../src/x_window.c:439
+#: ../src/i_callbacks.c:2264 ../src/x_window.c:439
 msgid "Component"
 msgstr "Component"
 
-#: ../src/i_callbacks.c:2294
-#: ../src/i_callbacks.c:2313
+#: ../src/i_callbacks.c:2300 ../src/i_callbacks.c:2319
 msgid "Attribute"
 msgstr "Attribute"
 
-#: ../src/i_callbacks.c:2780
+#: ../src/i_callbacks.c:2786
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Searching for source [%s]\n"
 
-#: ../src/i_callbacks.c:2804
-#: ../src/i_callbacks.c:2805
+#: ../src/i_callbacks.c:2810 ../src/i_callbacks.c:2811
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Cannot find source [%s]\n"
 
-#: ../src/i_callbacks.c:2872
+#: ../src/i_callbacks.c:2878
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Searching for symbol [%s]\n"
 
-#: ../src/i_callbacks.c:2959
-msgid "This command retrieves the component documentation from the web, but there is no component selected"
-msgstr "This command retrieves the component documentation from the web, but there is no component selected"
+#: ../src/i_callbacks.c:2965
+msgid ""
+"This command retrieves the component documentation from the web, but there "
+"is no component selected"
+msgstr ""
+"This command retrieves the component documentation from the web, but there "
+"is no component selected"
 
-#: ../src/i_callbacks.c:3076
+#: ../src/i_callbacks.c:3082
 msgid "ShowN"
 msgstr "ShowN"
 
-#: ../src/i_callbacks.c:3106
+#: ../src/i_callbacks.c:3112
 msgid "ShowV"
 msgstr "ShowV"
 
-#: ../src/i_callbacks.c:3136
+#: ../src/i_callbacks.c:3142
 msgid "ShowB"
 msgstr "ShowB"
 
-#: ../src/i_callbacks.c:3167
+#: ../src/i_callbacks.c:3173
 msgid "VisToggle"
 msgstr "VisToggle"
 
-#: ../src/i_callbacks.c:3188
+#: ../src/i_callbacks.c:3194
 #, 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:3276
+#: ../src/i_callbacks.c:3282
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Action feedback mode set to OUTLINE\n"
 
-#: ../src/i_callbacks.c:3279
+#: ../src/i_callbacks.c:3285
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Action feedback mode set to BOUNDINGBOX\n"
 
-#: ../src/i_callbacks.c:3296
+#: ../src/i_callbacks.c:3302
 msgid "Grid OFF\n"
 msgstr "Grid OFF\n"
 
-#: ../src/i_callbacks.c:3299
+#: ../src/i_callbacks.c:3305
 msgid "Grid ON\n"
 msgstr "Grid ON\n"
 
-#: ../src/i_callbacks.c:3316
+#: ../src/i_callbacks.c:3322
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (CAUTION!)\n"
 
-#: ../src/i_callbacks.c:3319
+#: ../src/i_callbacks.c:3325
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: ../src/i_callbacks.c:3339
+#: ../src/i_callbacks.c:3345
 msgid "Rubber band OFF \n"
 msgstr "Rubber band OFF \n"
 
-#: ../src/i_callbacks.c:3342
+#: ../src/i_callbacks.c:3348
 msgid "Rubber band ON\n"
 msgstr "Rubber band ON\n"
 
@@ -1140,7 +1079,7 @@ msgstr "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
 msgstr "Got an invalid buffer_number [o_buffer_paste_end]\n"
 
-#: ../src/o_bus.c:211
+#: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\n"
 msgstr "Got an invalid which one in o_bus_draw_xor_single\n"
@@ -1161,19 +1100,17 @@ msgstr "Unknown type for circle!\n"
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Unknown type for circle (fill)!\n"
 
-#: ../src/o_complex.c:186
+#: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
 msgstr "Could not find complex in new componet placement!\n"
 
-#: ../src/o_complex.c:417
-#: ../src/o_complex.c:421
+#: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Translating schematic [%d %d]\n"
 
-#: ../src/o_copy.c:122
-#: ../src/o_copy.c:312
+#: ../src/o_copy.c:122 ../src/o_copy.c:312
 #, c-format
 msgid "ERROR: NULL object in o_copy_end!\n"
 msgstr "ERROR: NULL object in o_copy_end!\n"
@@ -1250,37 +1187,32 @@ msgstr "DOH! tried to find the whichone, but didn't find it!\n"
 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:246
+#: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\n"
 msgstr "Got an invalid which one in o_net_draw_xor_single\n"
 
 #. try to exit gracefully
-#: ../src/o_net.c:775
-#: ../src/o_net.c:812
-#: ../src/o_net.c:883
-#: ../src/o_net.c:919
+#: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
 #, 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:992
+#: ../src/o_net.c:980
 #, 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_picture.c:207
-#: ../src/o_picture.c:737
+#: ../src/o_picture.c:208 ../src/o_picture.c:720
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Failed to load picture: %s"
 
-#: ../src/o_picture.c:221
+#: ../src/o_picture.c:222
 msgid "Picture"
 msgstr "Picture"
 
-#: ../src/o_picture.c:648
-#: ../src/x_attribedit.c:148
+#: ../src/o_picture.c:625 ../src/x_attribedit.c:148
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERROR: NULL object!\n"
@@ -1354,22 +1286,19 @@ msgstr "<b>Add Attribute</b>"
 
 #. Name selection
 #. GtkLabel
-#: ../src/x_attribedit.c:385
-#: ../src/x_multiattrib.c:1721
+#: ../src/x_attribedit.c:385 ../src/x_multiattrib.c:1721
 msgid "Name:"
 msgstr "Name:"
 
 #. Value entry
 #. GtkLabel
-#: ../src/x_attribedit.c:401
-#: ../src/x_multiattrib.c:1740
+#: ../src/x_attribedit.c:401 ../src/x_multiattrib.c:1740
 msgid "Value:"
 msgstr "Value:"
 
 #. Visibility
 #. GtkButton
-#: ../src/x_attribedit.c:417
-#: ../src/x_multiattrib.c:1777
+#: ../src/x_attribedit.c:417 ../src/x_multiattrib.c:1777
 msgid "Visible"
 msgstr "Visible"
 
@@ -1381,8 +1310,7 @@ msgstr "Show Value Only"
 msgid "Show Name Only"
 msgstr "Show Name Only"
 
-#: ../src/x_attribedit.c:441
-#: ../src/x_multiattrib.c:1216
+#: ../src/x_attribedit.c:441 ../src/x_multiattrib.c:1216
 msgid "Show Name & Value"
 msgstr "Show Name & Value"
 
@@ -1396,14 +1324,12 @@ msgid "All"
 msgstr "All"
 
 #. GtkTreeViewColumn
-#: ../src/x_attribedit.c:471
-#: ../src/x_compselect.c:733
-#: ../src/x_compselect.c:808
+#: ../src/x_attribedit.c:471 ../src/x_compselect.c:735
+#: ../src/x_compselect.c:810
 msgid "Components"
 msgstr "Components"
 
-#: ../src/x_attribedit.c:479
-#: ../src/x_window.c:449
+#: ../src/x_attribedit.c:479 ../src/x_window.c:449
 msgid "Nets"
 msgstr "Nets"
 
@@ -1412,14 +1338,20 @@ msgid "Replace existing attributes"
 msgstr "Replace existing attributes"
 
 #: ../src/x_autonumber.c:412
-msgid "slotted object without slot attribute may cause problems when autonumbering slots\n"
-msgstr "slotted object without slot attribute may cause problems when autonumbering slots\n"
+msgid ""
+"slotted object without slot attribute may cause problems when autonumbering "
+"slots\n"
+msgstr ""
+"slotted object without slot attribute may cause problems when autonumbering "
+"slots\n"
 
 #. duplicate slot in used_slots
 #: ../src/x_autonumber.c:427
 #, c-format
-msgid "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
-msgstr "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
+msgid ""
+"duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
+msgstr ""
+"duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 
 #: ../src/x_autonumber.c:692
 msgid "No searchstring given in autonumber text.\n"
@@ -1474,18 +1406,15 @@ msgstr "Autonumber text in:"
 msgid "Skip numbers found in:"
 msgstr "Skip numbers found in:"
 
-#: ../src/x_autonumber.c:1296
-#: ../src/x_autonumber.c:1305
+#: ../src/x_autonumber.c:1296 ../src/x_autonumber.c:1305
 msgid "Selected objects"
 msgstr "Selected objects"
 
-#: ../src/x_autonumber.c:1297
-#: ../src/x_autonumber.c:1306
+#: ../src/x_autonumber.c:1297 ../src/x_autonumber.c:1306
 msgid "Current page"
 msgstr "Current page"
 
-#: ../src/x_autonumber.c:1298
-#: ../src/x_autonumber.c:1307
+#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
 msgid "Whole hierarchy"
 msgstr "Whole hierarchy"
 
@@ -1514,70 +1443,63 @@ msgstr "Remove numbers"
 msgid "Automatic slotting"
 msgstr "Automatic slotting"
 
-#: ../src/x_color.c:60
-#: ../src/x_color.c:97
+#: ../src/x_color.c:60 ../src/x_color.c:97
 #, c-format
 msgid "Could not find the color %s!\n"
 msgstr "Could not find the colour %s!\n"
 
-#: ../src/x_color.c:63
-#: ../src/x_color.c:100
+#: ../src/x_color.c:63 ../src/x_color.c:100
 #, c-format
 msgid "Defaulting color to white\n"
 msgstr "Defaulting colour to white\n"
 
-#: ../src/x_color.c:70
-#: ../src/x_color.c:107
+#: ../src/x_color.c:70 ../src/x_color.c:107
 #, c-format
 msgid "Ack! Cannot allocate white!\n"
 msgstr "Ack! Cannot allocate white!\n"
 
-#: ../src/x_color.c:81
-#: ../src/x_color.c:129
-#: ../src/x_window.c:86
+#: ../src/x_color.c:81 ../src/x_color.c:129 ../src/x_window.c:86
 #: ../src/x_window.c:95
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Could not allocate the colour %s!\n"
 
-#: ../src/x_color.c:148
-#: ../src/x_color.c:164
+#: ../src/x_color.c:148 ../src/x_color.c:164
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Tried to get an invalid colour: %d\n"
 
 #. GtkLabel
-#: ../src/x_compselect.c:838
+#: ../src/x_compselect.c:840
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/x_compselect.c:930
+#: ../src/x_compselect.c:932
 msgid "Default behavior - reference component"
 msgstr "Default behavior - reference component"
 
-#: ../src/x_compselect.c:933
+#: ../src/x_compselect.c:935
 msgid "Embed component in schematic"
 msgstr "Embed component in schematic"
 
-#: ../src/x_compselect.c:936
+#: ../src/x_compselect.c:938
 msgid "Include component as individual objects"
 msgstr "Include component as individual objects"
 
-#: ../src/x_compselect.c:1092
+#: ../src/x_compselect.c:1094
 msgid "Select Component..."
 msgstr "Select Component..."
 
-#: ../src/x_compselect.c:1118
+#: ../src/x_compselect.c:1120
 msgid "In Use"
 msgstr "In Use"
 
-#: ../src/x_compselect.c:1122
+#: ../src/x_compselect.c:1124
 msgid "Libraries"
 msgstr "Libraries"
 
 #. GtkFrame
-#: ../src/x_compselect.c:1131
-#: ../src/x_fileselect.c:128
+#: ../src/x_compselect.c:1133 ../src/x_fileselect.c:128
 msgid "Preview"
 msgstr "Preview"
 
@@ -1685,24 +1607,12 @@ msgstr "Center"
 msgid "Phantom"
 msgstr "Phantom"
 
-#: ../src/x_dialog.c:802
-#: ../src/x_dialog.c:804
-#: ../src/x_dialog.c:806
-#: ../src/x_dialog.c:989
-#: ../src/x_dialog.c:990
-#: ../src/x_dialog.c:991
-#: ../src/x_dialog.c:999
-#: ../src/x_dialog.c:1182
-#: ../src/x_dialog.c:1184
-#: ../src/x_dialog.c:1186
-#: ../src/x_dialog.c:1188
-#: ../src/x_dialog.c:1190
-#: ../src/x_dialog.c:1395
-#: ../src/x_dialog.c:1396
-#: ../src/x_dialog.c:1397
-#: ../src/x_dialog.c:1398
-#: ../src/x_dialog.c:1399
-#: ../src/x_dialog.c:1407
+#: ../src/x_dialog.c:802 ../src/x_dialog.c:804 ../src/x_dialog.c:806
+#: ../src/x_dialog.c:989 ../src/x_dialog.c:990 ../src/x_dialog.c:991
+#: ../src/x_dialog.c:999 ../src/x_dialog.c:1182 ../src/x_dialog.c:1184
+#: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
+#: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
+#: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
 #, c-format
 msgid "*unchanged*"
 msgstr "*unchanged*"
@@ -1715,8 +1625,7 @@ msgstr "Edit Line Width & Type"
 msgid "Width:"
 msgstr "Width:"
 
-#: ../src/x_dialog.c:926
-#: ../src/x_print.c:315
+#: ../src/x_dialog.c:926 ../src/x_print.c:315
 msgid "Type:"
 msgstr "Type:"
 
@@ -1899,8 +1808,7 @@ msgid "Show text starting with:"
 msgstr "Show text starting with:"
 
 #. GtkTreeViewColumn
-#: ../src/x_dialog.c:3587
-#: ../src/x_multiattrib.c:1597
+#: ../src/x_dialog.c:3587 ../src/x_multiattrib.c:1597
 msgid "Name"
 msgstr "Name"
 
@@ -1915,8 +1823,10 @@ msgstr "Save the changes to schematic \"%s\" before closing?"
 
 #: ../src/x_dialog.c:3709
 #, c-format
-msgid "There are %d schematics with unsaved changes. Save changes before closing?"
-msgstr "There are %d schematics with unsaved changes. Save changes before closing?"
+msgid ""
+"There are %d schematics with unsaved changes. Save changes before closing?"
+msgstr ""
+"There are %d schematics with unsaved changes. Save changes before closing?"
 
 #. secondary label
 #: ../src/x_dialog.c:3738
@@ -2340,11 +2250,13 @@ msgstr "Redo last undo"
 #: ../src/x_window.c:440
 msgid ""
 "Add component...\n"
-"Select library and component from list, move the mouse into main window, click to place\n"
+"Select library and component from list, move the mouse into main window, "
+"click to place\n"
 "Right mouse button to cancel"
 msgstr ""
 "Add component...\n"
-"Select library and component from list, move the mouse into main window, click to place\n"
+"Select library and component from list, move the mouse into main window, "
+"click to place\n"
 "Right mouse button to cancel"
 
 #: ../src/x_window.c:450
@@ -2450,4 +2362,3 @@ 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"
-
diff --git a/gschem/po/es_ES.po b/gschem/po/es_ES.po
index f149023..b92c914 100644
--- a/gschem/po/es_ES.po
+++ b/gschem/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gschem VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-02 21:10-0400\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-07-09 19:31+0200\n"
 "Last-Translator: Carlos Nieves Ã?nega <cnieves@xxxxxxxxxx>\n"
 "Language-Team: Spanish/Spain\n"
@@ -17,601 +17,610 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.0.2\n"
 
-#: src/rcstrings.c:2
+#: ../src/rcstrings.c:2
 msgid "File"
 msgstr "Archivo"
 
-#: src/rcstrings.c:3
+#: ../src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nueva ventana"
 
-#: src/rcstrings.c:4 src/x_pagesel.c:258
+#: ../src/rcstrings.c:4 ../src/x_pagesel.c:259
 msgid "New Page"
 msgstr "Nueva página"
 
-#: src/rcstrings.c:5 src/x_pagesel.c:259
+#: ../src/rcstrings.c:5 ../src/x_pagesel.c:260
 msgid "Open Page..."
 msgstr "Abrir página"
 
-#: src/rcstrings.c:6 src/x_pagesel.c:262
+#: ../src/rcstrings.c:6 ../src/x_pagesel.c:263
 msgid "Close Page"
 msgstr "Cerrar página"
 
-#: src/rcstrings.c:7
+#: ../src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Recargar página"
 
-#: src/rcstrings.c:8 src/x_pagesel.c:261
+#: ../src/rcstrings.c:8 ../src/x_pagesel.c:262
 msgid "Save Page"
 msgstr "Guardar página"
 
-#: src/rcstrings.c:9
+#: ../src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Guardar página como..."
 
-#: src/rcstrings.c:10
+#: ../src/rcstrings.c:10
 msgid "Save All"
 msgstr "Guardar todo"
 
-#: src/rcstrings.c:11 src/x_print.c:283
+#. GtkWindow
+#: ../src/rcstrings.c:11 ../src/x_print.c:284
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: src/rcstrings.c:12 src/x_image.c:503
+#. Create the dialog
+#: ../src/rcstrings.c:12 ../src/x_image.c:509
 msgid "Write image..."
 msgstr "Guardar imagen..."
 
-#: src/rcstrings.c:13 src/x_menus.c:524
+#: ../src/rcstrings.c:13 ../src/x_menus.c:525
 msgid "Recent files"
 msgstr "Archivos recientes"
 
-#: src/rcstrings.c:14 src/x_script.c:50
+#: ../src/rcstrings.c:14 ../src/x_script.c:51
 msgid "Execute Script..."
 msgstr "Ejecutar subprograma..."
 
-#: src/rcstrings.c:15
+#: ../src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Cerrar ventana"
 
-#: src/rcstrings.c:16
+#: ../src/rcstrings.c:16
 msgid "Quit"
 msgstr "Salir"
 
-#: src/rcstrings.c:18 src/i_callbacks.c:730
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:732
 msgid "Edit"
 msgstr "Editar"
 
-#: src/rcstrings.c:19 src/x_window.c:511
+#: ../src/rcstrings.c:19 ../src/x_window.c:423
 msgid "Undo"
 msgstr "Deshacer"
 
-#: src/rcstrings.c:20 src/x_window.c:518
+#: ../src/rcstrings.c:20 ../src/x_window.c:430
 msgid "Redo"
 msgstr "Rehacer"
 
-#: src/rcstrings.c:21 src/i_basic.c:81 src/x_window.c:682
+#: ../src/rcstrings.c:21 ../src/i_basic.c:81 ../src/x_window.c:594
 msgid "Select Mode"
 msgstr "Seleccionar"
 
-#: src/rcstrings.c:22
+#: ../src/rcstrings.c:22
 msgid "Cut Buffer"
 msgstr "Cortar"
 
-#: src/rcstrings.c:23
+#: ../src/rcstrings.c:23
 msgid "Copy Buffer"
 msgstr "Copiar"
 
-#: src/rcstrings.c:24
+#: ../src/rcstrings.c:24
 msgid "Paste Buffer"
 msgstr "Pegar"
 
-#: src/rcstrings.c:25
+#: ../src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Editar..."
 
-#: src/rcstrings.c:26
+#: ../src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Editar texto..."
 
-#: src/rcstrings.c:27 src/i_basic.c:94
+#: ../src/rcstrings.c:27 ../src/i_basic.c:91
 msgid "Copy Mode"
 msgstr "Copiar"
 
-#: src/rcstrings.c:28 src/i_basic.c:149
+#: ../src/rcstrings.c:28 ../src/i_basic.c:146
 msgid "Multiple Copy Mode"
 msgstr "Modo de copia múltiple"
 
-#: src/rcstrings.c:29 src/i_basic.c:97
+#: ../src/rcstrings.c:29 ../src/i_basic.c:94
 msgid "Move Mode"
 msgstr "Mover"
 
-#: src/rcstrings.c:30 src/i_callbacks.c:706 src/x_multiattrib.c:1258
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:708 ../src/x_multiattrib.c:1248
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/rcstrings.c:31
+#: ../src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Rotar 90º"
 
-#: src/rcstrings.c:32 src/i_basic.c:101
+#: ../src/rcstrings.c:32 ../src/i_basic.c:98
 msgid "Mirror Mode"
 msgstr "Voltear"
 
-#: src/rcstrings.c:33
+#: ../src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Elemento..."
 
-#: src/rcstrings.c:34
+#: ../src/rcstrings.c:34
 msgid "Color..."
 msgstr "Color..."
 
-#: src/rcstrings.c:35 src/i_callbacks.c:952
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:952
 msgid "Lock"
 msgstr "Fijar"
 
-#: src/rcstrings.c:36 src/i_callbacks.c:970
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:970
 msgid "Unlock"
 msgstr "Desfijar"
 
-#: src/rcstrings.c:37
+#: ../src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Anchura y tipo de línea"
 
-#: src/rcstrings.c:38
+#: ../src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Tipo de relleno"
 
-#: src/rcstrings.c:39
+#: ../src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Mover símbolo..."
 
-#: src/rcstrings.c:40
+#: ../src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Incrustar componente/imagen"
 
-#: src/rcstrings.c:41
+#: ../src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Desincrustar componente/imagen"
 
-#: src/rcstrings.c:42
+#: ../src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Actualizar componente"
 
-#: src/rcstrings.c:43
+#: ../src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Mostrar/Ocultar texto oculto"
 
-#: src/rcstrings.c:44
+#: ../src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Hacer visible el texto oculto"
 
-#: src/rcstrings.c:46
+#: ../src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Memoria intermedia"
 
-#: src/rcstrings.c:47
+#: ../src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copiar en memoria intermedia 1"
 
-#: src/rcstrings.c:48
+#: ../src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copiar en memoria intermedia 2"
 
-#: src/rcstrings.c:49
+#: ../src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copiar en memoria intermedia 3"
 
-#: src/rcstrings.c:50
+#: ../src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copiar en memoria intermedia 4"
 
-#: src/rcstrings.c:51
+#: ../src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copiar en memoria intermedia 5"
 
-#: src/rcstrings.c:52
+#: ../src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Cortar en memoria intermedia 1"
 
-#: src/rcstrings.c:53
+#: ../src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Cortar en memoria intermedia 2"
 
-#: src/rcstrings.c:54
+#: ../src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Cortar en memoria intermedia 3"
 
-#: src/rcstrings.c:55
+#: ../src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Cortar en memoria intermedia 4"
 
-#: src/rcstrings.c:56
+#: ../src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Cortar en memoria intermedia 5"
 
-#: src/rcstrings.c:57
+#: ../src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Pegar memoria intermedia 1"
 
-#: src/rcstrings.c:58
+#: ../src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Pegar memoria intermedia 2"
 
-#: src/rcstrings.c:59
+#: ../src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Pegar memoria intermedia 3"
 
-#: src/rcstrings.c:60
+#: ../src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Pegar memoria intermedia 4"
 
-#: src/rcstrings.c:61
+#: ../src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Pegar memoria intermedia 5"
 
-#: src/rcstrings.c:63
+#: ../src/rcstrings.c:63
 msgid "View"
 msgstr "Ver"
 
-#: src/rcstrings.c:64
+#: ../src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Redibujar"
 
-#: src/rcstrings.c:65 src/i_callbacks.c:1537 src/i_callbacks.c:1606
+#. I don't know if this would get in the way
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1542 ../src/i_callbacks.c:1611
 msgid "Pan"
 msgstr "Centrar respecto al cursor"
 
-#: src/rcstrings.c:66 src/i_basic.c:105
+#: ../src/rcstrings.c:66 ../src/i_basic.c:102
 msgid "Zoom Box"
 msgstr "Ampliar"
 
-#: src/rcstrings.c:67
+#: ../src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Mostrar todo"
 
-#: src/rcstrings.c:68
+#: ../src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Aumentar ampliación"
 
-#: src/rcstrings.c:69
+#: ../src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Disminuir ampliación"
 
-#: src/rcstrings.c:70
+#: ../src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Vista completa"
 
-#: src/rcstrings.c:72
+#: ../src/rcstrings.c:72
 msgid "Page"
 msgstr "Página"
 
-#: src/rcstrings.c:73
+#: ../src/rcstrings.c:73
 msgid "Manager..."
 msgstr "Administrador..."
 
-#: src/rcstrings.c:74
+#: ../src/rcstrings.c:74
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/rcstrings.c:75
+#: ../src/rcstrings.c:75
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/rcstrings.c:76 src/x_window.c:489
+#: ../src/rcstrings.c:76 ../src/x_window.c:401
 msgid "New"
 msgstr "Nuevo"
 
-#: src/rcstrings.c:77
+#: ../src/rcstrings.c:77
 msgid "Revert"
 msgstr "Recargar"
 
-#: src/rcstrings.c:78
+#: ../src/rcstrings.c:78
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/rcstrings.c:79
+#: ../src/rcstrings.c:79
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/rcstrings.c:81
+#: ../src/rcstrings.c:81
 msgid "Add"
 msgstr "Añadir"
 
-#: src/rcstrings.c:82
+#: ../src/rcstrings.c:82
 msgid "Component..."
 msgstr "Componente..."
 
-#: src/rcstrings.c:83 src/i_callbacks.c:2358 src/i_callbacks.c:2380
+#. need to click
+#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2340 ../src/i_callbacks.c:2362
 msgid "Net"
 msgstr "Conexión"
 
-#: src/rcstrings.c:84 src/i_callbacks.c:2424 src/i_callbacks.c:2447
-#: src/x_window.c:547
+#. need to click
+#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2406 ../src/i_callbacks.c:2429
+#: ../src/x_window.c:459
 msgid "Bus"
 msgstr "Bus"
 
-#: src/rcstrings.c:85
+#: ../src/rcstrings.c:85
 msgid "Attribute..."
 msgstr "Propiedad..."
 
-#: src/rcstrings.c:86
+#: ../src/rcstrings.c:86
 msgid "Text..."
 msgstr "Texto..."
 
-#: src/rcstrings.c:87 src/i_callbacks.c:2528 src/i_callbacks.c:2547
+#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2510 ../src/i_callbacks.c:2529
 msgid "Line"
 msgstr "Línea"
 
-#: src/rcstrings.c:88 src/i_callbacks.c:2569 src/i_callbacks.c:2588
+#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2551 ../src/i_callbacks.c:2570
 msgid "Box"
 msgstr "Rectángulo"
 
-#: src/rcstrings.c:89 src/i_callbacks.c:2644 src/i_callbacks.c:2664
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2626 ../src/i_callbacks.c:2646
 msgid "Circle"
 msgstr "Círculo"
 
-#: src/rcstrings.c:90 src/i_callbacks.c:2686 src/i_callbacks.c:2705
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2668 ../src/i_callbacks.c:2687
 msgid "Arc"
 msgstr "Arco"
 
-#: src/rcstrings.c:91 src/i_callbacks.c:2727 src/i_callbacks.c:2746
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2709 ../src/i_callbacks.c:2728
 msgid "Pin"
 msgstr "Pin"
 
-#: src/rcstrings.c:92
+#: ../src/rcstrings.c:92
 msgid "Picture..."
 msgstr "Imagen..."
 
-#: src/rcstrings.c:94
+#: ../src/rcstrings.c:94
 msgid "Hierarchy"
 msgstr "Jerarquía"
 
-#: src/rcstrings.c:95
+#: ../src/rcstrings.c:95
 msgid "Down Schematic"
 msgstr "Descender en esquema"
 
-#: src/rcstrings.c:96
+#: ../src/rcstrings.c:96
 msgid "Down Symbol"
 msgstr "Descender en símbolo"
 
-#: src/rcstrings.c:97
+#: ../src/rcstrings.c:97
 msgid "Up"
 msgstr "Arriba"
 
-#: src/rcstrings.c:98
+#: ../src/rcstrings.c:98
 msgid "Documentation"
 msgstr "Documentación"
 
-#: src/rcstrings.c:100 src/x_multiattrib.c:1549
+#. GtkFrame
+#: ../src/rcstrings.c:100 ../src/x_multiattrib.c:1539
 msgid "Attributes"
 msgstr "Propiedades"
 
-#: src/rcstrings.c:101 src/i_callbacks.c:3011
+#: ../src/rcstrings.c:101 ../src/i_callbacks.c:2993
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/rcstrings.c:102 src/i_callbacks.c:3060
+#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3042
 msgid "Detach"
 msgstr "No adjuntar"
 
-#: src/rcstrings.c:103
+#: ../src/rcstrings.c:103
 msgid "Show Value"
 msgstr "Mostrar valor"
 
-#: src/rcstrings.c:104
+#: ../src/rcstrings.c:104
 msgid "Show Name"
 msgstr "Mostrar nombre"
 
-#: src/rcstrings.c:105
+#: ../src/rcstrings.c:105
 msgid "Show Both"
 msgstr "Mostrar ambos"
 
-#: src/rcstrings.c:106
+#: ../src/rcstrings.c:106
 msgid "Toggle Visibility"
 msgstr "Cambiar visibilidad"
 
-#: src/rcstrings.c:107
+#: ../src/rcstrings.c:107
 msgid "Find Specific Text..."
 msgstr "Encontrar texto específico..."
 
-#: src/rcstrings.c:108
+#: ../src/rcstrings.c:108
 msgid "Hide Specific Text..."
 msgstr "Ocultar texto específico..."
 
-#: src/rcstrings.c:109
+#: ../src/rcstrings.c:109
 msgid "Show Specific Text..."
 msgstr "Mostrar texto específico..."
 
-#: src/rcstrings.c:110
+#: ../src/rcstrings.c:110
 msgid "Autonumber Text..."
 msgstr "Autonumerar texto..."
 
-#: src/rcstrings.c:112
+#: ../src/rcstrings.c:112
 msgid "Options"
 msgstr "Opciones"
 
-#: src/rcstrings.c:113
+#: ../src/rcstrings.c:113
 msgid "Text Size..."
 msgstr "Tamaño de texto..."
 
-#: src/rcstrings.c:114
+#: ../src/rcstrings.c:114
 msgid "Toggle Grid On/Off"
 msgstr "Act/Desact rejilla"
 
-#: src/rcstrings.c:115
+#: ../src/rcstrings.c:115
 msgid "Toggle Snap On/Off"
 msgstr "Act/Desact ajuste a la rejilla"
 
-#: src/rcstrings.c:116
+#: ../src/rcstrings.c:116
 msgid "Snap Grid Spacing..."
 msgstr "Espaciado de la rejilla..."
 
-#: src/rcstrings.c:117
+#: ../src/rcstrings.c:117
 msgid "Scale up Grid Spacing"
 msgstr "Aumentar espaciado de la rejilla..."
 
-#: src/rcstrings.c:118
+#: ../src/rcstrings.c:118
 msgid "Scale down Grid Spacing"
 msgstr "Disminuir espaciado de la rejilla..."
 
-#: src/rcstrings.c:119
+#: ../src/rcstrings.c:119
 msgid "Toggle Outline/Box"
 msgstr "Cambiar Silueta/Rectángulo"
 
-#: src/rcstrings.c:120
+#: ../src/rcstrings.c:120
 msgid "Toggle Net Rubberband"
 msgstr "Act/Desact conservar conexiones"
 
-#: src/rcstrings.c:121
+#: ../src/rcstrings.c:121
 msgid "Show Log Window..."
 msgstr "Mostrar ventana de registro..."
 
-#: src/rcstrings.c:122
+#: ../src/rcstrings.c:122
 msgid "Show Coord Window..."
 msgstr "Mostrar ventana de coordenadas..."
 
-#: src/rcstrings.c:124
+#: ../src/rcstrings.c:124
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/rcstrings.c:125
+#: ../src/rcstrings.c:125
 msgid "Manual"
 msgstr "Manual"
 
-#: src/rcstrings.c:126
+#: ../src/rcstrings.c:126
 msgid "gEDA Documentation"
 msgstr "Documentación de gEDA"
 
-#: src/rcstrings.c:127
+#: ../src/rcstrings.c:127
 msgid "gschem FAQ"
 msgstr "PUF de gschem"
 
-#: src/rcstrings.c:128
+#: ../src/rcstrings.c:128
 msgid "Component Documentation"
 msgstr "Documentación del componente"
 
-#: src/rcstrings.c:129
+#: ../src/rcstrings.c:129
 msgid "About gschem"
 msgstr "Acerca de gschem"
 
-#: src/rcstrings.c:130 src/x_dialog.c:2517
+#: ../src/rcstrings.c:130 ../src/x_dialog.c:2517
 msgid "Hotkeys"
 msgstr "Teclas rápidas"
 
-#: src/a_zoom.c:245
+#: ../src/a_zoom.c:250
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "¡Vista demasiado ampliada! No se puede ampliar más.\n"
 
-#: src/g_funcs.c:342 src/i_callbacks.c:137
+#. Fork failed. Still in parent process, so can use the log
+#. * window
+#: ../src/g_funcs.c:343 ../src/i_callbacks.c:138
 #, c-format
 msgid "Could not fork\n"
 msgstr "No se ha podido crear un proceso hijo\n"
 
-#: src/g_funcs.c:358 src/i_callbacks.c:147
+#. if we return, then nothing happened
+#: ../src/g_funcs.c:359 ../src/i_callbacks.c:148
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "No se ha podido llamar a %s\n"
 
-#: src/g_funcs.c:364 src/i_callbacks.c:151
+#: ../src/g_funcs.c:365 ../src/i_callbacks.c:152
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "No se pueden utilizar los comandos de documentación bajo MinGW.\n"
 
-#: src/g_hook.c:88
+#: ../src/g_hook.c:87
 #, c-format
 msgid "Attribute failed ot find.\n"
 msgstr "Propiedad no encontrada.\n"
 
-#: src/g_rc.c:159
+#: ../src/g_rc.c:160
 #, 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:433
+#: ../src/g_rc.c:434
 #, 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:524
+#: ../src/g_rc.c:525
 #, 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:551
+#: ../src/g_rc.c:552
 #, 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:594
+#: ../src/g_rc.c:595
 #, 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:1049
+#: ../src/g_rc.c:1050
 #, 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:1289
+#: ../src/g_rc.c:1290
 #, 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:1364
+#: ../src/g_rc.c:1365
 #, c-format
 msgid "Invalid dot size [%d] passed to 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:1405
+#: ../src/g_rc.c:1406
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to 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:1449
+#: ../src/g_rc.c:1450
 #, 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:1473
+#: ../src/g_rc.c:1474
 #, 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:1514
+#: ../src/g_rc.c:1515
 #, 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:1537
+#: ../src/g_rc.c:1538
 #, 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:1583
+#: ../src/g_rc.c:1584
 #, 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/gschem.c:192 src/gschem.c:203
+#: ../src/gschem.c:193 ../src/gschem.c:204
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "Versión de gEDA/gschem %s%s.%s\n"
 
-#: src/gschem.c:195 src/gschem.c:206
+#: ../src/gschem.c:196 ../src/gschem.c:207
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -620,13 +629,13 @@ msgstr ""
 "gEDA/gschem no incluye NINGUNA GARANT�A; véase el fichero COPYING para más "
 "detalles.\n"
 
-#: src/gschem.c:197 src/gschem.c:208
+#: ../src/gschem.c:198 ../src/gschem.c:209
 #, 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:199 src/gschem.c:210
+#: ../src/gschem.c:200 ../src/gschem.c:211
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -635,214 +644,212 @@ msgstr ""
 "condiciones; por favor vea el fichero COPYING para más detalles.\n"
 "\n"
 
-#: src/gschem.c:214
+#: ../src/gschem.c:215
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "�sta es la adaptación MINGW32.\n"
 
-#: src/gschem.c:218
+#: ../src/gschem.c:219
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Entorno actual de locale: %s\n"
 
-#: src/gschem.c:231
+#: ../src/gschem.c:232
 #, c-format
 msgid "You must set the GEDADATA environment variable!\n"
 msgstr "¡Debe de especificar la variable de entorno GEDADATA!\n"
 
-#: src/gschem.c:246
+#: ../src/gschem.c:248
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Leído fichero de inicialización scm [%s]\n"
 
-#: src/gschem.c:250 src/gschem.c:253
+#. ! \todo These two messages are the same. Should be
+#. * integrated.
+#: ../src/gschem.c:252 ../src/gschem.c:255
 #, 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:323
+#: ../src/gschem.c:323
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "¡Directorio de Scheme no especificado!\n"
 
-#: src/gschem.c:330 src/x_script.c:71
+#: ../src/gschem.c:330 ../src/x_script.c:72
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Ejecutando programa de guile [%s]\n"
 
-#: src/i_basic.c:84
-msgid "Attribute Mode"
-msgstr "Modo Propiedades"
-
-#: src/i_basic.c:87
+#: ../src/i_basic.c:84
 msgid "Component Mode"
 msgstr "Modo Componentes"
 
-#: src/i_basic.c:91
+#: ../src/i_basic.c:88
 msgid "Text Mode"
 msgstr "Modo Texto"
 
-#: src/i_basic.c:99
+#: ../src/i_basic.c:96
 msgid "Rotate Mode"
 msgstr "Rotar"
 
-#: src/i_basic.c:109
+#: ../src/i_basic.c:106
 msgid "Pan Mode"
 msgstr "Modo Centrar"
 
-#: src/i_basic.c:113
+#: ../src/i_basic.c:110
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Modo Pegar %d"
 
-#: src/i_basic.c:118
+#: ../src/i_basic.c:115
 msgid "Net Mode"
 msgstr "Modo Conexión"
 
-#: src/i_basic.c:122
+#: ../src/i_basic.c:119
 msgid "Bus Mode"
 msgstr "Modo Bus"
 
-#: src/i_basic.c:125
+#: ../src/i_basic.c:122
 msgid "Line Mode"
 msgstr "Modo Línea"
 
-#: src/i_basic.c:128
+#: ../src/i_basic.c:125
 msgid "Box Mode"
 msgstr "Modo Rectángulo"
 
-#: src/i_basic.c:131
+#: ../src/i_basic.c:128
 msgid "Picture Mode"
 msgstr "Modo Imagen"
 
-#: src/i_basic.c:134
+#: ../src/i_basic.c:131
 msgid "Circle Mode"
 msgstr "Modo Círculo"
 
-#: src/i_basic.c:137
+#: ../src/i_basic.c:134
 msgid "Arc Mode"
 msgstr "Modo Arco"
 
-#: src/i_basic.c:140
+#: ../src/i_basic.c:137
 msgid "Pin Mode"
 msgstr "Modo Pin"
 
-#: src/i_basic.c:142 src/i_callbacks.c:587 src/i_callbacks.c:606
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:589 ../src/i_callbacks.c:608
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/i_basic.c:144 src/i_callbacks.c:667 src/i_callbacks.c:686
+#: ../src/i_basic.c:141 ../src/i_callbacks.c:669 ../src/i_callbacks.c:688
 msgid "Move"
 msgstr "Mover"
 
-#: src/i_basic.c:146 src/i_callbacks.c:627 src/i_callbacks.c:646
+#: ../src/i_basic.c:143 ../src/i_callbacks.c:629 ../src/i_callbacks.c:648
 msgid "Multiple Copy"
 msgstr "Copia múltiple"
 
-#: src/i_basic.c:174
+#: ../src/i_basic.c:172
 msgid "Show Hidden"
 msgstr "Mostrar ocultos"
 
-#: src/i_basic.c:177
+#: ../src/i_basic.c:175
 msgid "Snap Off"
 msgstr "Desactivado el ajuste a la rejilla"
 
-#: src/i_basic.c:259 src/x_window.c:656
+#: ../src/i_basic.c:256 ../src/x_window.c:568
 msgid "Action"
 msgstr "Acción"
 
-#: src/i_basic.c:267 src/x_window.c:651
+#: ../src/i_basic.c:262 ../src/x_window.c:563
 msgid "Stroke"
 msgstr "Gesto"
 
-#: src/i_basic.c:274 src/x_window.c:653
+#: ../src/i_basic.c:268 ../src/x_window.c:565
 msgid "none"
 msgstr "ninguno"
 
-#: src/i_basic.c:281
+#: ../src/i_basic.c:273
 msgid "Repeat/"
 msgstr "Repetir/"
 
-#: src/i_basic.c:570 src/i_basic.c:575
+#: ../src/i_basic.c:538 ../src/i_basic.c:543
 msgid "OFF"
 msgstr "NO"
 
-#: src/i_basic.c:579
+#: ../src/i_basic.c:547
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Rejilla(%s, %s)"
 
-#: src/i_callbacks.c:132
+#: ../src/i_callbacks.c:133
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentación de [%s, %s, %s, %s]\n"
 
-#: src/i_callbacks.c:192 src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:193 ../src/i_callbacks.c:1754
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Se ha creado una página nueva [%s]\n"
 
-#: src/i_callbacks.c:227 src/x_menus.c:493
+#: ../src/i_callbacks.c:229 ../src/x_menus.c:494
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Se ha creado una nueva ventana [%s]\n"
 
-#: src/i_callbacks.c:345
+#: ../src/i_callbacks.c:347
 msgid "Failed to Save All"
 msgstr "No se ha podido guardar todo"
 
-#: src/i_callbacks.c:347
+#: ../src/i_callbacks.c:349
 msgid "Saved All"
 msgstr "Guardado todo"
 
-#: src/i_callbacks.c:439
+#: ../src/i_callbacks.c:441
 msgid "Closing Window\n"
 msgstr "Cerrando ventana\n"
 
-#: src/i_callbacks.c:591 src/i_callbacks.c:631 src/i_callbacks.c:671
+#: ../src/i_callbacks.c:593 ../src/i_callbacks.c:633 ../src/i_callbacks.c:673
 msgid "Select objs first"
 msgstr "Antes seleccione objetos"
 
-#: src/i_callbacks.c:746
+#: ../src/i_callbacks.c:748
 msgid "Edit Text"
 msgstr "Editar texto"
 
-#: src/i_callbacks.c:769
+#: ../src/i_callbacks.c:771
 msgid "Slot"
 msgstr "Elemento"
 
-#: src/i_callbacks.c:786
+#: ../src/i_callbacks.c:788
 msgid "Color"
 msgstr "Color"
 
-#: src/i_callbacks.c:828 src/i_callbacks.c:875
+#: ../src/i_callbacks.c:830 ../src/i_callbacks.c:877
 msgid "Rotate"
 msgstr "Rotar"
 
-#: src/i_callbacks.c:902 src/i_callbacks.c:924
+#: ../src/i_callbacks.c:904 ../src/i_callbacks.c:926
 msgid "Mirror"
 msgstr "Voltear"
 
-#: src/i_callbacks.c:988 src/x_dialog.c:1604
+#: ../src/i_callbacks.c:988 ../src/x_dialog.c:1611
 msgid "Translate"
 msgstr "Mover"
 
-#: src/i_callbacks.c:991
+#: ../src/i_callbacks.c:991
 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:992
+#: ../src/i_callbacks.c:992
 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:999
+#: ../src/i_callbacks.c:999
 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:1001
+#: ../src/i_callbacks.c:1001
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -850,131 +857,132 @@ msgstr ""
 "ADVERTENCIA: Si está moviendo un símbolo al origen, el tamaño de la "
 "rejilladebe ser de 100\n"
 
-#: src/i_callbacks.c:1022
+#: ../src/i_callbacks.c:1022
 msgid "Embed"
 msgstr "Incrustar"
 
-#: src/i_callbacks.c:1060
+#: ../src/i_callbacks.c:1063
 msgid "Unembed"
 msgstr "Desincrustar"
 
-#: src/i_callbacks.c:1100
+#: ../src/i_callbacks.c:1106
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/i_callbacks.c:1157
+#: ../src/i_callbacks.c:1163
 msgid "ShowHidden"
 msgstr "Mostrar ocultos"
 
-#: src/i_callbacks.c:1180
+#: ../src/i_callbacks.c:1186
 msgid "MakeVisible"
 msgstr "Hacer visible"
 
-#: src/i_callbacks.c:1296
+#: ../src/i_callbacks.c:1302
 msgid "Edit Line Type"
 msgstr "Editar tipo de línea"
 
-#: src/i_callbacks.c:1337 src/x_dialog.c:1261
+#: ../src/i_callbacks.c:1343 ../src/x_dialog.c:1268
 msgid "Edit Fill Type"
 msgstr "Editar tipo de relleno"
 
-#: src/i_callbacks.c:1643
+#: ../src/i_callbacks.c:1648
 msgid "Update Cues"
 msgstr "Actualizar entradas"
 
-#: src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1798
 msgid "Really revert page?"
 msgstr "¿Seguro que quiere recargar la página?"
 
-#: src/i_callbacks.c:1856
+#: ../src/i_callbacks.c:1872
 msgid "Copy 1"
 msgstr "Copiar 1"
 
-#: src/i_callbacks.c:1875
+#: ../src/i_callbacks.c:1891
 msgid "Copy 2"
 msgstr "Copiar 2"
 
-#: src/i_callbacks.c:1894
+#: ../src/i_callbacks.c:1910
 msgid "Copy 3"
 msgstr "Copiar 3"
 
-#: src/i_callbacks.c:1913
+#: ../src/i_callbacks.c:1929
 msgid "Copy 4"
 msgstr "Copiar 4"
 
-#: src/i_callbacks.c:1932
+#: ../src/i_callbacks.c:1948
 msgid "Copy 5"
 msgstr "Copiar 5"
 
-#: src/i_callbacks.c:1951
+#: ../src/i_callbacks.c:1967
 msgid "Cut 1"
 msgstr "Cortar 1"
 
-#: src/i_callbacks.c:1970
+#: ../src/i_callbacks.c:1986
 msgid "Cut 2"
 msgstr "Cortar 2"
 
-#: src/i_callbacks.c:1989
+#: ../src/i_callbacks.c:2005
 msgid "Cut 3"
 msgstr "Cortar 3"
 
-#: src/i_callbacks.c:2008
+#: ../src/i_callbacks.c:2024
 msgid "Cut 4"
 msgstr "Cortar 4"
 
-#: src/i_callbacks.c:2027
+#: ../src/i_callbacks.c:2043
 msgid "Cut 5"
 msgstr "Cortar 5"
 
-#: src/i_callbacks.c:2043
+#: ../src/i_callbacks.c:2059
 msgid "Paste 1"
 msgstr "Pegar 1"
 
-#: src/i_callbacks.c:2052 src/i_callbacks.c:2076 src/i_callbacks.c:2100
-#: src/i_callbacks.c:2124 src/i_callbacks.c:2148
+#: ../src/i_callbacks.c:2066 ../src/i_callbacks.c:2088
+#: ../src/i_callbacks.c:2110 ../src/i_callbacks.c:2132
+#: ../src/i_callbacks.c:2154
 msgid "Empty buffer"
 msgstr "Buffer vacío"
 
-#: src/i_callbacks.c:2067
+#: ../src/i_callbacks.c:2081
 msgid "Paste 2"
 msgstr "Pegar 2"
 
-#: src/i_callbacks.c:2091
+#: ../src/i_callbacks.c:2103
 msgid "Paste 3"
 msgstr "Pegar 3"
 
-#: src/i_callbacks.c:2115
+#: ../src/i_callbacks.c:2125
 msgid "Paste 4"
 msgstr "Pegar 4"
 
-#: src/i_callbacks.c:2139
+#: ../src/i_callbacks.c:2147
 msgid "Paste 5"
 msgstr "Pegar 5"
 
-#: src/i_callbacks.c:2282 src/x_window.c:527
+#: ../src/i_callbacks.c:2264 ../src/x_window.c:439
 msgid "Component"
 msgstr "Componente"
 
-#: src/i_callbacks.c:2318 src/i_callbacks.c:2337
+#: ../src/i_callbacks.c:2300 ../src/i_callbacks.c:2319
 msgid "Attribute"
 msgstr "Propiedad"
 
-#: src/i_callbacks.c:2804
+#: ../src/i_callbacks.c:2786
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Buscando origen [%s]\n"
 
-#: src/i_callbacks.c:2828 src/i_callbacks.c:2829
+#: ../src/i_callbacks.c:2810 ../src/i_callbacks.c:2811
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "No se ha podido encontrar la fuente [%s]\n"
 
-#: src/i_callbacks.c:2896
+#: ../src/i_callbacks.c:2878
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Buscando símbolo [%s]\n"
 
-#: src/i_callbacks.c:2983
+#: ../src/i_callbacks.c:2965
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -982,325 +990,302 @@ msgstr ""
 "Este comando consigue la información del componente de internet, pero no hay "
 "ningún componente seleccionado"
 
-#: src/i_callbacks.c:3100
+#: ../src/i_callbacks.c:3082
 msgid "ShowN"
 msgstr "Mostrar nombre"
 
-#: src/i_callbacks.c:3130
+#: ../src/i_callbacks.c:3112
 msgid "ShowV"
 msgstr "Mostrar valor"
 
-#: src/i_callbacks.c:3160
+#: ../src/i_callbacks.c:3142
 msgid "ShowB"
 msgstr "Mostrar ambos"
 
-#: src/i_callbacks.c:3191
+#: ../src/i_callbacks.c:3173
 msgid "VisToggle"
 msgstr "Cambiar visibilidad"
 
-#: src/i_callbacks.c:3212
+#: ../src/i_callbacks.c:3194
 #, 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:3300
+#: ../src/i_callbacks.c:3282
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Modo de realimentación seleccionado: SILUETA\n"
 
-#: src/i_callbacks.c:3303
+#: ../src/i_callbacks.c:3285
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Modo de realimentación seleccionado: CONTENEDOR\n"
 
-#: src/i_callbacks.c:3320
+#: ../src/i_callbacks.c:3302
 msgid "Grid OFF\n"
 msgstr "Rejilla DESACTIVADA\n"
 
-#: src/i_callbacks.c:3323
+#: ../src/i_callbacks.c:3305
 msgid "Grid ON\n"
 msgstr "Rejilla ACTIVADA\n"
 
-#: src/i_callbacks.c:3340
+#: ../src/i_callbacks.c:3322
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "¡PRECAUCI�N!: Ajuste a la rejilla DESACTIVADO \n"
 
-#: src/i_callbacks.c:3343
+#: ../src/i_callbacks.c:3325
 msgid "Snap ON\n"
 msgstr "Ajuste a la rejilla ACTIVADO\n"
 
-#: src/i_callbacks.c:3363
+#: ../src/i_callbacks.c:3345
 msgid "Rubber band OFF \n"
 msgstr "Goma de borrar DESACT\n"
 
-#: src/i_callbacks.c:3366
+#: ../src/i_callbacks.c:3348
 msgid "Rubber band ON\n"
 msgstr "Goma de borrar ACT\n"
 
-#: src/o_arc.c:137
+#: ../src/o_arc.c:139
 #, c-format
 msgid "Unknown end for arc (%d)\n"
 msgstr "Final de arco desconocido (%d)\n"
 
-#: src/o_arc.c:178
+#: ../src/o_arc.c:180
 #, c-format
 msgid "Unknown type for arc !\n"
 msgstr "¡Tipo de arco desconocido!\n"
 
-#: src/o_attrib.c:105
+#: ../src/o_attrib.c:109
 #, c-format
 msgid "Got NULL in o_attrib_toggle_visibility\n"
 msgstr "Se ha recibido NULL de la función o_attrib_toggle_visibility\n"
 
-#: src/o_attrib.c:170
+#: ../src/o_attrib.c:175
 #, c-format
 msgid "Got NULL in o_attrib_toggle_show_name_value\n"
 msgstr "Se ha recibido NULL de la función o_attrib_toggle_show_name_value\n"
 
-#: src/o_attrib.c:221
-#, c-format
-msgid "ERROR! you can't get an attribute without an ='s\n"
-msgstr "¡ERROR! No puede tener una propiedad sin un signo '='\n"
-
-#: src/o_box.c:141
+#: ../src/o_box.c:143
 #, c-format
 msgid "Unknown end for box (%d)\n"
 msgstr "Final de rectángulo desconocido (%d)\n"
 
-#: src/o_box.c:181
+#: ../src/o_box.c:183
 #, c-format
 msgid "Unknown type for box !\n"
 msgstr "¡Tipo de rectángulo desconocido!\n"
 
-#: src/o_box.c:271
+#: ../src/o_box.c:267
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "¡Tipo de relleno de rectángulo desconocido!\n"
 
-#: src/o_buffer.c:42
+#: ../src/o_buffer.c:44
 #, c-format
 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"
 
-#: src/o_buffer.c:80
+#: ../src/o_buffer.c:73
 #, c-format
 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"
 
-#: src/o_buffer.c:121
+#: ../src/o_buffer.c:105
 #, 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_buffer.c:181
+#: ../src/o_buffer.c:164
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
 msgstr ""
 "Se ha recibido un número de memoria intermedia no válida en la función "
 "o_buffer_paste_end\n"
 
-#: src/o_bus.c:210
+#: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\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:136
+#: ../src/o_circle.c:138
 #, c-format
 msgid "Unknown end for circle\n"
 msgstr "Final de círculo desconocido\n"
 
-#: src/o_circle.c:172
+#. just to be careful
+#: ../src/o_circle.c:174
 #, c-format
 msgid "Unknown type for circle!\n"
 msgstr "¡Tipo de círculo desconocido!\n"
 
-#: src/o_circle.c:260
+#: ../src/o_circle.c:256
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "¡Tipo de relleno de círculo desconocido!\n"
 
-#: src/o_complex.c:230
+#: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
 msgstr "¡No se ha podido encontrar el objeto al colocar el nuevo componente!\n"
 
-#: src/o_complex.c:582
-#, c-format
-msgid "Got NULL in o_complex_translate_display_selection\n"
-msgstr ""
-"Se ha recibido NULL en la función o_complex_translate_display_selection\n"
-
-#: src/o_complex.c:650 src/o_complex.c:656
+#: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Convirtiendo esquema [%d %d]\n"
 
-#: src/o_complex.c:694
-#, c-format
-msgid "Got NULL in o_complex_translate_selection!\n"
-msgstr "¡Se ha recibido NULL en la función o_complex_translate_selection!\n"
-
-#: src/o_copy.c:119 src/o_copy.c:382
+#: ../src/o_copy.c:122 ../src/o_copy.c:312
 #, c-format
 msgid "ERROR: NULL object in o_copy_end!\n"
 msgstr "ERROR: en la función o_copy_end, ¡el objeto es NULL!\n"
 
-#: src/o_line.c:113
+#: ../src/o_line.c:115
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Final de línea desconocido (%d)\n"
 
-#: src/o_line.c:153
+#. just to be careful
+#: ../src/o_line.c:155
 #, c-format
 msgid "Unknown type for line (%d) !\n"
 msgstr "Tipo de línea desconocido (%d)\n"
 
-#: src/o_misc.c:65
+#: ../src/o_misc.c:66
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Se ha recibido NULL (no esperado) en la función o_edit\n"
 
-#: src/o_misc.c:144
+#: ../src/o_misc.c:145
 msgid "Object already locked\n"
 msgstr "Objeto previamente fijado\n"
 
-#: src/o_misc.c:182
+#: ../src/o_misc.c:183
 msgid "Object already unlocked\n"
 msgstr "El objeto no estaba fijado\n"
 
-#: src/o_misc.c:229 src/o_misc.c:472 src/o_misc.c:712
-#, c-format
-msgid "ERROR: NULL object in o_rotate_90!\n"
-msgstr "ERROR: en la función o_rotate_90, ¡el objeto es NULL!\n"
-
-#: src/o_misc.c:538
-#, c-format
-msgid "ERROR: NULL object in o_mirror!\n"
-msgstr "ERROR: en la función o_mirror, ¡el objeto es NULL!\n"
-
-#: src/o_misc.c:812
+#: ../src/o_misc.c:525
 msgid "Hidden text is now visible\n"
 msgstr "El texto oculto es ahora visible\n"
 
-#: src/o_misc.c:814
+#: ../src/o_misc.c:527
 msgid "Hidden text is now invisible\n"
 msgstr "El texto oculto es ahora invisible\n"
 
-#: src/o_misc.c:1058
+#: ../src/o_misc.c:771
 #, 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:1196
+#: ../src/o_misc.c:906
 #, 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:1240
+#: ../src/o_misc.c:951
 #, 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:1258
+#: ../src/o_misc.c:969
 #, 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:1263
+#: ../src/o_misc.c:974
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "NO se ha podido guardar la copia de seguridad [%s]\n"
 
-#: src/o_move.c:224
+#: ../src/o_move.c:181
 #, c-format
 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:332
+#: ../src/o_move.c:282
 #, 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:353
+#: ../src/o_move.c:304
 #, 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:255
+#: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\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:812 src/o_net.c:849 src/o_net.c:920 src/o_net.c:956
+#. try to exit gracefully
+#: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
 #, 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:1029
+#: ../src/o_net.c:980
 #, 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_picture.c:206 src/o_picture.c:746
+#: ../src/o_picture.c:208 ../src/o_picture.c:720
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fallo al cargar la imagen: %s"
 
-#: src/o_picture.c:220
+#: ../src/o_picture.c:222
 msgid "Picture"
 msgstr "Imagen"
 
-#: src/o_picture.c:658 src/x_attribedit.c:145
+#: ../src/o_picture.c:625 ../src/x_attribedit.c:148
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERROR: ¡objeto vacío (NULL)!\n"
 
-#: src/o_slot.c:128
+#: ../src/o_slot.c:130
 msgid "Slot attribute malformed\n"
 msgstr "El atributo del elemento está mal especificado\n"
 
-#: src/o_slot.c:146
+#: ../src/o_slot.c:148
 msgid "numslots attribute missing\n"
 msgstr "La propiedad \"numslots\" no está definida\n"
 
-#: src/o_slot.c:148
+#: ../src/o_slot.c:150
 msgid "Slotting not allowed for this component\n"
 msgstr "No se permiten múltiples elementos para este componente\n"
 
-#: src/o_slot.c:164
+#: ../src/o_slot.c:166
 msgid "New slot number out of range\n"
 msgstr "El nuevo número de elemento está fuera de rango\n"
 
-#: src/o_slot.c:237
+#: ../src/o_slot.c:239
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "¡¡Ufff!! ¡se ha intentado editar el elemento de algo que no existe!\n"
 
-#: src/o_undo.c:317
+#: ../src/o_undo.c:318
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "¡Deshacer/Rehacer deshabilitado en el fichero rc!\n"
 
-#: src/parsecmd.c:50
+#: ../src/parsecmd.c:51
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1324,69 +1309,78 @@ msgstr ""
 "  -h                Ayuda; éste mensaje\n"
 "\n"
 
-#: src/x_attribedit.c:130
+#: ../src/x_attribedit.c:133
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 "Se ha recibido una opción de mostrar no válida; mostrando ambos por defecto\n"
 
-#: src/x_attribedit.c:333
+#: ../src/x_attribedit.c:336
 msgid "Single Attribute Editor"
 msgstr "Editor de una única propiedad"
 
-#: src/x_attribedit.c:364
+#: ../src/x_attribedit.c:367
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Editar propiedades</b>"
 
-#: src/x_attribedit.c:366
+#: ../src/x_attribedit.c:369
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Añadir propiedad</b>"
 
-#: src/x_attribedit.c:382 src/x_multiattrib.c:1731
+#. Name selection
+#. GtkLabel
+#: ../src/x_attribedit.c:385 ../src/x_multiattrib.c:1721
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/x_attribedit.c:398 src/x_multiattrib.c:1750
+#. Value entry
+#. GtkLabel
+#: ../src/x_attribedit.c:401 ../src/x_multiattrib.c:1740
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/x_attribedit.c:414 src/x_multiattrib.c:1787
+#. Visibility
+#. GtkButton
+#: ../src/x_attribedit.c:417 ../src/x_multiattrib.c:1777
 msgid "Visible"
 msgstr "Visible"
 
-#: src/x_attribedit.c:434
+#: ../src/x_attribedit.c:437
 msgid "Show Value Only"
 msgstr "Mostrar sólo valor"
 
-#: src/x_attribedit.c:436
+#: ../src/x_attribedit.c:439
 msgid "Show Name Only"
 msgstr "Mostrar sólo nombre"
 
-#: src/x_attribedit.c:438 src/x_multiattrib.c:1226
+#: ../src/x_attribedit.c:441 ../src/x_multiattrib.c:1216
 msgid "Show Name & Value"
 msgstr "Mostrar nombre y valor"
 
-#: src/x_attribedit.c:445
+#. gschem specific
+#: ../src/x_attribedit.c:448
 msgid "<b>Attach Options</b>"
 msgstr "<b>Opciones de asociación</b>"
 
-#: src/x_attribedit.c:460
+#: ../src/x_attribedit.c:463
 msgid "All"
 msgstr "Todo"
 
-#: src/x_attribedit.c:468 src/x_compselect.c:728 src/x_compselect.c:803
+#. GtkTreeViewColumn
+#: ../src/x_attribedit.c:471 ../src/x_compselect.c:735
+#: ../src/x_compselect.c:810
 msgid "Components"
 msgstr "Componentes"
 
-#: src/x_attribedit.c:476 src/x_window.c:537
+#: ../src/x_attribedit.c:479 ../src/x_window.c:449
 msgid "Nets"
 msgstr "Conexiones"
 
-#: src/x_attribedit.c:484
+#: ../src/x_attribedit.c:487
 msgid "Replace existing attributes"
 msgstr "Reemplazar las propiedades existentes"
 
-#: src/x_autonumber.c:413
+#: ../src/x_autonumber.c:412
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1394,7 +1388,8 @@ msgstr ""
 "Un componente con varios elementos sin la propiedad 'slot' puede causar "
 "problemas al autonumerar los números de elemento\n"
 
-#: src/x_autonumber.c:428
+#. duplicate slot in used_slots
+#: ../src/x_autonumber.c:427
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
@@ -1402,156 +1397,162 @@ 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:697
+#: ../src/x_autonumber.c:692
 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:748
+#: ../src/x_autonumber.c:743
 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:881
+#: ../src/x_autonumber.c:876
 msgid "Diagonal"
 msgstr "Diagonal"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Top to bottom"
 msgstr "De arriba hacia abajo"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Bottom to top"
 msgstr "De abajo hacia arriba"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Left to right"
 msgstr "De izquierda hacia derecha"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Right to left"
 msgstr "De derecha hacia izquierda"
 
-#: src/x_autonumber.c:884
+#: ../src/x_autonumber.c:879
 msgid "File order"
 msgstr "Orden de archivos:"
 
-#: src/x_autonumber.c:1220
+#: ../src/x_autonumber.c:1215
 msgid "Autonumber text"
 msgstr "Autoenumerar texto"
 
-#: src/x_autonumber.c:1246
+#. scope section
+#: ../src/x_autonumber.c:1241
 msgid "<b>Scope</b>"
 msgstr "<b>Ã?mbito</b>"
 
-#: src/x_autonumber.c:1268
+#: ../src/x_autonumber.c:1263
 msgid "Search for:"
 msgstr "Buscar:"
 
-#: src/x_autonumber.c:1282
+#: ../src/x_autonumber.c:1277
 msgid "Autonumber text in:"
 msgstr "Autoenumerar texto en:"
 
-#: src/x_autonumber.c:1289
+#: ../src/x_autonumber.c:1284
 msgid "Skip numbers found in:"
 msgstr "Ignorar números encontrados en:"
 
-#: src/x_autonumber.c:1301 src/x_autonumber.c:1310
+#: ../src/x_autonumber.c:1296 ../src/x_autonumber.c:1305
 msgid "Selected objects"
 msgstr "Objetos seleccionados"
 
-#: src/x_autonumber.c:1302 src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1297 ../src/x_autonumber.c:1306
 msgid "Current page"
 msgstr "Hoja actual"
 
-#: src/x_autonumber.c:1303 src/x_autonumber.c:1312
+#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
 msgid "Whole hierarchy"
 msgstr "Jerarquía completa"
 
-#: src/x_autonumber.c:1314
+#: ../src/x_autonumber.c:1309
 msgid "Overwrite existing numbers"
 msgstr "Sobreescribir los números existentes"
 
-#: src/x_autonumber.c:1319
+#. Options section
+#: ../src/x_autonumber.c:1314
 msgid "<b>Options</b>"
 msgstr "<b>Opciones</b>"
 
-#: src/x_autonumber.c:1341
+#: ../src/x_autonumber.c:1336
 msgid "Starting number:"
 msgstr "Número inicial:"
 
-#: src/x_autonumber.c:1348
+#: ../src/x_autonumber.c:1343
 msgid "Sort order:"
 msgstr "Método de ordenación:"
 
-#: src/x_autonumber.c:1369
+#: ../src/x_autonumber.c:1364
 msgid "Remove numbers"
 msgstr "Borrar los números"
 
-#: src/x_autonumber.c:1373
+#: ../src/x_autonumber.c:1368
 msgid "Automatic slotting"
 msgstr "Asignar números de elemento automáticamente"
 
-#: src/x_color.c:60 src/x_color.c:97
+#: ../src/x_color.c:60 ../src/x_color.c:97
 #, c-format
 msgid "Could not find the color %s!\n"
 msgstr "¡No se ha podido encontrar el color %s!\n"
 
-#: src/x_color.c:63 src/x_color.c:100
+#: ../src/x_color.c:63 ../src/x_color.c:100
 #, c-format
 msgid "Defaulting color to white\n"
 msgstr "Utilizando color blanco por defecto\n"
 
-#: src/x_color.c:70 src/x_color.c:107
+#: ../src/x_color.c:70 ../src/x_color.c:107
 #, c-format
 msgid "Ack! Cannot allocate white!\n"
 msgstr "¡Eh! ¡No se puede reservar memoria para el color blanco!\n"
 
-#: src/x_color.c:81 src/x_color.c:129 src/x_window.c:176 src/x_window.c:185
+#: ../src/x_color.c:81 ../src/x_color.c:129 ../src/x_window.c:86
+#: ../src/x_window.c:95
 #, 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:148 src/x_color.c:164
+#: ../src/x_color.c:148 ../src/x_color.c:164
 #, 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_compselect.c:833
+#. GtkLabel
+#: ../src/x_compselect.c:840
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/x_compselect.c:925
+#: ../src/x_compselect.c:932
 msgid "Default behavior - reference component"
 msgstr "Comportamiento por defecto - designar componente"
 
-#: src/x_compselect.c:928
+#: ../src/x_compselect.c:935
 msgid "Embed component in schematic"
 msgstr "Incrustar componente en el esquema"
 
-#: src/x_compselect.c:931
+#: ../src/x_compselect.c:938
 msgid "Include component as individual objects"
 msgstr "Incluir componentes como objetos individuales"
 
-#: src/x_compselect.c:1077
+#: ../src/x_compselect.c:1094
 msgid "Select Component..."
 msgstr "Seleccionar componente..."
 
-#: src/x_compselect.c:1103
+#: ../src/x_compselect.c:1120
 msgid "In Use"
 msgstr "En uso"
 
-#: src/x_compselect.c:1107
+#: ../src/x_compselect.c:1124
 msgid "Libraries"
 msgstr "Librerías"
 
-#: src/x_compselect.c:1116 src/x_fileselect.c:127
+#. GtkFrame
+#: ../src/x_compselect.c:1133 ../src/x_fileselect.c:128
 msgid "Preview"
 msgstr "Vista preliminar"
 
-#: src/x_dialog.c:184
+#. dialog not created yet
+#: ../src/x_dialog.c:191
 msgid "Text Entry..."
 msgstr "Introducción de texto..."
 
-#: src/x_dialog.c:217
+#: ../src/x_dialog.c:224
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1562,168 +1563,178 @@ msgstr ""
 "para colocar el texto.\n"
 "Botón intermedio para rotar mientras está colocando el texto."
 
-#: src/x_dialog.c:306
+#: ../src/x_dialog.c:313
+#, c-format
 msgid "Lower Left"
 msgstr "Abajo a la izquierda"
 
-#: src/x_dialog.c:317
+#: ../src/x_dialog.c:324
+#, c-format
 msgid "Middle Left"
 msgstr "Centrado a la izquierda"
 
-#: src/x_dialog.c:328
+#: ../src/x_dialog.c:335
+#, c-format
 msgid "Upper Left"
 msgstr "Arriba a la izquierda"
 
-#: src/x_dialog.c:339
+#: ../src/x_dialog.c:346
+#, c-format
 msgid "Lower Middle"
 msgstr "Abajo centrado"
 
-#: src/x_dialog.c:350
+#: ../src/x_dialog.c:357
+#, c-format
 msgid "Middle Middle"
 msgstr "Centrado Centrado"
 
-#: src/x_dialog.c:361
+#: ../src/x_dialog.c:368
+#, c-format
 msgid "Upper Middle"
 msgstr "Arriba centrado"
 
-#: src/x_dialog.c:372
+#: ../src/x_dialog.c:379
+#, c-format
 msgid "Lower Right"
 msgstr "Abajo a la derecha"
 
-#: src/x_dialog.c:383
+#: ../src/x_dialog.c:390
+#, c-format
 msgid "Middle Right"
 msgstr "Centrado a la derecha"
 
-#: src/x_dialog.c:394
+#: ../src/x_dialog.c:401
+#, c-format
 msgid "Upper Right"
 msgstr "Arriba a la derecha"
 
-#: src/x_dialog.c:509
+#: ../src/x_dialog.c:516
 msgid "Edit Text Properties"
 msgstr "Editar las propiedades del texto"
 
-#: src/x_dialog.c:545
+#: ../src/x_dialog.c:552
 msgid "<b>Text Content</b>"
 msgstr "<b>Contenido del texto</b>"
 
-#: src/x_dialog.c:577
+#: ../src/x_dialog.c:584
 msgid "<b>Text Properties</b>"
 msgstr "<b>Propiedades del texto</b>"
 
-#: src/x_dialog.c:592
+#: ../src/x_dialog.c:599
 msgid "Color:"
 msgstr "Color:"
 
-#: src/x_dialog.c:602
+#: ../src/x_dialog.c:609
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/x_dialog.c:611
+#: ../src/x_dialog.c:618
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: src/x_dialog.c:665
+#: ../src/x_dialog.c:672
 msgid "Solid"
 msgstr "Sólido"
 
-#: src/x_dialog.c:666
+#: ../src/x_dialog.c:673
 msgid "Dotted"
 msgstr "Punteado"
 
-#: src/x_dialog.c:667
+#: ../src/x_dialog.c:674
 msgid "Dashed"
 msgstr "Guión"
 
-#: src/x_dialog.c:668
+#: ../src/x_dialog.c:675
 msgid "Center"
 msgstr "Centrar"
 
-#: src/x_dialog.c:669
+#: ../src/x_dialog.c:676
 msgid "Phantom"
 msgstr "Fantasma"
 
-#: src/x_dialog.c:795 src/x_dialog.c:797 src/x_dialog.c:799 src/x_dialog.c:982
-#: src/x_dialog.c:983 src/x_dialog.c:984 src/x_dialog.c:992
-#: src/x_dialog.c:1175 src/x_dialog.c:1177 src/x_dialog.c:1179
-#: src/x_dialog.c:1181 src/x_dialog.c:1183 src/x_dialog.c:1388
-#: src/x_dialog.c:1389 src/x_dialog.c:1390 src/x_dialog.c:1391
-#: src/x_dialog.c:1392 src/x_dialog.c:1400
+#: ../src/x_dialog.c:802 ../src/x_dialog.c:804 ../src/x_dialog.c:806
+#: ../src/x_dialog.c:989 ../src/x_dialog.c:990 ../src/x_dialog.c:991
+#: ../src/x_dialog.c:999 ../src/x_dialog.c:1182 ../src/x_dialog.c:1184
+#: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
+#: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
+#: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
+#, c-format
 msgid "*unchanged*"
 msgstr "*sin modificar*"
 
-#: src/x_dialog.c:874
+#: ../src/x_dialog.c:881
 msgid "Edit Line Width & Type"
 msgstr "Editar ancho y tipo de línea"
 
-#: src/x_dialog.c:915
+#: ../src/x_dialog.c:922
 msgid "Width:"
 msgstr "Ancho:"
 
-#: src/x_dialog.c:919 src/x_print.c:314
+#: ../src/x_dialog.c:926 ../src/x_print.c:315
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/x_dialog.c:923
+#: ../src/x_dialog.c:930
 msgid "Dash Length:"
 msgstr "Longitud de la línea en la discontinuidad:"
 
-#: src/x_dialog.c:927
+#: ../src/x_dialog.c:934
 msgid "Dash Space:"
 msgstr "Espaciado de la discontinuidad:"
 
-#: src/x_dialog.c:1032
+#: ../src/x_dialog.c:1039
 msgid "Hollow"
 msgstr "Hueco"
 
-#: src/x_dialog.c:1033
+#: ../src/x_dialog.c:1040
 msgid "Filled"
 msgstr "Relleno"
 
-#: src/x_dialog.c:1034
+#: ../src/x_dialog.c:1041
 msgid "Mesh"
 msgstr "Malla"
 
-#: src/x_dialog.c:1035
+#: ../src/x_dialog.c:1042
 msgid "Hatch"
 msgstr "Trama"
 
-#: src/x_dialog.c:1301
+#: ../src/x_dialog.c:1308
 msgid "Fill Type:"
 msgstr "Tipo de relleno:"
 
-#: src/x_dialog.c:1305
+#: ../src/x_dialog.c:1312
 msgid "Line Width:"
 msgstr "Ancho de línea:"
 
-#: src/x_dialog.c:1309
+#: ../src/x_dialog.c:1316
 msgid "Angle 1:"
 msgstr "Ã?ngulo 1:"
 
-#: src/x_dialog.c:1313
+#: ../src/x_dialog.c:1320
 msgid "Pitch 1:"
 msgstr "Separación 1:"
 
-#: src/x_dialog.c:1317
+#: ../src/x_dialog.c:1324
 msgid "Angle 2:"
 msgstr "Ã?ngulo 2:"
 
-#: src/x_dialog.c:1321
+#: ../src/x_dialog.c:1328
 msgid "Pitch 2:"
 msgstr "Separación 2:"
 
-#: src/x_dialog.c:1483
+#: ../src/x_dialog.c:1490
 msgid "Arc Params"
 msgstr "Parámetros de arco"
 
-#: src/x_dialog.c:1525
+#: ../src/x_dialog.c:1532
 msgid "Start Angle:"
 msgstr "Ã?ngulo de comienzo:"
 
-#: src/x_dialog.c:1535
+#: ../src/x_dialog.c:1542
 msgid "Degrees of Sweep:"
 msgstr "Grados de barrido:"
 
-#: src/x_dialog.c:1636
+#: ../src/x_dialog.c:1643
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1731,44 +1742,44 @@ msgstr ""
 "¿Desplazamiento del movimiento?\n"
 "(0 para el origen)"
 
-#: src/x_dialog.c:1704
+#: ../src/x_dialog.c:1711
 msgid "Text Size"
 msgstr "Tamaño de texto"
 
-#: src/x_dialog.c:1736
+#: ../src/x_dialog.c:1743
 msgid "Enter new text size:"
 msgstr "Introduzca nuevo tamaño de texto:"
 
-#: src/x_dialog.c:1811
+#: ../src/x_dialog.c:1818
 msgid "Snap Size"
 msgstr "Tamaño de la rejilla"
 
-#: src/x_dialog.c:1843
+#: ../src/x_dialog.c:1850
 msgid "Enter new snap grid spacing:"
 msgstr "Introduzca el nuevo espaciado de la rejilla:"
 
-#: src/x_dialog.c:1916
+#: ../src/x_dialog.c:1923
 msgid "Edit slot number"
 msgstr "Editar número de elemento"
 
-#: src/x_dialog.c:1949
+#: ../src/x_dialog.c:1956
 msgid "Edit slot number:"
 msgstr "Editar número de elemento:"
 
-#: src/x_dialog.c:2011
+#: ../src/x_dialog.c:2018
 msgid "About..."
 msgstr "Acerca de..."
 
-#: src/x_dialog.c:2031
+#: ../src/x_dialog.c:2038
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: Automatización de Diseño Electrónico GPL</b>"
 
-#: src/x_dialog.c:2035
+#: ../src/x_dialog.c:2042
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>versión de gschem %s%s.%s</b>"
 
-#: src/x_dialog.c:2043
+#: ../src/x_dialog.c:2050
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1780,96 +1791,98 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "Y muchos otros (Véase el archivo AUTHORS)"
 
-#: src/x_dialog.c:2107
+#: ../src/x_dialog.c:2115
 msgid "Coords"
 msgstr "Coordenadas"
 
-#: src/x_dialog.c:2128
+#: ../src/x_dialog.c:2136
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/x_dialog.c:2137
+#: ../src/x_dialog.c:2145
 msgid "World"
 msgstr "Mundo"
 
-#: src/x_dialog.c:2360
+#: ../src/x_dialog.c:2360
 #, 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:2423
+#: ../src/x_dialog.c:2423
 msgid "Color Edit"
 msgstr "Editar color"
 
-#: src/x_dialog.c:2456
+#: ../src/x_dialog.c:2456
 msgid "Object color:"
 msgstr "Color del componente:"
 
-#: src/x_dialog.c:2581
+#: ../src/x_dialog.c:2581
 msgid "Function"
 msgstr "Función"
 
-#: src/x_dialog.c:2588
+#: ../src/x_dialog.c:2588
 msgid "Keystroke(s)"
 msgstr "Pulsación(es)"
 
-#: src/x_dialog.c:2920
+#: ../src/x_dialog.c:2901
 msgid "Find Text"
 msgstr "Encontrar texto:"
 
-#: src/x_dialog.c:2953
+#: ../src/x_dialog.c:2934
 msgid "Text to find:"
 msgstr "Texto a encontrar:"
 
-#: src/x_dialog.c:2963
+#: ../src/x_dialog.c:2944
 msgid "descend into hierarchy"
 msgstr "Descender en la jerarquía"
 
-#: src/x_dialog.c:3027
+#: ../src/x_dialog.c:3008
 msgid "Hide Text"
 msgstr "Ocultar texto:"
 
-#: src/x_dialog.c:3060
+#: ../src/x_dialog.c:3041
 msgid "Hide text starting with:"
 msgstr "Ocultar texto que comienza por:"
 
-#: src/x_dialog.c:3128
+#: ../src/x_dialog.c:3109
 msgid "Show Text"
 msgstr "Mostrar texto"
 
-#: src/x_dialog.c:3161
+#: ../src/x_dialog.c:3142
 msgid "Show text starting with:"
 msgstr "Mostrar texto que comienza por:"
 
-#: src/x_dialog.c:3606 src/x_multiattrib.c:1607
+#. GtkTreeViewColumn
+#: ../src/x_dialog.c:3587 ../src/x_multiattrib.c:1597
 msgid "Name"
 msgstr "Nombre"
 
-#: src/x_dialog.c:3628
+#: ../src/x_dialog.c:3609
 msgid "S_elect the schematics you want to save:"
 msgstr "S_eleccione los esquemas que quiere guardar:"
 
-#: src/x_dialog.c:3722
+#: ../src/x_dialog.c:3703
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "¿Guardar cambios del esquema \"%s\" antes de salir?"
 
-#: src/x_dialog.c:3728
+#: ../src/x_dialog.c:3709
 #, fuzzy, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 "Hay %d esquemas con cambios sin guardar. ¿Guardar cambios antes de salir?"
 
-#: src/x_dialog.c:3757
+#. secondary label
+#: ../src/x_dialog.c:3738
 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:3777
+#: ../src/x_dialog.c:3758
 msgid "_Close without saving"
 msgstr "_Cerrar sin guardar"
 
-#: src/x_dialog.c:4098
+#: ../src/x_dialog.c:4094
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1880,50 +1893,68 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: src/x_dialog.c:4100
+#: ../src/x_dialog.c:4096
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Añadir propiedad"
 
-#: src/x_fileselect.c:47
+#: ../src/x_fileselect.c:48
 msgid "Schematics"
 msgstr "Esquemas"
 
-#: src/x_fileselect.c:52
+#: ../src/x_fileselect.c:53
 msgid "Symbols"
 msgstr "Símbolos"
 
-#: src/x_fileselect.c:57
+#: ../src/x_fileselect.c:58
 msgid "Schematics and symbols"
 msgstr "Esquemas y símbolos"
 
-#: src/x_fileselect.c:63
+#: ../src/x_fileselect.c:64
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: src/x_fileselect.c:176
+#: ../src/x_fileselect.c:177
 msgid "Open..."
 msgstr "Abrir..."
 
-#: src/x_fileselect.c:237
+#: ../src/x_fileselect.c:238
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: src/x_image.c:180
+#: ../src/x_fileselect.c:286
+#, c-format
+msgid ""
+"The selected file `%s' already exists.\n"
+"\n"
+"Would you like to overwrite it?"
+msgstr ""
+
+#: ../src/x_fileselect.c:289
+#, fuzzy
+msgid "Overwrite file?"
+msgstr "Nuevo archivo"
+
+#: ../src/x_fileselect.c:291
+msgid "Save cancelled on user request\n"
+msgstr ""
+
+#. WK - catch EPS export case
+#: ../src/x_image.c:181
 msgid "Encapsulated Postscript"
 msgstr "Postscript encapsulado"
 
-#: src/x_image.c:298
+#: ../src/x_image.c:304
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: Imposible escribir archivo eps: %s.\n"
 
-#: src/x_image.c:379
+#: ../src/x_image.c:385
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: Imposible escribir archivo %s: %s.\n"
 
-#: src/x_image.c:389
+#: ../src/x_image.c:395
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -1936,244 +1967,255 @@ msgstr ""
 "\n"
 "%s.\n"
 
-#: src/x_image.c:408
+#: ../src/x_image.c:414
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Se ha guardado la imagen en color en [%s] [%d x %d]\n"
 
-#: src/x_image.c:410
+#: ../src/x_image.c:416
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Se ha guardado la imagen en blanco y negro en [%s] [%d x %d]\n"
 
-#: src/x_image.c:420
+#: ../src/x_image.c:426
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr "x_image_lowlevel: Imposible obtener pixbuf de la ventana de gschem.\n"
 
-#: src/x_image.c:466
+#: ../src/x_image.c:472
 msgid "Width x Height"
 msgstr "Anchura x Altura"
 
-#: src/x_image.c:482
+#: ../src/x_image.c:488
 msgid "Image type"
 msgstr "Tipo de imagen"
 
-#: src/x_log.c:236
+#: ../src/x_log.c:252
 msgid "Status"
 msgstr "Estado"
 
-#: src/x_menus.c:41
+#: ../src/x_menus.c:42
 msgid "/Add Net"
 msgstr "/Añadir conexión..."
 
-#: src/x_menus.c:42
+#: ../src/x_menus.c:43
 msgid "/Add Attribute..."
 msgstr "/Añadir propiedad"
 
-#: src/x_menus.c:43
+#: ../src/x_menus.c:44
 msgid "/Add Component..."
 msgstr "/Añadir componente..."
 
-#: src/x_menus.c:44
+#: ../src/x_menus.c:45
 msgid "/Add Bus"
 msgstr "/Añadir bus"
 
-#: src/x_menus.c:45
+#: ../src/x_menus.c:46
 msgid "/Add Text"
 msgstr "/Añadir texto"
 
-#: src/x_menus.c:47
+#: ../src/x_menus.c:48
 msgid "/Zoom In"
 msgstr "/Aumentar ampliación"
 
-#: src/x_menus.c:48
+#: ../src/x_menus.c:49
 msgid "/Zoom Out"
 msgstr "/Disminuir ampliación"
 
-#: src/x_menus.c:49
+#: ../src/x_menus.c:50
 msgid "/Zoom Box"
 msgstr "/Ampliar zona"
 
-#: src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Zoom Extents"
 msgstr "/Mostrar todo"
 
-#: src/x_menus.c:52
+#: ../src/x_menus.c:53
 msgid "/Select"
 msgstr "/Seleccionar"
 
-#: src/x_menus.c:53
+#: ../src/x_menus.c:54
 msgid "/Edit..."
 msgstr "/Editar..."
 
-#: src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Copy"
 msgstr "/Copiar"
 
-#: src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Move"
 msgstr "/Mover"
 
-#: src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Delete"
 msgstr "/Borrar"
 
-#: src/x_menus.c:59
+#: ../src/x_menus.c:60
 msgid "/Down Schematic"
 msgstr "/Descender en esquema"
 
-#: src/x_menus.c:60
+#: ../src/x_menus.c:61
 msgid "/Down Symbol"
 msgstr "/Descender en símbolo"
 
-#: src/x_menus.c:61
+#: ../src/x_menus.c:62
 msgid "/Up"
 msgstr "/Arriba"
 
-#: src/x_menus.c:332
-msgid "Tried to set the sensitivity on a non-existent menu item\n"
+#: ../src/x_menus.c:333
+#, fuzzy, 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\n"
 
-#: src/x_menus.c:356
+#: ../src/x_menus.c:357
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "¡No existen menúes contextuales!\n"
 
-#: src/x_menus.c:369
+#: ../src/x_menus.c:370
 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"
 
-#: src/x_menus.c:482
+#. Remove this entry from all menus
+#: ../src/x_menus.c:482
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "No se ha podido abrir el archivo %s\n"
 
-#: src/x_menus.c:542
+#: ../src/x_menus.c:543
 msgid "Clear"
 msgstr "Borrar"
 
-#: src/x_multiattrib.c:718
+#: ../src/x_multiattrib.c:708
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr ""
 "No se permiten las propiedades sin nombre. Por favor, introduzca un nombre."
 
-#: src/x_multiattrib.c:1228
+#: ../src/x_multiattrib.c:1218
 msgid "Show Value only"
 msgstr "Mostrar sólo valor"
 
-#: src/x_multiattrib.c:1230
+#: ../src/x_multiattrib.c:1220
 msgid "Show Name only"
 msgstr "Mostrar sólo nombre"
 
-#: src/x_multiattrib.c:1257
+#: ../src/x_multiattrib.c:1247
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: src/x_multiattrib.c:1534
+#: ../src/x_multiattrib.c:1524
 msgid "Edit Attributes"
 msgstr "Editar propiedades"
 
-#: src/x_multiattrib.c:1632
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1622
 msgid "Value"
 msgstr "Valor"
 
-#: src/x_multiattrib.c:1654
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1644
 msgid "Vis?"
 msgstr "Visible?"
 
-#: src/x_multiattrib.c:1674
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1664
 msgid "N"
 msgstr "N"
 
-#: src/x_multiattrib.c:1694
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1684
 msgid "V"
 msgstr "V"
 
-#: src/x_multiattrib.c:1715
+#: ../src/x_multiattrib.c:1705
 msgid "Add Attribute"
 msgstr "Añadir propiedad"
 
-#: src/x_pagesel.c:263
+#: ../src/x_pagesel.c:264
 msgid "Discard Page"
 msgstr "Descartar página"
 
-#: src/x_pagesel.c:382
+#: ../src/x_pagesel.c:383
 msgid "Page Manager"
 msgstr "Administrador de páginas"
 
-#: src/x_pagesel.c:438
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:439
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: src/x_pagesel.c:454
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:455
 msgid "Changed"
 msgstr "Modificado"
 
-#: src/x_pagesel.c:474
+#. GtkLabel
+#: ../src/x_pagesel.c:475
 msgid "Right click on the filename for more options..."
 msgstr "Pulse con el botón derecho para ver más opciones..."
 
-#: src/x_print.c:89
+#: ../src/x_print.c:90
 msgid "Select PostScript Filename..."
 msgstr "Seleccionar archivo PostScript..."
 
-#: src/x_print.c:171
+#: ../src/x_print.c:172
 msgid "Extents with margins"
 msgstr "Completo con márgenes"
 
-#: src/x_print.c:177
+#: ../src/x_print.c:178
 msgid "Extents no margins"
 msgstr "Completo sin márgenes"
 
-#: src/x_print.c:183
+#: ../src/x_print.c:184
 msgid "Current Window"
 msgstr "Ventana actual"
 
-#: src/x_print.c:217
+#: ../src/x_print.c:218
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: src/x_print.c:223
+#: ../src/x_print.c:224
 msgid "Portrait"
 msgstr "Vertical"
 
-#: src/x_print.c:291
+#. Upper frame
+#: ../src/x_print.c:292
 msgid "Settings"
 msgstr "Opciones"
 
-#: src/x_print.c:303
+#: ../src/x_print.c:304
 msgid "Output paper size:"
 msgstr "Tamaño de papel:"
 
-#: src/x_print.c:325
+#: ../src/x_print.c:326
 msgid "Orientation:"
 msgstr "Orientación:"
 
-#: src/x_print.c:337
+#. Lower frame
+#: ../src/x_print.c:338
 msgid "Destination"
 msgstr "Destino"
 
-#: src/x_print.c:350
+#: ../src/x_print.c:351
 msgid "File:"
 msgstr "Archivo:"
 
-#: src/x_print.c:380
+#: ../src/x_print.c:381
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/x_print.c:750
+#: ../src/x_print.c:751
 msgid "No print destination specified\n"
 msgstr "No se ha especificado el destino de impresión\n"
 
-#: src/x_print.c:757
+#: ../src/x_print.c:758
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "No se puede imprimir el esquema actual a [%s]\n"
 
-#: src/x_print.c:766
+#: ../src/x_print.c:767
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2182,73 +2224,73 @@ msgstr ""
 "Error al imprimir al fichero '%s'\n"
 "Vea la ventana de registro para más información"
 
-#: src/x_print.c:773
+#: ../src/x_print.c:774
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Se ha imprimido el esquema actual a [%s]\n"
 
-#: src/x_window.c:176
+#: ../src/x_window.c:86
 msgid "black"
 msgstr "negro"
 
-#: src/x_window.c:185
+#: ../src/x_window.c:95
 msgid "white"
 msgstr "blanco"
 
-#: src/x_window.c:219
+#: ../src/x_window.c:129
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "No se ha podido reservar memoria para la variable gc\n"
 
-#: src/x_window.c:232
+#: ../src/x_window.c:142
 #, 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:245
+#: ../src/x_window.c:155
 #, 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:261
+#: ../src/x_window.c:171
 #, 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:268
+#: ../src/x_window.c:178
 #, 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:490
+#: ../src/x_window.c:402
 msgid "New file"
 msgstr "Nuevo archivo"
 
-#: src/x_window.c:496
+#: ../src/x_window.c:408
 msgid "Open"
 msgstr "Abrir"
 
-#: src/x_window.c:497
+#: ../src/x_window.c:409
 msgid "Open file..."
 msgstr "Abrir archivo"
 
-#: src/x_window.c:503
+#: ../src/x_window.c:415
 msgid "Save"
 msgstr "Guardar"
 
-#: src/x_window.c:504
+#: ../src/x_window.c:416
 msgid "Save file"
 msgstr "Guardar archivo"
 
-#: src/x_window.c:512
+#: ../src/x_window.c:424
 msgid "Undo last operation"
 msgstr "Deshacer última operación"
 
-#: src/x_window.c:519
+#: ../src/x_window.c:431
 msgid "Redo last undo"
 msgstr "Rehacer el último deshacer"
 
-#: src/x_window.c:528
+#: ../src/x_window.c:440
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2260,7 +2302,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:538
+#: ../src/x_window.c:450
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2268,7 +2310,7 @@ msgstr ""
 "Añadir conexión\n"
 "Botón derecho del ratón para cancelar"
 
-#: src/x_window.c:548
+#: ../src/x_window.c:460
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2276,75 +2318,114 @@ msgstr ""
 "Añadir bus\n"
 "Botón derecho del ratón para cancelar"
 
-#: src/x_window.c:555
+#: ../src/x_window.c:467
 msgid "Text"
 msgstr "Texto"
 
-#: src/x_window.c:556
+#: ../src/x_window.c:468
 msgid "Add Text..."
 msgstr "Añadir texto..."
 
-#: src/x_window.c:566
+#: ../src/x_window.c:478
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/x_window.c:567
+#: ../src/x_window.c:479
 msgid "Select mode"
 msgstr "Seleccionar"
 
-#: src/x_window.c:642
+#: ../src/x_window.c:554
 msgid "Pick"
 msgstr "Coger"
 
-#: src/x_window.c:658
+#: ../src/x_window.c:570
 msgid "Repeat/none"
 msgstr "Repetir/ninguno"
 
-#: src/x_window.c:668
+#: ../src/x_window.c:580
 msgid "Menu/Cancel"
 msgstr "Menú/Cancelar"
 
-#: src/x_window.c:670
+#: ../src/x_window.c:582
 msgid "Pan/Cancel"
 msgstr "Panorámica/Cancelar"
 
-#: src/x_window.c:926
+#: ../src/x_window.c:809
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Cargando esquema [%s]\n"
 
-#: src/x_window.c:1028
+#: ../src/x_window.c:821
+#, fuzzy
+msgid "Failed to load file"
+msgstr "Fallo al cargar la imagen: %s"
+
+#: ../src/x_window.c:830
+#, fuzzy, c-format
+msgid "New file [%s]\n"
+msgstr "Nuevo archivo"
+
+#. an error occured when saving page to file
+#: ../src/x_window.c:936
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "NO se ha podido guardar la página [%s]\n"
 
-#: src/x_window.c:1029
+#: ../src/x_window.c:937
 msgid "Error while trying to save"
 msgstr "Error al intentar guardar"
 
-#: src/x_window.c:1038
+#: ../src/x_window.c:946
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Guardado como [%s]\n"
 
-#: src/x_window.c:1040
+#: ../src/x_window.c:948
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Guardado [%s]\n"
 
-#: src/x_window.c:1042
+#: ../src/x_window.c:950
 msgid "Saved"
 msgstr "Guardado"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Descartando página [%s]\n"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Cerrando [%s]\n"
 
+#: ../data/geda-gschem.desktop.in.h:1
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
+#: ../data/geda-gschem.desktop.in.h:2
+#, fuzzy
+msgid "gEDA Schematic Editor"
+msgstr "Descender en esquema"
+
+#~ msgid "Attribute Mode"
+#~ msgstr "Modo Propiedades"
+
+#~ msgid "ERROR! you can't get an attribute without an ='s\n"
+#~ msgstr "¡ERROR! No puede tener una propiedad sin un signo '='\n"
+
+#~ msgid "Got NULL in o_complex_translate_display_selection\n"
+#~ msgstr ""
+#~ "Se ha recibido NULL en la función o_complex_translate_display_selection\n"
+
+#~ msgid "Got NULL in o_complex_translate_selection!\n"
+#~ msgstr "¡Se ha recibido NULL en la función o_complex_translate_selection!\n"
+
+#~ msgid "ERROR: NULL object in o_rotate_90!\n"
+#~ msgstr "ERROR: en la función o_rotate_90, ¡el objeto es NULL!\n"
+
+#~ msgid "ERROR: NULL object in o_mirror!\n"
+#~ msgstr "ERROR: en la función o_mirror, ¡el objeto es NULL!\n"
+
 #~ msgid "Invalid mode [%s] passed to %s\n"
 #~ msgstr "Se ha especificado un modo no válido [%s] a la función %s\n"
diff --git a/gschem/po/fr_FR.po b/gschem/po/fr_FR.po
index 0c0f3b8..9fe00d5 100644
--- a/gschem/po/fr_FR.po
+++ b/gschem/po/fr_FR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr_FR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-02 21:10-0400\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-02-16 14:08+0100\n"
 "Last-Translator: Patrick Bernaud <b-patrick@xxxxxxxxxx>\n"
 "Language-Team: French\n"
@@ -17,604 +17,613 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/rcstrings.c:2
+#: ../src/rcstrings.c:2
 msgid "File"
 msgstr "Fichier"
 
-#: src/rcstrings.c:3
+#: ../src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nouvelle fenêtre"
 
-#: src/rcstrings.c:4 src/x_pagesel.c:258
+#: ../src/rcstrings.c:4 ../src/x_pagesel.c:259
 msgid "New Page"
 msgstr "Nouvelle page"
 
-#: src/rcstrings.c:5 src/x_pagesel.c:259
+#: ../src/rcstrings.c:5 ../src/x_pagesel.c:260
 msgid "Open Page..."
 msgstr "Ouvrir une page..."
 
-#: src/rcstrings.c:6 src/x_pagesel.c:262
+#: ../src/rcstrings.c:6 ../src/x_pagesel.c:263
 msgid "Close Page"
 msgstr "Fermer la page"
 
-#: src/rcstrings.c:7
+#: ../src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Annuler les modifications"
 
-#: src/rcstrings.c:8 src/x_pagesel.c:261
+#: ../src/rcstrings.c:8 ../src/x_pagesel.c:262
 msgid "Save Page"
 msgstr "Enregistrer la page"
 
-#: src/rcstrings.c:9
+#: ../src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Enregistrer la page sous..."
 
-#: src/rcstrings.c:10
+#: ../src/rcstrings.c:10
 msgid "Save All"
 msgstr "Enregistrer toutes les pages"
 
-#: src/rcstrings.c:11 src/x_print.c:283
+#. GtkWindow
+#: ../src/rcstrings.c:11 ../src/x_print.c:284
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: src/rcstrings.c:12 src/x_image.c:503
+#. Create the dialog
+#: ../src/rcstrings.c:12 ../src/x_image.c:509
 #, fuzzy
 msgid "Write image..."
 msgstr "Exporter l'image..."
 
-#: src/rcstrings.c:13 src/x_menus.c:524
+#: ../src/rcstrings.c:13 ../src/x_menus.c:525
 #, fuzzy
 msgid "Recent files"
 msgstr "Nouveau fichier"
 
-#: src/rcstrings.c:14 src/x_script.c:50
+#: ../src/rcstrings.c:14 ../src/x_script.c:51
 msgid "Execute Script..."
 msgstr "Exécuter le script..."
 
-#: src/rcstrings.c:15
+#: ../src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Fermer la fenêtre"
 
-#: src/rcstrings.c:16
+#: ../src/rcstrings.c:16
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/rcstrings.c:18 src/i_callbacks.c:730
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:732
 msgid "Edit"
 msgstr "Ã?dition"
 
-#: src/rcstrings.c:19 src/x_window.c:511
+#: ../src/rcstrings.c:19 ../src/x_window.c:423
 msgid "Undo"
 msgstr "Défaire"
 
-#: src/rcstrings.c:20 src/x_window.c:518
+#: ../src/rcstrings.c:20 ../src/x_window.c:430
 msgid "Redo"
 msgstr "Refaire"
 
-#: src/rcstrings.c:21 src/i_basic.c:81 src/x_window.c:682
+#: ../src/rcstrings.c:21 ../src/i_basic.c:81 ../src/x_window.c:594
 msgid "Select Mode"
 msgstr "Mode Sélection"
 
-#: src/rcstrings.c:22
+#: ../src/rcstrings.c:22
 #, fuzzy
 msgid "Cut Buffer"
 msgstr "Tampon"
 
-#: src/rcstrings.c:23
+#: ../src/rcstrings.c:23
 #, fuzzy
 msgid "Copy Buffer"
 msgstr "Tampon"
 
-#: src/rcstrings.c:24
+#: ../src/rcstrings.c:24
 #, fuzzy
 msgid "Paste Buffer"
 msgstr "Tampon"
 
-#: src/rcstrings.c:25
+#: ../src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Ã?diter"
 
-#: src/rcstrings.c:26
+#: ../src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Ã?diter le texte..."
 
-#: src/rcstrings.c:27 src/i_basic.c:94
+#: ../src/rcstrings.c:27 ../src/i_basic.c:91
 msgid "Copy Mode"
 msgstr "Mode Copie"
 
-#: src/rcstrings.c:28 src/i_basic.c:149
+#: ../src/rcstrings.c:28 ../src/i_basic.c:146
 msgid "Multiple Copy Mode"
 msgstr "Mode Copie Multiple"
 
-#: src/rcstrings.c:29 src/i_basic.c:97
+#: ../src/rcstrings.c:29 ../src/i_basic.c:94
 msgid "Move Mode"
 msgstr "Mode Déplacement"
 
-#: src/rcstrings.c:30 src/i_callbacks.c:706 src/x_multiattrib.c:1258
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:708 ../src/x_multiattrib.c:1248
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/rcstrings.c:31
+#: ../src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Mode Rotation 90"
 
-#: src/rcstrings.c:32 src/i_basic.c:101
+#: ../src/rcstrings.c:32 ../src/i_basic.c:98
 msgid "Mirror Mode"
 msgstr "Mode Miroir"
 
-#: src/rcstrings.c:33
+#: ../src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Slot..."
 
-#: src/rcstrings.c:34
+#: ../src/rcstrings.c:34
 msgid "Color..."
 msgstr "Couleur..."
 
-#: src/rcstrings.c:35 src/i_callbacks.c:952
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:952
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: src/rcstrings.c:36 src/i_callbacks.c:970
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:970
 msgid "Unlock"
 msgstr "Déverrouiller"
 
-#: src/rcstrings.c:37
+#: ../src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Ã?paisseur & type de ligne..."
 
-#: src/rcstrings.c:38
+#: ../src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Type de remplissage..."
 
-#: src/rcstrings.c:39
+#: ../src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Translater le symbole..."
 
-#: src/rcstrings.c:40
+#: ../src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Embarquer le composant/l'image"
 
-#: src/rcstrings.c:41
+#: ../src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Débarquer le composant/l'image"
 
-#: src/rcstrings.c:42
+#: ../src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Mise à jour du composant"
 
-#: src/rcstrings.c:43
+#: ../src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Afficher/Cacher le texte invisible"
 
-#: src/rcstrings.c:44
+#: ../src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Rendre le texte invisible visible"
 
-#: src/rcstrings.c:46
+#: ../src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Tampon"
 
-#: src/rcstrings.c:47
+#: ../src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copier dans 1"
 
-#: src/rcstrings.c:48
+#: ../src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copier dans 2"
 
-#: src/rcstrings.c:49
+#: ../src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copier dans 3"
 
-#: src/rcstrings.c:50
+#: ../src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copier dans 4"
 
-#: src/rcstrings.c:51
+#: ../src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copier dans 5"
 
-#: src/rcstrings.c:52
+#: ../src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Couper dans 1"
 
-#: src/rcstrings.c:53
+#: ../src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Couper dans 2"
 
-#: src/rcstrings.c:54
+#: ../src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Couper dans 3"
 
-#: src/rcstrings.c:55
+#: ../src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Couper dans 4"
 
-#: src/rcstrings.c:56
+#: ../src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Couper dans 5"
 
-#: src/rcstrings.c:57
+#: ../src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Coller depuis 1"
 
-#: src/rcstrings.c:58
+#: ../src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Coller depuis 2"
 
-#: src/rcstrings.c:59
+#: ../src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Coller depuis 3"
 
-#: src/rcstrings.c:60
+#: ../src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Coller depuis 4"
 
-#: src/rcstrings.c:61
+#: ../src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Coller depuis 5"
 
-#: src/rcstrings.c:63
+#: ../src/rcstrings.c:63
 msgid "View"
 msgstr "Affichage"
 
-#: src/rcstrings.c:64
+#: ../src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Redessiner"
 
-#: src/rcstrings.c:65 src/i_callbacks.c:1537 src/i_callbacks.c:1606
+#. I don't know if this would get in the way
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1542 ../src/i_callbacks.c:1611
 msgid "Pan"
 msgstr "Panoramique"
 
-#: src/rcstrings.c:66 src/i_basic.c:105
+#: ../src/rcstrings.c:66 ../src/i_basic.c:102
 msgid "Zoom Box"
 msgstr "Zoom boîte"
 
-#: src/rcstrings.c:67
+#: ../src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Agrandissement auto"
 
-#: src/rcstrings.c:68
+#: ../src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Réduction"
 
-#: src/rcstrings.c:69
+#: ../src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Agrandissement"
 
-#: src/rcstrings.c:70
+#: ../src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Agrandissement minimum"
 
-#: src/rcstrings.c:72
+#: ../src/rcstrings.c:72
 msgid "Page"
 msgstr "Page"
 
-#: src/rcstrings.c:73
+#: ../src/rcstrings.c:73
 msgid "Manager..."
 msgstr "Gestionnaire..."
 
-#: src/rcstrings.c:74
+#: ../src/rcstrings.c:74
 msgid "Next"
 msgstr "Suivante"
 
-#: src/rcstrings.c:75
+#: ../src/rcstrings.c:75
 msgid "Previous"
 msgstr "Précédente"
 
-#: src/rcstrings.c:76 src/x_window.c:489
+#: ../src/rcstrings.c:76 ../src/x_window.c:401
 msgid "New"
 msgstr "Nouvelle"
 
-#: src/rcstrings.c:77
+#: ../src/rcstrings.c:77
 msgid "Revert"
 msgstr "Restaurer"
 
-#: src/rcstrings.c:78
+#: ../src/rcstrings.c:78
 msgid "Close"
 msgstr "Fermer"
 
-#: src/rcstrings.c:79
+#: ../src/rcstrings.c:79
 msgid "Discard"
 msgstr "Abandonner"
 
-#: src/rcstrings.c:81
+#: ../src/rcstrings.c:81
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/rcstrings.c:82
+#: ../src/rcstrings.c:82
 msgid "Component..."
 msgstr "Composant..."
 
-#: src/rcstrings.c:83 src/i_callbacks.c:2358 src/i_callbacks.c:2380
+#. need to click
+#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2340 ../src/i_callbacks.c:2362
 msgid "Net"
 msgstr "Piste"
 
-#: src/rcstrings.c:84 src/i_callbacks.c:2424 src/i_callbacks.c:2447
-#: src/x_window.c:547
+#. need to click
+#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2406 ../src/i_callbacks.c:2429
+#: ../src/x_window.c:459
 msgid "Bus"
 msgstr "Bus"
 
-#: src/rcstrings.c:85
+#: ../src/rcstrings.c:85
 msgid "Attribute..."
 msgstr "Attribut..."
 
-#: src/rcstrings.c:86
+#: ../src/rcstrings.c:86
 msgid "Text..."
 msgstr "Texte..."
 
-#: src/rcstrings.c:87 src/i_callbacks.c:2528 src/i_callbacks.c:2547
+#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2510 ../src/i_callbacks.c:2529
 msgid "Line"
 msgstr "Ligne"
 
-#: src/rcstrings.c:88 src/i_callbacks.c:2569 src/i_callbacks.c:2588
+#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2551 ../src/i_callbacks.c:2570
 msgid "Box"
 msgstr "Boîte"
 
-#: src/rcstrings.c:89 src/i_callbacks.c:2644 src/i_callbacks.c:2664
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2626 ../src/i_callbacks.c:2646
 msgid "Circle"
 msgstr "Cercle"
 
-#: src/rcstrings.c:90 src/i_callbacks.c:2686 src/i_callbacks.c:2705
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2668 ../src/i_callbacks.c:2687
 msgid "Arc"
 msgstr "Arc"
 
-#: src/rcstrings.c:91 src/i_callbacks.c:2727 src/i_callbacks.c:2746
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2709 ../src/i_callbacks.c:2728
 msgid "Pin"
 msgstr "Broche"
 
-#: src/rcstrings.c:92
+#: ../src/rcstrings.c:92
 msgid "Picture..."
 msgstr "Image..."
 
-#: src/rcstrings.c:94
+#: ../src/rcstrings.c:94
 msgid "Hierarchy"
 msgstr "Hiérarchie"
 
-#: src/rcstrings.c:95
+#: ../src/rcstrings.c:95
 msgid "Down Schematic"
 msgstr "Descendre dans la hiérarchie"
 
-#: src/rcstrings.c:96
+#: ../src/rcstrings.c:96
 msgid "Down Symbol"
 msgstr "Descendre dans le symbole"
 
-#: src/rcstrings.c:97
+#: ../src/rcstrings.c:97
 msgid "Up"
 msgstr "Remonter"
 
-#: src/rcstrings.c:98
+#: ../src/rcstrings.c:98
 msgid "Documentation"
 msgstr "Documentation"
 
-#: src/rcstrings.c:100 src/x_multiattrib.c:1549
+#. GtkFrame
+#: ../src/rcstrings.c:100 ../src/x_multiattrib.c:1539
 msgid "Attributes"
 msgstr "Attributs"
 
-#: src/rcstrings.c:101 src/i_callbacks.c:3011
+#: ../src/rcstrings.c:101 ../src/i_callbacks.c:2993
 msgid "Attach"
 msgstr "Attacher"
 
-#: src/rcstrings.c:102 src/i_callbacks.c:3060
+#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3042
 msgid "Detach"
 msgstr "Détacher"
 
-#: src/rcstrings.c:103
+#: ../src/rcstrings.c:103
 msgid "Show Value"
 msgstr "Montrer la valeur"
 
-#: src/rcstrings.c:104
+#: ../src/rcstrings.c:104
 msgid "Show Name"
 msgstr "Montrer le nom"
 
-#: src/rcstrings.c:105
+#: ../src/rcstrings.c:105
 msgid "Show Both"
 msgstr "Montrer le nom et la valeur"
 
-#: src/rcstrings.c:106
+#: ../src/rcstrings.c:106
 msgid "Toggle Visibility"
 msgstr "Afficher/Cacher"
 
-#: src/rcstrings.c:107
+#: ../src/rcstrings.c:107
 msgid "Find Specific Text..."
 msgstr "Rechercher le texte..."
 
-#: src/rcstrings.c:108
+#: ../src/rcstrings.c:108
 msgid "Hide Specific Text..."
 msgstr "Cacher le texte..."
 
-#: src/rcstrings.c:109
+#: ../src/rcstrings.c:109
 msgid "Show Specific Text..."
 msgstr "Montrer le texte..."
 
-#: src/rcstrings.c:110
+#: ../src/rcstrings.c:110
 msgid "Autonumber Text..."
 msgstr "Annotation automatique..."
 
-#: src/rcstrings.c:112
+#: ../src/rcstrings.c:112
 msgid "Options"
 msgstr "Options"
 
-#: src/rcstrings.c:113
+#: ../src/rcstrings.c:113
 msgid "Text Size..."
 msgstr "Taille de texte..."
 
-#: src/rcstrings.c:114
+#: ../src/rcstrings.c:114
 msgid "Toggle Grid On/Off"
 msgstr "Afficher/Cacher la grille"
 
-#: src/rcstrings.c:115
+#: ../src/rcstrings.c:115
 msgid "Toggle Snap On/Off"
 msgstr "Activer/Désactiver le snap"
 
-#: src/rcstrings.c:116
+#: ../src/rcstrings.c:116
 msgid "Snap Grid Spacing..."
 msgstr "Espacement de la grille de snap..."
 
-#: src/rcstrings.c:117
+#: ../src/rcstrings.c:117
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Espacement de la grille de snap..."
 
-#: src/rcstrings.c:118
+#: ../src/rcstrings.c:118
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Espacement de la grille de snap..."
 
-#: src/rcstrings.c:119
+#: ../src/rcstrings.c:119
 msgid "Toggle Outline/Box"
 msgstr ""
 
-#: src/rcstrings.c:120
+#: ../src/rcstrings.c:120
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: src/rcstrings.c:121
+#: ../src/rcstrings.c:121
 msgid "Show Log Window..."
 msgstr "Montrer la fenêtre de messages..."
 
-#: src/rcstrings.c:122
+#: ../src/rcstrings.c:122
 msgid "Show Coord Window..."
 msgstr "Montrer la fenêtre de coordonnées..."
 
-#: src/rcstrings.c:124
+#: ../src/rcstrings.c:124
 msgid "Help"
 msgstr "Aide"
 
-#: src/rcstrings.c:125
+#: ../src/rcstrings.c:125
 #, fuzzy
 msgid "Manual"
 msgstr "Manuel..."
 
-#: src/rcstrings.c:126
+#: ../src/rcstrings.c:126
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "Documentation"
 
-#: src/rcstrings.c:127
+#: ../src/rcstrings.c:127
 msgid "gschem FAQ"
 msgstr ""
 
-#: src/rcstrings.c:128
+#: ../src/rcstrings.c:128
 #, fuzzy
 msgid "Component Documentation"
 msgstr "Documentation"
 
-#: src/rcstrings.c:129
+#: ../src/rcstrings.c:129
 msgid "About gschem"
 msgstr ""
 
-#: src/rcstrings.c:130 src/x_dialog.c:2517
+#: ../src/rcstrings.c:130 ../src/x_dialog.c:2517
 msgid "Hotkeys"
 msgstr "Raccourcis"
 
-#: src/a_zoom.c:245
+#: ../src/a_zoom.c:250
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Agrandissement maximum ! Impossible d'agrandir plus.\n"
 
-#: src/g_funcs.c:342 src/i_callbacks.c:137
+#. Fork failed. Still in parent process, so can use the log
+#. * window
+#: ../src/g_funcs.c:343 ../src/i_callbacks.c:138
 #, c-format
 msgid "Could not fork\n"
 msgstr "Impossible de créer un processus fils\n"
 
-#: src/g_funcs.c:358 src/i_callbacks.c:147
+#. if we return, then nothing happened
+#: ../src/g_funcs.c:359 ../src/i_callbacks.c:148
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Impossible de lancer %s\n"
 
-#: src/g_funcs.c:364 src/i_callbacks.c:151
+#: ../src/g_funcs.c:365 ../src/i_callbacks.c:152
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Commandes de documentation non supportées sous MinGW.\n"
 
-#: src/g_hook.c:88
+#: ../src/g_hook.c:87
 #, c-format
 msgid "Attribute failed ot find.\n"
 msgstr "Impossible de trouver l'attribut.\n"
 
-#: src/g_rc.c:159
+#: ../src/g_rc.c:160
 #, c-format
 msgid "Invalid color [%s] passed to %s\n"
 msgstr "Couleur [%s] passée à %s invalide\n"
 
-#: src/g_rc.c:433
+#: ../src/g_rc.c:434
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Agrandissement [%d] passé à %s invalide\n"
 
-#: src/g_rc.c:524
+#: ../src/g_rc.c:525
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Taille [%d] passée à text-size invalide\n"
 
-#: src/g_rc.c:551
+#: ../src/g_rc.c:552
 #, 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:594
+#: ../src/g_rc.c:595
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Taille [%d] passée à snap-size invalide\n"
 
-#: src/g_rc.c:1049
+#: ../src/g_rc.c:1050
 #, 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:1289
+#: ../src/g_rc.c:1290
 #, 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:1364
+#: ../src/g_rc.c:1365
 #, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
 msgstr "Taille de point [%d] passée à grid-dot-size invalide\n"
 
-#: src/g_rc.c:1405
+#: ../src/g_rc.c:1406
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
 msgstr ""
 "Seuil d'affichage de grille [%d] passé à grid-fixed-threshold invalide\n"
 
-#: src/g_rc.c:1449
+#: ../src/g_rc.c:1450
 #, 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:1473
+#: ../src/g_rc.c:1474
 #, 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:1514
+#: ../src/g_rc.c:1515
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Gain [%d] passé à mousepan-gain invalide\n"
 
-#: src/g_rc.c:1537
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Gain [%d] passé à keyboardpan-gain invalide\n"
 
-#: src/g_rc.c:1583
+#: ../src/g_rc.c:1584
 #, 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/gschem.c:192 src/gschem.c:203
+#: ../src/gschem.c:193 ../src/gschem.c:204
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem version %s%s.%s\n"
 
-#: src/gschem.c:195 src/gschem.c:206
+#: ../src/gschem.c:196 ../src/gschem.c:207
 #, 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:197 src/gschem.c:208
+#: ../src/gschem.c:198 ../src/gschem.c:209
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -622,7 +631,7 @@ msgstr ""
 "Ceci est un logiciel libre et vous êtes invité à le redistribuer en "
 "respectant\n"
 
-#: src/gschem.c:199 src/gschem.c:210
+#: ../src/gschem.c:200 ../src/gschem.c:211
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -632,211 +641,209 @@ msgstr ""
 "COPYING.\n"
 "\n"
 
-#: src/gschem.c:214
+#: ../src/gschem.c:215
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Ceci est le portage sous MINGW32\n"
 
-#: src/gschem.c:218
+#: ../src/gschem.c:219
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Locale en cours : %s\n"
 
-#: src/gschem.c:231
+#: ../src/gschem.c:232
 #, c-format
 msgid "You must set the GEDADATA environment variable!\n"
 msgstr "Vous devez positionner la variable d'environnement GEDADATA !\n"
 
-#: src/gschem.c:246
+#: ../src/gschem.c:248
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lecture du fichier scm de démarrage [%s]\n"
 
-#: src/gschem.c:250 src/gschem.c:253
+#. ! \todo These two messages are the same. Should be
+#. * integrated.
+#: ../src/gschem.c:252 ../src/gschem.c:255
 #, 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:323
+#: ../src/gschem.c:323
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Répertoire Scheme NON initialisé !\n"
 
-#: src/gschem.c:330 src/x_script.c:71
+#: ../src/gschem.c:330 ../src/x_script.c:72
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Exécution du script guile [%s]\n"
 
-#: src/i_basic.c:84
-msgid "Attribute Mode"
-msgstr "Mode Attribut"
-
-#: src/i_basic.c:87
+#: ../src/i_basic.c:84
 msgid "Component Mode"
 msgstr "Mode Composant"
 
-#: src/i_basic.c:91
+#: ../src/i_basic.c:88
 msgid "Text Mode"
 msgstr "Mode Texte"
 
-#: src/i_basic.c:99
+#: ../src/i_basic.c:96
 msgid "Rotate Mode"
 msgstr "Mode Rotation"
 
-#: src/i_basic.c:109
+#: ../src/i_basic.c:106
 msgid "Pan Mode"
 msgstr "Mode Panoramique"
 
-#: src/i_basic.c:113
+#: ../src/i_basic.c:110
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Mode Coller %d"
 
-#: src/i_basic.c:118
+#: ../src/i_basic.c:115
 msgid "Net Mode"
 msgstr "Mode Lien"
 
-#: src/i_basic.c:122
+#: ../src/i_basic.c:119
 msgid "Bus Mode"
 msgstr "Mode Bus"
 
-#: src/i_basic.c:125
+#: ../src/i_basic.c:122
 msgid "Line Mode"
 msgstr "Mode Ligne"
 
-#: src/i_basic.c:128
+#: ../src/i_basic.c:125
 msgid "Box Mode"
 msgstr "Mode Boîte"
 
-#: src/i_basic.c:131
+#: ../src/i_basic.c:128
 msgid "Picture Mode"
 msgstr "Mode Image"
 
-#: src/i_basic.c:134
+#: ../src/i_basic.c:131
 msgid "Circle Mode"
 msgstr "Mode Cercle"
 
-#: src/i_basic.c:137
+#: ../src/i_basic.c:134
 msgid "Arc Mode"
 msgstr "Mode Arc"
 
-#: src/i_basic.c:140
+#: ../src/i_basic.c:137
 msgid "Pin Mode"
 msgstr "Mode Broche"
 
-#: src/i_basic.c:142 src/i_callbacks.c:587 src/i_callbacks.c:606
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:589 ../src/i_callbacks.c:608
 msgid "Copy"
 msgstr "Copier"
 
-#: src/i_basic.c:144 src/i_callbacks.c:667 src/i_callbacks.c:686
+#: ../src/i_basic.c:141 ../src/i_callbacks.c:669 ../src/i_callbacks.c:688
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/i_basic.c:146 src/i_callbacks.c:627 src/i_callbacks.c:646
+#: ../src/i_basic.c:143 ../src/i_callbacks.c:629 ../src/i_callbacks.c:648
 msgid "Multiple Copy"
 msgstr "Copie Multiple"
 
-#: src/i_basic.c:174
+#: ../src/i_basic.c:172
 msgid "Show Hidden"
 msgstr "Montrer caché"
 
-#: src/i_basic.c:177
+#: ../src/i_basic.c:175
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: src/i_basic.c:259 src/x_window.c:656
+#: ../src/i_basic.c:256 ../src/x_window.c:568
 msgid "Action"
 msgstr "Action"
 
-#: src/i_basic.c:267 src/x_window.c:651
+#: ../src/i_basic.c:262 ../src/x_window.c:563
 msgid "Stroke"
 msgstr ""
 
-#: src/i_basic.c:274 src/x_window.c:653
+#: ../src/i_basic.c:268 ../src/x_window.c:565
 msgid "none"
 msgstr "aucun"
 
-#: src/i_basic.c:281
+#: ../src/i_basic.c:273
 msgid "Repeat/"
 msgstr "Répéter"
 
-#: src/i_basic.c:570 src/i_basic.c:575
+#: ../src/i_basic.c:538 ../src/i_basic.c:543
 msgid "OFF"
 msgstr ""
 
-#: src/i_basic.c:579
+#: ../src/i_basic.c:547
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Grille(%s,%s)"
 
-#: src/i_callbacks.c:132
+#: ../src/i_callbacks.c:133
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentation pour [%s,%s,%s,%s]\n"
 
-#: src/i_callbacks.c:192 src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:193 ../src/i_callbacks.c:1754
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nouvelle page [%s] créée\n"
 
-#: src/i_callbacks.c:227 src/x_menus.c:493
+#: ../src/i_callbacks.c:229 ../src/x_menus.c:494
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nouvelle fenêtre créée\n"
 
-#: src/i_callbacks.c:345
+#: ../src/i_callbacks.c:347
 msgid "Failed to Save All"
 msgstr "Ã?chec de la sauvegarde de toutes les pages"
 
-#: src/i_callbacks.c:347
+#: ../src/i_callbacks.c:349
 msgid "Saved All"
 msgstr "Toutes les pages enregistrées"
 
-#: src/i_callbacks.c:439
+#: ../src/i_callbacks.c:441
 msgid "Closing Window\n"
 msgstr "Fermeture de la fenêtre\n"
 
-#: src/i_callbacks.c:591 src/i_callbacks.c:631 src/i_callbacks.c:671
+#: ../src/i_callbacks.c:593 ../src/i_callbacks.c:633 ../src/i_callbacks.c:673
 msgid "Select objs first"
 msgstr "Sélectionnez d'abord des objets"
 
-#: src/i_callbacks.c:746
+#: ../src/i_callbacks.c:748
 msgid "Edit Text"
 msgstr "Ã?diter le texte"
 
-#: src/i_callbacks.c:769
+#: ../src/i_callbacks.c:771
 msgid "Slot"
 msgstr "Slot"
 
-#: src/i_callbacks.c:786
+#: ../src/i_callbacks.c:788
 msgid "Color"
 msgstr "Couleur"
 
-#: src/i_callbacks.c:828 src/i_callbacks.c:875
+#: ../src/i_callbacks.c:830 ../src/i_callbacks.c:877
 msgid "Rotate"
 msgstr "Pivoter"
 
-#: src/i_callbacks.c:902 src/i_callbacks.c:924
+#: ../src/i_callbacks.c:904 ../src/i_callbacks.c:926
 msgid "Mirror"
 msgstr "Miroir"
 
-#: src/i_callbacks.c:988 src/x_dialog.c:1604
+#: ../src/i_callbacks.c:988 ../src/x_dialog.c:1611
 msgid "Translate"
 msgstr "Translater"
 
-#: src/i_callbacks.c:991
+#: ../src/i_callbacks.c:991
 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:992
+#: ../src/i_callbacks.c:992
 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:999
+#: ../src/i_callbacks.c:999
 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:1001
+#: ../src/i_callbacks.c:1001
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -844,438 +851,417 @@ 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:1022
+#: ../src/i_callbacks.c:1022
 msgid "Embed"
 msgstr "Embarquer"
 
-#: src/i_callbacks.c:1060
+#: ../src/i_callbacks.c:1063
 msgid "Unembed"
 msgstr "Débarquer"
 
-#: src/i_callbacks.c:1100
+#: ../src/i_callbacks.c:1106
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: src/i_callbacks.c:1157
+#: ../src/i_callbacks.c:1163
 msgid "ShowHidden"
 msgstr "AfficheCaché"
 
-#: src/i_callbacks.c:1180
+#: ../src/i_callbacks.c:1186
 msgid "MakeVisible"
 msgstr "RendVisible"
 
-#: src/i_callbacks.c:1296
+#: ../src/i_callbacks.c:1302
 msgid "Edit Line Type"
 msgstr "Ã?diter le type de ligne"
 
-#: src/i_callbacks.c:1337 src/x_dialog.c:1261
+#: ../src/i_callbacks.c:1343 ../src/x_dialog.c:1268
 msgid "Edit Fill Type"
 msgstr "Ã?diter le type de remplissage"
 
-#: src/i_callbacks.c:1643
+#: ../src/i_callbacks.c:1648
 msgid "Update Cues"
 msgstr "Met à jour les extrémités"
 
-#: src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1798
 msgid "Really revert page?"
 msgstr "Abandonner les modifications ?"
 
-#: src/i_callbacks.c:1856
+#: ../src/i_callbacks.c:1872
 msgid "Copy 1"
 msgstr "Copier 1"
 
-#: src/i_callbacks.c:1875
+#: ../src/i_callbacks.c:1891
 msgid "Copy 2"
 msgstr "Copier 2"
 
-#: src/i_callbacks.c:1894
+#: ../src/i_callbacks.c:1910
 msgid "Copy 3"
 msgstr "Copier 3"
 
-#: src/i_callbacks.c:1913
+#: ../src/i_callbacks.c:1929
 msgid "Copy 4"
 msgstr "Copier 4"
 
-#: src/i_callbacks.c:1932
+#: ../src/i_callbacks.c:1948
 msgid "Copy 5"
 msgstr "Copier 5"
 
-#: src/i_callbacks.c:1951
+#: ../src/i_callbacks.c:1967
 msgid "Cut 1"
 msgstr "Couper 1"
 
-#: src/i_callbacks.c:1970
+#: ../src/i_callbacks.c:1986
 msgid "Cut 2"
 msgstr "Couper 2"
 
-#: src/i_callbacks.c:1989
+#: ../src/i_callbacks.c:2005
 msgid "Cut 3"
 msgstr "Couper 3"
 
-#: src/i_callbacks.c:2008
+#: ../src/i_callbacks.c:2024
 msgid "Cut 4"
 msgstr "Couper 4"
 
-#: src/i_callbacks.c:2027
+#: ../src/i_callbacks.c:2043
 msgid "Cut 5"
 msgstr "Couper 5"
 
-#: src/i_callbacks.c:2043
+#: ../src/i_callbacks.c:2059
 msgid "Paste 1"
 msgstr "Coller 1"
 
-#: src/i_callbacks.c:2052 src/i_callbacks.c:2076 src/i_callbacks.c:2100
-#: src/i_callbacks.c:2124 src/i_callbacks.c:2148
+#: ../src/i_callbacks.c:2066 ../src/i_callbacks.c:2088
+#: ../src/i_callbacks.c:2110 ../src/i_callbacks.c:2132
+#: ../src/i_callbacks.c:2154
 msgid "Empty buffer"
 msgstr "Tampon vide"
 
-#: src/i_callbacks.c:2067
+#: ../src/i_callbacks.c:2081
 msgid "Paste 2"
 msgstr "Coller 2"
 
-#: src/i_callbacks.c:2091
+#: ../src/i_callbacks.c:2103
 msgid "Paste 3"
 msgstr "Coller 3"
 
-#: src/i_callbacks.c:2115
+#: ../src/i_callbacks.c:2125
 msgid "Paste 4"
 msgstr "Coller 4"
 
-#: src/i_callbacks.c:2139
+#: ../src/i_callbacks.c:2147
 msgid "Paste 5"
 msgstr "Coller 5"
 
-#: src/i_callbacks.c:2282 src/x_window.c:527
+#: ../src/i_callbacks.c:2264 ../src/x_window.c:439
 msgid "Component"
 msgstr "Composant"
 
-#: src/i_callbacks.c:2318 src/i_callbacks.c:2337
+#: ../src/i_callbacks.c:2300 ../src/i_callbacks.c:2319
 msgid "Attribute"
 msgstr "Attribut"
 
-#: src/i_callbacks.c:2804
+#: ../src/i_callbacks.c:2786
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Recherche de source [%s]\n"
 
-#: src/i_callbacks.c:2828 src/i_callbacks.c:2829
+#: ../src/i_callbacks.c:2810 ../src/i_callbacks.c:2811
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Impossible de trouver source [%s]\n"
 
-#: src/i_callbacks.c:2896
+#: ../src/i_callbacks.c:2878
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Recherche du symbole [%s]\n"
 
-#: src/i_callbacks.c:2983
+#: ../src/i_callbacks.c:2965
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: src/i_callbacks.c:3100
+#: ../src/i_callbacks.c:3082
 msgid "ShowN"
 msgstr "MontrerN"
 
-#: src/i_callbacks.c:3130
+#: ../src/i_callbacks.c:3112
 msgid "ShowV"
 msgstr "MontrerV"
 
-#: src/i_callbacks.c:3160
+#: ../src/i_callbacks.c:3142
 msgid "ShowB"
 msgstr "MontrerNV"
 
-#: src/i_callbacks.c:3191
+#: ../src/i_callbacks.c:3173
 msgid "VisToggle"
 msgstr ""
 
-#: src/i_callbacks.c:3212
+#: ../src/i_callbacks.c:3194
 #, 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:3300
+#: ../src/i_callbacks.c:3282
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Mode de retour utilisateur positionné à OUTLINE\n"
 
-#: src/i_callbacks.c:3303
+#: ../src/i_callbacks.c:3285
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Mode de retour utilisateur positionné à BOUNDINGBOX\n"
 
-#: src/i_callbacks.c:3320
+#: ../src/i_callbacks.c:3302
 msgid "Grid OFF\n"
 msgstr "Grille OFF\n"
 
-#: src/i_callbacks.c:3323
+#: ../src/i_callbacks.c:3305
 msgid "Grid ON\n"
 msgstr "Grille ON\n"
 
-#: src/i_callbacks.c:3340
+#: ../src/i_callbacks.c:3322
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (ATTENTION)\n"
 
-#: src/i_callbacks.c:3343
+#: ../src/i_callbacks.c:3325
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: src/i_callbacks.c:3363
+#: ../src/i_callbacks.c:3345
 msgid "Rubber band OFF \n"
 msgstr ""
 
-#: src/i_callbacks.c:3366
+#: ../src/i_callbacks.c:3348
 msgid "Rubber band ON\n"
 msgstr ""
 
-#: src/o_arc.c:137
+#: ../src/o_arc.c:139
 #, c-format
 msgid "Unknown end for arc (%d)\n"
 msgstr "Extrémité d'arc inconnue (%d)\n"
 
-#: src/o_arc.c:178
+#: ../src/o_arc.c:180
 #, c-format
 msgid "Unknown type for arc !\n"
 msgstr "Type pour arc inconnu !\n"
 
-#: src/o_attrib.c:105
+#: ../src/o_attrib.c:109
 #, c-format
 msgid "Got NULL in o_attrib_toggle_visibility\n"
 msgstr "object==NULL dans o_attrib_toggle_visibility()\n"
 
-#: src/o_attrib.c:170
+#: ../src/o_attrib.c:175
 #, c-format
 msgid "Got NULL in o_attrib_toggle_show_name_value\n"
 msgstr "object==NULL dans o_attrib_toggle_show_name_value()\n"
 
-#: src/o_attrib.c:221
-#, c-format
-msgid "ERROR! you can't get an attribute without an ='s\n"
-msgstr "ERREUR : un attribut doit comporter un caractère '='\n"
-
-#: src/o_box.c:141
+#: ../src/o_box.c:143
 #, c-format
 msgid "Unknown end for box (%d)\n"
 msgstr "Type d'extrémité de boîte inconnue (%d)\n"
 
-#: src/o_box.c:181
+#: ../src/o_box.c:183
 #, c-format
 msgid "Unknown type for box !\n"
 msgstr "Type de ligne inconnu pour boîte !\n"
 
-#: src/o_box.c:271
+#: ../src/o_box.c:267
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Type de remplissage de boîte inconnu !\n"
 
-#: src/o_buffer.c:42
+#: ../src/o_buffer.c:44
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_copy]\n"
 msgstr "Valeur de buffer_number incorrecte [o_buffer_copy]\n"
 
-#: src/o_buffer.c:80
+#: ../src/o_buffer.c:73
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_cut]\n"
 msgstr "Valeur de buffer_number incorrecte [o_buffer_cut]\n"
 
-#: src/o_buffer.c:121
+#: ../src/o_buffer.c:105
 #, 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_buffer.c:181
+#: ../src/o_buffer.c:164
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
 msgstr "Valeur de buffer_number incorrecte [o_buffer_paste_end]\n"
 
-#: src/o_bus.c:210
+#: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\n"
 msgstr "Valeur de whichone incorrecte dans o_bus_draw_xor_single\n"
 
-#: src/o_circle.c:136
+#: ../src/o_circle.c:138
 #, c-format
 msgid "Unknown end for circle\n"
 msgstr "Extrémité de cercle inconnue\n"
 
-#: src/o_circle.c:172
+#. just to be careful
+#: ../src/o_circle.c:174
 #, c-format
 msgid "Unknown type for circle!\n"
 msgstr "Type de ligne pour cercle inconnu !\n"
 
-#: src/o_circle.c:260
+#: ../src/o_circle.c:256
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Type de remplissage pour cercle inconnu !\n"
 
-#: src/o_complex.c:230
+#: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
 msgstr ""
 "Complex introuvable dans la liste de placement des nouveaux composants !\n"
 
-#: src/o_complex.c:582
-#, c-format
-msgid "Got NULL in o_complex_translate_display_selection\n"
-msgstr "o_current==NULL dans o_complex_translate_display_selection()\n"
-
-#: src/o_complex.c:650 src/o_complex.c:656
+#: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Translation du schéma [%d %d]\n"
 
-#: src/o_complex.c:694
-#, c-format
-msgid "Got NULL in o_complex_translate_selection!\n"
-msgstr "head==NULL dans o_complex_translate_selection()\n"
-
-#: src/o_copy.c:119 src/o_copy.c:382
+#: ../src/o_copy.c:122 ../src/o_copy.c:312
 #, c-format
 msgid "ERROR: NULL object in o_copy_end!\n"
 msgstr "ERREUR : object==NULL dans o_copy_end !\n"
 
-#: src/o_line.c:113
+#: ../src/o_line.c:115
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Extrémité de ligne inconnue (%d)\n"
 
-#: src/o_line.c:153
+#. just to be careful
+#: ../src/o_line.c:155
 #, c-format
 msgid "Unknown type for line (%d) !\n"
 msgstr "Type de ligne pour ligne inconnu (%d) !\n"
 
-#: src/o_misc.c:65
+#: ../src/o_misc.c:66
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "o_current==NULL dans o_edit()\n"
 
-#: src/o_misc.c:144
+#: ../src/o_misc.c:145
 #, fuzzy
 msgid "Object already locked\n"
 msgstr "Objet déjà verrouillé\n"
 
-#: src/o_misc.c:182
+#: ../src/o_misc.c:183
 #, fuzzy
 msgid "Object already unlocked\n"
 msgstr "Objet déjà déverrouillé\n"
 
-#: src/o_misc.c:229 src/o_misc.c:472 src/o_misc.c:712
-#, c-format
-msgid "ERROR: NULL object in o_rotate_90!\n"
-msgstr "ERREUR : object==NULL dans o_rotate_90 !\n"
-
-#: src/o_misc.c:538
-#, c-format
-msgid "ERROR: NULL object in o_mirror!\n"
-msgstr "ERREUR : object==NULL dans o_mirror !\n"
-
-#: src/o_misc.c:812
+#: ../src/o_misc.c:525
 msgid "Hidden text is now visible\n"
 msgstr "Le texte normalement caché est maintenant visible\n"
 
-#: src/o_misc.c:814
+#: ../src/o_misc.c:527
 msgid "Hidden text is now invisible\n"
 msgstr "Le texte normalement caché est maintenant invisible\n"
 
-#: src/o_misc.c:1058
+#: ../src/o_misc.c:771
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: src/o_misc.c:1196
+#: ../src/o_misc.c:906
 #, 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:1240
+#: ../src/o_misc.c:951
 #, 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:1258
+#: ../src/o_misc.c:969
 #, 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:1263
+#: ../src/o_misc.c:974
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "�chec lors de la création de la copie de sauvegarde [%s]\n"
 
-#: src/o_move.c:224
+#: ../src/o_move.c:181
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERREUR : object==NULL dans o_move_end !\n"
 
-#: src/o_move.c:332
+#: ../src/o_move.c:282
 #, 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:353
+#: ../src/o_move.c:304
 #, 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:255
+#: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\n"
 msgstr "Valeur de whichone incorrecte dans o_net_draw_xor_single\n"
 
-#: src/o_net.c:812 src/o_net.c:849 src/o_net.c:920 src/o_net.c:956
+#. try to exit gracefully
+#: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
 #, 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:1029
+#: ../src/o_net.c:980
 #, 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_picture.c:206 src/o_picture.c:746
+#: ../src/o_picture.c:208 ../src/o_picture.c:720
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Ã?chec lors du chargement de l'image : %s"
 
-#: src/o_picture.c:220
+#: ../src/o_picture.c:222
 msgid "Picture"
 msgstr "Image"
 
-#: src/o_picture.c:658 src/x_attribedit.c:145
+#: ../src/o_picture.c:625 ../src/x_attribedit.c:148
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERREUR : object==NULL !\n"
 
-#: src/o_slot.c:128
+#: ../src/o_slot.c:130
 msgid "Slot attribute malformed\n"
 msgstr "Attribut slot mal formé\n"
 
-#: src/o_slot.c:146
+#: ../src/o_slot.c:148
 msgid "numslots attribute missing\n"
 msgstr "attribut numslots manquant\n"
 
-#: src/o_slot.c:148
+#: ../src/o_slot.c:150
 msgid "Slotting not allowed for this component\n"
 msgstr "Le slotting n'est pas supporté par ce composant\n"
 
-#: src/o_slot.c:164
+#: ../src/o_slot.c:166
 msgid "New slot number out of range\n"
 msgstr "Nouvelle valeur de slot hors plage\n"
 
-#: src/o_slot.c:237
+#: ../src/o_slot.c:239
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Tentative d'édition de slot sur un objet inexistant !\n"
 
-#: src/o_undo.c:317
+#: ../src/o_undo.c:318
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Opérations Défaire/Refaire désactivées dans fichier rc\n"
 
-#: src/parsecmd.c:50
+#: ../src/parsecmd.c:51
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1300,70 +1286,79 @@ msgstr ""
 "  -h            Aide, affichage de ce message\n"
 "\n"
 
-#: src/x_attribedit.c:130
+#: ../src/x_attribedit.c:133
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 "Option d'affichage invalide ; changement pour affichage du nom et de la "
 "valeur\n"
 
-#: src/x_attribedit.c:333
+#: ../src/x_attribedit.c:336
 msgid "Single Attribute Editor"
 msgstr "Ã?diteur d'attribut"
 
-#: src/x_attribedit.c:364
+#: ../src/x_attribedit.c:367
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Ã?diter un attribut</b>"
 
-#: src/x_attribedit.c:366
+#: ../src/x_attribedit.c:369
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Ajouter un attribut</b>"
 
-#: src/x_attribedit.c:382 src/x_multiattrib.c:1731
+#. Name selection
+#. GtkLabel
+#: ../src/x_attribedit.c:385 ../src/x_multiattrib.c:1721
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/x_attribedit.c:398 src/x_multiattrib.c:1750
+#. Value entry
+#. GtkLabel
+#: ../src/x_attribedit.c:401 ../src/x_multiattrib.c:1740
 msgid "Value:"
 msgstr "Valeur :"
 
-#: src/x_attribedit.c:414 src/x_multiattrib.c:1787
+#. Visibility
+#. GtkButton
+#: ../src/x_attribedit.c:417 ../src/x_multiattrib.c:1777
 msgid "Visible"
 msgstr "Visible"
 
-#: src/x_attribedit.c:434
+#: ../src/x_attribedit.c:437
 msgid "Show Value Only"
 msgstr "Montrer seulement la valeur"
 
-#: src/x_attribedit.c:436
+#: ../src/x_attribedit.c:439
 msgid "Show Name Only"
 msgstr "Montrer seulement le nom"
 
-#: src/x_attribedit.c:438 src/x_multiattrib.c:1226
+#: ../src/x_attribedit.c:441 ../src/x_multiattrib.c:1216
 msgid "Show Name & Value"
 msgstr "Montrer le nom et la valeur"
 
-#: src/x_attribedit.c:445
+#. gschem specific
+#: ../src/x_attribedit.c:448
 msgid "<b>Attach Options</b>"
 msgstr "<b>Options d'attache</b>"
 
-#: src/x_attribedit.c:460
+#: ../src/x_attribedit.c:463
 msgid "All"
 msgstr "Tous"
 
-#: src/x_attribedit.c:468 src/x_compselect.c:728 src/x_compselect.c:803
+#. GtkTreeViewColumn
+#: ../src/x_attribedit.c:471 ../src/x_compselect.c:735
+#: ../src/x_compselect.c:810
 msgid "Components"
 msgstr "Composants"
 
-#: src/x_attribedit.c:476 src/x_window.c:537
+#: ../src/x_attribedit.c:479 ../src/x_window.c:449
 msgid "Nets"
 msgstr "Pistes"
 
-#: src/x_attribedit.c:484
+#: ../src/x_attribedit.c:487
 msgid "Replace existing attributes"
 msgstr "Remplacer les attributs existants"
 
-#: src/x_autonumber.c:413
+#: ../src/x_autonumber.c:412
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1371,7 +1366,8 @@ msgstr ""
 "Les objets à slots sans attribut de slot sont susceptibles de créer des "
 "problèmes durant l'annotation automatique\n"
 
-#: src/x_autonumber.c:428
+#. duplicate slot in used_slots
+#: ../src/x_autonumber.c:427
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
@@ -1379,158 +1375,164 @@ msgstr ""
 "Les slots dupliqués sont susceptibles de créer des problèmes : [symbolname=%"
 "s, number=%d, slot=%d]\n"
 
-#: src/x_autonumber.c:697
+#: ../src/x_autonumber.c:692
 msgid "No searchstring given in autonumber text.\n"
 msgstr "Pas de motif de recherche fourni pour l'annotation automatique.\n"
 
-#: src/x_autonumber.c:748
+#: ../src/x_autonumber.c:743
 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:881
+#: ../src/x_autonumber.c:876
 msgid "Diagonal"
 msgstr "en diagonal"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Top to bottom"
 msgstr "de haut en bas"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Bottom to top"
 msgstr "de bas en haut"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Left to right"
 msgstr "de gauche à droite"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Right to left"
 msgstr "de droite à gauche"
 
-#: src/x_autonumber.c:884
+#: ../src/x_autonumber.c:879
 msgid "File order"
 msgstr "dans ordre des éléments du fichier"
 
-#: src/x_autonumber.c:1220
+#: ../src/x_autonumber.c:1215
 msgid "Autonumber text"
 msgstr "Annotation automatique"
 
-#: src/x_autonumber.c:1246
+#. scope section
+#: ../src/x_autonumber.c:1241
 msgid "<b>Scope</b>"
 msgstr "<b>Portée</b>"
 
-#: src/x_autonumber.c:1268
+#: ../src/x_autonumber.c:1263
 msgid "Search for:"
 msgstr "Motif de recherche :"
 
-#: src/x_autonumber.c:1282
+#: ../src/x_autonumber.c:1277
 msgid "Autonumber text in:"
 msgstr "Annoter automatiquement :"
 
-#: src/x_autonumber.c:1289
+#: ../src/x_autonumber.c:1284
 msgid "Skip numbers found in:"
 msgstr "Passer les nombres trouvés dans :"
 
-#: src/x_autonumber.c:1301 src/x_autonumber.c:1310
+#: ../src/x_autonumber.c:1296 ../src/x_autonumber.c:1305
 msgid "Selected objects"
 msgstr "les objets sélectionnés"
 
-#: src/x_autonumber.c:1302 src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1297 ../src/x_autonumber.c:1306
 msgid "Current page"
 msgstr "la page en cours"
 
-#: src/x_autonumber.c:1303 src/x_autonumber.c:1312
+#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
 msgid "Whole hierarchy"
 msgstr "la hiérarchie complète"
 
-#: src/x_autonumber.c:1314
+#: ../src/x_autonumber.c:1309
 msgid "Overwrite existing numbers"
 msgstr "Remplacer les annotations existantes"
 
-#: src/x_autonumber.c:1319
+#. Options section
+#: ../src/x_autonumber.c:1314
 msgid "<b>Options</b>"
 msgstr "<b>Options</b>"
 
-#: src/x_autonumber.c:1341
+#: ../src/x_autonumber.c:1336
 msgid "Starting number:"
 msgstr "Indice de départ :"
 
-#: src/x_autonumber.c:1348
+#: ../src/x_autonumber.c:1343
 msgid "Sort order:"
 msgstr "Ordre :"
 
-#: src/x_autonumber.c:1369
+#: ../src/x_autonumber.c:1364
 msgid "Remove numbers"
 msgstr "Supprimer les annotations"
 
-#: src/x_autonumber.c:1373
+#: ../src/x_autonumber.c:1368
 msgid "Automatic slotting"
 msgstr "Slotting automatique"
 
-#: src/x_color.c:60 src/x_color.c:97
+#: ../src/x_color.c:60 ../src/x_color.c:97
 #, c-format
 msgid "Could not find the color %s!\n"
 msgstr "Impossible de trouver la couleur %s !\n"
 
-#: src/x_color.c:63 src/x_color.c:100
+#: ../src/x_color.c:63 ../src/x_color.c:100
 #, c-format
 msgid "Defaulting color to white\n"
 msgstr "Repli sur la couleur par défaut, blanc\n"
 
-#: src/x_color.c:70 src/x_color.c:107
+#: ../src/x_color.c:70 ../src/x_color.c:107
 #, c-format
 msgid "Ack! Cannot allocate white!\n"
 msgstr "Hum ! allocation de 'white' impossible !\n"
 
-#: src/x_color.c:81 src/x_color.c:129 src/x_window.c:176 src/x_window.c:185
+#: ../src/x_color.c:81 ../src/x_color.c:129 ../src/x_window.c:86
+#: ../src/x_window.c:95
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Impossible d'allouer la couleur %s !\n"
 
-#: src/x_color.c:148 src/x_color.c:164
+#: ../src/x_color.c:148 ../src/x_color.c:164
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Tentative d'obtention d'une couleur invalide : %d\n"
 
-#: src/x_compselect.c:833
+#. GtkLabel
+#: ../src/x_compselect.c:840
 msgid "Filter:"
 msgstr "Filtre:"
 
-#: src/x_compselect.c:925
+#: ../src/x_compselect.c:932
 msgid "Default behavior - reference component"
 msgstr "Comportement par défaut - référencer le composant"
 
-#: src/x_compselect.c:928
+#: ../src/x_compselect.c:935
 msgid "Embed component in schematic"
 msgstr "Embarquer le composant dans le schéma"
 
-#: src/x_compselect.c:931
+#: ../src/x_compselect.c:938
 msgid "Include component as individual objects"
 msgstr "Ã?clater le composant en objets individuels"
 
-#: src/x_compselect.c:1077
+#: ../src/x_compselect.c:1094
 msgid "Select Component..."
 msgstr "Sélecteur de composant..."
 
-#: src/x_compselect.c:1103
+#: ../src/x_compselect.c:1120
 msgid "In Use"
 msgstr ""
 
-#: src/x_compselect.c:1107
+#: ../src/x_compselect.c:1124
 msgid "Libraries"
 msgstr "Bibliothèques"
 
-#: src/x_compselect.c:1116 src/x_fileselect.c:127
+#. GtkFrame
+#: ../src/x_compselect.c:1133 ../src/x_fileselect.c:128
 msgid "Preview"
 msgstr "Prévisualisation"
 
-#: src/x_dialog.c:184
+#. dialog not created yet
+#: ../src/x_dialog.c:191
 msgid "Text Entry..."
 msgstr "Ajout de texte..."
 
-#: src/x_dialog.c:217
+#: ../src/x_dialog.c:224
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1540,168 +1542,178 @@ 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:306
+#: ../src/x_dialog.c:313
+#, c-format
 msgid "Lower Left"
 msgstr "En bas à gauche"
 
-#: src/x_dialog.c:317
+#: ../src/x_dialog.c:324
+#, c-format
 msgid "Middle Left"
 msgstr "Au milieu à gauche"
 
-#: src/x_dialog.c:328
+#: ../src/x_dialog.c:335
+#, c-format
 msgid "Upper Left"
 msgstr "En haut à gauche"
 
-#: src/x_dialog.c:339
+#: ../src/x_dialog.c:346
+#, c-format
 msgid "Lower Middle"
 msgstr "En bas au milieu"
 
-#: src/x_dialog.c:350
+#: ../src/x_dialog.c:357
+#, c-format
 msgid "Middle Middle"
 msgstr "Au centre"
 
-#: src/x_dialog.c:361
+#: ../src/x_dialog.c:368
+#, c-format
 msgid "Upper Middle"
 msgstr "En haut au milieu"
 
-#: src/x_dialog.c:372
+#: ../src/x_dialog.c:379
+#, c-format
 msgid "Lower Right"
 msgstr "En bas à droite"
 
-#: src/x_dialog.c:383
+#: ../src/x_dialog.c:390
+#, c-format
 msgid "Middle Right"
 msgstr "Au milieu à droite"
 
-#: src/x_dialog.c:394
+#: ../src/x_dialog.c:401
+#, c-format
 msgid "Upper Right"
 msgstr "En haut à droite"
 
-#: src/x_dialog.c:509
+#: ../src/x_dialog.c:516
 msgid "Edit Text Properties"
 msgstr "Editer les propriétés du texte"
 
-#: src/x_dialog.c:545
+#: ../src/x_dialog.c:552
 msgid "<b>Text Content</b>"
 msgstr "<b>Texte</b>"
 
-#: src/x_dialog.c:577
+#: ../src/x_dialog.c:584
 msgid "<b>Text Properties</b>"
 msgstr "<b>Propriétés du texte</b>"
 
-#: src/x_dialog.c:592
+#: ../src/x_dialog.c:599
 msgid "Color:"
 msgstr "Couleur :"
 
-#: src/x_dialog.c:602
+#: ../src/x_dialog.c:609
 msgid "Size:"
 msgstr "Taille :"
 
-#: src/x_dialog.c:611
+#: ../src/x_dialog.c:618
 msgid "Alignment:"
 msgstr "Alignement du texte :"
 
-#: src/x_dialog.c:665
+#: ../src/x_dialog.c:672
 msgid "Solid"
 msgstr "Continu"
 
-#: src/x_dialog.c:666
+#: ../src/x_dialog.c:673
 msgid "Dotted"
 msgstr "Pointillés"
 
-#: src/x_dialog.c:667
+#: ../src/x_dialog.c:674
 msgid "Dashed"
 msgstr "Tirets"
 
-#: src/x_dialog.c:668
+#: ../src/x_dialog.c:675
 msgid "Center"
 msgstr "Centré"
 
-#: src/x_dialog.c:669
+#: ../src/x_dialog.c:676
 msgid "Phantom"
 msgstr "Fantôme"
 
-#: src/x_dialog.c:795 src/x_dialog.c:797 src/x_dialog.c:799 src/x_dialog.c:982
-#: src/x_dialog.c:983 src/x_dialog.c:984 src/x_dialog.c:992
-#: src/x_dialog.c:1175 src/x_dialog.c:1177 src/x_dialog.c:1179
-#: src/x_dialog.c:1181 src/x_dialog.c:1183 src/x_dialog.c:1388
-#: src/x_dialog.c:1389 src/x_dialog.c:1390 src/x_dialog.c:1391
-#: src/x_dialog.c:1392 src/x_dialog.c:1400
+#: ../src/x_dialog.c:802 ../src/x_dialog.c:804 ../src/x_dialog.c:806
+#: ../src/x_dialog.c:989 ../src/x_dialog.c:990 ../src/x_dialog.c:991
+#: ../src/x_dialog.c:999 ../src/x_dialog.c:1182 ../src/x_dialog.c:1184
+#: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
+#: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
+#: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
+#, c-format
 msgid "*unchanged*"
 msgstr "*inchangé*"
 
-#: src/x_dialog.c:874
+#: ../src/x_dialog.c:881
 msgid "Edit Line Width & Type"
 msgstr "Ã?paisseur et type de ligne"
 
-#: src/x_dialog.c:915
+#: ../src/x_dialog.c:922
 msgid "Width:"
 msgstr "Largeur :"
 
-#: src/x_dialog.c:919 src/x_print.c:314
+#: ../src/x_dialog.c:926 ../src/x_print.c:315
 msgid "Type:"
 msgstr "Type :"
 
-#: src/x_dialog.c:923
+#: ../src/x_dialog.c:930
 msgid "Dash Length:"
 msgstr "Longueur du tiret :"
 
-#: src/x_dialog.c:927
+#: ../src/x_dialog.c:934
 msgid "Dash Space:"
 msgstr "Espace entre tirets :"
 
-#: src/x_dialog.c:1032
+#: ../src/x_dialog.c:1039
 msgid "Hollow"
 msgstr "Vide"
 
-#: src/x_dialog.c:1033
+#: ../src/x_dialog.c:1040
 msgid "Filled"
 msgstr "Plein"
 
-#: src/x_dialog.c:1034
+#: ../src/x_dialog.c:1041
 msgid "Mesh"
 msgstr "Quadrillage"
 
-#: src/x_dialog.c:1035
+#: ../src/x_dialog.c:1042
 msgid "Hatch"
 msgstr "Rayures"
 
-#: src/x_dialog.c:1301
+#: ../src/x_dialog.c:1308
 msgid "Fill Type:"
 msgstr "Type de remplissage :"
 
-#: src/x_dialog.c:1305
+#: ../src/x_dialog.c:1312
 msgid "Line Width:"
 msgstr "Ã?paisseur :"
 
-#: src/x_dialog.c:1309
+#: ../src/x_dialog.c:1316
 msgid "Angle 1:"
 msgstr "Angle1 :"
 
-#: src/x_dialog.c:1313
+#: ../src/x_dialog.c:1320
 msgid "Pitch 1:"
 msgstr "Ã?cart1 :"
 
-#: src/x_dialog.c:1317
+#: ../src/x_dialog.c:1324
 msgid "Angle 2:"
 msgstr "Angle2 :"
 
-#: src/x_dialog.c:1321
+#: ../src/x_dialog.c:1328
 msgid "Pitch 2:"
 msgstr "Ã?cart2 :"
 
-#: src/x_dialog.c:1483
+#: ../src/x_dialog.c:1490
 msgid "Arc Params"
 msgstr "Paramètres d'arc"
 
-#: src/x_dialog.c:1525
+#: ../src/x_dialog.c:1532
 msgid "Start Angle:"
 msgstr "Angle de départ :"
 
-#: src/x_dialog.c:1535
+#: ../src/x_dialog.c:1542
 msgid "Degrees of Sweep:"
 msgstr "Balayage :"
 
-#: src/x_dialog.c:1636
+#: ../src/x_dialog.c:1643
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1709,44 +1721,44 @@ msgstr ""
 "Cible pour translation ?\n"
 "(0 pour translation à l'origine)"
 
-#: src/x_dialog.c:1704
+#: ../src/x_dialog.c:1711
 msgid "Text Size"
 msgstr "Taille de texte :"
 
-#: src/x_dialog.c:1736
+#: ../src/x_dialog.c:1743
 msgid "Enter new text size:"
 msgstr "Entrez la nouvelle taille de texte :"
 
-#: src/x_dialog.c:1811
+#: ../src/x_dialog.c:1818
 msgid "Snap Size"
 msgstr "Grille de snap"
 
-#: src/x_dialog.c:1843
+#: ../src/x_dialog.c:1850
 msgid "Enter new snap grid spacing:"
 msgstr "Entrez le nouvel espacement de la grille de snap :"
 
-#: src/x_dialog.c:1916
+#: ../src/x_dialog.c:1923
 msgid "Edit slot number"
 msgstr "Numéro de slot"
 
-#: src/x_dialog.c:1949
+#: ../src/x_dialog.c:1956
 msgid "Edit slot number:"
 msgstr "Numéro de slot :"
 
-#: src/x_dialog.c:2011
+#: ../src/x_dialog.c:2018
 msgid "About..."
 msgstr "Ã? propos..."
 
-#: src/x_dialog.c:2031
+#: ../src/x_dialog.c:2038
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA : GPL Electronic Design Automation</b>"
 
-#: src/x_dialog.c:2035
+#: ../src/x_dialog.c:2042
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem version %s%s.$s</b>"
 
-#: src/x_dialog.c:2043
+#: ../src/x_dialog.c:2050
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1759,85 +1771,86 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "Et bien d'autres (consultez le fichier AUTHORS)"
 
-#: src/x_dialog.c:2107
+#: ../src/x_dialog.c:2115
 msgid "Coords"
 msgstr "Coords"
 
-#: src/x_dialog.c:2128
+#: ../src/x_dialog.c:2136
 msgid "Screen"
 msgstr "Ã?cran"
 
-#: src/x_dialog.c:2137
+#: ../src/x_dialog.c:2145
 msgid "World"
 msgstr "Monde"
 
-#: src/x_dialog.c:2360
+#: ../src/x_dialog.c:2360
 #, 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:2423
+#: ../src/x_dialog.c:2423
 msgid "Color Edit"
 msgstr "Sélecteur de couleur"
 
-#: src/x_dialog.c:2456
+#: ../src/x_dialog.c:2456
 msgid "Object color:"
 msgstr "Couleur de l'objet :"
 
-#: src/x_dialog.c:2581
+#: ../src/x_dialog.c:2581
 #, fuzzy
 msgid "Function"
 msgstr "Action"
 
-#: src/x_dialog.c:2588
+#: ../src/x_dialog.c:2588
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "Action : raccourci(s)"
 
-#: src/x_dialog.c:2920
+#: ../src/x_dialog.c:2901
 msgid "Find Text"
 msgstr "Recherche de texte"
 
-#: src/x_dialog.c:2953
+#: ../src/x_dialog.c:2934
 msgid "Text to find:"
 msgstr "Texte à rechercher :"
 
-#: src/x_dialog.c:2963
+#: ../src/x_dialog.c:2944
 msgid "descend into hierarchy"
 msgstr "descendre dans la hiérarchie"
 
-#: src/x_dialog.c:3027
+#: ../src/x_dialog.c:3008
 msgid "Hide Text"
 msgstr "Cacher le texte"
 
-#: src/x_dialog.c:3060
+#: ../src/x_dialog.c:3041
 msgid "Hide text starting with:"
 msgstr "Cacher le texte commençant par :"
 
-#: src/x_dialog.c:3128
+#: ../src/x_dialog.c:3109
 msgid "Show Text"
 msgstr "Montrer le texte"
 
-#: src/x_dialog.c:3161
+#: ../src/x_dialog.c:3142
 msgid "Show text starting with:"
 msgstr "Montrer le texte commençant par :"
 
-#: src/x_dialog.c:3606 src/x_multiattrib.c:1607
+#. GtkTreeViewColumn
+#: ../src/x_dialog.c:3587 ../src/x_multiattrib.c:1597
 msgid "Name"
 msgstr "Nom"
 
-#: src/x_dialog.c:3628
+#: ../src/x_dialog.c:3609
 msgid "S_elect the schematics you want to save:"
 msgstr "_Sélectionnez les schémas que vous souhaitez enregistrer :"
 
-#: src/x_dialog.c:3722
+#: ../src/x_dialog.c:3703
 #, 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:3728
+#: ../src/x_dialog.c:3709
 #, fuzzy, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1845,17 +1858,18 @@ msgstr ""
 "Il y a %d schémas avec des modifications non enregistrées. Voulez-vous "
 "enregistrer les modifications avant de fermer ?"
 
-#: src/x_dialog.c:3757
+#. secondary label
+#: ../src/x_dialog.c:3738
 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:3777
+#: ../src/x_dialog.c:3758
 msgid "_Close without saving"
 msgstr "Fermer sans sa_uvegarder"
 
-#: src/x_dialog.c:4098
+#: ../src/x_dialog.c:4094
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1866,50 +1880,68 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: src/x_dialog.c:4100
+#: ../src/x_dialog.c:4096
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Ajouter un attribut"
 
-#: src/x_fileselect.c:47
+#: ../src/x_fileselect.c:48
 msgid "Schematics"
 msgstr "sch - Schémas"
 
-#: src/x_fileselect.c:52
+#: ../src/x_fileselect.c:53
 msgid "Symbols"
 msgstr "sym - Symboles"
 
-#: src/x_fileselect.c:57
+#: ../src/x_fileselect.c:58
 msgid "Schematics and symbols"
 msgstr "sym/sch - Schémas et symboles"
 
-#: src/x_fileselect.c:63
+#: ../src/x_fileselect.c:64
 msgid "All files"
 msgstr "* - Tous fichiers"
 
-#: src/x_fileselect.c:176
+#: ../src/x_fileselect.c:177
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: src/x_fileselect.c:237
+#: ../src/x_fileselect.c:238
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: src/x_image.c:180
+#: ../src/x_fileselect.c:286
+#, c-format
+msgid ""
+"The selected file `%s' already exists.\n"
+"\n"
+"Would you like to overwrite it?"
+msgstr ""
+
+#: ../src/x_fileselect.c:289
+#, fuzzy
+msgid "Overwrite file?"
+msgstr "Nouveau fichier"
+
+#: ../src/x_fileselect.c:291
+msgid "Save cancelled on user request\n"
+msgstr ""
+
+#. WK - catch EPS export case
+#: ../src/x_image.c:181
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: src/x_image.c:298
+#: ../src/x_image.c:304
 #, fuzzy, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel(): Impossible d'écrire le fichier PNG.\n"
 
-#: src/x_image.c:379
+#: ../src/x_image.c:385
 #, fuzzy, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel(): Impossible d'écrire le fichier PNG.\n"
 
-#: src/x_image.c:389
+#: ../src/x_image.c:395
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -1918,244 +1950,255 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: src/x_image.c:408
+#: ../src/x_image.c:414
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Image couleur exportée dans fichier [%s] [%d x %d]\n"
 
-#: src/x_image.c:410
+#: ../src/x_image.c:416
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Image noire et blanche exportée dans fichier [%s] [%d x %d]\n"
 
-#: src/x_image.c:420
+#: ../src/x_image.c:426
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 "x_image_lowlevel(): Impossible de récupérer le pixbuf depuis la fenêtre de "
 "gschem.\n"
 
-#: src/x_image.c:466
+#: ../src/x_image.c:472
 #, fuzzy
 msgid "Width x Height"
 msgstr "Largeur x Hauteur :"
 
-#: src/x_image.c:482
+#: ../src/x_image.c:488
 #, fuzzy
 msgid "Image type"
 msgstr "Image"
 
-#: src/x_log.c:236
+#: ../src/x_log.c:252
 msgid "Status"
 msgstr "Messages"
 
-#: src/x_menus.c:41
+#: ../src/x_menus.c:42
 msgid "/Add Net"
 msgstr "/Ajouter une piste"
 
-#: src/x_menus.c:42
+#: ../src/x_menus.c:43
 msgid "/Add Attribute..."
 msgstr "/Ajouter un attribut..."
 
-#: src/x_menus.c:43
+#: ../src/x_menus.c:44
 msgid "/Add Component..."
 msgstr "/Ajouter un composant..."
 
-#: src/x_menus.c:44
+#: ../src/x_menus.c:45
 msgid "/Add Bus"
 msgstr "/Ajouter un bus"
 
-#: src/x_menus.c:45
+#: ../src/x_menus.c:46
 msgid "/Add Text"
 msgstr "/Ajouter du texte"
 
-#: src/x_menus.c:47
+#: ../src/x_menus.c:48
 msgid "/Zoom In"
 msgstr "/Agrandir"
 
-#: src/x_menus.c:48
+#: ../src/x_menus.c:49
 msgid "/Zoom Out"
 msgstr "/Réduire"
 
-#: src/x_menus.c:49
+#: ../src/x_menus.c:50
 msgid "/Zoom Box"
 msgstr "/Zoom boîte"
 
-#: src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Zoom Extents"
 msgstr "/Agrandissement auto"
 
-#: src/x_menus.c:52
+#: ../src/x_menus.c:53
 msgid "/Select"
 msgstr "/Sélectionner"
 
-#: src/x_menus.c:53
+#: ../src/x_menus.c:54
 msgid "/Edit..."
 msgstr "/Ã?diter..."
 
-#: src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Copy"
 msgstr "/Copier"
 
-#: src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Move"
 msgstr "/Déplacer"
 
-#: src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Delete"
 msgstr "/Supprimer"
 
-#: src/x_menus.c:59
+#: ../src/x_menus.c:60
 msgid "/Down Schematic"
 msgstr "/Descendre dans le schéma"
 
-#: src/x_menus.c:60
+#: ../src/x_menus.c:61
 msgid "/Down Symbol"
 msgstr "/Descendre dans le symbole"
 
-#: src/x_menus.c:61
+#: ../src/x_menus.c:62
 msgid "/Up"
 msgstr "/Remonter"
 
-#: src/x_menus.c:332
-msgid "Tried to set the sensitivity on a non-existent menu item\n"
+#: ../src/x_menus.c:333
+#, 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:356
+#: ../src/x_menus.c:357
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory n'existe pas !\n"
 
-#: src/x_menus.c:369
+#: ../src/x_menus.c:370
 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"
 
-#: src/x_menus.c:482
+#. Remove this entry from all menus
+#: ../src/x_menus.c:482
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Impossible de lancer %s\n"
 
-#: src/x_menus.c:542
+#: ../src/x_menus.c:543
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/x_multiattrib.c:718
+#: ../src/x_multiattrib.c:708
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Les attributs sans nom sont interdits. Donnez un nom."
 
-#: src/x_multiattrib.c:1228
+#: ../src/x_multiattrib.c:1218
 msgid "Show Value only"
 msgstr "Montrer seulement la valeur"
 
-#: src/x_multiattrib.c:1230
+#: ../src/x_multiattrib.c:1220
 msgid "Show Name only"
 msgstr "Montrer seulement le nom"
 
-#: src/x_multiattrib.c:1257
+#: ../src/x_multiattrib.c:1247
 msgid "Duplicate"
 msgstr "Cloner"
 
-#: src/x_multiattrib.c:1534
+#: ../src/x_multiattrib.c:1524
 msgid "Edit Attributes"
 msgstr "Ã?diteur d'attributs"
 
-#: src/x_multiattrib.c:1632
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1622
 msgid "Value"
 msgstr "Valeur"
 
-#: src/x_multiattrib.c:1654
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1644
 msgid "Vis?"
 msgstr "Vis?"
 
-#: src/x_multiattrib.c:1674
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1664
 msgid "N"
 msgstr "N"
 
-#: src/x_multiattrib.c:1694
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1684
 msgid "V"
 msgstr "V"
 
-#: src/x_multiattrib.c:1715
+#: ../src/x_multiattrib.c:1705
 msgid "Add Attribute"
 msgstr "Ajouter un attribut"
 
-#: src/x_pagesel.c:263
+#: ../src/x_pagesel.c:264
 msgid "Discard Page"
 msgstr "Abandonner la page"
 
-#: src/x_pagesel.c:382
+#: ../src/x_pagesel.c:383
 msgid "Page Manager"
 msgstr "Gestionnaire de pages"
 
-#: src/x_pagesel.c:438
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:439
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: src/x_pagesel.c:454
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:455
 msgid "Changed"
 msgstr "Modifié"
 
-#: src/x_pagesel.c:474
+#. GtkLabel
+#: ../src/x_pagesel.c:475
 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_print.c:89
+#: ../src/x_print.c:90
 msgid "Select PostScript Filename..."
 msgstr "Enregistrer en PostScript sous..."
 
-#: src/x_print.c:171
+#: ../src/x_print.c:172
 msgid "Extents with margins"
 msgstr "Totalité avec marges"
 
-#: src/x_print.c:177
+#: ../src/x_print.c:178
 msgid "Extents no margins"
 msgstr "Totalité sans marge"
 
-#: src/x_print.c:183
+#: ../src/x_print.c:184
 msgid "Current Window"
 msgstr "Vue en cours"
 
-#: src/x_print.c:217
+#: ../src/x_print.c:218
 msgid "Landscape"
 msgstr "Paysage"
 
-#: src/x_print.c:223
+#: ../src/x_print.c:224
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/x_print.c:291
+#. Upper frame
+#: ../src/x_print.c:292
 msgid "Settings"
 msgstr "Configuration"
 
-#: src/x_print.c:303
+#: ../src/x_print.c:304
 msgid "Output paper size:"
 msgstr "Taille de papier :"
 
-#: src/x_print.c:325
+#: ../src/x_print.c:326
 msgid "Orientation:"
 msgstr "Orientation :"
 
-#: src/x_print.c:337
+#. Lower frame
+#: ../src/x_print.c:338
 msgid "Destination"
 msgstr "Destination"
 
-#: src/x_print.c:350
+#: ../src/x_print.c:351
 msgid "File:"
 msgstr "Fichier :"
 
-#: src/x_print.c:380
+#: ../src/x_print.c:381
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/x_print.c:750
+#: ../src/x_print.c:751
 msgid "No print destination specified\n"
 msgstr "Destination pour l'impression non spécifiée\n"
 
-#: src/x_print.c:757
+#: ../src/x_print.c:758
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Impossible d'imprimer le schéma en cours dans [%s]\n"
 
-#: src/x_print.c:766
+#: ../src/x_print.c:767
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2164,73 +2207,73 @@ msgstr ""
 "Erreur pendant l'impression du fichier '%s'\n"
 "Reportez-vous à la fenêtre des messages pour plus de détails"
 
-#: src/x_print.c:773
+#: ../src/x_print.c:774
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Schéma en cours imprimé dans fichier [%s]\n"
 
-#: src/x_window.c:176
+#: ../src/x_window.c:86
 msgid "black"
 msgstr "noir"
 
-#: src/x_window.c:185
+#: ../src/x_window.c:95
 msgid "white"
 msgstr "blanc"
 
-#: src/x_window.c:219
+#: ../src/x_window.c:129
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Allocation gc impossible\n"
 
-#: src/x_window.c:232
+#: ../src/x_window.c:142
 #, c-format
 msgid "Couldn't allocate xor_gc\n"
 msgstr "Allocation xor_gc impossible\n"
 
-#: src/x_window.c:245
+#: ../src/x_window.c:155
 #, c-format
 msgid "Couldn't allocate outline_xor_gc\n"
 msgstr "Allocation outline_xor_gc impossible\n"
 
-#: src/x_window.c:261
+#: ../src/x_window.c:171
 #, c-format
 msgid "Couldn't allocate bounding_xor_gc\n"
 msgstr "Allocation bounding_xor_gc impossible\n"
 
-#: src/x_window.c:268
+#: ../src/x_window.c:178
 #, c-format
 msgid "Couldn't allocate bus_gc\n"
 msgstr "Allocation bus_gc impossible\n"
 
-#: src/x_window.c:490
+#: ../src/x_window.c:402
 msgid "New file"
 msgstr "Nouveau fichier"
 
-#: src/x_window.c:496
+#: ../src/x_window.c:408
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/x_window.c:497
+#: ../src/x_window.c:409
 msgid "Open file..."
 msgstr "Ouvrir fichier..."
 
-#: src/x_window.c:503
+#: ../src/x_window.c:415
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/x_window.c:504
+#: ../src/x_window.c:416
 msgid "Save file"
 msgstr "Sauvegarder le fichier"
 
-#: src/x_window.c:512
+#: ../src/x_window.c:424
 msgid "Undo last operation"
 msgstr "Défaire la dernière opération"
 
-#: src/x_window.c:519
+#: ../src/x_window.c:431
 msgid "Redo last undo"
 msgstr "Refaire le dernier défait"
 
-#: src/x_window.c:528
+#: ../src/x_window.c:440
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2242,7 +2285,7 @@ msgstr ""
 "pointeur dans la fenêtre principale.\n"
 "Clic gauche pour placer, clic droit pour annuler."
 
-#: src/x_window.c:538
+#: ../src/x_window.c:450
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2250,7 +2293,7 @@ msgstr ""
 "Mode ajout de piste\n"
 "Clic droit pour annuler"
 
-#: src/x_window.c:548
+#: ../src/x_window.c:460
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2258,76 +2301,114 @@ msgstr ""
 "Mode ajout de bus\n"
 "Clic droit pour annuler"
 
-#: src/x_window.c:555
+#: ../src/x_window.c:467
 msgid "Text"
 msgstr "Texte"
 
-#: src/x_window.c:556
+#: ../src/x_window.c:468
 msgid "Add Text..."
 msgstr "Ajouter du texte..."
 
-#: src/x_window.c:566
+#: ../src/x_window.c:478
 msgid "Select"
 msgstr "Sélectionner"
 
-#: src/x_window.c:567
+#: ../src/x_window.c:479
 msgid "Select mode"
 msgstr "Mode sélection"
 
-#: src/x_window.c:642
+#: ../src/x_window.c:554
 msgid "Pick"
 msgstr "Prendre"
 
-#: src/x_window.c:658
+#: ../src/x_window.c:570
 msgid "Repeat/none"
 msgstr "Répéter/aucun"
 
-#: src/x_window.c:668
+#: ../src/x_window.c:580
 msgid "Menu/Cancel"
 msgstr "Menu/Annuler"
 
-#: src/x_window.c:670
+#: ../src/x_window.c:582
 msgid "Pan/Cancel"
 msgstr "Panoramique/Annuler"
 
-#: src/x_window.c:926
+#: ../src/x_window.c:809
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Chargement du schéma [%s]\n"
 
-#: src/x_window.c:1028
+#: ../src/x_window.c:821
+#, fuzzy
+msgid "Failed to load file"
+msgstr "Ã?chec lors du chargement de l'image : %s"
+
+#: ../src/x_window.c:830
+#, fuzzy, c-format
+msgid "New file [%s]\n"
+msgstr "Nouveau fichier"
+
+#. an error occured when saving page to file
+#: ../src/x_window.c:936
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Ã?chec sauvegarde de la page [%s]\n"
 
-#: src/x_window.c:1029
+#: ../src/x_window.c:937
 msgid "Error while trying to save"
 msgstr "Erreur lors de la tentative de sauvegarde"
 
-#: src/x_window.c:1038
+#: ../src/x_window.c:946
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Enregistré sous [%s]\n"
 
-#: src/x_window.c:1040
+#: ../src/x_window.c:948
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Sauvegarder [%s]\n"
 
-#: src/x_window.c:1042
+#: ../src/x_window.c:950
 msgid "Saved"
 msgstr "Sauvegarder"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Abandonne page [%s]\n"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Ferme [%s]\n"
 
+#: ../data/geda-gschem.desktop.in.h:1
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
+#: ../data/geda-gschem.desktop.in.h:2
+#, fuzzy
+msgid "gEDA Schematic Editor"
+msgstr "Descendre dans la hiérarchie"
+
+#~ msgid "Attribute Mode"
+#~ msgstr "Mode Attribut"
+
+#~ msgid "ERROR! you can't get an attribute without an ='s\n"
+#~ msgstr "ERREUR : un attribut doit comporter un caractère '='\n"
+
+#~ msgid "Got NULL in o_complex_translate_display_selection\n"
+#~ msgstr "o_current==NULL dans o_complex_translate_display_selection()\n"
+
+#~ msgid "Got NULL in o_complex_translate_selection!\n"
+#~ msgstr "head==NULL dans o_complex_translate_selection()\n"
+
+#~ msgid "ERROR: NULL object in o_rotate_90!\n"
+#~ msgstr "ERREUR : object==NULL dans o_rotate_90 !\n"
+
+#~ msgid "ERROR: NULL object in o_mirror!\n"
+#~ msgstr "ERREUR : object==NULL dans o_mirror !\n"
+
 #~ msgid "Invalid mode [%s] passed to %s\n"
 #~ msgstr "Mode [%s] passé à %s invalide\n"
 
diff --git a/gschem/po/it_IT.po b/gschem/po/it_IT.po
index 7f814e0..373cc9e 100644
--- a/gschem/po/it_IT.po
+++ b/gschem/po/it_IT.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it_IT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-02 21:10-0400\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-09-10 23:05+0200\n"
 "Last-Translator: Michele <michelinux@xxxxxxxx>\n"
 "Language-Team: Italiano <michelinux@xxxxxxxx>\n"
@@ -19,588 +19,599 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/rcstrings.c:2
+#: ../src/rcstrings.c:2
 msgid "File"
 msgstr "File"
 
-#: src/rcstrings.c:3
+#: ../src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nuova finestra"
 
-#: src/rcstrings.c:4 src/x_pagesel.c:258
+#: ../src/rcstrings.c:4 ../src/x_pagesel.c:259
 msgid "New Page"
 msgstr "Nuova pagina"
 
-#: src/rcstrings.c:5 src/x_pagesel.c:259
+#: ../src/rcstrings.c:5 ../src/x_pagesel.c:260
 msgid "Open Page..."
 msgstr "Apri pagina..."
 
-#: src/rcstrings.c:6 src/x_pagesel.c:262
+#: ../src/rcstrings.c:6 ../src/x_pagesel.c:263
 msgid "Close Page"
 msgstr "Chiudi pagina"
 
-#: src/rcstrings.c:7
+#: ../src/rcstrings.c:7
 msgid "Revert Page"
 msgstr ""
 
-#: src/rcstrings.c:8 src/x_pagesel.c:261
+#: ../src/rcstrings.c:8 ../src/x_pagesel.c:262
 msgid "Save Page"
 msgstr "Salva la pagina"
 
-#: src/rcstrings.c:9
+#: ../src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Salva pagina con nome..."
 
-#: src/rcstrings.c:10
+#: ../src/rcstrings.c:10
 msgid "Save All"
 msgstr "Salva tutto"
 
-#: src/rcstrings.c:11 src/x_print.c:283
+#. GtkWindow
+#: ../src/rcstrings.c:11 ../src/x_print.c:284
 msgid "Print..."
 msgstr "Stampa..."
 
-#: src/rcstrings.c:12 src/x_image.c:503
+#. Create the dialog
+#: ../src/rcstrings.c:12 ../src/x_image.c:509
 msgid "Write image..."
 msgstr "Scrivi immagine..."
 
-#: src/rcstrings.c:13 src/x_menus.c:524
+#: ../src/rcstrings.c:13 ../src/x_menus.c:525
 msgid "Recent files"
 msgstr "File recenti"
 
-#: src/rcstrings.c:14 src/x_script.c:50
+#: ../src/rcstrings.c:14 ../src/x_script.c:51
 msgid "Execute Script..."
 msgstr "Esegui Script..."
 
-#: src/rcstrings.c:15
+#: ../src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Chiudi finestra"
 
-#: src/rcstrings.c:16
+#: ../src/rcstrings.c:16
 msgid "Quit"
 msgstr "Esci"
 
-#: src/rcstrings.c:18 src/i_callbacks.c:730
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:732
 msgid "Edit"
 msgstr "Modifica"
 
-#: src/rcstrings.c:19 src/x_window.c:511
+#: ../src/rcstrings.c:19 ../src/x_window.c:423
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/rcstrings.c:20 src/x_window.c:518
+#: ../src/rcstrings.c:20 ../src/x_window.c:430
 msgid "Redo"
 msgstr "Ripristina"
 
-#: src/rcstrings.c:21 src/i_basic.c:81 src/x_window.c:682
+#: ../src/rcstrings.c:21 ../src/i_basic.c:81 ../src/x_window.c:594
 msgid "Select Mode"
 msgstr "Modalità selezione"
 
-#: src/rcstrings.c:22
+#: ../src/rcstrings.c:22
 msgid "Cut Buffer"
 msgstr "Svuota buffer"
 
-#: src/rcstrings.c:23
+#: ../src/rcstrings.c:23
 msgid "Copy Buffer"
 msgstr "Copia buffer"
 
-#: src/rcstrings.c:24
+#: ../src/rcstrings.c:24
 msgid "Paste Buffer"
 msgstr "Incolla buffer"
 
-#: src/rcstrings.c:25
+#: ../src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: src/rcstrings.c:26
+#: ../src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Modifica il testo..."
 
-#: src/rcstrings.c:27 src/i_basic.c:94
+#: ../src/rcstrings.c:27 ../src/i_basic.c:91
 msgid "Copy Mode"
 msgstr "Modalità copia"
 
-#: src/rcstrings.c:28 src/i_basic.c:149
+#: ../src/rcstrings.c:28 ../src/i_basic.c:146
 msgid "Multiple Copy Mode"
 msgstr "Modalità di copiatura multipla"
 
-#: src/rcstrings.c:29 src/i_basic.c:97
+#: ../src/rcstrings.c:29 ../src/i_basic.c:94
 msgid "Move Mode"
 msgstr "Modalità spostamento"
 
-#: src/rcstrings.c:30 src/i_callbacks.c:706 src/x_multiattrib.c:1258
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:708 ../src/x_multiattrib.c:1248
 msgid "Delete"
 msgstr "Cancella"
 
-#: src/rcstrings.c:31
+#: ../src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Ruota di 90 gradi"
 
-#: src/rcstrings.c:32 src/i_basic.c:101
+#: ../src/rcstrings.c:32 ../src/i_basic.c:98
 msgid "Mirror Mode"
 msgstr "Modalità specchio"
 
-#: src/rcstrings.c:33
+#: ../src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Slot..."
 
-#: src/rcstrings.c:34
+#: ../src/rcstrings.c:34
 msgid "Color..."
 msgstr "Colore..."
 
-#: src/rcstrings.c:35 src/i_callbacks.c:952
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:952
 msgid "Lock"
 msgstr "Blocca"
 
-#: src/rcstrings.c:36 src/i_callbacks.c:970
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:970
 msgid "Unlock"
 msgstr "Sblocca"
 
-#: src/rcstrings.c:37
+#: ../src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Tipo & Larghezza della linea..."
 
-#: src/rcstrings.c:38
+#: ../src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Riempimento..."
 
-#: src/rcstrings.c:39
+#: ../src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Converti simbolo..."
 
-#: src/rcstrings.c:40
+#: ../src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Componente/Immagine fissato/a"
 
-#: src/rcstrings.c:41
+#: ../src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Componente/immagine non fissato/a"
 
-#: src/rcstrings.c:42
+#: ../src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Aggiorna Componente"
 
-#: src/rcstrings.c:43
+#: ../src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Mostra/Nascondi Testo Invisibile"
 
-#: src/rcstrings.c:44
+#: ../src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Rendi Invisibile Testo Visibile"
 
-#: src/rcstrings.c:46
+#: ../src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Buffer"
 
-#: src/rcstrings.c:47
+#: ../src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copia in 1"
 
-#: src/rcstrings.c:48
+#: ../src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copia in 2"
 
-#: src/rcstrings.c:49
+#: ../src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copia in 3"
 
-#: src/rcstrings.c:50
+#: ../src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copia in 4"
 
-#: src/rcstrings.c:51
+#: ../src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copia in 5"
 
-#: src/rcstrings.c:52
+#: ../src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Taglia in 1"
 
-#: src/rcstrings.c:53
+#: ../src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Taglia in 2"
 
-#: src/rcstrings.c:54
+#: ../src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Taglia in 3"
 
-#: src/rcstrings.c:55
+#: ../src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Taglia in 4"
 
-#: src/rcstrings.c:56
+#: ../src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Taglia in 5"
 
-#: src/rcstrings.c:57
+#: ../src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Incolla da 1"
 
-#: src/rcstrings.c:58
+#: ../src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Incolla da 2"
 
-#: src/rcstrings.c:59
+#: ../src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Incolla da 3"
 
-#: src/rcstrings.c:60
+#: ../src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Incolla da 4"
 
-#: src/rcstrings.c:61
+#: ../src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Incolla da 5"
 
-#: src/rcstrings.c:63
+#: ../src/rcstrings.c:63
 msgid "View"
 msgstr "Vista"
 
-#: src/rcstrings.c:64
+#: ../src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Aggiorna"
 
-#: src/rcstrings.c:65 src/i_callbacks.c:1537 src/i_callbacks.c:1606
+#. I don't know if this would get in the way
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1542 ../src/i_callbacks.c:1611
 msgid "Pan"
 msgstr "Pan"
 
-#: src/rcstrings.c:66 src/i_basic.c:105
+#: ../src/rcstrings.c:66 ../src/i_basic.c:102
 msgid "Zoom Box"
 msgstr "Ingrandisci Riquadro"
 
-#: src/rcstrings.c:67
+#: ../src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Adatta alla pagina"
 
-#: src/rcstrings.c:68
+#: ../src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Ingrandisci"
 
-#: src/rcstrings.c:69
+#: ../src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Riduci"
 
-#: src/rcstrings.c:70
+#: ../src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Riduci al Massimo"
 
-#: src/rcstrings.c:72
+#: ../src/rcstrings.c:72
 msgid "Page"
 msgstr "Pagina"
 
-#: src/rcstrings.c:73
+#: ../src/rcstrings.c:73
 msgid "Manager..."
 msgstr "Gestore..."
 
-#: src/rcstrings.c:74
+#: ../src/rcstrings.c:74
 msgid "Next"
 msgstr "Successiva"
 
-#: src/rcstrings.c:75
+#: ../src/rcstrings.c:75
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/rcstrings.c:76 src/x_window.c:489
+#: ../src/rcstrings.c:76 ../src/x_window.c:401
 msgid "New"
 msgstr "Nuovo"
 
-#: src/rcstrings.c:77
+#: ../src/rcstrings.c:77
 msgid "Revert"
 msgstr "Riduce e Centra lo Schema"
 
-#: src/rcstrings.c:78
+#: ../src/rcstrings.c:78
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/rcstrings.c:79
+#: ../src/rcstrings.c:79
 msgid "Discard"
 msgstr "Annulla"
 
-#: src/rcstrings.c:81
+#: ../src/rcstrings.c:81
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/rcstrings.c:82
+#: ../src/rcstrings.c:82
 msgid "Component..."
 msgstr "Componente..."
 
-#: src/rcstrings.c:83 src/i_callbacks.c:2358 src/i_callbacks.c:2380
+#. need to click
+#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2340 ../src/i_callbacks.c:2362
 msgid "Net"
 msgstr "Collegamento"
 
-#: src/rcstrings.c:84 src/i_callbacks.c:2424 src/i_callbacks.c:2447
-#: src/x_window.c:547
+#. need to click
+#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2406 ../src/i_callbacks.c:2429
+#: ../src/x_window.c:459
 msgid "Bus"
 msgstr "Bus"
 
-#: src/rcstrings.c:85
+#: ../src/rcstrings.c:85
 msgid "Attribute..."
 msgstr "Caratteristica..."
 
-#: src/rcstrings.c:86
+#: ../src/rcstrings.c:86
 msgid "Text..."
 msgstr "Testo..."
 
-#: src/rcstrings.c:87 src/i_callbacks.c:2528 src/i_callbacks.c:2547
+#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2510 ../src/i_callbacks.c:2529
 msgid "Line"
 msgstr "Linea"
 
-#: src/rcstrings.c:88 src/i_callbacks.c:2569 src/i_callbacks.c:2588
+#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2551 ../src/i_callbacks.c:2570
 msgid "Box"
 msgstr "Box"
 
-#: src/rcstrings.c:89 src/i_callbacks.c:2644 src/i_callbacks.c:2664
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2626 ../src/i_callbacks.c:2646
 msgid "Circle"
 msgstr "Cerchio"
 
-#: src/rcstrings.c:90 src/i_callbacks.c:2686 src/i_callbacks.c:2705
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2668 ../src/i_callbacks.c:2687
 msgid "Arc"
 msgstr "Arco"
 
-#: src/rcstrings.c:91 src/i_callbacks.c:2727 src/i_callbacks.c:2746
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2709 ../src/i_callbacks.c:2728
 msgid "Pin"
 msgstr "Pin"
 
-#: src/rcstrings.c:92
+#: ../src/rcstrings.c:92
 msgid "Picture..."
 msgstr "Immagine..."
 
-#: src/rcstrings.c:94
+#: ../src/rcstrings.c:94
 msgid "Hierarchy"
 msgstr "Gerarchia"
 
-#: src/rcstrings.c:95
+#: ../src/rcstrings.c:95
 msgid "Down Schematic"
 msgstr "Scarica Schematico"
 
-#: src/rcstrings.c:96
+#: ../src/rcstrings.c:96
 msgid "Down Symbol"
 msgstr "Scarica Simbolo"
 
-#: src/rcstrings.c:97
+#: ../src/rcstrings.c:97
 msgid "Up"
 msgstr "Sopra"
 
-#: src/rcstrings.c:98
+#: ../src/rcstrings.c:98
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: src/rcstrings.c:100 src/x_multiattrib.c:1549
+#. GtkFrame
+#: ../src/rcstrings.c:100 ../src/x_multiattrib.c:1539
 msgid "Attributes"
 msgstr "Caratteristiche"
 
-#: src/rcstrings.c:101 src/i_callbacks.c:3011
+#: ../src/rcstrings.c:101 ../src/i_callbacks.c:2993
 msgid "Attach"
 msgstr "Collega"
 
-#: src/rcstrings.c:102 src/i_callbacks.c:3060
+#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3042
 msgid "Detach"
 msgstr "Scollega"
 
-#: src/rcstrings.c:103
+#: ../src/rcstrings.c:103
 msgid "Show Value"
 msgstr "Mostra Valore"
 
-#: src/rcstrings.c:104
+#: ../src/rcstrings.c:104
 msgid "Show Name"
 msgstr "Mostra Nome"
 
-#: src/rcstrings.c:105
+#: ../src/rcstrings.c:105
 msgid "Show Both"
 msgstr "Mostra Entrambi"
 
-#: src/rcstrings.c:106
+#: ../src/rcstrings.c:106
 msgid "Toggle Visibility"
 msgstr "Pulsante Visibilità"
 
-#: src/rcstrings.c:107
+#: ../src/rcstrings.c:107
 msgid "Find Specific Text..."
 msgstr "Trova Testo Specifico..."
 
-#: src/rcstrings.c:108
+#: ../src/rcstrings.c:108
 msgid "Hide Specific Text..."
 msgstr "Nascondi Testo Specifico..."
 
-#: src/rcstrings.c:109
+#: ../src/rcstrings.c:109
 msgid "Show Specific Text..."
 msgstr "Mostra Testo Specifico..."
 
-#: src/rcstrings.c:110
+#: ../src/rcstrings.c:110
 msgid "Autonumber Text..."
 msgstr ""
 
-#: src/rcstrings.c:112
+#: ../src/rcstrings.c:112
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/rcstrings.c:113
+#: ../src/rcstrings.c:113
 msgid "Text Size..."
 msgstr "Ampiezza Testo..."
 
-#: src/rcstrings.c:114
+#: ../src/rcstrings.c:114
 msgid "Toggle Grid On/Off"
 msgstr "Modalità Griglia Visibile/Non Visibile"
 
-#: src/rcstrings.c:115
+#: ../src/rcstrings.c:115
 msgid "Toggle Snap On/Off"
 msgstr ""
 
-#: src/rcstrings.c:116
+#: ../src/rcstrings.c:116
 msgid "Snap Grid Spacing..."
 msgstr "Ampiezza Griglia"
 
-#: src/rcstrings.c:117
+#: ../src/rcstrings.c:117
 msgid "Scale up Grid Spacing"
 msgstr ""
 
-#: src/rcstrings.c:118
+#: ../src/rcstrings.c:118
 msgid "Scale down Grid Spacing"
 msgstr ""
 
-#: src/rcstrings.c:119
+#: ../src/rcstrings.c:119
 msgid "Toggle Outline/Box"
 msgstr ""
 
-#: src/rcstrings.c:120
+#: ../src/rcstrings.c:120
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: src/rcstrings.c:121
+#: ../src/rcstrings.c:121
 msgid "Show Log Window..."
 msgstr "Mostra Finestra File di Log..."
 
-#: src/rcstrings.c:122
+#: ../src/rcstrings.c:122
 msgid "Show Coord Window..."
 msgstr "Mostra Coordinate Finestra..."
 
-#: src/rcstrings.c:124
+#: ../src/rcstrings.c:124
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/rcstrings.c:125
+#: ../src/rcstrings.c:125
 msgid "Manual"
 msgstr "Manuale"
 
-#: src/rcstrings.c:126
+#: ../src/rcstrings.c:126
 msgid "gEDA Documentation"
 msgstr "Documentazione gEDA"
 
-#: src/rcstrings.c:127
+#: ../src/rcstrings.c:127
 msgid "gschem FAQ"
 msgstr "FAQ gschem"
 
-#: src/rcstrings.c:128
+#: ../src/rcstrings.c:128
 msgid "Component Documentation"
 msgstr "Documentazione componente"
 
-#: src/rcstrings.c:129
+#: ../src/rcstrings.c:129
 msgid "About gschem"
 msgstr "Informazioni su gschem"
 
-#: src/rcstrings.c:130 src/x_dialog.c:2517
+#: ../src/rcstrings.c:130 ../src/x_dialog.c:2517
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: src/a_zoom.c:245
+#: ../src/a_zoom.c:250
 msgid "Zoom too small!  Cannot zoom further.\n"
-msgstr "Eccessiva riduzione dell'immagine!  Non è possibile ridurla ulteriormente.\n"
+msgstr ""
+"Eccessiva riduzione dell'immagine!  Non è possibile ridurla ulteriormente.\n"
 
-#: src/g_funcs.c:342 src/i_callbacks.c:137
+#. Fork failed. Still in parent process, so can use the log
+#. * window
+#: ../src/g_funcs.c:343 ../src/i_callbacks.c:138
 #, c-format
 msgid "Could not fork\n"
 msgstr "Impossibile creare un nuovo processo\n"
 
-#: src/g_funcs.c:358 src/i_callbacks.c:147
+#. if we return, then nothing happened
+#: ../src/g_funcs.c:359 ../src/i_callbacks.c:148
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Non è possibile invocare %s\n"
 
-#: src/g_funcs.c:364 src/i_callbacks.c:151
+#: ../src/g_funcs.c:365 ../src/i_callbacks.c:152
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Comandi documentazione non supportati sotto MinGW.\n"
 
-#: src/g_hook.c:88
+#: ../src/g_hook.c:87
 #, c-format
 msgid "Attribute failed ot find.\n"
 msgstr ""
 
-#: src/g_rc.c:159
+#: ../src/g_rc.c:160
 #, c-format
 msgid "Invalid color [%s] passed to %s\n"
 msgstr "Colore [%s] non valido passato a %s\n"
 
-#: src/g_rc.c:433
+#: ../src/g_rc.c:434
 #, 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:524
+#: ../src/g_rc.c:525
 #, 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:551
+#: ../src/g_rc.c:552
 #, 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:594
+#: ../src/g_rc.c:595
 #, 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:1049
+#: ../src/g_rc.c:1050
 #, 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:1289
+#: ../src/g_rc.c:1290
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr ""
 
-#: src/g_rc.c:1364
+#: ../src/g_rc.c:1365
 #, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
-msgstr "Il valore [%d] dell'ampiezza dei punti passata alla griglia non è valida\n"
+msgstr ""
+"Il valore [%d] dell'ampiezza dei punti passata alla griglia non è valida\n"
 
-#: src/g_rc.c:1405
+#: ../src/g_rc.c:1406
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
 msgstr ""
 
-#: src/g_rc.c:1449
+#: ../src/g_rc.c:1450
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr ""
 
-#: src/g_rc.c:1473
+#: ../src/g_rc.c:1474
 #, 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:1514
+#: ../src/g_rc.c:1515
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr ""
 
-#: src/g_rc.c:1537
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr ""
 
-#: src/g_rc.c:1583
+#: ../src/g_rc.c:1584
 #, 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/gschem.c:192 src/gschem.c:203
+#: ../src/gschem.c:193 ../src/gschem.c:204
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versione %s%s.%s\n"
 
-#: src/gschem.c:195 src/gschem.c:206
+#: ../src/gschem.c:196 ../src/gschem.c:207
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -609,227 +620,226 @@ 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:197 src/gschem.c:208
+#: ../src/gschem.c:198 ../src/gschem.c:209
 #, c-format
-msgid "This is free software, and you are welcome to redistribute it under certain\n"
+msgid ""
+"This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 "Questo software è rilasciato sotto licenza GPL e può essere ridistribuito "
 "sotto determinate\n"
 
-#: src/gschem.c:199 src/gschem.c:210
+#: ../src/gschem.c:200 ../src/gschem.c:211
 #, 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:214
+#: ../src/gschem.c:215
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Port per MINGW32.\n"
 
-#: src/gschem.c:218
+#: ../src/gschem.c:219
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Impostazioni locali correnti: %s\n"
 
-#: src/gschem.c:231
+#: ../src/gschem.c:232
 #, c-format
 msgid "You must set the GEDADATA environment variable!\n"
 msgstr "Devi impostare la variabile d'ambiente GEDADATA!\n"
 
-#: src/gschem.c:246
+#: ../src/gschem.c:248
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lettura del file init scm [%s]\n"
 
-#: src/gschem.c:250 src/gschem.c:253
+#. ! \todo These two messages are the same. Should be
+#. * integrated.
+#: ../src/gschem.c:252 ../src/gschem.c:255
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Fallita la lettura del file init scm [%s]\n"
 
-#: src/gschem.c:323
+#: ../src/gschem.c:323
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Cartelle degli schemi non impostata!\n"
 
-#: src/gschem.c:330 src/x_script.c:71
+#: ../src/gschem.c:330 ../src/x_script.c:72
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Esecuzione dello script guile [%s]\n"
 
-#: src/i_basic.c:84
-msgid "Attribute Mode"
-msgstr "Modalità Caratteristica"
-
-#: src/i_basic.c:87
+#: ../src/i_basic.c:84
 msgid "Component Mode"
 msgstr "Scelta Componente"
 
-#: src/i_basic.c:91
+#: ../src/i_basic.c:88
 msgid "Text Mode"
 msgstr "Modalità Testo"
 
-#: src/i_basic.c:99
+#: ../src/i_basic.c:96
 msgid "Rotate Mode"
 msgstr "Modalità Rotazione"
 
-#: src/i_basic.c:109
+#: ../src/i_basic.c:106
 msgid "Pan Mode"
 msgstr ""
 
-#: src/i_basic.c:113
+#: ../src/i_basic.c:110
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Modalità %d Incolla"
 
-#: src/i_basic.c:118
+#: ../src/i_basic.c:115
 msgid "Net Mode"
 msgstr "Modalità Collegamento"
 
-#: src/i_basic.c:122
+#: ../src/i_basic.c:119
 msgid "Bus Mode"
 msgstr "Modalità Bus"
 
-#: src/i_basic.c:125
+#: ../src/i_basic.c:122
 msgid "Line Mode"
 msgstr "Modalità Linea"
 
-#: src/i_basic.c:128
+#: ../src/i_basic.c:125
 msgid "Box Mode"
 msgstr "Modalità Riquadro"
 
-#: src/i_basic.c:131
+#: ../src/i_basic.c:128
 msgid "Picture Mode"
 msgstr "Modalità Immagine"
 
-#: src/i_basic.c:134
+#: ../src/i_basic.c:131
 msgid "Circle Mode"
 msgstr "Modalità Cerchio"
 
-#: src/i_basic.c:137
+#: ../src/i_basic.c:134
 msgid "Arc Mode"
 msgstr "Modalità Arco"
 
-#: src/i_basic.c:140
+#: ../src/i_basic.c:137
 msgid "Pin Mode"
 msgstr "Modalità Pin"
 
-#: src/i_basic.c:142 src/i_callbacks.c:587 src/i_callbacks.c:606
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:589 ../src/i_callbacks.c:608
 msgid "Copy"
 msgstr "Copia"
 
-#: src/i_basic.c:144 src/i_callbacks.c:667 src/i_callbacks.c:686
+#: ../src/i_basic.c:141 ../src/i_callbacks.c:669 ../src/i_callbacks.c:688
 msgid "Move"
 msgstr "Sposta"
 
-#: src/i_basic.c:146 src/i_callbacks.c:627 src/i_callbacks.c:646
+#: ../src/i_basic.c:143 ../src/i_callbacks.c:629 ../src/i_callbacks.c:648
 msgid "Multiple Copy"
 msgstr "Copia Multipla"
 
-#: src/i_basic.c:174
+#: ../src/i_basic.c:172
 msgid "Show Hidden"
 msgstr "Mostra Nascosto"
 
-#: src/i_basic.c:177
+#: ../src/i_basic.c:175
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: src/i_basic.c:259 src/x_window.c:656
+#: ../src/i_basic.c:256 ../src/x_window.c:568
 msgid "Action"
 msgstr "Azione"
 
-#: src/i_basic.c:267 src/x_window.c:651
+#: ../src/i_basic.c:262 ../src/x_window.c:563
 msgid "Stroke"
 msgstr ""
 
-#: src/i_basic.c:274 src/x_window.c:653
+#: ../src/i_basic.c:268 ../src/x_window.c:565
 msgid "none"
 msgstr "none"
 
-#: src/i_basic.c:281
+#: ../src/i_basic.c:273
 msgid "Repeat/"
 msgstr "Ripeti/"
 
-#: src/i_basic.c:570 src/i_basic.c:575
+#: ../src/i_basic.c:538 ../src/i_basic.c:543
 msgid "OFF"
 msgstr "OFF"
 
-#: src/i_basic.c:579
+#: ../src/i_basic.c:547
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Griglia(%s, %s)"
 
-#: src/i_callbacks.c:132
+#: ../src/i_callbacks.c:133
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentazione per [%s,%s,%s,%s]\n"
 
-#: src/i_callbacks.c:192 src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:193 ../src/i_callbacks.c:1754
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nuova Pagina Creata [%s]\n"
 
-#: src/i_callbacks.c:227 src/x_menus.c:493
+#: ../src/i_callbacks.c:229 ../src/x_menus.c:494
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Creata Nuova Finestra [%s]\n"
 
-#: src/i_callbacks.c:345
+#: ../src/i_callbacks.c:347
 msgid "Failed to Save All"
 msgstr "Salvataggio Fallito"
 
-#: src/i_callbacks.c:347
+#: ../src/i_callbacks.c:349
 msgid "Saved All"
 msgstr "Salvato Tutto"
 
-#: src/i_callbacks.c:439
+#: ../src/i_callbacks.c:441
 msgid "Closing Window\n"
 msgstr "Chiusura Finestra\n"
 
-#: src/i_callbacks.c:591 src/i_callbacks.c:631 src/i_callbacks.c:671
+#: ../src/i_callbacks.c:593 ../src/i_callbacks.c:633 ../src/i_callbacks.c:673
 msgid "Select objs first"
 msgstr "Seleziona prima un oggetto"
 
-#: src/i_callbacks.c:746
+#: ../src/i_callbacks.c:748
 msgid "Edit Text"
 msgstr "Modifica Testo"
 
-#: src/i_callbacks.c:769
+#: ../src/i_callbacks.c:771
 msgid "Slot"
 msgstr "Slot"
 
-#: src/i_callbacks.c:786
+#: ../src/i_callbacks.c:788
 msgid "Color"
 msgstr "Colore"
 
-#: src/i_callbacks.c:828 src/i_callbacks.c:875
+#: ../src/i_callbacks.c:830 ../src/i_callbacks.c:877
 msgid "Rotate"
 msgstr "Ruota"
 
-#: src/i_callbacks.c:902 src/i_callbacks.c:924
+#: ../src/i_callbacks.c:904 ../src/i_callbacks.c:926
 msgid "Mirror"
 msgstr "Specchio"
 
-#: src/i_callbacks.c:988 src/x_dialog.c:1604
+#: ../src/i_callbacks.c:988 ../src/x_dialog.c:1611
 msgid "Translate"
 msgstr "Converti"
 
-#: src/i_callbacks.c:991
+#: ../src/i_callbacks.c:991
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "ATTENZIONE: Non effettuare la conversione in modalità snap off!\n"
 
-#: src/i_callbacks.c:992
+#: ../src/i_callbacks.c:992
 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:999
+#: ../src/i_callbacks.c:999
 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:1001
+#: ../src/i_callbacks.c:1001
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -837,131 +847,132 @@ 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:1022
+#: ../src/i_callbacks.c:1022
 msgid "Embed"
 msgstr "Posizionato"
 
-#: src/i_callbacks.c:1060
+#: ../src/i_callbacks.c:1063
 msgid "Unembed"
 msgstr "Non posizionato"
 
-#: src/i_callbacks.c:1100
+#: ../src/i_callbacks.c:1106
 msgid "Update"
 msgstr "Aggiorna"
 
-#: src/i_callbacks.c:1157
+#: ../src/i_callbacks.c:1163
 msgid "ShowHidden"
 msgstr "Mostra Nascosto"
 
-#: src/i_callbacks.c:1180
+#: ../src/i_callbacks.c:1186
 msgid "MakeVisible"
 msgstr "Rendi Visibile"
 
-#: src/i_callbacks.c:1296
+#: ../src/i_callbacks.c:1302
 msgid "Edit Line Type"
 msgstr "Modifica il Tipo di Linea"
 
-#: src/i_callbacks.c:1337 src/x_dialog.c:1261
+#: ../src/i_callbacks.c:1343 ../src/x_dialog.c:1268
 msgid "Edit Fill Type"
 msgstr "Modifica il Tipo di Riempimento"
 
-#: src/i_callbacks.c:1643
+#: ../src/i_callbacks.c:1648
 msgid "Update Cues"
 msgstr ""
 
-#: src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1798
 msgid "Really revert page?"
 msgstr "Vuoi veramente ritornare alla pagina precedente?"
 
-#: src/i_callbacks.c:1856
+#: ../src/i_callbacks.c:1872
 msgid "Copy 1"
 msgstr "Copia 1"
 
-#: src/i_callbacks.c:1875
+#: ../src/i_callbacks.c:1891
 msgid "Copy 2"
 msgstr "Copia 2"
 
-#: src/i_callbacks.c:1894
+#: ../src/i_callbacks.c:1910
 msgid "Copy 3"
 msgstr "Copia 3"
 
-#: src/i_callbacks.c:1913
+#: ../src/i_callbacks.c:1929
 msgid "Copy 4"
 msgstr "Copia 4"
 
-#: src/i_callbacks.c:1932
+#: ../src/i_callbacks.c:1948
 msgid "Copy 5"
 msgstr "Copia 5"
 
-#: src/i_callbacks.c:1951
+#: ../src/i_callbacks.c:1967
 msgid "Cut 1"
 msgstr "Taglia 1"
 
-#: src/i_callbacks.c:1970
+#: ../src/i_callbacks.c:1986
 msgid "Cut 2"
 msgstr "Taglia 2"
 
-#: src/i_callbacks.c:1989
+#: ../src/i_callbacks.c:2005
 msgid "Cut 3"
 msgstr "Taglia 3"
 
-#: src/i_callbacks.c:2008
+#: ../src/i_callbacks.c:2024
 msgid "Cut 4"
 msgstr "Taglia 4"
 
-#: src/i_callbacks.c:2027
+#: ../src/i_callbacks.c:2043
 msgid "Cut 5"
 msgstr "Taglia 5"
 
-#: src/i_callbacks.c:2043
+#: ../src/i_callbacks.c:2059
 msgid "Paste 1"
 msgstr "Incolla 1"
 
-#: src/i_callbacks.c:2052 src/i_callbacks.c:2076 src/i_callbacks.c:2100
-#: src/i_callbacks.c:2124 src/i_callbacks.c:2148
+#: ../src/i_callbacks.c:2066 ../src/i_callbacks.c:2088
+#: ../src/i_callbacks.c:2110 ../src/i_callbacks.c:2132
+#: ../src/i_callbacks.c:2154
 msgid "Empty buffer"
 msgstr "Buffer vuoto"
 
-#: src/i_callbacks.c:2067
+#: ../src/i_callbacks.c:2081
 msgid "Paste 2"
 msgstr "Incolla 2"
 
-#: src/i_callbacks.c:2091
+#: ../src/i_callbacks.c:2103
 msgid "Paste 3"
 msgstr "Incolla 3"
 
-#: src/i_callbacks.c:2115
+#: ../src/i_callbacks.c:2125
 msgid "Paste 4"
 msgstr "Incolla 4"
 
-#: src/i_callbacks.c:2139
+#: ../src/i_callbacks.c:2147
 msgid "Paste 5"
 msgstr "Incolla 5"
 
-#: src/i_callbacks.c:2282 src/x_window.c:527
+#: ../src/i_callbacks.c:2264 ../src/x_window.c:439
 msgid "Component"
 msgstr "Componente"
 
-#: src/i_callbacks.c:2318 src/i_callbacks.c:2337
+#: ../src/i_callbacks.c:2300 ../src/i_callbacks.c:2319
 msgid "Attribute"
 msgstr "Caratteristica"
 
-#: src/i_callbacks.c:2804
+#: ../src/i_callbacks.c:2786
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Ricerca del sorgente [%s]\n"
 
-#: src/i_callbacks.c:2828 src/i_callbacks.c:2829
+#: ../src/i_callbacks.c:2810 ../src/i_callbacks.c:2811
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Impossibile trovare il sorgente [%s]\n"
 
-#: src/i_callbacks.c:2896
+#: ../src/i_callbacks.c:2878
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Ricerca del simbolo [%s]\n"
 
-#: src/i_callbacks.c:2983
+#: ../src/i_callbacks.c:2965
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -969,304 +980,284 @@ msgstr ""
 "Questo comando reperisce la documentazione del componente da Internet, ma "
 "non hai selezionato nessun componente da cercare."
 
-#: src/i_callbacks.c:3100
+#: ../src/i_callbacks.c:3082
 msgid "ShowN"
 msgstr "MostraN"
 
-#: src/i_callbacks.c:3130
+#: ../src/i_callbacks.c:3112
 msgid "ShowV"
 msgstr "MostraV"
 
-#: src/i_callbacks.c:3160
+#: ../src/i_callbacks.c:3142
 msgid "ShowB"
 msgstr "MostraB"
 
-#: src/i_callbacks.c:3191
+#: ../src/i_callbacks.c:3173
 msgid "VisToggle"
 msgstr "Visibilità Strumenti"
 
-#: src/i_callbacks.c:3212
+#: ../src/i_callbacks.c:3194
 #, 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:3300
+#: ../src/i_callbacks.c:3282
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: src/i_callbacks.c:3303
+#: ../src/i_callbacks.c:3285
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: src/i_callbacks.c:3320
+#: ../src/i_callbacks.c:3302
 msgid "Grid OFF\n"
 msgstr "Griglia NON ATTIVA\n"
 
-#: src/i_callbacks.c:3323
+#: ../src/i_callbacks.c:3305
 msgid "Grid ON\n"
 msgstr "Griglia ATTIVA\n"
 
-#: src/i_callbacks.c:3340
+#: ../src/i_callbacks.c:3322
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (ATTENZIONE!)\n"
 
-#: src/i_callbacks.c:3343
+#: ../src/i_callbacks.c:3325
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: src/i_callbacks.c:3363
+#: ../src/i_callbacks.c:3345
 msgid "Rubber band OFF \n"
 msgstr "Rubber band OFF \n"
 
-#: src/i_callbacks.c:3366
+#: ../src/i_callbacks.c:3348
 msgid "Rubber band ON\n"
 msgstr "Rubber band ON\n"
 
-#: src/o_arc.c:137
+#: ../src/o_arc.c:139
 #, c-format
 msgid "Unknown end for arc (%d)\n"
 msgstr "Non corretta terminazione per l'arco (%d)\n"
 
-#: src/o_arc.c:178
+#: ../src/o_arc.c:180
 #, c-format
 msgid "Unknown type for arc !\n"
 msgstr "Tipo sconosciuto per l'arco!\n"
 
-#: src/o_attrib.c:105
+#: ../src/o_attrib.c:109
 #, c-format
 msgid "Got NULL in o_attrib_toggle_visibility\n"
 msgstr "Ottenuto un NULLO in o_attrib_toggle_visibility\n"
 
-#: src/o_attrib.c:170
+#: ../src/o_attrib.c:175
 #, c-format
 msgid "Got NULL in o_attrib_toggle_show_name_value\n"
 msgstr "Ottenuto un NULLO in o_attrib_toggle_show_name_value\n"
 
-#: src/o_attrib.c:221
-#, c-format
-msgid "ERROR! you can't get an attribute without an ='s\n"
-msgstr ""
-
-#: src/o_box.c:141
+#: ../src/o_box.c:143
 #, c-format
 msgid "Unknown end for box (%d)\n"
 msgstr "Non corretta terminazione per il riquadro (%d)\n"
 
-#: src/o_box.c:181
+#: ../src/o_box.c:183
 #, c-format
 msgid "Unknown type for box !\n"
 msgstr "Sconosciuto tipo per il riquadro!\n"
 
-#: src/o_box.c:271
+#: ../src/o_box.c:267
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Sconosciuto tipo per il riquadro (riempimento)!\n"
 
-#: src/o_buffer.c:42
+#: ../src/o_buffer.c:44
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_copy]\n"
 msgstr "Ottenuto un non valido buffer_number [o_buffer_copy]\n"
 
-#: src/o_buffer.c:80
+#: ../src/o_buffer.c:73
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_cut]\n"
 msgstr "Ottenuto un non valido buffer_number [o_buffer_cut]\n"
 
-#: src/o_buffer.c:121
+#: ../src/o_buffer.c:105
 #, 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_buffer.c:181
+#: ../src/o_buffer.c:164
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
 msgstr "Ottenuto un non valido buffer_number [o_buffer_paste_end]\n"
 
-#: src/o_bus.c:210
+#: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\n"
 msgstr ""
 
-#: src/o_circle.c:136
+#: ../src/o_circle.c:138
 #, c-format
 msgid "Unknown end for circle\n"
 msgstr "Non corretta terminazione per il cerchio\n"
 
-#: src/o_circle.c:172
+#. just to be careful
+#: ../src/o_circle.c:174
 #, c-format
 msgid "Unknown type for circle!\n"
 msgstr "Tipo sconosciuto per il cerchio!\n"
 
-#: src/o_circle.c:260
+#: ../src/o_circle.c:256
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Tipo sconosciuto per il cerchio (riempimento)!\n"
 
-#: src/o_complex.c:230
+#: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
 msgstr ""
 
-#: src/o_complex.c:582
-#, c-format
-msgid "Got NULL in o_complex_translate_display_selection\n"
-msgstr "Ottenuto un NULLO in o_complex_translate_display_selection\n"
-
-#: src/o_complex.c:650 src/o_complex.c:656
+#: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Spostamento schema [%d %d]\n"
 
-#: src/o_complex.c:694
-#, c-format
-msgid "Got NULL in o_complex_translate_selection!\n"
-msgstr "Ottenuto un NULLO in o_complex_translate_selection!\n"
-
-#: src/o_copy.c:119 src/o_copy.c:382
+#: ../src/o_copy.c:122 ../src/o_copy.c:312
 #, c-format
 msgid "ERROR: NULL object in o_copy_end!\n"
 msgstr "ERRORE: oggetto NULLO in o_copy_end!\n"
 
-#: src/o_line.c:113
+#: ../src/o_line.c:115
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Non corretta terminazione per la linea (%d)\n"
 
-#: src/o_line.c:153
+#. just to be careful
+#: ../src/o_line.c:155
 #, c-format
 msgid "Unknown type for line (%d) !\n"
 msgstr "Tipo di linea sconosciuta per (%d) !\n"
 
-#: src/o_misc.c:65
+#: ../src/o_misc.c:66
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Ottenuto un NULLO inaspettato in o_edit\n"
 
-#: src/o_misc.c:144
+#: ../src/o_misc.c:145
 msgid "Object already locked\n"
 msgstr "Oggetto già bloccato\n"
 
-#: src/o_misc.c:182
+#: ../src/o_misc.c:183
 msgid "Object already unlocked\n"
 msgstr "Oggetto già sbloccato\n"
 
-#: src/o_misc.c:229 src/o_misc.c:472 src/o_misc.c:712
-#, c-format
-msgid "ERROR: NULL object in o_rotate_90!\n"
-msgstr "ERRORE: oggetto NULLO in o_rotate_90!\n"
-
-#: src/o_misc.c:538
-#, c-format
-msgid "ERROR: NULL object in o_mirror!\n"
-msgstr "ERRORE: oggetto NULLO in o_mirror!\n"
-
-#: src/o_misc.c:812
+#: ../src/o_misc.c:525
 msgid "Hidden text is now visible\n"
 msgstr "Il testo nascosto è ora visibile\n"
 
-#: src/o_misc.c:814
+#: ../src/o_misc.c:527
 msgid "Hidden text is now invisible\n"
 msgstr "Il testo ora è non visibile\n"
 
-#: src/o_misc.c:1058
+#: ../src/o_misc.c:771
 #, 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"
+msgstr ""
+"Non è possibile trovare il simbolo [%s] nella libreria. Aggiornamento "
+"fallito.\n"
 
-#: src/o_misc.c:1196
+#: ../src/o_misc.c:906
 #, 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:1240
+#: ../src/o_misc.c:951
 #, 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:1258
+#: ../src/o_misc.c:969
 #, 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:1263
+#: ../src/o_misc.c:974
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Non è possibile salvare il file di ripristino [%s]\n"
 
-#: src/o_move.c:224
+#: ../src/o_move.c:181
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERRORE: oggetto NULLO in o_move_end!\n"
 
-#: src/o_move.c:332
+#: ../src/o_move.c:282
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: src/o_move.c:353
+#: ../src/o_move.c:304
 #, 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:255
+#: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\n"
 msgstr ""
 
-#: src/o_net.c:812 src/o_net.c:849 src/o_net.c:920 src/o_net.c:956
+#. try to exit gracefully
+#: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: src/o_net.c:1029
+#: ../src/o_net.c:980
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr ""
 
-#: src/o_picture.c:206 src/o_picture.c:746
+#: ../src/o_picture.c:208 ../src/o_picture.c:720
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fallito il caricamento dell'immagine: [%s]"
 
-#: src/o_picture.c:220
+#: ../src/o_picture.c:222
 msgid "Picture"
 msgstr "Immagine"
 
-#: src/o_picture.c:658 src/x_attribedit.c:145
+#: ../src/o_picture.c:625 ../src/x_attribedit.c:148
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERRORE: oggetto NULLO!\n"
 
-#: src/o_slot.c:128
+#: ../src/o_slot.c:130
 msgid "Slot attribute malformed\n"
 msgstr "Attributo dello slot malposto\n"
 
-#: src/o_slot.c:146
+#: ../src/o_slot.c:148
 msgid "numslots attribute missing\n"
 msgstr "attributo del numero dello slot mancante\n"
 
-#: src/o_slot.c:148
+#: ../src/o_slot.c:150
 msgid "Slotting not allowed for this component\n"
 msgstr ""
 
-#: src/o_slot.c:164
+#: ../src/o_slot.c:166
 msgid "New slot number out of range\n"
 msgstr "Numero del nuovo slot fuori dal limite\n"
 
-#: src/o_slot.c:237
+#: ../src/o_slot.c:239
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Hai provato a editare qualcosa che non esiste!\n"
 
-#: src/o_undo.c:317
+#: ../src/o_undo.c:318
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Cancella/Ripristina disabilitato nel file rc\n"
 
-#: src/parsecmd.c:50
+#: ../src/parsecmd.c:51
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1291,228 +1282,245 @@ msgstr ""
 "  -h            Help; this message\n"
 "\n"
 
-#: src/x_attribedit.c:130
+#: ../src/x_attribedit.c:133
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 
-#: src/x_attribedit.c:333
+#: ../src/x_attribedit.c:336
 msgid "Single Attribute Editor"
 msgstr "Editor Singola Caratteristica"
 
-#: src/x_attribedit.c:364
+#: ../src/x_attribedit.c:367
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Modifica Caratteristiche</b>"
 
-#: src/x_attribedit.c:366
+#: ../src/x_attribedit.c:369
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Aggiungi Caratteristiche</b>"
 
-#: src/x_attribedit.c:382 src/x_multiattrib.c:1731
+#. Name selection
+#. GtkLabel
+#: ../src/x_attribedit.c:385 ../src/x_multiattrib.c:1721
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/x_attribedit.c:398 src/x_multiattrib.c:1750
+#. Value entry
+#. GtkLabel
+#: ../src/x_attribedit.c:401 ../src/x_multiattrib.c:1740
 msgid "Value:"
 msgstr "Valore:"
 
-#: src/x_attribedit.c:414 src/x_multiattrib.c:1787
+#. Visibility
+#. GtkButton
+#: ../src/x_attribedit.c:417 ../src/x_multiattrib.c:1777
 msgid "Visible"
 msgstr "Visibile"
 
-#: src/x_attribedit.c:434
+#: ../src/x_attribedit.c:437
 msgid "Show Value Only"
 msgstr "Mostra Solo il Valore"
 
-#: src/x_attribedit.c:436
+#: ../src/x_attribedit.c:439
 msgid "Show Name Only"
 msgstr "Mostra Solo il Nome"
 
-#: src/x_attribedit.c:438 src/x_multiattrib.c:1226
+#: ../src/x_attribedit.c:441 ../src/x_multiattrib.c:1216
 msgid "Show Name & Value"
 msgstr "Mostra Nome & Valore"
 
-#: src/x_attribedit.c:445
+#. gschem specific
+#: ../src/x_attribedit.c:448
 msgid "<b>Attach Options</b>"
 msgstr "<b>Aggiungi Opzioni</b>"
 
-#: src/x_attribedit.c:460
+#: ../src/x_attribedit.c:463
 msgid "All"
 msgstr "Tutto"
 
-#: src/x_attribedit.c:468 src/x_compselect.c:728 src/x_compselect.c:803
+#. GtkTreeViewColumn
+#: ../src/x_attribedit.c:471 ../src/x_compselect.c:735
+#: ../src/x_compselect.c:810
 msgid "Components"
 msgstr "Componenti"
 
-#: src/x_attribedit.c:476 src/x_window.c:537
+#: ../src/x_attribedit.c:479 ../src/x_window.c:449
 msgid "Nets"
 msgstr "Collegamenti"
 
-#: src/x_attribedit.c:484
+#: ../src/x_attribedit.c:487
 msgid "Replace existing attributes"
 msgstr "Ridefinisci le caratteristiche esistenti"
 
-#: src/x_autonumber.c:413
+#: ../src/x_autonumber.c:412
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#: src/x_autonumber.c:428
+#. duplicate slot in used_slots
+#: ../src/x_autonumber.c:427
 #, c-format
-msgid "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
+msgid ""
+"duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: src/x_autonumber.c:697
+#: ../src/x_autonumber.c:692
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: src/x_autonumber.c:748
+#: ../src/x_autonumber.c:743
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: src/x_autonumber.c:881
+#: ../src/x_autonumber.c:876
 msgid "Diagonal"
 msgstr "Diagonale"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Top to bottom"
 msgstr "Dall'alto verso il basso"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Bottom to top"
 msgstr "Dal basso verso l'alto"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Left to right"
 msgstr "Da sinistra a destra"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Right to left"
 msgstr "Da destra a sinistra"
 
-#: src/x_autonumber.c:884
+#: ../src/x_autonumber.c:879
 msgid "File order"
 msgstr "Sequenza dei file"
 
-#: src/x_autonumber.c:1220
+#: ../src/x_autonumber.c:1215
 msgid "Autonumber text"
 msgstr ""
 
-#: src/x_autonumber.c:1246
+#. scope section
+#: ../src/x_autonumber.c:1241
 msgid "<b>Scope</b>"
 msgstr "<b>Visibilità</b>"
 
-#: src/x_autonumber.c:1268
+#: ../src/x_autonumber.c:1263
 msgid "Search for:"
 msgstr "Ricerca di:"
 
-#: src/x_autonumber.c:1282
+#: ../src/x_autonumber.c:1277
 msgid "Autonumber text in:"
 msgstr ""
 
-#: src/x_autonumber.c:1289
+#: ../src/x_autonumber.c:1284
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: src/x_autonumber.c:1301 src/x_autonumber.c:1310
+#: ../src/x_autonumber.c:1296 ../src/x_autonumber.c:1305
 msgid "Selected objects"
 msgstr "Oggetti selezionati"
 
-#: src/x_autonumber.c:1302 src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1297 ../src/x_autonumber.c:1306
 msgid "Current page"
 msgstr "Pagina corrente"
 
-#: src/x_autonumber.c:1303 src/x_autonumber.c:1312
+#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
 msgid "Whole hierarchy"
 msgstr "Intera gerarchia"
 
-#: src/x_autonumber.c:1314
+#: ../src/x_autonumber.c:1309
 msgid "Overwrite existing numbers"
 msgstr "Sovrascrivi i numeri esistenti"
 
-#: src/x_autonumber.c:1319
+#. Options section
+#: ../src/x_autonumber.c:1314
 msgid "<b>Options</b>"
 msgstr "<b>Opzioni</b>"
 
-#: src/x_autonumber.c:1341
+#: ../src/x_autonumber.c:1336
 msgid "Starting number:"
 msgstr "Numero iniziale:"
 
-#: src/x_autonumber.c:1348
+#: ../src/x_autonumber.c:1343
 msgid "Sort order:"
 msgstr ""
 
-#: src/x_autonumber.c:1369
+#: ../src/x_autonumber.c:1364
 msgid "Remove numbers"
 msgstr "Rimuovi numeri"
 
-#: src/x_autonumber.c:1373
+#: ../src/x_autonumber.c:1368
 msgid "Automatic slotting"
 msgstr ""
 
-#: src/x_color.c:60 src/x_color.c:97
+#: ../src/x_color.c:60 ../src/x_color.c:97
 #, c-format
 msgid "Could not find the color %s!\n"
 msgstr "Non è possibile trovare il colore %s!\n"
 
-#: src/x_color.c:63 src/x_color.c:100
+#: ../src/x_color.c:63 ../src/x_color.c:100
 #, c-format
 msgid "Defaulting color to white\n"
 msgstr "Colore predefinito; il bianco\n"
 
-#: src/x_color.c:70 src/x_color.c:107
+#: ../src/x_color.c:70 ../src/x_color.c:107
 #, c-format
 msgid "Ack! Cannot allocate white!\n"
 msgstr "Non è possibile inserire il bianco!\n"
 
-#: src/x_color.c:81 src/x_color.c:129 src/x_window.c:176 src/x_window.c:185
+#: ../src/x_color.c:81 ../src/x_color.c:129 ../src/x_window.c:86
+#: ../src/x_window.c:95
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Non è possibile inserire il colore %s!\n"
 
-#: src/x_color.c:148 src/x_color.c:164
+#: ../src/x_color.c:148 ../src/x_color.c:164
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Provato a ottenere un colore non valido: %d\n"
 
-#: src/x_compselect.c:833
+#. GtkLabel
+#: ../src/x_compselect.c:840
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/x_compselect.c:925
+#: ../src/x_compselect.c:932
 msgid "Default behavior - reference component"
 msgstr "Comportamento predefinito - Consultazione componente"
 
-#: src/x_compselect.c:928
+#: ../src/x_compselect.c:935
 msgid "Embed component in schematic"
 msgstr "Fissa il componente nello schema"
 
-#: src/x_compselect.c:931
+#: ../src/x_compselect.c:938
 msgid "Include component as individual objects"
 msgstr "Includi componente come oggetto individuale"
 
-#: src/x_compselect.c:1077
+#: ../src/x_compselect.c:1094
 msgid "Select Component..."
 msgstr "Seleziona Componente..."
 
-#: src/x_compselect.c:1103
+#: ../src/x_compselect.c:1120
 msgid "In Use"
 msgstr "In uso"
 
-#: src/x_compselect.c:1107
+#: ../src/x_compselect.c:1124
 msgid "Libraries"
 msgstr "Librerie"
 
-#: src/x_compselect.c:1116 src/x_fileselect.c:127
+#. GtkFrame
+#: ../src/x_compselect.c:1133 ../src/x_fileselect.c:128
 msgid "Preview"
 msgstr "Anteprima"
 
-#: src/x_dialog.c:184
+#. dialog not created yet
+#: ../src/x_dialog.c:191
 msgid "Text Entry..."
 msgstr "Inserisci Testo..."
 
-#: src/x_dialog.c:217
+#: ../src/x_dialog.c:224
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1523,211 +1531,221 @@ msgstr ""
 "e clicca con il tasto sinistro per rilasciare il testo.\n"
 "Il pulsante centrale del mouse ruota il testo."
 
-#: src/x_dialog.c:306
+#: ../src/x_dialog.c:313
+#, c-format
 msgid "Lower Left"
 msgstr "In basso a sinistra"
 
-#: src/x_dialog.c:317
+#: ../src/x_dialog.c:324
+#, c-format
 msgid "Middle Left"
 msgstr "Regione centrale a sinistra"
 
-#: src/x_dialog.c:328
+#: ../src/x_dialog.c:335
+#, c-format
 msgid "Upper Left"
 msgstr "In alto a sinistra"
 
-#: src/x_dialog.c:339
+#: ../src/x_dialog.c:346
+#, c-format
 msgid "Lower Middle"
 msgstr "Regione centrale in basso"
 
-#: src/x_dialog.c:350
+#: ../src/x_dialog.c:357
+#, c-format
 msgid "Middle Middle"
 msgstr "Centro della regione centrale"
 
-#: src/x_dialog.c:361
+#: ../src/x_dialog.c:368
+#, c-format
 msgid "Upper Middle"
 msgstr "Regione centrale in alto"
 
-#: src/x_dialog.c:372
+#: ../src/x_dialog.c:379
+#, c-format
 msgid "Lower Right"
 msgstr "In basso a destra"
 
-#: src/x_dialog.c:383
+#: ../src/x_dialog.c:390
+#, c-format
 msgid "Middle Right"
 msgstr "Zona centrale a destra"
 
-#: src/x_dialog.c:394
+#: ../src/x_dialog.c:401
+#, c-format
 msgid "Upper Right"
 msgstr "In alto a destra"
 
-#: src/x_dialog.c:509
+#: ../src/x_dialog.c:516
 msgid "Edit Text Properties"
 msgstr "Modifica proprietà del testo"
 
-#: src/x_dialog.c:545
+#: ../src/x_dialog.c:552
 msgid "<b>Text Content</b>"
 msgstr ""
 
-#: src/x_dialog.c:577
+#: ../src/x_dialog.c:584
 msgid "<b>Text Properties</b>"
 msgstr "<b>Proprietà del testo</b>"
 
-#: src/x_dialog.c:592
+#: ../src/x_dialog.c:599
 msgid "Color:"
 msgstr "Colore:"
 
-#: src/x_dialog.c:602
+#: ../src/x_dialog.c:609
 msgid "Size:"
 msgstr "Ampiezza:"
 
-#: src/x_dialog.c:611
+#: ../src/x_dialog.c:618
 msgid "Alignment:"
 msgstr "Allineamento:"
 
-#: src/x_dialog.c:665
+#: ../src/x_dialog.c:672
 msgid "Solid"
 msgstr "Continua"
 
-#: src/x_dialog.c:666
+#: ../src/x_dialog.c:673
 msgid "Dotted"
 msgstr "Punteggiata"
 
-#: src/x_dialog.c:667
+#: ../src/x_dialog.c:674
 msgid "Dashed"
 msgstr "Tratteggiata"
 
-#: src/x_dialog.c:668
+#: ../src/x_dialog.c:675
 msgid "Center"
 msgstr "Centro"
 
-#: src/x_dialog.c:669
+#: ../src/x_dialog.c:676
 msgid "Phantom"
 msgstr ""
 
-#: src/x_dialog.c:795 src/x_dialog.c:797 src/x_dialog.c:799 src/x_dialog.c:982
-#: src/x_dialog.c:983 src/x_dialog.c:984 src/x_dialog.c:992
-#: src/x_dialog.c:1175 src/x_dialog.c:1177 src/x_dialog.c:1179
-#: src/x_dialog.c:1181 src/x_dialog.c:1183 src/x_dialog.c:1388
-#: src/x_dialog.c:1389 src/x_dialog.c:1390 src/x_dialog.c:1391
-#: src/x_dialog.c:1392 src/x_dialog.c:1400
+#: ../src/x_dialog.c:802 ../src/x_dialog.c:804 ../src/x_dialog.c:806
+#: ../src/x_dialog.c:989 ../src/x_dialog.c:990 ../src/x_dialog.c:991
+#: ../src/x_dialog.c:999 ../src/x_dialog.c:1182 ../src/x_dialog.c:1184
+#: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
+#: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
+#: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
+#, c-format
 msgid "*unchanged*"
 msgstr "*non cambiato*"
 
-#: src/x_dialog.c:874
+#: ../src/x_dialog.c:881
 msgid "Edit Line Width & Type"
 msgstr "Modifica Larghezza & Tipo di Linea"
 
-#: src/x_dialog.c:915
+#: ../src/x_dialog.c:922
 msgid "Width:"
 msgstr "Larghezza:"
 
-#: src/x_dialog.c:919 src/x_print.c:314
+#: ../src/x_dialog.c:926 ../src/x_print.c:315
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/x_dialog.c:923
+#: ../src/x_dialog.c:930
 msgid "Dash Length:"
 msgstr "Lunghezza linea tratteggiata:"
 
-#: src/x_dialog.c:927
+#: ../src/x_dialog.c:934
 msgid "Dash Space:"
 msgstr "Spazio linea tratteggiata:"
 
-#: src/x_dialog.c:1032
+#: ../src/x_dialog.c:1039
 msgid "Hollow"
 msgstr "Vuoto"
 
-#: src/x_dialog.c:1033
+#: ../src/x_dialog.c:1040
 msgid "Filled"
 msgstr "Riempito"
 
-#: src/x_dialog.c:1034
+#: ../src/x_dialog.c:1041
 msgid "Mesh"
 msgstr "Rete"
 
-#: src/x_dialog.c:1035
+#: ../src/x_dialog.c:1042
 msgid "Hatch"
 msgstr "Tratteggio"
 
-#: src/x_dialog.c:1301
+#: ../src/x_dialog.c:1308
 msgid "Fill Type:"
 msgstr "Tipo di riempimento:"
 
-#: src/x_dialog.c:1305
+#: ../src/x_dialog.c:1312
 msgid "Line Width:"
 msgstr "Larghezza linea:"
 
-#: src/x_dialog.c:1309
+#: ../src/x_dialog.c:1316
 msgid "Angle 1:"
 msgstr "Angolo 1:"
 
-#: src/x_dialog.c:1313
+#: ../src/x_dialog.c:1320
 msgid "Pitch 1:"
 msgstr "Livello 1:"
 
-#: src/x_dialog.c:1317
+#: ../src/x_dialog.c:1324
 msgid "Angle 2:"
 msgstr "Angolo 2:"
 
-#: src/x_dialog.c:1321
+#: ../src/x_dialog.c:1328
 msgid "Pitch 2:"
 msgstr "Livello 2:"
 
-#: src/x_dialog.c:1483
+#: ../src/x_dialog.c:1490
 msgid "Arc Params"
 msgstr "Parametri Arco"
 
-#: src/x_dialog.c:1525
+#: ../src/x_dialog.c:1532
 msgid "Start Angle:"
 msgstr "Angolo di Attacco:"
 
-#: src/x_dialog.c:1535
+#: ../src/x_dialog.c:1542
 msgid "Degrees of Sweep:"
 msgstr "Gradi di sviluppo dell'arco:"
 
-#: src/x_dialog.c:1636
+#: ../src/x_dialog.c:1643
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
 msgstr ""
 
-#: src/x_dialog.c:1704
+#: ../src/x_dialog.c:1711
 msgid "Text Size"
 msgstr "Dimensione Testo"
 
-#: src/x_dialog.c:1736
+#: ../src/x_dialog.c:1743
 msgid "Enter new text size:"
 msgstr "Inserisci nuova ampiezza del testo:"
 
-#: src/x_dialog.c:1811
+#: ../src/x_dialog.c:1818
 msgid "Snap Size"
 msgstr ""
 
-#: src/x_dialog.c:1843
+#: ../src/x_dialog.c:1850
 msgid "Enter new snap grid spacing:"
 msgstr ""
 
-#: src/x_dialog.c:1916
+#: ../src/x_dialog.c:1923
 msgid "Edit slot number"
 msgstr "Modifica numero slot"
 
-#: src/x_dialog.c:1949
+#: ../src/x_dialog.c:1956
 msgid "Edit slot number:"
 msgstr "Modifica numero slot:"
 
-#: src/x_dialog.c:2011
+#: ../src/x_dialog.c:2018
 msgid "About..."
 msgstr "Altro..."
 
-#: src/x_dialog.c:2031
+#: ../src/x_dialog.c:2038
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Electronic Design Automation</b>"
 
-#: src/x_dialog.c:2035
+#: ../src/x_dialog.c:2042
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>versione di gschem %s%s.%s</b>"
 
-#: src/x_dialog.c:2043
+#: ../src/x_dialog.c:2050
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1739,98 +1757,101 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "...e molti altri (leggere il file AUTHORS)"
 
-#: src/x_dialog.c:2107
+#: ../src/x_dialog.c:2115
 msgid "Coords"
 msgstr "Coordinate"
 
-#: src/x_dialog.c:2128
+#: ../src/x_dialog.c:2136
 msgid "Screen"
 msgstr "Schermo"
 
-#: src/x_dialog.c:2137
+#: ../src/x_dialog.c:2145
 msgid "World"
 msgstr ""
 
-#: src/x_dialog.c:2360
+#: ../src/x_dialog.c:2360
 #, 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:2423
+#: ../src/x_dialog.c:2423
 msgid "Color Edit"
 msgstr "Modifica Colore"
 
-#: src/x_dialog.c:2456
+#: ../src/x_dialog.c:2456
 msgid "Object color:"
 msgstr "Colore dell'oggetto:"
 
-#: src/x_dialog.c:2581
+#: ../src/x_dialog.c:2581
 msgid "Function"
 msgstr "Funzione"
 
-#: src/x_dialog.c:2588
+#: ../src/x_dialog.c:2588
 msgid "Keystroke(s)"
 msgstr ""
 
-#: src/x_dialog.c:2920
+#: ../src/x_dialog.c:2901
 msgid "Find Text"
 msgstr "Trova testo"
 
-#: src/x_dialog.c:2953
+#: ../src/x_dialog.c:2934
 msgid "Text to find:"
 msgstr "Testo da cercare:"
 
-#: src/x_dialog.c:2963
+#: ../src/x_dialog.c:2944
 msgid "descend into hierarchy"
 msgstr "discende nella gerarchia"
 
-#: src/x_dialog.c:3027
+#: ../src/x_dialog.c:3008
 msgid "Hide Text"
 msgstr "Nascondi testo"
 
-#: src/x_dialog.c:3060
+#: ../src/x_dialog.c:3041
 msgid "Hide text starting with:"
 msgstr "Nascondi il testo iniziando con:"
 
-#: src/x_dialog.c:3128
+#: ../src/x_dialog.c:3109
 msgid "Show Text"
 msgstr "Mostra testo"
 
-#: src/x_dialog.c:3161
+#: ../src/x_dialog.c:3142
 msgid "Show text starting with:"
 msgstr "Mostra il testo iniziando con:"
 
-#: src/x_dialog.c:3606 src/x_multiattrib.c:1607
+#. GtkTreeViewColumn
+#: ../src/x_dialog.c:3587 ../src/x_multiattrib.c:1597
 msgid "Name"
 msgstr "Nome"
 
-#: src/x_dialog.c:3628
+#: ../src/x_dialog.c:3609
 msgid "S_elect the schematics you want to save:"
 msgstr "S_eleziona lo schematico che vuoi salvare:"
 
-#: src/x_dialog.c:3722
+#: ../src/x_dialog.c:3703
 #, 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:3728
+#: ../src/x_dialog.c:3709
 #, c-format
-msgid "There are %d schematics with unsaved changes. Save changes before closing?"
+msgid ""
+"There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
-"Ci sono %d schemi che presentano cambi non salvati. Salvare i cambi prima "
-"di chiudere?"
+"Ci sono %d schemi che presentano cambi non salvati. Salvare i cambi prima di "
+"chiudere?"
 
-#: src/x_dialog.c:3757
+#. secondary label
+#: ../src/x_dialog.c:3738
 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:3777
+#: ../src/x_dialog.c:3758
 msgid "_Close without saving"
 msgstr "_Chiudi senza salvare"
 
-#: src/x_dialog.c:4098
+#: ../src/x_dialog.c:4094
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1840,56 +1861,75 @@ msgid ""
 "The name cannot end with a space.\n"
 "The value cannot start with a space."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Il valore di ingresso \"%s\" non è valido\n"
+"<span weight=\"bold\" size=\"larger\">Il valore di ingresso \"%s\" non è "
+"valido\n"
 "Inserire un valore corretto per continuare</span>\n"
 "\n"
 "Il nome e il valore devono essere campi non vuoti.\n"
 "Il nome non deve terminare con uno spazio.\n"
 "Il valore non deve iniziare con uno spazio."
 
-#: src/x_dialog.c:4100
+#: ../src/x_dialog.c:4096
 msgid "Invalid Attribute"
 msgstr "Caratteristica non valida"
 
-#: src/x_fileselect.c:47
+#: ../src/x_fileselect.c:48
 msgid "Schematics"
 msgstr "Schematici"
 
-#: src/x_fileselect.c:52
+#: ../src/x_fileselect.c:53
 msgid "Symbols"
 msgstr "Simboli"
 
-#: src/x_fileselect.c:57
+#: ../src/x_fileselect.c:58
 msgid "Schematics and symbols"
 msgstr "Schematici e Simboli"
 
-#: src/x_fileselect.c:63
+#: ../src/x_fileselect.c:64
 msgid "All files"
 msgstr "Tutti i File"
 
-#: src/x_fileselect.c:176
+#: ../src/x_fileselect.c:177
 msgid "Open..."
 msgstr "Apri..."
 
-#: src/x_fileselect.c:237
+#: ../src/x_fileselect.c:238
 msgid "Save as..."
 msgstr "Salva con nome..."
 
-#: src/x_image.c:180
+#: ../src/x_fileselect.c:286
+#, c-format
+msgid ""
+"The selected file `%s' already exists.\n"
+"\n"
+"Would you like to overwrite it?"
+msgstr ""
+
+#: ../src/x_fileselect.c:289
+#, fuzzy
+msgid "Overwrite file?"
+msgstr "Nuovo file"
+
+#: ../src/x_fileselect.c:291
+msgid "Save cancelled on user request\n"
+msgstr ""
+
+#. WK - catch EPS export case
+#: ../src/x_image.c:181
 msgid "Encapsulated Postscript"
 msgstr "formato eps (Encapsulated Postscript)"
 
-#: src/x_image.c:298
+#: ../src/x_image.c:304
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: non è possibile scrivere il file eps %s.\n"
 
-#: src/x_image.c:379
+#: ../src/x_image.c:385
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr ""
 
-#: src/x_image.c:389
+#: ../src/x_image.c:395
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -1898,243 +1938,256 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: src/x_image.c:408
+#: ../src/x_image.c:414
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Scritta immagine a colori per [%s] [%d x %d]\n"
 
-#: src/x_image.c:410
+#: ../src/x_image.c:416
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Scritta immagine in bianco e nero per [%s] [%d x %d]\n"
 
-#: src/x_image.c:420
+#: ../src/x_image.c:426
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 "x_image_lowlevel: incapace ad ottenere immagine pixbuf dalla finestra di "
 "gschem.\n"
 
-#: src/x_image.c:466
+#: ../src/x_image.c:472
 msgid "Width x Height"
 msgstr "Larghezza x Altezza"
 
-#: src/x_image.c:482
+#: ../src/x_image.c:488
 msgid "Image type"
 msgstr "Tipo di immagine"
 
-#: src/x_log.c:236
+#: ../src/x_log.c:252
 msgid "Status"
 msgstr "Stato"
 
-#: src/x_menus.c:41
+#: ../src/x_menus.c:42
 msgid "/Add Net"
 msgstr "/Aggiungi Net"
 
-#: src/x_menus.c:42
+#: ../src/x_menus.c:43
 msgid "/Add Attribute..."
 msgstr "/Aggiungi Attributo..."
 
-#: src/x_menus.c:43
+#: ../src/x_menus.c:44
 msgid "/Add Component..."
 msgstr "/Aggiungi Componente..."
 
-#: src/x_menus.c:44
+#: ../src/x_menus.c:45
 msgid "/Add Bus"
 msgstr "/Aggiungi Bus"
 
-#: src/x_menus.c:45
+#: ../src/x_menus.c:46
 msgid "/Add Text"
 msgstr "/Aggiungi Testo"
 
-#: src/x_menus.c:47
+#: ../src/x_menus.c:48
 msgid "/Zoom In"
 msgstr "/Ingrandisci"
 
-#: src/x_menus.c:48
+#: ../src/x_menus.c:49
 msgid "/Zoom Out"
 msgstr "/Riduci"
 
-#: src/x_menus.c:49
+#: ../src/x_menus.c:50
 msgid "/Zoom Box"
 msgstr "/Ingrandisci Riquadro"
 
-#: src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Zoom Extents"
 msgstr "/Adatta alla pagina"
 
-#: src/x_menus.c:52
+#: ../src/x_menus.c:53
 msgid "/Select"
 msgstr "/Seleziona"
 
-#: src/x_menus.c:53
+#: ../src/x_menus.c:54
 msgid "/Edit..."
 msgstr "/Modifica..."
 
-#: src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Copy"
 msgstr "/Copia"
 
-#: src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Move"
 msgstr "/Sposta"
 
-#: src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Delete"
 msgstr "/Cancella"
 
-#: src/x_menus.c:59
+#: ../src/x_menus.c:60
 msgid "/Down Schematic"
 msgstr "/Rilascia schematico"
 
-#: src/x_menus.c:60
+#: ../src/x_menus.c:61
 msgid "/Down Symbol"
 msgstr "/Rilascia simbolo"
 
-#: src/x_menus.c:61
+#: ../src/x_menus.c:62
 msgid "/Up"
 msgstr "/Sopra"
 
-#: src/x_menus.c:332
-msgid "Tried to set the sensitivity on a non-existent menu item\n"
+#: ../src/x_menus.c:333
+#, 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:356
+#: ../src/x_menus.c:357
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "La voce Popup_menu_item_factory non esiste!\n"
 
-#: src/x_menus.c:369
+#: ../src/x_menus.c:370
 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"
+msgstr ""
+"Provato a impostare la sensibilità su una finestra di popup menu_itemi\n"
 
-#: src/x_menus.c:482
+#. Remove this entry from all menus
+#: ../src/x_menus.c:482
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Non è possibile aprire il file %s\n"
 
-#: src/x_menus.c:542
+#: ../src/x_menus.c:543
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/x_multiattrib.c:718
+#: ../src/x_multiattrib.c:708
 msgid "Attributes with empty name are not allowed. Please set a name."
-msgstr "Attributi con il nome vuoto non sono permessi. Per favore inserisci un nome."
+msgstr ""
+"Attributi con il nome vuoto non sono permessi. Per favore inserisci un nome."
 
-#: src/x_multiattrib.c:1228
+#: ../src/x_multiattrib.c:1218
 msgid "Show Value only"
 msgstr "Mostra solo il Valore"
 
-#: src/x_multiattrib.c:1230
+#: ../src/x_multiattrib.c:1220
 msgid "Show Name only"
 msgstr "Mostra solo il Nome"
 
-#: src/x_multiattrib.c:1257
+#: ../src/x_multiattrib.c:1247
 msgid "Duplicate"
 msgstr "Duplicare"
 
-#: src/x_multiattrib.c:1534
+#: ../src/x_multiattrib.c:1524
 msgid "Edit Attributes"
 msgstr "Modifica Caratteristiche"
 
-#: src/x_multiattrib.c:1632
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1622
 msgid "Value"
 msgstr "Valore"
 
-#: src/x_multiattrib.c:1654
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1644
 msgid "Vis?"
 msgstr "Vis?"
 
-#: src/x_multiattrib.c:1674
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1664
 msgid "N"
 msgstr "N"
 
-#: src/x_multiattrib.c:1694
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1684
 msgid "V"
 msgstr "V"
 
-#: src/x_multiattrib.c:1715
+#: ../src/x_multiattrib.c:1705
 msgid "Add Attribute"
 msgstr "Aggiungi Attributo"
 
-#: src/x_pagesel.c:263
+#: ../src/x_pagesel.c:264
 msgid "Discard Page"
 msgstr "Abbandona la pagina"
 
-#: src/x_pagesel.c:382
+#: ../src/x_pagesel.c:383
 msgid "Page Manager"
 msgstr "Gestore Pagina"
 
-#: src/x_pagesel.c:438
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:439
 msgid "Filename"
 msgstr "Nome file"
 
-#: src/x_pagesel.c:454
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:455
 msgid "Changed"
 msgstr "Cambiato"
 
-#: src/x_pagesel.c:474
+#. GtkLabel
+#: ../src/x_pagesel.c:475
 msgid "Right click on the filename for more options..."
 msgstr ""
 "Clicca con il tasto destro del mouse sul nome del file per ulteriori "
 "opzioni..."
 
-#: src/x_print.c:89
+#: ../src/x_print.c:90
 msgid "Select PostScript Filename..."
 msgstr "Seleziona il nome del file Psotscript..."
 
-#: src/x_print.c:171
+#: ../src/x_print.c:172
 msgid "Extents with margins"
 msgstr "Estensioni con margini"
 
-#: src/x_print.c:177
+#: ../src/x_print.c:178
 msgid "Extents no margins"
 msgstr "Estensioni senza margini"
 
-#: src/x_print.c:183
+#: ../src/x_print.c:184
 msgid "Current Window"
 msgstr "Finestra Corrente"
 
-#: src/x_print.c:217
+#: ../src/x_print.c:218
 msgid "Landscape"
 msgstr "Landscape"
 
-#: src/x_print.c:223
+#: ../src/x_print.c:224
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/x_print.c:291
+#. Upper frame
+#: ../src/x_print.c:292
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: src/x_print.c:303
+#: ../src/x_print.c:304
 msgid "Output paper size:"
 msgstr "Ampiezza del foglio:"
 
-#: src/x_print.c:325
+#: ../src/x_print.c:326
 msgid "Orientation:"
 msgstr "Orientazione:"
 
-#: src/x_print.c:337
+#. Lower frame
+#: ../src/x_print.c:338
 msgid "Destination"
 msgstr "Destinazione"
 
-#: src/x_print.c:350
+#: ../src/x_print.c:351
 msgid "File:"
 msgstr "File:"
 
-#: src/x_print.c:380
+#: ../src/x_print.c:381
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/x_print.c:750
+#: ../src/x_print.c:751
 msgid "No print destination specified\n"
 msgstr "Non è stata specificata nessuna stampante\n"
 
-#: src/x_print.c:757
+#: ../src/x_print.c:758
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Non è possibile stampare lo schema corrente in [%s]\n"
 
-#: src/x_print.c:766
+#: ../src/x_print.c:767
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2143,73 +2196,73 @@ msgstr ""
 "Errore nella stampa del file '%s'\n"
 "Verifica la finestra di stato per maggiori informazioni"
 
-#: src/x_print.c:773
+#: ../src/x_print.c:774
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Lo schema corrente è stato stampato in [%s]\n"
 
-#: src/x_window.c:176
+#: ../src/x_window.c:86
 msgid "black"
 msgstr "nero"
 
-#: src/x_window.c:185
+#: ../src/x_window.c:95
 msgid "white"
 msgstr "bianco"
 
-#: src/x_window.c:219
+#: ../src/x_window.c:129
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Impossibile l'allocazione di gc\n"
 
-#: src/x_window.c:232
+#: ../src/x_window.c:142
 #, c-format
 msgid "Couldn't allocate xor_gc\n"
 msgstr "Impossibile l'allocazione di xor_gc\n"
 
-#: src/x_window.c:245
+#: ../src/x_window.c:155
 #, c-format
 msgid "Couldn't allocate outline_xor_gc\n"
 msgstr "Impossibile l'allocazione di outline_xor_gc\n"
 
-#: src/x_window.c:261
+#: ../src/x_window.c:171
 #, c-format
 msgid "Couldn't allocate bounding_xor_gc\n"
 msgstr "Impossibile l'allocazione di bounding_xor_gc\n"
 
-#: src/x_window.c:268
+#: ../src/x_window.c:178
 #, c-format
 msgid "Couldn't allocate bus_gc\n"
 msgstr "Impossibile l'allocazione di bus_gc\n"
 
-#: src/x_window.c:490
+#: ../src/x_window.c:402
 msgid "New file"
 msgstr "Nuovo file"
 
-#: src/x_window.c:496
+#: ../src/x_window.c:408
 msgid "Open"
 msgstr "Apri"
 
-#: src/x_window.c:497
+#: ../src/x_window.c:409
 msgid "Open file..."
 msgstr "Apri file..."
 
-#: src/x_window.c:503
+#: ../src/x_window.c:415
 msgid "Save"
 msgstr "Salva"
 
-#: src/x_window.c:504
+#: ../src/x_window.c:416
 msgid "Save file"
 msgstr "Salva file"
 
-#: src/x_window.c:512
+#: ../src/x_window.c:424
 msgid "Undo last operation"
 msgstr "Annulla l'ultima operazione"
 
-#: src/x_window.c:519
+#: ../src/x_window.c:431
 msgid "Redo last undo"
 msgstr "Ripristina ultima operazione annullata"
 
-#: src/x_window.c:528
+#: ../src/x_window.c:440
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2223,7 +2276,7 @@ msgstr ""
 "Il tasto destro del mouse serve ad abbandonare il componente al fine di "
 "sceglierne un altro."
 
-#: src/x_window.c:538
+#: ../src/x_window.c:450
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2232,7 +2285,7 @@ msgstr ""
 "Tasto destro del mouse per\n"
 "cancellare il collegamento"
 
-#: src/x_window.c:548
+#: ../src/x_window.c:460
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2241,73 +2294,107 @@ msgstr ""
 "Tasto destro del mouse per\n"
 "cancellare il collegamento"
 
-#: src/x_window.c:555
+#: ../src/x_window.c:467
 msgid "Text"
 msgstr "Testo"
 
-#: src/x_window.c:556
+#: ../src/x_window.c:468
 msgid "Add Text..."
 msgstr "Aggiungi Testo..."
 
-#: src/x_window.c:566
+#: ../src/x_window.c:478
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/x_window.c:567
+#: ../src/x_window.c:479
 msgid "Select mode"
 msgstr "Modalità Selezione"
 
-#: src/x_window.c:642
+#: ../src/x_window.c:554
 msgid "Pick"
 msgstr "Prendi"
 
-#: src/x_window.c:658
+#: ../src/x_window.c:570
 msgid "Repeat/none"
 msgstr "Ripeti/Niente"
 
-#: src/x_window.c:668
+#: ../src/x_window.c:580
 msgid "Menu/Cancel"
 msgstr "Menù/Cancella"
 
-#: src/x_window.c:670
+#: ../src/x_window.c:582
 msgid "Pan/Cancel"
 msgstr "Pan/Cancella"
 
-#: src/x_window.c:926
+#: ../src/x_window.c:809
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Caricamento schema [%s]\n"
 
-#: src/x_window.c:1028
+#: ../src/x_window.c:821
+#, fuzzy
+msgid "Failed to load file"
+msgstr "Fallito il caricamento dell'immagine: [%s]"
+
+#: ../src/x_window.c:830
+#, fuzzy, c-format
+msgid "New file [%s]\n"
+msgstr "Nuovo file"
+
+#. an error occured when saving page to file
+#: ../src/x_window.c:936
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Non è possibile salvare la pagina [%s]\n"
 
-#: src/x_window.c:1029
+#: ../src/x_window.c:937
 msgid "Error while trying to save"
 msgstr "Errore durante il salvataggio"
 
-#: src/x_window.c:1038
+#: ../src/x_window.c:946
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Salvato con il nome [%s]\n"
 
-#: src/x_window.c:1040
+#: ../src/x_window.c:948
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Salvato [%s]\n"
 
-#: src/x_window.c:1042
+#: ../src/x_window.c:950
 msgid "Saved"
 msgstr "Salvato"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Annulla pagina [%s]\n"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Chiusura [%s]\n"
 
+#: ../data/geda-gschem.desktop.in.h:1
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
+#: ../data/geda-gschem.desktop.in.h:2
+#, fuzzy
+msgid "gEDA Schematic Editor"
+msgstr "Scarica Schematico"
+
+#~ msgid "Attribute Mode"
+#~ msgstr "Modalità Caratteristica"
+
+#~ msgid "Got NULL in o_complex_translate_display_selection\n"
+#~ msgstr "Ottenuto un NULLO in o_complex_translate_display_selection\n"
+
+#~ msgid "Got NULL in o_complex_translate_selection!\n"
+#~ msgstr "Ottenuto un NULLO in o_complex_translate_selection!\n"
+
+#~ msgid "ERROR: NULL object in o_rotate_90!\n"
+#~ msgstr "ERRORE: oggetto NULLO in o_rotate_90!\n"
+
+#~ msgid "ERROR: NULL object in o_mirror!\n"
+#~ msgstr "ERRORE: oggetto NULLO in o_mirror!\n"
diff --git a/gschem/po/ja_JP.po b/gschem/po/ja_JP.po
index c817711..d0040ec 100644
--- a/gschem/po/ja_JP.po
+++ b/gschem/po/ja_JP.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: 2007-09-02 21:10-0400\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2002-10-05 20:00+0900\n"
 "Last-Translator: MIYAMOTO Takanori <pnms@xxxxxxxxxxxxxxx>\n"
 "Language-Team: japanese <ja@xxxxxx>\n"
@@ -15,601 +15,610 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/rcstrings.c:2
+#: ../src/rcstrings.c:2
 msgid "File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: src/rcstrings.c:3
+#: ../src/rcstrings.c:3
 msgid "New Window"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦"
 
-#: src/rcstrings.c:4 src/x_pagesel.c:258
+#: ../src/rcstrings.c:4 ../src/x_pagesel.c:259
 msgid "New Page"
 msgstr "¿·µ¬¥Ú¡¼¥¸"
 
-#: src/rcstrings.c:5 src/x_pagesel.c:259
+#: ../src/rcstrings.c:5 ../src/x_pagesel.c:260
 msgid "Open Page..."
 msgstr "³«¤¯..."
 
-#: src/rcstrings.c:6 src/x_pagesel.c:262
+#: ../src/rcstrings.c:6 ../src/x_pagesel.c:263
 msgid "Close Page"
 msgstr "ÊĤ¸¤ë"
 
-#: src/rcstrings.c:7
+#: ../src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Ì᤹"
 
-#: src/rcstrings.c:8 src/x_pagesel.c:261
+#: ../src/rcstrings.c:8 ../src/x_pagesel.c:262
 msgid "Save Page"
 msgstr "Êݸ"
 
-#: src/rcstrings.c:9
+#: ../src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "̾Á°¤òÉÕ¤±¤ÆÊݸ..."
 
-#: src/rcstrings.c:10
+#: ../src/rcstrings.c:10
 msgid "Save All"
 msgstr "¤¹¤Ù¤ÆÊݸ"
 
-#: src/rcstrings.c:11 src/x_print.c:283
+#. GtkWindow
+#: ../src/rcstrings.c:11 ../src/x_print.c:284
 msgid "Print..."
 msgstr "°õºþ..."
 
-#: src/rcstrings.c:12 src/x_image.c:503
+#. Create the dialog
+#: ../src/rcstrings.c:12 ../src/x_image.c:509
 #, fuzzy
 msgid "Write image..."
 msgstr "¥¤¥á¡¼¥¸½ÐÎÏ..."
 
-#: src/rcstrings.c:13 src/x_menus.c:524
+#: ../src/rcstrings.c:13 ../src/x_menus.c:525
 #, fuzzy
 msgid "Recent files"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
 
-#: src/rcstrings.c:14 src/x_script.c:50
+#: ../src/rcstrings.c:14 ../src/x_script.c:51
 msgid "Execute Script..."
 msgstr "¥¹¥¯¥ê¥×¥È¼Â¹Ô..."
 
-#: src/rcstrings.c:15
+#: ../src/rcstrings.c:15
 msgid "Close Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
 
-#: src/rcstrings.c:16
+#: ../src/rcstrings.c:16
 msgid "Quit"
 msgstr "½ªÎ»"
 
-#: src/rcstrings.c:18 src/i_callbacks.c:730
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:732
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: src/rcstrings.c:19 src/x_window.c:511
+#: ../src/rcstrings.c:19 ../src/x_window.c:423
 msgid "Undo"
 msgstr "¥¢¥ó¥É¥¥"
 
-#: src/rcstrings.c:20 src/x_window.c:518
+#: ../src/rcstrings.c:20 ../src/x_window.c:430
 msgid "Redo"
 msgstr "¥ê¥É¥¥"
 
-#: src/rcstrings.c:21 src/i_basic.c:81 src/x_window.c:682
+#: ../src/rcstrings.c:21 ../src/i_basic.c:81 ../src/x_window.c:594
 msgid "Select Mode"
 msgstr "ÁªÂò¥â¡¼¥É"
 
-#: src/rcstrings.c:22
+#: ../src/rcstrings.c:22
 #, fuzzy
 msgid "Cut Buffer"
 msgstr "¥Ð¥Ã¥Õ¥¡"
 
-#: src/rcstrings.c:23
+#: ../src/rcstrings.c:23
 #, fuzzy
 msgid "Copy Buffer"
 msgstr "¥Ð¥Ã¥Õ¥¡"
 
-#: src/rcstrings.c:24
+#: ../src/rcstrings.c:24
 #, fuzzy
 msgid "Paste Buffer"
 msgstr "¥Ð¥Ã¥Õ¥¡"
 
-#: src/rcstrings.c:25
+#: ../src/rcstrings.c:25
 msgid "Edit..."
 msgstr "ÊÔ½¸..."
 
-#: src/rcstrings.c:26
+#: ../src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "¥Æ¥­¥¹¥ÈÊÔ½¸..."
 
-#: src/rcstrings.c:27 src/i_basic.c:94
+#: ../src/rcstrings.c:27 ../src/i_basic.c:91
 msgid "Copy Mode"
 msgstr "¥³¥Ô¡¼¥â¡¼¥É"
 
-#: src/rcstrings.c:28 src/i_basic.c:149
+#: ../src/rcstrings.c:28 ../src/i_basic.c:146
 #, fuzzy
 msgid "Multiple Copy Mode"
 msgstr "¥³¥Ô¡¼¥â¡¼¥É"
 
-#: src/rcstrings.c:29 src/i_basic.c:97
+#: ../src/rcstrings.c:29 ../src/i_basic.c:94
 msgid "Move Mode"
 msgstr "°ÜÆ°¥â¡¼¥É"
 
-#: src/rcstrings.c:30 src/i_callbacks.c:706 src/x_multiattrib.c:1258
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:708 ../src/x_multiattrib.c:1248
 msgid "Delete"
 msgstr "ºï½ü"
 
-#: src/rcstrings.c:31
+#: ../src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "90ÅÙ²óž¥â¡¼¥É"
 
-#: src/rcstrings.c:32 src/i_basic.c:101
+#: ../src/rcstrings.c:32 ../src/i_basic.c:98
 msgid "Mirror Mode"
 msgstr "ȿž¥â¡¼¥É"
 
-#: src/rcstrings.c:33
+#: ../src/rcstrings.c:33
 msgid "Slot..."
 msgstr "¥¹¥í¥Ã¥È..."
 
-#: src/rcstrings.c:34
+#: ../src/rcstrings.c:34
 msgid "Color..."
 msgstr "¿§..."
 
-#: src/rcstrings.c:35 src/i_callbacks.c:952
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:952
 msgid "Lock"
 msgstr "¥í¥Ã¥¯"
 
-#: src/rcstrings.c:36 src/i_callbacks.c:970
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:970
 msgid "Unlock"
 msgstr "¥í¥Ã¥¯²ò½ü"
 
-#: src/rcstrings.c:37
+#: ../src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Àþ¼ï¤ÈÉý..."
 
-#: src/rcstrings.c:38
+#: ../src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Åɤê¤Ä¤Ö¤·¼ïÎà..."
 
-#: src/rcstrings.c:39
+#: ../src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "¥·¥ó¥Ü¥ëžÁ÷..."
 
-#: src/rcstrings.c:40
+#: ../src/rcstrings.c:40
 #, fuzzy
 msgid "Embed Component/Picture"
 msgstr "ÁȤ߹þ¤à"
 
-#: src/rcstrings.c:41
+#: ../src/rcstrings.c:41
 #, fuzzy
 msgid "Unembed Component/Picture"
 msgstr "ÁȤ߹þ¤ß²ò½ü"
 
-#: src/rcstrings.c:42
+#: ../src/rcstrings.c:42
 msgid "Update Component"
 msgstr "ÉôÉʹ¹¿·"
 
-#: src/rcstrings.c:43
+#: ../src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "¥Æ¥­¥¹¥Èɽ¼¨/Èóɽ¼¨"
 
-#: src/rcstrings.c:44
+#: ../src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "±£¤·¥Æ¥­¥¹¥Èɽ¼¨"
 
-#: src/rcstrings.c:46
+#: ../src/rcstrings.c:46
 msgid "Buffer"
 msgstr "¥Ð¥Ã¥Õ¥¡"
 
-#: src/rcstrings.c:47
+#: ../src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "¥³¥Ô¡¼1"
 
-#: src/rcstrings.c:48
+#: ../src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "¥³¥Ô¡¼2"
 
-#: src/rcstrings.c:49
+#: ../src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "¥³¥Ô¡¼3"
 
-#: src/rcstrings.c:50
+#: ../src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "¥³¥Ô¡¼4"
 
-#: src/rcstrings.c:51
+#: ../src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "¥³¥Ô¡¼5"
 
-#: src/rcstrings.c:52
+#: ../src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "¥«¥Ã¥È1"
 
-#: src/rcstrings.c:53
+#: ../src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "¥«¥Ã¥È2"
 
-#: src/rcstrings.c:54
+#: ../src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "¥«¥Ã¥È3"
 
-#: src/rcstrings.c:55
+#: ../src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "¥«¥Ã¥È4"
 
-#: src/rcstrings.c:56
+#: ../src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "¥«¥Ã¥È5"
 
-#: src/rcstrings.c:57
+#: ../src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "¥Ú¡¼¥¹¥È1"
 
-#: src/rcstrings.c:58
+#: ../src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "¥Ú¡¼¥¹¥È2"
 
-#: src/rcstrings.c:59
+#: ../src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "¥Ú¡¼¥¹¥È3"
 
-#: src/rcstrings.c:60
+#: ../src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "¥Ú¡¼¥¹¥È4"
 
-#: src/rcstrings.c:61
+#: ../src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "¥Ú¡¼¥¹¥È5"
 
-#: src/rcstrings.c:63
+#: ../src/rcstrings.c:63
 msgid "View"
 msgstr "ɽ¼¨"
 
-#: src/rcstrings.c:64
+#: ../src/rcstrings.c:64
 msgid "Redraw"
 msgstr "²èÌ̹¹¿·"
 
-#: src/rcstrings.c:65 src/i_callbacks.c:1537 src/i_callbacks.c:1606
+#. I don't know if this would get in the way
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1542 ../src/i_callbacks.c:1611
 msgid "Pan"
 msgstr "¥Ñ¥ó"
 
-#: src/rcstrings.c:66 src/i_basic.c:105
+#: ../src/rcstrings.c:66 ../src/i_basic.c:102
 msgid "Zoom Box"
 msgstr "³ÈÂç"
 
-#: src/rcstrings.c:67
+#: ../src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "³ÈÂçÈÏ°Ï"
 
-#: src/rcstrings.c:68
+#: ../src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "³ÈÂç"
 
-#: src/rcstrings.c:69
+#: ../src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "½Ì¾®"
 
-#: src/rcstrings.c:70
+#: ../src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "ºÇÂç³ÈÂç"
 
-#: src/rcstrings.c:72
+#: ../src/rcstrings.c:72
 msgid "Page"
 msgstr "¥Ú¡¼¥¸"
 
-#: src/rcstrings.c:73
+#: ../src/rcstrings.c:73
 msgid "Manager..."
 msgstr "¥Þ¥Í¡¼¥¸¥ã..."
 
-#: src/rcstrings.c:74
+#: ../src/rcstrings.c:74
 msgid "Next"
 msgstr "¼¡"
 
-#: src/rcstrings.c:75
+#: ../src/rcstrings.c:75
 msgid "Previous"
 msgstr "Á°"
 
-#: src/rcstrings.c:76 src/x_window.c:489
+#: ../src/rcstrings.c:76 ../src/x_window.c:401
 msgid "New"
 msgstr "¿·µ¬"
 
-#: src/rcstrings.c:77
+#: ../src/rcstrings.c:77
 msgid "Revert"
 msgstr "Ìá¤ë"
 
-#: src/rcstrings.c:78
+#: ../src/rcstrings.c:78
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
-#: src/rcstrings.c:79
+#: ../src/rcstrings.c:79
 msgid "Discard"
 msgstr "ÇË´þ"
 
-#: src/rcstrings.c:81
+#: ../src/rcstrings.c:81
 msgid "Add"
 msgstr "ÄɲÃ"
 
-#: src/rcstrings.c:82
+#: ../src/rcstrings.c:82
 msgid "Component..."
 msgstr "ÉôÉÊ..."
 
-#: src/rcstrings.c:83 src/i_callbacks.c:2358 src/i_callbacks.c:2380
+#. need to click
+#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2340 ../src/i_callbacks.c:2362
 msgid "Net"
 msgstr "¥Í¥Ã¥È"
 
-#: src/rcstrings.c:84 src/i_callbacks.c:2424 src/i_callbacks.c:2447
-#: src/x_window.c:547
+#. need to click
+#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2406 ../src/i_callbacks.c:2429
+#: ../src/x_window.c:459
 msgid "Bus"
 msgstr "¥Ð¥¹"
 
-#: src/rcstrings.c:85
+#: ../src/rcstrings.c:85
 msgid "Attribute..."
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È..."
 
-#: src/rcstrings.c:86
+#: ../src/rcstrings.c:86
 msgid "Text..."
 msgstr "¥Æ¥­¥¹¥È..."
 
-#: src/rcstrings.c:87 src/i_callbacks.c:2528 src/i_callbacks.c:2547
+#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2510 ../src/i_callbacks.c:2529
 msgid "Line"
 msgstr "Àþ"
 
-#: src/rcstrings.c:88 src/i_callbacks.c:2569 src/i_callbacks.c:2588
+#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2551 ../src/i_callbacks.c:2570
 msgid "Box"
 msgstr "¥Ü¥Ã¥¯¥¹"
 
-#: src/rcstrings.c:89 src/i_callbacks.c:2644 src/i_callbacks.c:2664
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2626 ../src/i_callbacks.c:2646
 msgid "Circle"
 msgstr "±ß"
 
-#: src/rcstrings.c:90 src/i_callbacks.c:2686 src/i_callbacks.c:2705
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2668 ../src/i_callbacks.c:2687
 msgid "Arc"
 msgstr "±ß¸Ì"
 
-#: src/rcstrings.c:91 src/i_callbacks.c:2727 src/i_callbacks.c:2746
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2709 ../src/i_callbacks.c:2728
 msgid "Pin"
 msgstr "¥Ô¥ó"
 
-#: src/rcstrings.c:92
+#: ../src/rcstrings.c:92
 #, fuzzy
 msgid "Picture..."
 msgstr "°õºþ..."
 
-#: src/rcstrings.c:94
+#: ../src/rcstrings.c:94
 msgid "Hierarchy"
 msgstr "³¬ÁØ"
 
-#: src/rcstrings.c:95
+#: ../src/rcstrings.c:95
 msgid "Down Schematic"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 
-#: src/rcstrings.c:96
+#: ../src/rcstrings.c:96
 msgid "Down Symbol"
 msgstr "¥·¥ó¥Ü¥ë¤Ø"
 
-#: src/rcstrings.c:97
+#: ../src/rcstrings.c:97
 msgid "Up"
 msgstr "¾å¤Ø"
 
-#: src/rcstrings.c:98
+#: ../src/rcstrings.c:98
 msgid "Documentation"
 msgstr "¥É¥­¥å¥á¥ó¥Èɽ¼¨/¸¡º÷"
 
-#: src/rcstrings.c:100 src/x_multiattrib.c:1549
+#. GtkFrame
+#: ../src/rcstrings.c:100 ../src/x_multiattrib.c:1539
 msgid "Attributes"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È"
 
-#: src/rcstrings.c:101 src/i_callbacks.c:3011
+#: ../src/rcstrings.c:101 ../src/i_callbacks.c:2993
 msgid "Attach"
 msgstr "¥¢¥¿¥Ã¥Á"
 
-#: src/rcstrings.c:102 src/i_callbacks.c:3060
+#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3042
 msgid "Detach"
 msgstr "¥¢¥¿¥Ã¥Á²ò½ü"
 
-#: src/rcstrings.c:103
+#: ../src/rcstrings.c:103
 msgid "Show Value"
 msgstr "ÃÍɽ¼¨"
 
-#: src/rcstrings.c:104
+#: ../src/rcstrings.c:104
 msgid "Show Name"
 msgstr "̾Á°É½¼¨"
 
-#: src/rcstrings.c:105
+#: ../src/rcstrings.c:105
 msgid "Show Both"
 msgstr "̾Á°¤ÈÃͤòɽ¼¨"
 
-#: src/rcstrings.c:106
+#: ../src/rcstrings.c:106
 msgid "Toggle Visibility"
 msgstr "ɽ¼¨/Èóɽ¼¨"
 
-#: src/rcstrings.c:107
+#: ../src/rcstrings.c:107
 msgid "Find Specific Text..."
 msgstr "¥Æ¥­¥¹¥È¸¡º÷..."
 
-#: src/rcstrings.c:108
+#: ../src/rcstrings.c:108
 msgid "Hide Specific Text..."
 msgstr "¥Æ¥­¥¹¥È¤ò±£¤¹..."
 
-#: src/rcstrings.c:109
+#: ../src/rcstrings.c:109
 msgid "Show Specific Text..."
 msgstr "¥Æ¥­¥¹¥È¤òɽ¼¨..."
 
-#: src/rcstrings.c:110
+#: ../src/rcstrings.c:110
 msgid "Autonumber Text..."
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥­¥¹¥È"
 
-#: src/rcstrings.c:112
+#: ../src/rcstrings.c:112
 msgid "Options"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: src/rcstrings.c:113
+#: ../src/rcstrings.c:113
 msgid "Text Size..."
 msgstr "¥Æ¥­¥¹¥È¥µ¥¤¥º..."
 
-#: src/rcstrings.c:114
+#: ../src/rcstrings.c:114
 msgid "Toggle Grid On/Off"
 msgstr "¥°¥ê¥Ã¥É ¥ª¥ó/¥ª¥Õ"
 
-#: src/rcstrings.c:115
+#: ../src/rcstrings.c:115
 msgid "Toggle Snap On/Off"
 msgstr "¥¹¥Ê¥Ã¥× ¥ª¥ó/¥ª¥Õ"
 
-#: src/rcstrings.c:116
+#: ../src/rcstrings.c:116
 msgid "Snap Grid Spacing..."
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: src/rcstrings.c:117
+#: ../src/rcstrings.c:117
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: src/rcstrings.c:118
+#: ../src/rcstrings.c:118
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: src/rcstrings.c:119
+#: ../src/rcstrings.c:119
 msgid "Toggle Outline/Box"
 msgstr "¥¢¥¦¥È¥é¥¤¥ó/¥Ü¥Ã¥¯¥¹"
 
-#: src/rcstrings.c:120
+#: ../src/rcstrings.c:120
 msgid "Toggle Net Rubberband"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥ÉÀÚÂؤ¨"
 
-#: src/rcstrings.c:121
+#: ../src/rcstrings.c:121
 msgid "Show Log Window..."
 msgstr "¥í¥°¥¦¥£¥ó¥É¥¦É½¼¨..."
 
-#: src/rcstrings.c:122
+#: ../src/rcstrings.c:122
 msgid "Show Coord Window..."
 msgstr "ºÂɸ¥¦¥£¥ó¥É¥¦É½¼¨..."
 
-#: src/rcstrings.c:124
+#: ../src/rcstrings.c:124
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: src/rcstrings.c:125
+#: ../src/rcstrings.c:125
 #, fuzzy
 msgid "Manual"
 msgstr "¥Þ¥Ë¥å¥¢¥ë..."
 
-#: src/rcstrings.c:126
+#: ../src/rcstrings.c:126
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "¥É¥­¥å¥á¥ó¥Èɽ¼¨/¸¡º÷"
 
-#: src/rcstrings.c:127
+#: ../src/rcstrings.c:127
 msgid "gschem FAQ"
 msgstr ""
 
-#: src/rcstrings.c:128
+#: ../src/rcstrings.c:128
 #, fuzzy
 msgid "Component Documentation"
 msgstr "¥É¥­¥å¥á¥ó¥Èɽ¼¨/¸¡º÷"
 
-#: src/rcstrings.c:129
+#: ../src/rcstrings.c:129
 msgid "About gschem"
 msgstr ""
 
-#: src/rcstrings.c:130 src/x_dialog.c:2517
+#: ../src/rcstrings.c:130 ../src/x_dialog.c:2517
 #, fuzzy
 msgid "Hotkeys"
 msgstr "¥Û¥Ã¥È¥­¡¼..."
 
-#: src/a_zoom.c:245
+#: ../src/a_zoom.c:250
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "¤³¤ì°Ê¾å¥º¡¼¥à¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: src/g_funcs.c:342 src/i_callbacks.c:137
+#. Fork failed. Still in parent process, so can use the log
+#. * window
+#: ../src/g_funcs.c:343 ../src/i_callbacks.c:138
 #, c-format
 msgid "Could not fork\n"
 msgstr ""
 
-#: src/g_funcs.c:358 src/i_callbacks.c:147
+#. if we return, then nothing happened
+#: ../src/g_funcs.c:359 ../src/i_callbacks.c:148
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr ""
 
-#: src/g_funcs.c:364 src/i_callbacks.c:151
+#: ../src/g_funcs.c:365 ../src/i_callbacks.c:152
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr ""
 
-#: src/g_hook.c:88
+#: ../src/g_hook.c:87
 #, c-format
 msgid "Attribute failed ot find.\n"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/g_rc.c:159
+#: ../src/g_rc.c:160
 #, c-format
 msgid "Invalid color [%s] passed to %s\n"
 msgstr "̵¸ú¤Ê¿§[%s]¤¬%s¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:433
+#: ../src/g_rc.c:434
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "̵¸ú¤Ê³ÈÂçΨ[%d]¤¬%s¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:524
+#: ../src/g_rc.c:525
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:551
+#: ../src/g_rc.c:552
 #, fuzzy, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:594
+#: ../src/g_rc.c:595
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1049
+#: ../src/g_rc.c:1050
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "̵¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1289
+#: ../src/g_rc.c:1290
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬bus-ripper¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1364
+#: ../src/g_rc.c:1365
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1405
+#: ../src/g_rc.c:1406
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1449
+#: ../src/g_rc.c:1450
 #, fuzzy, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1473
+#: ../src/g_rc.c:1474
 #, fuzzy, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "̵¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1514
+#: ../src/g_rc.c:1515
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1537
+#: ../src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/g_rc.c:1583
+#: ../src/g_rc.c:1584
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "̵¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/gschem.c:192 src/gschem.c:203
+#: ../src/gschem.c:193 ../src/gschem.c:204
 #, fuzzy, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem¥Ð¡¼¥¸¥ç¥ó%s%s.%s\n"
 
-#: src/gschem.c:195 src/gschem.c:206
+#: ../src/gschem.c:196 ../src/gschem.c:207
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -618,7 +627,7 @@ msgstr ""
 "gEDA/gschem¤Ï´°Á´¤Ë̵ÊݾڤÇÄ󶡤µ¤ì¤Þ¤¹¡£¾Ü¤·¤¯¤ÏCOPYING¥Õ¥¡¥¤¥ë¤ò¤´Í÷¤¯¤À¤µ"
 "¤¤¡£\n"
 
-#: src/gschem.c:197 src/gschem.c:208
+#: ../src/gschem.c:198 ../src/gschem.c:209
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -626,7 +635,7 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¢¤ê¡¢¤¢¤ë¾ò·ï¤Î²¼¤ÇºÆÈÒÉÛ¤¹¤ë¤³¤È¤¬¾©Î夵¤ì¤Æ¤¤¤Þ"
 "¤¹¡£\n"
 
-#: src/gschem.c:199 src/gschem.c:210
+#: ../src/gschem.c:200 ../src/gschem.c:211
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -635,214 +644,212 @@ msgstr ""
 "¾Ü¤·¤¯¤ÏCOPYING¥Õ¥¡¥¤¥ë¤ò¤´Í÷¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: src/gschem.c:214
+#: ../src/gschem.c:215
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "MIGW32ÈǤǤ¹¡£\n"
 
-#: src/gschem.c:218
+#: ../src/gschem.c:219
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr ""
 
-#: src/gschem.c:231
+#: ../src/gschem.c:232
 #, c-format
 msgid "You must set the GEDADATA environment variable!\n"
 msgstr "´Ä¶­ÊÑ¿ôGEDADATA¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤!\n"
 
-#: src/gschem.c:246
+#: ../src/gschem.c:248
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹¡£[%s]\n"
 
-#: src/gschem.c:250 src/gschem.c:253
+#. ! \todo These two messages are the same. Should be
+#. * integrated.
+#: ../src/gschem.c:252 ../src/gschem.c:255
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: src/gschem.c:323
+#: ../src/gschem.c:323
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "scheme¥Ç¥£¥ì¥¯¥È¥ê¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
 
-#: src/gschem.c:330 src/x_script.c:71
+#: ../src/gschem.c:330 ../src/x_script.c:72
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "guile¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Æ¤¤¤Þ¤¹¡£[%s]\n"
 
-#: src/i_basic.c:84
-msgid "Attribute Mode"
-msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È¥â¡¼¥É"
-
-#: src/i_basic.c:87
+#: ../src/i_basic.c:84
 msgid "Component Mode"
 msgstr "ÉôÉʥ⡼¥É"
 
-#: src/i_basic.c:91
+#: ../src/i_basic.c:88
 msgid "Text Mode"
 msgstr "¥Í¥Ã¥È¥â¡¼¥É"
 
-#: src/i_basic.c:99
+#: ../src/i_basic.c:96
 msgid "Rotate Mode"
 msgstr "²óž¥â¡¼¥É"
 
-#: src/i_basic.c:109
+#: ../src/i_basic.c:106
 msgid "Pan Mode"
 msgstr "¥Ñ¥ó¥â¡¼¥É"
 
-#: src/i_basic.c:113
+#: ../src/i_basic.c:110
 #, c-format
 msgid "Paste %d Mode"
 msgstr "¥Ú¡¼¥¹¥È%d¥â¡¼¥É"
 
-#: src/i_basic.c:118
+#: ../src/i_basic.c:115
 msgid "Net Mode"
 msgstr "¥Í¥Ã¥È¥â¡¼¥É"
 
-#: src/i_basic.c:122
+#: ../src/i_basic.c:119
 msgid "Bus Mode"
 msgstr "¥Ð¥¹¥â¡¼¥É"
 
-#: src/i_basic.c:125
+#: ../src/i_basic.c:122
 msgid "Line Mode"
 msgstr "Àþ¥â¡¼¥É"
 
-#: src/i_basic.c:128
+#: ../src/i_basic.c:125
 msgid "Box Mode"
 msgstr "¥Ü¥Ã¥¯¥¹¥â¡¼¥É"
 
-#: src/i_basic.c:131
+#: ../src/i_basic.c:128
 #, fuzzy
 msgid "Picture Mode"
 msgstr "¥Ô¥ó¥â¡¼¥É"
 
-#: src/i_basic.c:134
+#: ../src/i_basic.c:131
 msgid "Circle Mode"
 msgstr "±ß¥â¡¼¥É"
 
-#: src/i_basic.c:137
+#: ../src/i_basic.c:134
 msgid "Arc Mode"
 msgstr "±ß¸Ì¥â¡¼¥É"
 
-#: src/i_basic.c:140
+#: ../src/i_basic.c:137
 msgid "Pin Mode"
 msgstr "¥Ô¥ó¥â¡¼¥É"
 
-#: src/i_basic.c:142 src/i_callbacks.c:587 src/i_callbacks.c:606
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:589 ../src/i_callbacks.c:608
 msgid "Copy"
 msgstr "¥³¥Ô¡¼"
 
-#: src/i_basic.c:144 src/i_callbacks.c:667 src/i_callbacks.c:686
+#: ../src/i_basic.c:141 ../src/i_callbacks.c:669 ../src/i_callbacks.c:688
 msgid "Move"
 msgstr "°ÜÆ°"
 
-#: src/i_basic.c:146 src/i_callbacks.c:627 src/i_callbacks.c:646
+#: ../src/i_basic.c:143 ../src/i_callbacks.c:629 ../src/i_callbacks.c:648
 #, fuzzy
 msgid "Multiple Copy"
 msgstr "¿½Å¥¢¥¿¥Ã¥Á"
 
-#: src/i_basic.c:174
+#: ../src/i_basic.c:172
 msgid "Show Hidden"
 msgstr "±£¤·¥Æ¥­¥¹¥Èɽ¼¨"
 
-#: src/i_basic.c:177
+#: ../src/i_basic.c:175
 msgid "Snap Off"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ"
 
-#: src/i_basic.c:259 src/x_window.c:656
+#: ../src/i_basic.c:256 ../src/x_window.c:568
 msgid "Action"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: src/i_basic.c:267 src/x_window.c:651
+#: ../src/i_basic.c:262 ../src/x_window.c:563
 msgid "Stroke"
 msgstr "¥¹¥È¥í¡¼¥¯"
 
-#: src/i_basic.c:274 src/x_window.c:653
+#: ../src/i_basic.c:268 ../src/x_window.c:565
 msgid "none"
 msgstr "¤Ê¤·"
 
-#: src/i_basic.c:281
+#: ../src/i_basic.c:273
 msgid "Repeat/"
 msgstr "·«¤êÊÖ¤·/"
 
-#: src/i_basic.c:570 src/i_basic.c:575
+#: ../src/i_basic.c:538 ../src/i_basic.c:543
 msgid "OFF"
 msgstr ""
 
-#: src/i_basic.c:579
+#: ../src/i_basic.c:547
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
 
-#: src/i_callbacks.c:132
+#: ../src/i_callbacks.c:133
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr ""
 
-#: src/i_callbacks.c:192 src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:193 ../src/i_callbacks.c:1754
 #, fuzzy, c-format
 msgid "New page created [%s]\n"
 msgstr "¿·µ¬¥Ú¡¼¥¸¤òºîÀ®¤·¤Þ¤·¤¿¡£[%s]\n"
 
-#: src/i_callbacks.c:227 src/x_menus.c:493
+#: ../src/i_callbacks.c:229 ../src/x_menus.c:494
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤òºîÀ®¤·¤Þ¤·¤¿¡£\n"
 
-#: src/i_callbacks.c:345
+#: ../src/i_callbacks.c:347
 #, fuzzy
 msgid "Failed to Save All"
 msgstr "¤¹¤Ù¤ÆÊݸ"
 
-#: src/i_callbacks.c:347
+#: ../src/i_callbacks.c:349
 msgid "Saved All"
 msgstr "¤¹¤Ù¤ÆÊݸ"
 
-#: src/i_callbacks.c:439
+#: ../src/i_callbacks.c:441
 msgid "Closing Window\n"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/i_callbacks.c:591 src/i_callbacks.c:631 src/i_callbacks.c:671
+#: ../src/i_callbacks.c:593 ../src/i_callbacks.c:633 ../src/i_callbacks.c:673
 msgid "Select objs first"
 msgstr "¤Þ¤º¥ª¥Ö¥¸¥§¥¯¥È¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/i_callbacks.c:746
+#: ../src/i_callbacks.c:748
 msgid "Edit Text"
 msgstr "¥Æ¥­¥¹¥ÈÊÔ½¸"
 
-#: src/i_callbacks.c:769
+#: ../src/i_callbacks.c:771
 msgid "Slot"
 msgstr "¥¹¥í¥Ã¥È"
 
-#: src/i_callbacks.c:786
+#: ../src/i_callbacks.c:788
 msgid "Color"
 msgstr "¿§"
 
-#: src/i_callbacks.c:828 src/i_callbacks.c:875
+#: ../src/i_callbacks.c:830 ../src/i_callbacks.c:877
 msgid "Rotate"
 msgstr "²óž"
 
-#: src/i_callbacks.c:902 src/i_callbacks.c:924
+#: ../src/i_callbacks.c:904 ../src/i_callbacks.c:926
 msgid "Mirror"
 msgstr "ȿž"
 
-#: src/i_callbacks.c:988 src/x_dialog.c:1604
+#: ../src/i_callbacks.c:988 ../src/x_dialog.c:1611
 msgid "Translate"
 msgstr "žÁ÷"
 
-#: src/i_callbacks.c:991
+#: ../src/i_callbacks.c:991
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "·Ù¹ð:¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ¤ÇžÁ÷¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤!\n"
 
-#: src/i_callbacks.c:992
+#: ../src/i_callbacks.c:992
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "·Ù¹ð:¥¹¥Ê¥Ã¥×¤ò¥ª¥ó¤·¤Æ¤«¤éžÁ÷¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/i_callbacks.c:999
+#: ../src/i_callbacks.c:999
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "·Ù¹ð:¥°¥ê¥Ã¥É¥µ¥¤¥º¤¬100¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: src/i_callbacks.c:1001
+#: ../src/i_callbacks.c:1001
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -850,433 +857,412 @@ msgstr ""
 "·Ù¹ð:¸¶ÅÀ¤ØžÁ÷¤¹¤ë¤È¤­¤Ï¥¹¥Ê¥Ã¥×¤Î¥°¥ê¥Ã¥É¥µ¥¤¥º¤ò\n"
 "100¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/i_callbacks.c:1022
+#: ../src/i_callbacks.c:1022
 msgid "Embed"
 msgstr "ÁȤ߹þ¤ß"
 
-#: src/i_callbacks.c:1060
+#: ../src/i_callbacks.c:1063
 msgid "Unembed"
 msgstr "ÁȤ߹þ¤ß²ò½ü"
 
-#: src/i_callbacks.c:1100
+#: ../src/i_callbacks.c:1106
 msgid "Update"
 msgstr "¹¹¿·"
 
-#: src/i_callbacks.c:1157
+#: ../src/i_callbacks.c:1163
 msgid "ShowHidden"
 msgstr "±£¤·¥Æ¥­¥¹¥Èɽ¼¨"
 
-#: src/i_callbacks.c:1180
+#: ../src/i_callbacks.c:1186
 msgid "MakeVisible"
 msgstr "ɽ¼¨¤¹¤ë"
 
-#: src/i_callbacks.c:1296
+#: ../src/i_callbacks.c:1302
 msgid "Edit Line Type"
 msgstr "Àþ¼ï¤òÊÔ½¸"
 
-#: src/i_callbacks.c:1337 src/x_dialog.c:1261
+#: ../src/i_callbacks.c:1343 ../src/x_dialog.c:1268
 msgid "Edit Fill Type"
 msgstr "Åɤê¤Ä¤Ö¤·¤òÊÔ½¸"
 
-#: src/i_callbacks.c:1643
+#: ../src/i_callbacks.c:1648
 msgid "Update Cues"
 msgstr "¥­¥å¡¼¹¹¿·"
 
-#: src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1798
 #, fuzzy
 msgid "Really revert page?"
 msgstr "Ì᤹"
 
-#: src/i_callbacks.c:1856
+#: ../src/i_callbacks.c:1872
 msgid "Copy 1"
 msgstr "¥³¥Ô¡¼1"
 
-#: src/i_callbacks.c:1875
+#: ../src/i_callbacks.c:1891
 msgid "Copy 2"
 msgstr "¥³¥Ô¡¼2"
 
-#: src/i_callbacks.c:1894
+#: ../src/i_callbacks.c:1910
 msgid "Copy 3"
 msgstr "¥³¥Ô¡¼3"
 
-#: src/i_callbacks.c:1913
+#: ../src/i_callbacks.c:1929
 msgid "Copy 4"
 msgstr "¥³¥Ô¡¼4"
 
-#: src/i_callbacks.c:1932
+#: ../src/i_callbacks.c:1948
 msgid "Copy 5"
 msgstr "¥³¥Ô¡¼5"
 
-#: src/i_callbacks.c:1951
+#: ../src/i_callbacks.c:1967
 msgid "Cut 1"
 msgstr "¥«¥Ã¥È1"
 
-#: src/i_callbacks.c:1970
+#: ../src/i_callbacks.c:1986
 msgid "Cut 2"
 msgstr "¥«¥Ã¥È2"
 
-#: src/i_callbacks.c:1989
+#: ../src/i_callbacks.c:2005
 msgid "Cut 3"
 msgstr "¥«¥Ã¥È3"
 
-#: src/i_callbacks.c:2008
+#: ../src/i_callbacks.c:2024
 msgid "Cut 4"
 msgstr "¥«¥Ã¥È4"
 
-#: src/i_callbacks.c:2027
+#: ../src/i_callbacks.c:2043
 msgid "Cut 5"
 msgstr "¥«¥Ã¥È5"
 
-#: src/i_callbacks.c:2043
+#: ../src/i_callbacks.c:2059
 msgid "Paste 1"
 msgstr "¥Ú¡¼¥¹¥È1"
 
-#: src/i_callbacks.c:2052 src/i_callbacks.c:2076 src/i_callbacks.c:2100
-#: src/i_callbacks.c:2124 src/i_callbacks.c:2148
+#: ../src/i_callbacks.c:2066 ../src/i_callbacks.c:2088
+#: ../src/i_callbacks.c:2110 ../src/i_callbacks.c:2132
+#: ../src/i_callbacks.c:2154
 msgid "Empty buffer"
 msgstr "¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Ç¤¹¡£"
 
-#: src/i_callbacks.c:2067
+#: ../src/i_callbacks.c:2081
 msgid "Paste 2"
 msgstr "¥Ú¡¼¥¹¥È 2"
 
-#: src/i_callbacks.c:2091
+#: ../src/i_callbacks.c:2103
 msgid "Paste 3"
 msgstr "¥Ú¡¼¥¹¥È 3"
 
-#: src/i_callbacks.c:2115
+#: ../src/i_callbacks.c:2125
 msgid "Paste 4"
 msgstr "¥Ú¡¼¥¹¥È 4"
 
-#: src/i_callbacks.c:2139
+#: ../src/i_callbacks.c:2147
 msgid "Paste 5"
 msgstr "¥Ú¡¼¥¹¥È 5"
 
-#: src/i_callbacks.c:2282 src/x_window.c:527
+#: ../src/i_callbacks.c:2264 ../src/x_window.c:439
 msgid "Component"
 msgstr "ÉôÉÊ"
 
-#: src/i_callbacks.c:2318 src/i_callbacks.c:2337
+#: ../src/i_callbacks.c:2300 ../src/i_callbacks.c:2319
 msgid "Attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È"
 
-#: src/i_callbacks.c:2804
+#: ../src/i_callbacks.c:2786
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "¥½¡¼¥¹¸¡º÷Ãæ[%s]\n"
 
-#: src/i_callbacks.c:2828 src/i_callbacks.c:2829
+#: ../src/i_callbacks.c:2810 ../src/i_callbacks.c:2811
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "¥½¡¼¥¹¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£[%s]\n"
 
-#: src/i_callbacks.c:2896
+#: ../src/i_callbacks.c:2878
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "¥·¥ó¥Ü¥ë¸¡º÷Ãæ[%s]\n"
 
-#: src/i_callbacks.c:2983
+#: ../src/i_callbacks.c:2965
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: src/i_callbacks.c:3100
+#: ../src/i_callbacks.c:3082
 msgid "ShowN"
 msgstr "Nɽ¼¨"
 
-#: src/i_callbacks.c:3130
+#: ../src/i_callbacks.c:3112
 msgid "ShowV"
 msgstr "ɽ¼¨V"
 
-#: src/i_callbacks.c:3160
+#: ../src/i_callbacks.c:3142
 msgid "ShowB"
 msgstr "ɽ¼¨B"
 
-#: src/i_callbacks.c:3191
+#: ../src/i_callbacks.c:3173
 msgid "VisToggle"
 msgstr "ɽ¼¨ÀÚÂؤ¨"
 
-#: src/i_callbacks.c:3212
+#: ../src/i_callbacks.c:3194
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "µ¡Ç½¤·¤Ê¤¤¥á¥Ë¥å¡¼¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
 
-#: src/i_callbacks.c:3300
+#: ../src/i_callbacks.c:3282
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: src/i_callbacks.c:3303
+#: ../src/i_callbacks.c:3285
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: src/i_callbacks.c:3320
+#: ../src/i_callbacks.c:3302
 msgid "Grid OFF\n"
 msgstr "¥°¥ê¥Ã¥É¡¦¥ª¥Õ\n"
 
-#: src/i_callbacks.c:3323
+#: ../src/i_callbacks.c:3305
 msgid "Grid ON\n"
 msgstr "¥°¥ê¥Ã¥É¡¦¥ª¥ó\n"
 
-#: src/i_callbacks.c:3340
+#: ../src/i_callbacks.c:3322
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ(Ãí°Õ!)\n"
 
-#: src/i_callbacks.c:3343
+#: ../src/i_callbacks.c:3325
 msgid "Snap ON\n"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥ó\n"
 
-#: src/i_callbacks.c:3363
+#: ../src/i_callbacks.c:3345
 msgid "Rubber band OFF \n"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥É¡¦¥ª¥Õ\n"
 
-#: src/i_callbacks.c:3366
+#: ../src/i_callbacks.c:3348
 msgid "Rubber band ON\n"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥É¡¦¥ª¥ó\n"
 
-#: src/o_arc.c:137
+#: ../src/o_arc.c:139
 #, c-format
 msgid "Unknown end for arc (%d)\n"
 msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤ÎÀèü(%d)\n"
 
-#: src/o_arc.c:178
+#: ../src/o_arc.c:180
 #, c-format
 msgid "Unknown type for arc !\n"
 msgstr "ÉÔÌÀ¤Ê±ß¸Ì¤Î¼ïÎà!\n"
 
-#: src/o_attrib.c:105
+#: ../src/o_attrib.c:109
 #, c-format
 msgid "Got NULL in o_attrib_toggle_visibility\n"
 msgstr ""
 
-#: src/o_attrib.c:170
+#: ../src/o_attrib.c:175
 #, c-format
 msgid "Got NULL in o_attrib_toggle_show_name_value\n"
 msgstr ""
 
-#: src/o_attrib.c:221
-#, c-format
-msgid "ERROR! you can't get an attribute without an ='s\n"
-msgstr "¥¨¥é¡¼!¥¢¥È¥ê¥Ó¥å¡¼¥È¤Ë¤Ï'='¤¬É¬ÍפǤ¹¡£\n"
-
-#: src/o_box.c:141
+#: ../src/o_box.c:143
 #, c-format
 msgid "Unknown end for box (%d)\n"
 msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤ÎÀèü(%d)\n"
 
-#: src/o_box.c:181
+#: ../src/o_box.c:183
 #, c-format
 msgid "Unknown type for box !\n"
 msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤Î¼ïÎà!\n"
 
-#: src/o_box.c:271
+#: ../src/o_box.c:267
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤Î¼ïÎà(Åɤê¤Ä¤Ö¤·)!\n"
 
-#: src/o_buffer.c:42
+#: ../src/o_buffer.c:44
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_copy]\n"
 msgstr ""
 
-#: src/o_buffer.c:80
+#: ../src/o_buffer.c:73
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_cut]\n"
 msgstr ""
 
-#: src/o_buffer.c:121
+#: ../src/o_buffer.c:105
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 
-#: src/o_buffer.c:181
+#: ../src/o_buffer.c:164
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
 msgstr ""
 
-#: src/o_bus.c:210
+#: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\n"
 msgstr ""
 
-#: src/o_circle.c:136
+#: ../src/o_circle.c:138
 #, c-format
 msgid "Unknown end for circle\n"
 msgstr "ÉÔÌÀ¤Ê±ß¤ÎÀèü\n"
 
-#: src/o_circle.c:172
+#. just to be careful
+#: ../src/o_circle.c:174
 #, c-format
 msgid "Unknown type for circle!\n"
 msgstr "ÉÔÌÀ¤Ê±ß¤Î¼ïÎà!\n"
 
-#: src/o_circle.c:260
+#: ../src/o_circle.c:256
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "ÉÔÌÀ¤Ê±ß¤Î¼ïÎà(Åɤê¤Ä¤Ö¤·)!\n"
 
-#: src/o_complex.c:230
+#: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
 msgstr ""
 
-#: src/o_complex.c:582
-#, c-format
-msgid "Got NULL in o_complex_translate_display_selection\n"
-msgstr ""
-
-#: src/o_complex.c:650 src/o_complex.c:656
+#: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤òžÁ÷¤·¤Æ¤¤¤Þ¤¹¡£[%d %d]\n"
 
-#: src/o_complex.c:694
-#, c-format
-msgid "Got NULL in o_complex_translate_selection!\n"
-msgstr ""
-
-#: src/o_copy.c:119 src/o_copy.c:382
+#: ../src/o_copy.c:122 ../src/o_copy.c:312
 #, c-format
 msgid "ERROR: NULL object in o_copy_end!\n"
 msgstr ""
 
-#: src/o_line.c:113
+#: ../src/o_line.c:115
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "ÉÔÌÀ¤ÊÀþ¤ÎÀèü(%d)\n"
 
-#: src/o_line.c:153
+#. just to be careful
+#: ../src/o_line.c:155
 #, c-format
 msgid "Unknown type for line (%d) !\n"
 msgstr "ÉÔÌÀ¤ÊÀþ¤Î¼ïÎà(%d)!\n"
 
-#: src/o_misc.c:65
+#: ../src/o_misc.c:66
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr ""
 
-#: src/o_misc.c:144
+#: ../src/o_misc.c:145
 #, fuzzy
 msgid "Object already locked\n"
 msgstr "¤³¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤¹¤Ç¤Ë¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/o_misc.c:182
+#: ../src/o_misc.c:183
 #, fuzzy
 msgid "Object already unlocked\n"
 msgstr "¤³¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤¹¤Ç¤Ë¥í¥Ã¥¯²ò½ü¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/o_misc.c:229 src/o_misc.c:472 src/o_misc.c:712
-#, c-format
-msgid "ERROR: NULL object in o_rotate_90!\n"
-msgstr ""
-
-#: src/o_misc.c:538
-#, c-format
-msgid "ERROR: NULL object in o_mirror!\n"
-msgstr ""
-
-#: src/o_misc.c:812
+#: ../src/o_misc.c:525
 msgid "Hidden text is now visible\n"
 msgstr "±£¤·¥Æ¥­¥¹¥È¤¬É½¼¨¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/o_misc.c:814
+#: ../src/o_misc.c:527
 msgid "Hidden text is now invisible\n"
 msgstr "±£¤·¥Æ¥­¥¹¥È¤¬Èóɽ¼¨¤Ë¤Ê¤ê¤Þ¤·¤¿¡£\n"
 
-#: src/o_misc.c:1058
+#: ../src/o_misc.c:771
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: src/o_misc.c:1196
+#: ../src/o_misc.c:906
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 
-#: src/o_misc.c:1240
+#: ../src/o_misc.c:951
 #, fuzzy, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Êݸ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: src/o_misc.c:1258
+#: ../src/o_misc.c:969
 #, fuzzy, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Êݸ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: src/o_misc.c:1263
+#: ../src/o_misc.c:974
 #, fuzzy, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Êݸ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: src/o_move.c:224
+#: ../src/o_move.c:181
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr ""
 
-#: src/o_move.c:332
+#: ../src/o_move.c:282
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: src/o_move.c:353
+#: ../src/o_move.c:304
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr ""
 
-#: src/o_net.c:255
+#: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\n"
 msgstr ""
 
-#: src/o_net.c:812 src/o_net.c:849 src/o_net.c:920 src/o_net.c:956
+#. try to exit gracefully
+#: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: src/o_net.c:1029
+#: ../src/o_net.c:980
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "̵¸ú¤Ê¥Ñ¥¹[%s]¤¬component-library¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/o_picture.c:206 src/o_picture.c:746
+#: ../src/o_picture.c:208 ../src/o_picture.c:720
 #, fuzzy, c-format
 msgid "Failed to load picture: %s"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: src/o_picture.c:220
+#: ../src/o_picture.c:222
 msgid "Picture"
 msgstr ""
 
-#: src/o_picture.c:658 src/x_attribedit.c:145
+#: ../src/o_picture.c:625 ../src/x_attribedit.c:148
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr ""
 
-#: src/o_slot.c:128
+#: ../src/o_slot.c:130
 msgid "Slot attribute malformed\n"
 msgstr "¥¹¥í¥Ã¥È¥¢¥È¥ê¥Ó¥å¡¼¥È¤¬ÊѤǤ¹¡£\n"
 
-#: src/o_slot.c:146
+#: ../src/o_slot.c:148
 msgid "numslots attribute missing\n"
 msgstr "¥¹¥í¥Ã¥ÈÈֹ椬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/o_slot.c:148
+#: ../src/o_slot.c:150
 msgid "Slotting not allowed for this component\n"
 msgstr "¤³¤ÎÉôÉʤ˥¹¥í¥Ã¥È¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: src/o_slot.c:164
+#: ../src/o_slot.c:166
 msgid "New slot number out of range\n"
 msgstr "¥¹¥í¥Ã¥ÈÈֹ椬ÈϰϤò±Û¤¨¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/o_slot.c:237
+#: ../src/o_slot.c:239
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "¤ª¤Ã¤È! ¸ºß¤·¤Ê¤¤¥¹¥í¥Ã¥È¤òÊÔ½¸¤·¤è¤¦¤È¤·¤Þ¤·¤¿!\n"
 
-#: src/o_undo.c:317
+#: ../src/o_undo.c:318
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "¥¢¥ó¥É¥¥/¥ê¥É¥¥¤Ïrc¥Õ¥¡¥¤¥ë¤Ç̵¸ú¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/parsecmd.c:50
+#: ../src/parsecmd.c:51
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1291,242 +1277,258 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/x_attribedit.c:130
+#: ../src/x_attribedit.c:133
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 
-#: src/x_attribedit.c:333
+#: ../src/x_attribedit.c:336
 msgid "Single Attribute Editor"
 msgstr "¥·¥ó¥°¥ë¥¢¥È¥ë¥Ó¥å¡¼¥È¥¨¥Ç¥£¥¿"
 
-#: src/x_attribedit.c:364
+#: ../src/x_attribedit.c:367
 #, fuzzy
 msgid "<b>Edit Attribute</b>"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÊÔ½¸"
 
-#: src/x_attribedit.c:366
+#: ../src/x_attribedit.c:369
 #, fuzzy
 msgid "<b>Add Attribute</b>"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#: src/x_attribedit.c:382 src/x_multiattrib.c:1731
+#. Name selection
+#. GtkLabel
+#: ../src/x_attribedit.c:385 ../src/x_multiattrib.c:1721
 msgid "Name:"
 msgstr "̾Á°:"
 
-#: src/x_attribedit.c:398 src/x_multiattrib.c:1750
+#. Value entry
+#. GtkLabel
+#: ../src/x_attribedit.c:401 ../src/x_multiattrib.c:1740
 msgid "Value:"
 msgstr "ÃÍ:"
 
-#: src/x_attribedit.c:414 src/x_multiattrib.c:1787
+#. Visibility
+#. GtkButton
+#: ../src/x_attribedit.c:417 ../src/x_multiattrib.c:1777
 msgid "Visible"
 msgstr "ɽ¼¨"
 
-#: src/x_attribedit.c:434
+#: ../src/x_attribedit.c:437
 msgid "Show Value Only"
 msgstr "ÃͤΤßɽ¼¨"
 
-#: src/x_attribedit.c:436
+#: ../src/x_attribedit.c:439
 msgid "Show Name Only"
 msgstr "̾Á°¤Î¤ßɽ¼¨"
 
-#: src/x_attribedit.c:438 src/x_multiattrib.c:1226
+#: ../src/x_attribedit.c:441 ../src/x_multiattrib.c:1216
 msgid "Show Name & Value"
 msgstr "̾Á°¤ÈÃͤòɽ¼¨"
 
-#: src/x_attribedit.c:445
+#. gschem specific
+#: ../src/x_attribedit.c:448
 #, fuzzy
 msgid "<b>Attach Options</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: src/x_attribedit.c:460
+#: ../src/x_attribedit.c:463
 msgid "All"
 msgstr "¤¹¤Ù¤Æ"
 
-#: src/x_attribedit.c:468 src/x_compselect.c:728 src/x_compselect.c:803
+#. GtkTreeViewColumn
+#: ../src/x_attribedit.c:471 ../src/x_compselect.c:735
+#: ../src/x_compselect.c:810
 msgid "Components"
 msgstr "ÉôÉÊ"
 
-#: src/x_attribedit.c:476 src/x_window.c:537
+#: ../src/x_attribedit.c:479 ../src/x_window.c:449
 msgid "Nets"
 msgstr "¥Í¥Ã¥È"
 
-#: src/x_attribedit.c:484
+#: ../src/x_attribedit.c:487
 msgid "Replace existing attributes"
 msgstr ""
 
-#: src/x_autonumber.c:413
+#: ../src/x_autonumber.c:412
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#: src/x_autonumber.c:428
+#. duplicate slot in used_slots
+#: ../src/x_autonumber.c:427
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: src/x_autonumber.c:697
+#: ../src/x_autonumber.c:692
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: src/x_autonumber.c:748
+#: ../src/x_autonumber.c:743
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: src/x_autonumber.c:881
+#: ../src/x_autonumber.c:876
 msgid "Diagonal"
 msgstr ""
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Top to bottom"
 msgstr ""
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Bottom to top"
 msgstr ""
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 #, fuzzy
 msgid "Left to right"
 msgstr "Ãæ±û ±¦"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Right to left"
 msgstr ""
 
-#: src/x_autonumber.c:884
+#: ../src/x_autonumber.c:879
 #, fuzzy
 msgid "File order"
 msgstr "±ß¥â¡¼¥É"
 
-#: src/x_autonumber.c:1220
+#: ../src/x_autonumber.c:1215
 msgid "Autonumber text"
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥­¥¹¥È"
 
-#: src/x_autonumber.c:1246
+#. scope section
+#: ../src/x_autonumber.c:1241
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: src/x_autonumber.c:1268
+#: ../src/x_autonumber.c:1263
 msgid "Search for:"
 msgstr ""
 
-#: src/x_autonumber.c:1282
+#: ../src/x_autonumber.c:1277
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥­¥¹¥È"
 
-#: src/x_autonumber.c:1289
+#: ../src/x_autonumber.c:1284
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: src/x_autonumber.c:1301 src/x_autonumber.c:1310
+#: ../src/x_autonumber.c:1296 ../src/x_autonumber.c:1305
 #, fuzzy
 msgid "Selected objects"
 msgstr "¸ºß¤·¤Ê¤¤¥ª¥Ö¥¸¥§¥¯¥È¤¬ÁªÂò¤µ¤ì¤Þ¤·¤¿!\n"
 
-#: src/x_autonumber.c:1302 src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1297 ../src/x_autonumber.c:1306
 #, fuzzy
 msgid "Current page"
 msgstr "¥Æ¥¹¥È¥·¡¼¥È"
 
-#: src/x_autonumber.c:1303 src/x_autonumber.c:1312
+#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "³¬ÁØ"
 
-#: src/x_autonumber.c:1314
+#: ../src/x_autonumber.c:1309
 msgid "Overwrite existing numbers"
 msgstr ""
 
-#: src/x_autonumber.c:1319
+#. Options section
+#: ../src/x_autonumber.c:1314
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: src/x_autonumber.c:1341
+#: ../src/x_autonumber.c:1336
 #, fuzzy
 msgid "Starting number:"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: src/x_autonumber.c:1348
+#: ../src/x_autonumber.c:1343
 msgid "Sort order:"
 msgstr ""
 
-#: src/x_autonumber.c:1369
+#: ../src/x_autonumber.c:1364
 msgid "Remove numbers"
 msgstr ""
 
-#: src/x_autonumber.c:1373
+#: ../src/x_autonumber.c:1368
 msgid "Automatic slotting"
 msgstr ""
 
-#: src/x_color.c:60 src/x_color.c:97
+#: ../src/x_color.c:60 ../src/x_color.c:97
 #, c-format
 msgid "Could not find the color %s!\n"
 msgstr "¿§%s¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó!\n"
 
-#: src/x_color.c:63 src/x_color.c:100
+#: ../src/x_color.c:63 ../src/x_color.c:100
 #, c-format
 msgid "Defaulting color to white\n"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¿§¤òÇò¤Ë¤·¤Þ¤¹¡£\n"
 
-#: src/x_color.c:70 src/x_color.c:107
+#: ../src/x_color.c:70 ../src/x_color.c:107
 #, c-format
 msgid "Ack! Cannot allocate white!\n"
 msgstr "¤¢¤Ã! Çò¤ò»ØÄê¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: src/x_color.c:81 src/x_color.c:129 src/x_window.c:176 src/x_window.c:185
+#: ../src/x_color.c:81 ../src/x_color.c:129 ../src/x_window.c:86
+#: ../src/x_window.c:95
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "»ØÄê¤Ç¤­¤Ê¤¤¿§[%s]¤Ç¤¹!\n"
 
-#: src/x_color.c:148 src/x_color.c:164
+#: ../src/x_color.c:148 ../src/x_color.c:164
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "̵¸ú¤Ê¿§¤Î»ØÄê¤Ç¤¹¡£ : %d\n"
 
-#: src/x_compselect.c:833
+#. GtkLabel
+#: ../src/x_compselect.c:840
 #, fuzzy
 msgid "Filter:"
 msgstr "¥Õ¥£¥ë¥¿"
 
-#: src/x_compselect.c:925
+#: ../src/x_compselect.c:932
 msgid "Default behavior - reference component"
 msgstr ""
 
-#: src/x_compselect.c:928
+#: ../src/x_compselect.c:935
 #, fuzzy
 msgid "Embed component in schematic"
 msgstr "ÁȤ߹þ¤à"
 
-#: src/x_compselect.c:931
+#: ../src/x_compselect.c:938
 msgid "Include component as individual objects"
 msgstr ""
 
-#: src/x_compselect.c:1077
+#: ../src/x_compselect.c:1094
 msgid "Select Component..."
 msgstr "ÉôÉÊÁªÂò..."
 
-#: src/x_compselect.c:1103
+#: ../src/x_compselect.c:1120
 msgid "In Use"
 msgstr ""
 
-#: src/x_compselect.c:1107
+#: ../src/x_compselect.c:1124
 msgid "Libraries"
 msgstr "¥é¥¤¥Ö¥é¥ê"
 
-#: src/x_compselect.c:1116 src/x_fileselect.c:127
+#. GtkFrame
+#: ../src/x_compselect.c:1133 ../src/x_fileselect.c:128
 msgid "Preview"
 msgstr "¥×¥ì¥Ó¥å¡¼"
 
-#: src/x_dialog.c:184
+#. dialog not created yet
+#: ../src/x_dialog.c:191
 msgid "Text Entry..."
 msgstr "¥Æ¥­¥¹¥È..."
 
-#: src/x_dialog.c:217
+#: ../src/x_dialog.c:224
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1536,185 +1538,195 @@ msgstr ""
 "¥¦¥£¥ó¥É¥¦Æâ¤Ç¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥Æ¥­¥¹¥È¤òÇÛÃÖ¤·¤Þ¤¹¡£\n"
 "Ãæ¥Ü¥¿¥ó¤Ç²óž¤·¤Þ¤¹¡£"
 
-#: src/x_dialog.c:306
+#: ../src/x_dialog.c:313
+#, c-format
 msgid "Lower Left"
 msgstr "²¼ º¸"
 
-#: src/x_dialog.c:317
+#: ../src/x_dialog.c:324
+#, c-format
 msgid "Middle Left"
 msgstr "Ãæ±û º¸"
 
-#: src/x_dialog.c:328
+#: ../src/x_dialog.c:335
+#, c-format
 msgid "Upper Left"
 msgstr "¾å º¸"
 
-#: src/x_dialog.c:339
+#: ../src/x_dialog.c:346
+#, c-format
 msgid "Lower Middle"
 msgstr "²¼ Ãæ±û"
 
-#: src/x_dialog.c:350
+#: ../src/x_dialog.c:357
+#, c-format
 msgid "Middle Middle"
 msgstr "Ãæ±û Ãæ±û"
 
-#: src/x_dialog.c:361
+#: ../src/x_dialog.c:368
+#, c-format
 msgid "Upper Middle"
 msgstr "¾å Ãæ±û"
 
-#: src/x_dialog.c:372
+#: ../src/x_dialog.c:379
+#, c-format
 msgid "Lower Right"
 msgstr "²¼ ±¦"
 
-#: src/x_dialog.c:383
+#: ../src/x_dialog.c:390
+#, c-format
 msgid "Middle Right"
 msgstr "Ãæ±û ±¦"
 
-#: src/x_dialog.c:394
+#: ../src/x_dialog.c:401
+#, c-format
 msgid "Upper Right"
 msgstr "¾å ±¦"
 
-#: src/x_dialog.c:509
+#: ../src/x_dialog.c:516
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "¥µ¥¤¥º"
 
-#: src/x_dialog.c:545
+#: ../src/x_dialog.c:552
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: src/x_dialog.c:577
+#: ../src/x_dialog.c:584
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: src/x_dialog.c:592
+#: ../src/x_dialog.c:599
 #, fuzzy
 msgid "Color:"
 msgstr "¿§"
 
-#: src/x_dialog.c:602
+#: ../src/x_dialog.c:609
 msgid "Size:"
 msgstr ""
 
-#: src/x_dialog.c:611
+#: ../src/x_dialog.c:618
 #, fuzzy
 msgid "Alignment:"
 msgstr "ÇÛÃÖ"
 
-#: src/x_dialog.c:665
+#: ../src/x_dialog.c:672
 msgid "Solid"
 msgstr "¼ÂÀþ"
 
-#: src/x_dialog.c:666
+#: ../src/x_dialog.c:673
 msgid "Dotted"
 msgstr "ÅÀÀþ"
 
-#: src/x_dialog.c:667
+#: ../src/x_dialog.c:674
 msgid "Dashed"
 msgstr "ÇËÀþ"
 
-#: src/x_dialog.c:668
+#: ../src/x_dialog.c:675
 msgid "Center"
 msgstr "Ãæ±û"
 
-#: src/x_dialog.c:669
+#: ../src/x_dialog.c:676
 msgid "Phantom"
 msgstr "¥Õ¥¡¥ó¥È¥à"
 
-#: src/x_dialog.c:795 src/x_dialog.c:797 src/x_dialog.c:799 src/x_dialog.c:982
-#: src/x_dialog.c:983 src/x_dialog.c:984 src/x_dialog.c:992
-#: src/x_dialog.c:1175 src/x_dialog.c:1177 src/x_dialog.c:1179
-#: src/x_dialog.c:1181 src/x_dialog.c:1183 src/x_dialog.c:1388
-#: src/x_dialog.c:1389 src/x_dialog.c:1390 src/x_dialog.c:1391
-#: src/x_dialog.c:1392 src/x_dialog.c:1400
+#: ../src/x_dialog.c:802 ../src/x_dialog.c:804 ../src/x_dialog.c:806
+#: ../src/x_dialog.c:989 ../src/x_dialog.c:990 ../src/x_dialog.c:991
+#: ../src/x_dialog.c:999 ../src/x_dialog.c:1182 ../src/x_dialog.c:1184
+#: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
+#: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
+#: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
+#, c-format
 msgid "*unchanged*"
 msgstr ""
 
-#: src/x_dialog.c:874
+#: ../src/x_dialog.c:881
 msgid "Edit Line Width & Type"
 msgstr "Àþ¼ï¤ÈÉýÊÔ½¸"
 
-#: src/x_dialog.c:915
+#: ../src/x_dialog.c:922
 #, fuzzy
 msgid "Width:"
 msgstr "Éý"
 
-#: src/x_dialog.c:919 src/x_print.c:314
+#: ../src/x_dialog.c:926 ../src/x_print.c:315
 #, fuzzy
 msgid "Type:"
 msgstr "¼ïÎà"
 
-#: src/x_dialog.c:923
+#: ../src/x_dialog.c:930
 #, fuzzy
 msgid "Dash Length:"
 msgstr "ÇËÀþ¤ÎŤµ"
 
-#: src/x_dialog.c:927
+#: ../src/x_dialog.c:934
 #, fuzzy
 msgid "Dash Space:"
 msgstr "ÇËÀþ¤Î´Ö³Ö"
 
-#: src/x_dialog.c:1032
+#: ../src/x_dialog.c:1039
 msgid "Hollow"
 msgstr "¶õƶ"
 
-#: src/x_dialog.c:1033
+#: ../src/x_dialog.c:1040
 msgid "Filled"
 msgstr "Åɤê¤Ä¤Ö¤·"
 
-#: src/x_dialog.c:1034
+#: ../src/x_dialog.c:1041
 msgid "Mesh"
 msgstr "¥á¥Ã¥·¥å"
 
-#: src/x_dialog.c:1035
+#: ../src/x_dialog.c:1042
 msgid "Hatch"
 msgstr "¥Ï¥Ã¥Á"
 
-#: src/x_dialog.c:1301
+#: ../src/x_dialog.c:1308
 #, fuzzy
 msgid "Fill Type:"
 msgstr "Åɤê¤Ä¤Ö¤·¼ïÎà"
 
-#: src/x_dialog.c:1305
+#: ../src/x_dialog.c:1312
 #, fuzzy
 msgid "Line Width:"
 msgstr "Àþ¤ÎÉý"
 
-#: src/x_dialog.c:1309
+#: ../src/x_dialog.c:1316
 #, fuzzy
 msgid "Angle 1:"
 msgstr "³ÑÅÙ1"
 
-#: src/x_dialog.c:1313
+#: ../src/x_dialog.c:1320
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "¥Ô¥Ã¥Á1"
 
-#: src/x_dialog.c:1317
+#: ../src/x_dialog.c:1324
 #, fuzzy
 msgid "Angle 2:"
 msgstr "³ÑÅÙ2"
 
-#: src/x_dialog.c:1321
+#: ../src/x_dialog.c:1328
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "¥Ô¥Ã¥Á2"
 
-#: src/x_dialog.c:1483
+#: ../src/x_dialog.c:1490
 msgid "Arc Params"
 msgstr "±ß¸Ì¥Ñ¥é¥á¡¼¥¿"
 
-#: src/x_dialog.c:1525
+#: ../src/x_dialog.c:1532
 #, fuzzy
 msgid "Start Angle:"
 msgstr "³«»Ï³Ñ"
 
-#: src/x_dialog.c:1535
+#: ../src/x_dialog.c:1542
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "¥¹¥¤¡¼¥×³Ñ"
 
-#: src/x_dialog.c:1636
+#: ../src/x_dialog.c:1643
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1722,49 +1734,49 @@ msgstr ""
 "žÁ÷¤·¤Þ¤¹¤«?\n"
 "(0¤Ç¸¶ÅÀ)"
 
-#: src/x_dialog.c:1704
+#: ../src/x_dialog.c:1711
 msgid "Text Size"
 msgstr "¥Æ¥­¥¹¥È¥µ¥¤¥º"
 
-#: src/x_dialog.c:1736
+#: ../src/x_dialog.c:1743
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "¥Æ¥­¥¹¥È¥µ¥¤¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: src/x_dialog.c:1811
+#: ../src/x_dialog.c:1818
 #, fuzzy
 msgid "Snap Size"
 msgstr "¥¹¥Ê¥Ã¥×¥°¥ê¥Ã¥É"
 
-#: src/x_dialog.c:1843
+#: ../src/x_dialog.c:1850
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "¥°¥ê¥Ã¥É¥µ¥¤¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: src/x_dialog.c:1916
+#: ../src/x_dialog.c:1923
 msgid "Edit slot number"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: src/x_dialog.c:1949
+#: ../src/x_dialog.c:1956
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: src/x_dialog.c:2011
+#: ../src/x_dialog.c:2018
 msgid "About..."
 msgstr "gschem¤Ë¤Ä¤¤¤Æ..."
 
-#: src/x_dialog.c:2031
+#: ../src/x_dialog.c:2038
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "gEDA : GPL Electronic Design Automation"
 
-#: src/x_dialog.c:2035
+#: ../src/x_dialog.c:2042
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "gschem¥Ð¡¼¥¸¥ç¥ó%s%s.%s"
 
-#: src/x_dialog.c:2043
+#: ../src/x_dialog.c:2050
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1777,100 +1789,102 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "¤ª¤è¤ÓÂçÀª¤Î¿Í¡¹(¥Õ¥¡¥¤¥ëAUTHORS»²¾È)"
 
-#: src/x_dialog.c:2107
+#: ../src/x_dialog.c:2115
 msgid "Coords"
 msgstr "ºÂɸ"
 
-#: src/x_dialog.c:2128
+#: ../src/x_dialog.c:2136
 msgid "Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: src/x_dialog.c:2137
+#: ../src/x_dialog.c:2145
 msgid "World"
 msgstr "¥ï¡¼¥ë¥É"
 
-#: src/x_dialog.c:2360
+#: ../src/x_dialog.c:2360
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr ""
 
-#: src/x_dialog.c:2423
+#: ../src/x_dialog.c:2423
 msgid "Color Edit"
 msgstr "¿§ÊÔ½¸"
 
-#: src/x_dialog.c:2456
+#: ../src/x_dialog.c:2456
 msgid "Object color:"
 msgstr ""
 
-#: src/x_dialog.c:2581
+#: ../src/x_dialog.c:2581
 #, fuzzy
 msgid "Function"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: src/x_dialog.c:2588
+#: ../src/x_dialog.c:2588
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "´Ø¿ô : ¥­¡¼¥¹¥È¥í¡¼¥¯"
 
-#: src/x_dialog.c:2920
+#: ../src/x_dialog.c:2901
 #, fuzzy
 msgid "Find Text"
 msgstr "¥Æ¥­¥¹¥È¸¡º÷"
 
-#: src/x_dialog.c:2953
+#: ../src/x_dialog.c:2934
 msgid "Text to find:"
 msgstr "¸¡º÷¥Æ¥­¥¹¥È"
 
-#: src/x_dialog.c:2963
+#: ../src/x_dialog.c:2944
 msgid "descend into hierarchy"
 msgstr "²¼¤Î³¬Áؤ⸡º÷"
 
-#: src/x_dialog.c:3027
+#: ../src/x_dialog.c:3008
 #, fuzzy
 msgid "Hide Text"
 msgstr "¥Æ¥­¥¹¥È¤ò±£¤¹"
 
-#: src/x_dialog.c:3060
+#: ../src/x_dialog.c:3041
 msgid "Hide text starting with:"
 msgstr "±£¤·¥Æ¥­¥¹¥È"
 
-#: src/x_dialog.c:3128
+#: ../src/x_dialog.c:3109
 #, fuzzy
 msgid "Show Text"
 msgstr "¥Æ¥­¥¹¥Èɽ¼¨"
 
-#: src/x_dialog.c:3161
+#: ../src/x_dialog.c:3142
 msgid "Show text starting with:"
 msgstr "¥Æ¥­¥¹¥È"
 
-#: src/x_dialog.c:3606 src/x_multiattrib.c:1607
+#. GtkTreeViewColumn
+#: ../src/x_dialog.c:3587 ../src/x_multiattrib.c:1597
 msgid "Name"
 msgstr "̾Á°"
 
-#: src/x_dialog.c:3628
+#: ../src/x_dialog.c:3609
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: src/x_dialog.c:3722
+#: ../src/x_dialog.c:3703
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: src/x_dialog.c:3728
+#: ../src/x_dialog.c:3709
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
-#: src/x_dialog.c:3757
+#. secondary label
+#: ../src/x_dialog.c:3738
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: src/x_dialog.c:3777
+#: ../src/x_dialog.c:3758
 msgid "_Close without saving"
 msgstr ""
 
-#: src/x_dialog.c:4098
+#: ../src/x_dialog.c:4094
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1881,55 +1895,73 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: src/x_dialog.c:4100
+#: ../src/x_dialog.c:4096
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#: src/x_fileselect.c:47
+#: ../src/x_fileselect.c:48
 #, fuzzy
 msgid "Schematics"
 msgstr "sch - ¥¹¥±¥Þ¥Á¥Ã¥¯"
 
-#: src/x_fileselect.c:52
+#: ../src/x_fileselect.c:53
 #, fuzzy
 msgid "Symbols"
 msgstr "sym - ¥·¥ó¥Ü¥ë"
 
-#: src/x_fileselect.c:57
+#: ../src/x_fileselect.c:58
 #, fuzzy
 msgid "Schematics and symbols"
 msgstr "sym/sch - ¥¹¥±¥Þ¥Á¥Ã¥¯¤È¥·¥ó¥Ü¥ë"
 
-#: src/x_fileselect.c:63
+#: ../src/x_fileselect.c:64
 #, fuzzy
 msgid "All files"
 msgstr "* - ¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë"
 
-#: src/x_fileselect.c:176
+#: ../src/x_fileselect.c:177
 msgid "Open..."
 msgstr "³«¤¯..."
 
-#: src/x_fileselect.c:237
+#: ../src/x_fileselect.c:238
 #, fuzzy
 msgid "Save as..."
 msgstr "ÊÌ̾¤ÇÊݸ..."
 
-#: src/x_image.c:180
+#: ../src/x_fileselect.c:286
+#, c-format
+msgid ""
+"The selected file `%s' already exists.\n"
+"\n"
+"Would you like to overwrite it?"
+msgstr ""
+
+#: ../src/x_fileselect.c:289
+#, fuzzy
+msgid "Overwrite file?"
+msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
+
+#: ../src/x_fileselect.c:291
+msgid "Save cancelled on user request\n"
+msgstr ""
+
+#. WK - catch EPS export case
+#: ../src/x_image.c:181
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: src/x_image.c:298
+#: ../src/x_image.c:304
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr ""
 
-#: src/x_image.c:379
+#: ../src/x_image.c:385
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr ""
 
-#: src/x_image.c:389
+#: ../src/x_image.c:395
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -1938,338 +1970,349 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: src/x_image.c:408
+#: ../src/x_image.c:414
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "¥«¥é¡¼¥¤¥á¡¼¥¸¤ò½ÐÎϤ·¤Þ¤·¤¿¡£[%s] [%d x %d]\n"
 
-#: src/x_image.c:410
+#: ../src/x_image.c:416
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Çò¹õ¥¤¥á¡¼¥¸¤ò½ÐÎϤ·¤Þ¤·¤¿¡£[%s] [%d x %d]\n"
 
-#: src/x_image.c:420
+#: ../src/x_image.c:426
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 
-#: src/x_image.c:466
+#: ../src/x_image.c:472
 #, fuzzy
 msgid "Width x Height"
 msgstr "Éý x ¹â¤µ"
 
-#: src/x_image.c:482
+#: ../src/x_image.c:488
 #, fuzzy
 msgid "Image type"
 msgstr "¥Ú¡¼¥¸"
 
-#: src/x_log.c:236
+#: ../src/x_log.c:252
 msgid "Status"
 msgstr "¥¹¥Æ¡¼¥¿¥¹"
 
-#: src/x_menus.c:41
+#: ../src/x_menus.c:42
 #, fuzzy
 msgid "/Add Net"
 msgstr "¥Æ¥­¥¹¥ÈÄɲÃ..."
 
-#: src/x_menus.c:42
+#: ../src/x_menus.c:43
 #, fuzzy
 msgid "/Add Attribute..."
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#: src/x_menus.c:43
+#: ../src/x_menus.c:44
 #, fuzzy
 msgid "/Add Component..."
 msgstr "ÉôÉÊ..."
 
-#: src/x_menus.c:44
+#: ../src/x_menus.c:45
 #, fuzzy
 msgid "/Add Bus"
 msgstr "¥Æ¥­¥¹¥ÈÄɲÃ..."
 
-#: src/x_menus.c:45
+#: ../src/x_menus.c:46
 #, fuzzy
 msgid "/Add Text"
 msgstr "¥Æ¥­¥¹¥ÈÄɲÃ..."
 
-#: src/x_menus.c:47
+#: ../src/x_menus.c:48
 #, fuzzy
 msgid "/Zoom In"
 msgstr "³ÈÂç"
 
-#: src/x_menus.c:48
+#: ../src/x_menus.c:49
 #, fuzzy
 msgid "/Zoom Out"
 msgstr "½Ì¾®"
 
-#: src/x_menus.c:49
+#: ../src/x_menus.c:50
 #, fuzzy
 msgid "/Zoom Box"
 msgstr "³ÈÂç"
 
-#: src/x_menus.c:50
+#: ../src/x_menus.c:51
 #, fuzzy
 msgid "/Zoom Extents"
 msgstr "³ÈÂçÈÏ°Ï"
 
-#: src/x_menus.c:52
+#: ../src/x_menus.c:53
 #, fuzzy
 msgid "/Select"
 msgstr "ÁªÂò"
 
-#: src/x_menus.c:53
+#: ../src/x_menus.c:54
 #, fuzzy
 msgid "/Edit..."
 msgstr "ÊÔ½¸..."
 
-#: src/x_menus.c:54
+#: ../src/x_menus.c:55
 #, fuzzy
 msgid "/Copy"
 msgstr "¥³¥Ô¡¼"
 
-#: src/x_menus.c:55
+#: ../src/x_menus.c:56
 #, fuzzy
 msgid "/Move"
 msgstr "°ÜÆ°"
 
-#: src/x_menus.c:56
+#: ../src/x_menus.c:57
 #, fuzzy
 msgid "/Delete"
 msgstr "ºï½ü"
 
-#: src/x_menus.c:59
+#: ../src/x_menus.c:60
 #, fuzzy
 msgid "/Down Schematic"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 
-#: src/x_menus.c:60
+#: ../src/x_menus.c:61
 #, fuzzy
 msgid "/Down Symbol"
 msgstr "¥·¥ó¥Ü¥ë¤Ø"
 
-#: src/x_menus.c:61
+#: ../src/x_menus.c:62
 #, fuzzy
 msgid "/Up"
 msgstr "¾å¤Ø"
 
-#: src/x_menus.c:332
-msgid "Tried to set the sensitivity on a non-existent menu item\n"
+#: ../src/x_menus.c:333
+#, c-format
+msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 
-#: src/x_menus.c:356
+#: ../src/x_menus.c:357
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr ""
 
-#: src/x_menus.c:369
+#: ../src/x_menus.c:370
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 
-#: src/x_menus.c:482
+#. Remove this entry from all menus
+#: ../src/x_menus.c:482
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "¤ª¤Ã¤È¡¢¥Ç¥£¥ì¥¯¥È¥ê¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: src/x_menus.c:542
+#: ../src/x_menus.c:543
 msgid "Clear"
 msgstr "¥¯¥ê¥¢"
 
-#: src/x_multiattrib.c:718
+#: ../src/x_multiattrib.c:708
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr ""
 
-#: src/x_multiattrib.c:1228
+#: ../src/x_multiattrib.c:1218
 msgid "Show Value only"
 msgstr "ÃͤΤßɽ¼¨"
 
-#: src/x_multiattrib.c:1230
+#: ../src/x_multiattrib.c:1220
 msgid "Show Name only"
 msgstr "̾Á°¤Î¤ßɽ¼¨"
 
-#: src/x_multiattrib.c:1257
+#: ../src/x_multiattrib.c:1247
 msgid "Duplicate"
 msgstr ""
 
-#: src/x_multiattrib.c:1534
+#: ../src/x_multiattrib.c:1524
 msgid "Edit Attributes"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÊÔ½¸"
 
-#: src/x_multiattrib.c:1632
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1622
 msgid "Value"
 msgstr "ÃÍ"
 
-#: src/x_multiattrib.c:1654
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1644
 msgid "Vis?"
 msgstr "ɽ¼¨"
 
-#: src/x_multiattrib.c:1674
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1664
 msgid "N"
 msgstr "̾Á°"
 
-#: src/x_multiattrib.c:1694
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1684
 msgid "V"
 msgstr "ÃÍ"
 
-#: src/x_multiattrib.c:1715
+#: ../src/x_multiattrib.c:1705
 #, fuzzy
 msgid "Add Attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#: src/x_pagesel.c:263
+#: ../src/x_pagesel.c:264
 msgid "Discard Page"
 msgstr "ÇË´þ"
 
-#: src/x_pagesel.c:382
+#: ../src/x_pagesel.c:383
 msgid "Page Manager"
 msgstr "¥Ú¡¼¥¸¥Þ¥Í¡¼¥¸¥ã"
 
-#: src/x_pagesel.c:438
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:439
 msgid "Filename"
 msgstr "¥Õ¥¡¥¤¥ë̾"
 
-#: src/x_pagesel.c:454
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:455
 #, fuzzy
 msgid "Changed"
 msgstr "Êѹ¹"
 
-#: src/x_pagesel.c:474
+#. GtkLabel
+#: ../src/x_pagesel.c:475
 msgid "Right click on the filename for more options..."
 msgstr ""
 
-#: src/x_print.c:89
+#: ../src/x_print.c:90
 #, fuzzy
 msgid "Select PostScript Filename..."
 msgstr "̾Á°¤òÉÕ¤±¤ÆÊݸ..."
 
-#: src/x_print.c:171
+#: ../src/x_print.c:172
 msgid "Extents with margins"
 msgstr ""
 
-#: src/x_print.c:177
+#: ../src/x_print.c:178
 msgid "Extents no margins"
 msgstr ""
 
-#: src/x_print.c:183
+#: ../src/x_print.c:184
 msgid "Current Window"
 msgstr "¸½ºß¤Î¥¦¥£¥ó¥É¥¦"
 
-#: src/x_print.c:217
+#: ../src/x_print.c:218
 msgid "Landscape"
 msgstr "¥é¥ó¥É¥¹¥±¡¼¥×"
 
-#: src/x_print.c:223
+#: ../src/x_print.c:224
 msgid "Portrait"
 msgstr "¥Ý¡¼¥È¥ì¥¤¥È"
 
-#: src/x_print.c:291
+#. Upper frame
+#: ../src/x_print.c:292
 msgid "Settings"
 msgstr ""
 
-#: src/x_print.c:303
+#: ../src/x_print.c:304
 #, fuzzy
 msgid "Output paper size:"
 msgstr "½ÐÎÏÍѻ極¥¤¥º"
 
-#: src/x_print.c:325
+#: ../src/x_print.c:326
 #, fuzzy
 msgid "Orientation:"
 msgstr "¥ª¥ê¥¨¥ó¥Æ¡¼¥·¥ç¥ó"
 
-#: src/x_print.c:337
+#. Lower frame
+#: ../src/x_print.c:338
 #, fuzzy
 msgid "Destination"
 msgstr "¥É¥­¥å¥á¥ó¥Èɽ¼¨/¸¡º÷"
 
-#: src/x_print.c:350
+#: ../src/x_print.c:351
 #, fuzzy
 msgid "File:"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: src/x_print.c:380
+#: ../src/x_print.c:381
 msgid "Command:"
 msgstr ""
 
-#: src/x_print.c:750
+#: ../src/x_print.c:751
 msgid "No print destination specified\n"
 msgstr ""
 
-#: src/x_print.c:757
+#: ../src/x_print.c:758
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "¸½ºß¤Î¥¹¥±¥Þ¥Á¥Ã¥¯¤ò°õºþ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: src/x_print.c:766
+#: ../src/x_print.c:767
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
 "Check the log window for more information"
 msgstr ""
 
-#: src/x_print.c:773
+#: ../src/x_print.c:774
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "¸½ºß¤Î¥¹¥±¥Þ¥Á¥Ã¥¯¤ò°õºþ¤·¤Þ¤·¤¿¡£[%s]\n"
 
-#: src/x_window.c:176
+#: ../src/x_window.c:86
 msgid "black"
 msgstr "¹õ"
 
-#: src/x_window.c:185
+#: ../src/x_window.c:95
 msgid "white"
 msgstr "Çò"
 
-#: src/x_window.c:219
+#: ../src/x_window.c:129
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr ""
 
-#: src/x_window.c:232
+#: ../src/x_window.c:142
 #, c-format
 msgid "Couldn't allocate xor_gc\n"
 msgstr ""
 
-#: src/x_window.c:245
+#: ../src/x_window.c:155
 #, c-format
 msgid "Couldn't allocate outline_xor_gc\n"
 msgstr ""
 
-#: src/x_window.c:261
+#: ../src/x_window.c:171
 #, c-format
 msgid "Couldn't allocate bounding_xor_gc\n"
 msgstr ""
 
-#: src/x_window.c:268
+#: ../src/x_window.c:178
 #, c-format
 msgid "Couldn't allocate bus_gc\n"
 msgstr ""
 
-#: src/x_window.c:490
+#: ../src/x_window.c:402
 msgid "New file"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
 
-#: src/x_window.c:496
+#: ../src/x_window.c:408
 msgid "Open"
 msgstr "³«¤¯"
 
-#: src/x_window.c:497
+#: ../src/x_window.c:409
 msgid "Open file..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: src/x_window.c:503
+#: ../src/x_window.c:415
 msgid "Save"
 msgstr "Êݸ"
 
-#: src/x_window.c:504
+#: ../src/x_window.c:416
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤òÊݸ"
 
-#: src/x_window.c:512
+#: ../src/x_window.c:424
 msgid "Undo last operation"
 msgstr "¥¢¥ó¥É¥¥"
 
-#: src/x_window.c:519
+#: ../src/x_window.c:431
 msgid "Redo last undo"
 msgstr "¥ê¥É¥¥"
 
-#: src/x_window.c:528
+#: ../src/x_window.c:440
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2281,7 +2324,7 @@ msgstr ""
 "¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢ÇÛÃÖ¤·¤Þ¤¹¡£\n"
 "±¦¥Ü¥¿¥ó¤Ç¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹¡£"
 
-#: src/x_window.c:538
+#: ../src/x_window.c:450
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2289,7 +2332,7 @@ msgstr ""
 "¥Í¥Ã¥ÈÄɲå⡼¥É\n"
 "±¦¥Ü¥¿¥ó¤Ç¥­¥ã¥ó¥»¥ë"
 
-#: src/x_window.c:548
+#: ../src/x_window.c:460
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2297,76 +2340,102 @@ msgstr ""
 "¥Ð¥¹Äɲå⡼¥É\n"
 "±¦¥Ü¥¿¥ó¤Ç¥­¥ã¥ó¥»¥ë"
 
-#: src/x_window.c:555
+#: ../src/x_window.c:467
 msgid "Text"
 msgstr "¥Æ¥­¥¹¥È"
 
-#: src/x_window.c:556
+#: ../src/x_window.c:468
 msgid "Add Text..."
 msgstr "¥Æ¥­¥¹¥ÈÄɲÃ..."
 
-#: src/x_window.c:566
+#: ../src/x_window.c:478
 msgid "Select"
 msgstr "ÁªÂò"
 
-#: src/x_window.c:567
+#: ../src/x_window.c:479
 msgid "Select mode"
 msgstr "ÁªÂò¥â¡¼¥É"
 
-#: src/x_window.c:642
+#: ../src/x_window.c:554
 msgid "Pick"
 msgstr "¥Ô¥Ã¥¯"
 
-#: src/x_window.c:658
+#: ../src/x_window.c:570
 msgid "Repeat/none"
 msgstr "·«¤êÊÖ¤·/¤Ê¤·"
 
-#: src/x_window.c:668
+#: ../src/x_window.c:580
 msgid "Menu/Cancel"
 msgstr "¥á¥Ë¥å¡¼/¥­¥ã¥ó¥»¥ë"
 
-#: src/x_window.c:670
+#: ../src/x_window.c:582
 msgid "Pan/Cancel"
 msgstr "¥Ñ¥ó/¥­¥ã¥ó¥»¥ë"
 
-#: src/x_window.c:926
+#: ../src/x_window.c:809
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹¡£[%s]\n"
 
-#: src/x_window.c:1028
+#: ../src/x_window.c:821
+#, fuzzy
+msgid "Failed to load file"
+msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
+
+#: ../src/x_window.c:830
+#, fuzzy, c-format
+msgid "New file [%s]\n"
+msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
+
+#. an error occured when saving page to file
+#: ../src/x_window.c:936
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Êݸ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: src/x_window.c:1029
+#: ../src/x_window.c:937
 msgid "Error while trying to save"
 msgstr "ÊݸÃæ¤Ë¥¨¥é¡¼È¯À¸"
 
-#: src/x_window.c:1038
+#: ../src/x_window.c:946
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "[%s]¤È¤·¤ÆÊݸ¤·¤Þ¤·¤¿¡£\n"
 
-#: src/x_window.c:1040
+#: ../src/x_window.c:948
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Êݸ¤·¤Þ¤·¤¿¡£[%s]\n"
 
-#: src/x_window.c:1042
+#: ../src/x_window.c:950
 msgid "Saved"
 msgstr "Êݸ¤·¤Þ¤·¤¿¡£"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "¥Ú¡¼¥¸¤òÇË´þ¤·¤Æ¤¤¤Þ¤¹¡£[%s]\n"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "ÊĤ¸¤Æ¤¤¤Þ¤¹¡£[%s]\n"
 
+#: ../data/geda-gschem.desktop.in.h:1
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
+#: ../data/geda-gschem.desktop.in.h:2
+#, fuzzy
+msgid "gEDA Schematic Editor"
+msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
+
+#~ msgid "Attribute Mode"
+#~ msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È¥â¡¼¥É"
+
+#~ msgid "ERROR! you can't get an attribute without an ='s\n"
+#~ msgstr "¥¨¥é¡¼!¥¢¥È¥ê¥Ó¥å¡¼¥È¤Ë¤Ï'='¤¬É¬ÍפǤ¹¡£\n"
+
 #~ msgid "Invalid mode [%s] passed to %s\n"
 #~ msgstr "̵¸ú¤Ê¥â¡¼¥É[%s]¤¬%s¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
diff --git a/gschem/po/nl_NL.po b/gschem/po/nl_NL.po
index c1748bb..cc06bfc 100644
--- a/gschem/po/nl_NL.po
+++ b/gschem/po/nl_NL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geda-gschem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-02 21:10-0400\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-06-23 23:19+0100\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: geda-dev@xxxxxxxxxxxxxx\n"
@@ -14,587 +14,597 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/rcstrings.c:2
+#: ../src/rcstrings.c:2
 msgid "File"
 msgstr "Bestand"
 
-#: src/rcstrings.c:3
+#: ../src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nieuw venster"
 
-#: src/rcstrings.c:4 src/x_pagesel.c:258
+#: ../src/rcstrings.c:4 ../src/x_pagesel.c:259
 msgid "New Page"
 msgstr "Nieuwe pagina"
 
-#: src/rcstrings.c:5 src/x_pagesel.c:259
+#: ../src/rcstrings.c:5 ../src/x_pagesel.c:260
 msgid "Open Page..."
 msgstr "Open pagina..."
 
-#: src/rcstrings.c:6 src/x_pagesel.c:262
+#: ../src/rcstrings.c:6 ../src/x_pagesel.c:263
 msgid "Close Page"
 msgstr "Sluit pagina"
 
-#: src/rcstrings.c:7
+#: ../src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Terughalen pagina"
 
-#: src/rcstrings.c:8 src/x_pagesel.c:261
+#: ../src/rcstrings.c:8 ../src/x_pagesel.c:262
 msgid "Save Page"
 msgstr "Opslaan pagina"
 
-#: src/rcstrings.c:9
+#: ../src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Opslaan Pagina Als..."
 
-#: src/rcstrings.c:10
+#: ../src/rcstrings.c:10
 msgid "Save All"
 msgstr "Alles Opslaan"
 
-#: src/rcstrings.c:11 src/x_print.c:283
+#. GtkWindow
+#: ../src/rcstrings.c:11 ../src/x_print.c:284
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: src/rcstrings.c:12 src/x_image.c:503
+#. Create the dialog
+#: ../src/rcstrings.c:12 ../src/x_image.c:509
 msgid "Write image..."
 msgstr "Schrijf Afbeelding..."
 
-#: src/rcstrings.c:13 src/x_menus.c:524
+#: ../src/rcstrings.c:13 ../src/x_menus.c:525
 msgid "Recent files"
 msgstr "Nieuw bestand"
 
-#: src/rcstrings.c:14 src/x_script.c:50
+#: ../src/rcstrings.c:14 ../src/x_script.c:51
 msgid "Execute Script..."
 msgstr "Uitvoeren Script..."
 
-#: src/rcstrings.c:15
+#: ../src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Sluit venster"
 
-#: src/rcstrings.c:16
+#: ../src/rcstrings.c:16
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/rcstrings.c:18 src/i_callbacks.c:730
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:732
 msgid "Edit"
 msgstr "Bewerk"
 
-#: src/rcstrings.c:19 src/x_window.c:511
+#: ../src/rcstrings.c:19 ../src/x_window.c:423
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/rcstrings.c:20 src/x_window.c:518
+#: ../src/rcstrings.c:20 ../src/x_window.c:430
 msgid "Redo"
 msgstr "Herstel"
 
-#: src/rcstrings.c:21 src/i_basic.c:81 src/x_window.c:682
+#: ../src/rcstrings.c:21 ../src/i_basic.c:81 ../src/x_window.c:594
 msgid "Select Mode"
 msgstr "Selectie Mode"
 
-#: src/rcstrings.c:22
+#: ../src/rcstrings.c:22
 msgid "Cut Buffer"
 msgstr "Knip Buffer"
 
-#: src/rcstrings.c:23
+#: ../src/rcstrings.c:23
 msgid "Copy Buffer"
 msgstr "Kopieer Buffer"
 
-#: src/rcstrings.c:24
+#: ../src/rcstrings.c:24
 msgid "Paste Buffer"
 msgstr "Plak Buffer"
 
-#: src/rcstrings.c:25
+#: ../src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Bewerk..."
 
-#: src/rcstrings.c:26
+#: ../src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Bewerk Tekst..."
 
-#: src/rcstrings.c:27 src/i_basic.c:94
+#: ../src/rcstrings.c:27 ../src/i_basic.c:91
 msgid "Copy Mode"
 msgstr "Kopieer Mode"
 
-#: src/rcstrings.c:28 src/i_basic.c:149
+#: ../src/rcstrings.c:28 ../src/i_basic.c:146
 msgid "Multiple Copy Mode"
 msgstr "Meervoudige Kopieer Mode"
 
-#: src/rcstrings.c:29 src/i_basic.c:97
+#: ../src/rcstrings.c:29 ../src/i_basic.c:94
 msgid "Move Mode"
 msgstr "Verplaats Mode"
 
-#: src/rcstrings.c:30 src/i_callbacks.c:706 src/x_multiattrib.c:1258
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:708 ../src/x_multiattrib.c:1248
 msgid "Delete"
 msgstr "Verwijder"
 
-#: src/rcstrings.c:31
+#: ../src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Rotatie 90 Mode"
 
-#: src/rcstrings.c:32 src/i_basic.c:101
+#: ../src/rcstrings.c:32 ../src/i_basic.c:98
 msgid "Mirror Mode"
 msgstr "Spiegel Mode"
 
-#: src/rcstrings.c:33
+#: ../src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Slot..."
 
-#: src/rcstrings.c:34
+#: ../src/rcstrings.c:34
 msgid "Color..."
 msgstr "Kleur..."
 
-#: src/rcstrings.c:35 src/i_callbacks.c:952
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:952
 msgid "Lock"
 msgstr "Vergrendel"
 
-#: src/rcstrings.c:36 src/i_callbacks.c:970
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:970
 msgid "Unlock"
 msgstr "Ontgrendel"
 
-#: src/rcstrings.c:37
+#: ../src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Lijn Dikte & Type..."
 
-#: src/rcstrings.c:38
+#: ../src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Arcering Type..."
 
-#: src/rcstrings.c:39
+#: ../src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Verplaats Symbool..."
 
-#: src/rcstrings.c:40
+#: ../src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Component/Afbeelding Insluiten"
 
-#: src/rcstrings.c:41
+#: ../src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Component/Afbeelding Uitsluiten"
 
-#: src/rcstrings.c:42
+#: ../src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Hernieuw Component"
 
-#: src/rcstrings.c:43
+#: ../src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Zichtbaar/Verborgen Onzichtbare Tekst"
 
-#: src/rcstrings.c:44
+#: ../src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Maak Onzichtbare Tekst Zichtbaar"
 
-#: src/rcstrings.c:46
+#: ../src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Buffer"
 
-#: src/rcstrings.c:47
+#: ../src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Kopieer naar 1"
 
-#: src/rcstrings.c:48
+#: ../src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Kopieer naar 2"
 
-#: src/rcstrings.c:49
+#: ../src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Kopieer naar 3"
 
-#: src/rcstrings.c:50
+#: ../src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Kopieer naar 4"
 
-#: src/rcstrings.c:51
+#: ../src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Kopieer naar 5"
 
-#: src/rcstrings.c:52
+#: ../src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Knip naar 1"
 
-#: src/rcstrings.c:53
+#: ../src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Knip naar 2"
 
-#: src/rcstrings.c:54
+#: ../src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Knip naar 3"
 
-#: src/rcstrings.c:55
+#: ../src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Knip naar 4"
 
-#: src/rcstrings.c:56
+#: ../src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Knip naar 5"
 
-#: src/rcstrings.c:57
+#: ../src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Plak vanuit 1"
 
-#: src/rcstrings.c:58
+#: ../src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Plak vanuit 2"
 
-#: src/rcstrings.c:59
+#: ../src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Plak vanuit 3"
 
-#: src/rcstrings.c:60
+#: ../src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Plak vanuit 4"
 
-#: src/rcstrings.c:61
+#: ../src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Plak vanuit 5"
 
-#: src/rcstrings.c:63
+#: ../src/rcstrings.c:63
 msgid "View"
 msgstr "Toon"
 
-#: src/rcstrings.c:64
+#: ../src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Hertekenen"
 
-#: src/rcstrings.c:65 src/i_callbacks.c:1537 src/i_callbacks.c:1606
+#. I don't know if this would get in the way
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1542 ../src/i_callbacks.c:1611
 msgid "Pan"
 msgstr "Schuif"
 
-#: src/rcstrings.c:66 src/i_basic.c:105
+#: ../src/rcstrings.c:66 ../src/i_basic.c:102
 msgid "Zoom Box"
 msgstr "Vergroot Venster"
 
-#: src/rcstrings.c:67
+#: ../src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Toon Alles"
 
-#: src/rcstrings.c:68
+#: ../src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Vergroot"
 
-#: src/rcstrings.c:69
+#: ../src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Verklein"
 
-#: src/rcstrings.c:70
+#: ../src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Toon Maximaal"
 
-#: src/rcstrings.c:72
+#: ../src/rcstrings.c:72
 msgid "Page"
 msgstr "Pagina"
 
-#: src/rcstrings.c:73
+#: ../src/rcstrings.c:73
 msgid "Manager..."
 msgstr "Manager..."
 
-#: src/rcstrings.c:74
+#: ../src/rcstrings.c:74
 msgid "Next"
 msgstr "Volgende"
 
-#: src/rcstrings.c:75
+#: ../src/rcstrings.c:75
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/rcstrings.c:76 src/x_window.c:489
+#: ../src/rcstrings.c:76 ../src/x_window.c:401
 msgid "New"
 msgstr "Nieuw"
 
-#: src/rcstrings.c:77
+#: ../src/rcstrings.c:77
 msgid "Revert"
 msgstr "Terughalen"
 
-#: src/rcstrings.c:78
+#: ../src/rcstrings.c:78
 msgid "Close"
 msgstr "Sluit"
 
-#: src/rcstrings.c:79
+#: ../src/rcstrings.c:79
 msgid "Discard"
 msgstr "Wegdoen"
 
-#: src/rcstrings.c:81
+#: ../src/rcstrings.c:81
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/rcstrings.c:82
+#: ../src/rcstrings.c:82
 msgid "Component..."
 msgstr "Component..."
 
-#: src/rcstrings.c:83 src/i_callbacks.c:2358 src/i_callbacks.c:2380
+#. need to click
+#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2340 ../src/i_callbacks.c:2362
 msgid "Net"
 msgstr "Draad"
 
-#: src/rcstrings.c:84 src/i_callbacks.c:2424 src/i_callbacks.c:2447
-#: src/x_window.c:547
+#. need to click
+#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2406 ../src/i_callbacks.c:2429
+#: ../src/x_window.c:459
 msgid "Bus"
 msgstr "Bus"
 
-#: src/rcstrings.c:85
+#: ../src/rcstrings.c:85
 msgid "Attribute..."
 msgstr "Attribuut..."
 
-#: src/rcstrings.c:86
+#: ../src/rcstrings.c:86
 msgid "Text..."
 msgstr "Tekst..."
 
-#: src/rcstrings.c:87 src/i_callbacks.c:2528 src/i_callbacks.c:2547
+#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2510 ../src/i_callbacks.c:2529
 msgid "Line"
 msgstr "Lijn"
 
-#: src/rcstrings.c:88 src/i_callbacks.c:2569 src/i_callbacks.c:2588
+#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2551 ../src/i_callbacks.c:2570
 msgid "Box"
 msgstr "Rechthoek"
 
-#: src/rcstrings.c:89 src/i_callbacks.c:2644 src/i_callbacks.c:2664
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2626 ../src/i_callbacks.c:2646
 msgid "Circle"
 msgstr "Cirkel"
 
-#: src/rcstrings.c:90 src/i_callbacks.c:2686 src/i_callbacks.c:2705
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2668 ../src/i_callbacks.c:2687
 msgid "Arc"
 msgstr "Boog"
 
-#: src/rcstrings.c:91 src/i_callbacks.c:2727 src/i_callbacks.c:2746
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2709 ../src/i_callbacks.c:2728
 msgid "Pin"
 msgstr "Pin"
 
-#: src/rcstrings.c:92
+#: ../src/rcstrings.c:92
 msgid "Picture..."
 msgstr "Afbeelding..."
 
-#: src/rcstrings.c:94
+#: ../src/rcstrings.c:94
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-#: src/rcstrings.c:95
+#: ../src/rcstrings.c:95
 msgid "Down Schematic"
 msgstr "Naar Schema"
 
-#: src/rcstrings.c:96
+#: ../src/rcstrings.c:96
 msgid "Down Symbol"
 msgstr "Naar Symbool"
 
-#: src/rcstrings.c:97
+#: ../src/rcstrings.c:97
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/rcstrings.c:98
+#: ../src/rcstrings.c:98
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: src/rcstrings.c:100 src/x_multiattrib.c:1549
+#. GtkFrame
+#: ../src/rcstrings.c:100 ../src/x_multiattrib.c:1539
 msgid "Attributes"
 msgstr "Attributen"
 
-#: src/rcstrings.c:101 src/i_callbacks.c:3011
+#: ../src/rcstrings.c:101 ../src/i_callbacks.c:2993
 msgid "Attach"
 msgstr "Vastmaken"
 
-#: src/rcstrings.c:102 src/i_callbacks.c:3060
+#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3042
 msgid "Detach"
 msgstr "Losmaken"
 
-#: src/rcstrings.c:103
+#: ../src/rcstrings.c:103
 msgid "Show Value"
 msgstr "Toon Waarde"
 
-#: src/rcstrings.c:104
+#: ../src/rcstrings.c:104
 msgid "Show Name"
 msgstr "Toon Naam"
 
-#: src/rcstrings.c:105
+#: ../src/rcstrings.c:105
 msgid "Show Both"
 msgstr "Toon Beide"
 
-#: src/rcstrings.c:106
+#: ../src/rcstrings.c:106
 msgid "Toggle Visibility"
 msgstr "Schakel Zichtbaarheid"
 
-#: src/rcstrings.c:107
+#: ../src/rcstrings.c:107
 msgid "Find Specific Text..."
 msgstr "Vind Specifieke Tekst..."
 
-#: src/rcstrings.c:108
+#: ../src/rcstrings.c:108
 msgid "Hide Specific Text..."
 msgstr "Verberg Specifike Tekst..."
 
-#: src/rcstrings.c:109
+#: ../src/rcstrings.c:109
 msgid "Show Specific Text..."
 msgstr "Toon Specifieke Tekst..."
 
-#: src/rcstrings.c:110
+#: ../src/rcstrings.c:110
 msgid "Autonumber Text..."
 msgstr "Automatisch Tekst Nummeren..."
 
-#: src/rcstrings.c:112
+#: ../src/rcstrings.c:112
 msgid "Options"
 msgstr "Opties"
 
-#: src/rcstrings.c:113
+#: ../src/rcstrings.c:113
 msgid "Text Size..."
 msgstr "Tekst Hoogte..."
 
-#: src/rcstrings.c:114
+#: ../src/rcstrings.c:114
 msgid "Toggle Grid On/Off"
 msgstr "Schakel Grid Aan/Uit"
 
-#: src/rcstrings.c:115
+#: ../src/rcstrings.c:115
 msgid "Toggle Snap On/Off"
 msgstr "Schakel Snap Aan/Uit"
 
-#: src/rcstrings.c:116
+#: ../src/rcstrings.c:116
 msgid "Snap Grid Spacing..."
 msgstr "Snap Grid Afstand..."
 
-#: src/rcstrings.c:117
+#: ../src/rcstrings.c:117
 msgid "Scale up Grid Spacing"
 msgstr "Omhoog schalen Grid Afstand"
 
-#: src/rcstrings.c:118
+#: ../src/rcstrings.c:118
 msgid "Scale down Grid Spacing"
 msgstr "Omlaag schalen Snap Grid Afstand"
 
-#: src/rcstrings.c:119
+#: ../src/rcstrings.c:119
 msgid "Toggle Outline/Box"
 msgstr "Schakel Contour/Rechthoek"
 
-#: src/rcstrings.c:120
+#: ../src/rcstrings.c:120
 msgid "Toggle Net Rubberband"
 msgstr "Schakel Draad Elastiekband"
 
-#: src/rcstrings.c:121
+#: ../src/rcstrings.c:121
 msgid "Show Log Window..."
 msgstr "Toon Logboek venster..."
 
-#: src/rcstrings.c:122
+#: ../src/rcstrings.c:122
 msgid "Show Coord Window..."
 msgstr "Toon Coordinaten venster..."
 
-#: src/rcstrings.c:124
+#: ../src/rcstrings.c:124
 msgid "Help"
 msgstr "Help"
 
-#: src/rcstrings.c:125
+#: ../src/rcstrings.c:125
 msgid "Manual"
 msgstr "Handleiding"
 
-#: src/rcstrings.c:126
+#: ../src/rcstrings.c:126
 msgid "gEDA Documentation"
 msgstr "gEDA Documentatie"
 
-#: src/rcstrings.c:127
+#: ../src/rcstrings.c:127
 msgid "gschem FAQ"
 msgstr "gschem FAQ"
 
-#: src/rcstrings.c:128
+#: ../src/rcstrings.c:128
 msgid "Component Documentation"
 msgstr "Component Documentatie"
 
-#: src/rcstrings.c:129
+#: ../src/rcstrings.c:129
 msgid "About gschem"
 msgstr "Over gschem"
 
-#: src/rcstrings.c:130 src/x_dialog.c:2517
+#: ../src/rcstrings.c:130 ../src/x_dialog.c:2517
 msgid "Hotkeys"
 msgstr "Sneltoets"
 
-#: src/a_zoom.c:245
+#: ../src/a_zoom.c:250
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Vergroting te klein! Kan niet verder vergroten.\n"
 
-#: src/g_funcs.c:342 src/i_callbacks.c:137
+#. Fork failed. Still in parent process, so can use the log
+#. * window
+#: ../src/g_funcs.c:343 ../src/i_callbacks.c:138
 #, c-format
 msgid "Could not fork\n"
 msgstr "Kan niet afsplitsen\n"
 
-#: src/g_funcs.c:358 src/i_callbacks.c:147
+#. if we return, then nothing happened
+#: ../src/g_funcs.c:359 ../src/i_callbacks.c:148
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Kan %s niet aanroepen\n"
 
-#: src/g_funcs.c:364 src/i_callbacks.c:151
+#: ../src/g_funcs.c:365 ../src/i_callbacks.c:152
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Documentatie opdrachten niet ondersteund bij MinGW.\n"
 
-#: src/g_hook.c:88
+#: ../src/g_hook.c:87
 #, c-format
 msgid "Attribute failed ot find.\n"
 msgstr "Attribuut weigert of niet gevonden.\n"
 
-#: src/g_rc.c:159
+#: ../src/g_rc.c:160
 #, c-format
 msgid "Invalid color [%s] passed to %s\n"
 msgstr "Ongeldige kleur [%s] overgedragen aan %s\n"
 
-#: src/g_rc.c:433
+#: ../src/g_rc.c:434
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ongeldige vergrotingsfactor [%d] overgedragen aan %s\n"
 
-#: src/g_rc.c:524
+#: ../src/g_rc.c:525
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ongeldige waarde [%d] overgedragen aan text-size\n"
 
-#: src/g_rc.c:551
+#: ../src/g_rc.c:552
 #, 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:594
+#: ../src/g_rc.c:595
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ongeldige waarde [%d] overgedragen aan snap-size\n"
 
-#: src/g_rc.c:1049
+#: ../src/g_rc.c:1050
 #, 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:1289
+#: ../src/g_rc.c:1290
 #, 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:1364
+#: ../src/g_rc.c:1365
 #, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
 msgstr "Ongeldige beeldpunt afmeting [%d] overgedragen aan grid-dot-size\n"
 
-#: src/g_rc.c:1405
+#: ../src/g_rc.c:1406
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
-msgstr "Ongeldige beeldpunt ruimte [%d] overgedragen aan grid-fixed-threshold\n"
+msgstr ""
+"Ongeldige beeldpunt ruimte [%d] overgedragen aan grid-fixed-threshold\n"
 
-#: src/g_rc.c:1449
+#: ../src/g_rc.c:1450
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ongeldige waarde [%d] overgedragen aan add-attribute-offset\n"
 
-#: src/g_rc.c:1473
+#: ../src/g_rc.c:1474
 #, 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:1514
+#: ../src/g_rc.c:1515
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ongeldige versterking [%d] overgedragen aan mousepan-gain\n"
 
-#: src/g_rc.c:1537
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ongeldige versterking [%d] overgedragen aan keyboardpan-gain\n"
 
-#: src/g_rc.c:1583
+#: ../src/g_rc.c:1584
 #, 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/gschem.c:192 src/gschem.c:203
+#: ../src/gschem.c:193 ../src/gschem.c:204
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versie %s%s.%s\n"
 
-#: src/gschem.c:195 src/gschem.c:206
+#: ../src/gschem.c:196 ../src/gschem.c:207
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -603,7 +613,7 @@ msgstr ""
 "gEDA/gschem komt ABSOLUUT ZONDER GARANTIE; zie het COPYING bestand voor meer "
 "informatie.\n"
 
-#: src/gschem.c:197 src/gschem.c:208
+#: ../src/gschem.c:198 ../src/gschem.c:209
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -611,7 +621,7 @@ msgstr ""
 "Dit is vrije software, en je wordt aangemoedigt dit te herdistribueren onder "
 "bepaalde\n"
 
-#: src/gschem.c:199 src/gschem.c:210
+#: ../src/gschem.c:200 ../src/gschem.c:211
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -620,212 +630,210 @@ msgstr ""
 "condities; zie het COPYING bestand voor meer informatie.\n"
 "\n"
 
-#: src/gschem.c:214
+#: ../src/gschem.c:215
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Dit is de MINGW32 versie.\n"
 
-#: src/gschem.c:218
+#: ../src/gschem.c:219
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Huidige locale instellingen: %s\n"
 
-#: src/gschem.c:231
+#: ../src/gschem.c:232
 #, c-format
 msgid "You must set the GEDADATA environment variable!\n"
 msgstr "Je moet de GEDADATA variabele instellen!\n"
 
-#: src/gschem.c:246
+#: ../src/gschem.c:248
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lees init scm bestand [%s]\n"
 
-#: src/gschem.c:250 src/gschem.c:253
+#. ! \todo These two messages are the same. Should be
+#. * integrated.
+#: ../src/gschem.c:252 ../src/gschem.c:255
 #, 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:323
+#: ../src/gschem.c:323
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Scheme bestandenmap is NIET ingesteld!\n"
 
-#: src/gschem.c:330 src/x_script.c:71
+#: ../src/gschem.c:330 ../src/x_script.c:72
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Bezig met uitvoeren van guile script [%s]\n"
 
-#: src/i_basic.c:84
-msgid "Attribute Mode"
-msgstr "Attribuut Mode"
-
-#: src/i_basic.c:87
+#: ../src/i_basic.c:84
 msgid "Component Mode"
 msgstr "Component Mode"
 
-#: src/i_basic.c:91
+#: ../src/i_basic.c:88
 msgid "Text Mode"
 msgstr "Tekst Mode"
 
-#: src/i_basic.c:99
+#: ../src/i_basic.c:96
 msgid "Rotate Mode"
 msgstr "Rotatie Mode"
 
-#: src/i_basic.c:109
+#: ../src/i_basic.c:106
 msgid "Pan Mode"
 msgstr "Schuif Mode"
 
-#: src/i_basic.c:113
+#: ../src/i_basic.c:110
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Plak %d Mode"
 
-#: src/i_basic.c:118
+#: ../src/i_basic.c:115
 msgid "Net Mode"
 msgstr "Net Mode"
 
-#: src/i_basic.c:122
+#: ../src/i_basic.c:119
 msgid "Bus Mode"
 msgstr "Bus Mode"
 
-#: src/i_basic.c:125
+#: ../src/i_basic.c:122
 msgid "Line Mode"
 msgstr "Lijn Mode"
 
-#: src/i_basic.c:128
+#: ../src/i_basic.c:125
 msgid "Box Mode"
 msgstr "Rechthoek Mode"
 
-#: src/i_basic.c:131
+#: ../src/i_basic.c:128
 msgid "Picture Mode"
 msgstr "Afbeelding Mode"
 
-#: src/i_basic.c:134
+#: ../src/i_basic.c:131
 msgid "Circle Mode"
 msgstr "Cirkel Mode"
 
-#: src/i_basic.c:137
+#: ../src/i_basic.c:134
 msgid "Arc Mode"
 msgstr "Boog Mode"
 
-#: src/i_basic.c:140
+#: ../src/i_basic.c:137
 msgid "Pin Mode"
 msgstr "Pen Mode"
 
-#: src/i_basic.c:142 src/i_callbacks.c:587 src/i_callbacks.c:606
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:589 ../src/i_callbacks.c:608
 msgid "Copy"
 msgstr "Kopieer"
 
-#: src/i_basic.c:144 src/i_callbacks.c:667 src/i_callbacks.c:686
+#: ../src/i_basic.c:141 ../src/i_callbacks.c:669 ../src/i_callbacks.c:688
 msgid "Move"
 msgstr "Verplaats"
 
-#: src/i_basic.c:146 src/i_callbacks.c:627 src/i_callbacks.c:646
+#: ../src/i_basic.c:143 ../src/i_callbacks.c:629 ../src/i_callbacks.c:648
 msgid "Multiple Copy"
 msgstr "Meervoudig Kopieren"
 
-#: src/i_basic.c:174
+#: ../src/i_basic.c:172
 msgid "Show Hidden"
 msgstr "Zichtbaar Verborgen"
 
-#: src/i_basic.c:177
+#: ../src/i_basic.c:175
 msgid "Snap Off"
 msgstr "Snap Aan"
 
-#: src/i_basic.c:259 src/x_window.c:656
+#: ../src/i_basic.c:256 ../src/x_window.c:568
 msgid "Action"
 msgstr "Aktie"
 
-#: src/i_basic.c:267 src/x_window.c:651
+#: ../src/i_basic.c:262 ../src/x_window.c:563
 msgid "Stroke"
 msgstr "Stroke"
 
-#: src/i_basic.c:274 src/x_window.c:653
+#: ../src/i_basic.c:268 ../src/x_window.c:565
 msgid "none"
 msgstr "geen"
 
-#: src/i_basic.c:281
+#: ../src/i_basic.c:273
 msgid "Repeat/"
 msgstr "Herhaal/"
 
-#: src/i_basic.c:570 src/i_basic.c:575
+#: ../src/i_basic.c:538 ../src/i_basic.c:543
 msgid "OFF"
 msgstr "UIT"
 
-#: src/i_basic.c:579
+#: ../src/i_basic.c:547
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Raster(%s, %s)"
 
-#: src/i_callbacks.c:132
+#: ../src/i_callbacks.c:133
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentatie voor [%s,%s,%s,%s]\n"
 
-#: src/i_callbacks.c:192 src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:193 ../src/i_callbacks.c:1754
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nieuwe pagina gemaakt [%s]\n"
 
-#: src/i_callbacks.c:227 src/x_menus.c:493
+#: ../src/i_callbacks.c:229 ../src/x_menus.c:494
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nieuw venster gemaakt [%s]\n"
 
-#: src/i_callbacks.c:345
+#: ../src/i_callbacks.c:347
 msgid "Failed to Save All"
 msgstr "Fout tijdens Alles Opslaan"
 
-#: src/i_callbacks.c:347
+#: ../src/i_callbacks.c:349
 #, fuzzy
 msgid "Saved All"
 msgstr "Alles Opgeslagen"
 
-#: src/i_callbacks.c:439
+#: ../src/i_callbacks.c:441
 msgid "Closing Window\n"
 msgstr "Sluit Venster\n"
 
-#: src/i_callbacks.c:591 src/i_callbacks.c:631 src/i_callbacks.c:671
+#: ../src/i_callbacks.c:593 ../src/i_callbacks.c:633 ../src/i_callbacks.c:673
 msgid "Select objs first"
 msgstr "Selecteer voorwerpen eerst"
 
-#: src/i_callbacks.c:746
+#: ../src/i_callbacks.c:748
 msgid "Edit Text"
 msgstr "Bewerk Tekst"
 
-#: src/i_callbacks.c:769
+#: ../src/i_callbacks.c:771
 msgid "Slot"
 msgstr "Slot"
 
-#: src/i_callbacks.c:786
+#: ../src/i_callbacks.c:788
 msgid "Color"
 msgstr "Kleur"
 
-#: src/i_callbacks.c:828 src/i_callbacks.c:875
+#: ../src/i_callbacks.c:830 ../src/i_callbacks.c:877
 msgid "Rotate"
 msgstr "Roteer"
 
-#: src/i_callbacks.c:902 src/i_callbacks.c:924
+#: ../src/i_callbacks.c:904 ../src/i_callbacks.c:926
 msgid "Mirror"
 msgstr "Spiegel"
 
-#: src/i_callbacks.c:988 src/x_dialog.c:1604
+#: ../src/i_callbacks.c:988 ../src/x_dialog.c:1611
 msgid "Translate"
 msgstr "Verplaats"
 
-#: src/i_callbacks.c:991
+#: ../src/i_callbacks.c:991
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "ATTENTIE: Niet verplaatsen met snap uit!\n"
 
-#: src/i_callbacks.c:992
+#: ../src/i_callbacks.c:992
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "ATTENTIE: Zet snap aan en vervolg de verplaatsing.\n"
 
-#: src/i_callbacks.c:999
+#: ../src/i_callbacks.c:999
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ATTENTIE: Snap grid waarde is niet gelijk aan 100!\n"
 
-#: src/i_callbacks.c:1001
+#: ../src/i_callbacks.c:1001
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -833,131 +841,132 @@ msgstr ""
 "ATTENTIE: Als je een symbool naar de oorsprong verschuift, dan moet de snap "
 "grip waarde op 100 gezet worden\n"
 
-#: src/i_callbacks.c:1022
+#: ../src/i_callbacks.c:1022
 msgid "Embed"
 msgstr "Insluiten"
 
-#: src/i_callbacks.c:1060
+#: ../src/i_callbacks.c:1063
 msgid "Unembed"
 msgstr "Uitsluiten"
 
-#: src/i_callbacks.c:1100
+#: ../src/i_callbacks.c:1106
 msgid "Update"
 msgstr "Vernieuw"
 
-#: src/i_callbacks.c:1157
+#: ../src/i_callbacks.c:1163
 msgid "ShowHidden"
 msgstr "ZichtbaarVerborgen"
 
-#: src/i_callbacks.c:1180
+#: ../src/i_callbacks.c:1186
 msgid "MakeVisible"
 msgstr "MaakZichtbaar"
 
-#: src/i_callbacks.c:1296
+#: ../src/i_callbacks.c:1302
 msgid "Edit Line Type"
 msgstr "Bewerk Lijn Type"
 
-#: src/i_callbacks.c:1337 src/x_dialog.c:1261
+#: ../src/i_callbacks.c:1343 ../src/x_dialog.c:1268
 msgid "Edit Fill Type"
 msgstr "Bewerk Arcering Type"
 
-#: src/i_callbacks.c:1643
+#: ../src/i_callbacks.c:1648
 msgid "Update Cues"
 msgstr "Vernieuw aanwijzing"
 
-#: src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1798
 msgid "Really revert page?"
 msgstr "Echt Terughalen pagina?"
 
-#: src/i_callbacks.c:1856
+#: ../src/i_callbacks.c:1872
 msgid "Copy 1"
 msgstr "Kopieer 1"
 
-#: src/i_callbacks.c:1875
+#: ../src/i_callbacks.c:1891
 msgid "Copy 2"
 msgstr "Kopieer 2"
 
-#: src/i_callbacks.c:1894
+#: ../src/i_callbacks.c:1910
 msgid "Copy 3"
 msgstr "Kopieer 3"
 
-#: src/i_callbacks.c:1913
+#: ../src/i_callbacks.c:1929
 msgid "Copy 4"
 msgstr "Kopieer 4"
 
-#: src/i_callbacks.c:1932
+#: ../src/i_callbacks.c:1948
 msgid "Copy 5"
 msgstr "Kopieer 5"
 
-#: src/i_callbacks.c:1951
+#: ../src/i_callbacks.c:1967
 msgid "Cut 1"
 msgstr "Knip 1"
 
-#: src/i_callbacks.c:1970
+#: ../src/i_callbacks.c:1986
 msgid "Cut 2"
 msgstr "Knip 2"
 
-#: src/i_callbacks.c:1989
+#: ../src/i_callbacks.c:2005
 msgid "Cut 3"
 msgstr "Knip 3"
 
-#: src/i_callbacks.c:2008
+#: ../src/i_callbacks.c:2024
 msgid "Cut 4"
 msgstr "Knip 4"
 
-#: src/i_callbacks.c:2027
+#: ../src/i_callbacks.c:2043
 msgid "Cut 5"
 msgstr "Knip 5"
 
-#: src/i_callbacks.c:2043
+#: ../src/i_callbacks.c:2059
 msgid "Paste 1"
 msgstr "Plak 1"
 
-#: src/i_callbacks.c:2052 src/i_callbacks.c:2076 src/i_callbacks.c:2100
-#: src/i_callbacks.c:2124 src/i_callbacks.c:2148
+#: ../src/i_callbacks.c:2066 ../src/i_callbacks.c:2088
+#: ../src/i_callbacks.c:2110 ../src/i_callbacks.c:2132
+#: ../src/i_callbacks.c:2154
 msgid "Empty buffer"
 msgstr "Maak buffer leeg"
 
-#: src/i_callbacks.c:2067
+#: ../src/i_callbacks.c:2081
 msgid "Paste 2"
 msgstr "Plak 2"
 
-#: src/i_callbacks.c:2091
+#: ../src/i_callbacks.c:2103
 msgid "Paste 3"
 msgstr "Plak 3"
 
-#: src/i_callbacks.c:2115
+#: ../src/i_callbacks.c:2125
 msgid "Paste 4"
 msgstr "Plak 4"
 
-#: src/i_callbacks.c:2139
+#: ../src/i_callbacks.c:2147
 msgid "Paste 5"
 msgstr "Plak 5"
 
-#: src/i_callbacks.c:2282 src/x_window.c:527
+#: ../src/i_callbacks.c:2264 ../src/x_window.c:439
 msgid "Component"
 msgstr "Component"
 
-#: src/i_callbacks.c:2318 src/i_callbacks.c:2337
+#: ../src/i_callbacks.c:2300 ../src/i_callbacks.c:2319
 msgid "Attribute"
 msgstr "Attribuut"
 
-#: src/i_callbacks.c:2804
+#: ../src/i_callbacks.c:2786
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Zoek naar bron [%s]\n"
 
-#: src/i_callbacks.c:2828 src/i_callbacks.c:2829
+#: ../src/i_callbacks.c:2810 ../src/i_callbacks.c:2811
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Kan bron [%s] niet vinden\n"
 
-#: src/i_callbacks.c:2896
+#: ../src/i_callbacks.c:2878
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Zoek naar symbool [%s]\n"
 
-#: src/i_callbacks.c:2983
+#: ../src/i_callbacks.c:2965
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -965,301 +974,282 @@ msgstr ""
 "Dit commando haalt de component documentatie van het web, maar er is geen "
 "component geselecteerd"
 
-#: src/i_callbacks.c:3100
+#: ../src/i_callbacks.c:3082
 msgid "ShowN"
 msgstr "ToonN"
 
-#: src/i_callbacks.c:3130
+#: ../src/i_callbacks.c:3112
 msgid "ShowV"
 msgstr "ToonV"
 
-#: src/i_callbacks.c:3160
+#: ../src/i_callbacks.c:3142
 msgid "ShowB"
 msgstr "ToonB"
 
-#: src/i_callbacks.c:3191
+#: ../src/i_callbacks.c:3173
 msgid "VisToggle"
 msgstr "SchakelZichtbaarheid"
 
-#: src/i_callbacks.c:3212
+#: ../src/i_callbacks.c:3194
 #, 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:3300
+#: ../src/i_callbacks.c:3282
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Aktie terugkoppel mode is ingesteld op OUTLINE\n"
 
-#: src/i_callbacks.c:3303
+#: ../src/i_callbacks.c:3285
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Aktie terugkoppel mode is ingesteld op BOUNDINGBOX.\n"
 
-#: src/i_callbacks.c:3320
+#: ../src/i_callbacks.c:3302
 msgid "Grid OFF\n"
 msgstr "Grid UIT\n"
 
-#: src/i_callbacks.c:3323
+#: ../src/i_callbacks.c:3305
 msgid "Grid ON\n"
 msgstr "Grid AAN\n"
 
-#: src/i_callbacks.c:3340
+#: ../src/i_callbacks.c:3322
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap UIT (PAS OP!)\n"
 
-#: src/i_callbacks.c:3343
+#: ../src/i_callbacks.c:3325
 msgid "Snap ON\n"
 msgstr "Snap AAN\n"
 
-#: src/i_callbacks.c:3363
+#: ../src/i_callbacks.c:3345
 msgid "Rubber band OFF \n"
 msgstr "Elastiek band UIT\n"
 
-#: src/i_callbacks.c:3366
+#: ../src/i_callbacks.c:3348
 msgid "Rubber band ON\n"
 msgstr "Elastiek band AAN\n"
 
-#: src/o_arc.c:137
+#: ../src/o_arc.c:139
 #, c-format
 msgid "Unknown end for arc (%d)\n"
 msgstr "Onbekend einde van boog (%d)\n"
 
-#: src/o_arc.c:178
+#: ../src/o_arc.c:180
 #, c-format
 msgid "Unknown type for arc !\n"
 msgstr "Onbekend type van boog !\n"
 
-#: src/o_attrib.c:105
+#: ../src/o_attrib.c:109
 #, c-format
 msgid "Got NULL in o_attrib_toggle_visibility\n"
 msgstr "Ontving NULL in o_attrib_toggle_visibility\n"
 
-#: src/o_attrib.c:170
+#: ../src/o_attrib.c:175
 #, c-format
 msgid "Got NULL in o_attrib_toggle_show_name_value\n"
 msgstr "Ontving NUL in o_attrib_toggle_show_name_value\n"
 
-#: src/o_attrib.c:221
-#, c-format
-msgid "ERROR! you can't get an attribute without an ='s\n"
-msgstr "FOUT! je kunt geen attribuut zonder een ='s krijgen\n"
-
-#: src/o_box.c:141
+#: ../src/o_box.c:143
 #, c-format
 msgid "Unknown end for box (%d)\n"
 msgstr "Onbekend einde voor rechthoek (%d)\n"
 
-#: src/o_box.c:181
+#: ../src/o_box.c:183
 #, c-format
 msgid "Unknown type for box !\n"
 msgstr "Onbekend type voor rechthoek !\n"
 
-#: src/o_box.c:271
+#: ../src/o_box.c:267
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Onbekend type voor rechthoek (arcering)!\n"
 
-#: src/o_buffer.c:42
+#: ../src/o_buffer.c:44
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_copy]\n"
 msgstr "Ontving een ongeldig buffernummer [o_buffer_copy]\n"
 
-#: src/o_buffer.c:80
+#: ../src/o_buffer.c:73
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_cut]\n"
 msgstr "Ontving een ongeldig buffernummer [o_buffer_cut]\n"
 
-#: src/o_buffer.c:121
+#: ../src/o_buffer.c:105
 #, 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_buffer.c:181
+#: ../src/o_buffer.c:164
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
 msgstr "Ontving een ongeldig buffernummer [o_buffer_paste_end]\n"
 
-#: src/o_bus.c:210
+#: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\n"
 msgstr "Ontving ereen die ongeldig is in [o_bus_draw_xor_single]\n"
 
-#: src/o_circle.c:136
+#: ../src/o_circle.c:138
 #, c-format
 msgid "Unknown end for circle\n"
 msgstr "Onbekend einde van cirkel\n"
 
-#: src/o_circle.c:172
+#. just to be careful
+#: ../src/o_circle.c:174
 #, c-format
 msgid "Unknown type for circle!\n"
 msgstr "Onbekend type voor cirkel!\n"
 
-#: src/o_circle.c:260
+#: ../src/o_circle.c:256
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Onbekend type voor cirkel (arcering)!\n"
 
-#: src/o_complex.c:230
+#: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
 msgstr "Kan complex niet vinden bij het plaatsen van een nieuwe component!\n"
 
-#: src/o_complex.c:582
-#, c-format
-msgid "Got NULL in o_complex_translate_display_selection\n"
-msgstr "Ontving NULL in o_complex_translate_display_selection\n"
-
-#: src/o_complex.c:650 src/o_complex.c:656
+#: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Vertaal schema [%d %d]\n"
 
-#: src/o_complex.c:694
-#, c-format
-msgid "Got NULL in o_complex_translate_selection!\n"
-msgstr "Ontving NULL in o_complex_translate_selection\n"
-
-#: src/o_copy.c:119 src/o_copy.c:382
+#: ../src/o_copy.c:122 ../src/o_copy.c:312
 #, c-format
 msgid "ERROR: NULL object in o_copy_end!\n"
 msgstr "FOUT: NULL object in o_copy_end!\n"
 
-#: src/o_line.c:113
+#: ../src/o_line.c:115
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Onbekend einde voor lijn (%d)\n"
 
-#: src/o_line.c:153
+#. just to be careful
+#: ../src/o_line.c:155
 #, c-format
 msgid "Unknown type for line (%d) !\n"
 msgstr "Onbekend type voor lijn (%d)!\n"
 
-#: src/o_misc.c:65
+#: ../src/o_misc.c:66
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Ontving een onverwachte NULL in o_edit\n"
 
-#: src/o_misc.c:144
+#: ../src/o_misc.c:145
 msgid "Object already locked\n"
 msgstr "Object reeds vergrendeld\n"
 
-#: src/o_misc.c:182
+#: ../src/o_misc.c:183
 msgid "Object already unlocked\n"
 msgstr "Object reeds ontgrendeld\n"
 
-#: src/o_misc.c:229 src/o_misc.c:472 src/o_misc.c:712
-#, c-format
-msgid "ERROR: NULL object in o_rotate_90!\n"
-msgstr "FOUT: NULL object in o_rotate 90!\n"
-
-#: src/o_misc.c:538
-#, c-format
-msgid "ERROR: NULL object in o_mirror!\n"
-msgstr "FOUT: NULL object in o_mirror!\n"
-
-#: src/o_misc.c:812
+#: ../src/o_misc.c:525
 msgid "Hidden text is now visible\n"
 msgstr "Verborgen tekst is nu zichtbaar\n"
 
-#: src/o_misc.c:814
+#: ../src/o_misc.c:527
 msgid "Hidden text is now invisible\n"
 msgstr "Verborgen tekst is nu onzichtbaar\n"
 
-#: src/o_misc.c:1058
+#: ../src/o_misc.c:771
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr "Kan symbool [%s] niet in bibliotheek vinden. Vernieuwen faalde.\n"
 
-#: src/o_misc.c:1196
+#: ../src/o_misc.c:906
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: Kan de echte bestandsnaam van %s niet krijgen."
 
-#: src/o_misc.c:1240
+#: ../src/o_misc.c:951
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
-msgstr "Voorgaande reserve bestand [%s] kan NIET op lezen-schrijven ingesteld worden\n"
+msgstr ""
+"Voorgaande reserve bestand [%s] kan NIET op lezen-schrijven ingesteld "
+"worden\n"
 
-#: src/o_misc.c:1258
+#: ../src/o_misc.c:969
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Reserve bestand [%s] kan NIET op alleen-lezen ingesteld worden\n"
 
-#: src/o_misc.c:1263
+#: ../src/o_misc.c:974
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Reserve bestand [%s] kan NIET opgeslagen worden\n"
 
-#: src/o_move.c:224
+#: ../src/o_move.c:181
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "FOUT: NULL object in o_move_end!\n"
 
-#: src/o_move.c:332
+#: ../src/o_move.c:282
 #, 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:353
+#: ../src/o_move.c:304
 #, 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:255
+#: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\n"
 msgstr "Ontving er een die ongeldig is in o_net_draw_xor_single\n"
 
-#: src/o_net.c:812 src/o_net.c:849 src/o_net.c:920 src/o_net.c:956
+#. try to exit gracefully
+#: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
 #, 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:1029
+#: ../src/o_net.c:980
 #, 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"
+msgstr ""
+"Bus ripper symbool [%s] niet gevonden in een van de component bibliotheken\n"
 
-#: src/o_picture.c:206 src/o_picture.c:746
+#: ../src/o_picture.c:208 ../src/o_picture.c:720
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fout bij het lezen van afbeelding: %s"
 
-#: src/o_picture.c:220
+#: ../src/o_picture.c:222
 msgid "Picture"
 msgstr "Afbeelding"
 
-#: src/o_picture.c:658 src/x_attribedit.c:145
+#: ../src/o_picture.c:625 ../src/x_attribedit.c:148
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "FOUT: NULL object!\n"
 
-#: src/o_slot.c:128
+#: ../src/o_slot.c:130
 msgid "Slot attribute malformed\n"
 msgstr "Slot attribuut misvormd\n"
 
-#: src/o_slot.c:146
+#: ../src/o_slot.c:148
 msgid "numslots attribute missing\n"
 msgstr "numslots attribuut ontbreekt\n"
 
-#: src/o_slot.c:148
+#: ../src/o_slot.c:150
 msgid "Slotting not allowed for this component\n"
 msgstr "Slots niet toegestaan voor deze component\n"
 
-#: src/o_slot.c:164
+#: ../src/o_slot.c:166
 msgid "New slot number out of range\n"
 msgstr "Nieuw slotnummer overschrijdt de limiet\n"
 
-#: src/o_slot.c:237
+#: ../src/o_slot.c:239
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Hmmm, je probeerde een slot te bewerken op iets dat niet bestaat!\n"
 
-#: src/o_undo.c:317
+#: ../src/o_undo.c:318
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Ongedaan/Opnieuw doen uitgeschakeld in rc bestand\n"
 
-#: src/parsecmd.c:50
+#: ../src/parsecmd.c:51
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1283,68 +1273,77 @@ msgstr ""
 "  -h            Help; deze mededeling\n"
 "\n"
 
-#: src/x_attribedit.c:130
+#: ../src/x_attribedit.c:133
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr "Kreeg ongeldige toon optie; standaardwaarde is toon beide\n"
 
-#: src/x_attribedit.c:333
+#: ../src/x_attribedit.c:336
 msgid "Single Attribute Editor"
 msgstr "Enkelvoudige Attribuut Bewerking"
 
-#: src/x_attribedit.c:364
+#: ../src/x_attribedit.c:367
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Bewerk Attribuut</b>"
 
-#: src/x_attribedit.c:366
+#: ../src/x_attribedit.c:369
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Plaats Attribuut</b>"
 
-#: src/x_attribedit.c:382 src/x_multiattrib.c:1731
+#. Name selection
+#. GtkLabel
+#: ../src/x_attribedit.c:385 ../src/x_multiattrib.c:1721
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/x_attribedit.c:398 src/x_multiattrib.c:1750
+#. Value entry
+#. GtkLabel
+#: ../src/x_attribedit.c:401 ../src/x_multiattrib.c:1740
 msgid "Value:"
 msgstr "Waarde:"
 
-#: src/x_attribedit.c:414 src/x_multiattrib.c:1787
+#. Visibility
+#. GtkButton
+#: ../src/x_attribedit.c:417 ../src/x_multiattrib.c:1777
 msgid "Visible"
 msgstr "Zichtbaar"
 
-#: src/x_attribedit.c:434
+#: ../src/x_attribedit.c:437
 msgid "Show Value Only"
 msgstr "Toon Alleen Waarde"
 
-#: src/x_attribedit.c:436
+#: ../src/x_attribedit.c:439
 msgid "Show Name Only"
 msgstr "Toon Alleen Naam"
 
-#: src/x_attribedit.c:438 src/x_multiattrib.c:1226
+#: ../src/x_attribedit.c:441 ../src/x_multiattrib.c:1216
 msgid "Show Name & Value"
 msgstr "Toon Naam & Waarde"
 
-#: src/x_attribedit.c:445
+#. gschem specific
+#: ../src/x_attribedit.c:448
 msgid "<b>Attach Options</b>"
 msgstr "<b>Opties Vastmaken</b>"
 
-#: src/x_attribedit.c:460
+#: ../src/x_attribedit.c:463
 msgid "All"
 msgstr "Alle"
 
-#: src/x_attribedit.c:468 src/x_compselect.c:728 src/x_compselect.c:803
+#. GtkTreeViewColumn
+#: ../src/x_attribedit.c:471 ../src/x_compselect.c:735
+#: ../src/x_compselect.c:810
 msgid "Components"
 msgstr "Componenten"
 
-#: src/x_attribedit.c:476 src/x_window.c:537
+#: ../src/x_attribedit.c:479 ../src/x_window.c:449
 msgid "Nets"
 msgstr "Draden"
 
-#: src/x_attribedit.c:484
+#: ../src/x_attribedit.c:487
 msgid "Replace existing attributes"
 msgstr "Vervang bestaande attributen"
 
-#: src/x_autonumber.c:413
+#: ../src/x_autonumber.c:412
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1352,163 +1351,170 @@ msgstr ""
 "Geslotte objecten zonder slot attribuut kunnen een probleem geven bij het "
 "automatisch nummeren van slots\n"
 
-#: src/x_autonumber.c:428
+#. duplicate slot in used_slots
+#: ../src/x_autonumber.c:427
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 "een dubbel slot kan een probleem geven: [symbolnaam=%s, nummer=%d, slot=%d]\n"
 
-#: src/x_autonumber.c:697
+#: ../src/x_autonumber.c:692
 msgid "No searchstring given in autonumber text.\n"
 msgstr "Geen zoektekst gegeven in autonumber text.\n"
 
-#: src/x_autonumber.c:748
+#: ../src/x_autonumber.c:743
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr "Geen '*' of '?' gegeven aan het einden van de autonummer tekst.\n"
 
-#: src/x_autonumber.c:881
+#: ../src/x_autonumber.c:876
 msgid "Diagonal"
 msgstr "Diagonaal"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Top to bottom"
 msgstr "Van boven naar beneden"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Bottom to top"
 msgstr "Van beneden naar boven"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Left to right"
 msgstr "Van links naar rechts"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Right to left"
 msgstr "Van rechts naar links"
 
-#: src/x_autonumber.c:884
+#: ../src/x_autonumber.c:879
 msgid "File order"
 msgstr "Bestand volgorde"
 
-#: src/x_autonumber.c:1220
+#: ../src/x_autonumber.c:1215
 msgid "Autonumber text"
 msgstr "Automatisch tekst nummeren"
 
-#: src/x_autonumber.c:1246
+#. scope section
+#: ../src/x_autonumber.c:1241
 msgid "<b>Scope</b>"
 msgstr "<b>Omvang</b>"
 
-#: src/x_autonumber.c:1268
+#: ../src/x_autonumber.c:1263
 msgid "Search for:"
 msgstr "Zoek naar:"
 
-#: src/x_autonumber.c:1282
+#: ../src/x_autonumber.c:1277
 msgid "Autonumber text in:"
 msgstr "Automatisch tekst nummeren in:"
 
-#: src/x_autonumber.c:1289
+#: ../src/x_autonumber.c:1284
 msgid "Skip numbers found in:"
 msgstr "Sla nummers over gevonden in:"
 
-#: src/x_autonumber.c:1301 src/x_autonumber.c:1310
+#: ../src/x_autonumber.c:1296 ../src/x_autonumber.c:1305
 msgid "Selected objects"
 msgstr "Geselecteerde objecten"
 
-#: src/x_autonumber.c:1302 src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1297 ../src/x_autonumber.c:1306
 msgid "Current page"
 msgstr "Huidig blad"
 
-#: src/x_autonumber.c:1303 src/x_autonumber.c:1312
+#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
 msgid "Whole hierarchy"
 msgstr "Hele hierarchie"
 
-#: src/x_autonumber.c:1314
+#: ../src/x_autonumber.c:1309
 msgid "Overwrite existing numbers"
 msgstr "Overschrijven van bestaande nummers"
 
-#: src/x_autonumber.c:1319
+#. Options section
+#: ../src/x_autonumber.c:1314
 msgid "<b>Options</b>"
 msgstr "<b>Opties</b>"
 
-#: src/x_autonumber.c:1341
+#: ../src/x_autonumber.c:1336
 msgid "Starting number:"
 msgstr "Start nummer:"
 
-#: src/x_autonumber.c:1348
+#: ../src/x_autonumber.c:1343
 msgid "Sort order:"
 msgstr "Sorteer volgorde:"
 
-#: src/x_autonumber.c:1369
+#: ../src/x_autonumber.c:1364
 msgid "Remove numbers"
 msgstr "Verwijder nummers"
 
-#: src/x_autonumber.c:1373
+#: ../src/x_autonumber.c:1368
 msgid "Automatic slotting"
 msgstr "Automatisch slotten"
 
-#: src/x_color.c:60 src/x_color.c:97
+#: ../src/x_color.c:60 ../src/x_color.c:97
 #, c-format
 msgid "Could not find the color %s!\n"
 msgstr "Kan kleur %s niet vinden!\n"
 
-#: src/x_color.c:63 src/x_color.c:100
+#: ../src/x_color.c:63 ../src/x_color.c:100
 #, c-format
 msgid "Defaulting color to white\n"
 msgstr "Kleur naar standaardwaarde wit teruggezet\n"
 
-#: src/x_color.c:70 src/x_color.c:107
+#: ../src/x_color.c:70 ../src/x_color.c:107
 #, c-format
 msgid "Ack! Cannot allocate white!\n"
 msgstr "Jakkie! Kan geen wit toewijzen!\n"
 
-#: src/x_color.c:81 src/x_color.c:129 src/x_window.c:176 src/x_window.c:185
+#: ../src/x_color.c:81 ../src/x_color.c:129 ../src/x_window.c:86
+#: ../src/x_window.c:95
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Kan de kleur %s niet toewijzen!\n"
 
-#: src/x_color.c:148 src/x_color.c:164
+#: ../src/x_color.c:148 ../src/x_color.c:164
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Probeerde een ongeldige kleur te verkrijgen: %d\n"
 
-#: src/x_compselect.c:833
+#. GtkLabel
+#: ../src/x_compselect.c:840
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/x_compselect.c:925
+#: ../src/x_compselect.c:932
 msgid "Default behavior - reference component"
 msgstr "Normaal gedrag - referentie component"
 
-#: src/x_compselect.c:928
+#: ../src/x_compselect.c:935
 msgid "Embed component in schematic"
 msgstr "Component insluiten in schema"
 
-#: src/x_compselect.c:931
+#: ../src/x_compselect.c:938
 msgid "Include component as individual objects"
 msgstr "Invoegen component als individuele objecten"
 
-#: src/x_compselect.c:1077
+#: ../src/x_compselect.c:1094
 msgid "Select Component..."
 msgstr "Selecteer Component..."
 
-#: src/x_compselect.c:1103
+#: ../src/x_compselect.c:1120
 msgid "In Use"
 msgstr "In gebruik"
 
-#: src/x_compselect.c:1107
+#: ../src/x_compselect.c:1124
 msgid "Libraries"
 msgstr "Bibliotheken"
 
-#: src/x_compselect.c:1116 src/x_fileselect.c:127
+#. GtkFrame
+#: ../src/x_compselect.c:1133 ../src/x_fileselect.c:128
 msgid "Preview"
 msgstr "Vooraf zien"
 
-#: src/x_dialog.c:184
+#. dialog not created yet
+#: ../src/x_dialog.c:191
 msgid "Text Entry..."
 msgstr "Tekst Ingeven..."
 
-#: src/x_dialog.c:217
+#: ../src/x_dialog.c:224
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1518,168 +1524,178 @@ msgstr ""
 "verplaats cursor in het venster, klik om tekst te plaatsen.\n"
 "Middelste muisknop gebruiken om te plaatsen"
 
-#: src/x_dialog.c:306
+#: ../src/x_dialog.c:313
+#, c-format
 msgid "Lower Left"
 msgstr "Onder Links"
 
-#: src/x_dialog.c:317
+#: ../src/x_dialog.c:324
+#, c-format
 msgid "Middle Left"
 msgstr "Midden Links"
 
-#: src/x_dialog.c:328
+#: ../src/x_dialog.c:335
+#, c-format
 msgid "Upper Left"
 msgstr "Boven Links"
 
-#: src/x_dialog.c:339
+#: ../src/x_dialog.c:346
+#, c-format
 msgid "Lower Middle"
 msgstr "Onder Midden"
 
-#: src/x_dialog.c:350
+#: ../src/x_dialog.c:357
+#, c-format
 msgid "Middle Middle"
 msgstr "Midden Midden"
 
-#: src/x_dialog.c:361
+#: ../src/x_dialog.c:368
+#, c-format
 msgid "Upper Middle"
 msgstr "Boven Midden"
 
-#: src/x_dialog.c:372
+#: ../src/x_dialog.c:379
+#, c-format
 msgid "Lower Right"
 msgstr "Onder Rechts"
 
-#: src/x_dialog.c:383
+#: ../src/x_dialog.c:390
+#, c-format
 msgid "Middle Right"
 msgstr "Midden Rechts"
 
-#: src/x_dialog.c:394
+#: ../src/x_dialog.c:401
+#, c-format
 msgid "Upper Right"
 msgstr "Boven Rechts"
 
-#: src/x_dialog.c:509
+#: ../src/x_dialog.c:516
 msgid "Edit Text Properties"
 msgstr "Bewerk Tekst Eigenschappen"
 
-#: src/x_dialog.c:545
+#: ../src/x_dialog.c:552
 msgid "<b>Text Content</b>"
 msgstr "<b>Tekst Inhoud</b>"
 
-#: src/x_dialog.c:577
+#: ../src/x_dialog.c:584
 msgid "<b>Text Properties</b>"
 msgstr "<b>Tekst Eigenschappen</b>"
 
-#: src/x_dialog.c:592
+#: ../src/x_dialog.c:599
 msgid "Color:"
 msgstr "Kleur:"
 
-#: src/x_dialog.c:602
+#: ../src/x_dialog.c:609
 msgid "Size:"
 msgstr "Grootte:"
 
-#: src/x_dialog.c:611
+#: ../src/x_dialog.c:618
 msgid "Alignment:"
 msgstr "Uitlijning:"
 
-#: src/x_dialog.c:665
+#: ../src/x_dialog.c:672
 msgid "Solid"
 msgstr "Getrokken lijn"
 
-#: src/x_dialog.c:666
+#: ../src/x_dialog.c:673
 msgid "Dotted"
 msgstr "Stippel lijn"
 
-#: src/x_dialog.c:667
+#: ../src/x_dialog.c:674
 msgid "Dashed"
 msgstr "Gestreepte lijn"
 
-#: src/x_dialog.c:668
+#: ../src/x_dialog.c:675
 msgid "Center"
 msgstr "Hartlijn"
 
-#: src/x_dialog.c:669
+#: ../src/x_dialog.c:676
 msgid "Phantom"
 msgstr "Begrenzingslijn"
 
-#: src/x_dialog.c:795 src/x_dialog.c:797 src/x_dialog.c:799 src/x_dialog.c:982
-#: src/x_dialog.c:983 src/x_dialog.c:984 src/x_dialog.c:992
-#: src/x_dialog.c:1175 src/x_dialog.c:1177 src/x_dialog.c:1179
-#: src/x_dialog.c:1181 src/x_dialog.c:1183 src/x_dialog.c:1388
-#: src/x_dialog.c:1389 src/x_dialog.c:1390 src/x_dialog.c:1391
-#: src/x_dialog.c:1392 src/x_dialog.c:1400
+#: ../src/x_dialog.c:802 ../src/x_dialog.c:804 ../src/x_dialog.c:806
+#: ../src/x_dialog.c:989 ../src/x_dialog.c:990 ../src/x_dialog.c:991
+#: ../src/x_dialog.c:999 ../src/x_dialog.c:1182 ../src/x_dialog.c:1184
+#: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
+#: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
+#: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
+#, c-format
 msgid "*unchanged*"
 msgstr "*onveranderd*"
 
-#: src/x_dialog.c:874
+#: ../src/x_dialog.c:881
 msgid "Edit Line Width & Type"
 msgstr "Bewerk Lijn Dikte & Type"
 
-#: src/x_dialog.c:915
+#: ../src/x_dialog.c:922
 msgid "Width:"
 msgstr "Breedte:"
 
-#: src/x_dialog.c:919 src/x_print.c:314
+#: ../src/x_dialog.c:926 ../src/x_print.c:315
 msgid "Type:"
 msgstr "Type:"
 
-#: src/x_dialog.c:923
+#: ../src/x_dialog.c:930
 msgid "Dash Length:"
 msgstr "Lijn Streeplengte:"
 
-#: src/x_dialog.c:927
+#: ../src/x_dialog.c:934
 msgid "Dash Space:"
 msgstr "Lijn Tussenruimte:"
 
-#: src/x_dialog.c:1032
+#: ../src/x_dialog.c:1039
 msgid "Hollow"
 msgstr "Hol"
 
-#: src/x_dialog.c:1033
+#: ../src/x_dialog.c:1040
 msgid "Filled"
 msgstr "Gevuld"
 
-#: src/x_dialog.c:1034
+#: ../src/x_dialog.c:1041
 msgid "Mesh"
 msgstr "Maas"
 
-#: src/x_dialog.c:1035
+#: ../src/x_dialog.c:1042
 msgid "Hatch"
 msgstr "Arcering"
 
-#: src/x_dialog.c:1301
+#: ../src/x_dialog.c:1308
 msgid "Fill Type:"
 msgstr "Arcering Type:"
 
-#: src/x_dialog.c:1305
+#: ../src/x_dialog.c:1312
 msgid "Line Width:"
 msgstr "Lijn Dikte:"
 
-#: src/x_dialog.c:1309
+#: ../src/x_dialog.c:1316
 msgid "Angle 1:"
 msgstr "Hoek 1:"
 
-#: src/x_dialog.c:1313
+#: ../src/x_dialog.c:1320
 msgid "Pitch 1:"
 msgstr "Steek 1:"
 
-#: src/x_dialog.c:1317
+#: ../src/x_dialog.c:1324
 msgid "Angle 2:"
 msgstr "Hoek 2:"
 
-#: src/x_dialog.c:1321
+#: ../src/x_dialog.c:1328
 msgid "Pitch 2:"
 msgstr "Steek 2:"
 
-#: src/x_dialog.c:1483
+#: ../src/x_dialog.c:1490
 msgid "Arc Params"
 msgstr "Boog parameters"
 
-#: src/x_dialog.c:1525
+#: ../src/x_dialog.c:1532
 msgid "Start Angle:"
 msgstr "Start Hoek:"
 
-#: src/x_dialog.c:1535
+#: ../src/x_dialog.c:1542
 msgid "Degrees of Sweep:"
 msgstr "Doorlopen Hoek:"
 
-#: src/x_dialog.c:1636
+#: ../src/x_dialog.c:1643
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1687,44 +1703,44 @@ msgstr ""
 "OffSet van de verplaatsing?\n"
 "(0 voor oorsprong)"
 
-#: src/x_dialog.c:1704
+#: ../src/x_dialog.c:1711
 msgid "Text Size"
 msgstr "Tekst Hoogte"
 
-#: src/x_dialog.c:1736
+#: ../src/x_dialog.c:1743
 msgid "Enter new text size:"
 msgstr "Voer nieuwe tekstgrootte in:"
 
-#: src/x_dialog.c:1811
+#: ../src/x_dialog.c:1818
 msgid "Snap Size"
 msgstr "Snap Grootte"
 
-#: src/x_dialog.c:1843
+#: ../src/x_dialog.c:1850
 msgid "Enter new snap grid spacing:"
 msgstr "Voer nieuwe snap grid waarde in:"
 
-#: src/x_dialog.c:1916
+#: ../src/x_dialog.c:1923
 msgid "Edit slot number"
 msgstr "Bewerk slot nummer"
 
-#: src/x_dialog.c:1949
+#: ../src/x_dialog.c:1956
 msgid "Edit slot number:"
 msgstr "Bewerk slot nummer:"
 
-#: src/x_dialog.c:2011
+#: ../src/x_dialog.c:2018
 msgid "About..."
 msgstr "Omtrent..."
 
-#: src/x_dialog.c:2031
+#: ../src/x_dialog.c:2038
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Elektronische Ontwerp Automatisering</b>"
 
-#: src/x_dialog.c:2035
+#: ../src/x_dialog.c:2042
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem versie %s%s.%s</b>"
 
-#: src/x_dialog.c:2043
+#: ../src/x_dialog.c:2050
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1736,96 +1752,98 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "En vele anderen (zie het AUTHORS bestand)"
 
-#: src/x_dialog.c:2107
+#: ../src/x_dialog.c:2115
 msgid "Coords"
 msgstr "Coordinaten"
 
-#: src/x_dialog.c:2128
+#: ../src/x_dialog.c:2136
 msgid "Screen"
 msgstr "Scherm"
 
-#: src/x_dialog.c:2137
+#: ../src/x_dialog.c:2145
 msgid "World"
 msgstr "Wereld"
 
-#: src/x_dialog.c:2360
+#: ../src/x_dialog.c:2360
 #, 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:2423
+#: ../src/x_dialog.c:2423
 msgid "Color Edit"
 msgstr "Kleur Bewerken"
 
-#: src/x_dialog.c:2456
+#: ../src/x_dialog.c:2456
 msgid "Object color:"
 msgstr "Objekt kleur:"
 
-#: src/x_dialog.c:2581
+#: ../src/x_dialog.c:2581
 msgid "Function"
 msgstr "Funktie"
 
-#: src/x_dialog.c:2588
+#: ../src/x_dialog.c:2588
 msgid "Keystroke(s)"
 msgstr "Toetsaanslag(en)"
 
-#: src/x_dialog.c:2920
+#: ../src/x_dialog.c:2901
 msgid "Find Text"
 msgstr "Vind tekst"
 
-#: src/x_dialog.c:2953
+#: ../src/x_dialog.c:2934
 msgid "Text to find:"
 msgstr "Te vinden tekst:"
 
-#: src/x_dialog.c:2963
+#: ../src/x_dialog.c:2944
 msgid "descend into hierarchy"
 msgstr "afdalen in hierarchie"
 
-#: src/x_dialog.c:3027
+#: ../src/x_dialog.c:3008
 msgid "Hide Text"
 msgstr "Verberg tekst"
 
-#: src/x_dialog.c:3060
+#: ../src/x_dialog.c:3041
 msgid "Hide text starting with:"
 msgstr "Verberg tekst beginnend met:"
 
-#: src/x_dialog.c:3128
+#: ../src/x_dialog.c:3109
 msgid "Show Text"
 msgstr "Toon tekst"
 
-#: src/x_dialog.c:3161
+#: ../src/x_dialog.c:3142
 msgid "Show text starting with:"
 msgstr "Toon tekst beginnend met:"
 
-#: src/x_dialog.c:3606 src/x_multiattrib.c:1607
+#. GtkTreeViewColumn
+#: ../src/x_dialog.c:3587 ../src/x_multiattrib.c:1597
 msgid "Name"
 msgstr "Naam"
 
-#: src/x_dialog.c:3628
+#: ../src/x_dialog.c:3609
 msgid "S_elect the schematics you want to save:"
 msgstr "S_electeer de schema's die je op wil slaan:"
 
-#: src/x_dialog.c:3722
+#: ../src/x_dialog.c:3703
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "Wijzigingen in schema \"%s\" opslaan voor het afsluiten?"
 
-#: src/x_dialog.c:3728
+#: ../src/x_dialog.c:3709
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 "Er zijn %d schema's met wijzigingen. Wijzigingen opslaan voor het afsluiten ?"
 
-#: src/x_dialog.c:3757
+#. secondary label
+#: ../src/x_dialog.c:3738
 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:3777
+#: ../src/x_dialog.c:3758
 msgid "_Close without saving"
 msgstr "Afsluiten zonder opslaan"
 
-#: src/x_dialog.c:4098
+#: ../src/x_dialog.c:4094
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1836,49 +1854,67 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: src/x_dialog.c:4100
+#: ../src/x_dialog.c:4096
 msgid "Invalid Attribute"
 msgstr "Ongeldig Attribuut"
 
-#: src/x_fileselect.c:47
+#: ../src/x_fileselect.c:48
 msgid "Schematics"
 msgstr "Schema's"
 
-#: src/x_fileselect.c:52
+#: ../src/x_fileselect.c:53
 msgid "Symbols"
 msgstr "Symbolen"
 
-#: src/x_fileselect.c:57
+#: ../src/x_fileselect.c:58
 msgid "Schematics and symbols"
 msgstr "Schema's en symbolen"
 
-#: src/x_fileselect.c:63
+#: ../src/x_fileselect.c:64
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: src/x_fileselect.c:176
+#: ../src/x_fileselect.c:177
 msgid "Open..."
 msgstr "Open..."
 
-#: src/x_fileselect.c:237
+#: ../src/x_fileselect.c:238
 msgid "Save as..."
 msgstr "Opslaan Als..."
 
-#: src/x_image.c:180
+#: ../src/x_fileselect.c:286
+#, c-format
+msgid ""
+"The selected file `%s' already exists.\n"
+"\n"
+"Would you like to overwrite it?"
+msgstr ""
+
+#: ../src/x_fileselect.c:289
+#, fuzzy
+msgid "Overwrite file?"
+msgstr "Nieuw bestand"
+
+#: ../src/x_fileselect.c:291
+msgid "Save cancelled on user request\n"
+msgstr ""
+
+#. WK - catch EPS export case
+#: ../src/x_image.c:181
 msgid "Encapsulated Postscript"
 msgstr "Encapsulated Postscript"
 
-#: src/x_image.c:298
+#: ../src/x_image.c:304
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: Kan EPS bestand %s niet schrijven.\n"
 
-#: src/x_image.c:379
+#: ../src/x_image.c:385
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: Kan [%s] bestand niet schrijven.\n"
 
-#: src/x_image.c:389
+#: ../src/x_image.c:395
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -1886,247 +1922,259 @@ msgid ""
 "\n"
 "%s.\n"
 msgstr ""
-"De volgende fout ontstond tijdens het opslaan van afbeelding met type %s naar bestandnaam:\n"
+"De volgende fout ontstond tijdens het opslaan van afbeelding met type %s "
+"naar bestandnaam:\n"
 "%s\n"
 "\n"
 "%s.\n"
 
-#: src/x_image.c:408
+#: ../src/x_image.c:414
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Schreef kleuren afbeelding naar [%s] [%d x %d]\n"
 
-#: src/x_image.c:410
+#: ../src/x_image.c:416
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Schreef zwart/wit afbeelding naar [%s] [%d x %d]\n"
 
-#: src/x_image.c:420
+#: ../src/x_image.c:426
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr "x_image_lowlevel: Kan geen pixbuf krijgen van gschem's venster.\n"
 
-#: src/x_image.c:466
+#: ../src/x_image.c:472
 msgid "Width x Height"
 msgstr "Breedte x Hoogte"
 
-#: src/x_image.c:482
+#: ../src/x_image.c:488
 msgid "Image type"
 msgstr "Afbeelding type"
 
-#: src/x_log.c:236
+#: ../src/x_log.c:252
 msgid "Status"
 msgstr "Status"
 
-#: src/x_menus.c:41
+#: ../src/x_menus.c:42
 msgid "/Add Net"
 msgstr "/Plaats Draad"
 
-#: src/x_menus.c:42
+#: ../src/x_menus.c:43
 msgid "/Add Attribute..."
 msgstr "/Plaats Attribuut..."
 
-#: src/x_menus.c:43
+#: ../src/x_menus.c:44
 msgid "/Add Component..."
 msgstr "/Plaats Component..."
 
-#: src/x_menus.c:44
+#: ../src/x_menus.c:45
 msgid "/Add Bus"
 msgstr "/Plaats Bus"
 
-#: src/x_menus.c:45
+#: ../src/x_menus.c:46
 msgid "/Add Text"
 msgstr "/Plaats Tekst"
 
-#: src/x_menus.c:47
+#: ../src/x_menus.c:48
 msgid "/Zoom In"
 msgstr "/Vergroot"
 
-#: src/x_menus.c:48
+#: ../src/x_menus.c:49
 msgid "/Zoom Out"
 msgstr "/Verklein"
 
-#: src/x_menus.c:49
+#: ../src/x_menus.c:50
 msgid "/Zoom Box"
 msgstr "/Vergroot Venster"
 
-#: src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Zoom Extents"
 msgstr "/Toon Alles"
 
-#: src/x_menus.c:52
+#: ../src/x_menus.c:53
 msgid "/Select"
 msgstr "/Selecteer"
 
-#: src/x_menus.c:53
+#: ../src/x_menus.c:54
 msgid "/Edit..."
 msgstr "/Bewerk..."
 
-#: src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Copy"
 msgstr "/Kopieer"
 
-#: src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Move"
 msgstr "/Verplaats"
 
-#: src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Delete"
 msgstr "/Verwijder"
 
-#: src/x_menus.c:59
+#: ../src/x_menus.c:60
 msgid "/Down Schematic"
 msgstr "/Naar Schema"
 
-#: src/x_menus.c:60
+#: ../src/x_menus.c:61
 msgid "/Down Symbol"
 msgstr "/Naar Symbool"
 
-#: src/x_menus.c:61
+#: ../src/x_menus.c:62
 msgid "/Up"
 msgstr "/Omhoog"
 
-#: src/x_menus.c:332
-msgid "Tried to set the sensitivity on a non-existent menu item\n"
+#: ../src/x_menus.c:333
+#, fuzzy, 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\n"
 
-#: src/x_menus.c:356
+#: ../src/x_menus.c:357
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory bestaat niet!\n"
 
-#: src/x_menus.c:369
+#: ../src/x_menus.c:370
 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"
 
-#: src/x_menus.c:482
+#. Remove this entry from all menus
+#: ../src/x_menus.c:482
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Kan bestand %s niet openen\n"
 
-#: src/x_menus.c:542
+#: ../src/x_menus.c:543
 msgid "Clear"
 msgstr "Wis"
 
-#: src/x_multiattrib.c:718
+#: ../src/x_multiattrib.c:708
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Attributen met een lege naam zijn niet toegestaan. Geef een naam."
 
-#: src/x_multiattrib.c:1228
+#: ../src/x_multiattrib.c:1218
 msgid "Show Value only"
 msgstr "Toon alleen Waarde"
 
-#: src/x_multiattrib.c:1230
+#: ../src/x_multiattrib.c:1220
 msgid "Show Name only"
 msgstr "Toon alleen Naam"
 
-#: src/x_multiattrib.c:1257
+#: ../src/x_multiattrib.c:1247
 msgid "Duplicate"
 msgstr "Dupliceer"
 
-#: src/x_multiattrib.c:1534
+#: ../src/x_multiattrib.c:1524
 msgid "Edit Attributes"
 msgstr "Bewerk Attribuut"
 
-#: src/x_multiattrib.c:1632
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1622
 msgid "Value"
 msgstr "Waarde"
 
-#: src/x_multiattrib.c:1654
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1644
 msgid "Vis?"
 msgstr "Zichtbaar?"
 
-#: src/x_multiattrib.c:1674
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1664
 msgid "N"
 msgstr "N"
 
-#: src/x_multiattrib.c:1694
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1684
 msgid "V"
 msgstr "V"
 
-#: src/x_multiattrib.c:1715
+#: ../src/x_multiattrib.c:1705
 msgid "Add Attribute"
 msgstr "Plaats Attribuut"
 
-#: src/x_pagesel.c:263
+#: ../src/x_pagesel.c:264
 msgid "Discard Page"
 msgstr "Pagina Wegdoen"
 
-#: src/x_pagesel.c:382
+#: ../src/x_pagesel.c:383
 msgid "Page Manager"
 msgstr "Pagina Manager"
 
-#: src/x_pagesel.c:438
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:439
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: src/x_pagesel.c:454
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:455
 msgid "Changed"
 msgstr "Veranderd"
 
-#: src/x_pagesel.c:474
+#. GtkLabel
+#: ../src/x_pagesel.c:475
 msgid "Right click on the filename for more options..."
 msgstr "Klik met rechts op de bestandnaam voor meer opties..."
 
-#: src/x_print.c:89
+#: ../src/x_print.c:90
 msgid "Select PostScript Filename..."
 msgstr "Selecteer Postscript bestandsnaam..."
 
-#: src/x_print.c:171
+#: ../src/x_print.c:172
 msgid "Extents with margins"
 msgstr "Alles met kantlijnen"
 
-#: src/x_print.c:177
+#: ../src/x_print.c:178
 msgid "Extents no margins"
 msgstr "Alles zonder kantlijnen"
 
-#: src/x_print.c:183
+#: ../src/x_print.c:184
 msgid "Current Window"
 msgstr "Huidige Venster"
 
-#: src/x_print.c:217
+#: ../src/x_print.c:218
 msgid "Landscape"
 msgstr "Liggend"
 
-#: src/x_print.c:223
+#: ../src/x_print.c:224
 msgid "Portrait"
 msgstr "Staand"
 
-#: src/x_print.c:291
+#. Upper frame
+#: ../src/x_print.c:292
 msgid "Settings"
 msgstr "Instellingen"
 
-#: src/x_print.c:303
+#: ../src/x_print.c:304
 msgid "Output paper size:"
 msgstr "Uitvoer papier afmeting:"
 
-#: src/x_print.c:325
+#: ../src/x_print.c:326
 msgid "Orientation:"
 msgstr "Orientatie:"
 
-#: src/x_print.c:337
+#. Lower frame
+#: ../src/x_print.c:338
 msgid "Destination"
 msgstr "Bestemming"
 
-#: src/x_print.c:350
+#: ../src/x_print.c:351
 msgid "File:"
 msgstr "Bestand:"
 
-#: src/x_print.c:380
+#: ../src/x_print.c:381
 msgid "Command:"
 msgstr "Commando:"
 
-#: src/x_print.c:750
+#: ../src/x_print.c:751
 msgid "No print destination specified\n"
 msgstr "Geen afdruk bestemming opgegeven\n"
 
-#: src/x_print.c:757
+#: ../src/x_print.c:758
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Kan huidige schema niet afdrukken op [%s]\n"
 
-#: src/x_print.c:766
+#: ../src/x_print.c:767
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2135,73 +2183,73 @@ msgstr ""
 "Fout bij afdrukken naar bestand '%s'\n"
 "Controleer het log venster voor meer informatie"
 
-#: src/x_print.c:773
+#: ../src/x_print.c:774
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Huidig schema afgedrukt op [%s]\n"
 
-#: src/x_window.c:176
+#: ../src/x_window.c:86
 msgid "black"
 msgstr "zwart"
 
-#: src/x_window.c:185
+#: ../src/x_window.c:95
 msgid "white"
 msgstr "wit"
 
-#: src/x_window.c:219
+#: ../src/x_window.c:129
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Kan gc niet toewijzen\n"
 
-#: src/x_window.c:232
+#: ../src/x_window.c:142
 #, c-format
 msgid "Couldn't allocate xor_gc\n"
 msgstr "Kan xor_gc niet toewijzen\n"
 
-#: src/x_window.c:245
+#: ../src/x_window.c:155
 #, c-format
 msgid "Couldn't allocate outline_xor_gc\n"
 msgstr "Kan outline_xor_gc niet toewijzen\n"
 
-#: src/x_window.c:261
+#: ../src/x_window.c:171
 #, c-format
 msgid "Couldn't allocate bounding_xor_gc\n"
 msgstr "Kan bounding_xor_gc niet toewijzen\n"
 
-#: src/x_window.c:268
+#: ../src/x_window.c:178
 #, c-format
 msgid "Couldn't allocate bus_gc\n"
 msgstr "Kan bus_gc niet toewijzen\n"
 
-#: src/x_window.c:490
+#: ../src/x_window.c:402
 msgid "New file"
 msgstr "Nieuw bestand"
 
-#: src/x_window.c:496
+#: ../src/x_window.c:408
 msgid "Open"
 msgstr "Open"
 
-#: src/x_window.c:497
+#: ../src/x_window.c:409
 msgid "Open file..."
 msgstr "Open bestand..."
 
-#: src/x_window.c:503
+#: ../src/x_window.c:415
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/x_window.c:504
+#: ../src/x_window.c:416
 msgid "Save file"
 msgstr "Opslaan bestand"
 
-#: src/x_window.c:512
+#: ../src/x_window.c:424
 msgid "Undo last operation"
 msgstr "Maak laatste bewerking ongedaan"
 
-#: src/x_window.c:519
+#: ../src/x_window.c:431
 msgid "Redo last undo"
 msgstr "Herstel de laatste ongedaanmaking"
 
-#: src/x_window.c:528
+#: ../src/x_window.c:440
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2213,7 +2261,7 @@ msgstr ""
 "muisindicator in het hoofdvensterklik om component te plaatsen\n"
 "Rechter muisknop om af te breken"
 
-#: src/x_window.c:538
+#: ../src/x_window.c:450
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2221,7 +2269,7 @@ msgstr ""
 "Plaats draden\n"
 "Rechter muisknop om af te breken"
 
-#: src/x_window.c:548
+#: ../src/x_window.c:460
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2229,76 +2277,114 @@ msgstr ""
 "Plaats bussen\n"
 "Rechter muisknop om af te breken"
 
-#: src/x_window.c:555
+#: ../src/x_window.c:467
 msgid "Text"
 msgstr "Tekst"
 
-#: src/x_window.c:556
+#: ../src/x_window.c:468
 msgid "Add Text..."
 msgstr "Plaats een tekst..."
 
-#: src/x_window.c:566
+#: ../src/x_window.c:478
 msgid "Select"
 msgstr "Selecteer"
 
-#: src/x_window.c:567
+#: ../src/x_window.c:479
 msgid "Select mode"
 msgstr "Selectie mode"
 
-#: src/x_window.c:642
+#: ../src/x_window.c:554
 msgid "Pick"
 msgstr "Pak"
 
-#: src/x_window.c:658
+#: ../src/x_window.c:570
 msgid "Repeat/none"
 msgstr "Herhaal/geen"
 
-#: src/x_window.c:668
+#: ../src/x_window.c:580
 msgid "Menu/Cancel"
 msgstr "Menu/Afbreken"
 
-#: src/x_window.c:670
+#: ../src/x_window.c:582
 msgid "Pan/Cancel"
 msgstr "Schuif/Afbreken"
 
-#: src/x_window.c:926
+#: ../src/x_window.c:809
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Bezig met laden van schema [%s]\n"
 
-#: src/x_window.c:1028
+#: ../src/x_window.c:821
+#, fuzzy
+msgid "Failed to load file"
+msgstr "Fout bij het lezen van afbeelding: %s"
+
+#: ../src/x_window.c:830
+#, fuzzy, c-format
+msgid "New file [%s]\n"
+msgstr "Nieuw bestand"
+
+#. an error occured when saving page to file
+#: ../src/x_window.c:936
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Pagina [%s] kan NIET opgeslagen worden\n"
 
-#: src/x_window.c:1029
+#: ../src/x_window.c:937
 msgid "Error while trying to save"
 msgstr "Fout tijdens het opslaan"
 
-#: src/x_window.c:1038
+#: ../src/x_window.c:946
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Opgeslagen Als [%s]\n"
 
-#: src/x_window.c:1040
+#: ../src/x_window.c:948
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Opgeslagen [%s]\n"
 
-#: src/x_window.c:1042
+#: ../src/x_window.c:950
 msgid "Saved"
 msgstr "Opgeslagen"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Pagina [%s] wegdoen\n"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Sluiten [%s]\n"
 
+#: ../data/geda-gschem.desktop.in.h:1
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
+#: ../data/geda-gschem.desktop.in.h:2
+#, fuzzy
+msgid "gEDA Schematic Editor"
+msgstr "Naar Schema"
+
+#~ msgid "Attribute Mode"
+#~ msgstr "Attribuut Mode"
+
+#~ msgid "ERROR! you can't get an attribute without an ='s\n"
+#~ msgstr "FOUT! je kunt geen attribuut zonder een ='s krijgen\n"
+
+#~ msgid "Got NULL in o_complex_translate_display_selection\n"
+#~ msgstr "Ontving NULL in o_complex_translate_display_selection\n"
+
+#~ msgid "Got NULL in o_complex_translate_selection!\n"
+#~ msgstr "Ontving NULL in o_complex_translate_selection\n"
+
+#~ msgid "ERROR: NULL object in o_rotate_90!\n"
+#~ msgstr "FOUT: NULL object in o_rotate 90!\n"
+
+#~ msgid "ERROR: NULL object in o_mirror!\n"
+#~ msgstr "FOUT: NULL object in o_mirror!\n"
+
 #~ msgid "Invalid mode [%s] passed to %s\n"
 #~ msgstr "Ongeldige mode [%s] overgedragen aan %s\n"
 
diff --git a/gschem/po/pt_BR.po b/gschem/po/pt_BR.po
index 285ec74..aee58b2 100644
--- a/gschem/po/pt_BR.po
+++ b/gschem/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-02 21:10-0400\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2006-07-27 01:34-0300\n"
 "Last-Translator: \n"
 "Language-Team:  <pt@xxxxxx>\n"
@@ -17,600 +17,609 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: src/rcstrings.c:2
+#: ../src/rcstrings.c:2
 msgid "File"
 msgstr "Arquivo"
 
-#: src/rcstrings.c:3
+#: ../src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nova Janela"
 
-#: src/rcstrings.c:4 src/x_pagesel.c:258
+#: ../src/rcstrings.c:4 ../src/x_pagesel.c:259
 msgid "New Page"
 msgstr "Nova Página"
 
-#: src/rcstrings.c:5 src/x_pagesel.c:259
+#: ../src/rcstrings.c:5 ../src/x_pagesel.c:260
 msgid "Open Page..."
 msgstr "Abrir Página..."
 
-#: src/rcstrings.c:6 src/x_pagesel.c:262
+#: ../src/rcstrings.c:6 ../src/x_pagesel.c:263
 msgid "Close Page"
 msgstr "Fechar Página"
 
-#: src/rcstrings.c:7
+#: ../src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Reverter Página"
 
-#: src/rcstrings.c:8 src/x_pagesel.c:261
+#: ../src/rcstrings.c:8 ../src/x_pagesel.c:262
 msgid "Save Page"
 msgstr "Salvar"
 
-#: src/rcstrings.c:9
+#: ../src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Salvar Como..."
 
-#: src/rcstrings.c:10
+#: ../src/rcstrings.c:10
 msgid "Save All"
 msgstr "Salvar Tudo"
 
-#: src/rcstrings.c:11 src/x_print.c:283
+#. GtkWindow
+#: ../src/rcstrings.c:11 ../src/x_print.c:284
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: src/rcstrings.c:12 src/x_image.c:503
+#. Create the dialog
+#: ../src/rcstrings.c:12 ../src/x_image.c:509
 #, fuzzy
 msgid "Write image..."
 msgstr "Salvar Imagem..."
 
-#: src/rcstrings.c:13 src/x_menus.c:524
+#: ../src/rcstrings.c:13 ../src/x_menus.c:525
 #, fuzzy
 msgid "Recent files"
 msgstr "Novo arquivo"
 
-#: src/rcstrings.c:14 src/x_script.c:50
+#: ../src/rcstrings.c:14 ../src/x_script.c:51
 msgid "Execute Script..."
 msgstr "Script..."
 
-#: src/rcstrings.c:15
+#: ../src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Fechando Janela"
 
-#: src/rcstrings.c:16
+#: ../src/rcstrings.c:16
 msgid "Quit"
 msgstr "Sair"
 
-#: src/rcstrings.c:18 src/i_callbacks.c:730
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:732
 msgid "Edit"
 msgstr "Editar"
 
-#: src/rcstrings.c:19 src/x_window.c:511
+#: ../src/rcstrings.c:19 ../src/x_window.c:423
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/rcstrings.c:20 src/x_window.c:518
+#: ../src/rcstrings.c:20 ../src/x_window.c:430
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/rcstrings.c:21 src/i_basic.c:81 src/x_window.c:682
+#: ../src/rcstrings.c:21 ../src/i_basic.c:81 ../src/x_window.c:594
 msgid "Select Mode"
 msgstr "Modo de Seleção"
 
-#: src/rcstrings.c:22
+#: ../src/rcstrings.c:22
 #, fuzzy
 msgid "Cut Buffer"
 msgstr "Buffer"
 
-#: src/rcstrings.c:23
+#: ../src/rcstrings.c:23
 #, fuzzy
 msgid "Copy Buffer"
 msgstr "Buffer"
 
-#: src/rcstrings.c:24
+#: ../src/rcstrings.c:24
 #, fuzzy
 msgid "Paste Buffer"
 msgstr "Buffer"
 
-#: src/rcstrings.c:25
+#: ../src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Editar..."
 
-#: src/rcstrings.c:26
+#: ../src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Editar Texto..."
 
-#: src/rcstrings.c:27 src/i_basic.c:94
+#: ../src/rcstrings.c:27 ../src/i_basic.c:91
 msgid "Copy Mode"
 msgstr "Modo de Cópia"
 
-#: src/rcstrings.c:28 src/i_basic.c:149
+#: ../src/rcstrings.c:28 ../src/i_basic.c:146
 msgid "Multiple Copy Mode"
 msgstr "Modo de Múltipla Cópia"
 
-#: src/rcstrings.c:29 src/i_basic.c:97
+#: ../src/rcstrings.c:29 ../src/i_basic.c:94
 msgid "Move Mode"
 msgstr "Modo de Movimentação"
 
-#: src/rcstrings.c:30 src/i_callbacks.c:706 src/x_multiattrib.c:1258
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:708 ../src/x_multiattrib.c:1248
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/rcstrings.c:31
+#: ../src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Modo de Rotação"
 
-#: src/rcstrings.c:32 src/i_basic.c:101
+#: ../src/rcstrings.c:32 ../src/i_basic.c:98
 msgid "Mirror Mode"
 msgstr "Modo de espelho"
 
-#: src/rcstrings.c:33
+#: ../src/rcstrings.c:33
 msgid "Slot..."
 msgstr ""
 
-#: src/rcstrings.c:34
+#: ../src/rcstrings.c:34
 msgid "Color..."
 msgstr "Cor..."
 
-#: src/rcstrings.c:35 src/i_callbacks.c:952
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:952
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/rcstrings.c:36 src/i_callbacks.c:970
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:970
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/rcstrings.c:37
+#: ../src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Largura/Tipo de Linha..."
 
-#: src/rcstrings.c:38
+#: ../src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Preenchimento..."
 
-#: src/rcstrings.c:39
+#: ../src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Transladar..."
 
-#: src/rcstrings.c:40
+#: ../src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Embutir Componente/Imagem"
 
-#: src/rcstrings.c:41
+#: ../src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Desembutir Componente/Imagem"
 
-#: src/rcstrings.c:42
+#: ../src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Atualizar Componente"
 
-#: src/rcstrings.c:43
+#: ../src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Exibir/Ocultar textos ocultos"
 
-#: src/rcstrings.c:44
+#: ../src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Tornar todos textos visíveis"
 
-#: src/rcstrings.c:46
+#: ../src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Buffer"
 
-#: src/rcstrings.c:47
+#: ../src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copiar para 1"
 
-#: src/rcstrings.c:48
+#: ../src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copiar para 2"
 
-#: src/rcstrings.c:49
+#: ../src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copiar para 3"
 
-#: src/rcstrings.c:50
+#: ../src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copiar para 4"
 
-#: src/rcstrings.c:51
+#: ../src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copiar para 5"
 
-#: src/rcstrings.c:52
+#: ../src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Cortar para 1"
 
-#: src/rcstrings.c:53
+#: ../src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Cortar para 2"
 
-#: src/rcstrings.c:54
+#: ../src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Cortar para 3"
 
-#: src/rcstrings.c:55
+#: ../src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Cortar para 4"
 
-#: src/rcstrings.c:56
+#: ../src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Cortar para 5"
 
-#: src/rcstrings.c:57
+#: ../src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Colar de 1"
 
-#: src/rcstrings.c:58
+#: ../src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Colar de 2"
 
-#: src/rcstrings.c:59
+#: ../src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Colar de 3"
 
-#: src/rcstrings.c:60
+#: ../src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Colar de 4"
 
-#: src/rcstrings.c:61
+#: ../src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Colar de 5"
 
-#: src/rcstrings.c:63
+#: ../src/rcstrings.c:63
 msgid "View"
 msgstr "Exibir"
 
-#: src/rcstrings.c:64
+#: ../src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Redesenhar"
 
-#: src/rcstrings.c:65 src/i_callbacks.c:1537 src/i_callbacks.c:1606
+#. I don't know if this would get in the way
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1542 ../src/i_callbacks.c:1611
 msgid "Pan"
 msgstr "Pan"
 
-#: src/rcstrings.c:66 src/i_basic.c:105
+#: ../src/rcstrings.c:66 ../src/i_basic.c:102
 msgid "Zoom Box"
 msgstr "Caixa de Zoom"
 
-#: src/rcstrings.c:67
+#: ../src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Zoom desenho"
 
-#: src/rcstrings.c:68
+#: ../src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Zoom maior"
 
-#: src/rcstrings.c:69
+#: ../src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Zoom menor"
 
-#: src/rcstrings.c:70
+#: ../src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Zoom total"
 
-#: src/rcstrings.c:72
+#: ../src/rcstrings.c:72
 msgid "Page"
 msgstr "Página"
 
-#: src/rcstrings.c:73
+#: ../src/rcstrings.c:73
 msgid "Manager..."
 msgstr "Gerenciador..."
 
-#: src/rcstrings.c:74
+#: ../src/rcstrings.c:74
 msgid "Next"
 msgstr "Próxima"
 
-#: src/rcstrings.c:75
+#: ../src/rcstrings.c:75
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/rcstrings.c:76 src/x_window.c:489
+#: ../src/rcstrings.c:76 ../src/x_window.c:401
 msgid "New"
 msgstr "Novo"
 
-#: src/rcstrings.c:77
+#: ../src/rcstrings.c:77
 msgid "Revert"
 msgstr "Reverter"
 
-#: src/rcstrings.c:78
+#: ../src/rcstrings.c:78
 msgid "Close"
 msgstr "Fechar"
 
-#: src/rcstrings.c:79
+#: ../src/rcstrings.c:79
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/rcstrings.c:81
+#: ../src/rcstrings.c:81
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/rcstrings.c:82
+#: ../src/rcstrings.c:82
 msgid "Component..."
 msgstr "Componente..."
 
-#: src/rcstrings.c:83 src/i_callbacks.c:2358 src/i_callbacks.c:2380
+#. need to click
+#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2340 ../src/i_callbacks.c:2362
 msgid "Net"
 msgstr "Conexão"
 
-#: src/rcstrings.c:84 src/i_callbacks.c:2424 src/i_callbacks.c:2447
-#: src/x_window.c:547
+#. need to click
+#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2406 ../src/i_callbacks.c:2429
+#: ../src/x_window.c:459
 msgid "Bus"
 msgstr "Barramento"
 
-#: src/rcstrings.c:85
+#: ../src/rcstrings.c:85
 msgid "Attribute..."
 msgstr "Atributo..."
 
-#: src/rcstrings.c:86
+#: ../src/rcstrings.c:86
 msgid "Text..."
 msgstr "Texto..."
 
-#: src/rcstrings.c:87 src/i_callbacks.c:2528 src/i_callbacks.c:2547
+#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2510 ../src/i_callbacks.c:2529
 msgid "Line"
 msgstr "Linha"
 
-#: src/rcstrings.c:88 src/i_callbacks.c:2569 src/i_callbacks.c:2588
+#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2551 ../src/i_callbacks.c:2570
 msgid "Box"
 msgstr "Caixa"
 
-#: src/rcstrings.c:89 src/i_callbacks.c:2644 src/i_callbacks.c:2664
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2626 ../src/i_callbacks.c:2646
 msgid "Circle"
 msgstr "Círculo"
 
-#: src/rcstrings.c:90 src/i_callbacks.c:2686 src/i_callbacks.c:2705
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2668 ../src/i_callbacks.c:2687
 msgid "Arc"
 msgstr "Arco"
 
-#: src/rcstrings.c:91 src/i_callbacks.c:2727 src/i_callbacks.c:2746
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2709 ../src/i_callbacks.c:2728
 msgid "Pin"
 msgstr "Pino"
 
-#: src/rcstrings.c:92
+#: ../src/rcstrings.c:92
 msgid "Picture..."
 msgstr "Imagem..."
 
-#: src/rcstrings.c:94
+#: ../src/rcstrings.c:94
 msgid "Hierarchy"
 msgstr "Hierarquia"
 
-#: src/rcstrings.c:95
+#: ../src/rcstrings.c:95
 msgid "Down Schematic"
 msgstr "Descer ao Esquemático"
 
-#: src/rcstrings.c:96
+#: ../src/rcstrings.c:96
 msgid "Down Symbol"
 msgstr "Descer ao Símbolo"
 
-#: src/rcstrings.c:97
+#: ../src/rcstrings.c:97
 msgid "Up"
 msgstr "Subir"
 
-#: src/rcstrings.c:98
+#: ../src/rcstrings.c:98
 msgid "Documentation"
 msgstr "Documentação"
 
-#: src/rcstrings.c:100 src/x_multiattrib.c:1549
+#. GtkFrame
+#: ../src/rcstrings.c:100 ../src/x_multiattrib.c:1539
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/rcstrings.c:101 src/i_callbacks.c:3011
+#: ../src/rcstrings.c:101 ../src/i_callbacks.c:2993
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/rcstrings.c:102 src/i_callbacks.c:3060
+#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3042
 msgid "Detach"
 msgstr "Desanexar"
 
-#: src/rcstrings.c:103
+#: ../src/rcstrings.c:103
 msgid "Show Value"
 msgstr "Mostra Valor"
 
-#: src/rcstrings.c:104
+#: ../src/rcstrings.c:104
 msgid "Show Name"
 msgstr "Mostra Nome"
 
-#: src/rcstrings.c:105
+#: ../src/rcstrings.c:105
 msgid "Show Both"
 msgstr "Mostrar Ambos"
 
-#: src/rcstrings.c:106
+#: ../src/rcstrings.c:106
 msgid "Toggle Visibility"
 msgstr "Comuta Visibilidade"
 
-#: src/rcstrings.c:107
+#: ../src/rcstrings.c:107
 msgid "Find Specific Text..."
 msgstr "Procurar texto..."
 
-#: src/rcstrings.c:108
+#: ../src/rcstrings.c:108
 msgid "Hide Specific Text..."
 msgstr "Ocultar Texto..."
 
-#: src/rcstrings.c:109
+#: ../src/rcstrings.c:109
 msgid "Show Specific Text..."
 msgstr "Exibir Texto..."
 
-#: src/rcstrings.c:110
+#: ../src/rcstrings.c:110
 msgid "Autonumber Text..."
 msgstr "Autonumerar..."
 
-#: src/rcstrings.c:112
+#: ../src/rcstrings.c:112
 msgid "Options"
 msgstr "Opções"
 
-#: src/rcstrings.c:113
+#: ../src/rcstrings.c:113
 msgid "Text Size..."
 msgstr "Tamanho do Texto..."
 
-#: src/rcstrings.c:114
+#: ../src/rcstrings.c:114
 msgid "Toggle Grid On/Off"
 msgstr "Liga/Desliga Grade"
 
-#: src/rcstrings.c:115
+#: ../src/rcstrings.c:115
 msgid "Toggle Snap On/Off"
 msgstr "Liga/Desliga Agarre"
 
-#: src/rcstrings.c:116
+#: ../src/rcstrings.c:116
 msgid "Snap Grid Spacing..."
 msgstr "Grade de Agarre..."
 
-#: src/rcstrings.c:117
+#: ../src/rcstrings.c:117
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Grade de Agarre..."
 
-#: src/rcstrings.c:118
+#: ../src/rcstrings.c:118
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Grade de Agarre..."
 
-#: src/rcstrings.c:119
+#: ../src/rcstrings.c:119
 msgid "Toggle Outline/Box"
 msgstr "Silhueta/Caixa"
 
-#: src/rcstrings.c:120
+#: ../src/rcstrings.c:120
 msgid "Toggle Net Rubberband"
 msgstr "Lig/Desliga elástico"
 
-#: src/rcstrings.c:121
+#: ../src/rcstrings.c:121
 msgid "Show Log Window..."
 msgstr "Exibir janela de Log"
 
-#: src/rcstrings.c:122
+#: ../src/rcstrings.c:122
 msgid "Show Coord Window..."
 msgstr "Exibir janela de Coord."
 
-#: src/rcstrings.c:124
+#: ../src/rcstrings.c:124
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/rcstrings.c:125
+#: ../src/rcstrings.c:125
 #, fuzzy
 msgid "Manual"
 msgstr "Manual..."
 
-#: src/rcstrings.c:126
+#: ../src/rcstrings.c:126
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "Documentação"
 
-#: src/rcstrings.c:127
+#: ../src/rcstrings.c:127
 msgid "gschem FAQ"
 msgstr ""
 
-#: src/rcstrings.c:128
+#: ../src/rcstrings.c:128
 #, fuzzy
 msgid "Component Documentation"
 msgstr "Documentação"
 
-#: src/rcstrings.c:129
+#: ../src/rcstrings.c:129
 msgid "About gschem"
 msgstr ""
 
-#: src/rcstrings.c:130 src/x_dialog.c:2517
+#: ../src/rcstrings.c:130 ../src/x_dialog.c:2517
 #, fuzzy
 msgid "Hotkeys"
 msgstr "Atalhos..."
 
-#: src/a_zoom.c:245
+#: ../src/a_zoom.c:250
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Zoom muito pequeno! Não posso diminuir. \n"
 
-#: src/g_funcs.c:342 src/i_callbacks.c:137
+#. Fork failed. Still in parent process, so can use the log
+#. * window
+#: ../src/g_funcs.c:343 ../src/i_callbacks.c:138
 #, c-format
 msgid "Could not fork\n"
 msgstr ""
 
-#: src/g_funcs.c:358 src/i_callbacks.c:147
+#. if we return, then nothing happened
+#: ../src/g_funcs.c:359 ../src/i_callbacks.c:148
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Impossível invocar %s!\n"
 
-#: src/g_funcs.c:364 src/i_callbacks.c:151
+#: ../src/g_funcs.c:365 ../src/i_callbacks.c:152
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr ""
 
-#: src/g_hook.c:88
+#: ../src/g_hook.c:87
 #, c-format
 msgid "Attribute failed ot find.\n"
 msgstr "Atributo não encontrado\n"
 
-#: src/g_rc.c:159
+#: ../src/g_rc.c:160
 #, c-format
 msgid "Invalid color [%s] passed to %s\n"
 msgstr "Cor [%s] inválida passada para %s\n"
 
-#: src/g_rc.c:433
+#: ../src/g_rc.c:434
 #, 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:524
+#: ../src/g_rc.c:525
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: src/g_rc.c:551
+#: ../src/g_rc.c:552
 #, 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:594
+#: ../src/g_rc.c:595
 #, 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:1049
+#: ../src/g_rc.c:1050
 #, 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:1289
+#: ../src/g_rc.c:1290
 #, 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:1364
+#: ../src/g_rc.c:1365
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: src/g_rc.c:1405
+#: ../src/g_rc.c:1406
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: src/g_rc.c:1449
+#: ../src/g_rc.c:1450
 #, 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:1473
+#: ../src/g_rc.c:1474
 #, 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:1514
+#: ../src/g_rc.c:1515
 #, 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:1537
+#: ../src/g_rc.c:1538
 #, 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:1583
+#: ../src/g_rc.c:1584
 #, 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/gschem.c:192 src/gschem.c:203
+#: ../src/gschem.c:193 ../src/gschem.c:204
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versão %s%s.%s\n"
 
-#: src/gschem.c:195 src/gschem.c:206
+#: ../src/gschem.c:196 ../src/gschem.c:207
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -619,7 +628,7 @@ msgstr ""
 "gEDA/gschem vem com ABSOLUTAMENTE NENHUMA GARANTIA; leia o arquivo COPYING "
 "para maiores detalhes.\n"
 
-#: src/gschem.c:197 src/gschem.c:208
+#: ../src/gschem.c:198 ../src/gschem.c:209
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -627,650 +636,627 @@ msgstr ""
 "Este programa é um software livre, e você é convidado a redistribui-lo sob "
 "certas\n"
 
-#: src/gschem.c:199 src/gschem.c:210
+#: ../src/gschem.c:200 ../src/gschem.c:211
 #, 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:214
+#: ../src/gschem.c:215
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Esta é a versão portada para MINGW32.\n"
 
-#: src/gschem.c:218
+#: ../src/gschem.c:219
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Configuração para Localização: %s\n"
 
-#: src/gschem.c:231
+#: ../src/gschem.c:232
 #, 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:246
+#: ../src/gschem.c:248
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lendo o arquivo scm [%s]\n"
 
-#: src/gschem.c:250 src/gschem.c:253
+#. ! \todo These two messages are the same. Should be
+#. * integrated.
+#: ../src/gschem.c:252 ../src/gschem.c:255
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Falhou ao ler o arquivo scm [%s]\n"
 
-#: src/gschem.c:323
+#: ../src/gschem.c:323
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Diretório Scheme N�O ajustado!\n"
 
-#: src/gschem.c:330 src/x_script.c:71
+#: ../src/gschem.c:330 ../src/x_script.c:72
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Executando script guile [%s]\n"
 
-#: src/i_basic.c:84
-msgid "Attribute Mode"
-msgstr "Modo de Atributo"
-
-#: src/i_basic.c:87
+#: ../src/i_basic.c:84
 msgid "Component Mode"
 msgstr "Modo de Componente"
 
-#: src/i_basic.c:91
+#: ../src/i_basic.c:88
 msgid "Text Mode"
 msgstr "Modo Texto"
 
-#: src/i_basic.c:99
+#: ../src/i_basic.c:96
 msgid "Rotate Mode"
 msgstr "Modo de Rotação"
 
-#: src/i_basic.c:109
+#: ../src/i_basic.c:106
 msgid "Pan Mode"
 msgstr "Modo Pan"
 
-#: src/i_basic.c:113
+#: ../src/i_basic.c:110
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Modo Colar de %d"
 
-#: src/i_basic.c:118
+#: ../src/i_basic.c:115
 msgid "Net Mode"
 msgstr "Modo de Conexão (NET)"
 
-#: src/i_basic.c:122
+#: ../src/i_basic.c:119
 msgid "Bus Mode"
 msgstr "Modo Barramento (BUS)"
 
-#: src/i_basic.c:125
+#: ../src/i_basic.c:122
 msgid "Line Mode"
 msgstr "Modo de Linha"
 
-#: src/i_basic.c:128
+#: ../src/i_basic.c:125
 msgid "Box Mode"
 msgstr "Modo de Caixa"
 
-#: src/i_basic.c:131
+#: ../src/i_basic.c:128
 msgid "Picture Mode"
 msgstr "Modo Imagem"
 
-#: src/i_basic.c:134
+#: ../src/i_basic.c:131
 msgid "Circle Mode"
 msgstr "Modo de Círculo"
 
-#: src/i_basic.c:137
+#: ../src/i_basic.c:134
 msgid "Arc Mode"
 msgstr "Modo de Arco"
 
-#: src/i_basic.c:140
+#: ../src/i_basic.c:137
 msgid "Pin Mode"
 msgstr "Modo de Pino"
 
-#: src/i_basic.c:142 src/i_callbacks.c:587 src/i_callbacks.c:606
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:589 ../src/i_callbacks.c:608
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/i_basic.c:144 src/i_callbacks.c:667 src/i_callbacks.c:686
+#: ../src/i_basic.c:141 ../src/i_callbacks.c:669 ../src/i_callbacks.c:688
 msgid "Move"
 msgstr "Mover"
 
-#: src/i_basic.c:146 src/i_callbacks.c:627 src/i_callbacks.c:646
+#: ../src/i_basic.c:143 ../src/i_callbacks.c:629 ../src/i_callbacks.c:648
 msgid "Multiple Copy"
 msgstr "Multipla Cópia"
 
-#: src/i_basic.c:174
+#: ../src/i_basic.c:172
 msgid "Show Hidden"
 msgstr "Mostrar Oculto"
 
-#: src/i_basic.c:177
+#: ../src/i_basic.c:175
 msgid "Snap Off"
 msgstr "Agarre desligado"
 
-#: src/i_basic.c:259 src/x_window.c:656
+#: ../src/i_basic.c:256 ../src/x_window.c:568
 msgid "Action"
 msgstr "Ação"
 
-#: src/i_basic.c:267 src/x_window.c:651
+#: ../src/i_basic.c:262 ../src/x_window.c:563
 msgid "Stroke"
 msgstr "Stroke"
 
-#: src/i_basic.c:274 src/x_window.c:653
+#: ../src/i_basic.c:268 ../src/x_window.c:565
 msgid "none"
 msgstr "nenhum"
 
-#: src/i_basic.c:281
+#: ../src/i_basic.c:273
 msgid "Repeat/"
 msgstr "Repetir/"
 
-#: src/i_basic.c:570 src/i_basic.c:575
+#: ../src/i_basic.c:538 ../src/i_basic.c:543
 msgid "OFF"
 msgstr ""
 
-#: src/i_basic.c:579
+#: ../src/i_basic.c:547
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
 
-#: src/i_callbacks.c:132
+#: ../src/i_callbacks.c:133
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentação para [%s,%s,%s,%s]\n"
 
-#: src/i_callbacks.c:192 src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:193 ../src/i_callbacks.c:1754
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Criada Nova Página [%s]\n"
 
-#: src/i_callbacks.c:227 src/x_menus.c:493
+#: ../src/i_callbacks.c:229 ../src/x_menus.c:494
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nova janela criada\n"
 
-#: src/i_callbacks.c:345
+#: ../src/i_callbacks.c:347
 msgid "Failed to Save All"
 msgstr "Falha ao salvar tudo"
 
-#: src/i_callbacks.c:347
+#: ../src/i_callbacks.c:349
 msgid "Saved All"
 msgstr "Salvar Tudo"
 
-#: src/i_callbacks.c:439
+#: ../src/i_callbacks.c:441
 msgid "Closing Window\n"
 msgstr "Fechando Janela\n"
 
-#: src/i_callbacks.c:591 src/i_callbacks.c:631 src/i_callbacks.c:671
+#: ../src/i_callbacks.c:593 ../src/i_callbacks.c:633 ../src/i_callbacks.c:673
 msgid "Select objs first"
 msgstr "Selecione objetos antes"
 
-#: src/i_callbacks.c:746
+#: ../src/i_callbacks.c:748
 msgid "Edit Text"
 msgstr "Editar Texto"
 
-#: src/i_callbacks.c:769
+#: ../src/i_callbacks.c:771
 msgid "Slot"
 msgstr "Slot"
 
-#: src/i_callbacks.c:786
+#: ../src/i_callbacks.c:788
 msgid "Color"
 msgstr "Cor"
 
-#: src/i_callbacks.c:828 src/i_callbacks.c:875
+#: ../src/i_callbacks.c:830 ../src/i_callbacks.c:877
 msgid "Rotate"
 msgstr "Rotacionar"
 
-#: src/i_callbacks.c:902 src/i_callbacks.c:924
+#: ../src/i_callbacks.c:904 ../src/i_callbacks.c:926
 msgid "Mirror"
 msgstr "Espelhar"
 
-#: src/i_callbacks.c:988 src/x_dialog.c:1604
+#: ../src/i_callbacks.c:988 ../src/x_dialog.c:1611
 msgid "Translate"
 msgstr "Transladar"
 
-#: src/i_callbacks.c:991
+#: ../src/i_callbacks.c:991
 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:992
+#: ../src/i_callbacks.c:992
 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:999
+#: ../src/i_callbacks.c:999
 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:1001
+#: ../src/i_callbacks.c:1001
 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:1022
+#: ../src/i_callbacks.c:1022
 msgid "Embed"
 msgstr "Embutir"
 
-#: src/i_callbacks.c:1060
+#: ../src/i_callbacks.c:1063
 msgid "Unembed"
 msgstr "Desembutir"
 
-#: src/i_callbacks.c:1100
+#: ../src/i_callbacks.c:1106
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/i_callbacks.c:1157
+#: ../src/i_callbacks.c:1163
 msgid "ShowHidden"
 msgstr "Mostrar Oculto"
 
-#: src/i_callbacks.c:1180
+#: ../src/i_callbacks.c:1186
 msgid "MakeVisible"
 msgstr "Deixar Visível"
 
-#: src/i_callbacks.c:1296
+#: ../src/i_callbacks.c:1302
 msgid "Edit Line Type"
 msgstr "Editar Tipo de Linha"
 
-#: src/i_callbacks.c:1337 src/x_dialog.c:1261
+#: ../src/i_callbacks.c:1343 ../src/x_dialog.c:1268
 msgid "Edit Fill Type"
 msgstr "Editar Preenchimento"
 
-#: src/i_callbacks.c:1643
+#: ../src/i_callbacks.c:1648
 msgid "Update Cues"
 msgstr "Atualiza dicas"
 
-#: src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1798
 msgid "Really revert page?"
 msgstr "Reverter Página?"
 
-#: src/i_callbacks.c:1856
+#: ../src/i_callbacks.c:1872
 msgid "Copy 1"
 msgstr "Copiar para 1"
 
-#: src/i_callbacks.c:1875
+#: ../src/i_callbacks.c:1891
 msgid "Copy 2"
 msgstr "Copiar para 2"
 
-#: src/i_callbacks.c:1894
+#: ../src/i_callbacks.c:1910
 msgid "Copy 3"
 msgstr "Copiar para 3"
 
-#: src/i_callbacks.c:1913
+#: ../src/i_callbacks.c:1929
 msgid "Copy 4"
 msgstr "Copiar para 4"
 
-#: src/i_callbacks.c:1932
+#: ../src/i_callbacks.c:1948
 msgid "Copy 5"
 msgstr "Copiar para 5"
 
-#: src/i_callbacks.c:1951
+#: ../src/i_callbacks.c:1967
 msgid "Cut 1"
 msgstr "Cortar para 1"
 
-#: src/i_callbacks.c:1970
+#: ../src/i_callbacks.c:1986
 msgid "Cut 2"
 msgstr "Cortar para 2"
 
-#: src/i_callbacks.c:1989
+#: ../src/i_callbacks.c:2005
 msgid "Cut 3"
 msgstr "Cortar para 3"
 
-#: src/i_callbacks.c:2008
+#: ../src/i_callbacks.c:2024
 msgid "Cut 4"
 msgstr "Cortar para 4"
 
-#: src/i_callbacks.c:2027
+#: ../src/i_callbacks.c:2043
 msgid "Cut 5"
 msgstr "Cortar para 5"
 
-#: src/i_callbacks.c:2043
+#: ../src/i_callbacks.c:2059
 msgid "Paste 1"
 msgstr "Colar de 1"
 
-#: src/i_callbacks.c:2052 src/i_callbacks.c:2076 src/i_callbacks.c:2100
-#: src/i_callbacks.c:2124 src/i_callbacks.c:2148
+#: ../src/i_callbacks.c:2066 ../src/i_callbacks.c:2088
+#: ../src/i_callbacks.c:2110 ../src/i_callbacks.c:2132
+#: ../src/i_callbacks.c:2154
 msgid "Empty buffer"
 msgstr "Buffer vazio"
 
-#: src/i_callbacks.c:2067
+#: ../src/i_callbacks.c:2081
 msgid "Paste 2"
 msgstr "Colar de 2"
 
-#: src/i_callbacks.c:2091
+#: ../src/i_callbacks.c:2103
 msgid "Paste 3"
 msgstr "Colar de 3"
 
-#: src/i_callbacks.c:2115
+#: ../src/i_callbacks.c:2125
 msgid "Paste 4"
 msgstr "Colar de 4"
 
-#: src/i_callbacks.c:2139
+#: ../src/i_callbacks.c:2147
 msgid "Paste 5"
 msgstr "Colar de 5"
 
-#: src/i_callbacks.c:2282 src/x_window.c:527
+#: ../src/i_callbacks.c:2264 ../src/x_window.c:439
 msgid "Component"
 msgstr "Componente"
 
-#: src/i_callbacks.c:2318 src/i_callbacks.c:2337
+#: ../src/i_callbacks.c:2300 ../src/i_callbacks.c:2319
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/i_callbacks.c:2804
+#: ../src/i_callbacks.c:2786
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Procurando por origem [%s]\n"
 
-#: src/i_callbacks.c:2828 src/i_callbacks.c:2829
+#: ../src/i_callbacks.c:2810 ../src/i_callbacks.c:2811
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Impossível encontrar origem [%s]\n"
 
-#: src/i_callbacks.c:2896
+#: ../src/i_callbacks.c:2878
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Procurando por símbolo [%s]\n"
 
-#: src/i_callbacks.c:2983
+#: ../src/i_callbacks.c:2965
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: src/i_callbacks.c:3100
+#: ../src/i_callbacks.c:3082
 msgid "ShowN"
 msgstr "Mostrar N"
 
-#: src/i_callbacks.c:3130
+#: ../src/i_callbacks.c:3112
 msgid "ShowV"
 msgstr "Mostrar V"
 
-#: src/i_callbacks.c:3160
+#: ../src/i_callbacks.c:3142
 msgid "ShowB"
 msgstr "Mostrar T"
 
-#: src/i_callbacks.c:3191
+#: ../src/i_callbacks.c:3173
 msgid "VisToggle"
 msgstr "Comuta Visibilidade"
 
-#: src/i_callbacks.c:3212
+#: ../src/i_callbacks.c:3194
 #, 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:3300
+#: ../src/i_callbacks.c:3282
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Retorno de ação ajustado para silhueta\n"
 
-#: src/i_callbacks.c:3303
+#: ../src/i_callbacks.c:3285
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Retorno de ação ajustado para caixa completa\n"
 
-#: src/i_callbacks.c:3320
+#: ../src/i_callbacks.c:3302
 msgid "Grid OFF\n"
 msgstr "Grade DESLIGADA\n"
 
-#: src/i_callbacks.c:3323
+#: ../src/i_callbacks.c:3305
 msgid "Grid ON\n"
 msgstr "Grade LIGADA\n"
 
-#: src/i_callbacks.c:3340
+#: ../src/i_callbacks.c:3322
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Agarre desligado (CUIDADO!)\n"
 
-#: src/i_callbacks.c:3343
+#: ../src/i_callbacks.c:3325
 msgid "Snap ON\n"
 msgstr "Agarre ligado\n"
 
-#: src/i_callbacks.c:3363
+#: ../src/i_callbacks.c:3345
 msgid "Rubber band OFF \n"
 msgstr "Elástico desligado\n"
 
-#: src/i_callbacks.c:3366
+#: ../src/i_callbacks.c:3348
 msgid "Rubber band ON\n"
 msgstr "Elástico ligado\n"
 
-#: src/o_arc.c:137
+#: ../src/o_arc.c:139
 #, c-format
 msgid "Unknown end for arc (%d)\n"
 msgstr "Fim de arco desconhecido:(%d)\n"
 
-#: src/o_arc.c:178
+#: ../src/o_arc.c:180
 #, c-format
 msgid "Unknown type for arc !\n"
 msgstr "Tipo para arco desconhecido!\n"
 
-#: src/o_attrib.c:105
+#: ../src/o_attrib.c:109
 #, c-format
 msgid "Got NULL in o_attrib_toggle_visibility\n"
 msgstr "tem NULO em o_attrib_toggle_visibility\n"
 
-#: src/o_attrib.c:170
+#: ../src/o_attrib.c:175
 #, c-format
 msgid "Got NULL in o_attrib_toggle_show_name_value\n"
 msgstr "Tem NULO em o_attrib_toggle_show_name_value\n"
 
-#: src/o_attrib.c:221
-#, c-format
-msgid "ERROR! you can't get an attribute without an ='s\n"
-msgstr "ERRO! Você não tem atributo sem um sinal = (igual)\n"
-
-#: src/o_box.c:141
+#: ../src/o_box.c:143
 #, c-format
 msgid "Unknown end for box (%d)\n"
 msgstr "Fim desconhecido para caixa (%d)\n"
 
-#: src/o_box.c:181
+#: ../src/o_box.c:183
 #, c-format
 msgid "Unknown type for box !\n"
 msgstr "Tipo desconhecido para caixa!\n"
 
-#: src/o_box.c:271
+#: ../src/o_box.c:267
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Tipo desconhecido para enchimento da caixa!\n"
 
-#: src/o_buffer.c:42
+#: ../src/o_buffer.c:44
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_copy]\n"
 msgstr ""
 
-#: src/o_buffer.c:80
+#: ../src/o_buffer.c:73
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_cut]\n"
 msgstr ""
 
-#: src/o_buffer.c:121
+#: ../src/o_buffer.c:105
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 
-#: src/o_buffer.c:181
+#: ../src/o_buffer.c:164
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
 msgstr ""
 
-#: src/o_bus.c:210
+#: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\n"
 msgstr ""
 
-#: src/o_circle.c:136
+#: ../src/o_circle.c:138
 #, c-format
 msgid "Unknown end for circle\n"
 msgstr "Fim para arco desconhecido\n"
 
-#: src/o_circle.c:172
+#. just to be careful
+#: ../src/o_circle.c:174
 #, c-format
 msgid "Unknown type for circle!\n"
 msgstr "Tipo para arco desconhecido!\n"
 
-#: src/o_circle.c:260
+#: ../src/o_circle.c:256
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Tipo desconhecido para enchimento de arco!\n"
 
-#: src/o_complex.c:230
+#: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
 msgstr ""
 
-#: src/o_complex.c:582
-#, c-format
-msgid "Got NULL in o_complex_translate_display_selection\n"
-msgstr ""
-
-#: src/o_complex.c:650 src/o_complex.c:656
+#: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Transladando diagrama [%d %d]\n"
 
-#: src/o_complex.c:694
-#, c-format
-msgid "Got NULL in o_complex_translate_selection!\n"
-msgstr ""
-
-#: src/o_copy.c:119 src/o_copy.c:382
+#: ../src/o_copy.c:122 ../src/o_copy.c:312
 #, c-format
 msgid "ERROR: NULL object in o_copy_end!\n"
 msgstr ""
 
-#: src/o_line.c:113
+#: ../src/o_line.c:115
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Fim desconhecido para linha (%d)!\n"
 
-#: src/o_line.c:153
+#. just to be careful
+#: ../src/o_line.c:155
 #, c-format
 msgid "Unknown type for line (%d) !\n"
 msgstr "Tipo desconhecido para linha (%d)!\n"
 
-#: src/o_misc.c:65
+#: ../src/o_misc.c:66
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr ""
 
-#: src/o_misc.c:144
+#: ../src/o_misc.c:145
 #, fuzzy
 msgid "Object already locked\n"
 msgstr "Objeto já bloqueado\n"
 
-#: src/o_misc.c:182
+#: ../src/o_misc.c:183
 #, fuzzy
 msgid "Object already unlocked\n"
 msgstr "Objeto já desbloqueado\n"
 
-#: src/o_misc.c:229 src/o_misc.c:472 src/o_misc.c:712
-#, c-format
-msgid "ERROR: NULL object in o_rotate_90!\n"
-msgstr "ERRO: NENHUM objeto na rotação 90!\n"
-
-#: src/o_misc.c:538
-#, c-format
-msgid "ERROR: NULL object in o_mirror!\n"
-msgstr "ERRO: NENHUM objeto ao espelhar!\n"
-
-#: src/o_misc.c:812
+#: ../src/o_misc.c:525
 msgid "Hidden text is now visible\n"
 msgstr "Texto oculto agora está visível\n"
 
-#: src/o_misc.c:814
+#: ../src/o_misc.c:527
 msgid "Hidden text is now invisible\n"
 msgstr "Texto oculto agora está invisível\n"
 
-#: src/o_misc.c:1058
+#: ../src/o_misc.c:771
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: src/o_misc.c:1196
+#: ../src/o_misc.c:906
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 
-#: src/o_misc.c:1240
+#: ../src/o_misc.c:951
 #, 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:1258
+#: ../src/o_misc.c:969
 #, 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:1263
+#: ../src/o_misc.c:974
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "N�O foi possível salvar  arquivo backup [%s] !\n"
 
-#: src/o_move.c:224
+#: ../src/o_move.c:181
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr ""
 
-#: src/o_move.c:332
+#: ../src/o_move.c:282
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: src/o_move.c:353
+#: ../src/o_move.c:304
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr ""
 
-#: src/o_net.c:255
+#: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\n"
 msgstr ""
 
-#: src/o_net.c:812 src/o_net.c:849 src/o_net.c:920 src/o_net.c:956
+#. try to exit gracefully
+#: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: src/o_net.c:1029
+#: ../src/o_net.c:980
 #, 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_picture.c:206 src/o_picture.c:746
+#: ../src/o_picture.c:208 ../src/o_picture.c:720
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Falhou ao ler imagem: %s"
 
-#: src/o_picture.c:220
+#: ../src/o_picture.c:222
 msgid "Picture"
 msgstr "Imagem"
 
-#: src/o_picture.c:658 src/x_attribedit.c:145
+#: ../src/o_picture.c:625 ../src/x_attribedit.c:148
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERRO: NENHUM objeto!\n"
 
-#: src/o_slot.c:128
+#: ../src/o_slot.c:130
 msgid "Slot attribute malformed\n"
 msgstr "Atributo Slot mau feito\n"
 
-#: src/o_slot.c:146
+#: ../src/o_slot.c:148
 msgid "numslots attribute missing\n"
 msgstr "Sem atributo NUMSLOTS\n"
 
-#: src/o_slot.c:148
+#: ../src/o_slot.c:150
 msgid "Slotting not allowed for this component\n"
 msgstr "Slots não disponível para este componente\n"
 
-#: src/o_slot.c:164
+#: ../src/o_slot.c:166
 msgid "New slot number out of range\n"
 msgstr "Número de slot fora dos limites\n"
 
-#: src/o_slot.c:237
+#: ../src/o_slot.c:239
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Você tentou editar o slot de algo que não existe!\n"
 
-#: src/o_undo.c:317
+#: ../src/o_undo.c:318
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Desfaz e Refaz desabilitado no arquivo rc\n"
 
-#: src/parsecmd.c:50
+#: ../src/parsecmd.c:51
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1295,244 +1281,260 @@ msgstr ""
 "  -h            Ajuda; esta mensagem\n"
 "\n"
 
-#: src/x_attribedit.c:130
+#: ../src/x_attribedit.c:133
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 
-#: src/x_attribedit.c:333
+#: ../src/x_attribedit.c:336
 msgid "Single Attribute Editor"
 msgstr "Editor de um atributo"
 
-#: src/x_attribedit.c:364
+#: ../src/x_attribedit.c:367
 #, fuzzy
 msgid "<b>Edit Attribute</b>"
 msgstr "Editar Atributos"
 
-#: src/x_attribedit.c:366
+#: ../src/x_attribedit.c:369
 #, fuzzy
 msgid "<b>Add Attribute</b>"
 msgstr "Inserir Atributo"
 
-#: src/x_attribedit.c:382 src/x_multiattrib.c:1731
+#. Name selection
+#. GtkLabel
+#: ../src/x_attribedit.c:385 ../src/x_multiattrib.c:1721
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/x_attribedit.c:398 src/x_multiattrib.c:1750
+#. Value entry
+#. GtkLabel
+#: ../src/x_attribedit.c:401 ../src/x_multiattrib.c:1740
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/x_attribedit.c:414 src/x_multiattrib.c:1787
+#. Visibility
+#. GtkButton
+#: ../src/x_attribedit.c:417 ../src/x_multiattrib.c:1777
 msgid "Visible"
 msgstr "Visível"
 
-#: src/x_attribedit.c:434
+#: ../src/x_attribedit.c:437
 msgid "Show Value Only"
 msgstr "Mostra apenas Valor"
 
-#: src/x_attribedit.c:436
+#: ../src/x_attribedit.c:439
 msgid "Show Name Only"
 msgstr "Mostra apenas Nome"
 
-#: src/x_attribedit.c:438 src/x_multiattrib.c:1226
+#: ../src/x_attribedit.c:441 ../src/x_multiattrib.c:1216
 msgid "Show Name & Value"
 msgstr "Mostra Nome e Valor"
 
-#: src/x_attribedit.c:445
+#. gschem specific
+#: ../src/x_attribedit.c:448
 #, fuzzy
 msgid "<b>Attach Options</b>"
 msgstr "Opções"
 
-#: src/x_attribedit.c:460
+#: ../src/x_attribedit.c:463
 msgid "All"
 msgstr "Todos"
 
-#: src/x_attribedit.c:468 src/x_compselect.c:728 src/x_compselect.c:803
+#. GtkTreeViewColumn
+#: ../src/x_attribedit.c:471 ../src/x_compselect.c:735
+#: ../src/x_compselect.c:810
 msgid "Components"
 msgstr "Componentes"
 
-#: src/x_attribedit.c:476 src/x_window.c:537
+#: ../src/x_attribedit.c:479 ../src/x_window.c:449
 msgid "Nets"
 msgstr "Conexões"
 
-#: src/x_attribedit.c:484
+#: ../src/x_attribedit.c:487
 msgid "Replace existing attributes"
 msgstr ""
 
-#: src/x_autonumber.c:413
+#: ../src/x_autonumber.c:412
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#: src/x_autonumber.c:428
+#. duplicate slot in used_slots
+#: ../src/x_autonumber.c:427
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: src/x_autonumber.c:697
+#: ../src/x_autonumber.c:692
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: src/x_autonumber.c:748
+#: ../src/x_autonumber.c:743
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: src/x_autonumber.c:881
+#: ../src/x_autonumber.c:876
 #, fuzzy
 msgid "Diagonal"
 msgstr "diagonal"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Top to bottom"
 msgstr ""
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Bottom to top"
 msgstr ""
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 #, fuzzy
 msgid "Left to right"
 msgstr "Esq Dir"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Right to left"
 msgstr ""
 
-#: src/x_autonumber.c:884
+#: ../src/x_autonumber.c:879
 #, fuzzy
 msgid "File order"
 msgstr "Ordena em arquivos"
 
-#: src/x_autonumber.c:1220
+#: ../src/x_autonumber.c:1215
 msgid "Autonumber text"
 msgstr "Autonumerar texto"
 
-#: src/x_autonumber.c:1246
+#. scope section
+#: ../src/x_autonumber.c:1241
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: src/x_autonumber.c:1268
+#: ../src/x_autonumber.c:1263
 #, fuzzy
 msgid "Search for:"
 msgstr "foco de procura"
 
-#: src/x_autonumber.c:1282
+#: ../src/x_autonumber.c:1277
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "Autonumerar texto"
 
-#: src/x_autonumber.c:1289
+#: ../src/x_autonumber.c:1284
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: src/x_autonumber.c:1301 src/x_autonumber.c:1310
+#: ../src/x_autonumber.c:1296 ../src/x_autonumber.c:1305
 #, fuzzy
 msgid "Selected objects"
 msgstr "Objetos selecionados"
 
-#: src/x_autonumber.c:1302 src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1297 ../src/x_autonumber.c:1306
 #, fuzzy
 msgid "Current page"
 msgstr "Folha corrente"
 
-#: src/x_autonumber.c:1303 src/x_autonumber.c:1312
+#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "Hierarquia"
 
-#: src/x_autonumber.c:1314
+#: ../src/x_autonumber.c:1309
 msgid "Overwrite existing numbers"
 msgstr ""
 
-#: src/x_autonumber.c:1319
+#. Options section
+#: ../src/x_autonumber.c:1314
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Opções"
 
-#: src/x_autonumber.c:1341
+#: ../src/x_autonumber.c:1336
 #, fuzzy
 msgid "Starting number:"
 msgstr "Número inicial"
 
-#: src/x_autonumber.c:1348
+#: ../src/x_autonumber.c:1343
 #, fuzzy
 msgid "Sort order:"
 msgstr "Ordenação"
 
-#: src/x_autonumber.c:1369
+#: ../src/x_autonumber.c:1364
 msgid "Remove numbers"
 msgstr ""
 
-#: src/x_autonumber.c:1373
+#: ../src/x_autonumber.c:1368
 msgid "Automatic slotting"
 msgstr ""
 
-#: src/x_color.c:60 src/x_color.c:97
+#: ../src/x_color.c:60 ../src/x_color.c:97
 #, c-format
 msgid "Could not find the color %s!\n"
 msgstr "Impossível encontrar a cor %s!\n"
 
-#: src/x_color.c:63 src/x_color.c:100
+#: ../src/x_color.c:63 ../src/x_color.c:100
 #, c-format
 msgid "Defaulting color to white\n"
 msgstr "Cor padrão para branco\n"
 
-#: src/x_color.c:70 src/x_color.c:107
+#: ../src/x_color.c:70 ../src/x_color.c:107
 #, c-format
 msgid "Ack! Cannot allocate white!\n"
 msgstr "Ih! Não consigo alocar o branco!\n"
 
-#: src/x_color.c:81 src/x_color.c:129 src/x_window.c:176 src/x_window.c:185
+#: ../src/x_color.c:81 ../src/x_color.c:129 ../src/x_window.c:86
+#: ../src/x_window.c:95
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Impossível alocar a cor %s!\n"
 
-#: src/x_color.c:148 src/x_color.c:164
+#: ../src/x_color.c:148 ../src/x_color.c:164
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Tentou ter cor inválida: %d\n"
 
-#: src/x_compselect.c:833
+#. GtkLabel
+#: ../src/x_compselect.c:840
 #, fuzzy
 msgid "Filter:"
 msgstr "Filtro"
 
-#: src/x_compselect.c:925
+#: ../src/x_compselect.c:932
 msgid "Default behavior - reference component"
 msgstr "Uso normal - referenciar componente"
 
-#: src/x_compselect.c:928
+#: ../src/x_compselect.c:935
 msgid "Embed component in schematic"
 msgstr "Embutir componente no diagrama"
 
-#: src/x_compselect.c:931
+#: ../src/x_compselect.c:938
 msgid "Include component as individual objects"
 msgstr "Incluir como objetos individuais"
 
-#: src/x_compselect.c:1077
+#: ../src/x_compselect.c:1094
 msgid "Select Component..."
 msgstr "Selecionar Componente"
 
-#: src/x_compselect.c:1103
+#: ../src/x_compselect.c:1120
 msgid "In Use"
 msgstr ""
 
-#: src/x_compselect.c:1107
+#: ../src/x_compselect.c:1124
 msgid "Libraries"
 msgstr "Bibliotecas"
 
-#: src/x_compselect.c:1116 src/x_fileselect.c:127
+#. GtkFrame
+#: ../src/x_compselect.c:1133 ../src/x_fileselect.c:128
 msgid "Preview"
 msgstr "Prévia"
 
-#: src/x_dialog.c:184
+#. dialog not created yet
+#: ../src/x_dialog.c:191
 msgid "Text Entry..."
 msgstr "Entrada de texto..."
 
-#: src/x_dialog.c:217
+#: ../src/x_dialog.c:224
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1542,185 +1544,195 @@ msgstr ""
 "cursor na janela, clique para deixar o texto.\n"
 "Use botão do meio para rotacionar enquanto posiciona"
 
-#: src/x_dialog.c:306
+#: ../src/x_dialog.c:313
+#, c-format
 msgid "Lower Left"
 msgstr "Esq Baixo"
 
-#: src/x_dialog.c:317
+#: ../src/x_dialog.c:324
+#, c-format
 msgid "Middle Left"
 msgstr "Esq Centro"
 
-#: src/x_dialog.c:328
+#: ../src/x_dialog.c:335
+#, c-format
 msgid "Upper Left"
 msgstr "Esq Alto"
 
-#: src/x_dialog.c:339
+#: ../src/x_dialog.c:346
+#, c-format
 msgid "Lower Middle"
 msgstr "Centro Baixo"
 
-#: src/x_dialog.c:350
+#: ../src/x_dialog.c:357
+#, c-format
 msgid "Middle Middle"
 msgstr "Centro Centro"
 
-#: src/x_dialog.c:361
+#: ../src/x_dialog.c:368
+#, c-format
 msgid "Upper Middle"
 msgstr "Centro Alto"
 
-#: src/x_dialog.c:372
+#: ../src/x_dialog.c:379
+#, c-format
 msgid "Lower Right"
 msgstr "Dir Baixo"
 
-#: src/x_dialog.c:383
+#: ../src/x_dialog.c:390
+#, c-format
 msgid "Middle Right"
 msgstr "Dir Centro"
 
-#: src/x_dialog.c:394
+#: ../src/x_dialog.c:401
+#, c-format
 msgid "Upper Right"
 msgstr "Dir Alto"
 
-#: src/x_dialog.c:509
+#: ../src/x_dialog.c:516
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "Editar Tamanho do Texto"
 
-#: src/x_dialog.c:545
+#: ../src/x_dialog.c:552
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "Opções"
 
-#: src/x_dialog.c:577
+#: ../src/x_dialog.c:584
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "Opções"
 
-#: src/x_dialog.c:592
+#: ../src/x_dialog.c:599
 #, fuzzy
 msgid "Color:"
 msgstr "Cor"
 
-#: src/x_dialog.c:602
+#: ../src/x_dialog.c:609
 msgid "Size:"
 msgstr ""
 
-#: src/x_dialog.c:611
+#: ../src/x_dialog.c:618
 #, fuzzy
 msgid "Alignment:"
 msgstr "Editar Alinhamento do Texto"
 
-#: src/x_dialog.c:665
+#: ../src/x_dialog.c:672
 msgid "Solid"
 msgstr "Solido"
 
-#: src/x_dialog.c:666
+#: ../src/x_dialog.c:673
 msgid "Dotted"
 msgstr "Pontilhado"
 
-#: src/x_dialog.c:667
+#: ../src/x_dialog.c:674
 msgid "Dashed"
 msgstr "Tracejado"
 
-#: src/x_dialog.c:668
+#: ../src/x_dialog.c:675
 msgid "Center"
 msgstr "Centro"
 
-#: src/x_dialog.c:669
+#: ../src/x_dialog.c:676
 msgid "Phantom"
 msgstr "Fantasma"
 
-#: src/x_dialog.c:795 src/x_dialog.c:797 src/x_dialog.c:799 src/x_dialog.c:982
-#: src/x_dialog.c:983 src/x_dialog.c:984 src/x_dialog.c:992
-#: src/x_dialog.c:1175 src/x_dialog.c:1177 src/x_dialog.c:1179
-#: src/x_dialog.c:1181 src/x_dialog.c:1183 src/x_dialog.c:1388
-#: src/x_dialog.c:1389 src/x_dialog.c:1390 src/x_dialog.c:1391
-#: src/x_dialog.c:1392 src/x_dialog.c:1400
+#: ../src/x_dialog.c:802 ../src/x_dialog.c:804 ../src/x_dialog.c:806
+#: ../src/x_dialog.c:989 ../src/x_dialog.c:990 ../src/x_dialog.c:991
+#: ../src/x_dialog.c:999 ../src/x_dialog.c:1182 ../src/x_dialog.c:1184
+#: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
+#: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
+#: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
+#, c-format
 msgid "*unchanged*"
 msgstr "*inalterado*"
 
-#: src/x_dialog.c:874
+#: ../src/x_dialog.c:881
 msgid "Edit Line Width & Type"
 msgstr "Editar Largura e Tipo de Linha"
 
-#: src/x_dialog.c:915
+#: ../src/x_dialog.c:922
 #, fuzzy
 msgid "Width:"
 msgstr "Largura"
 
-#: src/x_dialog.c:919 src/x_print.c:314
+#: ../src/x_dialog.c:926 ../src/x_print.c:315
 #, fuzzy
 msgid "Type:"
 msgstr "Origem da Imagem"
 
-#: src/x_dialog.c:923
+#: ../src/x_dialog.c:930
 #, fuzzy
 msgid "Dash Length:"
 msgstr "Comprimento dos traços"
 
-#: src/x_dialog.c:927
+#: ../src/x_dialog.c:934
 #, fuzzy
 msgid "Dash Space:"
 msgstr "Comprimento dos espaços"
 
-#: src/x_dialog.c:1032
+#: ../src/x_dialog.c:1039
 msgid "Hollow"
 msgstr "Vazio"
 
-#: src/x_dialog.c:1033
+#: ../src/x_dialog.c:1040
 msgid "Filled"
 msgstr "Preenchida"
 
-#: src/x_dialog.c:1034
+#: ../src/x_dialog.c:1041
 msgid "Mesh"
 msgstr "Malha"
 
-#: src/x_dialog.c:1035
+#: ../src/x_dialog.c:1042
 msgid "Hatch"
 msgstr "Linhas"
 
-#: src/x_dialog.c:1301
+#: ../src/x_dialog.c:1308
 #, fuzzy
 msgid "Fill Type:"
 msgstr "Tipo de Preenchimento"
 
-#: src/x_dialog.c:1305
+#: ../src/x_dialog.c:1312
 #, fuzzy
 msgid "Line Width:"
 msgstr "Largura da Linha"
 
-#: src/x_dialog.c:1309
+#: ../src/x_dialog.c:1316
 #, fuzzy
 msgid "Angle 1:"
 msgstr "Ã?ngulo1"
 
-#: src/x_dialog.c:1313
+#: ../src/x_dialog.c:1320
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "Passo1"
 
-#: src/x_dialog.c:1317
+#: ../src/x_dialog.c:1324
 #, fuzzy
 msgid "Angle 2:"
 msgstr "Ã?ngulo2"
 
-#: src/x_dialog.c:1321
+#: ../src/x_dialog.c:1328
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "Passo2"
 
-#: src/x_dialog.c:1483
+#: ../src/x_dialog.c:1490
 msgid "Arc Params"
 msgstr "Parametros do Arco"
 
-#: src/x_dialog.c:1525
+#: ../src/x_dialog.c:1532
 #, fuzzy
 msgid "Start Angle:"
 msgstr "Ã?ngulo Inicial"
 
-#: src/x_dialog.c:1535
+#: ../src/x_dialog.c:1542
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "Graus de comprimento"
 
-#: src/x_dialog.c:1636
+#: ../src/x_dialog.c:1643
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1728,49 +1740,49 @@ msgstr ""
 "Valor a transladar?\n"
 "(0 para origem)"
 
-#: src/x_dialog.c:1704
+#: ../src/x_dialog.c:1711
 msgid "Text Size"
 msgstr "Tamanho do Texto"
 
-#: src/x_dialog.c:1736
+#: ../src/x_dialog.c:1743
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "Entre com novo tamanho de texto"
 
-#: src/x_dialog.c:1811
+#: ../src/x_dialog.c:1818
 #, fuzzy
 msgid "Snap Size"
 msgstr "Grade de agarre"
 
-#: src/x_dialog.c:1843
+#: ../src/x_dialog.c:1850
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "Entre com novo tamanho de grade"
 
-#: src/x_dialog.c:1916
+#: ../src/x_dialog.c:1923
 msgid "Edit slot number"
 msgstr "Editar número de SLOT"
 
-#: src/x_dialog.c:1949
+#: ../src/x_dialog.c:1956
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "Editar número de SLOT"
 
-#: src/x_dialog.c:2011
+#: ../src/x_dialog.c:2018
 msgid "About..."
 msgstr "Sobre..."
 
-#: src/x_dialog.c:2031
+#: ../src/x_dialog.c:2038
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "gEDA : GPL Electronic Design Automation"
 
-#: src/x_dialog.c:2035
+#: ../src/x_dialog.c:2042
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "gschem versão %s%s.%s"
 
-#: src/x_dialog.c:2043
+#: ../src/x_dialog.c:2050
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1783,100 +1795,102 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "e outros autores (ver arquivo AUTHORS)"
 
-#: src/x_dialog.c:2107
+#: ../src/x_dialog.c:2115
 msgid "Coords"
 msgstr "Coordenadas"
 
-#: src/x_dialog.c:2128
+#: ../src/x_dialog.c:2136
 msgid "Screen"
 msgstr "Janela"
 
-#: src/x_dialog.c:2137
+#: ../src/x_dialog.c:2145
 msgid "World"
 msgstr "Universo"
 
-#: src/x_dialog.c:2360
+#: ../src/x_dialog.c:2360
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr ""
 
-#: src/x_dialog.c:2423
+#: ../src/x_dialog.c:2423
 msgid "Color Edit"
 msgstr "Edição de Cor"
 
-#: src/x_dialog.c:2456
+#: ../src/x_dialog.c:2456
 msgid "Object color:"
 msgstr ""
 
-#: src/x_dialog.c:2581
+#: ../src/x_dialog.c:2581
 #, fuzzy
 msgid "Function"
 msgstr "Ação"
 
-#: src/x_dialog.c:2588
+#: ../src/x_dialog.c:2588
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "Função : atalho(s)"
 
-#: src/x_dialog.c:2920
+#: ../src/x_dialog.c:2901
 #, fuzzy
 msgid "Find Text"
 msgstr "Localizar"
 
-#: src/x_dialog.c:2953
+#: ../src/x_dialog.c:2934
 msgid "Text to find:"
 msgstr "Loc. Texto:"
 
-#: src/x_dialog.c:2963
+#: ../src/x_dialog.c:2944
 msgid "descend into hierarchy"
 msgstr "Desce à hierarquia"
 
-#: src/x_dialog.c:3027
+#: ../src/x_dialog.c:3008
 #, fuzzy
 msgid "Hide Text"
 msgstr "Ocultar texto"
 
-#: src/x_dialog.c:3060
+#: ../src/x_dialog.c:3041
 msgid "Hide text starting with:"
 msgstr "Ocultar texto iniciado com:"
 
-#: src/x_dialog.c:3128
+#: ../src/x_dialog.c:3109
 #, fuzzy
 msgid "Show Text"
 msgstr "Mostrar Texto"
 
-#: src/x_dialog.c:3161
+#: ../src/x_dialog.c:3142
 msgid "Show text starting with:"
 msgstr "Mostrar texto iniciado com:"
 
-#: src/x_dialog.c:3606 src/x_multiattrib.c:1607
+#. GtkTreeViewColumn
+#: ../src/x_dialog.c:3587 ../src/x_multiattrib.c:1597
 msgid "Name"
 msgstr "Nome"
 
-#: src/x_dialog.c:3628
+#: ../src/x_dialog.c:3609
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: src/x_dialog.c:3722
+#: ../src/x_dialog.c:3703
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: src/x_dialog.c:3728
+#: ../src/x_dialog.c:3709
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
-#: src/x_dialog.c:3757
+#. secondary label
+#: ../src/x_dialog.c:3738
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: src/x_dialog.c:3777
+#: ../src/x_dialog.c:3758
 msgid "_Close without saving"
 msgstr ""
 
-#: src/x_dialog.c:4098
+#: ../src/x_dialog.c:4094
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1887,52 +1901,70 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: src/x_dialog.c:4100
+#: ../src/x_dialog.c:4096
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Inserir Atributo"
 
-#: src/x_fileselect.c:47
+#: ../src/x_fileselect.c:48
 msgid "Schematics"
 msgstr "Diagramas"
 
-#: src/x_fileselect.c:52
+#: ../src/x_fileselect.c:53
 msgid "Symbols"
 msgstr "Símbolos"
 
-#: src/x_fileselect.c:57
+#: ../src/x_fileselect.c:58
 msgid "Schematics and symbols"
 msgstr "Diagramas e Símbolos"
 
-#: src/x_fileselect.c:63
+#: ../src/x_fileselect.c:64
 #, fuzzy
 msgid "All files"
 msgstr "Todos arquivos"
 
-#: src/x_fileselect.c:176
+#: ../src/x_fileselect.c:177
 msgid "Open..."
 msgstr "Abrir..."
 
-#: src/x_fileselect.c:237
+#: ../src/x_fileselect.c:238
 #, fuzzy
 msgid "Save as..."
 msgstr "Salvar Como..."
 
-#: src/x_image.c:180
+#: ../src/x_fileselect.c:286
+#, c-format
+msgid ""
+"The selected file `%s' already exists.\n"
+"\n"
+"Would you like to overwrite it?"
+msgstr ""
+
+#: ../src/x_fileselect.c:289
+#, fuzzy
+msgid "Overwrite file?"
+msgstr "Novo arquivo"
+
+#: ../src/x_fileselect.c:291
+msgid "Save cancelled on user request\n"
+msgstr ""
+
+#. WK - catch EPS export case
+#: ../src/x_image.c:181
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: src/x_image.c:298
+#: ../src/x_image.c:304
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr ""
 
-#: src/x_image.c:379
+#: ../src/x_image.c:385
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr ""
 
-#: src/x_image.c:389
+#: ../src/x_image.c:395
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -1941,319 +1973,330 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: src/x_image.c:408
+#: ../src/x_image.c:414
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Salva imagem colorida [%s] [%d x %d]\n"
 
-#: src/x_image.c:410
+#: ../src/x_image.c:416
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Salva imagem em Preto e branco [%s] [%d x %d]\n"
 
-#: src/x_image.c:420
+#: ../src/x_image.c:426
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 
-#: src/x_image.c:466
+#: ../src/x_image.c:472
 #, fuzzy
 msgid "Width x Height"
 msgstr "Largura x Altura"
 
-#: src/x_image.c:482
+#: ../src/x_image.c:488
 msgid "Image type"
 msgstr ""
 
-#: src/x_log.c:236
+#: ../src/x_log.c:252
 msgid "Status"
 msgstr "Status"
 
-#: src/x_menus.c:41
+#: ../src/x_menus.c:42
 msgid "/Add Net"
 msgstr "/Inserir Net"
 
-#: src/x_menus.c:42
+#: ../src/x_menus.c:43
 msgid "/Add Attribute..."
 msgstr "/Inserir Atributo..."
 
-#: src/x_menus.c:43
+#: ../src/x_menus.c:44
 msgid "/Add Component..."
 msgstr "/Inserir Componente..."
 
-#: src/x_menus.c:44
+#: ../src/x_menus.c:45
 msgid "/Add Bus"
 msgstr "/Inserir Bus"
 
-#: src/x_menus.c:45
+#: ../src/x_menus.c:46
 msgid "/Add Text"
 msgstr "/Inserir Texto"
 
-#: src/x_menus.c:47
+#: ../src/x_menus.c:48
 msgid "/Zoom In"
 msgstr "/Zoom maior"
 
-#: src/x_menus.c:48
+#: ../src/x_menus.c:49
 msgid "/Zoom Out"
 msgstr "/Zoom menor"
 
-#: src/x_menus.c:49
+#: ../src/x_menus.c:50
 msgid "/Zoom Box"
 msgstr "/Caixa de Zoom"
 
-#: src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Zoom Extents"
 msgstr "/Zoom desenho"
 
-#: src/x_menus.c:52
+#: ../src/x_menus.c:53
 msgid "/Select"
 msgstr "/Selecionar"
 
-#: src/x_menus.c:53
+#: ../src/x_menus.c:54
 msgid "/Edit..."
 msgstr "/Editar..."
 
-#: src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Copy"
 msgstr "/Copiar"
 
-#: src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Move"
 msgstr "/Mover"
 
-#: src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Delete"
 msgstr "/Apagar"
 
-#: src/x_menus.c:59
+#: ../src/x_menus.c:60
 msgid "/Down Schematic"
 msgstr "/Descer ao Esquemático"
 
-#: src/x_menus.c:60
+#: ../src/x_menus.c:61
 msgid "/Down Symbol"
 msgstr "/Descer ao Símbolo"
 
-#: src/x_menus.c:61
+#: ../src/x_menus.c:62
 msgid "/Up"
 msgstr "/Subir"
 
-#: src/x_menus.c:332
-msgid "Tried to set the sensitivity on a non-existent menu item\n"
+#: ../src/x_menus.c:333
+#, c-format
+msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 
-#: src/x_menus.c:356
+#: ../src/x_menus.c:357
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr ""
 
-#: src/x_menus.c:369
+#: ../src/x_menus.c:370
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 
-#: src/x_menus.c:482
+#. Remove this entry from all menus
+#: ../src/x_menus.c:482
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Impossível invocar %s!\n"
 
-#: src/x_menus.c:542
+#: ../src/x_menus.c:543
 #, fuzzy
 msgid "Clear"
 msgstr "Fechar"
 
-#: src/x_multiattrib.c:718
+#: ../src/x_multiattrib.c:708
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Atributos com nome vazio não permitidos. Defina um nome."
 
-#: src/x_multiattrib.c:1228
+#: ../src/x_multiattrib.c:1218
 msgid "Show Value only"
 msgstr "Mostra apenas Valor"
 
-#: src/x_multiattrib.c:1230
+#: ../src/x_multiattrib.c:1220
 msgid "Show Name only"
 msgstr "Mostra apenas Nome"
 
-#: src/x_multiattrib.c:1257
+#: ../src/x_multiattrib.c:1247
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: src/x_multiattrib.c:1534
+#: ../src/x_multiattrib.c:1524
 msgid "Edit Attributes"
 msgstr "Editar Atributos"
 
-#: src/x_multiattrib.c:1632
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1622
 msgid "Value"
 msgstr "Valor"
 
-#: src/x_multiattrib.c:1654
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1644
 msgid "Vis?"
 msgstr "Vis?"
 
-#: src/x_multiattrib.c:1674
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1664
 msgid "N"
 msgstr "N"
 
-#: src/x_multiattrib.c:1694
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1684
 msgid "V"
 msgstr "V"
 
-#: src/x_multiattrib.c:1715
+#: ../src/x_multiattrib.c:1705
 msgid "Add Attribute"
 msgstr "Inserir Atributo"
 
-#: src/x_pagesel.c:263
+#: ../src/x_pagesel.c:264
 msgid "Discard Page"
 msgstr "Descartar"
 
-#: src/x_pagesel.c:382
+#: ../src/x_pagesel.c:383
 msgid "Page Manager"
 msgstr "Gerenciador de Páginas"
 
-#: src/x_pagesel.c:438
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:439
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: src/x_pagesel.c:454
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:455
 msgid "Changed"
 msgstr "Alterado"
 
-#: src/x_pagesel.c:474
+#. GtkLabel
+#: ../src/x_pagesel.c:475
 msgid "Right click on the filename for more options..."
 msgstr "Clique direito no arquivo para opções..."
 
-#: src/x_print.c:89
+#: ../src/x_print.c:90
 #, fuzzy
 msgid "Select PostScript Filename..."
 msgstr "Salvar Como..."
 
-#: src/x_print.c:171
+#: ../src/x_print.c:172
 msgid "Extents with margins"
 msgstr "Extensão com margens"
 
-#: src/x_print.c:177
+#: ../src/x_print.c:178
 msgid "Extents no margins"
 msgstr "Extensão sem margens"
 
-#: src/x_print.c:183
+#: ../src/x_print.c:184
 msgid "Current Window"
 msgstr "Janela Atual"
 
-#: src/x_print.c:217
+#: ../src/x_print.c:218
 msgid "Landscape"
 msgstr "Paisagem"
 
-#: src/x_print.c:223
+#: ../src/x_print.c:224
 msgid "Portrait"
 msgstr "Retrato"
 
-#: src/x_print.c:291
+#. Upper frame
+#: ../src/x_print.c:292
 msgid "Settings"
 msgstr ""
 
-#: src/x_print.c:303
+#: ../src/x_print.c:304
 #, fuzzy
 msgid "Output paper size:"
 msgstr "Tamanho do papel"
 
-#: src/x_print.c:325
+#: ../src/x_print.c:326
 #, fuzzy
 msgid "Orientation:"
 msgstr "Orientação"
 
-#: src/x_print.c:337
+#. Lower frame
+#: ../src/x_print.c:338
 #, fuzzy
 msgid "Destination"
 msgstr "Documentação"
 
-#: src/x_print.c:350
+#: ../src/x_print.c:351
 #, fuzzy
 msgid "File:"
 msgstr "Arquivo"
 
-#: src/x_print.c:380
+#: ../src/x_print.c:381
 msgid "Command:"
 msgstr ""
 
-#: src/x_print.c:750
+#: ../src/x_print.c:751
 msgid "No print destination specified\n"
 msgstr ""
 
-#: src/x_print.c:757
+#: ../src/x_print.c:758
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Não consigo imprimir para arquivo [%s]\n"
 
-#: src/x_print.c:766
+#: ../src/x_print.c:767
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
 "Check the log window for more information"
 msgstr ""
 
-#: src/x_print.c:773
+#: ../src/x_print.c:774
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Diagrama atual impresso para [%s]\n"
 
-#: src/x_window.c:176
+#: ../src/x_window.c:86
 msgid "black"
 msgstr "preta"
 
-#: src/x_window.c:185
+#: ../src/x_window.c:95
 msgid "white"
 msgstr "branca"
 
-#: src/x_window.c:219
+#: ../src/x_window.c:129
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr ""
 
-#: src/x_window.c:232
+#: ../src/x_window.c:142
 #, c-format
 msgid "Couldn't allocate xor_gc\n"
 msgstr ""
 
-#: src/x_window.c:245
+#: ../src/x_window.c:155
 #, c-format
 msgid "Couldn't allocate outline_xor_gc\n"
 msgstr ""
 
-#: src/x_window.c:261
+#: ../src/x_window.c:171
 #, c-format
 msgid "Couldn't allocate bounding_xor_gc\n"
 msgstr ""
 
-#: src/x_window.c:268
+#: ../src/x_window.c:178
 #, c-format
 msgid "Couldn't allocate bus_gc\n"
 msgstr ""
 
-#: src/x_window.c:490
+#: ../src/x_window.c:402
 msgid "New file"
 msgstr "Novo arquivo"
 
-#: src/x_window.c:496
+#: ../src/x_window.c:408
 msgid "Open"
 msgstr "Abrir"
 
-#: src/x_window.c:497
+#: ../src/x_window.c:409
 msgid "Open file..."
 msgstr "Abrir arquivo..."
 
-#: src/x_window.c:503
+#: ../src/x_window.c:415
 msgid "Save"
 msgstr "Salvar"
 
-#: src/x_window.c:504
+#: ../src/x_window.c:416
 msgid "Save file"
 msgstr "Salvar arquivo"
 
-#: src/x_window.c:512
+#: ../src/x_window.c:424
 msgid "Undo last operation"
 msgstr "Desfazer última operação"
 
-#: src/x_window.c:519
+#: ../src/x_window.c:431
 msgid "Redo last undo"
 msgstr "Refaz o último Desfaz"
 
-#: src/x_window.c:528
+#: ../src/x_window.c:440
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2265,7 +2308,7 @@ msgstr ""
 "para colocar o componente\n"
 "Botão Direito para cancelar"
 
-#: src/x_window.c:538
+#: ../src/x_window.c:450
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2273,7 +2316,7 @@ msgstr ""
 "Modo de conexões\n"
 "Botão Direito para cancelar"
 
-#: src/x_window.c:548
+#: ../src/x_window.c:460
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2281,76 +2324,108 @@ msgstr ""
 "Modo de Barramentos\n"
 "Botão Direito do mouse para cancelar"
 
-#: src/x_window.c:555
+#: ../src/x_window.c:467
 msgid "Text"
 msgstr "Texto"
 
-#: src/x_window.c:556
+#: ../src/x_window.c:468
 msgid "Add Text..."
 msgstr "Adicionar Texto..."
 
-#: src/x_window.c:566
+#: ../src/x_window.c:478
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/x_window.c:567
+#: ../src/x_window.c:479
 msgid "Select mode"
 msgstr "Modo de Seleção"
 
-#: src/x_window.c:642
+#: ../src/x_window.c:554
 msgid "Pick"
 msgstr "Pegar"
 
-#: src/x_window.c:658
+#: ../src/x_window.c:570
 msgid "Repeat/none"
 msgstr "Repetir/nenhum"
 
-#: src/x_window.c:668
+#: ../src/x_window.c:580
 msgid "Menu/Cancel"
 msgstr "Menu/Cancelar"
 
-#: src/x_window.c:670
+#: ../src/x_window.c:582
 msgid "Pan/Cancel"
 msgstr "Pan/Cancelar"
 
-#: src/x_window.c:926
+#: ../src/x_window.c:809
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Carregando o diagrama [%s]\n"
 
-#: src/x_window.c:1028
+#: ../src/x_window.c:821
+#, fuzzy
+msgid "Failed to load file"
+msgstr "Falhou ao ler imagem: %s"
+
+#: ../src/x_window.c:830
+#, fuzzy, c-format
+msgid "New file [%s]\n"
+msgstr "Novo arquivo"
+
+#. an error occured when saving page to file
+#: ../src/x_window.c:936
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "N�O foi possível salvar [%s] !\n"
 
-#: src/x_window.c:1029
+#: ../src/x_window.c:937
 msgid "Error while trying to save"
 msgstr "Erro tentando salvar"
 
-#: src/x_window.c:1038
+#: ../src/x_window.c:946
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "Salvo Como [%s]\n"
 
-#: src/x_window.c:1040
+#: ../src/x_window.c:948
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Salvo [%s]\n"
 
-#: src/x_window.c:1042
+#: ../src/x_window.c:950
 msgid "Saved"
 msgstr "Salvo"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Descartando página [%s]\n"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Fechando [%s]\n"
 
+#: ../data/geda-gschem.desktop.in.h:1
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
+#: ../data/geda-gschem.desktop.in.h:2
+#, fuzzy
+msgid "gEDA Schematic Editor"
+msgstr "Descer ao Esquemático"
+
+#~ msgid "Attribute Mode"
+#~ msgstr "Modo de Atributo"
+
+#~ msgid "ERROR! you can't get an attribute without an ='s\n"
+#~ msgstr "ERRO! Você não tem atributo sem um sinal = (igual)\n"
+
+#~ msgid "ERROR: NULL object in o_rotate_90!\n"
+#~ msgstr "ERRO: NENHUM objeto na rotação 90!\n"
+
+#~ msgid "ERROR: NULL object in o_mirror!\n"
+#~ msgstr "ERRO: NENHUM objeto ao espelhar!\n"
+
 #~ msgid "Invalid mode [%s] passed to %s\n"
 #~ msgstr "Modo [%s] inválido passado para %s\n"
 
diff --git a/gschem/po/ru.po b/gschem/po/ru.po
index 5b019e4..fcdd773 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: 2007-09-02 21:10-0400\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2006-09-13 16:59+0300\n"
 "Last-Translator: Andy Shevchenko <andy@xxxxxxxxxxxx>\n"
 "Language-Team: Russian <ru@xxxxxx>\n"
@@ -18,597 +18,606 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/rcstrings.c:2
+#: ../src/rcstrings.c:2
 msgid "File"
 msgstr "Файл"
 
-#: src/rcstrings.c:3
+#: ../src/rcstrings.c:3
 msgid "New Window"
 msgstr "Ð?овое окно"
 
-#: src/rcstrings.c:4 src/x_pagesel.c:258
+#: ../src/rcstrings.c:4 ../src/x_pagesel.c:259
 msgid "New Page"
 msgstr "Ð?оваÑ? Ñ?Ñ?Ñ?аниÑ?а"
 
-#: src/rcstrings.c:5 src/x_pagesel.c:259
+#: ../src/rcstrings.c:5 ../src/x_pagesel.c:260
 msgid "Open Page..."
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?..."
 
-#: src/rcstrings.c:6 src/x_pagesel.c:262
+#: ../src/rcstrings.c:6 ../src/x_pagesel.c:263
 msgid "Close Page"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: src/rcstrings.c:7
+#: ../src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Ð?озвÑ?аÑ?иÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: src/rcstrings.c:8 src/x_pagesel.c:261
+#: ../src/rcstrings.c:8 ../src/x_pagesel.c:262
 msgid "Save Page"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: src/rcstrings.c:9
+#: ../src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ? как..."
 
-#: src/rcstrings.c:10
+#: ../src/rcstrings.c:10
 msgid "Save All"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?е"
 
-#: src/rcstrings.c:11 src/x_print.c:283
+#. GtkWindow
+#: ../src/rcstrings.c:11 ../src/x_print.c:284
 msgid "Print..."
 msgstr "Ð?еÑ?аÑ?Ñ?..."
 
-#: src/rcstrings.c:12 src/x_image.c:503
+#. Create the dialog
+#: ../src/rcstrings.c:12 ../src/x_image.c:509
 #, fuzzy
 msgid "Write image..."
 msgstr "Ð?апиÑ?аÑ?Ñ? изобÑ?ажение..."
 
-#: src/rcstrings.c:13 src/x_menus.c:524
+#: ../src/rcstrings.c:13 ../src/x_menus.c:525
 #, fuzzy
 msgid "Recent files"
 msgstr "Ð?овÑ?й Ñ?айл"
 
-#: src/rcstrings.c:14 src/x_script.c:50
+#: ../src/rcstrings.c:14 ../src/x_script.c:51
 msgid "Execute Script..."
 msgstr "Ð?Ñ?полниÑ?Ñ? Ñ?кÑ?ипÑ?..."
 
-#: src/rcstrings.c:15
+#: ../src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ? окно"
 
-#: src/rcstrings.c:16
+#: ../src/rcstrings.c:16
 msgid "Quit"
 msgstr "Ð?Ñ?йÑ?и"
 
-#: src/rcstrings.c:18 src/i_callbacks.c:730
+#: ../src/rcstrings.c:18 ../src/i_callbacks.c:732
 msgid "Edit"
 msgstr "Ð?Ñ?авка"
 
-#: src/rcstrings.c:19 src/x_window.c:511
+#: ../src/rcstrings.c:19 ../src/x_window.c:423
 msgid "Undo"
 msgstr "Ð?Ñ?мениÑ?Ñ? дейÑ?Ñ?вие"
 
-#: src/rcstrings.c:20 src/x_window.c:518
+#: ../src/rcstrings.c:20 ../src/x_window.c:430
 msgid "Redo"
 msgstr "Ð?овÑ?оÑ?иÑ?Ñ? дейÑ?Ñ?вие"
 
-#: src/rcstrings.c:21 src/i_basic.c:81 src/x_window.c:682
+#: ../src/rcstrings.c:21 ../src/i_basic.c:81 ../src/x_window.c:594
 msgid "Select Mode"
 msgstr "Режим вÑ?боÑ?ки"
 
-#: src/rcstrings.c:22
+#: ../src/rcstrings.c:22
 #, fuzzy
 msgid "Cut Buffer"
 msgstr "Ð?Ñ?Ñ?еÑ?"
 
-#: src/rcstrings.c:23
+#: ../src/rcstrings.c:23
 #, fuzzy
 msgid "Copy Buffer"
 msgstr "Ð?Ñ?Ñ?еÑ?"
 
-#: src/rcstrings.c:24
+#: ../src/rcstrings.c:24
 #, fuzzy
 msgid "Paste Buffer"
 msgstr "Ð?Ñ?Ñ?еÑ?"
 
-#: src/rcstrings.c:25
+#: ../src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Ð?Ñ?авка..."
 
-#: src/rcstrings.c:26
+#: ../src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Ð?Ñ?авка Ñ?екÑ?Ñ?а..."
 
-#: src/rcstrings.c:27 src/i_basic.c:94
+#: ../src/rcstrings.c:27 ../src/i_basic.c:91
 msgid "Copy Mode"
 msgstr "Режим копиÑ?ованиÑ?"
 
-#: src/rcstrings.c:28 src/i_basic.c:149
+#: ../src/rcstrings.c:28 ../src/i_basic.c:146
 msgid "Multiple Copy Mode"
 msgstr "Режим множеÑ?Ñ?венного копиÑ?ованиÑ?"
 
-#: src/rcstrings.c:29 src/i_basic.c:97
+#: ../src/rcstrings.c:29 ../src/i_basic.c:94
 msgid "Move Mode"
 msgstr "Режим пеÑ?емеÑ?ениÑ?"
 
-#: src/rcstrings.c:30 src/i_callbacks.c:706 src/x_multiattrib.c:1258
+#: ../src/rcstrings.c:30 ../src/i_callbacks.c:708 ../src/x_multiattrib.c:1248
 msgid "Delete"
 msgstr "УдалиÑ?Ñ?"
 
-#: src/rcstrings.c:31
+#: ../src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Режим вÑ?аÑ?ениÑ? на 90"
 
-#: src/rcstrings.c:32 src/i_basic.c:101
+#: ../src/rcstrings.c:32 ../src/i_basic.c:98
 msgid "Mirror Mode"
 msgstr "Режим зеÑ?калиÑ?ованиÑ?"
 
-#: src/rcstrings.c:33
+#: ../src/rcstrings.c:33
 msgid "Slot..."
 msgstr "СлоÑ?..."
 
-#: src/rcstrings.c:34
+#: ../src/rcstrings.c:34
 msgid "Color..."
 msgstr "ЦвеÑ?..."
 
-#: src/rcstrings.c:35 src/i_callbacks.c:952
+#: ../src/rcstrings.c:35 ../src/i_callbacks.c:952
 msgid "Lock"
 msgstr "Ð?локиÑ?оваÑ?Ñ?"
 
-#: src/rcstrings.c:36 src/i_callbacks.c:970
+#: ../src/rcstrings.c:36 ../src/i_callbacks.c:970
 msgid "Unlock"
 msgstr "РазблокиÑ?оваÑ?Ñ?"
 
-#: src/rcstrings.c:37
+#: ../src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Тип и Ñ?иÑ?ина линии..."
 
-#: src/rcstrings.c:38
+#: ../src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Тип заливки..."
 
-#: src/rcstrings.c:39
+#: ../src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Ð?еÑ?евод Ñ?имвола..."
 
-#: src/rcstrings.c:40
+#: ../src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Ð?недÑ?иÑ?Ñ? компоненÑ?/изобÑ?ажение"
 
-#: src/rcstrings.c:41
+#: ../src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? компоненÑ?/изобÑ?ажение"
 
-#: src/rcstrings.c:42
+#: ../src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Ð?бновиÑ?Ñ? компоненÑ?"
 
-#: src/rcstrings.c:43
+#: ../src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Ð?оказаÑ?Ñ?/СкÑ?Ñ?Ñ?Ñ? невидимÑ?й Ñ?екÑ?Ñ?"
 
-#: src/rcstrings.c:44
+#: ../src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "СделаÑ?Ñ? невидимÑ?й Ñ?екÑ?Ñ? видимÑ?м"
 
-#: src/rcstrings.c:46
+#: ../src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Ð?Ñ?Ñ?еÑ?"
 
-#: src/rcstrings.c:47
+#: ../src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 1"
 
-#: src/rcstrings.c:48
+#: ../src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 2"
 
-#: src/rcstrings.c:49
+#: ../src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 3"
 
-#: src/rcstrings.c:50
+#: ../src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 4"
 
-#: src/rcstrings.c:51
+#: ../src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 5"
 
-#: src/rcstrings.c:52
+#: ../src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 1"
 
-#: src/rcstrings.c:53
+#: ../src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 2"
 
-#: src/rcstrings.c:54
+#: ../src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 3"
 
-#: src/rcstrings.c:55
+#: ../src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 4"
 
-#: src/rcstrings.c:56
+#: ../src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 5"
 
-#: src/rcstrings.c:57
+#: ../src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 1"
 
-#: src/rcstrings.c:58
+#: ../src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 2"
 
-#: src/rcstrings.c:59
+#: ../src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 3"
 
-#: src/rcstrings.c:60
+#: ../src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 4"
 
-#: src/rcstrings.c:61
+#: ../src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 5"
 
-#: src/rcstrings.c:63
+#: ../src/rcstrings.c:63
 msgid "View"
 msgstr "Ð?ид"
 
-#: src/rcstrings.c:64
+#: ../src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Ð?еÑ?еÑ?иÑ?оваÑ?Ñ?"
 
-#: src/rcstrings.c:65 src/i_callbacks.c:1537 src/i_callbacks.c:1606
+#. I don't know if this would get in the way
+#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1542 ../src/i_callbacks.c:1611
 msgid "Pan"
 msgstr "ЦенÑ?Ñ?иÑ?оваÑ?Ñ?"
 
-#: src/rcstrings.c:66 src/i_basic.c:105
+#: ../src/rcstrings.c:66 ../src/i_basic.c:102
 msgid "Zoom Box"
 msgstr "Ð?блаÑ?Ñ?Ñ? длÑ? маÑ?Ñ?Ñ?абиÑ?ованиÑ?"
 
-#: src/rcstrings.c:67
+#: ../src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Ð?аÑ?Ñ?Ñ?аб на Ñ?кÑ?ан"
 
-#: src/rcstrings.c:68
+#: ../src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "УвелиÑ?иÑ?Ñ?"
 
-#: src/rcstrings.c:69
+#: ../src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "УменÑ?Ñ?иÑ?Ñ?"
 
-#: src/rcstrings.c:70
+#: ../src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Ð? наÑ?Ñ?Ñ?алÑ?нÑ?Ñ? велиÑ?инÑ?"
 
-#: src/rcstrings.c:72
+#: ../src/rcstrings.c:72
 msgid "Page"
 msgstr "СÑ?Ñ?аниÑ?а"
 
-#: src/rcstrings.c:73
+#: ../src/rcstrings.c:73
 msgid "Manager..."
 msgstr "Ð?енеджеÑ?..."
 
-#: src/rcstrings.c:74
+#: ../src/rcstrings.c:74
 msgid "Next"
 msgstr "СледÑ?Ñ?Ñ?аÑ?"
 
-#: src/rcstrings.c:75
+#: ../src/rcstrings.c:75
 msgid "Previous"
 msgstr "Ð?Ñ?едÑ?дÑ?Ñ?аÑ?"
 
-#: src/rcstrings.c:76 src/x_window.c:489
+#: ../src/rcstrings.c:76 ../src/x_window.c:401
 msgid "New"
 msgstr "Ð?оваÑ?"
 
-#: src/rcstrings.c:77
+#: ../src/rcstrings.c:77
 msgid "Revert"
 msgstr "Ð?озвÑ?аÑ?иÑ?Ñ?"
 
-#: src/rcstrings.c:78
+#: ../src/rcstrings.c:78
 msgid "Close"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ?"
 
-#: src/rcstrings.c:79
+#: ../src/rcstrings.c:79
 msgid "Discard"
 msgstr "Ð?Ñ?веÑ?гнÑ?Ñ?Ñ?"
 
-#: src/rcstrings.c:81
+#: ../src/rcstrings.c:81
 msgid "Add"
 msgstr "Ð?обавиÑ?Ñ?"
 
-#: src/rcstrings.c:82
+#: ../src/rcstrings.c:82
 msgid "Component..."
 msgstr "Ð?омпоненÑ?..."
 
-#: src/rcstrings.c:83 src/i_callbacks.c:2358 src/i_callbacks.c:2380
+#. need to click
+#: ../src/rcstrings.c:83 ../src/i_callbacks.c:2340 ../src/i_callbacks.c:2362
 msgid "Net"
 msgstr "Ð?Ñ?оводник"
 
-#: src/rcstrings.c:84 src/i_callbacks.c:2424 src/i_callbacks.c:2447
-#: src/x_window.c:547
+#. need to click
+#: ../src/rcstrings.c:84 ../src/i_callbacks.c:2406 ../src/i_callbacks.c:2429
+#: ../src/x_window.c:459
 msgid "Bus"
 msgstr "Шина"
 
-#: src/rcstrings.c:85
+#: ../src/rcstrings.c:85
 msgid "Attribute..."
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?..."
 
-#: src/rcstrings.c:86
+#: ../src/rcstrings.c:86
 msgid "Text..."
 msgstr "ТекÑ?Ñ?..."
 
-#: src/rcstrings.c:87 src/i_callbacks.c:2528 src/i_callbacks.c:2547
+#: ../src/rcstrings.c:87 ../src/i_callbacks.c:2510 ../src/i_callbacks.c:2529
 msgid "Line"
 msgstr "Ð?иниÑ?"
 
-#: src/rcstrings.c:88 src/i_callbacks.c:2569 src/i_callbacks.c:2588
+#: ../src/rcstrings.c:88 ../src/i_callbacks.c:2551 ../src/i_callbacks.c:2570
 msgid "Box"
 msgstr "Ð?Ñ?Ñ?моÑ?голÑ?ник"
 
-#: src/rcstrings.c:89 src/i_callbacks.c:2644 src/i_callbacks.c:2664
+#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2626 ../src/i_callbacks.c:2646
 msgid "Circle"
 msgstr "Ð?кÑ?Ñ?жноÑ?Ñ?Ñ?"
 
-#: src/rcstrings.c:90 src/i_callbacks.c:2686 src/i_callbacks.c:2705
+#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2668 ../src/i_callbacks.c:2687
 msgid "Arc"
 msgstr "Ð?Ñ?га"
 
-#: src/rcstrings.c:91 src/i_callbacks.c:2727 src/i_callbacks.c:2746
+#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2709 ../src/i_callbacks.c:2728
 msgid "Pin"
 msgstr "Ð?онÑ?акÑ?"
 
-#: src/rcstrings.c:92
+#: ../src/rcstrings.c:92
 msgid "Picture..."
 msgstr "Ð?зобÑ?ажение..."
 
-#: src/rcstrings.c:94
+#: ../src/rcstrings.c:94
 msgid "Hierarchy"
 msgstr "Ð?еÑ?аÑ?Ñ?иÑ?"
 
-#: src/rcstrings.c:95
+#: ../src/rcstrings.c:95
 msgid "Down Schematic"
 msgstr "Ð?глÑ?бÑ? Ñ?Ñ?емÑ?"
 
-#: src/rcstrings.c:96
+#: ../src/rcstrings.c:96
 msgid "Down Symbol"
 msgstr "Ð?глÑ?бÑ? Ñ?имвола"
 
-#: src/rcstrings.c:97
+#: ../src/rcstrings.c:97
 msgid "Up"
 msgstr "Ð?авеÑ?Ñ?"
 
-#: src/rcstrings.c:98
+#: ../src/rcstrings.c:98
 msgid "Documentation"
 msgstr "Ð?окÑ?менÑ?аÑ?иÑ?"
 
-#: src/rcstrings.c:100 src/x_multiattrib.c:1549
+#. GtkFrame
+#: ../src/rcstrings.c:100 ../src/x_multiattrib.c:1539
 msgid "Attributes"
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: src/rcstrings.c:101 src/i_callbacks.c:3011
+#: ../src/rcstrings.c:101 ../src/i_callbacks.c:2993
 msgid "Attach"
 msgstr "Ð?Ñ?иÑ?епиÑ?Ñ?"
 
-#: src/rcstrings.c:102 src/i_callbacks.c:3060
+#: ../src/rcstrings.c:102 ../src/i_callbacks.c:3042
 msgid "Detach"
 msgstr "Ð?Ñ?Ñ?епиÑ?Ñ?"
 
-#: src/rcstrings.c:103
+#: ../src/rcstrings.c:103
 msgid "Show Value"
 msgstr "Ð?оказаÑ?Ñ? знаÑ?ение"
 
-#: src/rcstrings.c:104
+#: ../src/rcstrings.c:104
 msgid "Show Name"
 msgstr "Ð?оказаÑ?Ñ? имÑ?"
 
-#: src/rcstrings.c:105
+#: ../src/rcstrings.c:105
 msgid "Show Both"
 msgstr "Ð?оказаÑ?Ñ? оба паÑ?амеÑ?Ñ?а"
 
-#: src/rcstrings.c:106
+#: ../src/rcstrings.c:106
 msgid "Toggle Visibility"
 msgstr "Ð?еÑ?еклÑ?Ñ?ение видимоÑ?Ñ?и"
 
-#: src/rcstrings.c:107
+#: ../src/rcstrings.c:107
 msgid "Find Specific Text..."
 msgstr "Ð?айÑ?и опÑ?еделеннÑ?й Ñ?екÑ?Ñ?..."
 
-#: src/rcstrings.c:108
+#: ../src/rcstrings.c:108
 msgid "Hide Specific Text..."
 msgstr "СкÑ?Ñ?Ñ?Ñ? опÑ?еделеннÑ?й Ñ?екÑ?Ñ?..."
 
-#: src/rcstrings.c:109
+#: ../src/rcstrings.c:109
 msgid "Show Specific Text..."
 msgstr "Ð?оказаÑ?Ñ? опÑ?еделеннÑ?й Ñ?екÑ?Ñ?..."
 
-#: src/rcstrings.c:110
+#: ../src/rcstrings.c:110
 msgid "Autonumber Text..."
 msgstr "Ð?вÑ?онÑ?меÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?..."
 
-#: src/rcstrings.c:112
+#: ../src/rcstrings.c:112
 msgid "Options"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: src/rcstrings.c:113
+#: ../src/rcstrings.c:113
 msgid "Text Size..."
 msgstr "РазмеÑ? Ñ?екÑ?Ñ?а..."
 
-#: src/rcstrings.c:114
+#: ../src/rcstrings.c:114
 msgid "Toggle Grid On/Off"
 msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? оÑ?обÑ?ажение Ñ?еÑ?ки"
 
-#: src/rcstrings.c:115
+#: ../src/rcstrings.c:115
 msgid "Toggle Snap On/Off"
 msgstr "Ð?еÑ?еклÑ?Ñ?ение пÑ?ивÑ?зки"
 
-#: src/rcstrings.c:116
+#: ../src/rcstrings.c:116
 msgid "Snap Grid Spacing..."
 msgstr "Шаг Ñ?еÑ?ки пÑ?ивÑ?зки..."
 
-#: src/rcstrings.c:117
+#: ../src/rcstrings.c:117
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Шаг Ñ?еÑ?ки пÑ?ивÑ?зки..."
 
-#: src/rcstrings.c:118
+#: ../src/rcstrings.c:118
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Шаг Ñ?еÑ?ки пÑ?ивÑ?зки..."
 
-#: src/rcstrings.c:119
+#: ../src/rcstrings.c:119
 msgid "Toggle Outline/Box"
 msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? внеÑ?ний конÑ?Ñ?Ñ?/бокÑ?"
 
-#: src/rcstrings.c:120
+#: ../src/rcstrings.c:120
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: src/rcstrings.c:121
+#: ../src/rcstrings.c:121
 msgid "Show Log Window..."
 msgstr "Ð?оказаÑ?Ñ? окно пÑ?оÑ?окола"
 
-#: src/rcstrings.c:122
+#: ../src/rcstrings.c:122
 msgid "Show Coord Window..."
 msgstr "Ð?оказаÑ?Ñ? окно кооÑ?динаÑ?"
 
-#: src/rcstrings.c:124
+#: ../src/rcstrings.c:124
 msgid "Help"
 msgstr "Ð?омоÑ?Ñ?"
 
-#: src/rcstrings.c:125
+#: ../src/rcstrings.c:125
 #, fuzzy
 msgid "Manual"
 msgstr "РÑ?ководÑ?Ñ?во..."
 
-#: src/rcstrings.c:126
+#: ../src/rcstrings.c:126
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "Ð?окÑ?менÑ?аÑ?иÑ?"
 
-#: src/rcstrings.c:127
+#: ../src/rcstrings.c:127
 msgid "gschem FAQ"
 msgstr ""
 
-#: src/rcstrings.c:128
+#: ../src/rcstrings.c:128
 #, fuzzy
 msgid "Component Documentation"
 msgstr "Ð?окÑ?менÑ?аÑ?иÑ?"
 
-#: src/rcstrings.c:129
+#: ../src/rcstrings.c:129
 msgid "About gschem"
 msgstr ""
 
-#: src/rcstrings.c:130 src/x_dialog.c:2517
+#: ../src/rcstrings.c:130 ../src/x_dialog.c:2517
 #, fuzzy
 msgid "Hotkeys"
 msgstr "Ð?оÑ?Ñ?Ñ?ие клавиÑ?и..."
 
-#: src/a_zoom.c:245
+#: ../src/a_zoom.c:250
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Ð?аÑ?Ñ?Ñ?аб оÑ?енÑ? мал! Ð?евозможно далÑ?нейÑ?ее изменение.\n"
 
-#: src/g_funcs.c:342 src/i_callbacks.c:137
+#. Fork failed. Still in parent process, so can use the log
+#. * window
+#: ../src/g_funcs.c:343 ../src/i_callbacks.c:138
 #, c-format
 msgid "Could not fork\n"
 msgstr "Ð?евозможно Ñ?азвеÑ?влиÑ?Ñ?Ñ?Ñ?\n"
 
-#: src/g_funcs.c:358 src/i_callbacks.c:147
+#. if we return, then nothing happened
+#: ../src/g_funcs.c:359 ../src/i_callbacks.c:148
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Ð?евозможно вÑ?зваÑ?Ñ? %s\n"
 
-#: src/g_funcs.c:364 src/i_callbacks.c:151
+#: ../src/g_funcs.c:365 ../src/i_callbacks.c:152
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Ð?омандÑ? докÑ?менÑ?аÑ?ии не поддеÑ?живаÑ?Ñ?Ñ?Ñ? в MinGW.\n"
 
-#: src/g_hook.c:88
+#: ../src/g_hook.c:87
 #, c-format
 msgid "Attribute failed ot find.\n"
 msgstr "Ð?Ñ?ибка поиÑ?ка аÑ?Ñ?ибÑ?Ñ?а.\n"
 
-#: src/g_rc.c:159
+#: ../src/g_rc.c:160
 #, c-format
 msgid "Invalid color [%s] passed to %s\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?веÑ? [%s] пÑ?и обÑ?абоÑ?ке %s\n"
 
-#: src/g_rc.c:433
+#: ../src/g_rc.c:434
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ð?евеÑ?нÑ?й маÑ?Ñ?Ñ?аб [%d] пÑ?и обÑ?абоÑ?ке %s\n"
 
-#: src/g_rc.c:524
+#: ../src/g_rc.c:525
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? [%d] пÑ?и обÑ?абоÑ?ке text-size\n"
 
-#: src/g_rc.c:551
+#: ../src/g_rc.c:552
 #, fuzzy, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? [%d] пÑ?и обÑ?абоÑ?ке text-size\n"
 
-#: src/g_rc.c:594
+#: ../src/g_rc.c:595
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? [%d] пÑ?и обÑ?абоÑ?ке snap-size\n"
 
-#: src/g_rc.c:1049
+#: ../src/g_rc.c:1050
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Ð?евеÑ?ное колиÑ?еÑ?Ñ?во Ñ?Ñ?овней [%d] пÑ?и обÑ?абоÑ?ке undo-levels\n"
 
-#: src/g_rc.c:1289
+#: ../src/g_rc.c:1290
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? [%d] пÑ?и обÑ?абоÑ?ке bus-ripper-size\n"
 
-#: src/g_rc.c:1364
+#: ../src/g_rc.c:1365
 #, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? Ñ?оÑ?ки [%d] пÑ?и обÑ?абоÑ?ке grid-dot-size\n"
 
-#: src/g_rc.c:1405
+#: ../src/g_rc.c:1406
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
 msgstr "Ð?евеÑ?нÑ?е оÑ?Ñ?Ñ?Ñ?пÑ? [%d] пÑ?и обÑ?абоÑ?ке grid-fixed-threshold\n"
 
-#: src/g_rc.c:1449
+#: ../src/g_rc.c:1450
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ð?евеÑ?ное Ñ?меÑ?ение [%d] пÑ?и обÑ?абоÑ?ке add-attribute-offset\n"
 
-#: src/g_rc.c:1473
+#: ../src/g_rc.c:1474
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Ð?евеÑ?ное Ñ?иÑ?ло Ñ?екÑ?нд [%d] пÑ?и обÑ?абоÑ?ке auto-save-interval\n"
 
-#: src/g_rc.c:1514
+#: ../src/g_rc.c:1515
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ð?евеÑ?ное Ñ?Ñ?коÑ?ение [%d] пÑ?и обÑ?абоÑ?ке mousepan-gain\n"
 
-#: src/g_rc.c:1537
+#: ../src/g_rc.c:1538
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ð?евеÑ?ное Ñ?Ñ?коÑ?ение [%d] пÑ?и обÑ?абоÑ?ке keyboardpan-gain\n"
 
-#: src/g_rc.c:1583
+#: ../src/g_rc.c:1584
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Ð?евеÑ?ное Ñ?иÑ?ло Ñ?екÑ?нд [%d] пÑ?и обÑ?абоÑ?ке auto-save-interval\n"
 
-#: src/gschem.c:192 src/gschem.c:203
+#: ../src/gschem.c:193 ../src/gschem.c:204
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "Ð?еÑ?Ñ?иÑ? gEDA/gschem %s%s.%s\n"
 
-#: src/gschem.c:195 src/gschem.c:206
+#: ../src/gschem.c:196 ../src/gschem.c:207
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -616,7 +625,7 @@ msgid ""
 msgstr ""
 "gEDA/gschem поÑ?Ñ?авлÑ?еÑ?Ñ?Ñ? Ð?Ð?Ð? Ð?Ð?РÐ?Ð?ТÐ?Ð?; Ñ?моÑ?Ñ?иÑ?е COPYING длÑ? подÑ?обноÑ?Ñ?ей.\n"
 
-#: src/gschem.c:197 src/gschem.c:208
+#: ../src/gschem.c:198 ../src/gschem.c:209
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -624,7 +633,7 @@ msgstr ""
 "ЭÑ?о Ñ?вободное пÑ?огÑ?аммное обеÑ?пеÑ?ение, и его можно Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?Ñ? пÑ?и "
 "извеÑ?Ñ?нÑ?Ñ?\n"
 
-#: src/gschem.c:199 src/gschem.c:210
+#: ../src/gschem.c:200 ../src/gschem.c:211
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -633,211 +642,209 @@ msgstr ""
 "Ñ?Ñ?ловиÑ?Ñ?; пожалÑ?йÑ?Ñ?а, Ñ?моÑ?Ñ?иÑ?е Ñ?айл COPYING длÑ? полÑ?Ñ?ениÑ? подÑ?обноÑ?Ñ?ей.\n"
 "\n"
 
-#: src/gschem.c:214
+#: ../src/gschem.c:215
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "ЭÑ?о MINGW32 веÑ?Ñ?иÑ?.\n"
 
-#: src/gschem.c:218
+#: ../src/gschem.c:219
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "ТекÑ?Ñ?ие Ñ?Ñ?Ñ?ановки локализаÑ?ии: %s\n"
 
-#: src/gschem.c:231
+#: ../src/gschem.c:232
 #, c-format
 msgid "You must set the GEDADATA environment variable!\n"
 msgstr "Ð?Ñ? должнÑ? Ñ?Ñ?Ñ?ановиÑ?Ñ? пеÑ?еменнÑ?Ñ? окÑ?Ñ?жениÑ? GEDADATA!\n"
 
-#: src/gschem.c:246
+#: ../src/gschem.c:248
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "ЧÑ?ение наÑ?алÑ?ного scm-Ñ?айла [%s]\n"
 
-#: src/gschem.c:250 src/gschem.c:253
+#. ! \todo These two messages are the same. Should be
+#. * integrated.
+#: ../src/gschem.c:252 ../src/gschem.c:255
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Ð?евозможно пÑ?оÑ?иÑ?аÑ?Ñ? наÑ?алÑ?нÑ?й scm-Ñ?айл [%s]\n"
 
-#: src/gschem.c:323
+#: ../src/gschem.c:323
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Ð?аÑ?алог Ñ?Ñ?ем Ð?Ð? Ñ?Ñ?Ñ?ановлен!\n"
 
-#: src/gschem.c:330 src/x_script.c:71
+#: ../src/gschem.c:330 ../src/x_script.c:72
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Ð?апÑ?Ñ?каеÑ?Ñ?Ñ? guile-Ñ?кÑ?ипÑ? [%s]\n"
 
-#: src/i_basic.c:84
-msgid "Attribute Mode"
-msgstr "Режим аÑ?Ñ?ибÑ?Ñ?ов"
-
-#: src/i_basic.c:87
+#: ../src/i_basic.c:84
 msgid "Component Mode"
 msgstr "Режим компоненÑ?ов"
 
-#: src/i_basic.c:91
+#: ../src/i_basic.c:88
 msgid "Text Mode"
 msgstr "Режим Ñ?екÑ?Ñ?а"
 
-#: src/i_basic.c:99
+#: ../src/i_basic.c:96
 msgid "Rotate Mode"
 msgstr "Режим вÑ?аÑ?ениÑ?"
 
-#: src/i_basic.c:109
+#: ../src/i_basic.c:106
 msgid "Pan Mode"
 msgstr "Режим Ñ?енÑ?Ñ?иÑ?ованиÑ?"
 
-#: src/i_basic.c:113
+#: ../src/i_basic.c:110
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Режим вÑ?Ñ?авки %d"
 
-#: src/i_basic.c:118
+#: ../src/i_basic.c:115
 msgid "Net Mode"
 msgstr "Режим пÑ?оводника"
 
-#: src/i_basic.c:122
+#: ../src/i_basic.c:119
 msgid "Bus Mode"
 msgstr "Режим Ñ?инÑ?"
 
-#: src/i_basic.c:125
+#: ../src/i_basic.c:122
 msgid "Line Mode"
 msgstr "Режим линии"
 
-#: src/i_basic.c:128
+#: ../src/i_basic.c:125
 msgid "Box Mode"
 msgstr "Режим пÑ?Ñ?моÑ?голÑ?ника"
 
-#: src/i_basic.c:131
+#: ../src/i_basic.c:128
 msgid "Picture Mode"
 msgstr "Режим изобÑ?ажениÑ?"
 
-#: src/i_basic.c:134
+#: ../src/i_basic.c:131
 msgid "Circle Mode"
 msgstr "Режим окÑ?Ñ?жноÑ?Ñ?и"
 
-#: src/i_basic.c:137
+#: ../src/i_basic.c:134
 msgid "Arc Mode"
 msgstr "Режим дÑ?ги"
 
-#: src/i_basic.c:140
+#: ../src/i_basic.c:137
 msgid "Pin Mode"
 msgstr "Режим конÑ?акÑ?ов"
 
-#: src/i_basic.c:142 src/i_callbacks.c:587 src/i_callbacks.c:606
+#: ../src/i_basic.c:139 ../src/i_callbacks.c:589 ../src/i_callbacks.c:608
 msgid "Copy"
 msgstr "Ð?опиÑ?оваÑ?Ñ?"
 
-#: src/i_basic.c:144 src/i_callbacks.c:667 src/i_callbacks.c:686
+#: ../src/i_basic.c:141 ../src/i_callbacks.c:669 ../src/i_callbacks.c:688
 msgid "Move"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ?"
 
-#: src/i_basic.c:146 src/i_callbacks.c:627 src/i_callbacks.c:646
+#: ../src/i_basic.c:143 ../src/i_callbacks.c:629 ../src/i_callbacks.c:648
 msgid "Multiple Copy"
 msgstr "Ð?ножеÑ?Ñ?венное копиÑ?ование"
 
-#: src/i_basic.c:174
+#: ../src/i_basic.c:172
 msgid "Show Hidden"
 msgstr "Ð?оказаÑ?Ñ? Ñ?кÑ?Ñ?Ñ?Ñ?е"
 
-#: src/i_basic.c:177
+#: ../src/i_basic.c:175
 msgid "Snap Off"
 msgstr "Ð?Ñ?ивÑ?зка вÑ?клÑ?Ñ?ена"
 
-#: src/i_basic.c:259 src/x_window.c:656
+#: ../src/i_basic.c:256 ../src/x_window.c:568
 msgid "Action"
 msgstr "Ð?ейÑ?Ñ?вие"
 
-#: src/i_basic.c:267 src/x_window.c:651
+#: ../src/i_basic.c:262 ../src/x_window.c:563
 msgid "Stroke"
 msgstr "ШÑ?Ñ?иÑ?"
 
-#: src/i_basic.c:274 src/x_window.c:653
+#: ../src/i_basic.c:268 ../src/x_window.c:565
 msgid "none"
 msgstr "пÑ?Ñ?Ñ?о"
 
-#: src/i_basic.c:281
+#: ../src/i_basic.c:273
 msgid "Repeat/"
 msgstr "Ð?овÑ?оÑ?иÑ?Ñ?/"
 
-#: src/i_basic.c:570 src/i_basic.c:575
+#: ../src/i_basic.c:538 ../src/i_basic.c:543
 msgid "OFF"
 msgstr ""
 
-#: src/i_basic.c:579
+#: ../src/i_basic.c:547
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
 
-#: src/i_callbacks.c:132
+#: ../src/i_callbacks.c:133
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Ð?окÑ?менÑ?аÑ?иÑ? длÑ? [%s, %s, %s, %s]\n"
 
-#: src/i_callbacks.c:192 src/i_callbacks.c:1738
+#: ../src/i_callbacks.c:193 ../src/i_callbacks.c:1754
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Создана новаÑ? Ñ?Ñ?Ñ?аниÑ?а [%s]\n"
 
-#: src/i_callbacks.c:227 src/x_menus.c:493
+#: ../src/i_callbacks.c:229 ../src/x_menus.c:494
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Создано новое окно\n"
 
-#: src/i_callbacks.c:345
+#: ../src/i_callbacks.c:347
 msgid "Failed to Save All"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?оÑ?Ñ?анении вÑ?его"
 
-#: src/i_callbacks.c:347
+#: ../src/i_callbacks.c:349
 msgid "Saved All"
 msgstr "Ð?Ñ?е Ñ?оÑ?Ñ?анено"
 
-#: src/i_callbacks.c:439
+#: ../src/i_callbacks.c:441
 msgid "Closing Window\n"
 msgstr "Ð?акÑ?Ñ?Ñ?ие окна\n"
 
-#: src/i_callbacks.c:591 src/i_callbacks.c:631 src/i_callbacks.c:671
+#: ../src/i_callbacks.c:593 ../src/i_callbacks.c:633 ../src/i_callbacks.c:673
 msgid "Select objs first"
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? вÑ?боÑ? обÑ?екÑ?ов"
 
-#: src/i_callbacks.c:746
+#: ../src/i_callbacks.c:748
 msgid "Edit Text"
 msgstr "Ð?Ñ?авка Ñ?екÑ?Ñ?а"
 
-#: src/i_callbacks.c:769
+#: ../src/i_callbacks.c:771
 msgid "Slot"
 msgstr "СлоÑ?"
 
-#: src/i_callbacks.c:786
+#: ../src/i_callbacks.c:788
 msgid "Color"
 msgstr "ЦвеÑ?"
 
-#: src/i_callbacks.c:828 src/i_callbacks.c:875
+#: ../src/i_callbacks.c:830 ../src/i_callbacks.c:877
 msgid "Rotate"
 msgstr "Ð?Ñ?аÑ?аÑ?Ñ?"
 
-#: src/i_callbacks.c:902 src/i_callbacks.c:924
+#: ../src/i_callbacks.c:904 ../src/i_callbacks.c:926
 msgid "Mirror"
 msgstr "Ð?еÑ?калиÑ?ование"
 
-#: src/i_callbacks.c:988 src/x_dialog.c:1604
+#: ../src/i_callbacks.c:988 ../src/x_dialog.c:1611
 msgid "Translate"
 msgstr "Ð?еÑ?евод"
 
-#: src/i_callbacks.c:991
+#: ../src/i_callbacks.c:991
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "Ð?Ñ?едÑ?пÑ?еждение: не пеÑ?еводиÑ?е c вÑ?клÑ?Ñ?енной пÑ?ивÑ?зкой!\n"
 
-#: src/i_callbacks.c:992
+#: ../src/i_callbacks.c:992
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "Ð?Ñ?едÑ?пÑ?еждение: Ð?клÑ?Ñ?иÑ?е пÑ?ивÑ?зкÑ? пÑ?одолжиÑ?е Ñ?Ñ?анÑ?лÑ?Ñ?иÑ?.\n"
 
-#: src/i_callbacks.c:999
+#: ../src/i_callbacks.c:999
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "Ð?Ñ?едÑ?пÑ?еждение: Ñ?азмеÑ? Ñ?еÑ?ки пÑ?ивÑ?зки не Ñ?авен 100!\n"
 
-#: src/i_callbacks.c:1001
+#: ../src/i_callbacks.c:1001
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -845,434 +852,413 @@ msgstr ""
 "Ð?Ñ?едÑ?пÑ?еждение: Ð?Ñ?ли оÑ?Ñ?Ñ?еÑ?Ñ?влÑ?еÑ?Ñ?Ñ? пеÑ?евод Ñ?имвола к наÑ?алÑ? оÑ?Ñ?Ñ?еÑ?а, Ñ?азмеÑ? "
 "Ñ?еÑ?ки пÑ?ивÑ?зки должен бÑ?Ñ?Ñ? Ñ?Ñ?Ñ?ановлен в 100\n"
 
-#: src/i_callbacks.c:1022
+#: ../src/i_callbacks.c:1022
 msgid "Embed"
 msgstr "Ð?недÑ?иÑ?Ñ?"
 
-#: src/i_callbacks.c:1060
+#: ../src/i_callbacks.c:1063
 msgid "Unembed"
 msgstr "Ð?Ñ?клÑ?Ñ?иÑ?Ñ?"
 
-#: src/i_callbacks.c:1100
+#: ../src/i_callbacks.c:1106
 msgid "Update"
 msgstr "Ð?бновиÑ?Ñ?"
 
-#: src/i_callbacks.c:1157
+#: ../src/i_callbacks.c:1163
 msgid "ShowHidden"
 msgstr "Ð?оказаÑ?Ñ? Ñ?кÑ?Ñ?Ñ?Ñ?е"
 
-#: src/i_callbacks.c:1180
+#: ../src/i_callbacks.c:1186
 msgid "MakeVisible"
 msgstr "СделаÑ?Ñ? видимÑ?м"
 
-#: src/i_callbacks.c:1296
+#: ../src/i_callbacks.c:1302
 msgid "Edit Line Type"
 msgstr "Ð?Ñ?авка Ñ?ипа линии"
 
-#: src/i_callbacks.c:1337 src/x_dialog.c:1261
+#: ../src/i_callbacks.c:1343 ../src/x_dialog.c:1268
 msgid "Edit Fill Type"
 msgstr "Ð?Ñ?авка Ñ?ипа заливки"
 
-#: src/i_callbacks.c:1643
+#: ../src/i_callbacks.c:1648
 msgid "Update Cues"
 msgstr "Ð?бновиÑ?Ñ? Ñ?игналÑ?"
 
-#: src/i_callbacks.c:1782
+#: ../src/i_callbacks.c:1798
 msgid "Really revert page?"
 msgstr "Ð?ейÑ?Ñ?виÑ?елÑ?но возвÑ?аÑ?иÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ??"
 
-#: src/i_callbacks.c:1856
+#: ../src/i_callbacks.c:1872
 msgid "Copy 1"
 msgstr "Ð?опиÑ?ование 1"
 
-#: src/i_callbacks.c:1875
+#: ../src/i_callbacks.c:1891
 msgid "Copy 2"
 msgstr "Ð?опиÑ?ование 2"
 
-#: src/i_callbacks.c:1894
+#: ../src/i_callbacks.c:1910
 msgid "Copy 3"
 msgstr "Ð?опиÑ?ование 3"
 
-#: src/i_callbacks.c:1913
+#: ../src/i_callbacks.c:1929
 msgid "Copy 4"
 msgstr "Ð?опиÑ?ование 4"
 
-#: src/i_callbacks.c:1932
+#: ../src/i_callbacks.c:1948
 msgid "Copy 5"
 msgstr "Ð?опиÑ?ование 5"
 
-#: src/i_callbacks.c:1951
+#: ../src/i_callbacks.c:1967
 msgid "Cut 1"
 msgstr "Ð?Ñ?Ñ?езка 1"
 
-#: src/i_callbacks.c:1970
+#: ../src/i_callbacks.c:1986
 msgid "Cut 2"
 msgstr "Ð?Ñ?Ñ?езка 2"
 
-#: src/i_callbacks.c:1989
+#: ../src/i_callbacks.c:2005
 msgid "Cut 3"
 msgstr "Ð?Ñ?Ñ?езка 3"
 
-#: src/i_callbacks.c:2008
+#: ../src/i_callbacks.c:2024
 msgid "Cut 4"
 msgstr "Ð?Ñ?Ñ?езка 4"
 
-#: src/i_callbacks.c:2027
+#: ../src/i_callbacks.c:2043
 msgid "Cut 5"
 msgstr "Ð?Ñ?Ñ?езка 5"
 
-#: src/i_callbacks.c:2043
+#: ../src/i_callbacks.c:2059
 msgid "Paste 1"
 msgstr "Ð?Ñ?Ñ?авка 1"
 
-#: src/i_callbacks.c:2052 src/i_callbacks.c:2076 src/i_callbacks.c:2100
-#: src/i_callbacks.c:2124 src/i_callbacks.c:2148
+#: ../src/i_callbacks.c:2066 ../src/i_callbacks.c:2088
+#: ../src/i_callbacks.c:2110 ../src/i_callbacks.c:2132
+#: ../src/i_callbacks.c:2154
 msgid "Empty buffer"
 msgstr "Ð?Ñ?Ñ?Ñ?ой бÑ?Ñ?еÑ?"
 
-#: src/i_callbacks.c:2067
+#: ../src/i_callbacks.c:2081
 msgid "Paste 2"
 msgstr "Ð?Ñ?Ñ?авка 2"
 
-#: src/i_callbacks.c:2091
+#: ../src/i_callbacks.c:2103
 msgid "Paste 3"
 msgstr "Ð?Ñ?Ñ?авка 3"
 
-#: src/i_callbacks.c:2115
+#: ../src/i_callbacks.c:2125
 msgid "Paste 4"
 msgstr "Ð?Ñ?Ñ?авка 4"
 
-#: src/i_callbacks.c:2139
+#: ../src/i_callbacks.c:2147
 msgid "Paste 5"
 msgstr "Ð?Ñ?Ñ?авка 5"
 
-#: src/i_callbacks.c:2282 src/x_window.c:527
+#: ../src/i_callbacks.c:2264 ../src/x_window.c:439
 msgid "Component"
 msgstr "Ð?омпоненÑ?"
 
-#: src/i_callbacks.c:2318 src/i_callbacks.c:2337
+#: ../src/i_callbacks.c:2300 ../src/i_callbacks.c:2319
 msgid "Attribute"
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: src/i_callbacks.c:2804
+#: ../src/i_callbacks.c:2786
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Ð?оиÑ?к иÑ?Ñ?оÑ?ника [%s]\n"
 
-#: src/i_callbacks.c:2828 src/i_callbacks.c:2829
+#: ../src/i_callbacks.c:2810 ../src/i_callbacks.c:2811
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Ð?евозможно найÑ?и иÑ?Ñ?оÑ?ник [%s]\n"
 
-#: src/i_callbacks.c:2896
+#: ../src/i_callbacks.c:2878
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Ð?оиÑ?к Ñ?имвола [%s]\n"
 
-#: src/i_callbacks.c:2983
+#: ../src/i_callbacks.c:2965
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: src/i_callbacks.c:3100
+#: ../src/i_callbacks.c:3082
 msgid "ShowN"
 msgstr "Ð?оказаÑ?Ñ? N"
 
-#: src/i_callbacks.c:3130
+#: ../src/i_callbacks.c:3112
 msgid "ShowV"
 msgstr "Ð?оказаÑ?Ñ? V"
 
-#: src/i_callbacks.c:3160
+#: ../src/i_callbacks.c:3142
 msgid "ShowB"
 msgstr "Ð?оказаÑ?Ñ? B"
 
-#: src/i_callbacks.c:3191
+#: ../src/i_callbacks.c:3173
 msgid "VisToggle"
 msgstr "Ð?еÑ?екл. видимоÑ?Ñ?и"
 
-#: src/i_callbacks.c:3212
+#: ../src/i_callbacks.c:3194
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Ð?звиниÑ?е6 но Ñ?Ñ?о опÑ?иÑ? не Ñ?Ñ?нкÑ?ионалÑ?ного менÑ?\n"
 
-#: src/i_callbacks.c:3300
+#: ../src/i_callbacks.c:3282
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: src/i_callbacks.c:3303
+#: ../src/i_callbacks.c:3285
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: src/i_callbacks.c:3320
+#: ../src/i_callbacks.c:3302
 msgid "Grid OFF\n"
 msgstr "СеÑ?ка вÑ?кл.\n"
 
-#: src/i_callbacks.c:3323
+#: ../src/i_callbacks.c:3305
 msgid "Grid ON\n"
 msgstr "СеÑ?ка вкл.\n"
 
-#: src/i_callbacks.c:3340
+#: ../src/i_callbacks.c:3322
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Ð?Ñ?ивÑ?зка Ð?ЫÐ?Ð?ЮЧÐ?Ð?Ð? (Ð?нимание!)\n"
 
-#: src/i_callbacks.c:3343
+#: ../src/i_callbacks.c:3325
 msgid "Snap ON\n"
 msgstr "Ð?Ñ?ивÑ?зка Ð?Ð?Ð?ЮЧÐ?Ð?Ð?\n"
 
-#: src/i_callbacks.c:3363
+#: ../src/i_callbacks.c:3345
 msgid "Rubber band OFF \n"
 msgstr ""
 
-#: src/i_callbacks.c:3366
+#: ../src/i_callbacks.c:3348
 msgid "Rubber band ON\n"
 msgstr ""
 
-#: src/o_arc.c:137
+#: ../src/o_arc.c:139
 #, c-format
 msgid "Unknown end for arc (%d)\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й конеÑ? длÑ? дÑ?ги (%d)\n"
 
-#: src/o_arc.c:178
+#: ../src/o_arc.c:180
 #, c-format
 msgid "Unknown type for arc !\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? дÑ?ги !\n"
 
-#: src/o_attrib.c:105
+#: ../src/o_attrib.c:109
 #, c-format
 msgid "Got NULL in o_attrib_toggle_visibility\n"
 msgstr "Ð?олÑ?Ñ?ен NULL в o_attrib_toggle_visibility\n"
 
-#: src/o_attrib.c:170
+#: ../src/o_attrib.c:175
 #, c-format
 msgid "Got NULL in o_attrib_toggle_show_name_value\n"
 msgstr "Ð?олÑ?Ñ?ен NULL в o_attrib_toggle_show_name_value\n"
 
-#: src/o_attrib.c:221
-#, c-format
-msgid "ERROR! you can't get an attribute without an ='s\n"
-msgstr "Ð?Ñ?ибка! Ð?Ñ? не можеÑ?е полÑ?Ñ?иÑ?Ñ? аÑ?Ñ?ибÑ?Ñ? без знака '='\n"
-
-#: src/o_box.c:141
+#: ../src/o_box.c:143
 #, c-format
 msgid "Unknown end for box (%d)\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й конеÑ? длÑ? пÑ?Ñ?моÑ?голÑ?ника (%d)\n"
 
-#: src/o_box.c:181
+#: ../src/o_box.c:183
 #, c-format
 msgid "Unknown type for box !\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? пÑ?Ñ?моÑ?голÑ?ника !\n"
 
-#: src/o_box.c:271
+#: ../src/o_box.c:267
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? пÑ?Ñ?моÑ?голÑ?ника (Ñ? заливкой)!\n"
 
-#: src/o_buffer.c:42
+#: ../src/o_buffer.c:44
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_copy]\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й buffer_number [o_buffer_copy]\n"
 
-#: src/o_buffer.c:80
+#: ../src/o_buffer.c:73
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_cut]\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й buffer_number [o_buffer_cut]\n"
 
-#: src/o_buffer.c:121
+#: ../src/o_buffer.c:105
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й buffer_number [o_buffer_paste_start]\n"
 
-#: src/o_buffer.c:181
+#: ../src/o_buffer.c:164
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_end]\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й buffer_number [o_buffer_paste_end]\n"
 
-#: src/o_bus.c:210
+#: ../src/o_bus.c:199
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_xor_single\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й паÑ?амеÑ?Ñ? в o_bus_draw_xor_single\n"
 
-#: src/o_circle.c:136
+#: ../src/o_circle.c:138
 #, c-format
 msgid "Unknown end for circle\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й конеÑ? длÑ? окÑ?Ñ?жноÑ?Ñ?и\n"
 
-#: src/o_circle.c:172
+#. just to be careful
+#: ../src/o_circle.c:174
 #, c-format
 msgid "Unknown type for circle!\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? окÑ?Ñ?жноÑ?Ñ?и!\n"
 
-#: src/o_circle.c:260
+#: ../src/o_circle.c:256
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? окÑ?Ñ?жноÑ?Ñ?и (Ñ? заливкой)!\n"
 
-#: src/o_complex.c:230
+#: ../src/o_complex.c:174
 #, c-format
 msgid "Could not find complex in new componet placement!\n"
 msgstr "Ð?евозможно найÑ?и комплекÑ? в новом Ñ?аÑ?положении компоненÑ?а!\n"
 
-#: src/o_complex.c:582
-#, c-format
-msgid "Got NULL in o_complex_translate_display_selection\n"
-msgstr "Ð?олÑ?Ñ?ен NULL в o_complex_translate_display_selection\n"
-
-#: src/o_complex.c:650 src/o_complex.c:656
+#: ../src/o_complex.c:405 ../src/o_complex.c:409
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Ð?еÑ?евод Ñ?Ñ?емÑ? [%d %d]\n"
 
-#: src/o_complex.c:694
-#, c-format
-msgid "Got NULL in o_complex_translate_selection!\n"
-msgstr "Ð?олÑ?Ñ?ен NULL в in o_complex_translate_selection!\n"
-
-#: src/o_copy.c:119 src/o_copy.c:382
+#: ../src/o_copy.c:122 ../src/o_copy.c:312
 #, c-format
 msgid "ERROR: NULL object in o_copy_end!\n"
 msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в o_copy_end!\n"
 
-#: src/o_line.c:113
+#: ../src/o_line.c:115
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й конеÑ? длÑ? линии (%d)\n"
 
-#: src/o_line.c:153
+#. just to be careful
+#: ../src/o_line.c:155
 #, c-format
 msgid "Unknown type for line (%d) !\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? линии (%d) !\n"
 
-#: src/o_misc.c:65
+#: ../src/o_misc.c:66
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Ð?еожиданнÑ?й NULL в o_edit\n"
 
-#: src/o_misc.c:144
+#: ../src/o_misc.c:145
 #, fuzzy
 msgid "Object already locked\n"
 msgstr "Ð?бÑ?екÑ? Ñ?же заблокиÑ?ован\n"
 
-#: src/o_misc.c:182
+#: ../src/o_misc.c:183
 #, fuzzy
 msgid "Object already unlocked\n"
 msgstr "Ð?бÑ?екÑ? Ñ?же Ñ?азблокиÑ?ован\n"
 
-#: src/o_misc.c:229 src/o_misc.c:472 src/o_misc.c:712
-#, c-format
-msgid "ERROR: NULL object in o_rotate_90!\n"
-msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в o_rotate_90!\n"
-
-#: src/o_misc.c:538
-#, c-format
-msgid "ERROR: NULL object in o_mirror!\n"
-msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в o_mirror!\n"
-
-#: src/o_misc.c:812
+#: ../src/o_misc.c:525
 msgid "Hidden text is now visible\n"
 msgstr "СкÑ?Ñ?Ñ?Ñ?й Ñ?екÑ?Ñ? Ñ?ейÑ?аÑ? видим\n"
 
-#: src/o_misc.c:814
+#: ../src/o_misc.c:527
 msgid "Hidden text is now invisible\n"
 msgstr "СкÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?кÑ? Ñ?ейÑ?аÑ? невидим\n"
 
-#: src/o_misc.c:1058
+#: ../src/o_misc.c:771
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: src/o_misc.c:1196
+#: ../src/o_misc.c:906
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: невозможно полÑ?Ñ?иÑ?Ñ? Ñ?еалÑ?но имÑ? Ñ?айла длÑ? %s."
 
-#: src/o_misc.c:1240
+#: ../src/o_misc.c:951
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Ð?евозможно Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?ежим Ñ?Ñ?ениÑ?-запиÑ?и длÑ? пÑ?едÑ?дÑ?Ñ?ей Ñ?езеÑ?вной копии "
 "Ñ?айла [%s]\n"
 
-#: src/o_misc.c:1258
+#: ../src/o_misc.c:969
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Ð?евозможно Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?ежим Ñ?олÑ?ко Ñ?Ñ?ениÑ? длÑ? Ñ?езеÑ?вного Ñ?айла [%s]\n"
 
-#: src/o_misc.c:1263
+#: ../src/o_misc.c:974
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Ð?евозможно Ñ?оÑ?Ñ?аниÑ?Ñ? Ñ?езеÑ?внÑ?й Ñ?айл [%s]\n"
 
-#: src/o_move.c:224
+#: ../src/o_move.c:181
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в o_move_end!\n"
 
-#: src/o_move.c:332
+#: ../src/o_move.c:282
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "Ð?Ñ?! Ð?опÑ?Ñ?ка найÑ?и Ñ?Ñ?о-либо, но ниÑ?его не полÑ?Ñ?аеÑ?Ñ?Ñ?!\n"
 
-#: src/o_move.c:353
+#: ../src/o_move.c:304
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Ð?олÑ?Ñ?ен обÑ?екÑ? не линиÑ? в o_move_check_endpoint\n"
 
-#: src/o_net.c:255
+#: ../src/o_net.c:234
 #, c-format
 msgid "Got an invalid which one in o_net_draw_xor_single\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й паÑ?амеÑ?Ñ? в o_net_draw_xor_single\n"
 
-#: src/o_net.c:812 src/o_net.c:849 src/o_net.c:920 src/o_net.c:956
+#. try to exit gracefully
+#: ../src/o_net.c:763 ../src/o_net.c:800 ../src/o_net.c:871 ../src/o_net.c:907
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr "Ð?опÑ?Ñ?ка добавиÑ?Ñ? более двÑ?Ñ? Ñ?азÑ?Ñ?вов Ñ?инÑ?. Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка gschem.\n"
 
-#: src/o_net.c:1029
+#: ../src/o_net.c:980
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Ð?евозможно найÑ?и %s ни в одной из библиоÑ?ек компоненÑ?ов\n"
 
-#: src/o_picture.c:206 src/o_picture.c:746
+#: ../src/o_picture.c:208 ../src/o_picture.c:720
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Ð?евозможно загÑ?зиÑ?аÑ?Ñ? изобÑ?ажение: [%s]"
 
-#: src/o_picture.c:220
+#: ../src/o_picture.c:222
 msgid "Picture"
 msgstr "Ð?зобÑ?ажение"
 
-#: src/o_picture.c:658 src/x_attribedit.c:145
+#: ../src/o_picture.c:625 ../src/x_attribedit.c:148
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL!\n"
 
-#: src/o_slot.c:128
+#: ../src/o_slot.c:130
 msgid "Slot attribute malformed\n"
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ? Ñ?лоÑ?а иÑ?поÑ?Ñ?ен\n"
 
-#: src/o_slot.c:146
+#: ../src/o_slot.c:148
 msgid "numslots attribute missing\n"
 msgstr "оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? аÑ?Ñ?ибÑ?Ñ? numslots\n"
 
-#: src/o_slot.c:148
+#: ../src/o_slot.c:150
 msgid "Slotting not allowed for this component\n"
 msgstr "СлоÑ?иÑ?ование не допÑ?Ñ?Ñ?имо длÑ? Ñ?Ñ?ого компоненÑ?а\n"
 
-#: src/o_slot.c:164
+#: ../src/o_slot.c:166
 msgid "New slot number out of range\n"
 msgstr "Ð?омеÑ? нового Ñ?лоÑ?а вÑ?Ñ?одиÑ? за пÑ?еделÑ?\n"
 
-#: src/o_slot.c:237
+#: ../src/o_slot.c:239
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Ð?Ñ? пÑ?Ñ?аеÑ?еÑ?Ñ? пÑ?авиÑ?Ñ? Ñ?лоÑ? Ñ?его-Ñ?о неÑ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?его!\n"
 
-#: src/o_undo.c:317
+#: ../src/o_undo.c:318
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Ð?Ñ?мена/Ð?овÑ?оÑ?  вÑ?клÑ?Ñ?енÑ? в rc-Ñ?айле\n"
 
-#: src/parsecmd.c:50
+#: ../src/parsecmd.c:51
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1297,244 +1283,260 @@ msgstr ""
 "  -h            Ð?омоÑ?Ñ?; Ñ?Ñ?о Ñ?ообÑ?ение\n"
 "\n"
 
-#: src/x_attribedit.c:130
+#: ../src/x_attribedit.c:133
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr "Ð?олÑ?Ñ?ена невеÑ?наÑ? опÑ?иÑ? пÑ?оÑ?моÑ?Ñ?а, Ñ?Ñ?Ñ?анавливаеÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ? обоиÑ?\n"
 
-#: src/x_attribedit.c:333
+#: ../src/x_attribedit.c:336
 msgid "Single Attribute Editor"
 msgstr "РедакÑ?оÑ? одного аÑ?Ñ?ибÑ?Ñ?а"
 
-#: src/x_attribedit.c:364
+#: ../src/x_attribedit.c:367
 #, fuzzy
 msgid "<b>Edit Attribute</b>"
 msgstr "РедакÑ?иÑ?оваÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: src/x_attribedit.c:366
+#: ../src/x_attribedit.c:369
 #, fuzzy
 msgid "<b>Add Attribute</b>"
 msgstr "Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#: src/x_attribedit.c:382 src/x_multiattrib.c:1731
+#. Name selection
+#. GtkLabel
+#: ../src/x_attribedit.c:385 ../src/x_multiattrib.c:1721
 msgid "Name:"
 msgstr "Ð?мÑ?:"
 
-#: src/x_attribedit.c:398 src/x_multiattrib.c:1750
+#. Value entry
+#. GtkLabel
+#: ../src/x_attribedit.c:401 ../src/x_multiattrib.c:1740
 msgid "Value:"
 msgstr "Ð?наÑ?ение:"
 
-#: src/x_attribedit.c:414 src/x_multiattrib.c:1787
+#. Visibility
+#. GtkButton
+#: ../src/x_attribedit.c:417 ../src/x_multiattrib.c:1777
 msgid "Visible"
 msgstr "Ð?идимÑ?й"
 
-#: src/x_attribedit.c:434
+#: ../src/x_attribedit.c:437
 msgid "Show Value Only"
 msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко знаÑ?ение"
 
-#: src/x_attribedit.c:436
+#: ../src/x_attribedit.c:439
 msgid "Show Name Only"
 msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко имÑ?"
 
-#: src/x_attribedit.c:438 src/x_multiattrib.c:1226
+#: ../src/x_attribedit.c:441 ../src/x_multiattrib.c:1216
 msgid "Show Name & Value"
 msgstr "Ð?оказаÑ?Ñ? имÑ? и знаÑ?ение"
 
-#: src/x_attribedit.c:445
+#. gschem specific
+#: ../src/x_attribedit.c:448
 #, fuzzy
 msgid "<b>Attach Options</b>"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: src/x_attribedit.c:460
+#: ../src/x_attribedit.c:463
 msgid "All"
 msgstr "Ð?Ñ?е"
 
-#: src/x_attribedit.c:468 src/x_compselect.c:728 src/x_compselect.c:803
+#. GtkTreeViewColumn
+#: ../src/x_attribedit.c:471 ../src/x_compselect.c:735
+#: ../src/x_compselect.c:810
 msgid "Components"
 msgstr "Ð?омпоненÑ?Ñ?"
 
-#: src/x_attribedit.c:476 src/x_window.c:537
+#: ../src/x_attribedit.c:479 ../src/x_window.c:449
 msgid "Nets"
 msgstr "Ð?Ñ?оводники"
 
-#: src/x_attribedit.c:484
+#: ../src/x_attribedit.c:487
 msgid "Replace existing attributes"
 msgstr ""
 
-#: src/x_autonumber.c:413
+#: ../src/x_autonumber.c:412
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#: src/x_autonumber.c:428
+#. duplicate slot in used_slots
+#: ../src/x_autonumber.c:427
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: src/x_autonumber.c:697
+#: ../src/x_autonumber.c:692
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: src/x_autonumber.c:748
+#: ../src/x_autonumber.c:743
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: src/x_autonumber.c:881
+#: ../src/x_autonumber.c:876
 #, fuzzy
 msgid "Diagonal"
 msgstr "диагоналÑ?нÑ?й"
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Top to bottom"
 msgstr ""
 
-#: src/x_autonumber.c:882
+#: ../src/x_autonumber.c:877
 msgid "Bottom to top"
 msgstr ""
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 #, fuzzy
 msgid "Left to right"
 msgstr "левÑ?й пÑ?авÑ?й"
 
-#: src/x_autonumber.c:883
+#: ../src/x_autonumber.c:878
 msgid "Right to left"
 msgstr ""
 
-#: src/x_autonumber.c:884
+#: ../src/x_autonumber.c:879
 #, fuzzy
 msgid "File order"
 msgstr "поÑ?Ñ?док Ñ?айлов"
 
-#: src/x_autonumber.c:1220
+#: ../src/x_autonumber.c:1215
 msgid "Autonumber text"
 msgstr "Ð?вÑ?онÑ?меÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: src/x_autonumber.c:1246
+#. scope section
+#: ../src/x_autonumber.c:1241
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: src/x_autonumber.c:1268
+#: ../src/x_autonumber.c:1263
 #, fuzzy
 msgid "Search for:"
 msgstr "поиÑ?к Ñ?окÑ?Ñ?а"
 
-#: src/x_autonumber.c:1282
+#: ../src/x_autonumber.c:1277
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "Ð?вÑ?онÑ?меÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: src/x_autonumber.c:1289
+#: ../src/x_autonumber.c:1284
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: src/x_autonumber.c:1301 src/x_autonumber.c:1310
+#: ../src/x_autonumber.c:1296 ../src/x_autonumber.c:1305
 #, fuzzy
 msgid "Selected objects"
 msgstr "вÑ?бÑ?анÑ? обÑ?екÑ?Ñ?"
 
-#: src/x_autonumber.c:1302 src/x_autonumber.c:1311
+#: ../src/x_autonumber.c:1297 ../src/x_autonumber.c:1306
 #, fuzzy
 msgid "Current page"
 msgstr "Ñ?екÑ?Ñ?ий лиÑ?Ñ?"
 
-#: src/x_autonumber.c:1303 src/x_autonumber.c:1312
+#: ../src/x_autonumber.c:1298 ../src/x_autonumber.c:1307
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "Ð?еÑ?аÑ?Ñ?иÑ?"
 
-#: src/x_autonumber.c:1314
+#: ../src/x_autonumber.c:1309
 msgid "Overwrite existing numbers"
 msgstr ""
 
-#: src/x_autonumber.c:1319
+#. Options section
+#: ../src/x_autonumber.c:1314
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: src/x_autonumber.c:1341
+#: ../src/x_autonumber.c:1336
 #, fuzzy
 msgid "Starting number:"
 msgstr "Ñ?Ñ?аÑ?Ñ?овÑ?й номеÑ?"
 
-#: src/x_autonumber.c:1348
+#: ../src/x_autonumber.c:1343
 #, fuzzy
 msgid "Sort order:"
 msgstr "поÑ?Ñ?док Ñ?оÑ?Ñ?иÑ?овки"
 
-#: src/x_autonumber.c:1369
+#: ../src/x_autonumber.c:1364
 msgid "Remove numbers"
 msgstr ""
 
-#: src/x_autonumber.c:1373
+#: ../src/x_autonumber.c:1368
 msgid "Automatic slotting"
 msgstr ""
 
-#: src/x_color.c:60 src/x_color.c:97
+#: ../src/x_color.c:60 ../src/x_color.c:97
 #, c-format
 msgid "Could not find the color %s!\n"
 msgstr "Ð?евозможно найÑ?и Ñ?веÑ? %s!\n"
 
-#: src/x_color.c:63 src/x_color.c:100
+#: ../src/x_color.c:63 ../src/x_color.c:100
 #, c-format
 msgid "Defaulting color to white\n"
 msgstr "УÑ?Ñ?ановка белого Ñ?веÑ?а по Ñ?молÑ?аниÑ?\n"
 
-#: src/x_color.c:70 src/x_color.c:107
+#: ../src/x_color.c:70 ../src/x_color.c:107
 #, c-format
 msgid "Ack! Cannot allocate white!\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? белÑ?й!\n"
 
-#: src/x_color.c:81 src/x_color.c:129 src/x_window.c:176 src/x_window.c:185
+#: ../src/x_color.c:81 ../src/x_color.c:129 ../src/x_window.c:86
+#: ../src/x_window.c:95
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? Ñ?веÑ? %s!\n"
 
-#: src/x_color.c:148 src/x_color.c:164
+#: ../src/x_color.c:148 ../src/x_color.c:164
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Ð?опÑ?Ñ?ка полÑ?Ñ?ениÑ? невеÑ?ного Ñ?веÑ?а: %d\n"
 
-#: src/x_compselect.c:833
+#. GtkLabel
+#: ../src/x_compselect.c:840
 #, fuzzy
 msgid "Filter:"
 msgstr "ФилÑ?Ñ?Ñ?"
 
-#: src/x_compselect.c:925
+#: ../src/x_compselect.c:932
 msgid "Default behavior - reference component"
 msgstr "Ð?оÑ?малÑ?ное поведение - Ñ?Ñ?Ñ?лка на компоненÑ?"
 
-#: src/x_compselect.c:928
+#: ../src/x_compselect.c:935
 msgid "Embed component in schematic"
 msgstr "Ð?недÑ?иÑ?Ñ? компоненÑ? в Ñ?Ñ?емÑ?"
 
-#: src/x_compselect.c:931
+#: ../src/x_compselect.c:938
 msgid "Include component as individual objects"
 msgstr "Ð?клÑ?Ñ?иÑ?Ñ? компоненÑ? как индивидÑ?алÑ?нÑ?й обÑ?екÑ?"
 
-#: src/x_compselect.c:1077
+#: ../src/x_compselect.c:1094
 msgid "Select Component..."
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? компоненÑ?..."
 
-#: src/x_compselect.c:1103
+#: ../src/x_compselect.c:1120
 msgid "In Use"
 msgstr ""
 
-#: src/x_compselect.c:1107
+#: ../src/x_compselect.c:1124
 msgid "Libraries"
 msgstr "Ð?иблиоÑ?еки"
 
-#: src/x_compselect.c:1116 src/x_fileselect.c:127
+#. GtkFrame
+#: ../src/x_compselect.c:1133 ../src/x_fileselect.c:128
 msgid "Preview"
 msgstr "Ð?Ñ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ?"
 
-#: src/x_dialog.c:184
+#. dialog not created yet
+#: ../src/x_dialog.c:191
 msgid "Text Entry..."
 msgstr "ТекÑ?Ñ?овое вÑ?ождение..."
 
-#: src/x_dialog.c:217
+#: ../src/x_dialog.c:224
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1544,185 +1546,195 @@ msgstr ""
 "пеÑ?емеÑ?Ñ?иÑ?е кÑ?Ñ?Ñ?оÑ? в окно, Ñ?елкниÑ?е длÑ? Ñ?Ñ?Ñ?ановки Ñ?екÑ?Ñ?а.\n"
 "СÑ?еднÑ?Ñ? кнопка пÑ?едназнаÑ?ена длÑ? вÑ?аÑ?ениÑ? во вÑ?емÑ? Ñ?Ñ?Ñ?ановки."
 
-#: src/x_dialog.c:306
+#: ../src/x_dialog.c:313
+#, c-format
 msgid "Lower Left"
 msgstr "Ð?ижний левÑ?й"
 
-#: src/x_dialog.c:317
+#: ../src/x_dialog.c:324
+#, c-format
 msgid "Middle Left"
 msgstr "СÑ?едний левÑ?й"
 
-#: src/x_dialog.c:328
+#: ../src/x_dialog.c:335
+#, c-format
 msgid "Upper Left"
 msgstr "Ð?еÑ?Ñ?ний левÑ?й"
 
-#: src/x_dialog.c:339
+#: ../src/x_dialog.c:346
+#, c-format
 msgid "Lower Middle"
 msgstr "Ð?ижний Ñ?Ñ?едний"
 
-#: src/x_dialog.c:350
+#: ../src/x_dialog.c:357
+#, c-format
 msgid "Middle Middle"
 msgstr "СÑ?едний Ñ?Ñ?едний"
 
-#: src/x_dialog.c:361
+#: ../src/x_dialog.c:368
+#, c-format
 msgid "Upper Middle"
 msgstr "Ð?еÑ?Ñ?ний Ñ?Ñ?едний"
 
-#: src/x_dialog.c:372
+#: ../src/x_dialog.c:379
+#, c-format
 msgid "Lower Right"
 msgstr "Ð?ижний пÑ?авÑ?й"
 
-#: src/x_dialog.c:383
+#: ../src/x_dialog.c:390
+#, c-format
 msgid "Middle Right"
 msgstr "СÑ?едний пÑ?авÑ?й"
 
-#: src/x_dialog.c:394
+#: ../src/x_dialog.c:401
+#, c-format
 msgid "Upper Right"
 msgstr "Ð?еÑ?Ñ?ний пÑ?авÑ?й"
 
-#: src/x_dialog.c:509
+#: ../src/x_dialog.c:516
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "Ð?Ñ?авка Ñ?азмеÑ?а Ñ?екÑ?Ñ?а"
 
-#: src/x_dialog.c:545
+#: ../src/x_dialog.c:552
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: src/x_dialog.c:577
+#: ../src/x_dialog.c:584
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: src/x_dialog.c:592
+#: ../src/x_dialog.c:599
 #, fuzzy
 msgid "Color:"
 msgstr "ЦвеÑ?"
 
-#: src/x_dialog.c:602
+#: ../src/x_dialog.c:609
 msgid "Size:"
 msgstr ""
 
-#: src/x_dialog.c:611
+#: ../src/x_dialog.c:618
 #, fuzzy
 msgid "Alignment:"
 msgstr "Ð?Ñ?авка вÑ?Ñ?авниваниÑ? Ñ?екÑ?Ñ?а"
 
-#: src/x_dialog.c:665
+#: ../src/x_dialog.c:672
 msgid "Solid"
 msgstr "СплоÑ?ной"
 
-#: src/x_dialog.c:666
+#: ../src/x_dialog.c:673
 msgid "Dotted"
 msgstr "Ð?Ñ?нкÑ?иÑ? Ñ? Ñ?оÑ?кой"
 
-#: src/x_dialog.c:667
+#: ../src/x_dialog.c:674
 msgid "Dashed"
 msgstr "Ð?Ñ?нкÑ?иÑ? Ñ? деÑ?иÑ?ом"
 
-#: src/x_dialog.c:668
+#: ../src/x_dialog.c:675
 msgid "Center"
 msgstr "ЦенÑ?Ñ?иÑ?ованнÑ?й"
 
-#: src/x_dialog.c:669
+#: ../src/x_dialog.c:676
 msgid "Phantom"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?веннÑ?й"
 
-#: src/x_dialog.c:795 src/x_dialog.c:797 src/x_dialog.c:799 src/x_dialog.c:982
-#: src/x_dialog.c:983 src/x_dialog.c:984 src/x_dialog.c:992
-#: src/x_dialog.c:1175 src/x_dialog.c:1177 src/x_dialog.c:1179
-#: src/x_dialog.c:1181 src/x_dialog.c:1183 src/x_dialog.c:1388
-#: src/x_dialog.c:1389 src/x_dialog.c:1390 src/x_dialog.c:1391
-#: src/x_dialog.c:1392 src/x_dialog.c:1400
+#: ../src/x_dialog.c:802 ../src/x_dialog.c:804 ../src/x_dialog.c:806
+#: ../src/x_dialog.c:989 ../src/x_dialog.c:990 ../src/x_dialog.c:991
+#: ../src/x_dialog.c:999 ../src/x_dialog.c:1182 ../src/x_dialog.c:1184
+#: ../src/x_dialog.c:1186 ../src/x_dialog.c:1188 ../src/x_dialog.c:1190
+#: ../src/x_dialog.c:1395 ../src/x_dialog.c:1396 ../src/x_dialog.c:1397
+#: ../src/x_dialog.c:1398 ../src/x_dialog.c:1399 ../src/x_dialog.c:1407
+#, c-format
 msgid "*unchanged*"
 msgstr "*неизменено*"
 
-#: src/x_dialog.c:874
+#: ../src/x_dialog.c:881
 msgid "Edit Line Width & Type"
 msgstr "Ð?Ñ?авка Ñ?иÑ?инÑ? и Ñ?ипа линии"
 
-#: src/x_dialog.c:915
+#: ../src/x_dialog.c:922
 #, fuzzy
 msgid "Width:"
 msgstr "ШиÑ?ина"
 
-#: src/x_dialog.c:919 src/x_print.c:314
+#: ../src/x_dialog.c:926 ../src/x_print.c:315
 #, fuzzy
 msgid "Type:"
 msgstr "Тип"
 
-#: src/x_dialog.c:923
+#: ../src/x_dialog.c:930
 #, fuzzy
 msgid "Dash Length:"
 msgstr "Ð?лина деÑ?иÑ?а линии"
 
-#: src/x_dialog.c:927
+#: ../src/x_dialog.c:934
 #, fuzzy
 msgid "Dash Space:"
 msgstr "Ð?еÑ?иÑ?нÑ?й пÑ?обел линии"
 
-#: src/x_dialog.c:1032
+#: ../src/x_dialog.c:1039
 msgid "Hollow"
 msgstr "Ð?огнÑ?Ñ?Ñ?"
 
-#: src/x_dialog.c:1033
+#: ../src/x_dialog.c:1040
 msgid "Filled"
 msgstr "Ð?аполнено"
 
-#: src/x_dialog.c:1034
+#: ../src/x_dialog.c:1041
 msgid "Mesh"
 msgstr "ЯÑ?ейка"
 
-#: src/x_dialog.c:1035
+#: ../src/x_dialog.c:1042
 msgid "Hatch"
 msgstr "ШÑ?Ñ?иÑ?"
 
-#: src/x_dialog.c:1301
+#: ../src/x_dialog.c:1308
 #, fuzzy
 msgid "Fill Type:"
 msgstr "Тип заливки"
 
-#: src/x_dialog.c:1305
+#: ../src/x_dialog.c:1312
 #, fuzzy
 msgid "Line Width:"
 msgstr "ШиÑ?ина линии"
 
-#: src/x_dialog.c:1309
+#: ../src/x_dialog.c:1316
 #, fuzzy
 msgid "Angle 1:"
 msgstr "Угол1"
 
-#: src/x_dialog.c:1313
+#: ../src/x_dialog.c:1320
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "Ð?аклон1"
 
-#: src/x_dialog.c:1317
+#: ../src/x_dialog.c:1324
 #, fuzzy
 msgid "Angle 2:"
 msgstr "Угол2"
 
-#: src/x_dialog.c:1321
+#: ../src/x_dialog.c:1328
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "Ð?аклон2"
 
-#: src/x_dialog.c:1483
+#: ../src/x_dialog.c:1490
 msgid "Arc Params"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? дÑ?ги"
 
-#: src/x_dialog.c:1525
+#: ../src/x_dialog.c:1532
 #, fuzzy
 msgid "Start Angle:"
 msgstr "Ð?аÑ?ало Ñ?гла"
 
-#: src/x_dialog.c:1535
+#: ../src/x_dialog.c:1542
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "Угол Ñ?азвеÑ?Ñ?ки в гÑ?адÑ?Ñ?аÑ?"
 
-#: src/x_dialog.c:1636
+#: ../src/x_dialog.c:1643
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1730,50 +1742,50 @@ msgstr ""
 "СмеÑ?ение длÑ? пеÑ?евода?\n"
 "(о длÑ? наÑ?ала оÑ?Ñ?Ñ?еÑ?а)"
 
-#: src/x_dialog.c:1704
+#: ../src/x_dialog.c:1711
 msgid "Text Size"
 msgstr "РазмеÑ? Ñ?екÑ?Ñ?а"
 
-#: src/x_dialog.c:1736
+#: ../src/x_dialog.c:1743
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "Ð?ведиÑ?е новÑ?й Ñ?азмеÑ? Ñ?екÑ?Ñ?а"
 
-#: src/x_dialog.c:1811
+#: ../src/x_dialog.c:1818
 #, fuzzy
 msgid "Snap Size"
 msgstr "СеÑ?ка пÑ?ивÑ?зки"
 
-#: src/x_dialog.c:1843
+#: ../src/x_dialog.c:1850
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "Ð?ведиÑ?е новÑ?й Ñ?аг Ñ?еÑ?ки пÑ?ивÑ?зки"
 
-#: src/x_dialog.c:1916
+#: ../src/x_dialog.c:1923
 msgid "Edit slot number"
 msgstr "Ð?Ñ?авка номеÑ?а Ñ?лоÑ?а"
 
-#: src/x_dialog.c:1949
+#: ../src/x_dialog.c:1956
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "Ð?Ñ?авка номеÑ?а Ñ?лоÑ?а"
 
-#: src/x_dialog.c:2011
+#: ../src/x_dialog.c:2018
 msgid "About..."
 msgstr "Ð?..."
 
-#: src/x_dialog.c:2031
+#: ../src/x_dialog.c:2038
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr ""
 "gEDA: СиÑ?Ñ?ема Ð?вÑ?омаÑ?изиÑ?ованного Ð?РоекÑ?иÑ?ованиÑ? Ñ?лекÑ?Ñ?оннÑ?Ñ? Ñ?Ñ?ем (GPL)"
 
-#: src/x_dialog.c:2035
+#: ../src/x_dialog.c:2042
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "веÑ?Ñ?иÑ? gschem %s%s.%s"
 
-#: src/x_dialog.c:2043
+#: ../src/x_dialog.c:2050
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1787,100 +1799,102 @@ msgstr ""
 "Ð? многими дÑ?Ñ?гими (Ñ?моÑ?Ñ?иÑ?е Ñ?айл AUTHORS) \n"
 "Ð?еÑ?евод: Andy Shevchenko <andy@xxxxxxxxxxxx>"
 
-#: src/x_dialog.c:2107
+#: ../src/x_dialog.c:2115
 msgid "Coords"
 msgstr "Ð?ооÑ?динаÑ?Ñ?"
 
-#: src/x_dialog.c:2128
+#: ../src/x_dialog.c:2136
 msgid "Screen"
 msgstr "ЭкÑ?ан"
 
-#: src/x_dialog.c:2137
+#: ../src/x_dialog.c:2145
 msgid "World"
 msgstr "Ð?иÑ?"
 
-#: src/x_dialog.c:2360
+#: ../src/x_dialog.c:2360
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в color_edit_dialog_apply!\n"
 
-#: src/x_dialog.c:2423
+#: ../src/x_dialog.c:2423
 msgid "Color Edit"
 msgstr "Ð?Ñ?авка Ñ?веÑ?а"
 
-#: src/x_dialog.c:2456
+#: ../src/x_dialog.c:2456
 msgid "Object color:"
 msgstr ""
 
-#: src/x_dialog.c:2581
+#: ../src/x_dialog.c:2581
 #, fuzzy
 msgid "Function"
 msgstr "Ð?ейÑ?Ñ?вие"
 
-#: src/x_dialog.c:2588
+#: ../src/x_dialog.c:2588
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "ФÑ?нкÑ?иÑ? : комбинаÑ?иÑ? клавиÑ?"
 
-#: src/x_dialog.c:2920
+#: ../src/x_dialog.c:2901
 #, fuzzy
 msgid "Find Text"
 msgstr "Ð?айÑ?и Ñ?екÑ?Ñ?"
 
-#: src/x_dialog.c:2953
+#: ../src/x_dialog.c:2934
 msgid "Text to find:"
 msgstr "ТекÑ?Ñ? длÑ? поиÑ?ка:"
 
-#: src/x_dialog.c:2963
+#: ../src/x_dialog.c:2944
 msgid "descend into hierarchy"
 msgstr "СпÑ?Ñ?к по иеÑ?аÑ?Ñ?ии"
 
-#: src/x_dialog.c:3027
+#: ../src/x_dialog.c:3008
 #, fuzzy
 msgid "Hide Text"
 msgstr "СкÑ?Ñ?Ñ?Ñ? Ñ?екÑ?Ñ?"
 
-#: src/x_dialog.c:3060
+#: ../src/x_dialog.c:3041
 msgid "Hide text starting with:"
 msgstr "СкÑ?Ñ?Ñ?Ñ? Ñ?екÑ?Ñ?, наÑ?инаÑ?Ñ?ийÑ?Ñ? Ñ?:"
 
-#: src/x_dialog.c:3128
+#: ../src/x_dialog.c:3109
 #, fuzzy
 msgid "Show Text"
 msgstr "Ð?оказаÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: src/x_dialog.c:3161
+#: ../src/x_dialog.c:3142
 msgid "Show text starting with:"
 msgstr "Ð?оказаÑ?Ñ? Ñ?екÑ?Ñ?, наÑ?инаÑ?Ñ?ийÑ?Ñ? Ñ?:"
 
-#: src/x_dialog.c:3606 src/x_multiattrib.c:1607
+#. GtkTreeViewColumn
+#: ../src/x_dialog.c:3587 ../src/x_multiattrib.c:1597
 msgid "Name"
 msgstr "Ð?мÑ?"
 
-#: src/x_dialog.c:3628
+#: ../src/x_dialog.c:3609
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: src/x_dialog.c:3722
+#: ../src/x_dialog.c:3703
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: src/x_dialog.c:3728
+#: ../src/x_dialog.c:3709
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
-#: src/x_dialog.c:3757
+#. secondary label
+#: ../src/x_dialog.c:3738
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: src/x_dialog.c:3777
+#: ../src/x_dialog.c:3758
 msgid "_Close without saving"
 msgstr ""
 
-#: src/x_dialog.c:4098
+#: ../src/x_dialog.c:4094
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1891,51 +1905,69 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: src/x_dialog.c:4100
+#: ../src/x_dialog.c:4096
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#: src/x_fileselect.c:47
+#: ../src/x_fileselect.c:48
 msgid "Schematics"
 msgstr "СÑ?емÑ?"
 
-#: src/x_fileselect.c:52
+#: ../src/x_fileselect.c:53
 msgid "Symbols"
 msgstr "СимволÑ?"
 
-#: src/x_fileselect.c:57
+#: ../src/x_fileselect.c:58
 msgid "Schematics and symbols"
 msgstr "СÑ?емÑ? и Ñ?имволÑ?"
 
-#: src/x_fileselect.c:63
+#: ../src/x_fileselect.c:64
 msgid "All files"
 msgstr "Ð?Ñ?е Ñ?айлÑ?"
 
-#: src/x_fileselect.c:176
+#: ../src/x_fileselect.c:177
 msgid "Open..."
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?..."
 
-#: src/x_fileselect.c:237
+#: ../src/x_fileselect.c:238
 #, fuzzy
 msgid "Save as..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как..."
 
-#: src/x_image.c:180
+#: ../src/x_fileselect.c:286
+#, c-format
+msgid ""
+"The selected file `%s' already exists.\n"
+"\n"
+"Would you like to overwrite it?"
+msgstr ""
+
+#: ../src/x_fileselect.c:289
+#, fuzzy
+msgid "Overwrite file?"
+msgstr "Ð?овÑ?й Ñ?айл"
+
+#: ../src/x_fileselect.c:291
+msgid "Save cancelled on user request\n"
+msgstr ""
+
+#. WK - catch EPS export case
+#: ../src/x_image.c:181
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: src/x_image.c:298
+#: ../src/x_image.c:304
 #, fuzzy, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: невозможно запиÑ?аÑ?Ñ? PNG-Ñ?айл.\n"
 
-#: src/x_image.c:379
+#: ../src/x_image.c:385
 #, fuzzy, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: невозможно запиÑ?аÑ?Ñ? PNG-Ñ?айл.\n"
 
-#: src/x_image.c:389
+#: ../src/x_image.c:395
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -1944,323 +1976,334 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: src/x_image.c:408
+#: ../src/x_image.c:414
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Ð?апиÑ?ано Ñ?веÑ?ное изобÑ?ажение в [%s] [%d-x%d]\n"
 
-#: src/x_image.c:410
+#: ../src/x_image.c:416
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Ð?апиÑ?ано Ñ?еÑ?но-белое изобÑ?ажение в [%s] [%d-x-%d]\n"
 
-#: src/x_image.c:420
+#: ../src/x_image.c:426
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 "x_image_lowlevel: невозможно полÑ?Ñ?иÑ?Ñ? бÑ?Ñ?еÑ? изобÑ?ажениÑ? из окна gschem.\n"
 
-#: src/x_image.c:466
+#: ../src/x_image.c:472
 #, fuzzy
 msgid "Width x Height"
 msgstr "ШиÑ?ина-x-Ð?Ñ?Ñ?оÑ?а"
 
-#: src/x_image.c:482
+#: ../src/x_image.c:488
 #, fuzzy
 msgid "Image type"
 msgstr "Ð?зобÑ?ажение"
 
-#: src/x_log.c:236
+#: ../src/x_log.c:252
 msgid "Status"
 msgstr "СÑ?аÑ?Ñ?Ñ?"
 
-#: src/x_menus.c:41
+#: ../src/x_menus.c:42
 msgid "/Add Net"
 msgstr "/Ð?обавиÑ?Ñ? Ñ?оединение"
 
-#: src/x_menus.c:42
+#: ../src/x_menus.c:43
 msgid "/Add Attribute..."
 msgstr "/Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#: src/x_menus.c:43
+#: ../src/x_menus.c:44
 msgid "/Add Component..."
 msgstr "/Ð?обавиÑ?Ñ? компоненÑ?..."
 
-#: src/x_menus.c:44
+#: ../src/x_menus.c:45
 msgid "/Add Bus"
 msgstr "/Ð?обавиÑ?Ñ? Ñ?инÑ?"
 
-#: src/x_menus.c:45
+#: ../src/x_menus.c:46
 msgid "/Add Text"
 msgstr "/Ð?обавиÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: src/x_menus.c:47
+#: ../src/x_menus.c:48
 msgid "/Zoom In"
 msgstr "/УвелиÑ?иÑ?Ñ?"
 
-#: src/x_menus.c:48
+#: ../src/x_menus.c:49
 msgid "/Zoom Out"
 msgstr "/УменÑ?Ñ?иÑ?Ñ?"
 
-#: src/x_menus.c:49
+#: ../src/x_menus.c:50
 msgid "/Zoom Box"
 msgstr "/Ð?блаÑ?Ñ?Ñ? длÑ? маÑ?Ñ?Ñ?абиÑ?ованиÑ?"
 
-#: src/x_menus.c:50
+#: ../src/x_menus.c:51
 msgid "/Zoom Extents"
 msgstr "/Ð?аÑ?Ñ?Ñ?аб на Ñ?кÑ?ан"
 
-#: src/x_menus.c:52
+#: ../src/x_menus.c:53
 msgid "/Select"
 msgstr "/Ð?Ñ?бÑ?аÑ?Ñ?"
 
-#: src/x_menus.c:53
+#: ../src/x_menus.c:54
 msgid "/Edit..."
 msgstr "/Ð?Ñ?авка..."
 
-#: src/x_menus.c:54
+#: ../src/x_menus.c:55
 msgid "/Copy"
 msgstr "/Ð?опиÑ?оваÑ?Ñ?"
 
-#: src/x_menus.c:55
+#: ../src/x_menus.c:56
 msgid "/Move"
 msgstr "/Ð?еÑ?емеÑ?Ñ?иÑ?Ñ?"
 
-#: src/x_menus.c:56
+#: ../src/x_menus.c:57
 msgid "/Delete"
 msgstr "/УдалиÑ?Ñ?"
 
-#: src/x_menus.c:59
+#: ../src/x_menus.c:60
 msgid "/Down Schematic"
 msgstr "/Ð?глÑ?бÑ? Ñ?Ñ?емÑ?"
 
-#: src/x_menus.c:60
+#: ../src/x_menus.c:61
 msgid "/Down Symbol"
 msgstr "/Ð?глÑ?бÑ? Ñ?имвола"
 
-#: src/x_menus.c:61
+#: ../src/x_menus.c:62
 msgid "/Up"
 msgstr "/Ð?авеÑ?Ñ?"
 
-#: src/x_menus.c:332
-msgid "Tried to set the sensitivity on a non-existent menu item\n"
+#: ../src/x_menus.c:333
+#, fuzzy, c-format
+msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Ð?опÑ?Ñ?ка Ñ?Ñ?Ñ?ановки Ñ?Ñ?вÑ?Ñ?виÑ?елÑ?ноÑ?Ñ?и длÑ? неÑ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?его пÑ?нкÑ?а менÑ?\n"
 
-#: src/x_menus.c:356
+#: ../src/x_menus.c:357
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?!\n"
 
-#: src/x_menus.c:369
+#: ../src/x_menus.c:370
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Ð?опÑ?Ñ?ка Ñ?Ñ?Ñ?ановки Ñ?Ñ?вÑ?Ñ?виÑ?елÑ?ноÑ?Ñ?и длÑ? неÑ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?его вÑ?Ñ?какиваÑ?Ñ?его "
 "menu_item\n"
 
-#: src/x_menus.c:482
+#. Remove this entry from all menus
+#: ../src/x_menus.c:482
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Ð?евозможно вÑ?зваÑ?Ñ? %s\n"
 
-#: src/x_menus.c:542
+#: ../src/x_menus.c:543
 #, fuzzy
 msgid "Clear"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ?"
 
-#: src/x_multiattrib.c:718
+#: ../src/x_multiattrib.c:708
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?Ñ? Ñ? пÑ?Ñ?Ñ?Ñ?м именем недопÑ?Ñ?Ñ?имÑ?. Ð?ожалÑ?йÑ?Ñ?а, Ñ?Ñ?Ñ?ановиÑ?е имÑ?."
 
-#: src/x_multiattrib.c:1228
+#: ../src/x_multiattrib.c:1218
 msgid "Show Value only"
 msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко знаÑ?ение"
 
-#: src/x_multiattrib.c:1230
+#: ../src/x_multiattrib.c:1220
 msgid "Show Name only"
 msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко имÑ?"
 
-#: src/x_multiattrib.c:1257
+#: ../src/x_multiattrib.c:1247
 msgid "Duplicate"
 msgstr "Ð?Ñ?блиÑ?оваÑ?Ñ?"
 
-#: src/x_multiattrib.c:1534
+#: ../src/x_multiattrib.c:1524
 msgid "Edit Attributes"
 msgstr "РедакÑ?иÑ?оваÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: src/x_multiattrib.c:1632
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1622
 msgid "Value"
 msgstr "Ð?наÑ?ение"
 
-#: src/x_multiattrib.c:1654
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1644
 msgid "Vis?"
 msgstr "Ð?идим?"
 
-#: src/x_multiattrib.c:1674
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1664
 msgid "N"
 msgstr ""
 
-#: src/x_multiattrib.c:1694
+#. GtkTreeViewColumn
+#: ../src/x_multiattrib.c:1684
 msgid "V"
 msgstr ""
 
-#: src/x_multiattrib.c:1715
+#: ../src/x_multiattrib.c:1705
 msgid "Add Attribute"
 msgstr "Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#: src/x_pagesel.c:263
+#: ../src/x_pagesel.c:264
 msgid "Discard Page"
 msgstr "Ð?Ñ?веÑ?гнÑ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: src/x_pagesel.c:382
+#: ../src/x_pagesel.c:383
 msgid "Page Manager"
 msgstr "Ð?енеджеÑ? Ñ?Ñ?Ñ?аниÑ?"
 
-#: src/x_pagesel.c:438
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:439
 msgid "Filename"
 msgstr "Ð?мÑ? Ñ?айла"
 
-#: src/x_pagesel.c:454
+#. GtkTreeViewColumn
+#: ../src/x_pagesel.c:455
 msgid "Changed"
 msgstr "Ð?зменено"
 
-#: src/x_pagesel.c:474
+#. GtkLabel
+#: ../src/x_pagesel.c:475
 msgid "Right click on the filename for more options..."
 msgstr "ЩелкниÑ?е пÑ?авой кнопкой на имени Ñ?айла длÑ? дополниÑ?елÑ?нÑ?Ñ? опÑ?ий..."
 
-#: src/x_print.c:89
+#: ../src/x_print.c:90
 #, fuzzy
 msgid "Select PostScript Filename..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? PostScript как..."
 
-#: src/x_print.c:171
+#: ../src/x_print.c:172
 msgid "Extents with margins"
 msgstr "РаÑ?Ñ?иÑ?иÑ?Ñ? Ñ? полÑ?ми"
 
-#: src/x_print.c:177
+#: ../src/x_print.c:178
 msgid "Extents no margins"
 msgstr "РаÑ?Ñ?иÑ?иÑ?Ñ? без полей"
 
-#: src/x_print.c:183
+#: ../src/x_print.c:184
 msgid "Current Window"
 msgstr "ТекÑ?Ñ?ее окно"
 
-#: src/x_print.c:217
+#: ../src/x_print.c:218
 msgid "Landscape"
 msgstr "Ð?лÑ?бом"
 
-#: src/x_print.c:223
+#: ../src/x_print.c:224
 msgid "Portrait"
 msgstr "Ð?оÑ?Ñ?Ñ?еÑ?"
 
-#: src/x_print.c:291
+#. Upper frame
+#: ../src/x_print.c:292
 msgid "Settings"
 msgstr "УÑ?Ñ?ановки"
 
-#: src/x_print.c:303
+#: ../src/x_print.c:304
 #, fuzzy
 msgid "Output paper size:"
 msgstr "РазмеÑ? бÑ?маги длÑ? пеÑ?аÑ?и"
 
-#: src/x_print.c:325
+#: ../src/x_print.c:326
 #, fuzzy
 msgid "Orientation:"
 msgstr "Ð?Ñ?иенÑ?аÑ?иÑ?"
 
-#: src/x_print.c:337
+#. Lower frame
+#: ../src/x_print.c:338
 msgid "Destination"
 msgstr "Ð?азнаÑ?ение"
 
-#: src/x_print.c:350
+#: ../src/x_print.c:351
 #, fuzzy
 msgid "File:"
 msgstr "Файл"
 
-#: src/x_print.c:380
+#: ../src/x_print.c:381
 #, fuzzy
 msgid "Command:"
 msgstr "Ð?оманда"
 
-#: src/x_print.c:750
+#: ../src/x_print.c:751
 msgid "No print destination specified\n"
 msgstr "Ð?е Ñ?казано назнаÑ?ение длÑ? пеÑ?аÑ?и\n"
 
-#: src/x_print.c:757
+#: ../src/x_print.c:758
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Ð?евозможно Ñ?аÑ?пеÑ?аÑ?аÑ?Ñ? Ñ?екÑ?Ñ?Ñ?Ñ? Ñ?Ñ?емÑ? на [%s]\n"
 
-#: src/x_print.c:766
+#: ../src/x_print.c:767
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
 "Check the log window for more information"
 msgstr ""
 
-#: src/x_print.c:773
+#: ../src/x_print.c:774
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "ТекÑ?Ñ?аÑ? Ñ?Ñ?ема Ñ?аÑ?пеÑ?аÑ?ана на [%s]\n"
 
-#: src/x_window.c:176
+#: ../src/x_window.c:86
 msgid "black"
 msgstr "Ñ?еÑ?нÑ?й"
 
-#: src/x_window.c:185
+#: ../src/x_window.c:95
 msgid "white"
 msgstr "белÑ?й"
 
-#: src/x_window.c:219
+#: ../src/x_window.c:129
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? gc\n"
 
-#: src/x_window.c:232
+#: ../src/x_window.c:142
 #, c-format
 msgid "Couldn't allocate xor_gc\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? xor_gc\n"
 
-#: src/x_window.c:245
+#: ../src/x_window.c:155
 #, c-format
 msgid "Couldn't allocate outline_xor_gc\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? outline_xor_gc\n"
 
-#: src/x_window.c:261
+#: ../src/x_window.c:171
 #, c-format
 msgid "Couldn't allocate bounding_xor_gc\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? bounding_xor_gc\n"
 
-#: src/x_window.c:268
+#: ../src/x_window.c:178
 #, c-format
 msgid "Couldn't allocate bus_gc\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? bus_gc\n"
 
-#: src/x_window.c:490
+#: ../src/x_window.c:402
 msgid "New file"
 msgstr "Ð?овÑ?й Ñ?айл"
 
-#: src/x_window.c:496
+#: ../src/x_window.c:408
 msgid "Open"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?"
 
-#: src/x_window.c:497
+#: ../src/x_window.c:409
 msgid "Open file..."
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? Ñ?айл..."
 
-#: src/x_window.c:503
+#: ../src/x_window.c:415
 msgid "Save"
 msgstr "СоÑ?Ñ?аниÑ?Ñ?"
 
-#: src/x_window.c:504
+#: ../src/x_window.c:416
 msgid "Save file"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?айл"
 
-#: src/x_window.c:512
+#: ../src/x_window.c:424
 msgid "Undo last operation"
 msgstr "Ð?Ñ?мениÑ?Ñ? поÑ?леднее дейÑ?Ñ?вие"
 
-#: src/x_window.c:519
+#: ../src/x_window.c:431
 msgid "Redo last undo"
 msgstr "Ð?овÑ?оÑ?иÑ?Ñ? оÑ?мененное дейÑ?Ñ?вие"
 
-#: src/x_window.c:528
+#: ../src/x_window.c:440
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2272,7 +2315,7 @@ msgstr ""
 "Ñ?елкниÑ?е длÑ? Ñ?Ñ?Ñ?ановки\n"
 "Ð?Ñ?аваÑ? кнопка мÑ?Ñ?и длÑ? оÑ?менÑ?"
 
-#: src/x_window.c:538
+#: ../src/x_window.c:450
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2280,7 +2323,7 @@ msgstr ""
 "Ð?обавиÑ?Ñ? пÑ?оводники\n"
 "Ð?Ñ?аваÑ? кнопка мÑ?Ñ?и длÑ? оÑ?менÑ?"
 
-#: src/x_window.c:548
+#: ../src/x_window.c:460
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2288,76 +2331,114 @@ msgstr ""
 "Ð?обавиÑ?Ñ? Ñ?инÑ?\n"
 "Ð?Ñ?аваÑ? кнопка мÑ?Ñ?и длÑ? оÑ?менÑ?"
 
-#: src/x_window.c:555
+#: ../src/x_window.c:467
 msgid "Text"
 msgstr "ТекÑ?Ñ?"
 
-#: src/x_window.c:556
+#: ../src/x_window.c:468
 msgid "Add Text..."
 msgstr "Ð?обавиÑ?Ñ? Ñ?екÑ?Ñ?..."
 
-#: src/x_window.c:566
+#: ../src/x_window.c:478
 msgid "Select"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ?"
 
-#: src/x_window.c:567
+#: ../src/x_window.c:479
 msgid "Select mode"
 msgstr "Режим вÑ?боÑ?ки"
 
-#: src/x_window.c:642
+#: ../src/x_window.c:554
 msgid "Pick"
 msgstr ""
 
-#: src/x_window.c:658
+#: ../src/x_window.c:570
 msgid "Repeat/none"
 msgstr "Ð?овÑ?оÑ?/пÑ?Ñ?Ñ?о"
 
-#: src/x_window.c:668
+#: ../src/x_window.c:580
 msgid "Menu/Cancel"
 msgstr "Ð?енÑ?/Ð?Ñ?мена"
 
-#: src/x_window.c:670
+#: ../src/x_window.c:582
 msgid "Pan/Cancel"
 msgstr "ЦенÑ?Ñ?/Ð?Ñ?мена"
 
-#: src/x_window.c:926
+#: ../src/x_window.c:809
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Ð?агÑ?Ñ?жаеÑ?Ñ?Ñ? Ñ?Ñ?ема [%s]\n"
 
-#: src/x_window.c:1028
+#: ../src/x_window.c:821
+#, fuzzy
+msgid "Failed to load file"
+msgstr "Ð?евозможно загÑ?зиÑ?аÑ?Ñ? изобÑ?ажение: [%s]"
+
+#: ../src/x_window.c:830
+#, fuzzy, c-format
+msgid "New file [%s]\n"
+msgstr "Ð?овÑ?й Ñ?айл"
+
+#. an error occured when saving page to file
+#: ../src/x_window.c:936
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Ð?евозможно Ñ?оÑ?Ñ?аниÑ?Ñ? [%s]\n"
 
-#: src/x_window.c:1029
+#: ../src/x_window.c:937
 msgid "Error while trying to save"
 msgstr "Ð?Ñ?ибка пÑ?и попÑ?Ñ?ке Ñ?оÑ?Ñ?анениÑ?"
 
-#: src/x_window.c:1038
+#: ../src/x_window.c:946
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "Ð?апиÑ?ано как [%s]\n"
 
-#: src/x_window.c:1040
+#: ../src/x_window.c:948
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "СоÑ?Ñ?анено [%s]\n"
 
-#: src/x_window.c:1042
+#: ../src/x_window.c:950
 msgid "Saved"
 msgstr "СоÑ?Ñ?анено"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Ð?Ñ?веÑ?жение Ñ?Ñ?Ñ?аниÑ?Ñ? [%s]\n"
 
-#: src/x_window.c:1103
+#: ../src/x_window.c:1016
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Ð?акÑ?Ñ?Ñ?ие [%s]\n"
 
+#: ../data/geda-gschem.desktop.in.h:1
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
+#: ../data/geda-gschem.desktop.in.h:2
+#, fuzzy
+msgid "gEDA Schematic Editor"
+msgstr "Ð?глÑ?бÑ? Ñ?Ñ?емÑ?"
+
+#~ msgid "Attribute Mode"
+#~ msgstr "Режим аÑ?Ñ?ибÑ?Ñ?ов"
+
+#~ msgid "ERROR! you can't get an attribute without an ='s\n"
+#~ msgstr "Ð?Ñ?ибка! Ð?Ñ? не можеÑ?е полÑ?Ñ?иÑ?Ñ? аÑ?Ñ?ибÑ?Ñ? без знака '='\n"
+
+#~ msgid "Got NULL in o_complex_translate_display_selection\n"
+#~ msgstr "Ð?олÑ?Ñ?ен NULL в o_complex_translate_display_selection\n"
+
+#~ msgid "Got NULL in o_complex_translate_selection!\n"
+#~ msgstr "Ð?олÑ?Ñ?ен NULL в in o_complex_translate_selection!\n"
+
+#~ msgid "ERROR: NULL object in o_rotate_90!\n"
+#~ msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в o_rotate_90!\n"
+
+#~ msgid "ERROR: NULL object in o_mirror!\n"
+#~ msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в o_mirror!\n"
+
 #~ msgid "Invalid mode [%s] passed to %s\n"
 #~ msgstr "Ð?евеÑ?нÑ?й Ñ?ежим [%s] пÑ?и обÑ?абоÑ?ке %s\n"
 
diff --git a/libgeda/po/en_GB.po b/libgeda/po/en_GB.po
index 97ce14c..2aecd68 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: 2007-12-29 11:17+0000\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-12-29 11:21+0100\n"
 "Last-Translator: Peter Clifton <pcjc2@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -97,8 +97,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:113
-#: ../src/f_basic.c:126
+#: ../src/f_basic.c:113 ../src/f_basic.c:126
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "Failed to stat [%s]: %s"
@@ -121,12 +120,20 @@ 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:248
-msgid "The backup copy is newer than the schematic, so it seems you should load it instead of the original file.\n"
-msgstr "The backup copy is newer than the schematic, so it seems you should load it instead of the original file.\n"
+msgid ""
+"The backup copy is newer than the schematic, so it seems you should load it "
+"instead of the original file.\n"
+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:250
-msgid "Gschem usually makes backup copies automatically, and this situation happens when it crashed or it was forced to exit abruptly.\n"
-msgstr "Gschem usually makes backup copies automatically, and this situation happens when it crashed or it was forced to exit abruptly.\n"
+msgid ""
+"Gschem usually makes backup copies automatically, and this situation happens "
+"when it crashed or it was forced to exit abruptly.\n"
+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:253
 msgid ""
@@ -153,8 +160,7 @@ msgstr "Can't get the real filename of %s.\n"
 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:394
-#: ../src/f_basic.c:395
+#: ../src/f_basic.c:394 ../src/f_basic.c:395
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "Can't save backup file: %s."
@@ -164,15 +170,13 @@ msgstr "Can't save backup file: %s."
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Could NOT set backup file [%s] readonly\n"
 
-#: ../src/f_basic.c:540
-#: ../src/f_basic.c:541
+#: ../src/f_basic.c:540 ../src/f_basic.c:541
 #, c-format
 msgid "Could not read symbolic link information for %s"
 msgstr "Could not read symbolic link information for %s"
 
 #. Too many symlinks
-#: ../src/f_basic.c:581
-#: ../src/f_basic.c:582
+#: ../src/f_basic.c:581 ../src/f_basic.c:582
 #, c-format
 msgid "The file has too many symbolic links."
 msgstr "The file has too many symbolic links."
@@ -192,8 +196,10 @@ msgid "Error during reading of the prolog file `%s' in f_print_header()\n"
 msgstr "Error during reading of the prolog file `%s' in f_print_header()\n"
 
 #: ../src/f_print.c:163
-msgid "Error during writing of the output postscript file in f_print_header()\n"
-msgstr "Error during writing of the output postscript file in f_print_header()\n"
+msgid ""
+"Error during writing of the output postscript file in f_print_header()\n"
+msgstr ""
+"Error during writing of the output postscript file in f_print_header()\n"
 
 #: ../src/f_print.c:176
 msgid "Giving up on printing\n"
@@ -257,39 +263,25 @@ msgstr "Could not find any %s file!\n"
 msgid "Could not find a %s file\n"
 msgstr "Could not find a %s file\n"
 
-#: ../src/o_arc_basic.c:290
-#: ../src/o_arc_basic.c:292
+#: ../src/o_arc_basic.c:290 ../src/o_arc_basic.c:292
 #, c-format
 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:297
-#: ../src/o_arc_basic.c:298
-#: ../src/o_box_basic.c:343
-#: ../src/o_box_basic.c:344
-#: ../src/o_bus_basic.c:160
-#: ../src/o_bus_basic.c:161
-#: ../src/o_circle_basic.c:298
-#: ../src/o_circle_basic.c:299
-#: ../src/o_line_basic.c:295
-#: ../src/o_line_basic.c:296
-#: ../src/o_net_basic.c:169
-#: ../src/o_net_basic.c:170
-#: ../src/o_pin_basic.c:165
-#: ../src/o_pin_basic.c:166
-#: ../src/o_text_basic.c:1121
+#: ../src/o_arc_basic.c:297 ../src/o_arc_basic.c:298 ../src/o_box_basic.c:343
+#: ../src/o_box_basic.c:344 ../src/o_bus_basic.c:160 ../src/o_bus_basic.c:161
+#: ../src/o_circle_basic.c:298 ../src/o_circle_basic.c:299
+#: ../src/o_line_basic.c:295 ../src/o_line_basic.c:296
+#: ../src/o_net_basic.c:169 ../src/o_net_basic.c:170 ../src/o_pin_basic.c:165
+#: ../src/o_pin_basic.c:166 ../src/o_text_basic.c:1121
 #: ../src/o_text_basic.c:1122
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Found an invalid colour [ %s ]\n"
 
-#: ../src/o_arc_basic.c:299
-#: ../src/o_box_basic.c:345
-#: ../src/o_bus_basic.c:162
-#: ../src/o_circle_basic.c:300
-#: ../src/o_line_basic.c:297
-#: ../src/o_net_basic.c:171
-#: ../src/o_pin_basic.c:167
+#: ../src/o_arc_basic.c:299 ../src/o_box_basic.c:345 ../src/o_bus_basic.c:162
+#: ../src/o_circle_basic.c:300 ../src/o_line_basic.c:297
+#: ../src/o_net_basic.c:171 ../src/o_pin_basic.c:167
 #: ../src/o_text_basic.c:1123
 msgid "Setting color to WHITE\n"
 msgstr "Setting colour to WHITE\n"
@@ -299,8 +291,7 @@ msgstr "Setting colour to WHITE\n"
 msgid "Found an improper attribute: _%s_\n"
 msgstr "Found an improper attribute: _%s_\n"
 
-#: ../src/o_attrib.c:1695
-#: ../src/o_attrib.c:1848
+#: ../src/o_attrib.c:1695 ../src/o_attrib.c:1848
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "Did not find slotdef=#:#,#,#... attribute\n"
 
@@ -309,18 +300,15 @@ msgstr "Did not find slotdef=#:#,#,#... attribute\n"
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Improper slotdef syntax: missing \":\".\n"
 
-#: ../src/o_attrib.c:1716
-#: ../src/o_attrib.c:1867
+#: ../src/o_attrib.c:1716 ../src/o_attrib.c:1867
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "Did not find proper slotdef=#:#,#,#... attribute\n"
 
-#: ../src/o_attrib.c:1801
-#: ../src/o_attrib.c:1901
+#: ../src/o_attrib.c:1801 ../src/o_attrib.c:1901
 msgid "component missing pinseq= attribute\n"
 msgstr "component missing pinseq= attribute\n"
 
-#: ../src/o_basic.c:189
-#: ../src/o_basic.c:201
+#: ../src/o_basic.c:189 ../src/o_basic.c:201
 msgid "Invalid space specified, setting to 100\n"
 msgstr "Invalid space specified, setting to 100\n"
 
@@ -328,20 +316,17 @@ msgstr "Invalid space specified, setting to 100\n"
 msgid "Invalid length specified, setting to 100\n"
 msgstr "Invalid length specified, setting to 100\n"
 
-#: ../src/o_box_basic.c:336
-#: ../src/o_box_basic.c:338
+#: ../src/o_box_basic.c:336 ../src/o_box_basic.c:338
 #, c-format
 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:149
-#: ../src/o_bus_basic.c:151
+#: ../src/o_bus_basic.c:149 ../src/o_bus_basic.c:151
 #, 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:167
-#: ../src/o_bus_basic.c:168
+#: ../src/o_bus_basic.c:167 ../src/o_bus_basic.c:168
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr "Found an invalid bus ripper direction [ %s ]\n"
@@ -354,23 +339,22 @@ msgstr "Resetting direction to neutral (no direction)\n"
 msgid "Null radius circles are not allowed\n"
 msgstr "Null radius circles are not allowed\n"
 
-#: ../src/o_circle_basic.c:290
-#: ../src/o_circle_basic.c:292
+#: ../src/o_circle_basic.c:290 ../src/o_circle_basic.c:292
 #, c-format
 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:716
-#: ../src/o_complex_basic.c:717
+#: ../src/o_complex_basic.c:716 ../src/o_complex_basic.c:717
 #, 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:730
-#: ../src/o_complex_basic.c:732
+#: ../src/o_complex_basic.c:730 ../src/o_complex_basic.c:732
 #, 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"
+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:1431
 #, c-format
@@ -403,13 +387,14 @@ msgstr ""
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
-"\tsymversion=%s attached to instantiated symbol, but no symversion= inside symbol file\n"
+"\tsymversion=%s attached to instantiated symbol, but no symversion= inside "
+"symbol file\n"
 msgstr ""
 "WARNING: Symbol version oddity on refdes %s:\n"
-"\tsymversion=%s attached to instantiated symbol, but no symversion= inside symbol file\n"
+"\tsymversion=%s attached to instantiated symbol, but no symversion= inside "
+"symbol file\n"
 
-#: ../src/o_complex_basic.c:1491
-#: ../src/o_complex_basic.c:1495
+#: ../src/o_complex_basic.c:1491 ../src/o_complex_basic.c:1495
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -428,8 +413,7 @@ msgstr "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f)!\n"
 msgstr "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f)!\n"
 
-#: ../src/o_complex_basic.c:1544
-#: ../src/o_complex_basic.c:1547
+#: ../src/o_complex_basic.c:1544 ../src/o_complex_basic.c:1547
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr "\tMinor version change (file %.3f, instantiated %.3f)\n"
@@ -451,40 +435,39 @@ msgstr "Component [%s] has been embedded\n"
 #. symbol not found in the symbol library: signal an error
 #: ../src/o_embed.c:85
 #, c-format
-msgid "Could not find component [%s], while trying to unembed. Component is still embedded\n"
-msgstr "Could not find component [%s], while trying to unembed. Component is still embedded\n"
+msgid ""
+"Could not find component [%s], while trying to unembed. Component is still "
+"embedded\n"
+msgstr ""
+"Could not find component [%s], while trying to unembed. Component is still "
+"embedded\n"
 
 #: ../src/o_embed.c:93
 #, c-format
 msgid "Component [%s] has been successfully unembedded\n"
 msgstr "Component [%s] has been successfully unembedded\n"
 
-#: ../src/o_line_basic.c:288
-#: ../src/o_line_basic.c:290
+#: ../src/o_line_basic.c:288 ../src/o_line_basic.c:290
 #, c-format
 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:157
-#: ../src/o_net_basic.c:159
+#: ../src/o_net_basic.c:157 ../src/o_net_basic.c:159
 #, 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:83
-#: ../src/o_picture.c:85
+#: ../src/o_picture.c:83 ../src/o_picture.c:85
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Error reading picture definition line: %s.\n"
 
-#: ../src/o_picture.c:99
-#: ../src/o_picture.c:101
+#: ../src/o_picture.c:99 ../src/o_picture.c:101
 #, 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:106
-#: ../src/o_picture.c:108
+#: ../src/o_picture.c:106 ../src/o_picture.c:108
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr "Found a picture with a wrong 'mirrored' parameter: %c.\n"
@@ -493,8 +476,7 @@ msgstr "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgid "Setting mirrored to 0\n"
 msgstr "Setting mirrored to 0\n"
 
-#: ../src/o_picture.c:115
-#: ../src/o_picture.c:117
+#: ../src/o_picture.c:115 ../src/o_picture.c:117
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr "Found a picture with a wrong 'embedded' parameter: %c.\n"
@@ -503,20 +485,16 @@ msgstr "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgid "Setting embedded to 0\n"
 msgstr "Setting embedded to 0\n"
 
-#: ../src/o_picture.c:131
-#: ../src/o_picture.c:132
+#: ../src/o_picture.c:131 ../src/o_picture.c:132
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr "Found an unsupported picture angle [ %d ]\n"
 
-#: ../src/o_picture.c:133
-#: ../src/o_text_basic.c:1091
+#: ../src/o_picture.c:133 ../src/o_text_basic.c:1091
 msgid "Setting angle to 0\n"
 msgstr "Setting angle to 0\n"
 
-#: ../src/o_picture.c:168
-#: ../src/o_picture.c:179
-#: ../src/o_picture.c:949
+#: ../src/o_picture.c:168 ../src/o_picture.c:179 ../src/o_picture.c:949
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Failed to load image from embedded data [%s]: %s\n"
@@ -525,33 +503,26 @@ msgstr "Failed to load image from embedded data [%s]: %s\n"
 msgid "Base64 decoding failed."
 msgstr "Base64 decoding failed."
 
-#: ../src/o_picture.c:170
-#: ../src/o_picture.c:181
-#: ../src/o_picture.c:951
+#: ../src/o_picture.c:170 ../src/o_picture.c:181 ../src/o_picture.c:951
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Falling back to file loading. Picture unembedded.\n"
 
-#: ../src/o_picture.c:192
-#: ../src/o_picture.c:937
-#: ../src/o_picture.c:984
+#: ../src/o_picture.c:192 ../src/o_picture.c:937 ../src/o_picture.c:984
 #, 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:203
-#: ../src/o_picture.c:204
+#: ../src/o_picture.c:203 ../src/o_picture.c:204
 #, c-format
 msgid "Loading warning picture.\n"
 msgstr "Loading warning picture.\n"
 
-#: ../src/o_picture.c:210
-#: ../src/o_picture.c:212
+#: ../src/o_picture.c:210 ../src/o_picture.c:212
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Error loading picture from file: %s.\n"
 
-#: ../src/o_picture.c:272
-#: ../src/o_picture.c:273
+#: ../src/o_picture.c:272 ../src/o_picture.c:273
 #, c-format
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "ERROR: o_picture_save: unable to encode the picture.\n"
@@ -566,8 +537,7 @@ msgstr "Picture [%s] has been embedded\n"
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Picture [%s] has been unembedded\n"
 
-#: ../src/o_pin_basic.c:141
-#: ../src/o_pin_basic.c:143
+#: ../src/o_pin_basic.c:141 ../src/o_pin_basic.c:143
 #, c-format
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
@@ -576,14 +546,12 @@ msgstr ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
 
-#: ../src/o_pin_basic.c:147
-#: ../src/o_pin_basic.c:149
+#: ../src/o_pin_basic.c:147 ../src/o_pin_basic.c:149
 #, 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:160
-#: ../src/o_pin_basic.c:161
+#: ../src/o_pin_basic.c:160 ../src/o_pin_basic.c:161
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Found a zero length pin: [ %s ]\n"
@@ -598,20 +566,17 @@ msgstr "Could not find character '%s' definition.\n"
 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:1074
-#: ../src/o_text_basic.c:1075
+#: ../src/o_text_basic.c:1074 ../src/o_text_basic.c:1075
 #, 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:1087
-#: ../src/o_text_basic.c:1089
+#: ../src/o_text_basic.c:1087 ../src/o_text_basic.c:1089
 #, 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:1111
-#: ../src/o_text_basic.c:1113
+#: ../src/o_text_basic.c:1111 ../src/o_text_basic.c:1113
 #, 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"
@@ -669,15 +634,16 @@ msgstr "Failed to scan library [%s]: Scheme function returned non-list\n"
 msgid "Non-string symbol name while scanning library [%s]\n"
 msgstr "Non-string symbol name while scanning library [%s]\n"
 
-#: ../src/s_clib.c:882
-#: ../src/s_clib.c:929
+#: ../src/s_clib.c:882 ../src/s_clib.c:929
 msgid "Cannot add library: name not specified\n"
 msgstr "Cannot add library: name not specified\n"
 
 #: ../src/s_clib.c:889
 #, c-format
-msgid "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
-msgstr "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
+msgid ""
+"Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
+msgstr ""
+"Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
 
 #: ../src/s_clib.c:937
 #, c-format
@@ -767,18 +733,18 @@ msgstr "Could NOT save [%s]\n"
 msgid "Found [%s]\n"
 msgstr "Found [%s]\n"
 
-#: ../src/s_slib.c:204
-#: ../src/s_slib.c:207
+#: ../src/s_slib.c:204 ../src/s_slib.c:207
 #, c-format
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "Could not find [%s] in any SourceLibrary\n"
 
 #~ msgid "Error decoding picture.\n"
 #~ msgstr "Error decoding picture.\n"
+
 #~ msgid "Error deserializing picture.\n"
 #~ msgstr "Error deserialising picture.\n"
+
 #~ msgid ""
 #~ "ERROR: o_picture_save: failed to create serialized data from picture\n"
 #~ msgstr ""
 #~ "ERROR: o_picture_save: failed to create serialised data from picture\n"
-
diff --git a/libgeda/po/es_ES.po b/libgeda/po/es_ES.po
index 8243e5a..496b558 100644
--- a/libgeda/po/es_ES.po
+++ b/libgeda/po/es_ES.po
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgeda\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-27 19:16+0100\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-12-28 19:50+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"
@@ -118,22 +118,25 @@ msgstr ""
 
 #: ../src/f_basic.c:246
 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"
+msgstr ""
+"No se ha podido averiguar si es más reciente, así que lo tendrá que hacer "
+"usted manualmente.\n"
 
 #: ../src/f_basic.c:248
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
 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"
+"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:250
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
-msgstr "Gschem normalmente realiza copias de seguridad automáticamente y esta situación"
-"ocurre cuando ha fallado o se ha forzado una salida abrupta.\n"
+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:253
 msgid ""
@@ -158,7 +161,9 @@ msgstr "No se puede averiguar el nombre real del archivo %s.\n"
 #: ../src/f_basic.c:388
 #, 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 en modo de lectura-escritura\n"
+msgstr ""
+"No se ha podido poner el archivo de copia de seguridad anterior en modo de "
+"lectura-escritura\n"
 
 #: ../src/f_basic.c:394 ../src/f_basic.c:395
 #, c-format
@@ -168,7 +173,9 @@ msgstr "No se puede guardar la copia de seguridad: %s"
 #: ../src/f_basic.c:405
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
-msgstr "No se ha podido poner el archivo de copia de seguridad anterior en modo de sólo lectura\n"
+msgstr ""
+"No se ha podido poner el archivo de copia de seguridad anterior en modo de "
+"sólo lectura\n"
 
 #: ../src/f_basic.c:540 ../src/f_basic.c:541
 #, c-format
@@ -188,7 +195,8 @@ msgstr "Imposible obtener la hora en f_print_header()\n"
 #: ../src/f_print.c:143
 #, 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"
+msgstr ""
+"Imposible abrir el archivo de prólogo '%s' para lectura en f_print_header()\n"
 
 #: ../src/f_print.c:157
 #, c-format
@@ -266,7 +274,8 @@ msgstr "No se puede encontrar el archivo %s\n"
 #: ../src/o_arc_basic.c:290 ../src/o_arc_basic.c:292
 #, c-format
 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"
+msgstr ""
+"Se ha encontrado un arco con radio cero [ %c %d, %d, %d, %d, %d, %d ]\n"
 
 #: ../src/o_arc_basic.c:297 ../src/o_arc_basic.c:298 ../src/o_box_basic.c:343
 #: ../src/o_box_basic.c:344 ../src/o_bus_basic.c:160 ../src/o_bus_basic.c:161
@@ -319,7 +328,9 @@ msgstr "Se ha especificado una longitud no válida, se corrige a 100\n"
 #: ../src/o_box_basic.c:336 ../src/o_box_basic.c:338
 #, c-format
 msgid "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
-msgstr "Se ha encontrado un rectángulo con altura o anchura cero [ %c %d %d %d %d %d ]\n"
+msgstr ""
+"Se ha encontrado un rectángulo con altura o anchura cero [ %c %d %d %d %d %"
+"d ]\n"
 
 #: ../src/o_bus_basic.c:149 ../src/o_bus_basic.c:151
 #, c-format
@@ -329,7 +340,9 @@ msgstr "Se ha encontrado un bus de longitud cero [ %c %d %d %d %d %d ]\n"
 #: ../src/o_bus_basic.c:167 ../src/o_bus_basic.c:168
 #, 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"
+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:169
 msgid "Resetting direction to neutral (no direction)\n"
@@ -347,14 +360,17 @@ msgstr "Se ha encontrado un círculo con radio cero [ %c %d %d %d %d ]\n"
 #: ../src/o_complex_basic.c:716 ../src/o_complex_basic.c:717
 #, 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"
+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:730 ../src/o_complex_basic.c:732
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
-"Se ha encontrado un componente con un atributo de simetría no válido [ %c %d %d %d %d %d %s ]\n"
+"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:1431
 #, c-format
@@ -390,9 +406,10 @@ msgid ""
 "\tsymversion=%s attached to instantiated symbol, but no symversion= inside "
 "symbol file\n"
 msgstr ""
-"ADVERTENCIA: Se ha encontrado algo extraño en la versión de símbolo de la referencia %s:\n"
-"\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"
+"ADVERTENCIA: Se ha encontrado algo extraño en la versión de símbolo de la "
+"referencia %s:\n"
+"\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:1491 ../src/o_complex_basic.c:1495
 #, c-format
@@ -400,13 +417,16 @@ msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
 "\tSymbol in library is newer than instantiated symbol\n"
 msgstr ""
-"ADVERTENCIA: Las versiones de los símbolos no coinciden para la referencia %s (%s):\n"
-"\t El símbolo en la librería es más reciente que el instanciado en el esquema\n"
+"ADVERTENCIA: Las versiones de los símbolos no coinciden para la referencia %"
+"s (%s):\n"
+"\t El símbolo en la librería es más reciente que el instanciado en el "
+"esquema\n"
 
 #: ../src/o_complex_basic.c:1523
 #, 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"
+msgstr ""
+"\t¡CAMBIO DE VERSI�N IMPORTANTE (archivo %.3f, instanciado %.3f, %s)!\n"
 
 #: ../src/o_complex_basic.c:1526
 #, c-format
@@ -424,7 +444,8 @@ msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
 "\tInstantiated symbol is newer than symbol in library\n"
 msgstr ""
-"ADVERTENCIA: Se ha encontrado algo extraño en la versión de símbolo de la referencia %s:\n"
+"ADVERTENCIA: Se ha encontrado algo extraño en la versión de símbolo de la "
+"referencia %s:\n"
 "\tEl símbolo instanciado es más reciente que el símbolo en la librería\n"
 
 #: ../src/o_embed.c:49
@@ -432,31 +453,21 @@ msgstr ""
 msgid "Component [%s] has been embedded\n"
 msgstr "Se ha incrustado el componente [%s]\n"
 
-#: ../src/o_embed.c:62
-#, c-format
-msgid "Picture [%s] has been embedded\n"
-msgstr "Se ha incrustado la imagen [%s]\n"
-
 #. symbol not found in the symbol library: signal an error
-#: ../src/o_embed.c:91
+#: ../src/o_embed.c:85
 #, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
 "embedded\n"
 msgstr ""
-"No se puede encontrar el componente [%s], al intentar desincrustarlo."
-"El componente permanece todavía incrustado\n"
+"No se puede encontrar el componente [%s], al intentar desincrustarlo.El "
+"componente permanece todavía incrustado\n"
 
-#: ../src/o_embed.c:99
+#: ../src/o_embed.c:93
 #, c-format
 msgid "Component [%s] has been successfully unembedded\n"
 msgstr "Se ha desincrustado satisfactoriamente el componente [%s]\n"
 
-#: ../src/o_embed.c:114
-#, c-format
-msgid "Picture [%s] has been unembedded\n"
-msgstr "Se ha desincrustado la imagen [%s]\n"
-
 #: ../src/o_line_basic.c:288 ../src/o_line_basic.c:290
 #, c-format
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
@@ -465,76 +476,93 @@ msgstr "Se ha encontrado una línea con longitud cero [ %c %d %d %d %d %d ]\n"
 #: ../src/o_net_basic.c:157 ../src/o_net_basic.c:159
 #, 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"
+msgstr ""
+"Se ha encontrado una conexión con longitud cero [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:80 ../src/o_picture.c:82
+#: ../src/o_picture.c:83 ../src/o_picture.c:85
 #, 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:96 ../src/o_picture.c:98
+#: ../src/o_picture.c:99 ../src/o_picture.c:101
 #, 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"
+msgstr ""
+"Se ha encontrado una imagen con altura ó anchura cero [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:103 ../src/o_picture.c:105
+#: ../src/o_picture.c:106 ../src/o_picture.c:108
 #, 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"
+msgstr ""
+"Se ha encontrado una imagen con el parámetro 'volteado' incorrecto: %c.\n"
 
-#: ../src/o_picture.c:107
+#: ../src/o_picture.c:110
 msgid "Setting mirrored to 0\n"
 msgstr "Cambiando el parámetro 'volteado' a 0\n"
 
-#: ../src/o_picture.c:112 ../src/o_picture.c:114
+#: ../src/o_picture.c:115 ../src/o_picture.c:117
 #, 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"
+msgstr ""
+"Se ha encontrado una imagen con el parámetro 'incrustado' incorrecto: %c.\n"
 
-#: ../src/o_picture.c:116
+#: ../src/o_picture.c:119
 msgid "Setting embedded to 0\n"
 msgstr "Cambiando el parámetro 'incrustado' a 0\n"
 
-#: ../src/o_picture.c:128 ../src/o_picture.c:129
+#: ../src/o_picture.c:131 ../src/o_picture.c:132
 #, 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"
+msgstr ""
+"Se ha encontrado una imagen con un ángulo de rotación no válido [ %d ]\n"
 
-#: ../src/o_picture.c:130 ../src/o_text_basic.c:1091
+#: ../src/o_picture.c:133 ../src/o_text_basic.c:1091
 msgid "Setting angle to 0\n"
 msgstr "Cambiando el parámetro 'ángulo' a 0\n"
 
-#: ../src/o_picture.c:144 ../src/o_picture.c:145 ../src/o_picture.c:208
-#: ../src/o_picture.c:210
-#, 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:168 ../src/o_picture.c:179 ../src/o_picture.c:949
+#, fuzzy, c-format
+msgid "Failed to load image from embedded data [%s]: %s\n"
+msgstr "Error al cargar símbolo desde el archivo [%s]: %s\n"
 
-#: ../src/o_picture.c:175 ../src/o_picture.c:176
-#, c-format
-msgid "Error decoding picture.\n"
-msgstr "Error al decodificar una imagen.\n"
+#: ../src/o_picture.c:169
+msgid "Base64 decoding failed."
+msgstr ""
 
-#: ../src/o_picture.c:182
-#, c-format
-msgid "Error deserializing picture.\n"
-msgstr "Error de-serializando una imagen\n"
+#: ../src/o_picture.c:170 ../src/o_picture.c:181 ../src/o_picture.c:951
+msgid "Falling back to file loading. Picture unembedded.\n"
+msgstr ""
+
+#: ../src/o_picture.c:192 ../src/o_picture.c:937 ../src/o_picture.c:984
+#, fuzzy, c-format
+msgid "Failed to load image from file [%s]: %s\n"
+msgstr "Error al cargar símbolo desde el archivo [%s]: %s\n"
 
-#: ../src/o_picture.c:201 ../src/o_picture.c:202
+#: ../src/o_picture.c:203 ../src/o_picture.c:204
 #, c-format
 msgid "Loading warning picture.\n"
 msgstr "Cargando imagen de advertencia.\n"
 
-#: ../src/o_picture.c:275 ../src/o_picture.c:276
+#: ../src/o_picture.c:210 ../src/o_picture.c:212
 #, c-format
-msgid "ERROR: o_picture_save: failed to create serialized data from picture\n"
-msgstr "ERROR: o_picture_save: se ha producido un error al de-serializar los datos desde una imagen\n"
+msgid "Error loading picture from file: %s.\n"
+msgstr "Error al cargar la imagen desde el fichero: %s\n"
 
-#: ../src/o_picture.c:284 ../src/o_picture.c:285
+#: ../src/o_picture.c:272 ../src/o_picture.c:273
 #, c-format
 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:963
+#, c-format
+msgid "Picture [%s] has been embedded\n"
+msgstr "Se ha incrustado la imagen [%s]\n"
+
+#: ../src/o_picture.c:1001
+#, c-format
+msgid "Picture [%s] has been unembedded\n"
+msgstr "Se ha desincrustado la imagen [%s]\n"
+
 #: ../src/o_pin_basic.c:141 ../src/o_pin_basic.c:143
 #, c-format
 msgid ""
@@ -547,7 +575,8 @@ msgstr ""
 #: ../src/o_pin_basic.c:147 ../src/o_pin_basic.c:149
 #, 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"
+msgstr ""
+"Se ha encontrado un parámetro 'whichone' en una pata (y se cambia a 0): %d\n"
 
 #: ../src/o_pin_basic.c:160 ../src/o_pin_basic.c:161
 #, c-format
@@ -562,22 +591,29 @@ msgstr "No se puede encontrar la definición del carácter '%s'.\n"
 #: ../src/o_text_basic.c:186
 #, 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"
+msgstr ""
+"No se puede cargar el carácter de interrogación -- compruebe la variable "
+"font-directory\n"
 
 #: ../src/o_text_basic.c:1074 ../src/o_text_basic.c:1075
 #, 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"
+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:1087 ../src/o_text_basic.c:1089
 #, 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"
+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:1111 ../src/o_text_basic.c:1113
 #, 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"
+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:1115
 msgid "Setting alignment to LOWER_LEFT\n"
@@ -586,7 +622,8 @@ msgstr "Cambiando el alineamiento a 'Abajo a la izquierda'\n"
 #: ../src/o_text_basic.c:1201
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
-msgstr "Error al comprobar el carácter utf-8 en la definición de la fuente: \"%s\".\n"
+msgstr ""
+"Error al comprobar el carácter utf-8 en la definición de la fuente: \"%s\".\n"
 
 #: ../src/s_clib.c:454
 #, c-format
@@ -615,7 +652,8 @@ msgstr ""
 #: ../src/s_clib.c:546
 #, c-format
 msgid "Library name [%s] already in use.  Using [%s].\n"
-msgstr "Ya se está usando el nombre de la librería [%s]. Se usará [%s] en su lugar.\n"
+msgstr ""
+"Ya se está usando el nombre de la librería [%s]. Se usará [%s] en su lugar.\n"
 
 #: ../src/s_clib.c:583
 #, c-format
@@ -625,12 +663,16 @@ msgstr "Error al abrir la carpeta [%s]: %s\n"
 #: ../src/s_clib.c:719
 #, c-format
 msgid "Failed to scan library [%s]: Scheme function returned non-list\n"
-msgstr "Error al buscar en la librería [%s]: la función de Scheme devolvió algo que no es una lista\n"
+msgstr ""
+"Error al buscar en la librería [%s]: la función de Scheme devolvió algo que "
+"no es una lista\n"
 
 #: ../src/s_clib.c:727
 #, c-format
 msgid "Non-string symbol name while scanning library [%s]\n"
-msgstr "Se ha encontrado un nombre de símbolo que no es una cadena de texto al buscar en la librería [%s]\n"
+msgstr ""
+"Se ha encontrado un nombre de símbolo que no es una cadena de texto al "
+"buscar en la librería [%s]\n"
 
 #: ../src/s_clib.c:882 ../src/s_clib.c:929
 msgid "Cannot add library: name not specified\n"
@@ -641,13 +683,15 @@ msgstr "No se puede añadir la librería: nombre sin especificar\n"
 msgid ""
 "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
 msgstr ""
-"No se puede añadir la librería [%s]: se tienen que especificar los comandos 'list' y 'get'.\n"
+"No se puede añadir la librería [%s]: se tienen que especificar los comandos "
+"'list' y 'get'.\n"
 
 #: ../src/s_clib.c:937
 #, c-format
 msgid "Cannot add Scheme-library [%s]: callbacks must be closures\n"
 msgstr ""
-"No se puede añadir la librería de Scheme [%s]: las funciones de llamada deben ser cierres (closures)\n"
+"No se puede añadir la librería de Scheme [%s]: las funciones de llamada "
+"deben ser cierres (closures)\n"
 
 #: ../src/s_clib.c:1064
 #, c-format
@@ -667,7 +711,8 @@ msgstr "No se ha encontrado el componente [%s] en la librería de componentes\n"
 #: ../src/s_clib.c:1367
 #, c-format
 msgid "Component [%s] was not found in any component library\n"
-msgstr "No se ha encontrado el componente [%s] en ninguna librería de componentes\n"
+msgstr ""
+"No se ha encontrado el componente [%s] en ninguna librería de componentes\n"
 
 #. More than one symbol
 #: ../src/s_clib.c:1373
@@ -690,7 +735,9 @@ msgstr "¡No hay más esquemas en un nivel de jerarquía superior al actual!\n"
 
 #: ../src/s_hierarchy.c:252
 msgid "Cannot find any schematics above the current one!\n"
-msgstr "¡No se encuentra ningún esquema con un nivel de jerarquía superior al actual!\n"
+msgstr ""
+"¡No se encuentra ningún esquema con un nivel de jerarquía superior al "
+"actual!\n"
 
 #: ../src/s_hierarchy.c:253
 msgid "Maybe toplevel schematic page was closed/discarded?\n"
@@ -714,7 +761,8 @@ msgstr "s_page_delete: No se puede encontrar el nombre real del archivo %s.\n"
 #: ../src/s_page.c:176
 #, 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."
+msgstr ""
+"s_page_delete: No se ha podido borrar el archivo de copia de seguridad %s."
 
 #: ../src/s_page.c:356
 #, c-format
@@ -737,3 +785,14 @@ 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 "Error decoding picture.\n"
+#~ msgstr "Error al decodificar una imagen.\n"
+
+#~ msgid "Error deserializing picture.\n"
+#~ msgstr "Error de-serializando una imagen\n"
+
+#~ msgid ""
+#~ "ERROR: o_picture_save: failed to create serialized data from picture\n"
+#~ msgstr ""
+#~ "ERROR: o_picture_save: se ha producido un error al de-serializar los "
+#~ "datos desde una imagen\n"
diff --git a/libgeda/po/nl_NL.po b/libgeda/po/nl_NL.po
index 80eeb61..4aa562b 100644
--- a/libgeda/po/nl_NL.po
+++ b/libgeda/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgeda\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-24 18:51+0100\n"
+"POT-Creation-Date: 2007-12-29 09:21-0500\n"
 "PO-Revision-Date: 2007-12-25 10:14+0100\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -100,8 +100,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:113
-#: ../src/f_basic.c:126
+#: ../src/f_basic.c:113 ../src/f_basic.c:126
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "Status niet gelukt [%s]: %s"
@@ -124,12 +123,21 @@ 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:248
-msgid "The backup copy is newer than the schematic, so it seems you should load it instead of the original file.\n"
-msgstr "De reservekopie is nieuwer dan het schema, het lijkt erop dat je deze zou moeten laden in plaats van het orginele bestand.\n"
+msgid ""
+"The backup copy is newer than the schematic, so it seems you should load it "
+"instead of the original file.\n"
+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:250
-msgid "Gschem usually makes backup copies automatically, and this situation happens when it crashed or it was forced to exit abruptly.\n"
-msgstr "Gschem maakt gewoonlijk automatisch reservekopieen, en deze situatie komt voor wanneer er een crash is of wanneer er een abrupte gedwongen beeindiging was.\n"
+msgid ""
+"Gschem usually makes backup copies automatically, and this situation happens "
+"when it crashed or it was forced to exit abruptly.\n"
+msgstr ""
+"Gschem maakt gewoonlijk automatisch reservekopieen, en deze situatie komt "
+"voor wanneer er een crash is of wanneer er een abrupte gedwongen beeindiging "
+"was.\n"
 
 #: ../src/f_basic.c:253
 msgid ""
@@ -156,8 +164,7 @@ msgstr "Kan de werkelijke bestandsnaam van %s niet krijgen.\n"
 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:394
-#: ../src/f_basic.c:395
+#: ../src/f_basic.c:394 ../src/f_basic.c:395
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "Kan reservekopie niet opslaan: %s."
@@ -167,16 +174,14 @@ msgstr "Kan reservekopie niet opslaan: %s."
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Kan reservekopie [%s] NIET op alleen-lezen instellen\n"
 
-#: ../src/f_basic.c:540
-#: ../src/f_basic.c:541
+#: ../src/f_basic.c:540 ../src/f_basic.c:541
 #, c-format
 msgid "Could not read symbolic link information for %s"
 msgstr "Kan informatie van symbolische verbinding niet lezen voor %s"
 
 # Te veel symlinks
 #. Too many symlinks
-#: ../src/f_basic.c:581
-#: ../src/f_basic.c:582
+#: ../src/f_basic.c:581 ../src/f_basic.c:582
 #, c-format
 msgid "The file has too many symbolic links."
 msgstr "Het bestand heeft te veel symbolische verbindingen."
@@ -188,7 +193,8 @@ msgstr "Kan geen tijd van de dag krijgen in f_print_header()\n"
 #: ../src/f_print.c:143
 #, c-format
 msgid "Unable to open the prolog file `%s' for reading in f_print_header()\n"
-msgstr "Kan het prolog bestand `%s' niet openen tijdens lezen in f_print_header()\n"
+msgstr ""
+"Kan het prolog bestand `%s' niet openen tijdens lezen in f_print_header()\n"
 
 #: ../src/f_print.c:157
 #, c-format
@@ -196,8 +202,11 @@ msgid "Error during reading of the prolog file `%s' in f_print_header()\n"
 msgstr "Fout tijdens het lezen van prolog bestand `%s' in f_print_header()\n"
 
 #: ../src/f_print.c:163
-msgid "Error during writing of the output postscript file in f_print_header()\n"
-msgstr "Fout tijdens het schrijven van het postscript uitvoerbestand in f_print_header()\n"
+msgid ""
+"Error during writing of the output postscript file in f_print_header()\n"
+msgstr ""
+"Fout tijdens het schrijven van het postscript uitvoerbestand in "
+"f_print_header()\n"
 
 #: ../src/f_print.c:176
 msgid "Giving up on printing\n"
@@ -264,39 +273,25 @@ msgstr "Kan geen enkel %s bestand vinden!\n"
 msgid "Could not find a %s file\n"
 msgstr "Kan geen %s bestand vinden\n"
 
-#: ../src/o_arc_basic.c:290
-#: ../src/o_arc_basic.c:292
+#: ../src/o_arc_basic.c:290 ../src/o_arc_basic.c:292
 #, c-format
 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:297
-#: ../src/o_arc_basic.c:298
-#: ../src/o_box_basic.c:343
-#: ../src/o_box_basic.c:344
-#: ../src/o_bus_basic.c:160
-#: ../src/o_bus_basic.c:161
-#: ../src/o_circle_basic.c:298
-#: ../src/o_circle_basic.c:299
-#: ../src/o_line_basic.c:295
-#: ../src/o_line_basic.c:296
-#: ../src/o_net_basic.c:169
-#: ../src/o_net_basic.c:170
-#: ../src/o_pin_basic.c:165
-#: ../src/o_pin_basic.c:166
-#: ../src/o_text_basic.c:1121
+#: ../src/o_arc_basic.c:297 ../src/o_arc_basic.c:298 ../src/o_box_basic.c:343
+#: ../src/o_box_basic.c:344 ../src/o_bus_basic.c:160 ../src/o_bus_basic.c:161
+#: ../src/o_circle_basic.c:298 ../src/o_circle_basic.c:299
+#: ../src/o_line_basic.c:295 ../src/o_line_basic.c:296
+#: ../src/o_net_basic.c:169 ../src/o_net_basic.c:170 ../src/o_pin_basic.c:165
+#: ../src/o_pin_basic.c:166 ../src/o_text_basic.c:1121
 #: ../src/o_text_basic.c:1122
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Ongeldige kleur [ %s ] gevonden\n"
 
-#: ../src/o_arc_basic.c:299
-#: ../src/o_box_basic.c:345
-#: ../src/o_bus_basic.c:162
-#: ../src/o_circle_basic.c:300
-#: ../src/o_line_basic.c:297
-#: ../src/o_net_basic.c:171
-#: ../src/o_pin_basic.c:167
+#: ../src/o_arc_basic.c:299 ../src/o_box_basic.c:345 ../src/o_bus_basic.c:162
+#: ../src/o_circle_basic.c:300 ../src/o_line_basic.c:297
+#: ../src/o_net_basic.c:171 ../src/o_pin_basic.c:167
 #: ../src/o_text_basic.c:1123
 msgid "Setting color to WHITE\n"
 msgstr "Stel de kleur in op WIT \n"
@@ -306,8 +301,7 @@ msgstr "Stel de kleur in op WIT \n"
 msgid "Found an improper attribute: _%s_\n"
 msgstr "Ongewenst attribuut gevonden: _%s_\n"
 
-#: ../src/o_attrib.c:1695
-#: ../src/o_attrib.c:1848
+#: ../src/o_attrib.c:1695 ../src/o_attrib.c:1848
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "Kan slotdef=#:#,#,#... attribuut niet vinden\n"
 
@@ -317,18 +311,15 @@ msgstr "Kan slotdef=#:#,#,#... attribuut niet vinden\n"
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Ongewenst slotdef syntax: \":\". ontbreekt\n"
 
-#: ../src/o_attrib.c:1716
-#: ../src/o_attrib.c:1867
+#: ../src/o_attrib.c:1716 ../src/o_attrib.c:1867
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "Kan het gewenste slotdef=#:#,#,#... attribuut niet vinden\n"
 
-#: ../src/o_attrib.c:1801
-#: ../src/o_attrib.c:1901
+#: ../src/o_attrib.c:1801 ../src/o_attrib.c:1901
 msgid "component missing pinseq= attribute\n"
 msgstr "komponent mist het pinseq= attribuut\n"
 
-#: ../src/o_basic.c:189
-#: ../src/o_basic.c:201
+#: ../src/o_basic.c:189 ../src/o_basic.c:201
 msgid "Invalid space specified, setting to 100\n"
 msgstr "Ongeldige ruimte gespecificeerd, ingesteld op 100\n"
 
@@ -336,20 +327,18 @@ msgstr "Ongeldige ruimte gespecificeerd, ingesteld op 100\n"
 msgid "Invalid length specified, setting to 100\n"
 msgstr "Ongeldige lengte gespecificeerd, ingesteld op 100\n"
 
-#: ../src/o_box_basic.c:336
-#: ../src/o_box_basic.c:338
+#: ../src/o_box_basic.c:336 ../src/o_box_basic.c:338
 #, c-format
 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"
+msgstr ""
+"Rechthoek met een breedte/hoogte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:149
-#: ../src/o_bus_basic.c:151
+#: ../src/o_bus_basic.c:149 ../src/o_bus_basic.c:151
 #, 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:167
-#: ../src/o_bus_basic.c:168
+#: ../src/o_bus_basic.c:167 ../src/o_bus_basic.c:168
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr "Ongeldige bus ripper richting gevonden [ %s ]\n"
@@ -362,23 +351,24 @@ msgstr "Neutrale richting ingesteld (geen richting)\n"
 msgid "Null radius circles are not allowed\n"
 msgstr "Cirkels met een radius van nul zijn niet toegestaan\n"
 
-#: ../src/o_circle_basic.c:290
-#: ../src/o_circle_basic.c:292
+#: ../src/o_circle_basic.c:290 ../src/o_circle_basic.c:292
 #, c-format
 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:716
-#: ../src/o_complex_basic.c:717
+#: ../src/o_complex_basic.c:716 ../src/o_complex_basic.c:717
 #, 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"
+msgstr ""
+"Een komponent met een ongeldige rotatie gevonden [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:730
-#: ../src/o_complex_basic.c:732
+#: ../src/o_complex_basic.c:730 ../src/o_complex_basic.c:732
 #, c-format
-msgid "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
-msgstr "Een komponent met een ongeldige spiegel vlag gevonden [ %c %d %d %d %d %d %s ]\n"
+msgid ""
+"Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
+msgstr ""
+"Een komponent met een ongeldige spiegel vlag gevonden [ %c %d %d %d %d %d %"
+"s ]\n"
 
 #: ../src/o_complex_basic.c:1431
 #, c-format
@@ -411,13 +401,14 @@ msgstr ""
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
-"\tsymversion=%s attached to instantiated symbol, but no symversion= inside symbol file\n"
+"\tsymversion=%s attached to instantiated symbol, but no symversion= inside "
+"symbol file\n"
 msgstr ""
 "WAARSCHUWING: Symbool versie afwijking bij refdes %s:\n"
-"\tsymversion=%s bijgevoegd aan bedoelde symbool, maar geen symversion= in het symbool bestand\n"
+"\tsymversion=%s bijgevoegd aan bedoelde symbool, maar geen symversion= in "
+"het symbool bestand\n"
 
-#: ../src/o_complex_basic.c:1491
-#: ../src/o_complex_basic.c:1495
+#: ../src/o_complex_basic.c:1491 ../src/o_complex_basic.c:1495
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -436,8 +427,7 @@ msgstr "\tGROTE VERSIE VERANDERING (bestand %.3f, bedoeld %.3f, %s)!\n"
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f)!\n"
 msgstr "\tGROTE VERSIE VERANDERING (bestand %.3f, bedoeld %.3f)!\n"
 
-#: ../src/o_complex_basic.c:1544
-#: ../src/o_complex_basic.c:1547
+#: ../src/o_complex_basic.c:1544 ../src/o_complex_basic.c:1547
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr "\tKleine versie verandering (bestand %.3f, bedoeld %.3f)!\n"
@@ -456,122 +446,114 @@ msgstr ""
 msgid "Component [%s] has been embedded\n"
 msgstr "Komponent [%s] is ingevoegd\n"
 
-#: ../src/o_embed.c:62
-#, c-format
-msgid "Picture [%s] has been embedded\n"
-msgstr "Afbeelding [%s] is ingevoegd\n"
-
 # symbool niet gevonden in de symbolenbibliotheek: signaleer een fout
 #. symbol not found in the symbol library: signal an error
-#: ../src/o_embed.c:91
+#: ../src/o_embed.c:85
 #, c-format
-msgid "Could not find component [%s], while trying to unembed. Component is still embedded\n"
-msgstr "Kan komponent [%s] niet vinden, tijdens het uitvoegen. Komponent is nog steeds ingevoegd\n"
+msgid ""
+"Could not find component [%s], while trying to unembed. Component is still "
+"embedded\n"
+msgstr ""
+"Kan komponent [%s] niet vinden, tijdens het uitvoegen. Komponent is nog "
+"steeds ingevoegd\n"
 
-#: ../src/o_embed.c:99
+#: ../src/o_embed.c:93
 #, c-format
 msgid "Component [%s] has been successfully unembedded\n"
 msgstr "Komponent [%s] is succesvol uitgevoegd\n"
 
-#: ../src/o_embed.c:114
-#, c-format
-msgid "Picture [%s] has been unembedded\n"
-msgstr "Afbeelding [%s] is uitgevoegd\n"
-
-#: ../src/o_line_basic.c:288
-#: ../src/o_line_basic.c:290
+#: ../src/o_line_basic.c:288 ../src/o_line_basic.c:290
 #, c-format
 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:157
-#: ../src/o_net_basic.c:159
+#: ../src/o_net_basic.c:157 ../src/o_net_basic.c:159
 #, 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:80
-#: ../src/o_picture.c:82
+#: ../src/o_picture.c:83 ../src/o_picture.c:85
 #, 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:96
-#: ../src/o_picture.c:98
+#: ../src/o_picture.c:99 ../src/o_picture.c:101
 #, 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"
+msgstr ""
+"Afbeelding met een breedte/hoogte van nul gevonden [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:103
-#: ../src/o_picture.c:105
+#: ../src/o_picture.c:106 ../src/o_picture.c:108
 #, 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:107
+#: ../src/o_picture.c:110
 msgid "Setting mirrored to 0\n"
 msgstr "Spiegelen op 0 ingesteld\n"
 
-#: ../src/o_picture.c:112
-#: ../src/o_picture.c:114
+#: ../src/o_picture.c:115 ../src/o_picture.c:117
 #, 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:116
+#: ../src/o_picture.c:119
 msgid "Setting embedded to 0\n"
 msgstr "Invoegen op 0 ingesteld\n"
 
-#: ../src/o_picture.c:128
-#: ../src/o_picture.c:129
+#: ../src/o_picture.c:131 ../src/o_picture.c:132
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr "Niet ondersteunde afbeelding hoek [ %d ] gevonden\n"
 
-#: ../src/o_picture.c:130
-#: ../src/o_text_basic.c:1091
+#: ../src/o_picture.c:133 ../src/o_text_basic.c:1091
 msgid "Setting angle to 0\n"
 msgstr "Hoek op 0 ingesteld\n"
 
-#: ../src/o_picture.c:144
-#: ../src/o_picture.c:145
-#: ../src/o_picture.c:208
-#: ../src/o_picture.c:210
-#, 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:168 ../src/o_picture.c:179 ../src/o_picture.c:949
+#, fuzzy, c-format
+msgid "Failed to load image from embedded data [%s]: %s\n"
+msgstr "Laden van symbool uit bestand faalde [%s]: %s\n"
 
-#: ../src/o_picture.c:175
-#: ../src/o_picture.c:176
-#, c-format
-msgid "Error decoding picture.\n"
-msgstr "Fout bij het decoderen van een afbeelding.\n"
+#: ../src/o_picture.c:169
+msgid "Base64 decoding failed."
+msgstr ""
 
-#: ../src/o_picture.c:182
-#, c-format
-msgid "Error deserializing picture.\n"
-msgstr "Fout bij het de-serialiseren van een afbeelding.\n"
+#: ../src/o_picture.c:170 ../src/o_picture.c:181 ../src/o_picture.c:951
+msgid "Falling back to file loading. Picture unembedded.\n"
+msgstr ""
 
-#: ../src/o_picture.c:201
-#: ../src/o_picture.c:202
+#: ../src/o_picture.c:192 ../src/o_picture.c:937 ../src/o_picture.c:984
+#, fuzzy, c-format
+msgid "Failed to load image from file [%s]: %s\n"
+msgstr "Laden van symbool uit bestand faalde [%s]: %s\n"
+
+#: ../src/o_picture.c:203 ../src/o_picture.c:204
 #, c-format
 msgid "Loading warning picture.\n"
 msgstr "Laad de waarschuwing afbeelding.\n"
 
-#: ../src/o_picture.c:275
-#: ../src/o_picture.c:276
+#: ../src/o_picture.c:210 ../src/o_picture.c:212
 #, c-format
-msgid "ERROR: o_picture_save: failed to create serialized data from picture\n"
-msgstr "FOUT: o_picture_save: het creeren van geserialiseerde data van een afbeelding faalde\n"
+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:284
-#: ../src/o_picture.c:285
+#: ../src/o_picture.c:272 ../src/o_picture.c:273
 #, c-format
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "FOUT: o_picture_save: kan de afbeelding niet coderen.\n"
 
-#: ../src/o_pin_basic.c:141
-#: ../src/o_pin_basic.c:143
+#: ../src/o_picture.c:963
+#, c-format
+msgid "Picture [%s] has been embedded\n"
+msgstr "Afbeelding [%s] is ingevoegd\n"
+
+#: ../src/o_picture.c:1001
+#, c-format
+msgid "Picture [%s] has been unembedded\n"
+msgstr "Afbeelding [%s] is uitgevoegd\n"
+
+#: ../src/o_pin_basic.c:141 ../src/o_pin_basic.c:143
 #, c-format
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
@@ -580,14 +562,12 @@ msgstr ""
 "Pen die geen whichone veld ingesteld heeft gevonden.\n"
 "Verifieer en corigeer handmatig.\n"
 
-#: ../src/o_pin_basic.c:147
-#: ../src/o_pin_basic.c:149
+#: ../src/o_pin_basic.c:147 ../src/o_pin_basic.c:149
 #, 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:160
-#: ../src/o_pin_basic.c:161
+#: ../src/o_pin_basic.c:160 ../src/o_pin_basic.c:161
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Pen met een lengte van nul gevonden: [ %s ]\n"
@@ -600,25 +580,26 @@ msgstr "Kan karakter '%s' definitie niet vinden.\n"
 #: ../src/o_text_basic.c:186
 #, 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"
+msgstr ""
+"Kan vraag font karakter niet laden -- controleer font-map sleutelwoord\n"
 
-#: ../src/o_text_basic.c:1074
-#: ../src/o_text_basic.c:1075
+#: ../src/o_text_basic.c:1074 ../src/o_text_basic.c:1075
 #, 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"
+msgstr ""
+"Tekst string met een afmeting van nul gevonden [ %c %d %d %d %d %d %d %d %"
+"d ]\n"
 
-#: ../src/o_text_basic.c:1087
-#: ../src/o_text_basic.c:1089
+#: ../src/o_text_basic.c:1087 ../src/o_text_basic.c:1089
 #, 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:1111
-#: ../src/o_text_basic.c:1113
+#: ../src/o_text_basic.c:1111 ../src/o_text_basic.c:1113
 #, 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"
+msgstr ""
+"Niet ondersteunde tekst uitlijning gevonden [ %c %d %d %d %d %d %d %d %d ]\n"
 
 #: ../src/o_text_basic.c:1115
 msgid "Setting alignment to LOWER_LEFT\n"
@@ -666,27 +647,34 @@ msgstr "Openen van directory faalde [%s]: %s\n"
 #: ../src/s_clib.c:719
 #, c-format
 msgid "Failed to scan library [%s]: Scheme function returned non-list\n"
-msgstr "Doorzoeken van bibliotheek [%s] faalde: Scheme functie retourneerde non-list\n"
+msgstr ""
+"Doorzoeken van bibliotheek [%s] faalde: Scheme functie retourneerde non-"
+"list\n"
 
 #: ../src/s_clib.c:727
 #, c-format
 msgid "Non-string symbol name while scanning library [%s]\n"
-msgstr "Niet string symboolnaam tijdens het doorzoeken van de bibliotheek [%s]\n"
+msgstr ""
+"Niet string symboolnaam tijdens het doorzoeken van de bibliotheek [%s]\n"
 
-#: ../src/s_clib.c:882
-#: ../src/s_clib.c:929
+#: ../src/s_clib.c:882 ../src/s_clib.c:929
 msgid "Cannot add library: name not specified\n"
 msgstr "Kan bibliotheek niet toevoegen: naam niet gespecificeerd\n"
 
 #: ../src/s_clib.c:889
 #, c-format
-msgid "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
-msgstr "Kan bibliotheek niet toevoegen [%s]: zowel 'list' en 'get' opdrachten moeten gespecificeerd zijn.\n"
+msgid ""
+"Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
+msgstr ""
+"Kan bibliotheek niet toevoegen [%s]: zowel 'list' en 'get' opdrachten moeten "
+"gespecificeerd zijn.\n"
 
 #: ../src/s_clib.c:937
 #, c-format
 msgid "Cannot add Scheme-library [%s]: callbacks must be closures\n"
-msgstr "Kan scheme bibliotheek niet toevoegen [%s]: callbacks moeten afsluitingen zijn\n"
+msgstr ""
+"Kan scheme bibliotheek niet toevoegen [%s]: callbacks moeten afsluitingen "
+"zijn\n"
 
 #: ../src/s_clib.c:1064
 #, c-format
@@ -772,9 +760,19 @@ msgstr "Kan [%s] NIET opslaan\n"
 msgid "Found [%s]\n"
 msgstr "[%s] gevonden\n"
 
-#: ../src/s_slib.c:204
-#: ../src/s_slib.c:207
+#: ../src/s_slib.c:204 ../src/s_slib.c:207
 #, c-format
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "Kan geen [%s] vinden in welke BronBibliotheek dan ook!\n"
 
+#~ msgid "Error decoding picture.\n"
+#~ msgstr "Fout bij het decoderen van een afbeelding.\n"
+
+#~ msgid "Error deserializing picture.\n"
+#~ msgstr "Fout bij het de-serialiseren van een afbeelding.\n"
+
+#~ msgid ""
+#~ "ERROR: o_picture_save: failed to create serialized data from picture\n"
+#~ msgstr ""
+#~ "FOUT: o_picture_save: het creeren van geserialiseerde data van een "
+#~ "afbeelding faalde\n"



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