Commit: e040ef17a90030fdb87fedc48245650578132868 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: e040ef17a90030fdb87fedc48245650578132868 (tree)
• Time: 2004-07-18 05:46:47
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Transferred from main branch.

Change Summary

• modified: po/ChangeLog
• modified: po/cs.po
• modified: po/en_GB.po
• modified: po/es.po
• modified: po/ja.po
• modified: po/pt_BR.po
• modified: po/sq.po

Incremental Difference

--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -3,7 +3,29 @@
 	* de.po: 
 	* no.po: Patch from bug #147250.
 
-2004-07-06  Est黐縊 Samuel Proc?io  <[e-mail]>
[phone]  Gareth Owen  <[e-mail]>
+
+	* en_GB.po: Updated British English translation by
+	David Lodge <[e-mail]>
+
[phone]  Gustavo Maciel Dias Vieira  <[e-mail]>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation done by
+	Afonso Celso Medina <[e-mail]>.
+
[phone]  Takeshi AIHANA <[e-mail]>
+
+	* ja.po: Updated Japanese translation.
+
[phone]  Laurent Dhima  <[e-mail]>
+
+	* sq.po: Updated Albanian translation.
+
[phone]  Francisco Javier F. Serrador  <[e-mail]>
+
+	* es.po: Updated Spanish translation.
+
[phone]  Estﾃｪvﾃ｣o Samuel Procﾃｳpio  <[e-mail]>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation.
 
@@ -23,7 +45,7 @@
 
 	* cs.po: Updated Czech translation.
 
-2004-07-01  Lars Clausen  <larsﾘraeder.dk>
[phone]  Lars Clausen  <larsﾃ腕aeder.dk>
 
 	* POTFILES.in: Added ChemEng file.
 
@@ -129,10 +151,10 @@
 
 	* en_GB.po: Changed encoding to UTF-8
 
-2004-04-07  Samﾃｺel Jﾃｳn Gunnarsson  <[e-mail]>
[phone]  Samﾃδｺel Jﾃδｳn Gunnarsson  <[e-mail]>
 
 	* is.po: Added Icelandic translation by
-	Helgi ﾃ柞rmar ﾃ柞rbjﾃｶrnsson  <[e-mail]>
+	Helgi ﾃδ柞rmar ﾃδ柞rbjﾃδｶrnsson  <[e-mail]>
 
 2004-04-05 Maxim Dziumanenko <[e-mail]>
 
@@ -163,7 +185,7 @@
 
 	* sv.po: Updated Swedish translation.
 
-2004-03-24  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -238,7 +260,7 @@
 
 	* pl.po: Updated Polish translation.
 
-2004-03-09  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -282,7 +304,7 @@
 
 	* es.po: Updated Spanish translation.
 
-2004-02-27  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -306,7 +328,7 @@
 
 	* es.po: Updated Spanih translation.
 
-2004-02-20  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -378,7 +400,7 @@
 
 	* cs.po: Updated Czech translation.
 
-2004-01-05  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -406,7 +428,7 @@
 
 	* cs.po: Updated Czech translation.
 
-2003-12-14  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -430,7 +452,7 @@
 
 	* fi.po: Updated Finnish translation by Tommi Vainikainen.
 
-2003-11-22  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -465,7 +487,7 @@
         * ms.po: Updated Malay translation by
                 MIMOS Open Source Development Group <[e-mail]>
 
-2003-11-03  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -494,11 +516,11 @@
 
 	* pt.po: Updated Portuguese translation.
 
-2003-10-26  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
-2003-10-26  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -510,7 +532,7 @@
 
 	* cs.po: Updated Czech translation.
 
-2003-10-20  Cyrille Chﾃｩpﾃｩlov  <[e-mail]>
[phone]  Cyrille Chﾃδｩpﾃδｩlov  <[e-mail]>
 
 	* fr.po: Updated French translation.
 	
@@ -518,12 +540,12 @@
 
 	* cs.po: Updated Czech translation.
 
-2003-10-15  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Some fixes from Serbian team (Prevod.org),
 	and added more to translation.
 
-2003-10-13  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -539,11 +561,11 @@
 
 	* pt.po: Updated Portuguese translation.
 
-2003-10-08  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Added more to Serbian translation.
 
-2003-10-04  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -594,7 +616,7 @@
 
 	* sv.po: Updated Swedish translation.
 
-2003-09-11  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -615,7 +637,7 @@
 
 	* pt.po: Updated Portuguese translation.
 
-2003-09-08  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Updated Serbian translation.
 
@@ -681,7 +703,7 @@
 
 	* no.po: Update Norwegian translation.
 
-2003-08-17  Danilo ﾅ?egan  <[e-mail]>
[phone]  Danilo ﾃ??egan  <[e-mail]>
 
 	* sr.po, [e-mail]: Added Serbian translation by Serbian 
 	team (Prevod.org).
@@ -1213,7 +1235,7 @@
 
 2002-07-16  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2002-07-14  Lars Clausen  <[e-mail]>
 
@@ -1246,7 +1268,7 @@
 
 2002-06-09  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2002-06-03  Cyrille Chepelov  <[e-mail]>
 
@@ -1258,7 +1280,7 @@
 
 2002-05-28  Cyrille Chepelov  <[e-mail]>
 
-	* de.po: German translation update by Jﾃｶrgen Scheibengruber
+	* de.po: German translation update by Jﾃδｶrgen Scheibengruber
 	<[e-mail]>	
 
 2002-05-26  Christian Rose  <[e-mail]>
@@ -1284,7 +1306,7 @@
 
 2002-05-25  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2002-05-25  Christian Rose  <[e-mail]>
 
@@ -1296,7 +1318,7 @@
 
 2002-05-21  Carlos Perello Marin <[e-mail]>
 
-	* pt_BR.po: Updated by Francisco Petrﾃｺcio Cavalcante Junior
+	* pt_BR.po: Updated by Francisco Petrﾃδｺcio Cavalcante Junior
 	<[e-mail]>
 	
 2002-05-10  Duarte Loreto <[e-mail]>
@@ -1347,11 +1369,11 @@
 2002-02-23  Karsten Weiss  <[e-mail]>
 
 	* de.po: Updated German translation from
-	Jﾃｶrgen Scheibengruber <[e-mail]>.
+	Jﾃδｶrgen Scheibengruber <[e-mail]>.
 
 2002-02-21  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2002-02-16  Christian Rose  <[e-mail]>
 
@@ -1370,13 +1392,13 @@
 
         * pt.po: Updated portuguese translation.
 
-2002-02-04  Carlos Perellﾃｳ Marﾃｭn <[e-mail]>
[phone]  Carlos Perellﾃδｳ Marﾃδｭn <[e-mail]>
 
-	* es.po: Updated by Juan Manuel Garcﾃｭa Molina <[e-mail]>
+	* es.po: Updated by Juan Manuel Garcﾃδｭa Molina <[e-mail]>
 
 2002-01-31  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2002-01-31  Christian Rose  <[e-mail]>
 
@@ -1449,9 +1471,9 @@
 
 	* nn.po: Updated Norwegian (nynorsk) translation.
 
-2001-11-23  Carlos Perellﾃｳ Marﾃｭn <[e-mail]>
[phone]  Carlos Perellﾃδｳ Marﾃδｭn <[e-mail]>
 
-	* es.po: Updated Spanish translation by Juan Manuel Garcﾃｭa Molina
+	* es.po: Updated Spanish translation by Juan Manuel Garcﾃδｭa Molina
 	<[e-mail]>
 	
 2001-11-22  Gustavo Maciel Dias Vieira <[e-mail]>
@@ -1493,7 +1515,7 @@
 
 2001-10-02  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2001-09-28  Valek Filippov  <[e-mail]>
 
@@ -1501,12 +1523,12 @@
 
 2001-09-23  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2001-09-22  Christian Rose  <[e-mail]>
 
 	* sv.po: Corrected Swedish translation. Thanks to
-	Jan Djﾃ､rv <[e-mail]>.
+	Jan Djﾃδ､rv <[e-mail]>.
 
 2001-09-22  Christophe Merlet  <[e-mail]>
 
@@ -1516,13 +1538,13 @@
 
 	* sv.po: Updated Swedish translation.
 
-2001-09-15  Carlos Perellﾃｳ Marﾃｭn <[e-mail]>
[phone]  Carlos Perellﾃδｳ Marﾃδｭn <[e-mail]>
 
 	* az.po: Header fix.
 
 2001-09-13  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2001-09-12  Gustavo Maciel Dias Vieira <[e-mail]>
 
@@ -1613,7 +1635,7 @@
 
 2001-07-22  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	* nn.po: Added Norwegian (nynorsk) translation.
 
 2001-07-17  Fatih Demir <[e-mail]>
@@ -1623,7 +1645,7 @@
 
 2001-07-13  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	* nn.po: Added Norwegian (nynorsk) translation.
 
 2001-07-07  Christian Rose  <[e-mail]>
@@ -1653,9 +1675,9 @@
 2001-06-10  Christian Rose  <[e-mail]>
 
 	* sv.po: Updated and fixed Swedish translation. Thanks to
-	Jﾃｶrgen Tegnﾃｩr <[e-mail]>,
+	Jﾃδｶrgen Tegnﾃδｩr <[e-mail]>,
 	Jan D. <[e-mail]>, and
-	Gﾃｶran Uddeborg <[e-mail]> for their input.
+	Gﾃδｶran Uddeborg <[e-mail]> for their input.
 
 2001-06-08  Cyrille Chepelov  <[e-mail]>
 
@@ -1688,7 +1710,7 @@
 2001-05-17  Christophe Merlet  <[e-mail]>
 
 	* fr.po: Updated French translation from contributions of
-	Frﾃｩdﾃｩric Boiteux <[e-mail]> for Debian GNU/Linux.
+	Frﾃδｩdﾃδｩric Boiteux <[e-mail]> for Debian GNU/Linux.
 
 2001-05-16  Cyrille Chepelov  <[e-mail]>
 
@@ -1720,7 +1742,7 @@
 
 2001-04-09  Christian Rose  <[e-mail]>
 
-	* sv.po: Fixed Swedish translation. Thanks goes to Gﾃｶran Uddeborg
+	* sv.po: Fixed Swedish translation. Thanks goes to Gﾃδｶran Uddeborg
 	<[e-mail]> for the review.
 
 2001-04-09  Christian Rose  <[e-mail]>
@@ -1766,7 +1788,7 @@
 
 2001-03-27  Kjartan Maraas  <[e-mail]
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2001-03-22  Cyrille Chepelov  <[e-mail]>
 
@@ -1784,15 +1806,15 @@
 
 	* ru.po: updated russian translation.
 
-2001-03-07  Carlos Perellﾃｳ Marﾃｭn <[e-mail]>
[phone]  Carlos Perellﾃδｳ Marﾃδｭn <[e-mail]>
 
-	* es.po: Updated Spanish translation by Juan Manuel Garcﾃｭa Molina
+	* es.po: Updated Spanish translation by Juan Manuel Garcﾃδｭa Molina
 	  <[e-mail]>
 	* es_ES.po: Removed because it's the same locale as es.po
 
-2001-03-06  Carlos Perellﾃｳ Marﾃｭn <[e-mail]>
[phone]  Carlos Perellﾃδｳ Marﾃδｭn <[e-mail]>
 
-	* es.po: Updated Spanish translation by Juan Manuel Garcﾃｭa Molina
+	* es.po: Updated Spanish translation by Juan Manuel Garcﾃδｭa Molina
 	  <[e-mail]>
 
 2001-03-06  Christian Meyer  <[e-mail]>
@@ -1801,7 +1823,7 @@
 
 2001-03-05  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 
 2001-02-23  Valek Filippov  <[e-mail]>
 
@@ -1809,21 +1831,21 @@
 
 2001-02-21  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	* POTFILES.in: Added xfig plugin.
 	
 2001-02-16  Christophe Merlet  <[e-mail]>
 
 	* fr.po: Updated French translation.
 
-2001-02-14  Carlos Perellﾃｳ Marﾃｭn <[e-mail]>
[phone]  Carlos Perellﾃδｳ Marﾃδｭn <[e-mail]>
 
-	* es.po: Updated Spanish translation by Juan Manuel Garcﾃｭa Molina
+	* es.po: Updated Spanish translation by Juan Manuel Garcﾃδｭa Molina
 	  <[e-mail]>
 
 2001-02-14  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2001-02-09  Akira TAGOH  <[e-mail]>
 
@@ -1867,7 +1889,7 @@
 
 2001-01-08  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2001-01-04  Christophe Merlet  <[e-mail]>
 
@@ -1888,7 +1910,7 @@
 
 2000-12-05  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2000-11-16  Christian Rose  <[e-mail]>
 
@@ -1900,7 +1922,7 @@
 
 2000-11-10  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	
 2000-11-04  Zbigniew Chyla  <[e-mail]>
 
@@ -1928,7 +1950,7 @@
 
 2000-10-15  Kjartan Maraas  <[e-mail]>
 
-	* no.po: Updated Norwegian (bokmﾃ･l) translation.
+	* no.po: Updated Norwegian (bokmﾃδ･l) translation.
 	* POTFILES.in: Updated this too.
 		
 2000-10-14  Valek Filippov  <[e-mail]>

--- a/po/cs.po
+++ b/po/cs.po
@@ -10,114 +10,114 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dia VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-02 19:16+0200\n"
-"PO-Revision-Date: 2004-07-03 00:10+0200\n"
+"POT-Creation-Date: 2004-07-05 03:15+0200\n"
+"PO-Revision-Date: 2004-07-05 12:06+0200\n"
 "Last-Translator: Miloslav Trmac <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app/app_procs.c:220
+#: app/app_procs.c:219
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "Chyba %s: není známo, jak exportovat do %s\n"
 
-#: app/app_procs.c:230
+#: app/app_procs.c:228
 #, c-format
 msgid "%s error: input and output file name is identical: %s"
 msgstr "Chyba %s: názvy vstupního a výstupního souboru jsou shodné: %s"
 
-#: app/app_procs.c:238
+#: app/app_procs.c:235
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "Chyba %s: je třeba platný vstupní soubor %s\n"
 
 #. if (!quiet)
-#: app/app_procs.c:258
+#: app/app_procs.c:255
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: app/app_procs.c:306
+#: app/app_procs.c:303
 #, c-format
 msgid "Can't find output format %s\n"
 msgstr "Nemohu najít výstupní formát %s\n"
 
 #. Translators:  The argument is a list of options, not to be translated
-#: app/app_procs.c:393
+#: app/app_procs.c:390
 #, c-format
 msgid "Export to file format and exit.  Supported formats are: %s"
 msgstr "Exportovat do formátu souboru a skončit. Podporované formáty jsou: %s"
 
 #. &export_file_name
-#: app/app_procs.c:402
+#: app/app_procs.c:399
 msgid "Export loaded file and exit"
 msgstr "Exportovat načtený soubor a skončit"
 
-#: app/app_procs.c:402 app/diaconv.c:94
+#: app/app_procs.c:399 app/diaconv.c:94
 msgid "OUTPUT"
 msgstr "VÝSTUP"
 
 #. &export_file_format
-#: app/app_procs.c:404
+#: app/app_procs.c:401
 msgid "FORMAT"
 msgstr "FORMÁT"
 
-#: app/app_procs.c:407
+#: app/app_procs.c:404
 msgid "Export graphics size"
 msgstr "Velikost exportované grafiky"
 
-#: app/app_procs.c:407
+#: app/app_procs.c:404
 msgid "WxH"
 msgstr "Š×V"
 
-#: app/app_procs.c:409
+#: app/app_procs.c:406
 msgid "Don't show the splash screen"
 msgstr "Nezobrazovat titulní obrazovku (splashscreen)"
 
-#: app/app_procs.c:411
+#: app/app_procs.c:408
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "Posílat chybové zprávy na stderr místo zobrazování dialogů."
 
-#: app/app_procs.c:413
+#: app/app_procs.c:410
 msgid "Display credits list and exit"
 msgstr "Zobrazit seznam kreditů a skončit"
 
-#: app/app_procs.c:415
+#: app/app_procs.c:412
 msgid "Display version and exit"
 msgstr "Zobrazit verzi a skončit"
 
-#: app/app_procs.c:417 app/diaconv.c:95
+#: app/app_procs.c:413 app/diaconv.c:95
 msgid "Show this help message"
 msgstr "Zobrazit tuto nápovědu"
 
-#: app/app_procs.c:456
+#: app/app_procs.c:454
 msgid "Can't connect to session manager!\n"
 msgstr "Nelze se připojit ke správci sezení!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: app/app_procs.c:484
+#: app/app_procs.c:481
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia verze %s, sestavená %s %s\n"
 
-#: app/app_procs.c:486
+#: app/app_procs.c:483
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia verze %s\n"
 
-#: app/app_procs.c:540 app/app_procs.c:542 app/diaconv.c:201 app/diaconv.c:203
+#: app/app_procs.c:537 app/app_procs.c:539 app/diaconv.c:201 app/diaconv.c:203
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs, exiting...\n"
 msgstr "Nelze nalézt standardní objekty při hledání object-libs, končím...\n"
 
-#: app/app_procs.c:583
+#: app/app_procs.c:580
 msgid "Diagram1.dia"
 msgstr "Diagram1.dia"
 
-#: app/app_procs.c:622
+#: app/app_procs.c:619
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you can cause this message to appear.\n"
@@ -126,7 +126,7 @@ msgstr ""
 "a popište, jak jste způsobili zobrazení této zprávy.\n"
 
 #. no standard buttons
-#: app/app_procs.c:634
+#: app/app_procs.c:631
 msgid ""
 "Modified diagrams exist.\n"
 "Are you sure you want to quit Dia\n"
@@ -136,22 +136,21 @@ msgstr ""
 "Jste si jisti, že chcete ukončit program Dia\n"
 "bez uložení těchto změn?"
 
-#: app/app_procs.c:638
+#: app/app_procs.c:635
 msgid "Quit Dia"
 msgstr "Ukončit Dia"
 
 #. This printf seems to prevent a race condition with unrefs.
 #. Yuck.  -Lars
-#: app/app_procs.c:689
-#, c-format
+#: app/app_procs.c:686
 msgid "Thank you for using Dia.\n"
 msgstr "Děkujeme vám, že používáte Dia.\n"
 
-#: app/app_procs.c:705 app/app_procs.c:712
+#: app/app_procs.c:702 app/app_procs.c:709
 msgid "Could not create per-user Dia config directory"
 msgstr "Nelze vytvořit adresář s uživatelským nastavením Dia"
 
-#: app/app_procs.c:714
+#: app/app_procs.c:711
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
@@ -159,15 +158,15 @@ msgstr ""
 "Nelze vytvořit adresář s uživatelským nastavením Dia. Ujistěte se prosím, že "
 "proměnná prostředí HOME ukazuje na existující adresář."
 
-#: app/app_procs.c:736 app/diaconv.c:251
+#: app/app_procs.c:733 app/diaconv.c:251
 msgid "Objects and filters internal to dia"
 msgstr "Objekty a filtry interní pro program Dia"
 
-#: app/app_procs.c:775 app/diaconv.c:121
+#: app/app_procs.c:772 app/diaconv.c:121
 msgid "[OPTION...] [FILE...]"
 msgstr "[VOLBA...] [SOUBOR...]"
 
-#: app/app_procs.c:779 app/diaconv.c:128
+#: app/app_procs.c:775 app/diaconv.c:128
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -177,6 +176,44 @@ msgstr ""
 "Spuštěním '%s --help' zobrazíte kompletní seznam voleb dostupných z "
 "příkazové řádky.\n"
 
+#: app/app_procs.c:860
+msgid ""
+"The original author of Dia was:\n"
+"\n"
+msgstr ""
+"Původní autor Dia byl:\n"
+"\n"
+
+#: app/app_procs.c:865
+msgid ""
+"\n"
+"The current maintainers of Dia are:\n"
+"\n"
+msgstr ""
+"\n"
+"Současní správci Dia jsou:\n"
+"\n"
+
+#: app/app_procs.c:870
+msgid ""
+"\n"
+"Other authors are:\n"
+"\n"
+msgstr ""
+"\n"
+"Další autoři jsou:\n"
+"\n"
+
+#: app/app_procs.c:875
+msgid ""
+"\n"
+"Dia is documented by:\n"
+"\n"
+msgstr ""
+"\n"
+"Dokumentaci Dia napsali:\n"
+"\n"
+
 #: app/autosave.c:93
 msgid "Recovering autosaved diagrams"
 msgstr "Obnovuji automaticky uložené diagramy"
@@ -284,57 +321,57 @@ msgstr "Implicitní: "
 msgid "Diagram Properties"
 msgstr "Vlastnosti diagramu"
 
-#: app/dia-props.c:124
+#: app/dia-props.c:123
 msgid "Dynamic grid"
 msgstr "Dynamická mřížka"
 
-#: app/dia-props.c:132
+#: app/dia-props.c:131
 msgid "x"
 msgstr "x"
 
-#: app/dia-props.c:136
+#: app/dia-props.c:135
 msgid "y"
 msgstr "y"
 
-#: app/dia-props.c:141
+#: app/dia-props.c:140
 msgid "Spacing"
 msgstr "Odstup"
 
-#: app/dia-props.c:161
+#: app/dia-props.c:160
 msgid "Visible spacing"
 msgstr "Viditelný odstup"
 
 #. Hexes!
-#: app/dia-props.c:182 app/preferences.c:162
+#: app/dia-props.c:181 app/preferences.c:162
 msgid "Hex grid"
 msgstr "Šesterečková mřížka"
 
-#: app/dia-props.c:190
+#: app/dia-props.c:189
 msgid "Hex grid size"
 msgstr "Velikost šesterečkové mřížky"
 
-#: app/dia-props.c:203
+#: app/dia-props.c:202
 msgid "Grid"
 msgstr "Mřížka"
 
-#: app/dia-props.c:214 lib/diagramdata.c:127
+#: app/dia-props.c:213 lib/diagramdata.c:127
 msgid "Background"
 msgstr "Pozadí"
 
-#: app/dia-props.c:225 app/preferences.c:105
+#: app/dia-props.c:224 app/preferences.c:105
 msgid "Grid Lines"
 msgstr "Linie mřížky"
 
-#: app/dia-props.c:236
+#: app/dia-props.c:235
 msgid "Page Breaks"
 msgstr "Zalomení stránky"
 
-#: app/dia-props.c:247
+#: app/dia-props.c:246
 msgid "Colors"
 msgstr "Barvy"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: app/dia-props.c:266
+#: app/dia-props.c:265
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "Vlastnosti diagramu: %s"
@@ -567,7 +604,7 @@ msgstr "%0.3gcm × %0.3gcm"
 msgid "Page Setup"
 msgstr "Nastavení stránky"
 
-#: app/disp_callbacks.c:81 app/properties.c:153
+#: app/disp_callbacks.c:81 app/properties.c:152
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -613,7 +650,7 @@ msgid "Discard Changes"
 msgstr "Zahodit změny"
 
 #: app/export_png.c:134 app/load_save.c:893 app/render_eps.c:103
-#: plug-ins/cairo/diacairo.c:908 plug-ins/cgm/cgm.c:1157
+#: plug-ins/cairo/diacairo.c:911 plug-ins/cgm/cgm.c:1157
 #: plug-ins/dxf/dxf-export.c:505 plug-ins/hpgl/hpgl.c:732
 #: plug-ins/metapost/render_metapost.c:964
 #: plug-ins/pstricks/render_pstricks.c:800 plug-ins/shape/shape-export.c:135
@@ -658,23 +695,23 @@ msgstr "Výška obrázku:"
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: app/filedlg.c:121 app/filedlg.c:392
+#: app/filedlg.c:122 app/filedlg.c:393
 msgid "By extension"
 msgstr "Podle přípony"
 
-#: app/filedlg.c:182
+#: app/filedlg.c:183
 msgid "Open Diagram"
 msgstr "Otevřít diagram"
 
-#: app/filedlg.c:210
+#: app/filedlg.c:211
 msgid "Open Options"
 msgstr "Volby pro otevření"
 
-#: app/filedlg.c:218 app/filedlg.c:510
+#: app/filedlg.c:219 app/filedlg.c:511
 msgid "Determine file type:"
 msgstr "Zjistit typ souboru:"
 
-#: app/filedlg.c:255
+#: app/filedlg.c:256
 msgid ""
 "Some characters in the filename are neither UTF-8 nor your local encoding.\n"
 "Some things will break."
@@ -683,7 +720,7 @@ msgstr ""
 "kódování.\n"
 "Něco se pokazí."
 
-#: app/filedlg.c:261 app/filedlg.c:436
+#: app/filedlg.c:262 app/filedlg.c:437
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -692,21 +729,21 @@ msgstr ""
 "Soubor '%s' již existuje.\n"
 "Chcete jej přepsat?"
 
-#: app/filedlg.c:269 app/filedlg.c:443
+#: app/filedlg.c:270 app/filedlg.c:444
 msgid "File already exists"
 msgstr "Soubor již existuje"
 
-#: app/filedlg.c:301
+#: app/filedlg.c:302
 msgid "Save Diagram"
 msgstr "Uložit diagram"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: app/filedlg.c:306
+#: app/filedlg.c:307
 msgid "Compress diagram files"
 msgstr "Komprimovat soubory s diagramy"
 
-#: app/filedlg.c:315
+#: app/filedlg.c:316
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -715,7 +752,7 @@ msgstr ""
 "urychluje načítání a ukládání. Některé programy pro zpracování textu však "
 "neumí s komprimovanými soubory pracovat."
 
-#: app/filedlg.c:462
+#: app/filedlg.c:463
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -724,11 +761,11 @@ msgstr ""
 "Nelze zjistit, který exportní filtr se má\n"
 "použít pro uložení '%s'"
 
-#: app/filedlg.c:480
+#: app/filedlg.c:481
 msgid "Export Diagram"
 msgstr "Exportovat diagram"
 
-#: app/filedlg.c:502
+#: app/filedlg.c:503
 msgid "Export Options"
 msgstr "Volby exportu"
 
@@ -917,12 +954,12 @@ msgstr "Název vrstvy:"
 msgid "OK"
 msgstr "OK"
 
-#: app/linewidth_area.c:248 lib/properties.h:480 lib/properties.h:483
+#: app/linewidth_area.c:246 lib/properties.h:480 lib/properties.h:483
 #: objects/chronogram/chronoline.c:181 objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr "Šířka čáry"
 
-#: app/linewidth_area.c:260
+#: app/linewidth_area.c:258
 msgid "Line width:"
 msgstr "Šířka čáry:"
 
@@ -1491,12 +1528,12 @@ msgstr "Nemohu spustit příkaz '%s': %s"
 msgid "Could not open '%s' for writing: %s"
 msgstr "Nemohu otevřít '%s' pro zápis: %s"
 
-#: app/paginate_psprint.c:378
+#: app/paginate_psprint.c:376
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "Chyba při tisku: příkaz '%s' vrátil %d\n"
 
-#: app/paginate_psprint.c:388
+#: app/paginate_psprint.c:387
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr "Chyba při tisku: příkaz '%s' způsobil sigpipe."
@@ -1505,24 +1542,24 @@ msgstr "Chyba při tisku: příkaz '%s' způsobil sigpipe."
 msgid "Plug-ins"
 msgstr "Zásuvné moduly"
 
-#: app/plugin-manager.c:256
+#: app/plugin-manager.c:255
 msgid "Loaded"
 msgstr "Načten"
 
-#: app/plugin-manager.c:263 objects/UML/class.c:107
+#: app/plugin-manager.c:262 objects/UML/class.c:112
 #: objects/UML/large_package.c:128
 msgid "Name"
 msgstr "Název"
 
-#: app/plugin-manager.c:269
+#: app/plugin-manager.c:268
 msgid "Description"
 msgstr "Popis"
 
-#: app/plugin-manager.c:278
+#: app/plugin-manager.c:277
 msgid "Load at Startup"
 msgstr "Načíst při startu"
 
-#: app/plugin-manager.c:285
+#: app/plugin-manager.c:284
 msgid "File Name"
 msgstr "Název souboru"
 
@@ -1676,15 +1713,15 @@ msgstr "Nastavení"
 msgid "Object properties"
 msgstr "Vlastnosti objektu"
 
-#: app/properties.c:81
+#: app/properties.c:80
 msgid "This object has no properties."
 msgstr "Tento objekt nemá žádné vlastnosti."
 
-#: app/properties.c:203
+#: app/properties.c:202
 msgid "Properties: "
 msgstr "Vlastnosti:"
 
-#: app/properties.c:207
+#: app/properties.c:206
 msgid "Object properties:"
 msgstr "Vlastnosti objektu:"
 
@@ -2339,10 +2376,11 @@ msgstr "Koncová šipka"
 msgid "Text alignment"
 msgstr "Zarovnání textu"
 
+#. all this just to make the defaults selectable ...
 #: lib/properties.c:79 lib/properties.h:525 objects/GRAFCET/condition.c:132
 #: objects/GRAFCET/step.c:165 objects/GRAFCET/transition.c:142
-#: objects/UML/class_dialog.c:351 objects/chronogram/chronoline.c:183
-#: objects/chronogram/chronoref.c:164
+#: objects/UML/class.c:138 objects/UML/class_dialog.c:351
+#: objects/chronogram/chronoline.c:183 objects/chronogram/chronoref.c:164
 msgid "Font"
 msgstr "Písmo"
 
@@ -3727,7 +3765,8 @@ msgid "Miscellaneous objects"
 msgstr "Ostatní objekty"
 
 #. property rows
-#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:357
+#: objects/SADT/arrow.c:134 objects/UML/class.c:143
+#: objects/UML/class_dialog.c:357
 msgid "Normal"
 msgstr "Normální"
 
@@ -3795,12 +3834,6 @@ msgstr "Zařízení SADT"
 msgid "SADT diagram objects"
 msgstr "Objekty diagramu SADT"
 
-#. choose default font name for your locale. see also font_data structure
-#. in lib/font.c.
-#: objects/UML/activity.c:315
-msgid "Helvetica"
-msgstr "Helvetica"
-
 #: objects/UML/actor.c:359 objects/UML/actor.c:361 sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "Účinkující"
@@ -3848,67 +3881,86 @@ msgstr "Agregát"
 msgid "Composition"
 msgstr "Kompozice"
 
-#: objects/UML/class.c:109 objects/UML/classicon.c:135
+#: objects/UML/class.c:110 objects/UML/class.c:245 objects/UML/class.c:1157
+#: sheets/UML.sheet.in.h:6
+msgid "Class"
+msgstr "Třída"
+
+#: objects/UML/class.c:114 objects/UML/classicon.c:135
 #: objects/UML/component.c:122 objects/UML/large_package.c:126
 #: objects/UML/object.c:147 objects/UML/small_package.c:122
 msgid "Stereotype"
 msgstr "Stereotyp"
 
-#: objects/UML/class.c:111 objects/UML/class_dialog.c:382
-#: sheets/SDL.sheet.in.h:3
+#: objects/UML/class.c:116 objects/UML/class.c:153
+#: objects/UML/class_dialog.c:382 sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "Komentář"
 
-#: objects/UML/class.c:113 objects/UML/class_dialog.c:296
-#: objects/UML/class_dialog.c:367 objects/UML/class_dialog.c:1933
+#: objects/UML/class.c:118 objects/UML/class.c:147
+#: objects/UML/class_dialog.c:296 objects/UML/class_dialog.c:367
+#: objects/UML/class_dialog.c:1933
 msgid "Abstract"
 msgstr "Abstraktní"
 
-#: objects/UML/class.c:115 objects/UML/class_dialog.c:305
+#: objects/UML/class.c:120
+msgid "Template"
+msgstr "Šablona"
+
+#: objects/UML/class.c:123 objects/UML/class_dialog.c:305
 msgid "Suppress Attributes"
 msgstr "Potlačit atributy"
 
-#: objects/UML/class.c:117
+#: objects/UML/class.c:125
 msgid "Suppress Operations"
 msgstr "Potlačit operace"
 
-#: objects/UML/class.c:119
+#: objects/UML/class.c:127
 msgid "Visible Attributes"
 msgstr "Viditelné atributy"
 
-#: objects/UML/class.c:121
+#: objects/UML/class.c:129
 msgid "Visible Operations"
 msgstr "Viditelné operace"
 
-#: objects/UML/class.c:123
+#: objects/UML/class.c:131
 msgid "Visible Comments"
 msgstr "Viditelné komentáře"
 
-#: objects/UML/class.c:125 objects/UML/class_dialog.c:321
+#: objects/UML/class.c:133 objects/UML/class_dialog.c:321
 msgid "Wrap Operations"
 msgstr "Operace zalamování"
 
-#: objects/UML/class.c:127
+#: objects/UML/class.c:135
 msgid "Wrap after char"
 msgstr "Zalamovat po znaku"
 
-#: objects/UML/class.c:130 objects/UML/object.c:151
+#: objects/UML/class.c:145 objects/UML/class_dialog.c:362
+msgid "Polymorphic"
+msgstr "Polymorfní"
+
+#: objects/UML/class.c:149
+msgid "Classname"
+msgstr "Název třídy"
+
+#: objects/UML/class.c:151
+msgid "Abstract Classname"
+msgstr "Název abstraktní třídy"
+
+#: objects/UML/class.c:157 objects/UML/class.c:159 objects/UML/class.c:161
+#: objects/UML/class.c:163 objects/UML/class.c:165 objects/UML/class.c:167
+msgid " "
+msgstr " "
+
+#: objects/UML/class.c:172 objects/UML/object.c:151
 msgid "Attributes"
 msgstr "Atributy"
 
-#: objects/UML/class.c:132
+#: objects/UML/class.c:174
 msgid "Operations"
 msgstr "Operace"
 
-#: objects/UML/class.c:135
-msgid "Template"
-msgstr "Šablona"
-
-#: objects/UML/class.c:185 objects/UML/class.c:1088 sheets/UML.sheet.in.h:6
-msgid "Class"
-msgstr "Třída"
-
-#: objects/UML/class.c:191
+#: objects/UML/class.c:251
 msgid "Show comments"
 msgstr "Zobrazit komentář"
 
@@ -3944,6 +3996,10 @@ msgstr "Viditelné operace"
 msgid "Suppress operations"
 msgstr "Potlačit operace"
 
+#: objects/UML/class_dialog.c:328
+msgid "Wrap after this length: "
+msgstr "Zalamovat po této délce: "
+
 #: objects/UML/class_dialog.c:335
 msgid "Comments visible"
 msgstr "Viditelné komentáře"
@@ -3957,10 +4013,6 @@ msgstr "Druh"
 msgid "Size"
 msgstr "Velikost"
 
-#: objects/UML/class_dialog.c:362
-msgid "Polymorphic"
-msgstr "Polymorfní"
-
 #: objects/UML/class_dialog.c:372
 msgid "Class Name"
 msgstr "Název třídy"
@@ -4225,7 +4277,7 @@ msgstr ""
 "Tato volba bude odstraněna v budoucích verzích.\n"
 "Použijte prosím místo něj objekt Počátečního/Koncového stavu\n"
 
-#: objects/UML/state_term.c:122
+#: objects/UML/state_term.c:118
 msgid "Is final"
 msgstr "Je konečný"
 
@@ -4612,23 +4664,23 @@ msgstr "Přihlášení"
 msgid "Curve distance"
 msgstr "Vzdálenost křivky"
 
-#: objects/standard/bezier.c:545 objects/standard/beziergon.c:501
+#: objects/standard/bezier.c:545 objects/standard/beziergon.c:499
 msgid "Add Segment"
 msgstr "Přidat segment"
 
-#: objects/standard/bezier.c:546 objects/standard/beziergon.c:502
+#: objects/standard/bezier.c:546 objects/standard/beziergon.c:500
 msgid "Delete Segment"
 msgstr "Odstranit segment"
 
-#: objects/standard/bezier.c:548 objects/standard/beziergon.c:504
+#: objects/standard/bezier.c:548 objects/standard/beziergon.c:502
 msgid "Symmetric control"
 msgstr "Symetrické ovládání"
 
-#: objects/standard/bezier.c:550 objects/standard/beziergon.c:506
+#: objects/standard/bezier.c:550 objects/standard/beziergon.c:504
 msgid "Smooth control"
 msgstr "Hladké ovládání"
 
-#: objects/standard/bezier.c:552 objects/standard/beziergon.c:508
+#: objects/standard/bezier.c:552 objects/standard/beziergon.c:506
 msgid "Cusp control"
 msgstr "Hrotové ovládání"
 
@@ -4733,15 +4785,15 @@ msgstr "Odstranit roh"
 msgid "Standard objects"
 msgstr "Standardní objekty"
 
-#: plug-ins/cairo/diacairo.c:962
+#: plug-ins/cairo/diacairo.c:965
 msgid "Cairo PostScript"
 msgstr "Cairo PostScript"
 
-#: plug-ins/cairo/diacairo.c:971
+#: plug-ins/cairo/diacairo.c:974
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: plug-ins/cairo/diacairo.c:998
+#: plug-ins/cairo/diacairo.c:1001
 msgid "Cairo based Rendering"
 msgstr "Vykreslování založené na Cairo"
 
@@ -4822,7 +4874,7 @@ msgstr "GdkPixbuf - nevyhlazováno"
 msgid "GdkPixbuf bitmap"
 msgstr "Bitmapa GdkPixbuf"
 
-#: plug-ins/pixbuf/pixbuf.c:183
+#: plug-ins/pixbuf/pixbuf.c:189
 msgid "gdk-pixbuf based bitmap export/import"
 msgstr "export/import bitmapy založené na gdk-pixbuf"
 
@@ -4838,7 +4890,7 @@ msgstr "Není platné UTF8"
 msgid "TeX PSTricks macros"
 msgstr "Makra formátu TeX PSTricks"
 
-#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1058
+#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1137
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "Nelze otevřít '%s' pro zápis.\n"
@@ -4893,11 +4945,11 @@ msgstr "kořenový element byl '%s' -- očekávalo se 'svg'."
 msgid "Scalable Vector Graphics import and export filters"
 msgstr "Importní a exportní filtry do formátu Scalable Vector Graphics"
 
-#: plug-ins/wmf/wmf.cpp:1122
+#: plug-ins/wmf/wmf.cpp:1204
 msgid "Windows Meta File"
 msgstr "Windows Meta File"
 
-#: plug-ins/wmf/wmf.cpp:1138
+#: plug-ins/wmf/wmf.cpp:1220
 msgid "WMF export filter"
 msgstr "Exportní filtr formátu WMF"
 
@@ -5135,11 +5187,11 @@ msgstr "Chyba při zpracování stylu: %s\n"
 msgid "Error while applying stylesheet: %s\n"
 msgstr "Chyba při aplikaci stylu: %s\n"
 
-#: plug-ins/xslt/xslt.c:312
+#: plug-ins/xslt/xslt.c:313
 msgid "XSL Transformation filter"
 msgstr "Filtr pro transformaci XSL"
 
-#: plug-ins/xslt/xslt.c:336
+#: plug-ins/xslt/xslt.c:337
 msgid "No valid configuration files found for the XSLT plugin, not loading."
 msgstr ""
 "Nenalezeny platné konfigurační soubory pro zásuvný modul XSLT, nenačítám jej."
@@ -7900,154 +7952,158 @@ msgid "Pieces of a jigsaw"
 msgstr "Kousky skládačky"
 
 #: sheets/network.sheet.in.h:1
+msgid "24 Port Patch Panel"
+msgstr "Patch panel s 24 porty"
+
+#: sheets/network.sheet.in.h:2
 msgid "3 1/2 inch diskette"
 msgstr "3,5\" disketa"
 
-#: sheets/network.sheet.in.h:2
+#: sheets/network.sheet.in.h:3
 msgid "ATM switch symbol"
 msgstr "Symbol ATM switche"
 
-#: sheets/network.sheet.in.h:3
+#: sheets/network.sheet.in.h:4
 msgid "Antenna for wireless transmission"
 msgstr "Anténa pro bezdrátový přenos"
 
-#: sheets/network.sheet.in.h:4
+#: sheets/network.sheet.in.h:5
 msgid "Bigtower PC"
 msgstr "Bigtower PC"
 
-#: sheets/network.sheet.in.h:5
+#: sheets/network.sheet.in.h:6
 msgid "Computer"
 msgstr "Počítač"
 
-#: sheets/network.sheet.in.h:6
+#: sheets/network.sheet.in.h:7
 msgid "Desktop PC"
 msgstr "Desktop PC"
 
-#: sheets/network.sheet.in.h:7
+#: sheets/network.sheet.in.h:8
 msgid "Digitizing board"
 msgstr "Digitalizační panel"
 
-#: sheets/network.sheet.in.h:8
+#: sheets/network.sheet.in.h:9
 msgid "Ethernet bus"
 msgstr "Sběrnice Ethernet"
 
-#: sheets/network.sheet.in.h:9
+#: sheets/network.sheet.in.h:10
 msgid "External DAT drive"
 msgstr "Externí zařízení DAT"
 
-#: sheets/network.sheet.in.h:10
+#: sheets/network.sheet.in.h:11
 msgid "Firewall router"
 msgstr "Firewall směrovač"
 
-#: sheets/network.sheet.in.h:11
+#: sheets/network.sheet.in.h:12
 msgid "Laptop PC"
 msgstr "Laptop PC"
 
-#: sheets/network.sheet.in.h:12
+#: sheets/network.sheet.in.h:13
 msgid "Miditower PC"
 msgstr "Miditower PC"
 
-#: sheets/network.sheet.in.h:13
+#: sheets/network.sheet.in.h:14
 msgid "Minitower PC"
 msgstr "Minitower PC"
 
-#: sheets/network.sheet.in.h:14
+#: sheets/network.sheet.in.h:15
 msgid "Mobile phone"
 msgstr "Mobilní telefon"
 
-#: sheets/network.sheet.in.h:15
+#: sheets/network.sheet.in.h:16
 msgid "Mobile telephony base station"
 msgstr "Základová stanice pro mobilní telefony"
 
-#: sheets/network.sheet.in.h:16
+#: sheets/network.sheet.in.h:17
 msgid "Mobile telephony cell"
 msgstr "Buňka pro mobilní telefony"
 
-#: sheets/network.sheet.in.h:17
+#: sheets/network.sheet.in.h:18
 msgid "Modular switching system"
 msgstr "Modulární přepínací systém"
 
-#: sheets/network.sheet.in.h:18
+#: sheets/network.sheet.in.h:19
 msgid "Monitor"
 msgstr "Monitor"
 
-#: sheets/network.sheet.in.h:19
+#: sheets/network.sheet.in.h:20
 msgid "Network"
 msgstr "Síť"
 
-#: sheets/network.sheet.in.h:20
+#: sheets/network.sheet.in.h:21
 msgid "Network cloud"
 msgstr "Oblak sítě"
 
-#: sheets/network.sheet.in.h:21
+#: sheets/network.sheet.in.h:22
 msgid "Objects to design network diagrams with"
 msgstr "Objekty pro návrh síťových diagramů"
 
-#: sheets/network.sheet.in.h:22
+#: sheets/network.sheet.in.h:23
 msgid "Plotter"
 msgstr "Plotter"
 
-#: sheets/network.sheet.in.h:23
+#: sheets/network.sheet.in.h:24
 msgid "RJ45 wall-plug"
 msgstr "Zástrčka RJ45"
 
-#: sheets/network.sheet.in.h:24
+#: sheets/network.sheet.in.h:25
 msgid "Router symbol"
 msgstr "Symbol směrovače"
 
-#: sheets/network.sheet.in.h:25
+#: sheets/network.sheet.in.h:26
 msgid "Simple modem"
 msgstr "Jednoduchý modem"
 
-#: sheets/network.sheet.in.h:26
+#: sheets/network.sheet.in.h:27
 msgid "Simple printer"
 msgstr "Jednoduchá tiskárna"
 
-#: sheets/network.sheet.in.h:27
+#: sheets/network.sheet.in.h:28
 msgid "Speaker with integrated amplifier"
 msgstr "Reproduktor se zabudovaným zesilovačem"
 
-#: sheets/network.sheet.in.h:28
+#: sheets/network.sheet.in.h:29
 msgid "Speaker without amplifier"
 msgstr "Reproduktor bez zesilovače"
 
-#: sheets/network.sheet.in.h:29
+#: sheets/network.sheet.in.h:30
 msgid "Stackable hub or switch"
 msgstr "Stohovatelný hub nebo switch"
 
-#: sheets/network.sheet.in.h:30
+#: sheets/network.sheet.in.h:31
 msgid "Storage"
 msgstr "Úložiště"
 
-#: sheets/network.sheet.in.h:31
+#: sheets/network.sheet.in.h:32
 msgid "Switch symbol"
 msgstr "Symbol switche"
 
-#: sheets/network.sheet.in.h:32
+#: sheets/network.sheet.in.h:33
 msgid "Telephone"
 msgstr "Telefon"
 
-#: sheets/network.sheet.in.h:33
+#: sheets/network.sheet.in.h:34
 msgid "UNIX workstation"
 msgstr "Pracovní stanice UNIX"
 
-#: sheets/network.sheet.in.h:34
+#: sheets/network.sheet.in.h:35
 msgid "WAN connection"
 msgstr "Připojení WAN"
 
-#: sheets/network.sheet.in.h:35
+#: sheets/network.sheet.in.h:36
 msgid "WAN link"
 msgstr "Linka WAN"
 
-#: sheets/network.sheet.in.h:36
+#: sheets/network.sheet.in.h:37
 msgid "Wall-plug for the scEAD cabling system"
 msgstr "Zástrčka pro kabelový systém scEAD"
 
-#: sheets/network.sheet.in.h:37
+#: sheets/network.sheet.in.h:38
 msgid "Workstation monitor"
 msgstr "Monitor pracovní stanice"
 
-#: sheets/network.sheet.in.h:38
+#: sheets/network.sheet.in.h:39
 msgid "ZIP disk"
 msgstr "Disk ZIP"
 

--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,119 +3,120 @@
 # David Lodge <[e-mail]>, 2004.
 # 
 # 
+#: app/sheets.c:453
 msgid ""
 msgstr ""
 "Project-Id-Version: dia HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-29 19:18+0200\n"
-"PO-Revision-Date: 2004-06-29 21:25+0100\n"
+"POT-Creation-Date: 2004-07-13 14:28+0200\n"
+"PO-Revision-Date: 2004-07-13 17:55+0100\n"
 "Last-Translator: David Lodge <[e-mail]>\n"
 "Language-Team: English/GB <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit"
 
-#: app/app_procs.c:220
+#: app/app_procs.c:219
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s error: don't know how to export into %s\n"
 
-#: app/app_procs.c:230
+#: app/app_procs.c:228
 #, c-format
 msgid "%s error: input and output file name is identical: %s"
 msgstr "%s error: input and output file name is identical: %s"
 
-#: app/app_procs.c:238
+#: app/app_procs.c:235
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s error: need valid input file %s\n"
 
 #. if (!quiet)
-#: app/app_procs.c:258
+#: app/app_procs.c:255
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: app/app_procs.c:306
+#: app/app_procs.c:303
 #, c-format
 msgid "Can't find output format %s\n"
 msgstr "Can't find output format %s\n"
 
 #. Translators:  The argument is a list of options, not to be translated
-#: app/app_procs.c:393
+#: app/app_procs.c:390
 #, c-format
 msgid "Export to file format and exit.  Supported formats are: %s"
 msgstr "Export to file format and exit.  Supported formats are: %s"
 
 #. &export_file_name
-#: app/app_procs.c:402
+#: app/app_procs.c:399
 msgid "Export loaded file and exit"
 msgstr "Export loaded file and exit"
 
-#: app/app_procs.c:402 app/diaconv.c:94
+#: app/app_procs.c:399 app/diaconv.c:94
 msgid "OUTPUT"
 msgstr "OUTPUT"
 
 #. &export_file_format
-#: app/app_procs.c:404
+#: app/app_procs.c:401
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: app/app_procs.c:407
+#: app/app_procs.c:404
 msgid "Export graphics size"
 msgstr "Export graphics size"
 
-#: app/app_procs.c:407
+#: app/app_procs.c:404
 msgid "WxH"
 msgstr "WxH"
 
-#: app/app_procs.c:409
+#: app/app_procs.c:406
 msgid "Don't show the splash screen"
 msgstr "Don't show the splash screen"
 
-#: app/app_procs.c:411
+#: app/app_procs.c:408
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "Send error messages to stderr instead of showing dialogs."
 
-#: app/app_procs.c:413
+#: app/app_procs.c:410
 msgid "Display credits list and exit"
 msgstr "Display credits list and exit"
 
-#: app/app_procs.c:415
+#: app/app_procs.c:412
 msgid "Display version and exit"
 msgstr "Display version and exit"
 
-#: app/app_procs.c:417 app/diaconv.c:95
+#: app/app_procs.c:413 app/diaconv.c:95
 msgid "Show this help message"
 msgstr "Show this help message"
 
-#: app/app_procs.c:456
+#: app/app_procs.c:454
 msgid "Can't connect to session manager!\n"
 msgstr "Can't connect to session manager!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: app/app_procs.c:484
+#: app/app_procs.c:481
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia version %s, compiled %s %s\n"
 
-#: app/app_procs.c:486
+#: app/app_procs.c:483
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia version %s\n"
 
-#: app/app_procs.c:546 app/app_procs.c:548 app/diaconv.c:201 app/diaconv.c:203
+#: app/app_procs.c:537 app/app_procs.c:539 app/diaconv.c:201 app/diaconv.c:203
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs, exiting...\n"
 msgstr ""
 "Couldn't find standard objects when looking for object-libs, exiting...\n"
 
-#: app/app_procs.c:589
+#: app/app_procs.c:580
 msgid "Diagram1.dia"
 msgstr "Diagram1.dia"
 
-#: app/app_procs.c:628
+#: app/app_procs.c:619
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you can cause this message to appear.\n"
@@ -124,7 +125,7 @@ msgstr ""
 "describing how you can cause this message to appear.\n"
 
 #. no standard buttons
-#: app/app_procs.c:640
+#: app/app_procs.c:631
 msgid ""
 "Modified diagrams exist.\n"
 "Are you sure you want to quit Dia\n"
@@ -134,22 +135,21 @@ msgstr ""
 "Are you sure you want to quit Dia\n"
 "without saving them?"
 
-#: app/app_procs.c:644
+#: app/app_procs.c:635
 msgid "Quit Dia"
 msgstr "Quit Dia"
 
 #. This printf seems to prevent a race condition with unrefs.
 #. Yuck.  -Lars
-#: app/app_procs.c:695
-#, c-format
+#: app/app_procs.c:686
 msgid "Thank you for using Dia.\n"
 msgstr "Thank you for using Dia.\n"
 
-#: app/app_procs.c:711 app/app_procs.c:718
+#: app/app_procs.c:702 app/app_procs.c:709
 msgid "Could not create per-user Dia config directory"
 msgstr "Could not create per-user Dia config directory"
 
-#: app/app_procs.c:720
+#: app/app_procs.c:711
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
@@ -157,15 +157,15 @@ msgstr ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
 
-#: app/app_procs.c:742 app/diaconv.c:251
+#: app/app_procs.c:733 app/diaconv.c:251
 msgid "Objects and filters internal to dia"
 msgstr "Objects and filters internal to dia"
 
-#: app/app_procs.c:781 app/diaconv.c:121
+#: app/app_procs.c:772 app/diaconv.c:121
 msgid "[OPTION...] [FILE...]"
 msgstr "[OPTION...] [FILE...]"
 
-#: app/app_procs.c:785 app/diaconv.c:128
+#: app/app_procs.c:775 app/diaconv.c:128
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -174,6 +174,44 @@ msgstr ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 
+#: app/app_procs.c:860
+msgid ""
+"The original author of Dia was:\n"
+"\n"
+msgstr ""
+"The original author of Dia was:\n"
+"\n"
+
+#: app/app_procs.c:865
+msgid ""
+"\n"
+"The current maintainers of Dia are:\n"
+"\n"
+msgstr ""
+"\n"
+"The current maintainers of Dia are:\n"
+"\n"
+
+#: app/app_procs.c:870
+msgid ""
+"\n"
+"Other authors are:\n"
+"\n"
+msgstr ""
+"\n"
+"Other authors are:\n"
+"\n"
+
+#: app/app_procs.c:875
+msgid ""
+"\n"
+"Dia is documented by:\n"
+"\n"
+msgstr ""
+"\n"
+"Dia is documented by:\n"
+"\n"
+
 #: app/autosave.c:93
 msgid "Recovering autosaved diagrams"
 msgstr "Recovering autosaved diagrams"
@@ -236,10 +274,10 @@ msgstr "Copyright (C) 1998-2002 The Free Software Foundation and the authors"
 #: app/commands.c:623
 msgid ""
 "Dia is a program for drawing structured diagrams.\n"
-"Please visit http://www.lysator.liu.se/~alla/dia for more information."
+"Please visit http://www.gnome.org/projects/dia for more information."
 msgstr ""
 "Dia is a program for drawing structured diagrams.\n"
-"Please visit http://www.lysator.liu.se/~alla/dia for more information."
+"Please visit http://www.gnome.org/projects/dia for more information."
 
 #: app/commands.c:662
 msgid "About Dia"
@@ -256,8 +294,8 @@ msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
 msgstr "Maintainers: Lars Clausen and Cyrille Chepelov"
 
 #: app/commands.c:715
-msgid "Please visit http://www.lysator.liu.se/~alla/dia for more information"
-msgstr "Please visit http://www.lysator.liu.se/~alla/dia for more information"
+msgid "Please visit http://www.gnome.org/projects/dia for more information"
+msgstr "Please visit http://www.gnome.org/projects/dia for more information"
 
 #: app/commands.c:720
 msgid "Contributors:"
@@ -275,52 +313,61 @@ msgstr "This object has no defaults."
 msgid "Defaults: "
 msgstr "Defaults: "
 
-#: app/dia-props.c:75
+#: app/dia-props.c:89
 msgid "Diagram Properties"
 msgstr "Diagram Properties"
 
-#: app/dia-props.c:110
+#: app/dia-props.c:123
 msgid "Dynamic grid"
 msgstr "Dynamic grid"
 
-#: app/dia-props.c:118
+#: app/dia-props.c:131
 msgid "x"
 msgstr "x"
 
-#: app/dia-props.c:122
+#: app/dia-props.c:135
 msgid "y"
 msgstr "y"
 
-#: app/dia-props.c:127
+#: app/dia-props.c:140
 msgid "Spacing"
 msgstr "Spacing"
 
-#: app/dia-props.c:147
+#: app/dia-props.c:160
 msgid "Visible spacing"
 msgstr "Visible spacing"
 
-#: app/dia-props.c:167
+#. Hexes!
+#: app/dia-props.c:181 app/preferences.c:162
+msgid "Hex grid"
+msgstr "Hex grid"
+
+#: app/dia-props.c:189
+msgid "Hex grid size"
+msgstr "Hex grid size"
+
+#: app/dia-props.c:202
 msgid "Grid"
 msgstr "Grid"
 
-#: app/dia-props.c:178 lib/diagramdata.c:124
+#: app/dia-props.c:213 lib/diagramdata.c:127
 msgid "Background"
 msgstr "Background"
 
-#: app/dia-props.c:189 app/preferences.c:105
+#: app/dia-props.c:224 app/preferences.c:105
 msgid "Grid Lines"
 msgstr "Grid Lines"
 
-#: app/dia-props.c:200
+#: app/dia-props.c:235
 msgid "Page Breaks"
 msgstr "Page Breaks"
 
-#: app/dia-props.c:211
+#: app/dia-props.c:246
 msgid "Colors"
 msgstr "Colours"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: app/dia-props.c:230
+#: app/dia-props.c:265
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "Diagram Properties: %s"
@@ -551,7 +598,7 @@ msgstr "%0.3gcm x %0.3gcm"
 msgid "Page Setup"
 msgstr "Page Setup"
 
-#: app/disp_callbacks.c:81 app/properties.c:153
+#: app/disp_callbacks.c:81 app/properties.c:152
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -563,7 +610,7 @@ msgstr ""
 msgid "Properties..."
 msgstr "Properties..."
 
-#: app/disp_callbacks.c:908
+#: app/disp_callbacks.c:904
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -596,8 +643,8 @@ msgstr "Close Diagram"
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#: app/export_png.c:134 app/load_save.c:890 app/render_eps.c:103
-#: plug-ins/cairo/diacairo.c:908 plug-ins/cgm/cgm.c:1157
+#: app/export_png.c:134 app/load_save.c:893 app/render_eps.c:103
+#: plug-ins/cairo/diacairo.c:913 plug-ins/cgm/cgm.c:1157
 #: plug-ins/dxf/dxf-export.c:505 plug-ins/hpgl/hpgl.c:732
 #: plug-ins/metapost/render_metapost.c:964
 #: plug-ins/pstricks/render_pstricks.c:800 plug-ins/shape/shape-export.c:135
@@ -642,23 +689,23 @@ msgstr "Image height:"
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: app/filedlg.c:121 app/filedlg.c:392
+#: app/filedlg.c:122 app/filedlg.c:393
 msgid "By extension"
 msgstr "By extension"
 
-#: app/filedlg.c:182
+#: app/filedlg.c:183
 msgid "Open Diagram"
 msgstr "Open Diagram"
 
-#: app/filedlg.c:210
+#: app/filedlg.c:211
 msgid "Open Options"
 msgstr "Open Options"
 
-#: app/filedlg.c:218 app/filedlg.c:510
+#: app/filedlg.c:219 app/filedlg.c:511
 msgid "Determine file type:"
 msgstr "Determine file type:"
 
-#: app/filedlg.c:255
+#: app/filedlg.c:256
 msgid ""
 "Some characters in the filename are neither UTF-8 nor your local encoding.\n"
 "Some things will break."
@@ -667,7 +714,7 @@ msgstr ""
 "local encoding.\n"
 "Some things will break."
 
-#: app/filedlg.c:261 app/filedlg.c:436
+#: app/filedlg.c:262 app/filedlg.c:437
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -676,21 +723,21 @@ msgstr ""
 "The file '%s' already exists.\n"
 "Do you want to overwrite it?"
 
-#: app/filedlg.c:269 app/filedlg.c:443
+#: app/filedlg.c:270 app/filedlg.c:444
 msgid "File already exists"
 msgstr "File already exists"
 
-#: app/filedlg.c:301
+#: app/filedlg.c:302
 msgid "Save Diagram"
 msgstr "Save Diagram"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: app/filedlg.c:306
+#: app/filedlg.c:307
 msgid "Compress diagram files"
 msgstr "Compress diagram files"
 
-#: app/filedlg.c:315
+#: app/filedlg.c:316
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -698,7 +745,7 @@ msgstr ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving. Some text programs cannot manipulate compressed files."
 
-#: app/filedlg.c:462
+#: app/filedlg.c:463
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -707,11 +754,11 @@ msgstr ""
 "Could not determine which export filter\n"
 "to use to save '%s'"
 
-#: app/filedlg.c:480
+#: app/filedlg.c:481
 msgid "Export Diagram"
 msgstr "Export Diagram"
 
-#: app/filedlg.c:502
+#: app/filedlg.c:503
 msgid "Export Options"
 msgstr "Export Options"
 
@@ -901,12 +948,12 @@ msgstr "Layer name:"
 msgid "OK"
 msgstr "OK"
 
-#: app/linewidth_area.c:248 lib/properties.h:480 lib/properties.h:483
+#: app/linewidth_area.c:246 lib/properties.h:480 lib/properties.h:483
 #: objects/chronogram/chronoline.c:181 objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr "Line width"
 
-#: app/linewidth_area.c:260
+#: app/linewidth_area.c:258
 msgid "Line width:"
 msgstr "Line width:"
 
@@ -968,7 +1015,7 @@ msgstr ""
 "Error loading diagram %s.\n"
 "Not a Dia file."
 
-#: app/load_save.c:572
+#: app/load_save.c:575
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -979,12 +1026,12 @@ msgstr ""
 "%s.\n"
 "A valid Dia file defines at least one layer."
 
-#: app/load_save.c:923
+#: app/load_save.c:926
 #, c-format
 msgid "Failed to save file '%s'.\n"
 msgstr "Failed to save file '%s'.\n"
 
-#: app/load_save.c:994 app/load_save.c:999
+#: app/load_save.c:997 app/load_save.c:1002
 msgid "Native Dia Diagram"
 msgstr "Native Dia Diagram"
 
@@ -1475,12 +1522,12 @@ msgstr "Could not run command '%s': %s"
 msgid "Could not open '%s' for writing: %s"
 msgstr "Could not open '%s' for writing: %s"
 
-#: app/paginate_psprint.c:378
+#: app/paginate_psprint.c:376
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "Printing error: command '%s' returned %d\n"
 
-#: app/paginate_psprint.c:388
+#: app/paginate_psprint.c:387
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr "Printing error: command '%s' caused sigpipe."
@@ -1489,24 +1536,24 @@ msgstr "Printing error: command '%s' caused sigpipe."
 msgid "Plug-ins"
 msgstr "Plug-ins"
 
-#: app/plugin-manager.c:256
+#: app/plugin-manager.c:255
 msgid "Loaded"
 msgstr "Loaded"
 
-#: app/plugin-manager.c:263 objects/UML/class.c:107
+#: app/plugin-manager.c:262 objects/UML/class.c:112
 #: objects/UML/large_package.c:128
 msgid "Name"
 msgstr "Name"
 
-#: app/plugin-manager.c:269
+#: app/plugin-manager.c:268
 msgid "Description"
 msgstr "Description"
 
-#: app/plugin-manager.c:278
+#: app/plugin-manager.c:277
 msgid "Load at Startup"
 msgstr "Load at Startup"
 
-#: app/plugin-manager.c:285
+#: app/plugin-manager.c:284
 msgid "File Name"
 msgstr "File Name"
 
@@ -1631,24 +1678,28 @@ msgstr "Y Size:"
 msgid "Lines per major line"
 msgstr "Lines per major line"
 
-#: app/preferences.c:179
+#: app/preferences.c:163
+msgid "Hex Size:"
+msgstr "Hex Size:"
+
+#: app/preferences.c:182
 msgid "Diagram tree window:"
 msgstr "Diagram tree window:"
 
-#: app/preferences.c:181
+#: app/preferences.c:184
 msgid "Save hidden object types"
 msgstr "Save hidden object types"
 
-#: app/preferences.c:388 lib/prop_inttypes.c:158
+#: app/preferences.c:391 lib/prop_inttypes.c:158
 msgid "Yes"
 msgstr "Yes"
 
-#: app/preferences.c:388 app/preferences.c:399 lib/prop_inttypes.c:160
+#: app/preferences.c:391 app/preferences.c:402 lib/prop_inttypes.c:160
 #: lib/prop_inttypes.c:186
 msgid "No"
 msgstr "No"
 
-#: app/preferences.c:501
+#: app/preferences.c:504
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -1656,15 +1707,15 @@ msgstr "Preferences"
 msgid "Object properties"
 msgstr "Object properties"
 
-#: app/properties.c:81
+#: app/properties.c:80
 msgid "This object has no properties."
 msgstr "This object has no properties."
 
-#: app/properties.c:203
+#: app/properties.c:202
 msgid "Properties: "
 msgstr "Properties: "
 
-#: app/properties.c:207
+#: app/properties.c:206
 msgid "Object properties:"
 msgstr "Object properties:"
 
@@ -1690,7 +1741,7 @@ msgstr "Encapsulated Postscript with preview (using Pango fonts)"
 msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
 msgstr "Encapsulated Postscript (using PostScript Latin-1 fonts)"
 
-#: app/render_libart.c:318 lib/dialibartrenderer.c:288
+#: app/render_libart.c:318 lib/dialibartrenderer.c:300
 msgid "gdk_renderer: Unsupported fill mode specified!\n"
 msgstr "gdk_renderer: Unsupported fill mode specified!\n"
 
@@ -1809,8 +1860,8 @@ msgid "Description:"
 msgstr "Description:"
 
 #: app/sheets_dialog.c:618 objects/FS/flow-ortho.c:168 objects/FS/flow.c:146
-#: objects/UML/class_dialog.c:890 objects/UML/class_dialog.c:1824
-#: objects/UML/class_dialog.c:2053 objects/UML/class_dialog.c:2569
+#: objects/UML/class_dialog.c:911 objects/UML/class_dialog.c:1845
+#: objects/UML/class_dialog.c:2074 objects/UML/class_dialog.c:2590
 #: objects/Istar/link.c:167 objects/Jackson/phenomenon.c:144
 #: objects/KAOS/metaandorrel.c:164 objects/KAOS/metabinrel.c:181
 msgid "Type:"
@@ -1822,9 +1873,9 @@ msgstr "Sheet"
 
 #: app/sheets_dialog.c:672 objects/ER/attribute.c:151 objects/ER/entity.c:133
 #: objects/ER/relationship.c:138 objects/UML/association.c:200
-#: objects/UML/association.c:1126 objects/UML/class_dialog.c:879
-#: objects/UML/class_dialog.c:1813 objects/UML/class_dialog.c:2042
-#: objects/UML/class_dialog.c:2558 objects/UML/dependency.c:133
+#: objects/UML/association.c:1126 objects/UML/class_dialog.c:900
+#: objects/UML/class_dialog.c:1834 objects/UML/class_dialog.c:2063
+#: objects/UML/class_dialog.c:2579 objects/UML/dependency.c:133
 #: objects/UML/generalization.c:129 objects/UML/realizes.c:130
 msgid "Name:"
 msgstr "Name:"
@@ -2316,10 +2367,11 @@ msgstr "End arrow"
 msgid "Text alignment"
 msgstr "Text alignment"
 
+#. all this just to make the defaults selectable ...
 #: lib/properties.c:79 lib/properties.h:525 objects/GRAFCET/condition.c:132
 #: objects/GRAFCET/step.c:165 objects/GRAFCET/transition.c:142
-#: objects/UML/class_dialog.c:330 objects/chronogram/chronoline.c:183
-#: objects/chronogram/chronoref.c:164
+#: objects/UML/class.c:138 objects/UML/class_dialog.c:351
+#: objects/chronogram/chronoline.c:183 objects/chronogram/chronoref.c:164
 msgid "Font"
 msgstr "Font"
 
@@ -2443,18 +2495,18 @@ msgid "Total:"
 msgstr "Total:"
 
 #: objects/ER/participation.c:405 objects/FS/flow-ortho.c:644
-#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:566
+#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:462
 #: objects/UML/association.c:752 objects/UML/component_feature.c:183
 #: objects/UML/dependency.c:372 objects/UML/generalization.c:368
-#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:337
+#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:346
 msgid "Add segment"
 msgstr "Add segment"
 
 #: objects/ER/participation.c:406 objects/FS/flow-ortho.c:645
-#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:567
+#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:463
 #: objects/UML/association.c:753 objects/UML/component_feature.c:184
 #: objects/UML/dependency.c:373 objects/UML/generalization.c:369
-#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:338
+#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:347
 msgid "Delete segment"
 msgstr "Delete segment"
 
@@ -3704,7 +3756,8 @@ msgid "Miscellaneous objects"
 msgstr "Miscellaneous objects"
 
 #. property rows
-#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:336
+#: objects/SADT/arrow.c:134 objects/UML/class.c:143
+#: objects/UML/class_dialog.c:357
 msgid "Normal"
 msgstr "Normal"
 
@@ -3740,7 +3793,7 @@ msgstr ""
 "To improve the ease of reading, flows which begin and end vertically can be "
 "rendered grey"
 
-#: objects/SADT/arrow.c:572
+#: objects/SADT/arrow.c:468
 msgid "SADT Arrow"
 msgstr "SADT Arrow"
 
@@ -3772,17 +3825,11 @@ msgstr "SADT box"
 msgid "SADT diagram objects"
 msgstr "SADT diagram objects"
 
-#. choose default font name for your locale. see also font_data structure
-#. in lib/font.c.
-#: objects/UML/activity.c:315
-msgid "Helvetica"
-msgstr "Helvetica"
-
 #: objects/UML/actor.c:359 objects/UML/actor.c:361 sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "Actor"
 
-#: objects/UML/association.c:1139 objects/UML/class_dialog.c:2086
+#: objects/UML/association.c:1139 objects/UML/class_dialog.c:2107
 msgid "Direction:"
 msgstr "Direction:"
 
@@ -3825,252 +3872,279 @@ msgstr "Aggregate"
 msgid "Composition"
 msgstr "Composition"
 
-#: objects/UML/class.c:109 objects/UML/classicon.c:135
+#: objects/UML/class.c:110 objects/UML/class.c:245 objects/UML/class.c:1157
+#: sheets/UML.sheet.in.h:6
+msgid "Class"
+msgstr "Class"
+
+#: objects/UML/class.c:114 objects/UML/classicon.c:135
 #: objects/UML/component.c:122 objects/UML/large_package.c:126
 #: objects/UML/object.c:147 objects/UML/small_package.c:122
 msgid "Stereotype"
 msgstr "Stereotype"
 
-#: objects/UML/class.c:111 objects/UML/class_dialog.c:361
-#: sheets/SDL.sheet.in.h:3
+#: objects/UML/class.c:116 objects/UML/class.c:153
+#: objects/UML/class_dialog.c:382 sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "Comment"
 
-#: objects/UML/class.c:113 objects/UML/class_dialog.c:290
-#: objects/UML/class_dialog.c:346 objects/UML/class_dialog.c:1912
+#: objects/UML/class.c:118 objects/UML/class.c:147
+#: objects/UML/class_dialog.c:296 objects/UML/class_dialog.c:367
+#: objects/UML/class_dialog.c:1933
 msgid "Abstract"
 msgstr "Abstract"
 
-#: objects/UML/class.c:115 objects/UML/class_dialog.c:299
+#: objects/UML/class.c:120
+msgid "Template"
+msgstr "Template"
+
+#: objects/UML/class.c:123 objects/UML/class_dialog.c:305
 msgid "Suppress Attributes"
 msgstr "Suppress Attributes"
 
-#: objects/UML/class.c:117
+#: objects/UML/class.c:125
 msgid "Suppress Operations"
 msgstr "Suppress Operations"
 
-#: objects/UML/class.c:119
+#: objects/UML/class.c:127
 msgid "Visible Attributes"
 msgstr "Visible Attributes"
 
-#: objects/UML/class.c:121
+#: objects/UML/class.c:129
 msgid "Visible Operations"
 msgstr "Visible Operations"
 
-#: objects/UML/class.c:123
+#: objects/UML/class.c:131
 msgid "Visible Comments"
 msgstr "Visible Comments"
 
-#: objects/UML/class.c:126 objects/UML/object.c:151
+#: objects/UML/class.c:133 objects/UML/class_dialog.c:321
+msgid "Wrap Operations"
+msgstr "Wrap Operations"
+
+#: objects/UML/class.c:135
+msgid "Wrap after char"
+msgstr "Wrap after char"
+
+#: objects/UML/class.c:145 objects/UML/class_dialog.c:362
+msgid "Polymorphic"
+msgstr "Polymorphic"
+
+#: objects/UML/class.c:149
+msgid "Classname"
+msgstr "Classname"
+
+#: objects/UML/class.c:151
+msgid "Abstract Classname"
+msgstr "Abstract Classname"
+
+#: objects/UML/class.c:157 objects/UML/class.c:159 objects/UML/class.c:161
+#: objects/UML/class.c:163 objects/UML/class.c:165 objects/UML/class.c:167
+msgid " "
+msgstr " "
+
+#: objects/UML/class.c:172 objects/UML/object.c:151
 msgid "Attributes"
 msgstr "Attributes"
 
-#: objects/UML/class.c:128
+#: objects/UML/class.c:174
 msgid "Operations"
 msgstr "Operations"
 
-#: objects/UML/class.c:131
-msgid "Template"
-msgstr "Template"
-
-#: objects/UML/class.c:179 objects/UML/class.c:943 sheets/UML.sheet.in.h:6
-msgid "Class"
-msgstr "Class"
-
-#: objects/UML/class.c:185
+#: objects/UML/class.c:251
 msgid "Show comments"
 msgstr "Show comments"
 
 #. Class page:
-#: objects/UML/class_dialog.c:259
+#: objects/UML/class_dialog.c:265
 msgid "_Class"
 msgstr "_Class"
 
-#: objects/UML/class_dialog.c:267
+#: objects/UML/class_dialog.c:273
 msgid "Class name:"
 msgstr "Class name:"
 
-#: objects/UML/class_dialog.c:275 objects/UML/class_dialog.c:1835
+#: objects/UML/class_dialog.c:281 objects/UML/class_dialog.c:1856
 #: objects/UML/dependency.c:135 objects/UML/generalization.c:131
 #: objects/UML/realizes.c:132
 msgid "Stereotype:"
 msgstr "Stereotype:"
 
-#: objects/UML/class_dialog.c:282 objects/UML/class_dialog.c:912
-#: objects/UML/class_dialog.c:1953 objects/UML/class_dialog.c:2075
+#: objects/UML/class_dialog.c:288 objects/UML/class_dialog.c:933
+#: objects/UML/class_dialog.c:1974 objects/UML/class_dialog.c:2096
 msgid "Comment:"
 msgstr "Comment:"
 
-#: objects/UML/class_dialog.c:296
+#: objects/UML/class_dialog.c:302
 msgid "Attributes visible"
 msgstr "Attributes visible"
 
-#: objects/UML/class_dialog.c:305
+#: objects/UML/class_dialog.c:311
 msgid "Operations visible"
 msgstr "Operations visible"
 
-#: objects/UML/class_dialog.c:308
+#: objects/UML/class_dialog.c:314
 msgid "Suppress operations"
 msgstr "Suppress operations"
 
-#: objects/UML/class_dialog.c:314
+#: objects/UML/class_dialog.c:328
+msgid "Wrap after this length: "
+msgstr "Wrap after this length: "
+
+#: objects/UML/class_dialog.c:335
 msgid "Comments visible"
 msgstr "Comments visible"
 
 #. head line
-#: objects/UML/class_dialog.c:327
+#: objects/UML/class_dialog.c:348
 msgid "Kind"
 msgstr "Kind"
 
-#: objects/UML/class_dialog.c:332
+#: objects/UML/class_dialog.c:353
 msgid "Size"
 msgstr "Size"
 
-#: objects/UML/class_dialog.c:341
-msgid "Polymorphic"
-msgstr "Polymorphic"
-
-#: objects/UML/class_dialog.c:351
+#: objects/UML/class_dialog.c:372
 msgid "Class Name"
 msgstr "Class Name"
 
-#: objects/UML/class_dialog.c:356
+#: objects/UML/class_dialog.c:377
 msgid "Abstract Class"
 msgstr "Abstract Class"
 
 #. should probably be refactored too.
-#: objects/UML/class_dialog.c:373
+#: objects/UML/class_dialog.c:394
 msgid "Text Color"
 msgstr "Text Colour"
 
-#: objects/UML/class_dialog.c:381
+#: objects/UML/class_dialog.c:402
 msgid "Foreground Color"
 msgstr "Foreground Colour"
 
-#: objects/UML/class_dialog.c:389
+#: objects/UML/class_dialog.c:410
 msgid "Background Color"
 msgstr "Background Colour"
 
 #. Attributes page:
-#: objects/UML/class_dialog.c:812
+#: objects/UML/class_dialog.c:833
 msgid "_Attributes"
 msgstr "_Attributes"
 
-#: objects/UML/class_dialog.c:840 objects/UML/class_dialog.c:1771
-#: objects/UML/class_dialog.c:1999 objects/UML/class_dialog.c:2519
+#: objects/UML/class_dialog.c:861 objects/UML/class_dialog.c:1792
+#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2540
 msgid "_New"
 msgstr "_New"
 
-#: objects/UML/class_dialog.c:846 objects/UML/class_dialog.c:1777
-#: objects/UML/class_dialog.c:2006 objects/UML/class_dialog.c:2525
+#: objects/UML/class_dialog.c:867 objects/UML/class_dialog.c:1798
+#: objects/UML/class_dialog.c:2027 objects/UML/class_dialog.c:2546
 msgid "_Delete"
 msgstr "_Delete"
 
-#: objects/UML/class_dialog.c:852 objects/UML/class_dialog.c:1783
-#: objects/UML/class_dialog.c:2013 objects/UML/class_dialog.c:2531
+#: objects/UML/class_dialog.c:873 objects/UML/class_dialog.c:1804
+#: objects/UML/class_dialog.c:2034 objects/UML/class_dialog.c:2552
 msgid "Move up"
 msgstr "Move up"
 
-#: objects/UML/class_dialog.c:858 objects/UML/class_dialog.c:1789
-#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2537
+#: objects/UML/class_dialog.c:879 objects/UML/class_dialog.c:1810
+#: objects/UML/class_dialog.c:2041 objects/UML/class_dialog.c:2558
 msgid "Move down"
 msgstr "Move down"
 
-#: objects/UML/class_dialog.c:869
+#: objects/UML/class_dialog.c:890
 msgid "Attribute data"
 msgstr "Attribute data"
 
-#: objects/UML/class_dialog.c:901
+#: objects/UML/class_dialog.c:922
 msgid "Value:"
 msgstr "Value:"
 
-#: objects/UML/class_dialog.c:924 objects/UML/class_dialog.c:1848
+#: objects/UML/class_dialog.c:945 objects/UML/class_dialog.c:1869
 msgid "Visibility:"
 msgstr "Visibility:"
 
-#: objects/UML/class_dialog.c:933 objects/UML/class_dialog.c:1857
+#: objects/UML/class_dialog.c:954 objects/UML/class_dialog.c:1878
 msgid "Public"
 msgstr "Public"
 
-#: objects/UML/class_dialog.c:941 objects/UML/class_dialog.c:1865
+#: objects/UML/class_dialog.c:962 objects/UML/class_dialog.c:1886
 msgid "Private"
 msgstr "Private"
 
-#: objects/UML/class_dialog.c:949 objects/UML/class_dialog.c:1873
+#: objects/UML/class_dialog.c:970 objects/UML/class_dialog.c:1894
 msgid "Protected"
 msgstr "Protected"
 
-#: objects/UML/class_dialog.c:957 objects/UML/class_dialog.c:1881
+#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1902
 msgid "Implementation"
 msgstr "Implementation"
 
-#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1897
+#: objects/UML/class_dialog.c:999 objects/UML/class_dialog.c:1918
 msgid "Class scope"
 msgstr "Class scope"
 
 #. Operations page:
-#: objects/UML/class_dialog.c:1743
+#: objects/UML/class_dialog.c:1764
 msgid "_Operations"
 msgstr "_Operations"
 
-#: objects/UML/class_dialog.c:1801
+#: objects/UML/class_dialog.c:1822
 msgid "Operation data"
 msgstr "Operation data"
 
-#: objects/UML/class_dialog.c:1903
+#: objects/UML/class_dialog.c:1924
 msgid "Inheritance type:"
 msgstr "Inheritance type:"
 
-#: objects/UML/class_dialog.c:1920
+#: objects/UML/class_dialog.c:1941
 msgid "Polymorphic (virtual)"
 msgstr "Polymorphic (virtual)"
 
-#: objects/UML/class_dialog.c:1928
+#: objects/UML/class_dialog.c:1949
 msgid "Leaf (final)"
 msgstr "Leaf (final)"
 
-#: objects/UML/class_dialog.c:1946
+#: objects/UML/class_dialog.c:1967
 msgid "Query"
 msgstr "Query"
 
-#: objects/UML/class_dialog.c:1970
+#: objects/UML/class_dialog.c:1991
 msgid "Parameters:"
 msgstr "Parameters:"
 
-#: objects/UML/class_dialog.c:2032
+#: objects/UML/class_dialog.c:2053
 msgid "Parameter data"
 msgstr "Parameter data"
 
-#: objects/UML/class_dialog.c:2064
+#: objects/UML/class_dialog.c:2085
 msgid "Def. value:"
 msgstr "Def. value:"
 
-#: objects/UML/class_dialog.c:2095
+#: objects/UML/class_dialog.c:2116
 msgid "Undefined"
 msgstr "Undefined"
 
-#: objects/UML/class_dialog.c:2103
+#: objects/UML/class_dialog.c:2124
 msgid "In"
 msgstr "In"
 
-#: objects/UML/class_dialog.c:2112
+#: objects/UML/class_dialog.c:2133
 msgid "Out"
 msgstr "Out"
 
-#: objects/UML/class_dialog.c:2121
+#: objects/UML/class_dialog.c:2142
 msgid "In & Out"
 msgstr "In & Out"
 
 #. Templates page:
-#: objects/UML/class_dialog.c:2485
+#: objects/UML/class_dialog.c:2506
 msgid "_Templates"
 msgstr "_Templates"
 
-#: objects/UML/class_dialog.c:2491 sheets/UML.sheet.in.h:29
+#: objects/UML/class_dialog.c:2512 sheets/UML.sheet.in.h:29
 msgid "Template class"
 msgstr "Template class"
 
-#: objects/UML/class_dialog.c:2548
+#: objects/UML/class_dialog.c:2569
 msgid "Formal parameter data"
 msgstr "Formal parameter data"
 
@@ -4194,7 +4268,7 @@ msgstr ""
 "This option will go away in future versions.\n"
 "Please use the Initial/Final State object instead\n"
 
-#: objects/UML/state_term.c:122
+#: objects/UML/state_term.c:118
 msgid "Is final"
 msgstr "Is final"
 
@@ -4330,6 +4404,7 @@ msgid "Cannot open icon file %s for object type '%s'."
 msgstr "Cannot open icon file %s for object type '%s'."
 
 #: objects/flowchart/box.c:148 objects/standard/box.c:148
+#: objects/standard/polyline.c:130 objects/standard/zigzagline.c:129
 msgid "Corner radius"
 msgstr "Corner radius"
 
@@ -4578,23 +4653,23 @@ msgstr "Subscribers"
 msgid "Curve distance"
 msgstr "Curve distance"
 
-#: objects/standard/bezier.c:545 objects/standard/beziergon.c:501
+#: objects/standard/bezier.c:545 objects/standard/beziergon.c:499
 msgid "Add Segment"
 msgstr "Add Segment"
 
-#: objects/standard/bezier.c:546 objects/standard/beziergon.c:502
+#: objects/standard/bezier.c:546 objects/standard/beziergon.c:500
 msgid "Delete Segment"
 msgstr "Delete Segment"
 
-#: objects/standard/bezier.c:548 objects/standard/beziergon.c:504
+#: objects/standard/bezier.c:548 objects/standard/beziergon.c:502
 msgid "Symmetric control"
 msgstr "Symmetric control"
 
-#: objects/standard/bezier.c:550 objects/standard/beziergon.c:506
+#: objects/standard/bezier.c:550 objects/standard/beziergon.c:504
 msgid "Smooth control"
 msgstr "Smooth control"
 
-#: objects/standard/bezier.c:552 objects/standard/beziergon.c:508
+#: objects/standard/bezier.c:552 objects/standard/beziergon.c:506
 msgid "Cusp control"
 msgstr "Cusp control"
 
@@ -4687,11 +4762,11 @@ msgstr "Fractional start gap"
 msgid "Fractional end gap"
 msgstr "Fractional end gap"
 
-#: objects/standard/polygon.c:460 objects/standard/polyline.c:496
+#: objects/standard/polygon.c:460 objects/standard/polyline.c:515
 msgid "Add Corner"
 msgstr "Add Corner"
 
-#: objects/standard/polygon.c:461 objects/standard/polyline.c:497
+#: objects/standard/polygon.c:461 objects/standard/polyline.c:516
 msgid "Delete Corner"
 msgstr "Delete Corner"
 
@@ -4699,15 +4774,15 @@ msgstr "Delete Corner"
 msgid "Standard objects"
 msgstr "Standard objects"
 
-#: plug-ins/cairo/diacairo.c:962
+#: plug-ins/cairo/diacairo.c:967
 msgid "Cairo PostScript"
 msgstr "Cairo PostScript"
 
-#: plug-ins/cairo/diacairo.c:970
+#: plug-ins/cairo/diacairo.c:976
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: plug-ins/cairo/diacairo.c:996
+#: plug-ins/cairo/diacairo.c:1005
 msgid "Cairo based Rendering"
 msgstr "Cairo based Rendering"
 
@@ -4788,7 +4863,7 @@ msgstr "GdkPixbuf - not antialiased"
 msgid "GdkPixbuf bitmap"
 msgstr "GdkPixbuf bitmap"
 
-#: plug-ins/pixbuf/pixbuf.c:182
+#: plug-ins/pixbuf/pixbuf.c:189
 msgid "gdk-pixbuf based bitmap export/import"
 msgstr "gdk-pixbuf based bitmap export/import"
 
@@ -4804,7 +4879,7 @@ msgstr "Not valid UTF8"
 msgid "TeX PSTricks macros"
 msgstr "TeX PSTricks macros"
 
-#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1058
+#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1140
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "Couldn't open: '%s' for writing.\n"
@@ -4859,11 +4934,11 @@ msgstr "root element was '%s' -- expecting 'svg'."
 msgid "Scalable Vector Graphics import and export filters"
 msgstr "Scalable Vector Graphics import and export filters"
 
-#: plug-ins/wmf/wmf.cpp:1122
+#: plug-ins/wmf/wmf.cpp:1207
 msgid "Windows Meta File"
 msgstr "Windows Meta File"
 
-#: plug-ins/wmf/wmf.cpp:1138
+#: plug-ins/wmf/wmf.cpp:1223
 msgid "WMF export filter"
 msgstr "WMF export filter"
 
@@ -5097,11 +5172,11 @@ msgstr "Error while parsing stylesheet: %s\n"
 msgid "Error while applying stylesheet: %s\n"
 msgstr "Error while applying stylesheet: %s\n"
 
-#: plug-ins/xslt/xslt.c:312
+#: plug-ins/xslt/xslt.c:313
 msgid "XSL Transformation filter"
 msgstr "XSL Transformation filter"
 
-#: plug-ins/xslt/xslt.c:336
+#: plug-ins/xslt/xslt.c:337
 msgid "No valid configuration files found for the XSLT plugin, not loading."
 msgstr "No valid configuration files found for the XSLT plugin, not loading."
 
@@ -5293,6 +5368,219 @@ msgstr "Up-down-left arrow"
 msgid "Vertical parallelogram"
 msgstr "Vertical parallelogram"
 
+#: sheets/ChemEng.sheet.in.h:1
+msgid "AC Generator"
+msgstr "AC Generator"
+
+#: sheets/ChemEng.sheet.in.h:2
+msgid "Air Cooler"
+msgstr "Air Cooler"
+
+#: sheets/ChemEng.sheet.in.h:3
+msgid "Autoclave"
+msgstr "Autoclave"
+
+#: sheets/ChemEng.sheet.in.h:4
+msgid "Axial Flow Fan"
+msgstr "Axial Flow Fan"
+
+#: sheets/ChemEng.sheet.in.h:5
+msgid "Basic Filter"
+msgstr "Basic Filter"
+
+#: sheets/ChemEng.sheet.in.h:6
+msgid "Centrifugal Pump or Fan"
+msgstr "Centrifugal Pump or Fan"
+
+#: sheets/ChemEng.sheet.in.h:7
+msgid "Centrifuge"
+msgstr "Centrifuge"
+
+#. For: zenith
+#: sheets/ChemEng.sheet.in.h:9
+msgid "ChemEng"
+msgstr "ChemEng"
+
+#: sheets/ChemEng.sheet.in.h:10
+msgid "Clarifier or Settling Tank"
+msgstr "Clarifier or Settling Tank"
+
+#: sheets/ChemEng.sheet.in.h:11
+msgid "Collection for chemical engineering"
+msgstr "Collection for chemical engineering"
+
+#: sheets/ChemEng.sheet.in.h:12
+msgid "Compressor or Turbine"
+msgstr "Compressor or Turbine"
+
+#: sheets/ChemEng.sheet.in.h:13
+msgid "Covered tank"
+msgstr "Covered tank"
+
+#: sheets/ChemEng.sheet.in.h:14
+msgid "Cyclone and hydrocyclone"
+msgstr "Cyclone and hydrocyclone"
+
+#: sheets/ChemEng.sheet.in.h:15
+msgid "Double-Pipe Exchanger"
+msgstr "Double-Pipe Exchanger"
+
+#: sheets/ChemEng.sheet.in.h:16
+msgid "Ejector or Injector"
+msgstr "Ejector or Injector"
+
+#: sheets/ChemEng.sheet.in.h:17
+msgid "Fan or Stirrer"
+msgstr "Fan or Stirrer"
+
+#: sheets/ChemEng.sheet.in.h:18
+msgid "Fixed-Sheet Exchanger"
+msgstr "Fixed-Sheet Exchanger"
+
+#: sheets/ChemEng.sheet.in.h:19
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr "Floating-Head or U-Tube Exchanger"
+
+#: sheets/ChemEng.sheet.in.h:20
+msgid "Fluid Contacting Vessel, simple"
+msgstr "Fluid Contacting Vessel, simple"
+
+#: sheets/ChemEng.sheet.in.h:21
+msgid "Forced-Flow Air Cooler"
+msgstr "Forced-Flow Air Cooler"
+
+#: sheets/ChemEng.sheet.in.h:22
+msgid "Gas Holder, basic"
+msgstr "Gas Holder, basic"
+
+#: sheets/ChemEng.sheet.in.h:23
+msgid "Heating/Cooling Coil"
+msgstr "Heating/Cooling Coil"
+
+#: sheets/ChemEng.sheet.in.h:24
+msgid "Heating/Cooling Coil, vertical"
+msgstr "Heating/Cooling Coil, vertical"
+
+#: sheets/ChemEng.sheet.in.h:25
+msgid "Induced-Flow Air Cooler"
+msgstr "Induced-Flow Air Cooler"
+
+#: sheets/ChemEng.sheet.in.h:26
+msgid "Kettle Reboiler"
+msgstr "Kettle Reboiler"
+
+#: sheets/ChemEng.sheet.in.h:27
+msgid "Knock-out Drum (with demister pad)"
+msgstr "Knock-out Drum (with demister pad)"
+
+#: sheets/ChemEng.sheet.in.h:28
+msgid "Measurement"
+msgstr "Measurement"
+
+#: sheets/ChemEng.sheet.in.h:29
+msgid "Mixer"
+msgstr "Mixer"
+
+#: sheets/ChemEng.sheet.in.h:30
+msgid "Open Tank"
+msgstr "Open Tank"
+
+#: sheets/ChemEng.sheet.in.h:31
+msgid "Plate Exchanger"
+msgstr "Plate Exchanger"
+
+#: sheets/ChemEng.sheet.in.h:32
+msgid "Pneumatic Line"
+msgstr "Pneumatic Line"
+
+#: sheets/ChemEng.sheet.in.h:33
+msgid "Pneumatic Line, vertical"
+msgstr "Pneumatic Line, vertical"
+
+#: sheets/ChemEng.sheet.in.h:34
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr "Positive Displacement Rotary Pump or Compressor"
+
+#: sheets/ChemEng.sheet.in.h:35
+msgid "Reactor or Absorption Vessel, simple"
+msgstr "Reactor or Absorption Vessel, simple"
+
+#: sheets/ChemEng.sheet.in.h:36
+msgid "Reciprocating Compressor or Pump"
+msgstr "Reciprocating Compressor or Pump"
+
+#: sheets/ChemEng.sheet.in.h:37
+msgid "Regulable Valve"
+msgstr "Regulable Valve"
+
+#: sheets/ChemEng.sheet.in.h:38
+msgid "Regulable Valve, vertical"
+msgstr "Regulable Valve, vertical"
+
+#: sheets/ChemEng.sheet.in.h:39
+msgid "Sealed Tank"
+msgstr "Sealed Tank"
+
+#: sheets/ChemEng.sheet.in.h:40
+msgid "Simple Furnace"
+msgstr "Simple Furnace"
+
+#: sheets/ChemEng.sheet.in.h:41
+msgid "Simple Heat Exchanger"
+msgstr "Simple Heat Exchanger"
+
+#: sheets/ChemEng.sheet.in.h:42
+msgid "Simple Heat Exchanger, vertical"
+msgstr "Simple Heat Exchanger, vertical"
+
+#: sheets/ChemEng.sheet.in.h:43
+msgid "Simple Vessel"
+msgstr "Simple Vessel"
+
+#: sheets/ChemEng.sheet.in.h:44
+msgid "Spray Drier"
+msgstr "Spray Drier"
+
+#: sheets/ChemEng.sheet.in.h:45
+msgid "Spraying Device"
+msgstr "Spraying Device"
+
+#: sheets/ChemEng.sheet.in.h:46
+msgid "Storage Sphere"
+msgstr "Storage Sphere"
+
+#: sheets/ChemEng.sheet.in.h:47
+msgid "Tank with Fixed Roof"
+msgstr "Tank with Fixed Roof"
+
+#: sheets/ChemEng.sheet.in.h:48
+msgid "Tank with Floating Roof"
+msgstr "Tank with Floating Roof"
+
+#: sheets/ChemEng.sheet.in.h:49
+msgid "Tray Column, detailed"
+msgstr "Tray Column, detailed"
+
+#: sheets/ChemEng.sheet.in.h:50
+msgid "Tray Column, simple"
+msgstr "Tray Column, simple"
+
+#: sheets/ChemEng.sheet.in.h:51
+msgid "Valve"
+msgstr "Valve"
+
+#: sheets/ChemEng.sheet.in.h:52
+msgid "Valve, vertical"
+msgstr "Valve, vertical"
+
+#: sheets/ChemEng.sheet.in.h:53
+msgid "Water Cooler"
+msgstr "Water Cooler"
+
+#: sheets/ChemEng.sheet.in.h:54
+msgid "Water Cooler, vertical"
+msgstr "Water Cooler, vertical"
+
 #: sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
 msgstr "Circuit"
@@ -7639,154 +7927,158 @@ msgid "Pieces of a jigsaw"
 msgstr "Pieces of a jigsaw"
 
 #: sheets/network.sheet.in.h:1
+msgid "24 Port Patch Panel"
+msgstr "24 Port Patch Panel"
+
+#: sheets/network.sheet.in.h:2
 msgid "3 1/2 inch diskette"
 msgstr "3 1/2 inch diskette"
 
-#: sheets/network.sheet.in.h:2
+#: sheets/network.sheet.in.h:3
 msgid "ATM switch symbol"
 msgstr "ATM switch symbol"
 
-#: sheets/network.sheet.in.h:3
+#: sheets/network.sheet.in.h:4
 msgid "Antenna for wireless transmission"
 msgstr "Antenna for wireless transmission"
 
-#: sheets/network.sheet.in.h:4
+#: sheets/network.sheet.in.h:5
 msgid "Bigtower PC"
 msgstr "Bigtower PC"
 
-#: sheets/network.sheet.in.h:5
+#: sheets/network.sheet.in.h:6
 msgid "Computer"
 msgstr "Computer"
 
-#: sheets/network.sheet.in.h:6
+#: sheets/network.sheet.in.h:7
 msgid "Desktop PC"
 msgstr "Desktop PC"
 
-#: sheets/network.sheet.in.h:7
+#: sheets/network.sheet.in.h:8
 msgid "Digitizing board"
 msgstr "Digitising board"
 
-#: sheets/network.sheet.in.h:8
+#: sheets/network.sheet.in.h:9
 msgid "Ethernet bus"
 msgstr "Ethernet bus"
 
-#: sheets/network.sheet.in.h:9
+#: sheets/network.sheet.in.h:10
 msgid "External DAT drive"
 msgstr "External DAT drive"
 
-#: sheets/network.sheet.in.h:10
+#: sheets/network.sheet.in.h:11
 msgid "Firewall router"
 msgstr "Firewall router"
 
-#: sheets/network.sheet.in.h:11
+#: sheets/network.sheet.in.h:12
 msgid "Laptop PC"
 msgstr "Laptop PC"
 
-#: sheets/network.sheet.in.h:12
+#: sheets/network.sheet.in.h:13
 msgid "Miditower PC"
 msgstr "Miditower PC"
 
-#: sheets/network.sheet.in.h:13
+#: sheets/network.sheet.in.h:14
 msgid "Minitower PC"
 msgstr "Minitower PC"
 
-#: sheets/network.sheet.in.h:14
+#: sheets/network.sheet.in.h:15
 msgid "Mobile phone"
 msgstr "Mobile phone"
 
-#: sheets/network.sheet.in.h:15
+#: sheets/network.sheet.in.h:16
 msgid "Mobile telephony base station"
 msgstr "Mobile telephony base station"
 
-#: sheets/network.sheet.in.h:16
+#: sheets/network.sheet.in.h:17
 msgid "Mobile telephony cell"
 msgstr "Mobile telephony cell"
 
-#: sheets/network.sheet.in.h:17
+#: sheets/network.sheet.in.h:18
 msgid "Modular switching system"
 msgstr "Modular switching system"
 
-#: sheets/network.sheet.in.h:18
+#: sheets/network.sheet.in.h:19
 msgid "Monitor"
 msgstr "Monitor"
 
-#: sheets/network.sheet.in.h:19
+#: sheets/network.sheet.in.h:20
 msgid "Network"
 msgstr "Network"
 
-#: sheets/network.sheet.in.h:20
+#: sheets/network.sheet.in.h:21
 msgid "Network cloud"
 msgstr "Network cloud"
 
-#: sheets/network.sheet.in.h:21
+#: sheets/network.sheet.in.h:22
 msgid "Objects to design network diagrams with"
 msgstr "Objects to design network diagrams with"
 
-#: sheets/network.sheet.in.h:22
+#: sheets/network.sheet.in.h:23
 msgid "Plotter"
 msgstr "Plotter"
 
-#: sheets/network.sheet.in.h:23
+#: sheets/network.sheet.in.h:24
 msgid "RJ45 wall-plug"
 msgstr "RJ45 wall-plug"
 
-#: sheets/network.sheet.in.h:24
+#: sheets/network.sheet.in.h:25
 msgid "Router symbol"
 msgstr "Router symbol"
 
-#: sheets/network.sheet.in.h:25
+#: sheets/network.sheet.in.h:26
 msgid "Simple modem"
 msgstr "Simple modem"
 
-#: sheets/network.sheet.in.h:26
+#: sheets/network.sheet.in.h:27
 msgid "Simple printer"
 msgstr "Simple printer"
 
-#: sheets/network.sheet.in.h:27
+#: sheets/network.sheet.in.h:28
 msgid "Speaker with integrated amplifier"
 msgstr "Speaker with integrated amplifier"
 
-#: sheets/network.sheet.in.h:28
+#: sheets/network.sheet.in.h:29
 msgid "Speaker without amplifier"
 msgstr "Speaker without amplifier"
 
-#: sheets/network.sheet.in.h:29
+#: sheets/network.sheet.in.h:30
 msgid "Stackable hub or switch"
 msgstr "Stackable hub or switch"
 
-#: sheets/network.sheet.in.h:30
+#: sheets/network.sheet.in.h:31
 msgid "Storage"
 msgstr "Storage"
 
-#: sheets/network.sheet.in.h:31
+#: sheets/network.sheet.in.h:32
 msgid "Switch symbol"
 msgstr "Switch symbol"
 
-#: sheets/network.sheet.in.h:32
+#: sheets/network.sheet.in.h:33
 msgid "Telephone"
 msgstr "Telephone"
 
-#: sheets/network.sheet.in.h:33
+#: sheets/network.sheet.in.h:34
 msgid "UNIX workstation"
 msgstr "UNIX workstation"
 
-#: sheets/network.sheet.in.h:34
+#: sheets/network.sheet.in.h:35
 msgid "WAN connection"
 msgstr "WAN connection"
 
-#: sheets/network.sheet.in.h:35
+#: sheets/network.sheet.in.h:36
 msgid "WAN link"
 msgstr "WAN link"
 
-#: sheets/network.sheet.in.h:36
+#: sheets/network.sheet.in.h:37
 msgid "Wall-plug for the scEAD cabling system"
 msgstr "Wall-plug for the scEAD cabling system"
 
-#: sheets/network.sheet.in.h:37
+#: sheets/network.sheet.in.h:38
 msgid "Workstation monitor"
 msgstr "Workstation monitor"
 
-#: sheets/network.sheet.in.h:38
+#: sheets/network.sheet.in.h:39
 msgid "ZIP disk"
 msgstr "ZIP disk"
 
@@ -7822,6 +8114,9 @@ msgstr "Sybase dataserver"
 msgid "Sybase replication server"
 msgstr "Sybase replication server"
 
+#~ msgid "Helvetica"
+#~ msgstr "Helvetica"
+
 #~ msgid "Could not open `%s' for writing"
 #~ msgstr "Could not open `%s' for writing"
 

--- a/po/es.po
+++ b/po/es.po
@@ -1,3 +1,4 @@
+# traducción de es.po al Spanish
 # translation of es.po to Spanish
 # translation of dia.HEAD.po to Spanish
 # translation of dia.HEAD.es.po to Spanish
@@ -16,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-30 13:48+0200\n"
-"PO-Revision-Date: 2004-05-30 13:54+0200\n"
+"POT-Creation-Date: 2004-07-07 23:44+0200\n"
+"PO-Revision-Date: 2004-07-08 00:03+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -32,104 +33,101 @@ msgstr ""
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s error: no se sabe cómo exportar a %s\n"
 
-#: app/app_procs.c:229
+#: app/app_procs.c:228
 #, c-format
 msgid "%s error: input and output file name is identical: %s"
-msgstr ""
-"%s error: el nombre de los ficheros de entrada y salida es idéntico: %s"
+msgstr "%s error: el nombre de los ficheros de entrada y salida es idéntico: %s"
 
-#: app/app_procs.c:237
+#: app/app_procs.c:235
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s error: se necesita un archivo de entrada válido %s\n"
 
 #. if (!quiet)
-#: app/app_procs.c:246
+#: app/app_procs.c:255
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: app/app_procs.c:294
+#: app/app_procs.c:303
 #, c-format
 msgid "Can't find output format %s\n"
 msgstr "No se pudo encontrar el formato de salida %s\n"
 
 #. Translators:  The argument is a list of options, not to be translated
-#: app/app_procs.c:381
+#: app/app_procs.c:390
 #, c-format
 msgid "Export to file format and exit.  Supported formats are: %s"
-msgstr ""
-"Exportar al formato de archivo y salir. Los formatos soportados son: %s"
+msgstr "Exportar al formato de archivo y salir. Los formatos soportados son: %s"
 
 #. &export_file_name
-#: app/app_procs.c:390
+#: app/app_procs.c:399
 msgid "Export loaded file and exit"
 msgstr "Exportar archivo cargado y salir"
 
-#: app/app_procs.c:390 app/diaconv.c:94
+#: app/app_procs.c:399 app/diaconv.c:94
 msgid "OUTPUT"
 msgstr "SALIDA"
 
 #. &export_file_format
-#: app/app_procs.c:392
+#: app/app_procs.c:401
 msgid "FORMAT"
 msgstr "FORMATO"
 
-#: app/app_procs.c:395
+#: app/app_procs.c:404
 msgid "Export graphics size"
 msgstr "Tamaño del gráfico exportado"
 
-#: app/app_procs.c:395
+#: app/app_procs.c:404
 msgid "WxH"
 msgstr "AnchoxAlto"
 
-#: app/app_procs.c:397
+#: app/app_procs.c:406
 msgid "Don't show the splash screen"
 msgstr "No mostrar la pantalla de bienvenida"
 
-#: app/app_procs.c:399
+#: app/app_procs.c:408
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "Enviar los mensajes de error a stderr en vez de mostrar diálogos."
 
-#: app/app_procs.c:401
+#: app/app_procs.c:410
 msgid "Display credits list and exit"
 msgstr "Mostrar la lista de créditos y salir"
 
-#: app/app_procs.c:403
+#: app/app_procs.c:412
 msgid "Display version and exit"
 msgstr "Mostrar la versión y salir"
 
-#: app/app_procs.c:405 app/diaconv.c:95
+#: app/app_procs.c:413 app/diaconv.c:95
 msgid "Show this help message"
 msgstr "Mostrar este mensaje de ayuda"
 
-#: app/app_procs.c:444
+#: app/app_procs.c:454
 msgid "Can't connect to session manager!\n"
 msgstr "¡No se puede conectar con el gestor de sesiones!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: app/app_procs.c:472
+#: app/app_procs.c:481
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Versión %s de Dia, compilada %s %s\n"
 
-#: app/app_procs.c:474
+#: app/app_procs.c:483
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Versión %s de Dia\n"
 
 # Como adjetivo creo que el plural es "estándar". FVD
-#: app/app_procs.c:526 app/app_procs.c:528 app/diaconv.c:201 app/diaconv.c:203
+#: app/app_procs.c:537 app/app_procs.c:539 app/diaconv.c:201 app/diaconv.c:203
 #, c-format
-msgid ""
-"Couldn't find standard objects when looking for object-libs, exiting...\n"
+msgid "Couldn't find standard objects when looking for object-libs, exiting...\n"
 msgstr "No se encontraron objetos estándar en object-libs, saliendo...\n"
 
-#: app/app_procs.c:569
+#: app/app_procs.c:580
 msgid "Diagram1.dia"
 msgstr "Diagrama1.dia"
 
-#: app/app_procs.c:608
+#: app/app_procs.c:619
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you can cause this message to appear.\n"
@@ -138,7 +136,7 @@ msgstr ""
 "describiendo cómo puede hacer que este mensaje aparezca.\n"
 
 #. no standard buttons
-#: app/app_procs.c:620
+#: app/app_procs.c:631
 msgid ""
 "Modified diagrams exist.\n"
 "Are you sure you want to quit Dia\n"
@@ -148,22 +146,21 @@ msgstr ""
 "¿Está seguro de que desea salir de Dia\n"
 "sin guardarlos?"
 
-#: app/app_procs.c:624
+#: app/app_procs.c:635
 msgid "Quit Dia"
 msgstr "Salir de Dia"
 
 #. This printf seems to prevent a race condition with unrefs.
 #. Yuck.  -Lars
-#: app/app_procs.c:675
-#, c-format
+#: app/app_procs.c:686
 msgid "Thank you for using Dia.\n"
 msgstr "Gracias por usar Dia.\n"
 
-#: app/app_procs.c:691 app/app_procs.c:698
+#: app/app_procs.c:702 app/app_procs.c:709
 msgid "Could not create per-user Dia config directory"
 msgstr "No se pudo crear el directorio de configuración de Dia para el usuario"
 
-#: app/app_procs.c:700
+#: app/app_procs.c:711
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
@@ -172,15 +169,15 @@ msgstr ""
 "favor, asegúrese de que la variable de entorno HOME apunta a un directorio "
 "existente."
 
-#: app/app_procs.c:722 app/diaconv.c:251
+#: app/app_procs.c:733 app/diaconv.c:251
 msgid "Objects and filters internal to dia"
 msgstr "Objetos y filtros internos para dia"
 
-#: app/app_procs.c:761 app/diaconv.c:121
+#: app/app_procs.c:772 app/diaconv.c:121
 msgid "[OPTION...] [FILE...]"
 msgstr "[OPCIÓN...] [ARCHIVO...]"
 
-#: app/app_procs.c:765 app/diaconv.c:128
+#: app/app_procs.c:775 app/diaconv.c:128
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -190,6 +187,44 @@ msgstr ""
 "Ejecute '%s --help' para ver la lista completa de opciones de\n"
 "la línea de comandos.\n"
 
+#: app/app_procs.c:860
+msgid ""
+"The original author of Dia was:\n"
+"\n"
+msgstr ""
+"El autor original de Dia fue:\n"
+"\n"
+
+#: app/app_procs.c:865
+msgid ""
+"\n"
+"The current maintainers of Dia are:\n"
+"\n"
+msgstr ""
+"\n"
+"Los actuales mantenedores de Dia son:\n"
+"\n"
+
+#: app/app_procs.c:870
+msgid ""
+"\n"
+"Other authors are:\n"
+"\n"
+msgstr ""
+"\n"
+"Otos autores son:\n"
+"\n"
+
+#: app/app_procs.c:875
+msgid ""
+"\n"
+"Dia is documented by:\n"
+"\n"
+msgstr ""
+"\n"
+"Dia está documentado por:\n"
+"\n"
+
 #: app/autosave.c:93
 msgid "Recovering autosaved diagrams"
 msgstr "Recuperando los diagramas guardados automáticamente"
@@ -210,20 +245,20 @@ msgstr "Seleccione color de primer plano"
 msgid "Select background color"
 msgstr "Seleccione color de fondo"
 
-#: app/commands.c:132
+#: app/commands.c:134
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "Diagrama%d.dia"
 
-#: app/commands.c:200
+#: app/commands.c:205
 msgid "No existing object to paste.\n"
 msgstr "No hay objetos que pegar.\n"
 
-#: app/commands.c:520 app/commands.c:558
+#: app/commands.c:529 app/commands.c:567
 msgid "Could not find help directory"
 msgstr "No se pudo encontrar el directorio de ayuda"
 
-#: app/commands.c:527
+#: app/commands.c:536
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -237,108 +272,117 @@ msgstr ""
 #. * which will give them credit in the About box.
 #. * E.g. "Fulano de Tal <[e-mail]>"
 #.
-#: app/commands.c:597
+#: app/commands.c:606
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "Juan Manuel García Molina <[e-mail]>\n"
 "Revisión de Francisco Vila <[e-mail]>"
 
-#: app/commands.c:611 dia.desktop.in.h:1
+#: app/commands.c:620 dia.desktop.in.h:1
 msgid "Dia"
 msgstr "Dia"
 
-#: app/commands.c:613
+#: app/commands.c:622
 msgid "Copyright (C) 1998-2002 The Free Software Foundation and the authors"
 msgstr "Copyright © 1998-2002 la Free Software Foundation y los autores"
 
-#: app/commands.c:614
+#: app/commands.c:623
 msgid ""
 "Dia is a program for drawing structured diagrams.\n"
-"Please visit http://www.lysator.liu.se/~alla/dia for more information."
+"Please visit http://www.gnome.org/projects/dia for more information."
 msgstr ""
 "Dia es un programa para dibujar diagramas estructurados.\n"
-"Visite http://www.lysator.liu.se/~alla/dia para más información."
+"Visite http://www.gnome.org/projects/dia para más información."
 
-#: app/commands.c:653
+#: app/commands.c:662
 msgid "About Dia"
 msgstr "Acerca de Dia"
 
-#: app/commands.c:696
+#: app/commands.c:705
 #, c-format
 msgid "Dia v %s by Alexander Larsson"
 msgstr "Dia versión %s por Alexander Larsson"
 
 #. Exact spelling is Ch&eacute;p&eacute;lov (using *ML entities)
-#: app/commands.c:702
+#: app/commands.c:711
 msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
 msgstr "Encargados: Lars Clausen y Cyrille Chepelov"
 
-#: app/commands.c:706
-msgid "Please visit http://www.lysator.liu.se/~alla/dia for more information"
-msgstr "Visite http://www.lysator.liu.se/~alla/dia para más información"
+#: app/commands.c:715
+msgid "Please visit http://www.gnome.org/projects/dia for more information"
+msgstr "Visite http://www.gnome.org/projects/dia para más información"
 
-#: app/commands.c:711
+#: app/commands.c:720
 msgid "Contributors:"
-msgstr "Contribuciones:"
+msgstr "Han contribuído:"
 
 #: app/defaults.c:43 app/defaults.c:146
-msgid "DiaObject defaults"
-msgstr "Opciones predeterminadas para el objeto DiaObject"
+msgid "Object defaults"
+msgstr "Opciones predeterminadas para el objeto"
 
 #: app/defaults.c:61
 msgid "This object has no defaults."
-msgstr "Este objeto no tiene opciones por defecto."
+msgstr "Este objeto no tiene opciones predeterminadas."
 
 #: app/defaults.c:111
 msgid "Defaults: "
 msgstr "Predeterminados: "
 
-#: app/dia-props.c:75
+#: app/dia-props.c:89
 msgid "Diagram Properties"
 msgstr "Propiedades del diagrama"
 
-#: app/dia-props.c:110
+#: app/dia-props.c:123
 msgid "Dynamic grid"
 msgstr "Rejilla dinámica"
 
-#: app/dia-props.c:118
+#: app/dia-props.c:131
 msgid "x"
 msgstr "x"
 
-#: app/dia-props.c:122
+#: app/dia-props.c:135
 msgid "y"
 msgstr "y"
 
-#: app/dia-props.c:127
+#: app/dia-props.c:140
 msgid "Spacing"
 msgstr "Espaciado"
 
-#: app/dia-props.c:147
+#: app/dia-props.c:160
 msgid "Visible spacing"
 msgstr "Espaciado visible"
 
-#: app/dia-props.c:167
+#. Hexes!
+#: app/dia-props.c:181 app/preferences.c:162
+msgid "Hex grid"
+msgstr "Rejilla hex."
+
+#: app/dia-props.c:189
+msgid "Hex grid size"
+msgstr "Tamaño de la rejilla hex."
+
+#: app/dia-props.c:202
 msgid "Grid"
-msgstr "Cuadrícula"
+msgstr "Rejilla"
 
-#: app/dia-props.c:178 lib/diagramdata.c:124
+#: app/dia-props.c:213 lib/diagramdata.c:127
 msgid "Background"
 msgstr "Fondo"
 
-#: app/dia-props.c:189 app/preferences.c:105
+#: app/dia-props.c:224 app/preferences.c:105
 msgid "Grid Lines"
 msgstr "Línea de cuadrícula"
 
-#: app/dia-props.c:200
+#: app/dia-props.c:235
 msgid "Page Breaks"
 msgstr "Saltos de página"
 
-#: app/dia-props.c:211
+#: app/dia-props.c:246
 msgid "Colors"
 msgstr "Colores"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: app/dia-props.c:230
+#: app/dia-props.c:265
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "Propiedades del diagrama: %s"
@@ -347,6 +391,24 @@ msgstr "Propiedades del diagrama: %s"
 msgid "Could not initialize Bonobo!"
 msgstr "¡No se pudo iniciar Bonobo!"
 
+# Posicionar? FVD
+#: app/diacanvas.c:121
+msgid "X position"
+msgstr "Posición X"
+
+#: app/diacanvas.c:122
+msgid "X position of child widget"
+msgstr "Posición X del widget hijo"
+
+# Posicionar? FVD
+#: app/diacanvas.c:131
+msgid "Y position"
+msgstr "Posición Y"
+
+#: app/diacanvas.c:132
+msgid "Y position of child widget"
+msgstr "Posición Y del widget hijo"
+
 #. &export_file_format
 #: app/diaconv.c:92
 msgid "Export format to use"
@@ -493,7 +555,7 @@ msgstr "Árbol del diagrama"
 msgid "Ok"
 msgstr "Aceptar"
 
-#: app/dialogs.c:52 app/layer_dialog.c:983 app/paginate_psprint.c:279
+#: app/dialogs.c:52 app/layer_dialog.c:1006 app/paginate_psprint.c:275
 #: lib/diaarrowchooser.c:257
 msgid "Cancel"
 msgstr "Cancelar"
@@ -555,7 +617,7 @@ msgstr "%0.3gcm x %0.3gcm"
 msgid "Page Setup"
 msgstr "Configurar página"
 
-#: app/disp_callbacks.c:79 app/properties.c:153
+#: app/disp_callbacks.c:81 app/properties.c:152
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -563,11 +625,11 @@ msgstr ""
 "Este objeto no soporta deshacer/rehacer.\n"
 "Información para deshacer borrada."
 
-#: app/disp_callbacks.c:114
+#: app/disp_callbacks.c:116
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: app/disp_callbacks.c:914
+#: app/disp_callbacks.c:904
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -579,11 +641,11 @@ msgstr ""
 msgid "Diagram modified!"
 msgstr "¡Diagrama modificado!"
 
-#: app/display.c:982
+#: app/display.c:983
 msgid "<unnamed>"
 msgstr "<sin nombre>"
 
-#: app/display.c:984
+#: app/display.c:985
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -592,19 +654,20 @@ msgstr ""
 "Este diagrama «%s»\n"
 "no ha sido guardado. ¿Guardar los cambios ahora?"
 
-#: app/display.c:995
+#: app/display.c:996
 msgid "Close Diagram"
 msgstr "Cerrar el diagrama"
 
-#: app/display.c:1000
+#: app/display.c:1001
 msgid "Discard Changes"
 msgstr "Descartar los cambios"
 
-#: app/export_png.c:134 app/load_save.c:890 app/render_eps.c:103
-#: plug-ins/cgm/cgm.c:1157 plug-ins/dxf/dxf-export.c:505
-#: plug-ins/hpgl/hpgl.c:732 plug-ins/metapost/render_metapost.c:964
+#: app/export_png.c:134 app/load_save.c:893 app/render_eps.c:103
+#: plug-ins/cairo/diacairo.c:911 plug-ins/cgm/cgm.c:1157
+#: plug-ins/dxf/dxf-export.c:505 plug-ins/hpgl/hpgl.c:732
+#: plug-ins/metapost/render_metapost.c:964
 #: plug-ins/pstricks/render_pstricks.c:800 plug-ins/shape/shape-export.c:135
-#: plug-ins/svg/render_svg.c:152 plug-ins/wpg/wpg.c:1065
+#: plug-ins/svg/render_svg.c:152 plug-ins/wpg/wpg.c:1066
 #: plug-ins/xfig/xfig-export.c:1100 plug-ins/xslt/xslt.c:94
 #, c-format
 msgid "Can't open output file %s: %s\n"
@@ -645,23 +708,23 @@ msgstr "Alto de la imagen:"
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: app/filedlg.c:116 app/filedlg.c:385
+#: app/filedlg.c:122 app/filedlg.c:393
 msgid "By extension"
 msgstr "Por extensión"
 
-#: app/filedlg.c:177
+#: app/filedlg.c:183
 msgid "Open Diagram"
 msgstr "Abrir diagrama"
 
-#: app/filedlg.c:205
+#: app/filedlg.c:211
 msgid "Open Options"
 msgstr "Abrir opciones"
 
-#: app/filedlg.c:213 app/filedlg.c:503
+#: app/filedlg.c:219 app/filedlg.c:511
 msgid "Determine file type:"
 msgstr "Determinar tipo de archivo:"
 
-#: app/filedlg.c:250
+#: app/filedlg.c:256
 msgid ""
 "Some characters in the filename are neither UTF-8 nor your local encoding.\n"
 "Some things will break."
@@ -670,7 +733,7 @@ msgstr ""
 "codificación local.\n"
 "Algunas cosas no funcionarán."
 
-#: app/filedlg.c:256 app/filedlg.c:429
+#: app/filedlg.c:262 app/filedlg.c:437
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -679,21 +742,21 @@ msgstr ""
 "El archivo «%s» ya existe.\n"
 "¿Quiere sobreescribirlo?"
 
-#: app/filedlg.c:264 app/filedlg.c:436
+#: app/filedlg.c:270 app/filedlg.c:444
 msgid "File already exists"
 msgstr "El archivo ya existe"
 
-#: app/filedlg.c:296
+#: app/filedlg.c:302
 msgid "Save Diagram"
 msgstr "Guardar diagrama"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: app/filedlg.c:301
+#: app/filedlg.c:307
 msgid "Compress diagram files"
 msgstr "Comprimir archivos del diagrama"
 
-#: app/filedlg.c:310
+#: app/filedlg.c:316
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -702,7 +765,7 @@ msgstr ""
 "incrementa la velocidad del cargado y el guardado. Algunos programas de "
 "texto no pueden manipular archivos comprimidos."
 
-#: app/filedlg.c:455
+#: app/filedlg.c:463
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -711,11 +774,11 @@ msgstr ""
 "No se pudo determinar qué filtro de exportación\n"
 "usar para guardar «%s»"
 
-#: app/filedlg.c:473
+#: app/filedlg.c:481
 msgid "Export Diagram"
 msgstr "Exportar diagrama"
 
-#: app/filedlg.c:495
+#: app/filedlg.c:503
 msgid "Export Options"
 msgstr "Exportar opciones"
 
@@ -744,12 +807,13 @@ msgid "Scroll"
 msgstr "Desplazamiento"
 
 #: app/interface.c:68 app/interface.c:69 lib/properties.c:77
-#: lib/properties.h:514 lib/properties.h:517 objects/UML/activity.c:122
+#: lib/properties.h:516 lib/properties.h:519 objects/UML/activity.c:122
 #: objects/UML/actor.c:120 objects/UML/classicon.c:141
 #: objects/UML/component.c:126 objects/UML/component_feature.c:154
 #: objects/UML/node.c:125 objects/UML/note.c:119 objects/UML/object.c:145
 #: objects/UML/small_package.c:126 objects/UML/state.c:139
-#: objects/UML/usecase.c:136
+#: objects/UML/usecase.c:136 objects/Jackson/requirement.c:144
+#: objects/network/basestation.c:131 objects/network/radiocell.c:146
 msgid "Text"
 msgstr "Texto"
 
@@ -860,60 +924,60 @@ msgstr ""
 msgid "Diagram Editor"
 msgstr "Editor de diagramas"
 
-#: app/layer_dialog.c:74
+#: app/layer_dialog.c:70
 msgid "New Layer"
 msgstr "Nueva capa"
 
-#: app/layer_dialog.c:75
+#: app/layer_dialog.c:71
 msgid "Raise Layer"
 msgstr "Subir capa"
 
-#: app/layer_dialog.c:76
+#: app/layer_dialog.c:72
 msgid "Lower Layer"
 msgstr "Bajar capa"
 
-#: app/layer_dialog.c:77
+#: app/layer_dialog.c:73
 msgid "Delete Layer"
 msgstr "Borrar capa"
 
-#: app/layer_dialog.c:219
+#: app/layer_dialog.c:212
 msgid "Layers"
 msgstr "Capas"
 
-#: app/layer_dialog.c:233
+#: app/layer_dialog.c:226
 msgid "Diagrams:"
 msgstr "Diagramas:"
 
-#: app/layer_dialog.c:278
+#: app/layer_dialog.c:271
 msgid "Close"
 msgstr "Cerrar"
 
-#: app/layer_dialog.c:324
+#: app/layer_dialog.c:331
 msgid "New layer"
 msgstr "Nueva capa"
 
-#: app/layer_dialog.c:530
+#: app/layer_dialog.c:537
 msgid "none"
 msgstr "ninguna"
 
-#: app/layer_dialog.c:945
+#: app/layer_dialog.c:968
 msgid "Edit Layer Attributes"
 msgstr "Editar atributos de capa"
 
-#: app/layer_dialog.c:964
+#: app/layer_dialog.c:987
 msgid "Layer name:"
 msgstr "Nombre de la capa:"
 
-#: app/layer_dialog.c:973 app/paginate_psprint.c:271 lib/diaarrowchooser.c:248
+#: app/layer_dialog.c:996 app/paginate_psprint.c:267 lib/diaarrowchooser.c:248
 msgid "OK"
 msgstr "Aceptar"
 
-#: app/linewidth_area.c:248 lib/properties.h:478 lib/properties.h:481
+#: app/linewidth_area.c:246 lib/properties.h:480 lib/properties.h:483
 #: objects/chronogram/chronoline.c:181 objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr "Ancho de línea"
 
-#: app/linewidth_area.c:260
+#: app/linewidth_area.c:258
 msgid "Line width:"
 msgstr "Ancho de línea:"
 
@@ -951,7 +1015,7 @@ msgstr "No se pudo encontrar el objeto padre %s de %s\n"
 msgid "You must specify a file, not a directory.\n"
 msgstr "Debe especificar un archivo, no un directorio.\n"
 
-#: app/load_save.c:344 plug-ins/dxf/dxf-import.c:1304 plug-ins/wpg/wpg.c:1169
+#: app/load_save.c:344 plug-ins/dxf/dxf-import.c:1304 plug-ins/wpg/wpg.c:1170
 #: plug-ins/xfig/xfig-import.c:1560 plug-ins/xslt/xslt.c:87
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
@@ -975,7 +1039,7 @@ msgstr ""
 "Error cargando el diagrama %s.\n"
 "No es un archivo de Dia."
 
-#: app/load_save.c:572
+#: app/load_save.c:575
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -986,12 +1050,12 @@ msgstr ""
 "%s.\n"
 "Un archivo válido de Dia define al menos una capa."
 
-#: app/load_save.c:923
+#: app/load_save.c:926
 #, c-format
 msgid "Failed to save file '%s'.\n"
 msgstr "Fallo al cargar el archivo «%s».\n"
 
-#: app/load_save.c:994 app/load_save.c:999
+#: app/load_save.c:997 app/load_save.c:1002
 msgid "Native Dia Diagram"
 msgstr "Diagrama nativo de Dia"
 
@@ -1456,38 +1520,38 @@ msgstr ""
 "No se puede encontrar la entrada del menú «%s»\n"
 "Probablemente se deba a un problema de i18n (pruebe con LANG=C)."
 
-#: app/modify_tool.c:326
+#: app/modify_tool.c:328
 msgid "Couldn't get GTK settings"
 msgstr "No se pudieron obtener las preferencias de GTK"
 
-#: app/paginate_psprint.c:230
+#: app/paginate_psprint.c:226
 msgid "Select Printer"
 msgstr "Seleccionar impresora"
 
-#: app/paginate_psprint.c:242 sheets/ciscocomputer.sheet.in.h:25
+#: app/paginate_psprint.c:238 sheets/ciscocomputer.sheet.in.h:25
 msgid "Printer"
 msgstr "Impresora"
 
-#: app/paginate_psprint.c:256 sheets/Misc.sheet.in.h:1
+#: app/paginate_psprint.c:252 sheets/Misc.sheet.in.h:1
 msgid "File"
 msgstr "Archivo"
 
-#: app/paginate_psprint.c:360
+#: app/paginate_psprint.c:356
 #, c-format
 msgid "Could not run command '%s': %s"
 msgstr "No se pudo ejecutar el comando «%s»: %s"
 
-#: app/paginate_psprint.c:363
+#: app/paginate_psprint.c:359
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "No se pudo abrir «%s» para escritura: %s"
 
-#: app/paginate_psprint.c:382
+#: app/paginate_psprint.c:376
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "Error de impresión: el comando «%s» devolvió %d\n"
 
-#: app/paginate_psprint.c:392
+#: app/paginate_psprint.c:387
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr "Error de impresión: el comando «%s» causó un sigpipe."
@@ -1496,24 +1560,24 @@ msgstr "Error de impresión: el comando «%s» causó un sigpipe."
 msgid "Plug-ins"
 msgstr "Complementos"
 
-#: app/plugin-manager.c:256
+#: app/plugin-manager.c:255
 msgid "Loaded"
 msgstr "Cargado"
 
-#: app/plugin-manager.c:263 objects/UML/class.c:107
+#: app/plugin-manager.c:262 objects/UML/class.c:112
 #: objects/UML/large_package.c:128
 msgid "Name"
 msgstr "Nombre"
 
-#: app/plugin-manager.c:269
+#: app/plugin-manager.c:268
 msgid "Description"
 msgstr "Descripción"
 
-#: app/plugin-manager.c:278
+#: app/plugin-manager.c:277
 msgid "Load at Startup"
 msgstr "Cargar al comenzar"
 
-#: app/plugin-manager.c:285
+#: app/plugin-manager.c:284
 msgid "File Name"
 msgstr "Nombre del archivo"
 
@@ -1638,42 +1702,46 @@ msgstr "Tamaño Y:"
 msgid "Lines per major line"
 msgstr "Líneas por cada línea principal"
 
-#: app/preferences.c:179
+#: app/preferences.c:163
+msgid "Hex Size:"
+msgstr "Tamaño hex:"
+
+#: app/preferences.c:182
 msgid "Diagram tree window:"
 msgstr "Ventana del árbol del diagrama"
 
-#: app/preferences.c:181
+#: app/preferences.c:184
 msgid "Save hidden object types"
 msgstr "Guardar tipos de objetos ocultos"
 
-#: app/preferences.c:388 lib/prop_inttypes.c:158
+#: app/preferences.c:391 lib/prop_inttypes.c:158
 msgid "Yes"
 msgstr "Sí"
 
-#: app/preferences.c:388 app/preferences.c:399 lib/prop_inttypes.c:160
+#: app/preferences.c:391 app/preferences.c:402 lib/prop_inttypes.c:160
 #: lib/prop_inttypes.c:186
 msgid "No"
 msgstr "No"
 
-#: app/preferences.c:501
+#: app/preferences.c:504
 msgid "Preferences"
 msgstr "Preferencias"
 
 #: app/properties.c:55
-msgid "DiaObject properties"
-msgstr "Propiedades de DiaObject"
+msgid "Object properties"
+msgstr "Propiedades del objeto"
 
-#: app/properties.c:81
+#: app/properties.c:80
 msgid "This object has no properties."
 msgstr "Este objeto no tiene propiedades."
 
-#: app/properties.c:203
+#: app/properties.c:202
 msgid "Properties: "
 msgstr "Propiedades: "
 
-#: app/properties.c:207
-msgid "DiaObject properties:"
-msgstr "Propiedades DiaObject:"
+#: app/properties.c:206
+msgid "Object properties:"
+msgstr "Propiedades del objeto:"
 
 #. Use the Plugins menu item to get a pointer to the File menu,
 #. but any item on the File menu will do
@@ -1681,7 +1749,7 @@ msgstr "Propiedades DiaObject:"
 msgid "<Toolbox>/File/Plugins..."
 msgstr "<Caja de herramientas>/Archivo/Extensiones..."
 
-#: app/recent_files.c:70 app/recent_files.c:148
+#: app/recent_files.c:70 app/recent_files.c:149
 msgid "<Toolbox>/File/Quit"
 msgstr "<Caja de herramientas>/Archivo/Salir"
 
@@ -1777,7 +1845,9 @@ msgstr "Invertir"
 msgid "New"
 msgstr "Nuevo"
 
-#: app/sheets_dialog.c:362 app/sheets_dialog.c:794
+#: app/sheets_dialog.c:362 app/sheets_dialog.c:794 objects/Istar/actor.c:143
+#: objects/Istar/actor.c:144 objects/Istar/other.c:150
+#: objects/Istar/other.c:151 objects/KAOS/other.c:151 objects/KAOS/other.c:152
 msgid "Type"
 msgstr "Tipo"
 
@@ -1815,8 +1885,10 @@ msgid "Description:"
 msgstr "Descripción:"
 
 #: app/sheets_dialog.c:618 objects/FS/flow-ortho.c:168 objects/FS/flow.c:146
-#: objects/UML/class_dialog.c:890 objects/UML/class_dialog.c:1824
-#: objects/UML/class_dialog.c:2053 objects/UML/class_dialog.c:2569
+#: objects/UML/class_dialog.c:911 objects/UML/class_dialog.c:1845
+#: objects/UML/class_dialog.c:2074 objects/UML/class_dialog.c:2590
+#: objects/Istar/link.c:167 objects/Jackson/phenomenon.c:144
+#: objects/KAOS/metaandorrel.c:164 objects/KAOS/metabinrel.c:181
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -1825,10 +1897,10 @@ msgid "Sheet"
 msgstr "Hoja"
 
 #: app/sheets_dialog.c:672 objects/ER/attribute.c:151 objects/ER/entity.c:133
-#: objects/ER/relationship.c:138 objects/UML/association.c:199
-#: objects/UML/association.c:1112 objects/UML/class_dialog.c:879
-#: objects/UML/class_dialog.c:1813 objects/UML/class_dialog.c:2042
-#: objects/UML/class_dialog.c:2558 objects/UML/dependency.c:133
+#: objects/ER/relationship.c:138 objects/UML/association.c:200
+#: objects/UML/association.c:1126 objects/UML/class_dialog.c:900
+#: objects/UML/class_dialog.c:1834 objects/UML/class_dialog.c:2063
+#: objects/UML/class_dialog.c:2579 objects/UML/dependency.c:133
 #: objects/UML/generalization.c:129 objects/UML/realizes.c:130
 msgid "Name:"
 msgstr "Nombre:"
@@ -1961,7 +2033,7 @@ msgstr "Dia v %s"
 msgid "Diagram editor"
 msgstr "Editor de diagramas"
 
-#: lib/arrows.c:40 objects/UML/association.c:1135
+#: lib/arrows.c:40 objects/UML/association.c:1149 objects/Jackson/domain.c:96
 msgid "None"
 msgstr "Nada"
 
@@ -2226,7 +2298,7 @@ msgstr "Hay %d mensajes similares."
 msgid "Notice"
 msgstr "Noticia"
 
-#: lib/object_defaults.c:123
+#: lib/object_defaults.c:127
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2280,15 +2352,15 @@ msgstr ""
 "No se pudo abrir «%s»\n"
 "«%s»"
 
-#: lib/properties.c:62 lib/properties.h:466 lib/widgets.c:789
+#: lib/properties.c:62 lib/properties.h:468 lib/widgets.c:792
 msgid "Left"
 msgstr "Izquierda"
 
-#: lib/properties.c:63 lib/properties.h:467 lib/widgets.c:795
+#: lib/properties.c:63 lib/properties.h:469 lib/widgets.c:798
 msgid "Center"
 msgstr "Centro"
 
-#: lib/properties.c:64 lib/properties.h:468 lib/widgets.c:801
+#: lib/properties.c:64 lib/properties.h:470 lib/widgets.c:804
 msgid "Right"
 msgstr "Derecha"
 
@@ -2297,7 +2369,7 @@ msgstr "Derecha"
 msgid "Line color"
 msgstr "Color de línea"
 
-#: lib/properties.c:72 lib/properties.h:490 lib/properties.h:493
+#: lib/properties.c:72 lib/properties.h:492 lib/properties.h:495
 msgid "Line style"
 msgstr "Estilo de la línea"
 
@@ -2305,31 +2377,32 @@ msgstr "Estilo de la línea"
 msgid "Fill color"
 msgstr "Color de relleno"
 
-#: lib/properties.c:74 lib/properties.h:503
+#: lib/properties.c:74 lib/properties.h:505
 msgid "Draw background"
 msgstr "Dibujar fondo"
 
-#: lib/properties.c:75 lib/properties.h:507
+#: lib/properties.c:75 lib/properties.h:509
 msgid "Start arrow"
 msgstr "Flecha de inicio"
 
-#: lib/properties.c:76 lib/properties.h:510
+#: lib/properties.c:76 lib/properties.h:512
 msgid "End arrow"
 msgstr "Flecha de finalización"
 
-#: lib/properties.c:78 lib/properties.h:520
+#: lib/properties.c:78 lib/properties.h:522
 msgid "Text alignment"
 msgstr "Alineación del texto"
 
 # Creí que era Tipografía como en otros msgs. FVD
-#: lib/properties.c:79 lib/properties.h:523 objects/GRAFCET/condition.c:132
+#. all this just to make the defaults selectable ...
+#: lib/properties.c:79 lib/properties.h:525 objects/GRAFCET/condition.c:132
 #: objects/GRAFCET/step.c:165 objects/GRAFCET/transition.c:142
-#: objects/UML/class_dialog.c:330 objects/chronogram/chronoline.c:183
-#: objects/chronogram/chronoref.c:164
+#: objects/UML/class.c:138 objects/UML/class_dialog.c:351
+#: objects/chronogram/chronoline.c:183 objects/chronogram/chronoref.c:164
 msgid "Font"
 msgstr "Fuente"
 
-#: lib/properties.c:80 lib/properties.h:526 objects/GRAFCET/condition.c:134
+#: lib/properties.c:80 lib/properties.h:528 objects/GRAFCET/condition.c:134
 #: objects/GRAFCET/step.c:167 objects/GRAFCET/transition.c:144
 #: objects/chronogram/chronoline.c:185 objects/chronogram/chronoref.c:166
 msgid "Font size"
@@ -2340,71 +2413,71 @@ msgstr "Tamaño de la fuente"
 msgid "Text color"
 msgstr "Color de texto"
 
-#: lib/properties.h:484 lib/properties.h:487
+#: lib/properties.h:486 lib/properties.h:489
 msgid "Line colour"
 msgstr "Color de la línea"
 
-#: lib/properties.h:497 lib/properties.h:500
+#: lib/properties.h:499 lib/properties.h:502
 msgid "Fill colour"
 msgstr "Color de relleno"
 
-#: lib/properties.h:529 lib/properties.h:532
+#: lib/properties.h:531 lib/properties.h:534
 msgid "Text colour"
 msgstr "Color de texto"
 
-#: lib/widgets.c:390
+#: lib/widgets.c:395
 msgid "Other fonts..."
 msgstr "Otras tipografías..."
 
-#: lib/widgets.c:520
+#: lib/widgets.c:523
 #, c-format
 msgid "Couldn't find font family for %s\n"
 msgstr "No se pudo encontrar la familia de tipografías para %s\n"
 
 #. We hit the Other fonts... entry
-#: lib/widgets.c:585
+#: lib/widgets.c:588
 msgid "Select font"
 msgstr "Seleccionar tipografía"
 
 #. Translators: Menu item Noun/Material/Solid
-#: lib/widgets.c:937 objects/FS/function.c:1063
+#: lib/widgets.c:940 objects/FS/function.c:1063
 msgid "Solid"
 msgstr "Sólido"
 
-#: lib/widgets.c:943
+#: lib/widgets.c:946
 msgid "Dashed"
 msgstr "Discontinuo"
 
-#: lib/widgets.c:949
+#: lib/widgets.c:952
 msgid "Dash-Dot"
 msgstr "Línea-Punto"
 
-#: lib/widgets.c:955
+#: lib/widgets.c:958
 msgid "Dash-Dot-Dot"
 msgstr "Línea-Punto-Punto"
 
-#: lib/widgets.c:961
+#: lib/widgets.c:964
 msgid "Dotted"
 msgstr "Punteado"
 
 #. fs->sizebox = GTK_HBOX(box);
-#: lib/widgets.c:980
+#: lib/widgets.c:983
 msgid "Dash length: "
 msgstr "Longitud de la discontinuidad: "
 
-#: lib/widgets.c:1135
+#: lib/widgets.c:1138
 msgid "Select color"
 msgstr "Seleccione color"
 
-#: lib/widgets.c:1353
+#: lib/widgets.c:1356
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: lib/widgets.c:1502
+#: lib/widgets.c:1505
 msgid "Select image file"
 msgstr "Seleccionar archivo de imagen"
 
-#: lib/widgets.c:1538
+#: lib/widgets.c:1541
 msgid "Browse"
 msgstr "Navegar"
 
@@ -2450,18 +2523,18 @@ msgid "Total:"
 msgstr "Total:"
 
 #: objects/ER/participation.c:405 objects/FS/flow-ortho.c:644
-#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:566
-#: objects/UML/association.c:747 objects/UML/component_feature.c:183
+#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:462
+#: objects/UML/association.c:752 objects/UML/component_feature.c:183
 #: objects/UML/dependency.c:372 objects/UML/generalization.c:368
-#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:337
+#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:346
 msgid "Add segment"
 msgstr "Añadir segmento"
 
 #: objects/ER/participation.c:406 objects/FS/flow-ortho.c:645
-#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:567
-#: objects/UML/association.c:748 objects/UML/component_feature.c:184
+#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:463
+#: objects/UML/association.c:753 objects/UML/component_feature.c:184
 #: objects/UML/dependency.c:373 objects/UML/generalization.c:369
-#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:338
+#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:347
 msgid "Delete segment"
 msgstr "Borrar segmento"
 
@@ -2540,7 +2613,7 @@ msgid "Import"
 msgstr "Importar"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: objects/FS/function.c:675
+#: objects/FS/function.c:675 objects/KAOS/metabinrel.c:173
 msgid "Input"
 msgstr "Entrada"
 
@@ -2769,6 +2842,7 @@ msgstr "Sostener"
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
 #: objects/FS/function.c:789 objects/FS/function.c:791
+#: objects/Istar/actor.c:68
 msgid "Position"
 msgstr "Posición"
 
@@ -3690,6 +3764,8 @@ msgid "Vergent type:"
 msgstr "Tipo de divergencia:"
 
 #: objects/GRAFCET/vergent.c:405 objects/SADT/box.c:445
+#: objects/Istar/other.c:483 objects/Jackson/domain.c:539
+#: objects/KAOS/goal.c:587 objects/KAOS/other.c:535
 #: objects/standard/line.c:228
 msgid "Add connection point"
 msgstr "Añadir punto de conexión"
@@ -3728,7 +3804,8 @@ msgid "Miscellaneous objects"
 msgstr "Figuras variadas"
 
 #. property rows
-#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:336
+#: objects/SADT/arrow.c:134 objects/UML/class.c:143
+#: objects/UML/class_dialog.c:357
 msgid "Normal"
 msgstr "Normal"
 
@@ -3764,7 +3841,7 @@ msgstr ""
 "Para mejorar la calidad de la lectura, los flujos que empiezan y acaban "
 "verticalmente se pueden mostrar en gris."
 
-#: objects/SADT/arrow.c:572
+#: objects/SADT/arrow.c:468
 msgid "SADT Arrow"
 msgstr "Flecha SADT"
 
@@ -3780,10 +3857,11 @@ msgstr "Identificador de actividad/dato"
 
 #: objects/SADT/box.c:145
 msgid "The identifier which appears in the lower right corner of the Box"
-msgstr ""
-"El identificador que se muestra en la esquina inferior derecha de la caja"
+msgstr "El identificador que se muestra en la esquina inferior derecha de la caja"
 
-#: objects/SADT/box.c:446 objects/standard/line.c:229
+#: objects/SADT/box.c:446 objects/Istar/other.c:484
+#: objects/Jackson/domain.c:540 objects/KAOS/goal.c:588
+#: objects/KAOS/other.c:536 objects/standard/line.c:229
 msgid "Delete connection point"
 msgstr "Borrar punto de conexión"
 
@@ -3795,305 +3873,326 @@ msgstr "Caja SADT"
 msgid "SADT diagram objects"
 msgstr "Objetos de diagrama SADT"
 
-#. choose default font name for your locale. see also font_data structure
-#. in lib/font.c.
-#: objects/UML/activity.c:315
-msgid "Helvetica"
-msgstr "Helvética"
-
 #: objects/UML/actor.c:359 objects/UML/actor.c:361 sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "Actor"
 
-#: objects/UML/association.c:1125 objects/UML/class_dialog.c:2086
+#: objects/UML/association.c:1139 objects/UML/class_dialog.c:2107
 msgid "Direction:"
 msgstr "Dirección:"
 
-#: objects/UML/association.c:1142
+#: objects/UML/association.c:1156
 msgid "From A to B"
 msgstr "De A a B"
 
-#: objects/UML/association.c:1149
+#: objects/UML/association.c:1163
 msgid "From B to A"
 msgstr "De B a A"
 
-#: objects/UML/association.c:1173 objects/UML/association.c:1181
+#: objects/UML/association.c:1187 objects/UML/association.c:1195
 msgid "Side A"
 msgstr "Lado A"
 
-#: objects/UML/association.c:1175 objects/UML/association.c:1183
+#: objects/UML/association.c:1189 objects/UML/association.c:1197
 msgid "Side B"
 msgstr "Lado B"
 
-#: objects/UML/association.c:1189
+#: objects/UML/association.c:1203
 msgid "Role:"
 msgstr "Papel:"
 
-#: objects/UML/association.c:1201
+#: objects/UML/association.c:1215
 msgid "Multiplicity:"
 msgstr "Multiplicidad:"
 
 #. Show arrow:
-#: objects/UML/association.c:1212
+#: objects/UML/association.c:1226
 msgid "Show arrow"
 msgstr "Mostrar flecha"
 
 #. Aggregate
-#: objects/UML/association.c:1218
+#: objects/UML/association.c:1232
 msgid "Aggregate"
 msgstr "Agregar"
 
 #. Composition
-#: objects/UML/association.c:1226
+#: objects/UML/association.c:1240
 msgid "Composition"
 msgstr "Composición"
 
-#: objects/UML/class.c:109 objects/UML/classicon.c:135
+#: objects/UML/class.c:110 objects/UML/class.c:245 objects/UML/class.c:1157
+#: sheets/UML.sheet.in.h:6
+msgid "Class"
+msgstr "Clase"
+
+#: objects/UML/class.c:114 objects/UML/classicon.c:135
 #: objects/UML/component.c:122 objects/UML/large_package.c:126
 #: objects/UML/object.c:147 objects/UML/small_package.c:122
 msgid "Stereotype"
 msgstr "Estereotipo"
 
-#: objects/UML/class.c:111 objects/UML/class_dialog.c:361
-#: sheets/SDL.sheet.in.h:3
+#: objects/UML/class.c:116 objects/UML/class.c:153
+#: objects/UML/class_dialog.c:382 sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "Comentario"
 
-#: objects/UML/class.c:113 objects/UML/class_dialog.c:290
-#: objects/UML/class_dialog.c:346 objects/UML/class_dialog.c:1912
+#: objects/UML/class.c:118 objects/UML/class.c:147
+#: objects/UML/class_dialog.c:296 objects/UML/class_dialog.c:367
+#: objects/UML/class_dialog.c:1933
 msgid "Abstract"
 msgstr "Abstracta"
 
-#: objects/UML/class.c:115 objects/UML/class_dialog.c:299
+#: objects/UML/class.c:120
+msgid "Template"
+msgstr "Plantilla"
+
+#: objects/UML/class.c:123 objects/UML/class_dialog.c:305
 msgid "Suppress Attributes"
 msgstr "Suprimir atributos"
 
-#: objects/UML/class.c:117
+#: objects/UML/class.c:125
 msgid "Suppress Operations"
 msgstr "Suprimir operaciones"
 
-#: objects/UML/class.c:119
+#: objects/UML/class.c:127
 msgid "Visible Attributes"
 msgstr "Atributos visibles"
 
-#: objects/UML/class.c:121
+#: objects/UML/class.c:129
 msgid "Visible Operations"
 msgstr "Operaciones visibles"
 
-#: objects/UML/class.c:123
+#: objects/UML/class.c:131
 msgid "Visible Comments"
 msgstr "Comentarios visibles"
 
-#: objects/UML/class.c:126 objects/UML/object.c:151
+#: objects/UML/class.c:133 objects/UML/class_dialog.c:321
+msgid "Wrap Operations"
+msgstr "Operaciones de wrap"
+
+#: objects/UML/class.c:135
+msgid "Wrap after char"
+msgstr "Wrap después del carácter"
+
+#: objects/UML/class.c:145 objects/UML/class_dialog.c:362
+msgid "Polymorphic"
+msgstr "Polimórfico"
+
+#: objects/UML/class.c:149
+msgid "Classname"
+msgstr "Nombre de la clase"
+
+#: objects/UML/class.c:151
+msgid "Abstract Classname"
+msgstr "Nombre de clase abstracta"
+
+#: objects/UML/class.c:157 objects/UML/class.c:159 objects/UML/class.c:161
+#: objects/UML/class.c:163 objects/UML/class.c:165 objects/UML/class.c:167
+msgid " "
+msgstr " "
+
+#: objects/UML/class.c:172 objects/UML/object.c:151
 msgid "Attributes"
 msgstr "Atributos"
 
-#: objects/UML/class.c:128
+#: objects/UML/class.c:174
 msgid "Operations"
 msgstr "Operaciones"
 
-#: objects/UML/class.c:131
-msgid "Template"
-msgstr "Plantilla"
-
-#: objects/UML/class.c:179 objects/UML/class.c:943 sheets/UML.sheet.in.h:6
-msgid "Class"
-msgstr "Clase"
-
-#: objects/UML/class.c:185
+#: objects/UML/class.c:251
 msgid "Show comments"
 msgstr "Mostrar comentarios"
 
 #. Class page:
-#: objects/UML/class_dialog.c:259
+#: objects/UML/class_dialog.c:265
 msgid "_Class"
 msgstr "_Clase"
 
-#: objects/UML/class_dialog.c:267
+#: objects/UML/class_dialog.c:273
 msgid "Class name:"
 msgstr "Nombre de la clase:"
 
-#: objects/UML/class_dialog.c:275 objects/UML/class_dialog.c:1835
+#: objects/UML/class_dialog.c:281 objects/UML/class_dialog.c:1856
 #: objects/UML/dependency.c:135 objects/UML/generalization.c:131
 #: objects/UML/realizes.c:132
 msgid "Stereotype:"
 msgstr "Estereotipo:"
 
-#: objects/UML/class_dialog.c:282 objects/UML/class_dialog.c:912
-#: objects/UML/class_dialog.c:1953 objects/UML/class_dialog.c:2075
+#: objects/UML/class_dialog.c:288 objects/UML/class_dialog.c:933
+#: objects/UML/class_dialog.c:1974 objects/UML/class_dialog.c:2096
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: objects/UML/class_dialog.c:296
+#: objects/UML/class_dialog.c:302
 msgid "Attributes visible"
 msgstr "Atributos visibles"
 
-#: objects/UML/class_dialog.c:305
+#: objects/UML/class_dialog.c:311
 msgid "Operations visible"
 msgstr "Operaciones visibles"
 
-#: objects/UML/class_dialog.c:308
+#: objects/UML/class_dialog.c:314
 msgid "Suppress operations"
 msgstr "Suprimir operaciones"
 
-#: objects/UML/class_dialog.c:314
+#: objects/UML/class_dialog.c:328
+msgid "Wrap after this length: "
+msgstr "Wrap después de esta longitud:"
+
+#: objects/UML/class_dialog.c:335
 msgid "Comments visible"
 msgstr "Comentarios visibles"
 
 #. head line
-#: objects/UML/class_dialog.c:327
+#: objects/UML/class_dialog.c:348
 msgid "Kind"
 msgstr "Tipo"
 
-#: objects/UML/class_dialog.c:332
+#: objects/UML/class_dialog.c:353
 msgid "Size"
 msgstr "Tamaño"
 
-#: objects/UML/class_dialog.c:341
-msgid "Polymorphic"
-msgstr "Polimórfico"
-
-#: objects/UML/class_dialog.c:351
+#: objects/UML/class_dialog.c:372
 msgid "Class Name"
 msgstr "Nombre de la clase"
 
-#: objects/UML/class_dialog.c:356
+#: objects/UML/class_dialog.c:377
 msgid "Abstract Class"
 msgstr "Clase abstracta"
 
 #. should probably be refactored too.
-#: objects/UML/class_dialog.c:373
+#: objects/UML/class_dialog.c:394
 msgid "Text Color"
 msgstr "Color de texto"
 
-#: objects/UML/class_dialog.c:381
+#: objects/UML/class_dialog.c:402
 msgid "Foreground Color"
 msgstr "Color de primer plano"
 
-#: objects/UML/class_dialog.c:389
+#: objects/UML/class_dialog.c:410
 msgid "Background Color"
 msgstr "Color de fondo"
 
 #. Attributes page:
-#: objects/UML/class_dialog.c:812
+#: objects/UML/class_dialog.c:833
 msgid "_Attributes"
 msgstr "_Atributos"
 
-#: objects/UML/class_dialog.c:840 objects/UML/class_dialog.c:1771
-#: objects/UML/class_dialog.c:1999 objects/UML/class_dialog.c:2519
+#: objects/UML/class_dialog.c:861 objects/UML/class_dialog.c:1792
+#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2540
 msgid "_New"
 msgstr "_Nuevo"
 
-#: objects/UML/class_dialog.c:846 objects/UML/class_dialog.c:1777
-#: objects/UML/class_dialog.c:2006 objects/UML/class_dialog.c:2525
+#: objects/UML/class_dialog.c:867 objects/UML/class_dialog.c:1798
+#: objects/UML/class_dialog.c:2027 objects/UML/class_dialog.c:2546
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: objects/UML/class_dialog.c:852 objects/UML/class_dialog.c:1783
-#: objects/UML/class_dialog.c:2013 objects/UML/class_dialog.c:2531
+#: objects/UML/class_dialog.c:873 objects/UML/class_dialog.c:1804
+#: objects/UML/class_dialog.c:2034 objects/UML/class_dialog.c:2552
 msgid "Move up"
 msgstr "Mover arriba"
 
-#: objects/UML/class_dialog.c:858 objects/UML/class_dialog.c:1789
-#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2537
+#: objects/UML/class_dialog.c:879 objects/UML/class_dialog.c:1810
+#: objects/UML/class_dialog.c:2041 objects/UML/class_dialog.c:2558
 msgid "Move down"
 msgstr "Mover abajo"
 
-#: objects/UML/class_dialog.c:869
+#: objects/UML/class_dialog.c:890
 msgid "Attribute data"
 msgstr "Datos de atributo"
 
-#: objects/UML/class_dialog.c:901
+#: objects/UML/class_dialog.c:922
 msgid "Value:"
 msgstr "Valor:"
 
-#: objects/UML/class_dialog.c:924 objects/UML/class_dialog.c:1848
+#: objects/UML/class_dialog.c:945 objects/UML/class_dialog.c:1869
 msgid "Visibility:"
 msgstr "Visibilidad:"
 
-#: objects/UML/class_dialog.c:933 objects/UML/class_dialog.c:1857
+#: objects/UML/class_dialog.c:954 objects/UML/class_dialog.c:1878
 msgid "Public"
 msgstr "Público"
 
-#: objects/UML/class_dialog.c:941 objects/UML/class_dialog.c:1865
+#: objects/UML/class_dialog.c:962 objects/UML/class_dialog.c:1886
 msgid "Private"
 msgstr "Privado"
 
-#: objects/UML/class_dialog.c:949 objects/UML/class_dialog.c:1873
+#: objects/UML/class_dialog.c:970 objects/UML/class_dialog.c:1894
 msgid "Protected"
 msgstr "Protegido"
 
-#: objects/UML/class_dialog.c:957 objects/UML/class_dialog.c:1881
+#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1902
 msgid "Implementation"
 msgstr "Implementación"
 
-#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1897
+#: objects/UML/class_dialog.c:999 objects/UML/class_dialog.c:1918
 msgid "Class scope"
 msgstr "Vista de clase"
 
 #. Operations page:
-#: objects/UML/class_dialog.c:1743
+#: objects/UML/class_dialog.c:1764
 msgid "_Operations"
 msgstr "_Operaciones"
 
-#: objects/UML/class_dialog.c:1801
+#: objects/UML/class_dialog.c:1822
 msgid "Operation data"
 msgstr "Datos de operación"
 
-#: objects/UML/class_dialog.c:1903
+#: objects/UML/class_dialog.c:1924
 msgid "Inheritance type:"
 msgstr "Tipo de herencia:"
 
-#: objects/UML/class_dialog.c:1920
+#: objects/UML/class_dialog.c:1941
 msgid "Polymorphic (virtual)"
 msgstr "Polimórfico (virtual)"
 
-#: objects/UML/class_dialog.c:1928
+#: objects/UML/class_dialog.c:1949
 msgid "Leaf (final)"
 msgstr "Hoja (final)"
 
-#: objects/UML/class_dialog.c:1946
+#: objects/UML/class_dialog.c:1967
 msgid "Query"
 msgstr "Consulta"
 
-#: objects/UML/class_dialog.c:1970
+#: objects/UML/class_dialog.c:1991
 msgid "Parameters:"
 msgstr "Parámetros:"
 
-#: objects/UML/class_dialog.c:2032
+#: objects/UML/class_dialog.c:2053
 msgid "Parameter data"
 msgstr "Datos de parámetros"
 
-#: objects/UML/class_dialog.c:2064
+#: objects/UML/class_dialog.c:2085
 msgid "Def. value:"
 msgstr "Valor por defecto:"
 
-#: objects/UML/class_dialog.c:2095
+#: objects/UML/class_dialog.c:2116
 msgid "Undefined"
 msgstr "No definido"
 
-#: objects/UML/class_dialog.c:2103
+#: objects/UML/class_dialog.c:2124
 msgid "In"
 msgstr "Entrada"
 
-#: objects/UML/class_dialog.c:2112
+#: objects/UML/class_dialog.c:2133
 msgid "Out"
 msgstr "Salida"
 
-#: objects/UML/class_dialog.c:2121
+#: objects/UML/class_dialog.c:2142
 msgid "In & Out"
 msgstr "Entrada y salida"
 
 #. Templates page:
-#: objects/UML/class_dialog.c:2485
+#: objects/UML/class_dialog.c:2506
 msgid "_Templates"
 msgstr "Plan_tillas"
 
-#: objects/UML/class_dialog.c:2491 sheets/UML.sheet.in.h:29
+#: objects/UML/class_dialog.c:2512 sheets/UML.sheet.in.h:29
 msgid "Template class"
 msgstr "Clase de plantilla"
 
-#: objects/UML/class_dialog.c:2548
+#: objects/UML/class_dialog.c:2569
 msgid "Formal parameter data"
 msgstr "Datos de parámetros formales"
 
@@ -4182,7 +4281,7 @@ msgstr "Enviar"
 msgid "Recursive"
 msgstr "Recursiva"
 
-#: objects/UML/message.c:150
+#: objects/UML/message.c:150 objects/Jackson/phenomenon.c:142
 msgid "Message:"
 msgstr "Mensaje:"
 
@@ -4218,7 +4317,7 @@ msgstr ""
 "Esta opción no estará en futuras versiones.\n"
 "Por favor, use el objeto de estado inicial/final en su lugar\n"
 
-#: objects/UML/state_term.c:122
+#: objects/UML/state_term.c:118
 msgid "Is final"
 msgstr "Es final"
 
@@ -4356,6 +4455,7 @@ msgid "Cannot open icon file %s for object type '%s'."
 msgstr "No se puede abrir el archivo de icono %s para el tipo de objeto «%s»."
 
 #: objects/flowchart/box.c:148 objects/standard/box.c:148
+#: objects/standard/polyline.c:130 objects/standard/zigzagline.c:129
 msgid "Corner radius"
 msgstr "Radio de esquina"
 
@@ -4367,6 +4467,205 @@ msgstr "Objetos de diagrama de flujo"
 msgid "Shear angle"
 msgstr "Recortar ángulo"
 
+#: objects/Istar/actor.c:66 objects/Istar/link.c:155
+msgid "Unspecified"
+msgstr "No especificado"
+
+#: objects/Istar/actor.c:67 objects/KAOS/other.c:75
+msgid "Agent"
+msgstr "Agente"
+
+#: objects/Istar/actor.c:69
+msgid "Role"
+msgstr "Rol"
+
+#: objects/Istar/goal.c:74 objects/KAOS/goal.c:79
+msgid "Softgoal"
+msgstr "Meta débil"
+
+#: objects/Istar/goal.c:75 objects/KAOS/goal.c:80
+msgid "Goal"
+msgstr "Meta"
+
+#: objects/Istar/goal.c:155 objects/Istar/goal.c:156 objects/KAOS/goal.c:159
+#: objects/KAOS/goal.c:160
+msgid "Goal Type"
+msgstr "Tipo de meta"
+
+#: objects/Istar/istar.c:46
+msgid "Istar diagram"
+msgstr "Diagrama Istar"
+
+# Posicionar? FVD
+#: objects/Istar/link.c:156
+msgid "Positive Contrib"
+msgstr "Contribución positiva"
+
+#: objects/Istar/link.c:157
+msgid "Negative contrib"
+msgstr "Contribución negativa"
+
+#: objects/Istar/link.c:158 sheets/UML.sheet.in.h:10
+msgid "Dependency"
+msgstr "Dependencia"
+
+#: objects/Istar/link.c:159
+msgid "Decomposition"
+msgstr "Descomposición"
+
+#: objects/Istar/link.c:160
+msgid "Means-Ends"
+msgstr "Medias finales"
+
+#: objects/Istar/other.c:73
+msgid "Resource"
+msgstr "Recurso"
+
+#: objects/Istar/other.c:74
+msgid "Task"
+msgstr "Tarea"
+
+#: objects/Istar/other.c:489
+msgid "i* other"
+msgstr "i* otro"
+
+#: objects/Jackson/domain.c:79
+msgid "Given Domain"
+msgstr "Dominio dado"
+
+#: objects/Jackson/domain.c:80
+msgid "Designed Domain"
+msgstr "Dominio diseñado"
+
+#: objects/Jackson/domain.c:81
+msgid "Machine Domain"
+msgstr "Dominio máquina"
+
+#: objects/Jackson/domain.c:97
+msgid "Causal"
+msgstr "Causal"
+
+#: objects/Jackson/domain.c:98
+msgid "Biddable"
+msgstr ""
+
+#: objects/Jackson/domain.c:99
+msgid "Lexical"
+msgstr "Léxico"
+
+#: objects/Jackson/domain.c:178 objects/Jackson/domain.c:179
+msgid "Domain Type"
+msgstr "Tipo de dominio"
+
+#: objects/Jackson/domain.c:183
+msgid "Domain Kind"
+msgstr "Clase de dominio"
+
+#: objects/Jackson/domain.c:184
+msgid "Optional kind which appears in the lower right corner of the Domain"
+msgstr "Clase opcional que aparece en la esquina inferior derecha del dominio"
+
+#: objects/Jackson/domain.c:545
+msgid "Jackson domain"
+msgstr "Dominio Jackson"
+
+#: objects/Jackson/jackson.c:47
+msgid "Jackson diagram"
+msgstr "Diagrama de Jackson"
+
+# Ha de ser un verbo, creo. FVD
+#: objects/Jackson/phenomenon.c:134
+msgid "Shared"
+msgstr "Compartido"
+
+#: objects/Jackson/phenomenon.c:135 objects/KAOS/goal.c:81
+msgid "Requirement"
+msgstr "Requisito"
+
+#: objects/KAOS/goal.c:82
+msgid "Assumption"
+msgstr "Asunción"
+
+#: objects/KAOS/goal.c:83
+msgid "Obstacle"
+msgstr "Obstáculo"
+
+#: objects/KAOS/goal.c:593
+msgid "KAOS goal"
+msgstr ""
+
+#: objects/KAOS/kaos.c:49
+msgid "KAOS diagram"
+msgstr "Diagrama de KAOS"
+
+#: objects/KAOS/metaandorrel.c:151
+msgid "AND Refinement"
+msgstr "Refinamiento AND"
+
+#: objects/KAOS/metaandorrel.c:152
+msgid "Complete AND Refinement"
+msgstr "Refinamiento AND completo"
+
+#: objects/KAOS/metaandorrel.c:153
+msgid "OR Refinement"
+msgstr "Refinamiento OR"
+
+#: objects/KAOS/metaandorrel.c:154
+msgid "Operationalization"
+msgstr "Operacionalización"
+
+#: objects/KAOS/metaandorrel.c:161
+msgid "Text:"
+msgstr "Texto:"
+
+#: objects/KAOS/metabinrel.c:165
+msgid "Contributes"
+msgstr "Contribuye"
+
+#: objects/KAOS/metabinrel.c:166
+msgid "Obstructs"
+msgstr "Obstruye"
+
+#: objects/KAOS/metabinrel.c:167
+msgid "Conflicts"
+msgstr "En conflicto con"
+
+#: objects/KAOS/metabinrel.c:168
+msgid "Responsibility"
+msgstr "Responsabilidad"
+
+#: objects/KAOS/metabinrel.c:169
+msgid "Monitors"
+msgstr "Monitoriza"
+
+#: objects/KAOS/metabinrel.c:170
+msgid "Controls"
+msgstr "Controla"
+
+#: objects/KAOS/metabinrel.c:171
+msgid "CapableOf"
+msgstr "Capaz de"
+
+#: objects/KAOS/metabinrel.c:172
+msgid "Performs"
+msgstr "Realiza"
+
+#: objects/KAOS/metabinrel.c:174
+msgid "Output"
+msgstr "Salida"
+
+#: objects/KAOS/other.c:541
+msgid "KAOS other"
+msgstr "KAOS otro"
+
+#: objects/network/basestation.c:133
+msgid "Sectors"
+msgstr "Sectores"
+
+#: objects/network/basestation.c:388 objects/network/basestation.c:390
+msgid "Base Station"
+msgstr "Estación base"
+
 # Quizá Asa .FVD
 #: objects/network/bus.c:599
 msgid "Add Handle"
@@ -4380,27 +4679,51 @@ msgstr "Borrar manejador"
 msgid "Network diagram objects"
 msgstr "Objetos de diagrama de red"
 
+#: objects/network/radiocell.c:130
+msgid "Macro Cell"
+msgstr "Macro celda"
+
+#: objects/network/radiocell.c:131
+msgid "Micro Cell"
+msgstr "Micro celda"
+
+#: objects/network/radiocell.c:132
+msgid "Pico Cell"
+msgstr "Pico celda"
+
+#: objects/network/radiocell.c:138
+msgid "Radius"
+msgstr "Radio"
+
+#: objects/network/radiocell.c:140
+msgid "Cell Type:"
+msgstr "Tipo de celda:"
+
+#: objects/network/radiocell.c:152
+msgid "Subscribers"
+msgstr "Suscriptores"
+
 #: objects/standard/arc.c:131
 msgid "Curve distance"
 msgstr "Distancia de curva"
 
-#: objects/standard/bezier.c:545 objects/standard/beziergon.c:501
+#: objects/standard/bezier.c:545 objects/standard/beziergon.c:499
 msgid "Add Segment"
 msgstr "Añadir segmento"
 
-#: objects/standard/bezier.c:546 objects/standard/beziergon.c:502
+#: objects/standard/bezier.c:546 objects/standard/beziergon.c:500
 msgid "Delete Segment"
 msgstr "Borrar segmento"
 
-#: objects/standard/bezier.c:548 objects/standard/beziergon.c:504
+#: objects/standard/bezier.c:548 objects/standard/beziergon.c:502
 msgid "Symmetric control"
 msgstr "Control simétrico"
 
-#: objects/standard/bezier.c:550 objects/standard/beziergon.c:506
+#: objects/standard/bezier.c:550 objects/standard/beziergon.c:504
 msgid "Smooth control"
 msgstr "Control de suavidad"
 
-#: objects/standard/bezier.c:552 objects/standard/beziergon.c:508
+#: objects/standard/bezier.c:552 objects/standard/beziergon.c:506
 msgid "Cusp control"
 msgstr "Control de cúspide"
 
@@ -4494,11 +4817,11 @@ msgstr "Hueco de inicio fraccional"
 msgid "Fractional end gap"
 msgstr "Hueco de inicio fraccional"
 
-#: objects/standard/polygon.c:460 objects/standard/polyline.c:496
+#: objects/standard/polygon.c:460 objects/standard/polyline.c:515
 msgid "Add Corner"
 msgstr "Añadir esquina"
 
-#: objects/standard/polygon.c:461 objects/standard/polyline.c:497
+#: objects/standard/polygon.c:461 objects/standard/polyline.c:516
 msgid "Delete Corner"
 msgstr "Borrar esquina"
 
@@ -4507,6 +4830,18 @@ msgstr "Borrar esquina"
 msgid "Standard objects"
 msgstr "Objetos estándar"
 
+#: plug-ins/cairo/diacairo.c:965
+msgid "Cairo PostScript"
+msgstr "Cairo PostScript"
+
+#: plug-ins/cairo/diacairo.c:974
+msgid "Cairo PNG"
+msgstr "Cairo PNG"
+
+#: plug-ins/cairo/diacairo.c:1001
+msgid "Cairo based Rendering"
+msgstr "Renderizado basado en Cairo"
+
 #: plug-ins/cgm/cgm.c:1109
 msgid ""
 "Image row length larger than maximum cell array.\n"
@@ -4584,7 +4919,7 @@ msgstr "GdkPixbuf - sin suavizado"
 msgid "GdkPixbuf bitmap"
 msgstr "Mapa de bits GDK Pixbuf"
 
-#: plug-ins/pixbuf/pixbuf.c:182
+#: plug-ins/pixbuf/pixbuf.c:189
 msgid "gdk-pixbuf based bitmap export/import"
 msgstr "exportación/importación de mapa de bits basada en gdk-pixbuf"
 
@@ -4600,7 +4935,7 @@ msgstr "UTF-8 no válido"
 msgid "TeX PSTricks macros"
 msgstr "Macros PSTricks de TeX"
 
-#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1056
+#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1137
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "No se pudo abrir: «%s» para escritura.\n"
@@ -4654,27 +4989,26 @@ msgstr "el elemento raíz era «%s» -- se esperaba «svg»."
 
 #: plug-ins/svg/svg.c:37
 msgid "Scalable Vector Graphics import and export filters"
-msgstr ""
-"Filtro de importación y exportación de gráficos de vector escalables (SVG)"
+msgstr "Filtro de importación y exportación de gráficos de vector escalables (SVG)"
 
-#: plug-ins/wmf/wmf.cpp:1120
+#: plug-ins/wmf/wmf.cpp:1204
 msgid "Windows Meta File"
 msgstr "Meta-archivo de Windows (WMF)"
 
-#: plug-ins/wmf/wmf.cpp:1134
+#: plug-ins/wmf/wmf.cpp:1220
 msgid "WMF export filter"
 msgstr "Filtro de exportación de WMF"
 
-#: plug-ins/wpg/wpg.c:1181
+#: plug-ins/wpg/wpg.c:1182
 #, c-format
 msgid "File: %s type/version unsupported.\n"
 msgstr "Archivo: tipo/versión de %s no soportado.\n"
 
-#: plug-ins/wpg/wpg.c:1311 plug-ins/wpg/wpg.c:1318
+#: plug-ins/wpg/wpg.c:1312 plug-ins/wpg/wpg.c:1319
 msgid "WPG"
 msgstr "WPG"
 
-#: plug-ins/wpg/wpg.c:1332
+#: plug-ins/wpg/wpg.c:1333
 msgid "WordPerfect Graphics export filter"
 msgstr "Filtro de exportación de WordPerfect Graphics"
 
@@ -4699,8 +5033,7 @@ msgstr "Dia no admite patrones"
 
 #: plug-ins/xfig/xfig-import.c:500
 msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
-msgstr ""
-"Dia no soporta las líneas triplemente punteadas, se utilizará doble punteado"
+msgstr "Dia no soporta las líneas triplemente punteadas, se utilizará doble punteado"
 
 #: plug-ins/xfig/xfig-import.c:504
 #, c-format
@@ -4902,11 +5235,11 @@ msgid "Error while applying stylesheet: %s\n"
 msgstr "Error al aplicar la hoja de estilo: %s\n"
 
 # Esto es XSLT: T mayúscula necesaria. FVD
-#: plug-ins/xslt/xslt.c:312
+#: plug-ins/xslt/xslt.c:313
 msgid "XSL Transformation filter"
 msgstr "Filtro de Transformación XSL"
 
-#: plug-ins/xslt/xslt.c:336
+#: plug-ins/xslt/xslt.c:337
 msgid "No valid configuration files found for the XSLT plugin, not loading."
 msgstr ""
 "No se encontraron archivos de configuración válidos para la extensión XSLT, "
@@ -5097,6 +5430,224 @@ msgstr "Flecha arriba-abajo-izquierda"
 msgid "Vertical parallelogram"
 msgstr "Paralelogramo vertical"
 
+#: sheets/ChemEng.sheet.in.h:1
+msgid "AC Generator"
+msgstr "Generador de CA"
+
+#: sheets/ChemEng.sheet.in.h:2
+msgid "Air Cooler"
+msgstr "Enfriador por aire"
+
+#: sheets/ChemEng.sheet.in.h:3
+msgid "Autoclave"
+msgstr "Autoclave"
+
+#: sheets/ChemEng.sheet.in.h:4
+msgid "Axial Flow Fan"
+msgstr "Ventilador de flujo axial"
+
+#: sheets/ChemEng.sheet.in.h:5
+msgid "Basic Filter"
+msgstr "Filtro básico"
+
+#: sheets/ChemEng.sheet.in.h:6
+msgid "Centrifugal Pump or Fan"
+msgstr "Ventilador o bomba centrífuga"
+
+#: sheets/ChemEng.sheet.in.h:7
+msgid "Centrifuge"
+msgstr "Centrífuga"
+
+#: sheets/ChemEng.sheet.in.h:8
+msgid "ChemEng"
+msgstr "Motor químico"
+
+#: sheets/ChemEng.sheet.in.h:9
+msgid "Clarifier or Settling Tank"
+msgstr "Clarificador o tanque se precipitados"
+
+#: sheets/ChemEng.sheet.in.h:10
+msgid "Collection for chemical engineering"
+msgstr "Colección para ingeniería química"
+
+#: sheets/ChemEng.sheet.in.h:11
+msgid "Compressor or Turbine"
+msgstr "Compresor o turbina"
+
+#: sheets/ChemEng.sheet.in.h:12
+msgid "Covered tank"
+msgstr "Tanque cubierto"
+
+#: sheets/ChemEng.sheet.in.h:13
+msgid "Cyclone and hydrocyclone"
+msgstr "Ciclón o hidrociclón"
+
+#: sheets/ChemEng.sheet.in.h:14
+msgid "Double-Pipe Exchanger"
+msgstr "Intercambiador de doble tubo"
+
+#: sheets/ChemEng.sheet.in.h:15
+msgid "Ejector or Injector"
+msgstr "Eyector o inyector"
+
+#: sheets/ChemEng.sheet.in.h:16
+msgid "Fan or Stirrer"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:17
+msgid "Fixed-Sheet Exchanger"
+msgstr "Intercambiador de hoja fija"
+
+#: sheets/ChemEng.sheet.in.h:18
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:19
+msgid "Fluid Contacting Vessel, simple"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:20
+msgid "Forced-Flow Air Cooler"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:21
+msgid "Gas Holder, basic"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:22
+msgid "Heating/Cooling Coil"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:23
+msgid "Heating/Cooling Coil, vertical"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:24
+msgid "Induced-Flow Air Cooler"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:25
+msgid "Kettle Reboiler"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:26
+msgid "Knock-out Drum (with demister pad)"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:27
+msgid "Measurement"
+msgstr "Medida"
+
+#: sheets/ChemEng.sheet.in.h:28
+msgid "Mixer"
+msgstr "Mezclador"
+
+#: sheets/ChemEng.sheet.in.h:29
+msgid "Open Tank"
+msgstr "Tanque abierto"
+
+#: sheets/ChemEng.sheet.in.h:30
+msgid "Plate Exchanger"
+msgstr "Intercambiador de platos"
+
+#: sheets/ChemEng.sheet.in.h:31
+msgid "Pneumatic Line"
+msgstr "Línea neumática"
+
+#: sheets/ChemEng.sheet.in.h:32
+msgid "Pneumatic Line, vertical"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:33
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:34
+msgid "Reactor or Absorption Vessel, simple"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:35
+msgid "Reciprocating Compressor or Pump"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:36
+#, fuzzy
+msgid "Regulable Valve"
+msgstr "Regular"
+
+#: sheets/ChemEng.sheet.in.h:37
+msgid "Regulable Valve, vertical"
+msgstr "Válvula regulable, vertical"
+
+#: sheets/ChemEng.sheet.in.h:38
+msgid "Sealed Tank"
+msgstr "Tanque sellado"
+
+#: sheets/ChemEng.sheet.in.h:39
+#, fuzzy
+msgid "Simple Furnace"
+msgstr "Impresora simple"
+
+#: sheets/ChemEng.sheet.in.h:40
+msgid "Simple Heat Exchanger"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:41
+msgid "Simple Heat Exchanger, vertical"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:42
+msgid "Simple Vessel"
+msgstr "Contenedor simple"
+
+#: sheets/ChemEng.sheet.in.h:43
+msgid "Spray Drier"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:44
+msgid "Spraying Device"
+msgstr "Dispositivo difusor"
+
+#: sheets/ChemEng.sheet.in.h:45
+msgid "Storage Sphere"
+msgstr "Esfera de almacenamiento"
+
+#: sheets/ChemEng.sheet.in.h:46
+msgid "Tank with Fixed Roof"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:47
+msgid "Tank with Floating Roof"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:48
+msgid "Tray Column, detailed"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:49
+msgid "Tray Column, simple"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:50
+#, fuzzy
+msgid "Valve"
+msgstr "Valor:"
+
+#: sheets/ChemEng.sheet.in.h:51
+#, fuzzy
+msgid "Valve, vertical"
+msgstr "Invertir vertical"
+
+#: sheets/ChemEng.sheet.in.h:52
+#, fuzzy
+msgid "Water Cooler"
+msgstr "Nivel del agua"
+
+#: sheets/ChemEng.sheet.in.h:53
+#, fuzzy
+msgid "Water Cooler, vertical"
+msgstr "Nivel del agua"
+
 #: sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
 msgstr "Circuito"
@@ -5784,6 +6335,205 @@ msgstr "Tren 2, subida angular"
 msgid "Tree 1"
 msgstr "Árbol 1"
 
+#: sheets/Istar.sheet.in.h:1
+msgid "An i* agent"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:2
+msgid "An i* decomposition link"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:3
+msgid "An i* dependency link"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:4
+msgid "An i* goal"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:5
+msgid "An i* means-ends link"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:6
+msgid "An i* negative contribution"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:7
+#, fuzzy
+msgid "An i* position"
+msgstr "Composición"
+
+#: sheets/Istar.sheet.in.h:8
+msgid "An i* positive contribution"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:9
+msgid "An i* resource"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:10
+#, fuzzy
+msgid "An i* role"
+msgstr "Un archivo"
+
+#: sheets/Istar.sheet.in.h:11
+msgid "An i* softgoal"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:12
+msgid "An i* task"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:13
+msgid "An i* unspecified actor"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:14
+msgid "An i* unspecified link"
+msgstr ""
+
+#: sheets/Istar.sheet.in.h:15
+#, fuzzy
+msgid "Objects to design i* diagrams"
+msgstr "Objetos para diseñar diagramas SADT"
+
+#: sheets/Istar.sheet.in.h:16
+msgid "RE-i*"
+msgstr ""
+
+#: sheets/Jackson.sheet.in.h:1
+msgid "A Jackson designed domain"
+msgstr ""
+
+#: sheets/Jackson.sheet.in.h:2
+msgid "A Jackson given domain"
+msgstr ""
+
+#: sheets/Jackson.sheet.in.h:3
+msgid "A Jackson machine domain"
+msgstr ""
+
+#: sheets/Jackson.sheet.in.h:4
+msgid "A Jackson requirement"
+msgstr ""
+
+#: sheets/Jackson.sheet.in.h:5
+msgid "A Jackson requirement phenomenon"
+msgstr ""
+
+#: sheets/Jackson.sheet.in.h:6
+msgid "A Jackson shared phenomenon"
+msgstr ""
+
+#: sheets/Jackson.sheet.in.h:7
+#, fuzzy
+msgid "Objects to design Jacskon diagrams"
+msgstr "Objetos para diseñar diagramas SADT"
+
+#: sheets/Jackson.sheet.in.h:8
+msgid "RE-Jackson"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:1
+msgid "A KAOS AND refinement"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:2
+msgid "A KAOS OR refinement"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:3
+#, fuzzy
+msgid "A KAOS agent"
+msgstr "Añadir segmento"
+
+#: sheets/KAOS.sheet.in.h:4
+msgid "A KAOS assumption"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:5
+msgid "A KAOS binary conflict"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:6
+msgid "A KAOS capable-of"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:7
+msgid "A KAOS complete AND refinement"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:8
+msgid "A KAOS complete OR refinement"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:9
+msgid "A KAOS contribution"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:10
+msgid "A KAOS control link"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:11
+msgid "A KAOS goal"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:12
+msgid "A KAOS input"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:13
+msgid "A KAOS monitor link"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:14
+msgid "A KAOS obstacle"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:15
+msgid "A KAOS obstruction"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:16
+#, fuzzy
+msgid "A KAOS operation"
+msgstr "Operaciones"
+
+#: sheets/KAOS.sheet.in.h:17
+msgid "A KAOS operationalization"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:18
+msgid "A KAOS output"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:19
+msgid "A KAOS performs"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:20
+msgid "A KAOS requirement"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:21
+msgid "A KAOS responsibility"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:22
+msgid "A KAOS softgoal"
+msgstr ""
+
+#: sheets/KAOS.sheet.in.h:23
+#, fuzzy
+msgid "Objects to design KAOS diagrams"
+msgstr "Objetos para diseñar diagramas SADT"
+
+#: sheets/KAOS.sheet.in.h:24
+msgid "RE-KAOS"
+msgstr ""
+
 #: sheets/Logic.sheet.in.h:1
 msgid "AND gate"
 msgstr "Puerta AND"
@@ -6073,10 +6823,6 @@ msgstr "Componente"
 msgid "Constraint, place a constraint on something"
 msgstr "Restricción, poner una restricción a algo"
 
-#: sheets/UML.sheet.in.h:10
-msgid "Dependency"
-msgstr "Dependencia"
-
 #: sheets/UML.sheet.in.h:11
 msgid "Editor for UML Static Structure Diagrams"
 msgstr "Editor para diagramas de estructura estáticos UML"
@@ -7253,154 +7999,158 @@ msgid "Pieces of a jigsaw"
 msgstr "Piezas de un puzzle"
 
 #: sheets/network.sheet.in.h:1
+msgid "24 Port Patch Panel"
+msgstr ""
+
+#: sheets/network.sheet.in.h:2
 msgid "3 1/2 inch diskette"
 msgstr "Disquete de 3 1/2 pulgadas"
 
-#: sheets/network.sheet.in.h:2
+#: sheets/network.sheet.in.h:3
 msgid "ATM switch symbol"
 msgstr "Símbolo de switch ATM"
 
-#: sheets/network.sheet.in.h:3
+#: sheets/network.sheet.in.h:4
 msgid "Antenna for wireless transmission"
 msgstr "Una antena para la transmisión inalámbrica"
 
-#: sheets/network.sheet.in.h:4
+#: sheets/network.sheet.in.h:5
 msgid "Bigtower PC"
 msgstr "PC de torre grande"
 
-#: sheets/network.sheet.in.h:5
+#: sheets/network.sheet.in.h:6
 msgid "Computer"
 msgstr "Computadora"
 
-#: sheets/network.sheet.in.h:6
+#: sheets/network.sheet.in.h:7
 msgid "Desktop PC"
 msgstr "PC de escritorio"
 
-#: sheets/network.sheet.in.h:7
+#: sheets/network.sheet.in.h:8
 msgid "Digitizing board"
 msgstr "Tableta de digitalización"
 
-#: sheets/network.sheet.in.h:8
+#: sheets/network.sheet.in.h:9
 msgid "Ethernet bus"
 msgstr "Bus Ethernet"
 
-#: sheets/network.sheet.in.h:9
+#: sheets/network.sheet.in.h:10
 msgid "External DAT drive"
 msgstr "Unidad DAT externa"
 
-#: sheets/network.sheet.in.h:10
+#: sheets/network.sheet.in.h:11
 msgid "Firewall router"
 msgstr "Encaminador cortafuegos"
 
-#: sheets/network.sheet.in.h:11
+#: sheets/network.sheet.in.h:12
 msgid "Laptop PC"
 msgstr "PC portátil"
 
-#: sheets/network.sheet.in.h:12
+#: sheets/network.sheet.in.h:13
 msgid "Miditower PC"
 msgstr "PC de torre media"
 
-#: sheets/network.sheet.in.h:13
+#: sheets/network.sheet.in.h:14
 msgid "Minitower PC"
 msgstr "PC de torre pequeña"
 
-#: sheets/network.sheet.in.h:14
+#: sheets/network.sheet.in.h:15
 msgid "Mobile phone"
 msgstr "Teléfono móvil"
 
-#: sheets/network.sheet.in.h:15
+#: sheets/network.sheet.in.h:16
 msgid "Mobile telephony base station"
 msgstr "Estación base de telefonía móvil"
 
-#: sheets/network.sheet.in.h:16
+#: sheets/network.sheet.in.h:17
 msgid "Mobile telephony cell"
 msgstr "Celda de telefonía móvil"
 
-#: sheets/network.sheet.in.h:17
+#: sheets/network.sheet.in.h:18
 msgid "Modular switching system"
 msgstr "Sistema de conexión modular"
 
-#: sheets/network.sheet.in.h:18
+#: sheets/network.sheet.in.h:19
 msgid "Monitor"
 msgstr "Monitor"
 
-#: sheets/network.sheet.in.h:19
+#: sheets/network.sheet.in.h:20
 msgid "Network"
 msgstr "Red"
 
-#: sheets/network.sheet.in.h:20
+#: sheets/network.sheet.in.h:21
 msgid "Network cloud"
 msgstr "Nube de la red"
 
-#: sheets/network.sheet.in.h:21
+#: sheets/network.sheet.in.h:22
 msgid "Objects to design network diagrams with"
 msgstr "Objetos para diseñar diagramas de red"
 
-#: sheets/network.sheet.in.h:22
+#: sheets/network.sheet.in.h:23
 msgid "Plotter"
 msgstr "Plotter"
 
-#: sheets/network.sheet.in.h:23
+#: sheets/network.sheet.in.h:24
 msgid "RJ45 wall-plug"
 msgstr "Enchufe de pared RJ45"
 
-#: sheets/network.sheet.in.h:24
+#: sheets/network.sheet.in.h:25
 msgid "Router symbol"
 msgstr "Símbolo del encaminador"
 
-#: sheets/network.sheet.in.h:25
+#: sheets/network.sheet.in.h:26
 msgid "Simple modem"
 msgstr "Módem simple"
 
-#: sheets/network.sheet.in.h:26
+#: sheets/network.sheet.in.h:27
 msgid "Simple printer"
 msgstr "Impresora simple"
 
-#: sheets/network.sheet.in.h:27
+#: sheets/network.sheet.in.h:28
 msgid "Speaker with integrated amplifier"
 msgstr "Altavoz con amplificador integrado"
 
-#: sheets/network.sheet.in.h:28
+#: sheets/network.sheet.in.h:29
 msgid "Speaker without amplifier"
 msgstr "Altavoz sin amplificador"
 
-#: sheets/network.sheet.in.h:29
+#: sheets/network.sheet.in.h:30
 msgid "Stackable hub or switch"
 msgstr "Hub o switch apilable"
 
-#: sheets/network.sheet.in.h:30
+#: sheets/network.sheet.in.h:31
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: sheets/network.sheet.in.h:31
+#: sheets/network.sheet.in.h:32
 msgid "Switch symbol"
 msgstr "Símbolo de switch"
 
-#: sheets/network.sheet.in.h:32
+#: sheets/network.sheet.in.h:33
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: sheets/network.sheet.in.h:33
+#: sheets/network.sheet.in.h:34
 msgid "UNIX workstation"
 msgstr "Estación de trabajo UNIX"
 
-#: sheets/network.sheet.in.h:34
+#: sheets/network.sheet.in.h:35
 msgid "WAN connection"
 msgstr "Conexión WAN"
 
-#: sheets/network.sheet.in.h:35
+#: sheets/network.sheet.in.h:36
 msgid "WAN link"
 msgstr "Enlace WAN"
 
-#: sheets/network.sheet.in.h:36
+#: sheets/network.sheet.in.h:37
 msgid "Wall-plug for the scEAD cabling system"
 msgstr "Enchufe de pared para el sistema de cableado scEAD"
 
-#: sheets/network.sheet.in.h:37
+#: sheets/network.sheet.in.h:38
 msgid "Workstation monitor"
 msgstr "Monitor de estación de trabajo"
 
-#: sheets/network.sheet.in.h:38
+#: sheets/network.sheet.in.h:39
 msgid "ZIP disk"
 msgstr "Disco ZIP"
 
@@ -7436,6 +8186,9 @@ msgstr "Un servidor de datos sybase"
 msgid "Sybase replication server"
 msgstr "Un servidor de replicación de sybase"
 
+#~ msgid "Helvetica"
+#~ msgstr "Helvética"
+
 #~ msgid "Could not open `%s' for writing"
 #~ msgstr "No se pudo abrir «%s» para escritura"
 
@@ -7445,12 +8198,6 @@ msgstr "Un servidor de replicación de sybase"
 #~ msgid "Error occured while printing"
 #~ msgstr "Ocurrió un error mientras se imprimía"
 
-#~ msgid "_New diagram"
-#~ msgstr "_Nuevo diagrama"
-
-#~ msgid "Create new diagram"
-#~ msgstr "Crear un diagrama nuevo"
-
 #~ msgid "_Diagram tree"
 #~ msgstr "Árbol del _diagrama"
 
@@ -7550,9 +8297,6 @@ msgstr "Un servidor de replicación de sybase"
 #~ msgid "Transitive"
 #~ msgstr "Transitivo"
 
-#~ msgid "Same Type"
-#~ msgstr "Mismo tipo"
-
 #~ msgid "Equal Distance"
 #~ msgstr "Equidistante"
 
@@ -7562,9 +8306,6 @@ msgstr "Un servidor de replicación de sybase"
 #~ msgid "Top"
 #~ msgstr "Arriba"
 
-#~ msgid "Middle"
-#~ msgstr "Medio"
-
 #~ msgid "Bottom"
 #~ msgstr "Abajo"
 
@@ -7776,12 +8517,6 @@ msgstr "Un servidor de replicación de sybase"
 #~ msgid "An And gate"
 #~ msgstr "Una puerta Y"
 
-#~ msgid "An Inverter"
-#~ msgstr "Un inversor"
-
-#~ msgid "A File"
-#~ msgstr "Un archivo"
-
 #~ msgid "Create a branch"
 #~ msgstr "Crear un salto"
 
@@ -7846,3 +8581,4 @@ msgstr "Un servidor de replicación de sybase"
 
 #~ msgid "Could not load XSLT plugin; DIA_PLUGIN_PATH is not set."
 #~ msgstr "No se pudo cargar el plugin XSLT; DIA_PLUGIN_PATH no está fijada."
+

--- a/po/ja.po
+++ b/po/ja.po
@@ -5,12 +5,13 @@
 # Ryoichi INAGAKI <[e-mail]>, 2003.
 # Takeshi AIHANA <[e-mail]>, 2004.
 #
+#: app/sheets.c:453
 msgid ""
 msgstr ""
 "Project-Id-Version: dia HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-11 00:44+0900\n"
-"PO-Revision-Date: 2004-04-11 00:43+0900\n"
+"POT-Creation-Date: 2004-07-10 22:51+0900\n"
+"PO-Revision-Date: 2004-07-10 22:49+0900\n"
 "Last-Translator: Takeshi AIHANA <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -22,92 +23,92 @@ msgstr ""
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s エラー: %s へエキスポートする方法が不明です\n"
 
-#: app/app_procs.c:229
+#: app/app_procs.c:228
 #, c-format
 msgid "%s error: input and output file name is identical: %s"
 msgstr "%s エラー: 入力ファイルと出力ファイルの名前が同じです: %s"
 
-#: app/app_procs.c:237
+#: app/app_procs.c:235
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s エラー: 適切な入力ファイル %s が必要です\n"
 
 #. if (!quiet)
-#: app/app_procs.c:246
+#: app/app_procs.c:255
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: app/app_procs.c:294
+#: app/app_procs.c:303
 #, c-format
 msgid "Can't find output format %s\n"
 msgstr "出力フォーマット %s が見つかりません\n"
 
 #. Translators:  The argument is a list of options, not to be translated
-#: app/app_procs.c:381
+#: app/app_procs.c:390
 #, c-format
 msgid "Export to file format and exit.  Supported formats are: %s"
 msgstr "ファイルへエキスポートして終了する (サポートする形式: %s)"
 
 #. &export_file_name
-#: app/app_procs.c:390
+#: app/app_procs.c:399
 msgid "Export loaded file and exit"
 msgstr "読み込んだファイルをエキスポートして終了する"
 
-#: app/app_procs.c:390 app/diaconv.c:94
+#: app/app_procs.c:399 app/diaconv.c:94
 msgid "OUTPUT"
 msgstr "OUTPUT"
 
 #. &export_file_format
-#: app/app_procs.c:392
+#: app/app_procs.c:401
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: app/app_procs.c:395
+#: app/app_procs.c:404
 msgid "Export graphics size"
 msgstr "指定した大きさのグラフィックスにエキスポートする"
 
-#: app/app_procs.c:395
+#: app/app_procs.c:404
 msgid "WxH"
 msgstr "WxH"
 
-#: app/app_procs.c:397
+#: app/app_procs.c:406
 msgid "Don't show the splash screen"
 msgstr "スプラッシュスクリーンを表示しない"
 
-#: app/app_procs.c:399
+#: app/app_procs.c:408
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr ""
 "エラー・メッセージをダイアログで表示する代わりに標準エラー出力へ出力する"
 
-#: app/app_procs.c:401
+#: app/app_procs.c:410
 msgid "Display credits list and exit"
 msgstr "クレジットを表示して終了する"
 
-#: app/app_procs.c:403
+#: app/app_procs.c:412
 msgid "Display version and exit"
 msgstr "バージョンを表示して終了する"
 
-#: app/app_procs.c:405 app/diaconv.c:95
+#: app/app_procs.c:413 app/diaconv.c:95
 msgid "Show this help message"
 msgstr "このヘルプ・メッセージを表示する"
 
-#: app/app_procs.c:444
+#: app/app_procs.c:454
 msgid "Can't connect to session manager!\n"
 msgstr "セッション・マネージャへ接続できません！\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: app/app_procs.c:472
+#: app/app_procs.c:481
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia バージョン %s (%s %s でコンパイル済)\n"
 
-#: app/app_procs.c:474
+#: app/app_procs.c:483
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia バージョン %s\n"
 
-#: app/app_procs.c:526 app/app_procs.c:528 app/diaconv.c:201 app/diaconv.c:203
+#: app/app_procs.c:537 app/app_procs.c:539 app/diaconv.c:201 app/diaconv.c:203
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs, exiting...\n"
@@ -115,7 +116,11 @@ msgstr ""
 "object-libsを探しましたが標準オブジェクトを見つけられなかったので、終了しま"
 "す...\n"
 
-#: app/app_procs.c:591
+#: app/app_procs.c:580
+msgid "Diagram1.dia"
+msgstr "Diagram1.dia"
+
+#: app/app_procs.c:619
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you can cause this message to appear.\n"
@@ -124,7 +129,7 @@ msgstr ""
 "bugzilla.gnome.org まで報告して下さい。\n"
 
 #. no standard buttons
-#: app/app_procs.c:603
+#: app/app_procs.c:631
 msgid ""
 "Modified diagrams exist.\n"
 "Are you sure you want to quit Dia\n"
@@ -134,22 +139,21 @@ msgstr ""
 "保存せずに Dia を終了しても\n"
 "よろしいですか？"
 
-#: app/app_procs.c:607
+#: app/app_procs.c:635
 msgid "Quit Dia"
 msgstr "Dia の終了"
 
 #. This printf seems to prevent a race condition with unrefs.
 #. Yuck.  -Lars
-#: app/app_procs.c:662
-#, c-format
+#: app/app_procs.c:686
 msgid "Thank you for using Dia.\n"
 msgstr "Dia を使ってくれてありがとう。\n"
 
-#: app/app_procs.c:676 app/app_procs.c:683
+#: app/app_procs.c:702 app/app_procs.c:709
 msgid "Could not create per-user Dia config directory"
 msgstr "ユーザ用の Dia 設定フォルダを作成できませんでした"
 
-#: app/app_procs.c:685
+#: app/app_procs.c:711
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
@@ -157,15 +161,15 @@ msgstr ""
 "ユーザ用の Dia 設定フォルダを作成できませんでした。環境変数 $HOME が既存の"
 "フォルダを指しているか確認して下さい。"
 
-#: app/app_procs.c:707 app/diaconv.c:251
+#: app/app_procs.c:733 app/diaconv.c:251
 msgid "Objects and filters internal to dia"
 msgstr "Dia に内蔵されたオブジェクトとフィルタ"
 
-#: app/app_procs.c:746 app/diaconv.c:121
+#: app/app_procs.c:772 app/diaconv.c:121
 msgid "[OPTION...] [FILE...]"
 msgstr "[オプション...][ファイル...]"
 
-#: app/app_procs.c:750 app/diaconv.c:128
+#: app/app_procs.c:775 app/diaconv.c:128
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -175,6 +179,44 @@ msgstr ""
 "'%s --help' を実行して使用可能なコマンドライン・オプション一覧をご覧下さ"
 "い。\n"
 
+#: app/app_procs.c:860
+msgid ""
+"The original author of Dia was:\n"
+"\n"
+msgstr ""
+"オリジナルの Dia 開発者:\n"
+"\n"
+
+#: app/app_procs.c:865
+msgid ""
+"\n"
+"The current maintainers of Dia are:\n"
+"\n"
+msgstr ""
+"\n"
+"Dia の現在のメンテナ:\n"
+"\n"
+
+#: app/app_procs.c:870
+msgid ""
+"\n"
+"Other authors are:\n"
+"\n"
+msgstr ""
+"\n"
+"その他の開発者:\n"
+"\n"
+
+#: app/app_procs.c:875
+msgid ""
+"\n"
+"Dia is documented by:\n"
+"\n"
+msgstr ""
+"\n"
+"Dia のドキュメント担当:\n"
+"\n"
+
 #: app/autosave.c:93
 msgid "Recovering autosaved diagrams"
 msgstr "自動保存したダイアグラムへ復帰中"
@@ -187,28 +229,28 @@ msgstr ""
 "自動保存したファイルが存在します。\n"
 "戻したい状態のファイルを選択して下さい。"
 
-#: app/color_area.c:316 app/color_area.c:363
+#: app/color_area.c:317 app/color_area.c:364
 msgid "Select foreground color"
 msgstr "前景色の選択"
 
-#: app/color_area.c:317 app/color_area.c:364
+#: app/color_area.c:318 app/color_area.c:365
 msgid "Select background color"
 msgstr "背景色の選択"
 
-#: app/commands.c:132
+#: app/commands.c:134
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "Diagram%d.dia"
 
-#: app/commands.c:200
+#: app/commands.c:205
 msgid "No existing object to paste.\n"
 msgstr "貼り付けるオブジェクトがありません。\n"
 
-#: app/commands.c:515 app/commands.c:553
+#: app/commands.c:529 app/commands.c:567
 msgid "Could not find help directory"
 msgstr "ヘルプが見つかりませんでした"
 
-#: app/commands.c:522
+#: app/commands.c:536
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -222,7 +264,7 @@ msgstr ""
 #. * which will give them credit in the About box.
 #. * E.g. "Fulano de Tal <[e-mail]>"
 #.
-#: app/commands.c:592
+#: app/commands.c:606
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "相花 毅 <[e-mail]>\n"
@@ -231,41 +273,41 @@ msgstr ""
 "Akira TAGOH <[e-mail]>\n"
 "日本GNOMEユーザー会 <http://www.gnome.gr.jp>"
 
-#: app/commands.c:606 dia.desktop.in.h:1
+#: app/commands.c:620 dia.desktop.in.h:1
 msgid "Dia"
 msgstr "Dia"
 
-#: app/commands.c:608
+#: app/commands.c:622
 msgid "Copyright (C) 1998-2002 The Free Software Foundation and the authors"
 msgstr "Copyright (C) 1998-2002 The Free Software Foundation and the authors"
 
-#: app/commands.c:609
+#: app/commands.c:623
 msgid ""
 "Dia is a program for drawing structured diagrams.\n"
-"Please visit http://www.lysator.liu.se/~alla/dia for more information."
+"Please visit http://www.gnome.org/projects/dia for more information."
 msgstr ""
 "Dia は構造化ダイアグラムを描画するプログラムです。\n"
-"詳細は http://www.lysator.liu.se/~alla/dia をご覧下さい。"
+"詳細は http://www.gnome.org/projects/dia をご覧下さい。"
 
-#: app/commands.c:648
+#: app/commands.c:662
 msgid "About Dia"
 msgstr "Dia について"
 
-#: app/commands.c:691
+#: app/commands.c:705
 #, c-format
 msgid "Dia v %s by Alexander Larsson"
 msgstr "Dia v %s (作者: Alexander Larsson)"
 
 #. Exact spelling is Ch&eacute;p&eacute;lov (using *ML entities)
-#: app/commands.c:697
+#: app/commands.c:711
 msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
 msgstr "メンテナ: Lars Clausen 氏と Cyrille Chepelov 氏"
 
-#: app/commands.c:701
-msgid "Please visit http://www.lysator.liu.se/~alla/dia for more information"
-msgstr "詳細は http://www.lysator.liu.se/~alla/dia をご覧下さい"
+#: app/commands.c:715
+msgid "Please visit http://www.gnome.org/projects/dia for more information"
+msgstr "詳細は http://www.gnome.org/projects/dia をご覧下さい"
 
-#: app/commands.c:706
+#: app/commands.c:720
 msgid "Contributors:"
 msgstr "貢献者:"
 
@@ -281,52 +323,61 @@ msgstr "このオブジェクトにはデフォルトがありません."
 msgid "Defaults: "
 msgstr "デフォルト: "
 
-#: app/dia-props.c:75
+#: app/dia-props.c:89
 msgid "Diagram Properties"
 msgstr "ダイアグラムの設定"
 
-#: app/dia-props.c:110
+#: app/dia-props.c:123
 msgid "Dynamic grid"
 msgstr "グリッドのサイズを固定しない"
 
-#: app/dia-props.c:118
+#: app/dia-props.c:131
 msgid "x"
 msgstr "X-方向"
 
-#: app/dia-props.c:122
+#: app/dia-props.c:135
 msgid "y"
 msgstr "Y-方向"
 
-#: app/dia-props.c:127
+#: app/dia-props.c:140
 msgid "Spacing"
 msgstr "実際の間隔"
 
-#: app/dia-props.c:147
+#: app/dia-props.c:160
 msgid "Visible spacing"
 msgstr "表示する間隔"
 
-#: app/dia-props.c:167
+#. Hexes!
+#: app/dia-props.c:181 app/preferences.c:162
+msgid "Hex grid"
+msgstr "グリッドを六角形 (Hex) にする"
+
+#: app/dia-props.c:189
+msgid "Hex grid size"
+msgstr "Hex グリッドのサイズ"
+
+#: app/dia-props.c:202
 msgid "Grid"
 msgstr "グリッド"
 
-#: app/dia-props.c:178 lib/diagramdata.c:62
+#: app/dia-props.c:213 lib/diagramdata.c:127
 msgid "Background"
 msgstr "背景"
 
-#: app/dia-props.c:189 app/preferences.c:103
+#: app/dia-props.c:224 app/preferences.c:105
 msgid "Grid Lines"
 msgstr "グリッド線"
 
-#: app/dia-props.c:200
+#: app/dia-props.c:235
 msgid "Page Breaks"
 msgstr "ページの境界"
 
-#: app/dia-props.c:211
+#: app/dia-props.c:246
 msgid "Colors"
 msgstr "色"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: app/dia-props.c:230
+#: app/dia-props.c:265
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "ダイアグラムのプロパティ: %s"
@@ -335,6 +386,22 @@ msgstr "ダイアグラムのプロパティ: %s"
 msgid "Could not initialize Bonobo!"
 msgstr "Bonobo を初期化できませんでした！"
 
+#: app/diacanvas.c:121
+msgid "X position"
+msgstr "位置 X"
+
+#: app/diacanvas.c:122
+msgid "X position of child widget"
+msgstr "子ウィジットの X-位置"
+
+#: app/diacanvas.c:131
+msgid "Y position"
+msgstr "位置 Y"
+
+#: app/diacanvas.c:132
+msgid "Y position of child widget"
+msgstr "子ウィジットの Y-位置"
+
 #. &export_file_format
 #: app/diaconv.c:92
 msgid "Export format to use"
@@ -481,7 +548,7 @@ msgstr "ダイアグラム・ツリー"
 msgid "Ok"
 msgstr "OK"
 
-#: app/dialogs.c:52 app/layer_dialog.c:1009 app/paginate_psprint.c:278
+#: app/dialogs.c:52 app/layer_dialog.c:1006 app/paginate_psprint.c:275
 #: lib/diaarrowchooser.c:257
 msgid "Cancel"
 msgstr "キャンセル"
@@ -539,11 +606,11 @@ msgstr "対"
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3gcm x %0.3gcm"
 
-#: app/diapagelayout.c:786 app/pagesetup.c:73
+#: app/diapagelayout.c:786 app/pagesetup.c:76
 msgid "Page Setup"
 msgstr "ページ設定"
 
-#: app/disp_callbacks.c:79 app/properties.c:153
+#: app/disp_callbacks.c:81 app/properties.c:152
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -551,11 +618,11 @@ msgstr ""
 "このオブジェクトは \"元に戻す/やり直し\" をサポートしていません。\n"
 "元に戻すための情報は削除されました。"
 
-#: app/disp_callbacks.c:114
+#: app/disp_callbacks.c:116
 msgid "Properties..."
 msgstr "プロパティ..."
 
-#: app/disp_callbacks.c:907
+#: app/disp_callbacks.c:904
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -567,11 +634,11 @@ msgstr ""
 msgid "Diagram modified!"
 msgstr "ダイアグラムが変更されました！"
 
-#: app/display.c:998
+#: app/display.c:983
 msgid "<unnamed>"
 msgstr "<名前無し>"
 
-#: app/display.c:1000
+#: app/display.c:985
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -580,19 +647,20 @@ msgstr ""
 "ダイアグラム '%s' を保存していません。\n"
 "今すぐ保存しますか？"
 
-#: app/display.c:1011
+#: app/display.c:996
 msgid "Close Diagram"
 msgstr "ダイアグラムを閉じる"
 
-#: app/display.c:1016
+#: app/display.c:1001
 msgid "Discard Changes"
 msgstr "破棄する"
 
-#: app/export_png.c:134 app/load_save.c:867 app/render_eps.c:103
-#: plug-ins/cgm/cgm.c:1157 plug-ins/dxf/dxf-export.c:505
-#: plug-ins/hpgl/hpgl.c:732 plug-ins/metapost/render_metapost.c:964
+#: app/export_png.c:134 app/load_save.c:893 app/render_eps.c:103
+#: plug-ins/cairo/diacairo.c:911 plug-ins/cgm/cgm.c:1157
+#: plug-ins/dxf/dxf-export.c:505 plug-ins/hpgl/hpgl.c:732
+#: plug-ins/metapost/render_metapost.c:964
 #: plug-ins/pstricks/render_pstricks.c:800 plug-ins/shape/shape-export.c:135
-#: plug-ins/svg/render_svg.c:152 plug-ins/wpg/wpg.c:1065
+#: plug-ins/svg/render_svg.c:152 plug-ins/wpg/wpg.c:1066
 #: plug-ins/xfig/xfig-export.c:1100 plug-ins/xslt/xslt.c:94
 #, c-format
 msgid "Can't open output file %s: %s\n"
@@ -633,23 +701,23 @@ msgstr "画像の高さ:"
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: app/filedlg.c:114 app/filedlg.c:382
+#: app/filedlg.c:122 app/filedlg.c:393
 msgid "By extension"
 msgstr "拡張子で判断する"
 
-#: app/filedlg.c:175
+#: app/filedlg.c:183
 msgid "Open Diagram"
 msgstr "ダイアグラムを開く"
 
-#: app/filedlg.c:203
+#: app/filedlg.c:211
 msgid "Open Options"
 msgstr "ファイルのオプション"
 
-#: app/filedlg.c:211 app/filedlg.c:500
+#: app/filedlg.c:219 app/filedlg.c:511
 msgid "Determine file type:"
 msgstr "種類の指定:"
 
-#: app/filedlg.c:248
+#: app/filedlg.c:256
 msgid ""
 "Some characters in the filename are neither UTF-8 nor your local encoding.\n"
 "Some things will break."
@@ -658,7 +726,7 @@ msgstr ""
 "標準の UTF-8 でもなく、お使いのエンコーディングのものでもありません。\n"
 "文字化けを起こすかもしれません。"
 
-#: app/filedlg.c:254 app/filedlg.c:427
+#: app/filedlg.c:262 app/filedlg.c:437
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -667,21 +735,21 @@ msgstr ""
 "ファイル '%s' は既に存在します。\n"
 "上書きしますか？"
 
-#: app/filedlg.c:262 app/filedlg.c:434
+#: app/filedlg.c:270 app/filedlg.c:444
 msgid "File already exists"
 msgstr "ファイルは既に存在します"
 
-#: app/filedlg.c:294
+#: app/filedlg.c:302
 msgid "Save Diagram"
 msgstr "ダイアグラムの保存"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: app/filedlg.c:299
+#: app/filedlg.c:307
 msgid "Compress diagram files"
 msgstr "ファイルを圧縮する"
 
-#: app/filedlg.c:308
+#: app/filedlg.c:316
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -690,7 +758,7 @@ msgstr ""
 "ながります (注意: 圧縮したファイルを処理できないテキスト処理プログラムがいく"
 "つかあります)"
 
-#: app/filedlg.c:452
+#: app/filedlg.c:463
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -700,106 +768,107 @@ msgstr ""
 "エキスポートのフィルタを\n"
 "決定することができませんでした"
 
-#: app/filedlg.c:470
+#: app/filedlg.c:481
 msgid "Export Diagram"
 msgstr "ダイアグラムのエキスポート"
 
-#: app/filedlg.c:492
+#: app/filedlg.c:503
 msgid "Export Options"
 msgstr "エキスポートのオプション"
 
-#: app/interface.c:52
+#: app/interface.c:53
 msgid "Modify object(s)"
 msgstr "オブジェクトを変更します"
 
-#: app/interface.c:53
+#: app/interface.c:54
 msgid "Modify"
 msgstr "変更します"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: app/interface.c:57 app/interface.c:58 objects/FS/function.c:975
+#: app/interface.c:58 app/interface.c:59 objects/FS/function.c:975
 msgid "Magnify"
 msgstr "拡大します"
 
-#: app/interface.c:62
+#: app/interface.c:63
 msgid "Scroll around the diagram"
 msgstr "ダイアグラムの周辺をスクロールします"
 
-#: app/interface.c:63
+#: app/interface.c:64
 msgid "Scroll"
 msgstr "スクロール"
 
-#: app/interface.c:67 app/interface.c:68 lib/properties.c:77
-#: lib/properties.h:514 lib/properties.h:517 objects/UML/activity.c:122
+#: app/interface.c:68 app/interface.c:69 lib/properties.c:77
+#: lib/properties.h:516 lib/properties.h:519 objects/UML/activity.c:122
 #: objects/UML/actor.c:120 objects/UML/classicon.c:141
 #: objects/UML/component.c:126 objects/UML/component_feature.c:154
 #: objects/UML/node.c:125 objects/UML/note.c:119 objects/UML/object.c:145
 #: objects/UML/small_package.c:126 objects/UML/state.c:139
-#: objects/UML/usecase.c:136
+#: objects/UML/usecase.c:136 objects/Jackson/requirement.c:144
+#: objects/network/basestation.c:131 objects/network/radiocell.c:146
 msgid "Text"
 msgstr "文字を入力します"
 
-#: app/interface.c:72 app/interface.c:73
+#: app/interface.c:73 app/interface.c:74
 msgid "Box"
 msgstr "矩形を入力します"
 
-#: app/interface.c:77 app/interface.c:78
+#: app/interface.c:78 app/interface.c:79
 msgid "Ellipse"
 msgstr "楕円を入力します"
 
-#: app/interface.c:82 app/interface.c:83
+#: app/interface.c:83 app/interface.c:84
 msgid "Polygon"
 msgstr "多角形を入力します"
 
-#: app/interface.c:87 app/interface.c:88
+#: app/interface.c:88 app/interface.c:89
 msgid "Beziergon"
 msgstr "ベジエゴンを入力します"
 
-#: app/interface.c:92 app/interface.c:93 objects/standard/line.c:247
+#: app/interface.c:93 app/interface.c:94 objects/standard/line.c:234
 msgid "Line"
 msgstr "線を入力します"
 
-#: app/interface.c:97 app/interface.c:98
+#: app/interface.c:98 app/interface.c:99
 msgid "Arc"
 msgstr "円弧を入力します"
 
-#: app/interface.c:102 app/interface.c:103
+#: app/interface.c:103 app/interface.c:104
 msgid "Zigzagline"
 msgstr "ジグザグ線を入力します"
 
-#: app/interface.c:107 app/interface.c:108
+#: app/interface.c:108 app/interface.c:109
 msgid "Polyline"
 msgstr "連続線を入力します"
 
-#: app/interface.c:112 app/interface.c:113
+#: app/interface.c:113 app/interface.c:114
 msgid "Bezierline"
 msgstr "ベジエ曲線を入力します"
 
-#: app/interface.c:117 app/interface.c:118
+#: app/interface.c:118 app/interface.c:119
 msgid "Image"
 msgstr "画像を入力します"
 
-#: app/interface.c:390
+#: app/interface.c:391
 msgid "Diagram menu."
 msgstr "ダイアグラムのメニューです"
 
-#: app/interface.c:428
+#: app/interface.c:429
 msgid "Pops up the Navigation window."
 msgstr "ナビゲーション・ウィンドウをポップアップします"
 
-#: app/interface.c:508
+#: app/interface.c:511
 msgid "Zoom"
 msgstr "ズーム"
 
-#: app/interface.c:522
+#: app/interface.c:525
 msgid "Toggles snap-to-grid for this window."
 msgstr "グリッドに合わせる/合わせないを切り替えます"
 
-#: app/interface.c:585
+#: app/interface.c:588
 msgid "NULL tooldata in tool_select_update"
 msgstr "tool_select_update の中に NULL の tooldata があります"
 
-#: app/interface.c:1068
+#: app/interface.c:1071
 msgid ""
 "Foreground & background colors for new objects.  The small black and white "
 "squares reset colors.  The small arrows swap colors.  Double click to change "
@@ -809,7 +878,7 @@ msgstr ""
 "色をリセットし、小さな矢印をクリックすると双方の色を交換します (ダブル・ク"
 "リックすると色を変更できます)"
 
-#: app/interface.c:1083
+#: app/interface.c:1086
 msgid ""
 "Line widths.  Click on a line to set the default line width for new "
 "objects.  Double-click to set the line width more precisely."
@@ -817,7 +886,7 @@ msgstr ""
 "新しいオブジェクトの線の太さで、線をクリックするとデフォルトの太さをセットし"
 "ます (ダブル・クリックするとより詳細に設定できます)"
 
-#: app/interface.c:1115
+#: app/interface.c:1126
 msgid ""
 "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
 "arrow parameters with Details..."
@@ -825,7 +894,7 @@ msgstr ""
 "新しい線オブジェクトの矢印の始点スタイルで、クリックして矢印を選択するか、[詳"
 "細...] で矢印のパラメータを設定します"
 
-#: app/interface.c:1120
+#: app/interface.c:1131
 msgid ""
 "Line style for new lines.  Click to pick a line style, or set line style "
 "parameters with Details..."
@@ -833,7 +902,7 @@ msgstr ""
 "新しい線オブジェクトの線種で、クリックして線種を選択するか、[詳細...] で線種"
 "のパラメータを設定します"
 
-#: app/interface.c:1126
+#: app/interface.c:1145
 msgid ""
 "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
 "parameters with Details..."
@@ -841,7 +910,7 @@ msgstr ""
 "新しい線オブジェクトの矢印の終点スタイルで、クリックして矢印を選択するか、[詳"
 "細...] で矢印のパラメータを設定します"
 
-#: app/interface.c:1235
+#: app/interface.c:1255
 msgid "Diagram Editor"
 msgstr "ダイアグラム・エディタ"
 
@@ -861,48 +930,48 @@ msgstr "レイヤを背面に送ります"
 msgid "Delete Layer"
 msgstr "レイヤを削除します"
 
-#: app/layer_dialog.c:214
+#: app/layer_dialog.c:212
 msgid "Layers"
 msgstr "レイヤ"
 
-#: app/layer_dialog.c:228
+#: app/layer_dialog.c:226
 msgid "Diagrams:"
 msgstr "ダイアグラム:"
 
-#: app/layer_dialog.c:273
+#: app/layer_dialog.c:271
 msgid "Close"
 msgstr "閉じる"
 
-#: app/layer_dialog.c:319
+#: app/layer_dialog.c:331
 msgid "New layer"
 msgstr "新しいレイヤ"
 
-#: app/layer_dialog.c:525
+#: app/layer_dialog.c:537
 msgid "none"
 msgstr "なし"
 
-#: app/layer_dialog.c:971
+#: app/layer_dialog.c:968
 msgid "Edit Layer Attributes"
 msgstr "レイヤの属性を編集します"
 
-#: app/layer_dialog.c:990
+#: app/layer_dialog.c:987
 msgid "Layer name:"
 msgstr "レイヤ名:"
 
-#: app/layer_dialog.c:999 app/paginate_psprint.c:270 lib/diaarrowchooser.c:248
+#: app/layer_dialog.c:996 app/paginate_psprint.c:267 lib/diaarrowchooser.c:248
 msgid "OK"
 msgstr "OK"
 
-#: app/linewidth_area.c:239 lib/properties.h:478 lib/properties.h:481
+#: app/linewidth_area.c:246 lib/properties.h:480 lib/properties.h:483
 #: objects/chronogram/chronoline.c:181 objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr "線幅"
 
-#: app/linewidth_area.c:251
+#: app/linewidth_area.c:258
 msgid "Line width:"
 msgstr "線幅:"
 
-#: app/load_save.c:245
+#: app/load_save.c:247
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -910,38 +979,39 @@ msgstr ""
 "ダイアグラムを読み込む際にエラーが発生しました\n"
 "(ドキュメントの中にリンクしたオブジェクトがありません)"
 
-#: app/load_save.c:248
+#: app/load_save.c:250
 msgid ""
 "Error loading diagram.\n"
-"connection point does not exist."
+"connection handle does not exist."
 msgstr ""
 "ダイアグラムを読み込む際にエラーが発生しました\n"
-"(接続点が存在しません)"
+"(接続ハンドルが存在しません)"
 
-#: app/load_save.c:251
+#: app/load_save.c:267
+#, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection handle does not exist."
+"connection point %s does not exist."
 msgstr ""
 "ダイアグラムを読み込む際にエラーが発生しました\n"
-"(接続ハンドルが存在しません)"
+"(接続点 %s が存在しません)。"
 
-#: app/load_save.c:273
+#: app/load_save.c:292
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "オブジェクト %2$s の親オブジェクト %1$s がありません\n"
 
-#: app/load_save.c:318
+#: app/load_save.c:337
 msgid "You must specify a file, not a directory.\n"
 msgstr "フォルダではなく、ファイルを指定して下さい。\n"
 
-#: app/load_save.c:325 plug-ins/dxf/dxf-import.c:1304 plug-ins/wpg/wpg.c:1169
-#: plug-ins/xfig/xfig-import.c:1517 plug-ins/xslt/xslt.c:87
+#: app/load_save.c:344 plug-ins/dxf/dxf-import.c:1304 plug-ins/wpg/wpg.c:1170
+#: plug-ins/xfig/xfig-import.c:1560 plug-ins/xslt/xslt.c:87
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "'%s' を読み込みモードで開けませんでした。\n"
 
-#: app/load_save.c:342 app/load_save.c:347
+#: app/load_save.c:361 app/load_save.c:366
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -950,7 +1020,7 @@ msgstr ""
 "ダイアグラム %s を読み込む際にエラー\n"
 "(ファイルの種類が不明です)"
 
-#: app/load_save.c:354
+#: app/load_save.c:373
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -959,23 +1029,23 @@ msgstr ""
 "ダイアグラム %s を読み込む際にエラー\n"
 "(Dia ファイルではありません)"
 
-#: app/load_save.c:551
+#: app/load_save.c:575
 #, c-format
 msgid ""
 "Error loading diagram:\n"
 "%s.\n"
 "A valid Dia file defines at least one layer."
 msgstr ""
-"ダイアグラム %s を読み込む際にエラー:\n"
+"ダイアグラムを読み込む際にエラー:\n"
 "%s\n"
 "正しい Dia ファイルには少なくもレイヤが一つあります"
 
-#: app/load_save.c:900
+#: app/load_save.c:926
 #, c-format
 msgid "Failed to save file '%s'.\n"
 msgstr "ファイル '%s' の保存に失敗しました。\n"
 
-#: app/load_save.c:971 app/load_save.c:976
+#: app/load_save.c:997 app/load_save.c:1002
 msgid "Native Dia Diagram"
 msgstr "ネィテイブな Dia ダイアグラム"
 
@@ -1440,38 +1510,38 @@ msgstr ""
 "メニュー・エントリ \"%s\" が見つかりません！\n"
 "国際化 (I18N) の問題と思われます (環境変数 LANG=C にして試して下さい)"
 
-#: app/modify_tool.c:315
+#: app/modify_tool.c:328
 msgid "Couldn't get GTK settings"
 msgstr "GTK+ の設定を取得できませんでした"
 
-#: app/paginate_psprint.c:230
+#: app/paginate_psprint.c:226
 msgid "Select Printer"
 msgstr "プリンタの選択"
 
-#: app/paginate_psprint.c:242 sheets/ciscocomputer.sheet.in.h:25
+#: app/paginate_psprint.c:238 sheets/ciscocomputer.sheet.in.h:25
 msgid "Printer"
 msgstr "プリンタ"
 
-#: app/paginate_psprint.c:255 sheets/Misc.sheet.in.h:1
+#: app/paginate_psprint.c:252 sheets/Misc.sheet.in.h:1
 msgid "File"
 msgstr "ファイル"
 
-#: app/paginate_psprint.c:358
+#: app/paginate_psprint.c:356
 #, c-format
 msgid "Could not run command '%s': %s"
 msgstr "コマンド \"%s\" を実行できませんでした: %s"
 
-#: app/paginate_psprint.c:361
+#: app/paginate_psprint.c:359
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "'%s' を書き込みモードで開けませんでした: %s"
 
-#: app/paginate_psprint.c:380
+#: app/paginate_psprint.c:376
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "印刷エラー: コマンド \"%s\" が %d を返しました\n"
 
-#: app/paginate_psprint.c:390
+#: app/paginate_psprint.c:387
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr "印刷エラー: コマンド '%s' で SIGPIPE (Broken PIPE) が発生しました"
@@ -1480,56 +1550,56 @@ msgstr "印刷エラー: コマンド '%s' で SIGPIPE (Broken PIPE) が発生
 msgid "Plug-ins"
 msgstr "プラグイン"
 
-#: app/plugin-manager.c:256
+#: app/plugin-manager.c:255
 msgid "Loaded"
 msgstr "読み込み完了"
 
-#: app/plugin-manager.c:263 objects/UML/class.c:107
+#: app/plugin-manager.c:262 objects/UML/class.c:112
 #: objects/UML/large_package.c:128
 msgid "Name"
 msgstr "名前"
 
-#: app/plugin-manager.c:269
+#: app/plugin-manager.c:268
 msgid "Description"
 msgstr "説明"
 
-#: app/plugin-manager.c:278
+#: app/plugin-manager.c:277
 msgid "Load at Startup"
 msgstr "起動時の読み込み"
 
-#: app/plugin-manager.c:285
+#: app/plugin-manager.c:284
 msgid "File Name"
 msgstr "ファイル名"
 
-#: app/preferences.c:100
+#: app/preferences.c:102
 msgid "User Interface"
 msgstr "インタフェース"
 
-#: app/preferences.c:101
+#: app/preferences.c:103
 msgid "Diagram Defaults"
 msgstr "ダイアグラム"
 
-#: app/preferences.c:102
+#: app/preferences.c:104
 msgid "View Defaults"
 msgstr "ビュー"
 
-#: app/preferences.c:104
+#: app/preferences.c:106
 msgid "Diagram Tree"
 msgstr "ダイアグラム・ツリー"
 
-#: app/preferences.c:118
+#: app/preferences.c:120
 msgid "Reset tools after create"
 msgstr "配置する度にツールの選択をリセットする"
 
-#: app/preferences.c:119
+#: app/preferences.c:121
 msgid "Compress saved files"
 msgstr "ファイルを圧縮して保存する"
 
-#: app/preferences.c:120
+#: app/preferences.c:122
 msgid "Number of undo levels:"
 msgstr "\"元に戻す\" 回数:"
 
-#: app/preferences.c:121
+#: app/preferences.c:123
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1537,114 +1607,113 @@ msgstr ""
 "反転してドラッグすると\n"
 "オブジェクトを交互に選択する"
 
-#: app/preferences.c:122
+#: app/preferences.c:124
 msgid "Recent documents list size:"
 msgstr "最近開いたドキュメントの数:"
 
-#: app/preferences.c:123
+#: app/preferences.c:125
 msgid "Use menu bar"
 msgstr "メニュー・バーを使う"
 
-#: app/preferences.c:125
+#: app/preferences.c:127
 msgid "Keep tool box on top of diagram windows"
 msgstr "ツール・ボックスをダイアグラムより前面に配置する"
 
-#: app/preferences.c:127
+#: app/preferences.c:129
 msgid "New diagram:"
 msgstr "新しいダイアグラム:"
 
-#: app/preferences.c:128
+#: app/preferences.c:130
 msgid "Portrait"
 msgstr "横長にする"
 
-#: app/preferences.c:130
+#: app/preferences.c:132
 msgid "Paper type:"
 msgstr "用紙の種類:"
 
-#: app/preferences.c:133
+#: app/preferences.c:135
 msgid "Background Color:"
 msgstr "背景色:"
 
-#: app/preferences.c:136
+#: app/preferences.c:138
 msgid "New window:"
 msgstr "新しいウィンドウ:"
 
-#: app/preferences.c:137
+#: app/preferences.c:139
 msgid "Width:"
 msgstr "幅:"
 
-#: app/preferences.c:138
+#: app/preferences.c:140
 msgid "Height:"
 msgstr "高さ:"
 
-#: app/preferences.c:139
+#: app/preferences.c:141
 msgid "Magnify:"
 msgstr "ズーム:"
 
-#: app/preferences.c:142
+#: app/preferences.c:144
 msgid "Connection Points:"
 msgstr "接続点:"
 
 #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: app/preferences.c:143 app/preferences.c:147 app/preferences.c:153
+#: app/preferences.c:145 app/preferences.c:149 app/preferences.c:155
 msgid "Visible"
 msgstr "表示する"
 
-#: app/preferences.c:146
+#: app/preferences.c:148
 msgid "Page breaks:"
 msgstr "ページの境界線:"
 
-#: app/preferences.c:148 app/preferences.c:158
+#: app/preferences.c:150 app/preferences.c:160
 msgid "Color:"
 msgstr "色:"
 
-#: app/preferences.c:149
+#: app/preferences.c:151
 msgid "Solid lines"
 msgstr "実線で描画する"
 
-#: app/preferences.c:154
+#: app/preferences.c:156
 msgid "Snap to"
 msgstr "グリッドにあわせる"
 
-#: app/preferences.c:155
+#: app/preferences.c:157
 msgid "Dynamic grid resizing"
 msgstr "グリッドのサイズを固定しない"
 
-#: app/preferences.c:156
+#: app/preferences.c:158
 msgid "X Size:"
 msgstr "X-方向のサイズ:"
 
-#: app/preferences.c:157
+#: app/preferences.c:159
 msgid "Y Size:"
 msgstr "Y-方向のサイズ:"
 
-#: app/preferences.c:159
+#: app/preferences.c:161
 msgid "Lines per major line"
 msgstr "補助線の数"
 
-#: app/preferences.c:177
+#: app/preferences.c:163
+msgid "Hex Size:"
+msgstr "Hex のサイズ:"
+
+#: app/preferences.c:182
 msgid "Diagram tree window:"
 msgstr "ダイアグラム・ツリーのウィンドウ:"
 
-#: app/preferences.c:179
+#: app/preferences.c:184
 msgid "Save hidden object types"
 msgstr "隠れたオブジェクトの種類も保存する"
 
-#: app/preferences.c:308
-#, c-format
-msgid "Could not open `%s' for writing"
-msgstr "'%s' を書き込みモードで開けませんでした"
-
-#: app/preferences.c:586 lib/prop_inttypes.c:158
+#: app/preferences.c:391 lib/prop_inttypes.c:158
 msgid "Yes"
 msgstr "はい"
 
-#: app/preferences.c:586 app/preferences.c:597 lib/prop_inttypes.c:160
+#: app/preferences.c:391 app/preferences.c:402 lib/prop_inttypes.c:160
 #: lib/prop_inttypes.c:186
 msgid "No"
 msgstr "いいえ"
 
-#: app/preferences.c:699
+#: app/preferences.c:504
 msgid "Preferences"
 msgstr "デフォルトの設定"
 
@@ -1652,32 +1721,28 @@ msgstr "デフォルトの設定"
 msgid "Object properties"
 msgstr "オブジェクトのプロパティ"
 
-#: app/properties.c:81
+#: app/properties.c:80
 msgid "This object has no properties."
 msgstr "このオブジェクトにはプロパティはありません"
 
-#: app/properties.c:203
+#: app/properties.c:202
 msgid "Properties: "
 msgstr "プロパティ: "
 
-#: app/properties.c:207
+#: app/properties.c:206
 msgid "Object properties:"
 msgstr "オブジェクトのプロパティ:"
 
 #. Use the Plugins menu item to get a pointer to the File menu,
 #. but any item on the File menu will do
-#: app/recent_files.c:139
+#: app/recent_files.c:61
 msgid "<Toolbox>/File/Plugins..."
 msgstr "<Toolbox>/ファイル/プラグイン..."
 
-#: app/recent_files.c:267
+#: app/recent_files.c:70 app/recent_files.c:149
 msgid "<Toolbox>/File/Quit"
 msgstr "<Toolbox>/ファイル/終了"
 
-#: app/recent_files.c:303
-msgid "Can't open history file for writing."
-msgstr "履歴ファイルを書き込みモードで開けませんでした"
-
 #: app/render_eps.c:145
 msgid "Encapsulated Postscript (using Pango fonts)"
 msgstr "Encapsulated ポストスクリプト (Pango フォント使用)"
@@ -1691,7 +1756,7 @@ msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
 msgstr ""
 "Encapsulated ポストスクリプト (ポストスクリプトの Latin-1 フォント使用)"
 
-#: app/render_libart.c:318 lib/dialibartrenderer.c:266
+#: app/render_libart.c:318 lib/dialibartrenderer.c:288
 msgid "gdk_renderer: Unsupported fill mode specified!\n"
 msgstr "gdk_renderer: 指定した塗りつぶしモードはサポートしていません！\n"
 
@@ -1731,8 +1796,8 @@ msgid "SVG Shape"
 msgstr "SVG シェイプ"
 
 #: app/sheets.c:450
-msgid "Programmed Object"
-msgstr "プログラム化されたオブジェクト"
+msgid "Programmed DiaObject"
+msgstr "プログラム化された DiaObject"
 
 #: app/sheets_dialog.c:83
 msgid "Sheets and Objects"
@@ -1770,7 +1835,9 @@ msgstr "復帰"
 msgid "New"
 msgstr "新規"
 
-#: app/sheets_dialog.c:362 app/sheets_dialog.c:794
+#: app/sheets_dialog.c:362 app/sheets_dialog.c:794 objects/Istar/actor.c:143
+#: objects/Istar/actor.c:144 objects/Istar/other.c:150
+#: objects/Istar/other.c:151 objects/KAOS/other.c:151 objects/KAOS/other.c:152
 msgid "Type"
 msgstr "種類"
 
@@ -1799,17 +1866,19 @@ msgstr "改行する"
 msgid "Edit Attributes"
 msgstr "属性の編集"
 
-#: app/sheets_dialog.c:583 sheets/UML.sheet.in.h:24
-msgid "Object"
-msgstr "オブジェクト名"
+#: app/sheets_dialog.c:583
+msgid "DiaObject"
+msgstr "DiaObject"
 
 #: app/sheets_dialog.c:599 app/sheets_dialog.c:692
 msgid "Description:"
 msgstr "説明:"
 
 #: app/sheets_dialog.c:618 objects/FS/flow-ortho.c:168 objects/FS/flow.c:146
-#: objects/UML/class_dialog.c:890 objects/UML/class_dialog.c:1824
-#: objects/UML/class_dialog.c:2053 objects/UML/class_dialog.c:2569
+#: objects/UML/class_dialog.c:911 objects/UML/class_dialog.c:1845
+#: objects/UML/class_dialog.c:2074 objects/UML/class_dialog.c:2590
+#: objects/Istar/link.c:167 objects/Jackson/phenomenon.c:144
+#: objects/KAOS/metaandorrel.c:164 objects/KAOS/metabinrel.c:181
 msgid "Type:"
 msgstr "種類:"
 
@@ -1818,10 +1887,10 @@ msgid "Sheet"
 msgstr "シート名"
 
 #: app/sheets_dialog.c:672 objects/ER/attribute.c:151 objects/ER/entity.c:133
-#: objects/ER/relationship.c:138 objects/UML/association.c:199
-#: objects/UML/association.c:1112 objects/UML/class_dialog.c:879
-#: objects/UML/class_dialog.c:1813 objects/UML/class_dialog.c:2042
-#: objects/UML/class_dialog.c:2558 objects/UML/dependency.c:133
+#: objects/ER/relationship.c:138 objects/UML/association.c:200
+#: objects/UML/association.c:1126 objects/UML/class_dialog.c:900
+#: objects/UML/class_dialog.c:1834 objects/UML/class_dialog.c:2063
+#: objects/UML/class_dialog.c:2579 objects/UML/dependency.c:133
 #: objects/UML/generalization.c:129 objects/UML/realizes.c:130
 msgid "Name:"
 msgstr "名前:"
@@ -1835,8 +1904,8 @@ msgid "Remove"
 msgstr "削除"
 
 #: app/sheets_dialog.c:809
-msgid "Object:"
-msgstr "オブジェクト:"
+msgid "DiaObject:"
+msgstr "DiaObject:"
 
 #: app/sheets_dialog.c:836
 msgid "Sheet:"
@@ -1954,134 +2023,138 @@ msgstr "Dia バージョン %s"
 msgid "Diagram editor"
 msgstr "ダイアグラム・エディタです"
 
-#: lib/arrows.c:38 objects/UML/association.c:1135
+#: lib/arrows.c:40 objects/UML/association.c:1149 objects/Jackson/domain.c:96
 msgid "None"
 msgstr "矢印なし"
 
-#: lib/arrows.c:39
+#: lib/arrows.c:41
 msgid "Lines"
 msgstr "矢印あり"
 
-#: lib/arrows.c:40
+#: lib/arrows.c:42
 msgid "Hollow Triangle"
 msgstr "\"三角形 (中抜き)\""
 
-#: lib/arrows.c:41
+#: lib/arrows.c:43
 msgid "Filled Triangle"
 msgstr "\"三角形 (塗りつぶし)\""
 
-#: lib/arrows.c:42
+#: lib/arrows.c:44
 msgid "Unfilled Triangle"
 msgstr "\"三角形 (塗りつぶさない)\""
 
-#: lib/arrows.c:43
+#: lib/arrows.c:45
 msgid "Hollow Diamond"
 msgstr "\"菱形 (塗りつぶさない)\""
 
-#: lib/arrows.c:44
+#: lib/arrows.c:46
 msgid "Filled Diamond"
 msgstr "\"菱形 (塗りつぶし)\""
 
-#: lib/arrows.c:45
+#: lib/arrows.c:47
 msgid "Half Diamond"
 msgstr "\"菱形 (半分)\""
 
-#: lib/arrows.c:46
+#: lib/arrows.c:48
 msgid "Half Head"
 msgstr "\"半分の矢印\""
 
-#: lib/arrows.c:47
+#: lib/arrows.c:49
 msgid "Slashed Cross"
 msgstr "\"交差したスラッシュ\""
 
-#: lib/arrows.c:48
+#: lib/arrows.c:50
 msgid "Filled Ellipse"
 msgstr "\"楕円 (塗りつぶさない)\""
 
-#: lib/arrows.c:49
+#: lib/arrows.c:51
 msgid "Hollow Ellipse"
 msgstr "\"楕円 (中抜き)\""
 
-#: lib/arrows.c:50
+#: lib/arrows.c:52
 msgid "Filled Dot"
 msgstr "\"点 (塗りつぶし)\""
 
-#: lib/arrows.c:51
+#: lib/arrows.c:53
 msgid "Dimension Origin"
 msgstr "\"寸法線の始点\""
 
-#: lib/arrows.c:52
+#: lib/arrows.c:54
 msgid "Blanked Dot"
 msgstr "\"点 (中抜き)\""
 
-#: lib/arrows.c:53
+#: lib/arrows.c:55
 msgid "Double Hollow Triangle"
 msgstr "\"三角形二つ (中抜き)\""
 
-#: lib/arrows.c:54
+#: lib/arrows.c:56
 msgid "Double Filled Triangle"
 msgstr "\"三角形二つ (塗りつぶし)\""
 
-#: lib/arrows.c:55
+#: lib/arrows.c:57
 msgid "Filled Dot and Triangle"
 msgstr "\"点と三角形 (塗りつぶし)\""
 
-#: lib/arrows.c:56
+#: lib/arrows.c:58
 msgid "Filled Box"
 msgstr "\"矩形 (塗りつぶし)\""
 
-#: lib/arrows.c:57
+#: lib/arrows.c:59
 msgid "Blanked Box"
 msgstr "\"矩形 (中抜き)\""
 
-#: lib/arrows.c:58
+#: lib/arrows.c:60
 msgid "Slashed"
 msgstr "\"スラッシュ\""
 
-#: lib/arrows.c:59
+#: lib/arrows.c:61
 msgid "Integral Symbol"
 msgstr "\"積分の記号\""
 
-#: lib/arrows.c:60
+#: lib/arrows.c:62
 msgid "Crow Foot"
 msgstr "\"カラスの足\""
 
-#: lib/arrows.c:61
+#: lib/arrows.c:63
 msgid "Cross"
 msgstr "\"十字架\""
 
-#: lib/arrows.c:62
+#: lib/arrows.c:64
 msgid "1-or-many"
 msgstr "\"1 とその他\""
 
-#: lib/arrows.c:63
+#: lib/arrows.c:65
 msgid "0-or-many"
 msgstr "\"0 とその他\""
 
-#: lib/arrows.c:64
+#: lib/arrows.c:66
 msgid "1-or-0"
 msgstr "\"1 と 0\""
 
-#: lib/arrows.c:65
+#: lib/arrows.c:67
 msgid "1 exactly"
 msgstr "\"1 と 1\""
 
-#: lib/arrows.c:66
+#: lib/arrows.c:68
 msgid "Filled Concave"
 msgstr "\"切り込み (塗りつぶし)\""
 
-#: lib/arrows.c:67
+#: lib/arrows.c:69
 msgid "Blanked Concave"
 msgstr "\"切り込み (中抜き)\""
 
-#: lib/arrows.c:68
+#: lib/arrows.c:70
 msgid "Round"
 msgstr "\"円形 (半分)\""
 
-#: lib/arrows.c:69
+#: lib/arrows.c:71
 msgid "Open Round"
 msgstr "\"開いた円形 (半分)\""
 
+#: lib/arrows.c:72
+msgid "Backslash"
+msgstr "バックスラッシュ"
+
 #: lib/bezier_conn.c:533
 msgid "Internal error: Setting corner type of endpoint of bezier"
 msgstr "内部エラー: ベジエ曲線の端点の種類の設定"
@@ -2128,7 +2201,7 @@ msgstr ""
 msgid "Arrow Properties"
 msgstr "矢印のプロパティ"
 
-#: lib/diaarrowchooser.c:311 lib/dialinechooser.c:321
+#: lib/diaarrowchooser.c:313 lib/dialinechooser.c:333
 msgid "Details..."
 msgstr "詳細..."
 
@@ -2175,7 +2248,7 @@ msgstr "プレビュー(_P):"
 msgid "Font Selection"
 msgstr "フォント選択"
 
-#: lib/dialinechooser.c:287
+#: lib/dialinechooser.c:297
 msgid "Line Style Properties"
 msgstr "線種のプロパティ"
 
@@ -2184,7 +2257,7 @@ msgstr "線種のプロパティ"
 msgid "Multiple export filters with unique name %s"
 msgstr "重複しない名前 %s が付いた複数のエキスポート用フィルタ"
 
-#: lib/font.c:88
+#: lib/font.c:89
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "フォント %s を読み込めません。\n"
@@ -2214,7 +2287,7 @@ msgstr "%d 個の類似したメッセージがあります"
 msgid "Notice"
 msgstr "注意"
 
-#: lib/object_defaults.c:123
+#: lib/object_defaults.c:127
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2268,15 +2341,15 @@ msgstr ""
 "'%s' を開けませんでした\n"
 "'%s'"
 
-#: lib/properties.c:62 lib/properties.h:466 lib/widgets.c:806
+#: lib/properties.c:62 lib/properties.h:468 lib/widgets.c:792
 msgid "Left"
 msgstr "左寄せ"
 
-#: lib/properties.c:63 lib/properties.h:467 lib/widgets.c:812
+#: lib/properties.c:63 lib/properties.h:469 lib/widgets.c:798
 msgid "Center"
 msgstr "中央寄せ"
 
-#: lib/properties.c:64 lib/properties.h:468 lib/widgets.c:818
+#: lib/properties.c:64 lib/properties.h:470 lib/widgets.c:804
 msgid "Right"
 msgstr "右寄せ"
 
@@ -2285,7 +2358,7 @@ msgstr "右寄せ"
 msgid "Line color"
 msgstr "線の色"
 
-#: lib/properties.c:72 lib/properties.h:490 lib/properties.h:493
+#: lib/properties.c:72 lib/properties.h:492 lib/properties.h:495
 msgid "Line style"
 msgstr "線のスタイル"
 
@@ -2293,30 +2366,31 @@ msgstr "線のスタイル"
 msgid "Fill color"
 msgstr "塗りつぶす色"
 
-#: lib/properties.c:74 lib/properties.h:503
+#: lib/properties.c:74 lib/properties.h:505
 msgid "Draw background"
 msgstr "背景の描画"
 
-#: lib/properties.c:75 lib/properties.h:507
+#: lib/properties.c:75 lib/properties.h:509
 msgid "Start arrow"
 msgstr "始点の矢印"
 
-#: lib/properties.c:76 lib/properties.h:510
+#: lib/properties.c:76 lib/properties.h:512
 msgid "End arrow"
 msgstr "終点の矢印"
 
-#: lib/properties.c:78 lib/properties.h:520
+#: lib/properties.c:78 lib/properties.h:522
 msgid "Text alignment"
 msgstr "文字の配置"
 
-#: lib/properties.c:79 lib/properties.h:523 objects/GRAFCET/condition.c:132
+#. all this just to make the defaults selectable ...
+#: lib/properties.c:79 lib/properties.h:525 objects/GRAFCET/condition.c:132
 #: objects/GRAFCET/step.c:165 objects/GRAFCET/transition.c:142
-#: objects/UML/class_dialog.c:330 objects/chronogram/chronoline.c:183
-#: objects/chronogram/chronoref.c:164
+#: objects/UML/class.c:138 objects/UML/class_dialog.c:351
+#: objects/chronogram/chronoline.c:183 objects/chronogram/chronoref.c:164
 msgid "Font"
 msgstr "フォント"
 
-#: lib/properties.c:80 lib/properties.h:526 objects/GRAFCET/condition.c:134
+#: lib/properties.c:80 lib/properties.h:528 objects/GRAFCET/condition.c:134
 #: objects/GRAFCET/step.c:167 objects/GRAFCET/transition.c:144
 #: objects/chronogram/chronoline.c:185 objects/chronogram/chronoref.c:166
 msgid "Font size"
@@ -2327,71 +2401,71 @@ msgstr "フォントの大きさ"
 msgid "Text color"
 msgstr "文字の色"
 
-#: lib/properties.h:484 lib/properties.h:487
+#: lib/properties.h:486 lib/properties.h:489
 msgid "Line colour"
 msgstr "線の色"
 
-#: lib/properties.h:497 lib/properties.h:500
+#: lib/properties.h:499 lib/properties.h:502
 msgid "Fill colour"
 msgstr "塗りつぶす色"
 
-#: lib/properties.h:529 lib/properties.h:532
+#: lib/properties.h:531 lib/properties.h:534
 msgid "Text colour"
 msgstr "文字の色"
 
-#: lib/widgets.c:438
+#: lib/widgets.c:395
 msgid "Other fonts..."
 msgstr "その他のフォント..."
 
-#: lib/widgets.c:541
+#: lib/widgets.c:523
 #, c-format
 msgid "Couldn't find font family for %s\n"
 msgstr "%s 用のフォント・ファミリが見つかりませんでした\n"
 
 #. We hit the Other fonts... entry
-#: lib/widgets.c:605
+#: lib/widgets.c:588
 msgid "Select font"
 msgstr "フォントの選択"
 
 #. Translators: Menu item Noun/Material/Solid
-#: lib/widgets.c:954 objects/FS/function.c:1063
+#: lib/widgets.c:940 objects/FS/function.c:1063
 msgid "Solid"
 msgstr "実線"
 
-#: lib/widgets.c:960
+#: lib/widgets.c:946
 msgid "Dashed"
 msgstr "鎖線"
 
-#: lib/widgets.c:966
+#: lib/widgets.c:952
 msgid "Dash-Dot"
 msgstr "一点鎖線"
 
-#: lib/widgets.c:972
+#: lib/widgets.c:958
 msgid "Dash-Dot-Dot"
 msgstr "二点鎖線"
 
-#: lib/widgets.c:978
+#: lib/widgets.c:964
 msgid "Dotted"
 msgstr "点線"
 
 #. fs->sizebox = GTK_HBOX(box);
-#: lib/widgets.c:997
+#: lib/widgets.c:983
 msgid "Dash length: "
 msgstr "鎖線の長さ："
 
-#: lib/widgets.c:1152
+#: lib/widgets.c:1138
 msgid "Select color"
 msgstr "色の選択"
 
-#: lib/widgets.c:1369
+#: lib/widgets.c:1356
 msgid "Size: "
 msgstr "大きさ:"
 
-#: lib/widgets.c:1516
+#: lib/widgets.c:1505
 msgid "Select image file"
 msgstr "画像ファイルの選択"
 
-#: lib/widgets.c:1552
+#: lib/widgets.c:1541
 msgid "Browse"
 msgstr "参照"
 
@@ -2436,18 +2510,18 @@ msgid "Total:"
 msgstr "合計:"
 
 #: objects/ER/participation.c:405 objects/FS/flow-ortho.c:644
-#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:566
-#: objects/UML/association.c:747 objects/UML/component_feature.c:183
+#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:462
+#: objects/UML/association.c:752 objects/UML/component_feature.c:183
 #: objects/UML/dependency.c:372 objects/UML/generalization.c:368
-#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:337
+#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:346
 msgid "Add segment"
 msgstr "セグメントの追加"
 
 #: objects/ER/participation.c:406 objects/FS/flow-ortho.c:645
-#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:567
-#: objects/UML/association.c:748 objects/UML/component_feature.c:184
+#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:463
+#: objects/UML/association.c:753 objects/UML/component_feature.c:184
 #: objects/UML/dependency.c:373 objects/UML/generalization.c:369
-#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:338
+#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:347
 msgid "Delete segment"
 msgstr "セグメントの削除"
 
@@ -2526,7 +2600,7 @@ msgid "Import"
 msgstr "インポート"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: objects/FS/function.c:675
+#: objects/FS/function.c:675 objects/KAOS/metabinrel.c:173
 msgid "Input"
 msgstr "インプット"
 
@@ -2752,6 +2826,7 @@ msgstr "ホールド"
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
 #: objects/FS/function.c:789 objects/FS/function.c:791
+#: objects/Istar/actor.c:68
 msgid "Position"
 msgstr "位置"
 
@@ -3031,7 +3106,7 @@ msgid "Expose"
 msgstr "エキスポーズ"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: objects/FS/function.c:931 sheets/Flowchart.sheet.in.h:7
+#: objects/FS/function.c:931 sheets/Flowchart.sheet.in.h:8
 msgid "Extract"
 msgstr "展開"
 
@@ -3266,7 +3341,7 @@ msgid "Mark"
 msgstr "マーク"
 
 #. Translators: Menu item Verb/Signal/Display
-#: objects/FS/function.c:1049 sheets/Flowchart.sheet.in.h:5
+#: objects/FS/function.c:1049 sheets/Flowchart.sheet.in.h:6
 msgid "Display"
 msgstr "表示"
 
@@ -3657,7 +3732,9 @@ msgid "Vergent type:"
 msgstr "分岐の種類:"
 
 #: objects/GRAFCET/vergent.c:405 objects/SADT/box.c:445
-#: objects/standard/line.c:241
+#: objects/Istar/other.c:483 objects/Jackson/domain.c:539
+#: objects/KAOS/goal.c:587 objects/KAOS/other.c:535
+#: objects/standard/line.c:228
 msgid "Add connection point"
 msgstr "接続点の追加"
 
@@ -3694,7 +3771,8 @@ msgid "Miscellaneous objects"
 msgstr "いろいろなオブジェクト"
 
 #. property rows
-#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:336
+#: objects/SADT/arrow.c:134 objects/UML/class.c:143
+#: objects/UML/class_dialog.c:357
 msgid "Normal"
 msgstr "標準"
 
@@ -3729,7 +3807,7 @@ msgid ""
 msgstr ""
 "見やすさを向上するために、始点と終点の垂直方向のフローを灰色で描画します"
 
-#: objects/SADT/arrow.c:572
+#: objects/SADT/arrow.c:468
 msgid "SADT Arrow"
 msgstr "SADT 矢印"
 
@@ -3747,7 +3825,9 @@ msgstr "データ識別子"
 msgid "The identifier which appears in the lower right corner of the Box"
 msgstr "Box の右下に表示する識別子です"
 
-#: objects/SADT/box.c:446 objects/standard/line.c:242
+#: objects/SADT/box.c:446 objects/Istar/other.c:484
+#: objects/Jackson/domain.c:540 objects/KAOS/goal.c:588
+#: objects/KAOS/other.c:536 objects/standard/line.c:229
 msgid "Delete connection point"
 msgstr "接続点の削除"
 
@@ -3759,305 +3839,326 @@ msgstr "SADT box"
 msgid "SADT diagram objects"
 msgstr "SADT ダイアグラムのオブジェクト"
 
-#. choose default font name for your locale. see also font_data structure
-#. in lib/font.c.
-#: objects/UML/activity.c:315
-msgid "Helvetica"
-msgstr "Helvetica"
-
 #: objects/UML/actor.c:359 objects/UML/actor.c:361 sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "アクター"
 
-#: objects/UML/association.c:1125 objects/UML/class_dialog.c:2086
+#: objects/UML/association.c:1139 objects/UML/class_dialog.c:2107
 msgid "Direction:"
 msgstr "方向:"
 
-#: objects/UML/association.c:1142
+#: objects/UML/association.c:1156
 msgid "From A to B"
 msgstr "ＡからＢへ"
 
-#: objects/UML/association.c:1149
+#: objects/UML/association.c:1163
 msgid "From B to A"
 msgstr "ＢからＡへ"
 
-#: objects/UML/association.c:1173 objects/UML/association.c:1181
+#: objects/UML/association.c:1187 objects/UML/association.c:1195
 msgid "Side A"
 msgstr "Ａ側"
 
-#: objects/UML/association.c:1175 objects/UML/association.c:1183
+#: objects/UML/association.c:1189 objects/UML/association.c:1197
 msgid "Side B"
 msgstr "Ｂ側"
 
-#: objects/UML/association.c:1189
+#: objects/UML/association.c:1203
 msgid "Role:"
 msgstr "役割:"
 
-#: objects/UML/association.c:1201
+#: objects/UML/association.c:1215
 msgid "Multiplicity:"
 msgstr "多様性:"
 
 #. Show arrow:
-#: objects/UML/association.c:1212
+#: objects/UML/association.c:1226
 msgid "Show arrow"
 msgstr "矢印を表示する"
 
 #. Aggregate
-#: objects/UML/association.c:1218
+#: objects/UML/association.c:1232
 msgid "Aggregate"
 msgstr "アグリゲート"
 
 #. Composition
-#: objects/UML/association.c:1226
+#: objects/UML/association.c:1240
 msgid "Composition"
 msgstr "コンポジション"
 
-#: objects/UML/class.c:109 objects/UML/classicon.c:135
+#: objects/UML/class.c:110 objects/UML/class.c:245 objects/UML/class.c:1157
+#: sheets/UML.sheet.in.h:6
+msgid "Class"
+msgstr "クラス"
+
+#: objects/UML/class.c:114 objects/UML/classicon.c:135
 #: objects/UML/component.c:122 objects/UML/large_package.c:126
 #: objects/UML/object.c:147 objects/UML/small_package.c:122
 msgid "Stereotype"
 msgstr "ステレオタイプ"
 
-#: objects/UML/class.c:111 objects/UML/class_dialog.c:361
-#: sheets/SDL.sheet.in.h:3
+#: objects/UML/class.c:116 objects/UML/class.c:153
+#: objects/UML/class_dialog.c:382 sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "コメント"
 
-#: objects/UML/class.c:113 objects/UML/class_dialog.c:290
-#: objects/UML/class_dialog.c:346 objects/UML/class_dialog.c:1912
+#: objects/UML/class.c:118 objects/UML/class.c:147
+#: objects/UML/class_dialog.c:296 objects/UML/class_dialog.c:367
+#: objects/UML/class_dialog.c:1933
 msgid "Abstract"
 msgstr "抽象化"
 
-#: objects/UML/class.c:115 objects/UML/class_dialog.c:299
+#: objects/UML/class.c:120
+msgid "Template"
+msgstr "テンプレート"
+
+#: objects/UML/class.c:123 objects/UML/class_dialog.c:305
 msgid "Suppress Attributes"
 msgstr "属性を抑制する"
 
-#: objects/UML/class.c:117
+#: objects/UML/class.c:125
 msgid "Suppress Operations"
 msgstr "オペレーションを抑制する"
 
-#: objects/UML/class.c:119
+#: objects/UML/class.c:127
 msgid "Visible Attributes"
 msgstr "属性を表示する"
 
-#: objects/UML/class.c:121
+#: objects/UML/class.c:129
 msgid "Visible Operations"
 msgstr "操作の表示"
 
-#: objects/UML/class.c:123
+#: objects/UML/class.c:131
 msgid "Visible Comments"
 msgstr "コメントの表示"
 
-#: objects/UML/class.c:126 objects/UML/object.c:151
+#: objects/UML/class.c:133 objects/UML/class_dialog.c:321
+msgid "Wrap Operations"
+msgstr "オペレーションをラップする"
+
+#: objects/UML/class.c:135
+msgid "Wrap after char"
+msgstr "文字の後ろでラップする"
+
+#: objects/UML/class.c:145 objects/UML/class_dialog.c:362
+msgid "Polymorphic"
+msgstr "多態性"
+
+#: objects/UML/class.c:149
+msgid "Classname"
+msgstr "クラス名"
+
+#: objects/UML/class.c:151
+msgid "Abstract Classname"
+msgstr "抽象化クラス名"
+
+#: objects/UML/class.c:157 objects/UML/class.c:159 objects/UML/class.c:161
+#: objects/UML/class.c:163 objects/UML/class.c:165 objects/UML/class.c:167
+msgid " "
+msgstr " "
+
+#: objects/UML/class.c:172 objects/UML/object.c:151
 msgid "Attributes"
 msgstr "属性"
 
-#: objects/UML/class.c:128
+#: objects/UML/class.c:174
 msgid "Operations"
 msgstr "オペレーション"
 
-#: objects/UML/class.c:131
-msgid "Template"
-msgstr "テンプレート"
-
-#: objects/UML/class.c:179 objects/UML/class.c:943 sheets/UML.sheet.in.h:6
-msgid "Class"
-msgstr "クラス"
-
-#: objects/UML/class.c:185
+#: objects/UML/class.c:251
 msgid "Show comments"
 msgstr "コメントを表示する"
 
 #. Class page:
-#: objects/UML/class_dialog.c:259
+#: objects/UML/class_dialog.c:265
 msgid "_Class"
 msgstr "クラス(_C)"
 
-#: objects/UML/class_dialog.c:267
+#: objects/UML/class_dialog.c:273
 msgid "Class name:"
 msgstr "クラス名:"
 
-#: objects/UML/class_dialog.c:275 objects/UML/class_dialog.c:1835
+#: objects/UML/class_dialog.c:281 objects/UML/class_dialog.c:1856
 #: objects/UML/dependency.c:135 objects/UML/generalization.c:131
 #: objects/UML/realizes.c:132
 msgid "Stereotype:"
 msgstr "ステレオタイプ:"
 
-#: objects/UML/class_dialog.c:282 objects/UML/class_dialog.c:912
-#: objects/UML/class_dialog.c:1953 objects/UML/class_dialog.c:2075
+#: objects/UML/class_dialog.c:288 objects/UML/class_dialog.c:933
+#: objects/UML/class_dialog.c:1974 objects/UML/class_dialog.c:2096
 msgid "Comment:"
 msgstr "コメント:"
 
-#: objects/UML/class_dialog.c:296
+#: objects/UML/class_dialog.c:302
 msgid "Attributes visible"
 msgstr "属性を表示する"
 
-#: objects/UML/class_dialog.c:305
+#: objects/UML/class_dialog.c:311
 msgid "Operations visible"
 msgstr "オペレーションを表示する"
 
-#: objects/UML/class_dialog.c:308
+#: objects/UML/class_dialog.c:314
 msgid "Suppress operations"
 msgstr "オペレーションを抑制する"
 
-#: objects/UML/class_dialog.c:314
+#: objects/UML/class_dialog.c:328
+msgid "Wrap after this length: "
+msgstr "次の長さでラップする: "
+
+#: objects/UML/class_dialog.c:335
 msgid "Comments visible"
 msgstr "コメントを表示する"
 
 #. head line
-#: objects/UML/class_dialog.c:327
+#: objects/UML/class_dialog.c:348
 msgid "Kind"
 msgstr "種類"
 
-#: objects/UML/class_dialog.c:332
+#: objects/UML/class_dialog.c:353
 msgid "Size"
 msgstr "サイズ"
 
-#: objects/UML/class_dialog.c:341
-msgid "Polymorphic"
-msgstr "多態性"
-
-#: objects/UML/class_dialog.c:351
+#: objects/UML/class_dialog.c:372
 msgid "Class Name"
 msgstr "クラス名"
 
-#: objects/UML/class_dialog.c:356
+#: objects/UML/class_dialog.c:377
 msgid "Abstract Class"
 msgstr "抽象化クラス"
 
 #. should probably be refactored too.
-#: objects/UML/class_dialog.c:373
+#: objects/UML/class_dialog.c:394
 msgid "Text Color"
 msgstr "文字の色"
 
-#: objects/UML/class_dialog.c:381
+#: objects/UML/class_dialog.c:402
 msgid "Foreground Color"
 msgstr "前景色"
 
-#: objects/UML/class_dialog.c:389
+#: objects/UML/class_dialog.c:410
 msgid "Background Color"
 msgstr "背景色"
 
 #. Attributes page:
-#: objects/UML/class_dialog.c:812
+#: objects/UML/class_dialog.c:833
 msgid "_Attributes"
 msgstr "属性(_A)"
 
-#: objects/UML/class_dialog.c:840 objects/UML/class_dialog.c:1771
-#: objects/UML/class_dialog.c:1999 objects/UML/class_dialog.c:2519
+#: objects/UML/class_dialog.c:861 objects/UML/class_dialog.c:1792
+#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2540
 msgid "_New"
 msgstr "新規(_N)"
 
-#: objects/UML/class_dialog.c:846 objects/UML/class_dialog.c:1777
-#: objects/UML/class_dialog.c:2006 objects/UML/class_dialog.c:2525
+#: objects/UML/class_dialog.c:867 objects/UML/class_dialog.c:1798
+#: objects/UML/class_dialog.c:2027 objects/UML/class_dialog.c:2546
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: objects/UML/class_dialog.c:852 objects/UML/class_dialog.c:1783
-#: objects/UML/class_dialog.c:2013 objects/UML/class_dialog.c:2531
+#: objects/UML/class_dialog.c:873 objects/UML/class_dialog.c:1804
+#: objects/UML/class_dialog.c:2034 objects/UML/class_dialog.c:2552
 msgid "Move up"
 msgstr "上へ"
 
-#: objects/UML/class_dialog.c:858 objects/UML/class_dialog.c:1789
-#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2537
+#: objects/UML/class_dialog.c:879 objects/UML/class_dialog.c:1810
+#: objects/UML/class_dialog.c:2041 objects/UML/class_dialog.c:2558
 msgid "Move down"
 msgstr "下へ"
 
-#: objects/UML/class_dialog.c:869
+#: objects/UML/class_dialog.c:890
 msgid "Attribute data"
 msgstr "属性値"
 
-#: objects/UML/class_dialog.c:901
+#: objects/UML/class_dialog.c:922
 msgid "Value:"
 msgstr "値:"
 
-#: objects/UML/class_dialog.c:924 objects/UML/class_dialog.c:1848
+#: objects/UML/class_dialog.c:945 objects/UML/class_dialog.c:1869
 msgid "Visibility:"
 msgstr "公開/非公開:"
 
-#: objects/UML/class_dialog.c:933 objects/UML/class_dialog.c:1857
+#: objects/UML/class_dialog.c:954 objects/UML/class_dialog.c:1878
 msgid "Public"
 msgstr "パブリック"
 
-#: objects/UML/class_dialog.c:941 objects/UML/class_dialog.c:1865
+#: objects/UML/class_dialog.c:962 objects/UML/class_dialog.c:1886
 msgid "Private"
 msgstr "プライベート"
 
-#: objects/UML/class_dialog.c:949 objects/UML/class_dialog.c:1873
+#: objects/UML/class_dialog.c:970 objects/UML/class_dialog.c:1894
 msgid "Protected"
 msgstr "プロテクテッド"
 
-#: objects/UML/class_dialog.c:957 objects/UML/class_dialog.c:1881
+#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1902
 msgid "Implementation"
 msgstr "インプリメンテーション"
 
-#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1897
+#: objects/UML/class_dialog.c:999 objects/UML/class_dialog.c:1918
 msgid "Class scope"
 msgstr "クラスのスコープにする"
 
 #. Operations page:
-#: objects/UML/class_dialog.c:1743
+#: objects/UML/class_dialog.c:1764
 msgid "_Operations"
 msgstr "オペレーション(_O)"
 
-#: objects/UML/class_dialog.c:1801
+#: objects/UML/class_dialog.c:1822
 msgid "Operation data"
 msgstr "オペレーションのデータ"
 
-#: objects/UML/class_dialog.c:1903
+#: objects/UML/class_dialog.c:1924
 msgid "Inheritance type:"
 msgstr "継承する型:"
 
-#: objects/UML/class_dialog.c:1920
+#: objects/UML/class_dialog.c:1941
 msgid "Polymorphic (virtual)"
 msgstr "多態性 (virtual)"
 
-#: objects/UML/class_dialog.c:1928
+#: objects/UML/class_dialog.c:1949
 msgid "Leaf (final)"
 msgstr "リーフ (final)"
 
-#: objects/UML/class_dialog.c:1946
+#: objects/UML/class_dialog.c:1967
 msgid "Query"
 msgstr "クエリ"
 
-#: objects/UML/class_dialog.c:1970
+#: objects/UML/class_dialog.c:1991
 msgid "Parameters:"
 msgstr "パラメータ:"
 
-#: objects/UML/class_dialog.c:2032
+#: objects/UML/class_dialog.c:2053
 msgid "Parameter data"
 msgstr "パラメータのデータ"
 
-#: objects/UML/class_dialog.c:2064
+#: objects/UML/class_dialog.c:2085
 msgid "Def. value:"
 msgstr "定義値:"
 
-#: objects/UML/class_dialog.c:2095
+#: objects/UML/class_dialog.c:2116
 msgid "Undefined"
 msgstr "未定義"
 
-#: objects/UML/class_dialog.c:2103
+#: objects/UML/class_dialog.c:2124
 msgid "In"
 msgstr "入力"
 
-#: objects/UML/class_dialog.c:2112
+#: objects/UML/class_dialog.c:2133
 msgid "Out"
 msgstr "出力"
 
-#: objects/UML/class_dialog.c:2121
+#: objects/UML/class_dialog.c:2142
 msgid "In & Out"
 msgstr "入力と出力"
 
 #. Templates page:
-#: objects/UML/class_dialog.c:2485
+#: objects/UML/class_dialog.c:2506
 msgid "_Templates"
 msgstr "テンプレート(_T)"
 
-#: objects/UML/class_dialog.c:2491 sheets/UML.sheet.in.h:29
+#: objects/UML/class_dialog.c:2512 sheets/UML.sheet.in.h:29
 msgid "Template class"
 msgstr "テンプレート・クラス"
 
-#: objects/UML/class_dialog.c:2548
+#: objects/UML/class_dialog.c:2569
 msgid "Formal parameter data"
 msgstr "正規パラメータのデータ"
 
@@ -4145,7 +4246,7 @@ msgstr "送信"
 msgid "Recursive"
 msgstr "繰り返し"
 
-#: objects/UML/message.c:150
+#: objects/UML/message.c:150 objects/Jackson/phenomenon.c:142
 msgid "Message:"
 msgstr "メッセージ:"
 
@@ -4181,7 +4282,7 @@ msgstr ""
 "オプションは将来のバージョンで無くなる予定です。\n"
 "この代わりに、Initial/Final 状態オブジェクトを使用して下さい。\n"
 
-#: objects/UML/state_term.c:122
+#: objects/UML/state_term.c:118
 msgid "Is final"
 msgstr "final"
 
@@ -4317,6 +4418,7 @@ msgid "Cannot open icon file %s for object type '%s'."
 msgstr "オブジェクトの種類 '%2$s' のアイコン・ファイル %1$s を開けません"
 
 #: objects/flowchart/box.c:148 objects/standard/box.c:148
+#: objects/standard/polyline.c:130 objects/standard/zigzagline.c:129
 msgid "Corner radius"
 msgstr "四隅の丸み付け:"
 
@@ -4328,6 +4430,203 @@ msgstr "フローチャートのオブジェクト"
 msgid "Shear angle"
 msgstr "シアーの角度"
 
+#: objects/Istar/actor.c:66 objects/Istar/link.c:155
+msgid "Unspecified"
+msgstr "未指定"
+
+#: objects/Istar/actor.c:67 objects/KAOS/other.c:75
+msgid "Agent"
+msgstr "エージェント"
+
+#: objects/Istar/actor.c:69
+msgid "Role"
+msgstr "役割"
+
+#: objects/Istar/goal.c:74 objects/KAOS/goal.c:79
+msgid "Softgoal"
+msgstr "Softgoal"
+
+#: objects/Istar/goal.c:75 objects/KAOS/goal.c:80
+msgid "Goal"
+msgstr "ゴール"
+
+#: objects/Istar/goal.c:155 objects/Istar/goal.c:156 objects/KAOS/goal.c:159
+#: objects/KAOS/goal.c:160
+msgid "Goal Type"
+msgstr "ゴールの種類"
+
+#: objects/Istar/istar.c:46
+msgid "Istar diagram"
+msgstr "Istar ダイアグラム"
+
+#: objects/Istar/link.c:156
+msgid "Positive Contrib"
+msgstr "正の Contrib"
+
+#: objects/Istar/link.c:157
+msgid "Negative contrib"
+msgstr "負の Contrib"
+
+#: objects/Istar/link.c:158 sheets/UML.sheet.in.h:10
+msgid "Dependency"
+msgstr "依存関係"
+
+#: objects/Istar/link.c:159
+msgid "Decomposition"
+msgstr "分解"
+
+#: objects/Istar/link.c:160
+msgid "Means-Ends"
+msgstr "Means-Ends"
+
+#: objects/Istar/other.c:73
+msgid "Resource"
+msgstr "リソース"
+
+#: objects/Istar/other.c:74
+msgid "Task"
+msgstr "タスク"
+
+#: objects/Istar/other.c:489
+msgid "i* other"
+msgstr "i* other"
+
+#: objects/Jackson/domain.c:79
+msgid "Given Domain"
+msgstr "指定されたドメイン"
+
+#: objects/Jackson/domain.c:80
+msgid "Designed Domain"
+msgstr "設計されたドメイン"
+
+#: objects/Jackson/domain.c:81
+msgid "Machine Domain"
+msgstr "マシンのドメイン"
+
+#: objects/Jackson/domain.c:97
+msgid "Causal"
+msgstr "原因"
+
+#: objects/Jackson/domain.c:98
+msgid "Biddable"
+msgstr "従順"
+
+#: objects/Jackson/domain.c:99
+msgid "Lexical"
+msgstr "レキシカル"
+
+#: objects/Jackson/domain.c:178 objects/Jackson/domain.c:179
+msgid "Domain Type"
+msgstr "ドメインの型"
+
+#: objects/Jackson/domain.c:183
+msgid "Domain Kind"
+msgstr "ドメインの種類"
+
+#: objects/Jackson/domain.c:184
+msgid "Optional kind which appears in the lower right corner of the Domain"
+msgstr "ドメインの右下隅に表示するオプションの種類"
+
+#: objects/Jackson/domain.c:545
+msgid "Jackson domain"
+msgstr "Jackson ドメイン"
+
+#: objects/Jackson/jackson.c:47
+msgid "Jackson diagram"
+msgstr "Jackson ダイアグラム"
+
+#: objects/Jackson/phenomenon.c:134
+msgid "Shared"
+msgstr "共有"
+
+#: objects/Jackson/phenomenon.c:135 objects/KAOS/goal.c:81
+msgid "Requirement"
+msgstr "条件"
+
+#: objects/KAOS/goal.c:82
+msgid "Assumption"
+msgstr "仮定"
+
+#: objects/KAOS/goal.c:83
+msgid "Obstacle"
+msgstr "障害"
+
+#: objects/KAOS/goal.c:593
+msgid "KAOS goal"
+msgstr "KAOS ゴール"
+
+#: objects/KAOS/kaos.c:49
+msgid "KAOS diagram"
+msgstr "KAOS ダイアグラム"
+
+#: objects/KAOS/metaandorrel.c:151
+msgid "AND Refinement"
+msgstr "AND Refinement"
+
+#: objects/KAOS/metaandorrel.c:152
+msgid "Complete AND Refinement"
+msgstr "Complete AND Refinement"
+
+#: objects/KAOS/metaandorrel.c:153
+msgid "OR Refinement"
+msgstr "OR Refinement"
+
+#: objects/KAOS/metaandorrel.c:154
+msgid "Operationalization"
+msgstr "Operationalization"
+
+#: objects/KAOS/metaandorrel.c:161
+msgid "Text:"
+msgstr "テキスト:"
+
+#: objects/KAOS/metabinrel.c:165
+msgid "Contributes"
+msgstr "Contributes"
+
+#: objects/KAOS/metabinrel.c:166
+msgid "Obstructs"
+msgstr "障害物"
+
+#: objects/KAOS/metabinrel.c:167
+msgid "Conflicts"
+msgstr "重複"
+
+#: objects/KAOS/metabinrel.c:168
+msgid "Responsibility"
+msgstr "責任"
+
+#: objects/KAOS/metabinrel.c:169
+msgid "Monitors"
+msgstr "モニタ"
+
+#: objects/KAOS/metabinrel.c:170
+msgid "Controls"
+msgstr "制御"
+
+#: objects/KAOS/metabinrel.c:171
+msgid "CapableOf"
+msgstr "CapableOf"
+
+#: objects/KAOS/metabinrel.c:172
+msgid "Performs"
+msgstr "実行"
+
+#: objects/KAOS/metabinrel.c:174
+msgid "Output"
+msgstr "出力"
+
+#: objects/KAOS/other.c:541
+msgid "KAOS other"
+msgstr "KAOS その他"
+
+#: objects/network/basestation.c:133
+msgid "Sectors"
+msgstr "セクタ"
+
+#: objects/network/basestation.c:388 objects/network/basestation.c:390
+msgid "Base Station"
+msgstr "ベース・ステーション"
+
 #: objects/network/bus.c:599
 msgid "Add Handle"
 msgstr "ハンドルの追加"
@@ -4336,31 +4635,55 @@ msgstr "ハンドルの追加"
 msgid "Delete Handle"
 msgstr "ハンドルの削除"
 
-#: objects/network/network.c:41
+#: objects/network/network.c:43
 msgid "Network diagram objects"
 msgstr "ネットワーク・ダイアグラムのオブジェクト"
 
+#: objects/network/radiocell.c:130
+msgid "Macro Cell"
+msgstr "マクロ・セル"
+
+#: objects/network/radiocell.c:131
+msgid "Micro Cell"
+msgstr "マイクロ・セル"
+
+#: objects/network/radiocell.c:132
+msgid "Pico Cell"
+msgstr "ピコ・セル"
+
+#: objects/network/radiocell.c:138
+msgid "Radius"
+msgstr "半径"
+
+#: objects/network/radiocell.c:140
+msgid "Cell Type:"
+msgstr "セルの種類:"
+
+#: objects/network/radiocell.c:152
+msgid "Subscribers"
+msgstr "購読者"
+
 #: objects/standard/arc.c:131
 msgid "Curve distance"
 msgstr "曲線の長さ"
 
-#: objects/standard/bezier.c:545 objects/standard/beziergon.c:500
+#: objects/standard/bezier.c:545 objects/standard/beziergon.c:499
 msgid "Add Segment"
 msgstr "セグメントの追加"
 
-#: objects/standard/bezier.c:546 objects/standard/beziergon.c:501
+#: objects/standard/bezier.c:546 objects/standard/beziergon.c:500
 msgid "Delete Segment"
 msgstr "セグメントの削除"
 
-#: objects/standard/bezier.c:548 objects/standard/beziergon.c:503
+#: objects/standard/bezier.c:548 objects/standard/beziergon.c:502
 msgid "Symmetric control"
 msgstr "対称コントロール"
 
-#: objects/standard/bezier.c:550 objects/standard/beziergon.c:505
+#: objects/standard/bezier.c:550 objects/standard/beziergon.c:504
 msgid "Smooth control"
 msgstr "スムース・コントロール"
 
-#: objects/standard/bezier.c:552 objects/standard/beziergon.c:507
+#: objects/standard/bezier.c:552 objects/standard/beziergon.c:506
 msgid "Cusp control"
 msgstr "カスプ・コントロール"
 
@@ -4380,15 +4703,15 @@ msgstr "矩形"
 msgid "Aspect ratio"
 msgstr "アスペクト比"
 
-#: objects/standard/box.c:683 objects/standard/ellipse.c:661
+#: objects/standard/box.c:683 objects/standard/ellipse.c:664
 msgid "Free aspect"
 msgstr "自由なアスペクト"
 
-#: objects/standard/box.c:685 objects/standard/ellipse.c:663
+#: objects/standard/box.c:685 objects/standard/ellipse.c:666
 msgid "Fixed aspect"
 msgstr "固定アスペクト"
 
-#: objects/standard/ellipse.c:133 objects/standard/ellipse.c:665
+#: objects/standard/ellipse.c:133 objects/standard/ellipse.c:668
 msgid "Circle"
 msgstr "円"
 
@@ -4421,23 +4744,43 @@ msgstr ""
 msgid "The image file '%s' was not found.\n"
 msgstr "画像ファイル '%s' がありませんでした\n"
 
-#: objects/standard/line.c:136
+#: objects/standard/line.c:135
 msgid "Arrows"
 msgstr "矢印"
 
-#: objects/standard/line.c:141
+#: objects/standard/line.c:140
 msgid "Start point"
 msgstr "開始点"
 
-#: objects/standard/line.c:143
+#: objects/standard/line.c:142
 msgid "End point"
 msgstr "終了点"
 
-#: objects/standard/polygon.c:460 objects/standard/polyline.c:496
+#: objects/standard/line.c:143
+msgid "Line gaps"
+msgstr "線のギャップ"
+
+#: objects/standard/line.c:145
+msgid "Absolute start gap"
+msgstr "絶対始点のギャップ"
+
+#: objects/standard/line.c:147
+msgid "Absolute end gap"
+msgstr "絶対終点のギャップ"
+
+#: objects/standard/line.c:149
+msgid "Fractional start gap"
+msgstr "部分始点のギャップ"
+
+#: objects/standard/line.c:151
+msgid "Fractional end gap"
+msgstr "部分終点のギャップ"
+
+#: objects/standard/polygon.c:460 objects/standard/polyline.c:515
 msgid "Add Corner"
 msgstr "四隅の追加"
 
-#: objects/standard/polygon.c:461 objects/standard/polyline.c:497
+#: objects/standard/polygon.c:461 objects/standard/polyline.c:516
 msgid "Delete Corner"
 msgstr "四隅の削除"
 
@@ -4445,6 +4788,18 @@ msgstr "四隅の削除"
 msgid "Standard objects"
 msgstr "標準オブジェクト"
 
+#: plug-ins/cairo/diacairo.c:965
+msgid "Cairo PostScript"
+msgstr "Cairo ポストスクリプト"
+
+#: plug-ins/cairo/diacairo.c:974
+msgid "Cairo PNG"
+msgstr "Cairo PNG"
+
+#: plug-ins/cairo/diacairo.c:1001
+msgid "Cairo based Rendering"
+msgstr "Cairo ベースのレンダリング"
+
 #: plug-ins/cgm/cgm.c:1109
 msgid ""
 "Image row length larger than maximum cell array.\n"
@@ -4514,11 +4869,15 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: plug-ins/pixbuf/pixbuf.c:163 plug-ins/pixbuf/pixbuf.c:174
+#: plug-ins/pixbuf/pixbuf.c:159
+msgid "GdkPixbuf - not antialiased"
+msgstr "GdkPixbuf - アンチエイリアスなし"
+
+#: plug-ins/pixbuf/pixbuf.c:169
 msgid "GdkPixbuf bitmap"
 msgstr "GdkPixbuf ビットマップ"
 
-#: plug-ins/pixbuf/pixbuf.c:187
+#: plug-ins/pixbuf/pixbuf.c:189
 msgid "gdk-pixbuf based bitmap export/import"
 msgstr "gdk-pixbuf ビットマップのエキスポート/インポート"
 
@@ -4534,7 +4893,7 @@ msgstr "UTF8 が正しくありません"
 msgid "TeX PSTricks macros"
 msgstr "Tex PSTricks マクロ"
 
-#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1041
+#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1140
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "'%s' を書き込みモードで開けませんでした\n"
@@ -4555,11 +4914,11 @@ msgstr "Dia シェイプ・ファイル"
 msgid "dia shape export filter"
 msgstr "Dia シェイプのエキスポート用フィルタ"
 
-#: plug-ins/svg/render_svg.c:301 plug-ins/svg/svg-import.c:642
+#: plug-ins/svg/render_svg.c:301 plug-ins/svg/svg-import.c:641
 msgid "Scalable Vector Graphics"
 msgstr "スケーラブル・ベクタ・グラフィックス (SVG)"
 
-#: plug-ins/svg/svg-import.c:204 plug-ins/svg/svg-import.c:218
+#: plug-ins/svg/svg-import.c:203 plug-ins/svg/svg-import.c:217
 #: plug-ins/xfig/xfig-import.c:108 plug-ins/xfig/xfig-import.c:159
 #: plug-ins/xfig/xfig-import.c:188 plug-ins/xfig/xfig-import.c:224
 #: plug-ins/xfig/xfig-import.c:261 plug-ins/xfig/xfig-import.c:289
@@ -4568,19 +4927,19 @@ msgstr "スケーラブル・ベクタ・グラフィックス (SVG)"
 msgid "Can't find standard object"
 msgstr "標準オブジェクトが見つかりません"
 
-#: plug-ins/svg/svg-import.c:230
+#: plug-ins/svg/svg-import.c:229
 msgid "Unexpected SVG path element"
 msgstr "予期せぬ SVG パス"
 
-#: plug-ins/svg/svg-import.c:288
+#: plug-ins/svg/svg-import.c:287
 msgid "Courier"
 msgstr "Courier"
 
-#: plug-ins/svg/svg-import.c:591
+#: plug-ins/svg/svg-import.c:590
 msgid "Could not find SVG namespace."
 msgstr "SVG 名前空間を見つけることができませんでした"
 
-#: plug-ins/svg/svg-import.c:597
+#: plug-ins/svg/svg-import.c:596
 #, c-format
 msgid "root element was '%s' -- expecting 'svg'."
 msgstr "ルートの要素が '%s' でした -- 'svg' であるべきです."
@@ -4589,24 +4948,24 @@ msgstr "ルートの要素が '%s' でした -- 'svg' であるべきです."
 msgid "Scalable Vector Graphics import and export filters"
 msgstr "SVG のインポート/エキスポート用フィルタ"
 
-#: plug-ins/wmf/wmf.cpp:1100
+#: plug-ins/wmf/wmf.cpp:1207
 msgid "Windows Meta File"
 msgstr "Windows メタ・ファイル"
 
-#: plug-ins/wmf/wmf.cpp:1114
+#: plug-ins/wmf/wmf.cpp:1223
 msgid "WMF export filter"
 msgstr "WMF のエキスポート用フィルタ"
 
-#: plug-ins/wpg/wpg.c:1181
+#: plug-ins/wpg/wpg.c:1182
 #, c-format
 msgid "File: %s type/version unsupported.\n"
 msgstr "ファイル: %s の種類/バージョンはサポートしていません\n"
 
-#: plug-ins/wpg/wpg.c:1311 plug-ins/wpg/wpg.c:1318
+#: plug-ins/wpg/wpg.c:1312 plug-ins/wpg/wpg.c:1319
 msgid "WPG"
 msgstr "WPG"
 
-#: plug-ins/wpg/wpg.c:1332
+#: plug-ins/wpg/wpg.c:1333
 msgid "WordPerfect Graphics export filter"
 msgstr "WordPerfect Graphics のエキスポート用フィルタ"
 
@@ -4641,7 +5000,7 @@ msgstr "線スタイル %d は利用できません\n"
 #: plug-ins/xfig/xfig-import.c:573
 #, c-format
 msgid "Error while reading %dth of %d points: %s\n"
-msgstr "%2$d の %1$d 番目を読み込む際にエラーが発生しました: %s\n"
+msgstr "%2$d の %1$d 番目を読み込む際にエラーが発生しました: %3$s\n"
 
 #: plug-ins/xfig/xfig-import.c:595
 msgid "Error while reading arrowhead\n"
@@ -4652,152 +5011,152 @@ msgstr "矢印を読み込む際にエラーが発生しました\n"
 msgid "Unknown arrow type %d\n"
 msgstr "矢印の種類 %d を認識できません\n"
 
-#: plug-ins/xfig/xfig-import.c:712
+#: plug-ins/xfig/xfig-import.c:731
 #, c-format
 msgid "Couldn't read ellipse info: %s\n"
 msgstr "楕円の情報を読み込めませんでした: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:780
+#: plug-ins/xfig/xfig-import.c:799
 #, c-format
 msgid "Couldn't read polyline info: %s\n"
 msgstr "連続線の情報を読み込めませんでした: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:795
+#: plug-ins/xfig/xfig-import.c:814
 #, c-format
 msgid "Couldn't read flipped bit: %s\n"
 msgstr "反転ビットを読み込めませんでした: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:813
+#: plug-ins/xfig/xfig-import.c:832
 msgid "Negative corner radius, negating"
 msgstr "マイナス角の半径を打ち消します"
 
-#: plug-ins/xfig/xfig-import.c:857 plug-ins/xfig/xfig-import.c:1173
+#: plug-ins/xfig/xfig-import.c:876 plug-ins/xfig/xfig-import.c:1192
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "不明な連続線のサブタイプです: %d\n"
 
-#: plug-ins/xfig/xfig-import.c:1007 plug-ins/xfig/xfig-import.c:1039
+#: plug-ins/xfig/xfig-import.c:1026 plug-ins/xfig/xfig-import.c:1058
 #, c-format
 msgid "Couldn't read spline info: %s\n"
 msgstr "連続線の情報を読み込めませんでした: %s\n"
 
 #. Open approximated spline
 #. Closed approximated spline
-#: plug-ins/xfig/xfig-import.c:1026 plug-ins/xfig/xfig-import.c:1044
+#: plug-ins/xfig/xfig-import.c:1045 plug-ins/xfig/xfig-import.c:1063
 msgid "Cannot convert approximated spline yet."
 msgstr "近似スプラインに変換できません"
 
-#: plug-ins/xfig/xfig-import.c:1084
+#: plug-ins/xfig/xfig-import.c:1103
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr "不明な連続線のサブタイプです: %d\n"
 
-#: plug-ins/xfig/xfig-import.c:1147
+#: plug-ins/xfig/xfig-import.c:1166
 #, c-format
 msgid "Couldn't read arc info: %s\n"
 msgstr "円弧の情報を読み込めませんでした: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1237
+#: plug-ins/xfig/xfig-import.c:1256
 #, c-format
 msgid "Couldn't read text info: %s\n"
 msgstr "テキストの情報を読み込めませんでした: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1278
+#: plug-ins/xfig/xfig-import.c:1319
 #, c-format
 msgid "Couldn't identify FIG object: %s\n"
 msgstr "FIG オブジェクトを識別できませんでした: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1286
+#: plug-ins/xfig/xfig-import.c:1327
 msgid "Compound end outside compound\n"
 msgstr "Compound end outside compound\n"
 
-#: plug-ins/xfig/xfig-import.c:1305
+#: plug-ins/xfig/xfig-import.c:1346
 #, c-format
 msgid "Couldn't read color: %s\n"
 msgstr "色を読み込めませんでした: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1350
+#: plug-ins/xfig/xfig-import.c:1391
 #, c-format
 msgid "Couldn't read group extend: %s\n"
 msgstr "グループ拡張を読み込めませんでした: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1361
+#: plug-ins/xfig/xfig-import.c:1402
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "オブジェクトの種類 %d を認識できません\n"
 
-#: plug-ins/xfig/xfig-import.c:1384
+#: plug-ins/xfig/xfig-import.c:1426
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "'%s' は `%s' あるいは `%s' のひとつではありません\n"
 
-#: plug-ins/xfig/xfig-import.c:1394
+#: plug-ins/xfig/xfig-import.c:1436
 #, c-format
 msgid "Error reading paper size: %s\n"
 msgstr "用紙の大きさを読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1404
+#: plug-ins/xfig/xfig-import.c:1447
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "用紙の大きさ '%s' を認識できません (デフォルトを使用します)\n"
 
-#: plug-ins/xfig/xfig-import.c:1416
+#: plug-ins/xfig/xfig-import.c:1459
 #, c-format
 msgid "Error reading paper orientation: %s\n"
 msgstr "用紙の向きを読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1426
+#: plug-ins/xfig/xfig-import.c:1469
 #, c-format
 msgid "Error reading justification: %s\n"
 msgstr "配置を読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1436
+#: plug-ins/xfig/xfig-import.c:1479
 #, c-format
 msgid "Error reading units: %s\n"
 msgstr "単位を読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1450
+#: plug-ins/xfig/xfig-import.c:1493
 #, c-format
 msgid "Error reading magnification: %s\n"
 msgstr "倍率を読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1461
+#: plug-ins/xfig/xfig-import.c:1504
 #, c-format
 msgid "Error reading multipage indicator: %s\n"
 msgstr "複数ページ識別子を読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1472
+#: plug-ins/xfig/xfig-import.c:1515
 #, c-format
 msgid "Error reading transparent color: %s\n"
 msgstr "透明色を読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1481 plug-ins/xfig/xfig-import.c:1536
-#: plug-ins/xfig/xfig-import.c:1554
+#: plug-ins/xfig/xfig-import.c:1524 plug-ins/xfig/xfig-import.c:1579
+#: plug-ins/xfig/xfig-import.c:1597
 #, c-format
 msgid "Error reading FIG file: %s\n"
 msgstr "FIG ファイルを読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1483 plug-ins/xfig/xfig-import.c:1538
+#: plug-ins/xfig/xfig-import.c:1526 plug-ins/xfig/xfig-import.c:1581
 msgid "Premature end of FIG file\n"
 msgstr "FIG ファイルの終端が早すぎます\n"
 
-#: plug-ins/xfig/xfig-import.c:1492
+#: plug-ins/xfig/xfig-import.c:1535
 #, c-format
 msgid "Error reading resolution: %s\n"
 msgstr "解像度を読み込む際にエラーが発生しました: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1523
+#: plug-ins/xfig/xfig-import.c:1566
 #, c-format
 msgid "Doesn't look like a Fig file: %s\n"
 msgstr "FIG ファイルではないようです: %s\n"
 
-#: plug-ins/xfig/xfig-import.c:1529
+#: plug-ins/xfig/xfig-import.c:1572
 #, c-format
 msgid "This is a FIG version %d.%d file, I may not understand it\n"
 msgstr ""
 "これは FIG バージョン %d.%d のファイルです (認識できないかもしれません)\n"
 
-#: plug-ins/xfig/xfig-import.c:1577
+#: plug-ins/xfig/xfig-import.c:1620
 msgid "XFig File Format"
 msgstr "XFIG ファイル形式"
 
@@ -4830,11 +5189,11 @@ msgstr "スタイルシートを解析する際にエラーが発生しました
 msgid "Error while applying stylesheet: %s\n"
 msgstr "スタイルシートを適用する際にエラーが発生しました: %s\n"
 
-#: plug-ins/xslt/xslt.c:312
+#: plug-ins/xslt/xslt.c:313
 msgid "XSL Transformation filter"
 msgstr "XSL 変換用フィルタ"
 
-#: plug-ins/xslt/xslt.c:336
+#: plug-ins/xslt/xslt.c:337
 msgid "No valid configuration files found for the XSLT plugin, not loading."
 msgstr ""
 "XSLT プラグインの適切な設定ファイルが見つからないか、読み込まれていません"
@@ -4851,176 +5210,393 @@ msgstr "変換元:"
 msgid "To:"
 msgstr "変換先:"
 
-#: sheets/Assorted.sheet.in.h:1
+#. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
+#. Leave as is for now, renaming too much hassle.
+#. Will probably need to split into seperate sheets soon anyway.
+#: sheets/Assorted.sheet.in.h:4
 msgid ""
 "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
 "Geometric Shapes"
 msgstr "多角形、ベジェ曲線とその他いろいろな幾何学シェイプを集めた基本図形"
 
-#: sheets/Assorted.sheet.in.h:2
+#. Please talk to me before making any changes to this sheet
+#: sheets/Assorted.sheet.in.h:6
 msgid "Assorted"
 msgstr "基本図形"
 
-#: sheets/Assorted.sheet.in.h:3
+#: sheets/Assorted.sheet.in.h:7
 msgid "Chevron"
 msgstr "シェブロン"
 
-#: sheets/Assorted.sheet.in.h:4
+#: sheets/Assorted.sheet.in.h:8
 msgid "Curved eight point star"
 msgstr "カーブのかかった八点星"
 
-#: sheets/Assorted.sheet.in.h:5
+#: sheets/Assorted.sheet.in.h:9
 msgid "Curved four point star"
 msgstr "カーブのかかった四点星"
 
-#: sheets/Assorted.sheet.in.h:6
+#: sheets/Assorted.sheet.in.h:10
 msgid "Diamond"
 msgstr "菱形"
 
-#: sheets/Assorted.sheet.in.h:7
+#: sheets/Assorted.sheet.in.h:11
 msgid "Down arrow"
 msgstr "下向きの矢印"
 
-#: sheets/Assorted.sheet.in.h:8
+#: sheets/Assorted.sheet.in.h:12
 msgid "Eight point star"
 msgstr "八点星"
 
-#: sheets/Assorted.sheet.in.h:9
+#: sheets/Assorted.sheet.in.h:13
 msgid "Four point star"
 msgstr "四点星"
 
-#: sheets/Assorted.sheet.in.h:10
+#: sheets/Assorted.sheet.in.h:14
 msgid "Heart"
 msgstr "ハート"
 
-#: sheets/Assorted.sheet.in.h:11
+#: sheets/Assorted.sheet.in.h:15
 msgid "Heptagon. Seven sided shape"
 msgstr "七角形"
 
-#: sheets/Assorted.sheet.in.h:12
+#: sheets/Assorted.sheet.in.h:16
 msgid "Hexagon. Six sided shape"
 msgstr "六角形"
 
-#: sheets/Assorted.sheet.in.h:13
+#: sheets/Assorted.sheet.in.h:17
 msgid "Horizontal parallelogram"
 msgstr "平行四辺形 (横向き)"
 
-#: sheets/Assorted.sheet.in.h:14
+#: sheets/Assorted.sheet.in.h:18
 msgid "Isoceles triangle"
 msgstr "二等辺三角形"
 
-#: sheets/Assorted.sheet.in.h:15
+#: sheets/Assorted.sheet.in.h:19
 msgid "Left arrow"
 msgstr "左向きの矢印"
 
-#: sheets/Assorted.sheet.in.h:16
+#: sheets/Assorted.sheet.in.h:20
 msgid "Left-right arrow"
 msgstr "左-右 矢印"
 
-#: sheets/Assorted.sheet.in.h:17
+#: sheets/Assorted.sheet.in.h:21
 msgid "Left-right-up arrow"
 msgstr "左-右-上 矢印"
 
-#: sheets/Assorted.sheet.in.h:18
+#: sheets/Assorted.sheet.in.h:22
 msgid "Left-up arrow"
 msgstr "左-上 矢印"
 
-#: sheets/Assorted.sheet.in.h:19
+#: sheets/Assorted.sheet.in.h:23
 msgid "Maltese cross"
 msgstr "マルタ十字"
 
-#: sheets/Assorted.sheet.in.h:20
+#: sheets/Assorted.sheet.in.h:24
 msgid "Notched left arrow"
 msgstr "切り込み入り左向きの矢印"
 
-#: sheets/Assorted.sheet.in.h:21
+#: sheets/Assorted.sheet.in.h:25
 msgid "Notched right arrow"
 msgstr "切り込み入り右向きの矢印"
 
-#: sheets/Assorted.sheet.in.h:22
+#: sheets/Assorted.sheet.in.h:26
 msgid "Octogon. Eight sided shape"
 msgstr "八角形"
 
-#: sheets/Assorted.sheet.in.h:23
+#: sheets/Assorted.sheet.in.h:27
 msgid "Pentagon block arrow"
 msgstr "五角形の矢印"
 
-#: sheets/Assorted.sheet.in.h:24
+#: sheets/Assorted.sheet.in.h:28
 msgid "Pentagon. Five sided shape"
 msgstr "五角形"
 
-#: sheets/Assorted.sheet.in.h:25
+#: sheets/Assorted.sheet.in.h:29
 msgid "Perfect circle"
 msgstr "円"
 
-#: sheets/Assorted.sheet.in.h:26
+#: sheets/Assorted.sheet.in.h:30
 msgid "Perfect square, height equals width"
 msgstr "正方形"
 
-#: sheets/Assorted.sheet.in.h:27
+#: sheets/Assorted.sheet.in.h:31
 msgid "Quad arrow"
 msgstr "十字矢印"
 
-#: sheets/Assorted.sheet.in.h:28
+#: sheets/Assorted.sheet.in.h:32
 msgid "Quarter circle"
 msgstr "四分円"
 
-#: sheets/Assorted.sheet.in.h:29
+#: sheets/Assorted.sheet.in.h:33
 msgid "Quarter moon"
 msgstr "三日月"
 
-#: sheets/Assorted.sheet.in.h:30
+#: sheets/Assorted.sheet.in.h:34
 msgid "Right angle triangle"
 msgstr "直角三角形"
 
-#: sheets/Assorted.sheet.in.h:31
+#: sheets/Assorted.sheet.in.h:35
 msgid "Right arrow"
 msgstr "右向きの矢印"
 
-#: sheets/Assorted.sheet.in.h:32
+#: sheets/Assorted.sheet.in.h:36
 msgid "Seven point star"
 msgstr "七点星"
 
-#: sheets/Assorted.sheet.in.h:33
+#: sheets/Assorted.sheet.in.h:37
 msgid "Sharp eight point star"
 msgstr "シャープな八点星"
 
-#: sheets/Assorted.sheet.in.h:34
+#: sheets/Assorted.sheet.in.h:38
 msgid "Six point star"
 msgstr "六点星"
 
-#: sheets/Assorted.sheet.in.h:35
+#: sheets/Assorted.sheet.in.h:39
 msgid "Sun"
 msgstr "太陽"
 
-#: sheets/Assorted.sheet.in.h:36
+#: sheets/Assorted.sheet.in.h:40
 msgid "Swiss cross"
 msgstr "スイス十字"
 
-#: sheets/Assorted.sheet.in.h:37
+#: sheets/Assorted.sheet.in.h:41
 msgid "Trapezoid"
 msgstr "台形"
 
-#: sheets/Assorted.sheet.in.h:38
+#: sheets/Assorted.sheet.in.h:42
 msgid "Turn-up arrow"
 msgstr "上に曲げた矢印"
 
-#: sheets/Assorted.sheet.in.h:39
+#: sheets/Assorted.sheet.in.h:43
 msgid "Up arrow"
 msgstr "上向きの矢印"
 
-#: sheets/Assorted.sheet.in.h:40
+#: sheets/Assorted.sheet.in.h:44
 msgid "Up-down arrow"
 msgstr "上-下 矢印"
 
-#: sheets/Assorted.sheet.in.h:41
+#: sheets/Assorted.sheet.in.h:45
 msgid "Up-down-left arrow"
 msgstr "上-下-左 矢印"
 
-#: sheets/Assorted.sheet.in.h:42
+#: sheets/Assorted.sheet.in.h:46
 msgid "Vertical parallelogram"
 msgstr "平行四辺形 (縦向き)"
 
+#: sheets/ChemEng.sheet.in.h:1
+msgid "AC Generator"
+msgstr "AC ジェネレータ"
+
+#: sheets/ChemEng.sheet.in.h:2
+msgid "Air Cooler"
+msgstr "空冷式クーラー"
+
+#: sheets/ChemEng.sheet.in.h:3
+msgid "Autoclave"
+msgstr "オートクレーブ"
+
+#: sheets/ChemEng.sheet.in.h:4
+msgid "Axial Flow Fan"
+msgstr "Axial Flow Fan"
+
+#: sheets/ChemEng.sheet.in.h:5
+msgid "Basic Filter"
+msgstr "ベーシック・フィルタ"
+
+#: sheets/ChemEng.sheet.in.h:6
+msgid "Centrifugal Pump or Fan"
+msgstr "磁気浮上遠心ポンプ/ファン"
+
+#: sheets/ChemEng.sheet.in.h:7
+msgid "Centrifuge"
+msgstr "遠心分離器"
+
+#. For: zenith
+#: sheets/ChemEng.sheet.in.h:9
+msgid "ChemEng"
+msgstr "化学工学"
+
+#: sheets/ChemEng.sheet.in.h:10
+msgid "Clarifier or Settling Tank"
+msgstr "浄化/定着タンク"
+
+#: sheets/ChemEng.sheet.in.h:11
+msgid "Collection for chemical engineering"
+msgstr "化学工学のコレクション"
+
+#: sheets/ChemEng.sheet.in.h:12
+msgid "Compressor or Turbine"
+msgstr "コンプレッサ/タービン"
+
+#: sheets/ChemEng.sheet.in.h:13
+msgid "Covered tank"
+msgstr "カバー付きのタンク"
+
+#: sheets/ChemEng.sheet.in.h:14
+msgid "Cyclone and hydrocyclone"
+msgstr "サイクロンとハイドロサイクロン"
+
+#: sheets/ChemEng.sheet.in.h:15
+msgid "Double-Pipe Exchanger"
+msgstr "二本のパイプが付いたエクスチェンジャ"
+
+#: sheets/ChemEng.sheet.in.h:16
+msgid "Ejector or Injector"
+msgstr "イジェクタ/インジェクタ"
+
+#: sheets/ChemEng.sheet.in.h:17
+msgid "Fan or Stirrer"
+msgstr "ファン/かくはん器"
+
+#: sheets/ChemEng.sheet.in.h:18
+msgid "Fixed-Sheet Exchanger"
+msgstr "シート固定エクスチェンジャ"
+
+#: sheets/ChemEng.sheet.in.h:19
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr "Floating-Head or U-Tube Exchanger"
+
+#: sheets/ChemEng.sheet.in.h:20
+msgid "Fluid Contacting Vessel, simple"
+msgstr "Fluid Contacting Vessel, simple"
+
+#: sheets/ChemEng.sheet.in.h:21
+msgid "Forced-Flow Air Cooler"
+msgstr "Forced-Flow Air Cooler"
+
+#: sheets/ChemEng.sheet.in.h:22
+msgid "Gas Holder, basic"
+msgstr "Gas Holder, basic"
+
+#: sheets/ChemEng.sheet.in.h:23
+msgid "Heating/Cooling Coil"
+msgstr "Heating/Cooling Coil"
+
+#: sheets/ChemEng.sheet.in.h:24
+msgid "Heating/Cooling Coil, vertical"
+msgstr "Heating/Cooling Coil, vertical"
+
+#: sheets/ChemEng.sheet.in.h:25
+msgid "Induced-Flow Air Cooler"
+msgstr "Induced-Flow Air Cooler"
+
+#: sheets/ChemEng.sheet.in.h:26
+msgid "Kettle Reboiler"
+msgstr "Kettle Reboiler"
+
+#: sheets/ChemEng.sheet.in.h:27
+msgid "Knock-out Drum (with demister pad)"
+msgstr "Knock-out Drum (with demister pad)"
+
+#: sheets/ChemEng.sheet.in.h:28
+msgid "Measurement"
+msgstr "測定器"
+
+#: sheets/ChemEng.sheet.in.h:29
+msgid "Mixer"
+msgstr "ミキサ"
+
+#: sheets/ChemEng.sheet.in.h:30
+msgid "Open Tank"
+msgstr "タンクを開く"
+
+#: sheets/ChemEng.sheet.in.h:31
+msgid "Plate Exchanger"
+msgstr "プレート・エクスチェンジャ"
+
+#: sheets/ChemEng.sheet.in.h:32
+msgid "Pneumatic Line"
+msgstr "空気圧管路"
+
+#: sheets/ChemEng.sheet.in.h:33
+msgid "Pneumatic Line, vertical"
+msgstr "空気圧管路 (垂直)"
+
+#: sheets/ChemEng.sheet.in.h:34
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr "Positive Displacement Rotary Pump or Compressor"
+
+#: sheets/ChemEng.sheet.in.h:35
+msgid "Reactor or Absorption Vessel, simple"
+msgstr "Reactor or Absorption Vessel, simple"
+
+#: sheets/ChemEng.sheet.in.h:36
+msgid "Reciprocating Compressor or Pump"
+msgstr "Reciprocating Compressor or Pump"
+
+#: sheets/ChemEng.sheet.in.h:37
+msgid "Regulable Valve"
+msgstr "調整可能なバルブ"
+
+#: sheets/ChemEng.sheet.in.h:38
+msgid "Regulable Valve, vertical"
+msgstr "調整可能なバルブ (垂直)"
+
+#: sheets/ChemEng.sheet.in.h:39
+msgid "Sealed Tank"
+msgstr "タンクをふさぐ"
+
+#: sheets/ChemEng.sheet.in.h:40
+msgid "Simple Furnace"
+msgstr "シンプルな炉"
+
+#: sheets/ChemEng.sheet.in.h:41
+msgid "Simple Heat Exchanger"
+msgstr "シンプルなヒート・エクスチェンジャ"
+
+#: sheets/ChemEng.sheet.in.h:42
+msgid "Simple Heat Exchanger, vertical"
+msgstr "シンプルなヒート・エクスチェンジャ (垂直)"
+
+#: sheets/ChemEng.sheet.in.h:43
+msgid "Simple Vessel"
+msgstr "シンプルなベセル"
+
+#: sheets/ChemEng.sheet.in.h:44
+msgid "Spray Drier"
+msgstr "スプレー式ドライヤ"
+
+#: sheets/ChemEng.sheet.in.h:45
+msgid "Spraying Device"
+msgstr "スプレー式デバイス"
+
+#: sheets/ChemEng.sheet.in.h:46
+msgid "Storage Sphere"
+msgstr "ストレージ領域"
+
+#: sheets/ChemEng.sheet.in.h:47
+msgid "Tank with Fixed Roof"
+msgstr "Tank with Fixed Roof"
+
+#: sheets/ChemEng.sheet.in.h:48
+msgid "Tank with Floating Roof"
+msgstr "Tank with Floating Roof"
+
+#: sheets/ChemEng.sheet.in.h:49
+msgid "Tray Column, detailed"
+msgstr "Tray Column, detailed"
+
+#: sheets/ChemEng.sheet.in.h:50
+msgid "Tray Column, simple"
+msgstr "Tray Column, simple"
+
+#: sheets/ChemEng.sheet.in.h:51
+msgid "Valve"
+msgstr "バルブ"
+
+#: sheets/ChemEng.sheet.in.h:52
+msgid "Valve, vertical"
+msgstr "バルブ (垂直)"
+
+#: sheets/ChemEng.sheet.in.h:53
+msgid "Water Cooler"
+msgstr "水冷式クーラー"
+
+#: sheets/ChemEng.sheet.in.h:54
+msgid "Water Cooler, vertical"
+msgstr "水冷式クーラー (垂直)"
+
 #: sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
 msgstr "回路"
@@ -5089,63 +5665,67 @@ msgstr "マイクロフォン"
 msgid "NMOS transistor"
 msgstr "NMOS トランジスタ"
 
-#: sheets/Circuit.sheet.in.h:18
+#.
+#.
+#: sheets/Circuit.sheet.in.h:20
 msgid "NPN bipolar transistor"
 msgstr "NPN 接合バイポーラトランジスタ"
 
-#: sheets/Circuit.sheet.in.h:19
+#: sheets/Circuit.sheet.in.h:21
 msgid "Operational amplifier"
 msgstr "オペアンプ"
 
-#: sheets/Circuit.sheet.in.h:20
+#: sheets/Circuit.sheet.in.h:22
 msgid "PMOS transistor"
 msgstr "PMOS トランジスタ"
 
-#: sheets/Circuit.sheet.in.h:21
+#.
+#.
+#: sheets/Circuit.sheet.in.h:25
 msgid "PNP bipolar transistor"
 msgstr "PNP 接合バイポーラトランジスタ"
 
-#: sheets/Circuit.sheet.in.h:22 sheets/ciscomisc.sheet.in.h:39
+#: sheets/Circuit.sheet.in.h:26 sheets/ciscomisc.sheet.in.h:39
 msgid "Speaker"
 msgstr "スピーカ"
 
-#: sheets/Circuit.sheet.in.h:23
+#: sheets/Circuit.sheet.in.h:27
 msgid "Vertically aligned LED"
 msgstr "LED (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:24
+#: sheets/Circuit.sheet.in.h:28
 msgid "Vertically aligned capacitor"
 msgstr "コンデンサ (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:25
+#: sheets/Circuit.sheet.in.h:29
 msgid "Vertically aligned diode"
 msgstr "ダイオード (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:26
+#: sheets/Circuit.sheet.in.h:30
 msgid "Vertically aligned fuse"
 msgstr "ヒューズ (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:27
+#: sheets/Circuit.sheet.in.h:31
 msgid "Vertically aligned inductor"
 msgstr "インダクタ (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:28
+#: sheets/Circuit.sheet.in.h:32
 msgid "Vertically aligned inductor (European)"
 msgstr "ヨーロッパ式のインダクタ (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:29
+#: sheets/Circuit.sheet.in.h:33
 msgid "Vertically aligned powersource"
 msgstr "電源 (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:30
+#: sheets/Circuit.sheet.in.h:34
 msgid "Vertically aligned resistor"
 msgstr "抵抗 (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:31
+#: sheets/Circuit.sheet.in.h:35
 msgid "Vertically aligned resistor (European)"
 msgstr "ヨーロッパ式の抵抗 (縦向き)"
 
-#: sheets/Circuit.sheet.in.h:32
+#: sheets/Circuit.sheet.in.h:36
 msgid "Vertically aligned zener diode"
 msgstr "定電圧ダイオード (縦向き)"
 
@@ -5453,115 +6033,118 @@ msgstr "関数呼びだし"
 msgid "Orthogonal polyline flow"
 msgstr "直角連続線のフロー"
 
-#: sheets/Flowchart.sheet.in.h:1
+#. XXX
+#: sheets/Flowchart.sheet.in.h:2
 msgid "Collate"
 msgstr "照合"
 
-#: sheets/Flowchart.sheet.in.h:2
+#: sheets/Flowchart.sheet.in.h:3
 msgid "Connector"
 msgstr "接続子"
 
-#: sheets/Flowchart.sheet.in.h:3 sheets/SDL.sheet.in.h:4
+#: sheets/Flowchart.sheet.in.h:4 sheets/SDL.sheet.in.h:4
 msgid "Decision"
 msgstr "判断"
 
-#: sheets/Flowchart.sheet.in.h:4
+#: sheets/Flowchart.sheet.in.h:5
 msgid "Delay"
 msgstr "遅延"
 
-#: sheets/Flowchart.sheet.in.h:6
+#: sheets/Flowchart.sheet.in.h:7
 msgid "Document"
 msgstr "文書"
 
-#: sheets/Flowchart.sheet.in.h:8
+#: sheets/Flowchart.sheet.in.h:9
 msgid "Flowchart"
 msgstr "フローチャート"
 
-#: sheets/Flowchart.sheet.in.h:9
+#: sheets/Flowchart.sheet.in.h:10
 msgid "Input/Output"
 msgstr "入出力装置"
 
-#: sheets/Flowchart.sheet.in.h:10
+#: sheets/Flowchart.sheet.in.h:11
 msgid "Internal storage"
 msgstr "主記憶装置"
 
-#: sheets/Flowchart.sheet.in.h:11
+#: sheets/Flowchart.sheet.in.h:12
 msgid "Magnetic disk"
 msgstr "磁気ディスク"
 
-#: sheets/Flowchart.sheet.in.h:12
+#: sheets/Flowchart.sheet.in.h:13
 msgid "Magnetic drum"
 msgstr "磁気ドラム"
 
-#: sheets/Flowchart.sheet.in.h:13
+#: sheets/Flowchart.sheet.in.h:14
 msgid "Magnetic tape"
 msgstr "磁気テープ"
 
-#: sheets/Flowchart.sheet.in.h:14
+#: sheets/Flowchart.sheet.in.h:15
 msgid "Manual input"
 msgstr "手動入力"
 
-#: sheets/Flowchart.sheet.in.h:15
+#: sheets/Flowchart.sheet.in.h:16
 msgid "Manual operation"
 msgstr "手動操作"
 
-#: sheets/Flowchart.sheet.in.h:16
+#: sheets/Flowchart.sheet.in.h:17
 msgid "Merge"
 msgstr "融合"
 
-#: sheets/Flowchart.sheet.in.h:17
+#: sheets/Flowchart.sheet.in.h:18
 msgid "Objects to draw flowcharts"
 msgstr "フローチャートを描画するためのオブジェクト"
 
-#: sheets/Flowchart.sheet.in.h:18
+#. XXX
+#: sheets/Flowchart.sheet.in.h:20
 msgid "Off page connector"
 msgstr "オフページ・コネクタ"
 
-#: sheets/Flowchart.sheet.in.h:19
+#: sheets/Flowchart.sheet.in.h:21
 msgid "Offline storage"
 msgstr "オフライン・ストレージ"
 
-#: sheets/Flowchart.sheet.in.h:20
+#: sheets/Flowchart.sheet.in.h:22
 msgid "Or"
 msgstr "論理和"
 
-#: sheets/Flowchart.sheet.in.h:21
+#: sheets/Flowchart.sheet.in.h:23
 msgid "Predefined process"
 msgstr "定義済み処理"
 
-#: sheets/Flowchart.sheet.in.h:22
+#: sheets/Flowchart.sheet.in.h:24
 msgid "Preparation"
 msgstr "準備"
 
-#: sheets/Flowchart.sheet.in.h:23
+#: sheets/Flowchart.sheet.in.h:25
 msgid "Process/Auxiliary Operation"
 msgstr "処理"
 
-#: sheets/Flowchart.sheet.in.h:24
+#: sheets/Flowchart.sheet.in.h:26
 msgid "Punched card"
 msgstr "パンチ・カード"
 
-#: sheets/Flowchart.sheet.in.h:25
+#: sheets/Flowchart.sheet.in.h:27
 msgid "Punched tape"
 msgstr "パンチ・テープ"
 
-#: sheets/Flowchart.sheet.in.h:26
+#: sheets/Flowchart.sheet.in.h:28
 msgid "Sort"
 msgstr "ソート"
 
-#: sheets/Flowchart.sheet.in.h:27
+#. XXX
+#: sheets/Flowchart.sheet.in.h:30
 msgid "Summing junction"
 msgstr "評価の分岐"
 
-#: sheets/Flowchart.sheet.in.h:28
+#: sheets/Flowchart.sheet.in.h:31
 msgid "Terminal Interrupt"
 msgstr "端子"
 
-#: sheets/Flowchart.sheet.in.h:29
+#: sheets/Flowchart.sheet.in.h:32
 msgid "Transaction file"
 msgstr "処理ファイル"
 
-#: sheets/Flowchart.sheet.in.h:30
+#: sheets/Flowchart.sheet.in.h:33
 msgid "Transmittal tape"
 msgstr "伝送テープ"
 
@@ -5661,50 +6244,244 @@ msgstr "工場"
 msgid "Footbridge, Pedestrian Bridge"
 msgstr "歩道橋"
 
-#: sheets/IsometricMap.sheet.in.h:16
+#. use dc:description instead?
+#: sheets/IsometricMap.sheet.in.h:17
 msgid "Isometric Directional Map Shapes"
 msgstr "Isometric Directional Map のシェイプ"
 
-#: sheets/IsometricMap.sheet.in.h:17
+#: sheets/IsometricMap.sheet.in.h:18
 msgid "Long Straight Road Section"
 msgstr "直線"
 
-#: sheets/IsometricMap.sheet.in.h:18
+#. use dc:title instead?
+#: sheets/IsometricMap.sheet.in.h:20
 msgid "Map, Isometric"
 msgstr "地図 (Isometric)"
 
-#: sheets/IsometricMap.sheet.in.h:19
+#: sheets/IsometricMap.sheet.in.h:21
 msgid "One Way Road Sign"
 msgstr "一方通行"
 
-#: sheets/IsometricMap.sheet.in.h:20
+#: sheets/IsometricMap.sheet.in.h:22
 msgid "River"
 msgstr "川"
 
-#: sheets/IsometricMap.sheet.in.h:21
+#: sheets/IsometricMap.sheet.in.h:23
 msgid "Road Section"
 msgstr "道路"
 
-#: sheets/IsometricMap.sheet.in.h:22
+#: sheets/IsometricMap.sheet.in.h:24
 msgid "Roof1"
 msgstr "屋根１"
 
-#: sheets/IsometricMap.sheet.in.h:23
+#: sheets/IsometricMap.sheet.in.h:25
 msgid "T-Junction"
 msgstr "三差路 (Ｔ字)"
 
-#: sheets/IsometricMap.sheet.in.h:24
+#: sheets/IsometricMap.sheet.in.h:26
 msgid "Train 1, angled downward"
 msgstr "電車１ (下り)"
 
-#: sheets/IsometricMap.sheet.in.h:25
+#: sheets/IsometricMap.sheet.in.h:27
 msgid "Train 2, angled upward"
 msgstr "電車１ (上り)"
 
-#: sheets/IsometricMap.sheet.in.h:26
+#: sheets/IsometricMap.sheet.in.h:28
 msgid "Tree 1"
 msgstr "木１"
 
+#: sheets/Istar.sheet.in.h:1
+msgid "An i* agent"
+msgstr "An i* agent"
+
+#: sheets/Istar.sheet.in.h:2
+msgid "An i* decomposition link"
+msgstr "An i* decomposition link"
+
+#: sheets/Istar.sheet.in.h:3
+msgid "An i* dependency link"
+msgstr "An i* dependency link"
+
+#: sheets/Istar.sheet.in.h:4
+msgid "An i* goal"
+msgstr "An i* goal"
+
+#: sheets/Istar.sheet.in.h:5
+msgid "An i* means-ends link"
+msgstr "An i* means-ends link"
+
+#: sheets/Istar.sheet.in.h:6
+msgid "An i* negative contribution"
+msgstr "An i* negative contribution"
+
+#: sheets/Istar.sheet.in.h:7
+msgid "An i* position"
+msgstr "An i* position"
+
+#: sheets/Istar.sheet.in.h:8
+msgid "An i* positive contribution"
+msgstr "An i* positive contribution"
+
+#: sheets/Istar.sheet.in.h:9
+msgid "An i* resource"
+msgstr "An i* resource"
+
+#: sheets/Istar.sheet.in.h:10
+msgid "An i* role"
+msgstr "An i* role"
+
+#: sheets/Istar.sheet.in.h:11
+msgid "An i* softgoal"
+msgstr "An i* softgoal"
+
+#: sheets/Istar.sheet.in.h:12
+msgid "An i* task"
+msgstr "An i* task"
+
+#: sheets/Istar.sheet.in.h:13
+msgid "An i* unspecified actor"
+msgstr "An i* unspecified actor"
+
+#: sheets/Istar.sheet.in.h:14
+msgid "An i* unspecified link"
+msgstr "An i* unspecified link"
+
+#: sheets/Istar.sheet.in.h:15
+msgid "Objects to design i* diagrams"
+msgstr "i* ダイアグラムを設計するためのオブジェクト"
+
+#: sheets/Istar.sheet.in.h:16
+msgid "RE-i*"
+msgstr "RE-i*"
+
+#: sheets/Jackson.sheet.in.h:1
+msgid "A Jackson designed domain"
+msgstr "Jackson 設計ドメイン"
+
+#: sheets/Jackson.sheet.in.h:2
+msgid "A Jackson given domain"
+msgstr "A Jackson 指定ドメイン"
+
+#: sheets/Jackson.sheet.in.h:3
+msgid "A Jackson machine domain"
+msgstr "Jackson マシン・ドメイン"
+
+#: sheets/Jackson.sheet.in.h:4
+msgid "A Jackson requirement"
+msgstr "A Jackson requirement"
+
+#: sheets/Jackson.sheet.in.h:5
+msgid "A Jackson requirement phenomenon"
+msgstr "A Jackson requirement phenomenon"
+
+#: sheets/Jackson.sheet.in.h:6
+msgid "A Jackson shared phenomenon"
+msgstr "A Jackson shared phenomenon"
+
+#: sheets/Jackson.sheet.in.h:7
+msgid "Objects to design Jacskon diagrams"
+msgstr "Jackson ダイアグラムを設計するためのオブジェクト"
+
+#: sheets/Jackson.sheet.in.h:8
+msgid "RE-Jackson"
+msgstr "RE-Jackson"
+
+#: sheets/KAOS.sheet.in.h:1
+msgid "A KAOS AND refinement"
+msgstr "A KAOS AND refinement"
+
+#: sheets/KAOS.sheet.in.h:2
+msgid "A KAOS OR refinement"
+msgstr "A KAOS OR refinement"
+
+#: sheets/KAOS.sheet.in.h:3
+msgid "A KAOS agent"
+msgstr "KAOS エージェント"
+
+#: sheets/KAOS.sheet.in.h:4
+msgid "A KAOS assumption"
+msgstr "KAOS 仮定"
+
+#: sheets/KAOS.sheet.in.h:5
+msgid "A KAOS binary conflict"
+msgstr "KAOS バイナリ衝突"
+
+#: sheets/KAOS.sheet.in.h:6
+msgid "A KAOS capable-of"
+msgstr "KAOS capable-of"
+
+#: sheets/KAOS.sheet.in.h:7
+msgid "A KAOS complete AND refinement"
+msgstr "KAOS complete AND refinement"
+
+#: sheets/KAOS.sheet.in.h:8
+msgid "A KAOS complete OR refinement"
+msgstr "KAOS complete OR refinement"
+
+#: sheets/KAOS.sheet.in.h:9
+msgid "A KAOS contribution"
+msgstr "KAOS contribution"
+
+#: sheets/KAOS.sheet.in.h:10
+msgid "A KAOS control link"
+msgstr "KAOS control link"
+
+#: sheets/KAOS.sheet.in.h:11
+msgid "A KAOS goal"
+msgstr "KAOS ゴール"
+
+#: sheets/KAOS.sheet.in.h:12
+msgid "A KAOS input"
+msgstr "AOS 入力"
+
+#: sheets/KAOS.sheet.in.h:13
+msgid "A KAOS monitor link"
+msgstr "KAOS リンクの監視"
+
+#: sheets/KAOS.sheet.in.h:14
+msgid "A KAOS obstacle"
+msgstr "KAOS 障害"
+
+#: sheets/KAOS.sheet.in.h:15
+msgid "A KAOS obstruction"
+msgstr "KAOS 障害物"
+
+#: sheets/KAOS.sheet.in.h:16
+msgid "A KAOS operation"
+msgstr "KAOS オペレーション"
+
+#: sheets/KAOS.sheet.in.h:17
+msgid "A KAOS operationalization"
+msgstr "KAOS operationalization"
+
+#: sheets/KAOS.sheet.in.h:18
+msgid "A KAOS output"
+msgstr "KAOS 出力"
+
+#: sheets/KAOS.sheet.in.h:19
+msgid "A KAOS performs"
+msgstr "KAOS 実行"
+
+#: sheets/KAOS.sheet.in.h:20
+msgid "A KAOS requirement"
+msgstr "KAOS 条件"
+
+#: sheets/KAOS.sheet.in.h:21
+msgid "A KAOS responsibility"
+msgstr "KAOS 責任"
+
+#: sheets/KAOS.sheet.in.h:22
+msgid "A KAOS softgoal"
+msgstr "KAOS ソフトゴール"
+
+#: sheets/KAOS.sheet.in.h:23
+msgid "Objects to design KAOS diagrams"
+msgstr "KAOS ダイアグラムを設計するためのオブジェクト"
+
+#: sheets/KAOS.sheet.in.h:24
+msgid "RE-KAOS"
+msgstr "RE-KAOS"
+
 #: sheets/Logic.sheet.in.h:1
 msgid "AND gate"
 msgstr "AND ゲート"
@@ -5883,7 +6660,7 @@ msgstr "気圧のソース"
 
 #: sheets/Pneumatic.sheet.in.h:23
 msgid "Pneumatic/Hydraulic"
-msgstr "気学/水力学"
+msgstr "気学と水力学"
 
 #: sheets/Pneumatic.sheet.in.h:24
 msgid "Push-button command"
@@ -5993,10 +6770,6 @@ msgstr "コンポーネント"
 msgid "Constraint, place a constraint on something"
 msgstr "制約"
 
-#: sheets/UML.sheet.in.h:10
-msgid "Dependency"
-msgstr "依存関係"
-
 #: sheets/UML.sheet.in.h:11
 msgid "Editor for UML Static Structure Diagrams"
 msgstr "UML Static 構造体ダイアグラムのエディタ"
@@ -6037,6 +6810,10 @@ msgstr "ノード"
 msgid "Note"
 msgstr "注意"
 
+#: sheets/UML.sheet.in.h:24
+msgid "Object"
+msgstr "オブジェクト名"
+
 #: sheets/UML.sheet.in.h:25
 msgid "Realizes, implements a specific interface"
 msgstr "特定のインタフェースの具現化と実装"
@@ -7166,146 +7943,158 @@ msgid "Pieces of a jigsaw"
 msgstr "ジグゾーのピース"
 
 #: sheets/network.sheet.in.h:1
-msgid "3 1/2 inch diskette"
-msgstr "3.5 インチ ディスク"
+msgid "24 Port Patch Panel"
+msgstr "24 ポート・パッチ・パネル"
 
 #: sheets/network.sheet.in.h:2
+msgid "3 1/2 inch diskette"
+msgstr "3.5 インチ・ディスク"
+
+#: sheets/network.sheet.in.h:3
 msgid "ATM switch symbol"
 msgstr "ATM スイッチの記号"
 
-#: sheets/network.sheet.in.h:3
+#: sheets/network.sheet.in.h:4
 msgid "Antenna for wireless transmission"
 msgstr "無線アンテナ"
 
-#: sheets/network.sheet.in.h:4
+#: sheets/network.sheet.in.h:5
 msgid "Bigtower PC"
 msgstr "PC (フルタワー)"
 
-#: sheets/network.sheet.in.h:5
+#: sheets/network.sheet.in.h:6
 msgid "Computer"
 msgstr "コンピュータ"
 
-#: sheets/network.sheet.in.h:6
+#: sheets/network.sheet.in.h:7
 msgid "Desktop PC"
 msgstr "PC (デスクトップ)"
 
-#: sheets/network.sheet.in.h:7
+#: sheets/network.sheet.in.h:8
 msgid "Digitizing board"
 msgstr "ディジタイザ"
 
-#: sheets/network.sheet.in.h:8
+#: sheets/network.sheet.in.h:9
 msgid "Ethernet bus"
 msgstr "イーサネット・バス"
 
-#: sheets/network.sheet.in.h:9
+#: sheets/network.sheet.in.h:10
 msgid "External DAT drive"
 msgstr "外部 DAT ドライブ"
 
-#: sheets/network.sheet.in.h:10
+#: sheets/network.sheet.in.h:11
 msgid "Firewall router"
 msgstr "ファイアウォールのルータ"
 
-#: sheets/network.sheet.in.h:11
+#: sheets/network.sheet.in.h:12
 msgid "Laptop PC"
 msgstr "PC (ラップトップ)"
 
-#: sheets/network.sheet.in.h:12
+#: sheets/network.sheet.in.h:13
 msgid "Miditower PC"
 msgstr "PC (ミドルタワー)"
 
-#: sheets/network.sheet.in.h:13
+#: sheets/network.sheet.in.h:14
 msgid "Minitower PC"
 msgstr "PC (ミニタワー)"
 
-#: sheets/network.sheet.in.h:14
+#: sheets/network.sheet.in.h:15
 msgid "Mobile phone"
 msgstr "携帯電話"
 
-#: sheets/network.sheet.in.h:15
+#: sheets/network.sheet.in.h:16
+msgid "Mobile telephony base station"
+msgstr "携帯電話ベース・ステーション"
+
+#: sheets/network.sheet.in.h:17
+msgid "Mobile telephony cell"
+msgstr "携帯電話セル"
+
+#: sheets/network.sheet.in.h:18
 msgid "Modular switching system"
 msgstr "モジューラ式スイッチング・システム"
 
-#: sheets/network.sheet.in.h:16
+#: sheets/network.sheet.in.h:19
 msgid "Monitor"
 msgstr "モニタ"
 
-#: sheets/network.sheet.in.h:17
+#: sheets/network.sheet.in.h:20
 msgid "Network"
 msgstr "ネットワーク"
 
-#: sheets/network.sheet.in.h:18
+#: sheets/network.sheet.in.h:21
 msgid "Network cloud"
 msgstr "ネットワーク網"
 
-#: sheets/network.sheet.in.h:19
+#: sheets/network.sheet.in.h:22
 msgid "Objects to design network diagrams with"
 msgstr "ネットワーク構成をデザインするためのオブジェクト"
 
-#: sheets/network.sheet.in.h:20
+#: sheets/network.sheet.in.h:23
 msgid "Plotter"
 msgstr "プロッタ"
 
-#: sheets/network.sheet.in.h:21
+#: sheets/network.sheet.in.h:24
 msgid "RJ45 wall-plug"
 msgstr "RJ45 (壁差し型)"
 
-#: sheets/network.sheet.in.h:22
+#: sheets/network.sheet.in.h:25
 msgid "Router symbol"
 msgstr "ルータの記号"
 
-#: sheets/network.sheet.in.h:23
+#: sheets/network.sheet.in.h:26
 msgid "Simple modem"
 msgstr "モデム"
 
-#: sheets/network.sheet.in.h:24
+#: sheets/network.sheet.in.h:27
 msgid "Simple printer"
 msgstr "プリンタ"
 
-#: sheets/network.sheet.in.h:25
+#: sheets/network.sheet.in.h:28
 msgid "Speaker with integrated amplifier"
 msgstr "アンプ付きスピーカー"
 
-#: sheets/network.sheet.in.h:26
+#: sheets/network.sheet.in.h:29
 msgid "Speaker without amplifier"
 msgstr "アンプ無しスピーカー"
 
-#: sheets/network.sheet.in.h:27
+#: sheets/network.sheet.in.h:30
 msgid "Stackable hub or switch"
 msgstr "棚型のハブ/スイッチ"
 
-#: sheets/network.sheet.in.h:28
+#: sheets/network.sheet.in.h:31
 msgid "Storage"
 msgstr "記憶装置"
 
-#: sheets/network.sheet.in.h:29
+#: sheets/network.sheet.in.h:32
 msgid "Switch symbol"
 msgstr "スイッチの記号"
 
-#: sheets/network.sheet.in.h:30
+#: sheets/network.sheet.in.h:33
 msgid "Telephone"
 msgstr "電話"
 
-#: sheets/network.sheet.in.h:31
+#: sheets/network.sheet.in.h:34
 msgid "UNIX workstation"
 msgstr "UNIX ワークステーション"
 
-#: sheets/network.sheet.in.h:32
+#: sheets/network.sheet.in.h:35
 msgid "WAN connection"
 msgstr "WAN 接続"
 
-#: sheets/network.sheet.in.h:33
+#: sheets/network.sheet.in.h:36
 msgid "WAN link"
 msgstr "WAN リンク"
 
-#: sheets/network.sheet.in.h:34
+#: sheets/network.sheet.in.h:37
 msgid "Wall-plug for the scEAD cabling system"
 msgstr "壁差し型の scED ケーブル・システム"
 
-#: sheets/network.sheet.in.h:35
+#: sheets/network.sheet.in.h:38
 msgid "Workstation monitor"
 msgstr "ワークステーションのモニタ"
 
-#: sheets/network.sheet.in.h:36
+#: sheets/network.sheet.in.h:39
 msgid "ZIP disk"
 msgstr "ZIP ディスク"
 

--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,108 +7,110 @@
 # Afonso Celso Medina <[e-mail]>, 2004
 # 
 # 
+#: app/sheets.c:453
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.92.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-24 19:10+0200\n"
-"PO-Revision-Date: 2004-06-29 11:37-0300\n"
+"POT-Creation-Date: 2004-07-12 16:16-0400\n"
+"PO-Revision-Date: 2004-07-08 19:18-0300\n"
 "Last-Translator: Afonso Celso Medina <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: app/app_procs.c:220
+#: app/app_procs.c:219
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "erro %s: não é possível exportar para %s\n"
 
-#: app/app_procs.c:230
+#: app/app_procs.c:228
 #, c-format
 msgid "%s error: input and output file name is identical: %s"
-msgstr "erro %s: nomes dos arquivos de entrada e saida são idênticos: %s"
+msgstr "erro %s: os nomes dos arquivos de entrada e saida são idênticos: %s"
 
-#: app/app_procs.c:238
+#: app/app_procs.c:235
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "erro %s: é necessário um arquivo de entrada válido %s\n"
 
 #. if (!quiet)
-#: app/app_procs.c:258
+#: app/app_procs.c:255
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: app/app_procs.c:306
+#: app/app_procs.c:303
 #, c-format
 msgid "Can't find output format %s\n"
-msgstr "Não é possível localizar formato de saída %s\n"
+msgstr "Impossível localizar o formato de saída %s\n"
 
 #. Translators:  The argument is a list of options, not to be translated
-#: app/app_procs.c:393
+#: app/app_procs.c:390
 #, c-format
 msgid "Export to file format and exit.  Supported formats are: %s"
-msgstr "Exportar para formato do arquivo e sair. Os formatos suportados são: %s"
+msgstr ""
+"Exportar para formato do arquivo e sair. Os formatos suportados são: %s"
 
 #. &export_file_name
-#: app/app_procs.c:402
+#: app/app_procs.c:399
 msgid "Export loaded file and exit"
 msgstr "Exportar o arquivo carregado e sair"
 
-#: app/app_procs.c:402 app/diaconv.c:94
+#: app/app_procs.c:399 app/diaconv.c:94
 msgid "OUTPUT"
 msgstr "SAÍDA"
 
 #. &export_file_format
-#: app/app_procs.c:404
+#: app/app_procs.c:401
 msgid "FORMAT"
 msgstr "FORMATO"
 
-#: app/app_procs.c:407
+#: app/app_procs.c:404
 msgid "Export graphics size"
 msgstr "Tamanho do gráfico exportado"
 
-#: app/app_procs.c:407
+#: app/app_procs.c:404
 msgid "WxH"
 msgstr "LxA"
 
-#: app/app_procs.c:409
+#: app/app_procs.c:406
 msgid "Don't show the splash screen"
 msgstr "Não mostrar a tela de abertura"
 
-#: app/app_procs.c:411
+#: app/app_procs.c:408
 msgid "Send error messages to stderr instead of showing dialogs."
-msgstr "Enviar mensagens de erro pra stderr invés de mostrar diálogos."
+msgstr "Enviar mensagens de erro pra stderr ao contrário de mostrar diálogos."
 
-#: app/app_procs.c:413
+#: app/app_procs.c:410
 msgid "Display credits list and exit"
 msgstr "Mostrar lista de créditos e sair"
 
-#: app/app_procs.c:415
+#: app/app_procs.c:412
 msgid "Display version and exit"
 msgstr "Mostrar versão e sair"
 
-#: app/app_procs.c:417 app/diaconv.c:95
+#: app/app_procs.c:413 app/diaconv.c:95
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: app/app_procs.c:456
+#: app/app_procs.c:454
 msgid "Can't connect to session manager!\n"
-msgstr "Não é possível conectar-se ao gerenciador de sessão!\n"
+msgstr "Não é possível se conectar ao gerenciador de sessão!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: app/app_procs.c:484
+#: app/app_procs.c:481
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia versão %s, compilado %s %s\n"
 
-#: app/app_procs.c:486
+#: app/app_procs.c:483
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia versão %s\n"
 
-#: app/app_procs.c:546 app/app_procs.c:548 app/diaconv.c:201 app/diaconv.c:203
+#: app/app_procs.c:537 app/app_procs.c:539 app/diaconv.c:201 app/diaconv.c:203
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs, exiting...\n"
@@ -116,11 +118,11 @@ msgstr ""
 "Não foi possível encontrar os objetos padrão ao procurar object-libs, "
 "saindo...\n"
 
-#: app/app_procs.c:589
+#: app/app_procs.c:580
 msgid "Diagram1.dia"
 msgstr "Diagrama1.dia"
 
-#: app/app_procs.c:628
+#: app/app_procs.c:619
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you can cause this message to appear.\n"
@@ -129,7 +131,7 @@ msgstr ""
 "bugzilla.gnome.org descrevendo a situação que gerou esta mensagem.\n"
 
 #. no standard buttons
-#: app/app_procs.c:640
+#: app/app_procs.c:631
 msgid ""
 "Modified diagrams exist.\n"
 "Are you sure you want to quit Dia\n"
@@ -139,22 +141,21 @@ msgstr ""
 "Tem certeza de que deseja sair do Dia\n"
 "sem salvá-los?"
 
-#: app/app_procs.c:644
+#: app/app_procs.c:635
 msgid "Quit Dia"
 msgstr "Sair do Dia"
 
 #. This printf seems to prevent a race condition with unrefs.
 #. Yuck.  -Lars
-#: app/app_procs.c:695
-#, c-format
+#: app/app_procs.c:686
 msgid "Thank you for using Dia.\n"
 msgstr "Obrigado por utilizar o Dia.\n"
 
-#: app/app_procs.c:711 app/app_procs.c:718
+#: app/app_procs.c:702 app/app_procs.c:709
 msgid "Could not create per-user Dia config directory"
 msgstr "Não foi possível criar o diretório de configuração pessoal do Dia"
 
-#: app/app_procs.c:720
+#: app/app_procs.c:711
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
@@ -163,15 +164,15 @@ msgstr ""
 "Certifique-se de que a variável de ambiente HOME aponta para um diretório "
 "existente."
 
-#: app/app_procs.c:742 app/diaconv.c:251
+#: app/app_procs.c:733 app/diaconv.c:251
 msgid "Objects and filters internal to dia"
 msgstr "Objetos e filtros internos do Dia"
 
-#: app/app_procs.c:781 app/diaconv.c:121
+#: app/app_procs.c:772 app/diaconv.c:121
 msgid "[OPTION...] [FILE...]"
 msgstr "[OPÇÃO...] [ARQUIVO...]"
 
-#: app/app_procs.c:785 app/diaconv.c:128
+#: app/app_procs.c:775 app/diaconv.c:128
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -180,6 +181,44 @@ msgstr ""
 "Erro na opção %s: %s.\n"
 "Execute '%s --help' para obter uma lista completa das opções disponíveis.\n"
 
+#: app/app_procs.c:860
+msgid ""
+"The original author of Dia was:\n"
+"\n"
+msgstr ""
+"O autor original do Dia foi:\n"
+"\n"
+
+#: app/app_procs.c:865
+msgid ""
+"\n"
+"The current maintainers of Dia are:\n"
+"\n"
+msgstr ""
+"\n"
+"Os mantenedores atuais do Dia são:\n"
+"\n"
+
+#: app/app_procs.c:870
+msgid ""
+"\n"
+"Other authors are:\n"
+"\n"
+msgstr ""
+"\n"
+"Os outros autores são:\n"
+"\n"
+
+#: app/app_procs.c:875
+msgid ""
+"\n"
+"Dia is documented by:\n"
+"\n"
+msgstr ""
+"\n"
+"O Dia é documentado por:\n"
+"\n"
+
 #: app/autosave.c:93
 msgid "Recovering autosaved diagrams"
 msgstr "Recuperando diagramas salvos automaticamente"
@@ -248,7 +287,7 @@ msgstr "Copyright (C) 1998-2002 The Free Software Foundation e os autores"
 #: app/commands.c:623
 msgid ""
 "Dia is a program for drawing structured diagrams.\n"
-"Please visit http://www.lysator.liu.se/~alla/dia for more information."
+"Please visit http://www.gnome.org/projects/dia for more information."
 msgstr ""
 "Dia é um programa para desenhar diagramas estruturados.\n"
 "Visite http://www.gnome.org/projects/dia/ para maiores informações."
@@ -268,8 +307,9 @@ msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
 msgstr "Mantenedores: Lars Clausen e Cyrille Chepelov"
 
 #: app/commands.c:715
-msgid "Please visit http://www.lysator.liu.se/~alla/dia for more information"
-msgstr "Por favor, visite http://www.gnome.org/projects/dia/ para mais informações"
+msgid "Please visit http://www.gnome.org/projects/dia for more information"
+msgstr ""
+"Por favor, visite http://www.gnome.org/projects/dia/ para mais informações"
 
 #: app/commands.c:720
 msgid "Contributors:"
@@ -287,52 +327,61 @@ msgstr "Este objeto não tem valores padrão."
 msgid "Defaults: "
 msgstr "Padrões: "
 
-#: app/dia-props.c:75
+#: app/dia-props.c:89
 msgid "Diagram Properties"
 msgstr "Propriedades do Diagrama"
 
-#: app/dia-props.c:110
+#: app/dia-props.c:123
 msgid "Dynamic grid"
 msgstr "Grade dinâmica"
 
-#: app/dia-props.c:118
+#: app/dia-props.c:131
 msgid "x"
 msgstr "x"
 
-#: app/dia-props.c:122
+#: app/dia-props.c:135
 msgid "y"
 msgstr "y"
 
-#: app/dia-props.c:127
+#: app/dia-props.c:140
 msgid "Spacing"
 msgstr "Espaçamento"
 
-#: app/dia-props.c:147
+#: app/dia-props.c:160
 msgid "Visible spacing"
 msgstr "Espaçamento visível"
 
-#: app/dia-props.c:167
+#. Hexes!
+#: app/dia-props.c:181 app/preferences.c:162
+msgid "Hex grid"
+msgstr "Grade Hexagonal"
+
+#: app/dia-props.c:189
+msgid "Hex grid size"
+msgstr "Tamanho da grade hexagonal"
+
+#: app/dia-props.c:202
 msgid "Grid"
 msgstr "Grade"
 
-#: app/dia-props.c:178 lib/diagramdata.c:124
+#: app/dia-props.c:213 lib/diagramdata.c:127
 msgid "Background"
 msgstr "Segundo Plano"
 
-#: app/dia-props.c:189 app/preferences.c:105
+#: app/dia-props.c:224 app/preferences.c:105
 msgid "Grid Lines"
 msgstr "Linhas de Grade"
 
-#: app/dia-props.c:200
+#: app/dia-props.c:235
 msgid "Page Breaks"
 msgstr "Quebras de página"
 
-#: app/dia-props.c:211
+#: app/dia-props.c:246
 msgid "Colors"
 msgstr "Cores"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: app/dia-props.c:230
+#: app/dia-props.c:265
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "Propriedades do Diagrama: %s"
@@ -347,7 +396,7 @@ msgstr "Posição X"
 
 #: app/diacanvas.c:122
 msgid "X position of child widget"
-msgstr "Posição X do dispositivo filho"
+msgstr "Posição X do componente filho"
 
 #: app/diacanvas.c:131
 msgid "Y position"
@@ -355,7 +404,7 @@ msgstr "Posição Y"
 
 #: app/diacanvas.c:132
 msgid "Y position of child widget"
-msgstr "Posição Y do dispositivo filho"
+msgstr "Posição Y do componente filho"
 
 #. &export_file_format
 #: app/diaconv.c:92
@@ -495,11 +544,11 @@ msgstr "/_Esconder este tipo"
 
 #: app/diagram_tree_window.c:76
 msgid "Diagram tree"
-msgstr "Árvore do diagrama"
+msgstr "Árvore dos diagramas"
 
 #: app/dialogs.c:51
 msgid "Ok"
-msgstr "OK"
+msgstr "Ok"
 
 #: app/dialogs.c:52 app/layer_dialog.c:1006 app/paginate_psprint.c:275
 #: lib/diaarrowchooser.c:257
@@ -563,19 +612,19 @@ msgstr "%0.3gcm x %0.3gcm"
 msgid "Page Setup"
 msgstr "Configurar página"
 
-#: app/disp_callbacks.c:81 app/properties.c:153
+#: app/disp_callbacks.c:81 app/properties.c:152
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
 msgstr ""
 "Este objeto não suporta a função Desfazer/Refazer.\n"
-"Informação para desfazer apagada."
+"Informação para desfazer removida."
 
 #: app/disp_callbacks.c:116
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: app/disp_callbacks.c:908
+#: app/disp_callbacks.c:904
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -608,8 +657,8 @@ msgstr "Fechar o Diagrama"
 msgid "Discard Changes"
 msgstr "Descartar as Alterações"
 
-#: app/export_png.c:134 app/load_save.c:890 app/render_eps.c:103
-#: plug-ins/cairo/diacairo.c:908 plug-ins/cgm/cgm.c:1157
+#: app/export_png.c:134 app/load_save.c:893 app/render_eps.c:103
+#: plug-ins/cairo/diacairo.c:913 plug-ins/cgm/cgm.c:1157
 #: plug-ins/dxf/dxf-export.c:505 plug-ins/hpgl/hpgl.c:732
 #: plug-ins/metapost/render_metapost.c:964
 #: plug-ins/pstricks/render_pstricks.c:800 plug-ins/shape/shape-export.c:135
@@ -617,7 +666,7 @@ msgstr "Descartar as Alterações"
 #: plug-ins/xfig/xfig-export.c:1100 plug-ins/xslt/xslt.c:94
 #, c-format
 msgid "Can't open output file %s: %s\n"
-msgstr "Impossível abrir o arquivo de saída%s: %s\n"
+msgstr "Impossível abrir o arquivo de saída %s: %s\n"
 
 #: app/export_png.c:142
 msgid "Could not create PNG write structure"
@@ -654,23 +703,23 @@ msgstr "Altura da imagem:"
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: app/filedlg.c:121 app/filedlg.c:392
+#: app/filedlg.c:122 app/filedlg.c:393
 msgid "By extension"
 msgstr "Por extensão"
 
-#: app/filedlg.c:182
+#: app/filedlg.c:183
 msgid "Open Diagram"
 msgstr "Abrir Diagrama"
 
-#: app/filedlg.c:210
+#: app/filedlg.c:211
 msgid "Open Options"
-msgstr "Opções de abertura"
+msgstr "Opções de Abertura"
 
-#: app/filedlg.c:218 app/filedlg.c:510
+#: app/filedlg.c:219 app/filedlg.c:511
 msgid "Determine file type:"
 msgstr "Determinar o tipo de arquivo:"
 
-#: app/filedlg.c:255
+#: app/filedlg.c:256
 msgid ""
 "Some characters in the filename are neither UTF-8 nor your local encoding.\n"
 "Some things will break."
@@ -679,7 +728,7 @@ msgstr ""
 "local.\n"
 "Algumas coisas irão falhar."
 
-#: app/filedlg.c:261 app/filedlg.c:436
+#: app/filedlg.c:262 app/filedlg.c:437
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -688,30 +737,30 @@ msgstr ""
 "O arquivo '%s' já existe.\n"
 "Deseja sobrescrevê-lo?"
 
-#: app/filedlg.c:269 app/filedlg.c:443
+#: app/filedlg.c:270 app/filedlg.c:444
 msgid "File already exists"
 msgstr "O arquivo já existe"
 
-#: app/filedlg.c:301
+#: app/filedlg.c:302
 msgid "Save Diagram"
 msgstr "Salvar o Diagrama"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: app/filedlg.c:306
+#: app/filedlg.c:307
 msgid "Compress diagram files"
 msgstr "Comprimir os arquivos de diagramas"
 
-#: app/filedlg.c:315
+#: app/filedlg.c:316
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
 msgstr ""
-"A compressão reduz em cerca de 10% o tamanho do arquivo e aumenta a velocidade "
-"de leitura e gravação. Alguns programas texto não podem manipular arquivos "
-"comprimidos."
+"A compressão reduz em cerca de 10% o tamanho do arquivo e aumenta a "
+"velocidade de leitura e gravação. Alguns programas texto não podem manipular "
+"arquivos comprimidos."
 
-#: app/filedlg.c:462
+#: app/filedlg.c:463
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -720,11 +769,11 @@ msgstr ""
 "Impossível determinar qual filtro de\n"
 "exportação utilizar para salvar '%s'"
 
-#: app/filedlg.c:480
+#: app/filedlg.c:481
 msgid "Export Diagram"
-msgstr "Exportar Diagrama"
+msgstr "Exportar o Diagrama"
 
-#: app/filedlg.c:502
+#: app/filedlg.c:503
 msgid "Export Options"
 msgstr "Opções de Exportação"
 
@@ -814,7 +863,7 @@ msgstr "Zoom"
 
 #: app/interface.c:525
 msgid "Toggles snap-to-grid for this window."
-msgstr "Troca alinhar na grade para esta janela."
+msgstr "Alterna entre alinhar na grade ou não para esta janela."
 
 #: app/interface.c:588
 msgid "NULL tooldata in tool_select_update"
@@ -845,7 +894,7 @@ msgid ""
 "arrow parameters with Details..."
 msgstr ""
 "Estilo de seta no início de novas linhas.  Clique para escolher um seta, ou "
-"defina os parâmetros de estilo de seta com Detalhes..."
+"defina os parâmetros de estilo de seta através da opção Detalhes..."
 
 #: app/interface.c:1131
 msgid ""
@@ -853,7 +902,7 @@ msgid ""
 "parameters with Details..."
 msgstr ""
 "Estilo de linha para novas linhas.  Clique para escolher um estilo de linha, "
-"ou defina os parâmetros de estilo de linha com Detalhes..."
+"ou defina os parâmetros de estilo de linha através da opção Detalhes..."
 
 #: app/interface.c:1145
 msgid ""
@@ -861,7 +910,7 @@ msgid ""
 "parameters with Details..."
 msgstr ""
 "Estilo de seta no final de novas linhas.  Clique para escolher um seta ou "
-"defina os parâmetros de estilo de seta com Detalhes..."
+"defina os parâmetros de estilo de seta através da opção Detalhes..."
 
 #: app/interface.c:1255
 msgid "Diagram Editor"
@@ -915,12 +964,12 @@ msgstr "Nome da camada:"
 msgid "OK"
 msgstr "OK"
 
-#: app/linewidth_area.c:248 lib/properties.h:480 lib/properties.h:483
+#: app/linewidth_area.c:246 lib/properties.h:480 lib/properties.h:483
 #: objects/chronogram/chronoline.c:181 objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr "Largura da linha"
 
-#: app/linewidth_area.c:260
+#: app/linewidth_area.c:258
 msgid "Line width:"
 msgstr "Largura da linha:"
 
@@ -952,7 +1001,7 @@ msgstr ""
 #: app/load_save.c:292
 #, c-format
 msgid "Can't find parent %s of %s object\n"
-msgstr "Não foi possível encontrar o pai %s do objeto %s\n"
+msgstr "Impossível encontrar o pai %s do objeto %s\n"
 
 #: app/load_save.c:337
 msgid "You must specify a file, not a directory.\n"
@@ -982,7 +1031,7 @@ msgstr ""
 "Erro ao carregar o diagrama %s.\n"
 "Não é um arquivo Dia."
 
-#: app/load_save.c:572
+#: app/load_save.c:575
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -993,12 +1042,12 @@ msgstr ""
 "%s.\n"
 "Um arquivo Dia válido possui ao menos uma camada."
 
-#: app/load_save.c:923
+#: app/load_save.c:926
 #, c-format
 msgid "Failed to save file '%s'.\n"
 msgstr "Impossível salvar o arquivo '%s'.\n"
 
-#: app/load_save.c:994 app/load_save.c:999
+#: app/load_save.c:997 app/load_save.c:1002
 msgid "Native Dia Diagram"
 msgstr "Diagrama Dia Nativo"
 
@@ -1022,7 +1071,7 @@ msgstr "/Arquivo/---"
 
 #: app/menus.c:56
 msgid "/File/_Diagram tree"
-msgstr "/Arquivo/Árvore de _diagramas"
+msgstr "/Arquivo/Árvore dos _Diagramas"
 
 #: app/menus.c:58
 msgid "/File/Sheets and Objects..."
@@ -1312,11 +1361,11 @@ msgstr "/Objetos/Alinhar/---"
 
 #: app/menus.c:185
 msgid "/Objects/Align/Spread Out Horizontally"
-msgstr "/Objetos/Alinhar/Espalhar _Horizontalmente"
+msgstr "/Objetos/Alinhar/Distribuir _Horizontalmente"
 
 #: app/menus.c:186
 msgid "/Objects/Align/Spread Out Vertically"
-msgstr "/Objetos/Alinhar/Espalhar _Verticalmente"
+msgstr "/Objetos/Alinhar/Distribuir _Verticalmente"
 
 #: app/menus.c:187
 msgid "/Objects/Align/Adjacent"
@@ -1489,38 +1538,38 @@ msgstr "Impossível executar o comando '%s': %s"
 msgid "Could not open '%s' for writing: %s"
 msgstr "Impossível abrir '%s' para escrita: %s"
 
-#: app/paginate_psprint.c:378
+#: app/paginate_psprint.c:376
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "Erro de impressão: o comando '%s' retornou %d\n"
 
-#: app/paginate_psprint.c:388
+#: app/paginate_psprint.c:387
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
-msgstr "Erro de impressão: o comando '%s' causou sigpipe."
+msgstr "Erro de impressão: o comando '%s' causou um sigpipe."
 
 #: app/plugin-manager.c:200
 msgid "Plug-ins"
 msgstr "Plug-ins"
 
-#: app/plugin-manager.c:256
+#: app/plugin-manager.c:255
 msgid "Loaded"
 msgstr "Carregado"
 
-#: app/plugin-manager.c:263 objects/UML/class.c:107
+#: app/plugin-manager.c:262 objects/UML/class.c:112
 #: objects/UML/large_package.c:128
 msgid "Name"
 msgstr "Nome"
 
-#: app/plugin-manager.c:269
+#: app/plugin-manager.c:268
 msgid "Description"
 msgstr "Descrição"
 
-#: app/plugin-manager.c:278
+#: app/plugin-manager.c:277
 msgid "Load at Startup"
 msgstr "Carregar na Inicialização"
 
-#: app/plugin-manager.c:285
+#: app/plugin-manager.c:284
 msgid "File Name"
 msgstr "Nome do Arquivo"
 
@@ -1530,7 +1579,7 @@ msgstr "Interface com Usuário"
 
 #: app/preferences.c:103
 msgid "Diagram Defaults"
-msgstr "Padrões de Diagrama"
+msgstr "Padrões do Diagrama"
 
 #: app/preferences.c:104
 msgid "View Defaults"
@@ -1538,15 +1587,15 @@ msgstr "Padrões de Visualização"
 
 #: app/preferences.c:106
 msgid "Diagram Tree"
-msgstr "Árvore de Diagramas"
+msgstr "Árvore dos Diagramas"
 
 #: app/preferences.c:120
 msgid "Reset tools after create"
-msgstr "Reiniciar ferramentas depois de criar"
+msgstr "Redefinir ferramentas depois de criar"
 
 #: app/preferences.c:121
 msgid "Compress saved files"
-msgstr "Comprimir arquivos salvos"
+msgstr "Comprimir os arquivos salvos"
 
 #: app/preferences.c:122
 msgid "Number of undo levels:"
@@ -1556,9 +1605,7 @@ msgstr "Número de ações a desfazer:"
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
-msgstr ""
-"O arrasto reverso seleciona\n"
-"objetos que se cruzam"
+msgstr "Arrasto reverso seleciona objetos que se cruzam"
 
 #: app/preferences.c:124
 msgid "Recent documents list size:"
@@ -1566,11 +1613,11 @@ msgstr "Tamanho da lista de documentos recentes:"
 
 #: app/preferences.c:125
 msgid "Use menu bar"
-msgstr "Usar barra de menu"
+msgstr "Usar a barra de menu"
 
 #: app/preferences.c:127
 msgid "Keep tool box on top of diagram windows"
-msgstr "Manter a caixa de ferramentas acima das janelas de diagramas"
+msgstr "Manter a caixa de ferramentas sempre acima das janelas de diagramas"
 
 #: app/preferences.c:129
 msgid "New diagram:"
@@ -1627,7 +1674,7 @@ msgstr "Linhas sólidas"
 
 #: app/preferences.c:156
 msgid "Snap to"
-msgstr "Aderir a grade"
+msgstr "Aderir à grade"
 
 #: app/preferences.c:157
 msgid "Dynamic grid resizing"
@@ -1645,24 +1692,28 @@ msgstr "Tamanho na direção Y:"
 msgid "Lines per major line"
 msgstr "Linhas por linha mestre"
 
-#: app/preferences.c:179
+#: app/preferences.c:163
+msgid "Hex Size:"
+msgstr "Tamanho do Hexágono:"
+
+#: app/preferences.c:182
 msgid "Diagram tree window:"
-msgstr "Janela da árvore de diagrama:"
+msgstr "Janela da árvore dos diagramas:"
 
-#: app/preferences.c:181
+#: app/preferences.c:184
 msgid "Save hidden object types"
 msgstr "Salvar tipos de objetos ocultos"
 
-#: app/preferences.c:388 lib/prop_inttypes.c:158
+#: app/preferences.c:391 lib/prop_inttypes.c:158
 msgid "Yes"
 msgstr "Sim"
 
-#: app/preferences.c:388 app/preferences.c:399 lib/prop_inttypes.c:160
+#: app/preferences.c:391 app/preferences.c:402 lib/prop_inttypes.c:160
 #: lib/prop_inttypes.c:186
 msgid "No"
 msgstr "Não"
 
-#: app/preferences.c:501
+#: app/preferences.c:504
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -1670,15 +1721,15 @@ msgstr "Preferências"
 msgid "Object properties"
 msgstr "Propriedades do objeto"
 
-#: app/properties.c:81
+#: app/properties.c:80
 msgid "This object has no properties."
 msgstr "Este objeto não tem propriedades."
 
-#: app/properties.c:203
+#: app/properties.c:202
 msgid "Properties: "
 msgstr "Propriedades:"
 
-#: app/properties.c:207
+#: app/properties.c:206
 msgid "Object properties:"
 msgstr "Propriedades do objeto:"
 
@@ -1704,7 +1755,7 @@ msgstr "Postscript Encapsulado com pré-visualização (usando fontes Pango)"
 msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
 msgstr "Postscript Encapsulado (usando fontes PostScript Latin-1)"
 
-#: app/render_libart.c:318 lib/dialibartrenderer.c:288
+#: app/render_libart.c:318 lib/dialibartrenderer.c:300
 msgid "gdk_renderer: Unsupported fill mode specified!\n"
 msgstr "gdk_renderer: O modo de preenchimento especificado não é suportado!\n"
 
@@ -1823,8 +1874,8 @@ msgid "Description:"
 msgstr "Descrição:"
 
 #: app/sheets_dialog.c:618 objects/FS/flow-ortho.c:168 objects/FS/flow.c:146
-#: objects/UML/class_dialog.c:890 objects/UML/class_dialog.c:1824
-#: objects/UML/class_dialog.c:2053 objects/UML/class_dialog.c:2569
+#: objects/UML/class_dialog.c:911 objects/UML/class_dialog.c:1845
+#: objects/UML/class_dialog.c:2074 objects/UML/class_dialog.c:2590
 #: objects/Istar/link.c:167 objects/Jackson/phenomenon.c:144
 #: objects/KAOS/metaandorrel.c:164 objects/KAOS/metabinrel.c:181
 msgid "Type:"
@@ -1836,9 +1887,9 @@ msgstr "Folha"
 
 #: app/sheets_dialog.c:672 objects/ER/attribute.c:151 objects/ER/entity.c:133
 #: objects/ER/relationship.c:138 objects/UML/association.c:200
-#: objects/UML/association.c:1126 objects/UML/class_dialog.c:879
-#: objects/UML/class_dialog.c:1813 objects/UML/class_dialog.c:2042
-#: objects/UML/class_dialog.c:2558 objects/UML/dependency.c:133
+#: objects/UML/association.c:1126 objects/UML/class_dialog.c:900
+#: objects/UML/class_dialog.c:1834 objects/UML/class_dialog.c:2063
+#: objects/UML/class_dialog.c:2579 objects/UML/dependency.c:133
 #: objects/UML/generalization.c:129 objects/UML/realizes.c:130
 msgid "Name:"
 msgstr "Nome:"
@@ -1923,7 +1974,7 @@ msgstr "Impossível interpretar o arquivo de forma: '%s'"
 
 #: app/sheets_dialog_callbacks.c:897
 msgid "Sheet must have a Name"
-msgstr "A folha dever ter um nome"
+msgstr "A folha dever ter um Nome"
 
 #: app/sheets_dialog_callbacks.c:1594 app/sheets_dialog_callbacks.c:1600
 #, c-format
@@ -2041,7 +2092,7 @@ msgstr "Triângulo Preenchido Duplo"
 
 #: lib/arrows.c:57
 msgid "Filled Dot and Triangle"
-msgstr "Ponto e Triângulo Preenchido"
+msgstr "Ponto e Triângulo Preenchidos"
 
 #: lib/arrows.c:58
 msgid "Filled Box"
@@ -2081,7 +2132,7 @@ msgstr "1-ou-0"
 
 #: lib/arrows.c:67
 msgid "1 exactly"
-msgstr "1 exatamente"
+msgstr "Exatamente 1"
 
 #: lib/arrows.c:68
 msgid "Filled Concave"
@@ -2105,7 +2156,8 @@ msgstr "Barra invertida"
 
 #: lib/bezier_conn.c:533
 msgid "Internal error: Setting corner type of endpoint of bezier"
-msgstr "Erro interno ao configurar tipo de canto do ponto final da bézier"
+msgstr ""
+"Erro interno ao configurar tipo de canto do ponto final da curva de bézier"
 
 #: lib/dia_xml.c:154
 #, c-format
@@ -2290,15 +2342,15 @@ msgstr ""
 "Impossível abrir `%s'\n"
 "`%s'"
 
-#: lib/properties.c:62 lib/properties.h:468 lib/widgets.c:789
+#: lib/properties.c:62 lib/properties.h:468 lib/widgets.c:792
 msgid "Left"
 msgstr "Esquerda"
 
-#: lib/properties.c:63 lib/properties.h:469 lib/widgets.c:795
+#: lib/properties.c:63 lib/properties.h:469 lib/widgets.c:798
 msgid "Center"
 msgstr "Centralizar"
 
-#: lib/properties.c:64 lib/properties.h:470 lib/widgets.c:801
+#: lib/properties.c:64 lib/properties.h:470 lib/widgets.c:804
 msgid "Right"
 msgstr "Direita"
 
@@ -2317,7 +2369,7 @@ msgstr "Cor de preenchimento"
 
 #: lib/properties.c:74 lib/properties.h:505
 msgid "Draw background"
-msgstr "Desenhar fundo"
+msgstr "Transparente"
 
 #: lib/properties.c:75 lib/properties.h:509
 msgid "Start arrow"
@@ -2331,10 +2383,11 @@ msgstr "Seta final"
 msgid "Text alignment"
 msgstr "Alinhamento do texto"
 
+#. all this just to make the defaults selectable ...
 #: lib/properties.c:79 lib/properties.h:525 objects/GRAFCET/condition.c:132
 #: objects/GRAFCET/step.c:165 objects/GRAFCET/transition.c:142
-#: objects/UML/class_dialog.c:330 objects/chronogram/chronoline.c:183
-#: objects/chronogram/chronoref.c:164
+#: objects/UML/class.c:138 objects/UML/class_dialog.c:351
+#: objects/chronogram/chronoline.c:183 objects/chronogram/chronoref.c:164
 msgid "Font"
 msgstr "Fonte"
 
@@ -2361,59 +2414,59 @@ msgstr "Cor de preenchimento"
 msgid "Text colour"
 msgstr "Cor do texto"
 
-#: lib/widgets.c:390
+#: lib/widgets.c:395
 msgid "Other fonts..."
 msgstr "Outras fontes..."
 
-#: lib/widgets.c:520
+#: lib/widgets.c:523
 #, c-format
 msgid "Couldn't find font family for %s\n"
 msgstr "Impossível encontrar a família da fonte para %s\n"
 
 #. We hit the Other fonts... entry
-#: lib/widgets.c:585
+#: lib/widgets.c:588
 msgid "Select font"
 msgstr "Selecionar fonte"
 
 #. Translators: Menu item Noun/Material/Solid
-#: lib/widgets.c:937 objects/FS/function.c:1063
+#: lib/widgets.c:940 objects/FS/function.c:1063
 msgid "Solid"
 msgstr "Sólido"
 
-#: lib/widgets.c:943
+#: lib/widgets.c:946
 msgid "Dashed"
 msgstr "Tracejado"
 
-#: lib/widgets.c:949
+#: lib/widgets.c:952
 msgid "Dash-Dot"
 msgstr "Traço-Ponto"
 
-#: lib/widgets.c:955
+#: lib/widgets.c:958
 msgid "Dash-Dot-Dot"
 msgstr "Traço-Ponto-Ponto"
 
-#: lib/widgets.c:961
+#: lib/widgets.c:964
 msgid "Dotted"
 msgstr "Pontilhado"
 
 #. fs->sizebox = GTK_HBOX(box);
-#: lib/widgets.c:980
+#: lib/widgets.c:983
 msgid "Dash length: "
 msgstr "Tamanho do traço: "
 
-#: lib/widgets.c:1135
+#: lib/widgets.c:1138
 msgid "Select color"
 msgstr "Selecionar cor"
 
-#: lib/widgets.c:1353
+#: lib/widgets.c:1356
 msgid "Size: "
 msgstr "Tamanho: "
 
-#: lib/widgets.c:1502
+#: lib/widgets.c:1505
 msgid "Select image file"
-msgstr "Selecione o arquivo com a imagem"
+msgstr "Selecione o arquivo de imagem"
 
-#: lib/widgets.c:1538
+#: lib/widgets.c:1541
 msgid "Browse"
 msgstr "Navegar"
 
@@ -2458,18 +2511,18 @@ msgid "Total:"
 msgstr "Total:"
 
 #: objects/ER/participation.c:405 objects/FS/flow-ortho.c:644
-#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:566
+#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:462
 #: objects/UML/association.c:752 objects/UML/component_feature.c:183
 #: objects/UML/dependency.c:372 objects/UML/generalization.c:368
-#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:337
+#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:346
 msgid "Add segment"
 msgstr "Adicionar segmento"
 
 #: objects/ER/participation.c:406 objects/FS/flow-ortho.c:645
-#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:567
+#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:463
 #: objects/UML/association.c:753 objects/UML/component_feature.c:184
 #: objects/UML/dependency.c:373 objects/UML/generalization.c:369
-#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:338
+#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:347
 msgid "Delete segment"
 msgstr "Excluir segmento"
 
@@ -3054,7 +3107,7 @@ msgid "Expose"
 msgstr "Expor"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: objects/FS/function.c:931 sheets/Flowchart.sheet.in.h:8
+#: objects/FS/function.c:931 sheets/Flowchart.sheet.in.h:7
 msgid "Extract"
 msgstr "Extrair"
 
@@ -3289,7 +3342,7 @@ msgid "Mark"
 msgstr "Marcar"
 
 #. Translators: Menu item Verb/Signal/Display
-#: objects/FS/function.c:1049 sheets/Flowchart.sheet.in.h:6
+#: objects/FS/function.c:1049 sheets/Flowchart.sheet.in.h:5
 msgid "Display"
 msgstr "Mostrar"
 
@@ -3719,7 +3772,8 @@ msgid "Miscellaneous objects"
 msgstr "Miscelânea de objetos"
 
 #. property rows
-#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:336
+#: objects/SADT/arrow.c:134 objects/UML/class.c:143
+#: objects/UML/class_dialog.c:357
 msgid "Normal"
 msgstr "Normal"
 
@@ -3755,7 +3809,7 @@ msgstr ""
 "Para facilitar a leitura, fluxos que começam e terminam verticalmente podem "
 "ser desenhados em cinza"
 
-#: objects/SADT/arrow.c:572
+#: objects/SADT/arrow.c:468
 msgid "SADT Arrow"
 msgstr "Seta SADT"
 
@@ -3787,17 +3841,11 @@ msgstr "Caixa SADT"
 msgid "SADT diagram objects"
 msgstr "Objetos de diagrama SADT"
 
-#. choose default font name for your locale. see also font_data structure
-#. in lib/font.c.
-#: objects/UML/activity.c:315
-msgid "Helvetica"
-msgstr "Helvetica"
-
 #: objects/UML/actor.c:359 objects/UML/actor.c:361 sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "Ator"
 
-#: objects/UML/association.c:1139 objects/UML/class_dialog.c:2086
+#: objects/UML/association.c:1139 objects/UML/class_dialog.c:2107
 msgid "Direction:"
 msgstr "Direção:"
 
@@ -3840,254 +3888,281 @@ msgstr "Agregação"
 msgid "Composition"
 msgstr "Composição"
 
-#: objects/UML/class.c:109 objects/UML/classicon.c:135
+#: objects/UML/class.c:110 objects/UML/class.c:245 objects/UML/class.c:1157
+#: sheets/UML.sheet.in.h:6
+msgid "Class"
+msgstr "Classe"
+
+#: objects/UML/class.c:114 objects/UML/classicon.c:135
 #: objects/UML/component.c:122 objects/UML/large_package.c:126
 #: objects/UML/object.c:147 objects/UML/small_package.c:122
 msgid "Stereotype"
 msgstr "Estereótipo"
 
-#: objects/UML/class.c:111 objects/UML/class_dialog.c:361
-#: sheets/SDL.sheet.in.h:3
+#: objects/UML/class.c:116 objects/UML/class.c:153
+#: objects/UML/class_dialog.c:382 sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "Comentário"
 
-#: objects/UML/class.c:113 objects/UML/class_dialog.c:290
-#: objects/UML/class_dialog.c:346 objects/UML/class_dialog.c:1912
+#: objects/UML/class.c:118 objects/UML/class.c:147
+#: objects/UML/class_dialog.c:296 objects/UML/class_dialog.c:367
+#: objects/UML/class_dialog.c:1933
 msgid "Abstract"
 msgstr "Abstrata"
 
-#: objects/UML/class.c:115 objects/UML/class_dialog.c:299
+#: objects/UML/class.c:120
+msgid "Template"
+msgstr "Modelo"
+
+#: objects/UML/class.c:123 objects/UML/class_dialog.c:305
 msgid "Suppress Attributes"
 msgstr "Suprimir atributos"
 
-#: objects/UML/class.c:117
+#: objects/UML/class.c:125
 msgid "Suppress Operations"
 msgstr "Suprimir operações"
 
-#: objects/UML/class.c:119
+#: objects/UML/class.c:127
 msgid "Visible Attributes"
 msgstr "Atributos visíveis"
 
-#: objects/UML/class.c:121
+#: objects/UML/class.c:129
 msgid "Visible Operations"
 msgstr "Operações visíveis"
 
-#: objects/UML/class.c:123
+#: objects/UML/class.c:131
 msgid "Visible Comments"
 msgstr "Comentários Visíveis"
 
-#: objects/UML/class.c:126 objects/UML/object.c:151
+#: objects/UML/class.c:133 objects/UML/class_dialog.c:321
+msgid "Wrap Operations"
+msgstr "Operações de Quebra de Linha"
+
+#: objects/UML/class.c:135
+msgid "Wrap after char"
+msgstr "Quebra de linha após o caráctere"
+
+#: objects/UML/class.c:145 objects/UML/class_dialog.c:362
+msgid "Polymorphic"
+msgstr "Polimórfico"
+
+#: objects/UML/class.c:149
+msgid "Classname"
+msgstr "Classname"
+
+#: objects/UML/class.c:151
+msgid "Abstract Classname"
+msgstr "Classname Abstrata"
+
+#: objects/UML/class.c:157 objects/UML/class.c:159 objects/UML/class.c:161
+#: objects/UML/class.c:163 objects/UML/class.c:165 objects/UML/class.c:167
+msgid " "
+msgstr " "
+
+#: objects/UML/class.c:172 objects/UML/object.c:151
 msgid "Attributes"
 msgstr "Atributos"
 
-#: objects/UML/class.c:128
+#: objects/UML/class.c:174
 msgid "Operations"
 msgstr "Operações"
 
-#: objects/UML/class.c:131
-msgid "Template"
-msgstr "Modelo"
-
-#: objects/UML/class.c:179 objects/UML/class.c:943 sheets/UML.sheet.in.h:6
-msgid "Class"
-msgstr "Classe"
-
-#: objects/UML/class.c:185
+#: objects/UML/class.c:251
 msgid "Show comments"
 msgstr "Mostrar comentários"
 
 #. Class page:
-#: objects/UML/class_dialog.c:259
+#: objects/UML/class_dialog.c:265
 msgid "_Class"
 msgstr "_Classe"
 
-#: objects/UML/class_dialog.c:267
+#: objects/UML/class_dialog.c:273
 msgid "Class name:"
 msgstr "Nome da classe:"
 
-#: objects/UML/class_dialog.c:275 objects/UML/class_dialog.c:1835
+#: objects/UML/class_dialog.c:281 objects/UML/class_dialog.c:1856
 #: objects/UML/dependency.c:135 objects/UML/generalization.c:131
 #: objects/UML/realizes.c:132
 msgid "Stereotype:"
 msgstr "Estereótipo"
 
-#: objects/UML/class_dialog.c:282 objects/UML/class_dialog.c:912
-#: objects/UML/class_dialog.c:1953 objects/UML/class_dialog.c:2075
+#: objects/UML/class_dialog.c:288 objects/UML/class_dialog.c:933
+#: objects/UML/class_dialog.c:1974 objects/UML/class_dialog.c:2096
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: objects/UML/class_dialog.c:296
+#: objects/UML/class_dialog.c:302
 msgid "Attributes visible"
 msgstr "Atributos visíveis"
 
 # --??--
-#: objects/UML/class_dialog.c:305
+#: objects/UML/class_dialog.c:311
 msgid "Operations visible"
 msgstr "Métodos visíveis"
 
-#: objects/UML/class_dialog.c:308
+#: objects/UML/class_dialog.c:314
 msgid "Suppress operations"
 msgstr "Suprimir métodos"
 
+#: objects/UML/class_dialog.c:328
+msgid "Wrap after this length: "
+msgstr "Próxima linha após este comprimento: "
+
 # --??--
-#: objects/UML/class_dialog.c:314
+#: objects/UML/class_dialog.c:335
 msgid "Comments visible"
 msgstr "Comentários visíveis"
 
 #. head line
-#: objects/UML/class_dialog.c:327
+#: objects/UML/class_dialog.c:348
 msgid "Kind"
 msgstr "Tipo"
 
-#: objects/UML/class_dialog.c:332
+#: objects/UML/class_dialog.c:353
 msgid "Size"
 msgstr "Tamanho"
 
-#: objects/UML/class_dialog.c:341
-msgid "Polymorphic"
-msgstr "Polimórfico"
-
-#: objects/UML/class_dialog.c:351
+#: objects/UML/class_dialog.c:372
 msgid "Class Name"
 msgstr "Nome da classe"
 
-#: objects/UML/class_dialog.c:356
+#: objects/UML/class_dialog.c:377
 msgid "Abstract Class"
 msgstr "Classe abstrata"
 
 #. should probably be refactored too.
-#: objects/UML/class_dialog.c:373
+#: objects/UML/class_dialog.c:394
 msgid "Text Color"
 msgstr "Cor do texto"
 
-#: objects/UML/class_dialog.c:381
+#: objects/UML/class_dialog.c:402
 msgid "Foreground Color"
 msgstr "Cor do primeiro plano"
 
-#: objects/UML/class_dialog.c:389
+#: objects/UML/class_dialog.c:410
 msgid "Background Color"
 msgstr "Cor do segundo plano"
 
 #. Attributes page:
-#: objects/UML/class_dialog.c:812
+#: objects/UML/class_dialog.c:833
 msgid "_Attributes"
 msgstr "_Atributos"
 
-#: objects/UML/class_dialog.c:840 objects/UML/class_dialog.c:1771
-#: objects/UML/class_dialog.c:1999 objects/UML/class_dialog.c:2519
+#: objects/UML/class_dialog.c:861 objects/UML/class_dialog.c:1792
+#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2540
 msgid "_New"
 msgstr "_Novo"
 
-#: objects/UML/class_dialog.c:846 objects/UML/class_dialog.c:1777
-#: objects/UML/class_dialog.c:2006 objects/UML/class_dialog.c:2525
+#: objects/UML/class_dialog.c:867 objects/UML/class_dialog.c:1798
+#: objects/UML/class_dialog.c:2027 objects/UML/class_dialog.c:2546
 msgid "_Delete"
 msgstr "_Excluir"
 
-#: objects/UML/class_dialog.c:852 objects/UML/class_dialog.c:1783
-#: objects/UML/class_dialog.c:2013 objects/UML/class_dialog.c:2531
+#: objects/UML/class_dialog.c:873 objects/UML/class_dialog.c:1804
+#: objects/UML/class_dialog.c:2034 objects/UML/class_dialog.c:2552
 msgid "Move up"
 msgstr "Subir"
 
-#: objects/UML/class_dialog.c:858 objects/UML/class_dialog.c:1789
-#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2537
+#: objects/UML/class_dialog.c:879 objects/UML/class_dialog.c:1810
+#: objects/UML/class_dialog.c:2041 objects/UML/class_dialog.c:2558
 msgid "Move down"
 msgstr "Descer"
 
-#: objects/UML/class_dialog.c:869
+#: objects/UML/class_dialog.c:890
 msgid "Attribute data"
 msgstr "Dados do atributo"
 
-#: objects/UML/class_dialog.c:901
+#: objects/UML/class_dialog.c:922
 msgid "Value:"
 msgstr "Valor:"
 
-#: objects/UML/class_dialog.c:924 objects/UML/class_dialog.c:1848
+#: objects/UML/class_dialog.c:945 objects/UML/class_dialog.c:1869
 msgid "Visibility:"
 msgstr "Visibilidade:"
 
-#: objects/UML/class_dialog.c:933 objects/UML/class_dialog.c:1857
+#: objects/UML/class_dialog.c:954 objects/UML/class_dialog.c:1878
 msgid "Public"
 msgstr "Publico"
 
-#: objects/UML/class_dialog.c:941 objects/UML/class_dialog.c:1865
+#: objects/UML/class_dialog.c:962 objects/UML/class_dialog.c:1886
 msgid "Private"
 msgstr "Privado"
 
-#: objects/UML/class_dialog.c:949 objects/UML/class_dialog.c:1873
+#: objects/UML/class_dialog.c:970 objects/UML/class_dialog.c:1894
 msgid "Protected"
 msgstr "Protegido"
 
-#: objects/UML/class_dialog.c:957 objects/UML/class_dialog.c:1881
+#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1902
 msgid "Implementation"
 msgstr "Implementação"
 
-#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1897
+#: objects/UML/class_dialog.c:999 objects/UML/class_dialog.c:1918
 msgid "Class scope"
 msgstr "Escopo da classe"
 
 #. Operations page:
-#: objects/UML/class_dialog.c:1743
+#: objects/UML/class_dialog.c:1764
 msgid "_Operations"
 msgstr "_Operações"
 
-#: objects/UML/class_dialog.c:1801
+#: objects/UML/class_dialog.c:1822
 msgid "Operation data"
 msgstr "Dados do método"
 
-#: objects/UML/class_dialog.c:1903
+#: objects/UML/class_dialog.c:1924
 msgid "Inheritance type:"
 msgstr "Tipo de herança:"
 
-#: objects/UML/class_dialog.c:1920
+#: objects/UML/class_dialog.c:1941
 msgid "Polymorphic (virtual)"
 msgstr "Polimórfica (virtual)"
 
-#: objects/UML/class_dialog.c:1928
+#: objects/UML/class_dialog.c:1949
 msgid "Leaf (final)"
 msgstr "Folha (final)"
 
-#: objects/UML/class_dialog.c:1946
+#: objects/UML/class_dialog.c:1967
 msgid "Query"
 msgstr "Query"
 
-#: objects/UML/class_dialog.c:1970
+#: objects/UML/class_dialog.c:1991
 msgid "Parameters:"
 msgstr "Parâmetros:"
 
-#: objects/UML/class_dialog.c:2032
+#: objects/UML/class_dialog.c:2053
 msgid "Parameter data"
 msgstr "Dados dos parâmetros"
 
-#: objects/UML/class_dialog.c:2064
+#: objects/UML/class_dialog.c:2085
 msgid "Def. value:"
 msgstr "Valor padrão:"
 
-#: objects/UML/class_dialog.c:2095
+#: objects/UML/class_dialog.c:2116
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: objects/UML/class_dialog.c:2103
+#: objects/UML/class_dialog.c:2124
 msgid "In"
 msgstr "Dentro"
 
-#: objects/UML/class_dialog.c:2112
+#: objects/UML/class_dialog.c:2133
 msgid "Out"
 msgstr "Fora"
 
-#: objects/UML/class_dialog.c:2121
+#: objects/UML/class_dialog.c:2142
 msgid "In & Out"
 msgstr "Dentro & Fora"
 
 #. Templates page:
-#: objects/UML/class_dialog.c:2485
+#: objects/UML/class_dialog.c:2506
 msgid "_Templates"
 msgstr "_Modelos"
 
-#: objects/UML/class_dialog.c:2491 sheets/UML.sheet.in.h:29
+#: objects/UML/class_dialog.c:2512 sheets/UML.sheet.in.h:29
 msgid "Template class"
 msgstr "Classe modelo"
 
-#: objects/UML/class_dialog.c:2548
+#: objects/UML/class_dialog.c:2569
 msgid "Formal parameter data"
 msgstr "Parâmetros"
 
@@ -4211,7 +4286,7 @@ msgstr ""
 "Essa opção será removida em versões futuras.\n"
 "Utilize em vez deste os objetos Estado Inicial/Estado Final\n"
 
-#: objects/UML/state_term.c:122
+#: objects/UML/state_term.c:118
 msgid "Is final"
 msgstr "É final"
 
@@ -4348,8 +4423,9 @@ msgid "Cannot open icon file %s for object type '%s'."
 msgstr "Impossível abrir ícone %s para o tipo de objeto '%s'."
 
 #: objects/flowchart/box.c:148 objects/standard/box.c:148
+#: objects/standard/polyline.c:130 objects/standard/zigzagline.c:129
 msgid "Corner radius"
-msgstr "Raio das quinas"
+msgstr "Raio dos cantos"
 
 #: objects/flowchart/flowchart.c:37
 msgid "Flowchart objects"
@@ -4596,23 +4672,23 @@ msgstr "Assinantes"
 msgid "Curve distance"
 msgstr "Distância da curva"
 
-#: objects/standard/bezier.c:545 objects/standard/beziergon.c:501
+#: objects/standard/bezier.c:545 objects/standard/beziergon.c:499
 msgid "Add Segment"
 msgstr "Adicionar Segmento"
 
-#: objects/standard/bezier.c:546 objects/standard/beziergon.c:502
+#: objects/standard/bezier.c:546 objects/standard/beziergon.c:500
 msgid "Delete Segment"
 msgstr "Excluir Segmento"
 
-#: objects/standard/bezier.c:548 objects/standard/beziergon.c:504
+#: objects/standard/bezier.c:548 objects/standard/beziergon.c:502
 msgid "Symmetric control"
 msgstr "Controle simétrico"
 
-#: objects/standard/bezier.c:550 objects/standard/beziergon.c:506
+#: objects/standard/bezier.c:550 objects/standard/beziergon.c:504
 msgid "Smooth control"
 msgstr "Controle de suavidade"
 
-#: objects/standard/bezier.c:552 objects/standard/beziergon.c:508
+#: objects/standard/bezier.c:552 objects/standard/beziergon.c:506
 msgid "Cusp control"
 msgstr "Controle de cúspide"
 
@@ -4705,27 +4781,27 @@ msgstr "Espaçamento fracionário inicial"
 msgid "Fractional end gap"
 msgstr "Espaçamento fracionário final"
 
-#: objects/standard/polygon.c:460 objects/standard/polyline.c:496
+#: objects/standard/polygon.c:460 objects/standard/polyline.c:515
 msgid "Add Corner"
-msgstr "Adicionar quina"
+msgstr "Adicionar canto"
 
-#: objects/standard/polygon.c:461 objects/standard/polyline.c:497
+#: objects/standard/polygon.c:461 objects/standard/polyline.c:516
 msgid "Delete Corner"
-msgstr "Apagar quina"
+msgstr "Apagar canto"
 
 #: objects/standard/standard.c:45
 msgid "Standard objects"
 msgstr "Objetos padrão"
 
-#: plug-ins/cairo/diacairo.c:962
+#: plug-ins/cairo/diacairo.c:967
 msgid "Cairo PostScript"
 msgstr "PostScript Cairo"
 
-#: plug-ins/cairo/diacairo.c:970
+#: plug-ins/cairo/diacairo.c:976
 msgid "Cairo PNG"
 msgstr "PNG Cairo"
 
-#: plug-ins/cairo/diacairo.c:996
+#: plug-ins/cairo/diacairo.c:1005
 msgid "Cairo based Rendering"
 msgstr "Renderização baseada no Cairo"
 
@@ -4807,7 +4883,7 @@ msgstr "GdkPixbuf - sem antialisamento"
 msgid "GdkPixbuf bitmap"
 msgstr "Imagem GdkPixbuf"
 
-#: plug-ins/pixbuf/pixbuf.c:182
+#: plug-ins/pixbuf/pixbuf.c:189
 msgid "gdk-pixbuf based bitmap export/import"
 msgstr "Importação/exportação imagens baseadas gdk-pixbuf"
 
@@ -4823,7 +4899,7 @@ msgstr "Codificação UTF8 inválida"
 msgid "TeX PSTricks macros"
 msgstr "Macros TeX PSTricks"
 
-#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1058
+#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1140
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "Impossível abrir '%s' para escrita.\n"
@@ -4879,11 +4955,11 @@ msgid "Scalable Vector Graphics import and export filters"
 msgstr ""
 "Filtros de importação e exportação para o formato Scalable Vector Graphics"
 
-#: plug-ins/wmf/wmf.cpp:1122
+#: plug-ins/wmf/wmf.cpp:1207
 msgid "Windows Meta File"
 msgstr "Windows Meta File"
 
-#: plug-ins/wmf/wmf.cpp:1138
+#: plug-ins/wmf/wmf.cpp:1223
 msgid "WMF export filter"
 msgstr "Filtro de exportação para WMF"
 
@@ -4958,7 +5034,7 @@ msgstr "Impossível ler bit movido: %s\n"
 
 #: plug-ins/xfig/xfig-import.c:832
 msgid "Negative corner radius, negating"
-msgstr "Raio de quina negativo; rejeitando"
+msgstr "Raio do canto negativo; rejeitando"
 
 #: plug-ins/xfig/xfig-import.c:876 plug-ins/xfig/xfig-import.c:1192
 #, c-format
@@ -5118,11 +5194,11 @@ msgstr "Erro ao analisar folha de estilos: %s\n"
 msgid "Error while applying stylesheet: %s\n"
 msgstr "Erro ao aplicar folha de estilos: %s\n"
 
-#: plug-ins/xslt/xslt.c:312
+#: plug-ins/xslt/xslt.c:313
 msgid "XSL Transformation filter"
 msgstr "Filtro de Transformação XSL"
 
-#: plug-ins/xslt/xslt.c:336
+#: plug-ins/xslt/xslt.c:337
 msgid "No valid configuration files found for the XSLT plugin, not loading."
 msgstr ""
 "Nenhum arquivo de configuração válido encontrado para o plugin XSLT, não "
@@ -5140,182 +5216,390 @@ msgstr "De:"
 msgid "To:"
 msgstr "Para:"
 
-#. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
-#. Leave as is for now, renaming too much hassle.
-#. Will probably need to split into seperate sheets soon anyway.
-#: sheets/Assorted.sheet.in.h:4
+#: sheets/Assorted.sheet.in.h:1
 msgid ""
 "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
 "Geometric Shapes"
 msgstr ""
-"Uma coleção variada de polígonos, curvas de bézier e outras formas geométricas "
-"variadas"
+"Uma coleção variada de polígonos, curvas de bézier e outras formas "
+"geométricas variadas"
 
-#. Please talk to me before making any changes to this sheet
-#: sheets/Assorted.sheet.in.h:6
+#: sheets/Assorted.sheet.in.h:2
 msgid "Assorted"
 msgstr "Variados"
 
-#: sheets/Assorted.sheet.in.h:7
+#: sheets/Assorted.sheet.in.h:3
 msgid "Chevron"
 msgstr "Chevron"
 
-#: sheets/Assorted.sheet.in.h:8
+#: sheets/Assorted.sheet.in.h:4
 msgid "Curved eight point star"
 msgstr "Estrela de oito pontas arredondadas"
 
-#: sheets/Assorted.sheet.in.h:9
+#: sheets/Assorted.sheet.in.h:5
 msgid "Curved four point star"
 msgstr "Estrela de quatro pontas arredondadas"
 
-#: sheets/Assorted.sheet.in.h:10
+#: sheets/Assorted.sheet.in.h:6
 msgid "Diamond"
 msgstr "Diamante"
 
-#: sheets/Assorted.sheet.in.h:11
+#: sheets/Assorted.sheet.in.h:7
 msgid "Down arrow"
 msgstr "Seta para baixo"
 
-#: sheets/Assorted.sheet.in.h:12
+#: sheets/Assorted.sheet.in.h:8
 msgid "Eight point star"
 msgstr "Estrela de oito pontas"
 
-#: sheets/Assorted.sheet.in.h:13
+#: sheets/Assorted.sheet.in.h:9
 msgid "Four point star"
 msgstr "Estrela de quatro pontas"
 
-#: sheets/Assorted.sheet.in.h:14
+#: sheets/Assorted.sheet.in.h:10
 msgid "Heart"
 msgstr "Coração"
 
-#: sheets/Assorted.sheet.in.h:15
+#: sheets/Assorted.sheet.in.h:11
 msgid "Heptagon. Seven sided shape"
 msgstr "Heptágono. Forma de sete lados"
 
-#: sheets/Assorted.sheet.in.h:16
+#: sheets/Assorted.sheet.in.h:12
 msgid "Hexagon. Six sided shape"
 msgstr "Hexágono. Forma de seis lados"
 
-#: sheets/Assorted.sheet.in.h:17
+#: sheets/Assorted.sheet.in.h:13
 msgid "Horizontal parallelogram"
 msgstr "Paralelogramo horizontal"
 
-#: sheets/Assorted.sheet.in.h:18
+#: sheets/Assorted.sheet.in.h:14
 msgid "Isoceles triangle"
 msgstr "Triângulo isóceles"
 
-#: sheets/Assorted.sheet.in.h:19
+#: sheets/Assorted.sheet.in.h:15
 msgid "Left arrow"
 msgstr "Seta à esquerda"
 
-#: sheets/Assorted.sheet.in.h:20
+#: sheets/Assorted.sheet.in.h:16
 msgid "Left-right arrow"
 msgstr "Seta esquerda-direita"
 
-#: sheets/Assorted.sheet.in.h:21
+#: sheets/Assorted.sheet.in.h:17
 msgid "Left-right-up arrow"
 msgstr "Seta esquerda-direita-acima"
 
-#: sheets/Assorted.sheet.in.h:22
+#: sheets/Assorted.sheet.in.h:18
 msgid "Left-up arrow"
 msgstr "Seta esquerda-acima"
 
-#: sheets/Assorted.sheet.in.h:23
+#: sheets/Assorted.sheet.in.h:19
 msgid "Maltese cross"
 msgstr "Cruz de malta"
 
-#: sheets/Assorted.sheet.in.h:24
+#: sheets/Assorted.sheet.in.h:20
 msgid "Notched left arrow"
 msgstr "Seta chanfrada à esquerda"
 
-#: sheets/Assorted.sheet.in.h:25
+#: sheets/Assorted.sheet.in.h:21
 msgid "Notched right arrow"
 msgstr "Seta chanfrada à direita"
 
-#: sheets/Assorted.sheet.in.h:26
+#: sheets/Assorted.sheet.in.h:22
 msgid "Octogon. Eight sided shape"
 msgstr "Octógono. Forma de oito lados"
 
-#: sheets/Assorted.sheet.in.h:27
+#: sheets/Assorted.sheet.in.h:23
 msgid "Pentagon block arrow"
 msgstr "Seta de bloco pentagonal"
 
-#: sheets/Assorted.sheet.in.h:28
+#: sheets/Assorted.sheet.in.h:24
 msgid "Pentagon. Five sided shape"
 msgstr "Pentágono. Forma de cinco lados"
 
-#: sheets/Assorted.sheet.in.h:29
+#: sheets/Assorted.sheet.in.h:25
 msgid "Perfect circle"
 msgstr "Círculo perfeito"
 
-#: sheets/Assorted.sheet.in.h:30
+#: sheets/Assorted.sheet.in.h:26
 msgid "Perfect square, height equals width"
 msgstr "Quadrado perfeito, Altura igual à largura"
 
-#: sheets/Assorted.sheet.in.h:31
+#: sheets/Assorted.sheet.in.h:27
 msgid "Quad arrow"
 msgstr "Seta quádrupla"
 
-#: sheets/Assorted.sheet.in.h:32
+#: sheets/Assorted.sheet.in.h:28
 msgid "Quarter circle"
 msgstr "Quarto de círculo"
 
-#: sheets/Assorted.sheet.in.h:33
+#: sheets/Assorted.sheet.in.h:29
 msgid "Quarter moon"
 msgstr "Quarto de lua"
 
-#: sheets/Assorted.sheet.in.h:34
+#: sheets/Assorted.sheet.in.h:30
 msgid "Right angle triangle"
 msgstr "Triângulo retângulo"
 
-#: sheets/Assorted.sheet.in.h:35
+#: sheets/Assorted.sheet.in.h:31
 msgid "Right arrow"
 msgstr "Seta à direita"
 
-#: sheets/Assorted.sheet.in.h:36
+#: sheets/Assorted.sheet.in.h:32
 msgid "Seven point star"
 msgstr "Estrela de sete pontas"
 
-#: sheets/Assorted.sheet.in.h:37
+#: sheets/Assorted.sheet.in.h:33
 msgid "Sharp eight point star"
 msgstr "Estrela de oito pontas afiadas"
 
-#: sheets/Assorted.sheet.in.h:38
+#: sheets/Assorted.sheet.in.h:34
 msgid "Six point star"
 msgstr "Estrela de seis pontas"
 
-#: sheets/Assorted.sheet.in.h:39
+#: sheets/Assorted.sheet.in.h:35
 msgid "Sun"
 msgstr "Sol"
 
-#: sheets/Assorted.sheet.in.h:40
+#: sheets/Assorted.sheet.in.h:36
 msgid "Swiss cross"
 msgstr "Cruz suíça"
 
-#: sheets/Assorted.sheet.in.h:41
+#: sheets/Assorted.sheet.in.h:37
 msgid "Trapezoid"
 msgstr "Trapezóide"
 
-#: sheets/Assorted.sheet.in.h:42
+#: sheets/Assorted.sheet.in.h:38
 msgid "Turn-up arrow"
 msgstr "Seta esquerda-acima"
 
-#: sheets/Assorted.sheet.in.h:43
+#: sheets/Assorted.sheet.in.h:39
 msgid "Up arrow"
 msgstr "Seta acima"
 
-#: sheets/Assorted.sheet.in.h:44
+#: sheets/Assorted.sheet.in.h:40
 msgid "Up-down arrow"
 msgstr "Seta acima-abaixo"
 
-#: sheets/Assorted.sheet.in.h:45
+#: sheets/Assorted.sheet.in.h:41
 msgid "Up-down-left arrow"
 msgstr "Seta acima-abaixo-esquerda"
 
-#: sheets/Assorted.sheet.in.h:46
+#: sheets/Assorted.sheet.in.h:42
 msgid "Vertical parallelogram"
 msgstr "Paralelogramo vertical"
 
+#: sheets/ChemEng.sheet.in.h:1
+msgid "AC Generator"
+msgstr "Gerador AC"
+
+#: sheets/ChemEng.sheet.in.h:2
+msgid "Air Cooler"
+msgstr "Resfriador de Ar"
+
+#: sheets/ChemEng.sheet.in.h:3
+msgid "Autoclave"
+msgstr "Autoclave"
+
+#: sheets/ChemEng.sheet.in.h:4
+msgid "Axial Flow Fan"
+msgstr "Ventilador de Fluxo Axial"
+
+#: sheets/ChemEng.sheet.in.h:5
+msgid "Basic Filter"
+msgstr "Filtro Básico"
+
+#: sheets/ChemEng.sheet.in.h:6
+msgid "Centrifugal Pump or Fan"
+msgstr "Bomba ou Ventilador Centrífugo"
+
+#: sheets/ChemEng.sheet.in.h:7
+msgid "Centrifuge"
+msgstr "Centrifugadora"
+
+#: sheets/ChemEng.sheet.in.h:8
+msgid "ChemEng"
+msgstr "Engenharia Química"
+
+#: sheets/ChemEng.sheet.in.h:9
+msgid "Clarifier or Settling Tank"
+msgstr "Tanque Clarificador ou de Estabilização"
+
+#: sheets/ChemEng.sheet.in.h:10
+msgid "Collection for chemical engineering"
+msgstr "Coleção de Engenharia Química"
+
+#: sheets/ChemEng.sheet.in.h:11
+msgid "Compressor or Turbine"
+msgstr "Compressor ou Turbina"
+
+#: sheets/ChemEng.sheet.in.h:12
+msgid "Covered tank"
+msgstr "Tanque Coberto"
+
+#: sheets/ChemEng.sheet.in.h:13
+msgid "Cyclone and hydrocyclone"
+msgstr "Ciclone e Hidrociclone"
+
+#: sheets/ChemEng.sheet.in.h:14
+msgid "Double-Pipe Exchanger"
+msgstr "Trocador de Tubulação Dupla"
+
+#: sheets/ChemEng.sheet.in.h:15
+msgid "Ejector or Injector"
+msgstr "Ejetor ou Injetor"
+
+#: sheets/ChemEng.sheet.in.h:16
+msgid "Fan or Stirrer"
+msgstr "Ventilador ou Agitador"
+
+#: sheets/ChemEng.sheet.in.h:17
+msgid "Fixed-Sheet Exchanger"
+msgstr "Trocador de Placa Fixa"
+
+#: sheets/ChemEng.sheet.in.h:18
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr "Trocador de Tubo U ou de Cabeça Flutuante"
+
+#: sheets/ChemEng.sheet.in.h:19
+msgid "Fluid Contacting Vessel, simple"
+msgstr "Vaso de Fluido de Contato, simples"
+
+#: sheets/ChemEng.sheet.in.h:20
+msgid "Forced-Flow Air Cooler"
+msgstr "Resfriador de Ar de Fluxo Forçado"
+
+#: sheets/ChemEng.sheet.in.h:21
+msgid "Gas Holder, basic"
+msgstr "Cilíndro de Gás, básico"
+
+#: sheets/ChemEng.sheet.in.h:22
+msgid "Heating/Cooling Coil"
+msgstr "Serpentina de Aquecimento/Resfriamento"
+
+#: sheets/ChemEng.sheet.in.h:23
+msgid "Heating/Cooling Coil, vertical"
+msgstr "Serpentina de Aquecimento/Resfriamento, vertical"
+
+#: sheets/ChemEng.sheet.in.h:24
+msgid "Induced-Flow Air Cooler"
+msgstr "Resfriador de Ar de Fluxo Induzido"
+
+#: sheets/ChemEng.sheet.in.h:25
+msgid "Kettle Reboiler"
+msgstr "Caldera de Re-evaporação"
+
+#: sheets/ChemEng.sheet.in.h:26
+msgid "Knock-out Drum (with demister pad)"
+msgstr "Cilíndro Rotativo (com desembaçador)"
+
+#: sheets/ChemEng.sheet.in.h:27
+msgid "Measurement"
+msgstr "Medida"
+
+#: sheets/ChemEng.sheet.in.h:28
+msgid "Mixer"
+msgstr "Misturador"
+
+#: sheets/ChemEng.sheet.in.h:29
+msgid "Open Tank"
+msgstr "Tanque Aberto"
+
+#: sheets/ChemEng.sheet.in.h:30
+msgid "Plate Exchanger"
+msgstr "Trocador de Placas"
+
+#: sheets/ChemEng.sheet.in.h:31
+msgid "Pneumatic Line"
+msgstr "Linha Pneumática"
+
+#: sheets/ChemEng.sheet.in.h:32
+msgid "Pneumatic Line, vertical"
+msgstr "Linha Pneumática, vertical"
+
+#: sheets/ChemEng.sheet.in.h:33
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr "Compressor ou Bomba Rotativa de Deslocamento Positivo"
+
+#: sheets/ChemEng.sheet.in.h:34
+msgid "Reactor or Absorption Vessel, simple"
+msgstr "Reator ou Vaso de Absorção, simples"
+
+#: sheets/ChemEng.sheet.in.h:35
+msgid "Reciprocating Compressor or Pump"
+msgstr "Bomba ou Compressor de Reciprocação"
+
+#: sheets/ChemEng.sheet.in.h:36
+msgid "Regulable Valve"
+msgstr "Válvula Regulável"
+
+#: sheets/ChemEng.sheet.in.h:37
+msgid "Regulable Valve, vertical"
+msgstr "Válvula Regulável, vertical"
+
+#: sheets/ChemEng.sheet.in.h:38
+msgid "Sealed Tank"
+msgstr "Tanque Selado"
+
+#: sheets/ChemEng.sheet.in.h:39
+msgid "Simple Furnace"
+msgstr "Forno Simples"
+
+#: sheets/ChemEng.sheet.in.h:40
+msgid "Simple Heat Exchanger"
+msgstr "Trocador de Calor Simples"
+
+#: sheets/ChemEng.sheet.in.h:41
+msgid "Simple Heat Exchanger, vertical"
+msgstr "Trocador de Calor Simples, vertical"
+
+#: sheets/ChemEng.sheet.in.h:42
+msgid "Simple Vessel"
+msgstr "Vaso Simples"
+
+#: sheets/ChemEng.sheet.in.h:43
+msgid "Spray Drier"
+msgstr "Spray de Secagem"
+
+#: sheets/ChemEng.sheet.in.h:44
+msgid "Spraying Device"
+msgstr "Mecanismo de Secagem"
+
+#: sheets/ChemEng.sheet.in.h:45
+msgid "Storage Sphere"
+msgstr "Esfera de Armazenamento"
+
+#: sheets/ChemEng.sheet.in.h:46
+msgid "Tank with Fixed Roof"
+msgstr "Tanque com Cobertura Fixa"
+
+#: sheets/ChemEng.sheet.in.h:47
+msgid "Tank with Floating Roof"
+msgstr "Tanque com Cobertura Flutuante"
+
+#: sheets/ChemEng.sheet.in.h:48
+msgid "Tray Column, detailed"
+msgstr "Coluna Tray, detalhada"
+
+#: sheets/ChemEng.sheet.in.h:49
+msgid "Tray Column, simple"
+msgstr "Coluna Tray, simples"
+
+#: sheets/ChemEng.sheet.in.h:50
+msgid "Valve"
+msgstr "Válvula"
+
+#: sheets/ChemEng.sheet.in.h:51
+msgid "Valve, vertical"
+msgstr "Válvula, vertical"
+
+#: sheets/ChemEng.sheet.in.h:52
+msgid "Water Cooler"
+msgstr "Resfriador de Água"
+
+#: sheets/ChemEng.sheet.in.h:53
+msgid "Water Cooler, vertical"
+msgstr "Reafriador de Água, vertical"
+
 #: sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
 msgstr "Circuito"
@@ -5384,67 +5668,63 @@ msgstr "Microfone"
 msgid "NMOS transistor"
 msgstr "Transistor NMOS"
 
-#.
-#.
-#: sheets/Circuit.sheet.in.h:20
+#: sheets/Circuit.sheet.in.h:18
 msgid "NPN bipolar transistor"
 msgstr "Transistor bipolar NPN"
 
-#: sheets/Circuit.sheet.in.h:21
+#: sheets/Circuit.sheet.in.h:19
 msgid "Operational amplifier"
 msgstr "Amplificador operacional"
 
-#: sheets/Circuit.sheet.in.h:22
+#: sheets/Circuit.sheet.in.h:20
 msgid "PMOS transistor"
 msgstr "Transistor PMOS"
 
-#.
-#.
-#: sheets/Circuit.sheet.in.h:25
+#: sheets/Circuit.sheet.in.h:21
 msgid "PNP bipolar transistor"
 msgstr "Transistor bipolar PNP"
 
-#: sheets/Circuit.sheet.in.h:26 sheets/ciscomisc.sheet.in.h:39
+#: sheets/Circuit.sheet.in.h:22 sheets/ciscomisc.sheet.in.h:39
 msgid "Speaker"
 msgstr "Autofalante"
 
-#: sheets/Circuit.sheet.in.h:27
+#: sheets/Circuit.sheet.in.h:23
 msgid "Vertically aligned LED"
 msgstr "LED alinhado verticalmente"
 
-#: sheets/Circuit.sheet.in.h:28
+#: sheets/Circuit.sheet.in.h:24
 msgid "Vertically aligned capacitor"
 msgstr "Capacitor alinhado verticalmente"
 
-#: sheets/Circuit.sheet.in.h:29
+#: sheets/Circuit.sheet.in.h:25
 msgid "Vertically aligned diode"
 msgstr "Diodo alinhado verticalmente"
 
-#: sheets/Circuit.sheet.in.h:30
+#: sheets/Circuit.sheet.in.h:26
 msgid "Vertically aligned fuse"
 msgstr "Fusível alinhado verticalmente"
 
-#: sheets/Circuit.sheet.in.h:31
+#: sheets/Circuit.sheet.in.h:27
 msgid "Vertically aligned inductor"
 msgstr "Indutor alinhado verticalmente"
 
-#: sheets/Circuit.sheet.in.h:32
+#: sheets/Circuit.sheet.in.h:28
 msgid "Vertically aligned inductor (European)"
 msgstr "Indutor alinhado verticalmente (europeu)"
 
-#: sheets/Circuit.sheet.in.h:33
+#: sheets/Circuit.sheet.in.h:29
 msgid "Vertically aligned powersource"
 msgstr "Fonte de potência alinhada verticalmente"
 
-#: sheets/Circuit.sheet.in.h:34
+#: sheets/Circuit.sheet.in.h:30
 msgid "Vertically aligned resistor"
 msgstr "Resistor alinhado verticalmente"
 
-#: sheets/Circuit.sheet.in.h:35
+#: sheets/Circuit.sheet.in.h:31
 msgid "Vertically aligned resistor (European)"
 msgstr "Resistor alinhado verticalmente (europeu)"
 
-#: sheets/Circuit.sheet.in.h:36
+#: sheets/Circuit.sheet.in.h:32
 msgid "Vertically aligned zener diode"
 msgstr "Diodo zener alinhado verticalmente"
 
@@ -5752,118 +6032,115 @@ msgstr "Função"
 msgid "Orthogonal polyline flow"
 msgstr "Fluxo de polilinhas ortogonais"
 
-#. XXX
-#: sheets/Flowchart.sheet.in.h:2
+#: sheets/Flowchart.sheet.in.h:1
 msgid "Collate"
 msgstr "Ordenar"
 
-#: sheets/Flowchart.sheet.in.h:3
+#: sheets/Flowchart.sheet.in.h:2
 msgid "Connector"
 msgstr "Conector"
 
-#: sheets/Flowchart.sheet.in.h:4 sheets/SDL.sheet.in.h:4
+#: sheets/Flowchart.sheet.in.h:3 sheets/SDL.sheet.in.h:4
 msgid "Decision"
 msgstr "Decisão"
 
-#: sheets/Flowchart.sheet.in.h:5
+#: sheets/Flowchart.sheet.in.h:4
 msgid "Delay"
 msgstr "Atraso"
 
-#: sheets/Flowchart.sheet.in.h:7
+#: sheets/Flowchart.sheet.in.h:6
 msgid "Document"
 msgstr "Documento"
 
-#: sheets/Flowchart.sheet.in.h:9
+#: sheets/Flowchart.sheet.in.h:8
 msgid "Flowchart"
 msgstr "Fluxograma"
 
-#: sheets/Flowchart.sheet.in.h:10
+#: sheets/Flowchart.sheet.in.h:9
 msgid "Input/Output"
 msgstr "Entrada/Saída"
 
-#: sheets/Flowchart.sheet.in.h:11
+#: sheets/Flowchart.sheet.in.h:10
 msgid "Internal storage"
 msgstr "Armazenagem interna"
 
-#: sheets/Flowchart.sheet.in.h:12
+#: sheets/Flowchart.sheet.in.h:11
 msgid "Magnetic disk"
 msgstr "Disco magnético"
 
-#: sheets/Flowchart.sheet.in.h:13
+#: sheets/Flowchart.sheet.in.h:12
 msgid "Magnetic drum"
 msgstr "Tambor magnético"
 
-#: sheets/Flowchart.sheet.in.h:14
+#: sheets/Flowchart.sheet.in.h:13
 msgid "Magnetic tape"
 msgstr "Fita magnética"
 
-#: sheets/Flowchart.sheet.in.h:15
+#: sheets/Flowchart.sheet.in.h:14
 msgid "Manual input"
 msgstr "Entrada manual"
 
-#: sheets/Flowchart.sheet.in.h:16
+#: sheets/Flowchart.sheet.in.h:15
 msgid "Manual operation"
 msgstr "Operação manual"
 
-#: sheets/Flowchart.sheet.in.h:17
+#: sheets/Flowchart.sheet.in.h:16
 msgid "Merge"
 msgstr "Mesclar"
 
-#: sheets/Flowchart.sheet.in.h:18
+#: sheets/Flowchart.sheet.in.h:17
 msgid "Objects to draw flowcharts"
 msgstr "Objetos para desenhar fluxogramas"
 
-#. XXX
-#: sheets/Flowchart.sheet.in.h:20
+#: sheets/Flowchart.sheet.in.h:18
 msgid "Off page connector"
 msgstr "Conector fora de página"
 
-#: sheets/Flowchart.sheet.in.h:21
+#: sheets/Flowchart.sheet.in.h:19
 msgid "Offline storage"
 msgstr "Armazenamento 'offline'"
 
-#: sheets/Flowchart.sheet.in.h:22
+#: sheets/Flowchart.sheet.in.h:20
 msgid "Or"
 msgstr "Ou"
 
-#: sheets/Flowchart.sheet.in.h:23
+#: sheets/Flowchart.sheet.in.h:21
 msgid "Predefined process"
 msgstr "Processos predefinidos"
 
-#: sheets/Flowchart.sheet.in.h:24
+#: sheets/Flowchart.sheet.in.h:22
 msgid "Preparation"
 msgstr "Preparação"
 
-#: sheets/Flowchart.sheet.in.h:25
+#: sheets/Flowchart.sheet.in.h:23
 msgid "Process/Auxiliary Operation"
 msgstr "Processar/Operação auxiliar"
 
-#: sheets/Flowchart.sheet.in.h:26
+#: sheets/Flowchart.sheet.in.h:24
 msgid "Punched card"
 msgstr "Cartão perfurado"
 
-#: sheets/Flowchart.sheet.in.h:27
+#: sheets/Flowchart.sheet.in.h:25
 msgid "Punched tape"
 msgstr "Fita perfurada"
 
-#: sheets/Flowchart.sheet.in.h:28
+#: sheets/Flowchart.sheet.in.h:26
 msgid "Sort"
 msgstr "Ordenar"
 
-#. XXX
-#: sheets/Flowchart.sheet.in.h:30
+#: sheets/Flowchart.sheet.in.h:27
 msgid "Summing junction"
 msgstr "Combinação de saída"
 
-#: sheets/Flowchart.sheet.in.h:31
+#: sheets/Flowchart.sheet.in.h:28
 msgid "Terminal Interrupt"
 msgstr "Interruptor de terminal"
 
-#: sheets/Flowchart.sheet.in.h:32
+#: sheets/Flowchart.sheet.in.h:29
 msgid "Transaction file"
 msgstr "Arquivo de transação"
 
-#: sheets/Flowchart.sheet.in.h:33
+#: sheets/Flowchart.sheet.in.h:30
 msgid "Transmittal tape"
 msgstr "Fita de transmissão"
 
@@ -5963,49 +6240,47 @@ msgstr "Fábrica"
 msgid "Footbridge, Pedestrian Bridge"
 msgstr "Ponte de pedestre"
 
-#. use dc:description instead?
-#: sheets/IsometricMap.sheet.in.h:17
+#: sheets/IsometricMap.sheet.in.h:16
 msgid "Isometric Directional Map Shapes"
 msgstr "Formas de mapa diagonal isométrico"
 
-#: sheets/IsometricMap.sheet.in.h:18
+#: sheets/IsometricMap.sheet.in.h:17
 msgid "Long Straight Road Section"
 msgstr "Seção de longa estrada reta"
 
-#. use dc:title instead?
-#: sheets/IsometricMap.sheet.in.h:20
+#: sheets/IsometricMap.sheet.in.h:18
 msgid "Map, Isometric"
 msgstr "Mapa, isométrico"
 
-#: sheets/IsometricMap.sheet.in.h:21
+#: sheets/IsometricMap.sheet.in.h:19
 msgid "One Way Road Sign"
 msgstr "Placa de mão única"
 
-#: sheets/IsometricMap.sheet.in.h:22
+#: sheets/IsometricMap.sheet.in.h:20
 msgid "River"
 msgstr "Rio"
 
-#: sheets/IsometricMap.sheet.in.h:23
+#: sheets/IsometricMap.sheet.in.h:21
 msgid "Road Section"
 msgstr "Seção de estrada"
 
-#: sheets/IsometricMap.sheet.in.h:24
+#: sheets/IsometricMap.sheet.in.h:22
 msgid "Roof1"
 msgstr "Teto 1"
 
-#: sheets/IsometricMap.sheet.in.h:25
+#: sheets/IsometricMap.sheet.in.h:23
 msgid "T-Junction"
 msgstr "Junção em T"
 
-#: sheets/IsometricMap.sheet.in.h:26
+#: sheets/IsometricMap.sheet.in.h:24
 msgid "Train 1, angled downward"
 msgstr "Trem 1, angular inferior"
 
-#: sheets/IsometricMap.sheet.in.h:27
+#: sheets/IsometricMap.sheet.in.h:25
 msgid "Train 2, angled upward"
 msgstr "Trem 2, angular superior"
 
-#: sheets/IsometricMap.sheet.in.h:28
+#: sheets/IsometricMap.sheet.in.h:26
 msgid "Tree 1"
 msgstr "Árvore 1"
 
@@ -6488,7 +6763,7 @@ msgstr "Componente"
 
 #: sheets/UML.sheet.in.h:9
 msgid "Constraint, place a constraint on something"
-msgstr "Restrição, colocar uma rstrição em alguma coisa"
+msgstr "Restrição, colocar uma restrição em alguma coisa"
 
 #: sheets/UML.sheet.in.h:11
 msgid "Editor for UML Static Structure Diagrams"
@@ -6536,7 +6811,7 @@ msgstr "Objetos"
 
 #: sheets/UML.sheet.in.h:25
 msgid "Realizes, implements a specific interface"
-msgstr "Realiza, implementa uma interface específica"
+msgstr "Cria, implementa uma interface específica"
 
 #: sheets/UML.sheet.in.h:27
 msgid "Small package"
@@ -7663,154 +7938,158 @@ msgid "Pieces of a jigsaw"
 msgstr "Peças de quebra-cabeças"
 
 #: sheets/network.sheet.in.h:1
+msgid "24 Port Patch Panel"
+msgstr "Painel de 24 Portas"
+
+#: sheets/network.sheet.in.h:2
 msgid "3 1/2 inch diskette"
 msgstr "Disquete de 3 1/2\""
 
-#: sheets/network.sheet.in.h:2
+#: sheets/network.sheet.in.h:3
 msgid "ATM switch symbol"
 msgstr "Símbolo de comutador ATM"
 
-#: sheets/network.sheet.in.h:3
+#: sheets/network.sheet.in.h:4
 msgid "Antenna for wireless transmission"
 msgstr "Antena para transmissão sem fio"
 
-#: sheets/network.sheet.in.h:4
+#: sheets/network.sheet.in.h:5
 msgid "Bigtower PC"
 msgstr "Torre grande de PC"
 
-#: sheets/network.sheet.in.h:5
+#: sheets/network.sheet.in.h:6
 msgid "Computer"
 msgstr "Computador"
 
-#: sheets/network.sheet.in.h:6
+#: sheets/network.sheet.in.h:7
 msgid "Desktop PC"
 msgstr "PC de mesa"
 
-#: sheets/network.sheet.in.h:7
+#: sheets/network.sheet.in.h:8
 msgid "Digitizing board"
 msgstr "Mesa de digitalização"
 
-#: sheets/network.sheet.in.h:8
+#: sheets/network.sheet.in.h:9
 msgid "Ethernet bus"
 msgstr "Barramento ethernet"
 
-#: sheets/network.sheet.in.h:9
+#: sheets/network.sheet.in.h:10
 msgid "External DAT drive"
 msgstr "Unidade DAT externa"
 
-#: sheets/network.sheet.in.h:10
+#: sheets/network.sheet.in.h:11
 msgid "Firewall router"
 msgstr "Roteador Firewall"
 
-#: sheets/network.sheet.in.h:11
+#: sheets/network.sheet.in.h:12
 msgid "Laptop PC"
 msgstr "PC Portátil"
 
-#: sheets/network.sheet.in.h:12
+#: sheets/network.sheet.in.h:13
 msgid "Miditower PC"
 msgstr "Torre média de PC"
 
-#: sheets/network.sheet.in.h:13
+#: sheets/network.sheet.in.h:14
 msgid "Minitower PC"
 msgstr "Minitorre de PC"
 
-#: sheets/network.sheet.in.h:14
+#: sheets/network.sheet.in.h:15
 msgid "Mobile phone"
 msgstr "Telefone Celular"
 
-#: sheets/network.sheet.in.h:15
+#: sheets/network.sheet.in.h:16
 msgid "Mobile telephony base station"
 msgstr "Estação base de telefonia móvel celular"
 
-#: sheets/network.sheet.in.h:16
+#: sheets/network.sheet.in.h:17
 msgid "Mobile telephony cell"
 msgstr "Telefone móvel celular"
 
-#: sheets/network.sheet.in.h:17
+#: sheets/network.sheet.in.h:18
 msgid "Modular switching system"
 msgstr "Sistema de comutador modular"
 
-#: sheets/network.sheet.in.h:18
+#: sheets/network.sheet.in.h:19
 msgid "Monitor"
 msgstr "Monitor"
 
-#: sheets/network.sheet.in.h:19
+#: sheets/network.sheet.in.h:20
 msgid "Network"
 msgstr "Rede"
 
-#: sheets/network.sheet.in.h:20
+#: sheets/network.sheet.in.h:21
 msgid "Network cloud"
 msgstr "Nuvem da rede"
 
-#: sheets/network.sheet.in.h:21
+#: sheets/network.sheet.in.h:22
 msgid "Objects to design network diagrams with"
 msgstr "Objetos para projetar diagramas de rede"
 
-#: sheets/network.sheet.in.h:22
+#: sheets/network.sheet.in.h:23
 msgid "Plotter"
 msgstr "Plotter"
 
-#: sheets/network.sheet.in.h:23
+#: sheets/network.sheet.in.h:24
 msgid "RJ45 wall-plug"
 msgstr "Tomada RJ45"
 
-#: sheets/network.sheet.in.h:24
+#: sheets/network.sheet.in.h:25
 msgid "Router symbol"
 msgstr "Símbolo de roteador"
 
-#: sheets/network.sheet.in.h:25
+#: sheets/network.sheet.in.h:26
 msgid "Simple modem"
 msgstr "Modem simples"
 
-#: sheets/network.sheet.in.h:26
+#: sheets/network.sheet.in.h:27
 msgid "Simple printer"
 msgstr "Impressora simples"
 
-#: sheets/network.sheet.in.h:27
+#: sheets/network.sheet.in.h:28
 msgid "Speaker with integrated amplifier"
 msgstr "Autofalante com amplificador integrado"
 
-#: sheets/network.sheet.in.h:28
+#: sheets/network.sheet.in.h:29
 msgid "Speaker without amplifier"
 msgstr "Autofalante sem amplificador"
 
-#: sheets/network.sheet.in.h:29
+#: sheets/network.sheet.in.h:30
 msgid "Stackable hub or switch"
 msgstr "Hub ou comutador empilhável"
 
-#: sheets/network.sheet.in.h:30
+#: sheets/network.sheet.in.h:31
 msgid "Storage"
 msgstr "Armazenagem"
 
-#: sheets/network.sheet.in.h:31
+#: sheets/network.sheet.in.h:32
 msgid "Switch symbol"
 msgstr "Símbolo de comutador"
 
-#: sheets/network.sheet.in.h:32
+#: sheets/network.sheet.in.h:33
 msgid "Telephone"
 msgstr "Telefone"
 
-#: sheets/network.sheet.in.h:33
+#: sheets/network.sheet.in.h:34
 msgid "UNIX workstation"
 msgstr "Estação de Trabalho UNIX"
 
-#: sheets/network.sheet.in.h:34
+#: sheets/network.sheet.in.h:35
 msgid "WAN connection"
 msgstr "Conexão WAN"
 
-#: sheets/network.sheet.in.h:35
+#: sheets/network.sheet.in.h:36
 msgid "WAN link"
 msgstr "Link WAN"
 
-#: sheets/network.sheet.in.h:36
+#: sheets/network.sheet.in.h:37
 msgid "Wall-plug for the scEAD cabling system"
 msgstr "Tomada do sistema de cabeamento scEAD"
 
-#: sheets/network.sheet.in.h:37
+#: sheets/network.sheet.in.h:38
 msgid "Workstation monitor"
 msgstr "Monitor de Estação de Trabalho"
 
-#: sheets/network.sheet.in.h:38
+#: sheets/network.sheet.in.h:39
 msgid "ZIP disk"
 msgstr "Disco ZIP"
 
@@ -7846,6 +8125,9 @@ msgstr "Servidor de dados Sybase"
 msgid "Sybase replication server"
 msgstr "Servidor de replicação Sybase"
 
+#~ msgid "Helvetica"
+#~ msgstr "Helvetica"
+
 #~ msgid "Could not open `%s' for writing"
 #~ msgstr "Impossível abrir '%s' para escrita"
 

--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dia.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-23 14:07+0200\n"
+"POT-Creation-Date: 2004-07-10 03:19+0200\n"
 "PO-Revision-Date: 2004-01-12 15:23+0100\n"
 "Last-Translator: Laurent Dhima <[e-mail]>\n"
 "Language-Team: Albanian <[e-mail]>\n"
@@ -16,149 +16,148 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: app/app_procs.c:220
+#: app/app_procs.c:219
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr ""
 
-#: app/app_procs.c:230
+#: app/app_procs.c:228
 #, c-format
 msgid "%s error: input and output file name is identical: %s"
 msgstr ""
 
-#: app/app_procs.c:238
+#: app/app_procs.c:235
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr ""
 
 #. if (!quiet)
-#: app/app_procs.c:258
+#: app/app_procs.c:255
 #, c-format
 msgid "%s --> %s\n"
 msgstr ""
 
-#: app/app_procs.c:306
+#: app/app_procs.c:303
 #, c-format
 msgid "Can't find output format %s\n"
 msgstr ""
 
 #. Translators:  The argument is a list of options, not to be translated
-#: app/app_procs.c:393
+#: app/app_procs.c:390
 #, c-format
 msgid "Export to file format and exit.  Supported formats are: %s"
 msgstr ""
 
 #. &export_file_name
-#: app/app_procs.c:402
+#: app/app_procs.c:399
 msgid "Export loaded file and exit"
 msgstr ""
 
-#: app/app_procs.c:402 app/diaconv.c:94
+#: app/app_procs.c:399 app/diaconv.c:94
 msgid "OUTPUT"
 msgstr ""
 
 #. &export_file_format
-#: app/app_procs.c:404
+#: app/app_procs.c:401
 msgid "FORMAT"
 msgstr ""
 
-#: app/app_procs.c:407
+#: app/app_procs.c:404
 msgid "Export graphics size"
 msgstr ""
 
-#: app/app_procs.c:407
+#: app/app_procs.c:404
 msgid "WxH"
 msgstr ""
 
-#: app/app_procs.c:409
+#: app/app_procs.c:406
 msgid "Don't show the splash screen"
 msgstr ""
 
-#: app/app_procs.c:411
+#: app/app_procs.c:408
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr ""
 
-#: app/app_procs.c:413
+#: app/app_procs.c:410
 msgid "Display credits list and exit"
 msgstr ""
 
-#: app/app_procs.c:415
+#: app/app_procs.c:412
 msgid "Display version and exit"
 msgstr ""
 
-#: app/app_procs.c:417 app/diaconv.c:95
+#: app/app_procs.c:413 app/diaconv.c:95
 msgid "Show this help message"
 msgstr ""
 
-#: app/app_procs.c:456
+#: app/app_procs.c:454
 msgid "Can't connect to session manager!\n"
 msgstr ""
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: app/app_procs.c:484
+#: app/app_procs.c:481
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr ""
 
-#: app/app_procs.c:486
+#: app/app_procs.c:483
 #, c-format
 msgid "Dia version %s\n"
 msgstr ""
 
-#: app/app_procs.c:546 app/app_procs.c:548 app/diaconv.c:201 app/diaconv.c:203
+#: app/app_procs.c:537 app/app_procs.c:539 app/diaconv.c:201 app/diaconv.c:203
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs, exiting...\n"
 msgstr ""
 
-#: app/app_procs.c:589
+#: app/app_procs.c:580
 msgid "Diagram1.dia"
 msgstr ""
 
-#: app/app_procs.c:628
+#: app/app_procs.c:619
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you can cause this message to appear.\n"
 msgstr ""
 
 #. no standard buttons
-#: app/app_procs.c:640
+#: app/app_procs.c:631
 msgid ""
 "Modified diagrams exist.\n"
 "Are you sure you want to quit Dia\n"
 "without saving them?"
 msgstr ""
 
-#: app/app_procs.c:644
+#: app/app_procs.c:635
 msgid "Quit Dia"
 msgstr ""
 
 #. This printf seems to prevent a race condition with unrefs.
 #. Yuck.  -Lars
-#: app/app_procs.c:695
-#, c-format
+#: app/app_procs.c:686
 msgid "Thank you for using Dia.\n"
 msgstr ""
 
-#: app/app_procs.c:711 app/app_procs.c:718
+#: app/app_procs.c:702 app/app_procs.c:709
 msgid "Could not create per-user Dia config directory"
 msgstr ""
 
-#: app/app_procs.c:720
+#: app/app_procs.c:711
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
 msgstr ""
 
-#: app/app_procs.c:742 app/diaconv.c:251
+#: app/app_procs.c:733 app/diaconv.c:251
 msgid "Objects and filters internal to dia"
 msgstr ""
 
-#: app/app_procs.c:781 app/diaconv.c:121
+#: app/app_procs.c:772 app/diaconv.c:121
 msgid "[OPTION...] [FILE...]"
 msgstr ""
 
-#: app/app_procs.c:785 app/diaconv.c:128
+#: app/app_procs.c:775 app/diaconv.c:128
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -167,6 +166,33 @@ msgstr ""
 "Gabim në opcionin %s: %s.\n"
 "Zbato '%s --help' për të shikuar listën e plotë të opcioneve të komandës.\n"
 
+#: app/app_procs.c:860
+msgid ""
+"The original author of Dia was:\n"
+"\n"
+msgstr ""
+
+#: app/app_procs.c:865
+msgid ""
+"\n"
+"The current maintainers of Dia are:\n"
+"\n"
+msgstr ""
+
+#: app/app_procs.c:870
+msgid ""
+"\n"
+"Other authors are:\n"
+"\n"
+msgstr ""
+
+#: app/app_procs.c:875
+msgid ""
+"\n"
+"Dia is documented by:\n"
+"\n"
+msgstr ""
+
 #: app/autosave.c:93
 msgid "Recovering autosaved diagrams"
 msgstr ""
@@ -225,7 +251,7 @@ msgstr ""
 #: app/commands.c:623
 msgid ""
 "Dia is a program for drawing structured diagrams.\n"
-"Please visit http://www.lysator.liu.se/~alla/dia for more information."
+"Please visit http://www.gnome.org/projects/dia for more information."
 msgstr ""
 
 #: app/commands.c:662
@@ -243,10 +269,9 @@ msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
 msgstr ""
 
 #: app/commands.c:715
-msgid "Please visit http://www.lysator.liu.se/~alla/dia for more information"
+msgid "Please visit http://www.gnome.org/projects/dia for more information"
 msgstr ""
 
-#. GRUT modified this item
 #: app/commands.c:720
 msgid "Contributors:"
 msgstr "Ndihmuan:"
@@ -263,54 +288,61 @@ msgstr ""
 msgid "Defaults: "
 msgstr ""
 
-#: app/dia-props.c:75
+#: app/dia-props.c:89
 msgid "Diagram Properties"
 msgstr ""
 
-#: app/dia-props.c:110
+#: app/dia-props.c:123
 msgid "Dynamic grid"
 msgstr ""
 
-#: app/dia-props.c:118
+#: app/dia-props.c:131
 msgid "x"
 msgstr ""
 
-#: app/dia-props.c:122
+#: app/dia-props.c:135
 msgid "y"
 msgstr "p"
 
-#. GRUT modified this item
-#: app/dia-props.c:127
+#: app/dia-props.c:140
 msgid "Spacing"
 msgstr "Hapësira"
 
-#: app/dia-props.c:147
+#: app/dia-props.c:160
 msgid "Visible spacing"
 msgstr ""
 
-#: app/dia-props.c:167
+#. Hexes!
+#: app/dia-props.c:181 app/preferences.c:162
+msgid "Hex grid"
+msgstr ""
+
+#: app/dia-props.c:189
+msgid "Hex grid size"
+msgstr ""
+
+#: app/dia-props.c:202
 msgid "Grid"
 msgstr "Rrjeta"
 
-#: app/dia-props.c:178 lib/diagramdata.c:124
+#: app/dia-props.c:213 lib/diagramdata.c:127
 msgid "Background"
 msgstr "Sfondi"
 
-#: app/dia-props.c:189 app/preferences.c:105
+#: app/dia-props.c:224 app/preferences.c:105
 msgid "Grid Lines"
 msgstr ""
 
-#: app/dia-props.c:200
+#: app/dia-props.c:235
 msgid "Page Breaks"
 msgstr ""
 
-#. GRUT modified this item
-#: app/dia-props.c:211
+#: app/dia-props.c:246
 msgid "Colors"
 msgstr "Ngjyrat"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: app/dia-props.c:230
+#: app/dia-props.c:265
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr ""
@@ -319,22 +351,18 @@ msgstr ""
 msgid "Could not initialize Bonobo!"
 msgstr ""
 
-#. GRUT modified this item
 #: app/diacanvas.c:121
 msgid "X position"
 msgstr "Pozicioni X"
 
-#. GRUT modified this item
 #: app/diacanvas.c:122
 msgid "X position of child widget"
 msgstr "Pozicioni X i widget bir"
 
-#. GRUT modified this item
 #: app/diacanvas.c:131
 msgid "Y position"
 msgstr "Pozicioni Y"
 
-#. GRUT modified this item
 #: app/diacanvas.c:132
 msgid "Y position of child widget"
 msgstr "Pozicioni Y i widget bir"
@@ -528,7 +556,6 @@ msgstr ""
 msgid "Fit to:"
 msgstr ""
 
-#. GRUT modified this item
 #: app/diapagelayout.c:287
 msgid "by"
 msgstr "sipas"
@@ -538,23 +565,21 @@ msgstr "sipas"
 msgid "%0.3gcm x %0.3gcm"
 msgstr ""
 
-#. GRUT modified this item
 #: app/diapagelayout.c:786 app/pagesetup.c:76
 msgid "Page Setup"
 msgstr "Rregullimi i faqes"
 
-#: app/disp_callbacks.c:81 app/properties.c:153
+#: app/disp_callbacks.c:81 app/properties.c:152
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
 msgstr ""
 
-#. GRUT modified this item
 #: app/disp_callbacks.c:116
 msgid "Properties..."
 msgstr "Pronësitë..."
 
-#: app/disp_callbacks.c:908
+#: app/disp_callbacks.c:904
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -579,13 +604,12 @@ msgstr ""
 msgid "Close Diagram"
 msgstr ""
 
-#. GRUT modified this item
 #: app/display.c:1001
 msgid "Discard Changes"
 msgstr "Anullo ndryshimet"
 
-#: app/export_png.c:134 app/load_save.c:890 app/render_eps.c:103
-#: plug-ins/cairo/diacairo.c:908 plug-ins/cgm/cgm.c:1157
+#: app/export_png.c:134 app/load_save.c:893 app/render_eps.c:103
+#: plug-ins/cairo/diacairo.c:911 plug-ins/cgm/cgm.c:1157
 #: plug-ins/dxf/dxf-export.c:505 plug-ins/hpgl/hpgl.c:732
 #: plug-ins/metapost/render_metapost.c:964
 #: plug-ins/pstricks/render_pstricks.c:800 plug-ins/shape/shape-export.c:135
@@ -612,7 +636,6 @@ msgstr ""
 msgid "PNG Export Options"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Channel/Export
 #. Translators: Menu item Verb/Channel/Export/Export
 #: app/export_png.c:300 objects/FS/function.c:685 objects/FS/function.c:687
@@ -631,67 +654,67 @@ msgstr ""
 msgid "Portable Network Graphics"
 msgstr ""
 
-#: app/filedlg.c:121 app/filedlg.c:392
+#: app/filedlg.c:122 app/filedlg.c:393
 msgid "By extension"
 msgstr ""
 
-#: app/filedlg.c:182
+#: app/filedlg.c:183
 msgid "Open Diagram"
 msgstr ""
 
-#: app/filedlg.c:210
+#: app/filedlg.c:211
 msgid "Open Options"
 msgstr ""
 
-#: app/filedlg.c:218 app/filedlg.c:510
+#: app/filedlg.c:219 app/filedlg.c:511
 msgid "Determine file type:"
 msgstr ""
 
-#: app/filedlg.c:255
+#: app/filedlg.c:256
 msgid ""
 "Some characters in the filename are neither UTF-8 nor your local encoding.\n"
 "Some things will break."
 msgstr ""
 
-#: app/filedlg.c:261 app/filedlg.c:436
+#: app/filedlg.c:262 app/filedlg.c:437
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: app/filedlg.c:269 app/filedlg.c:443
+#: app/filedlg.c:270 app/filedlg.c:444
 msgid "File already exists"
 msgstr ""
 
-#: app/filedlg.c:301
+#: app/filedlg.c:302
 msgid "Save Diagram"
 msgstr ""
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: app/filedlg.c:306
+#: app/filedlg.c:307
 msgid "Compress diagram files"
 msgstr ""
 
-#: app/filedlg.c:315
+#: app/filedlg.c:316
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
 msgstr ""
 
-#: app/filedlg.c:462
+#: app/filedlg.c:463
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
 "to use to save '%s'"
 msgstr ""
 
-#: app/filedlg.c:480
+#: app/filedlg.c:481
 msgid "Export Diagram"
 msgstr ""
 
-#: app/filedlg.c:502
+#: app/filedlg.c:503
 msgid "Export Options"
 msgstr ""
 
@@ -699,7 +722,6 @@ msgstr ""
 msgid "Modify object(s)"
 msgstr ""
 
-#. GRUT modified this item
 #: app/interface.c:54
 msgid "Modify"
 msgstr "Ndrysho"
@@ -717,14 +739,13 @@ msgstr ""
 msgid "Scroll"
 msgstr ""
 
-#. GRUT modified this item
 #: app/interface.c:68 app/interface.c:69 lib/properties.c:77
 #: lib/properties.h:516 lib/properties.h:519 objects/UML/activity.c:122
 #: objects/UML/actor.c:120 objects/UML/classicon.c:141
 #: objects/UML/component.c:126 objects/UML/component_feature.c:154
 #: objects/UML/node.c:125 objects/UML/note.c:119 objects/UML/object.c:145
 #: objects/UML/small_package.c:126 objects/UML/state.c:139
-#: objects/UML/usecase.c:136 objects/Jackson/requirement.c:135
+#: objects/UML/usecase.c:136 objects/Jackson/requirement.c:144
 #: objects/network/basestation.c:131 objects/network/radiocell.c:146
 msgid "Text"
 msgstr "Teksti"
@@ -765,7 +786,6 @@ msgstr ""
 msgid "Bezierline"
 msgstr ""
 
-#. GRUT modified this item
 #: app/interface.c:118 app/interface.c:119
 msgid "Image"
 msgstr "Figura"
@@ -841,7 +861,6 @@ msgstr ""
 msgid "Delete Layer"
 msgstr ""
 
-#. GRUT modified this item
 #: app/layer_dialog.c:212
 msgid "Layers"
 msgstr "Planimetritë"
@@ -858,7 +877,6 @@ msgstr "Mbylle"
 msgid "New layer"
 msgstr ""
 
-#. GRUT modified this item
 #: app/layer_dialog.c:537
 msgid "none"
 msgstr "asnjë"
@@ -875,12 +893,12 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: app/linewidth_area.c:248 lib/properties.h:480 lib/properties.h:483
+#: app/linewidth_area.c:246 lib/properties.h:480 lib/properties.h:483
 #: objects/chronogram/chronoline.c:181 objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr ""
 
-#: app/linewidth_area.c:260
+#: app/linewidth_area.c:258
 msgid "Line width:"
 msgstr ""
 
@@ -932,7 +950,7 @@ msgid ""
 "Not a Dia file."
 msgstr ""
 
-#: app/load_save.c:572
+#: app/load_save.c:575
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -940,12 +958,12 @@ msgid ""
 "A valid Dia file defines at least one layer."
 msgstr ""
 
-#: app/load_save.c:923
+#: app/load_save.c:926
 #, c-format
 msgid "Failed to save file '%s'.\n"
 msgstr ""
 
-#: app/load_save.c:994 app/load_save.c:999
+#: app/load_save.c:997 app/load_save.c:1002
 msgid "Native Dia Diagram"
 msgstr ""
 
@@ -1418,7 +1436,6 @@ msgstr ""
 msgid "Select Printer"
 msgstr ""
 
-#. GRUT modified this item
 #: app/paginate_psprint.c:238 sheets/ciscocomputer.sheet.in.h:25
 msgid "Printer"
 msgstr "Printeri"
@@ -1437,12 +1454,12 @@ msgstr ""
 msgid "Could not open '%s' for writing: %s"
 msgstr ""
 
-#: app/paginate_psprint.c:378
+#: app/paginate_psprint.c:376
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr ""
 
-#: app/paginate_psprint.c:388
+#: app/paginate_psprint.c:387
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr ""
@@ -1451,24 +1468,24 @@ msgstr ""
 msgid "Plug-ins"
 msgstr ""
 
-#: app/plugin-manager.c:256
+#: app/plugin-manager.c:255
 msgid "Loaded"
 msgstr ""
 
-#: app/plugin-manager.c:263 objects/UML/class.c:107
+#: app/plugin-manager.c:262 objects/UML/class.c:112
 #: objects/UML/large_package.c:128
 msgid "Name"
 msgstr "Emri"
 
-#: app/plugin-manager.c:269
+#: app/plugin-manager.c:268
 msgid "Description"
 msgstr "Përshkrimi"
 
-#: app/plugin-manager.c:278
+#: app/plugin-manager.c:277
 msgid "Load at Startup"
 msgstr ""
 
-#: app/plugin-manager.c:285
+#: app/plugin-manager.c:284
 msgid "File Name"
 msgstr ""
 
@@ -1530,7 +1547,6 @@ msgstr "Vertikale"
 msgid "Paper type:"
 msgstr ""
 
-#. GRUT modified this item
 #: app/preferences.c:135
 msgid "Background Color:"
 msgstr "Ngjyra e Sfondit:"
@@ -1564,7 +1580,6 @@ msgstr "I dukshëm"
 msgid "Page breaks:"
 msgstr ""
 
-#. GRUT modified this item
 #: app/preferences.c:150 app/preferences.c:160
 msgid "Color:"
 msgstr "Ngjyra:"
@@ -1593,25 +1608,29 @@ msgstr ""
 msgid "Lines per major line"
 msgstr ""
 
-#: app/preferences.c:179
+#: app/preferences.c:163
+#, fuzzy
+msgid "Hex Size:"
+msgstr "Madhë_sia:"
+
+#: app/preferences.c:182
 msgid "Diagram tree window:"
 msgstr ""
 
-#: app/preferences.c:181
+#: app/preferences.c:184
 msgid "Save hidden object types"
 msgstr ""
 
-#: app/preferences.c:388 lib/prop_inttypes.c:158
+#: app/preferences.c:391 lib/prop_inttypes.c:158
 msgid "Yes"
 msgstr "Po"
 
-#: app/preferences.c:388 app/preferences.c:399 lib/prop_inttypes.c:160
+#: app/preferences.c:391 app/preferences.c:402 lib/prop_inttypes.c:160
 #: lib/prop_inttypes.c:186
 msgid "No"
 msgstr "Jo"
 
-#. GRUT modified this item
-#: app/preferences.c:501
+#: app/preferences.c:504
 msgid "Preferences"
 msgstr "Preferimet"
 
@@ -1619,15 +1638,15 @@ msgstr "Preferimet"
 msgid "Object properties"
 msgstr ""
 
-#: app/properties.c:81
+#: app/properties.c:80
 msgid "This object has no properties."
 msgstr ""
 
-#: app/properties.c:203
+#: app/properties.c:202
 msgid "Properties: "
 msgstr ""
 
-#: app/properties.c:207
+#: app/properties.c:206
 msgid "Object properties:"
 msgstr ""
 
@@ -1727,8 +1746,8 @@ msgid "New"
 msgstr "E re"
 
 #: app/sheets_dialog.c:362 app/sheets_dialog.c:794 objects/Istar/actor.c:143
-#: objects/Istar/actor.c:144 objects/Istar/other.c:167
-#: objects/Istar/other.c:168 objects/KAOS/other.c:169 objects/KAOS/other.c:170
+#: objects/Istar/actor.c:144 objects/Istar/other.c:150
+#: objects/Istar/other.c:151 objects/KAOS/other.c:151 objects/KAOS/other.c:152
 msgid "Type"
 msgstr "Lloji"
 
@@ -1766,12 +1785,11 @@ msgstr "Deaktivo"
 msgid "Description:"
 msgstr "Përshkrimi:"
 
-#. GRUT modified this item
 #: app/sheets_dialog.c:618 objects/FS/flow-ortho.c:168 objects/FS/flow.c:146
-#: objects/UML/class_dialog.c:890 objects/UML/class_dialog.c:1824
-#: objects/UML/class_dialog.c:2053 objects/UML/class_dialog.c:2569
-#: objects/Istar/link.c:167 objects/Jackson/phenomenon.c:135
-#: objects/KAOS/metaandorrel.c:154 objects/KAOS/metabinrel.c:171
+#: objects/UML/class_dialog.c:911 objects/UML/class_dialog.c:1845
+#: objects/UML/class_dialog.c:2074 objects/UML/class_dialog.c:2590
+#: objects/Istar/link.c:167 objects/Jackson/phenomenon.c:144
+#: objects/KAOS/metaandorrel.c:164 objects/KAOS/metabinrel.c:181
 msgid "Type:"
 msgstr "Lloji:"
 
@@ -1781,14 +1799,13 @@ msgstr ""
 
 #: app/sheets_dialog.c:672 objects/ER/attribute.c:151 objects/ER/entity.c:133
 #: objects/ER/relationship.c:138 objects/UML/association.c:200
-#: objects/UML/association.c:1126 objects/UML/class_dialog.c:879
-#: objects/UML/class_dialog.c:1813 objects/UML/class_dialog.c:2042
-#: objects/UML/class_dialog.c:2558 objects/UML/dependency.c:133
+#: objects/UML/association.c:1126 objects/UML/class_dialog.c:900
+#: objects/UML/class_dialog.c:1834 objects/UML/class_dialog.c:2063
+#: objects/UML/class_dialog.c:2579 objects/UML/dependency.c:133
 #: objects/UML/generalization.c:129 objects/UML/realizes.c:130
 msgid "Name:"
 msgstr "Emri:"
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Channel/Export/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
@@ -1911,7 +1928,7 @@ msgstr ""
 msgid "Diagram editor"
 msgstr ""
 
-#: lib/arrows.c:40 objects/UML/association.c:1149 objects/Jackson/domain.c:113
+#: lib/arrows.c:40 objects/UML/association.c:1149 objects/Jackson/domain.c:96
 msgid "None"
 msgstr "Asnjë"
 
@@ -2094,7 +2111,6 @@ msgstr ""
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#. GRUT modified this item
 #: lib/diagtkfontsel.c:209
 msgid "Font name"
 msgstr "Emri i gërmave"
@@ -2103,7 +2119,6 @@ msgstr "Emri i gërmave"
 msgid "The X string that represents this font."
 msgstr ""
 
-#. GRUT modified this item
 #: lib/diagtkfontsel.c:216
 msgid "Preview text"
 msgstr "Pamja e parë e tekstit"
@@ -2112,7 +2127,6 @@ msgstr "Pamja e parë e tekstit"
 msgid "The text to display in order to demonstrate the selected font."
 msgstr ""
 
-#. GRUT modified this item
 #: lib/diagtkfontsel.c:321
 msgid "_Family:"
 msgstr "_Familja:"
@@ -2125,7 +2139,6 @@ msgstr "_Stili:"
 msgid "Si_ze:"
 msgstr "Madhë_sia:"
 
-#. GRUT modified this item
 #. create the text entry widget
 #: lib/diagtkfontsel.c:462
 msgid "_Preview:"
@@ -2153,7 +2166,6 @@ msgstr ""
 msgid "Error"
 msgstr "Gabim"
 
-#. GRUT modified this item
 #: lib/message.c:80 lib/message.c:226
 msgid "Warning"
 msgstr "Kujdes"
@@ -2223,15 +2235,15 @@ msgid ""
 "`%s'"
 msgstr ""
 
-#: lib/properties.c:62 lib/properties.h:468 lib/widgets.c:789
+#: lib/properties.c:62 lib/properties.h:468 lib/widgets.c:792
 msgid "Left"
 msgstr "Majtas"
 
-#: lib/properties.c:63 lib/properties.h:469 lib/widgets.c:795
+#: lib/properties.c:63 lib/properties.h:469 lib/widgets.c:798
 msgid "Center"
 msgstr "Në qendër"
 
-#: lib/properties.c:64 lib/properties.h:470 lib/widgets.c:801
+#: lib/properties.c:64 lib/properties.h:470 lib/widgets.c:804
 msgid "Right"
 msgstr "Djathtas"
 
@@ -2244,12 +2256,10 @@ msgstr ""
 msgid "Line style"
 msgstr ""
 
-#. GRUT modified this item
 #: lib/properties.c:73
 msgid "Fill color"
 msgstr "Ngjyrosja"
 
-#. GRUT modified this item
 #: lib/properties.c:74 lib/properties.h:505
 msgid "Draw background"
 msgstr "Vizato sfondin"
@@ -2266,11 +2276,11 @@ msgstr ""
 msgid "Text alignment"
 msgstr ""
 
-#. GRUT modified this item
+#. all this just to make the defaults selectable ...
 #: lib/properties.c:79 lib/properties.h:525 objects/GRAFCET/condition.c:132
 #: objects/GRAFCET/step.c:165 objects/GRAFCET/transition.c:142
-#: objects/UML/class_dialog.c:330 objects/chronogram/chronoline.c:183
-#: objects/chronogram/chronoref.c:164
+#: objects/UML/class.c:138 objects/UML/class_dialog.c:351
+#: objects/chronogram/chronoline.c:183 objects/chronogram/chronoref.c:164
 msgid "Font"
 msgstr "Gërmat"
 
@@ -2298,60 +2308,60 @@ msgstr ""
 msgid "Text colour"
 msgstr ""
 
-#: lib/widgets.c:390
+#: lib/widgets.c:395
 msgid "Other fonts..."
 msgstr ""
 
-#: lib/widgets.c:520
+#: lib/widgets.c:523
 #, c-format
 msgid "Couldn't find font family for %s\n"
 msgstr ""
 
 #. We hit the Other fonts... entry
-#: lib/widgets.c:585
+#: lib/widgets.c:588
 msgid "Select font"
 msgstr ""
 
 #. Translators: Menu item Noun/Material/Solid
-#: lib/widgets.c:937 objects/FS/function.c:1063
+#: lib/widgets.c:940 objects/FS/function.c:1063
 msgid "Solid"
 msgstr ""
 
-#: lib/widgets.c:943
+#: lib/widgets.c:946
 msgid "Dashed"
 msgstr ""
 
-#: lib/widgets.c:949
+#: lib/widgets.c:952
 msgid "Dash-Dot"
 msgstr ""
 
-#: lib/widgets.c:955
+#: lib/widgets.c:958
 msgid "Dash-Dot-Dot"
 msgstr ""
 
-#: lib/widgets.c:961
+#: lib/widgets.c:964
 msgid "Dotted"
 msgstr ""
 
 #. fs->sizebox = GTK_HBOX(box);
-#: lib/widgets.c:980
+#: lib/widgets.c:983
 msgid "Dash length: "
 msgstr ""
 
-#: lib/widgets.c:1135
+#: lib/widgets.c:1138
 msgid "Select color"
 msgstr ""
 
-#: lib/widgets.c:1353
+#: lib/widgets.c:1356
 #, fuzzy
 msgid "Size: "
 msgstr "Madhë_sia:"
 
-#: lib/widgets.c:1502
+#: lib/widgets.c:1505
 msgid "Select image file"
 msgstr ""
 
-#: lib/widgets.c:1538
+#: lib/widgets.c:1541
 msgid "Browse"
 msgstr "Shfleto"
 
@@ -2371,7 +2381,6 @@ msgstr ""
 msgid "Multivalue:"
 msgstr ""
 
-#. GRUT modified this item
 #: objects/ER/attribute.c:421 sheets/ER.sheet.in.h:1
 msgid "Attribute"
 msgstr "Pronësi"
@@ -2385,7 +2394,6 @@ msgstr ""
 msgid "Associative:"
 msgstr "Aktiv"
 
-#. GRUT modified this item
 #: objects/ER/entity.c:406 objects/UML/classicon.c:126 sheets/ER.sheet.in.h:4
 msgid "Entity"
 msgstr "Entitet"
@@ -2399,18 +2407,18 @@ msgid "Total:"
 msgstr "Gjithsej:"
 
 #: objects/ER/participation.c:405 objects/FS/flow-ortho.c:644
-#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:566
+#: objects/GRAFCET/vector.c:311 objects/SADT/arrow.c:462
 #: objects/UML/association.c:752 objects/UML/component_feature.c:183
 #: objects/UML/dependency.c:372 objects/UML/generalization.c:368
-#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:337
+#: objects/UML/realizes.c:359 objects/standard/zigzagline.c:346
 msgid "Add segment"
 msgstr ""
 
 #: objects/ER/participation.c:406 objects/FS/flow-ortho.c:645
-#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:567
+#: objects/GRAFCET/vector.c:312 objects/SADT/arrow.c:463
 #: objects/UML/association.c:753 objects/UML/component_feature.c:184
 #: objects/UML/dependency.c:373 objects/UML/generalization.c:369
-#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:338
+#: objects/UML/realizes.c:360 objects/standard/zigzagline.c:347
 msgid "Delete segment"
 msgstr ""
 
@@ -2446,7 +2454,6 @@ msgstr ""
 msgid "Material"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Signal
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
@@ -2483,7 +2490,6 @@ msgstr ""
 msgid "Channel"
 msgstr "Kanali"
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Channel/Import
 #. Translators: Menu item Verb/Channel/Import/Import
 #: objects/FS/function.c:671 objects/FS/function.c:673
@@ -2491,7 +2497,7 @@ msgid "Import"
 msgstr "Importo"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: objects/FS/function.c:675 objects/KAOS/metabinrel.c:163
+#: objects/FS/function.c:675 objects/KAOS/metabinrel.c:173
 msgid "Input"
 msgstr "Input"
 
@@ -2522,7 +2528,6 @@ msgstr ""
 msgid "Discharge"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Channel/Export/Eject
 #: objects/FS/function.c:691
 msgid "Eject"
@@ -2533,7 +2538,6 @@ msgstr "Nxirre jashtë"
 msgid "Dispose"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Channel/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
@@ -2553,13 +2557,11 @@ msgstr ""
 msgid "Lift"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
 #: objects/FS/function.c:707
 msgid "Move"
 msgstr "Lëvize"
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
 #: objects/FS/function.c:711 objects/FS/function.c:713
@@ -2608,7 +2610,7 @@ msgstr ""
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
 #: objects/FS/function.c:735 objects/FS/function.c:737
 msgid "Rotate"
-msgstr ""
+msgstr "Rrotullo"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
 #: objects/FS/function.c:739
@@ -2636,7 +2638,6 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
 #: objects/FS/function.c:751 objects/FS/function.c:753
@@ -2687,25 +2688,24 @@ msgstr ""
 msgid "Steady"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
 #: objects/FS/function.c:775 objects/FS/function.c:777
 msgid "Secure"
 msgstr "I sigurtë"
 
+#. GRUT modified this item
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
 #: objects/FS/function.c:779 objects/FS/function.c:811
 msgid "Attach"
-msgstr ""
+msgstr "Bashkangjit"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
 #: objects/FS/function.c:781
 msgid "Mount"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Support/Secure/Lock
 #: objects/FS/function.c:783 sheets/ciscomisc.sheet.in.h:21
 msgid "Lock"
@@ -2766,7 +2766,6 @@ msgstr ""
 msgid "Assemble"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
 #: objects/FS/function.c:813 objects/FS/function.c:815
@@ -2837,7 +2836,6 @@ msgstr ""
 msgid "Disconnect"
 msgstr "Shkëputu"
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
 #: objects/FS/function.c:851
 msgid "Cut"
@@ -2894,7 +2892,6 @@ msgstr ""
 msgid "Clear"
 msgstr "Pastro (fshi)"
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
 #: objects/FS/function.c:875 objects/FS/function.c:877
@@ -3051,7 +3048,6 @@ msgstr "Kontrollo"
 msgid "Enable"
 msgstr "Aktivo"
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
 #: objects/FS/function.c:957
 msgid "Disable"
@@ -3062,7 +3058,6 @@ msgstr "Ç'aktivo"
 msgid "Limit"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
 #: objects/FS/function.c:961
 msgid "Interrupt"
@@ -3196,7 +3191,6 @@ msgstr ""
 msgid "Differentiate"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Verb/Convert/Process
 #: objects/FS/function.c:1021 sheets/EML.sheet.in.h:5
 msgid "Process"
@@ -3280,7 +3274,6 @@ msgstr ""
 msgid "Gas"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Noun/Material/Human
 #. Translators: Menu item Noun/Material/Human/Human
 #. Translators: Menu item Noun/Energy/Human
@@ -3304,7 +3297,6 @@ msgstr ""
 msgid "Head"
 msgstr ""
 
-#. GRUT modified this item
 #. Translators: Menu item Noun/Material/Human/Finger
 #: objects/FS/function.c:1079
 msgid "Finger"
@@ -3638,8 +3630,8 @@ msgid "Vergent type:"
 msgstr ""
 
 #: objects/GRAFCET/vergent.c:405 objects/SADT/box.c:445
-#: objects/Istar/other.c:498 objects/Jackson/domain.c:554
-#: objects/KAOS/goal.c:602 objects/KAOS/other.c:551
+#: objects/Istar/other.c:483 objects/Jackson/domain.c:539
+#: objects/KAOS/goal.c:587 objects/KAOS/other.c:535
 #: objects/standard/line.c:228
 msgid "Add connection point"
 msgstr ""
@@ -3677,7 +3669,8 @@ msgid "Miscellaneous objects"
 msgstr ""
 
 #. property rows
-#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:336
+#: objects/SADT/arrow.c:134 objects/UML/class.c:143
+#: objects/UML/class_dialog.c:357
 msgid "Normal"
 msgstr "Normal"
 
@@ -3711,7 +3704,7 @@ msgid ""
 "rendered gray"
 msgstr ""
 
-#: objects/SADT/arrow.c:572
+#: objects/SADT/arrow.c:468
 msgid "SADT Arrow"
 msgstr ""
 
@@ -3729,9 +3722,9 @@ msgstr ""
 msgid "The identifier which appears in the lower right corner of the Box"
 msgstr ""
 
-#: objects/SADT/box.c:446 objects/Istar/other.c:499
-#: objects/Jackson/domain.c:555 objects/KAOS/goal.c:603
-#: objects/KAOS/other.c:552 objects/standard/line.c:229
+#: objects/SADT/box.c:446 objects/Istar/other.c:484
+#: objects/Jackson/domain.c:540 objects/KAOS/goal.c:588
+#: objects/KAOS/other.c:536 objects/standard/line.c:229
 msgid "Delete connection point"
 msgstr ""
 
@@ -3743,17 +3736,11 @@ msgstr ""
 msgid "SADT diagram objects"
 msgstr ""
 
-#. choose default font name for your locale. see also font_data structure
-#. in lib/font.c.
-#: objects/UML/activity.c:315
-msgid "Helvetica"
-msgstr ""
-
 #: objects/UML/actor.c:359 objects/UML/actor.c:361 sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "Actor"
 
-#: objects/UML/association.c:1139 objects/UML/class_dialog.c:2086
+#: objects/UML/association.c:1139 objects/UML/class_dialog.c:2107
 msgid "Direction:"
 msgstr ""
 
@@ -3796,264 +3783,285 @@ msgstr "Agregim"
 msgid "Composition"
 msgstr ""
 
-#: objects/UML/class.c:109 objects/UML/classicon.c:135
+#: objects/UML/class.c:110 objects/UML/class.c:245 objects/UML/class.c:1157
+#: sheets/UML.sheet.in.h:6
+msgid "Class"
+msgstr "Klasa"
+
+#: objects/UML/class.c:114 objects/UML/classicon.c:135
 #: objects/UML/component.c:122 objects/UML/large_package.c:126
 #: objects/UML/object.c:147 objects/UML/small_package.c:122
 msgid "Stereotype"
 msgstr ""
 
-#: objects/UML/class.c:111 objects/UML/class_dialog.c:361
-#: sheets/SDL.sheet.in.h:3
+#: objects/UML/class.c:116 objects/UML/class.c:153
+#: objects/UML/class_dialog.c:382 sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "Komenti"
 
-#: objects/UML/class.c:113 objects/UML/class_dialog.c:290
-#: objects/UML/class_dialog.c:346 objects/UML/class_dialog.c:1912
+#: objects/UML/class.c:118 objects/UML/class.c:147
+#: objects/UML/class_dialog.c:296 objects/UML/class_dialog.c:367
+#: objects/UML/class_dialog.c:1933
 msgid "Abstract"
 msgstr "Abstract"
 
-#: objects/UML/class.c:115 objects/UML/class_dialog.c:299
+#: objects/UML/class.c:120
+msgid "Template"
+msgstr "Shabllon"
+
+#: objects/UML/class.c:123 objects/UML/class_dialog.c:305
 msgid "Suppress Attributes"
 msgstr ""
 
-#: objects/UML/class.c:117
+#: objects/UML/class.c:125
 msgid "Suppress Operations"
 msgstr ""
 
-#: objects/UML/class.c:119
+#: objects/UML/class.c:127
 msgid "Visible Attributes"
 msgstr ""
 
-#: objects/UML/class.c:121
+#: objects/UML/class.c:129
 msgid "Visible Operations"
 msgstr ""
 
-#: objects/UML/class.c:123
+#: objects/UML/class.c:131
 msgid "Visible Comments"
 msgstr ""
 
-#. GRUT modified this item
-#: objects/UML/class.c:126 objects/UML/object.c:151
-msgid "Attributes"
-msgstr "Pronësitë"
+#: objects/UML/class.c:133 objects/UML/class_dialog.c:321
+#, fuzzy
+msgid "Wrap Operations"
+msgstr "Orientimi"
 
-#: objects/UML/class.c:128
-msgid "Operations"
+#: objects/UML/class.c:135
+msgid "Wrap after char"
 msgstr ""
 
-#. GRUT modified this item
-#: objects/UML/class.c:131
-msgid "Template"
-msgstr "Shabllon"
+#: objects/UML/class.c:145 objects/UML/class_dialog.c:362
+msgid "Polymorphic"
+msgstr ""
 
-#: objects/UML/class.c:179 objects/UML/class.c:943 sheets/UML.sheet.in.h:6
-msgid "Class"
+#: objects/UML/class.c:149
+#, fuzzy
+msgid "Classname"
 msgstr "Klasa"
 
-#: objects/UML/class.c:185
+#: objects/UML/class.c:151
+#, fuzzy
+msgid "Abstract Classname"
+msgstr "Abstract"
+
+#: objects/UML/class.c:157 objects/UML/class.c:159 objects/UML/class.c:161
+#: objects/UML/class.c:163 objects/UML/class.c:165 objects/UML/class.c:167
+msgid " "
+msgstr " "
+
+#: objects/UML/class.c:172 objects/UML/object.c:151
+msgid "Attributes"
+msgstr "Pronësitë"
+
+#: objects/UML/class.c:174
+msgid "Operations"
+msgstr ""
+
+#: objects/UML/class.c:251
 msgid "Show comments"
 msgstr ""
 
 #. Class page:
-#: objects/UML/class_dialog.c:259
+#: objects/UML/class_dialog.c:265
 #, fuzzy
 msgid "_Class"
 msgstr "Klasa"
 
-#: objects/UML/class_dialog.c:267
+#: objects/UML/class_dialog.c:273
 msgid "Class name:"
 msgstr ""
 
-#: objects/UML/class_dialog.c:275 objects/UML/class_dialog.c:1835
+#: objects/UML/class_dialog.c:281 objects/UML/class_dialog.c:1856
 #: objects/UML/dependency.c:135 objects/UML/generalization.c:131
 #: objects/UML/realizes.c:132
 msgid "Stereotype:"
 msgstr ""
 
-#: objects/UML/class_dialog.c:282 objects/UML/class_dialog.c:912
-#: objects/UML/class_dialog.c:1953 objects/UML/class_dialog.c:2075
+#: objects/UML/class_dialog.c:288 objects/UML/class_dialog.c:933
+#: objects/UML/class_dialog.c:1974 objects/UML/class_dialog.c:2096
 msgid "Comment:"
 msgstr "Komenti:"
 
-#: objects/UML/class_dialog.c:296
+#: objects/UML/class_dialog.c:302
 msgid "Attributes visible"
 msgstr ""
 
-#: objects/UML/class_dialog.c:305
+#: objects/UML/class_dialog.c:311
 msgid "Operations visible"
 msgstr ""
 
-#: objects/UML/class_dialog.c:308
+#: objects/UML/class_dialog.c:314
 msgid "Suppress operations"
 msgstr ""
 
-#: objects/UML/class_dialog.c:314
+#: objects/UML/class_dialog.c:328
+msgid "Wrap after this length: "
+msgstr ""
+
+#: objects/UML/class_dialog.c:335
 msgid "Comments visible"
 msgstr ""
 
 #. head line
-#: objects/UML/class_dialog.c:327
+#: objects/UML/class_dialog.c:348
 msgid "Kind"
 msgstr ""
 
-#: objects/UML/class_dialog.c:332
+#: objects/UML/class_dialog.c:353
 msgid "Size"
 msgstr "Madhësia"
 
-#: objects/UML/class_dialog.c:341
-msgid "Polymorphic"
-msgstr ""
-
-#: objects/UML/class_dialog.c:351
+#: objects/UML/class_dialog.c:372
 msgid "Class Name"
 msgstr ""
 
-#: objects/UML/class_dialog.c:356
+#: objects/UML/class_dialog.c:377
 msgid "Abstract Class"
 msgstr ""
 
 #. should probably be refactored too.
-#: objects/UML/class_dialog.c:373
+#: objects/UML/class_dialog.c:394
 msgid "Text Color"
 msgstr "Ngjyra e tekstit"
 
-#: objects/UML/class_dialog.c:381
+#: objects/UML/class_dialog.c:402
 msgid "Foreground Color"
 msgstr ""
 
-#: objects/UML/class_dialog.c:389
+#: objects/UML/class_dialog.c:410
 msgid "Background Color"
 msgstr "Ngjyra e Sfondit"
 
 #. Attributes page:
-#: objects/UML/class_dialog.c:812
+#: objects/UML/class_dialog.c:833
 #, fuzzy
 msgid "_Attributes"
 msgstr "Atribute"
 
-#. GRUT modified this item
-#: objects/UML/class_dialog.c:840 objects/UML/class_dialog.c:1771
-#: objects/UML/class_dialog.c:1999 objects/UML/class_dialog.c:2519
+#: objects/UML/class_dialog.c:861 objects/UML/class_dialog.c:1792
+#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2540
 msgid "_New"
 msgstr "_E re"
 
-#: objects/UML/class_dialog.c:846 objects/UML/class_dialog.c:1777
-#: objects/UML/class_dialog.c:2006 objects/UML/class_dialog.c:2525
+#: objects/UML/class_dialog.c:867 objects/UML/class_dialog.c:1798
+#: objects/UML/class_dialog.c:2027 objects/UML/class_dialog.c:2546
 msgid "_Delete"
 msgstr "_Elemino"
 
-#. GRUT modified this item
-#. GRUT modified this item
-#: objects/UML/class_dialog.c:852 objects/UML/class_dialog.c:1783
-#: objects/UML/class_dialog.c:2013 objects/UML/class_dialog.c:2531
+#: objects/UML/class_dialog.c:873 objects/UML/class_dialog.c:1804
+#: objects/UML/class_dialog.c:2034 objects/UML/class_dialog.c:2552
 msgid "Move up"
 msgstr "Lëviz sipër"
 
-#. GRUT modified this item
-#: objects/UML/class_dialog.c:858 objects/UML/class_dialog.c:1789
-#: objects/UML/class_dialog.c:2020 objects/UML/class_dialog.c:2537
+#: objects/UML/class_dialog.c:879 objects/UML/class_dialog.c:1810
+#: objects/UML/class_dialog.c:2041 objects/UML/class_dialog.c:2558
 msgid "Move down"
 msgstr "Lëviz poshtë"
 
-#: objects/UML/class_dialog.c:869
+#: objects/UML/class_dialog.c:890
 msgid "Attribute data"
 msgstr ""
 
-#: objects/UML/class_dialog.c:901
+#: objects/UML/class_dialog.c:922
 msgid "Value:"
 msgstr ""
 
-#. GRUT modified this item
-#: objects/UML/class_dialog.c:924 objects/UML/class_dialog.c:1848
+#: objects/UML/class_dialog.c:945 objects/UML/class_dialog.c:1869
 msgid "Visibility:"
 msgstr "Dukshmëria:"
 
-#: objects/UML/class_dialog.c:933 objects/UML/class_dialog.c:1857
+#: objects/UML/class_dialog.c:954 objects/UML/class_dialog.c:1878
 msgid "Public"
 msgstr "Publik"
 
-#: objects/UML/class_dialog.c:941 objects/UML/class_dialog.c:1865
+#: objects/UML/class_dialog.c:962 objects/UML/class_dialog.c:1886
 msgid "Private"
 msgstr "Privat"
 
-#: objects/UML/class_dialog.c:949 objects/UML/class_dialog.c:1873
+#: objects/UML/class_dialog.c:970 objects/UML/class_dialog.c:1894
 msgid "Protected"
 msgstr ""
 
-#: objects/UML/class_dialog.c:957 objects/UML/class_dialog.c:1881
+#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1902
 msgid "Implementation"
 msgstr "Implementim"
 
-#: objects/UML/class_dialog.c:978 objects/UML/class_dialog.c:1897
+#: objects/UML/class_dialog.c:999 objects/UML/class_dialog.c:1918
 msgid "Class scope"
 msgstr ""
 
 #. Operations page:
-#: objects/UML/class_dialog.c:1743
+#: objects/UML/class_dialog.c:1764
 #, fuzzy
 msgid "_Operations"
 msgstr "Orientimi"
 
-#: objects/UML/class_dialog.c:1801
+#: objects/UML/class_dialog.c:1822
 msgid "Operation data"
 msgstr ""
 
-#: objects/UML/class_dialog.c:1903
+#: objects/UML/class_dialog.c:1924
 msgid "Inheritance type:"
 msgstr ""
 
-#: objects/UML/class_dialog.c:1920
+#: objects/UML/class_dialog.c:1941
 msgid "Polymorphic (virtual)"
 msgstr ""
 
-#: objects/UML/class_dialog.c:1928
+#: objects/UML/class_dialog.c:1949
 msgid "Leaf (final)"
 msgstr ""
 
-#. GRUT modified this item
-#: objects/UML/class_dialog.c:1946
+#: objects/UML/class_dialog.c:1967
 msgid "Query"
 msgstr "Kërkesë"
 
-#: objects/UML/class_dialog.c:1970
+#: objects/UML/class_dialog.c:1991
 msgid "Parameters:"
 msgstr ""
 
-#: objects/UML/class_dialog.c:2032
+#: objects/UML/class_dialog.c:2053
 msgid "Parameter data"
 msgstr ""
 
-#: objects/UML/class_dialog.c:2064
+#: objects/UML/class_dialog.c:2085
 msgid "Def. value:"
 msgstr ""
 
-#: objects/UML/class_dialog.c:2095
+#: objects/UML/class_dialog.c:2116
 msgid "Undefined"
 msgstr "E papërcaktuar"
 
-#: objects/UML/class_dialog.c:2103
+#: objects/UML/class_dialog.c:2124
 msgid "In"
 msgstr "Zmadho"
 
-#: objects/UML/class_dialog.c:2112
+#: objects/UML/class_dialog.c:2133
 msgid "Out"
 msgstr "Zvogëlo"
 
-#: objects/UML/class_dialog.c:2121
+#: objects/UML/class_dialog.c:2142
 msgid "In & Out"
 msgstr ""
 
-#. GRUT modified this item
 #. Templates page:
-#: objects/UML/class_dialog.c:2485
+#: objects/UML/class_dialog.c:2506
 msgid "_Templates"
 msgstr "_Shabllone"
 
-#: objects/UML/class_dialog.c:2491 sheets/UML.sheet.in.h:29
+#: objects/UML/class_dialog.c:2512 sheets/UML.sheet.in.h:29
 msgid "Template class"
 msgstr ""
 
-#: objects/UML/class_dialog.c:2548
+#: objects/UML/class_dialog.c:2569
 msgid "Formal parameter data"
 msgstr ""
 
@@ -4135,14 +4143,13 @@ msgstr ""
 
 #: objects/UML/message.c:140
 msgid "Send"
-msgstr ""
+msgstr "Dërgo"
 
 #: objects/UML/message.c:141
 msgid "Recursive"
 msgstr ""
 
-#. GRUT modified this item
-#: objects/UML/message.c:150 objects/Jackson/phenomenon.c:133
+#: objects/UML/message.c:150 objects/Jackson/phenomenon.c:142
 msgid "Message:"
 msgstr "Mesazhi:"
 
@@ -4175,7 +4182,7 @@ msgid ""
 "Please use the Initial/Final State object instead\n"
 msgstr ""
 
-#: objects/UML/state_term.c:122
+#: objects/UML/state_term.c:118
 msgid "Is final"
 msgstr ""
 
@@ -4306,6 +4313,7 @@ msgid "Cannot open icon file %s for object type '%s'."
 msgstr ""
 
 #: objects/flowchart/box.c:148 objects/standard/box.c:148
+#: objects/standard/polyline.c:130 objects/standard/zigzagline.c:129
 msgid "Corner radius"
 msgstr ""
 
@@ -4322,32 +4330,29 @@ msgstr ""
 msgid "Unspecified"
 msgstr "E papërcaktuar"
 
-#. GRUT modified this item
-#: objects/Istar/actor.c:67 objects/KAOS/other.c:93
+#: objects/Istar/actor.c:67 objects/KAOS/other.c:75
 msgid "Agent"
 msgstr "Agjenti"
 
-#. GRUT modified this item
 #: objects/Istar/actor.c:69
 msgid "Role"
 msgstr "Roli"
 
-#: objects/Istar/goal.c:91 objects/KAOS/goal.c:96
+#: objects/Istar/goal.c:74 objects/KAOS/goal.c:79
 msgid "Softgoal"
 msgstr ""
 
-#. GRUT modified this item
-#: objects/Istar/goal.c:92 objects/KAOS/goal.c:97
+#: objects/Istar/goal.c:75 objects/KAOS/goal.c:80
 msgid "Goal"
 msgstr "Qëllimi"
 
-#: objects/Istar/goal.c:172 objects/Istar/goal.c:173 objects/KAOS/goal.c:176
-#: objects/KAOS/goal.c:177
+#: objects/Istar/goal.c:155 objects/Istar/goal.c:156 objects/KAOS/goal.c:159
+#: objects/KAOS/goal.c:160
 #, fuzzy
 msgid "Goal Type"
 msgstr "Lloji"
 
-#: objects/Istar/istar.c:39
+#: objects/Istar/istar.c:46
 msgid "Istar diagram"
 msgstr ""
 
@@ -4373,157 +4378,152 @@ msgstr "Pozicioni"
 msgid "Means-Ends"
 msgstr ""
 
-#. GRUT modified this item
-#: objects/Istar/other.c:90
+#: objects/Istar/other.c:73
 msgid "Resource"
 msgstr "Burimi"
 
-#: objects/Istar/other.c:91
+#: objects/Istar/other.c:74
 msgid "Task"
-msgstr ""
+msgstr "Aktiviteti"
 
-#: objects/Istar/other.c:504
+#: objects/Istar/other.c:489
 msgid "i* other"
 msgstr ""
 
-#: objects/Jackson/domain.c:96
+#: objects/Jackson/domain.c:79
 msgid "Given Domain"
 msgstr ""
 
-#: objects/Jackson/domain.c:97
+#: objects/Jackson/domain.c:80
 msgid "Designed Domain"
 msgstr ""
 
-#: objects/Jackson/domain.c:98
+#: objects/Jackson/domain.c:81
 msgid "Machine Domain"
 msgstr ""
 
-#: objects/Jackson/domain.c:114
+#: objects/Jackson/domain.c:97
 #, fuzzy
 msgid "Causal"
 msgstr "Thirrje"
 
-#: objects/Jackson/domain.c:115
+#: objects/Jackson/domain.c:98
 #, fuzzy
 msgid "Biddable"
 msgstr "Deaktivo"
 
-#: objects/Jackson/domain.c:116
+#: objects/Jackson/domain.c:99
 msgid "Lexical"
 msgstr ""
 
-#: objects/Jackson/domain.c:195 objects/Jackson/domain.c:196
+#: objects/Jackson/domain.c:178 objects/Jackson/domain.c:179
 msgid "Domain Type"
 msgstr ""
 
-#: objects/Jackson/domain.c:200
+#: objects/Jackson/domain.c:183
 msgid "Domain Kind"
 msgstr ""
 
-#: objects/Jackson/domain.c:201
+#: objects/Jackson/domain.c:184
 msgid "Optional kind which appears in the lower right corner of the Domain"
 msgstr ""
 
-#: objects/Jackson/domain.c:560
+#: objects/Jackson/domain.c:545
 msgid "Jackson domain"
 msgstr ""
 
-#: objects/Jackson/jackson.c:37
+#: objects/Jackson/jackson.c:47
 msgid "Jackson diagram"
 msgstr ""
 
-#: objects/Jackson/phenomenon.c:125
+#: objects/Jackson/phenomenon.c:134
 #, fuzzy
 msgid "Shared"
 msgstr "Rërë"
 
-#: objects/Jackson/phenomenon.c:126 objects/KAOS/goal.c:98
+#: objects/Jackson/phenomenon.c:135 objects/KAOS/goal.c:81
 msgid "Requirement"
 msgstr ""
 
-#: objects/KAOS/goal.c:99
+#: objects/KAOS/goal.c:82
 msgid "Assumption"
 msgstr ""
 
-#: objects/KAOS/goal.c:100
+#: objects/KAOS/goal.c:83
 #, fuzzy
 msgid "Obstacle"
 msgstr "Abstract"
 
-#: objects/KAOS/goal.c:608
+#: objects/KAOS/goal.c:593
 msgid "KAOS goal"
 msgstr ""
 
-#: objects/KAOS/kaos.c:38
+#: objects/KAOS/kaos.c:49
 msgid "KAOS diagram"
 msgstr ""
 
-#: objects/KAOS/metaandorrel.c:141
+#: objects/KAOS/metaandorrel.c:151
 msgid "AND Refinement"
 msgstr ""
 
-#: objects/KAOS/metaandorrel.c:142
+#: objects/KAOS/metaandorrel.c:152
 msgid "Complete AND Refinement"
 msgstr ""
 
-#: objects/KAOS/metaandorrel.c:143
+#: objects/KAOS/metaandorrel.c:153
 msgid "OR Refinement"
 msgstr ""
 
-#: objects/KAOS/metaandorrel.c:144
+#: objects/KAOS/metaandorrel.c:154
 #, fuzzy
 msgid "Operationalization"
 msgstr "Orientimi"
 
-#. GRUT modified this item
-#: objects/KAOS/metaandorrel.c:151
+#: objects/KAOS/metaandorrel.c:161
 msgid "Text:"
 msgstr "Teksti:"
 
-#: objects/KAOS/metabinrel.c:155
+#: objects/KAOS/metabinrel.c:165
 #, fuzzy
 msgid "Contributes"
 msgstr "Ndihmësit:"
 
-#: objects/KAOS/metabinrel.c:156
+#: objects/KAOS/metabinrel.c:166
 #, fuzzy
 msgid "Obstructs"
 msgstr "Abstract"
 
-#. GRUT modified this item
-#: objects/KAOS/metabinrel.c:157
+#: objects/KAOS/metabinrel.c:167
 msgid "Conflicts"
 msgstr "Konflikte"
 
-#: objects/KAOS/metabinrel.c:158
+#: objects/KAOS/metabinrel.c:168
 #, fuzzy
 msgid "Responsibility"
 msgstr "Shikueshmëria:"
 
-#: objects/KAOS/metabinrel.c:159
+#: objects/KAOS/metabinrel.c:169
 #, fuzzy
 msgid "Monitors"
 msgstr "Ekrani"
 
-#. GRUT modified this item
-#: objects/KAOS/metabinrel.c:160
+#: objects/KAOS/metabinrel.c:170
 msgid "Controls"
 msgstr "Kontrollet"
 
-#: objects/KAOS/metabinrel.c:161
+#: objects/KAOS/metabinrel.c:171
 msgid "CapableOf"
 msgstr ""
 
-#: objects/KAOS/metabinrel.c:162
+#: objects/KAOS/metabinrel.c:172
 msgid "Performs"
 msgstr ""
 
-#. GRUT modified this item
-#: objects/KAOS/metabinrel.c:164
+#: objects/KAOS/metabinrel.c:174
 msgid "Output"
 msgstr "Rezultati"
 
-#: objects/KAOS/other.c:557
+#: objects/KAOS/other.c:541
 msgid "KAOS other"
 msgstr ""
 
@@ -4579,37 +4579,34 @@ msgstr ""
 msgid "Curve distance"
 msgstr ""
 
-#: objects/standard/bezier.c:545 objects/standard/beziergon.c:501
+#: objects/standard/bezier.c:545 objects/standard/beziergon.c:499
 msgid "Add Segment"
 msgstr ""
 
-#: objects/standard/bezier.c:546 objects/standard/beziergon.c:502
+#: objects/standard/bezier.c:546 objects/standard/beziergon.c:500
 msgid "Delete Segment"
 msgstr ""
 
-#: objects/standard/bezier.c:548 objects/standard/beziergon.c:504
+#: objects/standard/bezier.c:548 objects/standard/beziergon.c:502
 msgid "Symmetric control"
 msgstr ""
 
-#: objects/standard/bezier.c:550 objects/standard/beziergon.c:506
+#: objects/standard/bezier.c:550 objects/standard/beziergon.c:504
 msgid "Smooth control"
 msgstr ""
 
-#: objects/standard/bezier.c:552 objects/standard/beziergon.c:508
+#: objects/standard/bezier.c:552 objects/standard/beziergon.c:506
 msgid "Cusp control"
 msgstr ""
 
-#. GRUT modified this item
 #: objects/standard/box.c:135 objects/standard/ellipse.c:131
 msgid "Free"
 msgstr "I lirë"
 
-#. GRUT modified this item
 #: objects/standard/box.c:136 objects/standard/ellipse.c:132
 msgid "Fixed"
 msgstr "Fiksuar"
 
-#. GRUT modified this item
 #: objects/standard/box.c:137 objects/standard/box.c:687
 msgid "Square"
 msgstr "Në katror"
@@ -4627,7 +4624,6 @@ msgstr ""
 msgid "Fixed aspect"
 msgstr ""
 
-#. GRUT modified this item
 #: objects/standard/ellipse.c:133 objects/standard/ellipse.c:668
 msgid "Circle"
 msgstr "Rreth"
@@ -4692,11 +4688,11 @@ msgstr ""
 msgid "Fractional end gap"
 msgstr ""
 
-#: objects/standard/polygon.c:460 objects/standard/polyline.c:496
+#: objects/standard/polygon.c:460 objects/standard/polyline.c:515
 msgid "Add Corner"
 msgstr ""
 
-#: objects/standard/polygon.c:461 objects/standard/polyline.c:497
+#: objects/standard/polygon.c:461 objects/standard/polyline.c:516
 msgid "Delete Corner"
 msgstr ""
 
@@ -4704,15 +4700,15 @@ msgstr ""
 msgid "Standard objects"
 msgstr ""
 
-#: plug-ins/cairo/diacairo.c:962
+#: plug-ins/cairo/diacairo.c:965
 msgid "Cairo PostScript"
 msgstr ""
 
-#: plug-ins/cairo/diacairo.c:970
+#: plug-ins/cairo/diacairo.c:974
 msgid "Cairo PNG"
 msgstr ""
 
-#: plug-ins/cairo/diacairo.c:996
+#: plug-ins/cairo/diacairo.c:1001
 msgid "Cairo based Rendering"
 msgstr ""
 
@@ -4788,7 +4784,7 @@ msgstr ""
 msgid "GdkPixbuf bitmap"
 msgstr ""
 
-#: plug-ins/pixbuf/pixbuf.c:182
+#: plug-ins/pixbuf/pixbuf.c:189
 msgid "gdk-pixbuf based bitmap export/import"
 msgstr ""
 
@@ -4804,7 +4800,7 @@ msgstr ""
 msgid "TeX PSTricks macros"
 msgstr ""
 
-#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1058
+#: plug-ins/python/pydia-render.c:711 plug-ins/wmf/wmf.cpp:1140
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr ""
@@ -4859,11 +4855,11 @@ msgstr ""
 msgid "Scalable Vector Graphics import and export filters"
 msgstr ""
 
-#: plug-ins/wmf/wmf.cpp:1122
+#: plug-ins/wmf/wmf.cpp:1207
 msgid "Windows Meta File"
 msgstr ""
 
-#: plug-ins/wmf/wmf.cpp:1138
+#: plug-ins/wmf/wmf.cpp:1223
 msgid "WMF export filter"
 msgstr ""
 
@@ -5097,11 +5093,11 @@ msgstr ""
 msgid "Error while applying stylesheet: %s\n"
 msgstr ""
 
-#: plug-ins/xslt/xslt.c:312
+#: plug-ins/xslt/xslt.c:313
 msgid "XSL Transformation filter"
 msgstr ""
 
-#: plug-ins/xslt/xslt.c:336
+#: plug-ins/xslt/xslt.c:337
 msgid "No valid configuration files found for the XSLT plugin, not loading."
 msgstr ""
 
@@ -5291,6 +5287,224 @@ msgstr ""
 msgid "Vertical parallelogram"
 msgstr ""
 
+#: sheets/ChemEng.sheet.in.h:1
+msgid "AC Generator"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:2
+msgid "Air Cooler"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:3
+msgid "Autoclave"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:4
+msgid "Axial Flow Fan"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:5
+#, fuzzy
+msgid "Basic Filter"
+msgstr "Filtri"
+
+#: sheets/ChemEng.sheet.in.h:6
+msgid "Centrifugal Pump or Fan"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:7
+#, fuzzy
+msgid "Centrifuge"
+msgstr "Ndihmësit:"
+
+#. For: zenith
+#: sheets/ChemEng.sheet.in.h:9
+msgid "ChemEng"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:10
+msgid "Clarifier or Settling Tank"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:11
+msgid "Collection for chemical engineering"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:12
+msgid "Compressor or Turbine"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:13
+msgid "Covered tank"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:14
+msgid "Cyclone and hydrocyclone"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:15
+msgid "Double-Pipe Exchanger"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:16
+msgid "Ejector or Injector"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:17
+msgid "Fan or Stirrer"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:18
+msgid "Fixed-Sheet Exchanger"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:19
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:20
+msgid "Fluid Contacting Vessel, simple"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:21
+msgid "Forced-Flow Air Cooler"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:22
+msgid "Gas Holder, basic"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:23
+msgid "Heating/Cooling Coil"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:24
+msgid "Heating/Cooling Coil, vertical"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:25
+msgid "Induced-Flow Air Cooler"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:26
+msgid "Kettle Reboiler"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:27
+msgid "Knock-out Drum (with demister pad)"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:28
+msgid "Measurement"
+msgstr "Matja"
+
+#: sheets/ChemEng.sheet.in.h:29
+msgid "Mixer"
+msgstr "Miksues"
+
+#: sheets/ChemEng.sheet.in.h:30
+msgid "Open Tank"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:31
+msgid "Plate Exchanger"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:32
+msgid "Pneumatic Line"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:33
+msgid "Pneumatic Line, vertical"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:34
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:35
+msgid "Reactor or Absorption Vessel, simple"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:36
+msgid "Reciprocating Compressor or Pump"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:37
+msgid "Regulable Valve"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:38
+msgid "Regulable Valve, vertical"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:39
+msgid "Sealed Tank"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:40
+#, fuzzy
+msgid "Simple Furnace"
+msgstr "E thjeshtë"
+
+#: sheets/ChemEng.sheet.in.h:41
+msgid "Simple Heat Exchanger"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:42
+msgid "Simple Heat Exchanger, vertical"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:43
+#, fuzzy
+msgid "Simple Vessel"
+msgstr "E thjeshtë"
+
+#: sheets/ChemEng.sheet.in.h:44
+msgid "Spray Drier"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:45
+msgid "Spraying Device"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:46
+msgid "Storage Sphere"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:47
+msgid "Tank with Fixed Roof"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:48
+msgid "Tank with Floating Roof"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:49
+msgid "Tray Column, detailed"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:50
+msgid "Tray Column, simple"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:51
+#, fuzzy
+msgid "Valve"
+msgstr "Shkalla"
+
+#: sheets/ChemEng.sheet.in.h:52
+msgid "Valve, vertical"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:53
+msgid "Water Cooler"
+msgstr ""
+
+#: sheets/ChemEng.sheet.in.h:54
+msgid "Water Cooler, vertical"
+msgstr ""
+
 #: sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
 msgstr ""
@@ -5543,7 +5757,6 @@ msgstr ""
 msgid "Low pass filter"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/Cybernetics.sheet.in.h:17
 msgid "Product"
 msgstr "Produkti"
@@ -5931,7 +6144,6 @@ msgstr ""
 msgid "Elevated Road"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/IsometricMap.sheet.in.h:14
 msgid "Factory"
 msgstr "Fabrikë"
@@ -6612,11 +6824,11 @@ msgstr ""
 
 #: sheets/ciscocomputer.sheet.in.h:17
 msgid "Laptop"
-msgstr ""
+msgstr "Laptop"
 
 #: sheets/ciscocomputer.sheet.in.h:18
 msgid "Macintosh"
-msgstr ""
+msgstr "Macintosh"
 
 #: sheets/ciscocomputer.sheet.in.h:19
 msgid "MicroWebserver"
@@ -6690,7 +6902,6 @@ msgstr ""
 msgid "TV"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/ciscocomputer.sheet.in.h:38
 msgid "Terminal"
 msgstr "Terminali"
@@ -6719,7 +6930,6 @@ msgstr ""
 msgid "Web cluster"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/ciscocomputer.sheet.in.h:45
 msgid "Wireless"
 msgstr "Wireless (pa fije)"
@@ -6912,7 +7122,6 @@ msgstr ""
 msgid "ITP"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/ciscomisc.sheet.in.h:19
 msgid "Key"
 msgstr "Kyçi"
@@ -6945,7 +7154,6 @@ msgstr ""
 msgid "PC man"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/ciscomisc.sheet.in.h:29
 msgid "Phone"
 msgstr "Telefoni"
@@ -7122,7 +7330,6 @@ msgstr ""
 msgid "Cisco - Network"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/cisconetwork.sheet.in.h:24
 msgid "Cloud"
 msgstr "Re"
@@ -7199,7 +7406,6 @@ msgstr "IP"
 msgid "IP DSL"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/cisconetwork.sheet.in.h:43
 msgid "IPTC"
 msgstr "IPTC"
@@ -7328,7 +7534,6 @@ msgstr ""
 msgid "Universal gateway"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/cisconetwork.sheet.in.h:75
 msgid "VIP"
 msgstr "VIP"
@@ -7650,155 +7855,158 @@ msgid "Pieces of a jigsaw"
 msgstr ""
 
 #: sheets/network.sheet.in.h:1
-msgid "3 1/2 inch diskette"
+msgid "24 Port Patch Panel"
 msgstr ""
 
 #: sheets/network.sheet.in.h:2
-msgid "ATM switch symbol"
+msgid "3 1/2 inch diskette"
 msgstr ""
 
 #: sheets/network.sheet.in.h:3
-msgid "Antenna for wireless transmission"
+msgid "ATM switch symbol"
 msgstr ""
 
 #: sheets/network.sheet.in.h:4
-msgid "Bigtower PC"
+msgid "Antenna for wireless transmission"
 msgstr ""
 
-#. GRUT modified this item
 #: sheets/network.sheet.in.h:5
+msgid "Bigtower PC"
+msgstr ""
+
+#: sheets/network.sheet.in.h:6
 msgid "Computer"
 msgstr "Kompjuteri"
 
-#: sheets/network.sheet.in.h:6
+#: sheets/network.sheet.in.h:7
 msgid "Desktop PC"
 msgstr ""
 
-#: sheets/network.sheet.in.h:7
+#: sheets/network.sheet.in.h:8
 msgid "Digitizing board"
 msgstr ""
 
-#: sheets/network.sheet.in.h:8
+#: sheets/network.sheet.in.h:9
 msgid "Ethernet bus"
 msgstr ""
 
-#: sheets/network.sheet.in.h:9
+#: sheets/network.sheet.in.h:10
 msgid "External DAT drive"
 msgstr ""
 
-#: sheets/network.sheet.in.h:10
+#: sheets/network.sheet.in.h:11
 msgid "Firewall router"
 msgstr ""
 
-#: sheets/network.sheet.in.h:11
+#: sheets/network.sheet.in.h:12
 msgid "Laptop PC"
 msgstr ""
 
-#: sheets/network.sheet.in.h:12
+#: sheets/network.sheet.in.h:13
 msgid "Miditower PC"
 msgstr ""
 
-#: sheets/network.sheet.in.h:13
+#: sheets/network.sheet.in.h:14
 msgid "Minitower PC"
 msgstr ""
 
-#: sheets/network.sheet.in.h:14
+#: sheets/network.sheet.in.h:15
 msgid "Mobile phone"
 msgstr ""
 
-#: sheets/network.sheet.in.h:15
+#: sheets/network.sheet.in.h:16
 msgid "Mobile telephony base station"
 msgstr ""
 
-#: sheets/network.sheet.in.h:16
+#: sheets/network.sheet.in.h:17
 msgid "Mobile telephony cell"
 msgstr ""
 
-#: sheets/network.sheet.in.h:17
+#: sheets/network.sheet.in.h:18
 msgid "Modular switching system"
 msgstr ""
 
-#: sheets/network.sheet.in.h:18
+#: sheets/network.sheet.in.h:19
 msgid "Monitor"
 msgstr "Ekrani"
 
-#: sheets/network.sheet.in.h:19
+#: sheets/network.sheet.in.h:20
 msgid "Network"
 msgstr "Rrjeti"
 
-#: sheets/network.sheet.in.h:20
+#: sheets/network.sheet.in.h:21
 msgid "Network cloud"
 msgstr ""
 
-#: sheets/network.sheet.in.h:21
+#: sheets/network.sheet.in.h:22
 msgid "Objects to design network diagrams with"
 msgstr ""
 
-#: sheets/network.sheet.in.h:22
+#: sheets/network.sheet.in.h:23
 msgid "Plotter"
 msgstr ""
 
-#: sheets/network.sheet.in.h:23
+#: sheets/network.sheet.in.h:24
 msgid "RJ45 wall-plug"
 msgstr ""
 
-#: sheets/network.sheet.in.h:24
+#: sheets/network.sheet.in.h:25
 msgid "Router symbol"
 msgstr ""
 
-#: sheets/network.sheet.in.h:25
+#: sheets/network.sheet.in.h:26
 msgid "Simple modem"
 msgstr ""
 
-#: sheets/network.sheet.in.h:26
+#: sheets/network.sheet.in.h:27
 msgid "Simple printer"
 msgstr ""
 
-#: sheets/network.sheet.in.h:27
+#: sheets/network.sheet.in.h:28
 msgid "Speaker with integrated amplifier"
 msgstr ""
 
-#: sheets/network.sheet.in.h:28
+#: sheets/network.sheet.in.h:29
 msgid "Speaker without amplifier"
 msgstr ""
 
-#: sheets/network.sheet.in.h:29
+#: sheets/network.sheet.in.h:30
 msgid "Stackable hub or switch"
 msgstr ""
 
-#: sheets/network.sheet.in.h:30
+#: sheets/network.sheet.in.h:31
 msgid "Storage"
 msgstr ""
 
-#: sheets/network.sheet.in.h:31
+#: sheets/network.sheet.in.h:32
 msgid "Switch symbol"
 msgstr ""
 
-#: sheets/network.sheet.in.h:32
+#: sheets/network.sheet.in.h:33
 msgid "Telephone"
 msgstr ""
 
-#: sheets/network.sheet.in.h:33
+#: sheets/network.sheet.in.h:34
 msgid "UNIX workstation"
 msgstr ""
 
-#: sheets/network.sheet.in.h:34
+#: sheets/network.sheet.in.h:35
 msgid "WAN connection"
 msgstr ""
 
-#: sheets/network.sheet.in.h:35
+#: sheets/network.sheet.in.h:36
 msgid "WAN link"
 msgstr ""
 
-#: sheets/network.sheet.in.h:36
+#: sheets/network.sheet.in.h:37
 msgid "Wall-plug for the scEAD cabling system"
 msgstr ""
 
-#: sheets/network.sheet.in.h:37
+#: sheets/network.sheet.in.h:38
 msgid "Workstation monitor"
 msgstr ""
 
-#: sheets/network.sheet.in.h:38
+#: sheets/network.sheet.in.h:39
 msgid "ZIP disk"
 msgstr ""