Commit: 51e351926b4b36b2dc3facd860c7dce1945cab4d - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 51e351926b4b36b2dc3facd860c7dce1945cab4d (tree)
• Time: 2002-06-02 04:45:46
• Author: Cyrille Chepelov <cyrille@src....>
• Commiter: Cyrille Chepelov

Log Message

Whooops, forgot to commit !

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: po/az.po
• modified: po/ca.po
• modified: po/da.po
• modified: po/de.po
• modified: po/el.po
• modified: po/en_GB.po
• modified: po/es.po
• modified: po/fi.po
• modified: po/fr.po
• modified: po/ga.po
• modified: po/hu.po
• modified: po/it.po
• modified: po/ja.po
• modified: po/ko.po
• modified: po/nl.po
• modified: po/nn.po
• modified: po/no.po
• modified: po/pl.po
• modified: po/pt.po
• modified: po/pt_BR.po
• modified: po/ru.po
• modified: po/sk.po
• modified: po/sl.po
• modified: po/sv.po
• modified: po/tr.po
• modified: po/uk.po
• modified: po/vi.po
• modified: po/zh_CN.po
• modified: po/zh_TW.po

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
[phone]  Cyrille Chepelov  <[e-mail]>
+
+	* dia.spec:
+	* configure.in:
+	* NEWS:
+	* config.h.win32:
+	bumped up version number to 0.90. Yay!
+
 2002-05-30  Cyrille Chepelov  <[e-mail]>
 
 	* doc/pl/Makefile.am:

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+dia-0.90:  1-June-2002
+
+* identical to 0.90.RC3 save for some makefile juggling.
+
 dia-0.90.RC3:  30-May-2002
 
 * in FreeType mode, dia now looks for the xfs configuration files too

--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
 #undef GTK_TALKS_UTF8_WE_DONT
 #undef GTK_CHARSET_MISMATCH
 
-#define VERSION "0.90.RC3"
+#define VERSION "0.90"
 
 #include <io.h> 
 

--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(app/diagram.c)
 dnl AC_PREREQ(2.50)
 dnl AC_REVISION($Revision$)
 
-AM_INIT_AUTOMAKE(dia, 0.90.RC3)
+AM_INIT_AUTOMAKE(dia, 0.90)
 
 dnl Specify a header configuration file
 AM_CONFIG_HEADER(config.h)

--- a/dia.spec
+++ b/dia.spec
@@ -1,5 +1,5 @@
 %define name dia
-%define ver 0.90.RC3
+%define ver 0.90
 
 Summary: A gtk+ based diagram creation program.
 Name: %name
@@ -22,6 +22,8 @@ flowchart and others.  The native file format for Dia is XML (optionally
 gzip compressed).  It has print support, and can export to a number of formats such as EPS, SVG, CGM and PNG.
 
 %changelog
+* Sat Jun 1 2002  Cyrille Chepelov <[e-mail]>
+- update version number.
 * Fri May 11 2001  James Henstridge  <[e-mail]>
 - update version number.
 - Use make install rather than install-strip as it is causing some problems.

--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.86\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2001-11-28 16:49GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <[e-mail]>\n"
 "Language-Team: Azerbaijani Turkic <[e-mail]>\n"
@@ -3974,11 +3974,6 @@ msgstr "Standart cismlər"
 msgid "Fontsize:"
 msgstr "Yazıtipi böyüklüyü :"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Objects to design Sybase replication domain diagrams with"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Gedişatcı"
@@ -5822,6 +5817,10 @@ msgstr "Həyata keçirici, xüsusi ara üzü tamamlayır"
 msgid "UML"
 msgstr "UML"
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Objects to design Sybase replication domain diagrams with"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Diaqramma faylını oxuyarkən xəta oldu\n"
 

--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.86\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2001-01-26 19:44+0100\n"

 "Language-Team: Catalan <[e-mail]>\n"
@@ -4131,11 +4131,6 @@ msgstr "Objectes est
 msgid "Fontsize:"
 msgstr "Mida del tipus de lletra:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"

-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Actor"
@@ -6161,6 +6156,10 @@ msgstr ""
 msgid "UML"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"

+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "S'ha produ? un error mentre es llegia el fixer del diagrama\n"
 

--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia v. 0.83\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-01-16 14:40+0200\n"
 "Last-Translator: Keld Simonsen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
@@ -3971,13 +3971,6 @@ msgstr "Standard objekter"
 msgid "Fontsize:"
 msgstr "Skriftst?relse:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr ""
-"Objekter til udforming af dom?e-diagrammer for replikering i Sybase "
-"databaser"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Akt?"
@@ -5824,6 +5817,12 @@ msgstr "Realiserer, implementerer en specifik gr
 msgid "UML"
 msgstr "UML"
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr ""
+#~ "Objekter til udforming af dom?e-diagrammer for replikering i Sybase "
+#~ "databaser"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Fejl under indl?ning af diagramfilen\n"
 

--- a/po/de.po
+++ b/po/de.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.86(cvs)\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-05-29 15:17+0200\n"
 "Last-Translator: J?gen Scheibengruber <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
@@ -3984,10 +3984,6 @@ msgstr "Standardobjekte"
 msgid "Fontsize:"
 msgstr "Schriftgr?e:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Sybase Replikationsdiagramm-Objekte"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Akteur"
@@ -5830,3 +5826,6 @@ msgstr "Realisierung, implementiert eine spezielle Schnittstelle"
 #: sheets/UML.sheet.in.h:24
 msgid "UML"
 msgstr "UML"
+
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Sybase Replikationsdiagramm-Objekte"

--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.84\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-03-14 19:13-0500\n"
 "Last-Translator: Spiros Papadimitriou <[e-mail]>\n"
 "Language-Team: Greek <[e-mail]>\n"
@@ -4238,11 +4238,6 @@ msgstr "
 msgid "Fontsize:"
 msgstr "杢竇蓖?"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "_慾 粡榱驕跛?
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "假櫁??
@@ -6275,6 +6270,10 @@ msgstr ""
 msgid "UML"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "_慾 粡榱驕跛?
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "囑樣赱 瘢榱逋鼇 ? 粡痺驅跛癆闥\n"
 

--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia CVS\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-07-15\n"
 "Last-Translator: Robert Brady <[e-mail]>\n"
 "Language-Team: \n"
@@ -3871,10 +3871,6 @@ msgstr ""
 msgid "Fontsize:"
 msgstr ""
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr ""
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr ""

--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNOME 1.4\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-01-30 21:35+0100\n"
 "Last-Translator: Juan Manuel Garc? Molina <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
@@ -3975,11 +3975,6 @@ msgstr "Objetos est
 msgid "Fontsize:"
 msgstr "Tama? de fuente:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Objetos para dise?r diagramas en el dominio de replicaci? de Sybase"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Actor"
@@ -5824,6 +5819,11 @@ msgstr "Realiza, implementa un interfaz espec
 msgid "UML"
 msgstr "UML"
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr ""
+#~ "Objetos para dise?r diagramas en el dominio de replicaci? de Sybase"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Error leyendo archivo de diagrama\n"
 

--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.85\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-07-18 01:00+0300\n"
 "Last-Translator: Sami Gerdt <[e-mail]>\n"
 "Language-Team: finnish <[e-mail]>\n"
@@ -4141,11 +4141,6 @@ msgstr "Standardi-objektit"
 msgid "Fontsize:"
 msgstr "Kirjasin koko:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Sybase replication domain diagrammi objekteja"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "N艙ttelij?
@@ -6172,6 +6167,10 @@ msgstr ""
 msgid "UML"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Sybase replication domain diagrammi objekteja"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Virhe luettaessa diagrammitiedostoa\n"
 

--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.89\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-01-25 18:00+0100\n"
 "Last-Translator: Cyrille Ch駱駘ov <[e-mail]>\n"
 "Language-Team: Gnome French Team <[e-mail]>\n"
@@ -3946,10 +3946,6 @@ msgstr "Objets standards"
 msgid "Fontsize:"
 msgstr "Taille de police :"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Diagrammes pour la conception de r駱lication de domaines Sybase"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Acteur"
@@ -5779,3 +5775,6 @@ msgstr "R
 #: sheets/UML.sheet.in.h:24
 msgid "UML"
 msgstr "UML"
+
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Diagrammes pour la conception de r駱lication de domaines Sybase"

--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.86\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-03-09 12:40+0000\n"
 "Last-Translator: Alastair McKinstry <[e-mail]>\n"
 "Language-Team: Irish <[e-mail]>\n"
@@ -3943,10 +3943,6 @@ msgstr ""
 msgid "Fontsize:"
 msgstr ""
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr ""
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr ""

--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Dia 0.86\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2001-01-24 15:15+0100\n"
 "Last-Translator: Emese Kovacs <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
@@ -4143,11 +4143,6 @@ msgstr ""
 msgid "Fontsize:"
 msgstr "Bet??et:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Objektumok h??ati diagrammokhoz"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Szerepl?
@@ -6147,6 +6142,10 @@ msgstr ""
 msgid "UML"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Objektumok h??ati diagrammokhoz"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "?raf?l beolvas?i hiba\n"
 

--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.85\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-07-27 11:55+0200\n"
 "Last-Translator: Salvo Isaja <[e-mail]>\n"
 "Language-Team: ITALIAN <[e-mail]>\n"
@@ -4157,11 +4157,6 @@ msgstr "Oggetti standard"
 msgid "Fontsize:"
 msgstr "Dimensione del font:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Oggetti di diagramma Dominio di replicazione Sybase"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Attore"
@@ -6196,6 +6191,10 @@ msgstr ""
 msgid "UML"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Oggetti di diagramma Dominio di replicazione Sybase"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Errore durante la lettura del file del diagramma\n"
 

--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia CVS-20020526\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-05-26 16:09+0900\n"
 "Last-Translator: Akira TAGOH <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
@@ -3930,10 +3930,6 @@ msgstr "標
 msgid "Fontsize:"
 msgstr "フォントサイズ:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Sybase複製ドメインダイアグラムオブジェクト"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "アクター"
@@ -5762,3 +5758,6 @@ msgstr ""
 #: sheets/UML.sheet.in.h:24
 msgid "UML"
 msgstr "UML"
+
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Sybase複製ドメインダイアグラムオブジェクト"

--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.85\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-05-31 10:16:35+0900\n"
 "Last-Translator: Young-Ho Cha <[e-mail]>\n"
 "Language-Team: Korean <[e-mail]>\n"
@@ -4047,10 +4047,6 @@ msgstr "妊
 msgid "Fontsize:"
 msgstr "越加 滴奄:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr ""
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr ""

--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.86\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-10-15 18:27+0200\n"
 "Last-Translator: Almer S. Tigelaar <[e-mail]>\n"
 "Language-Team: Dutch <[e-mail]>\n"
@@ -4134,10 +4134,6 @@ msgstr "Standaard objecten"
 msgid "Fontsize:"
 msgstr "Lettergrootte:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Sybase replicatie domein diagram objecten"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Acteur"
@@ -6095,6 +6091,9 @@ msgstr ""
 msgid "UML"
 msgstr ""
 
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Sybase replicatie domein diagram objecten"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Fout bij lezen diagram bestand\n"
 

--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.88.1\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2001-11-27 20:51+0100\n"
 "Last-Translator: Roy-Magne Mo <[e-mail]>\n"
 "Language-Team: Norwegian Nynorsk <[e-mail]>\n"
@@ -4132,11 +4132,6 @@ msgstr "Standard skrifttype"
 msgid "Fontsize:"
 msgstr "Skrift&storleik"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Objekt til utforming av kronogrammer"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 #, fuzzy
 msgid "Actor"
@@ -6121,6 +6116,10 @@ msgstr ""
 msgid "UML"
 msgstr "UML"
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Objekt til utforming av kronogrammer"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Feil ved lesing av diagramfil\n"
 

--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.89\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-05-25 21:56+0200\n"
 "Last-Translator: Kjartan Maraas <[e-mail]>\n"
 "Language-Team: Norwegian <[e-mail]>\n"
@@ -3932,10 +3932,6 @@ msgstr "Standard objekter"
 msgid "Fontsize:"
 msgstr "St?relse p skrifttype:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Diagramobjekter for Sybase-replikeringsdomene"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Akt?"
@@ -5767,6 +5763,9 @@ msgstr "Realiserer, implementerer et spesifikt grensesnitt"
 msgid "UML"
 msgstr "UML"
 
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Diagramobjekter for Sybase-replikeringsdomene"
+
 #~ msgid "<<"
 #~ msgstr "<<"
 

--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-05-26 19:27+0200\n"
 "Last-Translator: GNOME PL Team <[e-mail]>\n"
 "Language-Team: Polish <[e-mail]>\n"
@@ -3938,10 +3938,6 @@ msgstr "Obiekty standardowe"
 msgid "Fontsize:"
 msgstr "Rozmiar czcionki:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"

-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Aktor"
@@ -5771,3 +5767,6 @@ msgstr "Realizacja, implementuje okre
 #: sheets/UML.sheet.in.h:24
 msgid "UML"
 msgstr "UML"
+
+#~ msgid "Sybase replication domain diagram objects"

--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 1.0\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-05-26 02:48+0000\n"
 "Last-Translator: Duarte Loreto <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
@@ -3932,10 +3932,6 @@ msgstr "Objecto standard"
 msgid "Fontsize:"
 msgstr "Tamanho Fonte:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Objectos de diagramas de dom?ios de replica鈬o Sybase"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Actor"
@@ -5767,6 +5763,9 @@ msgstr "Realiza, implementa um interface espec
 msgid "UML"
 msgstr "UML"
 
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Objectos de diagramas de dom?ios de replica鈬o Sybase"
+
 #~ msgid "<<"
 #~ msgstr "<<"
 

--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.88.1\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-05-21 12:23-0300\n"
 "Last-Translator: Francisco Petr?io Cavalcante Junior <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
@@ -5685,12 +5685,6 @@ msgstr "Objetos padr
 msgid "Fontsize:"
 msgstr "Tamanho da fonte:"
 
-# sheets/sybase.sheet.in.h:5
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Objetos para Projetar Diagramas de Dom?ios de Replica艫o Sybase"
-
 # objects/UML/actor.c:332
 # objects/UML/actor.c:332
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
@@ -8200,6 +8194,11 @@ msgstr ""
 msgid "UML"
 msgstr "UML"
 
+# sheets/sybase.sheet.in.h:5
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Objetos para Projetar Diagramas de Dom?ios de Replica艫o Sybase"
+
 #~ msgid "<<"
 #~ msgstr "<<"
 

--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Dia-0.86\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2001-09-28 19:27+0400\n"
 "Last-Translator: Valek Filippov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
@@ -3971,11 +3971,6 @@ msgstr "
 msgid "Fontsize:"
 msgstr "鯀斃賭 柢鋲堊:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "鐶濺穆 追素卅様 黎殞腕堙?鑚力枦良?
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "畴杜?
@@ -5857,6 +5852,10 @@ msgstr ""
 msgid "UML"
 msgstr "UML"
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "鐶濺穆 追素卅様 黎殞腕堙?鑚力枦良?
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "閊病冒 侑 湟杜鰭 徳別 追素卅様?n"
 

--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Dia VERSION\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-03-28 14:00+0100\n"
 "Last-Translator: Zdenko Podobn <[e-mail]>\n"
 "Language-Team: Slovak <[e-mail]>\n"
@@ -3952,10 +3952,6 @@ msgstr "
 msgid "Fontsize:"
 msgstr "Ve?os p?ma:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Objekty pre n?rh diagramov Sybase replika?ej dom?y s"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Akt?"
@@ -5790,6 +5786,9 @@ msgstr "Realizuje, implementuje 
 msgid "UML"
 msgstr "UML"
 
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Objekty pre n?rh diagramov Sybase replika?ej dom?y s"
+
 #~ msgid "<<"
 #~ msgstr "<<"
 

--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-06-25 19:28+0200\n"
 "Last-Translator: Andraz Tori <[e-mail]>\n"
 "Language-Team: Slovenian <[e-mail]>\n"
@@ -3955,10 +3955,6 @@ msgstr "Običajni predmeti"
 msgid "Fontsize:"
 msgstr "Velikost pisave:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Diagramski predmeti Sybase"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Vršilec"
@@ -5792,6 +5788,9 @@ msgstr "Realizes, implementira določen vmesnik"
 msgid "UML"
 msgstr "UMP"
 
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Diagramski predmeti Sybase"
+
 #~ msgid "<<"
 #~ msgstr "<<"
 

--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-05-26 23:53+0200\n"
 "Last-Translator: Christian Rose <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\n"
@@ -3942,10 +3942,6 @@ msgstr "Standardobjekt"
 msgid "Fontsize:"
 msgstr "Typsnittsstorlek:"
 
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr "Diagramobjekt f? Sybase-replikationsdom?er"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Akt?"
@@ -5775,6 +5771,9 @@ msgstr "Realiserar, implementerar ett specifikt gr
 msgid "UML"
 msgstr "UML"
 
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Diagramobjekt f? Sybase-replikationsdom?er"
+
 #~ msgid "<<"
 #~ msgstr "?
 

--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.88.1\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2000-08-06 13:23+0200\n"
 "Last-Translator: Burak Ilgicioglu <[e-mail]>\n"
 "Language-Team: Turkish <[e-mail]>\n"
@@ -4087,11 +4087,6 @@ msgstr "Standart nesneler"
 msgid "Fontsize:"
 msgstr "Yaz?ipi boyutu:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Varl?/?i?i diyagram nesneleri"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Eylemci"
@@ -6102,6 +6097,10 @@ msgstr ""
 msgid "UML"
 msgstr "UML"
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Varl?/?i?i diyagram nesneleri"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Diyagram dosyas? okurken hata oldu\n"
 

--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Dia 0.82\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-03-23 11:59+0200\n"
 "Last-Translator: Yuriy Syrota <[e-mail]>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
@@ -4021,11 +4021,6 @@ msgstr "Стандартні об'єкти"
 msgid "Fontsize:"
 msgstr "Розмір шрифту:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "Об'єкти діаграми реплікаційного домену Sybase"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "Агент"
@@ -5969,6 +5964,10 @@ msgstr ""
 msgid "UML"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "Об'єкти діаграми реплікаційного домену Sybase"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "Помилка зчитування файлу діаграми\n"
 

--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia VERSION\n"
-"POT-Creation-Date: 2002-03-29 18:51-0500\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2002-05-16 21:31-0400\n"
 "Last-Translator: pclouds <[e-mail]>\n"
 "Language-Team: GnomeVI <[e-mail]>\n"
@@ -13,62 +13,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app/app_procs.c:157
+#: app/app_procs.c:160
 #, c-format
 msgid "%s error: input and output file name is identical: %s"
 msgstr "Lỗi %s: tên tập tin nhập và xuất trùng nhau: %s"
 
-#: app/app_procs.c:168
+#: app/app_procs.c:171
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "Lỗi %s: cần tập tin nhập hợp lệ %s\n"
 
-#: app/app_procs.c:175
+#: app/app_procs.c:178
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "Lỗi %s: không biết phải xuất ra %s như thể nào\n"
 
 #. if (!quiet)
-#: app/app_procs.c:181
+#: app/app_procs.c:184
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
 #. &export_file_name
-#: app/app_procs.c:219
+#: app/app_procs.c:238
 msgid "Export loaded file and exit"
 msgstr "Xuất tập tin được nạp và thoát"
 
-#: app/app_procs.c:219 app/diaconv.c:97
+#: app/app_procs.c:238 app/diaconv.c:97
 msgid "OUTPUT"
 msgstr "XUẤT"
 
 #. &export_file_format
-#: app/app_procs.c:221
+#: app/app_procs.c:240
 msgid "Export to file format and exit"
 msgstr "Xuất ra dạng thức tập tin và thoát"
 
-#: app/app_procs.c:221 app/diaconv.c:95
+#: app/app_procs.c:240 app/diaconv.c:95
 msgid "eps,png,wmf,cgm,dxf,fig"
 msgstr "eps,png,wmf,cgm,dxf,fig"
 
-#: app/app_procs.c:223
+#: app/app_procs.c:242
 msgid "Don't show the splash screen"
 msgstr "Không hiển thị splash screen"
 
-#: app/app_procs.c:225 app/diaconv.c:98
+#: app/app_procs.c:244 app/diaconv.c:98
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
 
-#: app/app_procs.c:258
+#: app/app_procs.c:277
 msgid "Can't connect to session manager!\n"
 msgstr "Không thể kết nối với bộ quản lý session!\n"
 
-#: app/app_procs.c:269 app/diaconv.c:126
+#: app/app_procs.c:288 app/diaconv.c:126
 msgid "[OPTION...] [FILE...]"
 msgstr "[TÙY CHỌN...] [TẬP TIN...]"
 
-#: app/app_procs.c:273 app/diaconv.c:133
+#: app/app_procs.c:292 app/diaconv.c:133
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -77,21 +77,21 @@ msgstr ""
 "Lỗi trong tùy chọn %s: %s.\n"
 "Chạy '%s --help' để xem danh sách các tùy chọn hợp lệ.\n"
 
-#: app/app_procs.c:286
+#: app/app_procs.c:305
 #, c-format
 msgid "%s error: can specify only one of -f or -o."
 msgstr "Lỗi %s: chỉ có thể xác định hoặc là -f hoặc là -o."
 
-#: app/app_procs.c:330 app/app_procs.c:332 app/diaconv.c:206 app/diaconv.c:208
+#: app/app_procs.c:353 app/app_procs.c:355 app/diaconv.c:206 app/diaconv.c:208
 msgid ""
 "Couldn't find standard objects when looking for object-libs, exiting...\n"
 msgstr "Không thể tìm thấy các đối tượng chuẩn khi tìm object-libs, thoát...\n"
 
-#: app/app_procs.c:453 app/app_procs.c:459
+#: app/app_procs.c:478 app/app_procs.c:484
 msgid "Quit, are you sure?"
 msgstr "Bạn có chắc chắn muốn thoát chứ?"
 
-#: app/app_procs.c:466
+#: app/app_procs.c:491
 msgid ""
 "Modified diagrams exists.\n"
 "Are you sure you want to quit?"
@@ -99,32 +99,35 @@ msgstr ""
 "Biểu đồ đã bị thay đổi.\n"
 "Bạn có chắc chắn muốn thoát chứ?"
 
-#: app/app_procs.c:476 app/app_procs.c:481
+#: app/app_procs.c:501 app/app_procs.c:506
 msgid "Quit"
 msgstr "Thoát"
 
-#: app/app_procs.c:493 app/display.c:966 app/export_png.c:253
-#: app/layer_dialog.c:1015 app/lineprops_area.c:771 app/lineprops_area.c:971
-#: app/linewidth_area.c:246 app/paginate_psprint.c:268
+#: app/app_procs.c:518 app/dialogs.c:52 app/display.c:966
+#: app/layer_dialog.c:1015 app/lineprops_area.c:436 app/lineprops_area.c:636
+#: app/linewidth_area.c:246 app/paginate_psprint.c:268 app/sheets_dialog.c:570
+#: app/sheets_dialog.c:802 app/sheets_dialog.c:961
 msgid "Cancel"
 msgstr "Bỏ"
 
-#: app/app_procs.c:568 app/app_procs.c:575
+#: app/app_procs.c:593 app/app_procs.c:600
 msgid "Could not create per-user Dia config directory"
 msgstr "Không thể tạo thư mục cấu hình Dia cho từng người dùng"
 
-#: app/app_procs.c:577
+#: app/app_procs.c:602
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
-msgstr "Không thể tạo thư mục cấu hình Dia cho từng người dùng. Vui lòng kiểm tra biến môi trường HOME có chỉ đến một thư mục hợp lệ hay không."
+msgstr ""
+"Không thể tạo thư mục cấu hình Dia cho từng người dùng. Vui lòng kiểm tra "
+"biến môi trường HOME có chỉ đến một thư mục hợp lệ hay không."
 
-#: app/app_procs.c:599 app/diaconv.c:256
+#: app/app_procs.c:624 app/diaconv.c:256
 #, fuzzy
 msgid "Objects and filters internal to dia"
 msgstr "Đối tượng và bộ lọc nội tại của dia"
 
-#: app/color_area.c:264 lib/widgets.c:692
+#: app/color_area.c:264 lib/widgets.c:697
 msgid "Select color"
 msgstr "Chọn màu"
 
@@ -133,44 +136,47 @@ msgstr "Chọn màu"
 msgid "Untitled-%d"
 msgstr "Không tựa-%d"
 
-#: app/commands.c:201
+#: app/commands.c:204
 msgid "No existing object to paste.\n"
 msgstr "Không có đối tượng để dán.\n"
 
-#: app/commands.c:472 app/commands.c:496
+#: app/commands.c:475 app/commands.c:483 app/commands.c:505
 msgid "Could not find help directory"
 msgstr "Không thể tìm thấy thư mục trợ giúp"
 
-#: app/commands.c:543
+#: app/commands.c:553
 msgid "About Dia"
 msgstr "Nói về Dia"
 
-#: app/commands.c:586
+#: app/commands.c:596
 #, c-format
 msgid "Dia v %s by Alexander Larsson"
 msgstr "Dia v %s bởi Alexander Larsson"
 
-#: app/commands.c:591
+#: app/commands.c:601
 msgid "Maintainer: James Henstridge"
 msgstr "Người bảo trì: James Henstridge"
 
-#: app/commands.c:595
+#: app/commands.c:605
 msgid "Please visit http://www.lysator.liu.se/~alla/dia for more info"
-msgstr "Xin hãy ghé thăm http://www.lysator.liu.se/~alla/dia để có thêm thông tin chi tiết"
+msgstr ""
+"Xin hãy ghé thăm http://www.lysator.liu.se/~alla/dia để có thêm thông tin "
+"chi tiết"
 
-#: app/commands.c:600
+#: app/commands.c:610
 msgid "Contributors:"
 msgstr "Người tham gia:"
 
 #. setup buttons
-#: app/commands.c:617 app/dia-props.c:86 app/layer_dialog.c:1005
-#: app/lineprops_area.c:762 app/lineprops_area.c:961 app/linewidth_area.c:237
+#: app/commands.c:627 app/dia-props.c:86 app/layer_dialog.c:1005
+#: app/lineprops_area.c:427 app/lineprops_area.c:626 app/linewidth_area.c:237
 #: app/pagesetup.c:72 app/paginate_psprint.c:260 app/preferences.c:717
-#: app/properties.c:92 lib/message.c:87
+#: app/properties.c:92 app/sheets_dialog.c:558 app/sheets_dialog.c:790
+#: app/sheets_dialog.c:949 lib/message.c:87
 msgid "OK"
 msgstr "Đồng ý"
 
-#: app/commands.c:703
+#: app/commands.c:713
 msgid ""
 "The anti aliased renderer is buggy, and may cause\n"
 "crashes.  We know there are bugs in it, so don't\n"
@@ -182,13 +188,13 @@ msgid "Object defaults"
 msgstr "Đối tượng mặc định"
 
 #: app/defaults.c:75 app/dia-props.c:95 app/pagesetup.c:77
-#: app/preferences.c:726 app/properties.c:101
+#: app/preferences.c:726 app/properties.c:101 app/sheets_dialog.c:306
 msgid "Apply"
 msgstr "Áp dụng"
 
 #: app/defaults.c:85 app/dia-props.c:105 app/layer_dialog.c:264
 #: app/pagesetup.c:83 app/plugin-manager.c:160 app/preferences.c:735
-#: app/properties.c:111
+#: app/properties.c:111 app/sheets_dialog.c:326
 msgid "Close"
 msgstr "Đóng"
 
@@ -196,42 +202,6 @@ msgstr "Đóng"
 msgid "This object has no defaults."
 msgstr "Đối tượng này không có tham số mặc định."
 
-#: app/dia-props.c:60 app/dia-props.c:67
-msgid "Diagram Properties"
-msgstr "Thuộc tính biểu đồ"
-
-#: app/dia-props.c:130
-msgid "x"
-msgstr "x"
-
-#: app/dia-props.c:134
-msgid "y"
-msgstr "y"
-
-#: app/dia-props.c:139
-msgid "Spacing"
-msgstr "Khoảng trống"
-
-#: app/dia-props.c:159
-msgid "Visible spacing"
-msgstr ""
-
-#: app/dia-props.c:179
-msgid "Grid"
-msgstr "Lưới"
-
-#: app/dia-props.c:189
-msgid "Background Colour"
-msgstr "Màu nền"
-
-#: app/dia-props.c:200 lib/diagramdata.c:61 lib/diagramdata.c:63
-msgid "Background"
-msgstr "Nền"
-
-#: app/dia_embedd.c:352
-msgid "Could not initialize Bonobo!"
-msgstr "Không thể khởi động Bonobo!"
-
 #. &export_file_format
 #: app/diaconv.c:95
 msgid "Export format to use"
