Commit: cdfa0df73de39b649afc035bbab48bd283a59106 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: cdfa0df73de39b649afc035bbab48bd283a59106 (tree)
• Time: 2017-03-05 19:37:00
• Author: Inaki Larranaga Murgoitio <dooteo@zund...>
• Commiter: Inaki Larranaga Murgoitio

Log Message

Update Basque language

Change Summary

• modified: po/eu.po

Incremental Difference

--- a/po/eu.po
+++ b/po/eu.po
@@ -1,23 +1,24 @@
-# translation of eu.po to Basque
+# Basque translation for Dia
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Hizkuntza Politikarako Sailburuordetza <[e-mail]>, 2005.
 # Iñaki Larrañaga Murgoitio <[e-mail]>, 2006, 2008, 2009, 2010.
-# Iñaki Larrañaga Murgoitio <[e-mail]>, 2007.
+# Iñaki Larrañaga Murgoitio <[e-mail]>, 2007, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-16 18:03+0100\n"
-"PO-Revision-Date: 2010-03-29 11:45+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <[e-mail]>\n"
-"Language-Team: Basque <[e-mail]>\n"
+"Project-Id-Version: dia dia-0-97\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=dia&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-10-21 22:42+0000\n"
+"PO-Revision-Date: 2017-03-04 19:44+0100\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <[e-mail]>\n"
+"Language-Team: Basque <[e-mail]>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
@@ -79,36 +80,36 @@ msgid "Output-directory '%s' must exist!\n"
 msgstr "'%s' irteerako direktorioak existitu behar du.\n"
 
 #. Translators:  The argument is a list of options, not to be translated
-#: ../app/app_procs.c:695
+#: ../app/app_procs.c:702
 #, c-format
 msgid "Select the filter/format out of: %s"
 msgstr "Hautatu %s(r)en iragazkia edo irteerako formatua"
 
 #. &export_file_name
-#: ../app/app_procs.c:713
+#: ../app/app_procs.c:720
 msgid "Export loaded file and exit"
 msgstr "Esportatu kargatutako fitxategia eta irten"
 
-#: ../app/app_procs.c:713
+#: ../app/app_procs.c:720
 msgid "OUTPUT"
 msgstr "IRTEERA"
 
 # Supongo que también hay que traducir "TYPE", ¿no? RizOX.
 #. &export_file_format
 #. &export_format_string
-#: ../app/app_procs.c:715
+#: ../app/app_procs.c:722
 msgid "TYPE"
 msgstr "MOTA"
 
-#: ../app/app_procs.c:717
+#: ../app/app_procs.c:724
 msgid "Export graphics size"
 msgstr "Esportatzeko grafikoen tamaina"
 
-#: ../app/app_procs.c:717
+#: ../app/app_procs.c:724
 msgid "WxH"
 msgstr "ZxH"
 
-#: ../app/app_procs.c:719
+#: ../app/app_procs.c:726
 msgid ""
 "Show only specified layers (e.g. when exporting). Can be either the layer "
 "name or a range of layer numbers (X-Y)"
@@ -116,89 +117,93 @@ msgstr ""
 "Erakutsi zehaztutako geruzak bakarrik (adib. esportatzean). Geruzaren izena "
 "edo geruza kopuruen barrutia (X-Y) izan daiteke."
 
-#: ../app/app_procs.c:720
+#: ../app/app_procs.c:727
 msgid "LAYER,LAYER,..."
 msgstr "GERUZA,GERUZA,..."
 
-#: ../app/app_procs.c:722
+#: ../app/app_procs.c:729
 msgid "Don't show the splash screen"
 msgstr "Ez erakutsi harrerako pantaila"
 
-#: ../app/app_procs.c:724
+#: ../app/app_procs.c:731
 msgid "Don't create empty diagram"
 msgstr "Ez sortu diagrama hutsa"
 
-#: ../app/app_procs.c:726
+#: ../app/app_procs.c:733
 msgid "Start integrated user interface (diagrams in tabs)"
-msgstr "Abiarazi integratutako erabiltzailearen interfazea (diagramak fitxetan)"
+msgstr ""
+"Abiarazi integratutako erabiltzailearen interfazea (diagramak fitxetan)"
 
-#: ../app/app_procs.c:728
+#: ../app/app_procs.c:735
 msgid "Send error messages to stderr instead of showing dialogs."
-msgstr "Bidali errore-mezuak stderr-era, elkarrizketa-koadroak erakutsi beharrean."
+msgstr ""
+"Bidali errore-mezuak stderr-era, elkarrizketa-koadroak erakutsi beharrean."
 
-#: ../app/app_procs.c:730
+#: ../app/app_procs.c:737
 msgid "Directory containing input files"
 msgstr "Sarrerako fitxategiak dituen direktorioa"
 
-#: ../app/app_procs.c:730 ../app/app_procs.c:732
+#: ../app/app_procs.c:737 ../app/app_procs.c:739
 msgid "DIRECTORY"
 msgstr "DIREKTORIOA"
 
-#: ../app/app_procs.c:732
+#: ../app/app_procs.c:739
 msgid "Directory containing output files"
 msgstr "Irteerako fitxategiak dituen direktorioa"
 
-#: ../app/app_procs.c:734
+#: ../app/app_procs.c:741
 msgid "Display credits list and exit"
 msgstr "Bistaratu kredituen zerrenda eta irten"
 
-#: ../app/app_procs.c:736
+#: ../app/app_procs.c:743
 msgid "Generate verbose output"
 msgstr "Sortu irteera xehatua"
 
-#: ../app/app_procs.c:738
+#: ../app/app_procs.c:745
 msgid "Display version and exit"
 msgstr "Bistaratu bertsioa eta irten"
 
-#: ../app/app_procs.c:761
+#: ../app/app_procs.c:768
 msgid "[FILE...]"
 msgstr "[FITXATEGIA...]"
 
-#: ../app/app_procs.c:773
+#: ../app/app_procs.c:780
 #, c-format
 msgid "Invalid option?"
 msgstr "Aukera baliogabea?"
 
-#: ../app/app_procs.c:796
+#: ../app/app_procs.c:803
 #, c-format
 msgid "Filename conversion failed: %s\n"
 msgstr "Huts egin du fitxategi-izena bihurtzean: %s\n"
 
-#: ../app/app_procs.c:809
+#: ../app/app_procs.c:816
 #, c-format
 msgid "Missing input: %s\n"
 msgstr "Sarrera falta da: %s\n"
 
-#: ../app/app_procs.c:834
+#: ../app/app_procs.c:841
 msgid "Can't connect to session manager!\n"
 msgstr "Ezin da konektatu saio-kudeatzailera.\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:874
+#: ../app/app_procs.c:880
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia, %s bertsioa, konpilatua: %s %s\n"
 
-#: ../app/app_procs.c:876
+#: ../app/app_procs.c:882
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia, %s bertsioa\n"
 
-#: ../app/app_procs.c:914
-msgid "Couldn't find standard objects when looking for object-libs; exiting...\n"
-msgstr "Ezin izan dira 'object-libs'eko objektu estandarrak aurkitu, irtetzen...\n"
+#: ../app/app_procs.c:920
+msgid ""
+"Couldn't find standard objects when looking for object-libs; exiting...\n"
+msgstr ""
+"Ezin izan dira 'object-libs'eko objektu estandarrak aurkitu, irtetzen...\n"
 
-#: ../app/app_procs.c:916
+#: ../app/app_procs.c:922
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
@@ -207,11 +212,11 @@ msgstr ""
 "Ezin izan dira '%s'(e)n 'object-libs'eko objektu estandarrak aurkitu, "
 "irtetzen...\n"
 
-#: ../app/app_procs.c:983
+#: ../app/app_procs.c:989
 msgid "Diagram1.dia"
 msgstr "Diagrama1.dia"
 
-#: ../app/app_procs.c:1018
+#: ../app/app_procs.c:1024
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you can cause this message to appear.\n"
@@ -219,16 +224,16 @@ msgstr ""
 "Ez luke gertatu behar. Eman errorearen berri bugzilla.gnome.org-en,\n"
 "mezu hau agertzeko zer egin duzun azalduz.\n"
 
-#: ../app/app_procs.c:1033
+#: ../app/app_procs.c:1039
 msgid "Exiting Dia"
 msgstr "Dia-tik irtetzen"
 
 #. no standard buttons
-#: ../app/app_procs.c:1097
+#: ../app/app_procs.c:1103
 msgid "Quitting without saving modified diagrams"
 msgstr "Irtetzen (aldatutako diagramak gorde gabe)"
 
-#: ../app/app_procs.c:1099
+#: ../app/app_procs.c:1105
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
@@ -236,15 +241,16 @@ msgstr ""
 "Aldatutako diagramak daude. Ziur zaude Dia-tik irten nahi duzula diagramak "
 "gorde gabe?"
 
-#: ../app/app_procs.c:1103
+#: ../app/app_procs.c:1109
 msgid "Quit Dia"
 msgstr "Irten Dia-tik"
 
-#: ../app/app_procs.c:1172 ../app/app_procs.c:1179
+#: ../app/app_procs.c:1178 ../app/app_procs.c:1185
 msgid "Could not create per-user Dia config directory"
-msgstr "Ezin izan da sortu erabiltzaile bakoitzeko Dia konfigurazioko direktorioa"
+msgstr ""
+"Ezin izan da sortu erabiltzaile bakoitzeko Dia konfigurazioko direktorioa"
 
-#: ../app/app_procs.c:1182
+#: ../app/app_procs.c:1188
 msgid ""
 "Could not create per-user Dia config directory. Please make sure that the "
 "environment variable HOME points to an existing directory."
@@ -252,11 +258,11 @@ msgstr ""
 "Ezin izan da sortu erabiltzaile bakoitzeko Dia konfigurazioko direktorioa. "
 "Egiaztatu HOME ingurune-aldagaiak seinalatzen duen direktorioa badagoela."
 
-#: ../app/app_procs.c:1205
+#: ../app/app_procs.c:1211
 msgid "Objects and filters internal to dia"
 msgstr "Dia-ren barneko objektuak eta iragazkiak"
 
-#: ../app/app_procs.c:1261
+#: ../app/app_procs.c:1267
 #, c-format
 msgid ""
 "The original author of Dia was:\n"
@@ -265,7 +271,7 @@ msgstr ""
 "Dia-ren jatorriko egilea:\n"
 "\n"
 
-#: ../app/app_procs.c:1266
+#: ../app/app_procs.c:1272
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +282,7 @@ msgstr ""
 "Dia-ren uneko mantentzaileak:\n"
 "\n"
 
-#: ../app/app_procs.c:1271
+#: ../app/app_procs.c:1277
 #, c-format
 msgid ""
 "\n"
@@ -287,7 +293,7 @@ msgstr ""
 "Beste egile batzuk:\n"
 "\n"
 
-#: ../app/app_procs.c:1276
+#: ../app/app_procs.c:1282
 #, c-format
 msgid ""
 "\n"
@@ -327,15 +333,15 @@ msgstr "Ez da inprimatze-pluginik aurkitu."
 msgid "Diagram%d.dia"
 msgstr "Diagrama%d.dia"
 
-#: ../app/commands.c:343
+#: ../app/commands.c:344
 msgid "No existing object to paste.\n"
 msgstr "Ez dago objekturik itsasteko.\n"
 
-#: ../app/commands.c:646 ../app/commands.c:684
+#: ../app/commands.c:653 ../app/commands.c:691
 msgid "Could not find help directory"
 msgstr "Ezin izan da laguntza-direktorioa aurkitu."
 
-#: ../app/commands.c:653
+#: ../app/commands.c:660
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -344,13 +350,13 @@ msgstr ""
 "Ezin izan da laguntza-direktorioa ireki:\n"
 "%s"
 
-#: ../app/commands.c:720
+#: ../app/commands.c:727
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "Hizkuntza Politikarako Sailburuordetza <[e-mail]>\n"
 "Iñaki Larrañaga Murgoitio <[e-mail]>"
 
-#: ../app/commands.c:722
+#: ../app/commands.c:729
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -379,7 +385,7 @@ msgstr ""
 "zenuen; hala ez bada, idatzi hona: Free SoftwareFoundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: ../app/commands.c:745
+#: ../app/commands.c:752
 msgid "A program for drawing structured diagrams."
 msgstr "Diagrama egituratuak marrazteko editorea."
 
@@ -395,7 +401,8 @@ msgstr "%d orrialdeko diagrama bat esportatzera zoaz."
 
 #: ../app/confirm.c:73
 #, c-format
-msgid "You are about to export a diagram which may require %s of memory.(%d pages)."
+msgid ""
+"You are about to export a diagram which may require %s of memory.(%d pages)."
 msgstr "%s memoria behar duen diagrama bat esportatzera zoaz (%d orrialde)."
 
 #: ../app/confirm.c:81
@@ -688,7 +695,7 @@ msgstr "Propietateak..."
 msgid "Selection"
 msgstr "Hautapena"
 
-#: ../app/disp_callbacks.c:1072
+#: ../app/disp_callbacks.c:1075
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -712,20 +719,20 @@ msgid "Selected '%s'"
 msgstr "'%s' hautatuta"
 
 #. we really should not come here but instead disable the menu command earlier
-#: ../app/display.c:1081
+#: ../app/display.c:1121
 msgid "No anti-aliased renderer found"
 msgstr "Ez da antialiasing errendatzailerik aurkitu"
 
-#: ../app/display.c:1219
+#: ../app/display.c:1259
 msgid "<unnamed>"
 msgstr "<izengabea>"
 
 #. no standard buttons
-#: ../app/display.c:1225
+#: ../app/display.c:1265
 msgid "Closing diagram without saving"
 msgstr "Diagrama gorde gabe ixten"
 
-#: ../app/display.c:1227
+#: ../app/display.c:1267
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -734,11 +741,11 @@ msgstr ""
 "'%s' diagrama\n"
 "ez da gorde. Aldaketak gorde nahi dituzu?"
 
-#: ../app/display.c:1229
+#: ../app/display.c:1269
 msgid "Close Diagram"
 msgstr "Itxi diagrama"
 
-#: ../app/display.c:1234
+#: ../app/display.c:1274
 msgid "_Discard Changes"
 msgstr "_Baztertu aldaketak"
 
@@ -789,11 +796,11 @@ msgid "Nothing selected for saving.  Would you like to try again?"
 msgstr "Ez da ezer hautatu gordetzeko. Saiatu nahi duzu berriro?"
 
 #: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-#: ../app/filedlg.c:746 ../lib/widgets.c:1488
+#: ../app/filedlg.c:752 ../lib/widgets.c:1488
 msgid "Supported Formats"
 msgstr "Onartutako formatuak"
 
-#: ../app/filedlg.c:192 ../app/filedlg.c:604
+#: ../app/filedlg.c:192 ../app/filedlg.c:610
 msgid "By extension"
 msgstr "Luzapenaren arabera"
 
@@ -805,15 +812,15 @@ msgstr "Ireki diagrama"
 msgid "Open Options"
 msgstr "Irekitzeko aukerak"
 
-#: ../app/filedlg.c:317 ../app/filedlg.c:728
+#: ../app/filedlg.c:317 ../app/filedlg.c:734
 msgid "Determine file type:"
 msgstr "Zehaztu fitxategi-mota:"
 
-#: ../app/filedlg.c:337 ../app/filedlg.c:741 ../lib/widgets.c:1493
+#: ../app/filedlg.c:337 ../app/filedlg.c:747 ../lib/widgets.c:1493
 msgid "All Files"
 msgstr "Fitxategi denak"
 
-#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:408
+#: ../app/filedlg.c:376 ../plug-ins/postscript/paginate_psprint.c:408
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
@@ -823,12 +830,12 @@ msgstr ""
 "lokalekoak ere. \n"
 "Gauza batzuek ez dute funtzionatuko."
 
-#: ../app/filedlg.c:380 ../app/filedlg.c:651
+#: ../app/filedlg.c:386 ../app/filedlg.c:657
 #: ../plug-ins/postscript/paginate_psprint.c:422
 msgid "File already exists"
 msgstr "Fitxategia badago lehendik ere"
 
-#: ../app/filedlg.c:382 ../app/filedlg.c:653
+#: ../app/filedlg.c:388 ../app/filedlg.c:659
 #: ../plug-ins/postscript/paginate_psprint.c:418
 #, c-format
 msgid ""
@@ -838,17 +845,17 @@ msgstr ""
 "'%s' fitxategia badago lehendik.\n"
 "Gainidatzi nahi duzu?"
 
-#: ../app/filedlg.c:436
+#: ../app/filedlg.c:442
 msgid "Save Diagram"
 msgstr "Gorde diagrama"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: ../app/filedlg.c:447
+#: ../app/filedlg.c:453
 msgid "Compress diagram files"
 msgstr "Konprimitu diagrama-fitxategiak"
 
-#: ../app/filedlg.c:457 ../app/filedlg.c:462
+#: ../app/filedlg.c:463 ../app/filedlg.c:468
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -857,7 +864,7 @@ msgstr ""
 "kargatzea eta gordetzea azkartu. Testu-programa batzuek ezin dute fitxategi "
 "konprimiturik manipulatu."
 
-#: ../app/filedlg.c:677
+#: ../app/filedlg.c:683
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -866,11 +873,11 @@ msgstr ""
 "Ezin izan da zehaztu zein esportazio-iragazki\n"
 "erabili '%s' gordetzeko"
 
-#: ../app/filedlg.c:704
+#: ../app/filedlg.c:710
 msgid "Export Diagram"
 msgstr "Esportatu diagrama"
 
-#: ../app/filedlg.c:720
+#: ../app/filedlg.c:726
 msgid "Export Options"
 msgstr "Esportatzeko aukerak"
 
@@ -894,22 +901,22 @@ msgstr "_Hitz osoak soilik"
 msgid "Match _all properties (not just object name)"
 msgstr "Parekatu propietate _guztiak (ez soilik objektuen izenak)"
 
-#: ../app/find-and-replace.c:510
+#: ../app/find-and-replace.c:513
 msgid "Find"
 msgstr "Bilatu"
 
-#: ../app/find-and-replace.c:542 ../app/menus.c:267
+#: ../app/find-and-replace.c:545 ../app/menus.c:267
 msgid "Replace"
 msgstr "Ordeztu"
 
-#: ../app/find-and-replace.c:545
+#: ../app/find-and-replace.c:548
 msgid "Replace _All"
 msgstr "Ordeztu _guztiak"
 
 #. not adding the button in the list above to modify it's text;
 #. * the default "Find and Replace" is just too long for my taste ;)
 #.
-#: ../app/find-and-replace.c:550
+#: ../app/find-and-replace.c:553
 msgid "_Replace"
 msgstr "_Ordeztu"
 
@@ -997,40 +1004,40 @@ msgstr "Irudia"
 msgid "Outline"
 msgstr "Eskema"
 
-#: ../app/interface.c:621 ../app/interface.c:857
+#: ../app/interface.c:634 ../app/interface.c:870
 msgid "Pops up the Navigation window."
 msgstr "Nabigazio-leihoa bistaratzen du pantailan."
 
-#: ../app/interface.c:819
+#: ../app/interface.c:832
 msgid "Diagram menu."
 msgstr "Diagrama menua."
 
-#: ../app/interface.c:922
+#: ../app/interface.c:935
 msgid "Zoom"
 msgstr "Zooma"
 
-#: ../app/interface.c:937
+#: ../app/interface.c:950
 msgid "Toggles snap-to-grid for this window."
 msgstr "'Atxiki saretari' aktibatzen/desaktibatzen du leiho honetan."
 
-#: ../app/interface.c:948
+#: ../app/interface.c:961
 msgid "Toggles object snapping for this window."
 msgstr "Objektua atxikitzea aktibatzen/desaktibatzen du leiho honetan."
 
-#: ../app/interface.c:1338
+#: ../app/interface.c:1351
 #, c-format
 msgid "No sheet named %s"
 msgstr "Ez dago %s izeneko orririk"
 
-#: ../app/interface.c:1376
+#: ../app/interface.c:1389
 msgid "Other sheets"
 msgstr "Beste orriak"
 
-#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:10
+#: ../app/interface.c:1449 ../sheets/Flowchart.sheet.in.h:1
 msgid "Flowchart"
 msgstr "Fluxu-diagrama"
 
-#: ../app/interface.c:1496
+#: ../app/interface.c:1509
 msgid ""
 "Foreground & background colors for new objects.  The small black and white "
 "squares reset colors.  The small arrows swap colors.  Double click to change "
@@ -1040,7 +1047,7 @@ msgstr ""
 "zuri-beltzek koloreak berrezartzen dituzte. Gezi txikiek koloreak trukatzen "
 "dituzte. Egin klik bikoitza koloreak aldatzeko."
 
-#: ../app/interface.c:1511
+#: ../app/interface.c:1524
 msgid ""
 "Line widths.  Click on a line to set the default line width for new "
 "objects.  Double-click to set the line width more precisely."
@@ -1049,7 +1056,7 @@ msgstr ""
 "klik marra batean. Zabalera zehaztasun handiagoz ezartzeko, egin klik "
 "bikoitza."
 
-#: ../app/interface.c:1554
+#: ../app/interface.c:1567
 msgid ""
 "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
 "arrow parameters with Details..."
@@ -1057,7 +1064,7 @@ msgstr ""
 "Marra berrien hasierako gezi-estiloa. Egin klik gezi bat hautatzeko, edo "
 "ezarri gezi-parametroak Xehetasunekin..."
 
-#: ../app/interface.c:1559
+#: ../app/interface.c:1572
 msgid ""
 "Line style for new lines.  Click to pick a line style, or set line style "
 "parameters with Details..."
@@ -1065,7 +1072,7 @@ msgstr ""
 "Marra berrien marra-estiloa. Egin klik marra-estilo bat hautatzeko, edo "
 "marra-estiloaren parametroak Xehetasunekin..."
 
-#: ../app/interface.c:1575
+#: ../app/interface.c:1588
 msgid ""
 "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
 "parameters with Details..."
@@ -1073,7 +1080,7 @@ msgstr ""
 "Marra berrien amaierako gezi-estiloa. Egin klik gezi bat hautatzeko, edo "
 "ezarri gezi-parametroak Xehetasunekin..."
 
-#: ../app/interface.c:1635 ../app/interface.c:1762
+#: ../app/interface.c:1648 ../app/interface.c:1775
 msgid "Diagram Editor"
 msgstr "Diagrama-editorea"
 
@@ -1127,8 +1134,7 @@ msgid "Layer name:"
 msgstr "Geruza-izena:"
 
 #: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
-#: ../objects/chronogram/chronoline.c:183
-#: ../objects/chronogram/chronoref.c:162
+#: ../objects/chronogram/chronoline.c:183 ../objects/chronogram/chronoref.c:162
 msgid "Line width"
 msgstr "Marra-zabalera"
 
@@ -1136,7 +1142,7 @@ msgstr "Marra-zabalera"
 msgid "Line width:"
 msgstr "Marra-zabalera:"
 
-#: ../app/load_save.c:296
+#: ../app/load_save.c:303
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1144,7 +1150,7 @@ msgstr ""
 "Errorea diagrama kargatzean.\n"
 "Ez da aurkitu estekatutako objektua dokumentuan."
 
-#: ../app/load_save.c:300
+#: ../app/load_save.c:307
 #, c-format
 msgid ""
 "Error loading diagram.\n"
@@ -1153,7 +1159,7 @@ msgstr ""
 "Errorea diagrama kargatzean.\n"
 "%d. konexio-heldulekua ez dago '%s'(e)n."
 
-#: ../app/load_save.c:328
+#: ../app/load_save.c:335
 #, c-format
 msgid ""
 "Error loading diagram.\n"
@@ -1162,23 +1168,23 @@ msgstr ""
 "Errorea diagrama kargatzean.\n"
 "%d. konexio-puntua ez dago '%s'(e)n."
 
-#: ../app/load_save.c:368
+#: ../app/load_save.c:375
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "Ezin da aurkitu %2$s objektuaren %1$s gurasoa\n"
 
-#: ../app/load_save.c:417
+#: ../app/load_save.c:425
 msgid "You must specify a file, not a directory.\n"
 msgstr "Fitxategi bat zehaztu behar duzu, ez direktorioa.\n"
 
-#: ../app/load_save.c:424 ../plug-ins/dxf/dxf-import.c:1309
+#: ../app/load_save.c:432 ../plug-ins/dxf/dxf-import.c:1309
 #: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
 #: ../plug-ins/xslt/xslt.c:91
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "Ezin izan da ireki: '%s' irakurtzeko.\n"
 
-#: ../app/load_save.c:442 ../app/load_save.c:448
+#: ../app/load_save.c:450 ../app/load_save.c:460
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1187,7 +1193,7 @@ msgstr ""
 "Errorea %s diagrama kargatzean.\n"
 "Fitxategi-mota ezezaguna."
 
-#: ../app/load_save.c:456
+#: ../app/load_save.c:468
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1196,7 +1202,7 @@ msgstr ""
 "Errorea %s diagrama kargatzean.\n"
 "Ez da Dia fitxategia."
 
-#: ../app/load_save.c:673
+#: ../app/load_save.c:685
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1207,17 +1213,17 @@ msgstr ""
 "%s.\n"
 "Baliozko Dia fitxategi batek gutxienez geruza bat definitzen du."
 
-#: ../app/load_save.c:996
+#: ../app/load_save.c:1008
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "Ez dago baimenik irteerako %s fitxategian idazteko\n"
 
-#: ../app/load_save.c:1028
+#: ../app/load_save.c:1040
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr "Ez dago baimenik aldi baterako fitxategiak %s(e)n idazteko\n"
 
-#: ../app/load_save.c:1050 ../plug-ins/cairo/diacairo.c:121
+#: ../app/load_save.c:1062 ../plug-ins/cairo/diacairo.c:110
 #: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
 #: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
 #: ../plug-ins/libart/export_png.c:159
@@ -1226,24 +1232,24 @@ msgstr "Ez dago baimenik aldi baterako fitxategiak %s(e)n idazteko\n"
 #: ../plug-ins/pstricks/render_pstricks.c:916
 #: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
 #: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
-#: ../plug-ins/xfig/xfig-export.c:1151 ../plug-ins/xslt/xslt.c:99
+#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
 #, c-format
 msgid "Can't open output file %s: %s\n"
 msgstr "Ezin da %s irteerako fitxategia ireki: %s\n"
 
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:1061
+#: ../app/load_save.c:1073
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "Barneko %d. errorea %s fitxategian idaztean\n"
 
-#: ../app/load_save.c:1072
+#: ../app/load_save.c:1084
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "Ezin da %s izenez aldatu amaierako irteerako %s fitxategira: %s\n"
 
-#: ../app/load_save.c:1163 ../app/load_save.c:1168
+#: ../app/load_save.c:1175 ../app/load_save.c:1180
 msgid "Dia Diagram File"
 msgstr "Dia diagrama-fitxategia"
 
@@ -1484,7 +1490,7 @@ msgstr "_Hautatu"
 msgid "All"
 msgstr "Denak"
 
-#: ../app/menus.c:206 ../lib/arrows.c:1884 ../objects/Jackson/domain.c:96
+#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
 #: ../objects/UML/association.c:221 ../objects/UML/association.c:227
 msgid "None"
 msgstr "Bat ere ez"
@@ -1724,7 +1730,7 @@ msgstr "Bertikala"
 msgid "Paper type:"
 msgstr "Paper-mota:"
 
-#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1078
+#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1079
 msgid "Background Color:"
 msgstr "Atzeko planoaren kolorea:"
 
@@ -1793,7 +1799,7 @@ msgstr "Esportatu"
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:515
+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:521
 #: ../plug-ins/svg/svg-import.c:884
 msgid "Scalable Vector Graphics"
 msgstr "SVG (Bektore-Grafiko Eskalakorra)"
@@ -1851,8 +1857,8 @@ msgstr "Gorde ezkutuko objektu-motak"
 msgid "Yes"
 msgstr "Bai"
 
-#: ../app/preferences.c:485 ../app/preferences.c:496
-#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
+#: ../app/preferences.c:485 ../app/preferences.c:496 ../lib/prop_inttypes.c:160
+#: ../lib/prop_inttypes.c:186
 msgid "No"
 msgstr "Ez"
 
@@ -1990,7 +1996,7 @@ msgstr "DiaObjektua"
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:695
+#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:696
 #: ../objects/FS/flow-ortho.c:169 ../objects/FS/flow.c:146
 #: ../objects/Istar/link.c:162 ../objects/Jackson/phenomenon.c:146
 #: ../objects/KAOS/metaandorrel.c:166 ../objects/KAOS/metabinrel.c:173
@@ -2003,8 +2009,8 @@ msgstr "Mota:"
 msgid "Sheet"
 msgstr "Orria"
 
-#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:683
-#: ../objects/Database/table_dialog.c:1046 ../objects/ER/attribute.c:155
+#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:684
+#: ../objects/Database/table_dialog.c:1047 ../objects/ER/attribute.c:155
 #: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
 #: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
 #: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
@@ -2141,148 +2147,148 @@ msgstr "Dia, diagrama-editorea"
 msgid "Edit your Diagrams"
 msgstr "Editatu diagramak"
 
-#: ../lib/arrows.c:1885
+#: ../lib/arrows.c:1899
 msgid "Lines"
 msgstr "Marrak"
 
-#: ../lib/arrows.c:1886
+#: ../lib/arrows.c:1900
 msgid "Hollow Triangle"
 msgstr "Triangelu hutsa"
 
-#: ../lib/arrows.c:1887
+#: ../lib/arrows.c:1901
 msgid "Filled Triangle"
 msgstr "Triangelu betea"
 
-#: ../lib/arrows.c:1888
+#: ../lib/arrows.c:1902
 msgid "Unfilled Triangle"
 msgstr "Triangelu bete gabea"
 
-#: ../lib/arrows.c:1889
+#: ../lib/arrows.c:1903
 msgid "Hollow Diamond"
 msgstr "Diamante hutsa"
 
-#: ../lib/arrows.c:1890
+#: ../lib/arrows.c:1904
 msgid "Filled Diamond"
 msgstr "Diamante betea"
 
-#: ../lib/arrows.c:1891
+#: ../lib/arrows.c:1905
 msgid "Half Diamond"
 msgstr "Diamante erdia"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:1906
 msgid "Half Head"
 msgstr "Buru erdia"
 
-#: ../lib/arrows.c:1893
+#: ../lib/arrows.c:1907
 msgid "Slashed Cross"
 msgstr "Gurutze barraduna"
 
-#: ../lib/arrows.c:1894
+#: ../lib/arrows.c:1908
 msgid "Filled Ellipse"
 msgstr "Elipse betea"
 
-#: ../lib/arrows.c:1895
+#: ../lib/arrows.c:1909
 msgid "Hollow Ellipse"
 msgstr "Elipse hutsa"
 
-#: ../lib/arrows.c:1896
+#: ../lib/arrows.c:1910
 msgid "Filled Dot"
 msgstr "Puntu betea"
 
-#: ../lib/arrows.c:1897
+#: ../lib/arrows.c:1911
 msgid "Dimension Origin"
 msgstr "Dimentsio-jatorria"
 
-#: ../lib/arrows.c:1898
+#: ../lib/arrows.c:1912
 msgid "Blanked Dot"
 msgstr "Puntu hustua"
 
-#: ../lib/arrows.c:1899
+#: ../lib/arrows.c:1913
 msgid "Double Hollow Triangle"
 msgstr "Triangelu huts bikoitza"
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:1914
 msgid "Double Filled Triangle"
 msgstr "Triangelu bete bikoitza"
 
-#: ../lib/arrows.c:1901
+#: ../lib/arrows.c:1915
 msgid "Filled Dot and Triangle"
 msgstr "Puntu eta triangelu beteak"
 
-#: ../lib/arrows.c:1902
+#: ../lib/arrows.c:1916
 msgid "Filled Box"
 msgstr "Lauki betea"
 
-#: ../lib/arrows.c:1903
+#: ../lib/arrows.c:1917
 msgid "Blanked Box"
 msgstr "Lauki hustua"
 
-#: ../lib/arrows.c:1904
+#: ../lib/arrows.c:1918
 msgid "Slashed"
 msgstr "Barraduna"
 
-#: ../lib/arrows.c:1905
+#: ../lib/arrows.c:1919
 msgid "Integral Symbol"
 msgstr "Integralen ikurra"
 
-#: ../lib/arrows.c:1906
+#: ../lib/arrows.c:1920
 msgid "Crow Foot"
 msgstr "Izar-plantain"
 
-#: ../lib/arrows.c:1907
+#: ../lib/arrows.c:1921
 msgid "Cross"
 msgstr "Gurutzea"
 
-#: ../lib/arrows.c:1908
+#: ../lib/arrows.c:1922
 msgid "1-or-many"
 msgstr "1-edo-hainbat"
 
-#: ../lib/arrows.c:1909
+#: ../lib/arrows.c:1923
 msgid "0-or-many"
 msgstr "0-edo-hainbat"
 
-#: ../lib/arrows.c:1910
+#: ../lib/arrows.c:1924
 msgid "1-or-0"
 msgstr "1-edo-0"
 
-#: ../lib/arrows.c:1911
+#: ../lib/arrows.c:1925
 msgid "1 exactly"
 msgstr "1 zehazki"
 
-#: ../lib/arrows.c:1912
+#: ../lib/arrows.c:1926
 msgid "Filled Concave"
 msgstr "Ahur betea"
 
-#: ../lib/arrows.c:1913
+#: ../lib/arrows.c:1927
 msgid "Blanked Concave"
 msgstr "Ahur hustua"
 
-#: ../lib/arrows.c:1914
+#: ../lib/arrows.c:1928
 msgid "Round"
 msgstr "Biribila"
 
-#: ../lib/arrows.c:1915
+#: ../lib/arrows.c:1929
 msgid "Open Round"
 msgstr "Biribil irekia"
 
-#: ../lib/arrows.c:1916
+#: ../lib/arrows.c:1930
 msgid "Backslash"
 msgstr "Alderantzizko barra"
 
-#: ../lib/arrows.c:1917
+#: ../lib/arrows.c:1931
 msgid "Infinite Line"
 msgstr "Marra infinitua"
 
-#: ../lib/arrows.c:2045
+#: ../lib/arrows.c:2059
 msgid "Arrow head of unknown type"
 msgstr "Geziaren burua mota ezezagunekoa"
 
-#: ../lib/arrows.c:2053
+#: ../lib/arrows.c:2067
 #, c-format
 msgid "Arrow head of type %s has too small dimensions, removing.\n"
 msgstr "Geziaren %s motako buruaren dimentsioa txikiegia da, kentzen.\n"
 
-#: ../lib/arrows.c:2186
+#: ../lib/arrows.c:2200
 msgid "unknown arrow"
 msgstr "gezi ezezaguna"
 
@@ -2493,8 +2499,7 @@ msgid "Right"
 msgstr "Eskuinean"
 
 #: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
-#: ../objects/chronogram/chronoline.c:181
-#: ../objects/chronogram/chronoref.c:160
+#: ../objects/chronogram/chronoline.c:181 ../objects/chronogram/chronoref.c:160
 msgid "Line color"
 msgstr "Marra-kolorea"
 
@@ -2524,7 +2529,7 @@ msgstr "Testu-lerrokatzea"
 
 #. all this just to make the defaults selectable ...
 #: ../lib/properties.c:82 ../lib/properties.h:541
-#: ../objects/Database/table_dialog.c:1036 ../objects/Database/reference.c:117
+#: ../objects/Database/table_dialog.c:1037 ../objects/Database/reference.c:117
 #: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
 #: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:174
 #: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
@@ -2539,9 +2544,8 @@ msgstr "Letra-tipoa"
 msgid "Font size"
 msgstr "Letra-tamaina"
 