@@ -284,6 +254,10 @@ msgstr "Lỗi %s: chỉ cần có một tập tin nhập."
 msgid "%s error: popt library not available on this system"
 msgstr "Lỗi %s: thư viện popt không tồn tại trên hệ thống"
 
+#: app/dia_embedd.c:352
+msgid "Could not initialize Bonobo!"
+msgstr "Không thể khởi động Bonobo!"
+
 #: app/diagram_tree_menu.c:45
 msgid "/_Sort objects"
 msgstr "/_Sắp xếp đối tượng"
@@ -364,10 +338,14 @@ msgstr "/T_huộc tính"
 msgid "/_Hide this type"
 msgstr "/Ẩ_n loại này"
 
-#: app/diagram_tree_window.c:75
+#: app/diagram_tree_window.c:77
 msgid "Diagram tree"
 msgstr "Cây biểu đồ"
 
+#: app/dialogs.c:51
+msgid "Ok"
+msgstr "Đồng ý"
+
 #. paper size
 #: app/diapagelayout.c:112
 msgid "Paper Size"
@@ -425,7 +403,39 @@ msgstr "%0.3gcm x %0.3gcm"
 msgid "Page Setup"
 msgstr "Thiết lập trang"
 
-#: app/disp_callbacks.c:75 app/properties.c:176
+#: app/dia-props.c:60 app/dia-props.c:67
+msgid "Diagram Properties"
+msgstr "Thuộc tính biểu đồ"
+
+#: app/dia-props.c:130
+msgid "x"
+msgstr "x"
+
+#: app/dia-props.c:134
+msgid "y"
+msgstr "y"
+
+#: app/dia-props.c:139
+msgid "Spacing"
+msgstr "Khoảng trống"
+
+#: app/dia-props.c:159
+msgid "Visible spacing"
+msgstr ""
+
+#: app/dia-props.c:179
+msgid "Grid"
+msgstr "Lưới"
+
+#: app/dia-props.c:189
+msgid "Background Colour"
+msgstr "Màu nền"
+
+#: app/dia-props.c:200 lib/diagramdata.c:61 lib/diagramdata.c:63
+msgid "Background"
+msgstr "Nền"
+
+#: app/disp_callbacks.c:76 app/properties.c:176
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -433,7 +443,7 @@ msgstr ""
 "Đối tượng này không hỗ trợ tính năng Hoàn lại/Làm lại.\n"
 "Thông tin \"Hoàn lại\" sẽ bị xóa."
 
-#: app/disp_callbacks.c:196
+#: app/disp_callbacks.c:197
 msgid "No object menu"
 msgstr "Không có thư mục đối tượng"
 
@@ -461,17 +471,17 @@ msgstr ""
 "Biểu đồ này chưa được lưu.\n"
 "Lưu ngay bây giờ chứ?"
 
-#: app/display.c:945 app/filedlg.c:246 app/filedlg.c:435 app/preferences.c:607
-#: lib/prop_inttypes.c:191
+#: app/display.c:945 app/filedlg.c:249 app/filedlg.c:454 app/preferences.c:607
+#: lib/prop_inttypes.c:196
 msgid "Yes"
 msgstr "Có"
 
-#: app/display.c:955 app/filedlg.c:259 app/filedlg.c:448 app/preferences.c:607
-#: app/preferences.c:618 lib/prop_inttypes.c:193 lib/prop_inttypes.c:219
+#: app/display.c:955 app/filedlg.c:262 app/filedlg.c:467 app/preferences.c:607
+#: app/preferences.c:618 lib/prop_inttypes.c:198 lib/prop_inttypes.c:224
 msgid "No"
 msgstr "Không"
 
-#: app/export_png.c:114 app/load_save.c:616 app/render_eps.c:748
+#: app/export_png.c:115 app/load_save.c:639 app/render_eps.c:747
 #: plug-ins/cgm/cgm.c:1143 plug-ins/dxf/dxf-export.c:526
 #: plug-ins/hpgl/hpgl.c:559 plug-ins/metapost/render_metapost.c:205
 #: plug-ins/pstricks/render_pstricks.c:195 plug-ins/python/pydia-render.c:671
@@ -482,64 +492,61 @@ msgstr "Không"
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "Không thể mở: '%s' để ghi.\n"
 
-#: app/export_png.c:122
+#: app/export_png.c:123
 msgid "Could not create PNG write structure"
 msgstr "Không thể tạo cấu trúc PNG để ghi"
 
-#: app/export_png.c:131
+#: app/export_png.c:132
 msgid "Could not create PNG header info structure"
 msgstr "Không thể tạo cấu trúc PNG header info"
 
-#: app/export_png.c:139
+#: app/export_png.c:140
 msgid "Error occurred while writing PNG"
 msgstr "Lỗ khi đang tạo PNG"
 
-#: app/export_png.c:252
-msgid "Ok"
-msgstr "Đồng ý"
-
 #. Create a dialog
-#: app/export_png.c:301
+#: app/export_png.c:252
 msgid "PNG Export Options"
 msgstr "Tùy chọn xuất PNG"
 
-#: app/export_png.c:302 objects/FS/function.c:631 objects/FS/function.c:632
+#. Translators: Menu item Verb/Channel/Export
+#: app/export_png.c:253 objects/FS/function.c:658 objects/FS/function.c:660
 msgid "Export"
 msgstr "Xuất"
 
-#: app/export_png.c:307
+#: app/export_png.c:258
 msgid "Image width:"
 msgstr "Bề rộng ảnh:"
 
-#: app/export_png.c:310
+#: app/export_png.c:261
 msgid "Image height:"
 msgstr "Bề cao ảnh:"
 
-#: app/export_png.c:355
+#: app/export_png.c:306
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: app/filedlg.c:99 app/filedlg.c:373
+#: app/filedlg.c:102 app/filedlg.c:392
 msgid "By extension"
 msgstr "Bằng phần mở rộng"
 
-#: app/filedlg.c:158
+#: app/filedlg.c:161
 msgid "Open Diagram"
 msgstr "Mở biểu đồ"
 
-#: app/filedlg.c:184
+#: app/filedlg.c:187
 msgid "Open Options"
 msgstr "Tùy chọn Mở"
 
-#: app/filedlg.c:192 app/filedlg.c:526
+#: app/filedlg.c:195 app/filedlg.c:545
 msgid "Determine file type:"
 msgstr "Xác định loại tập tin:"
 
-#: app/filedlg.c:232 app/filedlg.c:420
+#: app/filedlg.c:235 app/filedlg.c:439
 msgid "File already exists"
 msgstr "Tập tin đã tồn tại"
 
-#: app/filedlg.c:236 app/filedlg.c:423
+#: app/filedlg.c:239 app/filedlg.c:442
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -548,22 +555,35 @@ msgstr ""
 "Tập tin '%s' đã tồn tại.\n"
 "Bạn có muốn ghi đè lên không?"
 
-#: app/filedlg.c:300
+#: app/filedlg.c:307
 msgid "Save Diagram"
 msgstr "Lưu biểu đồ"
 
-#: app/filedlg.c:480
+#. 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:315
+#, fuzzy
+msgid "Compress diagram files"
+msgstr "Tập tin được lưu nén:"
+
+#: app/filedlg.c:322
+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:499
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
 "to use to save '%s'"
 msgstr "Không thể xác định bộ lọc xuất cần dùng để lưu '%s'"
 
-#: app/filedlg.c:498
+#: app/filedlg.c:517
 msgid "Export Diagram"
 msgstr "Xuất biểu đồ"
 
-#: app/filedlg.c:518
+#: app/filedlg.c:537
 msgid "Export Options"
 msgstr "Tùy chọn xuất"
 
@@ -571,12 +591,13 @@ msgstr "Tùy chọn xuất"
 msgid "Modify object(s)"
 msgstr "Sửa đối tượng"
 
-#: app/interface.c:45 app/menus.c:203
+#: app/interface.c:45 app/menus.c:208
 msgid "Modify"
 msgstr "Sửa"
 
-#: app/interface.c:49 app/interface.c:50 app/menus.c:204
-#: objects/FS/function.c:776
+#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
+#: app/interface.c:49 app/interface.c:50 app/menus.c:209
+#: objects/FS/function.c:948
 msgid "Magnify"
 msgstr ""
 
@@ -584,7 +605,7 @@ msgstr ""
 msgid "Scroll around the diagram"
 msgstr "Cuộn chung quanh biểu đồ"
 
-#: app/interface.c:55 app/menus.c:205
+#: app/interface.c:55 app/menus.c:210
 msgid "Scroll"
 msgstr "Cuộn"
 
@@ -596,11 +617,11 @@ msgstr "Vẽ Text"
 #. PROP_STD_TEXT_FONT,
 #. PROP_STD_TEXT_HEIGHT,
 #. PROP_STD_TEXT_COLOUR,
-#: app/interface.c:60 app/menus.c:206 lib/properties.c:77 lib/properties.h:501
-#: lib/properties.h:504 objects/UML/actor.c:115 objects/UML/classicon.c:137
+#: app/interface.c:60 app/menus.c:211 lib/properties.c:77 lib/properties.h:503
+#: lib/properties.h:506 objects/UML/actor.c:115 objects/UML/classicon.c:137
 #: objects/UML/component.c:120 objects/UML/node.c:119 objects/UML/note.c:113
 #: objects/UML/object.c:142 objects/UML/small_package.c:120
-#: objects/UML/state.c:137 objects/UML/usecase.c:130
+#: objects/UML/state.c:143 objects/UML/usecase.c:130
 msgid "Text"
 msgstr "Text"
 
@@ -608,7 +629,7 @@ msgstr "Text"
 msgid "Create Box"
 msgstr "Vẽ hộp"
 
-#: app/interface.c:65 app/menus.c:207
+#: app/interface.c:65 app/menus.c:212
 msgid "Box"
 msgstr "Hộp"
 
@@ -616,7 +637,7 @@ msgstr "Hộp"
 msgid "Create Ellipse"
 msgstr "Vẽ êlíp"
 
-#: app/interface.c:70 app/menus.c:208
+#: app/interface.c:70 app/menus.c:213
 msgid "Ellipse"
 msgstr "Êlíp"
 
@@ -624,7 +645,7 @@ msgstr "Êlíp"
 msgid "Create Polygon"
 msgstr "Vẽ đa giác"
 
-#: app/interface.c:75 app/menus.c:209
+#: app/interface.c:75 app/menus.c:214
 msgid "Polygon"
 msgstr "Đa giác"
 
@@ -632,7 +653,7 @@ msgstr "Đa giác"
 msgid "Create Beziergon"
 msgstr "Vẽ Bezier"
 
-#: app/interface.c:80 app/menus.c:210
+#: app/interface.c:80 app/menus.c:215
 msgid "Beziergon"
 msgstr "Bezier"
 
@@ -640,7 +661,7 @@ msgstr "Bezier"
 msgid "Create Line"
 msgstr "Vẽ đường thẳng"
 
-#: app/interface.c:85 app/menus.c:211 objects/standard/line.c:188
+#: app/interface.c:85 app/menus.c:216 objects/standard/line.c:188
 msgid "Line"
 msgstr "Đường thẳng"
 
@@ -648,7 +669,7 @@ msgstr "Đường thẳng"
 msgid "Create Arc"
 msgstr "Vẽ cung"
 
-#: app/interface.c:90 app/menus.c:212
+#: app/interface.c:90 app/menus.c:217
 msgid "Arc"
 msgstr "Cung"
 
@@ -656,7 +677,7 @@ msgstr "Cung"
 msgid "Create Zigzagline"
 msgstr "Vẽ đường zíc zắc"
 
-#: app/interface.c:95 app/menus.c:213
+#: app/interface.c:95 app/menus.c:218
 msgid "Zigzagline"
 msgstr "Đường zíc zắc"
 
@@ -664,7 +685,7 @@ msgstr "Đường zíc zắc"
 msgid "Create Polyline"
 msgstr "Vẽ đa đoạn thẳng"
 
-#: app/interface.c:100 app/menus.c:214
+#: app/interface.c:100 app/menus.c:219
 msgid "Polyline"
 msgstr "Đa đoạn thẳng"
 
@@ -672,7 +693,7 @@ msgstr "Đa đoạn thẳng"
 msgid "Create Bezierline"
 msgstr "Vẽ đường Bezier"
 
-#: app/interface.c:105 app/menus.c:215
+#: app/interface.c:105 app/menus.c:220
 msgid "Bezierline"
 msgstr "Đường Bezier"
 
@@ -680,7 +701,7 @@ msgstr "Đường Bezier"
 msgid "Create Image"
 msgstr "Tạo ảnh"
 
-#: app/interface.c:110 app/menus.c:216
+#: app/interface.c:110 app/menus.c:221
 msgid "Image"
 msgstr "Ảnh"
 
@@ -688,13 +709,15 @@ msgstr "Ảnh"
 msgid "NULL tooldata in tool_select_update"
 msgstr "NULL tooldata trong tool_select_update"
 
-#: app/interface.c:961
+#: app/interface.c:965
 msgid ""
 "Foreground & background colors.  The small black and white squares reset "
 "colors.  The small arrows swap colors.  Double click to change colors."
-msgstr "Màu cận cảnh và màu nền. Ô vuông đen trắng nhỏ phục hồi màu. Mũi tên nhỏ hoán đổi màu. Nhấp đúp để thay đổi màu."
+msgstr ""
+"Màu cận cảnh và màu nền. Ô vuông đen trắng nhỏ phục hồi màu. Mũi tên nhỏ "
+"hoán đổi màu. Nhấp đúp để thay đổi màu."
 
-#: app/interface.c:1107
+#: app/interface.c:1122
 msgid "Diagram Editor"
 msgstr "Bộ biên soạn biểu đồ"
 
@@ -738,19 +761,19 @@ msgstr "Sửa thuộc tính lớp"
 msgid "Layer name:"
 msgstr "Tên lớp:"
 
-#: app/lineprops_area.c:751
+#: app/lineprops_area.c:416
 msgid "Arrow Properties"
 msgstr "Thuộc tính mũi tên"
 
-#: app/lineprops_area.c:808 app/lineprops_area.c:994
+#: app/lineprops_area.c:473 app/lineprops_area.c:659
 msgid "Details..."
 msgstr "Chi tiết..."
 
-#: app/lineprops_area.c:950
+#: app/lineprops_area.c:615
 msgid "Line Style Properties"
 msgstr "Thuộc tính kiểu đường thẳng"
 
-#: app/linewidth_area.c:216 lib/properties.h:477
+#: app/linewidth_area.c:216 lib/properties.h:479
 #: objects/chronogram/chronoline.c:181 objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr "Bề rộng đường thẳng"
@@ -759,11 +782,7 @@ msgstr "Bề rộng đường thẳng"
 msgid "Line width:"
 msgstr "Bề rộng đường thẳng:"
 
-#: app/load_save.c:127
-msgid "Error reading diagram file\n"
-msgstr "Lỗi khi đọc tập tin biểu đồ\n"
-
-#: app/load_save.c:195
+#: app/load_save.c:197
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -771,7 +790,7 @@ msgstr ""
 "Lỗi khi đọc biểu đồ.\n"
 "Không tìm thấy đối tượng liên kết trong tài liệu."
 
-#: app/load_save.c:198
+#: app/load_save.c:200
 msgid ""
 "Error loading diagram.\n"
 "connection point does not exist."
@@ -779,7 +798,7 @@ msgstr ""
 "Lỗi khi đọc biểu đồ.\n"
 "Điểm kết nối không tồn tại."
 
-#: app/load_save.c:201
+#: app/load_save.c:203
 msgid ""
 "Error loading diagram.\n"
 "connection handle does not exist."
@@ -787,17 +806,17 @@ msgstr ""
 "Lỗi khi nạp biểu đồ.\n"
 "Đầu kết nối không tồn tại."
 
-#: app/load_save.c:245 plug-ins/dxf/dxf-import.c:629 plug-ins/wpg/wpg.c:1039
-#: plug-ins/xfig/xfig-import.c:1152
+#: app/load_save.c:255 plug-ins/dxf/dxf-import.c:615 plug-ins/wpg/wpg.c:1039
+#: plug-ins/xfig/xfig-import.c:1168
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "Không thể mở: '%s' để đọc.\n"
 
-#: app/load_save.c:251
+#: app/load_save.c:261
 msgid "You must specify a file, not a directory.\n"
 msgstr "Bạn phải xác định một tập tin, không phải một thư mục.\n"
 
-#: app/load_save.c:260 app/load_save.c:265
+#: app/load_save.c:270 app/load_save.c:275
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -806,7 +825,7 @@ msgstr ""
 "Lỗi khi nạp biểu đồ %s.\n"
 "Loại tập tin lạ."
 
-#: app/load_save.c:272
+#: app/load_save.c:282
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -815,20 +834,30 @@ msgstr ""
 "Lỗi khi nạp biểu đồ %s.\n"
 "Không phải là tập tin Dia"
 
-#: app/load_save.c:744
+#: app/load_save.c:476
+#, fuzzy, c-format
+msgid ""
+"Error loading diagram:\n"
+"%s.\n"
+"A valid Dia file defines at least one layer."
+msgstr ""
+"Lỗi khi nạp biểu đồ %s.\n"
+"Không phải là tập tin Dia"
+
+#: app/load_save.c:767
 #, c-format
 msgid "Failed to save file '%s'.\n"
 msgstr "Lỗi khi lưu tập tin '%s'.\n"
 
-#: app/load_save.c:764 app/load_save.c:769
+#: app/load_save.c:787 app/load_save.c:792
 msgid "Native Dia Diagram"
 msgstr "Biểu đồ Dia gốc"
 
-#: app/menus.c:49 app/menus.c:65
+#: app/menus.c:50 app/menus.c:70
 msgid "_New diagram"
 msgstr "Biểu đồ _mới"
 
-#: app/menus.c:49 app/menus.c:65
+#: app/menus.c:50 app/menus.c:70
 msgid "Create new diagram"
 msgstr "Tạo biểu đồ mới"
 
@@ -841,610 +870,637 @@ msgid "Show diagram tree"
 msgstr "Hiện cây biểu đồ"
 
 #: app/menus.c:56
+#, fuzzy
+msgid "_Sheets and Objects..."
+msgstr "Đối tượng chuẩn"
+
+#: app/menus.c:57
+msgid "Modify sheets and their objects"
+msgstr ""
+
+#: app/menus.c:61
 msgid "P_lugins"
 msgstr "P_lugins"
 
-#: app/menus.c:72
+#: app/menus.c:77
 msgid "_Export..."
 msgstr "_Xuất..."
 
-#: app/menus.c:76
+#: app/menus.c:81
 msgid "Page Set_up..."
 msgstr "_Thiết lập trang..."
 
-#: app/menus.c:78
+#: app/menus.c:83
 msgid "_Print Diagram..."
 msgstr "_In biểu đồ..."
 
-#: app/menus.c:93
+#: app/menus.c:98
 msgid "_Delete"
 msgstr "_Xóa"
 
-#: app/menus.c:99
+#: app/menus.c:104
 msgid "Copy Text"
 msgstr "Sao chép text"
 
-#: app/menus.c:100
+#: app/menus.c:105
 msgid "Cut Text"
 msgstr "Cắt text"
 
-#: app/menus.c:101
+#: app/menus.c:106
 msgid "Paste _Text"
 msgstr "Dán _text"
 
-#: app/menus.c:124
+#: app/menus.c:129
 msgid "Zoom _In"
 msgstr "Phóng _to"
 
-#: app/menus.c:124
+#: app/menus.c:129
+#, c-format
 msgid "Zoom in 50%"
 msgstr "Phóng to 50%"
 
-#: app/menus.c:125
+#: app/menus.c:130
 msgid "Zoom _Out"
 msgstr "Thu _nhỏ"
 
-#: app/menus.c:125
+#: app/menus.c:130
+#, c-format
 msgid "Zoom out 50%"
 msgstr "Thu nhỏ 50%"
 
-#: app/menus.c:126
+#: app/menus.c:131
 msgid "_Zoom"
 msgstr "_Phóng to/thu nhỏ"
 
-#: app/menus.c:127
+#: app/menus.c:132
 msgid "Diagram Properties..."
 msgstr "Thuộc tính biểu đồ..."
 
-#: app/menus.c:129
+#: app/menus.c:134
 msgid "_AntiAliased"
 msgstr "_Làm mượt"
 
-#: app/menus.c:132
+#: app/menus.c:137
 msgid "_Visible Grid"
 msgstr "Hiện _Lưới"
 
-#: app/menus.c:134
+#: app/menus.c:139
 msgid "_Snap To Grid"
 msgstr "_Dính lưới"
 
-#: app/menus.c:136
+#: app/menus.c:141
 msgid "Show _Rulers"
 msgstr "Hiện _thước đo"
 
-#: app/menus.c:138
+#: app/menus.c:143
 msgid "Show _Connection Points"
 msgstr "Hiện điể_m kết nối"
 
-#: app/menus.c:141
+#: app/menus.c:146
 msgid "New _View"
 msgstr "_Khung nhìn mới"
 
-#: app/menus.c:142
+#: app/menus.c:147
 msgid "Show _All"
 msgstr "Hiện tất _cả"
 
-#: app/menus.c:147
+#: app/menus.c:152
 msgid "Replace"
 msgstr "Thay thế"
 
-#: app/menus.c:149
+#: app/menus.c:154
 msgid "Union"
 msgstr "Hợp"
 
-#: app/menus.c:151
+#: app/menus.c:156
 msgid "Intersect"
 msgstr "Giao"
 
-#: app/menus.c:153 objects/FS/function.c:636 objects/FS/function.c:712
-#: objects/FS/function.c:713
+#. Translators: Menu item Verb/Channel/Export/Remove
+#: app/menus.c:158 app/sheets_dialog.c:288 app/sheets_dialog.c:852
+#: objects/FS/function.c:668 objects/FS/function.c:820
+#: objects/FS/function.c:822
 msgid "Remove"
 msgstr "Loại bỏ"
 
-#: app/menus.c:155 app/menus.c:163
+#: app/menus.c:160 app/menus.c:168
 msgid "Invert"
 msgstr "Đảo"
 
-#: app/menus.c:161
+#: app/menus.c:166
 msgid "All"
 msgstr "Tất cả"
 
-#: app/menus.c:162 lib/widgets.c:833 objects/UML/association.c:1040
+#: app/menus.c:167 lib/widgets.c:839 objects/UML/association.c:1040
 msgid "None"
 msgstr "Không"
 
-#: app/menus.c:164
+#: app/menus.c:169
 msgid "Connected"
 msgstr "Đã nối"
 
-#: app/menus.c:165
+#: app/menus.c:170
 msgid "Transitive"
 msgstr ""
 
-#: app/menus.c:166
+#: app/menus.c:171
 msgid "Same Type"
 msgstr "Cùng loại"
 
-#: app/menus.c:173 lib/properties.c:62 lib/properties.h:465 lib/widgets.c:376
+#: app/menus.c:178 lib/properties.c:62 lib/properties.h:467 lib/widgets.c:381
 msgid "Left"
 msgstr "Trái"
 
-#: app/menus.c:174 app/menus.c:183 lib/properties.c:63 lib/properties.h:466
-#: lib/widgets.c:382
+#: app/menus.c:179 app/menus.c:188 lib/properties.c:63 lib/properties.h:468
+#: lib/widgets.c:387
 msgid "Center"
 msgstr "Giữa"
 
-#: app/menus.c:175 lib/properties.c:64 lib/properties.h:467 lib/widgets.c:388
+#: app/menus.c:180 lib/properties.c:64 lib/properties.h:469 lib/widgets.c:393
 msgid "Right"
 msgstr "Phải"
 
-#: app/menus.c:176 app/menus.c:185
+#: app/menus.c:181 app/menus.c:190
 msgid "Equal Distance"
 msgstr "Khoảng cách bằng nhau"
 
-#: app/menus.c:177 app/menus.c:186
+#: app/menus.c:182 app/menus.c:191
 msgid "Adjacent"
 msgstr "Kề nhau"
 
-#: app/menus.c:182
+#: app/menus.c:187
 msgid "Top"
 msgstr "Đỉnh"
 
-#: app/menus.c:184
+#: app/menus.c:189
 msgid "Bottom"
 msgstr "Đáy"
 
-#: app/menus.c:191
+#: app/menus.c:196
 msgid "Send to _Back"
 msgstr "Hạ xuống đá_y"
 
-#: app/menus.c:192
+#: app/menus.c:197
 msgid "Bring to _Front"
 msgstr "Đẩy lên đỉ_nh"
 
-#: app/menus.c:194
+#: app/menus.c:199
 msgid "_Group"
 msgstr "_Nhóm"
 
-#: app/menus.c:195
+#: app/menus.c:200
 msgid "_Ungroup"
 msgstr "_Tách nhóm"
 
-#: app/menus.c:197
+#: app/menus.c:202
 msgid "Align _Horizontal"
 msgstr "Canh ngang"
 
-#: app/menus.c:198
+#: app/menus.c:203
 msgid "Align _Vertical"
 msgstr "Canh dọc"
 
-#: app/menus.c:221
+#: app/menus.c:226
 msgid "_Properties"
 msgstr "_Thuộc tính"
 
-#: app/menus.c:222
+#: app/menus.c:227
 msgid "_Layers"
 msgstr "_Lớp"
 
-#: app/menus.c:243
+#: app/menus.c:248
 msgid "_Select"
 msgstr "_Chọn"
 
-#: app/menus.c:244
+#: app/menus.c:249
 msgid "_Objects"
 msgstr "Đối tượn_g"
 
-#: app/menus.c:245
+#: app/menus.c:250
 msgid "_Tools"
 msgstr "_Công cụ"
 
-#: app/menus.c:246
+#: app/menus.c:251
 msgid "_Dialogs"
 msgstr "_Hộp thoại"
 
-#: app/menus.c:257 app/menus.c:284
+#: app/menus.c:262 app/menus.c:292
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: app/menus.c:259 app/menus.c:286
+#: app/menus.c:264 app/menus.c:294
 msgid "/File/_New"
 msgstr "/Tập tin/Mớ_i"
 
-#: app/menus.c:260 app/menus.c:287
+#: app/menus.c:265 app/menus.c:295
 msgid "/File/_Open"
 msgstr "/Tập tin/_Mở"
 
 #. recent file list is dynamically inserted here
-#: app/menus.c:261 app/menus.c:266 app/menus.c:268 app/menus.c:291
-#: app/menus.c:294
+#: app/menus.c:266 app/menus.c:271 app/menus.c:274 app/menus.c:276
+#: app/menus.c:299 app/menus.c:302
 msgid "/File/---"
 msgstr "/Tập tin/---"
 
-#: app/menus.c:262
+#: app/menus.c:267
 msgid "/File/_Diagram tree"
 msgstr "/Tập tin/Cây _biểu đồ"
 
-#: app/menus.c:264
+#: app/menus.c:269
+msgid "/File/Sheets and Objects..."
+msgstr ""
+
+#: app/menus.c:272
 msgid "/File/_Preferences..."
 msgstr "/Tập tin/_Thông số..."
 
-#: app/menus.c:265
+#: app/menus.c:273
 msgid "/File/P_lugins"
 msgstr "/Tập tin/P_lugin"
 
-#: app/menus.c:269 app/menus.c:297
+#: app/menus.c:277 app/menus.c:305
 msgid "/File/_Quit"
 msgstr "/Tập tin/T_hoát"
 
-#: app/menus.c:270
+#: app/menus.c:278
 msgid "/_Help"
 msgstr "/Trợ _giúp"
 
-#: app/menus.c:272
+#: app/menus.c:280
 msgid "/Help/_Manual"
 msgstr "/Trợ giúp/Hướng dẫn _sử dụng"
 
-#: app/menus.c:273
+#: app/menus.c:281
 msgid "/Help/---"
 msgstr "/Trợ giúp/---"
 
-#: app/menus.c:274
+#: app/menus.c:282
 msgid "/Help/_About"
 msgstr ""
 
-#: app/menus.c:288
+#: app/menus.c:296
 msgid "/File/_Save"
 msgstr "/Tập tin/_Lưu"
 
-#: app/menus.c:289
+#: app/menus.c:297
 msgid "/File/Save _As..."
 msgstr "/Tập tin/Lư_u là..."
 
-#: app/menus.c:290
+#: app/menus.c:298
 msgid "/File/_Export..."
 msgstr "/Tập tin/_Xuất..."
 
-#: app/menus.c:292
+#: app/menus.c:300
 msgid "/File/Page Set_up..."
 msgstr "/Tập tin/_Thiết lập trang..."
 
-#: app/menus.c:293
+#: app/menus.c:301
 msgid "/File/_Print Diagram..."
 msgstr "/Tập tin/_In biểu đồ..."
 
-#: app/menus.c:295
+#: app/menus.c:303
 msgid "/File/_Close"
 msgstr "/Tập tin/Đón_g"
 
-#: app/menus.c:298
+#: app/menus.c:306
 msgid "/_Edit"
 msgstr "/_Hiệu chỉnh"
 
-#: app/menus.c:300
+#: app/menus.c:308
 msgid "/Edit/_Copy"
 msgstr "/Hiệu chỉnh/_Sao chép"
 
-#: app/menus.c:301
+#: app/menus.c:309
 msgid "/Edit/C_ut"
 msgstr "/Hiệu chỉnh/_Cắt"
 
-#: app/menus.c:302
+#: app/menus.c:310
 msgid "/Edit/_Paste"
 msgstr "/Hiệu chỉnh/_Dán"
 
-#: app/menus.c:303
+#: app/menus.c:311
 msgid "/Edit/_Delete"
 msgstr "/Hiệu chỉnh/_Xoá"
 
-#: app/menus.c:304
+#: app/menus.c:312
 msgid "/Edit/_Undo"
 msgstr "/Hiệu chỉnh/_Hoàn lại"
 
-#: app/menus.c:305
+#: app/menus.c:313
 msgid "/Edit/_Redo"
 msgstr "/Hiệu chỉnh/_Làm lại"
 
-#: app/menus.c:306
+#: app/menus.c:314
 msgid "/Edit/Copy Text"
 msgstr "/Hiệu chỉnh/Sao chép text"
 
-#: app/menus.c:307
+#: app/menus.c:315
 msgid "/Edit/Cut Text"
 msgstr "/Hiệu chỉnh/Cắt text"
 
-#: app/menus.c:308
+#: app/menus.c:316
 msgid "/Edit/Paste _Text"
 msgstr "/Hiệu chỉnh/Dán _text"
 
-#: app/menus.c:309
+#: app/menus.c:317
 msgid "/_View"
 msgstr "/_Xem"
 
-#: app/menus.c:311
+#: app/menus.c:319
 msgid "/View/Zoom _In"
 msgstr "/Xem/Phóng _to"
 
-#: app/menus.c:312
+#: app/menus.c:320
 msgid "/View/Zoom _Out"
 msgstr "/Xem/Thu _nhỏ"
 
-#: app/menus.c:313
+#: app/menus.c:321
 msgid "/View/_Zoom"
 msgstr "/Xem/_Phóng to,thu nhỏ"
 
-#: app/menus.c:315
+#: app/menus.c:323
+#, c-format
 msgid "/View/Zoom/400%"
 msgstr "/Xem/Phóng to,thu nhỏ/400%"
 
-#: app/menus.c:316
+#: app/menus.c:324
+#, c-format
 msgid "/View/Zoom/283%"
 msgstr "/Xem/Phóng to,thu nhỏ/283%"
 
-#: app/menus.c:317
+#: app/menus.c:325
+#, c-format
 msgid "/View/Zoom/200%"
 msgstr "/Xem/Phóng to,thu nhỏ/200%"
 
-#: app/menus.c:318
+#: app/menus.c:326
+#, c-format
 msgid "/View/Zoom/141%"
 msgstr "/Xem/Phóng to,thu nhỏ/141%"
 
-#: app/menus.c:319
+#: app/menus.c:327
+#, c-format
 msgid "/View/Zoom/100%"
 msgstr "/Xem/Phóng to,thu nhỏ/100%"
 
-#: app/menus.c:320
+#: app/menus.c:328
+#, c-format
 msgid "/View/Zoom/85%"
 msgstr "/Xem/Phóng to,thu nhỏ/85%"
 
-#: app/menus.c:321
+#: app/menus.c:329
+#, c-format
 msgid "/View/Zoom/70.7%"
 msgstr "/Xem/Phóng to,thu nhỏ/70.7%"
 
-#: app/menus.c:322
+#: app/menus.c:330
+#, c-format
 msgid "/View/Zoom/50%"
 msgstr "/Xem/Phóng to,thu nhỏ/50%"
 
-#: app/menus.c:323
+#: app/menus.c:331
+#, c-format
 msgid "/View/Zoom/35.4%"
 msgstr "/Xem/Phóng to,thu nhỏ/35.4%"
 
-#: app/menus.c:324
+#: app/menus.c:332
+#, c-format
 msgid "/View/Zoom/25%"
 msgstr "/Xem/Phóng to,thu nhỏ/25%"
 
-#: app/menus.c:325
+#: app/menus.c:333
 msgid "/View/Diagram Properties..."
 msgstr "/Xem/Thuộc tính biểu đồ..."
 
-#: app/menus.c:327
+#: app/menus.c:335
 msgid "/View/_AntiAliased"
 msgstr ""
 
-#: app/menus.c:329
+#: app/menus.c:337
 msgid "/View/_Visible Grid"
 msgstr "/Xem/Hiện _lưới"
 
-#: app/menus.c:330
+#: app/menus.c:338
 msgid "/View/_Snap To Grid"
 msgstr "/Xem/_Dính lưới"
 
-#: app/menus.c:331
+#: app/menus.c:339
 msgid "/View/Show _Rulers"
 msgstr "/Xem/Hiện thước đ_o"
 
-#: app/menus.c:332
+#: app/menus.c:340
 msgid "/View/Show _Connection Points"
 msgstr "/Xem/Hiện điể_m kết nối"
 
-#: app/menus.c:333
+#: app/menus.c:341
 msgid "/View/---"
 msgstr "/Xem/---"
 
-#: app/menus.c:334
+#: app/menus.c:342
 msgid "/View/New _View"
 msgstr "/Xem/Khung nhình _mới"
 
-#: app/menus.c:335
+#: app/menus.c:343
 msgid "/View/Show _All"
 msgstr "/Xem/Hiện tất _cả"
 
-#: app/menus.c:336
+#: app/menus.c:344
 msgid "/_Select"
 msgstr "/_Chọn"
 
-#: app/menus.c:338
+#: app/menus.c:346
 msgid "/Select/All"
 msgstr "/Chọn/Tất cả"
 
-#: app/menus.c:339
+#: app/menus.c:347
 msgid "/Select/None"
 msgstr "/Chọn/Không gì cả"
 
-#: app/menus.c:340 app/menus.c:353
+#: app/menus.c:348 app/menus.c:361
 msgid "/Select/Invert"
 msgstr "/Chọn/Đảo"
 
-#: app/menus.c:341
+#: app/menus.c:349
 msgid "/Select/Connected"
 msgstr "/Chọn/Đã kết nối"
 
-#: app/menus.c:342
+#: app/menus.c:350
 msgid "/Select/Transitive"
 msgstr ""
 
-#: app/menus.c:343
+#: app/menus.c:351
 msgid "/Select/Same Type"
 msgstr "/Chọn/Cùng loại"
 
-#: app/menus.c:344
+#: app/menus.c:352
 msgid "/Select/---"
 msgstr "/Chọn/---"
 
-#: app/menus.c:345
+#: app/menus.c:353
 msgid "/Select/Replace"
 msgstr "/Chọn/Thay thế"
 
-#: app/menus.c:347
+#: app/menus.c:355
 msgid "/Select/Union"
 msgstr "/Chọn/Hợp"
 
-#: app/menus.c:349
+#: app/menus.c:357
 msgid "/Select/Intersect"
 msgstr "/Chọn/Giao"
 
-#: app/menus.c:351
+#: app/menus.c:359
 msgid "/Select/Remove"
 msgstr "/Chọn/Loại bỏ"
 
-#: app/menus.c:355
+#: app/menus.c:363
 msgid "/_Objects"
 msgstr "/Đối tượn_g"
 
-#: app/menus.c:357
+#: app/menus.c:365
 msgid "/Objects/Send to _Back"
 msgstr "/Đối tượng/_Xuống đáy"
 
-#: app/menus.c:358
+#: app/menus.c:366
 msgid "/Objects/Bring to _Front"
 msgstr "/Đối tượng/_Lên đỉnh"
 
-#: app/menus.c:359 app/menus.c:362
+#: app/menus.c:367 app/menus.c:370
 msgid "/Objects/---"
 msgstr "/Đối tượng/---"
 
-#: app/menus.c:360
+#: app/menus.c:368
 msgid "/Objects/_Group"
 msgstr "/Đối tượng/_Nhóm"
 
-#: app/menus.c:361
+#: app/menus.c:369
 msgid "/Objects/_Ungroup"
 msgstr "/Đối tượng/_Tách nhóm"
 
-#: app/menus.c:363
+#: app/menus.c:371
 msgid "/Objects/Align _Horizontal"
 msgstr "/Đối tượng/Canh hành _ngang"
 
-#: app/menus.c:365
+#: app/menus.c:373
 msgid "/Objects/Align Horizontal/Left"
 msgstr "/Đối tượng/Canh hàng ngang/Trái"
 
-#: app/menus.c:366
+#: app/menus.c:374
 msgid "/Objects/Align Horizontal/Center"
 msgstr "/Đối tượng/Canh hàng ngang/Giữa"
 
-#: app/menus.c:367
+#: app/menus.c:375
 msgid "/Objects/Align Horizontal/Right"
 msgstr "/Đối tượng/Canh hàng ngang/Phải"
 
-#: app/menus.c:368
+#: app/menus.c:376
 msgid "/Objects/Align Horizontal/Equal Distance"
 msgstr "/Đối tượng/Canh hàng ngang/Cách đều"
 
-#: app/menus.c:369
+#: app/menus.c:377
 msgid "/Objects/Align Horizontal/Adjacent"
 msgstr "/Đối tượng/Canh hàng ngang/Kề nhau"
 
-#: app/menus.c:370
+#: app/menus.c:378
 msgid "/Objects/Align _Vertical"
 msgstr "/Đối tượng/Canh hành _dọc"
 
-#: app/menus.c:372
+#: app/menus.c:380
 msgid "/Objects/Align Vertical/Top"
 msgstr "/Đối tượng/Canh hành dọc/Đỉnh"
 
-#: app/menus.c:373
+#: app/menus.c:381
 msgid "/Objects/Align Vertical/Center"
 msgstr "/Đối tượng/Canh hành dọc/Giữa"
 
-#: app/menus.c:374
+#: app/menus.c:382
 msgid "/Objects/Align Vertical/Bottom"
 msgstr "/Đối tượng/Canh hành dọc/Đáy"
 
-#: app/menus.c:375
+#: app/menus.c:383
 msgid "/Objects/Align Vertical/Equal Distance"
 msgstr "/Đối tượng/Canh hành dọc/Cách đều"
 
-#: app/menus.c:376
+#: app/menus.c:384
 msgid "/Objects/Align Vertical/Adjacent"
 msgstr "/Đối tượng/Canh hành dọc/Kề nhau"
 
-#: app/menus.c:378
+#: app/menus.c:386
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: app/menus.c:380
+#: app/menus.c:388
 msgid "/Tools/Modify"
 msgstr "/Công cụ/Sửa chữa"
 
-#: app/menus.c:381
+#: app/menus.c:389
 msgid "/Tools/Magnify"
 msgstr ""
 
-#: app/menus.c:382
+#: app/menus.c:390
 msgid "/Tools/Scroll"
 msgstr "/Công cụ/Cuộn"
 
-#: app/menus.c:383
+#: app/menus.c:391
 msgid "/Tools/Text"
 msgstr "/Công cụ/Text"
 
-#: app/menus.c:384
+#: app/menus.c:392
 msgid "/Tools/Box"
 msgstr "/Công cụ/Hộp"
 
-#: app/menus.c:385
+#: app/menus.c:393
 msgid "/Tools/Ellipse"
 msgstr "/Công cụ/Êlíp"
 
-#: app/menus.c:386
+#: app/menus.c:394
 msgid "/Tools/Polygon"
 msgstr "/Công cụ/Đa giác"
 
-#: app/menus.c:387
+#: app/menus.c:395
 msgid "/Tools/Beziergon"
 msgstr "/Công cụ/Beziergon"
 
-#: app/menus.c:388
+#: app/menus.c:396
 msgid "/Tools/Line"
 msgstr "/Công cụ/Đường thẳng"
 
-#: app/menus.c:389
+#: app/menus.c:397
 msgid "/Tools/Arc"
 msgstr "/Công cụ/Cung"
 
-#: app/menus.c:390
+#: app/menus.c:398
 msgid "/Tools/Zigzagline"
 msgstr "/Công cụ/Đường zíc zắc"
 
-#: app/menus.c:391
+#: app/menus.c:399
 msgid "/Tools/Polyline"
 msgstr "/Công cụ/Đa đoạn thẳng"
 
-#: app/menus.c:392
+#: app/menus.c:400
 msgid "/Tools/Bezierline"
 msgstr "/Công cụ/Đường Bezier"
 
-#: app/menus.c:393
+#: app/menus.c:401
 msgid "/Tools/Image"
 msgstr "/Công cụ/Ảnh"
 
-#: app/menus.c:395
+#: app/menus.c:403
 msgid "/_Dialogs"
 msgstr "/_Hộp thoại"
 
-#: app/menus.c:397
+#: app/menus.c:405
 msgid "/Dialogs/_Properties"
 msgstr "/Hộp thoại/_Thuộc tính"
 
-#: app/menus.c:398
+#: app/menus.c:406
 msgid "/Dialogs/_Layers"
 msgstr "/Hộp thoại/_Lớp"
 
-#: app/menus.c:570
+#: app/menus.c:578
 msgid "NULL tooldata in tool_menu_select"
 msgstr "NULL tooldata trong tool_menu_select"
 
-#: app/menus.c:736
+#: app/menus.c:744
 msgid "Diagram Menu"
 msgstr "Menu Biểu đồ"
 
@@ -1494,13 +1550,12 @@ msgstr "không"
 msgid "Plug-ins"
 msgstr "Plug-in"
 
-#: app/plugin-manager.c:195 objects/EML/process_dialog.c:637
-#: objects/ER/attribute.c:148 objects/ER/entity.c:126
-#: objects/ER/relationship.c:135 objects/UML/association.c:1018
-#: objects/UML/class_dialog.c:907 objects/UML/class_dialog.c:1922
-#: objects/UML/class_dialog.c:2141 objects/UML/class_dialog.c:2700
-#: objects/UML/dependency.c:125 objects/UML/generalization.c:121
-#: objects/UML/realizes.c:122
+#: app/plugin-manager.c:195 app/sheets_dialog.c:733 objects/ER/attribute.c:149
+#: objects/ER/entity.c:127 objects/ER/relationship.c:136
+#: objects/UML/association.c:1018 objects/UML/class_dialog.c:884
+#: objects/UML/class_dialog.c:1899 objects/UML/class_dialog.c:2118
+#: objects/UML/class_dialog.c:2677 objects/UML/dependency.c:125
+#: objects/UML/generalization.c:121 objects/UML/realizes.c:122
 msgid "Name:"
 msgstr "Tên:"
 
@@ -1508,7 +1563,7 @@ msgstr "Tên:"
 msgid "File name:"
 msgstr "Tên tập tin:"
 
-#: app/plugin-manager.c:219
+#: app/plugin-manager.c:219 app/sheets_dialog.c:660 app/sheets_dialog.c:753
 msgid "Description:"
 msgstr "Mô tả:"
 
@@ -1698,10 +1753,258 @@ msgstr "<Hộp công cụ>/Tập tin/Thoát (quit)"
 msgid "Can't open history file for writing."
 msgstr "Không thể mổ tập tin lược sử để ghi."
 
-#: app/render_eps.c:1835
+#: app/render_eps.c:1834
 msgid "Encapsulated Postscript"
 msgstr ""
 
+#: app/render_libart.c:433
+msgid "gdk_renderer: Unsupported fill mode specified!\n"
+msgstr ""
+
+#: app/render_libart.c:448
+#, c-format
+msgid "Can't find font '%s' in height %d\n"
+msgstr ""
+
+#: app/sheets.c:163 app/sheets_dialog_callbacks.c:317
+#, c-format
+msgid ""
+"%s\n"
+"System sheet"
+msgstr ""
+
+#: app/sheets.c:165 app/sheets_dialog_callbacks.c:319
+#, c-format
+msgid ""
+"%s\n"
+"User sheet"
+msgstr ""
+
+#: app/sheets.c:282
+msgid ""
+"Can't get symbol 'custom_type' from any module.\n"
+"Editing shapes is disabled."
+msgstr ""
+
+#: app/sheets.c:380
+#, c-format
+msgid "Widget not found: %s"
+msgstr ""
+
+#: app/sheets.c:456
+msgid "SVG Shape"
+msgstr ""
+
+#: app/sheets.c:458
+msgid "Programmed Object"
+msgstr ""
+
+#: app/sheets_dialog.c:85
+#, fuzzy
+msgid "Sheets and Objects"
+msgstr "Đối tượng chuẩn"
+
+#: app/sheets_dialog.c:110 app/sheets_dialog_callbacks.c:185
+msgid "<- Copy"
+msgstr ""
+
+#: app/sheets_dialog.c:120 app/sheets_dialog_callbacks.c:187
+msgid "<- Copy All"
+msgstr ""
+
+#: app/sheets_dialog.c:127 app/sheets_dialog_callbacks.c:189
+#, fuzzy
+msgid "<- Move"
+msgstr "Di chuyển"
+
+#: app/sheets_dialog.c:137 app/sheets_dialog_callbacks.c:191
+msgid "<- Move All"
+msgstr ""
+
+#: app/sheets_dialog.c:205 app/sheets_dialog.c:409
+#: objects/UML/class_dialog.c:847 objects/UML/class_dialog.c:1859
+#: objects/UML/class_dialog.c:2076 objects/UML/class_dialog.c:2640
+msgid "New"
+msgstr "Mới"
+
+#: app/sheets_dialog.c:207
+#, fuzzy
+msgid "_New"
+msgstr "Mới"
+
+#: app/sheets_dialog.c:227
+msgid "Up"
+msgstr ""
+
+#: app/sheets_dialog.c:229
+msgid "_Up"
+msgstr ""
+
+#: app/sheets_dialog.c:249
+#, fuzzy
+msgid "Down"
+msgstr "Chuyển xuống"
+
+#: app/sheets_dialog.c:251
+msgid "_Down"
+msgstr ""
+
+#: app/sheets_dialog.c:269
+#, fuzzy
+msgid "Edit"
+msgstr "/_Hiệu chỉnh"
+
+#: app/sheets_dialog.c:271
+#, fuzzy
+msgid "_Edit"
+msgstr "/_Hiệu chỉnh"
+
+#: app/sheets_dialog.c:290
+#, fuzzy
+msgid "_Remove"
+msgstr "Loại bỏ"
+
+#: app/sheets_dialog.c:315
+#, fuzzy
+msgid "Revert"
+msgstr "Đảo"
+
+#: app/sheets_dialog.c:416 app/sheets_dialog.c:860
+#, fuzzy
+msgid "Type"
+msgstr "Loại:"
+
+#: app/sheets_dialog.c:431
+#, fuzzy
+msgid "Browse..."
+msgstr "Duyệt"
+
+#: app/sheets_dialog.c:440
+msgid "SVG Shape:"
+msgstr ""
+
+#: app/sheets_dialog.c:467 app/sheets_dialog.c:530
+#, fuzzy
+msgid "description:"
+msgstr "Mô tả:"
+
+#: app/sheets_dialog.c:479
+#, fuzzy
+msgid "Sheet name:"
+msgstr "Tên bước"
+
+#: app/sheets_dialog.c:500 app/sheets_dialog_callbacks.c:297
+#: app/sheets_dialog_callbacks.c:1083
+#, fuzzy
+msgid "Line Break"
+msgstr "Màu hàng"
+
+#: app/sheets_dialog.c:630
+#, fuzzy
+msgid "Edit Attributes"
+msgstr "Sửa thuộc tính lớp"
+
+#: app/sheets_dialog.c:644
+#, fuzzy
+msgid "Object"
+msgstr "Đối tượn_g"
+
+#: app/sheets_dialog.c:679 objects/FS/flow-ortho.c:187 objects/FS/flow.c:164
+#: objects/UML/class_dialog.c:896 objects/UML/class_dialog.c:1911
+#: objects/UML/class_dialog.c:2130 objects/UML/class_dialog.c:2689
+msgid "Type:"
+msgstr "Loại:"
+
+#: app/sheets_dialog.c:717
+#, fuzzy
+msgid "Sheet"
+msgstr "_Chọn"
+
+#: app/sheets_dialog.c:875
+#, fuzzy
+msgid "Object:"
+msgstr "Đối tượn_g"
+
+#: app/sheets_dialog.c:902
+#, fuzzy
+msgid "Sheet:"
+msgstr "_Chọn"
+
+#: app/sheets_dialog.c:994
+#, fuzzy
+msgid "Select SVG Shape File"
+msgstr "Chọn tập tin ảnh"
+
+#: app/sheets_dialog_callbacks.c:172
+#, fuzzy
+msgid "Copy ->"
+msgstr "Sao chép text"
+
+#: app/sheets_dialog_callbacks.c:174
+msgid "Copy All ->"
+msgstr ""
+
+#: app/sheets_dialog_callbacks.c:176
+#, fuzzy
+msgid "Move ->"
+msgstr "Di chuyển"
+
+#: app/sheets_dialog_callbacks.c:178
+msgid "Move All ->"
+msgstr ""
+
+#: app/sheets_dialog_callbacks.c:800
+#, c-format
+msgid "Filename must end with '%s': '%s'"
+msgstr ""
+
+#: app/sheets_dialog_callbacks.c:808
+#, c-format
+msgid "Error examining %s: %s"
+msgstr ""
+
+#: app/sheets_dialog_callbacks.c:830
+#, c-format
+msgid "Could not interpret shape file: '%s'"
+msgstr ""
+
+#: app/sheets_dialog_callbacks.c:896
+msgid "Sheet must have a Name"
+msgstr ""
+
+#: app/sheets_dialog_callbacks.c:1584 app/sheets_dialog_callbacks.c:1590
+#, fuzzy, c-format
+msgid "Couldn't open '%s': %s"
+msgstr "Không thể mở `%s'"
+
+#: app/sheets_dialog_callbacks.c:1641
+#, fuzzy, c-format
+msgid "Couldn't open: '%s' for writing"
+msgstr "Không thể mở: '%s' để ghi.\n"
+
+#: app/sheets_dialog_callbacks.c:1650
+msgid "a user"
+msgstr ""
+
+#: app/sheets_dialog_callbacks.c:1663
+#, fuzzy, c-format
+msgid "File: %s"
+msgstr "Tập tin"
+
+#: app/sheets_dialog_callbacks.c:1666
+#, fuzzy, c-format
+msgid "Date: %s"
+msgstr "Dia v %s"
+
+#: app/sheets_dialog_callbacks.c:1670
+#, c-format
+msgid "For: %s"
+msgstr ""
+
+#: app/sheets_dialog_callbacks.c:1687
+msgid "add shapes here"
+msgstr ""
+
 #: app/splash.c:58
 msgid "Loading ..."
 msgstr "Đang nạp ..."
@@ -1721,29 +2024,16 @@ msgstr "Dia"
 
 #. choose default font name for your locale. see also font_data structure
 #. in lib/font.c. if "Courier" works for you, it would be better.
-#: lib/attributes.c:130 lib/render_object.c:149 lib/text.c:998
-#: objects/EML/instantiation.c:474 objects/EML/interaction-ortho.c:325
-#: objects/EML/interaction-ortho.c:457 objects/EML/interaction.c:284
-#: objects/EML/interaction.c:496 objects/EML/process.c:511
-#: objects/ER/attribute.c:391 objects/ER/attribute.c:556
-#: objects/ER/entity.c:343 objects/ER/entity.c:485
-#: objects/ER/relationship.c:421 objects/ER/relationship.c:601
+#: lib/attributes.c:130 lib/text.c:1009 objects/ER/attribute.c:394
+#: objects/ER/attribute.c:568 objects/ER/entity.c:346 objects/ER/entity.c:497
+#: objects/ER/relationship.c:424 objects/ER/relationship.c:613
 #: objects/UML/association.c:556 objects/UML/association.c:741
-#: objects/UML/class.c:674 objects/UML/constraint.c:269
+#: objects/UML/class.c:689 objects/UML/constraint.c:269
 #: objects/UML/dependency.c:371 objects/UML/generalization.c:364
 #: objects/UML/implements.c:284 objects/UML/large_package.c:333
-#: objects/UML/note.c:301 objects/UML/realizes.c:367
-#: objects/UML/small_package.c:341 objects/custom/shape_info.h:67
-#: objects/network/antenna.c:91 objects/network/computer.c:92
-#: objects/network/disc.c:92 objects/network/flash.c:88
-#: objects/network/hub.c:92 objects/network/modem.c:90
-#: objects/network/modularswitch.c:94 objects/network/monitor.c:91
-#: objects/network/printer.c:91 objects/network/rj45plug.c:90
-#: objects/network/scead-plug.c:89 objects/standard/textobj.c:388
-#: objects/sybase/client.c:90 objects/sybase/dataserver.c:89
-#: objects/sybase/ltm.c:91 objects/sybase/repserver.c:90
-#: objects/sybase/rsm.c:102 objects/sybase/stableq.c:92
-#: plug-ins/dxf/dxf-import.c:545
+#: objects/UML/note.c:303 objects/UML/realizes.c:367
+#: objects/UML/small_package.c:342 objects/standard/textobj.c:388
+#: plug-ins/dxf/dxf-import.c:530
 msgid "Courier"
 msgstr "Courier"
 
@@ -1784,9 +2074,12 @@ msgid ""
 "Your local character set is UTF-8. Because of issues with libxml1 and the "
 "support of files generated by previous versions of dia, you will encounter  "
 "problems. Please report to [e-mail] if you see this message."
-msgstr "Bộ mã cục bộ của bạn là UTF-8. Vì lỗi của líbxml và sự hỗ trợ của các tập tin được tạo bởi phiên bản trước của Dia nên bạn sẽ gặp vấn đề. Vui lòng gửi báo cáo tới [e-mail] nếu bạn thấy thông báo này."
+msgstr ""
+"Bộ mã cục bộ của bạn là UTF-8. Vì lỗi của líbxml và sự hỗ trợ của các tập "
+"tin được tạo bởi phiên bản trước của Dia nên bạn sẽ gặp vấn đề. Vui lòng gửi "
+"báo cáo tới [e-mail] nếu bạn thấy thông báo này."
 
-#: lib/font.c:517
+#: lib/font.c:527
 #, c-format
 msgid ""
 "Warning no X Font for %s found, \n"
@@ -1795,29 +2088,31 @@ msgstr ""
 "Cảnh báo: Không tìm thấy X Font cho %s,\n"
 "sử dụng %s thay thế.\n"
 
-#: lib/font.c:626
+#: lib/font.c:804
 #, c-format
 msgid "Warning: FreeType selected, but library wouldn't load: %d\n"
 msgstr "Cảnh báo: FreeType được chọn, nhưng thư viện sẽ không nạp: %d\n"
 
-#: lib/font.c:635
+#: lib/font.c:813
 msgid "Warning: No X fonts found.  The world is ending."
 msgstr "Cảnh báo: Không thấy X Font. Thế giới sẽ chấm dứt !?"
 
-#: lib/font.c:644
+#: lib/font.c:858
 msgid "Warning: No fonts loaded.  Are there any font files in the X font path?"
-msgstr "Cảnh báo: Không có font nào được nạp. Có tập tin font nào trong thư mục font của X Window không?"
+msgstr ""
+"Cảnh báo: Không có font nào được nạp. Có tập tin font nào trong thư mục font "
+"của X Window không?"
 
-#: lib/font.c:927
+#: lib/font.c:1150
 msgid "Error, couldn't locate font. Shouldn't happen.\n"
 msgstr "Lỗi, không thể định vị font. Sẽ không xảy ra lần nữa.\n"
 