-#: ../lib/properties.c:84 ../lib/properties.h:555
-#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
-#: ../objects/chronogram/chronoref.c:170
+#: ../lib/properties.c:84 ../lib/properties.h:555 ../objects/GRAFCET/step.c:171
+#: ../objects/chronogram/chronoline.c:189 ../objects/chronogram/chronoref.c:170
 msgid "Text color"
 msgstr "Testu-kolorea"
 
@@ -2641,12 +2645,12 @@ msgstr "Hautatu irudi-fitxategia"
 msgid "Browse"
 msgstr "Arakatu"
 
-#: ../lib/widgets.c:2076
+#: ../lib/widgets.c:2087
 msgid "Reset menu"
 msgstr "Berrezarri menua"
 
 #. Installer message if no GTK+ was found
-#: ../installer/win32/gennsh.c:38
+#: ../installer/win32/gennsh.c:39
 msgid ""
 "GTK+ is not installed. Please use the full installer. It is available from "
 "http://dia-installer.de."
@@ -2655,7 +2659,7 @@ msgstr ""
 "eskuragarri: http://dia-installer.de"
 
 #. Installer message: Don't install over pre 0.95 versions
-#: ../installer/win32/gennsh.c:41
+#: ../installer/win32/gennsh.c:42
 msgid ""
 "Please remove old Dia installations completely or install Dia to a different "
 "location."
@@ -2664,12 +2668,12 @@ msgstr ""
 "batean."
 
 #. Installer message:  License Page
-#: ../installer/win32/gennsh.c:44
+#: ../installer/win32/gennsh.c:45
 msgid "Next >"
 msgstr "Hurrengoa >"
 
 #. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-#: ../installer/win32/gennsh.c:47
+#: ../installer/win32/gennsh.c:48
 msgid ""
 "$(^Name) is released under the GPL license. The license is provided here for "
 "information purposes only. $_CLICK"
@@ -2678,32 +2682,32 @@ msgstr ""
 "informazioa emateko zedearekin. $_CLICK"
 
 #. Installer message: Components page
-#: ../installer/win32/gennsh.c:50
+#: ../installer/win32/gennsh.c:51
 msgid "Dia Diagram Editor (required)"
 msgstr "Dia, diagrama-editorea (beharrezkoa)"
 
 #. Installer message: Components page
-#: ../installer/win32/gennsh.c:53
+#: ../installer/win32/gennsh.c:54
 msgid "Translations"
 msgstr "Itzulpenak"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:56
+#: ../installer/win32/gennsh.c:57
 msgid "Optional translations of the Dia user interface"
 msgstr "Dia-ren interfazearen aukerako itzulpenak"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:59
+#: ../installer/win32/gennsh.c:60
 msgid "Core Dia files and dlls"
 msgstr "Dia-ren nukleoko fitxategi eta dll-ak"
 
 #. Installer message: Component name
-#: ../installer/win32/gennsh.c:62
+#: ../installer/win32/gennsh.c:63
 msgid "Python plug-in"
 msgstr "Python-en gehigarriak"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:65
+#: ../installer/win32/gennsh.c:66
 msgid ""
 "Support for the Python Scripting Language 2.3. Do not select this if Python "
 "is not installed."
@@ -2711,58 +2715,94 @@ msgstr ""
 "Python scriptaren 2.3 bertsioaren euskarria. Ez hautatu hau Python instalatu "
 "gabe egonez gero."
 
+#. Installer message: Component name
+#: ../installer/win32/gennsh.c:69
+#| msgid "Desktop PC"
+msgid "Desktop Shortcut"
+msgstr "Mahaigaineko lasterbidea"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:72
+msgid "Create a shortcut on the Desktop."
+msgstr "Sortu mahaigaineko lasterbidea."
+
 #. Installer message: hyperlink text on finish page
-#: ../installer/win32/gennsh.c:68
+#: ../installer/win32/gennsh.c:76
 msgid "Visit the Dia for Windows Web Page"
 msgstr "Bisitatu Dia Windows-entzako web orrialdea"
 
 #. Installer message: Dia uninstaller entry in Control Panel
-#: ../installer/win32/gennsh.c:71
+#: ../installer/win32/gennsh.c:79
 msgid "Dia (remove only)"
 msgstr "Dia (kendu soilik)"
 
-#. Installer message: confirmation question. Keep $\r
-#: ../installer/win32/gennsh.c:74
+#. Installer message: directory delete confirmation line 1
+#: ../installer/win32/gennsh.c:82
+#| msgid ""
+#| "The installation directory you specified already exists. Any contents$"
+#| "\rwill be deleted. Would you like to continue?"
 msgid ""
-"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
-"$\rNote: Any non-standard plugins that you may have installed will be "
-"deleted.$\rDia user settings will not be affected."
-msgstr ""
-"Dia zaharraren direktorioa ezabatzera doa. Jarraitzea nahi duzu?$\r"
-"$\rOharra: instalatuta eduki dezakezun edozein plugin ez-estandar ere ezabatu "
-"egingo dela.$\rDia-ko erabiltzailearen ezarpenei ez die eragingo."
+"Your old Dia directory is about to be deleted. Would you like to continue?"
+msgstr "Zure Dia-ren direktorio zaharra ezabatzera doa. Jarraitzea nahi duzu?"
 
-#. Installer message: confirmatin question. Keep $\r
-#: ../installer/win32/gennsh.c:77
+#. Installer message: directory delete confirmation line 2
+#: ../installer/win32/gennsh.c:84
 msgid ""
-"The installation directory you specified already exists. Any contents$\rwill "
-"be deleted. Would you like to continue?"
-msgstr ""
-"Zehaztu duzun instalaziorako direktorioa badago lehendik ere. Bertako$\r"
-"edozein eduki ezabatu egingo da. Jarraitzea nahi duzu?"
+"Note: Any non-standard plugins that you may have installed will be deleted."
+msgstr "Oharra: plugin ez arruntak instala bazenitu, horiek ezabatzera doa."
 
-#. Installer message: Uninstall Section Prompts. Keep $\r
-#: ../installer/win32/gennsh.c:80
-msgid ""
-"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-"another user installed this application."
+#. Installer message: directory delete confirmation line 3
+#: ../installer/win32/gennsh.c:86
+msgid "Dia user settings will not be affected."
+msgstr "Dia-ko erabiltzailearen ezarpenei ez die eragingo."
+
+#. Installer message: DIA_PROMPT_DIR_EXISTS line 1
+#: ../installer/win32/gennsh.c:89
+#| msgid ""
+#| "The installation directory you specified already exists. Any contents$"
+#| "\rwill be deleted. Would you like to continue?"
+msgid "The installation directory you specified already exists. Any contents"
 msgstr ""
-"Desinstalatzaileak ezin izan du Dia-ren sarrerako erregistrorik aurkitu.$\r"
-"Badirudi beste erabiltzaile batek instalatu duela aplikazio hau."
+"Zehaztu duzun instalaziorako direktorioa badago lehendik ere. Eduki guztia "
+
+#. Installer message: DIA_PROMP_DIR_EXISTS line 2
+#: ../installer/win32/gennsh.c:91
+#| msgid "Nothing selected for saving.  Would you like to try again?"
+msgid "will be deleted. Would you like to continue?"
+msgstr "ezabatu egingo da. Jarraitzea nahi duzu?"
+
+#. Installer message: registry entries not found line 1
+#: ../installer/win32/gennsh.c:94
+#| msgid ""
+#| "The uninstaller could not find registry entries for Dia.$\rIt is likely "
+#| "that another user installed this application."
+msgid "The uninstaller could not find registry entries for Dia."
+msgstr ""
+"Desinstalatzaileak ezin izan du Dia-ren sarrerako erregistrorik aurkitu."
+
+#. Installer message: registry entries not found line 2
+#: ../installer/win32/gennsh.c:96
+#| msgid ""
+#| "The uninstaller could not find registry entries for Dia.$\rIt is likely "
+#| "that another user installed this application."
+msgid "It is likely that another user installed this application."
+msgstr "Badirudi beste erabiltzaile batek instalatu duela aplikazio hau."
 
 #. Installer message: Uninstall error message
-#: ../installer/win32/gennsh.c:83
+#: ../installer/win32/gennsh.c:99
 msgid "You do not have permission to uninstall this application."
 msgstr "Ez daukazu aplikazio hau desinstalatzeko baimenik."
 
 #. Installer message: Uninstallation warning. Keep $INSTDIR
-#: ../installer/win32/gennsh.c:86
+#: ../installer/win32/gennsh.c:102
 msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-msgstr "Honek erabat ezabatuko du $INSTDIR eta bere azpidirektorio guztiak. Jarraitu?"
+msgstr ""
+"Honek erabat ezabatuko du $INSTDIR eta bere azpidirektorio guztiak. Jarraitu?"
 
 #. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-#: ../installer/win32/gennsh.c:89
-msgid "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
+#: ../installer/win32/gennsh.c:105
+msgid ""
+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
 msgstr ""
 "Honek erabat ezabatuko du $PROFILE\\.dia eta bere azpidirektorio guztiak. "
 "Jarraitu?"
@@ -2875,7 +2915,7 @@ msgstr "Entitate/Erlazio taularen diagrama-objektuak"
 #: ../objects/Database/table.c:200 ../objects/UML/class.c:148
 #: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
 #: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
-#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
 msgid "Comment"
 msgstr "Iruzkina"
 
@@ -2899,16 +2939,16 @@ msgstr "Iruzkin ikusgaiak"
 msgid "Comment tagging"
 msgstr "Iruzkinen etiketak"
 
-#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:976
+#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:977
 msgid "Underline primary keys"
 msgstr "Azpimarratu lehen mailako gakoak"
 
-#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:981
+#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:982
 msgid "Use bold font for primary keys"
 msgstr "Erabili letra-lodia lehen mailako gakoetan"
 
 #. property rows
-#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:136
+#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
 #: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
 msgid "Normal"
 msgstr "Normala"
@@ -2939,119 +2979,119 @@ msgstr "Erakutsi iruzkinak"
 
 #. init data
 #: ../objects/Database/table.c:253 ../objects/Database/table.c:356
-#: ../sheets/Database.sheet.in.h:5
+#: ../sheets/Database.sheet.in.h:3
 msgid "Table"
 msgstr "Taula"
 
 #. Attributes page:
-#: ../objects/Database/table_dialog.c:611 ../objects/UML/class_dialog.c:1081
+#: ../objects/Database/table_dialog.c:612 ../objects/UML/class_dialog.c:1081
 msgid "_Attributes"
 msgstr "_Atributuak"
 
 #. the "new" button
-#: ../objects/Database/table_dialog.c:639 ../objects/SISSI/sissi_dialog.c:739
+#: ../objects/Database/table_dialog.c:640 ../objects/SISSI/sissi_dialog.c:739
 #: ../objects/SISSI/sissi_dialog.c:871
 msgid "_New"
 msgstr "_Berria"
 
 #. the "delete" button
-#: ../objects/Database/table_dialog.c:647
+#: ../objects/Database/table_dialog.c:648
 msgid "_Delete"
 msgstr "Ez_abatu"
 
 #. the "Move up" button
-#: ../objects/Database/table_dialog.c:655
+#: ../objects/Database/table_dialog.c:656
 msgid "Move up"
 msgstr "Eraman gorantz"
 
 #. the "Move down" button
-#: ../objects/Database/table_dialog.c:663
+#: ../objects/Database/table_dialog.c:664
 msgid "Move down"
 msgstr "Eraman beherantz"
 
-#: ../objects/Database/table_dialog.c:673 ../objects/UML/class_dialog.c:1138
+#: ../objects/Database/table_dialog.c:674 ../objects/UML/class_dialog.c:1138
 msgid "Attribute data"
 msgstr "Atributu-datuak"
 
-#: ../objects/Database/table_dialog.c:707
-#: ../objects/Database/table_dialog.c:946
-#: ../objects/Database/table_dialog.c:1051 ../objects/UML/class_dialog.c:452
+#: ../objects/Database/table_dialog.c:708
+#: ../objects/Database/table_dialog.c:947
+#: ../objects/Database/table_dialog.c:1052 ../objects/UML/class_dialog.c:452
 #: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
 #: ../objects/UML/class_dialog.c:2283
 msgid "Comment:"
 msgstr "Iruzkina:"
 
-#: ../objects/Database/table_dialog.c:726
+#: ../objects/Database/table_dialog.c:727
 msgid "_Primary key"
 msgstr "_Lehen mailako gakoa"
 
-#: ../objects/Database/table_dialog.c:733
+#: ../objects/Database/table_dialog.c:734
 msgid "N_ullable"
 msgstr "_Null izan daiteke"
 
-#: ../objects/Database/table_dialog.c:740
+#: ../objects/Database/table_dialog.c:741
 msgid "Uni_que"
 msgstr "_Bakarra"
 
-#: ../objects/Database/table_dialog.c:928
+#: ../objects/Database/table_dialog.c:929
 msgid "_Table"
 msgstr "_Taula"
 
-#: ../objects/Database/table_dialog.c:936
+#: ../objects/Database/table_dialog.c:937
 msgid "Table name:"
 msgstr "Taula-izena:"
 
 #. XXX create a handler and disable the 'show documentation tag' checkbox
 #. if 'comment visible' is not active.
-#: ../objects/Database/table_dialog.c:966
+#: ../objects/Database/table_dialog.c:967
 msgid "Comment visible"
 msgstr "Iruzkina ikusgai"
 
-#: ../objects/Database/table_dialog.c:971 ../objects/UML/class_dialog.c:522
+#: ../objects/Database/table_dialog.c:972 ../objects/UML/class_dialog.c:522
 msgid "Show documentation tag"
 msgstr "Erakutsi dokumentazio-etiketa"
 
 #. * Fonts and Colors selection *
-#: ../objects/Database/table_dialog.c:1010 ../objects/UML/class_dialog.c:551
+#: ../objects/Database/table_dialog.c:1011 ../objects/UML/class_dialog.c:551
 msgid "_Style"
 msgstr "_Estiloa"
 
-#: ../objects/Database/table_dialog.c:1021
+#: ../objects/Database/table_dialog.c:1022
 msgid "Border width:"
 msgstr "Ertz-zabalera:"
 
 #. head line
-#: ../objects/Database/table_dialog.c:1034 ../objects/UML/class_dialog.c:561
+#: ../objects/Database/table_dialog.c:1035 ../objects/UML/class_dialog.c:561
 #: ../objects/UML/umlparameter.c:51
 msgid "Kind"
 msgstr "Mota"
 
-#: ../objects/Database/table_dialog.c:1038 ../objects/UML/class_dialog.c:566
+#: ../objects/Database/table_dialog.c:1039 ../objects/UML/class_dialog.c:566
 msgid "Size"
 msgstr "Tamaina"
 
-#: ../objects/Database/table_dialog.c:1041
+#: ../objects/Database/table_dialog.c:1042
 msgid "Normal:"
 msgstr "Normala:"
 
-#: ../objects/Database/table_dialog.c:1062
+#: ../objects/Database/table_dialog.c:1063
 msgid "Text Color:"
 msgstr "Testuaren kolorea:"
 
-#: ../objects/Database/table_dialog.c:1070
+#: ../objects/Database/table_dialog.c:1071
 msgid "Foreground Color:"
 msgstr "Aurreko planoaren kolorea:"
 
 #. two chars at the beginning
-#: ../objects/Database/table_dialog.c:1383
+#: ../objects/Database/table_dialog.c:1384
 msgid "not null"
 msgstr "ez null"
 
-#: ../objects/Database/table_dialog.c:1384
+#: ../objects/Database/table_dialog.c:1385
 msgid "null"
 msgstr "null"
 
-#: ../objects/Database/table_dialog.c:1385
+#: ../objects/Database/table_dialog.c:1386
 msgid "unique"
 msgstr "bakarra"
 
@@ -3071,7 +3111,7 @@ msgstr "Azalpenaren amaiera"
 
 #: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
 #: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
-#: ../objects/SADT/arrow.c:459 ../objects/UML/association.c:854
+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
 #: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
 #: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
 #: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
@@ -3081,7 +3121,7 @@ msgstr "Gehitu segmentua"
 
 #: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
 #: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
-#: ../objects/SADT/arrow.c:460 ../objects/UML/association.c:855
+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
 #: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
 #: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
 #: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
@@ -3109,7 +3149,7 @@ msgstr "Eratorria:"
 msgid "Multivalue:"
 msgstr "Balio anitzekoa:"
 
-#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:6
 msgid "Attribute"
 msgstr "Atributua"
 
@@ -3122,7 +3162,7 @@ msgid "Associative:"
 msgstr "Asoziatiboa:"
 
 #: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
-#: ../sheets/ER.sheet.in.h:4
+#: ../sheets/ER.sheet.in.h:3
 msgid "Entity"
 msgstr "Entitatea"
 
@@ -3150,7 +3190,7 @@ msgstr "Biratu:"
 msgid "Identifying:"
 msgstr "Identifikatzea:"
 
-#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:5
 msgid "Relationship"
 msgstr "Erlazioa"
 
@@ -3361,7 +3401,7 @@ msgstr "Onartu"
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
 #: ../objects/FS/function.c:768 ../objects/FS/function.c:770
-#: ../sheets/SDL.sheet.in.h:19
+#: ../sheets/SDL.sheet.in.h:16
 msgid "Stop"
 msgstr "Gelditu"
 
@@ -3420,7 +3460,7 @@ msgid "Mount"
 msgstr "Muntatu"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Lock"
 msgstr "Blokeatu"
 
@@ -3508,7 +3548,7 @@ msgstr "Inkorporatu"
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
 #: ../objects/FS/function.c:840 ../objects/FS/function.c:842
-#: ../sheets/UML.sheet.in.h:5
+#: ../sheets/UML.sheet.in.h:30
 msgid "Branch"
 msgstr "Adarra"
 
@@ -3713,7 +3753,7 @@ msgid "Expose"
 msgstr "Agerian jarri"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:22
 msgid "Extract"
 msgstr "Atera"
 
@@ -3902,7 +3942,7 @@ msgid "Differentiate"
 msgstr "Desberdindu"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:8
+#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:3
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
 msgstr "Prozesatu"
@@ -4212,7 +4252,7 @@ msgstr "Erabiltzaile/gailuaren Fn"
 msgid "Wish Fn"
 msgstr "Nahi den Fn"
 
-#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:11
 msgid "Macro call"
 msgstr "Makro-deia"
 
@@ -4248,19 +4288,19 @@ msgstr "Baldintzaren kolorea"
 msgid "GRAFCET diagram objects"
 msgstr "GRAFCET diagrama-objektuak"
 
-#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:3
 msgid "Regular step"
 msgstr "Urrats erregularra"
 
-#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:4
 msgid "Initial step"
 msgstr "Hasierako urratsa"
 
-#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:5
 msgid "Macro entry step"
 msgstr "Makroaren sarrerako urratsa"
 
-#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Macro exit step"
 msgstr "Makroaren irteerako urratsa"
 
@@ -4342,14 +4382,14 @@ msgstr "Dibergentzia-mota:"
 
 #: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
 #: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
-#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:449
+#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
 #: ../objects/standard/line.c:223
 msgid "Add connection point"
 msgstr "Gehitu konexio-puntua"
 
 #: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
 #: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
-#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:450
+#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
 #: ../objects/standard/line.c:224
 msgid "Delete connection point"
 msgstr "Ezabatu konexio-puntua"
@@ -4395,7 +4435,7 @@ msgstr "Kontribuzio positiboa"
 msgid "Negative contrib"
 msgstr "Kontribuzio negatiboa"
 
-#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:6
 msgid "Dependency"
 msgstr "Mendekotasuna"
 
@@ -4411,7 +4451,7 @@ msgstr "Amaiera-adierazpena"
 msgid "Resource"
 msgstr "Baliabidea"
 
-#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:33
 msgid "Task"
 msgstr "Tarea"
 
@@ -4627,7 +4667,7 @@ msgid "pi"
 msgstr "pi"
 
 #. PROP_FLAG_VISIBLE|
-#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
 msgid "Measurement"
 msgstr "Neurria"
 
@@ -4647,31 +4687,31 @@ msgstr "Gehitu heldulekua"
 msgid "Delete Handle"
 msgstr "Ezabatu heldulekua"
 
-#: ../objects/SADT/arrow.c:137
+#: ../objects/SADT/arrow.c:138
 msgid "Import resource (not shown upstairs)"
 msgstr "Inportatu baliabidea (goian erakutsi gabe)"
 
-#: ../objects/SADT/arrow.c:138
+#: ../objects/SADT/arrow.c:139
 msgid "Imply resource (not shown downstairs)"
 msgstr "Inplikatu baliabidea (behean erakutsi gabe)"
 
-#: ../objects/SADT/arrow.c:139
+#: ../objects/SADT/arrow.c:140
 msgid "Dotted arrow"
 msgstr "Gezi puntukatua"
 
-#: ../objects/SADT/arrow.c:140
+#: ../objects/SADT/arrow.c:141
 msgid "disable arrow heads"
 msgstr "desgaitu gezi-buruak"
 
-#: ../objects/SADT/arrow.c:146
+#: ../objects/SADT/arrow.c:148
 msgid "Flow style:"
 msgstr "Fluxu-estiloa:"
 
-#: ../objects/SADT/arrow.c:148
+#: ../objects/SADT/arrow.c:150
 msgid "Automatically gray vertical flows:"
 msgstr "Fluxu bertikalak grisez automatikoki:"
 
-#: ../objects/SADT/arrow.c:149
+#: ../objects/SADT/arrow.c:151
 msgid ""
 "To improve the ease of reading, flows which begin and end vertically can be "
 "rendered gray"
@@ -4679,25 +4719,25 @@ msgstr ""
 "Errazago irakurtzeko, bertikalki hasten eta amaitzen diren fluxuak grisez "
 "bistara daitezke"
 
-#: ../objects/SADT/arrow.c:465
+#: ../objects/SADT/arrow.c:470
 msgid "SADT Arrow"
 msgstr "SADT gezia"
 
-#: ../objects/SADT/box.c:139 ../objects/custom/custom_object.c:226
+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
 #: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
 #: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
 msgid "Text padding"
 msgstr "Testu-betegarria"
 
-#: ../objects/SADT/box.c:146
+#: ../objects/SADT/box.c:149
 msgid "Activity/Data identifier"
 msgstr "Jarduera/Datu-identifikatzailea"
 
-#: ../objects/SADT/box.c:147
+#: ../objects/SADT/box.c:150
 msgid "The identifier which appears in the lower right corner of the Box"
 msgstr "Laukiaren behealdeko eskuin-ertzean agertzen den identifikatzailea"
 
-#: ../objects/SADT/box.c:455
+#: ../objects/SADT/box.c:460
 msgid "SADT box"
 msgstr "SADT laukia"
 
@@ -5012,7 +5052,7 @@ msgstr "Garatzailea"
 msgid "Operator / Maintenance"
 msgstr "Operadorea / Mantentzea"
 
-#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
 msgid "Network"
 msgstr "Sarea"
 
@@ -5028,7 +5068,7 @@ msgstr "Atzerapen pasibo edo aktiboa"
 msgid "Communication interface"
 msgstr "Komunikazioaren interfazea"
 
-#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:21
 msgid "Software"
 msgstr "Softwarea"
 
@@ -5135,7 +5175,7 @@ msgid "Document title"
 msgstr "Dokumentuaren titulua"
 
 #: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
-#: ../sheets/UML.sheet.in.h:2
+#: ../sheets/UML.sheet.in.h:15
 msgid "Actor"
 msgstr "Aktorea"
 
@@ -5189,7 +5229,7 @@ msgid "Side B"
 msgstr "B aldea"
 
 #: ../objects/UML/class.c:142 ../objects/UML/class.c:325
-#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:6
+#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:3
 msgid "Class"
 msgstr "Klasea"
 
@@ -5428,7 +5468,7 @@ msgstr "Eragiketa-datuak"
 msgid "_Templates"
 msgstr "_Txantiloiak"
 
-#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:4
 msgid "Template class"
 msgstr "Txantiloi-klasea"
 
@@ -5444,19 +5484,19 @@ msgstr "Muga"
 msgid "Is object"
 msgstr "Objektua da"
 
-#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:21
 msgid "Facet"
 msgstr "Alderdia"
 
-#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:22
 msgid "Receptacle"
 msgstr "Errezeptakulua"
 
-#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:23
 msgid "Event Source"
 msgstr "Gertaera-iturburua"
 
-#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:24
 msgid "Event Sink"
 msgstr "Gertaera-hobia"
 
@@ -5599,7 +5639,7 @@ msgstr "Ekintza"
 msgid "Action to perform when this transition is taken"
 msgstr "Ekintza (trantsizio hau gertatzean egikaritzeko)"
 
-#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:43
+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
 msgid "Guard"
 msgstr "Zaintzailea"
 
@@ -5647,7 +5687,7 @@ msgstr "Lankidetza"
 msgid "Chronogram diagram objects"
 msgstr "Kronograma diagrama-objektuak"
 
-#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:5
 msgid "Data"
 msgstr "Datuak"
 
@@ -5677,13 +5717,11 @@ msgstr ""
 "u iraupena  seinalea \"ezezaguna\" egoeran jartzen du; itxaron 'iraupena'.\n"
 "adibidea : @ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
+#: ../objects/chronogram/chronoline.c:166 ../objects/chronogram/chronoref.c:148
 msgid "Start time"
 msgstr "Hasiera-ordua"
 
-#: ../objects/chronogram/chronoline.c:168
-#: ../objects/chronogram/chronoref.c:150
+#: ../objects/chronogram/chronoline.c:168 ../objects/chronogram/chronoref.c:150
 msgid "End time"
 msgstr "Amaiera-ordua"
 
@@ -5699,8 +5737,7 @@ msgstr "Erortze-denbora"
 msgid "Multi-bit data"
 msgstr "Multi-bit datuak"
 
-#: ../objects/chronogram/chronoline.c:175
-#: ../objects/chronogram/chronoref.c:158
+#: ../objects/chronogram/chronoline.c:175 ../objects/chronogram/chronoref.c:158
 msgid "Aspect"
 msgstr "Itxura"
 
@@ -5737,12 +5774,12 @@ msgid "Custom XML shapes loader"
 msgstr "XML forma pertsonalizatuen kargatzailea"
 
 #: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
-#: ../objects/custom/custom_object.c:1780
+#: ../objects/custom/custom_object.c:1782
 msgid "Flip horizontal"
 msgstr "Irauli horizontalki"
 
 #: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
-#: ../objects/custom/custom_object.c:1781
+#: ../objects/custom/custom_object.c:1783
 msgid "Flip vertical"
 msgstr "Irauli bertikalki"
 
@@ -5750,7 +5787,7 @@ msgstr "Irauli bertikalki"
 msgid "Scale of the subshapes"
 msgstr "Azpiformen eskala"
 
-#: ../objects/custom/custom_object.c:1818
+#: ../objects/custom/custom_object.c:1820
 #: ../objects/custom_lines/custom_linetypes.c:263
 #, c-format
 msgid "Cannot open icon file %s for object type '%s'."
@@ -5766,12 +5803,14 @@ msgstr "XML lerro pertsonalizatuen kargatzailea"
 
 #: ../objects/custom_lines/custom_linetypes.c:226
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
-msgstr "BARNEKOA: LerroPertsonalizatuak: lerro mota ilegala LineInfo objektuan."
+msgstr ""
+"BARNEKOA: LerroPertsonalizatuak: lerro mota ilegala LineInfo objektuan."
 
 #: ../objects/custom_lines/custom_linetypes.c:251
 #, c-format
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
-msgstr "BARNEKOA: LerroPertsonalizatuak: lerro mota ilegala LineInfo %s objektuan."
+msgstr ""
+"BARNEKOA: LerroPertsonalizatuak: lerro mota ilegala LineInfo %s objektuan."
 
 #: ../objects/custom/shape_info.c:162
 #, c-format
@@ -5810,7 +5849,7 @@ msgstr "Erradioa"
 msgid "Width"
 msgstr "Zabalera"
 
-#: ../objects/standard/arc.c:143
+#: ../objects/standard/arc.c:141
 msgid "Curve distance"
 msgstr "Kurba-distantzia"
 
@@ -5948,7 +5987,7 @@ msgstr "Zoomaren erakuslea"
 msgid "Visible rect pointer"
 msgstr "Zuzenaren erakuslea ikusgai"
 
-#: ../plug-ins/cairo/diacairo.c:129
+#: ../plug-ins/cairo/diacairo.c:118
 #, c-format
 msgid ""
 "Can't convert output filename '%s' to locale encoding.\n"
@@ -5957,61 +5996,61 @@ msgstr ""
 "Ezin da irteerako '%s' fitxategia lokaleko kodeketara bihurtu.\n"
 "Aukeratu beste izen bat Cairo-rekin gordetzeko.\n"
 
-#: ../plug-ins/cairo/diacairo.c:256 ../plug-ins/cairo/diacairo.c:272
+#: ../plug-ins/cairo/diacairo.c:245 ../plug-ins/cairo/diacairo.c:261
 #, c-format
 msgid "Can't write %d bytes to %s"
 msgstr "Ezin dira %d byte idatzi '%s'(e)n"
 
-#: ../plug-ins/cairo/diacairo.c:285
+#: ../plug-ins/cairo/diacairo.c:274
 msgid "Clipboard copy failed"
 msgstr "Huts egin du arbela kopiatzean"
 
-#: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1388
+#: ../plug-ins/cairo/diacairo.c:300 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1381
 msgid "Nothing to print"
 msgstr "Ezer ez inprimatzeko"
 
-#: ../plug-ins/cairo/diacairo.c:322
+#: ../plug-ins/cairo/diacairo.c:311
 msgid "Printing with Gtk+(cairo) requires at least version 2.10."
 msgstr "Gtk+ (Cairo)-rekin inprimatzeko gutxienez 2.10 bertsioa behar da."
 
-#: ../plug-ins/cairo/diacairo.c:329
+#: ../plug-ins/cairo/diacairo.c:318
 msgid "Cairo PostScript"
 msgstr "Cairo PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:340
+#: ../plug-ins/cairo/diacairo.c:329
 msgid "Cairo Portable Document Format"
 msgstr "Cairo-ren 'Portable Document Format'"
 
-#: ../plug-ins/cairo/diacairo.c:355
+#: ../plug-ins/cairo/diacairo.c:344
 msgid "Cairo Scalable Vector Graphics"
 msgstr "Cairo-ren Bektore-Grafiko Eskalakorra"
 
-#: ../plug-ins/cairo/diacairo.c:366
+#: ../plug-ins/cairo/diacairo.c:355
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: ../plug-ins/cairo/diacairo.c:374
+#: ../plug-ins/cairo/diacairo.c:363
 msgid "Cairo PNG (with alpha)"
 msgstr "Cairo PNG (alfa-rekin)"
 
-#: ../plug-ins/cairo/diacairo.c:384
+#: ../plug-ins/cairo/diacairo.c:373
 msgid "Cairo EMF"
 msgstr "Cairo EMF"
 
-#: ../plug-ins/cairo/diacairo.c:394
+#: ../plug-ins/cairo/diacairo.c:383
 msgid "Cairo WMF"
 msgstr "Cairo WMF"
 
-#: ../plug-ins/cairo/diacairo.c:416
+#: ../plug-ins/cairo/diacairo.c:405
 msgid "Copy _Diagram"
 msgstr "Kopiatu _diagrama"
 
-#: ../plug-ins/cairo/diacairo.c:426
+#: ../plug-ins/cairo/diacairo.c:415
 msgid "Print (GTK) ..."
 msgstr "Inprimatu (GTK) ..."
 
-#: ../plug-ins/cairo/diacairo.c:471
+#: ../plug-ins/cairo/diacairo.c:460
 msgid "Cairo based Rendering"
 msgstr "Cairo-n oinarritutako errendatua"
 
@@ -6122,8 +6161,7 @@ msgstr "'TeX Metapost' makroak"
 msgid "LaTeX PGF export filter"
 msgstr "'LaTeX PGF' esportatzeko iragazkia"
 
-#: ../plug-ins/pgf/render_pgf.c:1112
-#: ../plug-ins/pstricks/render_pstricks.c:733
+#: ../plug-ins/pgf/render_pgf.c:1112 ../plug-ins/pstricks/render_pstricks.c:733
 msgid "Not valid UTF8"
 msgstr "UTF8 baliogabea"
 
@@ -6151,11 +6189,11 @@ msgid "Select Printer"
 msgstr "Hautatu inprimagailua"
 
 #: ../plug-ins/postscript/paginate_psprint.c:285
-#: ../sheets/ciscocomputer.sheet.in.h:36
+#: ../sheets/ciscocomputer.sheet.in.h:37
 msgid "Printer"
 msgstr "Inprimagailua"
 
-#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
 msgid "File"
 msgstr "Fitxategia"
 
@@ -6292,15 +6330,22 @@ msgid "MoveTo not at start of Bezier\n"
 msgstr "Ez eduki 'MoveTo'  Bezier-en hasieran\n"
 
 #: ../plug-ins/vdx/vdx-import.c:1740
-msgid "Invalid NURBS formula"
-msgstr "NURBS formula baliogabea"
+#| msgid "Invalid NURBS formula"
+msgid "Invalid NURBS formula\n"
+msgstr "NURBS formula baliogabea\n"
 
 #: ../plug-ins/vdx/vdx-import.c:1984
 #, c-format
 msgid "Couldn't write file %s"
 msgstr "Ezin izan da %s fitxategia idatzi"
 
-#: ../plug-ins/vdx/vdx-import.c:2069 ../plug-ins/vdx/vdx-import.c:2082
+#: ../plug-ins/vdx/vdx-import.c:2069
+#, c-format
+#| msgid "Couldn't handle foreign object type %s"
+msgid "Couldn't handle foreign object type %s\n"
+msgstr "Ezin izan da kanpoko %s objektu mota kudeatu\n"
+
+#: ../plug-ins/vdx/vdx-import.c:2082
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "Ezin izan da kanpoko %s objektu mota kudeatu"
@@ -6310,14 +6355,15 @@ msgstr "Ezin izan da kanpoko %s objektu mota kudeatu"
 msgid "Couldn't make object dir %s"
 msgstr "Ezin izan da %s direktorio objektua sortu"
 
-#: ../plug-ins/vdx/vdx-import.c:3100
+#: ../plug-ins/vdx/vdx-import.c:3118
 msgid "Visio XML File Format"
 msgstr "Visio XML fitxategi-formatua"
 
 #: ../plug-ins/vdx/vdx-xml.c:3344
 #, c-format
-msgid "Can't decode object %s"
-msgstr "Ezin da %s objektua deskodetu"
+#| msgid "Can't decode object %s"
+msgid "Can't decode object %s\n"
+msgstr "Ezin da %s objektua deskodetu\n"
 
 #: ../plug-ins/vdx/vdx-xml.c:5125
 #, c-format
@@ -6328,7 +6374,7 @@ msgstr "Ezin dira %u objektu idatzi"
 msgid "Visio XML Format import and export filter"
 msgstr "Visio XML formatua inportatzeko eta esportatzeko iragazkia"
 
-#: ../plug-ins/wmf/wmf.cpp:506
+#: ../plug-ins/wmf/wmf.cpp:499
 #, c-format
 msgid ""
 "Can not render unknown font:\n"
@@ -6337,24 +6383,24 @@ msgstr ""
 "Ezin da letra-tipo ezezaguna errendatu:\n"
 "%s"
 
-#: ../plug-ins/wmf/wmf.cpp:1265
+#: ../plug-ins/wmf/wmf.cpp:1258
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "Ezin izan da '%s' idazteko ireki.\n"
 
-#: ../plug-ins/wmf/wmf.cpp:1364
+#: ../plug-ins/wmf/wmf.cpp:1357
 msgid "Windows Meta File"
 msgstr "Windows-en metafitxategia"
 
-#: ../plug-ins/wmf/wmf.cpp:1373
+#: ../plug-ins/wmf/wmf.cpp:1366
 msgid "Enhanced Meta File"
 msgstr "Hobetutako metafitxategia"
 