-#: lib/font.c:929 lib/font.c:963
+#: lib/font.c:1152 lib/font.c:1186
 #, c-format
 msgid "Font %s not found, using Courier instead.\n"
 msgstr "Không tìm thấy font %s, dùng font Courier thay thế.\n"
 
-#: lib/font.c:939
+#: lib/font.c:1162
 #, c-format
 msgid "Font %s has no style %s, using %s\n"
 msgstr "Font %s không có kiểu %s, dùng %s\n"
@@ -1834,12 +2129,12 @@ msgstr "Cảnh báo"
 msgid "Error"
 msgstr "Lỗi"
 
-#: lib/plug-ins.c:226
+#: lib/plug-ins.c:210
 #, c-format
 msgid "Could not deduce correct path for `%s'"
 msgstr ""
 
-#: lib/plug-ins.c:231
+#: lib/plug-ins.c:215
 #, c-format
 msgid ""
 "Could not load plugin `%s'\n"
@@ -1848,39 +2143,39 @@ msgstr ""
 "Không thể nạp plugin `%s'\n"
 "%s"
 
-#: lib/plug-ins.c:242
+#: lib/plug-ins.c:226
 #, c-format
 msgid "Could not find plugin init function in `%s'"
 msgstr "Không thể tìm thấy hàm plugin init  trong `%s'"
 
-#: lib/plug-ins.c:269
+#: lib/plug-ins.c:253
 #, c-format
 msgid "%s Plugin could not be unloaded"
 msgstr "%s Plugin không thể được nạp"
 
-#: lib/plug-ins.c:350
+#: lib/plug-ins.c:334
 #, c-format
 msgid "`%s' is not a directory"
 msgstr "`%s' không phải là thư mục"
 
-#: lib/plug-ins.c:356
+#: lib/plug-ins.c:340
 #, c-format
 msgid "Could not open `%s'"
 msgstr "Không thể mở `%s'"
 
-#: lib/properties.c:71 lib/properties.h:480
+#: lib/properties.c:71 lib/properties.h:482
 msgid "Line colour"
 msgstr "Màu đường thẳng"
 
-#: lib/properties.c:72 lib/properties.h:483
+#: lib/properties.c:72 lib/properties.h:485
 msgid "Line style"
 msgstr "Kiểu đường"
 
-#: lib/properties.c:73 lib/properties.h:487
+#: lib/properties.c:73 lib/properties.h:489
 msgid "Fill colour"
 msgstr "Màu tô"
 
-#: lib/properties.c:74 lib/properties.h:490 objects/custom/custom_object.c:311
+#: lib/properties.c:74 lib/properties.h:492 objects/custom/custom_object.c:320
 #: objects/flowchart/box.c:271 objects/flowchart/diamond.c:264
 #: objects/flowchart/ellipse.c:264 objects/flowchart/parallelogram.c:274
 #: objects/standard/beziergon.c:221 objects/standard/box.c:232
@@ -1888,367 +2183,331 @@ msgstr "Màu tô"
 msgid "Draw background"
 msgstr "Nền vẽ"
 
-#: lib/properties.c:75 lib/properties.h:494
+#: lib/properties.c:75 lib/properties.h:496
 msgid "Start arrow"
 msgstr "Mũi tên đầu"
 
-#: lib/properties.c:76 lib/properties.h:497
+#: lib/properties.c:76 lib/properties.h:499
 msgid "End arrow"
 msgstr "Mũi tên cuối"
 
-#: lib/properties.c:78 lib/properties.h:507
+#: lib/properties.c:78 lib/properties.h:509
 msgid "Text alignment"
 msgstr "Canh hàng text"
 
-#: lib/properties.c:79 lib/properties.h:510 objects/GRAFCET/condition.c:133
+#: lib/properties.c:79 lib/properties.h:512 objects/GRAFCET/condition.c:133
 #: objects/GRAFCET/step.c:165 objects/GRAFCET/transition.c:142
-#: objects/chronogram/chronoline.c:183 objects/chronogram/chronoref.c:164
+#: objects/UML/class_dialog.c:306 objects/chronogram/chronoline.c:183
+#: objects/chronogram/chronoref.c:164
 msgid "Font"
 msgstr "Font"
 
-#: lib/properties.c:80 lib/properties.h:513 objects/GRAFCET/condition.c:135
+#: lib/properties.c:80 lib/properties.h:515 objects/GRAFCET/condition.c:135
 #: objects/GRAFCET/step.c:167 objects/GRAFCET/transition.c:144
 #: objects/chronogram/chronoline.c:185 objects/chronogram/chronoref.c:166
 msgid "Font size"
 msgstr "Cỡ font"
 
-#: lib/properties.c:81 lib/properties.h:516 objects/GRAFCET/step.c:169
+#: lib/properties.c:81 lib/properties.h:518 objects/GRAFCET/step.c:169
 #: objects/chronogram/chronoline.c:187 objects/chronogram/chronoref.c:168
 msgid "Text colour"
 msgstr "Màu text"
 
-#: lib/widgets.c:496 objects/FS/function.c:820
+#. Translators: Menu item Noun/Material/Solid
+#: lib/widgets.c:501 objects/FS/function.c:1036
 msgid "Solid"
 msgstr "Đặc"
 
-#: lib/widgets.c:502
+#: lib/widgets.c:507
 msgid "Dashed"
 msgstr "Gạch gạch"
 
-#: lib/widgets.c:508
+#: lib/widgets.c:513
 msgid "Dash-Dot"
 msgstr "Gạch chấm"
 
-#: lib/widgets.c:514
+#: lib/widgets.c:519
 msgid "Dash-Dot-Dot"
 msgstr "Gạch chấm chấm"
 
-#: lib/widgets.c:520
+#: lib/widgets.c:525
 msgid "Dotted"
 msgstr "Chấm chấm"
 
 #. fs->sizebox = GTK_HBOX(box);
-#: lib/widgets.c:538
+#: lib/widgets.c:543
 msgid "Dash length: "
 msgstr "Độ dài gạch: "
 
-#: lib/widgets.c:834
+#: lib/widgets.c:840
 msgid "Lines"
 msgstr "Đường"
 
-#: lib/widgets.c:835
+#: lib/widgets.c:841
 msgid "Hollow Triangle"
 msgstr "Tam giá rỗng"
 
-#: lib/widgets.c:836
+#: lib/widgets.c:842
 msgid "Filled Triangle"
 msgstr "Tam giác đặc"
 
-#: lib/widgets.c:837
+#: lib/widgets.c:843
 msgid "Unfilled Triangle"
 msgstr "Tam giác không đặc"
 
-#: lib/widgets.c:838
+#: lib/widgets.c:844
 msgid "Filled Diamond"
 msgstr "Kim cương đặc"
 
-#: lib/widgets.c:839
+#: lib/widgets.c:845
 msgid "Half Head"
 msgstr "Nửa đầu"
 
-#: lib/widgets.c:840
+#: lib/widgets.c:846
 msgid "Slashed Cross"
 msgstr ""
 
-#: lib/widgets.c:841
+#: lib/widgets.c:847
 msgid "Filled Ellipse"
 msgstr "Êlíp đặc"
 
-#: lib/widgets.c:842
+#: lib/widgets.c:848
 msgid "Hollow Ellipse"
 msgstr "Êlíp rỗng"
 
-#: lib/widgets.c:843
+#: lib/widgets.c:849
 msgid "Filled Dot"
 msgstr "Chấm đặc"
 
-#: lib/widgets.c:844
+#: lib/widgets.c:850
 msgid "Dimension Origin"
 msgstr "Gốc toạ độ"
 
-#: lib/widgets.c:845
+#: lib/widgets.c:851
 msgid "Blanked Dot"
 msgstr "Chấm nháy"
 
-#: lib/widgets.c:846
+#: lib/widgets.c:852
 msgid "Double Hollow triangle"
 msgstr "Tam giác đôi rỗng"
 
-#: lib/widgets.c:847
+#: lib/widgets.c:853
 msgid "Double Filled triangle"
 msgstr "Tam giác đôi đặc"
 
-#: lib/widgets.c:848
+#: lib/widgets.c:854
 msgid "Filled Box"
 msgstr "Hộp đặc"
 
-#: lib/widgets.c:849
+#: lib/widgets.c:855
 msgid "Blanked Box"
 msgstr "Hộp nháy"
 
-#: lib/widgets.c:850
+#: lib/widgets.c:856
 msgid "Slashed"
 msgstr "Gạch chéo"
 
-#: lib/widgets.c:851
+#: lib/widgets.c:857
 msgid "Integral Symbol"
 msgstr "Ký hiệu số"
 
-#: lib/widgets.c:852
+#: lib/widgets.c:858
 msgid "Crow Foot"
 msgstr ""
 
-#: lib/widgets.c:853
+#: lib/widgets.c:859
 msgid "Cross"
 msgstr "Chéo"
 
-#: lib/widgets.c:889
+#: lib/widgets.c:896
 msgid "Length: "
 msgstr "Dài: "
 
-#: lib/widgets.c:902
+#: lib/widgets.c:909
 msgid "Width: "
 msgstr "Rộng: "
 
-#: lib/widgets.c:1028 objects/standard/image.c:536
+#: lib/widgets.c:1035 objects/standard/image.c:536
 msgid "Select image file"
 msgstr "Chọn tập tin ảnh"
 
-#: lib/widgets.c:1058
+#: lib/widgets.c:1065
 msgid "Browse"
 msgstr "Duyệt"
 
-#: objects/EML/eml.c:40
-msgid "Event Modelling Language diagram"
+#: objects/chronogram/chronogram.c:40
+msgid "Chronogram diagram objects"
 msgstr ""
 
-#: objects/EML/instantiation.c:130
-msgid "Number of processes:"
-msgstr "Số tiến trình:"
+#: objects/chronogram/chronoline.c:148
+msgid "Data"
+msgstr "Dữ liệu"
 
-#: objects/EML/instantiation.c:132 objects/EML/interaction-ortho.c:548
-msgid "multiple"
-msgstr "đa"
+#: objects/chronogram/chronoline.c:150
+msgid "Data name"
+msgstr "Tên dữ liệu"
 
-#: objects/EML/instantiation.c:433
-msgid "Single"
-msgstr "Đa"
+#: objects/chronogram/chronoline.c:152
+msgid "Events"
+msgstr "Sự kiện"
 
-#: objects/EML/instantiation.c:435
-msgid "Multiple"
-msgstr "Đơn"
+#: objects/chronogram/chronoline.c:155
+msgid "Event specification"
+msgstr "Chi tiết kỹ thuật sự kiện"
 
-#: objects/EML/instantiation.c:437 objects/EML/interaction-ortho.c:288
-#: objects/ER/participation.c:393 objects/FS/flow-ortho.c:815
-#: objects/GRAFCET/vector.c:301 objects/SADT/arrow.c:550
-#: objects/UML/association.c:620 objects/UML/dependency.c:335
-#: objects/UML/generalization.c:327 objects/UML/realizes.c:330
-#: objects/standard/zigzagline.c:337
-msgid "Add segment"
-msgstr "Thêm đoạn"
+#: objects/chronogram/chronoline.c:156
+msgid ""
+"@ time    set the pointer at an absolute time.\n"
+"( duration  sets the signal up, then wait 'duration'.\n"
+") duration  sets the signal down, then wait 'duration'.\n"
+"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
+"example : @ 1.0 (2.0)1.0(2.0)\n"
+msgstr ""
 
-#: objects/EML/instantiation.c:438 objects/EML/interaction-ortho.c:289
-#: objects/ER/participation.c:394 objects/FS/flow-ortho.c:816
-#: objects/GRAFCET/vector.c:302 objects/SADT/arrow.c:551
-#: objects/UML/association.c:621 objects/UML/dependency.c:336
-#: objects/UML/generalization.c:328 objects/UML/realizes.c:331
-#: objects/standard/zigzagline.c:338
-msgid "Delete segment"
-msgstr "Xóa đoạn"
+#: objects/chronogram/chronoline.c:162
+msgid "Parameters"
+msgstr "Tham số"
 
-#: objects/EML/instantiation.c:442
-msgid "Instantiation"
-msgstr ""
+#: objects/chronogram/chronoline.c:164 objects/chronogram/chronoref.c:146
+msgid "Start time"
+msgstr "Thời điểm đầu"
 
-#: objects/EML/interaction-ortho.c:286 objects/EML/interaction.c:454
-msgid "Unidirectional"
-msgstr "Một hướng"
+#: objects/chronogram/chronoline.c:166 objects/chronogram/chronoref.c:148
+msgid "End time"
+msgstr "Thời điểm cuối"
 
-#: objects/EML/interaction-ortho.c:287 objects/EML/interaction.c:455
-msgid "Bidirectional"
-msgstr "Hai hướng"
+#: objects/chronogram/chronoline.c:168
+msgid "Rise time"
+msgstr ""
 
-#: objects/EML/interaction.c:612
-msgid "Interaction name:"
-msgstr "Tên giao tiếp"
+#: objects/chronogram/chronoline.c:170
+msgid "Fall time"
+msgstr ""
 
-#: objects/EML/interaction.c:623
-msgid "bidirectional"
-msgstr "hai hướng"
+#: objects/chronogram/chronoline.c:171
+msgid "Multi-bit data"
+msgstr "Dữ liệu đa bit"
 
-#: objects/EML/nlist.c:37 objects/UML/class_dialog.c:870
-#: objects/UML/class_dialog.c:1882 objects/UML/class_dialog.c:2099
-#: objects/UML/class_dialog.c:2663
-msgid "New"
-msgstr "Mới"
+#: objects/chronogram/chronoline.c:173 objects/chronogram/chronoref.c:156
+msgid "Aspect"
+msgstr ""
 
-#: objects/EML/nlist.c:42 objects/UML/class_dialog.c:876
-#: objects/UML/class_dialog.c:1888 objects/UML/class_dialog.c:2106
-#: objects/UML/class_dialog.c:2669
-msgid "Delete"
-msgstr "Xóa"
+#: objects/chronogram/chronoline.c:175
+msgid "Data color"
+msgstr "Màu dữ liệu"
 
-#: objects/EML/nlist.c:47 objects/UML/class_dialog.c:882
-#: objects/UML/class_dialog.c:1894 objects/UML/class_dialog.c:2113
-#: objects/UML/class_dialog.c:2675
-msgid "Move up"
-msgstr "Chuyển lên"
+#: objects/chronogram/chronoline.c:177
+msgid "Data line width"
+msgstr "Bề rông hành dữ liệu"
 
-#: objects/EML/nlist.c:52
-msgid "Move Down"
-msgstr "Chuyển xuống"
+#: objects/chronogram/chronoline.c:179 objects/chronogram/chronoref.c:158
+msgid "Line color"
+msgstr "Màu hàng"
 
 #. choose default font name for your locale. see also font_data structure
 #. in lib/font.c.
-#: objects/EML/process.c:514 objects/EML/process.c:515
-#: objects/EML/process.c:516 objects/EML/process.c:517
-#: objects/FS/function.c:416 objects/SADT/annotation.c:357
-#: objects/UML/actor.c:331 objects/UML/classicon.c:414
-#: objects/UML/component.c:347 objects/UML/message.c:369
-#: objects/UML/node.c:325 objects/UML/object.c:446 objects/UML/state.c:339
-#: objects/UML/usecase.c:386 objects/chronogram/chronoline.c:611
+#: objects/FS/function.c:417 objects/SADT/annotation.c:357
+#: objects/UML/actor.c:332 objects/UML/classicon.c:415
+#: objects/UML/component.c:348 objects/UML/message.c:369
+#: objects/UML/node.c:328 objects/UML/object.c:447 objects/UML/state.c:352
+#: objects/UML/usecase.c:387 objects/chronogram/chronoline.c:611
 #: objects/chronogram/chronoref.c:434
 msgid "Helvetica"
 msgstr "Helvetica"
 
-#: objects/EML/process_dialog.c:625
-msgid "relation"
-msgstr "quan hệ"
-
-#: objects/EML/process_dialog.c:882
-msgid "Interface functions"
-msgstr "Hàm giao diện"
+#: objects/chronogram/chronoref.c:144
+msgid "Time data"
+msgstr "Dữ liệu thời gian"
 
-#: objects/EML/process_dialog.c:883
-msgid "Function"
-msgstr "Hàm"
+#: objects/chronogram/chronoref.c:150
+msgid "Major time step"
+msgstr ""
 
-#: objects/EML/process_dialog.c:899
-msgid "Function module:"
-msgstr "Mô đun hàm:"
+#: objects/chronogram/chronoref.c:152
+msgid "Minor time step"
+msgstr ""
 
-#: objects/EML/process_dialog.c:908 objects/EML/process_dialog.c:1304
-msgid "Function name:"
-msgstr "Tên hàm:"
+#: objects/chronogram/chronoref.c:162
+msgid "Minor step line width"
+msgstr ""
 
-#: objects/EML/process_dialog.c:1097
-msgid "Interfaces"
-msgstr "Giao diện"
-
-#: objects/EML/process_dialog.c:1098
-msgid "Interface"
-msgstr "Giao diện"
-
-#: objects/EML/process_dialog.c:1114
-msgid "Interface name:"
-msgstr "Tên giao diện:"
-
-#: objects/EML/process_dialog.c:1132
-msgid "Interface messages"
-msgstr "Thông điệp giao diện"
-
-#: objects/EML/process_dialog.c:1133
-msgid "Message"
-msgstr "Thông điệp"
-
-#: objects/EML/process_dialog.c:1134
-msgid "Message parameters"
-msgstr "Tham số thông điệp"
-
-#: objects/EML/process_dialog.c:1135
-msgid "Message parameter"
-msgstr "Tham số thông điệp"
-
-#: objects/EML/process_dialog.c:1148
-msgid "Functions"
-msgstr "Hàm"
+#: objects/custom/custom.c:135
+msgid "Custom"
+msgstr "Tự chọn"
 
-#: objects/EML/process_dialog.c:1151
-msgid "Messages"
-msgstr "Thông điệp"
+#: objects/custom/custom.c:135
+msgid "Custom XML shapes loader"
+msgstr "Bộ nạp hình XML tự chọn"
 
-#: objects/EML/process_dialog.c:1238 objects/FS/function.c:799
-msgid "Process"
-msgstr "Tiến trình"
+#: objects/custom/custom_object.c:197 objects/custom/custom_object.c:216
+msgid "Flip horizontal"
+msgstr "Lật ngang"
 
-#: objects/EML/process_dialog.c:1242
-msgid "Process name:"
-msgstr "Tên tiến trình:"
+#: objects/custom/custom_object.c:199 objects/custom/custom_object.c:218
+msgid "Flip vertical"
+msgstr "Lật dọc"
 
-#: objects/EML/process_dialog.c:1246
-msgid "Process reference name:"
-msgstr "Tên tham khảo tiến trình:"
+#: objects/custom/custom_object.c:329 objects/flowchart/box.c:293
+#: objects/flowchart/diamond.c:272 objects/flowchart/ellipse.c:272
+#: objects/flowchart/parallelogram.c:296
+msgid "Text padding:"
+msgstr "Đệm text:"
 
-#: objects/EML/process_dialog.c:1251
-msgid "Process lifetime:"
-msgstr "Chu kỳ sống tiến trình:"
+#: objects/custom/custom_object.c:343 objects/standard/textobj.c:206
+msgid "Alignment:"
+msgstr "Canh hàng:"
 
-#: objects/EML/process_dialog.c:1299
-msgid "Module name:"
-msgstr "Tên mô đun:"
+#: objects/custom/custom_object.c:354 objects/flowchart/box.c:307
+#: objects/flowchart/diamond.c:286 objects/flowchart/ellipse.c:286
+#: objects/flowchart/parallelogram.c:310 objects/standard/textobj.c:217
+msgid "Font:"
+msgstr "Font:"
 
-#: objects/EML/process_dialog.c:1311
-msgid "Function parameters"
-msgstr "Tham số hàm"
+#: objects/custom/custom_object.c:365 objects/flowchart/box.c:318
+#: objects/flowchart/diamond.c:297 objects/flowchart/ellipse.c:297
+#: objects/flowchart/parallelogram.c:321
+msgid "Font size:"
+msgstr "Cỡ font:"
 
-#: objects/EML/process_dialog.c:1312
-msgid "Parameter"
-msgstr "Tham số"
+#: objects/custom/custom_object.c:1525
+msgid "Flip Horizontal"
+msgstr "Lật ngang"
 
-#: objects/EML/process_dialog.c:1313
-msgid "Relation members"
-msgstr "Thành phần quan hệ"
+#: objects/custom/custom_object.c:1526
+msgid "Flip Vertical"
+msgstr "Lật dọc"
 
-#: objects/EML/process_dialog.c:1314
-msgid "Relation member"
-msgstr "Thành phần quan hệ"
+#: objects/custom/custom_object.c:1563
+#, c-format
+msgid "Cannot open icon file %s for object type '%s'."
+msgstr "Không thể mở tập tin biểu tượng %s cho đối tượng loại '%s'."
 
-#: objects/ER/attribute.c:150
+#: objects/ER/attribute.c:151
 msgid "Key:"
 msgstr "Khoá:"
 
-#: objects/ER/attribute.c:152
+#: objects/ER/attribute.c:153
 msgid "Weak key:"
 msgstr "Khoá yếu:"
 
-#: objects/ER/attribute.c:154
+#: objects/ER/attribute.c:155
 msgid "Derived:"
 msgstr "Dẫn xuất từ:"
 
-#: objects/ER/attribute.c:156
+#: objects/ER/attribute.c:157
 msgid "Multivalue:"
 msgstr "Đa giá trị:"
 
-#: objects/ER/attribute.c:393 objects/ER/attribute.c:395
+#: objects/ER/attribute.c:397 objects/ER/attribute.c:399
 #: sheets/ER.sheet.in.h:1
 msgid "Attribute"
 msgstr "Thuộc tính"
 
-#: objects/ER/entity.c:128
+#: objects/ER/entity.c:129
 msgid "Weak:"
 msgstr "Yếu:"
 
-#: objects/ER/entity.c:345 objects/ER/entity.c:347 objects/UML/classicon.c:124
+#: objects/ER/entity.c:349 objects/ER/entity.c:351 objects/UML/classicon.c:124
 #: sheets/ER.sheet.in.h:4
 msgid "Entity"
 msgstr "Thực thể"
@@ -2261,75 +2520,107 @@ msgstr "Đối tượng biểu đồ thực thệ/mối quan hệ"
 msgid "Total:"
 msgstr "Tổng cộng:"
 
-#: objects/ER/relationship.c:137
+#: objects/ER/participation.c:393 objects/FS/flow-ortho.c:815
+#: objects/GRAFCET/vector.c:301 objects/SADT/arrow.c:550
+#: objects/UML/association.c:620 objects/UML/dependency.c:335
+#: objects/UML/generalization.c:327 objects/UML/realizes.c:330
+#: objects/standard/zigzagline.c:343
+msgid "Add segment"
+msgstr "Thêm đoạn"
+
+#: objects/ER/participation.c:394 objects/FS/flow-ortho.c:816
+#: objects/GRAFCET/vector.c:302 objects/SADT/arrow.c:551
+#: objects/UML/association.c:621 objects/UML/dependency.c:336
+#: objects/UML/generalization.c:328 objects/UML/realizes.c:331
+#: objects/standard/zigzagline.c:344
+msgid "Delete segment"
+msgstr "Xóa đoạn"
+
+#: objects/ER/relationship.c:138
 msgid "Left Cardinality:"
 msgstr ""
 
-#: objects/ER/relationship.c:139
+#: objects/ER/relationship.c:140
 msgid "Right Cardinality:"
 msgstr ""
 
-#: objects/ER/relationship.c:141
+#: objects/ER/relationship.c:142
 msgid "Rotate:"
 msgstr "Quay:"
 
-#: objects/ER/relationship.c:143
+#: objects/ER/relationship.c:144
 msgid "Identifying:"
 msgstr "Định danh:"
 
-#: objects/ER/relationship.c:423 objects/ER/relationship.c:425
+#: objects/ER/relationship.c:427 objects/ER/relationship.c:429
 #: sheets/ER.sheet.in.h:6
 msgid "Relationship"
 msgstr "Quan hệ"
 
+#: objects/flowchart/box.c:167 objects/standard/box.c:153
+msgid "Corner radius"
+msgstr "Góc"
+
+#: objects/SADT/box.c:137 objects/flowchart/box.c:169
+#: objects/flowchart/diamond.c:165 objects/flowchart/ellipse.c:165
+#: objects/flowchart/parallelogram.c:171
+msgid "Text padding"
+msgstr "Đệm text"
+
+#: objects/flowchart/box.c:279 objects/standard/box.c:240
+msgid "Corner rounding:"
+msgstr "Góc tròn:"
+
+#: objects/flowchart/flowchart.c:37
+msgid "Flowchart objects"
+msgstr "Đối tượng lưu đồ"
+
+#: objects/flowchart/parallelogram.c:169
+msgid "Shear angle"
+msgstr ""
+
+#: objects/flowchart/parallelogram.c:282
+msgid "Shear angle:"
+msgstr ""
+
 #.
 #: objects/FS/flow-ortho.c:178 objects/FS/flow-ortho.c:746
 #: objects/FS/flow-ortho.c:812 objects/FS/flow-ortho.c:877
-#: objects/FS/flow-poly.c:670 objects/FS/flow-poly.c:725
-#: objects/FS/flow-poly.c:789 objects/FS/flow.c:155 objects/FS/flow.c:658
-#: objects/FS/flow.c:722 objects/FS/function.c:831
+#: objects/FS/flow.c:155 objects/FS/flow.c:658 objects/FS/flow.c:722
+#: objects/FS/function.c:1058
 msgid "Energy"
 msgstr "Năng lượng"
 
+#. Translators: Menu item Noun/Material
 #: objects/FS/flow-ortho.c:179 objects/FS/flow-ortho.c:753
 #: objects/FS/flow-ortho.c:813 objects/FS/flow-ortho.c:884
-#: objects/FS/flow-poly.c:677 objects/FS/flow-poly.c:726
-#: objects/FS/flow-poly.c:796 objects/FS/flow.c:156 objects/FS/flow.c:659
-#: objects/FS/flow.c:729 objects/FS/function.c:819
+#: objects/FS/flow.c:156 objects/FS/flow.c:659 objects/FS/flow.c:729
+#: objects/FS/function.c:1034
 msgid "Material"
 msgstr "Nguyên liệu"
 
+#. Translators: Menu item Verb/Signal
 #: objects/FS/flow-ortho.c:180 objects/FS/flow-ortho.c:759
 #: objects/FS/flow-ortho.c:814 objects/FS/flow-ortho.c:890
-#: objects/FS/flow-poly.c:683 objects/FS/flow-poly.c:727
-#: objects/FS/flow-poly.c:802 objects/FS/flow.c:157 objects/FS/flow.c:660
-#: objects/FS/flow.c:735 objects/FS/function.c:800 objects/FS/function.c:801
-#: objects/FS/function.c:869 objects/FS/function.c:870
+#: objects/FS/flow.c:157 objects/FS/flow.c:660 objects/FS/flow.c:735
+#: objects/FS/function.c:996 objects/FS/function.c:998
+#: objects/FS/function.c:1134 objects/FS/function.c:1136
 msgid "Signal"
 msgstr "Tín hiệu"
 
-#: objects/FS/flow-ortho.c:187 objects/FS/flow.c:164
-#: objects/UML/class_dialog.c:919 objects/UML/class_dialog.c:1934
-#: objects/UML/class_dialog.c:2153 objects/UML/class_dialog.c:2712
-msgid "Type:"
-msgstr "Loại:"
-
 #. choose default font name for your locale. see also font_data structure
 #. in lib/font.c.
 #: objects/FS/flow-ortho.c:437 objects/FS/flow-ortho.c:567
-#: objects/FS/flow-ortho.c:926 objects/FS/flow-poly.c:366
-#: objects/FS/flow-poly.c:495 objects/FS/flow-poly.c:838 objects/FS/flow.c:430
-#: objects/FS/flow.c:559 objects/FS/flow.c:771
+#: objects/FS/flow-ortho.c:926 objects/FS/flow.c:430 objects/FS/flow.c:559
+#: objects/FS/flow.c:771
 msgid "Helvetica-Oblique"
 msgstr ""
 