-#: ../plug-ins/wmf/wmf.cpp:1395
+#: ../plug-ins/wmf/wmf.cpp:1388
 msgid "Print (GDI) ..."
 msgstr "Inprimatu (GDI) ..."
 
-#: ../plug-ins/wmf/wmf.cpp:1410
+#: ../plug-ins/wmf/wmf.cpp:1403
 msgid "WMF export filter"
 msgstr "WMF esportatzeko iragazkia"
 
@@ -6371,20 +6417,20 @@ msgstr "WPG"
 msgid "WordPerfect Graphics export filter"
 msgstr "WordPerfect grafikoak esportatzeko iragazkia"
 
-#: ../plug-ins/xfig/xfig-export.c:461
+#: ../plug-ins/xfig/xfig-export.c:463
 #, c-format
 msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
 msgstr ""
 "FIG formatuak ez du %s gezi-estiloaren baliokiderik, gezi soila erabiliko "
 "da.\n"
 
-#: ../plug-ins/xfig/xfig-export.c:484
+#: ../plug-ins/xfig/xfig-export.c:486
 msgid "No more user-definable colors - using black"
 msgstr ""
 "Ez dago erabiltzaileak definitzeko moduko kolore gehiago - beltza erabiliko "
 "da"
 
-#: ../plug-ins/xfig/xfig-export.c:1205
+#: ../plug-ins/xfig/xfig-export.c:1207
 msgid "XFig format"
 msgstr "XFig formatua"
 
@@ -6651,46 +6697,51 @@ msgstr "AADL"
 msgid "AADL Shapes"
 msgstr "AADL formak"
 
-#: ../sheets/AADL.sheet.in.h:3
-msgid "Bus"
-msgstr "Bus"
-
-#: ../sheets/AADL.sheet.in.h:5
-msgid "Device"
-msgstr "Gailua"
+#: ../sheets/AADL.sheet.in.h:4
+msgid "Thread"
+msgstr "Haria"
 
 #: ../sheets/AADL.sheet.in.h:6
+msgid "Processor"
+msgstr "Prozesadorea"
+
+#: ../sheets/AADL.sheet.in.h:7
 msgid "Memory"
 msgstr "Memoria"
 
-#: ../sheets/AADL.sheet.in.h:7
-msgid "Package"
-msgstr "Paketea"
+#: ../sheets/AADL.sheet.in.h:8
+msgid "Bus"
+msgstr "Bus"
 
 #: ../sheets/AADL.sheet.in.h:9
-msgid "Processor"
-msgstr "Prozesadorea"
+msgid "System"
+msgstr "Sistema"
 
 #: ../sheets/AADL.sheet.in.h:10
 msgid "Subprogram"
 msgstr "Azpi-programa"
 
 #: ../sheets/AADL.sheet.in.h:11
-msgid "System"
-msgstr "Sistema"
+msgid "Thread Group"
+msgstr "Hari-taldea"
 
 #: ../sheets/AADL.sheet.in.h:12
-msgid "Thread"
-msgstr "Haria"
+msgid "Device"
+msgstr "Gailua"
 
 #: ../sheets/AADL.sheet.in.h:13
-msgid "Thread Group"
-msgstr "Hari-taldea"
+msgid "Package"
+msgstr "Paketea"
+
+#. Please talk to me before making any changes to this sheet
+#: ../sheets/Assorted.sheet.in.h:2
+msgid "Assorted"
+msgstr "Askotarikoa"
 
 #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
 #. Leave as is for now, renaming too much hassle.
 #. Will probably need to split into seperate sheets soon anyway.
-#: ../sheets/Assorted.sheet.in.h:4
+#: ../sheets/Assorted.sheet.in.h:6
 msgid ""
 "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
 "Geometric Shapes"
@@ -6698,560 +6749,556 @@ msgstr ""
 "Poligono, Beziergono eta bestelako hainbat forma geometrikoren askotariko "
 "bilduma"
 
-#. Please talk to me before making any changes to this sheet
-#: ../sheets/Assorted.sheet.in.h:6
-msgid "Assorted"
-msgstr "Askotarikoa"
-
 #: ../sheets/Assorted.sheet.in.h:7
-msgid "Chevron"
-msgstr "Xebroia"
+msgid "Right angle triangle"
+msgstr "Triangelu angeluzuzena"
 
 #: ../sheets/Assorted.sheet.in.h:8
-msgid "Curved eight point star"
-msgstr "Zortzi puntako izar kurbatua"
+msgid "Isoceles triangle"
+msgstr "Triangelu isoszelea"
 
 #: ../sheets/Assorted.sheet.in.h:9
-msgid "Curved four point star"
-msgstr "Lau puntako izar kurbatua"
+msgid "Perfect square, height equals width"
+msgstr "Lauki perfektua; altuera zabaleraren berdina"
 
 #: ../sheets/Assorted.sheet.in.h:10
-msgid "Diamond"
-msgstr "Diamantea"
+msgid "Perfect circle"
+msgstr "Zirkulu perfektua"
 
 #: ../sheets/Assorted.sheet.in.h:11
-msgid "Down arrow"
-msgstr "Behera gezia"
+msgid "Quarter circle"
+msgstr "Zirkulu-laurdena"
 
 #: ../sheets/Assorted.sheet.in.h:12
-msgid "Eight point star"
-msgstr "Zortzi puntako izarra"
+msgid "Diamond"
+msgstr "Diamantea"
 
 #: ../sheets/Assorted.sheet.in.h:13
-msgid "Five point star"
-msgstr "Bost puntako izarra"
+msgid "Pentagon. Five sided shape"
+msgstr "Pentagonoa. Bost aldeko forma"
 
 #: ../sheets/Assorted.sheet.in.h:14
-msgid "Four point star"
-msgstr "Lau puntako izarra"
+msgid "Hexagon. Six sided shape"
+msgstr "Hexagonoa. Sei aldeko forma"
 
 #: ../sheets/Assorted.sheet.in.h:15
-msgid "Heart"
-msgstr "Bihotza"
-
-#: ../sheets/Assorted.sheet.in.h:16
 msgid "Heptagon. Seven sided shape"
 msgstr "Heptagonoa. Zazpi aldeko forma"
 
-#: ../sheets/Assorted.sheet.in.h:17
-msgid "Hexagon. Six sided shape"
-msgstr "Hexagonoa. Sei aldeko forma"
+#: ../sheets/Assorted.sheet.in.h:16
+msgid "Octogon. Eight sided shape"
+msgstr "Oktogonoa. Zortzi aldeko forma"
 
-#: ../sheets/Assorted.sheet.in.h:18
+#: ../sheets/Assorted.sheet.in.h:17
 msgid "Horizontal parallelogram"
 msgstr "Paralelogramo horizontala"
 
+#: ../sheets/Assorted.sheet.in.h:18
+msgid "Vertical parallelogram"
+msgstr "Paralelogramo bertikala"
+
 #: ../sheets/Assorted.sheet.in.h:19
-msgid "Isoceles triangle"
-msgstr "Triangelu isoszelea"
+msgid "Trapezoid"
+msgstr "Trapezoidea"
 
 #: ../sheets/Assorted.sheet.in.h:20
-msgid "Left arrow"
-msgstr "Ezker-gezia"
+msgid "Four point star"
+msgstr "Lau puntako izarra"
 
 #: ../sheets/Assorted.sheet.in.h:21
-msgid "Left-right arrow"
-msgstr "Ezker-eskuin gezia"
+msgid "Curved four point star"
+msgstr "Lau puntako izar kurbatua"
 
 #: ../sheets/Assorted.sheet.in.h:22
-msgid "Left-right-up arrow"
-msgstr "Ezker-eskuin-gora gezia"
+msgid "Five point star"
+msgstr "Bost puntako izarra"
 
 #: ../sheets/Assorted.sheet.in.h:23
-msgid "Left-up arrow"
-msgstr "Ezkerrera-gora gezia"
+msgid "Six point star"
+msgstr "Sei puntako izarra"
 
 #: ../sheets/Assorted.sheet.in.h:24
-msgid "Maltese cross"
-msgstr "Gurutze maltarra"
+msgid "Seven point star"
+msgstr "Zazpi puntako izarra"
 
 #: ../sheets/Assorted.sheet.in.h:25
-msgid "Notched left arrow"
-msgstr "Ezker-gezi moztua"
+msgid "Eight point star"
+msgstr "Zortzi puntako izarra"
 
 #: ../sheets/Assorted.sheet.in.h:26
-msgid "Notched right arrow"
-msgstr "Eskuin-gezi moztua"
+msgid "Sharp eight point star"
+msgstr "Zortzi puntako izar zorrotza"
 
 #: ../sheets/Assorted.sheet.in.h:27
-msgid "Octogon. Eight sided shape"
-msgstr "Oktogonoa. Zortzi aldeko forma"
+msgid "Curved eight point star"
+msgstr "Zortzi puntako izar kurbatua"
 
 #: ../sheets/Assorted.sheet.in.h:28
-msgid "Pentagon block arrow"
-msgstr "Pentagono-bloke gezia"
+msgid "Swiss cross"
+msgstr "Gurutze suitzarra"
 
 #: ../sheets/Assorted.sheet.in.h:29
-msgid "Pentagon. Five sided shape"
-msgstr "Pentagonoa. Bost aldeko forma"
+msgid "Maltese cross"
+msgstr "Gurutze maltarra"
 
 #: ../sheets/Assorted.sheet.in.h:30
-msgid "Perfect circle"
-msgstr "Zirkulu perfektua"
+msgid "Down arrow"
+msgstr "Behera gezia"
 
 #: ../sheets/Assorted.sheet.in.h:31
-msgid "Perfect square, height equals width"
-msgstr "Lauki perfektua; altuera zabaleraren berdina"
+msgid "Up arrow"
+msgstr "Gora gezia"
 
 #: ../sheets/Assorted.sheet.in.h:32
-msgid "Quad arrow"
-msgstr "Lau aldeetarako gezia"
+msgid "Left arrow"
+msgstr "Ezker-gezia"
 
 #: ../sheets/Assorted.sheet.in.h:33
-msgid "Quarter circle"
-msgstr "Zirkulu-laurdena"
+msgid "Right arrow"
+msgstr "Eskuin-gezia"
 
 #: ../sheets/Assorted.sheet.in.h:34
-msgid "Quarter moon"
-msgstr "Ilargi-laurdena"
-
+msgid "Notched left arrow"
+msgstr "Ezker-gezi moztua"
+
 #: ../sheets/Assorted.sheet.in.h:35
-msgid "Right angle triangle"
-msgstr "Triangelu angeluzuzena"
+msgid "Notched right arrow"
+msgstr "Eskuin-gezi moztua"
 
 #: ../sheets/Assorted.sheet.in.h:36
-msgid "Right arrow"
-msgstr "Eskuin-gezia"
+msgid "Left-up arrow"
+msgstr "Ezkerrera-gora gezia"
 
 #: ../sheets/Assorted.sheet.in.h:37
-msgid "Seven point star"
-msgstr "Zazpi puntako izarra"
+msgid "Turn-up arrow"
+msgstr "Biratu-gora gezia"
 
 #: ../sheets/Assorted.sheet.in.h:38
-msgid "Sharp eight point star"
-msgstr "Zortzi puntako izar zorrotza"
+msgid "Left-right arrow"
+msgstr "Ezker-eskuin gezia"
 
 #: ../sheets/Assorted.sheet.in.h:39
-msgid "Six point star"
-msgstr "Sei puntako izarra"
+msgid "Up-down arrow"
+msgstr "Gora-behera gezia"
 
 #: ../sheets/Assorted.sheet.in.h:40
-msgid "Sun"
-msgstr "Eguzkia"
+msgid "Quad arrow"
+msgstr "Lau aldeetarako gezia"
 
 #: ../sheets/Assorted.sheet.in.h:41
-msgid "Swiss cross"
-msgstr "Gurutze suitzarra"
+msgid "Left-right-up arrow"
+msgstr "Ezker-eskuin-gora gezia"
 
 #: ../sheets/Assorted.sheet.in.h:42
-msgid "Trapezoid"
-msgstr "Trapezoidea"
+msgid "Up-down-left arrow"
+msgstr "Gora-behera-ezkerrera gezia"
 
 #: ../sheets/Assorted.sheet.in.h:43
-msgid "Turn-up arrow"
-msgstr "Biratu-gora gezia"
+msgid "Pentagon block arrow"
+msgstr "Pentagono-bloke gezia"
 
 #: ../sheets/Assorted.sheet.in.h:44
-msgid "Up arrow"
-msgstr "Gora gezia"
+msgid "Chevron"
+msgstr "Xebroia"
 
 #: ../sheets/Assorted.sheet.in.h:45
-msgid "Up-down arrow"
-msgstr "Gora-behera gezia"
+msgid "Heart"
+msgstr "Bihotza"
 
 #: ../sheets/Assorted.sheet.in.h:46
-msgid "Up-down-left arrow"
-msgstr "Gora-behera-ezkerrera gezia"
+msgid "Sun"
+msgstr "Eguzkia"
 
 #: ../sheets/Assorted.sheet.in.h:47
-msgid "Vertical parallelogram"
-msgstr "Paralelogramo bertikala"
-
-#: ../sheets/BPMN.sheet.in.h:1
-msgid "Activity Looping"
-msgstr "Jardueraren begizta"
-
-#: ../sheets/BPMN.sheet.in.h:2
-msgid "Ad-Hoc Collapsed Sub-Process"
-msgstr "Bereziki hartutako azpiprozesua"
+msgid "Quarter moon"
+msgstr "Ilargi-laurdena"
 
 #. For: anthonym
-#: ../sheets/BPMN.sheet.in.h:4
+#: ../sheets/BPMN.sheet.in.h:2
 msgid "BPMN"
 msgstr "BPMN"
 
-#: ../sheets/BPMN.sheet.in.h:5
+#: ../sheets/BPMN.sheet.in.h:3
 msgid "Business Process Modeling Notation"
-msgstr "Business Process Modeling Notation (Enpresako prozesua modelatzeko notazioa)"
+msgstr ""
+"Business Process Modeling Notation (Enpresako prozesua modelatzeko notazioa)"
+
+#: ../sheets/BPMN.sheet.in.h:4
+msgid "Start Event"
+msgstr "Hasierako gertaera"
+
+#: ../sheets/BPMN.sheet.in.h:5
+msgid "Start Event - Message"
+msgstr "Hasierako gertaera - Mezua"
 
 #: ../sheets/BPMN.sheet.in.h:6
-msgid "Collapsed Sub-Process"
-msgstr "Hartutako azpiprozesua"
+msgid "Start Event - Timer"
+msgstr "Hasierako gertaera - Tenporizadorea"
 
 #: ../sheets/BPMN.sheet.in.h:7
-msgid "Compensation Collapsed Sub-Process"
-msgstr "Hartutako azpiprozesuaren kalte-ordaina"
+msgid "Start Event - Rule"
+msgstr "Hasierako gertaera - Araua"
 
 #: ../sheets/BPMN.sheet.in.h:8
-msgid "Compensation Task"
-msgstr "Kalte-ordainen ataza"
+msgid "Start Event - Link"
+msgstr "Hasierako gertaera - Esteka"
 
 #: ../sheets/BPMN.sheet.in.h:9
-msgid "Complex"
-msgstr "Konplexua"
+msgid "Start Event - Multiple"
+msgstr "Hasierako gertaera - Hainbat"
 
 #: ../sheets/BPMN.sheet.in.h:10
-msgid "Data Object"
-msgstr "Datu-objektua"
+msgid "Intermediate Event"
+msgstr "Tarteko gertaera"
 
 #: ../sheets/BPMN.sheet.in.h:11
-msgid "End Event"
-msgstr "Amaierako gertaera"
+msgid "Intermediate Event - Message"
+msgstr "Tarteko gertaera - Mezua"
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "End Event - Cancel"
-msgstr "Amaierako gertaera - Bertan behera utzi"
+msgid "Intermediate Event - Timer"
+msgstr "Tarteko gertaera - Tenporizadorea"
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "End Event - Compensation"
-msgstr "Amaierako gertaera - Kalte-ordainketa"
+msgid "Intermediate Event - Error"
+msgstr "Tarteko gertaera - Errorea"
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "End Event - Error"
-msgstr "Amaierako gertaera - Errorea"
+msgid "Intermediate Event - Cancel"
+msgstr "Tarteko gertaera - Bertan behera utzi"
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "End Event - Link"
-msgstr "Amaierako gertaera - Esteka"
+msgid "Intermediate Event - Compensation"
+msgstr "Tarteko gertaera - Kalte-ordainketa"
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "End Event - Message"
-msgstr "Amaierako gertaera - Mezua"
+msgid "Intermediate Event - Rule"
+msgstr "Tarteko gertaera - Araua"
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "End Event - Multiple"
-msgstr "Amaierako gertaera - Hainbat"
+msgid "Intermediate Event - Link"
+msgstr "Tarteko gertaera - Esteka"
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "End Event - Terminate"
-msgstr "Amaierako gertaera - Amaitu"
+msgid "Intermediate Event - Multiple"
+msgstr "Tarteko gertaera - Hainbat"
 
 #: ../sheets/BPMN.sheet.in.h:19
-msgid "Exclusive (XOR) Data Based"
-msgstr "Datuetan oinarritutako esklusiboa (XOR)"
+msgid "End Event"
+msgstr "Amaierako gertaera"
 
 #: ../sheets/BPMN.sheet.in.h:20
-msgid "Exclusive (XOR) Event Based"
-msgstr "Gertaeretan oinarritutako esklusiboa (XOR)"
+msgid "End Event - Message"
+msgstr "Amaierako gertaera - Mezua"
 
 #: ../sheets/BPMN.sheet.in.h:21
-msgid "Gateway"
-msgstr "Atebidea"
+msgid "End Event - Error"
+msgstr "Amaierako gertaera - Errorea"
 
 #: ../sheets/BPMN.sheet.in.h:22
-msgid "Group"
-msgstr "Taldea"
+msgid "End Event - Cancel"
+msgstr "Amaierako gertaera - Bertan behera utzi"
 
 #: ../sheets/BPMN.sheet.in.h:23
-msgid "Inclusive (OR)"
-msgstr "Inklusiboa (OR)"
+msgid "End Event - Compensation"
+msgstr "Amaierako gertaera - Kalte-ordainketa"
 
 #: ../sheets/BPMN.sheet.in.h:24
-msgid "Intermediate Event"
-msgstr "Tarteko gertaera"
+msgid "End Event - Link"
+msgstr "Amaierako gertaera - Esteka"
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "Intermediate Event - Cancel"
-msgstr "Tarteko gertaera - Bertan behera utzi"
+msgid "End Event - Multiple"
+msgstr "Amaierako gertaera - Hainbat"
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "Intermediate Event - Compensation"
-msgstr "Tarteko gertaera - Kalte-ordainketa"
+msgid "End Event - Terminate"
+msgstr "Amaierako gertaera - Amaitu"
 
 #: ../sheets/BPMN.sheet.in.h:27
-msgid "Intermediate Event - Error"
-msgstr "Tarteko gertaera - Errorea"
+msgid "Gateway"
+msgstr "Atebidea"
 
 #: ../sheets/BPMN.sheet.in.h:28
-msgid "Intermediate Event - Link"
-msgstr "Tarteko gertaera - Esteka"
+msgid "Exclusive (XOR) Data Based"
+msgstr "Datuetan oinarritutako esklusiboa (XOR)"
 
 #: ../sheets/BPMN.sheet.in.h:29
-msgid "Intermediate Event - Message"
-msgstr "Tarteko gertaera - Mezua"
+msgid "Exclusive (XOR) Event Based"
+msgstr "Gertaeretan oinarritutako esklusiboa (XOR)"
 
 #: ../sheets/BPMN.sheet.in.h:30
-msgid "Intermediate Event - Multiple"
-msgstr "Tarteko gertaera - Hainbat"
+msgid "Inclusive (OR)"
+msgstr "Inklusiboa (OR)"
 
 #: ../sheets/BPMN.sheet.in.h:31
-msgid "Intermediate Event - Rule"
-msgstr "Tarteko gertaera - Araua"
+msgid "Complex"
+msgstr "Konplexua"
 
 #: ../sheets/BPMN.sheet.in.h:32
-msgid "Intermediate Event - Timer"
-msgstr "Tarteko gertaera - Tenporizadorea"
-
-#: ../sheets/BPMN.sheet.in.h:33
-msgid "Looping Collapsed Sub-Process"
-msgstr "Hartutako azpiprozesuaren begizta"
+msgid "Parallel (AND)"
+msgstr "Paraleloa (AND)"
 
 #: ../sheets/BPMN.sheet.in.h:34
-msgid "Multiple Instance Collapsed Sub-Process"
-msgstr "Hartutako azpiprozesuaren hainbat instantzia"
+msgid "Activity Looping"
+msgstr "Jardueraren begizta"
 
 #: ../sheets/BPMN.sheet.in.h:35
 msgid "Multiple Instance Task"
 msgstr "Atazaren hainbat instantzia"
 
 #: ../sheets/BPMN.sheet.in.h:36
-msgid "Parallel (AND)"
-msgstr "Paraleloa (AND)"
+msgid "Compensation Task"
+msgstr "Kalte-ordainen ataza"
 
 #: ../sheets/BPMN.sheet.in.h:37
-msgid "Start Event"
-msgstr "Hasierako gertaera"
+msgid "Collapsed Sub-Process"
+msgstr "Hartutako azpiprozesua"
 
 #: ../sheets/BPMN.sheet.in.h:38
-msgid "Start Event - Link"
-msgstr "Hasierako gertaera - Esteka"
+msgid "Looping Collapsed Sub-Process"
+msgstr "Hartutako azpiprozesuaren begizta"
 
 #: ../sheets/BPMN.sheet.in.h:39
-msgid "Start Event - Message"
-msgstr "Hasierako gertaera - Mezua"
+msgid "Multiple Instance Collapsed Sub-Process"
+msgstr "Hartutako azpiprozesuaren hainbat instantzia"
 
 #: ../sheets/BPMN.sheet.in.h:40
-msgid "Start Event - Multiple"
-msgstr "Hasierako gertaera - Hainbat"
+msgid "Ad-Hoc Collapsed Sub-Process"
+msgstr "Bereziki hartutako azpiprozesua"
 
 #: ../sheets/BPMN.sheet.in.h:41
-msgid "Start Event - Rule"
-msgstr "Hasierako gertaera - Araua"
+msgid "Compensation Collapsed Sub-Process"
+msgstr "Hartutako azpiprozesuaren kalte-ordaina"
 
 #: ../sheets/BPMN.sheet.in.h:42
-msgid "Start Event - Timer"
-msgstr "Hasierako gertaera - Tenporizadorea"
-
-#: ../sheets/BPMN.sheet.in.h:44
-msgid "Text Annotation"
-msgstr "Testuaren anotazioa"
+msgid "Group"
+msgstr "Taldea"
 
-#: ../sheets/BPMN.sheet.in.h:45
+#: ../sheets/BPMN.sheet.in.h:43
 msgid "Transaction"
 msgstr "Transakzioa"
 
-#: ../sheets/ChemEng.sheet.in.h:1
-msgid "AC Generator"
-msgstr "KA sortzailea"
+#: ../sheets/BPMN.sheet.in.h:44
+msgid "Data Object"
+msgstr "Datu-objektua"
+
+#: ../sheets/BPMN.sheet.in.h:45
+msgid "Text Annotation"
+msgstr "Testuaren anotazioa"
 
+#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:2
-msgid "Air Cooler"
-msgstr "Aire-hozkailua"
+msgid "ChemEng"
+msgstr "Motore kimikoa"
 
 #: ../sheets/ChemEng.sheet.in.h:3
-msgid "Autoclave"
-msgstr "Auto-gakoa"
+msgid "Collection for chemical engineering"
+msgstr "Kimika ingenieritzarako bilduma"
 
 #: ../sheets/ChemEng.sheet.in.h:4
-msgid "Axial Flow Fan"
-msgstr "Ardatz-fluxuko haizagailua"
+msgid "Fan or Stirrer"
+msgstr "Haizagailua edo irabiagailua"
 
 #: ../sheets/ChemEng.sheet.in.h:5
-msgid "Basic Filter"
-msgstr "Oinarriko iragazkia"
+msgid "Spraying Device"
+msgstr "Ihinztapen gailua"
 
 #: ../sheets/ChemEng.sheet.in.h:6
-msgid "Centrifugal Pump or Fan"
-msgstr "Ponpa zentrifugoa eta haizagailua"
+msgid "Pneumatic Line"
+msgstr "Linea pneumatikoa"
 
 #: ../sheets/ChemEng.sheet.in.h:7
-msgid "Centrifuge"
-msgstr "Zentrifugoa"
+msgid "Pneumatic Line, vertical"
+msgstr "Linea pneumatikoa, bertikala"
 
-#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:9
-msgid "ChemEng"
-msgstr "Motore kimikoa"
+msgid "Simple Heat Exchanger"
+msgstr "Bero-trukagailu bakuna"
 
 #: ../sheets/ChemEng.sheet.in.h:10
-msgid "Clarifier or Settling Tank"
-msgstr "Klarifikazio- edo dekantazio-upela"
+msgid "Simple Heat Exchanger, vertical"
+msgstr "Bero-trukagailu bakuna, bertikala"
 
 #: ../sheets/ChemEng.sheet.in.h:11
-msgid "Collection for chemical engineering"
-msgstr "Kimika ingenieritzarako bilduma"
+msgid "Water Cooler"
+msgstr "Ur-hozkailua"
 
 #: ../sheets/ChemEng.sheet.in.h:12
-msgid "Compressor or Turbine"
-msgstr "Konpresorea edo turbina"
+msgid "Water Cooler, vertical"
+msgstr "Ur-hozkailua, bertikala"
 
 #: ../sheets/ChemEng.sheet.in.h:13
-msgid "Covered tank"
-msgstr "Estalitako upela"
+msgid "Fixed-Sheet Exchanger"
+msgstr "Xafla finkoaren trukatzailea"
 
 #: ../sheets/ChemEng.sheet.in.h:14
-msgid "Cyclone and hydrocyclone"
-msgstr "Zikloia eta hidrozikloia"
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr "Buru-mugiokorra edo U tutu trukagailua"
 
 #: ../sheets/ChemEng.sheet.in.h:15
-msgid "Double-Pipe Exchanger"
-msgstr "Kanalizazio-bikoitzeko trukatzailea"
+msgid "Kettle Reboiler"
+msgstr "Galdara lapikoa"
 
 #: ../sheets/ChemEng.sheet.in.h:16
-msgid "Ejector or Injector"
-msgstr "Eiektorea edo injektorea"
+msgid "Air Cooler"
+msgstr "Aire-hozkailua"
 
 #: ../sheets/ChemEng.sheet.in.h:17
-msgid "Fan or Stirrer"
-msgstr "Haizagailua edo irabiagailua"
+msgid "Forced-Flow Air Cooler"
+msgstr "Behartutako aire-fluxu hozkailua"
 
 #: ../sheets/ChemEng.sheet.in.h:18
-msgid "Fixed-Sheet Exchanger"
-msgstr "Xafla finkoaren trukatzailea"
+msgid "Induced-Flow Air Cooler"
+msgstr "Aire-fluxu hozkailu induzitua"
 
 #: ../sheets/ChemEng.sheet.in.h:19
-msgid "Floating-Head or U-Tube Exchanger"
-msgstr "Buru-mugiokorra edo U tutu trukagailua"
+msgid "Plate Exchanger"
+msgstr "Plaka trukatzailea"
 
 #: ../sheets/ChemEng.sheet.in.h:20
-msgid "Fluid Contacting Vessel, simple"
-msgstr "Fluido-kontaktuen ontzia, bakuna"
+msgid "Double-Pipe Exchanger"
+msgstr "Kanalizazio-bikoitzeko trukatzailea"
 
 #: ../sheets/ChemEng.sheet.in.h:21
-msgid "Forced-Flow Air Cooler"
-msgstr "Behartutako aire-fluxu hozkailua"
+msgid "Heating/Cooling Coil"
+msgstr "Hodibihur hoztailea/bero-emailea"
 
 #: ../sheets/ChemEng.sheet.in.h:22
-msgid "Gas Holder, basic"
-msgstr "Gasometroa, oinarrizkoa"
+msgid "Heating/Cooling Coil, vertical"
+msgstr "Hodibihur hoztaile/bero-emaile bertikala"
 
 #: ../sheets/ChemEng.sheet.in.h:23
-msgid "Heating/Cooling Coil"
-msgstr "Hodibihur hoztailea/bero-emailea"
+msgid "Simple Furnace"
+msgstr "Labe soila"
 
 #: ../sheets/ChemEng.sheet.in.h:24
-msgid "Heating/Cooling Coil, vertical"
-msgstr "Hodibihur hoztaile/bero-emaile bertikala"
+msgid "Simple Vessel"
+msgstr "Ontzi soila"
 
 #: ../sheets/ChemEng.sheet.in.h:25
-msgid "Induced-Flow Air Cooler"
-msgstr "Aire-fluxu hozkailu induzitua"
+msgid "Knock-out Drum (with demister pad)"
+msgstr "Lauza kentzeko gailu-bereizlea"
 
 #: ../sheets/ChemEng.sheet.in.h:26
-msgid "Kettle Reboiler"
-msgstr "Galdara lapikoa"
+msgid "Tray Column, simple"
+msgstr "Erretiluen zutabea, bakuna"
 
 #: ../sheets/ChemEng.sheet.in.h:27
-msgid "Knock-out Drum (with demister pad)"
-msgstr "Lauza kentzeko gailu-bereizlea"
+msgid "Tray Column, detailed"
+msgstr "Erretiluen zutabea, xehatua"
+
+#: ../sheets/ChemEng.sheet.in.h:28
+msgid "Fluid Contacting Vessel, simple"
+msgstr "Fluido-kontaktuen ontzia, bakuna"
 
 #: ../sheets/ChemEng.sheet.in.h:29
-msgid "Mixer"
-msgstr "Nahasgailua"
+msgid "Reactor or Absorption Vessel, simple"
+msgstr "Erreaktorea edo xurgatzeko ontzia, bakuna"
 
 #: ../sheets/ChemEng.sheet.in.h:30
-msgid "Open Tank"
-msgstr "Upel irekia"
+msgid "Autoclave"
+msgstr "Auto-gakoa"
 
 #: ../sheets/ChemEng.sheet.in.h:31
-msgid "Plate Exchanger"
-msgstr "Plaka trukatzailea"
+msgid "Open Tank"
+msgstr "Upel irekia"
 
 #: ../sheets/ChemEng.sheet.in.h:32
-msgid "Pneumatic Line"
-msgstr "Linea pneumatikoa"
+msgid "Clarifier or Settling Tank"
+msgstr "Klarifikazio- edo dekantazio-upela"
 
 #: ../sheets/ChemEng.sheet.in.h:33
-msgid "Pneumatic Line, vertical"
-msgstr "Linea pneumatikoa, bertikala"
+msgid "Sealed Tank"
+msgstr "Upel hermetikoa"
 
 #: ../sheets/ChemEng.sheet.in.h:34
-msgid "Positive Displacement Rotary Pump or Compressor"
-msgstr "desplazamendu positiboko ponpa birakaria edo konpresorea"
+msgid "Covered tank"
+msgstr "Estalitako upela"
 
 #: ../sheets/ChemEng.sheet.in.h:35
-msgid "Pressure Relief Valve"
-msgstr "Presioak ihes egiteko balbula"
+msgid "Tank with Fixed Roof"
+msgstr "Upela finkatutako estalkiarekin"
 
 #: ../sheets/ChemEng.sheet.in.h:36
-msgid "Reactor or Absorption Vessel, simple"
-msgstr "Erreaktorea edo xurgatzeko ontzia, bakuna"
+msgid "Tank with Floating Roof"
+msgstr "Upela estalki mugikorrarekin"
 
 #: ../sheets/ChemEng.sheet.in.h:37
-msgid "Reciprocating Compressor or Pump"
-msgstr "Pistoizko konpresorea edo ponpa"
+msgid "Storage Sphere"
+msgstr "Biltegiratze-bideratzailea"
 
 #: ../sheets/ChemEng.sheet.in.h:38
-msgid "Regulable Valve"
-msgstr "Balbula erregulagarria"
+msgid "Gas Holder, basic"
+msgstr "Gasometroa, oinarrizkoa"
 
 #: ../sheets/ChemEng.sheet.in.h:39
-msgid "Regulable Valve, vertical"
-msgstr "Balbula erregulagarria, bertikala"
+msgid "Centrifugal Pump or Fan"
+msgstr "Ponpa zentrifugoa eta haizagailua"
 
 #: ../sheets/ChemEng.sheet.in.h:40
-msgid "Sealed Tank"
-msgstr "Upel hermetikoa"
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr "desplazamendu positiboko ponpa birakaria edo konpresorea"
 
 #: ../sheets/ChemEng.sheet.in.h:41
-msgid "Simple Furnace"
-msgstr "Labe soila"
+msgid "Reciprocating Compressor or Pump"
+msgstr "Pistoizko konpresorea edo ponpa"
 
 #: ../sheets/ChemEng.sheet.in.h:42
-msgid "Simple Heat Exchanger"
-msgstr "Bero-trukagailu bakuna"
+msgid "Axial Flow Fan"
+msgstr "Ardatz-fluxuko haizagailua"
 
 #: ../sheets/ChemEng.sheet.in.h:43
-msgid "Simple Heat Exchanger, vertical"
-msgstr "Bero-trukagailu bakuna, bertikala"
+msgid "Compressor or Turbine"
+msgstr "Konpresorea edo turbina"
 
 #: ../sheets/ChemEng.sheet.in.h:44
-msgid "Simple Vessel"
-msgstr "Ontzi soila"
+msgid "Ejector or Injector"
+msgstr "Eiektorea edo injektorea"
 
 #: ../sheets/ChemEng.sheet.in.h:45
-msgid "Spray Drier"
-msgstr "Spray lehortzailea"
+msgid "AC Generator"
+msgstr "KA sortzailea"
 
 #: ../sheets/ChemEng.sheet.in.h:46
-msgid "Spraying Device"
-msgstr "Ihinztapen gailua"
+msgid "Valve"
+msgstr "Balbula"
 
 #: ../sheets/ChemEng.sheet.in.h:47
-msgid "Storage Sphere"
-msgstr "Biltegiratze-bideratzailea"
+msgid "Valve, vertical"
+msgstr "Balbula, bertikala"
 
 #: ../sheets/ChemEng.sheet.in.h:48
-msgid "Tank with Fixed Roof"
-msgstr "Upela finkatutako estalkiarekin"
+msgid "Regulable Valve"
+msgstr "Balbula erregulagarria"
 
 #: ../sheets/ChemEng.sheet.in.h:49
-msgid "Tank with Floating Roof"
-msgstr "Upela estalki mugikorrarekin"
+msgid "Regulable Valve, vertical"
+msgstr "Balbula erregulagarria, bertikala"
 
 #: ../sheets/ChemEng.sheet.in.h:50
-msgid "Tray Column, detailed"
-msgstr "Erretiluen zutabea, xehatua"
+msgid "Basic Filter"
+msgstr "Oinarriko iragazkia"
 
 #: ../sheets/ChemEng.sheet.in.h:51
-msgid "Tray Column, simple"
-msgstr "Erretiluen zutabea, bakuna"
+msgid "Mixer"
+msgstr "Nahasgailua"
 
 #: ../sheets/ChemEng.sheet.in.h:52
-msgid "Valve"
-msgstr "Balbula"
+msgid "Cyclone and hydrocyclone"
+msgstr "Zikloia eta hidrozikloia"
 
 #: ../sheets/ChemEng.sheet.in.h:53
-msgid "Valve, vertical"
-msgstr "Balbula, bertikala"
+msgid "Spray Drier"
+msgstr "Spray lehortzailea"
 
 #: ../sheets/ChemEng.sheet.in.h:54