-#: objects/FS/flow-ortho.c:726 objects/FS/flow-poly.c:650
-#: objects/FS/flow-poly.c:768 objects/FS/flow.c:701
+#: objects/FS/flow-ortho.c:726 objects/FS/flow.c:701
 msgid "Flow:"
 msgstr "Dòng chảy:"
 
-#: objects/FS/flow-ortho.c:741 objects/FS/flow-poly.c:665
-#: objects/FS/flow-poly.c:784 objects/FS/flow.c:717
+#: objects/FS/flow-ortho.c:741 objects/FS/flow.c:717
 msgid "Flow type:"
 msgstr "Loại dòng chảy:"
 
@@ -2353,782 +2644,978 @@ msgstr "hàm Wish"
 msgid "User function"
 msgstr "Hàm người dùng"
 
-#: objects/FS/function.c:621
+#. Translators: Menu item Verb
+#: objects/FS/function.c:638
 msgid "Verb"
 msgstr "Động từ"
 
-#: objects/FS/function.c:622 objects/FS/function.c:623
-#: objects/FS/function.c:643
+#. Translators: Menu item Verb/Channel
+#: objects/FS/function.c:640 objects/FS/function.c:642
+#: objects/FS/function.c:682
 msgid "Channel"
 msgstr "Kênh"
 
-#: objects/FS/function.c:624 objects/FS/function.c:625
+#. Translators: Menu item Verb/Channel/Import
+#: objects/FS/function.c:644 objects/FS/function.c:646
 msgid "Import"
 msgstr "Nhập"
 
-#: objects/FS/function.c:626
+#. Translators: Menu item Verb/Channel/Import/Input
+#: objects/FS/function.c:648
 msgid "Input"
 msgstr "Đầu vào"
 
-#: objects/FS/function.c:627
+#. Translators: Menu item Verb/Channel/Import/Receive
+#: objects/FS/function.c:650
 msgid "Receive"
 msgstr "Nhận"
 
-#: objects/FS/function.c:628 objects/FS/function.c:764
+#. Translators: Menu item Verb/Channel/Import/Allow
+#: objects/FS/function.c:652 objects/FS/function.c:924
 msgid "Allow"
 msgstr "Cho phép"
 
-#: objects/FS/function.c:629
+#. Translators: Menu item Verb/Channel/Import/Form Entrance
+#: objects/FS/function.c:654
 msgid "Form Entrance"
 msgstr ""
 
-#: objects/FS/function.c:630 objects/FS/function.c:747
+#. Translators: Menu item Verb/Channel/Import/Capture
+#: objects/FS/function.c:656 objects/FS/function.c:890
 msgid "Capture"
 msgstr "Bắt lấy"
 
-#: objects/FS/function.c:633
+#. Translators: Menu item Verb/Channel/Export/Discharge
+#: objects/FS/function.c:662
 msgid "Discharge"
 msgstr ""
 
-#: objects/FS/function.c:634
+#. Translators: Menu item Verb/Channel/Export/Eject
+#: objects/FS/function.c:664
 msgid "Eject"
 msgstr "Đẩy ra"
 
-#: objects/FS/function.c:635
+#. Translators: Menu item Verb/Channel/Export/Dispose
+#: objects/FS/function.c:666
 msgid "Dispose"
 msgstr ""
 
-#: objects/FS/function.c:637 objects/FS/function.c:638
-#: objects/FS/function.c:647
+#. Translators: Menu item Verb/Channel/Transfer
+#: objects/FS/function.c:670 objects/FS/function.c:672
+#: objects/FS/function.c:690
 msgid "Transfer"
 msgstr "Chuyển"
 
-#: objects/FS/function.c:639 objects/FS/function.c:640
+#. Translators: Menu item Verb/Channel/Transfer/Transport
+#: objects/FS/function.c:674 objects/FS/function.c:676
 msgid "Transport"
 msgstr "Vận chuyển"
 
-#: objects/FS/function.c:641
+#. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
+#: objects/FS/function.c:678
 msgid "Lift"
 msgstr ""
 
-#: objects/FS/function.c:642
+#. Translators: Menu item Verb/Channel/Transfer/Transport/Move
+#: objects/FS/function.c:680
 msgid "Move"
 msgstr "Di chuyển"
 
-#: objects/FS/function.c:644 objects/FS/function.c:645
+#. Translators: Menu item Verb/Channel/Transfer/Transmit
+#: objects/FS/function.c:684 objects/FS/function.c:686
 msgid "Transmit"
 msgstr "Gửi"
 
-#: objects/FS/function.c:646
+#. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
+#: objects/FS/function.c:688
 msgid "Conduct"
 msgstr ""
 
-#: objects/FS/function.c:648
+#. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
+#: objects/FS/function.c:692
 msgid "Convey"
 msgstr ""
 
-#: objects/FS/function.c:649 objects/FS/function.c:650
-#: objects/FS/function.c:651
+#. Translators: Menu item Verb/Channel/Guide
+#: objects/FS/function.c:694 objects/FS/function.c:696
+#: objects/FS/function.c:698
 msgid "Guide"
 msgstr "Hướng dẫn"
 
-#: objects/FS/function.c:652
+#. Translators: Menu item Verb/Channel/Guide/Guide/Direct
+#: objects/FS/function.c:700
 msgid "Direct"
 msgstr ""
 
-#: objects/FS/function.c:653
+#. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
+#: objects/FS/function.c:702
 msgid "Straighten"
 msgstr "Làm thẳng"
 
-#: objects/FS/function.c:654
+#. Translators: Menu item Verb/Channel/Guide/Guide/Steer
+#: objects/FS/function.c:704
 msgid "Steer"
 msgstr "Điều khiển"
 
-#: objects/FS/function.c:655
+#. Translators: Menu item Verb/Channel/Guide/Translate
+#: objects/FS/function.c:706
 msgid "Translate"
 msgstr "Dịch"
 
-#: objects/FS/function.c:656 objects/FS/function.c:657
+#. Translators: Menu item Verb/Channel/Guide/Rotate
+#: objects/FS/function.c:708 objects/FS/function.c:710
 msgid "Rotate"
 msgstr "Quay"
 
-#: objects/FS/function.c:658
+#. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
+#: objects/FS/function.c:712
 msgid "Turn"
 msgstr "Quay"
 
-#: objects/FS/function.c:659
+#. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
+#: objects/FS/function.c:714
 msgid "Spin"
 msgstr "Quay vòng"
 
-#: objects/FS/function.c:660 objects/FS/function.c:661
+#. Translators: Menu item Verb/Channel/Guide/Allow DOF
+#: objects/FS/function.c:716 objects/FS/function.c:718
 msgid "Allow DOF"
 msgstr "Cho phép DOF"
 
-#: objects/FS/function.c:662
+#. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
+#: objects/FS/function.c:720
 msgid "Constrain"
 msgstr "Ràng buộc"
 
-#: objects/FS/function.c:663
+#. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
+#: objects/FS/function.c:722
 msgid "Unlock"
 msgstr "Bỏ khóa"
 
-#: objects/FS/function.c:664 objects/FS/function.c:665
+#. Translators: Menu item Verb/Support
+#: objects/FS/function.c:724 objects/FS/function.c:726
 msgid "Support"
 msgstr "Hỗ trợ"
 
-#: objects/FS/function.c:666 objects/FS/function.c:667
+#. Translators: Menu item Verb/Support/Stop
+#: objects/FS/function.c:728 objects/FS/function.c:730
 #: sheets/SDL.sheet.in.h:19
 msgid "Stop"
 msgstr "Dừng"
 
-#: objects/FS/function.c:668
+#. Translators: Menu item Verb/Support/Stop/Insulate
+#: objects/FS/function.c:732
 msgid "Insulate"
 msgstr ""
 
-#: objects/FS/function.c:669
+#. Translators: Menu item Verb/Support/Stop/Protect
+#: objects/FS/function.c:734
 msgid "Protect"
 msgstr ""
 
-#: objects/FS/function.c:670 objects/FS/function.c:765
+#. Translators: Menu item Verb/Support/Stop/Prevent
+#: objects/FS/function.c:736 objects/FS/function.c:926
 msgid "Prevent"
 msgstr ""
 
-#: objects/FS/function.c:671
+#. Translators: Menu item Verb/Support/Stop/Shield
+#: objects/FS/function.c:738
 msgid "Shield"
 msgstr ""
 
-#: objects/FS/function.c:672
+#. Translators: Menu item Verb/Support/Stop/Inhibit
+#: objects/FS/function.c:740
 msgid "Inhibit"
 msgstr "Chống"
 
-#: objects/FS/function.c:673 objects/FS/function.c:674
+#. Translators: Menu item Verb/Support/Stabilize
+#: objects/FS/function.c:742 objects/FS/function.c:744
 msgid "Stabilize"
 msgstr ""
 
-#: objects/FS/function.c:675
+#. Translators: Menu item Verb/Support/Stabilize/Steady
+#: objects/FS/function.c:746
 msgid "Steady"
 msgstr ""
 
-#: objects/FS/function.c:676 objects/FS/function.c:677
+#. Translators: Menu item Verb/Support/Secure
+#: objects/FS/function.c:748 objects/FS/function.c:750
 msgid "Secure"
 msgstr "An toàn"
 
-#: objects/FS/function.c:678 objects/FS/function.c:694
+#. Translators: Menu item Verb/Support/Secure/Attach
+#: objects/FS/function.c:752 objects/FS/function.c:784
 msgid "Attach"
 msgstr "Gắn vào"
 
-#: objects/FS/function.c:679
+#. Translators: Menu item Verb/Support/Secure/Mount
+#: objects/FS/function.c:754
 msgid "Mount"
 msgstr "Gắn kết"
 
-#: objects/FS/function.c:680
+#. Translators: Menu item Verb/Support/Secure/Lock
+#: objects/FS/function.c:756
 msgid "Lock"
 msgstr "Khoá"
 
-#: objects/FS/function.c:681
+#. Translators: Menu item Verb/Support/Secure/Fasten
+#: objects/FS/function.c:758
 msgid "Fasten"
 msgstr "Cột"
 
-#: objects/FS/function.c:682
+#. Translators: Menu item Verb/Support/Secure/Hold
+#: objects/FS/function.c:760
 msgid "Hold"
 msgstr "Giữ"
 
-#: objects/FS/function.c:683 objects/FS/function.c:684
+#. Translators: Menu item Verb/Support/Position
+#: objects/FS/function.c:762 objects/FS/function.c:764
 msgid "Position"
 msgstr "Vị trí"
 
-#: objects/FS/function.c:685
+#. Translators: Menu item Verb/Support/Position/Orient
+#: objects/FS/function.c:766
 msgid "Orient"
 msgstr "Hướng"
 
-#: objects/FS/function.c:686
+#. Translators: Menu item Verb/Support/Position/Align
+#: objects/FS/function.c:768
 msgid "Align"
 msgstr ""
 
-#: objects/FS/function.c:687 objects/FS/function.c:808
+#. Translators: Menu item Verb/Support/Position/Locate
+#: objects/FS/function.c:770 objects/FS/function.c:1012
 msgid "Locate"
 msgstr "Định vị"
 
-#: objects/FS/function.c:688 objects/FS/function.c:689
+#. Translators: Menu item Verb/Connect
+#: objects/FS/function.c:772 objects/FS/function.c:774
 msgid "Connect"
 msgstr "Kết nối"
 
-#: objects/FS/function.c:690 objects/FS/function.c:691
+#. Translators: Menu item Verb/Connect/Couple
+#: objects/FS/function.c:776 objects/FS/function.c:778
 msgid "Couple"
 msgstr "Cặp"
 
-#: objects/FS/function.c:692
+#. Translators: Menu item Verb/Connect/Couple/Join
+#: objects/FS/function.c:780
 msgid "Join"
 msgstr "Tham gia"
 
-#: objects/FS/function.c:693
+#. Translators: Menu item Verb/Connect/Couple/Assemble
+#: objects/FS/function.c:782
 msgid "Assemble"
 msgstr "Tập hợp"
 
-#: objects/FS/function.c:695 objects/FS/function.c:696
+#. Translators: Menu item Verb/Connect/Mix
+#: objects/FS/function.c:786 objects/FS/function.c:788
 msgid "Mix"
 msgstr "Trộn"
 
-#: objects/FS/function.c:697
+#. Translators: Menu item Verb/Connect/Mix/Combine
+#: objects/FS/function.c:790
 msgid "Combine"
 msgstr "Kết hợp"
 
-#: objects/FS/function.c:698
+#. Translators: Menu item Verb/Connect/Mix/Blend
+#: objects/FS/function.c:792
 msgid "Blend"
 msgstr "Hoàn trộn"
 
-#: objects/FS/function.c:699
+#. Translators: Menu item Verb/Connect/Mix/Add
+#: objects/FS/function.c:794
 msgid "Add"
 msgstr "Thêm"
 
-#: objects/FS/function.c:700
+#. Translators: Menu item Verb/Connect/Mix/Pack
+#: objects/FS/function.c:796
 msgid "Pack"
 msgstr "Nén"
 
-#: objects/FS/function.c:701
+#. Translators: Menu item Verb/Connect/Mix/Coalesce
+#: objects/FS/function.c:798
 msgid "Coalesce"
 msgstr ""
 
-#: objects/FS/function.c:702 objects/FS/function.c:703
+#. Translators: Menu item Verb/Branch
+#: objects/FS/function.c:800 objects/FS/function.c:802
 msgid "Branch"
 msgstr "Nhánh"
 
-#: objects/FS/function.c:704 objects/FS/function.c:705
-#: objects/FS/function.c:706
+#. Translators: Menu item Verb/Branch/Separate
+#: objects/FS/function.c:804 objects/FS/function.c:806
+#: objects/FS/function.c:808
 msgid "Separate"
 msgstr "Ngăn cách"
 
-#: objects/FS/function.c:707
+#. Translators: Menu item Verb/Branch/Separate/Separate/Switch
+#: objects/FS/function.c:810
 msgid "Switch"
 msgstr ""
 
-#: objects/FS/function.c:708
+#. Translators: Menu item Verb/Branch/Separate/Separate/Divide
+#: objects/FS/function.c:812
 msgid "Divide"
 msgstr "Chia"
 
-#: objects/FS/function.c:709
+#. Translators: Menu item Verb/Branch/Separate/Separate/Release
+#: objects/FS/function.c:814
 msgid "Release"
 msgstr ""
 
-#: objects/FS/function.c:710
+#. Translators: Menu item Verb/Branch/Separate/Separate/Detach
+#: objects/FS/function.c:816
 msgid "Detach"
 msgstr ""
 
-#: objects/FS/function.c:711
+#. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
+#: objects/FS/function.c:818
 msgid "Disconnect"
 msgstr "Ngắt kết nối"
 
-#: objects/FS/function.c:714
+#. Translators: Menu item Verb/Branch/Separate/Remove/Cut
+#: objects/FS/function.c:824
 msgid "Cut"
 msgstr "Cắt"
 
-#: objects/FS/function.c:715
+#. Translators: Menu item Verb/Branch/Separate/Remove/Polish
+#: objects/FS/function.c:826
 msgid "Polish"
 msgstr ""
 
-#: objects/FS/function.c:716
+#. Translators: Menu item Verb/Branch/Separate/Remove/Sand
+#: objects/FS/function.c:828
 msgid "Sand"
 msgstr "Cát"
 
-#: objects/FS/function.c:717
+#. Translators: Menu item Verb/Branch/Separate/Remove/Drill
+#: objects/FS/function.c:830
 msgid "Drill"
 msgstr "Khoan"
 
-#: objects/FS/function.c:718
+#. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
+#: objects/FS/function.c:832
 msgid "Lathe"
 msgstr ""
 
-#: objects/FS/function.c:719 objects/FS/function.c:720
+#. Translators: Menu item Verb/Branch/Refine
+#: objects/FS/function.c:834 objects/FS/function.c:836
 msgid "Refine"
 msgstr "Lọc"
 
-#: objects/FS/function.c:721
+#. Translators: Menu item Verb/Branch/Refine/Purify
+#: objects/FS/function.c:838
 msgid "Purify"
 msgstr ""
 
-#: objects/FS/function.c:722
+#. Translators: Menu item Verb/Branch/Refine/Strain
+#: objects/FS/function.c:840
 msgid "Strain"
 msgstr ""
 
-#: objects/FS/function.c:723
+#. Translators: Menu item Verb/Branch/Refine/Filter
+#: objects/FS/function.c:842
 msgid "Filter"
 msgstr "Lọc"
 
-#: objects/FS/function.c:724
+#. Translators: Menu item Verb/Branch/Refine/Percolate
+#: objects/FS/function.c:844
 msgid "Percolate"
 msgstr ""
 
-#: objects/FS/function.c:725
+#. Translators: Menu item Verb/Branch/Refine/Clear
+#: objects/FS/function.c:846
 msgid "Clear"
 msgstr "Xoá"
 
-#: objects/FS/function.c:726 objects/FS/function.c:727
+#. Translators: Menu item Verb/Branch/Distribute
+#: objects/FS/function.c:848 objects/FS/function.c:850
 msgid "Distribute"
 msgstr "Phân phối"
 
-#: objects/FS/function.c:728
+#. Translators: Menu item Verb/Branch/Distribute/Diverge
+#: objects/FS/function.c:852
 msgid "Diverge"
 msgstr ""
 
-#: objects/FS/function.c:729
+#. Translators: Menu item Verb/Branch/Distribute/Scatter
+#: objects/FS/function.c:854
 msgid "Scatter"
 msgstr ""
 
-#: objects/FS/function.c:730
+#. Translators: Menu item Verb/Branch/Distribute/Disperse
+#: objects/FS/function.c:856
 msgid "Disperse"
 msgstr ""
 
-#: objects/FS/function.c:731 objects/FS/function.c:738
+#. Translators: Menu item Verb/Branch/Distribute/Diffuse
+#: objects/FS/function.c:858 objects/FS/function.c:872
 msgid "Diffuse"
 msgstr ""
 
-#: objects/FS/function.c:732
+#. Translators: Menu item Verb/Branch/Distribute/Empty
+#: objects/FS/function.c:860
 msgid "Empty"
 msgstr "Rỗng"
 
-#: objects/FS/function.c:733 objects/FS/function.c:734
+#. Translators: Menu item Verb/Branch/Dissipate
+#: objects/FS/function.c:862 objects/FS/function.c:864
 msgid "Dissipate"
 msgstr ""
 
-#: objects/FS/function.c:735
+#. Translators: Menu item Verb/Branch/Dissipate/Absorb
+#: objects/FS/function.c:866
 msgid "Absorb"
 msgstr "Hút"
 
-#: objects/FS/function.c:736
+#. Translators: Menu item Verb/Branch/Dissipate/Dampen
+#: objects/FS/function.c:868
 msgid "Dampen"
 msgstr ""
 
-#: objects/FS/function.c:737
+#. Translators: Menu item Verb/Branch/Dissipate/Dispel
+#: objects/FS/function.c:870
 msgid "Dispel"
 msgstr ""
 
-#: objects/FS/function.c:739
+#. Translators: Menu item Verb/Branch/Dissipate/Resist
+#: objects/FS/function.c:874
 msgid "Resist"
 msgstr "Cản"
 
-#: objects/FS/function.c:740 objects/FS/function.c:741
+#. Translators: Menu item Verb/Provision
+#: objects/FS/function.c:876 objects/FS/function.c:878
 msgid "Provision"
 msgstr "Dự phòng"
 
-#: objects/FS/function.c:742 objects/FS/function.c:743
+#. Translators: Menu item Verb/Provision/Store
+#: objects/FS/function.c:880 objects/FS/function.c:882
 msgid "Store"
 msgstr "Cửa hàng"
 
-#: objects/FS/function.c:744
+#. Translators: Menu item Verb/Provision/Store/Contain
+#: objects/FS/function.c:884
 msgid "Contain"
 msgstr "Chứa"
 
-#: objects/FS/function.c:745
+#. Translators: Menu item Verb/Provision/Store/Collect
+#: objects/FS/function.c:886
 msgid "Collect"
 msgstr "Tập hợp"
 
-#: objects/FS/function.c:746
+#. Translators: Menu item Verb/Provision/Store/Reserve
+#: objects/FS/function.c:888
 msgid "Reserve"
 msgstr "Đảo"
 
-#: objects/FS/function.c:748 objects/FS/function.c:749
+#. Translators: Menu item Verb/Provision/Supply
+#: objects/FS/function.c:892 objects/FS/function.c:894
 msgid "Supply"
 msgstr "Cung cấp"
 
-#: objects/FS/function.c:750
+#. Translators: Menu item Verb/Provision/Supply/Fill
+#: objects/FS/function.c:896
 msgid "Fill"
 msgstr "Tô đầy"
 
-#: objects/FS/function.c:751
+#. Translators: Menu item Verb/Provision/Supply/Provide
+#: objects/FS/function.c:898
 msgid "Provide"
 msgstr "Cung cấp"
 
-#: objects/FS/function.c:752
+#. Translators: Menu item Verb/Provision/Supply/Replenish
+#: objects/FS/function.c:900
 msgid "Replenish"
 msgstr ""
 
-#: objects/FS/function.c:753
+#. Translators: Menu item Verb/Provision/Supply/Expose
+#: objects/FS/function.c:902
 msgid "Expose"
 msgstr ""
 
-#: objects/FS/function.c:754 sheets/Flowchart.sheet.in.h:9
+#. Translators: Menu item Verb/Provision/Extract
+#: objects/FS/function.c:904 sheets/Flowchart.sheet.in.h:9
 msgid "Extract"
 msgstr "Trích"
 
-#: objects/FS/function.c:755 objects/FS/function.c:756
+#. Translators: Menu item Verb/Control Magnitude
+#: objects/FS/function.c:906 objects/FS/function.c:908
 msgid "Control Magnitude"
 msgstr ""
 
-#: objects/FS/function.c:757 objects/FS/function.c:758
+#. Translators: Menu item Verb/Control Magnitude/Actuate
+#: objects/FS/function.c:910 objects/FS/function.c:912
 msgid "Actuate"
 msgstr ""
 
-#: objects/FS/function.c:759
+#. Translators: Menu item Verb/Control Magnitude/Actuate/Start
+#: objects/FS/function.c:914
 msgid "Start"
 msgstr "Bắt đầu"
 
-#: objects/FS/function.c:760
+#. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
+#: objects/FS/function.c:916
 msgid "Initiate"
 msgstr "Khởi động"
 
-#: objects/FS/function.c:761 objects/FS/function.c:762
+#. Translators: Menu item Verb/Control Magnitude/Regulate
+#: objects/FS/function.c:918 objects/FS/function.c:920
 msgid "Regulate"
 msgstr ""
 
-#: objects/FS/function.c:763 objects/FS/function.c:872
+#. Translators: Menu item Verb/Control Magnitude/Regulate/Control
+#: objects/FS/function.c:922 objects/FS/function.c:1140
 #: objects/UML/classicon.c:122
 msgid "Control"
 msgstr "Điều khiển"
 
-#: objects/FS/function.c:766
+#. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
+#: objects/FS/function.c:928
 msgid "Enable"
 msgstr "Bật"
 
-#: objects/FS/function.c:767
+#. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
+#: objects/FS/function.c:930
 msgid "Disable"
 msgstr "Tắt"
 
-#: objects/FS/function.c:768
+#. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
+#: objects/FS/function.c:932
 msgid "Limit"
 msgstr "Giới hạn"
 
-#: objects/FS/function.c:769
+#. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
+#: objects/FS/function.c:934
 msgid "Interrupt"
 msgstr "Ngắt"
 
-#: objects/FS/function.c:770 objects/FS/function.c:771
+#. Translators: Menu item Verb/Control Magnitude/Change
+#: objects/FS/function.c:936 objects/FS/function.c:938
 msgid "Change"
 msgstr "Thay đổi"
 
-#: objects/FS/function.c:772
+#. Translators: Menu item Verb/Control Magnitude/Change/Increase
+#: objects/FS/function.c:940
 msgid "Increase"
 msgstr "Tăng"
 
-#: objects/FS/function.c:773
+#. Translators: Menu item Verb/Control Magnitude/Change/Decrease
+#: objects/FS/function.c:942
 msgid "Decrease"
 msgstr "Giảm"
 
-#: objects/FS/function.c:774
+#. Translators: Menu item Verb/Control Magnitude/Change/Amplify
+#: objects/FS/function.c:944
 msgid "Amplify"
 msgstr "Khuếch đại"
 
-#: objects/FS/function.c:775
+#. Translators: Menu item Verb/Control Magnitude/Change/Reduce
+#: objects/FS/function.c:946
 msgid "Reduce"
 msgstr "Giảm thiểu"
 
-#: objects/FS/function.c:777
+#. Translators: Menu item Verb/Control Magnitude/Change/Normalize
+#: objects/FS/function.c:950
 msgid "Normalize"
 msgstr "Chuẩn hóa"
 
-#: objects/FS/function.c:778
+#. Translators: Menu item Verb/Control Magnitude/Change/Multiply
+#: objects/FS/function.c:952
 msgid "Multiply"
 msgstr "Nhân"
 
-#: objects/FS/function.c:779
+#. Translators: Menu item Verb/Control Magnitude/Change/Scale
+#: objects/FS/function.c:954
 msgid "Scale"
 msgstr ""
 
-#: objects/FS/function.c:780
+#. Translators: Menu item Verb/Control Magnitude/Change/Rectify
+#: objects/FS/function.c:956
 msgid "Rectify"
 msgstr ""
 
-#: objects/FS/function.c:781
+#. Translators: Menu item Verb/Control Magnitude/Change/Adjust
+#: objects/FS/function.c:958
 msgid "Adjust"
 msgstr "Điều chỉnh"
 
-#: objects/FS/function.c:782 objects/FS/function.c:783
+#. Translators: Menu item Verb/Control Magnitude/Form
+#: objects/FS/function.c:960 objects/FS/function.c:962
 msgid "Form"
 msgstr ""
 
-#: objects/FS/function.c:784
+#. Translators: Menu item Verb/Control Magnitude/Form/Compact
+#: objects/FS/function.c:964
 msgid "Compact"
 msgstr "Nén"
 
-#: objects/FS/function.c:785
+#. Translators: Menu item Verb/Control Magnitude/Form/Crush
+#: objects/FS/function.c:966
 msgid "Crush"
 msgstr "Vắt"
 
-#: objects/FS/function.c:786
+#. Translators: Menu item Verb/Control Magnitude/Form/Shape
+#: objects/FS/function.c:968
 msgid "Shape"
 msgstr ""
 
-#: objects/FS/function.c:787
+#. Translators: Menu item Verb/Control Magnitude/Form/Compress
+#: objects/FS/function.c:970
 msgid "Compress"
 msgstr "Nén"
 
-#: objects/FS/function.c:788
+#. Translators: Menu item Verb/Control Magnitude/Form/Pierce
+#: objects/FS/function.c:972
 msgid "Pierce"
 msgstr "Đâm"
 
-#: objects/FS/function.c:789 objects/FS/function.c:790
+#. Translators: Menu item Verb/Convert
+#: objects/FS/function.c:974 objects/FS/function.c:976
 msgid "Convert"
 msgstr "Chuyển đổi"
 
-#: objects/FS/function.c:791
+#. Translators: Menu item Verb/Convert/Transform
+#: objects/FS/function.c:978
 msgid "Transform"
 msgstr "Biến đổi"
 
-#: objects/FS/function.c:792
+#. Translators: Menu item Verb/Convert/Liquefy
+#: objects/FS/function.c:980
 msgid "Liquefy"
 msgstr "Hoá lỏng"
 
-#: objects/FS/function.c:793
+#. Translators: Menu item Verb/Convert/Solidify
+#: objects/FS/function.c:982
 msgid "Solidify"
 msgstr "Đặc hóa"
 
-#: objects/FS/function.c:794
+#. Translators: Menu item Verb/Convert/Evaporate
+#: objects/FS/function.c:984
 msgid "Evaporate"
 msgstr "Bay hơi"
 
-#: objects/FS/function.c:795
+#. Translators: Menu item Verb/Convert/Sublimate
+#: objects/FS/function.c:986
 msgid "Sublimate"
 msgstr "Thăng hoa"
 
-#: objects/FS/function.c:796
+#. Translators: Menu item Verb/Convert/Condense
+#: objects/FS/function.c:988
 msgid "Condense"
 msgstr "Cô đặc"
 