-msgid "Water Cooler"
-msgstr "Ur-hozkailua"
+msgid "Centrifuge"
+msgstr "Zentrifugoa"
 
 #: ../sheets/ChemEng.sheet.in.h:55
-msgid "Water Cooler, vertical"
-msgstr "Ur-hozkailua, bertikala"
+msgid "Pressure Relief Valve"
+msgstr "Presioak ihes egiteko balbula"
 
 #: ../sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
@@ -7262,304 +7309,304 @@ msgid "Components for circuit diagrams"
 msgstr "Zirkuitu-diagramen osagaiak"
 
 #: ../sheets/Circuit.sheet.in.h:3
-msgid "Ground point"
-msgstr "Lur-hargunea"
+msgid "Vertically aligned resistor"
+msgstr "Bertikalki lerrokatutako erresistentzia"
 
 #: ../sheets/Circuit.sheet.in.h:4
-msgid "Horizontal jumper"
-msgstr "Jumper horizontala"
+msgid "Horizontally aligned inductor"
+msgstr "Horizontalki lerrokatutako induktorea"
 
 #: ../sheets/Circuit.sheet.in.h:5
-msgid "Horizontally aligned LED"
-msgstr "Horizontalki lerrokatutako LEDa"
+msgid "Vertically aligned inductor"
+msgstr "Bertikalki lerrokatutako induktorea"
 
 #: ../sheets/Circuit.sheet.in.h:6
-msgid "Horizontally aligned capacitor"
-msgstr "Horizontalki lerrokatutako kondentsadorea"
+msgid "Horizontally aligned resistor"
+msgstr "Horizontalki lerrokatutako erresistentzia"
 
 #: ../sheets/Circuit.sheet.in.h:7
-msgid "Horizontally aligned diode"
-msgstr "Horizontalki lerrokatutako diodoa"
+msgid "Vertically aligned resistor (European)"
+msgstr "Bertikalki lerrokatutako erresistentzia (europarra)"
 
 #: ../sheets/Circuit.sheet.in.h:8
-msgid "Horizontally aligned fuse"
-msgstr "Horizontalki lerrokatutako fusiblea"
-
-#: ../sheets/Circuit.sheet.in.h:9
-msgid "Horizontally aligned inductor"
-msgstr "Horizontalki lerrokatutako induktorea"
-
-#: ../sheets/Circuit.sheet.in.h:10
 msgid "Horizontally aligned inductor (European)"
 msgstr "Horizontalki lerrokatutako induktorea (europarra)"
 
-#: ../sheets/Circuit.sheet.in.h:11
-msgid "Horizontally aligned powersource"
-msgstr "Horizontalki lerrokatutako energia-iturria"
-
-#: ../sheets/Circuit.sheet.in.h:12
-msgid "Horizontally aligned resistor"
-msgstr "Horizontalki lerrokatutako erresistentzia"
+#: ../sheets/Circuit.sheet.in.h:9
+msgid "Vertically aligned inductor (European)"
+msgstr "Bertikalki lerrokatutako induktorea (europarra)"
 
-#: ../sheets/Circuit.sheet.in.h:13
+#: ../sheets/Circuit.sheet.in.h:10
 msgid "Horizontally aligned resistor (European)"
 msgstr "Horizontalki lerrokatutako erresistentzia (europarra)"
 
-#: ../sheets/Circuit.sheet.in.h:14
-msgid "Horizontally aligned zener diode"
-msgstr "Horizontalki lerrokatutako zener diodoa"
-
-#: ../sheets/Circuit.sheet.in.h:15
-msgid "Lamp"
-msgstr "Lanpara"
-
-#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
-msgid "Microphone"
-msgstr "Mikrofonoa"
+#: ../sheets/Circuit.sheet.in.h:11
+msgid "Horizontally aligned capacitor"
+msgstr "Horizontalki lerrokatutako kondentsadorea"
 
-#: ../sheets/Circuit.sheet.in.h:17
-msgid "NMOS transistor"
-msgstr "NMOS transistorea"
+#: ../sheets/Circuit.sheet.in.h:12
+msgid "Vertically aligned capacitor"
+msgstr "Bertikalki lerrokatutako kondentsadorea"
 
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:20
+#: ../sheets/Circuit.sheet.in.h:15
 msgid "NPN bipolar transistor"
 msgstr "NPN transistore bipolarra"
 
-#: ../sheets/Circuit.sheet.in.h:21
-msgid "Operational amplifier"
-msgstr "Anplifikadore operazionala"
-
-#: ../sheets/Circuit.sheet.in.h:22
-msgid "PMOS transistor"
-msgstr "PMOS transistorea"
-
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:25
+#: ../sheets/Circuit.sheet.in.h:18
 msgid "PNP bipolar transistor"
 msgstr "PNP transistore bipolarra"
 
-#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
-msgid "Speaker"
-msgstr "Bozgorailua"
+#: ../sheets/Circuit.sheet.in.h:19
+msgid "Horizontally aligned diode"
+msgstr "Horizontalki lerrokatutako diodoa"
+
+#: ../sheets/Circuit.sheet.in.h:20
+msgid "Vertically aligned diode"
+msgstr "Bertikalki lerrokatutako diodoa"
+
+#: ../sheets/Circuit.sheet.in.h:21
+msgid "Horizontally aligned zener diode"
+msgstr "Horizontalki lerrokatutako zener diodoa"
+
+#: ../sheets/Circuit.sheet.in.h:22
+msgid "Vertically aligned zener diode"
+msgstr "Bertikalki lerrokatutako zener diodoa"
+
+#: ../sheets/Circuit.sheet.in.h:23
+msgid "Ground point"
+msgstr "Lur-hargunea"
+
+#: ../sheets/Circuit.sheet.in.h:24
+msgid "Operational amplifier"
+msgstr "Anplifikadore operazionala"
+
+#: ../sheets/Circuit.sheet.in.h:25
+msgid "Horizontally aligned fuse"
+msgstr "Horizontalki lerrokatutako fusiblea"
+
+#: ../sheets/Circuit.sheet.in.h:26
+msgid "Vertically aligned fuse"
+msgstr "Bertikalki lerrokatutako fusiblea"
 
 #: ../sheets/Circuit.sheet.in.h:27
-msgid "Vertically aligned LED"
-msgstr "Bertikalki lerrokatutako LEDa"
+msgid "Horizontally aligned powersource"
+msgstr "Horizontalki lerrokatutako energia-iturria"
 
 #: ../sheets/Circuit.sheet.in.h:28
-msgid "Vertically aligned capacitor"
-msgstr "Bertikalki lerrokatutako kondentsadorea"
+msgid "Vertically aligned powersource"
+msgstr "Bertikalki lerrokatutako energia-iturria"
 
 #: ../sheets/Circuit.sheet.in.h:29
-msgid "Vertically aligned diode"
-msgstr "Bertikalki lerrokatutako diodoa"
+msgid "Lamp"
+msgstr "Lanpara"
 
-#: ../sheets/Circuit.sheet.in.h:30
-msgid "Vertically aligned fuse"
-msgstr "Bertikalki lerrokatutako fusiblea"
+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
+msgid "Speaker"
+msgstr "Bozgorailua"
 
-#: ../sheets/Circuit.sheet.in.h:31
-msgid "Vertically aligned inductor"
-msgstr "Bertikalki lerrokatutako induktorea"
+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
+msgid "Microphone"
+msgstr "Mikrofonoa"
 
 #: ../sheets/Circuit.sheet.in.h:32
-msgid "Vertically aligned inductor (European)"
-msgstr "Bertikalki lerrokatutako induktorea (europarra)"
+msgid "Horizontally aligned LED"
+msgstr "Horizontalki lerrokatutako LEDa"
 
 #: ../sheets/Circuit.sheet.in.h:33
-msgid "Vertically aligned powersource"
-msgstr "Bertikalki lerrokatutako energia-iturria"
+msgid "Vertically aligned LED"
+msgstr "Bertikalki lerrokatutako LEDa"
 
 #: ../sheets/Circuit.sheet.in.h:34
-msgid "Vertically aligned resistor"
-msgstr "Bertikalki lerrokatutako erresistentzia"
+msgid "NMOS transistor"
+msgstr "NMOS transistorea"
 
 #: ../sheets/Circuit.sheet.in.h:35
-msgid "Vertically aligned resistor (European)"
-msgstr "Bertikalki lerrokatutako erresistentzia (europarra)"
+msgid "PMOS transistor"
+msgstr "PMOS transistorea"
 
 #: ../sheets/Circuit.sheet.in.h:36
-msgid "Vertically aligned zener diode"
-msgstr "Bertikalki lerrokatutako zener diodoa"
+msgid "Horizontal jumper"
+msgstr "Jumper horizontala"
 
 #: ../sheets/Contact.sheet.in.h:1
-msgid "'if not' (normally closed) ladder contact"
-msgstr "'ez bada' (normalean itxita) eskailera-kontaktua"
+msgid "Ladder"
+msgstr "Eskailera"
 
 #: ../sheets/Contact.sheet.in.h:2
-msgid "'if' (normally open) ladder contact"
-msgstr "'baldin bada' (normalean irekita) eskailera-kontaktua"
+msgid "Components for LADDER circuits"
+msgstr "LADDER (eskailera) zirkuituen osagaiak"
 
 #: ../sheets/Contact.sheet.in.h:3
-msgid "'jump' output variable"
-msgstr "'jump' irteerako aldagaia"
+msgid "'if' (normally open) ladder contact"
+msgstr "'baldin bada' (normalean irekita) eskailera-kontaktua"
 
 #: ../sheets/Contact.sheet.in.h:4
-msgid "'reset' output variable"
-msgstr "'reset' irteerako aldagaia"
+msgid "'if not' (normally closed) ladder contact"
+msgstr "'ez bada' (normalean itxita) eskailera-kontaktua"
 
 #: ../sheets/Contact.sheet.in.h:5
-msgid "'set' output variable"
-msgstr "'set' irteerako aldagaia"
+msgid "Simple output variable"
+msgstr "Irteerako aldagai soila"
 
 #: ../sheets/Contact.sheet.in.h:6
-msgid "Components for LADDER circuits"
-msgstr "LADDER (eskailera) zirkuituen osagaiak"
+msgid "Negative output variable"
+msgstr "Irteerako aldagai negatiboa"
 
 #: ../sheets/Contact.sheet.in.h:7
-msgid "Ladder"
-msgstr "Eskailera"
+msgid "'set' output variable"
+msgstr "'set' irteerako aldagaia"
 
 #: ../sheets/Contact.sheet.in.h:8
-msgid "Negative output variable"
-msgstr "Irteerako aldagai negatiboa"
+msgid "'reset' output variable"
+msgstr "'reset' irteerako aldagaia"
 
 #: ../sheets/Contact.sheet.in.h:9
-msgid "Power-saved 'reset' output variable"
-msgstr "Gordetako potentziako 'reset' irteerako aldagaia"
+msgid "'jump' output variable"
+msgstr "'jump' irteerako aldagaia"
 
 #: ../sheets/Contact.sheet.in.h:10
-msgid "Power-saved 'set' output variable"
-msgstr "Gordetako potentziako 'set' irteerako aldagaia"
+msgid "Receptivity output variable"
+msgstr "Harmenaren irteerako aldagaia"
 
 #: ../sheets/Contact.sheet.in.h:11
-msgid "Power-saved negative output variable"
-msgstr "Gordetako potentziako irteerako aldagai negatiboa"
-
-#: ../sheets/Contact.sheet.in.h:12
 msgid "Power-saved simple output variable"
 msgstr "Gordetako potentziako irteerako aldagai soila"
 
+#: ../sheets/Contact.sheet.in.h:12
+msgid "Power-saved negative output variable"
+msgstr "Gordetako potentziako irteerako aldagai negatiboa"
+
 #: ../sheets/Contact.sheet.in.h:13
-msgid "Receptivity output variable"
-msgstr "Harmenaren irteerako aldagaia"
+msgid "Power-saved 'set' output variable"
+msgstr "Gordetako potentziako 'set' irteerako aldagaia"
 
 #: ../sheets/Contact.sheet.in.h:14
-msgid "Simple output variable"
-msgstr "Irteerako aldagai soila"
+msgid "Power-saved 'reset' output variable"
+msgstr "Gordetako potentziako 'reset' irteerako aldagaia"
 
 #: ../sheets/Cybernetics.sheet.in.h:1
-msgid "Constant factor below -1"
-msgstr "Faktore konstantea -1 baino txikiagoa"
+msgid "Cybernetics"
+msgstr "Zibernetika"
 
 #: ../sheets/Cybernetics.sheet.in.h:2
-msgid "Constant factor between 0 and -1"
-msgstr "Faktore konstantea 0 eta -1 artekoa"
+msgid "Elements of cybernetic circuits"
+msgstr "Zirkuitu zibernetikoetako elementuak"
 
 #: ../sheets/Cybernetics.sheet.in.h:3
-msgid "Constant factor between 0 and 1"
-msgstr "Faktore konstantea 0 eta 1 artekoa"
+msgid "Sensor - left"
+msgstr "Sentsorea - ezkerrean"
 
 #: ../sheets/Cybernetics.sheet.in.h:4
-msgid "Constant factor greater 1"
-msgstr "Faktore konstantea 1 baino handiagoa"
+msgid "Sensor - right"
+msgstr "Sentsorea - eskuinean"
 
 #: ../sheets/Cybernetics.sheet.in.h:5
-msgid "Constant negative shift on the y-axis"
-msgstr "Desplazamendu konstante negatiboa y ardatzean"
+msgid "Sensor - bottom"
+msgstr "Sentsorea - behean"
 
 #: ../sheets/Cybernetics.sheet.in.h:6
-msgid "Constant positive shift on the y-axis"
-msgstr "Desplazamendu konstante positiboa y ardatzean"
+msgid "Sensor - top"
+msgstr "Sentsorea - goian"
 
 #: ../sheets/Cybernetics.sheet.in.h:7
-msgid "Cybernetics"
-msgstr "Zibernetika"
+msgid "Sum, subtracting left input"
+msgstr "Batu, ezkerreko sarrera kenduta"
 
 #: ../sheets/Cybernetics.sheet.in.h:8
-msgid "Elements of cybernetic circuits"
-msgstr "Zirkuitu zibernetikoetako elementuak"
+msgid "Sum, subtracting right input"
+msgstr "Batu, eskuineko sarrera kenduta"
 
 #: ../sheets/Cybernetics.sheet.in.h:9
-msgid "Full wave rectifier (absolute value)"
-msgstr "Uhin osoko artezgailua (balio absolutua)"
+msgid "Sum, subtracting bottom input"
+msgstr "Batu, beheko sarrera kenduta"
 
 #: ../sheets/Cybernetics.sheet.in.h:10
-msgid "Half wave rectifier or ramp input"
-msgstr "Uhin-erdiko artezgailua edo malda-sarrera"
+msgid "Sum, subtracting top input"
+msgstr "Batu, goiko sarrera kenduta"
 
 #: ../sheets/Cybernetics.sheet.in.h:11
-msgid "High pass filter"
-msgstr "Paso altuko iragazkia"
-
-#: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator - input bottom"
-msgstr "Integratzailea - beheko sarrera"
-
-#: ../sheets/Cybernetics.sheet.in.h:13
 msgid "Integrator - input left"
 msgstr "Integratzailea - ezkerreko sarrera"
 
-#: ../sheets/Cybernetics.sheet.in.h:14
+#: ../sheets/Cybernetics.sheet.in.h:12
 msgid "Integrator - input right"
 msgstr "Integratzailea - eskuineko sarrera"
 
-#: ../sheets/Cybernetics.sheet.in.h:15
+#: ../sheets/Cybernetics.sheet.in.h:13
+msgid "Integrator - input bottom"
+msgstr "Integratzailea - beheko sarrera"
+
+#: ../sheets/Cybernetics.sheet.in.h:14
 msgid "Integrator - input top"
 msgstr "Integratzailea - goiko sarrera"
 
-#: ../sheets/Cybernetics.sheet.in.h:16
-msgid "Low pass filter"
-msgstr "Paso baxuko iragazkia"
+#: ../sheets/Cybernetics.sheet.in.h:15
+msgid "Sum"
+msgstr "Batu"
 
-#: ../sheets/Cybernetics.sheet.in.h:17
+#: ../sheets/Cybernetics.sheet.in.h:16
 msgid "Product"
 msgstr "Biderkadura"
 
+#: ../sheets/Cybernetics.sheet.in.h:17
+msgid "High pass filter"
+msgstr "Paso altuko iragazkia"
+
 #: ../sheets/Cybernetics.sheet.in.h:18
-msgid "Relay characteristic (sigma)"
-msgstr "Errele-ezaugarria (sigma)"
+msgid "Low pass filter"
+msgstr "Paso baxuko iragazkia"
 
 #: ../sheets/Cybernetics.sheet.in.h:19
-msgid "Saturation characteristic"
-msgstr "Saturazio-ezaugarria"
+msgid "Sine characteristic or input"
+msgstr "Sinu-ezaugarria edo sarrera"
 
 #: ../sheets/Cybernetics.sheet.in.h:20
-msgid "Sensor - bottom"
-msgstr "Sentsorea - behean"
+msgid "Sigmoid characteristic"
+msgstr "Sigmoide-ezaugarria"
 
 #: ../sheets/Cybernetics.sheet.in.h:21
-msgid "Sensor - left"
-msgstr "Sentsorea - ezkerrean"
+msgid "Saturation characteristic"
+msgstr "Saturazio-ezaugarria"
 
 #: ../sheets/Cybernetics.sheet.in.h:22
-msgid "Sensor - right"
-msgstr "Sentsorea - eskuinean"
+msgid "Relay characteristic (sigma)"
+msgstr "Errele-ezaugarria (sigma)"
 
 #: ../sheets/Cybernetics.sheet.in.h:23
-msgid "Sensor - top"
-msgstr "Sentsorea - goian"
+msgid "Half wave rectifier or ramp input"
+msgstr "Uhin-erdiko artezgailua edo malda-sarrera"
 
 #: ../sheets/Cybernetics.sheet.in.h:24
-msgid "Sigmoid characteristic"
-msgstr "Sigmoide-ezaugarria"
+msgid "Full wave rectifier (absolute value)"
+msgstr "Uhin osoko artezgailua (balio absolutua)"
 
 #: ../sheets/Cybernetics.sheet.in.h:25
-msgid "Sine characteristic or input"
-msgstr "Sinu-ezaugarria edo sarrera"
+msgid "Constant positive shift on the y-axis"
+msgstr "Desplazamendu konstante positiboa y ardatzean"
 
 #: ../sheets/Cybernetics.sheet.in.h:26
-msgid "Sum"
-msgstr "Batu"
+msgid "Constant negative shift on the y-axis"
+msgstr "Desplazamendu konstante negatiboa y ardatzean"
 
 #: ../sheets/Cybernetics.sheet.in.h:27
-msgid "Sum, subtracting bottom input"
-msgstr "Batu, beheko sarrera kenduta"
+msgid "Constant factor greater 1"
+msgstr "Faktore konstantea 1 baino handiagoa"
 
 #: ../sheets/Cybernetics.sheet.in.h:28
-msgid "Sum, subtracting left input"
-msgstr "Batu, ezkerreko sarrera kenduta"
+msgid "Constant factor between 0 and 1"
+msgstr "Faktore konstantea 0 eta 1 artekoa"
 
 #: ../sheets/Cybernetics.sheet.in.h:29
-msgid "Sum, subtracting right input"
-msgstr "Batu, eskuineko sarrera kenduta"
+msgid "Constant factor between 0 and -1"
+msgstr "Faktore konstantea 0 eta -1 artekoa"
 
 #: ../sheets/Cybernetics.sheet.in.h:30
-msgid "Sum, subtracting top input"
-msgstr "Batu, goiko sarrera kenduta"
+msgid "Constant factor below -1"
+msgstr "Faktore konstantea -1 baino txikiagoa"
 
 #: ../sheets/Cybernetics.sheet.in.h:31
 msgid "Template for custom characteristics"
@@ -7570,328 +7617,322 @@ msgid "Time delay"
 msgstr "Atzerapena"
 
 #: ../sheets/Database.sheet.in.h:1
-msgid "Attribute compound"
-msgstr "Atributu konposatua"
-
-#: ../sheets/Database.sheet.in.h:2
 msgid "Database"
 msgstr "Datu-basea"
 
-#: ../sheets/Database.sheet.in.h:3
+#: ../sheets/Database.sheet.in.h:2
 msgid "Editor for Database Table Relation Diagrams"
 msgstr "Datu-baseko taula-erlazioen diagramen editorea"
 
-#: ../sheets/ER.sheet.in.h:2
+#: ../sheets/Database.sheet.in.h:5
+msgid "Attribute compound"
+msgstr "Atributu konposatua"
+
+#: ../sheets/ER.sheet.in.h:1
 msgid "ER"
 msgstr "ER"
 
-#: ../sheets/ER.sheet.in.h:3
+#: ../sheets/ER.sheet.in.h:2
 msgid "Editor for Entity Relations Diagrams"
 msgstr "Entitate Erlazioen Diagramen editorea"
 
-#: ../sheets/ER.sheet.in.h:5
-msgid "Participation"
-msgstr "Partaidetza"
-
-#: ../sheets/ER.sheet.in.h:7
+#: ../sheets/ER.sheet.in.h:4
 msgid "Weak entity"
 msgstr "Entitate ahula"
 
+#: ../sheets/ER.sheet.in.h:7
+msgid "Participation"
+msgstr "Partaidetza"
+
 #: ../sheets/Electric.sheet.in.h:1
+msgid "Electric"
+msgstr "Elektrikoa"
+
+#: ../sheets/Electric.sheet.in.h:2
 msgid "Components for electric circuits"
 msgstr "Zirkuitu elektrikoetarako osagaiak"
 
-#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
-msgid "Connection point"
-msgstr "Konexio-puntua"
-
 #: ../sheets/Electric.sheet.in.h:3
-msgid "Electric"
-msgstr "Elektrikoa"
+msgid "Normally open contact (horizontal)"
+msgstr "Normalean irekitako kontaktua (horizontala)"
 
 #: ../sheets/Electric.sheet.in.h:4
-msgid "Lamp or indicator light (horizontal)"
-msgstr "Lanpara edo adierazlearen argia (horizontala)"
+msgid "Normally closed contact (horizontal)"
+msgstr "Normalean itxitako kontaktua (horizontala)"
 
 #: ../sheets/Electric.sheet.in.h:5
-msgid "Lamp or indicator light (vertical)"
-msgstr "Lanpara edo adierazlearen argia (bertikala)"
+msgid "Normally open position switch (horizontal)"
+msgstr "Normalean irekitako etengailua (horizontala)"
 
 #: ../sheets/Electric.sheet.in.h:6
-msgid "Normally closed contact (horizontal)"
-msgstr "Normalean itxitako kontaktua (horizontala)"
+msgid "Normally closed position switch (horizontal)"
+msgstr "Normalean itxitako etengailua (horizontala)"
 
 #: ../sheets/Electric.sheet.in.h:7
-msgid "Normally closed contact (vertical)"
-msgstr "Normalean itxitako kontaktua (bertikala)"
+msgid "Normally open contact (vertical)"
+msgstr "Normalean irekitako kontaktua (bertikala)"
 
 #: ../sheets/Electric.sheet.in.h:8
-msgid "Normally closed position switch (horizontal)"
-msgstr "Normalean itxitako etengailua (horizontala)"
+msgid "Normally closed contact (vertical)"
+msgstr "Normalean itxitako kontaktua (bertikala)"
 
 #: ../sheets/Electric.sheet.in.h:9
-msgid "Normally closed position switch (vertical)"
-msgstr "Normalean itxitako etengailua (bertikala)"
+msgid "Normally open position switch (vertical)"
+msgstr "Normalean irekitako etengailua (bertikala)"
 
 #: ../sheets/Electric.sheet.in.h:10
-msgid "Normally open contact (horizontal)"
-msgstr "Normalean irekitako kontaktua (horizontala)"
+msgid "Normally closed position switch (vertical)"
+msgstr "Normalean itxitako etengailua (bertikala)"
 
 #: ../sheets/Electric.sheet.in.h:11
-msgid "Normally open contact (vertical)"
-msgstr "Normalean irekitako kontaktua (bertikala)"
+msgid "The command organ of a relay (horizontal)"
+msgstr "Errele baten komando-organoa (horizontala)"
 
 #: ../sheets/Electric.sheet.in.h:12
-msgid "Normally open position switch (horizontal)"
-msgstr "Normalean irekitako etengailua (horizontala)"
+msgid "Relay (horizontal)"
+msgstr "Errelea (horizontala)"
 
 #: ../sheets/Electric.sheet.in.h:13
-msgid "Normally open position switch (vertical)"
-msgstr "Normalean irekitako etengailua (bertikala)"
+msgid "Lamp or indicator light (horizontal)"
+msgstr "Lanpara edo adierazlearen argia (horizontala)"
 
 #: ../sheets/Electric.sheet.in.h:14
-msgid "Relay (horizontal)"
-msgstr "Errelea (horizontala)"
+msgid "The command organ of a relay (vertical)"
+msgstr "Errele baten komando-organoa (bertikala)"
 
 #: ../sheets/Electric.sheet.in.h:15
 msgid "Relay (vertical)"
 msgstr "Errelea (bertikala)"
 
 #: ../sheets/Electric.sheet.in.h:16
-msgid "The command organ of a relay (horizontal)"
-msgstr "Errele baten komando-organoa (horizontala)"
+msgid "Lamp or indicator light (vertical)"
+msgstr "Lanpara edo adierazlearen argia (bertikala)"
 
-#: ../sheets/Electric.sheet.in.h:17
-msgid "The command organ of a relay (vertical)"
-msgstr "Errele baten komando-organoa (bertikala)"
+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
+msgid "Connection point"
+msgstr "Konexio-puntua"
 
 #: ../sheets/FS.sheet.in.h:1
-msgid "Editor for Function Structure Diagrams."
-msgstr "Funtzio egiturako diagramen editorea."
-
-#: ../sheets/FS.sheet.in.h:2
 msgid "FS"
 msgstr "FS"
 
+#: ../sheets/FS.sheet.in.h:2
+msgid "Editor for Function Structure Diagrams."
+msgstr "Funtzio egiturako diagramen editorea."
+
 #: ../sheets/FS.sheet.in.h:3
 msgid "Flow"
 msgstr "Fluxua"
 
 #: ../sheets/FS.sheet.in.h:4
-msgid "Function"
-msgstr "Funtzioa"
-
-#: ../sheets/FS.sheet.in.h:5
 msgid "Orthogonal polyline flow"
 msgstr "Fluxu ortogonala"
 
-#. XXX
+#: ../sheets/FS.sheet.in.h:5
+msgid "Function"
+msgstr "Funtzioa"
+
 #: ../sheets/Flowchart.sheet.in.h:2
-msgid "Collate"
-msgstr "Tartekatu"
+msgid "Objects to draw flowcharts"
+msgstr "Fluxu-diagramak marrazteko objektuak"
 
 #: ../sheets/Flowchart.sheet.in.h:3
-msgid "Connector"
-msgstr "Konektorea"
+msgid "Process/Auxiliary Operation"
+msgstr "Prozesua/Eragiketa lagungarria"
 
 #: ../sheets/Flowchart.sheet.in.h:4
-msgid "Data source"
-msgstr "Datu-iturburua"
+msgid "Input/Output"
+msgstr "Sarrera/Irteera"
 
-#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
 msgid "Decision"
 msgstr "Erabakia"
 
 #: ../sheets/Flowchart.sheet.in.h:6
-msgid "Delay"
-msgstr "Atzerapena"
+msgid "Connector"
+msgstr "Konektorea"
 
 #: ../sheets/Flowchart.sheet.in.h:8
-msgid "Document"
-msgstr "Dokumentua"
+msgid "Transaction file"
+msgstr "Transakzio-fitxategia"
+
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:10
+msgid "Off page connector"
+msgstr "Orrialdetik kanpoko konektorea"
 
 #: ../sheets/Flowchart.sheet.in.h:11
-msgid "Input/Output"
-msgstr "Sarrera/Irteera"
+msgid "Document"
+msgstr "Dokumentua"
 
 #: ../sheets/Flowchart.sheet.in.h:12
-msgid "Internal storage"
-msgstr "Barne-biltegiratzea"
+msgid "Manual operation"
+msgstr "Eskuzko eragiketa"
 
 #: ../sheets/Flowchart.sheet.in.h:13
-msgid "Magnetic disk"
-msgstr "Disko magnetikoa"
+msgid "Preparation"
+msgstr "Prestaketa"
 
 #: ../sheets/Flowchart.sheet.in.h:14
-msgid "Magnetic drum"
-msgstr "Danbor magnetikoa"
+msgid "Manual input"
+msgstr "Eskuzko sarrera"
 
 #: ../sheets/Flowchart.sheet.in.h:15
-msgid "Magnetic tape"
-msgstr "Zinta magnetikoa"
+msgid "Predefined process"
+msgstr "Prozesu aurredefinitua"
 
 #: ../sheets/Flowchart.sheet.in.h:16
-msgid "Manual input"
-msgstr "Eskuzko sarrera"
+msgid "Terminal Interrupt"
+msgstr "Terminal-etena"
 
 #: ../sheets/Flowchart.sheet.in.h:17
-msgid "Manual operation"
-msgstr "Eskuzko eragiketa"
+msgid "Magnetic disk"
+msgstr "Disko magnetikoa"
 
 #: ../sheets/Flowchart.sheet.in.h:18
-msgid "Merge"
-msgstr "Batu"
+msgid "Magnetic drum"
+msgstr "Danbor magnetikoa"
 
 #: ../sheets/Flowchart.sheet.in.h:19
-msgid "Objects to draw flowcharts"
-msgstr "Fluxu-diagramak marrazteko objektuak"
+msgid "Magnetic tape"
+msgstr "Zinta magnetikoa"
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:21
-msgid "Off page connector"
-msgstr "Orrialdetik kanpoko konektorea"
+#: ../sheets/Flowchart.sheet.in.h:20
+msgid "Internal storage"
+msgstr "Barne-biltegiratzea"
 
-#: ../sheets/Flowchart.sheet.in.h:22
-msgid "Offline storage"
-msgstr "Lineaz kanpoko biltegiratzea"
+#: ../sheets/Flowchart.sheet.in.h:21
+msgid "Merge"
+msgstr "Batu"
 
 #: ../sheets/Flowchart.sheet.in.h:23
-msgid "Or"
-msgstr "Edo"
-
-#: ../sheets/Flowchart.sheet.in.h:24
-msgid "Predefined process"
-msgstr "Prozesu aurredefinitua"
+msgid "Delay"
+msgstr "Atzerapena"
 
+#. XXX
 #: ../sheets/Flowchart.sheet.in.h:25
-msgid "Preparation"
-msgstr "Prestaketa"
-
-#: ../sheets/Flowchart.sheet.in.h:26
-msgid "Process/Auxiliary Operation"
-msgstr "Prozesua/Eragiketa lagungarria"
+msgid "Summing junction"
+msgstr "Batze-lotura"
 
+#. XXX
 #: ../sheets/Flowchart.sheet.in.h:27
-msgid "Punched card"
-msgstr "Txartel zulatua"
+msgid "Collate"
+msgstr "Tartekatu"
 
 #: ../sheets/Flowchart.sheet.in.h:28
-msgid "Punched tape"
-msgstr "Zinta zulatua"
-
-#: ../sheets/Flowchart.sheet.in.h:29
 msgid "Sort"
 msgstr "Ordenatu"
 
-#. XXX
+#: ../sheets/Flowchart.sheet.in.h:29
+msgid "Or"
+msgstr "Edo"
+
+#: ../sheets/Flowchart.sheet.in.h:30
+msgid "Punched card"
+msgstr "Txartel zulatua"
+
 #: ../sheets/Flowchart.sheet.in.h:31
-msgid "Summing junction"
-msgstr "Batze-lotura"
+msgid "Punched tape"
+msgstr "Zinta zulatua"
 
 #: ../sheets/Flowchart.sheet.in.h:32
-msgid "Terminal Interrupt"
-msgstr "Terminal-etena"
+msgid "Transmittal tape"
+msgstr "Transmisio-zinta"
 
 #: ../sheets/Flowchart.sheet.in.h:33
-msgid "Transaction file"
-msgstr "Transakzio-fitxategia"
+msgid "Offline storage"
+msgstr "Lineaz kanpoko biltegiratzea"
 
 #: ../sheets/Flowchart.sheet.in.h:34
-msgid "Transmittal tape"
-msgstr "Transmisio-zinta"
+msgid "Data source"
+msgstr "Datu-iturburua"
 
 #: ../sheets/GRAFCET.sheet.in.h:1
-msgid "AND vergent"
-msgstr "ETA dibergentzia"
+msgid "GRAFCET"
+msgstr "GRAFCET"
 
 #: ../sheets/GRAFCET.sheet.in.h:2
+msgid "Objects to design GRAFCET charts"
+msgstr "GRAFCET diagramak diseinatzeko objektuak"
+
+#: ../sheets/GRAFCET.sheet.in.h:8
+msgid "Macro sub-program call step"
+msgstr "Makro azpi-programa bati dei egiteko urratsa"
+
+#: ../sheets/GRAFCET.sheet.in.h:9
 msgid "Action to associate to a step"
 msgstr "Urrats bati asoziatzeko ekintza"
 
-#: ../sheets/GRAFCET.sheet.in.h:3
-msgid "Arc (upward)"
-msgstr "Arkua (gorantz)"
-
-#: ../sheets/GRAFCET.sheet.in.h:4
+#: ../sheets/GRAFCET.sheet.in.h:10
 msgid "Condition (of an action)"
 msgstr "Baldintza (ekintza batena)"
 
-#: ../sheets/GRAFCET.sheet.in.h:5
-msgid "GRAFCET"
-msgstr "GRAFCET"
-
-#: ../sheets/GRAFCET.sheet.in.h:10
-msgid "Macro sub-program call step"
-msgstr "Makro azpi-programa bati dei egiteko urratsa"
+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
+msgid "Transition"
+msgstr "Trantsizioa"
 
-#: ../sheets/GRAFCET.sheet.in.h:11
+#: ../sheets/GRAFCET.sheet.in.h:12
 msgid "OR vergent"
 msgstr "EDO dibergentzia"
 
-#: ../sheets/GRAFCET.sheet.in.h:12
-msgid "Objects to design GRAFCET charts"
-msgstr "GRAFCET diagramak diseinatzeko objektuak"
+#: ../sheets/GRAFCET.sheet.in.h:13
+msgid "AND vergent"
+msgstr "ETA dibergentzia"
 
-#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
-msgid "Transition"
-msgstr "Trantsizioa"
+#: ../sheets/GRAFCET.sheet.in.h:14
+msgid "Arc (upward)"
+msgstr "Arkua (gorantz)"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:1
+#. Author: Nicholas Moore, 2005. mailto: [e-mail]
+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
+msgid "Gane and Sarson"
+msgstr "Gane eta Sarson"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
+msgid "Gane and Sarson DFD"
+msgstr "Gane eta Sarson DFD"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
 msgid "Alternate external entity"
 msgstr "Bestelako kanpoko entitatea"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:2
+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
 msgid "Data store"
 msgstr "Datuen biltegia"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:3
+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
 msgid "External entity"
 msgstr "Kanpoko entitatea"
 
-#. Author: Nicholas Moore, 2005. mailto: [e-mail]
-#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-msgid "Gane and Sarson"
-msgstr "Gane eta Sarson"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-msgid "Gane and Sarson DFD"
-msgstr "Gane eta Sarson DFD"
-
-#: ../sheets/IsometricMap.sheet.in.h:1
-msgid "Block 1, 2:4"
-msgstr "Blokea 1, 2:4"
-
+#. use dc:title instead?
 #: ../sheets/IsometricMap.sheet.in.h:2
-msgid "Block 2, 2:8"
-msgstr "Blokea 2, 2:8"
-
-#: ../sheets/IsometricMap.sheet.in.h:3
-msgid "Block 3, 4:4"
-msgstr "Blokea 3, 4:4"
+msgid "Map, Isometric"
+msgstr "Mapa, isometrikoa"
 
+#. use dc:description instead?
 #: ../sheets/IsometricMap.sheet.in.h:4
-msgid "Block 4, 4:8"
-msgstr "Blokea 4, 4:8"
+msgid "Isometric Directional Map Shapes"
+msgstr "Norabide-mapa isometrikoen formak"
 
 #: ../sheets/IsometricMap.sheet.in.h:5
-msgid "Block 5, 3:3"
-msgstr "Blokea 5, 3:3"
+msgid "Road Section"
+msgstr "Errepide-atala"
 
 #: ../sheets/IsometricMap.sheet.in.h:6
-msgid "Block 6, 4:6"
-msgstr "Blokea 6, 4:6"
+msgid "Long Straight Road Section"
+msgstr "Bide zuzen luzeen atala"
 
 #: ../sheets/IsometricMap.sheet.in.h:7
-msgid "Block 7"
-msgstr "Blokea 7"
+msgid "Crossroads"
+msgstr "Bidegurutzea"
 
 #: ../sheets/IsometricMap.sheet.in.h:8
-msgid "Car 1, Front View"
-msgstr "Autoa1, Aurretiko bista"
+msgid "T-Junction"
+msgstr "T-bidegurutzea"
 
 #: ../sheets/IsometricMap.sheet.in.h:9
-msgid "Car 2, Rear View"
-msgstr "Autoa2, Atzetiko bista"
+msgid "Elevated Road"
+msgstr "Altxatako bidea"
 
 #: ../sheets/IsometricMap.sheet.in.h:10
 msgid "Corner 1"
@@ -7902,1458 +7943,1468 @@ msgid "Corner 2"
 msgstr "Izkina 2"
 
 #: ../sheets/IsometricMap.sheet.in.h:12
-msgid "Crossroads"
-msgstr "Bidegurutzea"
+msgid "River"
+msgstr "Ibaia"
 
 #: ../sheets/IsometricMap.sheet.in.h:13
-msgid "Elevated Road"
-msgstr "Altxatako bidea"
+msgid "Roof1"
+msgstr "Teilatua1"
 
 #: ../sheets/IsometricMap.sheet.in.h:14
-msgid "Factory"
-msgstr "Fabrika"
+msgid "Block 1, 2:4"
+msgstr "Blokea 1, 2:4"
 
 #: ../sheets/IsometricMap.sheet.in.h:15
-msgid "Footbridge, Pedestrian Bridge"
-msgstr "Oinezkoentzako zubia"
+msgid "Block 2, 2:8"
+msgstr "Blokea 2, 2:8"
+
+#: ../sheets/IsometricMap.sheet.in.h:16
+msgid "Block 3, 4:4"
+msgstr "Blokea 3, 4:4"
 
-#. use dc:description instead?
 #: ../sheets/IsometricMap.sheet.in.h:17
-msgid "Isometric Directional Map Shapes"
-msgstr "Norabide-mapa isometrikoen formak"
+msgid "Block 4, 4:8"
+msgstr "Blokea 4, 4:8"
 
 #: ../sheets/IsometricMap.sheet.in.h:18
-msgid "Long Straight Road Section"
-msgstr "Bide zuzen luzeen atala"
+msgid "Block 5, 3:3"
+msgstr "Blokea 5, 3:3"
+
+#: ../sheets/IsometricMap.sheet.in.h:19
+msgid "Block 6, 4:6"
+msgstr "Blokea 6, 4:6"
 
-#. use dc:title instead?
 #: ../sheets/IsometricMap.sheet.in.h:20
-msgid "Map, Isometric"
-msgstr "Mapa, isometrikoa"
+msgid "Block 7"
+msgstr "Blokea 7"
 
 #: ../sheets/IsometricMap.sheet.in.h:21
-msgid "One Way Road Sign"
-msgstr "Norabide bakarreko bidearen ikurra"
+msgid "Factory"
+msgstr "Fabrika"
 
 #: ../sheets/IsometricMap.sheet.in.h:22
-msgid "River"
-msgstr "Ibaia"
+msgid "Car 1, Front View"
+msgstr "Autoa1, Aurretiko bista"
 
 #: ../sheets/IsometricMap.sheet.in.h:23
-msgid "Road Section"
-msgstr "Errepide-atala"
+msgid "Car 2, Rear View"
+msgstr "Autoa2, Atzetiko bista"
 
 #: ../sheets/IsometricMap.sheet.in.h:24
-msgid "Roof1"
-msgstr "Teilatua1"
-
-#: ../sheets/IsometricMap.sheet.in.h:25
-msgid "T-Junction"
-msgstr "T-bidegurutzea"
-
-#: ../sheets/IsometricMap.sheet.in.h:26
 msgid "Train 1, angled downward"
 msgstr "Trena 1, beheranzko angeluarekin"
 
-#: ../sheets/IsometricMap.sheet.in.h:27
+#: ../sheets/IsometricMap.sheet.in.h:25
 msgid "Train 2, angled upward"
 msgstr "Trena 2, goranzko angeluarekin"
 
-#: ../sheets/IsometricMap.sheet.in.h:28
+#: ../sheets/IsometricMap.sheet.in.h:26
 msgid "Tree 1"
 msgstr "Zuhaitza 1"
 
+#: ../sheets/IsometricMap.sheet.in.h:27
+msgid "Footbridge, Pedestrian Bridge"
+msgstr "Oinezkoentzako zubia"
+
+#: ../sheets/IsometricMap.sheet.in.h:28
+msgid "One Way Road Sign"
+msgstr "Norabide bakarreko bidearen ikurra"
+
 #: ../sheets/Istar.sheet.in.h:1
-msgid "An i* agent"
-msgstr "i* agente bat"
+msgid "RE-i*"
+msgstr "RE-i*"
 
 #: ../sheets/Istar.sheet.in.h:2
-msgid "An i* decomposition link"
-msgstr "i* deskonposizio-esteka bat"
+msgid "Objects to design i* diagrams"
+msgstr "¡* diagramak diseinatzeko objektuak"
 
 #: ../sheets/Istar.sheet.in.h:3
-msgid "An i* dependency link"
-msgstr "i* mendekotasun-esteka bat"
+msgid "An i* softgoal"
+msgstr "i* bigarren helburu bat"
 
 #: ../sheets/Istar.sheet.in.h:4
 msgid "An i* goal"
 msgstr "i* helburu bat"
 
 #: ../sheets/Istar.sheet.in.h:5
-msgid "An i* means-ends link"
-msgstr "i* batek estekaren amaiera adierazten du"
+msgid "An i* resource"
+msgstr "i* baliabide bat"
 
 #: ../sheets/Istar.sheet.in.h:6
-msgid "An i* negative contribution"
-msgstr "i* kontribuzio negatibo bat"
+msgid "An i* task"
+msgstr "i* ataza bat"
 
 #: ../sheets/Istar.sheet.in.h:7
-msgid "An i* position"
-msgstr "¡* posizio bat"
+msgid "An i* unspecified actor"
+msgstr "i* definitu gabeko aktore bat"
 
 #: ../sheets/Istar.sheet.in.h:8
-msgid "An i* positive contribution"
-msgstr "i* kontribuzio positiboa"
+msgid "An i* agent"
+msgstr "i* agente bat"
 
 #: ../sheets/Istar.sheet.in.h:9
-msgid "An i* resource"
-msgstr "i* baliabide bat"
+msgid "An i* position"
+msgstr "¡* posizio bat"
 
 #: ../sheets/Istar.sheet.in.h:10
 msgid "An i* role"
 msgstr "i* funtzio bat"
 
 #: ../sheets/Istar.sheet.in.h:11
-msgid "An i* softgoal"
-msgstr "i* bigarren helburu bat"
+msgid "An i* unspecified link"
+msgstr "i* definitu gabeko esteka bat"
 
 #: ../sheets/Istar.sheet.in.h:12
-msgid "An i* task"
-msgstr "i* ataza bat"
+msgid "An i* positive contribution"
+msgstr "i* kontribuzio positiboa"
 
 #: ../sheets/Istar.sheet.in.h:13
-msgid "An i* unspecified actor"
-msgstr "i* definitu gabeko aktore bat"
+msgid "An i* negative contribution"
+msgstr "i* kontribuzio negatibo bat"
 
 #: ../sheets/Istar.sheet.in.h:14
-msgid "An i* unspecified link"
-msgstr "i* definitu gabeko esteka bat"
+msgid "An i* dependency link"
+msgstr "i* mendekotasun-esteka bat"
 
 #: ../sheets/Istar.sheet.in.h:15
-msgid "Objects to design i* diagrams"
-msgstr "¡* diagramak diseinatzeko objektuak"
+msgid "An i* decomposition link"
+msgstr "i* deskonposizio-esteka bat"
 
 #: ../sheets/Istar.sheet.in.h:16
-msgid "RE-i*"
-msgstr "RE-i*"
+msgid "An i* means-ends link"
+msgstr "i* batek estekaren amaiera adierazten du"
 
 #: ../sheets/Jackson.sheet.in.h:1
-msgid "A Jackson designed domain"
-msgstr "Jackson-ek diseinatutako domeinua"
+msgid "RE-Jackson"
+msgstr "RE-Jackson"
 
 #: ../sheets/Jackson.sheet.in.h:2
+msgid "Objects to design Jackson diagrams"
+msgstr "Jackson-en diagramak diseinatzeko objektuak"
+
+#: ../sheets/Jackson.sheet.in.h:3
 msgid "A Jackson given domain"
 msgstr "Jackson-ek emandako domeinua"
 
-#: ../sheets/Jackson.sheet.in.h:3
+#: ../sheets/Jackson.sheet.in.h:4
+msgid "A Jackson designed domain"
+msgstr "Jackson-ek diseinatutako domeinua"
+
+#: ../sheets/Jackson.sheet.in.h:5
 msgid "A Jackson machine domain"
 msgstr "Jackson gailuen domeinua"
 
-#: ../sheets/Jackson.sheet.in.h:4
+#: ../sheets/Jackson.sheet.in.h:6
 msgid "A Jackson requirement"
 msgstr "Jackson-en eskakizunak"
 
-#: ../sheets/Jackson.sheet.in.h:5
-msgid "A Jackson requirement phenomenon"
-msgstr "Jackson-ek eskatzen duen gertaera"
-
-#: ../sheets/Jackson.sheet.in.h:6
+#: ../sheets/Jackson.sheet.in.h:7
 msgid "A Jackson shared phenomenon"
 msgstr "Jackson-ek partekatutako gertaera"
 
-#: ../sheets/Jackson.sheet.in.h:7
-msgid "Objects to design Jackson diagrams"
-msgstr "Jackson-en diagramak diseinatzeko objektuak"
-
 #: ../sheets/Jackson.sheet.in.h:8
-msgid "RE-Jackson"
-msgstr "RE-Jackson"
+msgid "A Jackson requirement phenomenon"
+msgstr "Jackson-ek eskatzen duen gertaera"
 
 #: ../sheets/KAOS.sheet.in.h:1
-msgid "A KAOS AND refinement"
-msgstr "KAOS ETA fintzea"
+msgid "RE-KAOS"
+msgstr "RE-KAOS"
 
 #: ../sheets/KAOS.sheet.in.h:2
-msgid "A KAOS OR refinement"
-msgstr "KAOS EDO fintzea"
+msgid "Objects to design KAOS diagrams"
+msgstr "KAOS diagramak diseinatzeko objektuak"
 
 #: ../sheets/KAOS.sheet.in.h:3
-msgid "A KAOS agent"
-msgstr "KAOS agentea"
+msgid "A KAOS softgoal"
+msgstr "KAOS-en bigarren helburua"
 
 #: ../sheets/KAOS.sheet.in.h:4
-msgid "A KAOS assumption"
-msgstr "KAOS asumitzea"
+msgid "A KAOS goal"
+msgstr "KAOS-en helburua"
 
 #: ../sheets/KAOS.sheet.in.h:5
-msgid "A KAOS binary conflict"
-msgstr "KAOS-en gatazka bitarra"
+msgid "A KAOS requirement"
+msgstr "KAOS-ren eskaerak"
 
 #: ../sheets/KAOS.sheet.in.h:6
-msgid "A KAOS capable-of"
-msgstr "KAOS-en gaitasuna"
+msgid "A KAOS assumption"
+msgstr "KAOS asumitzea"
 
 #: ../sheets/KAOS.sheet.in.h:7
-msgid "A KAOS complete AND refinement"
-msgstr "Erabateko KAOS ETA fintzea"
+msgid "A KAOS obstacle"
+msgstr "KAOS oztopoa"
 
 #: ../sheets/KAOS.sheet.in.h:8
-msgid "A KAOS complete OR refinement"
-msgstr "Erabateko KAOS EDO fintzea"
+msgid "A KAOS AND refinement"
+msgstr "KAOS ETA fintzea"
 
 #: ../sheets/KAOS.sheet.in.h:9
-msgid "A KAOS contribution"
-msgstr "KAOS-en kontribuzioa"
+msgid "A KAOS complete AND refinement"
+msgstr "Erabateko KAOS ETA fintzea"
 
 #: ../sheets/KAOS.sheet.in.h:10
-msgid "A KAOS control link"
-msgstr "KAOS-en kontrol-esteka"
+msgid "A KAOS OR refinement"
+msgstr "KAOS EDO fintzea"
 
 #: ../sheets/KAOS.sheet.in.h:11
-msgid "A KAOS goal"
-msgstr "KAOS-en helburua"
+msgid "A KAOS complete OR refinement"
+msgstr "Erabateko KAOS EDO fintzea"
 
 #: ../sheets/KAOS.sheet.in.h:12
-msgid "A KAOS input"
-msgstr "KAOS-en sarrera"
+msgid "A KAOS operationalization"
+msgstr "KAOS-en eragiketa-datuak"
 
 #: ../sheets/KAOS.sheet.in.h:13
-msgid "A KAOS monitor link"
-msgstr "KAOS-en esteka monitorea"
+msgid "A KAOS contribution"
+msgstr "KAOS-en kontribuzioa"
 
 #: ../sheets/KAOS.sheet.in.h:14
-msgid "A KAOS obstacle"
-msgstr "KAOS oztopoa"
-
-#: ../sheets/KAOS.sheet.in.h:15
 msgid "A KAOS obstruction"
 msgstr "KAOS eragozpena"
 
+#: ../sheets/KAOS.sheet.in.h:15
+msgid "A KAOS binary conflict"
+msgstr "KAOS-en gatazka bitarra"
+
 #: ../sheets/KAOS.sheet.in.h:16
-msgid "A KAOS operation"
-msgstr "KAOS-en eragiketa"
+msgid "A KAOS agent"
+msgstr "KAOS agentea"
 
 #: ../sheets/KAOS.sheet.in.h:17
-msgid "A KAOS operationalization"
-msgstr "KAOS-en eragiketa-datuak"
+msgid "A KAOS responsibility"
+msgstr "KAOS-en erantzukizunak"
 
 #: ../sheets/KAOS.sheet.in.h:18
-msgid "A KAOS output"
-msgstr "KAOS-en irteera"
+msgid "A KAOS monitor link"
+msgstr "KAOS-en esteka monitorea"
 
 #: ../sheets/KAOS.sheet.in.h:19
-msgid "A KAOS performs"
-msgstr "KAOS-en egikaritu"
+msgid "A KAOS control link"
+msgstr "KAOS-en kontrol-esteka"
 
 #: ../sheets/KAOS.sheet.in.h:20
-msgid "A KAOS requirement"
-msgstr "KAOS-ren eskaerak"
+msgid "A KAOS capable-of"
+msgstr "KAOS-en gaitasuna"
 
 #: ../sheets/KAOS.sheet.in.h:21
-msgid "A KAOS responsibility"
-msgstr "KAOS-en erantzukizunak"
+msgid "A KAOS performs"
+msgstr "KAOS-en egikaritu"
 
 #: ../sheets/KAOS.sheet.in.h:22
-msgid "A KAOS softgoal"
-msgstr "KAOS-en bigarren helburua"
+msgid "A KAOS operation"
+msgstr "KAOS-en eragiketa"
 
 #: ../sheets/KAOS.sheet.in.h:23
-msgid "Objects to design KAOS diagrams"
-msgstr "KAOS diagramak diseinatzeko objektuak"
+msgid "A KAOS input"
+msgstr "KAOS-en sarrera"
 
 #: ../sheets/KAOS.sheet.in.h:24
-msgid "RE-KAOS"
-msgstr "RE-KAOS"
+msgid "A KAOS output"
+msgstr "KAOS-en irteera"
 
 #: ../sheets/Lights.sheet.in.h:1
-msgid "ACL"
-msgstr "ACL"
+msgid "Lights"
+msgstr "Argiak"
 
 #: ../sheets/Lights.sheet.in.h:2
-msgid "Black light"
-msgstr "Argi beltza"
+msgid "Objects to design simple lighting plots"
+msgstr "Argi-trazak diseinatzeko objektuak"
 
 #: ../sheets/Lights.sheet.in.h:3
-msgid "Blinders"
-msgstr "Keinukariak"
+msgid "PAR"
+msgstr "PAR argia"
 
 #: ../sheets/Lights.sheet.in.h:4
-msgid "Ellipsoidal Reflector Spotlight"
-msgstr "Islatzaile elipsoidala"
+msgid "PAR on the floor"
+msgstr "PAR argia lurrean"
 
 #: ../sheets/Lights.sheet.in.h:5
-msgid "Fresel lantern"
-msgstr "Fresel-en linterna"
+msgid "ACL"
+msgstr "ACL"
 
 #: ../sheets/Lights.sheet.in.h:6
-msgid "Lights"
-msgstr "Argiak"
+msgid "Pebble Convex lantern"
+msgstr "Linterna ganbila"
 
 #: ../sheets/Lights.sheet.in.h:7
-msgid "Moving head"
-msgstr "Motordun proiektagailua"
+msgid "Fresel lantern"
+msgstr "Fresel-en linterna"
 
 #: ../sheets/Lights.sheet.in.h:8
-msgid "Objects to design simple lighting plots"
-msgstr "Argi-trazak diseinatzeko objektuak"
+msgid "Striplight"
+msgstr "Hodi-bonbila"
 
 #: ../sheets/Lights.sheet.in.h:9
-msgid "PAR"
-msgstr "PAR argia"
+msgid "Ellipsoidal Reflector Spotlight"
+msgstr "Islatzaile elipsoidala"
 
 #: ../sheets/Lights.sheet.in.h:10
-msgid "PAR on the floor"
-msgstr "PAR argia lurrean"
+msgid "Blinders"
+msgstr "Keinukariak"
 
 #: ../sheets/Lights.sheet.in.h:11
-msgid "Pebble Convex lantern"
-msgstr "Linterna ganbila"
+msgid "Black light"
+msgstr "Argi beltza"
 
-#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
-msgid "Scanner"
-msgstr "Eskanerra"
+#: ../sheets/Lights.sheet.in.h:12
+msgid "Stroboscope light"
+msgstr "Argi estroboskopikoa"
 
 #: ../sheets/Lights.sheet.in.h:13
-msgid "Striplight"
-msgstr "Hodi-bonbila"
+msgid "Moving head"
+msgstr "Motordun proiektagailua"
 
-#: ../sheets/Lights.sheet.in.h:14
-msgid "Stroboscope light"
-msgstr "Argi estroboskopikoa"
+#: ../sheets/Lights.sheet.in.h:14 ../sheets/ciscocomputer.sheet.in.h:29
+msgid "Scanner"
+msgstr "Eskanerra"
 
 #: ../sheets/Lights.sheet.in.h:15
 msgid "Structure"
 msgstr "Egitura"
 
 #: ../sheets/Logic.sheet.in.h:1
-msgid "AND gate"
-msgstr "AND atea"
+msgid "Logic"
+msgstr "Logika"
 
 #: ../sheets/Logic.sheet.in.h:2
 msgid "Boolean Logic"
 msgstr "Logika boolearra"
 
 #: ../sheets/Logic.sheet.in.h:3
-msgid "Crossconnector"
-msgstr "Gurutze-konektorea"
+msgid "OR gate"
+msgstr "OR atea"
 
-#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
-msgid "Inverter"
-msgstr "Alderantzikatzailea"
+#: ../sheets/Logic.sheet.in.h:4
+msgid "AND gate"
+msgstr "AND atea"
 
 #: ../sheets/Logic.sheet.in.h:5
-msgid "Logic"
-msgstr "Logika"
+msgid "XOR gate"
+msgstr "XOR atea"
 
 #: ../sheets/Logic.sheet.in.h:6
+msgid "Simple buffer"
+msgstr "Buffer soila"
+
+#: ../sheets/Logic.sheet.in.h:7 ../sheets/SISSI.sheet.in.h:61
+msgid "Inverter"
+msgstr "Alderantzikatzailea"
+
+#: ../sheets/Logic.sheet.in.h:8
 msgid "NAND gate"
 msgstr "NAND atea"
 
-#: ../sheets/Logic.sheet.in.h:7
+#: ../sheets/Logic.sheet.in.h:9
 msgid "NOR gate"
 msgstr "NOR atea"
 
-#: ../sheets/Logic.sheet.in.h:8
+#: ../sheets/Logic.sheet.in.h:10
 msgid "NOT"
 msgstr "NOT"
 
-#: ../sheets/Logic.sheet.in.h:9
-msgid "OR gate"
-msgstr "OR atea"
-
-#: ../sheets/Logic.sheet.in.h:10
-msgid "Simple buffer"
-msgstr "Buffer soila"
-
 #: ../sheets/Logic.sheet.in.h:11
-msgid "XOR gate"
-msgstr "XOR atea"
+msgid "Crossconnector"
+msgstr "Gurutze-konektorea"
 
 #: ../sheets/MSE.sheet.in.h:1
-msgid "Demultiplexer"
-msgstr "Demultiplexadorea"
+msgid "MSE"
+msgstr "MSE"
 
 #: ../sheets/MSE.sheet.in.h:2
-msgid "Large extension node"
-msgstr "Luzapen-nodo handia"
+msgid "U.S. Army Mobile Subscriber Equipment Components"
+msgstr "AEBetako armadaren 'Mobile Subscriber Equipment'en osagaiak"
 
 #: ../sheets/MSE.sheet.in.h:3
-msgid "MSE"
-msgstr "MSE"
+msgid "Node center"
+msgstr "Nodo-zentroa"
 
 #: ../sheets/MSE.sheet.in.h:4
-msgid "Multiplexer"
-msgstr "Multiplexadorea"
+msgid "Large extension node"
+msgstr "Luzapen-nodo handia"
 
 #: ../sheets/MSE.sheet.in.h:5
-msgid "Node center"
-msgstr "Nodo-zentroa"
-
-#: ../sheets/MSE.sheet.in.h:6
 msgid "Small extension node"
 msgstr "Luzapen-nodo txikia"
 
-#: ../sheets/MSE.sheet.in.h:7
+#: ../sheets/MSE.sheet.in.h:6
 msgid "Tactical satellite communications terminal"
 msgstr "Satelite bidezko komunikazioen terminal taktikoa"
 
-#: ../sheets/MSE.sheet.in.h:8
-msgid "U.S. Army Mobile Subscriber Equipment Components"
-msgstr "AEBetako armadaren 'Mobile Subscriber Equipment'en osagaiak"
-
-#: ../sheets/Misc.sheet.in.h:2
-msgid "Folder"
-msgstr "Karpeta"
+#: ../sheets/MSE.sheet.in.h:7
+msgid "Multiplexer"
+msgstr "Multiplexadorea"
 
-#: ../sheets/Misc.sheet.in.h:3
-msgid "Measure distance"
-msgstr "Neurtu distantzia"
+#: ../sheets/MSE.sheet.in.h:8
+msgid "Demultiplexer"
+msgstr "Demultiplexadorea"
 
-#: ../sheets/Misc.sheet.in.h:4
+#: ../sheets/Misc.sheet.in.h:1
 msgid "Misc"
 msgstr "Hainbat"
 
-#: ../sheets/Misc.sheet.in.h:5
+#: ../sheets/Misc.sheet.in.h:2
 msgid "Miscellaneous Shapes"
 msgstr "Hainbat forma"
 
+#: ../sheets/Misc.sheet.in.h:3
+msgid "Tree"
+msgstr "Zuhaitza"
+
+#: ../sheets/Misc.sheet.in.h:4
+msgid "Folder"
+msgstr "Karpeta"
+
 #: ../sheets/Misc.sheet.in.h:6
-msgid "New-style group object, for testing"
-msgstr "Estilo berrien talde-objektua, probatzeko"
+msgid "expensible node"
+msgstr "nodo xahugarria"
 
 #: ../sheets/Misc.sheet.in.h:7
-msgid "Resizable grid"
-msgstr "Sareta tamainaz aldagarria"
+msgid "expended node"
+msgstr "xahututako nodoa"
 
 #: ../sheets/Misc.sheet.in.h:8
 msgid "Traditional clock"
 msgstr "Erloju tradizionala"
 
 #: ../sheets/Misc.sheet.in.h:9
-msgid "Tree"
-msgstr "Zuhaitza"
+msgid "Measure distance"
+msgstr "Neurtu distantzia"
 
 #: ../sheets/Misc.sheet.in.h:10
-msgid "expended node"
-msgstr "xahututako nodoa"
+msgid "Resizable grid"
+msgstr "Sareta tamainaz aldagarria"
 
 #: ../sheets/Misc.sheet.in.h:11
-msgid "expensible node"
-msgstr "nodo xahugarria"
+msgid "New-style group object, for testing"
+msgstr "Estilo berrien talde-objektua, probatzeko"
 
 #: ../sheets/Pneumatic.sheet.in.h:1
-msgid "2/2 distributor"
-msgstr "2/2 banatzailea"
+msgid "Pneumatic/Hydraulic"
+msgstr "Pneumatikoa/Hidraulikoa"
 
 #: ../sheets/Pneumatic.sheet.in.h:2
-msgid "3/2 distributor"
-msgstr "3/2 banatzailea"
+msgid "Components for pneumatic and hydraulic circuits"
+msgstr "Zirkuitu pneumatikoetarako eta hidraulikoetarako osagaiak"
 
 #: ../sheets/Pneumatic.sheet.in.h:3
-msgid "4/2 distributor"
-msgstr "4/2 banatzailea"
+msgid "Double-effect jack"
+msgstr "Efektu bikoitzeko txanka"
 
 #: ../sheets/Pneumatic.sheet.in.h:4
-msgid "5/2 distributor"
-msgstr "5/2 banatzailea"
+msgid "Normally-in simple-effect jack"
+msgstr "Efektu soileko txanka normalean entxufatua"
 
 #: ../sheets/Pneumatic.sheet.in.h:5
-msgid "Air exhaust orifice"
-msgstr "Airea irteteko zuloa"
+msgid "Normally-out simple-effect jack"
+msgstr "Efektu soileko txanka normalean desentxufatua"
 
 #: ../sheets/Pneumatic.sheet.in.h:6
-msgid "Components for pneumatic and hydraulic circuits"
-msgstr "Zirkuitu pneumatikoetarako eta hidraulikoetarako osagaiak"
+msgid "Generic pressure source"
+msgstr "Presio generikoaren iturburua"
+
+#: ../sheets/Pneumatic.sheet.in.h:7
+msgid "Hydraulic pressure source"
+msgstr "Presio hidraulikoaren iturburua"
 
 #: ../sheets/Pneumatic.sheet.in.h:8
-msgid "Double-effect jack"
-msgstr "Efektu bikoitzeko txanka"
+msgid "Pneumatic pressure source"
+msgstr "Presio pneumatikoaren iturburua"
 
 #: ../sheets/Pneumatic.sheet.in.h:9
-msgid "Electric command (double coil)"
-msgstr "Kontrol elektrikoa (bobina bikoitza)"
+msgid "Air exhaust orifice"
+msgstr "Airea irteteko zuloa"
 
 #: ../sheets/Pneumatic.sheet.in.h:10
-msgid "Electric command (single coil)"
-msgstr "Kontrol elektrikoa (bobina soila)"
+msgid "2/2 distributor"
+msgstr "2/2 banatzailea"
 
 #: ../sheets/Pneumatic.sheet.in.h:11
-msgid "Generic pressure source"
-msgstr "Presio generikoaren iturburua"
+msgid "3/2 distributor"
+msgstr "3/2 banatzailea"
 
 #: ../sheets/Pneumatic.sheet.in.h:12
-msgid "Hydraulic pressure source"
-msgstr "Presio hidraulikoaren iturburua"
+msgid "4/2 distributor"
+msgstr "4/2 banatzailea"
 
 #: ../sheets/Pneumatic.sheet.in.h:13
-msgid "Indirect command by hydraulic driver"
-msgstr "Gidari hidraulikoaren zeharkako kontrola"
+msgid "5/2 distributor"
+msgstr "5/2 banatzailea"
 
 #: ../sheets/Pneumatic.sheet.in.h:14
-msgid "Indirect command by pneumatic driver"
-msgstr "Gidari pneumatikoaren zeharkako kontrola"
+msgid "Muscular command"
+msgstr "Muskulu-kontrola"
 
 #: ../sheets/Pneumatic.sheet.in.h:15
-msgid "Mechanical command by spring"
-msgstr "Malguki bidezko kontrol mekanikoa"
-
+msgid "Push-button command"
+msgstr "Botoi-sakatzeko komandoa"
+
 #: ../sheets/Pneumatic.sheet.in.h:16
 msgid "Mechanical command by tappet"
 msgstr "Espeka bidezko kontrol mekanikoa"
 
 #: ../sheets/Pneumatic.sheet.in.h:17
-msgid "Muscular command"
-msgstr "Muskulu-kontrola"
+msgid "Mechanical command by spring"
+msgstr "Malguki bidezko kontrol mekanikoa"
 
 #: ../sheets/Pneumatic.sheet.in.h:18
-msgid "Normally-in simple-effect jack"
-msgstr "Efektu soileko txanka normalean entxufatua"
+msgid "Electric command (single coil)"
+msgstr "Kontrol elektrikoa (bobina soila)"
 
 #: ../sheets/Pneumatic.sheet.in.h:19
-msgid "Normally-out simple-effect jack"
-msgstr "Efektu soileko txanka normalean desentxufatua"
+msgid "Electric command (double coil)"
+msgstr "Kontrol elektrikoa (bobina bikoitza)"
 
 #: ../sheets/Pneumatic.sheet.in.h:20
-msgid "Pneumatic pressure source"
-msgstr "Presio pneumatikoaren iturburua"
+msgid "Indirect command by hydraulic driver"
+msgstr "Gidari hidraulikoaren zeharkako kontrola"
 
 #: ../sheets/Pneumatic.sheet.in.h:21
-msgid "Pneumatic/Hydraulic"
-msgstr "Pneumatikoa/Hidraulikoa"
-
-#: ../sheets/Pneumatic.sheet.in.h:22
-msgid "Push-button command"
-msgstr "Botoi-sakatzeko komandoa"
+msgid "Indirect command by pneumatic driver"
+msgstr "Gidari pneumatikoaren zeharkako kontrola"
 
 #: ../sheets/SADT.sheet.in.h:1
-msgid "Activity/data box"
-msgstr "Jarduera/datuen koadroa"
+msgid "SADT/IDEF0"
+msgstr "SADT/IDEF0"
 
 #: ../sheets/SADT.sheet.in.h:2
-msgid "Activity/data flow arrow"
-msgstr "Jarduera/datu-fluxuaren gezia"
+msgid "Objects to design SADT diagrams"
+msgstr "SADT diagramak diseinatzeko objektuak"
 
 #: ../sheets/SADT.sheet.in.h:3
-msgid "Flow label"
-msgstr "Fluxu-etiketa"
+msgid "Activity/data flow arrow"
+msgstr "Jarduera/datu-fluxuaren gezia"
 
 #: ../sheets/SADT.sheet.in.h:4
-msgid "Objects to design SADT diagrams"
-msgstr "SADT diagramak diseinatzeko objektuak"
+msgid "Activity/data box"
+msgstr "Jarduera/datuen koadroa"
 
 #: ../sheets/SADT.sheet.in.h:5
-msgid "SADT/IDEF0"
-msgstr "SADT/IDEF0"
+msgid "Flow label"
+msgstr "Fluxu-etiketa"
 
 #: ../sheets/SDL.sheet.in.h:1
-msgid "Action being executed"
-msgstr "Exekutatzen ari den ekintza"
+msgid "SDL"
+msgstr "SDL"
 
 #: ../sheets/SDL.sheet.in.h:2
+msgid "Specification and Description Language."
+msgstr "Zehaztapeneko eta Azalpeneko Hizkuntza."
+
+#: ../sheets/SDL.sheet.in.h:3
 msgid "Block type reference"
 msgstr "Bloke-motaren erreferentzia"
 
+#: ../sheets/SDL.sheet.in.h:4
+msgid "Service type reference"
+msgstr "Zerbitzu-motaren erreferentzia"
+
 #: ../sheets/SDL.sheet.in.h:5
-msgid "Function call"
-msgstr "Funtzio-deia"
+msgid "Process type reference"
+msgstr "Prozesu-motaren erreferentzia"
 
-#: ../sheets/SDL.sheet.in.h:6
-msgid "Function header"
-msgstr "Funtzio-goiburua"
+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
+msgid "State"
+msgstr "Egoera"
 
 #: ../sheets/SDL.sheet.in.h:7
-msgid "Generic text note"
-msgstr "Testu-ohar generikoa"
+msgid "Function header"
+msgstr "Funtzio-goiburua"
 
 #: ../sheets/SDL.sheet.in.h:8
-msgid "In/Out connector"
-msgstr "Sarrera/Irteera konektorea"
+msgid "Send message"
+msgstr "Bidali mezua"
 
-#: ../sheets/SDL.sheet.in.h:10
-msgid "Procedure return"
-msgstr "Prozedura-itzulera"
+#: ../sheets/SDL.sheet.in.h:9
+msgid "Receive message"
+msgstr "Jaso mezua"
 
-#: ../sheets/SDL.sheet.in.h:11
-msgid "Process type reference"
-msgstr "Prozesu-motaren erreferentzia"
+#: ../sheets/SDL.sheet.in.h:10
+msgid "Function call"
+msgstr "Funtzio-deia"
 
 #: ../sheets/SDL.sheet.in.h:12
-msgid "Receive message"
-msgstr "Jaso mezua"
+msgid "Action being executed"
+msgstr "Exekutatzen ari den ekintza"
 
 #: ../sheets/SDL.sheet.in.h:13
-msgid "SDL"
-msgstr "SDL"
-
-#: ../sheets/SDL.sheet.in.h:14
 msgid "Save state"
 msgstr "Gorde egoera"
 
 #: ../sheets/SDL.sheet.in.h:15
-msgid "Send message"
-msgstr "Bidali mezua"
-
-#: ../sheets/SDL.sheet.in.h:16
-msgid "Service type reference"
-msgstr "Zerbitzu-motaren erreferentzia"
+msgid "In/Out connector"
+msgstr "Sarrera/Irteera konektorea"
 
 #: ../sheets/SDL.sheet.in.h:17
-msgid "Specification and Description Language."
-msgstr "Zehaztapeneko eta Azalpeneko Hizkuntza."
+msgid "Procedure return"
+msgstr "Prozedura-itzulera"
 
-#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
-msgid "State"
-msgstr "Egoera"
+#: ../sheets/SDL.sheet.in.h:19
+msgid "Generic text note"
+msgstr "Testu-ohar generikoa"
 
 #: ../sheets/SISSI.sheet.in.h:1
-msgid "Air filter"
-msgstr "Aire-iragazkia"
+msgid "Objects to design sissi diagrams"
+msgstr "Sissi diagramak diseinatzeko objektuak"
 
 #: ../sheets/SISSI.sheet.in.h:2