-#: objects/FS/function.c:797
+#. Translators: Menu item Verb/Convert/Integrate
+#: objects/FS/function.c:990
 msgid "Integrate"
 msgstr "Tích hợp"
 
-#: objects/FS/function.c:798
+#. Translators: Menu item Verb/Convert/Differentiate
+#: objects/FS/function.c:992
 msgid "Differentiate"
 msgstr "Vi phân"
 
-#: objects/FS/function.c:802 objects/FS/function.c:803
+#. Translators: Menu item Verb/Convert/Process
+#: objects/FS/function.c:994
+msgid "Process"
+msgstr "Tiến trình"
+
+#. Translators: Menu item Verb/Signal/Sense
+#: objects/FS/function.c:1000 objects/FS/function.c:1002
 msgid "Sense"
 msgstr "Cảm giác"
 
-#: objects/FS/function.c:804
+#. Translators: Menu item Verb/Signal/Sense/Perceive
+#: objects/FS/function.c:1004
 msgid "Perceive"
 msgstr "Hấp thụ"
 
-#: objects/FS/function.c:805
+#. Translators: Menu item Verb/Signal/Sense/Recognize
+#: objects/FS/function.c:1006
 msgid "Recognize"
 msgstr "Công nhận"
 
-#: objects/FS/function.c:806
+#. Translators: Menu item Verb/Signal/Sense/Discern
+#: objects/FS/function.c:1008
 msgid "Discern"
 msgstr ""
 
-#: objects/FS/function.c:807
+#. Translators: Menu item Verb/Signal/Sense/Check
+#: objects/FS/function.c:1010
 msgid "Check"
 msgstr "Kiểm tra"
 
-#: objects/FS/function.c:809
+#. Translators: Menu item Verb/Signal/Sense/Verify
+#: objects/FS/function.c:1014
 msgid "Verify"
 msgstr "Kiểm tra"
 
-#: objects/FS/function.c:810 objects/FS/function.c:811
+#. Translators: Menu item Verb/Signal/Indicate
+#: objects/FS/function.c:1016 objects/FS/function.c:1018
 msgid "Indicate"
 msgstr "Chỉ thị"
 
-#: objects/FS/function.c:812
+#. Translators: Menu item Verb/Signal/Indicate/Mark
+#: objects/FS/function.c:1020
 msgid "Mark"
 msgstr "Đánh dấu"
 
-#: objects/FS/function.c:813 sheets/Flowchart.sheet.in.h:7
+#. Translators: Menu item Verb/Signal/Display
+#: objects/FS/function.c:1022 sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "Hiển thị"
 
-#: objects/FS/function.c:814 objects/FS/function.c:815
+#. Translators: Menu item Verb/Signal/Measure
+#: objects/FS/function.c:1024 objects/FS/function.c:1026
 msgid "Measure"
 msgstr "Đo"
 
-#: objects/FS/function.c:816
+#. Translators: Menu item Verb/Signal/Measure/Calculate
+#: objects/FS/function.c:1028
 msgid "Calculate"
 msgstr "Tính toán"
 
-#: objects/FS/function.c:817
+#. Translators: Menu item Verb/Signal/Represent
+#: objects/FS/function.c:1030
 msgid "Represent"
 msgstr ""
 
-#: objects/FS/function.c:818
+#. Translators: Menu item Noun
+#: objects/FS/function.c:1032
 msgid "Noun"
 msgstr "Danh từ"
 
-#: objects/FS/function.c:821
+#. Translators: Menu item Noun/Material/Liquid
+#: objects/FS/function.c:1038
 msgid "Liquid"
 msgstr "Chất lỏng"
 
-#: objects/FS/function.c:822
+#. Translators: Menu item Noun/Material/Gas
+#: objects/FS/function.c:1040
 msgid "Gas"
 msgstr "Gas"
 
-#: objects/FS/function.c:823 objects/FS/function.c:824
-#: objects/FS/function.c:866
+#. Translators: Menu item Noun/Material/Human
+#: objects/FS/function.c:1042 objects/FS/function.c:1044
+#: objects/FS/function.c:1128
 msgid "Human"
 msgstr "Người"
 
-#: objects/FS/function.c:825
+#. Translators: Menu item Noun/Material/Human/Hand
+#: objects/FS/function.c:1046
 msgid "Hand"
 msgstr "Tay"
 
-#: objects/FS/function.c:826
+#. Translators: Menu item Noun/Material/Human/Foot
+#: objects/FS/function.c:1048
 msgid "Foot"
 msgstr "Chân"
 
-#: objects/FS/function.c:827
+#. Translators: Menu item Noun/Material/Human/Head
+#: objects/FS/function.c:1050
 msgid "Head"
 msgstr "Đầu"
 
-#: objects/FS/function.c:828
+#. Translators: Menu item Noun/Material/Human/Finger
+#: objects/FS/function.c:1052
 msgid "Finger"
 msgstr "Ngón trỏ"
 
-#: objects/FS/function.c:829
+#. Translators: Menu item Noun/Material/Human/Toe
+#: objects/FS/function.c:1054
 msgid "Toe"
 msgstr "Ngón cái"
 
-#: objects/FS/function.c:830
+#. Translators: Menu item Noun/Material/Biological
+#: objects/FS/function.c:1056
 msgid "Biological"
 msgstr "Sinh học"
 
-#: objects/FS/function.c:832
+#. Translators: Menu item Noun/Energy/Mechanical
+#: objects/FS/function.c:1060
 msgid "Mechanical"
 msgstr "Cơ khí"
 
-#: objects/FS/function.c:833
+#. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
+#: objects/FS/function.c:1062
 msgid "Mech. Energy"
 msgstr "Cơ năng"
 
-#: objects/FS/function.c:834
+#. Translators: Menu item Noun/Energy/Mechanical/Translation
+#: objects/FS/function.c:1064
 msgid "Translation"
 msgstr "Tịnh tiến"
 
-#: objects/FS/function.c:835
+#. Translators: Menu item Noun/Energy/Mechanical/Force
+#: objects/FS/function.c:1066
 msgid "Force"
 msgstr "Lực"
 
-#: objects/FS/function.c:836
+#. Translators: Menu item Noun/Energy/Mechanical/Rotation
+#: objects/FS/function.c:1068
 msgid "Rotation"
 msgstr "Quay"
 
-#: objects/FS/function.c:837
+#. Translators: Menu item Noun/Energy/Mechanical/Torque
+#: objects/FS/function.c:1070
 msgid "Torque"
 msgstr ""
 
-#: objects/FS/function.c:838
+#. Translators: Menu item Noun/Energy/Mechanical/Random Motion
+#: objects/FS/function.c:1072
 msgid "Random Motion"
 msgstr "Chuyển động hỗn loạn"
 
-#: objects/FS/function.c:839
+#. Translators: Menu item Noun/Energy/Mechanical/Vibration
+#: objects/FS/function.c:1074
 msgid "Vibration"
 msgstr "Rung động"
 
-#: objects/FS/function.c:840
+#. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
+#: objects/FS/function.c:1076
 msgid "Rotational Energy"
 msgstr "Năng lượng quay"
 
-#: objects/FS/function.c:841
+#. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
+#: objects/FS/function.c:1078
 msgid "Translational Energy"
 msgstr "Năng lượng tịnh tiến"
 
-#: objects/FS/function.c:842
+#. Translators: Menu item Noun/Energy/Electricity
+#: objects/FS/function.c:1080
 msgid "Electrical"
 msgstr "Điện"
 
-#: objects/FS/function.c:843
+#. Translators: Menu item Noun/Energy/Electricity/Electricity
+#: objects/FS/function.c:1082
 msgid "Electricity"
 msgstr "Điện"
 
-#: objects/FS/function.c:844
+#. Translators: Menu item Noun/Energy/Electricity/Voltage
+#: objects/FS/function.c:1084
 msgid "Voltage"
 msgstr "Vôn"
 
-#: objects/FS/function.c:845
+#. Translators: Menu item Noun/Energy/Electricity/Current
+#: objects/FS/function.c:1086
 msgid "Current"
 msgstr "Dòng điện"
 
-#: objects/FS/function.c:846
+#. Translators: Menu item Noun/Energy/Hydraulic
+#: objects/FS/function.c:1088
 msgid "Hydraulic"
 msgstr "Nước"
 
-#: objects/FS/function.c:847
+#. Translators: Menu item Noun/Energy/Hydraulic/Pressure
+#: objects/FS/function.c:1090
 msgid "Pressure"
 msgstr "Áp suất"
 
-#: objects/FS/function.c:848
+#. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
+#: objects/FS/function.c:1092
 msgid "Volumetric Flow"
 msgstr ""
 
-#: objects/FS/function.c:849
+#. Translators: Menu item Noun/Energy/Thermal
+#: objects/FS/function.c:1094
 msgid "Thermal"
 msgstr "Nhiệt"
 
-#: objects/FS/function.c:850
+#. Translators: Menu item Noun/Energy/Thermal/Heat
+#: objects/FS/function.c:1096
 msgid "Heat"
 msgstr "Sức nóng"
 
-#: objects/FS/function.c:851
+#. Translators: Menu item Noun/Energy/Thermal/Conduction
+#: objects/FS/function.c:1098
 msgid "Conduction"
 msgstr "Dẫn điện"
 
-#: objects/FS/function.c:852
+#. Translators: Menu item Noun/Energy/Thermal/Convection
+#: objects/FS/function.c:1100
 msgid "Convection"
 msgstr "Đối lưu"
 
-#: objects/FS/function.c:853 objects/FS/function.c:857
+#. Translators: Menu item Noun/Energy/Thermal/Radiation
+#: objects/FS/function.c:1102 objects/FS/function.c:1110
 msgid "Radiation"
 msgstr "Phát xạ"
 
-#: objects/FS/function.c:854
+#. Translators: Menu item Noun/Energy/Pneumatic
+#: objects/FS/function.c:1104
 msgid "Pneumatic"
 msgstr "Khí"
 
-#: objects/FS/function.c:855
+#. Translators: Menu item Noun/Energy/Chemical
+#: objects/FS/function.c:1106
 msgid "Chemical"
 msgstr "Hoá học"
 
-#: objects/FS/function.c:856
+#. Translators: Menu item Noun/Energy/Radioactive
+#: objects/FS/function.c:1108
 msgid "Radioactive"
 msgstr ""
 
-#: objects/FS/function.c:858
+#. Translators: Menu item Noun/Energy/Radioactive/Microwaves
+#: objects/FS/function.c:1112
 msgid "Microwaves"
 msgstr "Sóng siêu âm"
 
-#: objects/FS/function.c:859
+#. Translators: Menu item Noun/Energy/Radioactive/Radio waves
+#: objects/FS/function.c:1114
 msgid "Radio waves"
 msgstr "Sóng radio"
 
-#: objects/FS/function.c:860
+#. Translators: Menu item Noun/Energy/Radioactive/X-Rays
+#: objects/FS/function.c:1116
 msgid "X-Rays"
 msgstr "Tia X"
 
-#: objects/FS/function.c:861
+#. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
+#: objects/FS/function.c:1118
 msgid "Gamma Rays"
 msgstr "Tia Gamma"
 
-#: objects/FS/function.c:862
+#. Translators: Menu item Noun/Energy/Acoustic Energy
+#: objects/FS/function.c:1120
 msgid "Acoustic Energy"
 msgstr "Năng lượng âm thanh"
 
-#: objects/FS/function.c:863
+#. Translators: Menu item Noun/Energy/Optical Energy
+#: objects/FS/function.c:1122
 msgid "Optical Energy"
 msgstr "Quang năng"
 
-#: objects/FS/function.c:864
+#. Translators: Menu item Noun/Energy/Solar Energy
+#: objects/FS/function.c:1124
 msgid "Solar Energy"
 msgstr "Năng lượng mặt trời"
 
-#: objects/FS/function.c:865
+#. Translators: Menu item Noun/Energy/Magnetic Energy
+#: objects/FS/function.c:1126
 msgid "Magnetic Energy"
 msgstr "Từ năng"
 
-#: objects/FS/function.c:867
+#. Translators: Menu item Noun/Energy/Human/Human Motion
+#: objects/FS/function.c:1130
 msgid "Human Motion"
 msgstr "Chuyển động người"
 
-#: objects/FS/function.c:868
+#. Translators: Menu item Noun/Energy/Human/Human Force
+#: objects/FS/function.c:1132
 msgid "Human Force"
 msgstr "Lực người"
 
-#: objects/FS/function.c:871
+#. Translators: Menu item Noun/Signal/Status
+#: objects/FS/function.c:1138
 msgid "Status"
 msgstr "Trạng thái"
 
-#: objects/FS/function.c:874
+#: objects/FS/function.c:1142
 msgid "User/Device Fn"
 msgstr ""
 
-#: objects/FS/function.c:875
+#: objects/FS/function.c:1143
 msgid "Wish Fn"
 msgstr ""
 
@@ -3136,7 +3623,7 @@ msgstr ""
 #. in lib/font.c.
 #: objects/GRAFCET/action.c:52 objects/GRAFCET/condition.c:51
 #: objects/GRAFCET/step.c:48 objects/GRAFCET/transition.c:55
-#: objects/SADT/box.c:500 objects/UML/class.c:686
+#: objects/SADT/box.c:501 objects/UML/class.c:701
 msgid "Helvetica-Bold"
 msgstr "Helvetica-Bold"
 
@@ -3268,7 +3755,7 @@ msgstr "VÀ"
 msgid "Vergent type:"
 msgstr ""
 
-#: objects/GRAFCET/vergent.c:390 objects/SADT/box.c:438
+#: objects/GRAFCET/vergent.c:390 objects/SADT/box.c:439
 #: objects/standard/line.c:182
 msgid "Add connection point"
 msgstr "Thêm điểm nối"
@@ -3281,7 +3768,21 @@ msgstr "Xoá điểm nối"
 msgid "GRAFCET OR/AND vergent"
 msgstr ""
 
-#: objects/SADT/arrow.c:134 objects/UML/state.c:124
+#: objects/network/bus.c:574
+msgid "Add Handle"
+msgstr ""
+
+#: objects/network/bus.c:575
+msgid "Delete Handle"
+msgstr ""
+
+#: objects/network/network.c:41
+msgid "Network diagram objects"
+msgstr "Đối tượng biểu đồ Mạng"
+
+#. property rows
+#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:312
+#: objects/UML/state.c:124
 msgid "Normal"
 msgstr "Bình thường"
 
@@ -3319,12 +3820,6 @@ msgstr ""
 msgid "SADT Arrow"
 msgstr "Mũi tên SADT"
 
-#: objects/SADT/box.c:137 objects/flowchart/box.c:169
-#: objects/flowchart/diamond.c:165 objects/flowchart/ellipse.c:165
-#: objects/flowchart/parallelogram.c:171
-msgid "Text padding"
-msgstr "Đệm text"
-
 #: objects/SADT/box.c:144
 msgid "Activity/Data identifier"
 msgstr "Định danh hoạt động/dữ liệu"
@@ -3333,11 +3828,11 @@ msgstr "Định danh hoạt động/dữ liệu"
 msgid "The identifier which appears in the lower right corner of the Box"
 msgstr "Định danh xuất hiện bên gói trái-dưới của hộp"
 
-#: objects/SADT/box.c:439 objects/standard/line.c:183
+#: objects/SADT/box.c:440 objects/standard/line.c:183
 msgid "Delete connection point"
 msgstr "Xoá điểm nối"
 
-#: objects/SADT/box.c:444
+#: objects/SADT/box.c:445
 msgid "SADT box"
 msgstr "Hộp SADT"
 
@@ -3345,69 +3840,157 @@ msgstr "Hộp SADT"
 msgid "SADT diagram objects"
 msgstr "Đối tượng biểu đồ SADT"
 
-#: objects/UML/actor.c:337 objects/UML/actor.c:339
-msgid "Actor"
-msgstr ""
-
-#: objects/UML/association.c:1030 objects/UML/class_dialog.c:2177
-msgid "Direction:"
-msgstr "Hướng"
+#: objects/standard/arc.c:133
+msgid "Curve distance"
+msgstr "Khoảng cách cong"
 
-#: objects/UML/association.c:1047
-msgid "From A to B"
-msgstr "Từ A sang B"
+#: objects/standard/bezier.c:524 objects/standard/beziergon.c:543
+msgid "Add Segment"
+msgstr "Thêm đoạn"
 
-#: objects/UML/association.c:1054
-msgid "From B to A"
-msgstr "Từ B sang A"
+#: objects/standard/bezier.c:525 objects/standard/beziergon.c:544
+msgid "Delete Segment"
+msgstr "Xoá đoạn"
 
-#: objects/UML/association.c:1078 objects/UML/association.c:1086
-msgid "Side A"
-msgstr "Mặt A"
+#: objects/standard/bezier.c:527 objects/standard/beziergon.c:546
+msgid "Symmetric control"
+msgstr "Điều khiển đối xứng"
 
-#: objects/UML/association.c:1080 objects/UML/association.c:1088
-msgid "Side B"
-msgstr "Mặt B"
+#: objects/standard/bezier.c:529 objects/standard/beziergon.c:548
+msgid "Smooth control"
+msgstr "Điều khiển mượt"
 
-#: objects/UML/association.c:1094
-msgid "Role:"
-msgstr "Vai trò:"
+#: objects/standard/bezier.c:531 objects/standard/beziergon.c:550
+msgid "Cusp control"
+msgstr "Điều khiển nhọn"
 
-#: objects/UML/association.c:1106
-msgid "Multiplicity:"
-msgstr "Vô số:"
+#: objects/standard/image.c:168
+msgid "Image file"
+msgstr "Tập tin ảnh"
 
-#. Show arrow:
-#: objects/UML/association.c:1117
-msgid "Show arrow"
-msgstr "Hiện mũi tên"
+#: objects/standard/image.c:170
+msgid "Draw border"
+msgstr "Biên vẽ"
 
-#. Aggregate
-#: objects/UML/association.c:1123
-msgid "Aggregate"
-msgstr ""
+#: objects/standard/image.c:172
+msgid "Keep aspect ratio"
+msgstr "Giữ tỷ lệ"
 
-#. Composition
-#: objects/UML/association.c:1131
-msgid "Composition"
-msgstr ""
+#: objects/standard/image.c:271
+msgid "Image file:"
+msgstr "Tập tin ảnh:"
 
-#: objects/UML/class.c:102 objects/UML/large_package.c:120
-msgid "Name"
-msgstr "Tên"
+#: objects/standard/image.c:282
+msgid "Keep aspect ratio:"
+msgstr "Giữ tỷ lệ:"
 
-#: objects/UML/class.c:104 objects/UML/classicon.c:131
+#: objects/standard/image.c:290
+msgid "Show border:"
+msgstr "Hiện biên:"
+
+#. Found file in same dir as diagram.
+#: objects/standard/image.c:842 objects/standard/image.c:853
+#, c-format
+msgid ""
+"The image file '%s' was not found in that directory.\n"
+"Using the file '%s' instead\n"
+msgstr ""
+"Tập tin ảnh '%s' không có trong thư mục đó,\n"
+"dùng tập tin '%s' thay thế\n"
+
+#. Didn't find file in current dir.
+#: objects/standard/image.c:859 objects/standard/image.c:885
+#, c-format
+msgid "The image file '%s' was not found.\n"
+msgstr "Không tìm thấy tập tin ảnh '%s'.\n"
+
+#: objects/standard/line.c:121
+msgid "Start point"
+msgstr "Điểm đầu"
+
+#: objects/standard/line.c:123
+msgid "End point"
+msgstr "Điểm kết"
+
+#: objects/standard/polygon.c:526 objects/standard/polyline.c:498
+msgid "Add Corner"
+msgstr "Thêm góc"
+
+#: objects/standard/polygon.c:527 objects/standard/polyline.c:499
+msgid "Delete Corner"
+msgstr "Xoá góc"
+
+#: objects/standard/standard.c:45
+msgid "Standard objects"
+msgstr "Đối tượng chuẩn"
+
+#: objects/standard/textobj.c:228
+msgid "Fontsize:"
+msgstr "Cỡ font:"
+
+#: objects/UML/actor.c:338 objects/UML/actor.c:340
+msgid "Actor"
+msgstr ""
+
+#: objects/UML/association.c:1030 objects/UML/class_dialog.c:2154
+msgid "Direction:"
+msgstr "Hướng"
+
+#: objects/UML/association.c:1047
+msgid "From A to B"
+msgstr "Từ A sang B"
+
+#: objects/UML/association.c:1054
+msgid "From B to A"
+msgstr "Từ B sang A"
+
+#: objects/UML/association.c:1078 objects/UML/association.c:1086
+msgid "Side A"
+msgstr "Mặt A"
+
+#: objects/UML/association.c:1080 objects/UML/association.c:1088
+msgid "Side B"
+msgstr "Mặt B"
+
+#: objects/UML/association.c:1094
+msgid "Role:"
+msgstr "Vai trò:"
+
+#: objects/UML/association.c:1106
+msgid "Multiplicity:"
+msgstr "Vô số:"
+
+#. Show arrow:
+#: objects/UML/association.c:1117
+msgid "Show arrow"
+msgstr "Hiện mũi tên"
+
+#. Aggregate
+#: objects/UML/association.c:1123
+msgid "Aggregate"
+msgstr ""
+
+#. Composition
+#: objects/UML/association.c:1131
+msgid "Composition"
+msgstr ""
+
+#: objects/UML/class.c:102 objects/UML/large_package.c:120
+msgid "Name"
+msgstr "Tên"
+
+#: objects/UML/class.c:104 objects/UML/classicon.c:131
 #: objects/UML/component.c:116 objects/UML/large_package.c:118
 #: objects/UML/object.c:144 objects/UML/small_package.c:116
 msgid "Stereotype"
 msgstr ""
 
-#: objects/UML/class.c:106 objects/UML/class_dialog.c:257
-#: objects/UML/class_dialog.c:2023
+#: objects/UML/class.c:106 objects/UML/class_dialog.c:275
+#: objects/UML/class_dialog.c:317 objects/UML/class_dialog.c:2000
 msgid "Abstract"
 msgstr "Ảo"
 
-#: objects/UML/class.c:108 objects/UML/class_dialog.c:269
+#: objects/UML/class.c:108 objects/UML/class_dialog.c:284
 msgid "Suppress Attributes"
 msgstr "Bỏ qua thuộc tính"
 
@@ -3429,189 +4012,188 @@ msgstr "Mẫu"
 
 #. choose default font name for abstract for your locale. see also font_data
 #. structure in lib/font.c.
-#: objects/UML/class.c:680
+#: objects/UML/class.c:695
 msgid "Courier-Oblique"
 msgstr "Courier-Oblique"
 
 #. choose default font name for abstract class name for your locale. see also font_data
 #. structure in lib/font.c.
-#: objects/UML/class.c:692
+#: objects/UML/class.c:707
 msgid "Helvetica-BoldOblique"
 msgstr "Helvetica-BoldOblique"
 
 #. Class page:
-#: objects/UML/class.c:723 objects/UML/class.c:725
-#: objects/UML/class_dialog.c:229
+#: objects/UML/class.c:738 objects/UML/class.c:740
+#: objects/UML/class_dialog.c:249
 msgid "Class"
 msgstr "Lớp"
 
-#: objects/UML/class_dialog.c:235
+#: objects/UML/class_dialog.c:255
 msgid "Class name:"
 msgstr "Tên lớp:"
 
-#: objects/UML/class_dialog.c:246 objects/UML/class_dialog.c:1946
+#: objects/UML/class_dialog.c:266 objects/UML/class_dialog.c:1923
 #: objects/UML/dependency.c:127 objects/UML/generalization.c:123
 #: objects/UML/realizes.c:124
 msgid "Stereotype:"
 msgstr ""
 
-#: objects/UML/class_dialog.c:265
+#: objects/UML/class_dialog.c:281
 msgid "Attributes visible"
 msgstr "Thuộc tính khả kiến"
 
-#: objects/UML/class_dialog.c:277
+#: objects/UML/class_dialog.c:290
 msgid "Operations visible"
 msgstr "Thao tác khả kiến"
 
-#: objects/UML/class_dialog.c:281
+#: objects/UML/class_dialog.c:293
 msgid "Suppress operations"
 msgstr "Bỏ quả thao tác"
 
-#: objects/UML/class_dialog.c:292
-msgid "Normal Font"
-msgstr "Font bình thường"
-
-#: objects/UML/class_dialog.c:300
-msgid "Normal Font Size"
-msgstr "Cỡ font bình thường"
-
-#: objects/UML/class_dialog.c:309
-msgid "Abstract Font"
-msgstr "Font chung"
-
-#: objects/UML/class_dialog.c:317
-msgid "Abstract Font Size"
-msgstr "Cỡ font chung"
+#. head line
+#: objects/UML/class_dialog.c:303
+msgid "Kind"
+msgstr ""
 
-#: objects/UML/class_dialog.c:326
-msgid "Class name Font"
-msgstr "Font Tên lớp"
+#: objects/UML/class_dialog.c:308
+#, fuzzy
+msgid "Size"
+msgstr "Cỡ X:"
 
-#: objects/UML/class_dialog.c:334
-msgid "Class name Font Size"
-msgstr "Cỡ font Tên lớp"
+#: objects/UML/class_dialog.c:322
+#, fuzzy
+msgid "Class Name"
+msgstr "Tên lớp:"
 
-#: objects/UML/class_dialog.c:343
-msgid "Abstract Class name Font"
+#: objects/UML/class_dialog.c:327
+#, fuzzy
+msgid "Abstract Class"
 msgstr "Font tên lớp ảo"
 
-#: objects/UML/class_dialog.c:351
-msgid "Abstract Class name Font Size"
-msgstr "Cỡ font tên lớp ảo"
-
-#: objects/UML/class_dialog.c:360
+#. should probably be refactored too.
+#: objects/UML/class_dialog.c:337
 msgid "Foreground Color"
 msgstr "Màu cận cảnh"
 
-#: objects/UML/class_dialog.c:368
+#: objects/UML/class_dialog.c:345
 msgid "Background Color"
 msgstr "Màu nền"
 
 #. Attributes page:
-#: objects/UML/class_dialog.c:842 objects/UML/object.c:148
+#: objects/UML/class_dialog.c:819 objects/UML/object.c:148
 msgid "Attributes"
 msgstr "Thuộc tính"
 
-#: objects/UML/class_dialog.c:888 objects/UML/class_dialog.c:1900
-#: objects/UML/class_dialog.c:2120 objects/UML/class_dialog.c:2681
+#: objects/UML/class_dialog.c:853 objects/UML/class_dialog.c:1865
+#: objects/UML/class_dialog.c:2083 objects/UML/class_dialog.c:2646
+msgid "Delete"
+msgstr "Xóa"
+
+#: objects/UML/class_dialog.c:859 objects/UML/class_dialog.c:1871
+#: objects/UML/class_dialog.c:2090 objects/UML/class_dialog.c:2652
+msgid "Move up"
+msgstr "Chuyển lên"
+
+#: objects/UML/class_dialog.c:865 objects/UML/class_dialog.c:1877
+#: objects/UML/class_dialog.c:2097 objects/UML/class_dialog.c:2658
 msgid "Move down"
 msgstr "Chuyển xuống"
 
-#: objects/UML/class_dialog.c:899
+#: objects/UML/class_dialog.c:876
 msgid "Attribute data"
 msgstr "Dữ liệu thuộc tính"
 
-#: objects/UML/class_dialog.c:931
+#: objects/UML/class_dialog.c:908
 msgid "Value:"
 msgstr "Giá trị:"
 
-#: objects/UML/class_dialog.c:943 objects/UML/class_dialog.c:1959
+#: objects/UML/class_dialog.c:920 objects/UML/class_dialog.c:1936
 msgid "Visibility:"
 msgstr "Khả kiến:"
 
-#: objects/UML/class_dialog.c:952 objects/UML/class_dialog.c:1968
+#: objects/UML/class_dialog.c:929 objects/UML/class_dialog.c:1945
 msgid "Public"
 msgstr "Công khai"
 
-#: objects/UML/class_dialog.c:960 objects/UML/class_dialog.c:1976
+#: objects/UML/class_dialog.c:937 objects/UML/class_dialog.c:1953
 msgid "Private"
 msgstr "Riêng tư"
 
-#: objects/UML/class_dialog.c:968 objects/UML/class_dialog.c:1984
+#: objects/UML/class_dialog.c:945 objects/UML/class_dialog.c:1961
 msgid "Protected"
 msgstr "Có bảo vệ"
 