-msgid "Air quality detector"
-msgstr "Aire-kalitatearen detektagailua"
+msgid "Workstation"
+msgstr "Lanpostua"
 
-#: ../sheets/SISSI.sheet.in.h:3
-msgid "Airconditioner"
-msgstr "Aire-girogailua"
+#: ../sheets/SISSI.sheet.in.h:3 ../sheets/ciscocomputer.sheet.in.h:43
+msgid "Relational Database"
+msgstr "Datu-base erlazionala"
 
 #: ../sheets/SISSI.sheet.in.h:4
-msgid "Alarm center"
-msgstr "Alarma-zentroa"
+msgid "Server"
+msgstr "Zerbitzaria"
 
-#: ../sheets/SISSI.sheet.in.h:5
-msgid "Axial Ventilator"
-msgstr "Ardatz-haizagailua"
+#: ../sheets/SISSI.sheet.in.h:5 ../sheets/ciscocomputer.sheet.in.h:36
+msgid "Laptop"
+msgstr "Eramangarria"
 
-#: ../sheets/SISSI.sheet.in.h:6
-msgid "Backup"
-msgstr "Babeskopia"
+#: ../sheets/SISSI.sheet.in.h:6 ../sheets/ciscocomputer.sheet.in.h:34
+msgid "PDA"
+msgstr "PDA"
 
-#: ../sheets/SISSI.sheet.in.h:7
-msgid "Badge reader"
-msgstr "Plaka irakurgailua"
+#: ../sheets/SISSI.sheet.in.h:7 ../sheets/ciscocomputer.sheet.in.h:49
+msgid "Storage array"
+msgstr "Biltegiratzeko array-a"
 
-#: ../sheets/SISSI.sheet.in.h:8
-msgid "Badge reader/keyboard"
-msgstr "Plaka irakurgailua/teklatua"
+#: ../sheets/SISSI.sheet.in.h:8 ../sheets/ciscohub.sheet.in.h:3
+msgid "Router"
+msgstr "Bideratzailea"
 
-#: ../sheets/SISSI.sheet.in.h:9
-msgid "Biometric reader"
-msgstr "Irakurgailu biometrikoa"
+#: ../sheets/SISSI.sheet.in.h:9 ../sheets/network.sheet.in.h:18
+msgid "Network cloud"
+msgstr "Sare-lainoa"
 
-#: ../sheets/SISSI.sheet.in.h:10
-msgid "Cell phone"
-msgstr "Telefono mugikorra"
+#: ../sheets/SISSI.sheet.in.h:10 ../sheets/network.sheet.in.h:37
+msgid "Telephone"
+msgstr "Telefonoa"
 
 #: ../sheets/SISSI.sheet.in.h:11
-msgid "Centrifugal Ventilator"
-msgstr "Haizagailu zentrifugoa"
+msgid "Cell phone"
+msgstr "Telefono mugikorra"
 
-#: ../sheets/SISSI.sheet.in.h:12
-msgid "Cipher machine"
-msgstr "Zifragailua"
+#: ../sheets/SISSI.sheet.in.h:12 ../sheets/ciscohub.sheet.in.h:21
+msgid "Hub"
+msgstr "Kontzentragailua"
 
-#: ../sheets/SISSI.sheet.in.h:13
-msgid "Circulation pump"
-msgstr "Zirkulazio-ponpa"
+#: ../sheets/SISSI.sheet.in.h:13 ../sheets/ciscocomputer.sheet.in.h:40
+msgid "Modem"
+msgstr "Modema"
 
 #: ../sheets/SISSI.sheet.in.h:14
-msgid "Condensator"
-msgstr "Kondentsadorea"
+msgid "Cipher machine"
+msgstr "Zifragailua"
 
 #: ../sheets/SISSI.sheet.in.h:15
-msgid "Current transducer"
-msgstr "Uneko transduktorea"
+msgid "Magnetic storage"
+msgstr "Zinta magnetikoa"
 
 #: ../sheets/SISSI.sheet.in.h:16
-msgid "Digital code"
-msgstr "Kode digitala"
+msgid "Paper storage"
+msgstr "Paper biltegia"
 
 #: ../sheets/SISSI.sheet.in.h:17
-msgid "Enthalpy transducer"
-msgstr "Entalpiaren sentsorea"
-
-#: ../sheets/SISSI.sheet.in.h:18
-msgid "Extinguisher"
-msgstr "Itzalgailua"
-
-#: ../sheets/SISSI.sheet.in.h:19
-msgid "Faraday cage"
-msgstr "Faraday-ren kaiola"
+msgid "Person"
+msgstr "Pertsona"
 
-#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
+#: ../sheets/SISSI.sheet.in.h:18 ../sheets/ciscomisc.sheet.in.h:48
 msgid "File cabinet"
 msgstr "Fitxategi-kabinetea"
 
-#: ../sheets/SISSI.sheet.in.h:21
-msgid "Gate"
-msgstr "Atea"
+#: ../sheets/SISSI.sheet.in.h:19
+msgid "Safe"
+msgstr "Segurtasun-kutxa"
+
+#: ../sheets/SISSI.sheet.in.h:20
+msgid "Backup"
+msgstr "Babeskopia"
 
 #: ../sheets/SISSI.sheet.in.h:22
-msgid "Geographic site"
-msgstr "Gune geografikoa"
+msgid "Log analysis"
+msgstr "Egunkariaren analisia"
 
 #: ../sheets/SISSI.sheet.in.h:23
-msgid "Glass-break sensor"
-msgstr "Beira apurtzearen sentsorea"
-
-#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
-msgid "Hub"
-msgstr "Kontzentragailua"
+msgid "Information system"
+msgstr "Informazioaren sistema"
 
-#: ../sheets/SISSI.sheet.in.h:25
+#: ../sheets/SISSI.sheet.in.h:24
 msgid "Information"
 msgstr "Informazioa"
 
+#: ../sheets/SISSI.sheet.in.h:25
+msgid "Room"
+msgstr "Gela"
+
 #: ../sheets/SISSI.sheet.in.h:26
-msgid "Information system"
-msgstr "Informazioaren sistema"
+msgid "Faraday cage"
+msgstr "Faraday-ren kaiola"
 
-#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
-msgid "Laptop"
-msgstr "Eramangarria"
+#: ../sheets/SISSI.sheet.in.h:27
+msgid "Security area"
+msgstr "Segurtasun area"
+
+#: ../sheets/SISSI.sheet.in.h:28
+msgid "Geographic site"
+msgstr "Gune geografikoa"
 
 #: ../sheets/SISSI.sheet.in.h:29
-msgid "Level detector"
-msgstr "Maila-detektagailua"
+msgid "Gate"
+msgstr "Atea"
 
 #: ../sheets/SISSI.sheet.in.h:30
-msgid "Light detector"
-msgstr "Argi-detektagailua"
+msgid "Video camera"
+msgstr "Bideo-kamera"
 
 #: ../sheets/SISSI.sheet.in.h:31
-msgid "Log analysis"
-msgstr "Egunkariaren analisia"
+msgid "Glass-break sensor"
+msgstr "Beira apurtzearen sentsorea"
 
 #: ../sheets/SISSI.sheet.in.h:32
-msgid "Magnetic storage"
-msgstr "Zinta magnetikoa"
+msgid "Sensor beam"
+msgstr "Izpi-sentsorea"
 
-#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
-msgid "Modem"
-msgstr "Modema"
+#: ../sheets/SISSI.sheet.in.h:33
+msgid "Condensator"
+msgstr "Kondentsadorea"
 
 #: ../sheets/SISSI.sheet.in.h:34
-msgid "Moisture extractor"
-msgstr "Hezetasun-erauzgailua"
+msgid "Power transducer"
+msgstr "Energia-sentsorea"
 
 #: ../sheets/SISSI.sheet.in.h:35
-msgid "Moisture sensor"
-msgstr "Hezetasun-sentsorea"
+msgid "Current transducer"
+msgstr "Uneko transduktorea"
 
 #: ../sheets/SISSI.sheet.in.h:36
-msgid "Movement detector"
-msgstr "Mugimendu-detektagailua"
+msgid "Enthalpy transducer"
+msgstr "Entalpiaren sentsorea"
 
-#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
-msgid "Network cloud"
-msgstr "Sare-lainoa"
+#: ../sheets/SISSI.sheet.in.h:37
+msgid "Smoke detector"
+msgstr "Ke-detektagailua"
 
 #: ../sheets/SISSI.sheet.in.h:38
-msgid "Objects to design sissi diagrams"
-msgstr "Sissi diagramak diseinatzeko objektuak"
+msgid "Moisture sensor"
+msgstr "Hezetasun-sentsorea"
 
-#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
-msgid "PDA"
-msgstr "PDA"
+#: ../sheets/SISSI.sheet.in.h:39
+msgid "Light detector"
+msgstr "Argi-detektagailua"
 
 #: ../sheets/SISSI.sheet.in.h:40
-msgid "Paper storage"
-msgstr "Paper biltegia"
+msgid "Movement detector"
+msgstr "Mugimendu-detektagailua"
 
 #: ../sheets/SISSI.sheet.in.h:41
-msgid "Person"
-msgstr "Pertsona"
+msgid "Video movement detector"
+msgstr "Mugimenduaren bideo-detektagailua"
 
 #: ../sheets/SISSI.sheet.in.h:42
-msgid "Power transducer"
-msgstr "Energia-sentsorea"
+msgid "Level detector"
+msgstr "Maila-detektagailua"
 
 #: ../sheets/SISSI.sheet.in.h:43
 msgid "Pressure transducer"
 msgstr "Presio-sentsorea"
 
 #: ../sheets/SISSI.sheet.in.h:44
-msgid "Pump"
-msgstr "Ponpa"
+msgid "Air quality detector"
+msgstr "Aire-kalitatearen detektagailua"
 
-#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
-msgid "Relational Database"
-msgstr "Datu-base erlazionala"
+#: ../sheets/SISSI.sheet.in.h:45
+msgid "Voltage detector"
+msgstr "Tentsio-detektagailua"
 
 #: ../sheets/SISSI.sheet.in.h:46
-msgid "Revolving door"
-msgstr "Ate birakaria"
+msgid "Vehicle detector"
+msgstr "Ibilgailu-detektagailua"
 
 #: ../sheets/SISSI.sheet.in.h:47
-msgid "Room"
-msgstr "Gela"
+msgid "Vibration sensor"
+msgstr "Bibrazio-sentsorea"
 
-#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
-msgid "Router"
-msgstr "Bideratzailea"
+#: ../sheets/SISSI.sheet.in.h:48
+msgid "Digital code"
+msgstr "Kode digitala"
 
 #: ../sheets/SISSI.sheet.in.h:49
-msgid "Safe"
-msgstr "Segurtasun-kutxa"
+msgid "Moisture extractor"
+msgstr "Hezetasun-erauzgailua"
 
 #: ../sheets/SISSI.sheet.in.h:50
-msgid "Security area"
-msgstr "Segurtasun area"
+msgid "Air filter"
+msgstr "Aire-iragazkia"
 
 #: ../sheets/SISSI.sheet.in.h:51
-msgid "Sensor beam"
-msgstr "Izpi-sentsorea"
+msgid "Badge reader/keyboard"
+msgstr "Plaka irakurgailua/teklatua"
 
 #: ../sheets/SISSI.sheet.in.h:52
-msgid "Server"
-msgstr "Zerbitzaria"
+msgid "Badge reader"
+msgstr "Plaka irakurgailua"
 
 #: ../sheets/SISSI.sheet.in.h:53
-msgid "Smoke detector"
-msgstr "Ke-detektagailua"
+msgid "Biometric reader"
+msgstr "Irakurgailu biometrikoa"
 
-#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
-msgid "Storage array"
-msgstr "Biltegiratzeko array-a"
+#: ../sheets/SISSI.sheet.in.h:54
+msgid "Pump"
+msgstr "Ponpa"
 
-#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
-msgid "Telephone"
-msgstr "Telefonoa"
+#: ../sheets/SISSI.sheet.in.h:55
+msgid "Circulation pump"
+msgstr "Zirkulazio-ponpa"
+
+#: ../sheets/SISSI.sheet.in.h:56
+msgid "Revolving door"
+msgstr "Ate birakaria"
 
 #: ../sheets/SISSI.sheet.in.h:57
-msgid "Vehicle detector"
-msgstr "Ibilgailu-detektagailua"
+msgid "Axial Ventilator"
+msgstr "Ardatz-haizagailua"
 
 #: ../sheets/SISSI.sheet.in.h:58
-msgid "Ventilator"
-msgstr "Haizagailua"
+msgid "Centrifugal Ventilator"
+msgstr "Haizagailu zentrifugoa"
 
 #: ../sheets/SISSI.sheet.in.h:59
-msgid "Vibration sensor"
-msgstr "Bibrazio-sentsorea"
+msgid "Ventilator"
+msgstr "Haizagailua"
 
 #: ../sheets/SISSI.sheet.in.h:60
-msgid "Video camera"
-msgstr "Bideo-kamera"
-
-#: ../sheets/SISSI.sheet.in.h:61
-msgid "Video movement detector"
-msgstr "Mugimenduaren bideo-detektagailua"
+msgid "Extinguisher"
+msgstr "Itzalgailua"
 
 #: ../sheets/SISSI.sheet.in.h:62
-msgid "Voltage detector"
-msgstr "Tentsio-detektagailua"
+msgid "Airconditioner"
+msgstr "Aire-girogailua"
 
 #: ../sheets/SISSI.sheet.in.h:63
-msgid "Workstation"
-msgstr "Lanpostua"
+msgid "Alarm center"
+msgstr "Alarma-zentroa"
 
 #: ../sheets/UML.sheet.in.h:1
-msgid "Activity"
-msgstr "Jarduera"
+msgid "UML"
+msgstr "UML"
 
-#: ../sheets/UML.sheet.in.h:3
-msgid "Aggregation, one class is part of another"
-msgstr "Agregazioa, klase bat beste baten zati da"
+#: ../sheets/UML.sheet.in.h:2
+msgid "Editor for UML Static Structure Diagrams"
+msgstr "UML egitura estatikoko diagramen editorea"
 
-#: ../sheets/UML.sheet.in.h:4
-msgid "Association, two classes are associated"
-msgstr "Asoziazioa, bi klase asoziatuta"
+#: ../sheets/UML.sheet.in.h:5
+msgid "Note"
+msgstr "Oharra"
 
 #: ../sheets/UML.sheet.in.h:7
-msgid "Class stereotype icon"
-msgstr "Klase-estereotipoaren ikonoa"
+msgid "Realizes, implements a specific interface"
+msgstr "Gauzatzea; interfaze jakin bat inplementatzen du"
 
 #: ../sheets/UML.sheet.in.h:8
-msgid "Component"
-msgstr "Osagaia"
+msgid "Generalization, class inheritance"
+msgstr "Orokortzea, klase-herentzia"
 
 #: ../sheets/UML.sheet.in.h:9
-msgid "Constraint, place a constraint on something"
-msgstr "Murriztapena, jarri murriztapen bat zerbaiti"
-
-#: ../sheets/UML.sheet.in.h:11
-msgid "Editor for UML Static Structure Diagrams"
-msgstr "UML egitura estatikoko diagramen editorea"
-
-#: ../sheets/UML.sheet.in.h:15
-msgid "Fork/union"
-msgstr "Banatzea/batzea"
+msgid "Association, two classes are associated"
+msgstr "Asoziazioa, bi klase asoziatuta"
 
-#: ../sheets/UML.sheet.in.h:16
-msgid "Generalization, class inheritance"
-msgstr "Orokortzea, klase-herentzia"
+#: ../sheets/UML.sheet.in.h:10
+msgid "Aggregation, one class is part of another"
+msgstr "Agregazioa, klase bat beste baten zati da"
 
-#: ../sheets/UML.sheet.in.h:17
+#: ../sheets/UML.sheet.in.h:11
 msgid "Implements, class implements a specific interface"
 msgstr "Inplementatzea; klaseak interfaze jakin bat inplementatzen du"
 
-#: ../sheets/UML.sheet.in.h:18
-msgid "Initial/end state"
-msgstr "Hasierako/amaierako egoera"
+#: ../sheets/UML.sheet.in.h:12
+msgid "Constraint, place a constraint on something"
+msgstr "Murriztapena, jarri murriztapen bat zerbaiti"
 
-#: ../sheets/UML.sheet.in.h:19
+#: ../sheets/UML.sheet.in.h:13
+msgid "Small package"
+msgstr "Pakete txikia"
+
+#: ../sheets/UML.sheet.in.h:14
 msgid "Large package"
 msgstr "Pakete handia"
 
-#: ../sheets/UML.sheet.in.h:20
+#: ../sheets/UML.sheet.in.h:16
+msgid "Use case"
+msgstr "Erabili kapitalizazioa"
+
+#: ../sheets/UML.sheet.in.h:17
 msgid "Lifeline"
 msgstr "Bizitza-marra"
 
-#: ../sheets/UML.sheet.in.h:21
+#: ../sheets/UML.sheet.in.h:18
+msgid "Object"
+msgstr "Objektua"
+
+#: ../sheets/UML.sheet.in.h:19
 msgid "Message"
 msgstr "Mezua"
 
-#: ../sheets/UML.sheet.in.h:22
+#: ../sheets/UML.sheet.in.h:20
+msgid "Component"
+msgstr "Osagaia"
+
+#: ../sheets/UML.sheet.in.h:25
 msgid "Node"
 msgstr "Nodoa"
 
-#: ../sheets/UML.sheet.in.h:23
-msgid "Note"
-msgstr "Oharra"
-
-#: ../sheets/UML.sheet.in.h:24
-msgid "Object"
-msgstr "Objektua"
-
-#: ../sheets/UML.sheet.in.h:25
-msgid "Realizes, implements a specific interface"
-msgstr "Gauzatzea; interfaze jakin bat inplementatzen du"
+#: ../sheets/UML.sheet.in.h:26
+msgid "Class stereotype icon"
+msgstr "Klase-estereotipoaren ikonoa"
 
 #: ../sheets/UML.sheet.in.h:27
-msgid "Small package"
-msgstr "Pakete txikia"
+msgid "Initial/end state"
+msgstr "Hasierako/amaierako egoera"
 
-#: ../sheets/UML.sheet.in.h:31
-msgid "UML"
-msgstr "UML"
+#: ../sheets/UML.sheet.in.h:29
+msgid "Activity"
+msgstr "Jarduera"
 
-#: ../sheets/UML.sheet.in.h:32
-msgid "Use case"
-msgstr "Erabili kapitalizazioa"
+#: ../sheets/UML.sheet.in.h:31
+msgid "Fork/union"
+msgstr "Banatzea/batzea"
 
 #: ../sheets/chronogram.sheet.in.h:1
 msgid "Chronogram"
 msgstr "Kronograma"
 
 #: ../sheets/chronogram.sheet.in.h:2
-msgid "Data line"
-msgstr "Datu-lerroa"
-
-#: ../sheets/chronogram.sheet.in.h:3
 msgid "Objects to design chronogram charts"
 msgstr "Kronograma-diagramak diseinatzeko objektuak"
 
-#: ../sheets/chronogram.sheet.in.h:4
+#: ../sheets/chronogram.sheet.in.h:3
 msgid "Time scale"
 msgstr "Denbora-eskala"
 
-#: ../sheets/ciscocomputer.sheet.in.h:1
-msgid "BBS"
-msgstr "BBS"
+#: ../sheets/chronogram.sheet.in.h:4
+msgid "Data line"
+msgstr "Datu-lerroa"
 
-#: ../sheets/ciscocomputer.sheet.in.h:2
+#: ../sheets/ciscocomputer.sheet.in.h:1
 msgid "Cisco - Computer"
 msgstr "Cisco - Ordenagailua"
 
+#: ../sheets/ciscocomputer.sheet.in.h:2
+msgid "Computer shapes by Cisco"
+msgstr "Cisco-ren ordenagailu-formak"
+
 #: ../sheets/ciscocomputer.sheet.in.h:3
-msgid "Cisco CA"
-msgstr "Cisco CA"
+msgid "PC"
+msgstr "PC"
 
 #: ../sheets/ciscocomputer.sheet.in.h:4
-msgid "CiscoSecurity"
-msgstr "CiscoSecurity"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../sheets/ciscocomputer.sheet.in.h:5
-msgid "CiscoWorks workstation"
-msgstr "CiscoWorks lanpostua"
+msgid "Terminal"
+msgstr "Terminala"
 
 #: ../sheets/ciscocomputer.sheet.in.h:6
-msgid "Computer shapes by Cisco"
-msgstr "Cisco-ren ordenagailu-formak"
+msgid "SUN workstation"
+msgstr "SUN lanpostua"
 
 #: ../sheets/ciscocomputer.sheet.in.h:7
-msgid "Disk subsystem"
-msgstr "Diskoaren azpisistema"
+msgid "CiscoWorks workstation"
+msgstr "CiscoWorks lanpostua"
 
 #: ../sheets/ciscocomputer.sheet.in.h:8
-msgid "Diskette"
-msgstr "Disketea"
+msgid "PC Router Card"
+msgstr "PC bideratzaile-txartela"
 
 #: ../sheets/ciscocomputer.sheet.in.h:9
-msgid "EtherClient"
-msgstr "Ethernet bezeroa"
+msgid "PC Software"
+msgstr "PC softwarea"
 
 #: ../sheets/ciscocomputer.sheet.in.h:10
-msgid "FC Storage"
-msgstr "FC biltegiratzea"
+msgid "PC with Router-Based Software"
+msgstr "PC bideratzaile-softwarearekin"
 
 #: ../sheets/ciscocomputer.sheet.in.h:11
-msgid "File Server"
-msgstr "Fitxategi-zerbitzaria"
+msgid "Workgroup director"
+msgstr "Lantaldeko zuzendaria"
 
 #: ../sheets/ciscocomputer.sheet.in.h:12
-msgid "Front End Processor"
-msgstr "Aurrealdeko prozesadorea"
+msgid "CiscoSecurity"
+msgstr "CiscoSecurity"
 
 #: ../sheets/ciscocomputer.sheet.in.h:13
-msgid "HP Mini"
-msgstr "HP Mini"
+msgid "Cisco CA"
+msgstr "Cisco CA"
 
 #: ../sheets/ciscocomputer.sheet.in.h:14
-msgid "Handheld"
-msgstr "Eskuko ordenagailua"
+msgid "WWW server"
+msgstr "WWW zerbitzaria"
 
 #: ../sheets/ciscocomputer.sheet.in.h:15
-msgid "Host"
-msgstr "Ostalaria"
+msgid "Web browser"
+msgstr "Web arakatzailea"
 
 #: ../sheets/ciscocomputer.sheet.in.h:16
-msgid "IBM Mini (AS400)"
-msgstr "IBM Mini (AS400)"
+msgid "File Server"
+msgstr "Fitxategi-zerbitzaria"
 
 #: ../sheets/ciscocomputer.sheet.in.h:17
-msgid "IBM Tower"
-msgstr "IBM dorrea"
+msgid "Software-Based Router on File Server"
+msgstr "Softwarean oinarritutako bideratzailea fitxategi-zerbitzarian"
 
 #: ../sheets/ciscocomputer.sheet.in.h:18
-msgid "IBM mainframe"
-msgstr "IBM mainframe"
+msgid "Server with PC Router"
+msgstr "Zerbitzaria PC bideratzailearekin"
 
 #: ../sheets/ciscocomputer.sheet.in.h:19
-msgid "IBM mainframe with FEP"
-msgstr "IBM mainframe FEP-rekin"
+msgid "IBM Tower"
+msgstr "IBM dorrea"
 
 #: ../sheets/ciscocomputer.sheet.in.h:20
-msgid "JBOD"
-msgstr "JBOD"
+msgid "IBM Mini (AS400)"
+msgstr "IBM Mini (AS400)"
+
+#: ../sheets/ciscocomputer.sheet.in.h:21
+msgid "Front End Processor"
+msgstr "Aurrealdeko prozesadorea"
 
 #: ../sheets/ciscocomputer.sheet.in.h:22
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "IBM mainframe"
+msgstr "IBM mainframe"
 
 #: ../sheets/ciscocomputer.sheet.in.h:23
-msgid "MicroWebserver"
-msgstr "MicroWebserver"
+msgid "IBM mainframe with FEP"
+msgstr "IBM mainframe FEP-rekin"
 
 #: ../sheets/ciscocomputer.sheet.in.h:24
-msgid "Mini VAX"
-msgstr "Mini VAX"
+msgid "HP Mini"
+msgstr "HP Mini"
 
-#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
-msgid "Monitor"
-msgstr "Monitorea"
+#: ../sheets/ciscocomputer.sheet.in.h:25
+msgid "Supercomputer"
+msgstr "Superordenagailua"
+
+#: ../sheets/ciscocomputer.sheet.in.h:26
+msgid "Web cluster"
+msgstr "Web lukua"
 
 #: ../sheets/ciscocomputer.sheet.in.h:27
-msgid "Newton"
-msgstr "Newton"
+msgid "Mini VAX"
+msgstr "Mini VAX"
 
 #: ../sheets/ciscocomputer.sheet.in.h:28
-msgid "PC"
-msgstr "PC"
-
-#: ../sheets/ciscocomputer.sheet.in.h:29
-msgid "PC Adapter Card"
-msgstr "PC moldagailu-txartela"
-
-#: ../sheets/ciscocomputer.sheet.in.h:30
 msgid "PC Card"
 msgstr "PC txartela"
 
+#: ../sheets/ciscocomputer.sheet.in.h:30
+msgid "Tablet"
+msgstr "Taula"
+
 #: ../sheets/ciscocomputer.sheet.in.h:31
-msgid "PC Router Card"
-msgstr "PC bideratzaile-txartela"
+msgid "EtherClient"
+msgstr "Ethernet bezeroa"
 
 #: ../sheets/ciscocomputer.sheet.in.h:32
-msgid "PC Software"
-msgstr "PC softwarea"
+msgid "Handheld"
+msgstr "Eskuko ordenagailua"
 
 #: ../sheets/ciscocomputer.sheet.in.h:33
-msgid "PC Video"
-msgstr "PC bideoa"
+msgid "Wireless"
+msgstr "Haririk gabea"
 
-#: ../sheets/ciscocomputer.sheet.in.h:34
-msgid "PC with Router-Based Software"
-msgstr "PC bideratzaile-softwarearekin"
+#: ../sheets/ciscocomputer.sheet.in.h:35
+msgid "Newton"
+msgstr "Newton"
 
-#: ../sheets/ciscocomputer.sheet.in.h:38
-msgid "SUN workstation"
-msgstr "SUN lanpostua"
+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
+msgid "Monitor"
+msgstr "Monitorea"
 
-#: ../sheets/ciscocomputer.sheet.in.h:40
-msgid "Server with PC Router"
-msgstr "Zerbitzaria PC bideratzailearekin"
+#: ../sheets/ciscocomputer.sheet.in.h:39
+msgid "PC Video"
+msgstr "PC bideoa"
 
 #: ../sheets/ciscocomputer.sheet.in.h:41
-msgid "Software-Based Router on File Server"
-msgstr "Softwarean oinarritutako bideratzailea fitxategi-zerbitzarian"
+msgid "BBS"
+msgstr "BBS"
 
-#: ../sheets/ciscocomputer.sheet.in.h:43
-msgid "Supercomputer"
-msgstr "Superordenagailua"
+#: ../sheets/ciscocomputer.sheet.in.h:42
+msgid "MicroWebserver"
+msgstr "MicroWebserver"
 
 #: ../sheets/ciscocomputer.sheet.in.h:44
-msgid "Tablet"
-msgstr "Taula"
+msgid "Diskette"
+msgstr "Disketea"
 
 #: ../sheets/ciscocomputer.sheet.in.h:45
-msgid "Tape array"
-msgstr "Zinta array-a"
+msgid "Host"
+msgstr "Ostalaria"
 
 #: ../sheets/ciscocomputer.sheet.in.h:46
-msgid "Terminal"
-msgstr "Terminala"
+msgid "Tape array"
+msgstr "Zinta array-a"
 
 #: ../sheets/ciscocomputer.sheet.in.h:47
-msgid "WWW server"
-msgstr "WWW zerbitzaria"
+msgid "Disk subsystem"
+msgstr "Diskoaren azpisistema"
 
 #: ../sheets/ciscocomputer.sheet.in.h:48
-msgid "Web browser"
-msgstr "Web arakatzailea"
-
-#: ../sheets/ciscocomputer.sheet.in.h:49
-msgid "Web cluster"
-msgstr "Web lukua"
+msgid "JBOD"
+msgstr "JBOD"
 
 #: ../sheets/ciscocomputer.sheet.in.h:50
-msgid "Wireless"
-msgstr "Haririk gabea"
+msgid "FC Storage"
+msgstr "FC biltegiratzea"
 
 #: ../sheets/ciscocomputer.sheet.in.h:51
-msgid "Workgroup director"
-msgstr "Lantaldeko zuzendaria"
+msgid "PC Adapter Card"
+msgstr "PC moldagailu-txartela"
 
 #: ../sheets/ciscohub.sheet.in.h:1
-msgid "100BaseT Hub"
-msgstr "100BaseT kontzentragailua"
+msgid "Cisco - Switch"
+msgstr "Cisco - konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:2
-msgid "7500ARS (7513) Router"
-msgstr "7500ARS (7513) bideratzailea"
-
-#: ../sheets/ciscohub.sheet.in.h:3
-msgid "7505 Router"
-msgstr "7505 Bideratzailea"
+msgid "Router and switch shapes by Cisco"
+msgstr "Cisco-ren kontzentragailu- eta konmutadore-formak"
 
 #: ../sheets/ciscohub.sheet.in.h:4
-msgid "7507 Router"
-msgstr "7507 Bideratzailea"
+msgid "Router subdued"
+msgstr "Bideratzaile estutua"
 
 #: ../sheets/ciscohub.sheet.in.h:5
-msgid "ASIC Processor"
-msgstr "ASIC prozesadorea"
+msgid "Router with Silicon Switch"
+msgstr "Silicon konmutadoredun bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:6
-msgid "ATM 3800"
-msgstr "ATM 3800"
+msgid "NetFlow router"
+msgstr "NetFlow bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:7
-msgid "ATM Fast Gigabit Etherswitch"
-msgstr "ATM fast gigabit ethernet konmutadorea"
+msgid "Broadband router"
+msgstr "Banda zabaleko bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:8
-msgid "ATM Switch"
-msgstr "ATM konmutadorea"
+msgid "Wavelength router"
+msgstr "Uhin-luzeraren bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:9
-msgid "ATM Tag Switch Router"
-msgstr "ATM tag konmutadore-bideratzailea"
+msgid "Wireless router"
+msgstr "Haririk gabeko bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:10
-msgid "Access Gateway"
-msgstr "Atzipen-atebidea"
+msgid "7507 Router"
+msgstr "7507 Bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:11
-msgid "BBSM"
-msgstr "BBSM"
+msgid "7505 Router"
+msgstr "7505 Bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:12
-msgid "Broadband router"
-msgstr "Banda zabaleko bideratzailea"
+msgid "7500ARS (7513) Router"
+msgstr "7500ARS (7513) bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:13
-msgid "CSM-S"
-msgstr "CSM-S"
+msgid "Edge Label Switch Router with NetFlow"
+msgstr "Konmutadore-bideratzailearen ertzaren etiketa NetFlow-rekin"
 
 #: ../sheets/ciscohub.sheet.in.h:14
-msgid "Carrier Routing System"
-msgstr "Bideraketa garraiatzailearen sistema"
+msgid "Edge Label Switch Router"
+msgstr "Konmutadore-bideratzailearen ertzaren etiketa"
 
 #: ../sheets/ciscohub.sheet.in.h:15
-msgid "Cisco - Switch"
-msgstr "Cisco - konmutadorea"
+msgid "Router with Firewall"
+msgstr "Suebakidun bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:16
-msgid "Cisco 1000"
-msgstr "Cisco 1000"
+msgid "Optical Services Router"
+msgstr "Zerbitzu optikoen bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:17
-msgid "Cisco Hub"
-msgstr "Cisco  kontzentragailua"
-
-#: ../sheets/ciscohub.sheet.in.h:18
 msgid "Content Router"
 msgstr "Eduki-bideratzailea"
 
+#: ../sheets/ciscohub.sheet.in.h:18
+msgid "Carrier Routing System"
+msgstr "Bideraketa garraiatzailearen sistema"
+
 #: ../sheets/ciscohub.sheet.in.h:19
-msgid "Content Service Module"
-msgstr "Eduki-zerbitzuen modulua"
+msgid "Storage Router"
+msgstr "Biltegiratze-bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:20
-msgid "Content Service Switch 1100"
-msgstr "1100 eduki-zerbitzuetako konmutadorea"
-
-#: ../sheets/ciscohub.sheet.in.h:21
-msgid "Content Switch"
-msgstr "Eduki-konmutadorea"
+msgid "NetSonar"
+msgstr "NetSonar"
 
 #: ../sheets/ciscohub.sheet.in.h:22
-msgid "Data Center Switch"
-msgstr "Datu-zentruaren konmutadorea"
+msgid "Hub subdued"
+msgstr "Kontzentragailu estuta"
 
 #: ../sheets/ciscohub.sheet.in.h:23
-msgid "Data Center Switch Reversed"
-msgstr "Datu-zentruaren alderantzizko konmutadorea"
+msgid "Cisco Hub"
+msgstr "Cisco  kontzentragailua"
 
 #: ../sheets/ciscohub.sheet.in.h:24
-msgid "Data Switch Processor"
-msgstr "Datu-konmutadorearen prozesadorea"
+msgid "Small Hub"
+msgstr "Kontzentragailu txikia"
 
 #: ../sheets/ciscohub.sheet.in.h:25
-msgid "Director-class Fibre Channel intelligent switch"
-msgstr "Direktor-klaseko zuntz-kanal aldatzaile azkarra"
+msgid "100BaseT Hub"
+msgstr "100BaseT kontzentragailua"
 
 #: ../sheets/ciscohub.sheet.in.h:26
-msgid "Edge Label Switch Router"
-msgstr "Konmutadore-bideratzailearen ertzaren etiketa"
+msgid "Workgroup switch"
+msgstr "Lantalde-konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:27
-msgid "Edge Label Switch Router with NetFlow"
-msgstr "Konmutadore-bideratzailearen ertzaren etiketa NetFlow-rekin"
+msgid "Workgroup switch Subdued"
+msgstr "Lantaldeko konmutadore estutua"
 
 #: ../sheets/ciscohub.sheet.in.h:28
-msgid "Generic Processor"
-msgstr "Prozesadore generikoa"
+msgid "Workgroup Switch Voice-Enabled"
+msgstr "Lantaldeko ahots-konmutadorea"
+
+#: ../sheets/ciscohub.sheet.in.h:29
+msgid "BBSM"
+msgstr "BBSM"
 
 #: ../sheets/ciscohub.sheet.in.h:30
-msgid "Hub subdued"
-msgstr "Kontzentragailu estuta"
+msgid "ATM Tag Switch Router"
+msgstr "ATM tag konmutadore-bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:31
-msgid "ISDN switch"
-msgstr "ISDN konmutadorea"
+msgid "Switch Processor"
+msgstr "Konmutadorearen prozesadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:32
-msgid "LAN2LAN Switch"
-msgstr "LAN2LAN konmutadorea"
+msgid "Route Switch Processor"
+msgstr "Bide-konmutadorearen prozesadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:33
-msgid "Label Switch Router"
-msgstr "Etiketa-konmutadorearen bideratzailea"
+msgid "Route Switch Processor with Si"
+msgstr "Bide-konmutadorearen prozesadorea Si-rekin"
 
 #: ../sheets/ciscohub.sheet.in.h:34
-msgid "Layer 2 Remote Switch"
-msgstr "Layer 3 urruneko konmutadorea"
+msgid "PXF"
+msgstr "PXF"
 
 #: ../sheets/ciscohub.sheet.in.h:35
-msgid "MGX 8220"
-msgstr "MGX 8220"
+msgid "ASIC Processor"
+msgstr "ASIC prozesadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:36
-msgid "MGX 8240"
-msgstr "MGX 8240"
+msgid "Generic Processor"
+msgstr "Prozesadore generikoa"
 
 #: ../sheets/ciscohub.sheet.in.h:37
-msgid "MGX 8260"
-msgstr "MGX 8260"
+msgid "Data Center Switch"
+msgstr "Datu-zentruaren konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:38
-msgid "Multi-Fabric Server Switch"
-msgstr "Fabrika anitzeko zerbitzari-konmutadorea"
+msgid "Data Center Switch Reversed"
+msgstr "Datu-zentruaren alderantzizko konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:39
-msgid "MultiSwitch Device"
-msgstr "Multikonmutadore gailua"
+msgid "Data Switch Processor"
+msgstr "Datu-konmutadorearen prozesadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:40
-msgid "Multilayer Remote Switch"
-msgstr "Geruza anitzeko urruneko konmutadorea"
+msgid "Content Switch"
+msgstr "Eduki-konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:41
-msgid "Multilayer Switch"
-msgstr "Geruza anitzeko konmutadorea"
+msgid "Content Service Module"
+msgstr "Eduki-zerbitzuen modulua"
 
 #: ../sheets/ciscohub.sheet.in.h:42
-msgid "Multilayer Switch with Silicon"
-msgstr "Geruza anitzeko konmutadorea Silicon-ekin"
+msgid "CSM-S"
+msgstr "CSM-S"
 
 #: ../sheets/ciscohub.sheet.in.h:43
-msgid "Multilayer Switch with Silicon subdued"
-msgstr "Geruza anitzeko konmutadorea Silicon"
+msgid "Access Gateway"
+msgstr "Atzipen-atebidea"
 
 #: ../sheets/ciscohub.sheet.in.h:44
-msgid "NetFlow router"
-msgstr "NetFlow bideratzailea"
+msgid "ATM Switch"
+msgstr "ATM konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:45
-msgid "NetRanger"
-msgstr "NetRanger"
+msgid "ATM 3800"
+msgstr "ATM 3800"
 
 #: ../sheets/ciscohub.sheet.in.h:46
-msgid "NetSonar"
-msgstr "NetSonar"
+msgid "Cisco 1000"
+msgstr "Cisco 1000"
 
 #: ../sheets/ciscohub.sheet.in.h:47
-msgid "Optical Services Router"
-msgstr "Zerbitzu optikoen bideratzailea"
+msgid "ISDN switch"
+msgstr "ISDN konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:48
-msgid "PXF"
-msgstr "PXF"
+msgid "Label Switch Router"
+msgstr "Etiketa-konmutadorearen bideratzailea"
 
 #: ../sheets/ciscohub.sheet.in.h:49
-msgid "Programmable Switch"
-msgstr "Konmutadore programagarria"
+msgid "MultiSwitch Device"
+msgstr "Multikonmutadore gailua"
 
 #: ../sheets/ciscohub.sheet.in.h:50
-msgid "RateMUX"
-msgstr "RateMUX"
+msgid "LAN2LAN Switch"
+msgstr "LAN2LAN konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:51
-msgid "Route Switch Processor"
-msgstr "Bide-konmutadorearen prozesadorea"
+msgid "Multilayer Switch"
+msgstr "Geruza anitzeko konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:52
-msgid "Route Switch Processor with Si"
-msgstr "Bide-konmutadorearen prozesadorea Si-rekin"
+msgid "Multilayer Switch with Silicon"
+msgstr "Geruza anitzeko konmutadorea Silicon-ekin"
+
+#: ../sheets/ciscohub.sheet.in.h:53
+msgid "Multilayer Switch with Silicon subdued"
+msgstr "Geruza anitzeko konmutadorea Silicon"
 
 #: ../sheets/ciscohub.sheet.in.h:54
-msgid "Router and switch shapes by Cisco"
-msgstr "Cisco-ren kontzentragailu- eta konmutadore-formak"
+msgid "Programmable Switch"
+msgstr "Konmutadore programagarria"
 
 #: ../sheets/ciscohub.sheet.in.h:55
-msgid "Router subdued"
-msgstr "Bideratzaile estutua"
+msgid "Content Service Switch 1100"
+msgstr "1100 eduki-zerbitzuetako konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:56
-msgid "Router with Firewall"
-msgstr "Suebakidun bideratzailea"
+msgid "ATM Fast Gigabit Etherswitch"
+msgstr "ATM fast gigabit ethernet konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:57
-msgid "Router with Silicon Switch"
-msgstr "Silicon konmutadoredun bideratzailea"
+msgid "RateMUX"
+msgstr "RateMUX"
 
 #: ../sheets/ciscohub.sheet.in.h:58
-msgid "Server Switch"
-msgstr "Zerbitzari-konmutadorea"
+msgid "Workgroup 5500"
+msgstr "Lantaldea 5500"
 
 #: ../sheets/ciscohub.sheet.in.h:59
-msgid "Small Hub"
-msgstr "Kontzentragailu txikia"
+msgid "Workgroup 5000"
+msgstr "Lantaldea 5000"
 
 #: ../sheets/ciscohub.sheet.in.h:60
-msgid "Storage Router"
-msgstr "Biltegiratze-bideratzailea"
+msgid "Workgroup 5002"
+msgstr "Lantaldea 5002"
 
 #: ../sheets/ciscohub.sheet.in.h:61
-msgid "Switch Processor"
-msgstr "Konmutadorearen prozesadorea"
+msgid "NetRanger"
+msgstr "NetRanger"
 
 #: ../sheets/ciscohub.sheet.in.h:62
-msgid "Universal Gateway"
-msgstr "Atebide unibertsala"
+msgid "MGX 8220"
+msgstr "MGX 8220"
 
 #: ../sheets/ciscohub.sheet.in.h:63
-msgid "Virtual Layer Switch"
-msgstr "Geruza birtualeko konmutadorea"
+msgid "MGX 8240"
+msgstr "MGX 8240"
 
 #: ../sheets/ciscohub.sheet.in.h:64
-msgid "Wavelength router"
-msgstr "Uhin-luzeraren bideratzailea"
+msgid "MGX 8260"
+msgstr "MGX 8260"
 
 #: ../sheets/ciscohub.sheet.in.h:65
-msgid "Wireless router"
-msgstr "Haririk gabeko bideratzailea"
+msgid "Universal Gateway"
+msgstr "Atebide unibertsala"
 
 #: ../sheets/ciscohub.sheet.in.h:66
-msgid "Workgroup 5000"
-msgstr "Lantaldea 5000"
+msgid "iSCSI switch"
+msgstr "iSCSI konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:67
-msgid "Workgroup 5002"
-msgstr "Lantaldea 5002"
+msgid "Workgroup Fibre Channel intelligent switch"
+msgstr "Lantaldeko Zunt-Kanal aldatzaile azkarra"
 
 #: ../sheets/ciscohub.sheet.in.h:68
-msgid "Workgroup 5500"
-msgstr "Lantaldea 5500"
+msgid "Director-class Fibre Channel intelligent switch"
+msgstr "Direktor-klaseko zuntz-kanal aldatzaile azkarra"
 
 #: ../sheets/ciscohub.sheet.in.h:69
-msgid "Workgroup Fibre Channel intelligent switch"
-msgstr "Lantaldeko Zunt-Kanal aldatzaile azkarra"
+msgid "Multi-Fabric Server Switch"
+msgstr "Fabrika anitzeko zerbitzari-konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:70
-msgid "Workgroup Switch Voice-Enabled"
-msgstr "Lantaldeko ahots-konmutadorea"
+msgid "Server Switch"
+msgstr "Zerbitzari-konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:71
-msgid "Workgroup switch"
-msgstr "Lantalde-konmutadorea"
+msgid "Multilayer Remote Switch"
+msgstr "Geruza anitzeko urruneko konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:72
-msgid "Workgroup switch Subdued"
-msgstr "Lantaldeko konmutadore estutua"
+msgid "Layer 2 Remote Switch"
+msgstr "Layer 3 urruneko konmutadorea"
 
 #: ../sheets/ciscohub.sheet.in.h:73
-msgid "iSCSI switch"
-msgstr "iSCSI konmutadorea"
+msgid "Virtual Layer Switch"
+msgstr "Geruza birtualeko konmutadorea"
 
 #: ../sheets/ciscomisc.sheet.in.h:1
-msgid "Androgynous Person"
-msgstr "Pertsona androginoa"
+msgid "Cisco - Misc"
+msgstr "Cisco - Hainb."
 
 #: ../sheets/ciscomisc.sheet.in.h:2
-msgid "Antenna"
-msgstr "Antena"
+msgid "Miscellaneous shapes by Cisco"
+msgstr "Cisco-ren hainbat forma"
 
 #: ../sheets/ciscomisc.sheet.in.h:3
-msgid "Branch office"
-msgstr "Sukurtsala"
+msgid "Government Building"
+msgstr "Gobernuaren eraikina"
 
 #: ../sheets/ciscomisc.sheet.in.h:4
-msgid "Branch office blue"
-msgstr "Sukurtsal urdina"
+msgid "University"
+msgstr "Unibertsitatea"
 
 #: ../sheets/ciscomisc.sheet.in.h:5
-msgid "Branch office subdued"
-msgstr "Sukurtsal estutua"
+msgid "Small Business"
+msgstr "Enpresa txikia"
 
 #: ../sheets/ciscomisc.sheet.in.h:6
-msgid "Car"
-msgstr "Autoa"
+msgid "Home office"
+msgstr "Bulegoa"
 
 #: ../sheets/ciscomisc.sheet.in.h:7
-msgid "Cisco - Misc"
-msgstr "Cisco - Hainb."
+msgid "Branch office"
+msgstr "Sukurtsala"
 
 #: ../sheets/ciscomisc.sheet.in.h:8
-msgid "CiscoWorks Man"
-msgstr "CiscoWorks gizona"
+msgid "Branch office subdued"
+msgstr "Sukurtsal estutua"
+
+#: ../sheets/ciscomisc.sheet.in.h:9
+msgid "Branch office blue"
+msgstr "Sukurtsal urdina"
 
 #: ../sheets/ciscomisc.sheet.in.h:10
 msgid "Generic Building"
 msgstr "Eraikin generikoa"
 
 #: ../sheets/ciscomisc.sheet.in.h:11
-msgid "Generic Building blue"
-msgstr "Eraikin generiko urdina"
-
-#: ../sheets/ciscomisc.sheet.in.h:12
 msgid "Generic Building subdued"
 msgstr "Eraikin generiko estutua"
 
+#: ../sheets/ciscomisc.sheet.in.h:12
+msgid "Generic Building blue"
+msgstr "Eraikin generiko urdina"
+
 #: ../sheets/ciscomisc.sheet.in.h:13
-msgid "Government Building"
-msgstr "Gobernuaren eraikina"
+msgid "Medium Building"
+msgstr "Ertaineko eraikina"
 
 #: ../sheets/ciscomisc.sheet.in.h:14
-msgid "Headphones"
-msgstr "Aurikularra"
+msgid "Medium Building subdued"
+msgstr "Ertaineko eraikin estutua"
 
 #: ../sheets/ciscomisc.sheet.in.h:15
-msgid "Home office"
-msgstr "Bulegoa"
+msgid "Medium Building blue"
+msgstr "Ertaineko eraikin urdina"
 
 #: ../sheets/ciscomisc.sheet.in.h:16
 msgid "House"
@@ -9364,1130 +9415,1135 @@ msgid "House blue"
 msgstr "Etxe urdina"
 
 #: ../sheets/ciscomisc.sheet.in.h:18
-msgid "Key"
-msgstr "Gakoa"
+msgid "Telecommuter house"
+msgstr "Telekonmutadorearen etxea"
 
-#: ../sheets/ciscomisc.sheet.in.h:20
-msgid "Lock and Key"
-msgstr "Blokeoa eta gakoa"
+#: ../sheets/ciscomisc.sheet.in.h:19
+msgid "Telecommuter house subdued"
+msgstr "Telekonmutadorearen etxea estutua"
 
-#: ../sheets/ciscomisc.sheet.in.h:21
+#: ../sheets/ciscomisc.sheet.in.h:20
 msgid "MDU"
 msgstr "MDU"
 
+#: ../sheets/ciscomisc.sheet.in.h:21
+msgid "Man"
+msgstr "Gizona"
+
 #: ../sheets/ciscomisc.sheet.in.h:22
-msgid "Mac Woman"
-msgstr "Mac emakumea"
+msgid "Man red"
+msgstr "Gizon gorria"
 
 #: ../sheets/ciscomisc.sheet.in.h:23
-msgid "Man"
-msgstr "Gizona"
+msgid "Man gold"
+msgstr "Urrezko gizona"
 
 #: ../sheets/ciscomisc.sheet.in.h:24
 msgid "Man blue"
 msgstr "Gizon urdina"
 
 #: ../sheets/ciscomisc.sheet.in.h:25
-msgid "Man gold"
-msgstr "Urrezko gizona"
+msgid "Standing Man"
+msgstr "Gizona zutik"
 
 #: ../sheets/ciscomisc.sheet.in.h:26
-msgid "Man red"
-msgstr "Gizon gorria"
+msgid "Standing woman"
+msgstr "Emakumea zutik"
 
 #: ../sheets/ciscomisc.sheet.in.h:27
-msgid "Medium Building"
-msgstr "Ertaineko eraikina"
+msgid "Woman"
+msgstr "Emakumea"
 
 #: ../sheets/ciscomisc.sheet.in.h:28
-msgid "Medium Building blue"
-msgstr "Ertaineko eraikin urdina"
+msgid "Woman red"
+msgstr "Emakume gorria"
 
 #: ../sheets/ciscomisc.sheet.in.h:29
-msgid "Medium Building subdued"
-msgstr "Ertaineko eraikin estutua"
+msgid "Woman gold"
+msgstr "Urreko emakumea"
+
+#: ../sheets/ciscomisc.sheet.in.h:30
+msgid "Woman blue"
+msgstr "Emakume urdina"
 
 #: ../sheets/ciscomisc.sheet.in.h:31
-msgid "Miscellaneous shapes by Cisco"
-msgstr "Cisco-ren hainbat forma"
+msgid "Running man"
+msgstr "Gizona korrika"
 
 #: ../sheets/ciscomisc.sheet.in.h:32
-msgid "PC Man"
-msgstr "PC gizona"
+msgid "Running man subdued"
+msgstr "Gizona korrika estutua"
 
 #: ../sheets/ciscomisc.sheet.in.h:33
-msgid "PC Man left"
-msgstr "PC gizona ezkerrean"
+msgid "Telecommuter"
+msgstr "Telekonmutadorea"
 
 #: ../sheets/ciscomisc.sheet.in.h:34
-msgid "Running man"
-msgstr "Gizona korrika"
+msgid "Running woman"
+msgstr "Emakumea korrika"
 
 #: ../sheets/ciscomisc.sheet.in.h:35
-msgid "Running man subdued"
-msgstr "Gizona korrika estutua"
+msgid "CiscoWorks Man"
+msgstr "CiscoWorks gizona"
 
 #: ../sheets/ciscomisc.sheet.in.h:36
-msgid "Running woman"
-msgstr "Emakumea korrika"
+msgid "PC Man left"
+msgstr "PC gizona ezkerrean"
 
 #: ../sheets/ciscomisc.sheet.in.h:37
-msgid "Satellite"
-msgstr "Satelitea"
+msgid "PC Man"
+msgstr "PC gizona"
 
 #: ../sheets/ciscomisc.sheet.in.h:38
-msgid "Satellite dish"
-msgstr "Antena parabolikoa"
-
-#: ../sheets/ciscomisc.sheet.in.h:39
 msgid "Sitting Woman"
 msgstr "Emakumea eserita"
 
-#: ../sheets/ciscomisc.sheet.in.h:40
+#: ../sheets/ciscomisc.sheet.in.h:39
 msgid "Sitting Woman right"
 msgstr "Emakumea eserita eskuinean"
 
+#: ../sheets/ciscomisc.sheet.in.h:40
+msgid "Mac Woman"
+msgstr "Mac emakumea"
+
 #: ../sheets/ciscomisc.sheet.in.h:41
-msgid "Small Business"
-msgstr "Enpresa txikia"
+msgid "Androgynous Person"
+msgstr "Pertsona androginoa"
 
 #: ../sheets/ciscomisc.sheet.in.h:43
-msgid "Standing Man"
-msgstr "Gizona zutik"
+msgid "Key"
+msgstr "Gakoa"
 
 #: ../sheets/ciscomisc.sheet.in.h:44
-msgid "Standing woman"
-msgstr "Emakumea zutik"
+msgid "Lock and Key"
+msgstr "Blokeoa eta gakoa"
 
 #: ../sheets/ciscomisc.sheet.in.h:45
-msgid "Telecommuter"
-msgstr "Telekonmutadorea"
+msgid "Satellite dish"
+msgstr "Antena parabolikoa"
 
 #: ../sheets/ciscomisc.sheet.in.h:46
-msgid "Telecommuter house"
-msgstr "Telekonmutadorearen etxea"
+msgid "Satellite"
+msgstr "Satelitea"
 
 #: ../sheets/ciscomisc.sheet.in.h:47
-msgid "Telecommuter house subdued"
-msgstr "Telekonmutadorearen etxea estutua"
-
-#: ../sheets/ciscomisc.sheet.in.h:48
-msgid "Truck"
-msgstr "Kamioia"
+msgid "Antenna"
+msgstr "Antena"
 
 #: ../sheets/ciscomisc.sheet.in.h:49
-msgid "University"
-msgstr "Unibertsitatea"
+msgid "Car"
+msgstr "Autoa"
 
 #: ../sheets/ciscomisc.sheet.in.h:50
+msgid "Truck"
+msgstr "Kamioia"
+
+#: ../sheets/ciscomisc.sheet.in.h:51
 msgid "Video Camera"
 msgstr "Bideo-kamera"
 
-#: ../sheets/ciscomisc.sheet.in.h:51
+#: ../sheets/ciscomisc.sheet.in.h:52
 msgid "Video Camera right"
 msgstr "Bideo-kamera eskuinean"
 
-#: ../sheets/ciscomisc.sheet.in.h:52
-msgid "Woman"
-msgstr "Emakumea"
-
-#: ../sheets/ciscomisc.sheet.in.h:53
-msgid "Woman blue"
-msgstr "Emakume urdina"
-
 #: ../sheets/ciscomisc.sheet.in.h:54
-msgid "Woman gold"
-msgstr "Urreko emakumea"
-
-#: ../sheets/ciscomisc.sheet.in.h:55
-msgid "Woman red"
-msgstr "Emakume gorria"
+msgid "Headphones"
+msgstr "Aurikularra"
 
 #: ../sheets/cisconetwork.sheet.in.h:1
-msgid "10700"
-msgstr "10700"
+msgid "Cisco - Network"
+msgstr "Cisco - Sarea"
 
 #: ../sheets/cisconetwork.sheet.in.h:2
-msgid "15200"
-msgstr "15200"
+msgid "Network shapes by Cisco"
+msgstr "Cisco-ren sare-formak"
 
 #: ../sheets/cisconetwork.sheet.in.h:3
-msgid "15800"
-msgstr "15800"
+msgid "Network Management"
+msgstr "Sare-kudeaketa"
 
 #: ../sheets/cisconetwork.sheet.in.h:4
-msgid "3174 (desktop) cluster controller"
-msgstr "3174 (mahaigaina) lukuaren kontroladorea"
+msgid "Detector"
+msgstr "Detektagailua"
 
 #: ../sheets/cisconetwork.sheet.in.h:5
-msgid "3X74 (floor) cluster controller"
-msgstr "3X74 (zorua) lukuaren kontroladorea"
+msgid "Protocol Translator"
+msgstr "Protokolo-itzultzailea"
 
 #: ../sheets/cisconetwork.sheet.in.h:6
-msgid "Access Server"
-msgstr "Atzipen-zerbitzaria"
+msgid "IP"
+msgstr "IP"
 
 #: ../sheets/cisconetwork.sheet.in.h:7
-msgid "AccessPoint"
-msgstr "Sarbide-puntua"
+msgid "IP Old-style"
+msgstr "IP estilo zaharrekoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:8
-msgid "Automatic Protection Switching"
-msgstr "Babes-automatiko konmutadorea (APS)"
+msgid "NAT"
+msgstr "NAT"
 
 #: ../sheets/cisconetwork.sheet.in.h:9
-msgid "BBFW"
-msgstr "BBFW"
+msgid "VIP"
+msgstr "VIP"
 
 #: ../sheets/cisconetwork.sheet.in.h:10
-msgid "BBFW media"
-msgstr "BBFW bitartekoa"
+msgid "Terminal Server"
+msgstr "Terminal-zerbitzaria"
 
 #: ../sheets/cisconetwork.sheet.in.h:11
-msgid "Breakout box"
-msgstr "Breakout kutxa"
+msgid "Access Server"
+msgstr "Atzipen-zerbitzaria"
 
 #: ../sheets/cisconetwork.sheet.in.h:12
-msgid "Bridge"
-msgstr "Zubia"
+msgid "System controller"
+msgstr "Sistema-kontroladorea"
 
 #: ../sheets/cisconetwork.sheet.in.h:13
-msgid "CDDI/FDDI Concentrator"
-msgstr "CDDI/FDDI kontzentratzailea"
+msgid "Directory Server"
+msgstr "Direktorio-zerbitzaria"
 
 #: ../sheets/cisconetwork.sheet.in.h:14
-msgid "CDM Content Distribution Manager"
-msgstr "CDM eduki-banaketako kudeatzailea"
+msgid "Firewall"
+msgstr "Suebakia"
 
 #: ../sheets/cisconetwork.sheet.in.h:15
-msgid "CSU/DSU"
-msgstr "CSU/DSU"
+msgid "Firewall subdued"
+msgstr "Suebaki estutua"
 
 #: ../sheets/cisconetwork.sheet.in.h:16
-msgid "Cable Modem"
-msgstr "Kable-modema"
+msgid "Firewall horizontal"
+msgstr "Suebaki horizontala"
 
 #: ../sheets/cisconetwork.sheet.in.h:17
-msgid "Catalyst Access Gateway"
-msgstr "Catalyst atzipen-atebidea"
+msgid "Firewall Service Module"
+msgstr "Suebaki-zerbitzu modulua"
 
 #: ../sheets/cisconetwork.sheet.in.h:18
-msgid "Centri Firewall"
-msgstr "Centri suebakia"
+msgid "IOS Firewall"
+msgstr "IOS suebakia"
 
 #: ../sheets/cisconetwork.sheet.in.h:19
-msgid "Channelized Pipe"
-msgstr "Kanalizatutako hodia"
+msgid "PIX Firewall"
+msgstr "PIX suebakia"
 
 #: ../sheets/cisconetwork.sheet.in.h:20
-msgid "Cisco - Network"
-msgstr "Cisco - Sarea"
+msgid "PIX Firewall Left"
+msgstr "PIX suebakia ezkerrean"
 
 #: ../sheets/cisconetwork.sheet.in.h:21
-msgid "Cloud"
-msgstr "Lainoa"
-
-#: ../sheets/cisconetwork.sheet.in.h:22
-msgid "Cloud Dark"
-msgstr "Laino iluna"
+msgid "Centri Firewall"
+msgstr "Centri suebakia"
 
 #: ../sheets/cisconetwork.sheet.in.h:23
-msgid "Cloud Gold"
-msgstr "Urrezko lainoa"
+msgid "Security appliance"
+msgstr "Segurtasun gailua"
 
 #: ../sheets/cisconetwork.sheet.in.h:24
-msgid "Cloud White"
-msgstr "Laino zuria"
+msgid "VPN Concentrator"
+msgstr "VPN kontzentratzailea"
 
 #: ../sheets/cisconetwork.sheet.in.h:25
-msgid "Concatenated Payload"
-msgstr "Konkatenatutako karga"
+msgid "VPN Gateway"
+msgstr "VPN atebidea"
 
 #: ../sheets/cisconetwork.sheet.in.h:26
-msgid "Content Engine (Cache Director)"
-msgstr "Eduki-motorra (Cache banatzailea)"
+msgid "LAN to LAN"
+msgstr "LANetik LANera"
 
 #: ../sheets/cisconetwork.sheet.in.h:27
-msgid "Content Transformation Engine (CTE)"
-msgstr "Eduki-eraldatzeko motorra (CTE)"
+msgid "SSL Terminator"
+msgstr "SSL terminala"
 
 #: ../sheets/cisconetwork.sheet.in.h:28
-msgid "DSLAM"
-msgstr "DSLAM"
+msgid "IP DSL Switch"
+msgstr "IP DSL konmutadorea"
 
 #: ../sheets/cisconetwork.sheet.in.h:29
-msgid "DWDM Filter"
-msgstr "DWDM iragazkia"
+msgid "DSLAM"
+msgstr "DSLAM"
 
 #: ../sheets/cisconetwork.sheet.in.h:30
-msgid "Detector"
-msgstr "Detektagailua"
+msgid "Cable Modem"
+msgstr "Kable-modema"
 
 #: ../sheets/cisconetwork.sheet.in.h:31
-msgid "Digital Cross-Connect"
-msgstr "Gurutze-konektore digitala"
+msgid "Wireless Connectivity"
+msgstr "Haririk gabeko konektibitatea"
 
 #: ../sheets/cisconetwork.sheet.in.h:32
-msgid "Directory Server"
-msgstr "Direktorio-zerbitzaria"
+msgid "Wireless Transport"
+msgstr "Haririk gabeko garraioa"
 
 #: ../sheets/cisconetwork.sheet.in.h:33
-msgid "Distributed Director"
-msgstr "Banatutako banatzailea"
+msgid "AccessPoint"
+msgstr "Sarbide-puntua"
 
 #: ../sheets/cisconetwork.sheet.in.h:34
-msgid "Dual Mode AccessPoint"
-msgstr "Modu bikoitzeko sarbide-puntua"
+msgid "Wireless Bridge"
+msgstr "Haririk gabeko zubia"
 
 #: ../sheets/cisconetwork.sheet.in.h:35
-msgid "FDDI Ring"
-msgstr "FDDI eraztuna"
+msgid "Dual Mode AccessPoint"
+msgstr "Modu bikoitzeko sarbide-puntua"
 
 #: ../sheets/cisconetwork.sheet.in.h:36
-msgid "File Engine"
-msgstr "Fitxategi-motorra"
+msgid "Wi-Fi Tag"
+msgstr "Wi-Fi bandera"
 
 #: ../sheets/cisconetwork.sheet.in.h:37
-msgid "Firewall"
-msgstr "Suebakia"
+msgid "Wireless Location Appliance"
+msgstr "Geolokalizazio-zerbitzaria"
 
 #: ../sheets/cisconetwork.sheet.in.h:38
-msgid "Firewall Service Module"
-msgstr "Suebaki-zerbitzu modulua"
+msgid "Location server"
+msgstr "Lokalizazio-zerbitzaria"
 
 #: ../sheets/cisconetwork.sheet.in.h:39
-msgid "Firewall horizontal"
-msgstr "Suebaki horizontala"
+msgid "Lightweight AP"
+msgstr "AP arina"
 
 #: ../sheets/cisconetwork.sheet.in.h:40
-msgid "Firewall subdued"
-msgstr "Suebaki estutua"
+msgid "WLAN controller"
+msgstr "WLAN-kontroladorea"
 
 #: ../sheets/cisconetwork.sheet.in.h:41
-msgid "General Appliance"
-msgstr "Gailu generikoa"
+msgid "BBFW"
+msgstr "BBFW"
 
 #: ../sheets/cisconetwork.sheet.in.h:42
-msgid "Generic Gateway"
-msgstr "Atebide generikoa"
+msgid "BBFW media"
+msgstr "BBFW bitartekoa"
+
+#: ../sheets/cisconetwork.sheet.in.h:43
+msgid "Channelized Pipe"
+msgstr "Kanalizatutako hodia"
 
 #: ../sheets/cisconetwork.sheet.in.h:44
-msgid "IOS Firewall"
-msgstr "IOS suebakia"
+msgid "Concatenated Payload"
+msgstr "Konkatenatutako karga"
 
 #: ../sheets/cisconetwork.sheet.in.h:45
-msgid "IOS SLB"
-msgstr "IOS SLB"
+msgid "Optical Cross-Connect"
+msgstr "Konexio-gurutzatu optikoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:46
-msgid "IP"
-msgstr "IP"
+msgid "Optical Transport"
+msgstr "Garraio optikoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:47
-msgid "IP DSL Switch"
-msgstr "IP DSL konmutadorea"
+msgid "Optical Fiber"
+msgstr "Zuntza optikoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:48
-msgid "IP Old-style"
-msgstr "IP estilo zaharrekoa"
+msgid "Optical Amplifier"
+msgstr "Anplifikadore optikoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:49
-msgid "IP Transport Concentrator"
-msgstr "IP garraio kontzentratzailea"
+msgid "Digital Cross-Connect"
+msgstr "Gurutze-konektore digitala"
 
 #: ../sheets/cisconetwork.sheet.in.h:50
-msgid "IPTV broadcast server"
-msgstr "IPTV broadcast zerbitazaria"
+msgid "IP Transport Concentrator"
+msgstr "IP garraio kontzentratzailea"
 
 #: ../sheets/cisconetwork.sheet.in.h:51
-msgid "IPTV content manager"
-msgstr "IPTV eduki-kudeatzailea"
+msgid "DWDM Filter"
+msgstr "DWDM iragazkia"
 
 #: ../sheets/cisconetwork.sheet.in.h:52
-msgid "LAN to LAN"
-msgstr "LANetik LANera"
+msgid "WDM"
+msgstr "WDM"
 
 #: ../sheets/cisconetwork.sheet.in.h:53
-msgid "Lightweight AP"
-msgstr "AP arina"
+msgid "15200"
+msgstr "15200"
 
 #: ../sheets/cisconetwork.sheet.in.h:54
-msgid "LocalDirector"
-msgstr "Banatzaile lokala"
+msgid "15800"
+msgstr "15800"
 
 #: ../sheets/cisconetwork.sheet.in.h:55
-msgid "Location server"
-msgstr "Lokalizazio-zerbitzaria"
+msgid "ONS15104"
+msgstr "ONS15104"
 
 #: ../sheets/cisconetwork.sheet.in.h:56
-msgid "LongReach CPE"
-msgstr "LongReach CPE"
+msgid "10700"
+msgstr "10700"
 
 #: ../sheets/cisconetwork.sheet.in.h:57
-msgid "MAS Gateway"
-msgstr "MAS atebidea"
+msgid "Metro 1500"
+msgstr "Metro 1500"
 
 #: ../sheets/cisconetwork.sheet.in.h:58
-msgid "MAU"
-msgstr "MAU"
+msgid "ONS15540"
+msgstr "ONS15540"
 
 #: ../sheets/cisconetwork.sheet.in.h:59
-msgid "ME 1100"
-msgstr "ME 1100"
+msgid "Automatic Protection Switching"
+msgstr "Babes-automatiko konmutadorea (APS)"
 
 #: ../sheets/cisconetwork.sheet.in.h:60
-msgid "MUX"
-msgstr "MUX"
+msgid "RPS"
+msgstr "RPS"
 
 #: ../sheets/cisconetwork.sheet.in.h:61
-msgid "Metro 1500"
-msgstr "Metro 1500"
+msgid "UPS"
+msgstr "UPS"
 
 #: ../sheets/cisconetwork.sheet.in.h:62
-msgid "NAT"
-msgstr "NAT"
+msgid "LongReach CPE"
+msgstr "LongReach CPE"
 
 #: ../sheets/cisconetwork.sheet.in.h:63
-msgid "Network Management"
-msgstr "Sare-kudeaketa"
+msgid "3X74 (floor) cluster controller"
+msgstr "3X74 (zorua) lukuaren kontroladorea"
 
 #: ../sheets/cisconetwork.sheet.in.h:64
-msgid "Network shapes by Cisco"
-msgstr "Cisco-ren sare-formak"
+msgid "3174 (desktop) cluster controller"
+msgstr "3174 (mahaigaina) lukuaren kontroladorea"
 
 #: ../sheets/cisconetwork.sheet.in.h:65
-msgid "ONS15104"
-msgstr "ONS15104"
+msgid "CSU/DSU"
+msgstr "CSU/DSU"
 
 #: ../sheets/cisconetwork.sheet.in.h:66
-msgid "ONS15540"
-msgstr "ONS15540"
+msgid "WAN"
+msgstr "WAN"
 
 #: ../sheets/cisconetwork.sheet.in.h:67
-msgid "Optical Amplifier"
-msgstr "Anplifikadore optikoa"
+msgid "Cloud"
+msgstr "Lainoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:68
-msgid "Optical Cross-Connect"
-msgstr "Konexio-gurutzatu optikoa"
+msgid "Cloud Gold"
+msgstr "Urrezko lainoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:69
-msgid "Optical Fiber"
-msgstr "Zuntza optikoa"
+msgid "Cloud White"
+msgstr "Laino zuria"
 
 #: ../sheets/cisconetwork.sheet.in.h:70
-msgid "Optical Transport"
-msgstr "Garraio optikoa"
+msgid "Cloud Dark"
+msgstr "Laino iluna"
 
 #: ../sheets/cisconetwork.sheet.in.h:71
-msgid "PAD"
-msgstr "PAD"
+msgid "Distributed Director"
+msgstr "Banatutako banatzailea"
 
 #: ../sheets/cisconetwork.sheet.in.h:72
-msgid "PIX Firewall"
-msgstr "PIX suebakia"
+msgid "LocalDirector"
+msgstr "Banatzaile lokala"
 
 #: ../sheets/cisconetwork.sheet.in.h:73
-msgid "PIX Firewall Left"
-msgstr "PIX suebakia ezkerrean"
+msgid "IOS SLB"
+msgstr "IOS SLB"
 
 #: ../sheets/cisconetwork.sheet.in.h:74
-msgid "Protocol Translator"
-msgstr "Protokolo-itzultzailea"
+msgid "MUX"
+msgstr "MUX"
 
 #: ../sheets/cisconetwork.sheet.in.h:75
-msgid "RPS"
-msgstr "RPS"
+msgid "General Appliance"
+msgstr "Gailu generikoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:76
-msgid "Repeater"
-msgstr "Errepikatzailea"
+msgid "PAD"
+msgstr "PAD"
 
 #: ../sheets/cisconetwork.sheet.in.h:77
-msgid "SSL Terminator"
-msgstr "SSL terminala"
+msgid "CDDI/FDDI Concentrator"
+msgstr "CDDI/FDDI kontzentratzailea"
 
 #: ../sheets/cisconetwork.sheet.in.h:78
-msgid "STB (set top box)"
-msgstr "STB (set top box)"
+msgid "FDDI Ring"
+msgstr "FDDI eraztuna"
 
 #: ../sheets/cisconetwork.sheet.in.h:79
-msgid "Security appliance"
-msgstr "Segurtasun gailua"
+msgid "TokenRing"
+msgstr "TokenRing"
 
 #: ../sheets/cisconetwork.sheet.in.h:80
-msgid "Service Control"
-msgstr "Zerbitzu-kontrola"
+msgid "MAU"
+msgstr "MAU"
 
 #: ../sheets/cisconetwork.sheet.in.h:81
-msgid "Storage Solution Engine"
-msgstr "Biltegiratzeko motorra"
+msgid "Repeater"
+msgstr "Errepikatzailea"
 
 #: ../sheets/cisconetwork.sheet.in.h:82
-msgid "System controller"
-msgstr "Sistema-kontroladorea"
+msgid "Bridge"
+msgstr "Zubia"
 
 #: ../sheets/cisconetwork.sheet.in.h:83