-#: objects/UML/class_dialog.c:976 objects/UML/class_dialog.c:1992
+#: objects/UML/class_dialog.c:953 objects/UML/class_dialog.c:1969
 msgid "Implementation"
 msgstr "Cài đặt"
 
-#: objects/UML/class_dialog.c:992 objects/UML/class_dialog.c:2008
+#: objects/UML/class_dialog.c:969 objects/UML/class_dialog.c:1985
 msgid "Class scope"
 msgstr "Phạm vi lớp"
 
 #. Operations page:
-#: objects/UML/class_dialog.c:1854
+#: objects/UML/class_dialog.c:1831
 msgid "Operations"
 msgstr "Thao tác"
 
-#: objects/UML/class_dialog.c:1912
+#: objects/UML/class_dialog.c:1889
 msgid "Operation data"
 msgstr "Dữ liệu thao tác"
 
-#: objects/UML/class_dialog.c:2014
+#: objects/UML/class_dialog.c:1991
 msgid "Inheritance type:"
 msgstr "Loại kế thừa:"
 
-#: objects/UML/class_dialog.c:2031
+#: objects/UML/class_dialog.c:2008
 msgid "Polymorphic (virtual)"
 msgstr "Đa hình (ảo)"
 
-#: objects/UML/class_dialog.c:2039
+#: objects/UML/class_dialog.c:2016
 msgid "Leaf (final)"
 msgstr "Lá (kết thúc)"
 
-#: objects/UML/class_dialog.c:2057
+#: objects/UML/class_dialog.c:2034
 msgid "Query"
 msgstr "Truy vấn"
 
-#: objects/UML/class_dialog.c:2070
+#: objects/UML/class_dialog.c:2047
 msgid "Parameters:"
 msgstr "Tham số:"
 
-#: objects/UML/class_dialog.c:2132
+#: objects/UML/class_dialog.c:2109
 msgid "Parameter data"
 msgstr "Dữ liệu tham số"
 
-#: objects/UML/class_dialog.c:2165
+#: objects/UML/class_dialog.c:2142
 msgid "Def. value:"
 msgstr "Giá trị mặc định:"
 
-#: objects/UML/class_dialog.c:2186
+#: objects/UML/class_dialog.c:2163
 msgid "Undefined"
 msgstr "Chưa định nghĩa"
 
-#: objects/UML/class_dialog.c:2194
+#: objects/UML/class_dialog.c:2171
 msgid "In"
 msgstr "Vào"
 
-#: objects/UML/class_dialog.c:2203
+#: objects/UML/class_dialog.c:2180
 msgid "Out"
 msgstr "Ra"
 
-#: objects/UML/class_dialog.c:2212
+#: objects/UML/class_dialog.c:2189
 msgid "In & Out"
 msgstr "Vào & Ra"
 
 #. Templates page:
-#: objects/UML/class_dialog.c:2629
+#: objects/UML/class_dialog.c:2606
 msgid "Templates"
 msgstr "Mẫu"
 
-#: objects/UML/class_dialog.c:2635
+#: objects/UML/class_dialog.c:2612
 msgid "Template class"
 msgstr "Lớp mẫu"
 
-#: objects/UML/class_dialog.c:2692
+#: objects/UML/class_dialog.c:2669
 msgid "Formal parameter data"
 msgstr "Dữ liệu tham số hình thức"
 
@@ -3723,17 +4305,6 @@ msgstr "Loại trạng thái"
 msgid "Unified Modelling Language diagram objects"
 msgstr "Đối tượng biểu đồ UML"
 
-#. Characters used to start/end stereotypes:
-#. start stereotype symbol(like \xab) for local locale
-#: objects/UML/uml.h:94
-msgid "<<"
-msgstr "<<"
-
-#. end stereotype symbol(like \xbb) for local locale
-#: objects/UML/uml.h:96
-msgid ">>"
-msgstr ">>"
-
 #: objects/UML/usecase.c:124
 msgid "Text outside"
 msgstr "Text bên ngoài"
@@ -3742,527 +4313,288 @@ msgstr "Text bên ngoài"
 msgid "Collaboration"
 msgstr "Cộng tác"
 
-#: objects/chronogram/chronogram.c:40
-msgid "Chronogram diagram objects"
+#: plug-ins/cgm/cgm.c:1092
+msgid ""
+"Image row length larger than maximum cell array.\n"
+"Image not exported to CGM."
 msgstr ""
 
-#: objects/chronogram/chronoline.c:148
-msgid "Data"
-msgstr "Dữ liệu"
-
-#: objects/chronogram/chronoline.c:150
-msgid "Data name"
-msgstr "Tên dữ liệu"
+#: plug-ins/cgm/cgm.c:1270
+msgid "Computer Graphics Metafile"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:152
-msgid "Events"
-msgstr "Sự kiện"
+#: plug-ins/cgm/cgm.c:1284
+msgid "Computer Graphics Metafile export filter"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:155
-msgid "Event specification"
-msgstr "Chi tiết kỹ thuật sự kiện"
+#: plug-ins/dxf/dxf.c:37
+msgid "Drawing Interchange File import and export filters"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:156
-msgid ""
-"@ time    set the pointer at an absolute time.\n"
-"( duration  sets the signal up, then wait 'duration'.\n"
-") duration  sets the signal down, then wait 'duration'.\n"
-"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
-"example : @ 1.0 (2.0)1.0(2.0)\n"
+#: plug-ins/dxf/dxf-export.c:574 plug-ins/dxf/dxf-import.c:669
+msgid "Drawing Interchange File"
 msgstr ""
 
-#: objects/chronogram/chronoline.c:162
-msgid "Parameters"
-msgstr "Tham số"
+#: plug-ins/hpgl/hpgl.c:619
+msgid "HP Graphics Language export filter"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:164 objects/chronogram/chronoref.c:146
-msgid "Start time"
-msgstr "Thời điểm đầu"
+#: plug-ins/metapost/metapost.c:34
+msgid "TeX Metapost export filter"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:166 objects/chronogram/chronoref.c:148
-msgid "End time"
-msgstr "Thời điểm cuối"
+#: plug-ins/metapost/render_metapost.c:735
+msgid "TeX Metapost macros"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:168
-msgid "Rise time"
+#: plug-ins/pstricks/pstricks.c:14
+msgid "TeX Pstricks export filter"
 msgstr ""
 
-#: objects/chronogram/chronoline.c:170
-msgid "Fall time"
+#: plug-ins/pstricks/render_pstricks.c:773
+msgid "TeX PSTricks macros"
 msgstr ""
 
-#: objects/chronogram/chronoline.c:171
-msgid "Multi-bit data"
-msgstr "Dữ liệu đa bit"
+#: plug-ins/python/python.c:76
+msgid "Python scripting support"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:173 objects/chronogram/chronoref.c:156
-msgid "Aspect"
+#: plug-ins/shape/shape.c:36
+msgid "dia shape export filter"
 msgstr ""
 
-#: objects/chronogram/chronoline.c:175
-msgid "Data color"
-msgstr "Màu dữ liệu"
+#: plug-ins/shape/shape-export.c:962
+msgid "Can't export png without libart!"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:177
-msgid "Data line width"
-msgstr "Bề rông hành dữ liệu"
+#: plug-ins/shape/shape-export.c:989
+msgid "dia shape file"
+msgstr ""
 
-#: objects/chronogram/chronoline.c:179 objects/chronogram/chronoref.c:158
-msgid "Line color"
-msgstr "Màu hàng"
+#: plug-ins/svg/render_svg.c:870
+msgid "Scalable Vector Graphics"
+msgstr ""
 
-#: objects/chronogram/chronoref.c:144
-msgid "Time data"
-msgstr "Dữ liệu thời gian"
+#: plug-ins/svg/svg.c:36
+msgid "Scalable Vector Graphics export filter"
+msgstr ""
 
-#: objects/chronogram/chronoref.c:150
-msgid "Major time step"
+#: plug-ins/wmf/wmf.cpp:962
+msgid "Windows Meta File"
 msgstr ""
 
-#: objects/chronogram/chronoref.c:152
-msgid "Minor time step"
+#: plug-ins/wmf/wmf.cpp:976
+msgid "WMF export filter"
 msgstr ""
 
-#: objects/chronogram/chronoref.c:162
-msgid "Minor step line width"
+#: plug-ins/wpg/wpg.c:1051
+#, c-format
+msgid "File: %s type/version unsupported.\n"
+msgstr "Tập tin: loại/phiên bản %s không được hỗ trợ.\n"
+
+#: plug-ins/wpg/wpg.c:1200
+msgid "WordPerfect Graphics export filter"
 msgstr ""
 
-#: objects/custom/custom.c:124
-msgid "Custom"
-msgstr "Tự chọn"
+#: plug-ins/xfig/xfig.c:39
+msgid "Fig Format import and export filter"
+msgstr ""
 
-#: objects/custom/custom.c:124
-msgid "Custom XML shapes loader"
-msgstr "Bộ nạp hình XML tự chọn"
+#: plug-ins/xfig/xfig-export.c:365
+msgid "No more user-definable colors - using black"
+msgstr ""
 
-#: objects/custom/custom_object.c:188 objects/custom/custom_object.c:207
-msgid "Flip horizontal"
-msgstr "Lật ngang"
+#: plug-ins/xfig/xfig-export.c:792
+msgid "XFig format"
+msgstr ""
 
-#: objects/custom/custom_object.c:190 objects/custom/custom_object.c:209
-msgid "Flip vertical"
-msgstr "Lật dọc"
+#: plug-ins/xfig/xfig-import.c:76
+msgid "Polygon import is not implemented yet"
+msgstr ""
 
-#: objects/custom/custom_object.c:320 objects/flowchart/box.c:293
-#: objects/flowchart/diamond.c:272 objects/flowchart/ellipse.c:272
-#: objects/flowchart/parallelogram.c:296
-msgid "Text padding:"
-msgstr "Đệm text:"
+#: plug-ins/xfig/xfig-import.c:77
+msgid "Patterns are not supported by Dia"
+msgstr ""
 
-#: objects/custom/custom_object.c:334 objects/standard/textobj.c:206
-msgid "Alignment:"
-msgstr "Canh hàng:"
+#: plug-ins/xfig/xfig-import.c:78
+msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
+msgstr ""
 
-#: objects/custom/custom_object.c:345 objects/flowchart/box.c:307
-#: objects/flowchart/diamond.c:286 objects/flowchart/ellipse.c:286
-#: objects/flowchart/parallelogram.c:310 objects/standard/textobj.c:217
-msgid "Font:"
-msgstr "Font:"
-
-#: objects/custom/custom_object.c:356 objects/flowchart/box.c:318
-#: objects/flowchart/diamond.c:297 objects/flowchart/ellipse.c:297
-#: objects/flowchart/parallelogram.c:321
-msgid "Font size:"
-msgstr "Cỡ font:"
-
-#: objects/custom/custom_object.c:1516
-msgid "Flip Horizontal"
-msgstr "Lật ngang"
-
-#: objects/custom/custom_object.c:1517
-msgid "Flip Vertical"
-msgstr "Lật dọc"
-
-#: objects/custom/custom_object.c:1554
-#, c-format
-msgid "Cannot open icon file %s for object type '%s'."
-msgstr "Không thể mở tập tin biểu tượng %s cho đối tượng loại '%s'."
-
-#: objects/flowchart/box.c:167 objects/standard/box.c:153
-msgid "Corner radius"
-msgstr "Góc"
-
-#: objects/flowchart/box.c:279 objects/standard/box.c:240
-msgid "Corner rounding:"
-msgstr "Góc tròn:"
-
-#: objects/flowchart/flowchart.c:37
-msgid "Flowchart objects"
-msgstr "Đối tượng lưu đồ"
-
-#: objects/flowchart/parallelogram.c:169
-msgid "Shear angle"
-msgstr ""
-
-#: objects/flowchart/parallelogram.c:282
-msgid "Shear angle:"
-msgstr ""
-
-#: objects/network/bus.c:574
-msgid "Add Handle"
-msgstr ""
-
-#: objects/network/bus.c:575
-msgid "Delete Handle"
-msgstr ""
-
-#: objects/network/network.c:41
-msgid "Network diagram objects"
-msgstr "Đối tượng biểu đồ Mạng"
-
-#: objects/standard/arc.c:133
-msgid "Curve distance"
-msgstr "Khoảng cách cong"
-
-#: objects/standard/bezier.c:524 objects/standard/beziergon.c:543
-msgid "Add Segment"
-msgstr "Thêm đoạn"
-
-#: objects/standard/bezier.c:525 objects/standard/beziergon.c:544
-msgid "Delete Segment"
-msgstr "Xoá đoạn"
-
-#: objects/standard/bezier.c:527 objects/standard/beziergon.c:546
-msgid "Symmetric control"
-msgstr "Điều khiển đối xứng"
-
-#: objects/standard/bezier.c:529 objects/standard/beziergon.c:548
-msgid "Smooth control"
-msgstr "Điều khiển mượt"
-
-#: objects/standard/bezier.c:531 objects/standard/beziergon.c:550
-msgid "Cusp control"
-msgstr "Điều khiển nhọn"
-
-#: objects/standard/image.c:168
-msgid "Image file"
-msgstr "Tập tin ảnh"
-
-#: objects/standard/image.c:170
-msgid "Draw border"
-msgstr "Biên vẽ"
-
-#: objects/standard/image.c:172
-msgid "Keep aspect ratio"
-msgstr "Giữ tỷ lệ"
-
-#: objects/standard/image.c:271
-msgid "Image file:"
-msgstr "Tập tin ảnh:"
-
-#: objects/standard/image.c:282
-msgid "Keep aspect ratio:"
-msgstr "Giữ tỷ lệ:"
-
-#: objects/standard/image.c:290
-msgid "Show border:"
-msgstr "Hiện biên:"
-
-#. Found file in same dir as diagram.
-#: objects/standard/image.c:849 objects/standard/image.c:860
-#, c-format
-msgid ""
-"The image file '%s' was not found in that directory.\n"
-"Using the file '%s' instead\n"
-msgstr ""
-"Tập tin ảnh '%s' không có trong thư mục đó,\n"
-"dùng tập tin '%s' thay thế\n"
-
-#. Didn't find file in current dir.
-#: objects/standard/image.c:866 objects/standard/image.c:892
-#, c-format
-msgid "The image file '%s' was not found.\n"
-msgstr "Không tìm thấy tập tin ảnh '%s'.\n"
-
-#: objects/standard/line.c:121
-msgid "Start point"
-msgstr "Điểm đầu"
-
-#: objects/standard/line.c:123
-msgid "End point"
-msgstr "Điểm kết"
-
-#: objects/standard/polygon.c:526 objects/standard/polyline.c:498
-msgid "Add Corner"
-msgstr "Thêm góc"
-
-#: objects/standard/polygon.c:527 objects/standard/polyline.c:499
-msgid "Delete Corner"
-msgstr "Xoá góc"
-
-#: objects/standard/standard.c:45
-msgid "Standard objects"
-msgstr "Đối tượng chuẩn"
-
-#: objects/standard/textobj.c:228
-msgid "Fontsize:"
-msgstr "Cỡ font:"
-
-#: objects/sybase/sybase.c:44
-msgid "Sybase replication domain diagram objects"
-msgstr ""
-
-#: plug-ins/cgm/cgm.c:1092
-msgid ""
-"Image row length larger than maximum cell array.\n"
-"Image not exported to CGM."
-msgstr ""
-
-#: plug-ins/cgm/cgm.c:1270
-msgid "Computer Graphics Metafile"
-msgstr ""
-
-#: plug-ins/cgm/cgm.c:1284
-msgid "Computer Graphics Metafile export filter"
-msgstr ""
-
-#: plug-ins/dxf/dxf-export.c:574 plug-ins/dxf/dxf-import.c:683
-msgid "Drawing Interchange File"
-msgstr ""
-
-#: plug-ins/dxf/dxf.c:37
-msgid "Drawing Interchange File import and export filters"
-msgstr ""
-
-#: plug-ins/hpgl/hpgl.c:619
-msgid "HP Graphics Language export filter"
-msgstr ""
-
-#: plug-ins/metapost/metapost.c:34
-msgid "TeX Metapost export filter"
-msgstr ""
-
-#: plug-ins/metapost/render_metapost.c:735
-msgid "TeX Metapost macros"
-msgstr ""
-
-#: plug-ins/pstricks/pstricks.c:14
-msgid "TeX Pstricks export filter"
-msgstr ""
-
-#: plug-ins/pstricks/render_pstricks.c:773
-msgid "TeX PSTricks macros"
-msgstr ""
-
-#: plug-ins/python/python.c:76
-msgid "Python scripting support"
-msgstr ""
-
-#: plug-ins/shape/shape-export.c:945
-msgid "Can't export png without libart!"
-msgstr ""
-
-#: plug-ins/shape/shape-export.c:972
-msgid "dia shape file"
-msgstr ""
-
-#: plug-ins/shape/shape.c:36
-msgid "dia shape export filter"
-msgstr ""
-
-#: plug-ins/svg/render_svg.c:870
-msgid "Scalable Vector Graphics"
-msgstr ""
-
-#: plug-ins/svg/svg.c:36
-msgid "Scalable Vector Graphics export filter"
-msgstr ""
-
-#: plug-ins/wmf/wmf.cpp:962
-msgid "Windows Meta File"
-msgstr ""
-
-#: plug-ins/wmf/wmf.cpp:976
-msgid "WMF export filter"
-msgstr ""
-
-#: plug-ins/wpg/wpg.c:1051
-#, c-format
-msgid "File: %s type/version unsupported.\n"
-msgstr "Tập tin: loại/phiên bản %s không được hỗ trợ.\n"
-
-#: plug-ins/wpg/wpg.c:1200
-msgid "WordPerfect Graphics export filter"
-msgstr ""
-
-#: plug-ins/xfig/xfig-export.c:365
-msgid "No more user-definable colors - using black"
-msgstr ""
-
-#: plug-ins/xfig/xfig-export.c:792
-msgid "XFig format"
-msgstr ""
-
-#: plug-ins/xfig/xfig-import.c:75
-msgid "Polygon import is not implemented yet"
-msgstr ""
-
-#: plug-ins/xfig/xfig-import.c:76
-msgid "Patterns are not supported by Dia"
-msgstr ""
-
-#: plug-ins/xfig/xfig-import.c:77
-msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
-msgstr ""
-
-#: plug-ins/xfig/xfig-import.c:79
+#: plug-ins/xfig/xfig-import.c:80
 msgid "Negative corner radius, negating"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:80
+#: plug-ins/xfig/xfig-import.c:81
 msgid "Spline import is not implemented yet"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:406
+#: plug-ins/xfig/xfig-import.c:82
+#, fuzzy
+msgid "Can't find standard object"
+msgstr "Đối tượng chuẩn"
+
+#: plug-ins/xfig/xfig-import.c:424
 #, c-format
 msgid "Line style %d should not appear\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:474
+#: plug-ins/xfig/xfig-import.c:492
 #, c-format
 msgid "Error while reading %dth of %d points: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:493
+#: plug-ins/xfig/xfig-import.c:511
 msgid "Error while reading arrowhead\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:584
+#: plug-ins/xfig/xfig-import.c:602
 #, c-format
 msgid "Couldn't read ellipse info: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:652
+#: plug-ins/xfig/xfig-import.c:670
 #, c-format
 msgid "Couldn't read polyline info: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:667
+#: plug-ins/xfig/xfig-import.c:685
 #, c-format
 msgid "Couldn't read flipped bit: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:723 plug-ins/xfig/xfig-import.c:809
+#: plug-ins/xfig/xfig-import.c:744 plug-ins/xfig/xfig-import.c:830
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:787
+#: plug-ins/xfig/xfig-import.c:807
 #, c-format
 msgid "Couldn't read arc info: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:876
+#: plug-ins/xfig/xfig-import.c:891
 #, c-format
 msgid "Couldn't read text info: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:917
+#: plug-ins/xfig/xfig-import.c:933
 #, c-format
 msgid "Couldn't identify FIG object: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:924
+#: plug-ins/xfig/xfig-import.c:940
 msgid "Compound end outside compound\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:943
+#: plug-ins/xfig/xfig-import.c:959
 #, c-format
 msgid "Couldn't read color: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:985
+#: plug-ins/xfig/xfig-import.c:1001
 #, c-format
 msgid "Couldn't read group extend: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:996
+#: plug-ins/xfig/xfig-import.c:1012
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1019
+#: plug-ins/xfig/xfig-import.c:1035
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1029
+#: plug-ins/xfig/xfig-import.c:1045
 #, c-format
 msgid "Error reading paper size: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1039
+#: plug-ins/xfig/xfig-import.c:1055
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1051
+#: plug-ins/xfig/xfig-import.c:1067
 #, c-format
 msgid "Error reading paper orientation: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1061
+#: plug-ins/xfig/xfig-import.c:1077
 #, c-format
 msgid "Error reading justification: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1071
+#: plug-ins/xfig/xfig-import.c:1087
 #, c-format
 msgid "Error reading units: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1085
+#: plug-ins/xfig/xfig-import.c:1101
 #, c-format
 msgid "Error reading magnification: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1096
+#: plug-ins/xfig/xfig-import.c:1112
 #, c-format
 msgid "Error reading multipage indicator: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1107
+#: plug-ins/xfig/xfig-import.c:1123
 #, c-format
 msgid "Error reading transparent color: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1116 plug-ins/xfig/xfig-import.c:1171
+#: plug-ins/xfig/xfig-import.c:1132 plug-ins/xfig/xfig-import.c:1187
 #, c-format
 msgid "Error reading FIG file: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1118 plug-ins/xfig/xfig-import.c:1173
+#: plug-ins/xfig/xfig-import.c:1134 plug-ins/xfig/xfig-import.c:1189
 msgid "Premature end of FIG file\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1127
+#: plug-ins/xfig/xfig-import.c:1143
 #, c-format
 msgid "Error reading resolution: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1158
+#: plug-ins/xfig/xfig-import.c:1174
 #, c-format
 msgid "Doesn't look like a Fig file: %s\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1164
+#: plug-ins/xfig/xfig-import.c:1180
 #, c-format
 msgid "This is a FIG version %d.%d file, I may not understand it\n"
 msgstr ""
 
-#: plug-ins/xfig/xfig-import.c:1205
+#: plug-ins/xfig/xfig-import.c:1221
 msgid "XFig File Format"
 msgstr ""
 
-#: plug-ins/xfig/xfig.c:39
-msgid "Fig Format import and export filter"
-msgstr ""
+#: sheets/chronogram.sheet.in.h:1
+msgid "A data line"
+msgstr "Dòng dữ liệu"
 
-#: sheets/Circuit.sheet.in.h:1
-msgid "A Horizontal Jumper"
-msgstr "Jumper ngang"
+#: sheets/chronogram.sheet.in.h:2
+msgid "A time scale"
+msgstr ""
 
-#: sheets/Circuit.sheet.in.h:2
+#: sheets/chronogram.sheet.in.h:3
+msgid "Chronogram"
+msgstr ""
+
+#: sheets/chronogram.sheet.in.h:4
+msgid "Objects to design chronogram charts"
+msgstr ""
+
+#: sheets/Circuit.sheet.in.h:1
+msgid "A Horizontal Jumper"
+msgstr "Jumper ngang"
+
+#: sheets/Circuit.sheet.in.h:2
 msgid "A Horizontally aligned inductor"
 msgstr "Cảm điện ngang"
 
@@ -4386,6 +4718,122 @@ msgstr "Mạch"
 msgid "Components for circuit diagrams"
 msgstr "Thành phần cho Biểu đồ mạch"
 
+#: sheets/civil.sheet.in.h:1
+msgid "A Backflow Preventer"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:2
+msgid "A Basin"
+msgstr "Chậu"
+
+#: sheets/civil.sheet.in.h:3
+msgid "A Container"
+msgstr "Vật chứa"
+
+#: sheets/civil.sheet.in.h:4
+msgid "A Frequency Converter"
+msgstr "Bộ chuyển tần số"
+
+#: sheets/civil.sheet.in.h:5
+msgid "A Gas Bottle"
+msgstr "Bình Gas"
+
+#: sheets/civil.sheet.in.h:6
+msgid "A Motor"
+msgstr "Mô tơ"
+
+#: sheets/civil.sheet.in.h:7
+msgid "A Preliminary Clarification Tank"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:8
+msgid "A Rotor"
+msgstr "Rô tơ"
+
+#: sheets/civil.sheet.in.h:9
+msgid "A final-settling Basin"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:10
+msgid "A horizontal limiting line"
+msgstr "Dòng giới hạn ngang"
+
+#: sheets/civil.sheet.in.h:11
+msgid "A horizontally aligned Arrow"
+msgstr "Mũi tên canh ngang"
+
+#: sheets/civil.sheet.in.h:12
+msgid "A vertical limiting line"
+msgstr "Dòng giới hạn dọc"
+
+#: sheets/civil.sheet.in.h:13
+msgid "A vertically aligned Arrow"
+msgstr "Mũi tên canh dọc"
+
+#: sheets/civil.sheet.in.h:14
+msgid "An Aerator with bubbles"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:15
+msgid "Bivalent Vertical Rest"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:16
+msgid "Civil"
+msgstr "Dân sự"
+
+#: sheets/civil.sheet.in.h:17
+msgid "Civil Engineering Components"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:18
+msgid "Horizontal Rest"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:19
+msgid "Horizontally aligned Valve"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:20
+msgid "Horizontally aligned compressor"
+msgstr "Bộ nén ngang"
+
+#: sheets/civil.sheet.in.h:21
+msgid "Horizontally aligned pump"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:22
+msgid "Reference Line"
+msgstr "Dòng tham chiếu"
+
+#: sheets/civil.sheet.in.h:23
+msgid "Soil"
+msgstr "Đất"
+
+#: sheets/civil.sheet.in.h:24
+msgid "Vertical Rest"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:25
+msgid "Vertically aligned Propeller"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:26
+msgid "Vertically aligned Valve"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:27
+msgid "Vertically aligned compressor"
+msgstr "Bộ nén dọc"
+
+#: sheets/civil.sheet.in.h:28
+msgid "Vertically aligned pump"
+msgstr ""
+
+#: sheets/civil.sheet.in.h:29
+msgid "Water Level"
+msgstr "Mức nước"
+
 #: sheets/Contact.sheet.in.h:1
 msgid "A 'if not' (normally closed) ladder contact"
 msgstr ""
@@ -4442,42 +4890,6 @@ msgstr "Thành phần cho mạch THANG"
 msgid "Ladder"
 msgstr "Thang"
 
-#: sheets/EML.sheet.in.h:1
-msgid "Create a process"
-msgstr "Tạo một tiến trình"
-
-#: sheets/EML.sheet.in.h:2
-msgid "EML"
-msgstr "EML"
-
-#: sheets/EML.sheet.in.h:3
-msgid "Editor for EML Static Structure Diagrams."
-msgstr "Bộ soạn thảo cho Biểu đồ cấu trúc tĩnh EML"
-
-#: sheets/EML.sheet.in.h:4
-msgid "Instantiation. One process create others"
-msgstr ""
-
-#: sheets/EML.sheet.in.h:5
-msgid "Interaction between processes."
-msgstr "Giao tiếp giữa các tiến trình"
-
-#: sheets/ER.sheet.in.h:2
-msgid "ER"
-msgstr "ER"
-
-#: sheets/ER.sheet.in.h:3
-msgid "Editor for Entity Relations Diagrams"
-msgstr "Bộ soạn thảo cho Biểu đồ quan hệ thực thể"
-
-#: sheets/ER.sheet.in.h:5
-msgid "Participation"
-msgstr "Tham gia"
-
-#: sheets/ER.sheet.in.h:7
-msgid "Weak Entity"
-msgstr "Thực thể yếu"
-
 #: sheets/Electric.sheet.in.h:1 sheets/Pneumatic.sheet.in.h:7
 msgid "A connection point"
 msgstr "Đầu nối"
@@ -4518,25 +4930,41 @@ msgstr "Điện"
 msgid "The command organ of a relay"
 msgstr ""
 
-#: sheets/FS.sheet.in.h:1
-msgid "Create a flow"
-msgstr "Tạo một dòng chảy"
+#: sheets/EML.sheet.in.h:1
+msgid "Create a process"
+msgstr "Tạo một tiến trình"
 