-msgid "TV"
-msgstr "TB"
+msgid "Breakout box"
+msgstr "Breakout kutxa"
 
 #: ../sheets/cisconetwork.sheet.in.h:84
-msgid "Terminal Server"
-msgstr "Terminal-zerbitzaria"
+msgid "STB (set top box)"
+msgstr "STB (set top box)"
 
 #: ../sheets/cisconetwork.sheet.in.h:85
-msgid "TokenRing"
-msgstr "TokenRing"
+msgid "TV"
+msgstr "TB"
 
 #: ../sheets/cisconetwork.sheet.in.h:86
-msgid "TransPath"
-msgstr "Garraio-bidea"
+msgid "IPTV broadcast server"
+msgstr "IPTV broadcast zerbitazaria"
 
 #: ../sheets/cisconetwork.sheet.in.h:87
-msgid "UPS"
-msgstr "UPS"
+msgid "IPTV content manager"
+msgstr "IPTV eduki-kudeatzailea"
 
 #: ../sheets/cisconetwork.sheet.in.h:88
-msgid "VIP"
-msgstr "VIP"
-
-#: ../sheets/cisconetwork.sheet.in.h:89
 msgid "VN2900"
 msgstr "VN2900"
 
+#: ../sheets/cisconetwork.sheet.in.h:89
+msgid "VN5902"
+msgstr "VN5902"
+
 #: ../sheets/cisconetwork.sheet.in.h:90
 msgid "VN5900"
 msgstr "VN5900"
 
 #: ../sheets/cisconetwork.sheet.in.h:91
-msgid "VN5902"
-msgstr "VN5902"
+msgid "Catalyst Access Gateway"
+msgstr "Catalyst atzipen-atebidea"
 
 #: ../sheets/cisconetwork.sheet.in.h:92
-msgid "VPN Concentrator"
-msgstr "VPN kontzentratzailea"
+msgid "Generic Gateway"
+msgstr "Atebide generikoa"
 
 #: ../sheets/cisconetwork.sheet.in.h:93
-msgid "VPN Gateway"
-msgstr "VPN atebidea"
+msgid "TransPath"
+msgstr "Garraio-bidea"
 
 #: ../sheets/cisconetwork.sheet.in.h:94
-msgid "WAN"
-msgstr "WAN"
+msgid "uBR910 Cable DSU"
+msgstr "uBR910 kablea DSU"
 
 #: ../sheets/cisconetwork.sheet.in.h:95
-msgid "WDM"
-msgstr "WDM"
+msgid "Storage Solution Engine"
+msgstr "Biltegiratzeko motorra"
 
 #: ../sheets/cisconetwork.sheet.in.h:96
-msgid "WLAN controller"
-msgstr "WLAN-kontroladorea"
+msgid "Content Engine (Cache Director)"
+msgstr "Eduki-motorra (Cache banatzailea)"
 
 #: ../sheets/cisconetwork.sheet.in.h:97
-msgid "Wi-Fi Tag"
-msgstr "Wi-Fi bandera"
+msgid "CDM Content Distribution Manager"
+msgstr "CDM eduki-banaketako kudeatzailea"
 
 #: ../sheets/cisconetwork.sheet.in.h:98
-msgid "Wireless Bridge"
-msgstr "Haririk gabeko zubia"
+msgid "Content Transformation Engine (CTE)"
+msgstr "Eduki-eraldatzeko motorra (CTE)"
 
 #: ../sheets/cisconetwork.sheet.in.h:99
-msgid "Wireless Connectivity"
-msgstr "Haririk gabeko konektibitatea"
+msgid "ME 1100"
+msgstr "ME 1100"
 
 #: ../sheets/cisconetwork.sheet.in.h:100
-msgid "Wireless Location Appliance"
-msgstr "Geolokalizazio-zerbitzaria"
+msgid "MAS Gateway"
+msgstr "MAS atebidea"
 
 #: ../sheets/cisconetwork.sheet.in.h:101
-msgid "Wireless Transport"
-msgstr "Haririk gabeko garraioa"
+msgid "File Engine"
+msgstr "Fitxategi-motorra"
 
 #: ../sheets/cisconetwork.sheet.in.h:102
-msgid "uBR910 Cable DSU"
-msgstr "uBR910 kablea DSU"
+msgid "Service Control"
+msgstr "Zerbitzu-kontrola"
 
 #: ../sheets/ciscotelephony.sheet.in.h:1
-msgid "6701"
-msgstr "6701"
+msgid "Cisco - Telephony"
+msgstr "Cisco - Telefonia"
 
 #: ../sheets/ciscotelephony.sheet.in.h:2
-msgid "6705"
-msgstr "6705"
+msgid "Telephony shapes by Cisco"
+msgstr "Cisco-ren telefonia-formak"
 
 #: ../sheets/ciscotelephony.sheet.in.h:3
-msgid "6732"
-msgstr "6732"
+msgid "Phone"
+msgstr "Telefonoa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:4
-msgid "ADM"
-msgstr "ADM"
+msgid "Phone 2"
+msgstr "2. Telefonoa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:5
-msgid "ATA"
-msgstr "ATA"
+msgid "Phone Ethernet"
+msgstr "Ethernet telefonoa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:6
-msgid "BTS 10200"
-msgstr "BTS 10200"
+msgid "Phone Appliance"
+msgstr "Telefono generikoa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:7
-msgid "CallManager"
-msgstr "Dei-kudeatzailea"
+msgid "Phone Feature"
+msgstr "Telefonoaren ezaugarria"
 
 #: ../sheets/ciscotelephony.sheet.in.h:8
-msgid "Cellular Phone"
-msgstr "Telefono mugikorra"
+msgid "Phone/Fax"
+msgstr "Telefonoa/Faxa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:9
-msgid "Cisco - Telephony"
-msgstr "Cisco - Telefonia"
+msgid "HootPhone"
+msgstr "HootPhone"
 
 #: ../sheets/ciscotelephony.sheet.in.h:10
-msgid "Class 4/5 switch"
-msgstr "4/5 klaseko konmutadorea"
+msgid "IP Phone"
+msgstr "IP telefonoa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:11
-msgid "End Office"
-msgstr "Banagunea"
+msgid "IP Softphone"
+msgstr "IP Softphone"
 
 #: ../sheets/ciscotelephony.sheet.in.h:12
-msgid "Fax"
-msgstr "Faxa"
+msgid "Softphone"
+msgstr "Softphone"
 
 #: ../sheets/ciscotelephony.sheet.in.h:13
-msgid "Gatekeeper"
-msgstr "Gatekeeper"
+msgid "Cellular Phone"
+msgstr "Telefono mugikorra"
 
 #: ../sheets/ciscotelephony.sheet.in.h:14
-msgid "Generic softswitch"
-msgstr "Software-konmutadore generikoa"
+msgid "Mobile Access IP Phone"
+msgstr "IP bidezko telefono mugikorra"
 
 #: ../sheets/ciscotelephony.sheet.in.h:15
-msgid "H.323"
-msgstr "H.323"
+msgid "Pager"
+msgstr "Bilagailua"
 
 #: ../sheets/ciscotelephony.sheet.in.h:16
-msgid "HootPhone"
-msgstr "HootPhone"
+msgid "Fax"
+msgstr "Faxa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:17
-msgid "IAD router"
-msgstr "IAD bideratzailea"
+msgid "Turret"
+msgstr "Dorretxoa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:18
-msgid "ICM"
-msgstr "ICM"
+msgid "Octel"
+msgstr "Octel"
 
 #: ../sheets/ciscotelephony.sheet.in.h:19
-msgid "ICS"
-msgstr "ICS"
+msgid "Radio Tower"
+msgstr "Irrati-dorrea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:20
-msgid "IP Phone"
-msgstr "IP telefonoa"
+msgid "PBX"
+msgstr "PBX"
 
 #: ../sheets/ciscotelephony.sheet.in.h:21
-msgid "IP Softphone"
-msgstr "IP Softphone"
+msgid "PBX Switch"
+msgstr "PBX konmutadorea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:22
-msgid "IP Telephony Router"
-msgstr "IP telefoniako bideratzailea"
+msgid "Class 4/5 switch"
+msgstr "4/5 klaseko konmutadorea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:23
-msgid "ITP"
-msgstr "ITP"
+msgid "SONET MUX"
+msgstr "SONET MUX"
 
 #: ../sheets/ciscotelephony.sheet.in.h:24
-msgid "IntelliSwitch Stack"
-msgstr "IntelliSwitch pila"
+msgid "ADM"
+msgstr "ADM"
 
 #: ../sheets/ciscotelephony.sheet.in.h:25
-msgid "MCU"
-msgstr "MCU"
+msgid "ITP"
+msgstr "ITP"
 
 #: ../sheets/ciscotelephony.sheet.in.h:26
-msgid "MGX 8000 Series Voice Gateway"
-msgstr "MGX 800 serieko ahots-atebidea"
+msgid "ATA"
+msgstr "ATA"
 
 #: ../sheets/ciscotelephony.sheet.in.h:27
-msgid "MoH server (Music on Hold)"
-msgstr "MoH zerbitzaria (Music on Hold)"
+msgid "SIP Proxy Server"
+msgstr "SIP Proxy zerbitzaria"
 
 #: ../sheets/ciscotelephony.sheet.in.h:28
-msgid "Mobile Access IP Phone"
-msgstr "IP bidezko telefono mugikorra"
+msgid "Gatekeeper"
+msgstr "Gatekeeper"
 
 #: ../sheets/ciscotelephony.sheet.in.h:29
-msgid "Mobile Access Router"
-msgstr "Mugikorren atzipen-bideratzailea"
+msgid "MGX 8000 Series Voice Gateway"
+msgstr "MGX 800 serieko ahots-atebidea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:30
-msgid "Octel"
-msgstr "Octel"
+msgid "End Office"
+msgstr "Banagunea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:31
-msgid "PBX"
-msgstr "PBX"
+msgid "Voice-Enabled Access Server"
+msgstr "Ahots atzipen-zerbitzaria"
 
 #: ../sheets/ciscotelephony.sheet.in.h:32
-msgid "PBX Switch"
-msgstr "PBX konmutadorea"
+msgid "Voice-Enabled Router"
+msgstr "Ahots-bideratzailea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:33
-msgid "Pager"
-msgstr "Bilagailua"
+msgid "Voice-Enabled ATM Switch"
+msgstr "ATM ahots-konmutadorea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:34
-msgid "Phone"
-msgstr "Telefonoa"
+msgid "CallManager"
+msgstr "Dei-kudeatzailea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:35
-msgid "Phone 2"
-msgstr "2. Telefonoa"
+msgid "IP Telephony Router"
+msgstr "IP telefoniako bideratzailea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:36
-msgid "Phone Appliance"
-msgstr "Telefono generikoa"
+msgid "Mobile Access Router"
+msgstr "Mugikorren atzipen-bideratzailea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:37
-msgid "Phone Ethernet"
-msgstr "Ethernet telefonoa"
+msgid "H.323"
+msgstr "H.323"
 
 #: ../sheets/ciscotelephony.sheet.in.h:38
-msgid "Phone Feature"
-msgstr "Telefonoaren ezaugarria"
+msgid "STP"
+msgstr "STP"
 
 #: ../sheets/ciscotelephony.sheet.in.h:39
-msgid "Phone/Fax"
-msgstr "Telefonoa/Faxa"
+msgid "BTS 10200"
+msgstr "BTS 10200"
 
 #: ../sheets/ciscotelephony.sheet.in.h:40
-msgid "Radio Tower"
-msgstr "Irrati-dorrea"
+msgid "Generic softswitch"
+msgstr "Software-konmutadore generikoa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:41
-msgid "SC2200 (Signalling Controller)"
-msgstr "SC2200 (seinale-kontroladorea)"
-
-#: ../sheets/ciscotelephony.sheet.in.h:42
 msgid "SC2200/VSC3000 host"
 msgstr "SC2200/VSC3000 ostalaria"
 
+#: ../sheets/ciscotelephony.sheet.in.h:42
+msgid "Virtual switch controller (VSC 3000)"
+msgstr "Konmutadore-kontroladore birtuala (VSC 3000)"
+
 #: ../sheets/ciscotelephony.sheet.in.h:43
-msgid "SIP Proxy Server"
-msgstr "SIP Proxy zerbitzaria"
+msgid "SC2200 (Signalling Controller)"
+msgstr "SC2200 (seinale-kontroladorea)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:44
-msgid "SONET MUX"
-msgstr "SONET MUX"
+msgid "MoH server (Music on Hold)"
+msgstr "MoH zerbitzaria (Music on Hold)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:45
-msgid "STP"
-msgstr "STP"
+msgid "TDM router"
+msgstr "TDM bideratzailea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:46
-msgid "Softphone"
-msgstr "Softphone"
+msgid "6701"
+msgstr "6701"
 
 #: ../sheets/ciscotelephony.sheet.in.h:47
-msgid "TDM router"
-msgstr "TDM bideratzailea"
+msgid "6705"
+msgstr "6705"
 
 #: ../sheets/ciscotelephony.sheet.in.h:48
-msgid "Telephony shapes by Cisco"
-msgstr "Cisco-ren telefonia-formak"
+msgid "6732"
+msgstr "6732"
 
 #: ../sheets/ciscotelephony.sheet.in.h:49
-msgid "Turret"
-msgstr "Dorretxoa"
+msgid "IAD router"
+msgstr "IAD bideratzailea"
 
 #: ../sheets/ciscotelephony.sheet.in.h:50
-msgid "Unity Express"
-msgstr "Unity Express"
+msgid "ICS"
+msgstr "ICS"
 
 #: ../sheets/ciscotelephony.sheet.in.h:51
-msgid "Unity server"
-msgstr "Unity zerbitzaria"
+msgid "ICM"
+msgstr "ICM"
 
 #: ../sheets/ciscotelephony.sheet.in.h:52
-msgid "Virtual switch controller (VSC 3000)"
-msgstr "Konmutadore-kontroladore birtuala (VSC 3000)"
+msgid "IntelliSwitch Stack"
+msgstr "IntelliSwitch pila"
 
 #: ../sheets/ciscotelephony.sheet.in.h:53
-msgid "Voice-Enabled ATM Switch"
-msgstr "ATM ahots-konmutadorea"
+msgid "Unity server"
+msgstr "Unity zerbitzaria"
 
 #: ../sheets/ciscotelephony.sheet.in.h:54
-msgid "Voice-Enabled Access Server"
-msgstr "Ahots atzipen-zerbitzaria"
+msgid "Unity Express"
+msgstr "Unity Express"
 
 #: ../sheets/ciscotelephony.sheet.in.h:55
-msgid "Voice-Enabled Router"
-msgstr "Ahots-bideratzailea"
+msgid "MCU"
+msgstr "MCU"
 
 #: ../sheets/ciscotelephony.sheet.in.h:56
 msgid "uMG series"
 msgstr "uMG serieak"
 
 #: ../sheets/civil.sheet.in.h:1
-msgid "Aerator with bubbles"
-msgstr "Aerator burbuiladuna"
+msgid "Civil"
+msgstr "Zibila"
 
 #: ../sheets/civil.sheet.in.h:2
-msgid "Backflow preventer"
-msgstr "Itzultze-kontrako balbula"
+msgid "Civil Engineering Components"
+msgstr "Ingeniaritza zibileko osagaiak"
 
 #: ../sheets/civil.sheet.in.h:3
-msgid "Basin"
-msgstr "Konketa"
+msgid "Vertical rest"
+msgstr "Euskarri bertikala"
 
 #: ../sheets/civil.sheet.in.h:4
-msgid "Bivalent vertical rest"
-msgstr "Baliobiko euskarri bertikala"
+msgid "Horizontal rest"
+msgstr "Euskarri horizontala"
 
 #: ../sheets/civil.sheet.in.h:5
-msgid "Civil"
-msgstr "Zibila"
+msgid "Bivalent vertical rest"
+msgstr "Baliobiko euskarri bertikala"
 
 #: ../sheets/civil.sheet.in.h:6
-msgid "Civil Engineering Components"
-msgstr "Ingeniaritza zibileko osagaiak"
+msgid "Reference line"
+msgstr "Erreferentzia-linea"
 
 #: ../sheets/civil.sheet.in.h:7
-msgid "Container"
-msgstr "Kontainerra"
+msgid "Water level"
+msgstr "Ur-maila"
 
 #: ../sheets/civil.sheet.in.h:8
-msgid "Final-settling basin"
-msgstr "Azken kokapeneko konketa"
+msgid "Soil"
+msgstr "Lurra"
 
 #: ../sheets/civil.sheet.in.h:9
-msgid "Frequency converter"
-msgstr "Maiztasun-bihurtzailea"
+msgid "Horizontally aligned arrow"
+msgstr "Horizontalki lerrokatutako gezia"
 
 #: ../sheets/civil.sheet.in.h:10
-msgid "Gas bottle"
-msgstr "Gas-botila"
+msgid "Vertically aligned arrow"
+msgstr "Bertikalki lerrokatutako gezia"
 
 #: ../sheets/civil.sheet.in.h:11
 msgid "Horizontal limiting line"
 msgstr "Muga-marra horizontala"
 
 #: ../sheets/civil.sheet.in.h:12
-msgid "Horizontal rest"
-msgstr "Euskarri horizontala"
+msgid "Vertical limiting line"
+msgstr "Muga-marra bertikala"
 
 #: ../sheets/civil.sheet.in.h:13
-msgid "Horizontally aligned arrow"
-msgstr "Horizontalki lerrokatutako gezia"
+msgid "Horizontally aligned pump"
+msgstr "Horizontalki lerrokatutako ponpa"
 
 #: ../sheets/civil.sheet.in.h:14
-msgid "Horizontally aligned compressor"
-msgstr "Horizontalki lerrokatutako konpresorea"
+msgid "Vertically aligned pump"
+msgstr "Bertikalki lerrokatutako ponpa"
 
 #: ../sheets/civil.sheet.in.h:15
-msgid "Horizontally aligned pump"
-msgstr "Horizontalki lerrokatutako ponpa"
+msgid "Horizontally aligned compressor"
+msgstr "Horizontalki lerrokatutako konpresorea"
 
 #: ../sheets/civil.sheet.in.h:16
-msgid "Horizontally aligned valve"
-msgstr "Horizontalki lerrokatutako balbula"
+msgid "Vertically aligned compressor"
+msgstr "Bertikalki lerrokatutako konpresorea"
 
 #: ../sheets/civil.sheet.in.h:17
-msgid "Motor"
-msgstr "Motorra"
+msgid "Vertically aligned valve"
+msgstr "Bertikalki lerrokatutako balbula"
 
 #: ../sheets/civil.sheet.in.h:18
-msgid "Preliminary clarification tank"
-msgstr "Klarifikazio-upela"
+msgid "Horizontally aligned valve"
+msgstr "Horizontalki lerrokatutako balbula"
 
 #: ../sheets/civil.sheet.in.h:19
-msgid "Reference line"
-msgstr "Erreferentzia-linea"
+msgid "Backflow preventer"
+msgstr "Itzultze-kontrako balbula"
 
 #: ../sheets/civil.sheet.in.h:20
-msgid "Rotor"
-msgstr "Errotorea"
+msgid "Motor"
+msgstr "Motorra"
 
 #: ../sheets/civil.sheet.in.h:21
-msgid "Soil"
-msgstr "Lurra"
+msgid "Gas bottle"
+msgstr "Gas-botila"
 
 #: ../sheets/civil.sheet.in.h:22
-msgid "Vertical limiting line"
-msgstr "Muga-marra bertikala"
+msgid "Frequency converter"
+msgstr "Maiztasun-bihurtzailea"
 
 #: ../sheets/civil.sheet.in.h:23
-msgid "Vertical rest"
-msgstr "Euskarri bertikala"
+msgid "Vertically aligned propeller"
+msgstr "Bertikalki lerrokatutako helizea"
 
 #: ../sheets/civil.sheet.in.h:24
-msgid "Vertically aligned arrow"
-msgstr "Bertikalki lerrokatutako gezia"
+msgid "Aerator with bubbles"
+msgstr "Aerator burbuiladuna"
 
-#: ../sheets/civil.sheet.in.h:25
-msgid "Vertically aligned compressor"
-msgstr "Bertikalki lerrokatutako konpresorea"
+#: ../sheets/civil.sheet.in.h:25
+msgid "Rotor"
+msgstr "Errotorea"
 
 #: ../sheets/civil.sheet.in.h:26
-msgid "Vertically aligned propeller"
-msgstr "Bertikalki lerrokatutako helizea"
+msgid "Final-settling basin"
+msgstr "Azken kokapeneko konketa"
 
 #: ../sheets/civil.sheet.in.h:27
-msgid "Vertically aligned pump"
-msgstr "Bertikalki lerrokatutako ponpa"
+msgid "Preliminary clarification tank"
+msgstr "Klarifikazio-upela"
 
 #: ../sheets/civil.sheet.in.h:28
-msgid "Vertically aligned valve"
-msgstr "Bertikalki lerrokatutako balbula"
+msgid "Basin"
+msgstr "Konketa"
 
 #: ../sheets/civil.sheet.in.h:29
-msgid "Water level"
-msgstr "Ur-maila"
+msgid "Container"
+msgstr "Kontainerra"
 
 #: ../sheets/jigsaw.sheet.in.h:1
 msgid "Jigsaw"
 msgstr "Puzzlea"
 
 #: ../sheets/jigsaw.sheet.in.h:2
-msgid "Jigsaw - part_iiii"
-msgstr "Puzlea- zatia:_iiii"
+msgid "Pieces of a jigsaw"
+msgstr "Puzle baten zatiak"
 
 #: ../sheets/jigsaw.sheet.in.h:3
-msgid "Jigsaw - part_iiio"
-msgstr "Puzlea- zatia:_iiio"
+msgid "Jigsaw - part_oioi"
+msgstr "Puzlea- zatia:_oioi"
 
 #: ../sheets/jigsaw.sheet.in.h:4
-msgid "Jigsaw - part_iioi"
-msgstr "Puzlea- zatia:_iioi"
+msgid "Jigsaw - part_ioio"
+msgstr "Puzlea- zatia:_ioio"
 
 #: ../sheets/jigsaw.sheet.in.h:5
-msgid "Jigsaw - part_iioo"
-msgstr "Puzlea- zatia:_iioo"
+msgid "Jigsaw - part_iiii"
+msgstr "Puzlea- zatia:_iiii"
 
 #: ../sheets/jigsaw.sheet.in.h:6
-msgid "Jigsaw - part_ioii"
-msgstr "Puzlea- zatia:_ioii"
+msgid "Jigsaw - part_oooo"
+msgstr "Puzlea- zatia:_oooo"
 
 #: ../sheets/jigsaw.sheet.in.h:7
-msgid "Jigsaw - part_ioio"
-msgstr "Puzlea- zatia:_ioio"
+msgid "Jigsaw - part_oooi"
+msgstr "Puzlea- zatia:_oooi"
 
 #: ../sheets/jigsaw.sheet.in.h:8
-msgid "Jigsaw - part_iooi"
-msgstr "Puzlea- zatia:_iooi"
-
-#: ../sheets/jigsaw.sheet.in.h:9
 msgid "Jigsaw - part_iooo"
 msgstr "Puzlea- zatia:_iooo"
 
+#: ../sheets/jigsaw.sheet.in.h:9
+msgid "Jigsaw - part_oioo"
+msgstr "Puzlea- zatia:_oioo"
+
 #: ../sheets/jigsaw.sheet.in.h:10
-msgid "Jigsaw - part_oiii"
-msgstr "Puzlea- zatia:_oiii"
+msgid "Jigsaw - part_ooio"
+msgstr "Puzlea- zatia:_ooio"
 
 #: ../sheets/jigsaw.sheet.in.h:11
-msgid "Jigsaw - part_oiio"
-msgstr "Puzlea- zatia:_oiio"
+msgid "Jigsaw - part_iioo"
+msgstr "Puzlea- zatia:_iioo"
 
 #: ../sheets/jigsaw.sheet.in.h:12
-msgid "Jigsaw - part_oioi"
-msgstr "Puzlea- zatia:_oioi"
+msgid "Jigsaw - part_oiio"
+msgstr "Puzlea- zatia:_oiio"
 
 #: ../sheets/jigsaw.sheet.in.h:13
-msgid "Jigsaw - part_oioo"
-msgstr "Puzlea- zatia:_oioo"
-
-#: ../sheets/jigsaw.sheet.in.h:14
 msgid "Jigsaw - part_ooii"
 msgstr "Puzlea- zatia:_ooii"
 
+#: ../sheets/jigsaw.sheet.in.h:14
+msgid "Jigsaw - part_iooi"
+msgstr "Puzlea- zatia:_iooi"
+
 #: ../sheets/jigsaw.sheet.in.h:15
-msgid "Jigsaw - part_ooio"
-msgstr "Puzlea- zatia:_ooio"
+msgid "Jigsaw - part_oiii"
+msgstr "Puzlea- zatia:_oiii"
 
 #: ../sheets/jigsaw.sheet.in.h:16
-msgid "Jigsaw - part_oooi"
-msgstr "Puzlea- zatia:_oooi"
+msgid "Jigsaw - part_ioii"
+msgstr "Puzlea- zatia:_ioii"
 
 #: ../sheets/jigsaw.sheet.in.h:17
-msgid "Jigsaw - part_oooo"
-msgstr "Puzlea- zatia:_oooo"
+msgid "Jigsaw - part_iioi"
+msgstr "Puzlea- zatia:_iioi"
 
 #: ../sheets/jigsaw.sheet.in.h:18
-msgid "Pieces of a jigsaw"
-msgstr "Puzle baten zatiak"
-
-#: ../sheets/network.sheet.in.h:1
-msgid "24 Port Patch Panel"
-msgstr "24 atakatako adabaki-panela"
+msgid "Jigsaw - part_iiio"
+msgstr "Puzlea- zatia:_iiio"
 
 #: ../sheets/network.sheet.in.h:2
-msgid "3 1/2 inch diskette"
-msgstr "3 1/2 hazbeteko disketea"
+msgid "Objects to design network diagrams with"
+msgstr "Sare-diagramak diseinatzeko objektuak"
 
 #: ../sheets/network.sheet.in.h:3
-msgid "ATM switch symbol"
-msgstr "ATM konmutadorearen ikurra"
-
-#: ../sheets/network.sheet.in.h:4
-msgid "Antenna for wireless transmission"
-msgstr "Haririk gabeko transmisiorako antena"
+msgid "Computer"
+msgstr "Ordenagailua"
 
 #: ../sheets/network.sheet.in.h:5
-msgid "Bigtower PC"
-msgstr "Dorre handiko PCa"
+msgid "Storage"
+msgstr "Biltegiratzea"
 
 #: ../sheets/network.sheet.in.h:6
-msgid "Computer"
-msgstr "Ordenagailua"
+msgid "Ethernet bus"
+msgstr "Ethernet busa"
 
 #: ../sheets/network.sheet.in.h:7
-msgid "Desktop PC"
-msgstr "Mahai gaineko PCa"
+msgid "Simple printer"
+msgstr "Inprimagailu soila"
 
 #: ../sheets/network.sheet.in.h:8
-msgid "Digitizing board"
-msgstr "Digitalizazio-taula"
+msgid "WAN connection"
+msgstr "WAN konexioa"
 
 #: ../sheets/network.sheet.in.h:9
-msgid "Ethernet bus"
-msgstr "Ethernet busa"
+msgid "WAN link"
+msgstr "WAN esteka"
 
 #: ../sheets/network.sheet.in.h:10
-msgid "External DAT drive"
-msgstr "Kanpoko DAT unitatea"
+msgid "Stackable hub or switch"
+msgstr "Kontzentragailu edo konmutadore pilagarria"
 
 #: ../sheets/network.sheet.in.h:11
-msgid "Firewall router"
-msgstr "Suebaki-bideratzailea"
+msgid "Modular switching system"
+msgstr "Konmutadore-sistema modularra"
 
 #: ../sheets/network.sheet.in.h:12
-msgid "Laptop PC"
-msgstr "PC eramangarria"
+msgid "24 Port Patch Panel"
+msgstr "24 atakatako adabaki-panela"
 
 #: ../sheets/network.sheet.in.h:13
-msgid "Miditower PC"
-msgstr "Dorre ertaineko PCa"
+msgid "RJ45 wall-plug"
+msgstr "RJ45 horma-entxufea"
 
 #: ../sheets/network.sheet.in.h:14
-msgid "Minitower PC"
-msgstr "Dorre txikiko PCa"
+msgid "Wall-plug for the scEAD cabling system"
+msgstr "scEAD kable-sistemarentzako horma-entxufea"
 
 #: ../sheets/network.sheet.in.h:15
-msgid "Mobile phone"
-msgstr "Telefono mugikorra"
+msgid "Simple modem"
+msgstr "Modem soila"
 
 #: ../sheets/network.sheet.in.h:16
+msgid "Antenna for wireless transmission"
+msgstr "Haririk gabeko transmisiorako antena"
+
+#: ../sheets/network.sheet.in.h:17
 msgid "Mobile telephony base station"
 msgstr "Telefono mugikorraren oinarri-estazioa"
 
-#: ../sheets/network.sheet.in.h:17
+#: ../sheets/network.sheet.in.h:19
 msgid "Mobile telephony cell"
 msgstr "Telefono mugikorra"
 
-#: ../sheets/network.sheet.in.h:18
-msgid "Modular switching system"
-msgstr "Konmutadore-sistema modularra"
+#: ../sheets/network.sheet.in.h:20
+msgid "Router symbol"
+msgstr "Bideratzailearen ikurra"
+
+#: ../sheets/network.sheet.in.h:21
+msgid "Switch symbol"
+msgstr "Switch-ikurra"
 
 #: ../sheets/network.sheet.in.h:22
-msgid "Objects to design network diagrams with"
-msgstr "Sare-diagramak diseinatzeko objektuak"
+msgid "ATM switch symbol"
+msgstr "ATM konmutadorearen ikurra"
 
 #: ../sheets/network.sheet.in.h:23
-msgid "Plotter"
-msgstr "Marrazlea"
+msgid "Firewall router"
+msgstr "Suebaki-bideratzailea"
 
 #: ../sheets/network.sheet.in.h:24
-msgid "RJ45 wall-plug"
-msgstr "RJ45 horma-entxufea"
+msgid "Workstation monitor"
+msgstr "Lanpostuaren monitorea"
 
 #: ../sheets/network.sheet.in.h:25
-msgid "Router symbol"
-msgstr "Bideratzailearen ikurra"
+msgid "UNIX workstation"
+msgstr "UNIX lanpostua"
 
 #: ../sheets/network.sheet.in.h:26
-msgid "Simple modem"
-msgstr "Modem soila"
+msgid "Desktop PC"
+msgstr "Mahai gaineko PCa"
 
 #: ../sheets/network.sheet.in.h:27
-msgid "Simple printer"
-msgstr "Inprimagailu soila"
+msgid "Laptop PC"
+msgstr "PC eramangarria"
 
 #: ../sheets/network.sheet.in.h:28
-msgid "Speaker with integrated amplifier"
-msgstr "Anplifikadore integratuko bozgorailua"
+msgid "Bigtower PC"
+msgstr "Dorre handiko PCa"
 
 #: ../sheets/network.sheet.in.h:29
-msgid "Speaker without amplifier"
-msgstr "Anplifikadorerik gabeko bozgorailua"
+msgid "Miditower PC"
+msgstr "Dorre ertaineko PCa"
 
 #: ../sheets/network.sheet.in.h:30
-msgid "Stackable hub or switch"
-msgstr "Kontzentragailu edo konmutadore pilagarria"
+msgid "Minitower PC"
+msgstr "Dorre txikiko PCa"
 
 #: ../sheets/network.sheet.in.h:31
-msgid "Storage"
-msgstr "Biltegiratzea"
+msgid "Speaker with integrated amplifier"
+msgstr "Anplifikadore integratuko bozgorailua"
 
 #: ../sheets/network.sheet.in.h:32
-msgid "Switch symbol"
-msgstr "Switch-ikurra"
+msgid "Speaker without amplifier"
+msgstr "Anplifikadorerik gabeko bozgorailua"
+
+#: ../sheets/network.sheet.in.h:33
+msgid "3 1/2 inch diskette"
+msgstr "3 1/2 hazbeteko disketea"
 
 #: ../sheets/network.sheet.in.h:34
-msgid "UNIX workstation"
-msgstr "UNIX lanpostua"
+msgid "ZIP disk"
+msgstr "ZIP diskoa"
 
 #: ../sheets/network.sheet.in.h:35
-msgid "WAN connection"
-msgstr "WAN konexioa"
+msgid "External DAT drive"
+msgstr "Kanpoko DAT unitatea"
 
 #: ../sheets/network.sheet.in.h:36
-msgid "WAN link"
-msgstr "WAN esteka"
-
-#: ../sheets/network.sheet.in.h:37
-msgid "Wall-plug for the scEAD cabling system"
-msgstr "scEAD kable-sistemarentzako horma-entxufea"
+msgid "Mobile phone"
+msgstr "Telefono mugikorra"
 
 #: ../sheets/network.sheet.in.h:38
-msgid "Workstation monitor"
-msgstr "Lanpostuaren monitorea"
+msgid "Plotter"
+msgstr "Marrazlea"
 
 #: ../sheets/network.sheet.in.h:39
-msgid "ZIP disk"
-msgstr "ZIP diskoa"
+msgid "Digitizing board"
+msgstr "Digitalizazio-taula"
 
 #: ../sheets/sybase.sheet.in.h:1
-msgid "Log transfer manager or rep agent"
-msgstr "Rep agentea edo egunkari-transferentzien kudeatzailea"
+msgid "Sybase"
+msgstr "Sybase"
 
 #: ../sheets/sybase.sheet.in.h:2
 msgid "Objects to design Sybase replication domain diagrams with"
 msgstr "Sybase erreplikatzeen domeinu-diagramak diseinatzeko objektuak"
 
 #: ../sheets/sybase.sheet.in.h:3
-msgid "Replication server manager"
-msgstr "Erreplika-zerbitzariaren kudeatzailea"
+msgid "Sybase dataserver"
+msgstr "Sybase datu-zerbitzaria"
 
 #: ../sheets/sybase.sheet.in.h:4
-msgid "Stable storage device"
-msgstr "Biltegiragailu egonkorra"
+msgid "Sybase replication server"
+msgstr "Sybase erreplikatze-zerbitzaria"
 
 #: ../sheets/sybase.sheet.in.h:5
-msgid "Sybase"
-msgstr "Sybase"
+msgid "Log transfer manager or rep agent"
+msgstr "Rep agentea edo egunkari-transferentzien kudeatzailea"
 
 #: ../sheets/sybase.sheet.in.h:6
-msgid "Sybase client application"
-msgstr "Sybase bezero-aplikazioa"
+msgid "Stable storage device"
+msgstr "Biltegiragailu egonkorra"
 
 #: ../sheets/sybase.sheet.in.h:7
-msgid "Sybase dataserver"
-msgstr "Sybase datu-zerbitzaria"
+msgid "Sybase client application"
+msgstr "Sybase bezero-aplikazioa"
 
 #: ../sheets/sybase.sheet.in.h:8
-msgid "Sybase replication server"
-msgstr "Sybase erreplikatze-zerbitzaria"
+msgid "Replication server manager"
+msgstr "Erreplika-zerbitzariaren kudeatzailea"
+
+#~ msgid ""
+#~ "Your old Dia directory is about to be deleted. Would you like to continue?"
+#~ "Note: Any non-standard plugins that you may have installed will be "
+#~ "deleted. Dia user settings will not be affected."
+#~ msgstr ""
+#~ "Dia zaharraren direktorioa ezabatzera doa. Jarraitzea nahi duzu?"
+#~ "Oharra: instalatuta eduki dezakezun edozein plugin ez-estandar ere "
+#~ "ezabatu egingo dela. Dia-ko erabiltzailearen ezarpenei ez die eragingo."