-#: sheets/FS.sheet.in.h:2
-msgid "Create a function"
-msgstr "Tạo một hàm"
+#: sheets/EML.sheet.in.h:2
+msgid "EML"
+msgstr "EML"
 
-#: sheets/FS.sheet.in.h:3
-msgid "Create an orthogonal polyline flow"
+#: sheets/EML.sheet.in.h:3
+msgid "Editor for EML Static Structure Diagrams."
+msgstr "Bộ soạn thảo cho Biểu đồ cấu trúc tĩnh EML"
+
+#: sheets/EML.sheet.in.h:4
+msgid "Instantiation. One process create others"
 msgstr ""
 
-#: sheets/FS.sheet.in.h:4
-msgid "Editor for Function Structure Diagrams."
-msgstr "Trình soạn thảo cho Biểu đồ cấu trúc hàm."
+#: sheets/EML.sheet.in.h:5
+msgid "Interaction between processes."
+msgstr "Giao tiếp giữa các tiến trình"
 
-#: sheets/FS.sheet.in.h:5
-msgid "FS"
-msgstr "FS"
+#: sheets/ER.sheet.in.h:2
+msgid "ER"
+msgstr "ER"
+
+#: sheets/ER.sheet.in.h:3
+msgid "Editor for Entity Relations Diagrams"
+msgstr "Bộ soạn thảo cho Biểu đồ quan hệ thực thể"
+
+#: sheets/ER.sheet.in.h:5
+msgid "Participation"
+msgstr "Tham gia"
+
+#: sheets/ER.sheet.in.h:7
+msgid "Weak Entity"
+msgstr "Thực thể yếu"
 
 #: sheets/Flowchart.sheet.in.h:1
 msgid "A box with text inside"
@@ -4650,6 +5078,26 @@ msgstr "Tập tin giao dịch"
 msgid "Transmittal Tape"
 msgstr ""
 
+#: sheets/FS.sheet.in.h:1
+msgid "Create a flow"
+msgstr "Tạo một dòng chảy"
+
+#: sheets/FS.sheet.in.h:2
+msgid "Create a function"
+msgstr "Tạo một hàm"
+
+#: sheets/FS.sheet.in.h:3
+msgid "Create an orthogonal polyline flow"
+msgstr ""
+
+#: sheets/FS.sheet.in.h:4
+msgid "Editor for Function Structure Diagrams."
+msgstr "Trình soạn thảo cho Biểu đồ cấu trúc hàm."
+
+#: sheets/FS.sheet.in.h:5
+msgid "FS"
+msgstr "FS"
+
 #: sheets/GRAFCET.sheet.in.h:1
 msgid "A AND vergent"
 msgstr ""
@@ -4706,25 +5154,97 @@ msgstr "GRAFCET"
 msgid "Objects to design GRAFCET charts"
 msgstr ""
 
-#: sheets/Logic.sheet.in.h:1
-msgid "A Nand gate"
-msgstr "Cổng NAND"
+#: sheets/jigsaw.sheet.in.h:1
+msgid "Jigsaw"
+msgstr ""
 
-#: sheets/Logic.sheet.in.h:2
-msgid "A Nor gate"
-msgstr "Cổng NOR"
+#: sheets/jigsaw.sheet.in.h:2
+msgid "Jigsaw - part_iiii"
+msgstr ""
 
-#: sheets/Logic.sheet.in.h:3
-msgid "A Not"
-msgstr "Cổng NOT"
+#: sheets/jigsaw.sheet.in.h:3
+msgid "Jigsaw - part_iiio"
+msgstr ""
 
-#: sheets/Logic.sheet.in.h:4
-msgid "A Xor gate"
-msgstr "Cổng XOR"
+#: sheets/jigsaw.sheet.in.h:4
+msgid "Jigsaw - part_iioi"
+msgstr ""
 
-#: sheets/Logic.sheet.in.h:5
-msgid "A crossconnector"
-msgstr "Đầu nối chéo"
+#: sheets/jigsaw.sheet.in.h:5
+msgid "Jigsaw - part_iioo"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:6
+msgid "Jigsaw - part_ioii"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:7
+msgid "Jigsaw - part_ioio"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:8
+msgid "Jigsaw - part_iooi"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:9
+msgid "Jigsaw - part_iooo"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:10
+msgid "Jigsaw - part_oiii"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:11
+msgid "Jigsaw - part_oiio"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:12
+msgid "Jigsaw - part_oioi"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:13
+msgid "Jigsaw - part_oioo"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:14
+msgid "Jigsaw - part_ooii"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:15
+msgid "Jigsaw - part_ooio"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:16
+msgid "Jigsaw - part_oooi"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:17
+msgid "Jigsaw - part_oooo"
+msgstr ""
+
+#: sheets/jigsaw.sheet.in.h:18
+msgid "Pieces of a jigsaw"
+msgstr ""
+
+#: sheets/Logic.sheet.in.h:1
+msgid "A Nand gate"
+msgstr "Cổng NAND"
+
+#: sheets/Logic.sheet.in.h:2
+msgid "A Nor gate"
+msgstr "Cổng NOR"
+
+#: sheets/Logic.sheet.in.h:3
+msgid "A Not"
+msgstr "Cổng NOT"
+
+#: sheets/Logic.sheet.in.h:4
+msgid "A Xor gate"
+msgstr "Cổng XOR"
+
+#: sheets/Logic.sheet.in.h:5
+msgid "A crossconnector"
+msgstr "Đầu nối chéo"
 
 #: sheets/Logic.sheet.in.h:6
 msgid "A simple Buffer"
@@ -4750,6 +5270,23 @@ msgstr "Logic Boolean"
 msgid "Logic"
 msgstr "Logic"
 
+#: sheets/Misc.sheet.in.h:1
+#, fuzzy
+msgid "A File"
+msgstr "Tập tin"
+
+#: sheets/Misc.sheet.in.h:2
+msgid "A Folder"
+msgstr ""
+
+#: sheets/Misc.sheet.in.h:3
+msgid "Misc"
+msgstr ""
+
+#: sheets/Misc.sheet.in.h:4
+msgid "Miscellaneous Shapes"
+msgstr ""
+
 #: sheets/MSE.sheet.in.h:1
 msgid "Demultiplexer"
 msgstr "Bộ tách"
@@ -4782,6 +5319,139 @@ msgstr ""
 msgid "U.S. Army Mobile Subscriber Equipment Components"
 msgstr ""
 
+#: sheets/network.sheet.in.h:1
+msgid "A 3 1/2 inch diskette"
+msgstr "Đĩa mềm 3 1/2"
+
+#: sheets/network.sheet.in.h:2
+msgid "A Bigtower PC"
+msgstr ""
+
+#: sheets/network.sheet.in.h:3
+msgid "A Computer"
+msgstr "Máy tính"
+
+#: sheets/network.sheet.in.h:4
+msgid "A Desktop PC"
+msgstr "Máy PC để bàn"
+
+#: sheets/network.sheet.in.h:5
+msgid "A Firewall router"
+msgstr "Bức tường lửa"
+
+#: sheets/network.sheet.in.h:6
+msgid "A Miditower PC"
+msgstr ""
+
+#: sheets/network.sheet.in.h:7
+msgid "A Minitower PC"
+msgstr ""
+
+#: sheets/network.sheet.in.h:8
+msgid "A Mobile Phone"
+msgstr "Điện thoại di động"
+
+#: sheets/network.sheet.in.h:9
+msgid "A RJ45 Wall-Plug"
+msgstr "Đầu cắm RJ45"
+
+#: sheets/network.sheet.in.h:10
+#, fuzzy
+msgid "A Telephone"
+msgstr "Điện thoại di động"
+
+#: sheets/network.sheet.in.h:11
+msgid "A UNIX Workstation"
+msgstr "Trạm làm việc UNIX"
+
+#: sheets/network.sheet.in.h:12
+msgid "A WAN Connection"
+msgstr "Kết nối WAN"
+
+#: sheets/network.sheet.in.h:13
+msgid "A WAN Link"
+msgstr "Liên kết WAN"
+
+#: sheets/network.sheet.in.h:14
+msgid "A Wall-Plug for the scEAD Cabling System"
+msgstr ""
+
+#: sheets/network.sheet.in.h:15
+msgid "A Workstation Monitor"
+msgstr ""
+
+#: sheets/network.sheet.in.h:16
+msgid "A ZIP Disk"
+msgstr "Đĩa Zip"
+
+#: sheets/network.sheet.in.h:17
+msgid "A modular switching system"
+msgstr ""
+
+#: sheets/network.sheet.in.h:18
+msgid "A monitor"
+msgstr "Màn hình"
+
+#: sheets/network.sheet.in.h:19
+msgid "A simple Modem"
+msgstr "Modem đơn giản"
+
+#: sheets/network.sheet.in.h:20
+msgid "A simple printer"
+msgstr "Máy in đơn giản"
+
+#: sheets/network.sheet.in.h:21
+msgid "A speaker with integrated amplifier"
+msgstr "Loa với bộ khuếch đại nội"
+
+#: sheets/network.sheet.in.h:22
+msgid "A speaker without amplifier"
+msgstr "Loa không có khuếch đại"
+
+#: sheets/network.sheet.in.h:23
+msgid "A stackable hub or switch"
+msgstr ""
+
+#: sheets/network.sheet.in.h:24
+msgid "ATM Switch Symbol"
+msgstr "Ký hiệu ATM Switch"
+
+#: sheets/network.sheet.in.h:25
+msgid "An Ethernet bus"
+msgstr "Bus Ethernet"
+
+#: sheets/network.sheet.in.h:26
+msgid "An antenna for wireless transmission"
+msgstr "Anten"
+
+#: sheets/network.sheet.in.h:27
+msgid "An external DAT drive"
+msgstr "Đĩa DAT ngoài"
+
+#: sheets/network.sheet.in.h:28
+msgid "Network"
+msgstr "Mạng"
+
+#: sheets/network.sheet.in.h:29
+msgid "Network Cloud"
+msgstr "Đám mây mạng"
+
+#: sheets/network.sheet.in.h:30
+msgid "Objects to design network diagrams with"
+msgstr "Đối tượng để thiết kế biểu đồ mạng với"
+
+#: sheets/network.sheet.in.h:31
+msgid "Router Symbol"
+msgstr "Ký hiệu Bộ dẫn đường"
+
+#: sheets/network.sheet.in.h:32
+msgid "Storage"
+msgstr "Kho"
+
+#: sheets/network.sheet.in.h:33
+msgid "Switch Symbol"
+msgstr "Ký hiệu Switch"
+
 #: sheets/Pneumatic.sheet.in.h:1
 msgid "A 2/2 distributor"
 msgstr ""
@@ -4962,6 +5632,38 @@ msgstr ""
 msgid "State"
 msgstr "Trạng thái"
 
+#: sheets/sybase.sheet.in.h:1
+msgid "A Sybase Client Application"
+msgstr "Ứng dụng Sybase Client"
+
+#: sheets/sybase.sheet.in.h:2
+msgid "A Sybase Dataserver"
+msgstr "Sybase Dataserver"
+
+#: sheets/sybase.sheet.in.h:3
+msgid "A Sybase Replication Server"
+msgstr "Sybase Replication Server"
+
+#: sheets/sybase.sheet.in.h:4
+msgid "Log Transfer Manager or Rep Agent"
+msgstr ""
+
+#: sheets/sybase.sheet.in.h:5
+msgid "Objects to design Sybase replication domain diagrams with"
+msgstr ""
+
+#: sheets/sybase.sheet.in.h:6
+msgid "Replication Server Manager"
+msgstr ""
+
+#: sheets/sybase.sheet.in.h:7
+msgid "Stable Storage Device"
+msgstr "Thiết bị lưu trữ ổn định"
+
+#: sheets/sybase.sheet.in.h:8
+msgid "Sybase"
+msgstr "Sybase"
+
 #: sheets/UML.sheet.in.h:1
 msgid "Aggregation, one class is part of another"
 msgstr ""
@@ -5058,366 +5760,122 @@ msgstr ""
 msgid "UML"
 msgstr "UML"
 
-#: sheets/chronogram.sheet.in.h:1
-msgid "A data line"
-msgstr "Dòng dữ liệu"
+#~ msgid "Error reading diagram file\n"
+#~ msgstr "Lỗi khi đọc tập tin biểu đồ\n"
 
-#: sheets/chronogram.sheet.in.h:2
-msgid "A time scale"
-msgstr ""
+#~ msgid "Number of processes:"
+#~ msgstr "Số tiến trình:"
 
-#: sheets/chronogram.sheet.in.h:3
-msgid "Chronogram"
-msgstr ""
+#~ msgid "multiple"
+#~ msgstr "đa"
 
-#: sheets/chronogram.sheet.in.h:4
-msgid "Objects to design chronogram charts"
-msgstr ""
-
-#: sheets/civil.sheet.in.h:1
-msgid "A Backflow Preventer"
-msgstr ""
-
-#: sheets/civil.sheet.in.h:2
-msgid "A Basin"
-msgstr "Chậu"
+#~ msgid "Single"
+#~ msgstr "Đa"
 
-#: sheets/civil.sheet.in.h:3
-msgid "A Container"
-msgstr "Vật chứa"
+#~ msgid "Multiple"
+#~ msgstr "Đơn"
 
-#: sheets/civil.sheet.in.h:4
-msgid "A Frequency Converter"
-msgstr "Bộ chuyển tần số"
+#~ msgid "Unidirectional"
+#~ msgstr "Một hướng"
 
-#: sheets/civil.sheet.in.h:5
-msgid "A Gas Bottle"
-msgstr "Bình Gas"
+#~ msgid "Bidirectional"
+#~ msgstr "Hai hướng"
 
-#: sheets/civil.sheet.in.h:6
-msgid "A Motor"
-msgstr "Mô tơ"
+#~ msgid "Interaction name:"
+#~ msgstr "Tên giao tiếp"
 
-#: sheets/civil.sheet.in.h:7
-msgid "A Preliminary Clarification Tank"
-msgstr ""
+#~ msgid "bidirectional"
+#~ msgstr "hai hướng"
 
-#: sheets/civil.sheet.in.h:8
-msgid "A Rotor"
-msgstr "Rô tơ"
+#~ msgid "relation"
+#~ msgstr "quan hệ"
 
-#: sheets/civil.sheet.in.h:9
-msgid "A final-settling Basin"
-msgstr ""
+#~ msgid "Interface functions"
+#~ msgstr "Hàm giao diện"
 
-#: sheets/civil.sheet.in.h:10
-msgid "A horizontal limiting line"
-msgstr "Dòng giới hạn ngang"
+#~ msgid "Function"
+#~ msgstr "Hàm"
 
-#: sheets/civil.sheet.in.h:11
-msgid "A horizontally aligned Arrow"
-msgstr "Mũi tên canh ngang"
+#~ msgid "Function module:"
+#~ msgstr "Mô đun hàm:"
 
-#: sheets/civil.sheet.in.h:12
-msgid "A vertical limiting line"
-msgstr "Dòng giới hạn dọc"
-
-#: sheets/civil.sheet.in.h:13
-msgid "A vertically aligned Arrow"
-msgstr "Mũi tên canh dọc"
-
-#: sheets/civil.sheet.in.h:14
-msgid "An Aerator with bubbles"
-msgstr ""
-
-#: sheets/civil.sheet.in.h:15
-msgid "Bivalent Vertical Rest"
-msgstr ""
-
-#: sheets/civil.sheet.in.h:16
-msgid "Civil"
-msgstr "Dân sự"
-
-#: sheets/civil.sheet.in.h:17
-msgid "Civil Engineering Components"
-msgstr ""
-
-#: sheets/civil.sheet.in.h:18
-msgid "Horizontal Rest"
-msgstr ""
-
-#: sheets/civil.sheet.in.h:19
-msgid "Horizontally aligned Valve"
-msgstr ""
-
-#: sheets/civil.sheet.in.h:20
-msgid "Horizontally aligned compressor"
-msgstr "Bộ nén ngang"
-
-#: sheets/civil.sheet.in.h:21
-msgid "Horizontally aligned pump"
-msgstr ""
-
-#: sheets/civil.sheet.in.h:22
-msgid "Reference Line"
-msgstr "Dòng tham chiếu"
+#~ msgid "Function name:"
+#~ msgstr "Tên hàm:"
 
-#: sheets/civil.sheet.in.h:23
-msgid "Soil"
-msgstr "Đất"
+#~ msgid "Interfaces"
+#~ msgstr "Giao diện"
 
-#: sheets/civil.sheet.in.h:24
-msgid "Vertical Rest"
-msgstr ""
+#~ msgid "Interface"
+#~ msgstr "Giao diện"
 
-#: sheets/civil.sheet.in.h:25
-msgid "Vertically aligned Propeller"
-msgstr ""
+#~ msgid "Interface name:"
+#~ msgstr "Tên giao diện:"
 
-#: sheets/civil.sheet.in.h:26
-msgid "Vertically aligned Valve"
-msgstr ""
+#~ msgid "Interface messages"
+#~ msgstr "Thông điệp giao diện"
 
-#: sheets/civil.sheet.in.h:27
-msgid "Vertically aligned compressor"
-msgstr "Bộ nén dọc"
+#~ msgid "Message"
+#~ msgstr "Thông điệp"
 
-#: sheets/civil.sheet.in.h:28
-msgid "Vertically aligned pump"
-msgstr ""
+#~ msgid "Message parameters"
+#~ msgstr "Tham số thông điệp"
 
-#: sheets/civil.sheet.in.h:29
-msgid "Water Level"
-msgstr "Mức nước"
+#~ msgid "Message parameter"
+#~ msgstr "Tham số thông điệp"
 
-#: sheets/jigsaw.sheet.in.h:1
-msgid "Jigsaw"
-msgstr ""
+#~ msgid "Functions"
+#~ msgstr "Hàm"
 
-#: sheets/jigsaw.sheet.in.h:2
-msgid "Jigsaw - part_iiii"
-msgstr ""
+#~ msgid "Messages"
+#~ msgstr "Thông điệp"
 
-#: sheets/jigsaw.sheet.in.h:3
-msgid "Jigsaw - part_iiio"
-msgstr ""
+#~ msgid "Process name:"
+#~ msgstr "Tên tiến trình:"
 
-#: sheets/jigsaw.sheet.in.h:4
-msgid "Jigsaw - part_iioi"
-msgstr ""
+#~ msgid "Process reference name:"
+#~ msgstr "Tên tham khảo tiến trình:"
 
-#: sheets/jigsaw.sheet.in.h:5
-msgid "Jigsaw - part_iioo"
-msgstr ""
+#~ msgid "Process lifetime:"
+#~ msgstr "Chu kỳ sống tiến trình:"
 
-#: sheets/jigsaw.sheet.in.h:6
-msgid "Jigsaw - part_ioii"
-msgstr ""
+#~ msgid "Module name:"
+#~ msgstr "Tên mô đun:"
 
-#: sheets/jigsaw.sheet.in.h:7
-msgid "Jigsaw - part_ioio"
-msgstr ""
+#~ msgid "Function parameters"
+#~ msgstr "Tham số hàm"
 
-#: sheets/jigsaw.sheet.in.h:8
-msgid "Jigsaw - part_iooi"
-msgstr ""
+#~ msgid "Parameter"
+#~ msgstr "Tham số"
 
-#: sheets/jigsaw.sheet.in.h:9
-msgid "Jigsaw - part_iooo"
-msgstr ""
+#~ msgid "Relation members"
+#~ msgstr "Thành phần quan hệ"
 
-#: sheets/jigsaw.sheet.in.h:10
-msgid "Jigsaw - part_oiii"
-msgstr ""
+#~ msgid "Relation member"
+#~ msgstr "Thành phần quan hệ"
 
-#: sheets/jigsaw.sheet.in.h:11
-msgid "Jigsaw - part_oiio"
-msgstr ""
+#~ msgid "Normal Font"
+#~ msgstr "Font bình thường"
 
-#: sheets/jigsaw.sheet.in.h:12
-msgid "Jigsaw - part_oioi"
-msgstr ""
+#~ msgid "Normal Font Size"
+#~ msgstr "Cỡ font bình thường"
 
-#: sheets/jigsaw.sheet.in.h:13
-msgid "Jigsaw - part_oioo"
-msgstr ""
+#~ msgid "Abstract Font"
+#~ msgstr "Font chung"
 
-#: sheets/jigsaw.sheet.in.h:14
-msgid "Jigsaw - part_ooii"
-msgstr ""
+#~ msgid "Abstract Font Size"
+#~ msgstr "Cỡ font chung"
 
-#: sheets/jigsaw.sheet.in.h:15
-msgid "Jigsaw - part_ooio"
-msgstr ""
+#~ msgid "Class name Font"
+#~ msgstr "Font Tên lớp"
 
-#: sheets/jigsaw.sheet.in.h:16
-msgid "Jigsaw - part_oooi"
-msgstr ""
+#~ msgid "Class name Font Size"
+#~ msgstr "Cỡ font Tên lớp"
 
-#: sheets/jigsaw.sheet.in.h:17
-msgid "Jigsaw - part_oooo"
-msgstr ""
+#~ msgid "Abstract Class name Font Size"
+#~ msgstr "Cỡ font tên lớp ảo"
 
-#: sheets/jigsaw.sheet.in.h:18
-msgid "Pieces of a jigsaw"
-msgstr ""
+#~ msgid "<<"
+#~ msgstr "<<"
 
-#: sheets/network.sheet.in.h:1
-msgid "A 3 1/2 inch diskette"
-msgstr "Đĩa mềm 3 1/2"
-
-#: sheets/network.sheet.in.h:2
-msgid "A Bigtower PC"
-msgstr ""
-
-#: sheets/network.sheet.in.h:3
-msgid "A Computer"
-msgstr "Máy tính"
-
-#: sheets/network.sheet.in.h:4
-msgid "A Desktop PC"
-msgstr "Máy PC để bàn"
-
-#: sheets/network.sheet.in.h:5
-msgid "A Firewall router"
-msgstr "Bức tường lửa"
-
-#: sheets/network.sheet.in.h:6
-msgid "A Miditower PC"
-msgstr ""
-
-#: sheets/network.sheet.in.h:7
-msgid "A Minitower PC"
-msgstr ""
-
-#: sheets/network.sheet.in.h:8
-msgid "A Mobile Phone"
-msgstr "Điện thoại di động"
-
-#: sheets/network.sheet.in.h:9
-msgid "A RJ45 Wall-Plug"
-msgstr "Đầu cắm RJ45"
-
-#: sheets/network.sheet.in.h:10
-msgid "A UNIX Workstation"
-msgstr "Trạm làm việc UNIX"
-
-#: sheets/network.sheet.in.h:11
-msgid "A WAN Connection"
-msgstr "Kết nối WAN"
-
-#: sheets/network.sheet.in.h:12
-msgid "A WAN Link"
-msgstr "Liên kết WAN"
-
-#: sheets/network.sheet.in.h:13
-msgid "A Wall-Plug for the scEAD Cabling System"
-msgstr ""
-
-#: sheets/network.sheet.in.h:14
-msgid "A Workstation Monitor"
-msgstr ""
-
-#: sheets/network.sheet.in.h:15
-msgid "A ZIP Disk"
-msgstr "Đĩa Zip"
-
-#: sheets/network.sheet.in.h:16
-msgid "A modular switching system"
-msgstr ""
-
-#: sheets/network.sheet.in.h:17
-msgid "A monitor"
-msgstr "Màn hình"
-
-#: sheets/network.sheet.in.h:18
-msgid "A simple Modem"
-msgstr "Modem đơn giản"
-
-#: sheets/network.sheet.in.h:19
-msgid "A simple printer"
-msgstr "Máy in đơn giản"
-
-#: sheets/network.sheet.in.h:20
-msgid "A speaker with integrated amplifier"
-msgstr "Loa với bộ khuếch đại nội"
-
-#: sheets/network.sheet.in.h:21
-msgid "A speaker without amplifier"
-msgstr "Loa không có khuếch đại"
-
-#: sheets/network.sheet.in.h:22
-msgid "A stackable hub or switch"
-msgstr ""
-
-#: sheets/network.sheet.in.h:23
-msgid "ATM Switch Symbol"
-msgstr "Ký hiệu ATM Switch"
-
-#: sheets/network.sheet.in.h:24
-msgid "An Ethernet bus"
-msgstr "Bus Ethernet"
-
-#: sheets/network.sheet.in.h:25
-msgid "An antenna for wireless transmission"
-msgstr "Anten"
-
-#: sheets/network.sheet.in.h:26
-msgid "An external DAT drive"
-msgstr "Đĩa DAT ngoài"
-
-#: sheets/network.sheet.in.h:27
-msgid "Network"
-msgstr "Mạng"
-
-#: sheets/network.sheet.in.h:28
-msgid "Network Cloud"
-msgstr "Đám mây mạng"
-
-#: sheets/network.sheet.in.h:29
-msgid "Objects to design network diagrams with"
-msgstr "Đối tượng để thiết kế biểu đồ mạng với"
-
-#: sheets/network.sheet.in.h:30
-msgid "Router Symbol"
-msgstr "Ký hiệu Bộ dẫn đường"
-
-#: sheets/network.sheet.in.h:31
-msgid "Storage"
-msgstr "Kho"
-
-#: sheets/network.sheet.in.h:32
-msgid "Switch Symbol"
-msgstr "Ký hiệu Switch"
-
-#: sheets/sybase.sheet.in.h:1
-msgid "A Sybase Client Application"
-msgstr "Ứng dụng Sybase Client"
-
-#: sheets/sybase.sheet.in.h:2
-msgid "A Sybase Dataserver"
-msgstr "Sybase Dataserver"
-
-#: sheets/sybase.sheet.in.h:3
-msgid "A Sybase Replication Server"
-msgstr "Sybase Replication Server"
-
-#: sheets/sybase.sheet.in.h:4
-msgid "Log Transfer Manager or Rep Agent"
-msgstr ""
-
-#: sheets/sybase.sheet.in.h:5
-msgid "Objects to design Sybase replication domain diagrams with"
-msgstr ""
-
-#: sheets/sybase.sheet.in.h:6
-msgid "Replication Server Manager"
-msgstr ""
-
-#: sheets/sybase.sheet.in.h:7
-msgid "Stable Storage Device"
-msgstr "Thiết bị lưu trữ ổn định"
-
-#: sheets/sybase.sheet.in.h:8
-msgid "Sybase"
-msgstr "Sybase"
+#~ msgid ">>"
+#~ msgstr ">>"

--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2001-09-01 11:31+0800\n"
 "Last-Translator: Wang Jian <[e-mail]>\n"
 "Language-Team: zh_CN <[e-mail]>\n"
@@ -4005,11 +4005,6 @@ msgstr "
 msgid "Fontsize:"
 msgstr "忖悶寄弌:"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "糞悶/購狼夕燕斤?"
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr ""
@@ -5938,6 +5933,10 @@ msgstr ""
 msgid "UML"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "糞悶/購狼夕燕斤?"
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "響函夕燕猟周扮窟伏危列\n"
 

--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.89\n"
-"POT-Creation-Date: 2002-05-30 07:34+0200\n"
+"POT-Creation-Date: 2002-05-30 07:59+0200\n"
 "PO-Revision-Date: 2001-09-05 19:31+0800\n"
 "Last-Translator: Abel Cheung <[e-mail]>\n"
 "Language-Team: traditional chinese <[e-mail]>\n"
@@ -3992,11 +3992,6 @@ msgstr "
 msgid "Fontsize:"
 msgstr "､螯r､j､p｡G"
 
-#: objects/sybase/sybase.c:44
-#, fuzzy
-msgid "Sybase replication domain diagram objects"
-msgstr "｡u･ｻﾅ?ﾃ?Y｡vｹﾏｪ?ｫ･?
-
 #: objects/UML/actor.c:338 objects/UML/actor.c:340
 msgid "Actor"
 msgstr "ｬﾛﾃ?､ｦ?
@@ -5856,6 +5851,10 @@ msgstr ""
 msgid "UML"
 msgstr "UML"
 
+#, fuzzy
+#~ msgid "Sybase replication domain diagram objects"
+#~ msgstr "｡u･ｻﾅ?ﾃ?Y｡vｹﾏｪ?ｫ･?
+
 #~ msgid "Error reading diagram file\n"
 #~ msgstr "ﾅｪｨ?ﾏｪ?ﾉｮﾗｵo･ﾍｿ?~\n"