[dia] Finnish translation update



commit b5d35f308d9c5d8ddb0cc8dcf39df3ffe8b576a5
Author: Lasse Liehu <lasse liehu gmail com>
Date:   Fri May 30 14:53:20 2014 +0300

    Finnish translation update

 po/fi.po |12522 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 6858 insertions(+), 5664 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 5a62632..a667359 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,61 +1,75 @@
 # Dia - finnish translation
 # Copyright © 2000,2003-2005,2007 Free Software Foundation, Inc.
 #
+#
+#: ../objects/UML/class.c:193
 # Sami Gerdt <sgerdt cs joensuu fi>, 2000.
 # Tommi Vainikainen <Tommi Vainikainen iki fi>, 2003-2005,2007.
 # Ilkka Tuohela  <hile iki fi>, 2005-2006.
-#
+# Lasse Liehu <lasse liehu gmail com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: dia\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-02 17:22+0300\n"
-"PO-Revision-Date: 2007-01-13 20:28+0200\n"
-"Last-Translator: Tommi Vainikainen <Tommi Vainikainen iki fi>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=dia&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-05-01 22:18+0000\n"
+"PO-Revision-Date: 2014-05-21 17:59+0300\n"
+"Last-Translator: Lasse Liehu <lasse liehu gmail com>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. This is not an errror
-#: ../app/app_procs.c:214
+#: ../app/app_procs.c:208
 #, c-format
 msgid "Warning: invalid layer range %lu - %lu\n"
 msgstr "Varoitus: virheellinen tasojakso %lu - %lu\n"
 
-#: ../app/app_procs.c:226
+#: ../app/app_procs.c:220
 #, c-format
 msgid "Warning: Layer %lu (%s) selected more than once.\n"
 msgstr "Varoitus: Taso %lu (%s) valittu useammin kuin kerran.\n"
 
-#: ../app/app_procs.c:252
+#: ../app/app_procs.c:246
 #, c-format
 msgid "Warning: Layer %d (%s) selected more than once.\n"
 msgstr "Varoitus: Taso %d (%s) valittu useammin kuin kerran.\n"
 
-#: ../app/app_procs.c:261
-#, c-format
-msgid "Warning: There is no layer named %s\n"
+#: ../app/app_procs.c:255
+#, fuzzy, c-format
+#| msgid "Warning: There is no layer named %s\n"
+msgid "Warning: There is no layer named %s.\n"
 msgstr "Varoitus: Ei ole tasoa nimeltä %s\n"
 
-#: ../app/app_procs.c:343
+#: ../app/app_procs.c:338
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s virhe: ei tiedä kuinka viedään %s\n"
 
-#: ../app/app_procs.c:352
-#, c-format
-msgid "%s error: input and output file name is identical: %s"
+#: ../app/app_procs.c:347
+#, fuzzy, c-format
+#| msgid "%s error: input and output file name is identical: %s"
+msgid "%s error: input and output filenames are identical: %s"
 msgstr "%s virhe: syöte- ja tulostetiedostonimet ovat identtiset: %s"
 
-#: ../app/app_procs.c:360
+#. Translators: Menu item Verb/Channel/Import
+#. Translators: Menu item Verb/Channel/Import/Import
+#: ../app/app_procs.c:353 ../objects/FS/function.c:675
+#: ../objects/FS/function.c:677
+msgid "Import"
+msgstr "Tuo"
+
+#: ../app/app_procs.c:356
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s virhe: tarvitaan käypä syötetiedosto %s\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:385
+#: ../app/app_procs.c:384
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
@@ -65,36 +79,46 @@ msgstr "%s --> %s\n"
 msgid "Can't find output format/filter %s\n"
 msgstr "Tulostemuotoa/suodatinta %s ei löydy\n"
 
+#: ../app/app_procs.c:626
+#, c-format
+msgid "Input directory '%s' must exist!\n"
+msgstr ""
+
+#: ../app/app_procs.c:643
+#, c-format
+msgid "Output directory '%s' must exist!\n"
+msgstr ""
+
 #. Translators:  The argument is a list of options, not to be translated
-#: ../app/app_procs.c:633
+#: ../app/app_procs.c:693
 #, c-format
 msgid "Select the filter/format out of: %s"
 msgstr "Valitse suodatin/muoto seuraavista: %s"
 
 #. &export_file_name
-#: ../app/app_procs.c:651
+#: ../app/app_procs.c:711
 msgid "Export loaded file and exit"
 msgstr "Vie ladattu tiedosto ja lopeta"
 
-#: ../app/app_procs.c:651
+#: ../app/app_procs.c:711
 msgid "OUTPUT"
 msgstr "TULOSTE"
 
 #. &export_file_format
 #. &export_format_string
-#: ../app/app_procs.c:653
+#: ../app/app_procs.c:713
 msgid "TYPE"
 msgstr "TYYPPI"
 
-#: ../app/app_procs.c:655
+#: ../app/app_procs.c:715
 msgid "Export graphics size"
 msgstr "Vientigrafiikan koko"
 
-#: ../app/app_procs.c:655
+#: ../app/app_procs.c:715
 msgid "WxH"
 msgstr "L×K"
 
-#: ../app/app_procs.c:657
+#: ../app/app_procs.c:717
 msgid ""
 "Show only specified layers (e.g. when exporting). Can be either the layer "
 "name or a range of layer numbers (X-Y)"
@@ -102,70 +126,101 @@ msgstr ""
 "Näytä vain annetut tasot (esimerkiksi vietäessä). Voi olla joko kerroksen "
 "nimi tai lista tasojen numeroista (X-Y)"
 
-#: ../app/app_procs.c:658
+#: ../app/app_procs.c:718
 msgid "LAYER,LAYER,..."
 msgstr "TASO,TASO,..."
 
-#: ../app/app_procs.c:660
+#: ../app/app_procs.c:720
 msgid "Don't show the splash screen"
 msgstr "Älä näytä käynnistysruutua"
 
-#: ../app/app_procs.c:662
-msgid "Don't create empty diagram"
+#: ../app/app_procs.c:722
+#, fuzzy
+#| msgid "Don't create empty diagram"
+msgid "Don't create an empty diagram"
 msgstr "Älä luo tyhjää kaaviota"
 
-#: ../app/app_procs.c:664
+#: ../app/app_procs.c:724
+msgid "Start classic user interface (no diagrams in tabs)"
+msgstr ""
+
+#: ../app/app_procs.c:726
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "Lähetä virheviestit vakiovirheeseen pikaikkunoiden näyttämisen sijaan."
 
-#. &input_directory
-#: ../app/app_procs.c:666
+#: ../app/app_procs.c:728
 msgid "Directory containing input files"
 msgstr "Syötetiedostoja sisältävä kansio"
 
-#: ../app/app_procs.c:666 ../app/app_procs.c:668
+#: ../app/app_procs.c:728 ../app/app_procs.c:730
 msgid "DIRECTORY"
 msgstr "KANSIO"
 
-#. &output_directory
-#: ../app/app_procs.c:668
+#: ../app/app_procs.c:730
 msgid "Directory containing output files"
 msgstr "Tulostiedostoja sisältävä kansio"
 
-#: ../app/app_procs.c:670
+#: ../app/app_procs.c:732
 msgid "Display credits list and exit"
 msgstr "Näytä tekijäluettelo ja lopeta"
 
-#: ../app/app_procs.c:672
+#: ../app/app_procs.c:734
 msgid "Generate verbose output"
 msgstr "Tulosta paljon viestejä"
 
-#: ../app/app_procs.c:674
+#: ../app/app_procs.c:736
 msgid "Display version and exit"
 msgstr "Näytä versio ja lopeta"
 
-#: ../app/app_procs.c:731
+#: ../app/app_procs.c:763
+msgid "[FILE...]"
+msgstr "[TIEDOSTO...]"
+
+#: ../app/app_procs.c:777
+#, fuzzy, c-format
+#| msgid "Manual operation"
+msgid "Invalid option?"
+msgstr "Käsitoiminta"
+
+#: ../app/app_procs.c:800
+#, fuzzy, c-format
+#| msgid "Dia version %s, compiled %s %s\n"
+msgid "Filename conversion failed: %s\n"
+msgstr "Dia, versio %s, käännetty %s %s\n"
+
+#: ../app/app_procs.c:813
+#, c-format
+msgid "Missing input: %s\n"
+msgstr ""
+
+#: ../app/app_procs.c:838
 msgid "Can't connect to session manager!\n"
 msgstr "Ei voitu yhdistää istunnonhallintaan.\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:771
+#: ../app/app_procs.c:879
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia, versio %s, käännetty %s %s\n"
 
-#: ../app/app_procs.c:773
+#: ../app/app_procs.c:881
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia, versio %s\n"
 
-#: ../app/app_procs.c:811
+#: ../app/app_procs.c:919
+#, fuzzy
+#| msgid "Object defaults"
+msgid "Object Defaults"
+msgstr "Objektin oletusarvot"
+
+#: ../app/app_procs.c:926
 msgid ""
 "Couldn't find standard objects when looking for object-libs; exiting...\n"
 msgstr ""
 "Standardiobjekteja ei löytynyt etsittäessä objektikirjastoja, lopetetaan...\n"
 
-#: ../app/app_procs.c:813
+#: ../app/app_procs.c:928
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
@@ -174,28 +229,37 @@ msgstr ""
 "Standardiobjekteja ei löytynyt etsittäessä objektikirjastoja kansiosta \"%s"
 "\", lopetetaan...\n"
 
-#: ../app/app_procs.c:875
+#: ../app/app_procs.c:988
 msgid "Diagram1.dia"
 msgstr "Kaavio1.dia"
 
-#: ../app/app_procs.c:919
+#: ../app/app_procs.c:1023
+#, fuzzy
+#| 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"
 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"
+"describing how you caused this message to appear.\n"
 msgstr ""
 "Näin ei pitäisi tapahtua. Ole hyvä ja tee vikailmoitus osoitteessa\n"
 "bugzilla.gnome.org kertoen kuinka sait tämän viestin aikaiseksi.\n"
 
-#: ../app/app_procs.c:934
+#: ../app/app_procs.c:1038
 msgid "Exiting Dia"
 msgstr "Suljetaan dia"
 
+#: ../app/app_procs.c:1065 ../app/display.c:1249 ../app/exit_dialog.c:115
+#: ../app/filedlg.c:582
+msgid "Save"
+msgstr "Tallenna"
+
 #. no standard buttons
-#: ../app/app_procs.c:986
+#: ../app/app_procs.c:1107
 msgid "Quitting without saving modified diagrams"
 msgstr "Suljetaan tallentamatta muokuttuja kaavioita"
 
-#: ../app/app_procs.c:988
+#: ../app/app_procs.c:1109
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
@@ -203,51 +267,39 @@ msgstr ""
 "Kaavioita on muokattu. Haluatko varmasti lopettaa Dian tallentamatta "
 "muutoksia?"
 
-#: ../app/app_procs.c:992
+#: ../app/app_procs.c:1113
 msgid "Quit Dia"
 msgstr "Lopeta Dia"
 
-#: ../app/app_procs.c:1061 ../app/app_procs.c:1068
-msgid "Could not create per-user Dia config directory"
+#: ../app/app_procs.c:1143
+msgid "Exit"
+msgstr ""
+
+#: ../app/app_procs.c:1189 ../app/app_procs.c:1196
+#, fuzzy
+#| msgid "Could not create per-user Dia config directory"
+msgid "Could not create per-user Dia configuration directory"
 msgstr "Ei voitu luoda käyttäjäkohtaista Dia-asetushakemistoa"
 
-#: ../app/app_procs.c:1071
+#: ../app/app_procs.c:1199
+#, fuzzy
+#| msgid ""
+#| "Could not create per-user Dia config directory. Please make sure that the "
+#| "environment variable HOME points to an existing directory."
 msgid ""
-"Could not create per-user Dia config directory. Please make sure that the "
-"environment variable HOME points to an existing directory."
+"Could not create per-user Dia configuration directory. Please make sure that "
+"the environment variable HOME points to an existing directory."
 msgstr ""
 "Käyttäjäkohtaista Dia-asetushakemistoa ei voi luoda. Tarkista, että "
 "ympäristömuuttuja HOME osoittaa olemassaolevaan hakemistoon."
 
-#: ../app/app_procs.c:1094
-msgid "Objects and filters internal to dia"
+#: ../app/app_procs.c:1222
+#, fuzzy
+#| msgid "Objects and filters internal to dia"
+msgid "Objects and filters internal to Dia"
 msgstr "Dian sisäiset objektit ja suodattimet"
 
-#: ../app/app_procs.c:1127
-msgid "[FILE...]"
-msgstr "[TIEDOSTO...]"
-
-#: ../app/app_procs.c:1147
-#, c-format
-msgid "Input-directory '%s' must exist!\n"
-msgstr ""
-
-#: ../app/app_procs.c:1152
-#, c-format
-msgid "Output-directory '%s' must exist!\n"
-msgstr ""
-
-#: ../app/app_procs.c:1158
-#, c-format
-msgid "'%s' not found!\n"
-msgstr "Tiedostoa \"%s\" ei löytynyt!\n"
-
-#: ../app/app_procs.c:1166
-#, c-format
-msgid "'%s' not found in '%s'!\n"
-msgstr "Tiedostoa \"%s\" ei löytynyt lähteestä \"%s\"!\n"
-
-#: ../app/app_procs.c:1215
+#: ../app/app_procs.c:1275
 #, c-format
 msgid ""
 "The original author of Dia was:\n"
@@ -256,7 +308,7 @@ msgstr ""
 "Dian alkuperäinen tekijä on:\n"
 "\n"
 
-#: ../app/app_procs.c:1220
+#: ../app/app_procs.c:1280
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +319,7 @@ msgstr ""
 "Nykyiset Dian ylläpitäjät ovat:\n"
 "\n"
 
-#: ../app/app_procs.c:1225
+#: ../app/app_procs.c:1285
 #, c-format
 msgid ""
 "\n"
@@ -278,7 +330,7 @@ msgstr ""
 "Muut tekijät ovat:\n"
 "\n"
 
-#: ../app/app_procs.c:1230
+#: ../app/app_procs.c:1290
 #, c-format
 msgid ""
 "\n"
@@ -289,28 +341,18 @@ msgstr ""
 "Dian on dokumentoinut:\n"
 "\n"
 
-#: ../app/autosave.c:90
-msgid "Recovering autosaved diagrams"
-msgstr "Palautetaan automaattisesti tallennettuja kaavioita"
-
-#: ../app/autosave.c:98
-msgid ""
-"Autosaved files exist.\n"
-"Please select those you wish to recover."
-msgstr ""
-"Automaattisesti tallennettuja tiedostoja löytyi.\n"
-"Valitse ne, jotka haluat palautettavan."
-
-#: ../app/color_area.c:317 ../app/color_area.c:360
+#: ../app/color_area.c:333 ../app/color_area.c:343
 msgid "Select foreground color"
 msgstr "Valitse etualan väri"
 
-#: ../app/color_area.c:318 ../app/color_area.c:361
+#: ../app/color_area.c:334 ../app/color_area.c:344
 msgid "Select background color"
 msgstr "Valitse taustaväri"
 
-#: ../app/commands.c:130
-msgid "No print plug-in found!"
+#: ../app/commands.c:131
+#, fuzzy
+#| msgid "No print plug-in found!"
+msgid "No print plugin found!"
 msgstr "Tulostusliitännäistä ei löytynyt!"
 
 #: ../app/commands.c:150
@@ -318,15 +360,41 @@ msgstr "Tulostusliitännäistä ei löytynyt!"
 msgid "Diagram%d.dia"
 msgstr "Kaavio%d.dia"
 
-#: ../app/commands.c:343
+#: ../app/commands.c:249
+msgid "No image from Clipboard to paste."
+msgstr ""
+
+#: ../app/commands.c:300
+msgid "No selected object can take an image."
+msgstr ""
+
+#: ../app/commands.c:327
+#, fuzzy
+#| msgid "Cairo Clipboard"
+msgid "Clipboard Paste"
+msgstr "Cairo-leikepöytä"
+
+#. might become more right some day ;)
+#: ../app/commands.c:335
+#, c-format
+msgid "No clipboard handler for '%s'"
+msgstr ""
+
+#: ../app/commands.c:426
+#, fuzzy
+#| msgid "Cairo Clipboard"
+msgid "Clipboard Copy"
+msgstr "Cairo-leikepöytä"
+
+#: ../app/commands.c:625
 msgid "No existing object to paste.\n"
 msgstr "Ei objekteja liitettäväksi.\n"
 
-#: ../app/commands.c:646 ../app/commands.c:684
+#: ../app/commands.c:935 ../app/commands.c:973
 msgid "Could not find help directory"
 msgstr "Ohjehakemistoa ei löydy"
 
-#: ../app/commands.c:653
+#: ../app/commands.c:942
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -335,7 +403,7 @@ msgstr ""
 "Ohjehakemiston avaus ei onnistunut:\n"
 "%s"
 
-#: ../app/commands.c:720
+#: ../app/commands.c:1010
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "Tommi Vainikainen, 2003-2005, 2007\n"
@@ -344,7 +412,7 @@ msgstr ""
 "\n"
 "http://gnome.fi/";
 
-#: ../app/commands.c:722
+#: ../app/commands.c:1012
 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"
@@ -374,27 +442,34 @@ msgstr ""
 "ole, kirjoita osoitteeseen Free Software Foundation Inc., 59 Temple \n"
 "Place – Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: ../app/commands.c:745
+#: ../app/commands.c:1039
 msgid "A program for drawing structured diagrams."
 msgstr "Ohjelma rakenteisten kaavioiden piirtoon."
 
-#: ../app/confirm.c:69
+#: ../app/confirm.c:71
 #, c-format
-msgid "You are about to print a diagram with %d pages."
-msgstr ""
+msgid "You are about to print a diagram with %d page."
+msgid_plural "You are about to print a diagram with %d pages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../app/confirm.c:71
+#: ../app/confirm.c:75
 #, c-format
-msgid "You are about to export a diagram with %d pages."
-msgstr ""
+msgid "You are about to export a diagram with %d page."
+msgid_plural "You are about to export a diagram with %d pages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../app/confirm.c:73
+#: ../app/confirm.c:79
 #, c-format
 msgid ""
+"You are about to export a diagram which may require %s of memory.(%d page)."
+msgid_plural ""
 "You are about to export a diagram which may require %s of memory.(%d pages)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../app/confirm.c:81
+#: ../app/confirm.c:88
 msgid ""
 "You can adjust the size of the diagram by changing the 'Scaling' in the "
 "'Page Setup' dialog.\n"
@@ -402,7 +477,7 @@ msgid ""
 "the intended bounds."
 msgstr ""
 
-#: ../app/confirm.c:85
+#: ../app/confirm.c:92
 msgid "Confirm Diagram Size"
 msgstr "Vahvista kaavion koko"
 
@@ -411,259 +486,236 @@ msgstr "Vahvista kaavion koko"
 msgid "'%s' creation failed"
 msgstr "\"%s\" luonti epäonnistui"
 
-#: ../app/defaults.c:43 ../app/defaults.c:150
+#: ../app/defaults.c:44 ../app/defaults.c:147
 msgid "Object defaults"
 msgstr "Objektin oletusarvot"
 
-#: ../app/defaults.c:61
+#: ../app/defaults.c:62
 msgid "This object has no defaults."
 msgstr "Tällä objektilla ei ole oletusarvoja."
 
-#: ../app/defaults.c:115
+#: ../app/defaults.c:111
 msgid "Defaults: "
 msgstr "Oletusarvot: "
 
-#: ../app/dia-props.c:85
-msgid "Diagram Properties"
-msgstr "Kaavion ominaisuudet"
-
-#: ../app/dia-props.c:119
-msgid "Dynamic grid"
-msgstr "Dynaaminen ruudukko"
-
-#: ../app/dia-props.c:127
-msgid "x"
-msgstr "x"
-
-#: ../app/dia-props.c:131
-msgid "y"
-msgstr "y"
-
-#: ../app/dia-props.c:136
-msgid "Spacing"
-msgstr "Harvennus"
-
-#: ../app/dia-props.c:156
-msgid "Visible spacing"
-msgstr "Näkyvä harvennus"
-
-#. Hexes!
-#: ../app/dia-props.c:177 ../app/preferences.c:247
-msgid "Hex grid"
-msgstr "Kuusioruudukko"
-
-#: ../app/dia-props.c:185
-msgid "Hex grid size"
-msgstr "Kuusioruudukon koko"
-
-#: ../app/dia-props.c:198
-msgid "Grid"
-msgstr "Ruudukko"
-
-#: ../app/dia-props.c:209 ../lib/diagramdata.c:112
-msgid "Background"
-msgstr "Tausta"
-
-#: ../app/dia-props.c:220 ../app/preferences.c:123
-msgid "Grid Lines"
-msgstr "Ruudukon viivat"
-
-#: ../app/dia-props.c:231
-msgid "Page Breaks"
-msgstr "Sivun vaihdot"
-
-#: ../app/dia-props.c:242
-msgid "Colors"
-msgstr "Värit"
-
-#. Can we be sure that the filename is the 'proper title'?
-#: ../app/dia-props.c:263
-#, c-format
-msgid "Diagram Properties: %s"
-msgstr "Kaavion ominaisuudet: %s"
-
-#: ../app/dia_embedd.c:348
-msgid "Could not initialize Bonobo!"
-msgstr "Ei pystytty alustamaan Bonoboa"
-
-#: ../app/diacanvas.c:121
-msgid "X position"
-msgstr "X-sijainti"
-
-#: ../app/diacanvas.c:122
-msgid "X position of child widget"
-msgstr "Alisäätimen X-sijainti"
-
-#: ../app/diacanvas.c:131
-msgid "Y position"
-msgstr "Y-sijainti"
-
-#: ../app/diacanvas.c:132
-msgid "Y position of child widget"
-msgstr "Alisäätimen Y-sijainti"
-
-#: ../app/diagram.c:222
+#: ../app/diagram.c:237
 #, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr "Tiedostonimeä \"%s\" ei voi muuntaa UTF-8-muotoon: %s\n"
 
-#: ../app/diagram.c:225 ../lib/message.c:90 ../lib/message.c:293
+#: ../app/diagram.c:240 ../lib/message.c:91 ../lib/message.c:299
 msgid "Error"
 msgstr "Virhe"
 
-#: ../app/diagram.c:1209
-msgid "Trying to group with no selected objects."
-msgstr "Yritettiin ryhmittää ilman valittuja kohteita."
-
-#: ../app/diagram.c:1219
-msgid ""
-"You cannot group objects that belong to different groups or have different "
-"parents"
+#. ToDo: move context further up in the callstack and to sth useful with it's content
+#: ../app/diagram.c:272
+msgid "Load Into"
 msgstr ""
-"Et voi ryhmittää kohteita, jotka kuuluvat eri ryhmiin tai joilla on eri äiti"
-
-#: ../app/diagram_tree_menu.c:47
-msgid "/_Sort objects"
-msgstr "/_Järjestä objektit"
-
-#: ../app/diagram_tree_menu.c:48
-msgid "/Sort objects/by _name"
-msgstr "/Järjestä objektit/_nimen perusteella"
-
-#: ../app/diagram_tree_menu.c:50
-msgid "/Sort objects/by _type"
-msgstr "/Järjestä objektit/_tyypin perusteella"
 
-#: ../app/diagram_tree_menu.c:52
-msgid "/Sort objects/as _inserted"
-msgstr "/Järjestä objektit/_lisäysjärjestys"
-
-#: ../app/diagram_tree_menu.c:55
-msgid "/Sort objects/All by name"
-msgstr "/Järjestä objektit/Kaikki nimen perusteella"
-
-#: ../app/diagram_tree_menu.c:57
-msgid "/Sort objects/All by type"
-msgstr "/Järjestä objektit/Kaikki tyypin perusteella"
-
-#: ../app/diagram_tree_menu.c:59
-msgid "/Sort objects/All as inserted"
-msgstr "/Järjestä objektit/Kaikki lisäysjärjestykseen"
-
-#: ../app/diagram_tree_menu.c:61
-msgid "/Sort objects/_Default"
-msgstr "/Järjestä objektit/_Oletus"
-
-#: ../app/diagram_tree_menu.c:62
-msgid "/Sort objects/Default/by _name"
-msgstr "/Järjestä objektit/Oletus/_nimen perusteella"
-
-#: ../app/diagram_tree_menu.c:64
-msgid "/Sort objects/Default/by _type"
-msgstr "/Järjestä objektit/Oletus/_tyypin perusteella"
+#: ../app/diagram.c:1217
+msgid "Trying to group with no selected objects."
+msgstr "Yritettiin ryhmittää ilman valittuja kohteita."
 
-#: ../app/diagram_tree_menu.c:66
-msgid "/Sort objects/Default/as _inserted"
-msgstr "/Järjestä objektit/Oletus/_lisäysjärjestykseen"
+#: ../app/diagram_tree_view.c:164
+#, fuzzy
+#| msgid "Diagram:"
+msgid "Diagram"
+msgstr "Kaavio:"
 
-#: ../app/diagram_tree_menu.c:68
-msgid "/Sort _diagrams"
-msgstr "/Järjestä _kaaviot"
+#: ../app/diagram_tree_view.c:171
+#: ../plug-ins/drs/dia-render-script-import.c:447
+#, fuzzy
+#| msgid "Layers"
+msgid "Layer"
+msgstr "Tasot"
 
-#: ../app/diagram_tree_menu.c:69
-msgid "/Sort _diagrams/by _name"
-msgstr "/Järjestä _kaaviot/_nimen perusteella"
+#: ../app/diagram_tree_view.c:177
+#, fuzzy, c-format
+#| msgid "Layers"
+msgid "%d Layer"
+msgid_plural "%d Layers"
+msgstr[0] "Tasot"
+msgstr[1] "Tasot"
+
+#: ../app/diagram_tree_view.c:181 ../app/diagram_tree_view.c:519
+#: ../objects/Database/table.c:149 ../objects/Istar/actor.c:142
+#: ../objects/Istar/actor.c:143 ../objects/Istar/other.c:147
+#: ../objects/Istar/other.c:148 ../objects/KAOS/other.c:150
+#: ../objects/KAOS/other.c:151 ../objects/UML/association.c:242
+#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
+#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
+msgid "Type"
+msgstr "Tyyppi"
 
-#: ../app/diagram_tree_menu.c:71
-msgid "/Sort _diagrams/as _inserted"
-msgstr "/Järjestä _kaaviot/_lisäysjärjestykseen"
+#: ../app/diagram_tree_view.c:184
+#, fuzzy
+#| msgid "Position"
+msgid "object|Position"
+msgstr "Sijainti"
 
-#: ../app/diagram_tree_menu.c:73
-msgid "/Sort diagrams/_Default"
-msgstr "/Järjestä kaaviot/_Oletus"
+#: ../app/diagram_tree_view.c:187
+#, fuzzy
+#| msgid "_Unparent Children"
+msgid "Children"
+msgstr "_Pura lapsi perheestä"
 
-#: ../app/diagram_tree_menu.c:74
-msgid "/Sort diagrams/Default/by _name"
-msgstr "/Järjestä _kaaviot/Oletus/_nimen perusteella"
+#: ../app/diagram_tree_view.c:191
+#, fuzzy, c-format
+#| msgid "Object"
+msgid "%d Object"
+msgid_plural "%d Objects"
+msgstr[0] "Objekti"
+msgstr[1] "Objekti"
 
-#: ../app/diagram_tree_menu.c:76
-msgid "/Sort diagrams/Default/as _inserted"
-msgstr "/Järjestä _kaaviot/Oletus/_lisäysjärjestykseen"
+#: ../app/diagram_tree_view.c:448
+#, fuzzy
+#| msgid "_Select"
+msgid "Select"
+msgstr "_Valitse"
 
-#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
-msgid "/_Locate"
-msgstr "/P_aikanna"
+#. Translators: Menu item Verb/Support/Position/Locate
+#. Translators: Menu item Verb/Signal/Sense/Locate
+#: ../app/diagram_tree_view.c:449 ../objects/FS/function.c:801
+#: ../objects/FS/function.c:1043
+msgid "Locate"
+msgstr "Paikallista"
 
-#: ../app/diagram_tree_menu.c:85
-msgid "/_Properties"
+#: ../app/diagram_tree_view.c:450
+#, fuzzy
+#| msgid "/_Properties"
+msgid "Properties"
 msgstr "/_Ominaisuudet"
 
-#: ../app/diagram_tree_menu.c:86
-msgid "/_Hide this type"
-msgstr "/_Piilota tämä tyyppi"
+#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:125
+#: ../app/plugin-manager.c:270 ../objects/Database/table.c:147
+#: ../objects/Database/table.c:190 ../objects/UML/association.c:236
+#: ../objects/UML/class.c:140 ../objects/UML/large_package.c:131
+#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
+#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
+msgid "Name"
+msgstr "Nimi"
 
-#: ../app/diagram_tree_window.c:80 ../app/preferences.c:124
+#: ../app/diagram_tree_view.c:565
 msgid "Diagram Tree"
 msgstr "Kaaviopuu"
 
 #. paper size
-#: ../app/diapagelayout.c:153
+#: ../app/diapagelayout.c:155
 msgid "Paper Size"
 msgstr "Paperin koko"
 
 #. orientation
-#: ../app/diapagelayout.c:186
+#: ../app/diapagelayout.c:184
 msgid "Orientation"
 msgstr "Suunta"
 
 #. margins
-#: ../app/diapagelayout.c:224
+#: ../app/diapagelayout.c:213
 msgid "Margins"
 msgstr "Reunukset"
 
-#: ../app/diapagelayout.c:236
+#: ../app/diapagelayout.c:225
 msgid "Top:"
 msgstr "Ylä:"
 
-#: ../app/diapagelayout.c:249
+#: ../app/diapagelayout.c:238
 msgid "Bottom:"
 msgstr "Ala:"
 
-#: ../app/diapagelayout.c:262
+#: ../app/diapagelayout.c:251
 msgid "Left:"
 msgstr "Vasen:"
 
-#: ../app/diapagelayout.c:275
+#: ../app/diapagelayout.c:264
 msgid "Right:"
 msgstr "Oikea:"
 
 #. Scaling
-#: ../app/diapagelayout.c:289
+#: ../app/diapagelayout.c:278
 msgid "Scaling"
 msgstr "Skaalaus"
 
-#: ../app/diapagelayout.c:300
+#: ../app/diapagelayout.c:289
 msgid "Scale:"
 msgstr "Skaala:"
 
-#: ../app/diapagelayout.c:312
+#: ../app/diapagelayout.c:301
 msgid "Fit to:"
 msgstr "Sovita:"
 
-#: ../app/diapagelayout.c:324
+#: ../app/diapagelayout.c:313
 msgid "by"
 msgstr "×"
 
-#: ../app/diapagelayout.c:741
+#: ../app/diapagelayout.c:732
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3g cm × %0.3g cm"
 
-#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
+#: ../app/diapagelayout.c:836 ../app/pagesetup.c:77
 msgid "Page Setup"
 msgstr "Sivun asetukset"
 
-#: ../app/disp_callbacks.c:95 ../app/properties-dialog.c:157
+#: ../app/dia-props.c:86
+msgid "Diagram Properties"
+msgstr "Kaavion ominaisuudet"
+
+#: ../app/dia-props.c:120
+msgid "Dynamic grid"
+msgstr "Dynaaminen ruudukko"
+
+#: ../app/dia-props.c:128
+msgid "x"
+msgstr "x"
+
+#: ../app/dia-props.c:132
+msgid "y"
+msgstr "y"
+
+#: ../app/dia-props.c:137
+msgid "Spacing"
+msgstr "Harvennus"
+
+#: ../app/dia-props.c:157
+msgid "Visible spacing"
+msgstr "Näkyvä harvennus"
+
+#. Hexes!
+#: ../app/dia-props.c:178 ../app/preferences.c:243
+msgid "Hex grid"
+msgstr "Kuusioruudukko"
+
+#: ../app/dia-props.c:186
+msgid "Hex grid size"
+msgstr "Kuusioruudukon koko"
+
+#: ../app/dia-props.c:199
+msgid "Grid"
+msgstr "Ruudukko"
+
+#: ../app/dia-props.c:210 ../lib/diagramdata.c:123
+msgid "Background"
+msgstr "Tausta"
+
+#: ../app/dia-props.c:221 ../app/preferences.c:122
+msgid "Grid Lines"
+msgstr "Ruudukon viivat"
+
+#: ../app/dia-props.c:232
+msgid "Page Breaks"
+msgstr "Sivun vaihdot"
+
+#: ../app/dia-props.c:243
+msgid "Colors"
+msgstr "Värit"
+
+#. Can we be sure that the filename is the 'proper title'?
+#: ../app/dia-props.c:264
+#, c-format
+msgid "Diagram Properties: %s"
+msgstr "Kaavion ominaisuudet: %s"
+
+#: ../app/disp_callbacks.c:93 ../app/properties-dialog.c:156
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -671,11 +723,37 @@ msgstr ""
 "Tämä objekti ei tue Peru/Tee uudestaan -toimintoja.\n"
 "Peru toiminto."
 
-#: ../app/disp_callbacks.c:130
-msgid "Properties..."
-msgstr "Ominaisuudet..."
+#: ../app/disp_callbacks.c:128
+#, fuzzy
+#| msgid "/_Properties"
+msgid "Properties…"
+msgstr "/_Ominaisuudet"
+
+#: ../app/disp_callbacks.c:167
+msgid "Follow link…"
+msgstr ""
+
+#: ../app/disp_callbacks.c:215 ../objects/standard/bezier.c:785
+#: ../objects/standard/beziergon.c:548 ../objects/standard/box.c:784
+#: ../objects/standard/textobj.c:450
+#, fuzzy
+#| msgid "Convert"
+msgid "Convert to Path"
+msgstr "Muunna"
+
+#: ../app/disp_callbacks.c:344
+#, fuzzy
+#| msgid "Select None"
+msgid "Selection"
+msgstr "Älä valitse mitään"
 
-#: ../app/disp_callbacks.c:1066
+#: ../app/disp_callbacks.c:359
+#, fuzzy
+#| msgid "_Input Methods"
+msgid "Input _Methods"
+msgstr "_Syötetavat"
+
+#: ../app/disp_callbacks.c:1135
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -686,33 +764,35 @@ msgstr ""
 #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
 #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
 #.
-#: ../app/display.c:115
+#: ../app/display.c:109
 #, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
 msgstr[0] "%d kohteen valinta"
 msgstr[1] "%d kohteen valinta"
 
-#: ../app/display.c:125
+#: ../app/display.c:119
 #, c-format
 msgid "Selected '%s'"
 msgstr "Valittu '%s'"
 
 #. we really should not come here but instead disable the menu command earlier
-#: ../app/display.c:1034
-msgid "No anti-aliased renderer found"
+#: ../app/display.c:1137
+#, fuzzy
+#| msgid "No anti-aliased renderer found"
+msgid "No antialiased renderer found"
 msgstr "Antialiasoitua piirrintä ei löytynyt"
 
-#: ../app/display.c:1179
+#: ../app/display.c:1295
 msgid "<unnamed>"
 msgstr "<nimetön>"
 
 #. no standard buttons
-#: ../app/display.c:1185
+#: ../app/display.c:1301
 msgid "Closing diagram without saving"
 msgstr "Suljetaan kaavio tallentamatta"
 
-#: ../app/display.c:1187
+#: ../app/display.c:1303
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -721,11 +801,11 @@ msgstr ""
 "Kaaviota \"%s\"\n"
 "ei ole tallennettu. Tallennetaanko muutokset nyt?"
 
-#: ../app/display.c:1189
+#: ../app/display.c:1305
 msgid "Close Diagram"
 msgstr "Sulje kaavio"
 
-#: ../app/display.c:1194
+#: ../app/display.c:1310
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
@@ -745,67 +825,50 @@ msgstr "Tallenna valittu"
 msgid "The following are not saved:"
 msgstr "Seuraavia ei ole tallennettu:"
 
-#: ../app/exit_dialog.c:113
-msgid "Save"
-msgstr "Tallenna"
-
-#: ../app/exit_dialog.c:114
-msgid "active"
-msgstr "käytössä"
-
-#. *** board of value **************
-#: ../app/exit_dialog.c:123 ../app/plugin-manager.c:262
-#: ../objects/Database/table.c:138 ../objects/Database/table.c:181
-#: ../objects/SISSI/sissi_dialog.c:734 ../objects/UML/association.c:234
-#: ../objects/UML/class.c:144 ../objects/UML/large_package.c:139
-#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
-#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
-msgid "Name"
-msgstr "Nimi"
-
-#: ../app/exit_dialog.c:129
+#: ../app/exit_dialog.c:131
 msgid "Path"
 msgstr "Polku"
 
-#: ../app/exit_dialog.c:142
+#: ../app/exit_dialog.c:144
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../app/exit_dialog.c:150
+#: ../app/exit_dialog.c:152
 msgid "Select None"
 msgstr "Älä valitse mitään"
 
-#: ../app/exit_dialog.c:232
+#: ../app/exit_dialog.c:244
 msgid "Nothing selected for saving.  Would you like to try again?"
 msgstr "Mitään ei ole valittu tallennettavaksi. Haluatko yrittää uudestaan?"
 
 #: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-#: ../app/filedlg.c:749 ../lib/widgets.c:1488
+#: ../app/filedlg.c:825 ../lib/widgets.c:402
 msgid "Supported Formats"
 msgstr "Tuetut muodot"
 
-#: ../app/filedlg.c:192 ../app/filedlg.c:606
+#: ../app/filedlg.c:197 ../app/filedlg.c:199 ../app/filedlg.c:668
+#: ../app/filedlg.c:670
 msgid "By extension"
 msgstr "Tiedostopäätteestä"
 
-#: ../app/filedlg.c:281
+#: ../app/filedlg.c:293
 msgid "Open Diagram"
 msgstr "Avaa kaavio"
 
 # Tarkista
-#: ../app/filedlg.c:310
+#: ../app/filedlg.c:326
 msgid "Open Options"
 msgstr "Avaa asetukset"
 
-#: ../app/filedlg.c:318 ../app/filedlg.c:731
+#: ../app/filedlg.c:334 ../app/filedlg.c:807
 msgid "Determine file type:"
 msgstr "Määrittele tiedoston tyyppi:"
 
-#: ../app/filedlg.c:338 ../app/filedlg.c:744 ../lib/widgets.c:1493
+#: ../app/filedlg.c:354 ../app/filedlg.c:820 ../lib/widgets.c:410
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: ../app/filedlg.c:371 ../plug-ins/postscript/paginate_psprint.c:408
+#: ../app/filedlg.c:393 ../plug-ins/postscript/paginate_psprint.c:416
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
@@ -815,13 +878,13 @@ msgstr ""
 "eikä paikallista merkistöä.\n"
 "Jotain tulee hajoamaan."
 
-#: ../app/filedlg.c:381 ../app/filedlg.c:653
-#: ../plug-ins/postscript/paginate_psprint.c:422
+#: ../app/filedlg.c:403 ../app/filedlg.c:722
+#: ../plug-ins/postscript/paginate_psprint.c:430
 msgid "File already exists"
 msgstr "Samanniminen tiedosto on jo olemassa"
 
-#: ../app/filedlg.c:383 ../app/filedlg.c:655
-#: ../plug-ins/postscript/paginate_psprint.c:418
+#: ../app/filedlg.c:405 ../app/filedlg.c:724
+#: ../plug-ins/postscript/paginate_psprint.c:426
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -830,17 +893,23 @@ msgstr ""
 "Tiedosto \"%s\" on jo olemassa.\n"
 "Korvataanko uudella?"
 
-#: ../app/filedlg.c:437
+#: ../app/filedlg.c:425
+#, fuzzy
+#| msgid "Save"
+msgid "Save as"
+msgstr "Tallenna"
+
+#: ../app/filedlg.c:493
 msgid "Save Diagram"
 msgstr "Tallenna kaavio"
 
 #. 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:449
+#: ../app/filedlg.c:507
 msgid "Compress diagram files"
 msgstr "Pakkaa kaaviotiedostot"
 
-#: ../app/filedlg.c:459 ../app/filedlg.c:464
+#: ../app/filedlg.c:516
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -849,7 +918,15 @@ msgstr ""
 "ja tallentamista. Jotkin tekstiohjelmat eivät osaa käsitellä pakattuja "
 "tiedostoja."
 
-#: ../app/filedlg.c:679
+#. Favored Filter
+#. Translators: Menu item Verb/Channel/Export
+#. Translators: Menu item Verb/Channel/Export/Export
+#: ../app/filedlg.c:744 ../app/preferences.c:220 ../objects/FS/function.c:689
+#: ../objects/FS/function.c:691 ../plug-ins/libart/export_png.c:329
+msgid "Export"
+msgstr "Vie"
+
+#: ../app/filedlg.c:753
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -858,269 +935,134 @@ msgstr ""
 "Ei pystynyt määrittelemään mitä vientisuodatinta\n"
 "tulisi käyttää tallennettaessa tiedostoa \"%s\""
 
-#: ../app/filedlg.c:706
+#: ../app/filedlg.c:780
 msgid "Export Diagram"
 msgstr "Vie kaavio"
 
-#: ../app/filedlg.c:723
+#: ../app/filedlg.c:799
 msgid "Export Options"
 msgstr "Vientiasetukset"
 
-#: ../app/find-and-replace.c:453
+#: ../app/find-and-replace.c:480
 msgid "_Search for:"
 msgstr "_Etsi:"
 
-#: ../app/find-and-replace.c:466
+#: ../app/find-and-replace.c:493
 msgid "Replace _with:"
 msgstr "_Korvaa:"
 
-#: ../app/find-and-replace.c:476
+#: ../app/find-and-replace.c:503
 msgid "_Match case"
 msgstr "_Täsmää kirjainkoko"
 
-#: ../app/find-and-replace.c:480
+#: ../app/find-and-replace.c:507
 msgid "Match _entire word only"
 msgstr "Täsmää _koko sanat"
 
-#: ../app/find-and-replace.c:484
+#: ../app/find-and-replace.c:511
 msgid "Match _all properties (not just object name)"
 msgstr ""
 
-#: ../app/find-and-replace.c:509
+#: ../app/find-and-replace.c:537
 msgid "Find"
 msgstr "Etsi"
 
-#: ../app/find-and-replace.c:541 ../app/menus.c:261
+#: ../app/find-and-replace.c:567 ../app/menus.c:271
 msgid "Replace"
 msgstr "Korvaa"
 
-#: ../app/find-and-replace.c:544
+#: ../app/find-and-replace.c:570
 msgid "Replace _All"
 msgstr "Korvaa k_aikki"
 
 #. 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:549
+#: ../app/find-and-replace.c:575
 msgid "_Replace"
 msgstr "Ko_rvaa"
 
-#: ../app/interface.c:153
-msgid ""
-"Modify object(s)\n"
-"Use <Space> to toggle between this and other tools"
-msgstr ""
-"Muokkaa objektia/objekteja\n"
-"Käytä <Välilyöntiä> vaihtamaan tämän ja muiden työkalujen välillä"
-
-#: ../app/interface.c:159
-msgid ""
-"Text edit(s)\n"
-"Use <Esc> to leave this tool"
-msgstr ""
-"Tekstin muokkain\n"
-"Poistu työkalusta Esc:illä"
-
-#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:165 ../app/menus.c:223 ../objects/FS/function.c:988
-msgid "Magnify"
-msgstr "Suurenna"
-
-#: ../app/interface.c:171
-msgid "Scroll around the diagram"
-msgstr "Vieritä kaaviota"
-
-#. how it used to be before 0.96+SVN
-#. new name matching "same name, same type"  rule
-#: ../app/interface.c:177 ../app/menus.c:226 ../lib/properties.c:80
-#: ../lib/properties.h:530 ../objects/AADL/aadlbox.c:156
-#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
-#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
-#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
-#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
-#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
-#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
-#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:236
-#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
-msgid "Text"
-msgstr "Teksti"
-
-#: ../app/interface.c:183 ../app/menus.c:227
-msgid "Box"
-msgstr "Laatikko"
-
-#: ../app/interface.c:189 ../app/menus.c:228
-msgid "Ellipse"
-msgstr "Ellipsi"
-
-#: ../app/interface.c:195 ../app/menus.c:229
-msgid "Polygon"
-msgstr "Monikulmio"
-
-#: ../app/interface.c:201 ../app/menus.c:230
-msgid "Beziergon"
-msgstr "Bezier-kulmio"
-
-#: ../app/interface.c:207 ../app/menus.c:232 ../objects/standard/line.c:229
-msgid "Line"
-msgstr "Viiva"
-
-#: ../app/interface.c:213 ../app/menus.c:233
-msgid "Arc"
-msgstr "Kaari"
-
-#: ../app/interface.c:219 ../app/menus.c:234
-msgid "Zigzagline"
-msgstr "Siksakkiviiva"
-
-#: ../app/interface.c:225 ../app/menus.c:235
-msgid "Polyline"
-msgstr "Moniviiva"
-
-#: ../app/interface.c:231 ../app/menus.c:236
-msgid "Bezierline"
-msgstr "Bezier-viiva"
-
-#: ../app/interface.c:237 ../app/menus.c:239
-msgid "Image"
-msgstr "Kuva"
-
-#: ../app/interface.c:244 ../app/menus.c:237
-msgid "Outline"
-msgstr ""
-
-#: ../app/interface.c:619 ../app/interface.c:855
+#: ../app/interface.c:521
 msgid "Pops up the Navigation window."
 msgstr "Näytä navigointi-ikkuna."
 
-#: ../app/interface.c:817
+#: ../app/interface.c:736
 msgid "Diagram menu."
 msgstr "Kaaviovalikko."
 
-#: ../app/interface.c:920
+#: ../app/interface.c:776
 msgid "Zoom"
 msgstr "Zoomaus"
 
-#: ../app/interface.c:935
+#: ../app/interface.c:791
 msgid "Toggles snap-to-grid for this window."
 msgstr "Kiinnitä ruudukkoon -kytkin tälle ikkunalle."
 
-#: ../app/interface.c:946
+#: ../app/interface.c:802
 msgid "Toggles object snapping for this window."
 msgstr "Kiinnitetäänkö kohteet tässä ikkunassa."
 
-#: ../app/interface.c:1009
-msgid "NULL tooldata in tool_select_update"
-msgstr "TYHJÄ työvälinetieto tool_select_update-funktiossa"
-
-#: ../app/interface.c:1336
-#, c-format
-msgid "No sheet named %s"
-msgstr "Ei luokkaa nimeltä %s"
-
-#: ../app/interface.c:1374
-msgid "Other sheets"
-msgstr "Muut luokat"
-
-#: ../app/interface.c:1434 ../sheets/Flowchart.sheet.in.h:10
-msgid "Flowchart"
-msgstr "Vuokaavio"
-
-#: ../app/interface.c:1494
-msgid ""
-"Foreground & background colors for new objects.  The small black and white "
-"squares reset colors.  The small arrows swap colors.  Double click to change "
-"colors."
-msgstr ""
-"Edusta- ja taustavärit uusille objekteille. Pienet mustavalkoiset neliöt "
-"palauttavat värit alkutilaan. Pienet nuolet vaihtavat värejä. "
-"Kaksoisnapsauta vaihtaaksesi värejä."
-
-#: ../app/interface.c:1509
-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."
-msgstr ""
-"Viivan paksuudet.  Napsauta viivaa asettaaksesi viivan oletuspaksuuden "
-"uusille objekteille.  Kaksoisnapsauta jos haluat asettaa tarkemmin."
-
-#: ../app/interface.c:1552
-msgid ""
-"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-"arrow parameters with Details..."
-msgstr ""
-"Nuolen tyyli uusien viivojen alussa. Napsauta valitaksesi nuolen tai muokkaa "
-"nuoliparametreja Tiedot-painikkeesta"
-
-#: ../app/interface.c:1557
-msgid ""
-"Line style for new lines.  Click to pick a line style, or set line style "
-"parameters with Details..."
-msgstr ""
-"Viivan tyyli uusille viivoille. Napsauta asettaaksesi viivan tyyli tai "
-"muokkaa viivan tyyliparametrit Tiedot-painikkeesta"
-
-#: ../app/interface.c:1573
-msgid ""
-"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-"parameters with Details..."
-msgstr ""
-"Nuolen tyyli uusien viivojen alussa. Napsauta valitaksesi nuolen tai muokkaa "
-"nuoliparametreja Tiedot-painikkeesta"
-
 # Vai kaaviomuokkain?
-#: ../app/interface.c:1633 ../app/interface.c:1760
+#: ../app/interface.c:970 ../app/interface.c:1087 ../dia.desktop.in.in.h:2
 msgid "Diagram Editor"
 msgstr "Kaaviomuokkain"
 
-#: ../app/layer_dialog.c:159
+#: ../app/layer_dialog.c:165
 msgid "New Layer"
 msgstr "Uusi taso"
 
-#: ../app/layer_dialog.c:160
+#: ../app/layer_dialog.c:166
 msgid "Raise Layer"
 msgstr "Kohota taso"
 
-#: ../app/layer_dialog.c:161
+#: ../app/layer_dialog.c:167
 msgid "Lower Layer"
 msgstr "Laske taso"
 
-#: ../app/layer_dialog.c:162
+#: ../app/layer_dialog.c:168
 msgid "Delete Layer"
 msgstr "Poista taso"
 
-#: ../app/layer_dialog.c:306
+#: ../app/layer_dialog.c:305
 msgid "Layers:"
 msgstr "Tasot:"
 
-#: ../app/layer_dialog.c:386
+#: ../app/layer_dialog.c:384
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../app/layer_dialog.c:400
+#: ../app/layer_dialog.c:398
 msgid "Diagram:"
 msgstr "Kaavio:"
 
-#: ../app/layer_dialog.c:514
+#: ../app/layer_dialog.c:512 ../app/layer_dialog.c:1238
 #, c-format
 msgid "New layer %d"
 msgstr "Uusi taso %d"
 
-#: ../app/layer_dialog.c:729
+#: ../app/layer_dialog.c:727
 msgid "none"
 msgstr "ei mitään"
 
-#: ../app/layer_dialog.c:1154
-msgid "Edit Layer Attributes"
-msgstr "Muokkaa tason ominaisuuksia"
+#: ../app/layer_dialog.c:1208
+#, fuzzy
+#| msgid "Raise Layer"
+msgid "Edit Layer"
+msgstr "Kohota taso"
 
-#: ../app/layer_dialog.c:1173
+#: ../app/layer_dialog.c:1208
+#, fuzzy
+#| msgid "New Layer"
+msgid "Add Layer"
+msgstr "Uusi taso"
+
+#: ../app/layer_dialog.c:1227
 msgid "Layer name:"
 msgstr "Tason nimi:"
 
-#: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
-#: ../objects/chronogram/chronoline.c:183
-#: ../objects/chronogram/chronoref.c:162
+#: ../app/linewidth_area.c:246 ../lib/properties.h:626 ../lib/properties.h:629
+#: ../objects/chronogram/chronoline.c:180
+#: ../objects/chronogram/chronoref.c:159
 msgid "Line width"
 msgstr "Viivan paksuus"
 
@@ -1128,7 +1070,7 @@ msgstr "Viivan paksuus"
 msgid "Line width:"
 msgstr "Viivan paksuus:"
 
-#: ../app/load_save.c:295
+#: ../app/load_save.c:266
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1136,41 +1078,60 @@ msgstr ""
 "Virhe ladattaessa kaaviota.\n"
 "Linkitettyä objektia ei löytynyt dokumentista."
 
-#: ../app/load_save.c:299
-#,  c-format
+#: ../app/load_save.c:270
+#, fuzzy, c-format
+#| msgid ""
+#| "Error loading diagram.\n"
+#| "connection handle %d does not exist on '%s'."
 msgid ""
 "Error loading diagram.\n"
-"connection handle %d does not exist on '%s'."
+"Connection handle %d does not exist on '%s'."
 msgstr ""
 "Virhe ladattaessa kaaviota.\n"
 "Liitoskahvaa %d ei ole olemassa kohteessa \"%s\"."
 
-#: ../app/load_save.c:327
-#, c-format
+#: ../app/load_save.c:286
+#, fuzzy, c-format
+#| msgid ""
+#| "Error loading diagram.\n"
+#| "connection point %d does not exist on '%s'."
 msgid ""
 "Error loading diagram.\n"
-"connection point %d does not exist on '%s'."
+"Connection point %d does not exist on '%s'."
 msgstr ""
 "Virhe ladattaessa kaaviota.\n"
 "Liitoskohtaa %d ei ole olemassa kohteessa \"%s\"."
 
-#: ../app/load_save.c:367
+#: ../app/load_save.c:326
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "Objektin %2$s isää %1$s ei löydy\n"
 
-#: ../app/load_save.c:416
-msgid "You must specify a file, not a directory.\n"
+#: ../app/load_save.c:393
+#, fuzzy
+#| msgid "You must specify a file, not a directory.\n"
+msgid "You must specify a file, not a directory."
 msgstr "Sinun täytyy määritellä tiedosto, ei hakemistoa.\n"
 
-#: ../app/load_save.c:423 ../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
+#: ../app/load_save.c:400 ../plug-ins/dxf/dxf-import.c:1289
+#: ../plug-ins/wpg/wpg-import.c:463 ../plug-ins/xfig/xfig-import.c:1288
+#: ../plug-ins/xslt/xslt.c:97
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "Ei pystynyt aukaisemaan tiedostoa \"%s\" luettavaksi.\n"
 
-#: ../app/load_save.c:441 ../app/load_save.c:447
+#. this was talking about unknown file type but it could as well be broken XML
+#: ../app/load_save.c:418
+#, fuzzy, c-format
+#| msgid ""
+#| "Error loading diagram %s.\n"
+#| "Not a Dia file."
+msgid "Error loading diagram %s."
+msgstr ""
+"Virhe ladattaessa kaaviota %s.\n"
+"Ei ole Dia-tiedosto."
+
+#: ../app/load_save.c:427
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1179,7 +1140,7 @@ msgstr ""
 "Virhe ladattaessa kaaviota %s.\n"
 "Tuntematon tiedostotyyppi."
 
-#: ../app/load_save.c:455
+#: ../app/load_save.c:435
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1188,7 +1149,13 @@ msgstr ""
 "Virhe ladattaessa kaaviota %s.\n"
 "Ei ole Dia-tiedosto."
 
-#: ../app/load_save.c:672
+#: ../app/load_save.c:680
+#, fuzzy
+#| msgid "Error reading resolution: %s\n"
+msgid "Error reading connections"
+msgstr "Virhe luettaessa tarkkuutta: %s\n"
+
+#: ../app/load_save.c:700
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1199,473 +1166,707 @@ msgstr ""
 "%s.\n"
 "Kelvollisessa Dia-tiedostossa on vähintään yksi taso."
 
-#: ../app/load_save.c:995
+#: ../app/load_save.c:1001
+#, fuzzy
+#| msgid "Error reading magnification: %s\n"
+msgid "Error saving connections"
+msgstr "Virhe luettaessa suurennusta: %s\n"
+
+#: ../app/load_save.c:1006
+#, c-format
+msgid "Connection saving is incomplete for layer '%s'"
+msgstr ""
+
+#: ../app/load_save.c:1059
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "Tulostiedostoa \"%s\" ei ole lupaa kirjoittaa\n"
 
-#: ../app/load_save.c:1027
+#: ../app/load_save.c:1091
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr "Väliaikaistiedostoja kansiion \"%s\" ei ole lupaa kirjoittaa\n"
 
-#: ../app/load_save.c:1049 ../plug-ins/cairo/diacairo.c:121
-#: ../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:157
-#: ../plug-ins/metapost/render_metapost.c:1177
-#: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
-#: ../plug-ins/pstricks/render_pstricks.c:916
-#: ../plug-ins/shape/shape-export.c:136 ../plug-ins/svg/render_svg.c:199
-#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1072
-#: ../plug-ins/xfig/xfig-export.c:1151 ../plug-ins/xslt/xslt.c:99
-#, c-format
-msgid "Can't open output file %s: %s\n"
+#: ../app/load_save.c:1114 ../plug-ins/cgm/cgm.c:1145
+#: ../plug-ins/dxf/dxf-export.c:576
+#: ../plug-ins/metapost/render_metapost.c:1085
+#: ../plug-ins/pgf/render_pgf.c:1209 ../plug-ins/postscript/render_eps.c:123
+#: ../plug-ins/pstricks/render_pstricks.c:863
+#: ../plug-ins/vdx/vdx-export.c:1749 ../plug-ins/wmf/wmf.cpp:1350
+#: ../plug-ins/wpg/wpg.c:1065 ../plug-ins/xfig/xfig-export.c:1196
+#, fuzzy, c-format
+#| msgid "Can't open output file %s: %s\n"
+msgid "Can't open output file %s"
 msgstr "Tulostetiedostoa %s ei voi avata: %s\n"
 
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:1060
+#: ../app/load_save.c:1125
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "Sisäinen virhe %d kirjoitettassa tiedostoa %s\n"
 
-#: ../app/load_save.c:1071
+#: ../app/load_save.c:1136
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "Tiedostoa %s ei voi nimetä tallennustiedostoksi %s: %s\n"
 
-#: ../app/load_save.c:1162 ../app/load_save.c:1167
+#. no extra threads supported, stay in this one
+#: ../app/load_save.c:1252 ../app/load_save.c:1262 ../app/load_save.c:1270
+#, fuzzy
+#| msgid "Autoclave"
+msgid "Auto save"
+msgstr "Autoklaavi"
+
+#: ../app/load_save.c:1294 ../app/load_save.c:1299
 msgid "Dia Diagram File"
 msgstr "Dia-kaaviotiedosto"
 
-#: ../app/menus.c:58
+#: ../app/menus.c:63
 msgid "Fit"
 msgstr "Sovita"
 
-#: ../app/menus.c:76
+#: ../app/menus.c:90
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../app/menus.c:80
+#: ../app/menus.c:91
+#, fuzzy
+#| msgid "Don't create empty diagram"
+msgid "Create a new diagram"
+msgstr "Älä luo tyhjää kaaviota"
+
+#: ../app/menus.c:92
+msgid "_Open…"
+msgstr ""
+
+#: ../app/menus.c:92
+#, fuzzy
+#| msgid "Compress diagram files"
+msgid "Open a diagram file"
+msgstr "Pakkaa kaaviotiedostot"
+
+#: ../app/menus.c:94
 msgid "_Help"
 msgstr "O_hje"
 
-# Sheet "sisältää" joukon objekteja
-#: ../app/menus.c:88
-msgid "Sheets and Objects..."
-msgstr "Luokat ja _objektit..."
+#: ../app/menus.c:104
+#, fuzzy
+#| msgid "Sheets and Objects"
+msgid "Sheets and Objects…"
+msgstr "Luokat ja objektit"
 
-#: ../app/menus.c:90
-msgid "Plugins..."
-msgstr "Liitännäiset..."
+#: ../app/menus.c:106
+#, fuzzy
+#| msgid "Plug-ins"
+msgid "Plugins…"
+msgstr "Liitännäiset"
 
-#: ../app/menus.c:96
-msgid "_Diagram tree..."
-msgstr "_Kaaviopuu..."
+#: ../app/menus.c:107
+#, fuzzy
+#| msgid "Diagram Tree"
+msgid "_Diagram Tree"
+msgstr "Kaaviopuu"
 
-#: ../app/menus.c:102
+#: ../app/menus.c:112
 msgid "Show Toolbar"
 msgstr "Näytä työkalupalkki"
 
-#: ../app/menus.c:103
+#: ../app/menus.c:113
 msgid "Show Statusbar"
 msgstr "Näytä tilarivi"
 
-#: ../app/menus.c:104
+#: ../app/menus.c:114
 msgid "Show Layers"
 msgstr "Näytä tasot"
 
-#: ../app/menus.c:112
-msgid "_Export ..."
-msgstr "_Vie..."
+#: ../app/menus.c:120
+#, fuzzy
+#| msgid "Save Diagram"
+msgid "Save the diagram"
+msgstr "Tallenna kaavio"
 
-#: ../app/menus.c:113
-msgid "Page Set_up..."
-msgstr "S_ivun asetukset..."
+#: ../app/menus.c:121
+msgid "Save _As…"
+msgstr ""
 
-#: ../app/menus.c:117 ../app/sheets_dialog.c:236
+#: ../app/menus.c:121
+msgid "Save the diagram with a new name"
+msgstr ""
+
+#: ../app/menus.c:122
+#, fuzzy
+#| msgid "Export"
+msgid "_Export…"
+msgstr "Vie"
+
+#: ../app/menus.c:122
+#, fuzzy
+#| msgid "Export Diagram"
+msgid "Export the diagram"
+msgstr "Vie kaavio"
+
+#: ../app/menus.c:123
+#, fuzzy
+#| msgid "Diagram Properties"
+msgid "_Diagram Properties"
+msgstr "Kaavion ominaisuudet"
+
+#: ../app/menus.c:124
+#, fuzzy
+#| msgid "Page Setup"
+msgid "Page Set_up…"
+msgstr "Sivun asetukset"
+
+#: ../app/menus.c:125
+#, fuzzy
+#| msgid "Printer"
+msgid "_Print…"
+msgstr "Tulostin"
+
+#: ../app/menus.c:125
+#, fuzzy
+#| msgid "Scroll around the diagram"
+msgid "Print the diagram"
+msgstr "Vieritä kaaviota"
+
+#: ../app/menus.c:128
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../app/menus.c:124
+#: ../app/menus.c:129
+msgid "Undo"
+msgstr ""
+
+#: ../app/menus.c:130
+msgid "Redo"
+msgstr ""
+
+#: ../app/menus.c:132
+#, fuzzy
+#| msgid "Convection"
+msgid "Copy selection"
+msgstr "Kulkeutuminen"
+
+#: ../app/menus.c:133
+#, fuzzy
+#| msgid "P Detection"
+msgid "Cut selection"
+msgstr "P-havaitseminen"
+
+#: ../app/menus.c:134
+#, fuzzy
+#| msgid "Water detection"
+msgid "Paste selection"
+msgstr "Veden havaitseminen"
+
+#: ../app/menus.c:135
 msgid "_Duplicate"
 msgstr "_Monista"
 
+#: ../app/menus.c:138
+#, fuzzy
+#| msgid "Find"
+msgid "_Find…"
+msgstr "Etsi"
+
+#: ../app/menus.c:139
+#, fuzzy
+#| msgid "_Replace"
+msgid "_Replace…"
+msgstr "Ko_rvaa"
+
 #. the following used to bind to <control><shift>C which collides with Unicode input.
-#. * <control>>alt> doesn't work either
-#: ../app/menus.c:132
+#. * <control><alt> doesn't work either
+#: ../app/menus.c:143
 msgid "Copy Text"
 msgstr "Kopioi teksti"
 
-#: ../app/menus.c:133
+#: ../app/menus.c:144
 msgid "Cut Text"
 msgstr "Leikkaa teksti"
 
-#: ../app/menus.c:134
+#: ../app/menus.c:145
 msgid "Paste _Text"
 msgstr "Liitä _teksti"
 
-#: ../app/menus.c:136
-msgid "_Diagram"
-msgstr "_Kaavio"
+#: ../app/menus.c:147
+#, fuzzy
+#| msgid "Paste _Text"
+msgid "Paste _Image"
+msgstr "Liitä _teksti"
+
+#: ../app/menus.c:149
+#, fuzzy
+#| msgid "Layers"
+msgid "_Layers"
+msgstr "Tasot"
 
-#: ../app/menus.c:138
-msgid "_Layers..."
-msgstr "_Tasot..."
+#: ../app/menus.c:150
+msgid "Add Layer…"
+msgstr ""
 
-#: ../app/menus.c:140
+#: ../app/menus.c:151
+#, fuzzy
+#| msgid "Raise Layer"
+msgid "Rename Layer…"
+msgstr "Kohota taso"
+
+#: ../app/menus.c:152
+msgid "Move Selection to Layer above"
+msgstr ""
+
+#: ../app/menus.c:153
+msgid "Move Selection to Layer below"
+msgstr ""
+
+#: ../app/menus.c:154
+#, fuzzy
+#| msgid "Layers"
+msgid "_Layers…"
+msgstr "Tasot"
+
+#: ../app/menus.c:155
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../app/menus.c:143
+#: ../app/menus.c:156
+#, fuzzy
+#| msgid "Zoom pointer"
+msgid "Zoom in"
+msgstr "Suurenna kohdistinta"
+
+#: ../app/menus.c:157
+#, fuzzy
+#| msgid "Zoom pointer"
+msgid "Zoom out"
+msgstr "Suurenna kohdistinta"
+
+#: ../app/menus.c:158
 msgid "_Zoom"
 msgstr "_Kuvasuhde"
 
-#: ../app/menus.c:144
+#: ../app/menus.c:159
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:145 ../app/menus.c:567
+#: ../app/menus.c:160 ../app/menus.c:597 ../app/menus.c:609
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:146 ../app/menus.c:568
+#: ../app/menus.c:161 ../app/menus.c:598 ../app/menus.c:610
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:147
+#: ../app/menus.c:162
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:148
+#: ../app/menus.c:163
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:149
+#: ../app/menus.c:164
 msgid "141"
 msgstr "141"
 
-#: ../app/menus.c:151
+#: ../app/menus.c:166
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:167
 msgid "70.7"
 msgstr "70.7"
 
-#: ../app/menus.c:153
+#: ../app/menus.c:168
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:154
+#: ../app/menus.c:169
 msgid "35.4"
 msgstr "35.4"
 
-#: ../app/menus.c:155
+#: ../app/menus.c:170
 msgid "25"
 msgstr "25"
 
+#. Show All, Best Fit.  Same as the Gimp, Ctrl+E
+#: ../app/menus.c:172
+#, fuzzy
+#| msgid "Zoom pointer"
+msgid "Zoom fit"
+msgstr "Suurenna kohdistinta"
+
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:161
+#: ../app/menus.c:176
 msgid "New _View"
 msgstr "Uusi _näkymä"
 
-#: ../app/menus.c:162
+#: ../app/menus.c:177
 msgid "C_lone View"
 msgstr "K_loonaa näkymä"
 
-#: ../app/menus.c:165
+#: ../app/menus.c:180
 msgid "_Objects"
 msgstr "_Objektit"
 
-#: ../app/menus.c:166
+#: ../app/menus.c:181
 msgid "Send to _Back"
 msgstr "Siirrä _taustalle"
 
-#: ../app/menus.c:167
+#: ../app/menus.c:182
 msgid "Bring to _Front"
 msgstr "Tuo _päällimmäiseksi"
 
-#: ../app/menus.c:168
+#: ../app/menus.c:183
 msgid "Send Backwards"
 msgstr "Siirrä taaemmas"
 
-#: ../app/menus.c:169
+#: ../app/menus.c:184
 msgid "Bring Forwards"
 msgstr "Tuo edemmäs"
 
-#: ../app/menus.c:171
-msgid "Move to layer above"
-msgstr ""
-
-#: ../app/menus.c:172
-msgid "Move to layer below"
-msgstr ""
-
-#: ../app/menus.c:174
+#: ../app/menus.c:186
 msgid "_Group"
 msgstr "_Kasaa ryhmään"
 
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:176
+#: ../app/menus.c:188
 msgid "_Ungroup"
 msgstr "_Pura ryhmä"
 
-#: ../app/menus.c:178
+#: ../app/menus.c:190
 msgid "_Parent"
 msgstr "_Kasaa perheeksi"
 
-#: ../app/menus.c:179
+#: ../app/menus.c:191
 msgid "_Unparent"
 msgstr "_Pura perhe"
 
-#: ../app/menus.c:180
+#: ../app/menus.c:192
 msgid "_Unparent Children"
 msgstr "_Pura lapsi perheestä"
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:182 ../objects/FS/function.c:808
+#: ../app/menus.c:194 ../objects/FS/function.c:799
 msgid "Align"
 msgstr "Tasaa"
 
-#: ../app/menus.c:187 ../objects/standard/textobj.c:137
+#: ../app/menus.c:199 ../objects/standard/textobj.c:110
 msgid "Top"
 msgstr "Päällä"
 
-#: ../app/menus.c:188
+#: ../app/menus.c:200
 msgid "Middle"
 msgstr "Keskellä"
 
-#: ../app/menus.c:189 ../objects/standard/textobj.c:136
+#: ../app/menus.c:201 ../objects/standard/textobj.c:109
 msgid "Bottom"
 msgstr "Alla"
 
-#: ../app/menus.c:191
+#: ../app/menus.c:203
 msgid "Spread Out Horizontally"
 msgstr "Levitä vaakasuoraan"
 
-#: ../app/menus.c:192
+#: ../app/menus.c:204
 msgid "Spread Out Vertically"
 msgstr "Levitä pystysuoraan"
 
-#: ../app/menus.c:193
+#: ../app/menus.c:205
 msgid "Adjacent"
 msgstr "Vierekkäin"
 
-#: ../app/menus.c:194
+#: ../app/menus.c:206
 msgid "Stacked"
 msgstr "Pinossa"
 
-#: ../app/menus.c:198
+#: ../app/menus.c:207 ../app/menus.c:217
+msgid "Connected"
+msgstr "Yhdistetty"
+
+#: ../app/menus.c:211
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../app/menus.c:199
+#: ../app/menus.c:212
 msgid "All"
 msgstr "Kaikki"
 
-#: ../app/menus.c:200 ../lib/arrows.c:1882 ../objects/Jackson/domain.c:96
-#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
+#: ../app/menus.c:213 ../objects/Jackson/domain.c:94
+#: ../objects/UML/association.c:220 ../objects/UML/association.c:226
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../app/menus.c:201
+#: ../app/menus.c:214
 msgid "Invert"
 msgstr "Invertoi"
 
-#: ../app/menus.c:203
+#: ../app/menus.c:216
 msgid "Transitive"
 msgstr "Transitiivinen"
 
-#: ../app/menus.c:204
-msgid "Connected"
-msgstr "Yhdistetty"
-
-#: ../app/menus.c:205
+#: ../app/menus.c:218
 msgid "Same Type"
 msgstr "Sama tyyppi"
 
 #. display_select_radio_entries go here
-#: ../app/menus.c:209
+#: ../app/menus.c:222
 msgid "Select By"
 msgstr "Valitse kriteerillä"
 
-#: ../app/menus.c:211
-msgid "_Input Methods"
-msgstr "_Syötetavat"
+#. For placment of the toplevel Layout menu and it's accelerator
+#: ../app/menus.c:225
+msgid "L_ayout"
+msgstr ""
 
-#: ../app/menus.c:213
+#: ../app/menus.c:227
 msgid "D_ialogs"
 msgstr "D_ialogit"
 
-#: ../app/menus.c:215
+#: ../app/menus.c:229
 msgid "D_ebug"
 msgstr "Vian_etsintä"
 
-#: ../app/menus.c:221
+#: ../app/menus.c:235
 msgid "_Tools"
 msgstr "_Työkalut"
 
-#: ../app/menus.c:222
+#: ../app/menus.c:236
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../app/menus.c:224
-msgid "Edit text"
+#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
+#: ../app/menus.c:237 ../app/toolbox.c:86 ../objects/FS/function.c:979
+msgid "Magnify"
+msgstr "Suurenna"
+
+#: ../app/menus.c:238
+#, fuzzy
+#| msgid "Edit text"
+msgid "Edit Text"
 msgstr "Muokkaa tekstiä"
 
-#: ../app/menus.c:225
+#: ../app/menus.c:239
 msgid "Scroll"
 msgstr "Vieritä"
 
-#: ../app/menus.c:248
-msgid "Fullscr_een"
-msgstr "_Kokoruutu"
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: ../app/menus.c:240 ../app/toolbox.c:98 ../lib/properties.c:102
+#: ../lib/properties.h:677 ../objects/AADL/aadlbox.c:153
+#: ../objects/custom/custom_object.c:228 ../objects/Jackson/requirement.c:130
+#: ../objects/network/basestation.c:132 ../objects/network/radiocell.c:125
+#: ../objects/UML/activity.c:127 ../objects/UML/actor.c:120
+#: ../objects/UML/classicon.c:145 ../objects/UML/component.c:127
+#: ../objects/UML/component_feature.c:158 ../objects/UML/node.c:127
+#: ../objects/UML/node.c:129 ../objects/UML/note.c:118
+#: ../objects/UML/object.c:164 ../objects/UML/small_package.c:129
+#: ../objects/UML/state.c:154 ../objects/UML/usecase.c:136
+msgid "Text"
+msgstr "Teksti"
+
+#: ../app/menus.c:241 ../app/toolbox.c:104
+msgid "Box"
+msgstr "Laatikko"
+
+#: ../app/menus.c:242 ../app/toolbox.c:110
+msgid "Ellipse"
+msgstr "Ellipsi"
+
+#: ../app/menus.c:243 ../app/toolbox.c:116
+msgid "Polygon"
+msgstr "Monikulmio"
+
+#: ../app/menus.c:244 ../app/toolbox.c:122
+msgid "Beziergon"
+msgstr "Bezier-kulmio"
+
+#: ../app/menus.c:246 ../app/toolbox.c:128 ../objects/standard/line.c:325
+msgid "Line"
+msgstr "Viiva"
+
+#: ../app/menus.c:247 ../app/toolbox.c:134
+msgid "Arc"
+msgstr "Kaari"
+
+#: ../app/menus.c:248 ../app/toolbox.c:140
+msgid "Zigzagline"
+msgstr "Siksakkiviiva"
+
+#: ../app/menus.c:249 ../app/toolbox.c:146
+msgid "Polyline"
+msgstr "Moniviiva"
+
+#: ../app/menus.c:250 ../app/toolbox.c:152
+msgid "Bezierline"
+msgstr "Bezier-viiva"
+
+#: ../app/menus.c:251 ../app/toolbox.c:165
+msgid "Outline"
+msgstr ""
+
+#: ../app/menus.c:253 ../app/toolbox.c:158
+msgid "Image"
+msgstr "Kuva"
 
-#: ../app/menus.c:250
-msgid "_AntiAliased"
+#: ../app/menus.c:260
+#, fuzzy
+#| msgid "_AntiAliased"
+msgid "_Antialiased"
 msgstr "_Antialiasoitu"
 
-#: ../app/menus.c:251
+#: ../app/menus.c:261
 msgid "Show _Grid"
 msgstr "Näytä _ruudukko"
 
-#: ../app/menus.c:252
-msgid "_Snap To Grid"
+#: ../app/menus.c:262
+#, fuzzy
+#| msgid "_Snap To Grid"
+msgid "_Snap to Grid"
 msgstr "_Kiinnitä ruudukkoon"
 
-#: ../app/menus.c:253
-msgid "Snap To _Objects"
+#: ../app/menus.c:263
+#, fuzzy
+#| msgid "Snap To _Objects"
+msgid "Snap to _Objects"
 msgstr "_Kiinnitä kohteisiin"
 
-#: ../app/menus.c:254
+#: ../app/menus.c:264
 msgid "Show _Rulers"
 msgstr "Näytä _sarkaimet"
 
-#: ../app/menus.c:255
+#: ../app/menus.c:265
 msgid "Show _Connection Points"
 msgstr "Näytä _liitoskohdat"
 
-#: ../app/menus.c:262
+#: ../app/menus.c:272
 msgid "Union"
 msgstr "Liitos"
 
-#: ../app/menus.c:263
+#: ../app/menus.c:273
 msgid "Intersection"
 msgstr "Leikkaus"
 
 #. Translators: Menu item Verb/Channel/Export/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
-#: ../app/menus.c:264 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
-#: ../objects/FS/function.c:860 ../objects/FS/function.c:862
+#: ../app/menus.c:274 ../objects/FS/function.c:699
+#: ../objects/FS/function.c:851 ../objects/FS/function.c:853
 msgid "Remove"
 msgstr "Poista"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:266
+#: ../app/menus.c:276
 msgid "Inverse"
 msgstr "Käännetty"
 
-#: ../app/menus.c:330
+#: ../app/menus.c:338
 msgid "NULL tooldata in tool_menu_select"
 msgstr "TYHJÄ työkalutieto työkalu_valinta_valikossa"
 
-#: ../app/menus.c:569
+#: ../app/menus.c:599 ../app/menus.c:611
 msgid "300%"
 msgstr "300%"
 
-#: ../app/menus.c:570
+#: ../app/menus.c:600 ../app/menus.c:612
 msgid "200%"
 msgstr "200%"
 
-#: ../app/menus.c:571
+#: ../app/menus.c:601 ../app/menus.c:613
 msgid "150%"
 msgstr "150%"
 
-#: ../app/menus.c:572
+#: ../app/menus.c:602 ../app/menus.c:614
 msgid "100%"
 msgstr "100%"
 
-#: ../app/menus.c:573
+#: ../app/menus.c:603 ../app/menus.c:615
 msgid "75%"
 msgstr "75%"
 
-#: ../app/menus.c:574
+#: ../app/menus.c:604 ../app/menus.c:616
 msgid "50%"
 msgstr "50%"
 
-#: ../app/menus.c:575
+#: ../app/menus.c:605 ../app/menus.c:617
 msgid "25%"
 msgstr "25%"
 
-#: ../app/menus.c:576
+#: ../app/menus.c:606 ../app/menus.c:618
 msgid "10%"
 msgstr "10%"
 
-#: ../app/menus.c:602
+#: ../app/menus.c:644
 msgid "Toggles snap-to-grid."
 msgstr "Vaihtelee kiinnitä ruudukkoon -kytkintä"
 
-#: ../app/menus.c:614
+#: ../app/menus.c:655
 msgid "Toggles object snapping."
 msgstr "Kiinnitetäänkö kohteet tässä ikkunassa."
 
-#: ../app/modify_tool.c:390
-msgid "Couldn't get GTK settings"
+#: ../app/menus.c:1260
+msgid "The function is not available anymore."
+msgstr ""
+
+#: ../app/modify_tool.c:387
+#, fuzzy
+#| msgid "Couldn't get GTK settings"
+msgid "Couldn't get GTK+ settings"
 msgstr "GTK-asetuksia ei saatu"
 
-#: ../app/plugin-manager.c:200
-msgid "Plug-ins"
+#: ../app/plugin-manager.c:208
+#, fuzzy
+#| msgid "Plug-ins"
+msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../app/plugin-manager.c:255
+#: ../app/plugin-manager.c:263
 msgid "Loaded"
 msgstr "Ladattu"
 
-#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-#: ../objects/SISSI/sissi_dialog.c:882
+#: ../app/plugin-manager.c:276
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../app/plugin-manager.c:277
+#: ../app/plugin-manager.c:285
 msgid "Load at Startup"
 msgstr "Lataa käynnistettäessä"
 
-#: ../app/plugin-manager.c:284
-msgid "File Name"
+#: ../app/plugin-manager.c:292
+#, fuzzy
+#| msgid "File Name"
+msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: ../app/preferences.c:100 ../app/preferences.c:145
+#: ../app/preferences.c:100 ../app/preferences.c:143
 msgid "any"
 msgstr "mikä tahansa"
 
-#: ../app/preferences.c:119
+#: ../app/preferences.c:118
 msgid "User Interface"
 msgstr "Käyttöliittymä"
 
-#: ../app/preferences.c:120
+#: ../app/preferences.c:119
 msgid "Diagram Defaults"
 msgstr "Kaavion oletukset"
 
-#: ../app/preferences.c:121
+#: ../app/preferences.c:120
 msgid "View Defaults"
 msgstr "Katso oletusarvoja"
 
-#: ../app/preferences.c:122
+#: ../app/preferences.c:121
 msgid "Favorites"
 msgstr "Suosikit"
 
-#: ../app/preferences.c:166
+#: ../app/preferences.c:164
 msgid "Reset tools after create"
 msgstr "Palauta työkalut alkutilaansa luomisen jälkeen"
 
-#: ../app/preferences.c:169
+#: ../app/preferences.c:167
 msgid "Number of undo levels:"
 msgstr "Perumistasojen lukumäärä:"
 
-#: ../app/preferences.c:172
+#: ../app/preferences.c:170
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1673,201 +1874,190 @@ msgstr ""
 "Käänteinen veto valitsee\n"
 "päällekkäin menevät objektit"
 
-#: ../app/preferences.c:175
+#: ../app/preferences.c:173
 msgid "Recent documents list size:"
 msgstr "Viimeksi avattujen listan koko:"
 
-#: ../app/preferences.c:178
+#: ../app/preferences.c:176
 msgid "Use menu bar"
 msgstr "Käytä valikkopalkkia"
 
-#: ../app/preferences.c:181
+#: ../app/preferences.c:179
 msgid "Keep tool box on top of diagram windows"
 msgstr "Pidä työkalulaatikko kaavioikkunoiden päällä"
 
-#: ../app/preferences.c:184
+#: ../app/preferences.c:182
 msgid "Length unit:"
 msgstr "Pituusyksikkö: "
 
-#: ../app/preferences.c:187
-msgid "Font-size unit:"
-msgstr "Kirjasinkoon yksikkö:"
-
-#: ../app/preferences.c:191
-msgid "Integrated UI"
-msgstr "Integroitu UI"
+#: ../app/preferences.c:185
+#| msgid "Font-size unit:"
+msgid "Font size unit:"
+msgstr "Fonttikoon yksikkö:"
 
-#: ../app/preferences.c:194
+#: ../app/preferences.c:188
 msgid "New diagram:"
 msgstr "Uusi kaavio:"
 
-#: ../app/preferences.c:195
+#: ../app/preferences.c:189
 msgid "Portrait"
 msgstr "Paperi pystysuunnassa"
 
-#: ../app/preferences.c:197
+#: ../app/preferences.c:191
 msgid "Paper type:"
 msgstr "Paperin tyyppi:"
 
-#: ../app/preferences.c:199 ../objects/Database/table_dialog.c:1078
+#: ../app/preferences.c:193
 msgid "Background Color:"
 msgstr "Taustaväri:"
 
-#: ../app/preferences.c:201
+#: ../app/preferences.c:195
 msgid "Compress saved files"
 msgstr "Pakkaa tallennetut tiedostot"
 
-#: ../app/preferences.c:204
+#: ../app/preferences.c:198
+msgid "Connection Points:"
+msgstr "Liitoskohdat:"
+
+#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
+#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
+msgid "Visible"
+msgstr "Näkyvissä"
+
+#: ../app/preferences.c:200
+msgid "Snap to object"
+msgstr "Kiinnitä kohteisiin"
+
+#: ../app/preferences.c:203
 msgid "New window:"
 msgstr "Uusi ikkuna:"
 
-#: ../app/preferences.c:205
+#: ../app/preferences.c:204
 msgid "Width:"
 msgstr "Leveys:"
 
-#: ../app/preferences.c:206
+#: ../app/preferences.c:205
 msgid "Height:"
 msgstr "Korkeus:"
 
-#: ../app/preferences.c:207
+#: ../app/preferences.c:206
 msgid "Magnify:"
 msgstr "Suurennus:"
 
-#: ../app/preferences.c:210
-msgid "Connection Points:"
-msgstr "Liitoskohdat:"
-
-#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:211 ../app/preferences.c:216 ../app/preferences.c:240
-msgid "Visible"
-msgstr "Näkyvissä"
-
-#: ../app/preferences.c:212
-msgid "Snap to object"
-msgstr "Kiinnitä kohteisiin"
-
-#: ../app/preferences.c:215
+#: ../app/preferences.c:209
 msgid "Page breaks:"
 msgstr "Sivun vaihtoja:"
 
-#: ../app/preferences.c:217 ../app/preferences.c:245
+#: ../app/preferences.c:211 ../app/preferences.c:241
 msgid "Color:"
 msgstr "Väri:"
 
-#: ../app/preferences.c:218
+#: ../app/preferences.c:212
 msgid "Solid lines"
 msgstr "Kiinteät viivat"
 
-#: ../app/preferences.c:221
+#: ../app/preferences.c:215
 msgid "Antialias:"
 msgstr "Antialiasointi:"
 
-#: ../app/preferences.c:222
+#: ../app/preferences.c:216
 msgid "view antialised"
 msgstr "näytä antialiasoituna"
 
-#. Favored Filter
-#. Translators: Menu item Verb/Channel/Export
-#. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/preferences.c:226 ../objects/FS/function.c:698
-#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:323
-msgid "Export"
-msgstr "Vie"
-
-#: ../app/preferences.c:228
+#: ../app/preferences.c:222
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: ../app/preferences.c:230 ../plug-ins/svg/render_svg.c:515
-#: ../plug-ins/svg/svg-import.c:884
+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:585
+#: ../plug-ins/svg/svg-import.c:2151
 msgid "Scalable Vector Graphics"
 msgstr "Scalable Vector Graphics"
 
-#: ../app/preferences.c:232
+#: ../app/preferences.c:226
 msgid "PostScript"
 msgstr "PostScript"
 
-#: ../app/preferences.c:234
-msgid "Windows MetaFile"
+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1452
+#, fuzzy
+#| msgid "Windows MetaFile"
+msgid "Windows Metafile"
 msgstr "Windows-metatiedosto"
 
-#: ../app/preferences.c:236
-msgid "Enhanced MetaFile"
+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1461
+#, fuzzy
+#| msgid "Enhanced MetaFile"
+msgid "Enhanced Metafile"
 msgstr "Parannettu metatiedosto"
 
-#: ../app/preferences.c:241
+#: ../app/preferences.c:235
 msgid "Snap to"
 msgstr "Kiinnitä"
 
-#: ../app/preferences.c:242
+#: ../app/preferences.c:236
 msgid "Dynamic grid resizing"
 msgstr "Dynaaminen ruudukon koon muuttaminen"
 
-#: ../app/preferences.c:243
+#: ../app/preferences.c:237
 msgid "X Size:"
 msgstr "X-Koko:"
 
-#: ../app/preferences.c:244
+#: ../app/preferences.c:238
 msgid "Y Size:"
 msgstr "Y-Koko:"
 
-#: ../app/preferences.c:246
+#: ../app/preferences.c:239
+#, fuzzy
+#| msgid "Visible spacing"
+msgid "Visual Spacing X:"
+msgstr "Näkyvä harvennus"
+
+#: ../app/preferences.c:240
+#, fuzzy
+#| msgid "Visible spacing"
+msgid "Visual Spacing Y:"
+msgstr "Näkyvä harvennus"
+
+#: ../app/preferences.c:242
 msgid "Lines per major line"
 msgstr "Viivoja per iso viiva"
 
-#: ../app/preferences.c:248
+#: ../app/preferences.c:244
 msgid "Hex Size:"
 msgstr "Kuutiokoko:"
 
-#. There's really no reason to not pretty format it, and allowing non-pretty
-#. can lead to problems with long lines, CVS etc.
-#. { "pretty_formated_xml", PREF_BOOLEAN,PREF_OFFSET(pretty_formated_xml),
-#. &default_true,0,"pretty formated xml",NULL, TRUE},
-#.
-#: ../app/preferences.c:260
-msgid "Diagram tree window:"
-msgstr "Kaaviopuuikkuna:"
-
-#: ../app/preferences.c:262
-msgid "Save hidden object types"
-msgstr "Tallenna piilotetut objektityypit"
-
-#: ../app/preferences.c:472 ../lib/prop_inttypes.c:158
+#: ../app/preferences.c:470 ../lib/diapatternselector.c:87
+#: ../lib/prop_inttypes.c:159 ../lib/prop_pixbuf.c:270
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../app/preferences.c:472 ../app/preferences.c:483
-#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
+#: ../app/preferences.c:470 ../app/preferences.c:481
+#: ../lib/diapatternselector.c:91 ../lib/diapatternselector.c:182
+#: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
+#: ../lib/prop_pixbuf.c:272 ../lib/prop_pixbuf.c:278
 msgid "No"
 msgstr "Ei"
 
-#: ../app/preferences.c:578
+#: ../app/preferences.c:584
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../app/preferences.c:780
-msgid "User Interface type settings change will take after restart"
-msgstr ""
-"Käyttöliittymän tyyppiasetukset tulevat voimaan uudelleenkäynnistyksen "
-"jälkeen"
-
-#: ../app/properties-dialog.c:56
+#: ../app/properties-dialog.c:60
 msgid "Object properties"
 msgstr "Objektin ominaisuudet"
 
-#: ../app/properties-dialog.c:81
+#: ../app/properties-dialog.c:85
 msgid "This object has no properties."
 msgstr "Tällä objektilla ei ole ominaisuuksia."
 
-#: ../app/properties-dialog.c:245
+#: ../app/properties-dialog.c:248
 msgid "Properties: "
 msgstr "Ominaisuudet: "
 
-#: ../app/properties-dialog.c:249
+#: ../app/properties-dialog.c:252
 msgid "Object properties:"
 msgstr "Objektin ominaisuudet:"
 
-#: ../app/sheets.c:162
+#: ../app/sheets.c:158
 #, c-format
 msgid ""
 "%s\n"
@@ -1876,7 +2066,7 @@ msgstr ""
 "%s\n"
 "Järjestelmäluokka"
 
-#: ../app/sheets.c:164
+#: ../app/sheets.c:160
 #, c-format
 msgid ""
 "%s\n"
@@ -1885,7 +2075,7 @@ msgstr ""
 "%s\n"
 "Käyttäjäluokka"
 
-#: ../app/sheets.c:279
+#: ../app/sheets.c:278
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
@@ -1893,146 +2083,60 @@ msgstr ""
 "Symbolia \"custom_type\" ei löydy mistään moduulista.\n"
 "Kuvioiden muokkaus ei ole käytössä."
 
-#: ../app/sheets.c:399
+#: ../app/sheets.c:413
 #, c-format
 msgid "Widget not found: %s"
 msgstr "Säädintä ei löydy: %s"
 
-#: ../app/sheets.c:474
+#: ../app/sheets.c:443
 msgid "SVG Shape"
 msgstr "SVG-muoto"
 
-#: ../app/sheets.c:476
+#: ../app/sheets.c:445
 msgid "Programmed DiaObject"
 msgstr "Ohjelmoitu Dia-objekti"
 
-#: ../app/sheets_dialog.c:84
-msgid "Sheets and Objects"
-msgstr "Luokat ja objektit"
+#: ../app/sheets_dialog.c:253
+msgid "Select SVG Shape File"
+msgstr "Valitse SVG-muototiedosto"
+
+#: ../app/sheets_dialog_callbacks.c:164
+msgid "Copy ->"
+msgstr "Kopioi ->"
 
-#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:180
+#: ../app/sheets_dialog_callbacks.c:166
+msgid "Copy All ->"
+msgstr "Kopioi kaikki ->"
+
+#: ../app/sheets_dialog_callbacks.c:168
+msgid "Move ->"
+msgstr "Siirrä ->"
+
+#: ../app/sheets_dialog_callbacks.c:170
+msgid "Move All ->"
+msgstr "Siirrä kaikki ->"
+
+#: ../app/sheets_dialog_callbacks.c:177
 msgid "<- Copy"
 msgstr "<- Kopioi"
 
-#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:182
+#: ../app/sheets_dialog_callbacks.c:179
 msgid "<- Copy All"
 msgstr "<- Kopioi kaikki"
 
-#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:184
+#: ../app/sheets_dialog_callbacks.c:181
 msgid "<- Move"
 msgstr "<- Siirrä"
 
-#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:186
+#: ../app/sheets_dialog_callbacks.c:183
 msgid "<- Move All"
 msgstr "<- Siirrä kaikki"
 
-#: ../app/sheets_dialog.c:234
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: ../app/sheets_dialog.c:267
-msgid "Revert"
-msgstr "Palauta"
-
-#: ../app/sheets_dialog.c:355
-msgid "New"
-msgstr "Uusi"
-
-#: ../app/sheets_dialog.c:363 ../app/sheets_dialog.c:795
-#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:146
-#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
-#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
-#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
-#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
-msgid "Type"
-msgstr "Tyyppi"
-
-#: ../app/sheets_dialog.c:378
-msgid "Browse..."
-msgstr "Selaa..."
-
-#: ../app/sheets_dialog.c:387
-msgid "SVG Shape:"
-msgstr "SVG-muoto:"
-
-#: ../app/sheets_dialog.c:414 ../app/sheets_dialog.c:477
-msgid "description:"
-msgstr "kuvaus:"
-
-#: ../app/sheets_dialog.c:426
-msgid "Sheet name:"
-msgstr "Luokan nimi:"
-
-#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:292
-#: ../app/sheets_dialog_callbacks.c:1109
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1071
 msgid "Line Break"
 msgstr "Rivinvaihto"
 
-#: ../app/sheets_dialog.c:569
-msgid "Edit Attributes"
-msgstr "Muokkaa ominaisuuksia"
-
-#: ../app/sheets_dialog.c:584
-msgid "DiaObject"
-msgstr "Dia-objekti"
-
-#: ../app/sheets_dialog.c:600 ../app/sheets_dialog.c:693
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:695
-#: ../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
-#: ../objects/UML/class_dialog.c:1155 ../objects/UML/class_dialog.c:2021
-#: ../objects/UML/class_dialog.c:2257 ../objects/UML/class_dialog.c:2860
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#: ../app/sheets_dialog.c:657
-msgid "Sheet"
-msgstr "Luokka"
-
-#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:683
-#: ../objects/Database/table_dialog.c:1046 ../objects/ER/attribute.c:155
-#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
-#: ../objects/UML/class_dialog.c:1144 ../objects/UML/class_dialog.c:2010
-#: ../objects/UML/class_dialog.c:2246 ../objects/UML/class_dialog.c:2849
-#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
-#: ../objects/UML/realizes.c:134
-msgid "Name:"
-msgstr "Nimi:"
-
-#: ../app/sheets_dialog.c:810
-msgid "DiaObject:"
-msgstr "Dia-objekti:"
-
-#: ../app/sheets_dialog.c:837
-msgid "Sheet:"
-msgstr "Luokka:"
-
-#: ../app/sheets_dialog.c:921
-msgid "Select SVG Shape File"
-msgstr "Valitse SVG-muototiedosto"
-
-#: ../app/sheets_dialog_callbacks.c:167
-msgid "Copy ->"
-msgstr "Kopioi ->"
-
-#: ../app/sheets_dialog_callbacks.c:169
-msgid "Copy All ->"
-msgstr "Kopioi kaikki ->"
-
-#: ../app/sheets_dialog_callbacks.c:171
-msgid "Move ->"
-msgstr "Siirrä ->"
-
-#: ../app/sheets_dialog_callbacks.c:173
-msgid "Move All ->"
-msgstr "Siirrä kaikki ->"
-
-#: ../app/sheets_dialog_callbacks.c:306
+#: ../app/sheets_dialog_callbacks.c:303
 #, c-format
 msgid ""
 "%s\n"
@@ -2041,7 +2145,7 @@ msgstr ""
 "%s\n"
 "Muoto"
 
-#: ../app/sheets_dialog_callbacks.c:309
+#: ../app/sheets_dialog_callbacks.c:306
 #, c-format
 msgid ""
 "%s\n"
@@ -2050,7 +2154,7 @@ msgstr ""
 "%s\n"
 "Objekti"
 
-#: ../app/sheets_dialog_callbacks.c:312
+#: ../app/sheets_dialog_callbacks.c:309
 #, c-format
 msgid ""
 "%s\n"
@@ -2059,247 +2163,712 @@ msgstr ""
 "%s\n"
 "Sijoittamaton tyyppi"
 
-#: ../app/sheets_dialog_callbacks.c:803
+#: ../app/sheets_dialog_callbacks.c:770
+#, fuzzy
+#| msgid "Select SVG Shape File"
+msgid "Please select a .shape file"
+msgstr "Valitse SVG-muototiedosto"
+
+#: ../app/sheets_dialog_callbacks.c:777
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "Tiedostonimen päätteen täytyy olla \"%s\": \"%s\""
 
-#: ../app/sheets_dialog_callbacks.c:811
+#: ../app/sheets_dialog_callbacks.c:785
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "Virhe tutkittaessa %s: %s"
 
-#: ../app/sheets_dialog_callbacks.c:842
+#: ../app/sheets_dialog_callbacks.c:816
 msgid "Please export the diagram as a shape."
 msgstr "Vie kaavio muotona."
 
-#: ../app/sheets_dialog_callbacks.c:845
+#: ../app/sheets_dialog_callbacks.c:819
 #, c-format
 msgid "Could not interpret shape file: '%s'"
 msgstr "Muototiedostoa ei voitu tulkita: \"%s\""
 
-#: ../app/sheets_dialog_callbacks.c:916
+#: ../app/sheets_dialog_callbacks.c:887
 msgid "Sheet must have a Name"
 msgstr "Luokalla täytyy olla nimi"
 
-#: ../app/sheets_dialog_callbacks.c:1621 ../app/sheets_dialog_callbacks.c:1628
+#: ../app/sheets_dialog_callbacks.c:1579 ../app/sheets_dialog_callbacks.c:1586
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "Tiedostoa \"%s\" ei voi avata: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1680
+#: ../app/sheets_dialog_callbacks.c:1640
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "Tiedostoa \"%s\" ei voitu avata kirjoittamista varten"
 
-#: ../app/sheets_dialog_callbacks.c:1690
+#: ../app/sheets_dialog_callbacks.c:1650
 msgid "a user"
 msgstr "käyttäjä"
 
-#: ../app/sheets_dialog_callbacks.c:1703
+#: ../app/sheets_dialog_callbacks.c:1663
 #, c-format
 msgid "File: %s"
 msgstr "Tiedosto: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1706
+#: ../app/sheets_dialog_callbacks.c:1666
 #, c-format
 msgid "Date: %s"
 msgstr "Päiväys: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1710
+#: ../app/sheets_dialog_callbacks.c:1670
 #, c-format
 msgid "For: %s"
 msgstr "Varten: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1727
+#: ../app/sheets_dialog_callbacks.c:1687
 msgid "add shapes here"
 msgstr "lisää luokkia tänne"
 
-#: ../app/splash.c:57
-msgid "Loading ..."
+#: ../app/splash.c:50
+#, fuzzy
+#| msgid "Loading ..."
+msgid "Loading …"
 msgstr "Ladataan..."
 
-#: ../app/splash.c:75
+#: ../app/splash.c:68
 #, c-format
 msgid "Dia v %s"
 msgstr "Dia, v %s"
 
-# Vai kaaviomuokkain?
+#: ../app/toolbox.c:74
+msgid ""
+"Modify object(s)\n"
+"Use <Space> to toggle between this and other tools"
+msgstr ""
+"Muokkaa objektia/objekteja\n"
+"Käytä <Välilyöntiä> vaihtamaan tämän ja muiden työkalujen välillä"
+
+#: ../app/toolbox.c:80
+msgid ""
+"Text edit(s)\n"
+"Use <Esc> to leave this tool"
+msgstr ""
+"Tekstin muokkain\n"
+"Poistu työkalusta Esc:illä"
+
+#: ../app/toolbox.c:92
+msgid "Scroll around the diagram"
+msgstr "Vieritä kaaviota"
+
+#: ../app/toolbox.c:352
+#, c-format
+msgid "No sheet named %s"
+msgstr "Ei luokkaa nimeltä %s"
+
+#: ../app/toolbox.c:390
+msgid "Other sheets"
+msgstr "Muut luokat"
+
+#: ../app/toolbox.c:450 ../sheets/Flowchart.sheet.in.h:1
+msgid "Flowchart"
+msgstr "Vuokaavio"
+
+#: ../app/toolbox.c:494
+#, fuzzy
+#| msgid ""
+#| "Foreground & background colors for new objects.  The small black and "
+#| "white squares reset colors.  The small arrows swap colors.  Double click "
+#| "to change colors."
+msgid ""
+"Foreground & background colors for new objects.  The small black and white "
+"squares reset colors.  The small arrows swap colors.  Double-click to change "
+"colors."
+msgstr ""
+"Edusta- ja taustavärit uusille objekteille. Pienet mustavalkoiset neliöt "
+"palauttavat värit alkutilaan. Pienet nuolet vaihtavat värejä. "
+"Kaksoisnapsauta vaihtaaksesi värejä."
+
+#: ../app/toolbox.c:508
+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."
+msgstr ""
+"Viivan paksuudet.  Napsauta viivaa asettaaksesi viivan oletuspaksuuden "
+"uusille objekteille.  Kaksoisnapsauta jos haluat asettaa tarkemmin."
+
+#: ../app/toolbox.c:551
+#, fuzzy
+#| msgid ""
+#| "Arrow style at the beginning of new lines.  Click to pick an arrow, or "
+#| "set arrow parameters with Details..."
+msgid ""
+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
+"arrow parameters with Details…"
+msgstr ""
+"Nuolen tyyli uusien viivojen alussa. Napsauta valitaksesi nuolen tai muokkaa "
+"nuoliparametreja Tiedot-painikkeesta"
+
+#: ../app/toolbox.c:556
+#, fuzzy
+#| msgid ""
+#| "Line style for new lines.  Click to pick a line style, or set line style "
+#| "parameters with Details..."
+msgid ""
+"Line style for new lines.  Click to pick a line style, or set line style "
+"parameters with Details…"
+msgstr ""
+"Viivan tyyli uusille viivoille. Napsauta asettaaksesi viivan tyyli tai "
+"muokkaa viivan tyyliparametrit Tiedot-painikkeesta"
+
+#: ../app/toolbox.c:572
+#, fuzzy
+#| msgid ""
+#| "Arrow style at the end of new lines.  Click to pick an arrow, or set "
+#| "arrow parameters with Details..."
+msgid ""
+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
+"parameters with Details…"
+msgstr ""
+"Nuolen tyyli uusien viivojen alussa. Napsauta valitaksesi nuolen tai muokkaa "
+"nuoliparametreja Tiedot-painikkeesta"
+
 #: ../dia.desktop.in.in.h:1
+#, fuzzy
+#| msgid "Day"
+msgid "Dia"
+msgstr "Päivä"
+
+# Vai kaaviomuokkain?
+#: ../dia.desktop.in.in.h:3
 msgid "Dia Diagram Editor"
 msgstr "Dia-kaaviomuokkain"
 
-#: ../dia.desktop.in.in.h:2
+#: ../dia.desktop.in.in.h:4
 msgid "Edit your Diagrams"
 msgstr "Muokkaa kaavioitasi"
 
-#: ../lib/arrows.c:1883
+#. Installer message if no GTK+ was found
+#: ../installer/win32/gennsh.c:39
+msgid ""
+"GTK+ is not installed. Please use the full installer. It is available from "
+"http://dia-installer.de.";
+msgstr ""
+
+#. Installer message: Don't install over pre 0.95 versions
+#: ../installer/win32/gennsh.c:42
+msgid ""
+"Please remove old Dia installations completely or install Dia to a different "
+"location."
+msgstr ""
+
+#. Installer message:  License Page
+#: ../installer/win32/gennsh.c:45
+msgid "Next >"
+msgstr "Seuraava >"
+
+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
+#: ../installer/win32/gennsh.c:48
+msgid ""
+"$(^Name) is released under the GPL license. The license is provided here for "
+"information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:51
+msgid "Dia Diagram Editor (required)"
+msgstr "Dia-kaaviomuokkain (vaadittu)"
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:54
+msgid "Translations"
+msgstr "Käännökset"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:57
+msgid "Optional translations of the Dia user interface"
+msgstr "Dian käyttöliittymän käännökset"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:60
+msgid "Core Dia files and dlls"
+msgstr "Dian ydintiedostot ja kirjastot"
+
+#. Installer message: Component name
+#: ../installer/win32/gennsh.c:63
+msgid "Python plug-in"
+msgstr "Python-liitännäinen"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:66
+msgid ""
+"Support for the Python Scripting Language 2.3. Do not select this if Python "
+"is not installed."
+msgstr ""
+
+#. Installer message: hyperlink text on finish page
+#: ../installer/win32/gennsh.c:69
+msgid "Visit the Dia for Windows Web Page"
+msgstr ""
+
+#. Installer message: Dia uninstaller entry in Control Panel
+#: ../installer/win32/gennsh.c:72
+msgid "Dia (remove only)"
+msgstr ""
+
+#. Installer message: directory delete confirmation line 1
+#: ../installer/win32/gennsh.c:75
+msgid ""
+"Your old Dia directory is about to be deleted. Would you like to continue?"
+msgstr ""
+
+#. Installer message: directory delete confirmation line 2
+#: ../installer/win32/gennsh.c:77
+msgid ""
+"Note: Any non-standard plugins that you may have installed will be deleted."
+msgstr ""
+
+#. Installer message: directory delete confirmation line 3
+#: ../installer/win32/gennsh.c:79
+msgid "Dia user settings will not be affected."
+msgstr ""
+
+#. Installer message: DIA_PROMPT_DIR_EXISTS line 1
+#: ../installer/win32/gennsh.c:82
+msgid "The installation directory you specified already exists. Any contents"
+msgstr ""
+
+#. Installer message: DIA_PROMP_DIR_EXISTS line 2
+#: ../installer/win32/gennsh.c:84
+#, fuzzy
+#| msgid "Nothing selected for saving.  Would you like to try again?"
+msgid "will be deleted. Would you like to continue?"
+msgstr "Mitään ei ole valittu tallennettavaksi. Haluatko yrittää uudestaan?"
+
+#. Installer message: registry entries not found line 1
+#: ../installer/win32/gennsh.c:87
+msgid "The uninstaller could not find registry entries for Dia."
+msgstr ""
+
+#. Installer message: registry entries not found line 2
+#: ../installer/win32/gennsh.c:89
+msgid "It is likely that another user installed this application."
+msgstr ""
+
+#. Installer message: Uninstall error message
+#: ../installer/win32/gennsh.c:92
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#. Installer message: Uninstallation warning. Keep $INSTDIR
+#: ../installer/win32/gennsh.c:95
+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
+msgstr ""
+
+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
+#: ../installer/win32/gennsh.c:98
+msgid ""
+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
+msgstr ""
+
+#: ../lib/arrows.c:1889
+#, fuzzy
+#| msgid "None"
+msgctxt "Arrow"
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../lib/arrows.c:1890
+#, fuzzy
+#| msgid "Lines"
+msgctxt "Arrow"
 msgid "Lines"
 msgstr "Perinteinen"
 
-#: ../lib/arrows.c:1884
+#: ../lib/arrows.c:1891
+#, fuzzy
+#| msgid "Hollow Triangle"
+msgctxt "Arrow"
 msgid "Hollow Triangle"
 msgstr "Ontto kolmio"
 
-#: ../lib/arrows.c:1885
+#: ../lib/arrows.c:1892
+#, fuzzy
+#| msgid "Filled Triangle"
+msgctxt "Arrow"
 msgid "Filled Triangle"
 msgstr "Täytetty kolmio"
 
-#: ../lib/arrows.c:1886
+#: ../lib/arrows.c:1893
+#, fuzzy
+#| msgid "Unfilled Triangle"
+msgctxt "Arrow"
 msgid "Unfilled Triangle"
 msgstr "Täyttämätön kolmio"
 
-#: ../lib/arrows.c:1887
+#: ../lib/arrows.c:1894
+#, fuzzy
+#| msgid "Hollow Diamond"
+msgctxt "Arrow"
 msgid "Hollow Diamond"
 msgstr "Ontto timantti"
 
-#: ../lib/arrows.c:1888
+#: ../lib/arrows.c:1895
+#, fuzzy
+#| msgid "Filled Diamond"
+msgctxt "Arrow"
 msgid "Filled Diamond"
 msgstr "Täytetty timantti"
 
-#: ../lib/arrows.c:1889
+#: ../lib/arrows.c:1896
+#, fuzzy
+#| msgid "Half Diamond"
+msgctxt "Arrow"
 msgid "Half Diamond"
 msgstr "Puolikas timantti"
 
-#: ../lib/arrows.c:1890
+#: ../lib/arrows.c:1897
+#, fuzzy
+#| msgid "Half Head"
+msgctxt "Arrow"
 msgid "Half Head"
 msgstr "Puolikas"
 
-#: ../lib/arrows.c:1891
+#: ../lib/arrows.c:1898
+#, fuzzy
+#| msgid "Slashed Cross"
+msgctxt "Arrow"
 msgid "Slashed Cross"
 msgstr "Risti"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:1899
+#, fuzzy
+#| msgid "Filled Ellipse"
+msgctxt "Arrow"
 msgid "Filled Ellipse"
 msgstr "Täytetty ellipsi"
 
-#: ../lib/arrows.c:1893
+#: ../lib/arrows.c:1900
+#, fuzzy
+#| msgid "Hollow Ellipse"
+msgctxt "Arrow"
 msgid "Hollow Ellipse"
 msgstr "Ontto ellipsi"
 
-#: ../lib/arrows.c:1894
+#: ../lib/arrows.c:1901
+#, fuzzy
+#| msgid "Filled Dot"
+msgctxt "Arrow"
 msgid "Filled Dot"
 msgstr "Täytetty piste"
 
-#: ../lib/arrows.c:1895
+#: ../lib/arrows.c:1902
+#, fuzzy
+#| msgid "Dimension Origin"
+msgctxt "Arrow"
 msgid "Dimension Origin"
 msgstr "Mitta-alkuperä"
 
-#: ../lib/arrows.c:1896
+#: ../lib/arrows.c:1903
+#, fuzzy
+#| msgid "Blanked Dot"
+msgctxt "Arrow"
 msgid "Blanked Dot"
 msgstr "Tyhjä piste"
 
-#: ../lib/arrows.c:1897
+#: ../lib/arrows.c:1904
+#, fuzzy
+#| msgid "Double Hollow Triangle"
+msgctxt "Arrow"
 msgid "Double Hollow Triangle"
 msgstr "Kaksinkertainen ontto kolmio"
 
-#: ../lib/arrows.c:1898
+#: ../lib/arrows.c:1905
+#, fuzzy
+#| msgid "Double Filled Triangle"
+msgctxt "Arrow"
 msgid "Double Filled Triangle"
 msgstr "Kaksinkertainen täytetty kolmio"
 
-#: ../lib/arrows.c:1899
+#: ../lib/arrows.c:1906
+#, fuzzy
+#| msgid "Filled Dot and Triangle"
+msgctxt "Arrow"
 msgid "Filled Dot and Triangle"
 msgstr "Täytetty piste ja kolmio"
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:1907
+#, fuzzy
+#| msgid "Filled Box"
+msgctxt "Arrow"
 msgid "Filled Box"
 msgstr "Täytetty laatikko"
 
-#: ../lib/arrows.c:1901
+#: ../lib/arrows.c:1908
+#, fuzzy
+#| msgid "Blanked Box"
+msgctxt "Arrow"
 msgid "Blanked Box"
 msgstr "Tyhjä laatikko"
 
-#: ../lib/arrows.c:1902
+#: ../lib/arrows.c:1909
+#, fuzzy
+#| msgid "Slashed"
+msgctxt "Arrow"
 msgid "Slashed"
 msgstr "Silputtu"
 
-#: ../lib/arrows.c:1903
+#: ../lib/arrows.c:1910
+#, fuzzy
+#| msgid "Integral Symbol"
+msgctxt "Arrow"
 msgid "Integral Symbol"
 msgstr "Integraalisymboli"
 
-#: ../lib/arrows.c:1904
+#: ../lib/arrows.c:1911
+#, fuzzy
+#| msgid "Crow Foot"
+msgctxt "Arrow"
 msgid "Crow Foot"
 msgstr "Harakan varpaat"
 
-#: ../lib/arrows.c:1905
+#: ../lib/arrows.c:1912
+#, fuzzy
+#| msgid "Cross"
+msgctxt "Arrow"
 msgid "Cross"
 msgstr "Risti"
 
-#: ../lib/arrows.c:1906
+#: ../lib/arrows.c:1913
+#, fuzzy
+#| msgid "1-or-many"
+msgctxt "Arrow"
 msgid "1-or-many"
 msgstr "1-tai-monta"
 
-#: ../lib/arrows.c:1907
+#: ../lib/arrows.c:1914
+#, fuzzy
+#| msgid "0-or-many"
+msgctxt "Arrow"
 msgid "0-or-many"
 msgstr "0-tai-monta"
 
-#: ../lib/arrows.c:1908
+#: ../lib/arrows.c:1915
+#, fuzzy
+#| msgid "1-or-0"
+msgctxt "Arrow"
 msgid "1-or-0"
 msgstr "1-tai-0"
 
-#: ../lib/arrows.c:1909
+#: ../lib/arrows.c:1916
+#, fuzzy
+#| msgid "1 exactly"
+msgctxt "Arrow"
 msgid "1 exactly"
 msgstr "täsmälleen 1"
 
-#: ../lib/arrows.c:1910
+#: ../lib/arrows.c:1917
+#, fuzzy
+#| msgid "Filled Concave"
+msgctxt "Arrow"
 msgid "Filled Concave"
 msgstr "Täytetty kovera"
 
-#: ../lib/arrows.c:1911
+#: ../lib/arrows.c:1918
+#, fuzzy
+#| msgid "Blanked Concave"
+msgctxt "Arrow"
 msgid "Blanked Concave"
 msgstr "Tyhjä kovera"
 
-#: ../lib/arrows.c:1912
+#: ../lib/arrows.c:1919
+#, fuzzy
+#| msgid "Round"
+msgctxt "Arrow"
 msgid "Round"
 msgstr "Ympyrä"
 
-#: ../lib/arrows.c:1913
+#: ../lib/arrows.c:1920
+#, fuzzy
+#| msgid "Open Round"
+msgctxt "Arrow"
 msgid "Open Round"
 msgstr "Avoin ympyrä"
 
-#: ../lib/arrows.c:1914
+#: ../lib/arrows.c:1921
+#, fuzzy
+#| msgid "Backslash"
+msgctxt "Arrow"
 msgid "Backslash"
 msgstr "Kenoviiva"
 
-#: ../lib/arrows.c:1915
+#: ../lib/arrows.c:1922
+#, fuzzy
+#| msgid "Infinite Line"
+msgctxt "Arrow"
 msgid "Infinite Line"
 msgstr "Ääretön viiva"
 
-#: ../lib/arrows.c:2043
+#: ../lib/arrows.c:2050
 msgid "Arrow head of unknown type"
 msgstr "Tuntematon nuolenpäätyyppi"
 
-#: ../lib/arrows.c:2051
-#, c-format
-msgid "Arrow head of type %s has too small dimensions, removing.\n"
+#: ../lib/arrows.c:2058
+#, fuzzy, c-format
+#| msgid "Arrow head of type %s has too small dimensions, removing.\n"
+msgid "Arrow head of type %s has too small dimensions; removing.\n"
 msgstr "Tyypin %s nuolenpäällä liian pienet mitat, poistetaan.\n"
 
-#: ../lib/arrows.c:2184
+#: ../lib/arrows.c:2191
 msgid "unknown arrow"
 msgstr "tuntematon nuoli"
 
-#: ../lib/bezier_conn.c:636
-msgid "Internal error: Setting corner type of endpoint of bezier"
-msgstr "Sisäinen virhe: Asetetaan bezierin päätepisteen kulmatyyppi"
-
 #: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
-#: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
-#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
-#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:144
+#: ../lib/create.c:160 ../lib/create.c:196 ../lib/create.c:228
+#: ../lib/create.c:252 ../lib/create.c:284 ../lib/create.c:305
+#: ../lib/create.c:335 ../lib/create.c:378 ../plug-ins/svg/svg-import.c:694
+#: ../plug-ins/vdx/vdx-import.c:144
 msgid "Can't find standard object"
 msgstr "Standardiobjekteja ei löydy"
 
-#: ../lib/dia_dirs.c:242
+#: ../lib/diaarrowchooser.c:367
+msgid "Arrow Properties"
+msgstr "Nuolen ominaisuudet"
+
+#: ../lib/diaarrowselector.c:123
+msgid "More arrows"
+msgstr "Lisää nuolia"
+
+#: ../lib/diaarrowselector.c:140
+msgid "Size: "
+msgstr "Koko: "
+
+#: ../lib/diacolorselector.c:204
+msgid "Select color"
+msgstr "Valitse väri"
+
+#: ../lib/diacolorselector.c:292
+#, fuzzy
+#| msgid "More colors..."
+msgid "More colors…"
+msgstr "Lisää värejä..."
+
+#: ../lib/dia_dirs.c:315
+#, fuzzy, c-format
+#| msgid "Too many ..'s in filename %s\n"
+msgid "Too many \"..\"s in filename %s\n"
+msgstr "Liian monta ..-merkkijonoa tiedostonimessä %s\n"
+
+#: ../lib/diadynamicmenu.c:396
+msgid "Reset menu"
+msgstr "Nollausvalikko"
+
+#: ../lib/diafontselector.c:158
+msgid "Other fonts"
+msgstr "Muut fontit"
+
+#: ../lib/diafontselector.c:233
 #, c-format
-msgid "%s<illegal characters>..."
-msgstr "%s<kiellettyjä merkkejä>..."
+msgid "Couldn't find font family for %s\n"
+msgstr "Fonttiperhettä %s ei löydy\n"
 
-#: ../lib/dia_dirs.c:273
+#. pathologic case - pixbuf not even supporting PNG?
+#: ../lib/dia_image.c:333
 #, c-format
-msgid "Too many ..'s in filename %s\n"
-msgstr "Liian monta ..-merkkijonoa tiedostonimessä %s\n"
+msgid ""
+"Unsupported file format for saving:\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+#: ../lib/dia_image.c:336
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not save file:\n"
+#| "%s\n"
+#| "%s"
+msgid ""
+"Could not save file:\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"Ei voitu tallentaa tiedostoa:\n"
+"%s\n"
+"%s"
+
+#: ../lib/dialinechooser.c:309
+msgid "Line Style Properties"
+msgstr "Viivan tyyliominaisuudet"
+
+#: ../lib/dialinechooser.c:344
+#, fuzzy
+#| msgid "Details..."
+msgid "Details…"
+msgstr "Tiedot..."
+
+#: ../lib/dialinestyleselector.c:107
+#, fuzzy
+#| msgid "Solid"
+msgid "line|Solid"
+msgstr "Yhtenäinen"
+
+#: ../lib/dialinestyleselector.c:108
+#, fuzzy
+#| msgid "Dashed"
+msgid "line|Dashed"
+msgstr "Katkoviiva"
+
+#: ../lib/dialinestyleselector.c:109
+#, fuzzy
+#| msgid "Dash-Dot"
+msgid "line|Dash-Dot"
+msgstr "Viiva-piste"
+
+#: ../lib/dialinestyleselector.c:110
+#, fuzzy
+#| msgid "Dash-Dot-Dot"
+msgid "line|Dash-Dot-Dot"
+msgstr "Viiva-piste-piste"
+
+#: ../lib/dialinestyleselector.c:111
+#, fuzzy
+#| msgid "Dotted"
+msgid "line|Dotted"
+msgstr "Pistemäinen"
+
+#. fs->sizebox = GTK_HBOX(box);
+#: ../lib/dialinestyleselector.c:143
+msgid "Dash length: "
+msgstr "Viivan pituus: "
+
+#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
+msgid "OK"
+msgstr "OK"
+
+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
+msgid "Cancel"
+msgstr "Peru"
+
+#: ../lib/diapatternselector.c:108
+#, fuzzy
+#| msgid "Flip Horizontal"
+msgid "Horizontal"
+msgstr "Pyöräytä vaakatasossa"
+
+#: ../lib/diapatternselector.c:109
+#, fuzzy
+#| msgid "Diagram:"
+msgid "Diagonal"
+msgstr "Kaavio:"
 
-#: ../lib/dia_xml.c:192
+#: ../lib/diapatternselector.c:110
+#, fuzzy
+#| msgid "Flip Vertical"
+msgid "Vertical"
+msgstr "Pyöräytä pystytasossa"
+
+#: ../lib/diapatternselector.c:111
+#, fuzzy
+#| msgid "Radiation"
+msgid "Radial"
+msgstr "Säteily"
+
+#: ../lib/dia_xml.c:214
 #, c-format
 msgid ""
 "The file %s has no encoding specification;\n"
@@ -2308,115 +2877,142 @@ msgstr ""
 "Tiedostossa %s ei ole merkistömäärettä;\n"
 "oletetaan merkistöksi %s"
 
-#: ../lib/dia_xml.c:597
+#: ../lib/dia_xml.c:511
+#, fuzzy, c-format
+#| msgid "Unknown dxf code %d\n"
+msgid "Unknown type of DataNode '%s'"
+msgstr "Tuntematon dxf-koodi %d\n"
+
+#: ../lib/dia_xml.c:530
+#, fuzzy
+#| msgid "Taking point value of non-point node."
+msgid "Taking int value of non-int node."
+msgstr "Otetaan pistearvo ei-pistemäiseltä solmulta."
+
+#: ../lib/dia_xml.c:706
 msgid "Taking point value of non-point node."
 msgstr "Otetaan pistearvo ei-pistemäiseltä solmulta."
 
-#: ../lib/dia_xml.c:608
+#: ../lib/dia_xml.c:717
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "Virheellinen x-pistearvo \"%s\" %f; ohitetaan se."
 
-#: ../lib/dia_xml.c:615
+#: ../lib/dia_xml.c:724
 msgid "Error parsing point."
 msgstr "Virhe jäsennettäessä pistettä."
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:623
+#: ../lib/dia_xml.c:732
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "Virheellinen y-pistearvo \"%s\" %f; ohitetaan se."
 
-#: ../lib/dia_xml.c:640
+#: ../lib/dia_xml.c:752
 #, fuzzy
 msgid "Taking bezpoint value of non-point node."
 msgstr "Otetaan pistearvo ei-pistemäiseltä solmulta."
 
-#: ../lib/dia_xml.c:658
+#: ../lib/dia_xml.c:770
 #, fuzzy
 msgid "Error parsing bezpoint p1."
 msgstr "Virhe jäsennettäessä pistettä."
 
-#: ../lib/dia_xml.c:672
+#: ../lib/dia_xml.c:784
 #, fuzzy
 msgid "Error parsing bezpoint p2."
 msgstr "Virhe jäsennettäessä pistettä."
 
-#: ../lib/dia_xml.c:686
+#: ../lib/dia_xml.c:798
 #, fuzzy
 msgid "Error parsing bezpoint p3."
 msgstr "Virhe jäsennettäessä pistettä."
 
-#: ../lib/dia_xml.c:1205
-msgid ""
-"Your local character set is UTF-8. Because of issues with libxml1 and the "
-"support of files generated by previous versions of dia, you will encounter  "
-"problems. Please report to dia-list gnome org if you see this message."
-msgstr ""
-"Paikalliseksi merkistöksesi on asetettu UTF-8. Tulet kohtaamaan ongelmia "
-"libxml1:n seikkojen kanssa ja Dian aiempien versioiden luomien tiedostojen "
-"tuen vuoksi. Ilmoita dia-list gnome org:n jos näet tämän viestin. "
+#: ../lib/dia_xml.c:825
+#, fuzzy
+#| msgid "Taking point value of non-point node."
+msgid "Taking rectangle value of non-rectangle node."
+msgstr "Otetaan pistearvo ei-pistemäiseltä solmulta."
 
-#: ../lib/diaarrowchooser.c:352
-msgid "Arrow Properties"
-msgstr "Nuolen ominaisuudet"
+#: ../lib/dia_xml.c:837 ../lib/dia_xml.c:848 ../lib/dia_xml.c:859
+#, fuzzy
+#| msgid "Error parsing point."
+msgid "Error parsing rectangle."
+msgstr "Virhe jäsennettäessä pistettä."
 
-#: ../lib/dialinechooser.c:297
-msgid "Line Style Properties"
-msgstr "Viivan tyyliominaisuudet"
+#: ../lib/dia_xml.c:887
+#, fuzzy
+#| msgid "Taking point value of non-point node."
+msgid "Taking string value of non-string node."
+msgstr "Otetaan pistearvo ei-pistemäiseltä solmulta."
 
-#: ../lib/dialinechooser.c:339
-msgid "Details..."
-msgstr "Tiedot..."
+#: ../lib/dia_xml.c:913
+#, fuzzy
+#| msgid "Error parsing point."
+msgid "Error in string tag."
+msgstr "Virhe jäsennettäessä pistettä."
 
-#: ../lib/dialogs.c:51
-msgid "Ok"
-msgstr "OK"
+#: ../lib/dia_xml.c:931
+msgid "Error in file, string not starting with #"
+msgstr ""
 
-#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
-msgid "Cancel"
-msgstr "Peru"
+#: ../lib/dia_xml.c:993
+#, fuzzy
+#| msgid "Taking point value of non-point node."
+msgid "Taking font value of non-font node."
+msgstr "Otetaan pistearvo ei-pistemäiseltä solmulta."
 
-#: ../lib/filter.c:176
+#: ../lib/filter.c:177
 #, c-format
 msgid "Multiple export filters with unique name %s"
 msgstr "Useita vientisuodattimia uniikilla nimellä %s"
 
-#: ../lib/font.c:84
+#: ../lib/filter.c:195
+#, fuzzy, c-format
+#| msgid "Multiple export filters with unique name %s"
+msgid "Multiple import filters with unique name %s"
+msgstr "Useita vientisuodattimia uniikilla nimellä %s"
+
+#: ../lib/font.c:89
 #, c-format
 msgid "Can't load font %s.\n"
-msgstr "Kirjasinta %s ei voi ladata.\n"
+msgstr "Fonttia %s ei voi ladata.\n"
+
+#: ../lib/group.c:624
+#, fuzzy
+#| msgid "Information"
+msgid "Transformation"
+msgstr "Tiedot"
 
-#: ../lib/message.c:92 ../lib/message.c:278
+#: ../lib/message.c:93 ../lib/message.c:284
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../lib/message.c:119
+#: ../lib/message.c:120
 msgid "There is one similar message."
 msgstr "Yksi samankaltainen viesti."
 
-#: ../lib/message.c:124
+#: ../lib/message.c:125
 msgid "Show repeated messages"
 msgstr "Näytä toistuvat viestit"
 
-#: ../lib/message.c:145
+#: ../lib/message.c:146
 msgid "Don't show this message again"
 msgstr "Älä näytä tätä viestiä uudestaan"
 
-#: ../lib/message.c:203
-#, c-format
-msgid "There are %d similar messages."
-msgstr "%d samankaltaista viestiä."
+#: ../lib/message.c:206
+#, fuzzy, c-format
+#| msgid "There is one similar message."
+msgid "There is %d similar message."
+msgid_plural "There are %d similar messages."
+msgstr[0] "Yksi samankaltainen viesti."
+msgstr[1] "Yksi samankaltainen viesti."
 
-#: ../lib/message.c:262
+#: ../lib/message.c:268
 msgid "Notice"
 msgstr "Huomaa"
 
-#: ../lib/newgroup.c:124
-msgid "Open group"
-msgstr "Avoin ryhmä"
-
-#: ../lib/object_defaults.c:128
+#: ../lib/object_defaults.c:134
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2425,36 +3021,59 @@ msgstr ""
 "Virhe ladattaessa oletuksia \"%s\".\n"
 "Ei ole Dia-kaaviotiedosto."
 
-#: ../lib/plug-ins.c:111
+#. base property stuff...
+#: ../lib/orth_conn.h:97
+#, fuzzy
+#| msgid "IAD router"
+msgid "Autoroute"
+msgstr "IAD-reititin"
+
+#: ../lib/orth_conn.h:108
+msgid "Autorouting"
+msgstr ""
+
+#: ../lib/persistence.c:321
+#, fuzzy
+#| msgid "Preferences"
+msgid "Persistence"
+msgstr "Asetukset"
+
+#: ../lib/plug-ins.c:113
 msgid "???"
 msgstr "???"
 
-#: ../lib/plug-ins.c:186
+#: ../lib/plug-ins.c:188
 #, c-format
 msgid "Missing dependencies for '%s'?"
 msgstr "Puuttuvatko \"%s\"-riippuvuudet?"
 
-#: ../lib/plug-ins.c:197
+#: ../lib/plug-ins.c:199
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr "Symboli \"dia_plugin_init\" puuttuu"
 
-#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
+#: ../lib/plug-ins.c:207 ../lib/plug-ins.c:215
 msgid "dia_plugin_init() call failed"
 msgstr "dia_plugin_init()-kutsu epäonnistui"
 
-#: ../lib/plug-ins.c:232
+#: ../lib/plug-ins.c:234
 #, c-format
 msgid "%s Plugin could not be unloaded"
 msgstr "Liitännäistä %s ei voitu ladata pois muistista"
 
-#: ../lib/plug-ins.c:303
-#, c-format
-msgid ""
-"Could not open `%s'\n"
-"`%s'"
+#: ../lib/plug-ins.c:442
+msgid "Plugin Configuration"
+msgstr ""
+
+#: ../lib/propdialogs.c:324 ../objects/UML/association.c:234
+#: ../objects/UML/object.c:144
+#, fuzzy
+#| msgid "AC Generator"
+msgid "General"
+msgstr "Vaihtovirtageneraattori"
+
+#: ../lib/propdialogs.c:325
+msgid "Meta"
 msgstr ""
-"Tiedoston \"%s\" avaus ei onnistunut\n"
-"\"%s\""
 
 #: ../lib/prop_dict.c:43
 msgid "Author"
@@ -2472,110 +3091,203 @@ msgstr "Luontipäivä"
 msgid "Modification date"
 msgstr "Muokkauspäivä"
 
-#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
+#: ../lib/prop_dict.c:47
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/prop_inttypes.c:558
-msgid "Property cast from int to enum out of range"
-msgstr ""
+#: ../lib/prop_dict.c:243 ../sheets/ciscomisc.sheet.in.h:43
+msgid "Key"
+msgstr "Avain"
 
-#: ../lib/prop_text.c:468
-#, c-format
-msgid "Group with %d objects"
-msgstr "Ryhmä, jossa %d objektia"
+#: ../lib/prop_dict.c:250 ../objects/UML/umlattribute.c:41
+#: ../objects/UML/umlparameter.c:47
+msgid "Value"
+msgstr "Arvo"
 
-#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:724
+#: ../lib/properties.c:68 ../lib/properties.h:591 ../lib/widgets.c:269
 msgid "Left"
 msgstr "Vasen"
 
-#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:730
-#: ../objects/standard/textobj.c:138
+#: ../lib/properties.c:69 ../lib/properties.h:592 ../lib/widgets.c:270
+#: ../objects/standard/textobj.c:111
 msgid "Center"
 msgstr "Keski"
 
-#: ../lib/properties.c:67 ../lib/properties.h:479 ../lib/widgets.c:736
+#: ../lib/properties.c:70 ../lib/properties.h:593 ../lib/widgets.c:271
 msgid "Right"
 msgstr "Oikea"
 
-#: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
-#: ../objects/chronogram/chronoline.c:181
-#: ../objects/chronogram/chronoref.c:160
+#: ../lib/properties.c:75 ../lib/properties.h:597
+#, fuzzy
+#| msgid "Revert"
+msgid "Never"
+msgstr "Palauta"
+
+#: ../lib/properties.c:76 ../lib/properties.h:598
+msgid "When Needed"
+msgstr ""
+
+#: ../lib/properties.c:77 ../lib/properties.h:599
+msgid "Always"
+msgstr ""
+
+#: ../lib/properties.c:81 ../lib/properties.h:603
+msgctxt "LineJoin"
+msgid "Miter"
+msgstr ""
+
+#: ../lib/properties.c:82 ../lib/properties.h:604
+#, fuzzy
+#| msgid "Round"
+msgctxt "LineJoin"
+msgid "Round"
+msgstr "Ympyrä"
+
+#: ../lib/properties.c:83 ../lib/properties.h:605
+msgctxt "LineJoin"
+msgid "Bevel"
+msgstr ""
+
+#: ../lib/properties.c:87 ../lib/properties.h:609
+msgctxt "LineCap"
+msgid "Butt"
+msgstr ""
+
+#: ../lib/properties.c:88 ../lib/properties.h:610
+#, fuzzy
+#| msgid "Round"
+msgctxt "LineCap"
+msgid "Round"
+msgstr "Ympyrä"
+
+#: ../lib/properties.c:89 ../lib/properties.h:611
+#, fuzzy
+#| msgid "No Protection"
+msgctxt "LineCap"
+msgid "Projecting"
+msgstr "Ei turvaa"
+
+#: ../lib/properties.c:96 ../lib/properties.h:632 ../lib/properties.h:635
+#: ../objects/chronogram/chronoline.c:178
+#: ../objects/chronogram/chronoref.c:157
 msgid "Line color"
 msgstr "Janan väri"
 
-#: ../lib/properties.c:75 ../lib/properties.h:503 ../lib/properties.h:506
+#: ../lib/properties.c:97 ../lib/properties.h:638 ../lib/properties.h:641
 msgid "Line style"
 msgstr "Viivan tyyli"
 
-#: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
+#: ../lib/properties.c:98 ../lib/properties.h:657 ../lib/properties.h:660
 msgid "Fill color"
 msgstr "Täyttöväri"
 
-#: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
+#. just to simplify transfering properties between objects
+#: ../lib/properties.c:99 ../lib/properties.h:663 ../lib/properties.h:666
+#: ../lib/standard-path.c:147
 msgid "Draw background"
 msgstr "Piirrä tausta"
 
-#: ../lib/properties.c:78 ../lib/properties.h:523
+#: ../lib/properties.c:100 ../lib/properties.h:670
 msgid "Start arrow"
 msgstr "Lähtönuoli"
 
-#: ../lib/properties.c:79 ../lib/properties.h:526
+#: ../lib/properties.c:101 ../lib/properties.h:673
 msgid "End arrow"
 msgstr "Päättönuoli"
 
-#: ../lib/properties.c:81 ../lib/properties.h:536
+#: ../lib/properties.c:103 ../lib/properties.h:683
 msgid "Text alignment"
 msgstr "Tekstin tasaus"
 
-#. 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/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
-#: ../objects/chronogram/chronoref.c:166
+#: ../lib/properties.c:104 ../lib/properties.h:688
+#: ../objects/chronogram/chronoline.c:182
+#: ../objects/chronogram/chronoref.c:163 ../objects/Database/reference.c:118
+#: ../objects/GRAFCET/condition.c:131 ../objects/GRAFCET/step.c:165
+#: ../objects/GRAFCET/transition.c:141 ../objects/UML/class_dialog.c:455
 msgid "Font"
-msgstr "Kirjasin"
+msgstr "Fontti"
 
-#: ../lib/properties.c:83 ../lib/properties.h:549
-#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
-#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
-#: ../objects/chronogram/chronoref.c:168
+#: ../lib/properties.c:105 ../lib/properties.h:696
+#: ../objects/chronogram/chronoline.c:184
+#: ../objects/chronogram/chronoref.c:165 ../objects/GRAFCET/condition.c:133
+#: ../objects/GRAFCET/step.c:167 ../objects/GRAFCET/transition.c:143
 msgid "Font size"
-msgstr "Kirjasinkoko"
+msgstr "Fonttikoko"
 
-#: ../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:106 ../lib/properties.h:702
+#: ../objects/chronogram/chronoline.c:186
+#: ../objects/chronogram/chronoref.c:167 ../objects/GRAFCET/step.c:169
 msgid "Text color"
 msgstr "Tekstin väri"
 
-#: ../lib/proplist.c:163
-#, c-format
-msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
+#: ../lib/properties.h:644 ../lib/properties.h:647
+#, fuzzy
+#| msgid "Line width"
+msgid "Line join"
+msgstr "Viivan paksuus"
+
+#: ../lib/properties.h:650 ../lib/properties.h:653
+#, fuzzy
+#| msgid "Line gaps"
+msgid "Line caps"
+msgstr "Rivivälit"
+
+#: ../lib/properties.h:711
+#, fuzzy
+#| msgid "Text padding"
+msgid "Text fitting"
+msgstr "Tekstin täyttö"
+
+#: ../lib/prop_inttypes.c:567
+msgid "Property cast from int to enum out of range"
+msgstr ""
+
+#: ../lib/proplist.c:161
+#, fuzzy, c-format
+#| msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
+msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr "Ei attribuuttia \"%s\" (%p) tai data(%p) tässä attribuutissa"
 
-#: ../lib/sheet.c:69
+#: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
 #, c-format
 msgid ""
-"DiaObject '%s' needed in sheet '%s' was not found.\n"
-"It will not be available for use."
+"Failed to load image form diagram:\n"
+"%s"
 msgstr ""
 
-#: ../lib/sheet.c:84
+#: ../lib/prop_pixbuf.c:198
 #, c-format
 msgid ""
-"DiaObject '%s' needed in sheet '%s' was not found.\n"
-"It will not be availible for use."
+"Saving inline pixbuf failed:\n"
+"%s"
 msgstr ""
 
-#: ../lib/sheet.c:133 ../lib/sheet.c:144 ../lib/sheet.c:150
+#: ../lib/prop_pixbuf.c:296
+msgid "Cant create image data from scratch!"
+msgstr ""
+
+#. Todo: get label for the branch view from props, e.g. UML Operations Parameters
+#: ../lib/prop_sdarray_widget.c:577 ../objects/chronogram/chronoline.c:161
+#: ../objects/UML/umloperation.c:79
+msgid "Parameters"
+msgstr "Parametrit"
+
+#: ../lib/prop_text.c:484
 #, fuzzy, c-format
-msgid "sheets from '%s'"
-msgstr "Ei luokkaa nimeltä %s"
+#| msgid "Group with %d objects"
+msgid "Group with %d object"
+msgid_plural "Group with %d objects"
+msgstr[0] "Ryhmä, jossa %d objektia"
+msgstr[1] "Ryhmä, jossa %d objektia"
+
+#: ../lib/sheet.c:71 ../lib/sheet.c:86
+#, c-format
+msgid ""
+"DiaObject '%s' needed in sheet '%s' was not found.\n"
+"It will not be available for use."
+msgstr ""
 
-#: ../lib/sheet.c:314
+#: ../lib/sheet.c:319
 #, c-format
 msgid ""
 "The system sheet '%s' appears to be more recent than your custom\n"
@@ -2585,270 +3297,323 @@ msgid ""
 "or remove '%s', using the 'Sheets and Objects' dialog."
 msgstr ""
 
-#: ../lib/sheet.c:371
+#: ../lib/sheet.c:378
 #, c-format
 msgid "%s: you should use object tags rather than shape tags now"
 msgstr ""
 
-#: ../lib/widgets.c:441
-msgid "Other fonts"
-msgstr "Muut kirjasimet"
-
-#: ../lib/widgets.c:513
-#, c-format
-msgid "Couldn't find font family for %s\n"
-msgstr "Kirjasinperhettä %s ei löydy\n"
-
-#. Translators: Menu item Noun/Material/Solid
-#: ../lib/widgets.c:896 ../objects/FS/function.c:1076
-msgid "Solid"
-msgstr "Yhtenäinen"
-
-#: ../lib/widgets.c:902
-msgid "Dashed"
-msgstr "Katkoviiva"
-
-#: ../lib/widgets.c:908
-msgid "Dash-Dot"
-msgstr "Viiva-piste"
-
-#: ../lib/widgets.c:914
-msgid "Dash-Dot-Dot"
-msgstr "Viiva-piste-piste"
-
-#: ../lib/widgets.c:920
-msgid "Dotted"
-msgstr "Pistemäinen"
-
-#. fs->sizebox = GTK_HBOX(box);
-#: ../lib/widgets.c:938
-msgid "Dash length: "
-msgstr "Viivan pituus: "
-
-#: ../lib/widgets.c:1066
-msgid "Select color"
-msgstr "Valitse väri"
-
-#: ../lib/widgets.c:1132
-msgid "More colors..."
-msgstr "Lisää värejä..."
-
-#: ../lib/widgets.c:1280
-msgid "More arrows"
-msgstr "Lisää nuolia"
-
-#: ../lib/widgets.c:1297
-msgid "Size: "
-msgstr "Koko: "
-
-#: ../lib/widgets.c:1475
-msgid "Select image file"
-msgstr "Valitse kuvatiedosto"
-
-#: ../lib/widgets.c:1523
-msgid "Browse"
-msgstr "Selaa"
-
-#: ../lib/widgets.c:2076
-msgid "Reset menu"
-msgstr "Nollausvalikko"
-
-#. Installer message if no GTK+ was found
-#: ../installer/win32/gennsh.c:38
-msgid ""
-"GTK+ is not installed. Please use the full installer. It is available from "
-"http://dia-installer.de.";
-msgstr ""
-
-#. Installer message: Don't install over pre 0.95 versions
-#: ../installer/win32/gennsh.c:41
-msgid ""
-"Please remove old Dia installations completely or install Dia to a different "
-"location."
-msgstr ""
-
-#. Installer message:  License Page
-#: ../installer/win32/gennsh.c:44
-msgid "Next >"
-msgstr "Seuraava >"
-
-#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-#: ../installer/win32/gennsh.c:47
-msgid ""
-"$(^Name) is released under the GPL license. The license is provided here for "
-"information purposes only. $_CLICK"
+#: ../lib/standard-path.c:131
+msgid "Stroke"
 msgstr ""
 
-#. Installer message: Components page
-#: ../installer/win32/gennsh.c:50
-msgid "Dia Diagram Editor (required)"
-msgstr "Dia-kaaviomuokkain (vaadittu)"
-
-#. Installer message: Components page
-#: ../installer/win32/gennsh.c:53
-msgid "Translations"
-msgstr "Käännökset"
-
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:56
-msgid "Optional translations of the Dia user interface"
-msgstr "Dian käyttöliittymän käännökset"
-
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:59
-msgid "Core Dia files and dlls"
-msgstr "Dian ydintiedostot ja kirjastot"
-
-#. Installer message: Component name
-#: ../installer/win32/gennsh.c:62
-msgid "Python plug-in"
-msgstr "Python-liitännäinen"
+#. Translators: Menu item Verb/Provision/Supply/Fill
+#: ../lib/standard-path.c:132 ../objects/FS/function.c:927
+msgid "Fill"
+msgstr "Täytä"
 
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:65
-msgid ""
-"Support for the Python Scripting Language 2.3. Do not select this if Python "
-"is not installed."
+#: ../lib/standard-path.c:133
+msgid "Fill & Stroke"
 msgstr ""
 
-#. Installer message: hyperlink text on finish page
-#: ../installer/win32/gennsh.c:68
-msgid "Visit the Dia for Windows Web Page"
-msgstr ""
+#: ../lib/standard-path.c:138
+#, fuzzy
+#| msgid "Beziergon"
+msgid "Bezier points"
+msgstr "Bezier-kulmio"
 
-#. Installer message: Dia uninstaller entry in Control Panel
-#: ../installer/win32/gennsh.c:71
-msgid "Dia (remove only)"
+#: ../lib/standard-path.c:139
+msgid "Drawing"
 msgstr ""
 
-#. Installer message: confirmation question. Keep $\r
-#: ../installer/win32/gennsh.c:74
-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 ""
+#: ../lib/standard-path.c:148
+#, fuzzy
+#| msgid "Controls"
+msgid "Draw Control Lines"
+msgstr "Hallitsee"
 
-#. Installer message: confirmatin question. Keep $\r
-#: ../installer/win32/gennsh.c:77
-msgid ""
-"The installation directory you specified already exists. Any contents$\rwill "
-"be deleted. Would you like to continue?"
-msgstr ""
+#: ../lib/standard-path.c:149 ../objects/standard/beziergon.c:110
+#: ../objects/standard/box.c:148 ../objects/standard/ellipse.c:135
+#: ../objects/standard/polygon.c:112
+#, fuzzy
+#| msgid "Scatter"
+msgid "Pattern"
+msgstr "Sirottele"
 
-#. 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."
+#: ../lib/standard-path.c:552
+msgid "Convert to Bezier"
 msgstr ""
 
-#. Installer message: Uninstall error message
-#: ../installer/win32/gennsh.c:83
-msgid "You do not have permission to uninstall this application."
-msgstr ""
+#: ../lib/standard-path.c:553
+#, fuzzy
+#| msgid "Invert"
+msgid "Invert Path"
+msgstr "Invertoi"
 
-#. Installer message: Uninstallation warning. Keep $INSTDIR
-#: ../installer/win32/gennsh.c:86
-msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-msgstr ""
+#: ../lib/standard-path.c:554
+#, fuzzy
+#| msgid "Show _Connection Points"
+msgid "Show Control Lines"
+msgstr "Näytä _liitoskohdat"
 
-#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-#: ../installer/win32/gennsh.c:89
-msgid ""
-"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-msgstr ""
+#: ../lib/widgets.c:390
+msgid "Select image file"
+msgstr "Valitse kuvatiedosto"
 
-#: ../objects/AADL/aadl.c:52
-msgid "Architecture Analysis & Design Language diagram objects"
-msgstr "Arkkitehtuurin analyysi ja suunnittelukielen kaavio-oliot"
+#: ../lib/widgets.c:441
+msgid "Browse"
+msgstr "Selaa"
 
-#: ../objects/AADL/aadlbox.c:150
+#: ../objects/AADL/aadlbox.c:147
 msgid "Declaration"
 msgstr "Määrittely"
 
-#: ../objects/AADL/aadlbox.c:361
+#: ../objects/AADL/aadlbox.c:356
 msgid "Add Access Provider"
 msgstr "Lisää pääsyn tarjoaja"
 
-#: ../objects/AADL/aadlbox.c:363
+#: ../objects/AADL/aadlbox.c:358
 msgid "Add Access Requirer"
 msgstr "Lisää pääsyn vaatija"
 
-#: ../objects/AADL/aadlbox.c:365
+#: ../objects/AADL/aadlbox.c:360
 msgid "Add In Data Port"
 msgstr "Lisää saapuva dataportti"
 
-#: ../objects/AADL/aadlbox.c:367
+#: ../objects/AADL/aadlbox.c:362
 msgid "Add In Event Port"
 msgstr "Lisää saapuva tapahtumaportti"
 
-#: ../objects/AADL/aadlbox.c:369
+#: ../objects/AADL/aadlbox.c:364
 msgid "Add In Event Data Port"
 msgstr "Lisää saapuva tapahtumadataportti"
 
-#: ../objects/AADL/aadlbox.c:371
+#: ../objects/AADL/aadlbox.c:366
 msgid "Add Out Data Port"
 msgstr "Lisää lähtevä dataportti"
 
-#: ../objects/AADL/aadlbox.c:373
+#: ../objects/AADL/aadlbox.c:368
 msgid "Add Out Event Port"
 msgstr "Lisää lähtevä tapahtumaportti"
 
-#: ../objects/AADL/aadlbox.c:375
+#: ../objects/AADL/aadlbox.c:370
 msgid "Add Out Event Data Port"
 msgstr "Lisää lähtevä tapahtumadataportti"
 
-#: ../objects/AADL/aadlbox.c:377
+#: ../objects/AADL/aadlbox.c:372
 msgid "Add In Out Data Port"
 msgstr "Lisää lähtevä dataportti"
 
-#: ../objects/AADL/aadlbox.c:379
+#: ../objects/AADL/aadlbox.c:374
 msgid "Add In Out Event Port"
 msgstr "Lisää saapuva/lähtevä tapahtumaportti"
 
-#: ../objects/AADL/aadlbox.c:381
+#: ../objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Data Port"
 msgstr "Lisää saapuva/lähtevä tapahtumalevyportti"
 
-#: ../objects/AADL/aadlbox.c:383
+#: ../objects/AADL/aadlbox.c:378
 msgid "Add Port Group"
 msgstr "Lisää porttiryhmä"
 
-#: ../objects/AADL/aadlbox.c:385
+#: ../objects/AADL/aadlbox.c:380
 msgid "Add Connection Point"
 msgstr "Lisää liitoskohta"
 
-#: ../objects/AADL/aadlbox.c:389
+#: ../objects/AADL/aadlbox.c:384
 msgid "Delete Port"
 msgstr "Poista portti"
 
-#: ../objects/AADL/aadlbox.c:390
+#: ../objects/AADL/aadlbox.c:385
 msgid "Edit Port Declaration"
 msgstr "Muokkaa portin määrittelyä"
 
-#: ../objects/AADL/aadlbox.c:394
+#: ../objects/AADL/aadlbox.c:389
 msgid "Delete Connection Point"
 msgstr "Poista liitoskohta"
 
-#: ../objects/Database/compound.c:197
+#: ../objects/AADL/aadl.c:52
+msgid "Architecture Analysis & Design Language diagram objects"
+msgstr "Arkkitehtuurin analyysi ja suunnittelukielen kaavio-oliot"
+
+#: ../objects/chronogram/chronogram.c:40
+msgid "Chronogram diagram objects"
+msgstr "Kronogrammikaavio-objektit"
+
+#: ../objects/chronogram/chronoline.c:147 ../sheets/AADL.sheet.in.h:5
+msgid "Data"
+msgstr "Tieto"
+
+#: ../objects/chronogram/chronoline.c:149
+msgid "Data name"
+msgstr "Tiedon nimi"
+
+#: ../objects/chronogram/chronoline.c:151
+msgid "Events"
+msgstr "Tapahtumat"
+
+#: ../objects/chronogram/chronoline.c:154
+msgid "Event specification"
+msgstr "Tapahtuman määrittely"
+
+# Tässä 'sanat' olis parempi jos esim. sais kursiivilla?
+#: ../objects/chronogram/chronoline.c:155
+#, fuzzy
+#| msgid ""
+#| "@ time    set the pointer at an absolute time.\n"
+#| "( duration  sets the signal up, then wait 'duration'.\n"
+#| ") duration  sets the signal down, then wait 'duration'.\n"
+#| "u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
+#| "example : @ 1.0 (2.0)1.0(2.0)\n"
+msgid ""
+"@ time    set the pointer to an absolute time.\n"
+"( duration  set the signal up, then wait 'duration'.\n"
+") duration  set the signal down, then wait 'duration'.\n"
+"u duration  set the signal to \"unknown\" state, then wait 'duration'.\n"
+"Example: @ 1.0 (2.0)1.0(2.0)\n"
+msgstr ""
+"@ aika    aseta osoitin absoluuttiseen aikaan.\n"
+"( kesto   asettaa signaalin ylös, sitten odota 'kesto'.\n"
+") kesto   asettaa signaalin alas, sitten odota 'kesto'.\n"
+"u kesto   asettaa signaalin \"tuntematon\"-tilaan, sitten odota 'kesto'.\n"
+"esimerkki: @ 1.0 (2.0)1.0(2.0)\n"
+
+#: ../objects/chronogram/chronoline.c:163
+#: ../objects/chronogram/chronoref.c:145
+msgid "Start time"
+msgstr "Lähtöaika"
+
+#: ../objects/chronogram/chronoline.c:165
+#: ../objects/chronogram/chronoref.c:147
+msgid "End time"
+msgstr "Lopetusaika"
+
+#: ../objects/chronogram/chronoline.c:167
+msgid "Rise time"
+msgstr "Nousuaika"
+
+#: ../objects/chronogram/chronoline.c:169
+msgid "Fall time"
+msgstr "Laskuaika"
+
+#: ../objects/chronogram/chronoline.c:170
+msgid "Multi-bit data"
+msgstr "Monibittinen tieto"
+
+#: ../objects/chronogram/chronoline.c:172
+#: ../objects/chronogram/chronoref.c:155
+msgid "Aspect"
+msgstr "Näkökohta"
+
+#: ../objects/chronogram/chronoline.c:174
+msgid "Data color"
+msgstr "Tiedon väri"
+
+#: ../objects/chronogram/chronoline.c:176
+msgid "Data line width"
+msgstr "Tietojanan leveys"
+
+#: ../objects/chronogram/chronoref.c:143
+msgid "Time data"
+msgstr "Aikatieto"
+
+#: ../objects/chronogram/chronoref.c:149
+msgid "Major time step"
+msgstr "Suuri aika-askel"
+
+#: ../objects/chronogram/chronoref.c:151
+msgid "Minor time step"
+msgstr "Pieni aika-askel"
+
+#: ../objects/chronogram/chronoref.c:161
+msgid "Minor step line width"
+msgstr "Pienen askeleen jananleveys"
+
+#: ../objects/custom/custom.c:140
+msgid "Custom"
+msgstr "Räätälöity"
+
+#: ../objects/custom/custom.c:140
+msgid "Custom XML shapes loader"
+msgstr "Räätälöity XML-kuviolataaja"
+
+#: ../objects/custom/custom_object.c:199 ../objects/custom/custom_object.c:232
+msgid "Flip horizontal"
+msgstr "Pyöräytä vaakatasossa"
+
+#: ../objects/custom/custom_object.c:201 ../objects/custom/custom_object.c:234
+msgid "Flip vertical"
+msgstr "Pyöräytä pystytasossa"
+
+#: ../objects/custom/custom_object.c:204 ../objects/custom/custom_object.c:237
+msgid "Scale of the subshapes"
+msgstr "Alimuotojen mittakaava"
+
+#: ../objects/custom/custom_object.c:218 ../objects/flowchart/box.c:152
+#: ../objects/flowchart/diamond.c:150 ../objects/flowchart/ellipse.c:149
+#: ../objects/flowchart/parallelogram.c:154 ../objects/SADT/box.c:135
+msgid "Text padding"
+msgstr "Tekstin täyttö"
+
+#: ../objects/custom/custom_object.c:1777
+msgid "Flip Horizontal"
+msgstr "Pyöräytä vaakatasossa"
+
+#: ../objects/custom/custom_object.c:1778
+msgid "Flip Vertical"
+msgstr "Pyöräytä pystytasossa"
+
+#: ../objects/custom/custom_object.c:1815
+#, c-format
+msgid "Cannot open icon file %s for object type '%s'."
+msgstr "Kuvaketiedostoa %s ei voi avata objektityyppiä \"%s\" varten."
+
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "CustomLines"
+msgstr "OmatRivit"
+
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "Custom XML lines loader"
+msgstr "Omien XML-rivien lataaja"
+
+#: ../objects/custom_lines/custom_linetypes.c:259
+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
+msgstr "SISÄINEN: CustomLines: Virheellinen rivin tyyppi LineInfo-oliossa."
+
+#: ../objects/custom/shape_info.c:170
+#, c-format
+msgid ""
+"The file '%s' has invalid path data.\n"
+"svg:path data must start with moveto."
+msgstr ""
+"Tiedoston \"%s\" sisältää virheellisiä polkutietoja.\n"
+"svg:path -tiedon täytyy alkaa tagilla moveto."
+
+#: ../objects/Database/compound.c:196
 msgid "Number of arms"
 msgstr ""
 
 #: ../objects/Database/compound.c:219
-msgid "Flip arms verticaly"
+#, fuzzy
+#| msgid "Flip arms verticaly"
+msgid "Flip arms vertically"
 msgstr "Pyöräytä pystytasossa"
 
 #: ../objects/Database/compound.c:221
-msgid "Flip arms horizontaly"
+#, fuzzy
+#| msgid "Flip arms horizontaly"
+msgid "Flip arms horizontally"
 msgstr "Pyöräytä vaakatasossa"
 
 #: ../objects/Database/compound.c:223
-msgid "Center mount point verticaly"
+#, fuzzy
+#| msgid "Center mount point verticaly"
+msgid "Center mount point vertically"
 msgstr "Keskitä liitoskohta pystysuunnassa"
 
 #: ../objects/Database/compound.c:225
-msgid "Center mount point horizontaly"
+#, fuzzy
+#| msgid "Center mount point horizontaly"
+msgid "Center mount point horizontally"
 msgstr "Keskitä liitoskohta vaakasuunnassa"
 
 #: ../objects/Database/compound.c:227
@@ -2863,259 +3628,189 @@ msgstr "Yhdiste"
 msgid "Entity/Relationship table diagram objects"
 msgstr "ER-kaavioiden oliot"
 
-#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
-#: ../objects/Database/table.c:200 ../objects/UML/class.c:148
-#: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
+#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:150
+#: ../objects/standard/box.c:144 ../objects/standard/polyline.c:107
+#: ../objects/standard/zigzagline.c:106
+msgid "Corner radius"
+msgstr "Kulmanpyöristyssäde"
+
+#: ../objects/Database/reference.c:112
+msgid "Start description"
+msgstr "Aloita kuvaus"
+
+#: ../objects/Database/reference.c:114
+msgid "End description"
+msgstr "Lopeta kuvaus"
+
+#: ../objects/Database/reference.c:121 ../objects/Database/table.c:223
+#: ../objects/Database/table.c:225 ../objects/Database/table.c:227
+#: ../objects/UML/association.c:247 ../objects/UML/association.c:258
+#: ../objects/UML/association.c:260 ../objects/UML/association.c:262
+#: ../objects/UML/association.c:264 ../objects/UML/association.c:266
+#: ../objects/UML/class.c:215 ../objects/UML/class.c:217
+#: ../objects/UML/class.c:219 ../objects/UML/class.c:221
+#: ../objects/UML/class.c:223 ../objects/UML/class.c:225
+msgid " "
+msgstr " "
+
+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:404
+#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:309
+#: ../objects/SADT/arrow.c:462 ../objects/standard/zigzagline.c:446
+#: ../objects/UML/association.c:866 ../objects/UML/component_feature.c:189
+#: ../objects/UML/dependency.c:380 ../objects/UML/generalization.c:377
+#: ../objects/UML/realizes.c:367 ../objects/UML/transition.c:172
+msgid "Add segment"
+msgstr "Lisää osa"
+
+#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:405
+#: ../objects/FS/flow-ortho.c:628 ../objects/GRAFCET/vector.c:310
+#: ../objects/SADT/arrow.c:463 ../objects/standard/zigzagline.c:447
+#: ../objects/UML/association.c:867 ../objects/UML/component_feature.c:190
+#: ../objects/UML/dependency.c:381 ../objects/UML/generalization.c:378
+#: ../objects/UML/realizes.c:368 ../objects/UML/transition.c:173
+msgid "Delete segment"
+msgstr "Poista osa"
+
+#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
+msgid "Reference"
+msgstr "Viite"
+
+#: ../objects/Database/table.c:151 ../objects/Database/table.c:192
+#: ../objects/Database/table.c:220 ../objects/UML/class.c:144
+#: ../objects/UML/class.c:211 ../objects/UML/class_dialog.c:486
 #: ../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 "Kommentti"
 
-#: ../objects/Database/table.c:144
+#: ../objects/Database/table.c:153
+#, fuzzy
+#| msgid "Primary key"
+msgid "Primary"
+msgstr "Pääavain"
+
+#: ../objects/Database/table.c:153
 msgid "Primary key"
 msgstr "Pääavain"
 
-#: ../objects/Database/table.c:146
+#: ../objects/Database/table.c:155
 msgid "Nullable"
 msgstr "Voi olla NULL"
 
-#: ../objects/Database/table.c:148
+#: ../objects/Database/table.c:157
 msgid "Unique"
 msgstr "Yksikäsitteinen"
 
-#: ../objects/Database/table.c:185
-msgid "Visible comments"
-msgstr "Näkyvät kommentit"
-
-#: ../objects/Database/table.c:187 ../objects/UML/class.c:171
-msgid "Comment tagging"
-msgstr "Kommentin merkinnät"
-
-#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:976
-msgid "Underline primary keys"
-msgstr "Alleviivaa pääavaimet"
-
-#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:981
-msgid "Use bold font for primary keys"
-msgstr "Käytä korostettua kirjasinta pääavaimille"
-
-#. property rows
-#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:136
-#: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
-msgid "Normal"
-msgstr "Normaali"
-
-# Olikos se nyt Tietoviikko mikä ainakin käyttää tätä, Tablet PC = Lehtiö-PC
-#: ../objects/Database/table.c:198
-msgid "Tablename"
-msgstr "Taulunimi"
-
-#: ../objects/Database/table.c:203 ../objects/Database/table.c:205
-#: ../objects/Database/table.c:207 ../objects/Database/reference.c:120
-#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
-#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
-#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
-#: ../objects/UML/class.c:193 ../objects/UML/class.c:195
-#: ../objects/UML/class.c:197 ../objects/UML/class.c:199
-#: ../objects/UML/class.c:201 ../objects/UML/class.c:203
-msgid " "
-msgstr " "
-
-#: ../objects/Database/table.c:211 ../objects/UML/class.c:209
-#: ../objects/UML/object.c:157
-msgid "Attributes"
-msgstr "Ominaisuudet"
+#: ../objects/Database/table.c:159
+#, fuzzy
+#| msgid "Defaults: "
+msgid "Default"
+msgstr "Oletusarvot: "
 
-#: ../objects/Database/table.c:248
-msgid "Show comments"
-msgstr "Näytä kommentit"
+#: ../objects/Database/table.c:159
+#, fuzzy
+#| msgid "Def. value:"
+msgid "Default value"
+msgstr "Oletusarvo:"
 
 # Olikos se nyt Tietoviikko mikä ainakin käyttää tätä, Tablet PC = Lehtiö-PC
 #. init data
-#: ../objects/Database/table.c:253 ../objects/Database/table.c:356
-#: ../sheets/Database.sheet.in.h:5
+#: ../objects/Database/table.c:188 ../objects/Database/table.c:278
+#: ../objects/Database/table.c:387 ../sheets/Database.sheet.in.h:3
 msgid "Table"
 msgstr "Taulu"
 
-#. Attributes page:
-#: ../objects/Database/table_dialog.c:611 ../objects/UML/class_dialog.c:1077
-msgid "_Attributes"
-msgstr "_Määritteet"
-
-#. the "new" button
-#: ../objects/Database/table_dialog.c:639 ../objects/SISSI/sissi_dialog.c:739
-#: ../objects/SISSI/sissi_dialog.c:871
-msgid "_New"
-msgstr "_Uusi"
-
-#. the "delete" button
-#: ../objects/Database/table_dialog.c:647
-msgid "_Delete"
-msgstr "_Poista"
-
-#. the "Move up" button
-#: ../objects/Database/table_dialog.c:655
-msgid "Move up"
-msgstr "Siirrä ylöspäin"
-
-#. the "Move down" button
-#: ../objects/Database/table_dialog.c:663
-msgid "Move down"
-msgstr "Siirrä alaspäin"
-
-#: ../objects/Database/table_dialog.c:673 ../objects/UML/class_dialog.c:1134
-msgid "Attribute data"
-msgstr "Attribuuttidata"
-
-#: ../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/UML/class_dialog.c:1177 ../objects/UML/class_dialog.c:2107
-#: ../objects/UML/class_dialog.c:2279
-msgid "Comment:"
-msgstr "Kommentti:"
-
-#: ../objects/Database/table_dialog.c:726
-msgid "_Primary key"
-msgstr "_Päääavain"
-
-#: ../objects/Database/table_dialog.c:733
-msgid "N_ullable"
-msgstr "Voi _olla NuLL"
-
-#: ../objects/Database/table_dialog.c:740
-msgid "Uni_que"
-msgstr "_Yksikäsitteinen"
+#: ../objects/Database/table.c:197
+msgid "Visible comments"
+msgstr "Näkyvät kommentit"
 
-# Olikos se nyt Tietoviikko mikä ainakin käyttää tätä, Tablet PC = Lehtiö-PC
-#: ../objects/Database/table_dialog.c:928
-msgid "_Table"
-msgstr "_Taulu"
+#: ../objects/Database/table.c:199
+msgid "Underline primary keys"
+msgstr "Alleviivaa pääavaimet"
 
-#: ../objects/Database/table_dialog.c:936
-msgid "Table name:"
-msgstr "Taulun nimi:"
+#: ../objects/Database/table.c:202 ../objects/UML/class.c:159
+msgid "Comment tagging"
+msgstr "Kommentin merkinnät"
 
-#. XXX create a handler and disable the 'show documentation tag' checkbox
-#. if 'comment visible' is not active.
-#: ../objects/Database/table_dialog.c:966
-msgid "Comment visible"
-msgstr "näkyvät kommentit"
+#: ../objects/Database/table.c:204
+msgid "Use bold font for primary keys"
+msgstr "Käytä korostettua fonttia pääavaimille"
 
-#: ../objects/Database/table_dialog.c:971 ../objects/UML/class_dialog.c:522
-msgid "Show documentation tag"
-msgstr "Näytä dokumentointitagi"
+#: ../objects/Database/table.c:207 ../objects/UML/class.c:181
+#: ../objects/UML/object.c:150
+msgid "Attributes"
+msgstr "Ominaisuudet"
 
-#. * Fonts and Colors selection *
-#: ../objects/Database/table_dialog.c:1010 ../objects/UML/class_dialog.c:551
-msgid "_Style"
+#. umlformalparameters_extra
+#. all this just to make the defaults selectable ...
+#: ../objects/Database/table.c:211 ../objects/UML/association.c:269
+#: ../objects/UML/class.c:196 ../objects/UML/object.c:159
+#, fuzzy
+#| msgid "_Style"
+msgid "Style"
 msgstr "_Tyyli"
 
-#: ../objects/Database/table_dialog.c:1021
-msgid "Border width:"
-msgstr "Reunan paksuus:"
-
-#. head line
-#: ../objects/Database/table_dialog.c:1034 ../objects/UML/class_dialog.c:561
-#: ../objects/UML/umlparameter.c:51
-msgid "Kind"
-msgstr "Laji"
-
-#: ../objects/Database/table_dialog.c:1038 ../objects/UML/class_dialog.c:566
-msgid "Size"
-msgstr "Koko"
-
-#: ../objects/Database/table_dialog.c:1041
-msgid "Normal:"
-msgstr "Normaali:"
-
-#: ../objects/Database/table_dialog.c:1062
-msgid "Text Color:"
-msgstr "Tekstin väri:"
+#: ../objects/Database/table.c:212 ../objects/UML/class.c:197
+#| msgid "Font"
+msgid "Fonts"
+msgstr "Fontit"
 
-#: ../objects/Database/table_dialog.c:1070
-msgid "Foreground Color:"
-msgstr "Edustaväri:"
-
-#. two chars at the beginning
-#: ../objects/Database/table_dialog.c:1383
-msgid "not null"
-msgstr "ei NULL"
-
-#: ../objects/Database/table_dialog.c:1384
-msgid "null"
-msgstr "NULL"
-
-#: ../objects/Database/table_dialog.c:1385
-msgid "unique"
-msgstr "yksikäsitteinen"
-
-#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
-#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:136
-#: ../objects/standard/zigzagline.c:132
-msgid "Corner radius"
-msgstr "Kulmanpyöristyssäde"
-
-#: ../objects/Database/reference.c:111
-msgid "Start description"
-msgstr "Aloita kuvaus"
-
-#: ../objects/Database/reference.c:113
-msgid "End description"
-msgstr "Lopeta kuvaus"
+#. property rows
+#: ../objects/Database/table.c:216 ../objects/SADT/arrow.c:135
+#: ../objects/UML/class.c:201 ../objects/UML/class_dialog.c:461
+msgid "Normal"
+msgstr "Normaali"
 
-#: ../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:852
-#: ../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/zigzagline.c:380
-msgid "Add segment"
-msgstr "Lisää osa"
+#: ../objects/Database/table.c:218
+#, fuzzy
+#| msgid "Table name:"
+msgid "Table name"
+msgstr "Taulun nimi:"
 
-#: ../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:853
-#: ../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/zigzagline.c:381
-msgid "Delete segment"
-msgstr "Poista osa"
+#: ../objects/Database/table.c:273 ../objects/UML/class.c:342
+msgid "Show comments"
+msgstr "Näytä kommentit"
 
-#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
-msgid "Reference"
-msgstr "Viite"
+#: ../objects/ER/attribute.c:152 ../objects/ER/entity.c:134
+#: ../objects/ER/relationship.c:139
+#: ../objects/UML/class_attributes_dialog.c:517
+#: ../objects/UML/class_operations_dialog.c:777
+#: ../objects/UML/class_operations_dialog.c:977
+#: ../objects/UML/class_templates_dialog.c:436 ../objects/UML/dependency.c:132
+#: ../objects/UML/generalization.c:129 ../objects/UML/realizes.c:129
+msgid "Name:"
+msgstr "Nimi:"
 
-#: ../objects/ER/attribute.c:157
+#: ../objects/ER/attribute.c:154
 msgid "Key:"
 msgstr "Avain:"
 
-#: ../objects/ER/attribute.c:159
+#: ../objects/ER/attribute.c:156
 msgid "Weak key:"
 msgstr "Heikko avain:"
 
-#: ../objects/ER/attribute.c:161
+#: ../objects/ER/attribute.c:158
 msgid "Derived:"
 msgstr "Johdannainen:"
 
-#: ../objects/ER/attribute.c:163
+#: ../objects/ER/attribute.c:160
 msgid "Multivalue:"
 msgstr "Moniarvo:"
 
-#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
+#: ../objects/ER/attribute.c:433 ../sheets/ER.sheet.in.h:6
 msgid "Attribute"
 msgstr "Ominaisuus"
 
-#: ../objects/ER/entity.c:139
+#: ../objects/ER/entity.c:136
 msgid "Weak:"
 msgstr "Heikko:"
 
-#: ../objects/ER/entity.c:141
+#: ../objects/ER/entity.c:138
 msgid "Associative:"
 msgstr "Assosiatiivinen:"
 
-#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
-#: ../sheets/ER.sheet.in.h:4
+#: ../objects/ER/entity.c:407 ../objects/UML/classicon.c:129
+#: ../sheets/ER.sheet.in.h:3
 msgid "Entity"
 msgstr "Olio"
 
@@ -3123,41 +3818,49 @@ msgstr "Olio"
 msgid "Entity/Relationship diagram objects"
 msgstr "Olio/suhde-kaavio-objektit"
 
-#: ../objects/ER/participation.c:118
+#: ../objects/ER/participation.c:116
 msgid "Total:"
 msgstr "Yhteensä:"
 
-#: ../objects/ER/relationship.c:144
+#: ../objects/ER/relationship.c:141
 msgid "Left Cardinality:"
 msgstr "Vasen kardinaliteetti:"
 
-#: ../objects/ER/relationship.c:146
+#: ../objects/ER/relationship.c:143
 msgid "Right Cardinality:"
 msgstr "Oikea kardinaliteetti:"
 
-#: ../objects/ER/relationship.c:148
+#: ../objects/ER/relationship.c:145
 msgid "Rotate:"
 msgstr "Kierrä:"
 
-#: ../objects/ER/relationship.c:150
+#: ../objects/ER/relationship.c:147
 msgid "Identifying:"
 msgstr "Tunnistaminen:"
 
-#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/relationship.c:454 ../sheets/ER.sheet.in.h:5
 msgid "Relationship"
 msgstr "Suhde"
 
+#: ../objects/flowchart/flowchart.c:37
+msgid "Flowchart objects"
+msgstr "Vuokaavio-objektit"
+
+#: ../objects/flowchart/parallelogram.c:152
+msgid "Shear angle"
+msgstr "Vääntökulma:"
+
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:623
-#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:625
-#: ../objects/FS/function.c:1098
+#: ../objects/FS/flow.c:135 ../objects/FS/flow.c:627
+#: ../objects/FS/flow-ortho.c:158 ../objects/FS/flow-ortho.c:624
+#: ../objects/FS/function.c:1089
 msgid "Energy"
 msgstr "Energia"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:624
-#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:626
-#: ../objects/FS/function.c:1074
+#: ../objects/FS/flow.c:136 ../objects/FS/flow.c:628
+#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:625
+#: ../objects/FS/function.c:1065
 msgid "Material"
 msgstr "Materiaali"
 
@@ -3165,1075 +3868,1073 @@ msgstr "Materiaali"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:625
-#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:627
-#: ../objects/FS/function.c:1036 ../objects/FS/function.c:1038
-#: ../objects/FS/function.c:1174 ../objects/FS/function.c:1176
+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:629
+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:626
+#: ../objects/FS/function.c:1027 ../objects/FS/function.c:1029
+#: ../objects/FS/function.c:1165 ../objects/FS/function.c:1167
 msgid "Signal"
 msgstr "Signaali"
 
+#: ../objects/FS/flow.c:144 ../objects/FS/flow-ortho.c:167
+#: ../objects/Istar/link.c:161 ../objects/Jackson/phenomenon.c:145
+#: ../objects/KAOS/metaandorrel.c:165 ../objects/KAOS/metabinrel.c:172
+#: ../objects/UML/class_attributes_dialog.c:528
+#: ../objects/UML/class_operations_dialog.c:788
+#: ../objects/UML/class_operations_dialog.c:988
+#: ../objects/UML/class_templates_dialog.c:447
+msgid "Type:"
+msgstr "Tyyppi:"
+
 #: ../objects/FS/fs.c:43
 msgid "Function structure diagram objects"
 msgstr "Funktion rakenne -kaavio-objektit"
 
-#: ../objects/FS/function.c:144
+#: ../objects/FS/function.c:141
 msgid "Wish function"
 msgstr "Toivetoiminto"
 
-#: ../objects/FS/function.c:146
+#: ../objects/FS/function.c:143
 msgid "User function"
 msgstr "Käyttäjätoiminto"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:678
+#: ../objects/FS/function.c:669
 msgid "Verb"
 msgstr "Verbi"
 
 #. Translators: Menu item Verb/Channel
 #. Translators: Menu item Verb/Channel/Channel
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
-#: ../objects/FS/function.c:680 ../objects/FS/function.c:682
-#: ../objects/FS/function.c:722
+#: ../objects/FS/function.c:671 ../objects/FS/function.c:673
+#: ../objects/FS/function.c:713
 msgid "Channel"
 msgstr "Kanava"
 
-#. Translators: Menu item Verb/Channel/Import
-#. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:684 ../objects/FS/function.c:686
-msgid "Import"
-msgstr "Tuo"
-
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:688 ../objects/KAOS/metabinrel.c:165
+#: ../objects/FS/function.c:679 ../objects/KAOS/metabinrel.c:164
 msgid "Input"
 msgstr "Syötä"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:690
+#: ../objects/FS/function.c:681
 msgid "Receive"
 msgstr "Vastaanota"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:692 ../objects/FS/function.c:964
+#: ../objects/FS/function.c:683 ../objects/FS/function.c:955
 msgid "Allow"
 msgstr "Salli"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:694
+#: ../objects/FS/function.c:685
 msgid "Form Entrance"
 msgstr "Kaavakkeen hyväksyntä"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:696 ../objects/FS/function.c:930
+#: ../objects/FS/function.c:687 ../objects/FS/function.c:921
 msgid "Capture"
 msgstr "Kaappaa"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:702
+#: ../objects/FS/function.c:693
 msgid "Discharge"
 msgstr "Vapauta"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:704
+#: ../objects/FS/function.c:695
 msgid "Eject"
 msgstr "Työnnä ulos"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:706
+#: ../objects/FS/function.c:697
 msgid "Dispose"
 msgstr "Hävitä"
 
 #. Translators: Menu item Verb/Channel/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
-#: ../objects/FS/function.c:710 ../objects/FS/function.c:712
-#: ../objects/FS/function.c:730
+#: ../objects/FS/function.c:701 ../objects/FS/function.c:703
+#: ../objects/FS/function.c:721
 msgid "Transfer"
 msgstr "Siirrä"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:714 ../objects/FS/function.c:716
+#: ../objects/FS/function.c:705 ../objects/FS/function.c:707
 msgid "Transport"
 msgstr "Kuljeta"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:718
+#: ../objects/FS/function.c:709
 msgid "Lift"
 msgstr "Nosta"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:720
+#: ../objects/FS/function.c:711
 msgid "Move"
 msgstr "Siirrä"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:724 ../objects/FS/function.c:726
+#: ../objects/FS/function.c:715 ../objects/FS/function.c:717
 msgid "Transmit"
 msgstr "Lähetä"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:728
+#: ../objects/FS/function.c:719
 msgid "Conduct"
 msgstr "Johda"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:732
+#: ../objects/FS/function.c:723
 msgid "Convey"
 msgstr "Välitä"
 
 #. Translators: Menu item Verb/Channel/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
-#: ../objects/FS/function.c:734 ../objects/FS/function.c:736
-#: ../objects/FS/function.c:738
+#: ../objects/FS/function.c:725 ../objects/FS/function.c:727
+#: ../objects/FS/function.c:729
 msgid "Guide"
 msgstr "Opasta"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:740
+#: ../objects/FS/function.c:731
 msgid "Direct"
 msgstr "Suunta"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:742
+#: ../objects/FS/function.c:733
 msgid "Straighten"
 msgstr "Suorista"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:744
+#: ../objects/FS/function.c:735
 msgid "Steer"
 msgstr "Ohjaa"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:746
+#: ../objects/FS/function.c:737
 msgid "Translate"
 msgstr "Käännä"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:748 ../objects/FS/function.c:750
+#: ../objects/FS/function.c:739 ../objects/FS/function.c:741
 msgid "Rotate"
 msgstr "Kierrä"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:752
+#: ../objects/FS/function.c:743
 msgid "Turn"
 msgstr "Käännä"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:754
+#: ../objects/FS/function.c:745
 msgid "Spin"
 msgstr "Pyöritä"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-#: ../objects/FS/function.c:756 ../objects/FS/function.c:758
+#: ../objects/FS/function.c:747 ../objects/FS/function.c:749
 msgid "Allow DOF"
 msgstr "Salli DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:760
+#: ../objects/FS/function.c:751
 msgid "Constrain"
 msgstr "Rajoita"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:762
+#: ../objects/FS/function.c:753
 msgid "Unlock"
 msgstr "Avaa"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:764 ../objects/FS/function.c:766
+#: ../objects/FS/function.c:755 ../objects/FS/function.c:757
 msgid "Support"
 msgstr "Tue"
 
 #. 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
+#: ../objects/FS/function.c:759 ../objects/FS/function.c:761
+#: ../sheets/SDL.sheet.in.h:16
 msgid "Stop"
 msgstr "Pysäytä"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:772
+#: ../objects/FS/function.c:763
 msgid "Insulate"
 msgstr "Eristä"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:774
+#: ../objects/FS/function.c:765
 msgid "Protect"
 msgstr "Turvaa"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:776 ../objects/FS/function.c:966
+#: ../objects/FS/function.c:767 ../objects/FS/function.c:957
 msgid "Prevent"
 msgstr "Torju"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:778
+#: ../objects/FS/function.c:769
 msgid "Shield"
 msgstr "Suojele"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:780
+#: ../objects/FS/function.c:771
 msgid "Inhibit"
 msgstr "Estä"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:782 ../objects/FS/function.c:784
+#: ../objects/FS/function.c:773 ../objects/FS/function.c:775
 msgid "Stabilize"
 msgstr "Vakauta"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:786
+#: ../objects/FS/function.c:777
 msgid "Steady"
 msgstr "Tasaannuta"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:788 ../objects/FS/function.c:790
+#: ../objects/FS/function.c:779 ../objects/FS/function.c:781
 msgid "Secure"
 msgstr "Varmista"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:792 ../objects/FS/function.c:824
+#: ../objects/FS/function.c:783 ../objects/FS/function.c:815
 msgid "Attach"
 msgstr "Kiinnitä"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:794
+#: ../objects/FS/function.c:785
 msgid "Mount"
 msgstr "Liitä"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:787 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Lock"
 msgstr "Lukitse"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:798
+#: ../objects/FS/function.c:789
 msgid "Fasten"
 msgstr "Nopeuta"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:800
+#: ../objects/FS/function.c:791
 msgid "Hold"
 msgstr "Pidä"
 
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:802 ../objects/FS/function.c:804
-#: ../objects/Istar/actor.c:70
+#: ../objects/FS/function.c:793 ../objects/FS/function.c:795
+#: ../objects/Istar/actor.c:68
 msgid "Position"
 msgstr "Sijainti"
 
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:806
+#: ../objects/FS/function.c:797
 msgid "Orient"
 msgstr "Suuntaa"
 
-#. Translators: Menu item Verb/Support/Position/Locate
-#. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../objects/FS/function.c:810 ../objects/FS/function.c:1052
-msgid "Locate"
-msgstr "Paikallista"
-
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:812 ../objects/FS/function.c:814
+#: ../objects/FS/function.c:803 ../objects/FS/function.c:805
 msgid "Connect"
 msgstr "Yhdistä"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:816 ../objects/FS/function.c:818
+#: ../objects/FS/function.c:807 ../objects/FS/function.c:809
 msgid "Couple"
 msgstr "Kytke"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:820
+#: ../objects/FS/function.c:811
 msgid "Join"
 msgstr "Liitä"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:822
+#: ../objects/FS/function.c:813
 msgid "Assemble"
 msgstr "Kokoa"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:826 ../objects/FS/function.c:828
+#: ../objects/FS/function.c:817 ../objects/FS/function.c:819
 msgid "Mix"
 msgstr "Sekoita"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:830
+#: ../objects/FS/function.c:821
 msgid "Combine"
 msgstr "Liitä yhteen"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:832
+#: ../objects/FS/function.c:823
 msgid "Blend"
 msgstr "Sulauta"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:834
+#: ../objects/FS/function.c:825
 msgid "Add"
 msgstr "Lisää"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:836
+#: ../objects/FS/function.c:827
 msgid "Pack"
 msgstr "Pakkaa"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:838
+#: ../objects/FS/function.c:829
 msgid "Coalesce"
 msgstr "Yhteensulauta"
 
 #. 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
+#: ../objects/FS/function.c:831 ../objects/FS/function.c:833
+#: ../sheets/UML.sheet.in.h:30
 msgid "Branch"
 msgstr "Haara"
 
 #. Translators: Menu item Verb/Branch/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
-#: ../objects/FS/function.c:844 ../objects/FS/function.c:846
-#: ../objects/FS/function.c:848
+#: ../objects/FS/function.c:835 ../objects/FS/function.c:837
+#: ../objects/FS/function.c:839
 msgid "Separate"
 msgstr "Erottele"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:850
+#: ../objects/FS/function.c:841
 msgid "Switch"
 msgstr "Vaihda"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:852
+#: ../objects/FS/function.c:843
 msgid "Divide"
 msgstr "Jaa"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:854
+#: ../objects/FS/function.c:845
 msgid "Release"
 msgstr "Vapauta"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:856
+#: ../objects/FS/function.c:847
 msgid "Detach"
 msgstr "Irrota"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:858
+#: ../objects/FS/function.c:849
 msgid "Disconnect"
 msgstr "Katkaise"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:864
+#: ../objects/FS/function.c:855
 msgid "Cut"
 msgstr "Leikkaa"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:866
+#: ../objects/FS/function.c:857
 msgid "Polish"
 msgstr "Kiillota"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:868
+#: ../objects/FS/function.c:859
 msgid "Sand"
 msgstr "Hiekoita"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:870
+#: ../objects/FS/function.c:861
 msgid "Drill"
 msgstr "Poraa"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:872
+#: ../objects/FS/function.c:863
 msgid "Lathe"
 msgstr "Sorvaa"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:874 ../objects/FS/function.c:876
+#: ../objects/FS/function.c:865 ../objects/FS/function.c:867
 msgid "Refine"
 msgstr "Hienonna"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:878
+#: ../objects/FS/function.c:869
 msgid "Purify"
 msgstr "Puhdista"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:880
+#: ../objects/FS/function.c:871
 msgid "Strain"
 msgstr "Terästä"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:882
+#: ../objects/FS/function.c:873
 msgid "Filter"
 msgstr "Suodata"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:884
+#: ../objects/FS/function.c:875
 msgid "Percolate"
 msgstr "Siivilöi"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:886
+#: ../objects/FS/function.c:877
 msgid "Clear"
 msgstr "Puhdista"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:888 ../objects/FS/function.c:890
+#: ../objects/FS/function.c:879 ../objects/FS/function.c:881
 msgid "Distribute"
 msgstr "Hajauta"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:892
+#: ../objects/FS/function.c:883
 msgid "Diverge"
 msgstr "Eriytä"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:894
+#: ../objects/FS/function.c:885
 msgid "Scatter"
 msgstr "Sirottele"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:896
+#: ../objects/FS/function.c:887
 msgid "Disperse"
 msgstr "Hajottaa"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:898 ../objects/FS/function.c:912
+#: ../objects/FS/function.c:889 ../objects/FS/function.c:903
 msgid "Diffuse"
 msgstr "Levitä"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:900
+#: ../objects/FS/function.c:891
 msgid "Empty"
 msgstr "Tyhjennä"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:902 ../objects/FS/function.c:904
+#: ../objects/FS/function.c:893 ../objects/FS/function.c:895
 msgid "Dissipate"
 msgstr "Hajauta"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:906
+#: ../objects/FS/function.c:897
 msgid "Absorb"
 msgstr "Absorboi"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:908
+#: ../objects/FS/function.c:899
 msgid "Dampen"
 msgstr "Vaimenna"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:910
+#: ../objects/FS/function.c:901
 msgid "Dispel"
 msgstr "Hälvennä"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:914
+#: ../objects/FS/function.c:905
 msgid "Resist"
 msgstr "Vastusta"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:916 ../objects/FS/function.c:918
+#: ../objects/FS/function.c:907 ../objects/FS/function.c:909
 msgid "Provision"
 msgstr "Valmistaudu"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:920 ../objects/FS/function.c:922
+#: ../objects/FS/function.c:911 ../objects/FS/function.c:913
 msgid "Store"
 msgstr "Varastoi"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:924
+#: ../objects/FS/function.c:915
 msgid "Contain"
 msgstr "Sisällytä"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:926
+#: ../objects/FS/function.c:917
 msgid "Collect"
 msgstr "Kerää"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:928
+#: ../objects/FS/function.c:919
 msgid "Reserve"
 msgstr "Varaa"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:932 ../objects/FS/function.c:934
+#: ../objects/FS/function.c:923 ../objects/FS/function.c:925
 msgid "Supply"
 msgstr "Toimita"
 
-#. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:936
-msgid "Fill"
-msgstr "Täytä"
-
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:938
+#: ../objects/FS/function.c:929
 msgid "Provide"
 msgstr "Tarjoa"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:940
+#: ../objects/FS/function.c:931
 msgid "Replenish"
 msgstr "Täydennä"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:942
+#: ../objects/FS/function.c:933
 msgid "Expose"
 msgstr "Paljasta"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:935 ../sheets/Flowchart.sheet.in.h:22
 msgid "Extract"
 msgstr "Pura"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:946 ../objects/FS/function.c:948
+#: ../objects/FS/function.c:937 ../objects/FS/function.c:939
 msgid "Control Magnitude"
 msgstr "Kontrollin magnitudi"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:950 ../objects/FS/function.c:952
+#: ../objects/FS/function.c:941 ../objects/FS/function.c:943
 msgid "Actuate"
 msgstr "Pätevöitä"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:954
+#: ../objects/FS/function.c:945
 msgid "Start"
 msgstr "Käynnistä"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:956
+#: ../objects/FS/function.c:947
 msgid "Initiate"
 msgstr "Aloita"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:958 ../objects/FS/function.c:960
+#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
 msgid "Regulate"
 msgstr "Sääntele"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:962 ../objects/FS/function.c:1180
-#: ../objects/UML/classicon.c:129
+#: ../objects/FS/function.c:953 ../objects/FS/function.c:1171
+#: ../objects/UML/classicon.c:127
 msgid "Control"
 msgstr "Hallinnoi"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:968
+#: ../objects/FS/function.c:959
 msgid "Enable"
 msgstr "Ota käyttöön"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:970
+#: ../objects/FS/function.c:961
 msgid "Disable"
 msgstr "Poista käytöstä"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:972
+#: ../objects/FS/function.c:963
 msgid "Limit"
 msgstr "Rajoita"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:974
+#: ../objects/FS/function.c:965
 msgid "Interrupt"
 msgstr "Keskeytä"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:976 ../objects/FS/function.c:978
+#: ../objects/FS/function.c:967 ../objects/FS/function.c:969
 msgid "Change"
 msgstr "Muuta"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:980
+#: ../objects/FS/function.c:971
 msgid "Increase"
 msgstr "Kasvata"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:982
+#: ../objects/FS/function.c:973
 msgid "Decrease"
 msgstr "Vähennä"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:984
+#: ../objects/FS/function.c:975
 msgid "Amplify"
 msgstr "Vahvista"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:986
+#: ../objects/FS/function.c:977
 msgid "Reduce"
 msgstr "Supista"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:990
+#: ../objects/FS/function.c:981
 msgid "Normalize"
 msgstr "Normaalisoi"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:992
+#: ../objects/FS/function.c:983
 msgid "Multiply"
 msgstr "Moninkertaista"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
 #. FIXME: mark read-only
-#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:187
+#: ../objects/FS/function.c:985 ../objects/Misc/measure.c:185
 msgid "Scale"
 msgstr "Skaalaa"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:996
+#: ../objects/FS/function.c:987
 msgid "Rectify"
 msgstr "Suorista"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:998
+#: ../objects/FS/function.c:989
 msgid "Adjust"
 msgstr "Sopeuta"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:1000 ../objects/FS/function.c:1002
+#: ../objects/FS/function.c:991 ../objects/FS/function.c:993
 msgid "Form"
 msgstr "Järjestäydy"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1004
+#: ../objects/FS/function.c:995
 msgid "Compact"
 msgstr "Puserra"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1006
+#: ../objects/FS/function.c:997
 msgid "Crush"
 msgstr "Murskaa"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1008
+#: ../objects/FS/function.c:999
 msgid "Shape"
 msgstr "Muodosta"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1010
+#: ../objects/FS/function.c:1001
 msgid "Compress"
 msgstr "Pakkaa"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1012
+#: ../objects/FS/function.c:1003
 msgid "Pierce"
 msgstr "Lävistä"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1014 ../objects/FS/function.c:1016
+#: ../objects/FS/function.c:1005 ../objects/FS/function.c:1007
 msgid "Convert"
 msgstr "Muunna"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1018
+#: ../objects/FS/function.c:1009
 msgid "Transform"
 msgstr "Siirrä"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1020
+#: ../objects/FS/function.c:1011
 msgid "Liquefy"
 msgstr "Nesteytä"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1022
+#: ../objects/FS/function.c:1013
 msgid "Solidify"
 msgstr "Kiinteytä"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1024
+#: ../objects/FS/function.c:1015
 msgid "Evaporate"
 msgstr "Höyrystä"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1026
+#: ../objects/FS/function.c:1017
 msgid "Sublimate"
 msgstr "Sublimoi"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1028
+#: ../objects/FS/function.c:1019
 msgid "Condense"
 msgstr "Tiivistä"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1030
+#: ../objects/FS/function.c:1021
 msgid "Integrate"
 msgstr "Integroi"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1032
+#: ../objects/FS/function.c:1023
 msgid "Differentiate"
 msgstr "Derivoi"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:8
+#: ../objects/FS/function.c:1025 ../sheets/AADL.sheet.in.h:3
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
 msgstr "Käsittele"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1040 ../objects/FS/function.c:1042
+#: ../objects/FS/function.c:1031 ../objects/FS/function.c:1033
 msgid "Sense"
 msgstr "Aisti"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1044
+#: ../objects/FS/function.c:1035
 msgid "Perceive"
 msgstr "Hahmota"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1046
+#: ../objects/FS/function.c:1037
 msgid "Recognize"
 msgstr "Tunnista"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1048
+#: ../objects/FS/function.c:1039
 msgid "Discern"
 msgstr "Käsitä"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1050
+#: ../objects/FS/function.c:1041
 msgid "Check"
 msgstr "Tarkista"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1054
+#: ../objects/FS/function.c:1045
 msgid "Verify"
 msgstr "Varmista"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1056 ../objects/FS/function.c:1058
+#: ../objects/FS/function.c:1047 ../objects/FS/function.c:1049
 msgid "Indicate"
 msgstr "Osoita"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1060
+#: ../objects/FS/function.c:1051
 msgid "Mark"
 msgstr "Merkitse"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1062 ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1053 ../sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "Näytä"
 
 #. Translators: Menu item Verb/Signal/Measure
 #. Translators: Menu item Verb/Signal/Measure/Measure
-#: ../objects/FS/function.c:1064 ../objects/FS/function.c:1066
+#: ../objects/FS/function.c:1055 ../objects/FS/function.c:1057
 msgid "Measure"
 msgstr "Mittaa"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1068
+#: ../objects/FS/function.c:1059
 msgid "Calculate"
 msgstr "Laske"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1070
+#: ../objects/FS/function.c:1061
 msgid "Represent"
 msgstr "Esitä"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1072
+#: ../objects/FS/function.c:1063
 msgid "Noun"
 msgstr "Substantiivi"
 
+#. Translators: Menu item Noun/Material/Solid
+#: ../objects/FS/function.c:1067
+msgid "Solid"
+msgstr "Yhtenäinen"
+
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1078
+#: ../objects/FS/function.c:1069
 msgid "Liquid"
 msgstr "Neste"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1080
+#: ../objects/FS/function.c:1071
 msgid "Gas"
 msgstr "Kaasu"
 
 #. Translators: Menu item Noun/Material/Human
 #. Translators: Menu item Noun/Material/Human/Human
 #. Translators: Menu item Noun/Energy/Human
-#: ../objects/FS/function.c:1082 ../objects/FS/function.c:1084
-#: ../objects/FS/function.c:1168
+#: ../objects/FS/function.c:1073 ../objects/FS/function.c:1075
+#: ../objects/FS/function.c:1159
 msgid "Human"
 msgstr "Ihminen"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1086
+#: ../objects/FS/function.c:1077
 msgid "Hand"
 msgstr "Käsi"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1088
+#: ../objects/FS/function.c:1079
 msgid "Foot"
 msgstr "Jalka"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1090
+#: ../objects/FS/function.c:1081
 msgid "Head"
 msgstr "Pää"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1092
+#: ../objects/FS/function.c:1083
 msgid "Finger"
 msgstr "Sormi"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1094
+#: ../objects/FS/function.c:1085
 msgid "Toe"
 msgstr "Varvas"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1096
+#: ../objects/FS/function.c:1087
 msgid "Biological"
 msgstr "Biologinen"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1100
+#: ../objects/FS/function.c:1091
 msgid "Mechanical"
 msgstr "Mekaaninen"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1102
+#: ../objects/FS/function.c:1093
 msgid "Mech. Energy"
 msgstr "Mekaaninen energia"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1104
+#: ../objects/FS/function.c:1095
 msgid "Translation"
 msgstr "Muunnos"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1106
+#: ../objects/FS/function.c:1097
 msgid "Force"
 msgstr "Voima"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:206
+#: ../objects/FS/function.c:1099 ../objects/standard/outline.c:104
 msgid "Rotation"
 msgstr "Pyörimis-"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1110
+#: ../objects/FS/function.c:1101
 msgid "Torque"
 msgstr "Vääntömomentti"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1112
+#: ../objects/FS/function.c:1103
 msgid "Random Motion"
 msgstr "Satunnaisliike"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1114
+#: ../objects/FS/function.c:1105
 msgid "Vibration"
 msgstr "Värähtely"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1116
+#: ../objects/FS/function.c:1107
 msgid "Rotational Energy"
 msgstr "Pyörimisenergia"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1118
+#: ../objects/FS/function.c:1109
 msgid "Translational Energy"
 msgstr "Etenemisenergia"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1120
+#: ../objects/FS/function.c:1111
 msgid "Electrical"
 msgstr "Sähköinen"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1122
+#: ../objects/FS/function.c:1113
 msgid "Electricity"
 msgstr "Sähkö"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1124
+#: ../objects/FS/function.c:1115
 msgid "Voltage"
 msgstr "Jännite"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1126
+#: ../objects/FS/function.c:1117
 msgid "Current"
 msgstr "Virta"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1128
+#: ../objects/FS/function.c:1119
 msgid "Hydraulic"
 msgstr "Hydraulinen"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1130
+#: ../objects/FS/function.c:1121
 msgid "Pressure"
 msgstr "Paine"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1132
+#: ../objects/FS/function.c:1123
 msgid "Volumetric Flow"
 msgstr "Plastinen tilavuudenmuutos"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1134
+#: ../objects/FS/function.c:1125
 msgid "Thermal"
 msgstr "Lämpö"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1136
+#: ../objects/FS/function.c:1127
 msgid "Heat"
 msgstr "Kuumuus"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1138
+#: ../objects/FS/function.c:1129
 msgid "Conduction"
 msgstr "Johtuminen"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1140
+#: ../objects/FS/function.c:1131
 msgid "Convection"
 msgstr "Kulkeutuminen"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1142 ../objects/FS/function.c:1150
+#: ../objects/FS/function.c:1133 ../objects/FS/function.c:1141
 msgid "Radiation"
 msgstr "Säteily"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1144
+#: ../objects/FS/function.c:1135
 msgid "Pneumatic"
 msgstr "Paineilma"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1146
+#: ../objects/FS/function.c:1137
 msgid "Chemical"
 msgstr "Kemiallinen"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1148
+#: ../objects/FS/function.c:1139
 msgid "Radioactive"
 msgstr "Radioaktiivinen"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1152
+#: ../objects/FS/function.c:1143
 msgid "Microwaves"
 msgstr "Mikroaallot"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1154
+#: ../objects/FS/function.c:1145
 msgid "Radio waves"
 msgstr "Radioaallot"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1156
+#: ../objects/FS/function.c:1147
 msgid "X-Rays"
 msgstr "Röntgensäteet"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1158
+#: ../objects/FS/function.c:1149
 msgid "Gamma Rays"
 msgstr "Gammasäteet"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1160
+#: ../objects/FS/function.c:1151
 msgid "Acoustic Energy"
 msgstr "Akustinen energia"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1162
+#: ../objects/FS/function.c:1153
 msgid "Optical Energy"
 msgstr "Optinen energia"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1164
+#: ../objects/FS/function.c:1155
 msgid "Solar Energy"
 msgstr "Aurinkoenergia"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1166
+#: ../objects/FS/function.c:1157
 msgid "Magnetic Energy"
 msgstr "Magneettinen energia"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1170
+#: ../objects/FS/function.c:1161
 msgid "Human Motion"
 msgstr "Ihmisliike"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1172
+#: ../objects/FS/function.c:1163
 msgid "Human Force"
 msgstr "Ihmisvoima"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1178
+#: ../objects/FS/function.c:1169
 msgid "Status"
 msgstr "Tila"
 
-#: ../objects/FS/function.c:1182
+#: ../objects/FS/function.c:1173
 msgid "User/Device Fn"
 msgstr "Käyttäjä/laitetoiminto"
 
-#: ../objects/FS/function.c:1183
+#: ../objects/FS/function.c:1174
 msgid "Wish Fn"
 msgstr "Toivetoiminto"
 
-#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
+#: ../objects/GRAFCET/action.c:132 ../sheets/SDL.sheet.in.h:11
 msgid "Macro call"
 msgstr "Makro-kutsu"
 
-#: ../objects/GRAFCET/action.c:137
+#: ../objects/GRAFCET/action.c:132
 msgid "This action is a call to a macro-step"
 msgstr "Tämä toiminto on kutsu makroaskeleeseen"
 
-#: ../objects/GRAFCET/condition.c:132
+#: ../objects/GRAFCET/condition.c:129
 msgid "Condition"
 msgstr "Ehto"
 
-#: ../objects/GRAFCET/condition.c:132
+#: ../objects/GRAFCET/condition.c:129
 msgid "The boolean equation of the condition"
 msgstr "Ehdon boolen lauseke"
 
-#: ../objects/GRAFCET/condition.c:134
+#: ../objects/GRAFCET/condition.c:131
 msgid "The condition's font"
-msgstr "Ehdon kirjasin"
+msgstr "Ehdon fontti"
 
-#: ../objects/GRAFCET/condition.c:136
+#: ../objects/GRAFCET/condition.c:133
 msgid "The condition's font size"
-msgstr "Ehdon kirjasimen koko"
+msgstr "Ehdon fontin koko"
 
-#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/transition.c:146
 msgid "Color"
 msgstr "Väri"
 
-#: ../objects/GRAFCET/condition.c:139
+#: ../objects/GRAFCET/condition.c:136
 msgid "The condition's color"
 msgstr "Ehdon väri"
 
@@ -4241,138 +4942,138 @@ msgstr "Ehdon väri"
 msgid "GRAFCET diagram objects"
 msgstr "GRAFCET-kaavio-objektit"
 
-#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
+#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:3
 msgid "Regular step"
 msgstr "Tavallinen askel"
 
-#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:4
 msgid "Initial step"
 msgstr "Lähtöaskel"
 
-#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:5
 msgid "Macro entry step"
 msgstr "Makron tuloaskel"
 
-#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Macro exit step"
 msgstr "Makron poistumisaskel"
 
-#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
 msgid "Macro call step"
 msgstr "Makron kutsuaskel"
 
-#: ../objects/GRAFCET/step.c:153
+#: ../objects/GRAFCET/step.c:151
 msgid "Subprogram call step"
 msgstr "Aliohjelman kutsuaskel"
 
-#: ../objects/GRAFCET/step.c:160
+#: ../objects/GRAFCET/step.c:158
 msgid "Step name"
 msgstr "Askeleen nimi"
 
-#: ../objects/GRAFCET/step.c:160
+#: ../objects/GRAFCET/step.c:158
 msgid "The name of the step"
 msgstr "Askeleen nimi"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:161
 msgid "Step type"
 msgstr "Askeleen tyyppi"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:161
 msgid "The kind of step"
 msgstr "Millainen askel"
 
-#: ../objects/GRAFCET/step.c:165
+#: ../objects/GRAFCET/step.c:163
 msgid "Active"
 msgstr "Toiminnassa"
 
-#: ../objects/GRAFCET/step.c:165
+#: ../objects/GRAFCET/step.c:163
 msgid "Shows a red dot to figure the step's activity"
 msgstr "Näyttää punaisella pistellä kuvaamassa askeleen toimintaa"
 
-#: ../objects/GRAFCET/transition.c:142
+#: ../objects/GRAFCET/transition.c:139
 msgid "Receptivity"
 msgstr "Vastaanottavuus"
 
-#: ../objects/GRAFCET/transition.c:142
+#: ../objects/GRAFCET/transition.c:139
 msgid "The boolean equation of the receptivity"
 msgstr "Vastaanottavuuden boolen yhtälö"
 
-#: ../objects/GRAFCET/transition.c:144
+#: ../objects/GRAFCET/transition.c:141
 msgid "The receptivity's font"
-msgstr "Vastaanottavuuden kirjasin"
+msgstr "Vastaanottavuuden fontti"
 
-#: ../objects/GRAFCET/transition.c:146
+#: ../objects/GRAFCET/transition.c:143
 msgid "The receptivity's font size"
-msgstr "Vastaanottavuuden kirjasimen koko"
+msgstr "Vastaanottavuuden fontin koko"
 
-#: ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/transition.c:146
 msgid "The receptivity's color"
 msgstr "Vastaanottavuuden väri"
 
-#: ../objects/GRAFCET/transition.c:150
+#: ../objects/GRAFCET/transition.c:147
 msgid "North point"
 msgstr "Pohjoispiste"
 
-#: ../objects/GRAFCET/transition.c:151
+#: ../objects/GRAFCET/transition.c:148
 msgid "South point"
 msgstr "Eteläpiste"
 
-#: ../objects/GRAFCET/vector.c:131
+#: ../objects/GRAFCET/vector.c:126
 msgid "Draw arrow heads on upward arcs:"
 msgstr "Piirrä nuolenpäitä nouseviin kaariin:"
 
-#: ../objects/GRAFCET/vergent.c:124
+#: ../objects/GRAFCET/vergent.c:120
 msgid "OR"
 msgstr "TAI"
 
-#: ../objects/GRAFCET/vergent.c:125
+#: ../objects/GRAFCET/vergent.c:121
 msgid "AND"
 msgstr "JA"
 
-#: ../objects/GRAFCET/vergent.c:136
+#: ../objects/GRAFCET/vergent.c:132
 msgid "Vergent type:"
 msgstr "Vergentin tyyppi:"
 
-#: ../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/standard/line.c:223
+#: ../objects/GRAFCET/vergent.c:403 ../objects/Istar/other.c:464
+#: ../objects/Jackson/domain.c:527 ../objects/KAOS/goal.c:567
+#: ../objects/KAOS/other.c:516 ../objects/SADT/box.c:442
+#: ../objects/standard/line.c:318
 msgid "Add connection point"
 msgstr "Lisää liitoskohta"
 
-#: ../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/standard/line.c:224
+#: ../objects/GRAFCET/vergent.c:404 ../objects/Istar/other.c:465
+#: ../objects/Jackson/domain.c:528 ../objects/KAOS/goal.c:568
+#: ../objects/KAOS/other.c:517 ../objects/SADT/box.c:443
+#: ../objects/standard/line.c:319
 msgid "Delete connection point"
 msgstr "Poista liitoskohta"
 
-#: ../objects/GRAFCET/vergent.c:412
+#: ../objects/GRAFCET/vergent.c:408
 msgid "GRAFCET OR/AND vergent"
 msgstr "GRAFCET ja/tai vergentti"
 
-#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
+#: ../objects/Istar/actor.c:66 ../objects/Istar/link.c:149
 msgid "Unspecified"
 msgstr "Määrittelemätön"
 
-#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
+#: ../objects/Istar/actor.c:67 ../objects/KAOS/other.c:73
 msgid "Agent"
 msgstr "Agentti"
 
-#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
+#: ../objects/Istar/actor.c:69 ../objects/UML/association.c:249
 msgid "Role"
 msgstr "Rooli"
 
-#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
+#: ../objects/Istar/goal.c:74 ../objects/KAOS/goal.c:77
 msgid "Softgoal"
 msgstr "Välitavoite"
 
-#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
+#: ../objects/Istar/goal.c:75 ../objects/KAOS/goal.c:78
 msgid "Goal"
 msgstr "Tavoite"
 
-#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
-#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
+#: ../objects/Istar/goal.c:153 ../objects/Istar/goal.c:154
+#: ../objects/KAOS/goal.c:156 ../objects/KAOS/goal.c:157
 msgid "Goal Type"
 msgstr "Tavoitetyyppi"
 
@@ -4380,75 +5081,77 @@ msgstr "Tavoitetyyppi"
 msgid "Istar diagram"
 msgstr "Istar-kaavio"
 
-#: ../objects/Istar/link.c:151
+#: ../objects/Istar/link.c:150
 msgid "Positive contrib"
 msgstr "Positiivinen myötävaikutus"
 
-#: ../objects/Istar/link.c:152
+#: ../objects/Istar/link.c:151
 msgid "Negative contrib"
 msgstr "Negatiivinen myötävaikutus"
 
-#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
+#: ../objects/Istar/link.c:152 ../sheets/UML.sheet.in.h:6
 msgid "Dependency"
 msgstr "Riippuvuus"
 
-#: ../objects/Istar/link.c:154
+#: ../objects/Istar/link.c:153
 msgid "Decomposition"
 msgstr "Hajoitus"
 
-#: ../objects/Istar/link.c:155
+#: ../objects/Istar/link.c:154
 msgid "Means-Ends"
 msgstr ""
 
-#: ../objects/Istar/other.c:73
+#: ../objects/Istar/other.c:71
 msgid "Resource"
 msgstr "Resurssi"
 
-#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
+#: ../objects/Istar/other.c:72 ../sheets/BPMN.sheet.in.h:33
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../objects/Istar/other.c:477
+#: ../objects/Istar/other.c:470
 msgid "i* other"
 msgstr "i* muu"
 
-#: ../objects/Jackson/domain.c:79
+#: ../objects/Jackson/domain.c:77
 msgid "Given Domain"
 msgstr "Annettu kenttä"
 
-#: ../objects/Jackson/domain.c:80
+#: ../objects/Jackson/domain.c:78
 msgid "Designed Domain"
 msgstr "Suunniteltu kenttä"
 
-#: ../objects/Jackson/domain.c:81
+#: ../objects/Jackson/domain.c:79
 msgid "Machine Domain"
 msgstr "Konekenttä"
 
-#: ../objects/Jackson/domain.c:97
+#: ../objects/Jackson/domain.c:95
 msgid "Causal"
 msgstr "Kausaalinen"
 
-#: ../objects/Jackson/domain.c:98
+#: ../objects/Jackson/domain.c:96
 msgid "Biddable"
 msgstr "Kilpailtava"
 
-#: ../objects/Jackson/domain.c:99
+#: ../objects/Jackson/domain.c:97
 msgid "Lexical"
 msgstr "Leksikaalinen"
 
-#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
+#: ../objects/Jackson/domain.c:175 ../objects/Jackson/domain.c:176
 msgid "Domain Type"
 msgstr "Kentän tyyppi"
 
-#: ../objects/Jackson/domain.c:183
+#: ../objects/Jackson/domain.c:180
 msgid "Domain Kind"
 msgstr "Kentän laji"
 
-#: ../objects/Jackson/domain.c:184
-msgid "Optional kind which appears in the lower right corner of the Domain"
+#: ../objects/Jackson/domain.c:181
+#, fuzzy
+#| msgid "Optional kind which appears in the lower right corner of the Domain"
+msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr "Valinnainen laji, joka näkyy kentän oikeassa alareunassa"
 
-#: ../objects/Jackson/domain.c:539
+#: ../objects/Jackson/domain.c:533
 msgid "Jackson domain"
 msgstr "Jackson-kenttä"
 
@@ -4456,30 +5159,30 @@ msgstr "Jackson-kenttä"
 msgid "Jackson diagram"
 msgstr "Jackson-kaavio"
 
-#: ../objects/Jackson/phenomenon.c:136
+#: ../objects/Jackson/phenomenon.c:135
 msgid "Shared"
 msgstr "Jaettu"
 
-#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
+#: ../objects/Jackson/phenomenon.c:136 ../objects/KAOS/goal.c:79
 msgid "Requirement"
 msgstr "Vaatimus"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:153
-#: ../objects/UML/message.c:155
+#: ../objects/Jackson/phenomenon.c:143 ../objects/UML/message.c:149
+#: ../objects/UML/message.c:151
 msgid "Message:"
 msgstr "Viesti:"
 
-#: ../objects/KAOS/goal.c:82
+#: ../objects/KAOS/goal.c:80
 msgid "Assumption"
 msgstr "Oletus"
 
-#: ../objects/KAOS/goal.c:83
+#: ../objects/KAOS/goal.c:81
 msgid "Obstacle"
 msgstr "Este"
 
-#: ../objects/KAOS/goal.c:580
+#: ../objects/KAOS/goal.c:573
 msgid "KAOS goal"
 msgstr "KAOS-tavoite"
 
@@ -4487,172 +5190,226 @@ msgstr "KAOS-tavoite"
 msgid "KAOS diagram"
 msgstr "KAOS-kaavio"
 
-#: ../objects/KAOS/metaandorrel.c:153
+#: ../objects/KAOS/metaandorrel.c:152
 msgid "AND Refinement"
 msgstr "AND-tarkennus"
 
-#: ../objects/KAOS/metaandorrel.c:154
+#: ../objects/KAOS/metaandorrel.c:153
 msgid "Complete AND Refinement"
 msgstr "Täydellinen AND-tarkennus"
 
-#: ../objects/KAOS/metaandorrel.c:155
+#: ../objects/KAOS/metaandorrel.c:154
 msgid "OR Refinement"
 msgstr "OR-tarkennus"
 
-#: ../objects/KAOS/metaandorrel.c:156
+#: ../objects/KAOS/metaandorrel.c:155
 msgid "Operationalization"
 msgstr "Operationalisointi"
 
-#: ../objects/KAOS/metaandorrel.c:163
+#: ../objects/KAOS/metaandorrel.c:162
 msgid "Text:"
 msgstr "Teksti:"
 
-#: ../objects/KAOS/metabinrel.c:157
+#: ../objects/KAOS/metabinrel.c:156
 msgid "Contributes"
 msgstr "Avustaa"
 
-#: ../objects/KAOS/metabinrel.c:158
+#: ../objects/KAOS/metabinrel.c:157
 msgid "Obstructs"
 msgstr "Estää"
 
-#: ../objects/KAOS/metabinrel.c:159
+#: ../objects/KAOS/metabinrel.c:158
 msgid "Conflicts"
 msgstr "Konfliktoi"
 
-#: ../objects/KAOS/metabinrel.c:160
+#: ../objects/KAOS/metabinrel.c:159
 msgid "Responsibility"
 msgstr "Vastuu"
 
-#: ../objects/KAOS/metabinrel.c:161
+#: ../objects/KAOS/metabinrel.c:160
 msgid "Monitors"
 msgstr "Valvoo"
 
-#: ../objects/KAOS/metabinrel.c:162
+#: ../objects/KAOS/metabinrel.c:161
 msgid "Controls"
 msgstr "Hallitsee"
 
-#: ../objects/KAOS/metabinrel.c:163
+#: ../objects/KAOS/metabinrel.c:162
 msgid "CapableOf"
 msgstr "Kykenevä"
 
-#: ../objects/KAOS/metabinrel.c:164
+#: ../objects/KAOS/metabinrel.c:163
 msgid "Performs"
 msgstr "Suorittaa"
 
-#: ../objects/KAOS/metabinrel.c:166
+#: ../objects/KAOS/metabinrel.c:165
 msgid "Output"
 msgstr "Tuloste"
 
-#: ../objects/KAOS/other.c:533
+#: ../objects/KAOS/other.c:522
 msgid "KAOS other"
 msgstr "KAOS muu"
 
-#: ../objects/Misc/analog_clock.c:139
+#: ../objects/Misc/analog_clock.c:136
 msgid "Arrow color"
 msgstr "Nuolen väri"
 
-#: ../objects/Misc/analog_clock.c:141
+#: ../objects/Misc/analog_clock.c:138
 msgid "Arrow line width"
 msgstr "Nuolen viivan paksuus"
 
-#: ../objects/Misc/analog_clock.c:143
+#: ../objects/Misc/analog_clock.c:140
 msgid "Seconds arrow color"
 msgstr "Toisten nuolien väri"
 
-#: ../objects/Misc/analog_clock.c:145
+#: ../objects/Misc/analog_clock.c:142
 msgid "Seconds arrow line width"
 msgstr "Toisten nuolien viivojen paksuus"
 
-#: ../objects/Misc/analog_clock.c:147
+#: ../objects/Misc/analog_clock.c:144
 msgid "Show hours"
 msgstr "Näytä tunnit"
 
-#: ../objects/Misc/grid_object.c:140
+#: ../objects/Misc/diagram_as_object.c:112
+#, fuzzy
+#| msgid "Dia Diagram File"
+msgid "Diagram file"
+msgstr "Dia-kaaviotiedosto"
+
+#: ../objects/Misc/grid_object.c:137
 msgid "Rows"
 msgstr "Rivejä"
 
-#: ../objects/Misc/grid_object.c:142
+#: ../objects/Misc/grid_object.c:139
 msgid "Columns"
 msgstr "Sarakkeita"
 
-#: ../objects/Misc/grid_object.c:144
-msgid "Gridline color"
+#: ../objects/Misc/grid_object.c:141
+#, fuzzy
+#| msgid "Gridline color"
+msgid "Grid line color"
 msgstr "Ruudukkoviivan väri"
 
-#: ../objects/Misc/grid_object.c:146
-msgid "Gridline width"
-msgstr "Ruudukkoviivan paksuus" 
+#: ../objects/Misc/grid_object.c:143
+#, fuzzy
+#| msgid "Gridline width"
+msgid "Grid line width"
+msgstr "Ruudukkoviivan paksuus"
 
-#: ../objects/Misc/libmisc.c:41
+#: ../objects/Misc/libmisc.c:42
 msgid "Miscellaneous objects"
 msgstr "Sekalaiset objektit"
 
-#: ../objects/Misc/measure.c:170
+#: ../objects/Misc/measure.c:168
+#, fuzzy
+#| msgid "cm"
+msgctxt "length unit"
 msgid "cm"
 msgstr "cm"
 
-#: ../objects/Misc/measure.c:171
+#: ../objects/Misc/measure.c:169
+#, fuzzy
+#| msgid "dm"
+msgctxt "length unit"
 msgid "dm"
 msgstr "dm"
 
-#: ../objects/Misc/measure.c:172
+#: ../objects/Misc/measure.c:170
+#, fuzzy
+#| msgid "ft"
+msgctxt "length unit"
 msgid "ft"
 msgstr "ft"
 
-#: ../objects/Misc/measure.c:173
+#: ../objects/Misc/measure.c:171
+#, fuzzy
+#| msgid "in"
+msgctxt "length unit"
 msgid "in"
 msgstr "in"
 
-#: ../objects/Misc/measure.c:174
+#: ../objects/Misc/measure.c:172
+#, fuzzy
+#| msgid "m"
+msgctxt "length unit"
 msgid "m"
 msgstr "m"
 
-#: ../objects/Misc/measure.c:175
+#: ../objects/Misc/measure.c:173
+#, fuzzy
+#| msgid "mm"
+msgctxt "length unit"
 msgid "mm"
 msgstr "mm"
 
-#: ../objects/Misc/measure.c:176
+#: ../objects/Misc/measure.c:174
+#, fuzzy
+#| msgid "pt"
+msgctxt "length unit"
 msgid "pt"
 msgstr "pt"
 
-#: ../objects/Misc/measure.c:177
+#: ../objects/Misc/measure.c:175
+#, fuzzy
+#| msgid "pi"
+msgctxt "length unit"
 msgid "pi"
 msgstr "pi"
 
 #. PROP_FLAG_VISIBLE|
-#: ../objects/Misc/measure.c:186 ../sheets/ChemEng.sheet.in.h:28
+#: ../objects/Misc/measure.c:184 ../sheets/ChemEng.sheet.in.h:8
 msgid "Measurement"
 msgstr "Mittaus"
 
-#: ../objects/Misc/measure.c:188
+#: ../objects/Misc/measure.c:186
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: ../objects/Misc/measure.c:189
+#: ../objects/Misc/measure.c:187
 msgid "Precision"
 msgstr "Tarkkuus"
 
-#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
+#: ../objects/Misc/tree.c:597 ../objects/network/bus.c:605
 msgid "Add Handle"
 msgstr "Lisää kahva"
 
-#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
+#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
 msgid "Delete Handle"
 msgstr "Poista kahva"
 
-#: ../objects/SADT/arrow.c:137
+#: ../objects/network/basestation.c:134
+msgid "Sectors"
+msgstr "Sektorit"
+
+#: ../objects/network/basestation.c:392 ../objects/network/basestation.c:394
+msgid "Base Station"
+msgstr "Tukiasema"
+
+#: ../objects/network/network.c:41
+msgid "Network diagram objects"
+msgstr "Verkkokaavio-objektit"
+
+#: ../objects/network/radiocell.c:119
+msgid "Radius"
+msgstr "Säde"
+
+#: ../objects/network/wanlink.c:119
+msgid "Width"
+msgstr "Leveys"
+
+#: ../objects/SADT/arrow.c:136
 msgid "Import resource (not shown upstairs)"
 msgstr "Tuo lähde muualta (ei näy ylöspäin)"
 
-#: ../objects/SADT/arrow.c:138
+#: ../objects/SADT/arrow.c:137
 msgid "Imply resource (not shown downstairs)"
 msgstr "Viittaa lähteeseen (ei näy alaspäin)"
 
-#: ../objects/SADT/arrow.c:139
+#: ../objects/SADT/arrow.c:138
 msgid "Dotted arrow"
 msgstr "Pistenuoli"
 
-#: ../objects/SADT/arrow.c:140
+#: ../objects/SADT/arrow.c:139
 msgid "disable arrow heads"
 msgstr "Poista käytöstä nuolenpäät"
 
@@ -4672,25 +5429,21 @@ msgstr ""
 "Lukemisen helpottamiseksi virrat, jotka alkavat ja päättyvät pystyssä, "
 "voidaan piirtää harmaalla"
 
-#: ../objects/SADT/arrow.c:465
+#: ../objects/SADT/arrow.c:468
 msgid "SADT Arrow"
 msgstr "SADT-nuoli"
 
-#: ../objects/SADT/box.c:139 ../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 "Tekstin täyttö"
-
-#: ../objects/SADT/box.c:146
+#: ../objects/SADT/box.c:144
 msgid "Activity/Data identifier"
 msgstr "Toiminnan/Tiedon tunnistaja"
 
-#: ../objects/SADT/box.c:147
-msgid "The identifier which appears in the lower right corner of the Box"
+#: ../objects/SADT/box.c:145
+#, fuzzy
+#| msgid "The identifier which appears in the lower right corner of the Box"
+msgid "The identifier which appears in the lower-right corner of the Box"
 msgstr "Tunniste, joka näkyy laatikon oikeassa alareunassa"
 
-#: ../objects/SADT/box.c:455
+#: ../objects/SADT/box.c:448
 msgid "SADT box"
 msgstr "SADT-laatikko"
 
@@ -4698,880 +5451,680 @@ msgstr "SADT-laatikko"
 msgid "SADT diagram objects"
 msgstr "SADT-kaavio-objektit"
 
-#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
-msgid "No Protection"
-msgstr "Ei turvaa"
-
-#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
-msgid "Restricted Diffusion"
-msgstr "Rajattu diffuusio"
-
-#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
-msgid "Special Country Confidential"
-msgstr ""
+#: ../objects/standard/arc.c:120
+msgid "Curve distance"
+msgstr "Polun etäisyys"
 
-#: ../objects/SISSI/classification.h:41
-msgid "Confidential"
-msgstr "Luottamuksellinen"
+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:126
+#: ../objects/standard/polyline.c:108
+msgid "Line gaps"
+msgstr "Rivivälit"
 
-#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
-msgid "NATO Confidential"
-msgstr "NATO-luottamuksellin"
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:128
+#: ../objects/standard/polyline.c:110
+msgid "Absolute start gap"
+msgstr "Absoluuttinen alkuväli"
 
-#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
-msgid "Personal Confidential"
-msgstr "Henkiökohtainen luottamuksellinen"
+#: ../objects/standard/bezier.c:149 ../objects/standard/line.c:130
+#: ../objects/standard/polyline.c:112
+msgid "Absolute end gap"
+msgstr "Absoluuttinen lopetusväli"
 
-#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
-msgid "Medical Confidential"
-msgstr ""
+#: ../objects/standard/bezier.c:776 ../objects/standard/beziergon.c:539
+msgid "Add Segment"
+msgstr "Lisää osa"
 
-#: ../objects/SISSI/classification.h:45
-msgid "Industrie Confidential"
-msgstr ""
+#: ../objects/standard/bezier.c:777 ../objects/standard/beziergon.c:540
+msgid "Delete Segment"
+msgstr "Poista osa"
 
-#: ../objects/SISSI/classification.h:46
-msgid "Defense Confidential"
-msgstr ""
+#: ../objects/standard/bezier.c:779 ../objects/standard/beziergon.c:542
+msgid "Symmetric control"
+msgstr "Symmetrinen kontrolli"
 
-#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
-msgid "Secret"
-msgstr "Salainen"
+#: ../objects/standard/bezier.c:781 ../objects/standard/beziergon.c:544
+msgid "Smooth control"
+msgstr "Pehmeä kontrolli"
 
-#: ../objects/SISSI/classification.h:48
-msgid "Defense Secret"
-msgstr ""
+#: ../objects/standard/bezier.c:783 ../objects/standard/beziergon.c:546
+msgid "Cusp control"
+msgstr "Leikkauspiste kontrolli"
 
-#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
-msgid "Secret special country"
-msgstr "Salainen, erityinen maa"
+#: ../objects/standard/box.c:130 ../objects/standard/ellipse.c:120
+msgid "Free"
+msgstr "Vapaa"
 
-#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
-msgid "NATO Secret"
-msgstr "NATO-salainen"
+#: ../objects/standard/box.c:131 ../objects/standard/ellipse.c:121
+msgid "Fixed"
+msgstr "Kiinnitetty"
 
-#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
-msgid "Very Secret"
-msgstr "Erittäin salainen"
+#: ../objects/standard/box.c:132 ../objects/standard/box.c:782
+msgid "Square"
+msgstr "Neliö"
 
-#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
-msgid "NATO Very Secret"
-msgstr "NATOn erittäin salainen"
+#: ../objects/standard/box.c:146 ../objects/standard/ellipse.c:133
+msgid "Aspect ratio"
+msgstr "Kuvasuhde"
 
-#: ../objects/SISSI/sissi.c:66
-msgid "SISSI diagram"
-msgstr "SISSI-kaavio"
+#: ../objects/standard/box.c:778 ../objects/standard/ellipse.c:686
+msgid "Free aspect"
+msgstr "Vapaa suhde"
 
-#: ../objects/SISSI/sissi.c:923
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Not a regular file: %s"
-msgstr ""
-"Virhe ladattaessa kohdetta.\n"
-"Ei ole tavallinen tiedosto: %s"
+#: ../objects/standard/box.c:780 ../objects/standard/ellipse.c:688
+msgid "Fixed aspect"
+msgstr "Kiinnitetty suhde"
 
-#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Incorrect file type: %s"
-msgstr ""
-"Virhe ladattaessa kohdetta.\n"
-"Tuntematon tiedostotyyppi: %s"
+#: ../objects/standard/ellipse.c:122 ../objects/standard/ellipse.c:690
+msgid "Circle"
+msgstr "Ympyrä"
 
-#: ../objects/SISSI/sissi.c:940
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Not a Dia file: %s"
-msgstr ""
-"Virhe ladattaessa kohdetta.\n"
-"Ei ole Dia-tiedosto: %s"
+#: ../objects/standard/image.c:118
+msgid "Image file"
+msgstr "Kuvatiedosto"
 
-#: ../objects/SISSI/sissi_dialog.c:48
-msgid "Industrial Confidential"
-msgstr ""
+#: ../objects/standard/image.c:120
+#, fuzzy
+#| msgid "Time data"
+msgid "Inline data"
+msgstr "Aikatieto"
 
-#: ../objects/SISSI/sissi_dialog.c:58
-msgid "No integrity"
+#: ../objects/standard/image.c:120
+msgid "Store image data in diagram"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:59
-msgid "Low integrity"
+#: ../objects/standard/image.c:122
+msgid "Pixbuf"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:60
-msgid "Average software integrity"
-msgstr ""
+#: ../objects/standard/image.c:122
+#, fuzzy
+#| msgid "Preferences"
+msgid "The Pixbuf reference"
+msgstr "Asetukset"
 
-#: ../objects/SISSI/sissi_dialog.c:61
-msgid "High software integrity"
-msgstr ""
+#: ../objects/standard/image.c:124
+msgid "Draw border"
+msgstr "Piirrä raja"
 
-#: ../objects/SISSI/sissi_dialog.c:62
-msgid "Average hardware integrity"
-msgstr ""
+#: ../objects/standard/image.c:126
+msgid "Keep aspect ratio"
+msgstr "Säilytä suhde"
 
-#: ../objects/SISSI/sissi_dialog.c:63
-msgid "High hardware integrity"
+#: ../objects/standard/image.c:687
+msgid "Inconsistent pixbuf during image save."
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:68
-msgid "Millisecond"
-msgstr "Millisekunti"
-
-#: ../objects/SISSI/sissi_dialog.c:69
-msgid "Second"
-msgstr "Sekunti"
-
-#: ../objects/SISSI/sissi_dialog.c:70
-msgid "Minute"
-msgstr "Minuutti"
-
-#: ../objects/SISSI/sissi_dialog.c:71
-msgid "Hour"
-msgstr "Tunti"
-
-#: ../objects/SISSI/sissi_dialog.c:72
-msgid "Day"
-msgstr "Päivä"
-
-#: ../objects/SISSI/sissi_dialog.c:73
-msgid "Week"
-msgstr "Viikko"
-
-#: ../objects/SISSI/sissi_dialog.c:78
-msgid "SYSTEM"
-msgstr "JÄRJESTELMÄ"
-
-#: ../objects/SISSI/sissi_dialog.c:79
-msgid "Internet access device"
-msgstr "Internet-pääsylaite"
-
-#: ../objects/SISSI/sissi_dialog.c:80
-msgid "Electronic messaging"
-msgstr "Sähköinen viestintä"
-
-#: ../objects/SISSI/sissi_dialog.c:81
-msgid "Intranet"
-msgstr "Internet"
-
-#: ../objects/SISSI/sissi_dialog.c:82
-msgid "Company directory"
-msgstr "Yrityshakemisto"
-
-#: ../objects/SISSI/sissi_dialog.c:83
-msgid "External portal"
-msgstr "Ulkoinen portaali"
-
-#: ../objects/SISSI/sissi_dialog.c:88
-msgid "ORGANISATION"
-msgstr "ORGANISAATIO"
-
-#: ../objects/SISSI/sissi_dialog.c:89
-msgid "Higher-tier organisation"
-msgstr "Ylemmän tason organisaatio"
-
-#: ../objects/SISSI/sissi_dialog.c:90
-msgid "Structure of the organisation"
-msgstr "Organisaation rakenne"
-
-#: ../objects/SISSI/sissi_dialog.c:91
-msgid "Project or system organisation"
-msgstr "Projekti tai järjestelmäorganisaatio"
-
-#: ../objects/SISSI/sissi_dialog.c:92
-msgid "Subcontractors / Suppliers / Manufacturers"
-msgstr "Alihankkijat, toimittajat ja valmistajat"
-
-#: ../objects/SISSI/sissi_dialog.c:97
-msgid "SITE"
-msgstr "PAIKKA"
-
-#: ../objects/SISSI/sissi_dialog.c:98
-msgid "Places"
-msgstr "Sijainnit"
-
-#: ../objects/SISSI/sissi_dialog.c:99
-msgid "External environment"
-msgstr "Ulkoinen ympäristö"
-
-#: ../objects/SISSI/sissi_dialog.c:100
-msgid "Premises"
-msgstr "Tilat"
-
-#: ../objects/SISSI/sissi_dialog.c:101
-msgid "Zone"
-msgstr "Alue"
-
-#: ../objects/SISSI/sissi_dialog.c:102
-msgid "Essential Services"
-msgstr "Välttämättömät palvelut"
-
-#: ../objects/SISSI/sissi_dialog.c:103
-msgid "Communication"
-msgstr "Tietoliikenne"
-
-#: ../objects/SISSI/sissi_dialog.c:104
-msgid "Power"
-msgstr "Virta"
-
-#: ../objects/SISSI/sissi_dialog.c:105
-msgid "Cooling / Pollution"
-msgstr "Viilentyminen / saasteet"
-
-#: ../objects/SISSI/sissi_dialog.c:109
-msgid "Thermal detection"
-msgstr "Lämmön havaitseminen"
-
-#: ../objects/SISSI/sissi_dialog.c:113
-msgid "Fire detection"
-msgstr "Tulen havaitseminen"
-
-#: ../objects/SISSI/sissi_dialog.c:117
-msgid "Water detection"
-msgstr "Veden havaitseminen"
-
-#: ../objects/SISSI/sissi_dialog.c:121
-msgid "Air detection"
-msgstr "Ilman havaitseminen"
-
-#: ../objects/SISSI/sissi_dialog.c:125
-msgid "Energy detection"
-msgstr "Energian havaitseminen"
-
-#: ../objects/SISSI/sissi_dialog.c:129
-msgid "Intrusion detection"
-msgstr "Hyökkäyksen havaitseminen"
-
-#: ../objects/SISSI/sissi_dialog.c:133
-msgid "Thermal action"
-msgstr "Lämpötilan havaitseminen"
-
-#: ../objects/SISSI/sissi_dialog.c:137
-msgid "Fire action"
-msgstr "Tulitoimenpide"
-
-#: ../objects/SISSI/sissi_dialog.c:141
-msgid "Water action"
-msgstr "Vesitoimenpide"
-
-#: ../objects/SISSI/sissi_dialog.c:145
-msgid "Air action"
-msgstr "Ilmatoimenpide"
-
-#: ../objects/SISSI/sissi_dialog.c:149
-msgid "Energy action"
-msgstr "Energiatoimenpide"
-
-#: ../objects/SISSI/sissi_dialog.c:153
-msgid "Intrusion action"
-msgstr "Hyökkäystoimenpide"
-
-#: ../objects/SISSI/sissi_dialog.c:158
-msgid "Personal"
-msgstr "Henkilökohtainen"
-
-#: ../objects/SISSI/sissi_dialog.c:159
-msgid "Decision maker"
-msgstr "Päätöksentekijä"
-
-#: ../objects/SISSI/sissi_dialog.c:160
-msgid "SSI Responsible"
-msgstr "SSI-vastuullinen"
-
-#: ../objects/SISSI/sissi_dialog.c:161
-msgid "Users"
-msgstr "Käyttäjät"
-
-#: ../objects/SISSI/sissi_dialog.c:162
-msgid "Functional administrator"
-msgstr "Funktionaalinen ylläpitäjä"
-
-#: ../objects/SISSI/sissi_dialog.c:163
-msgid "Technical administrator"
-msgstr "Tekninen ylläpitäjä"
-
-#: ../objects/SISSI/sissi_dialog.c:164
-msgid "SSI administrator"
-msgstr "SSI-ylläpitäjä"
-
-#: ../objects/SISSI/sissi_dialog.c:165
-msgid "Developer"
-msgstr "Kehittäjä"
-
-#: ../objects/SISSI/sissi_dialog.c:166
-msgid "Operator / Maintenance"
-msgstr "Operaattori / ylläpito"
-
-#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
-msgid "Network"
-msgstr "Verkko"
-
-#: ../objects/SISSI/sissi_dialog.c:172
-msgid "Medium and support"
-msgstr "Media ja tuki"
-
-#: ../objects/SISSI/sissi_dialog.c:173
-msgid "Passive or active relay"
-msgstr "Passiivinen tai aktiivinen rele"
-
-#: ../objects/SISSI/sissi_dialog.c:174
-msgid "Communication interface"
+#. Found file in same dir as diagram.
+#. Found file in current dir.
+#: ../objects/standard/image.c:784 ../objects/standard/image.c:795
+#, fuzzy, c-format
+#| msgid ""
+#| "The image file '%s' was not found in that directory.\n"
+#| "Using the file '%s' instead\n"
+msgid ""
+"The image file '%s' was not found in the specified directory.\n"
+"Using the file '%s' instead.\n"
 msgstr ""
+"Kuvatiedostoa \"%s\" ei löytynyt hakemistosta.\n"
+"Käytetään tiedostoa \"%s\"\n"
 
-#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
-msgid "Software"
-msgstr "Ohjelmisto"
-
-#: ../objects/SISSI/sissi_dialog.c:180
-msgid "Operating System"
-msgstr "Käyttöjärjestelmä"
-
-#: ../objects/SISSI/sissi_dialog.c:181
-msgid "Service - maintenance or administration software"
-msgstr "Palvelu - ylläpito- tai hallintaohjelmisto"
-
-#: ../objects/SISSI/sissi_dialog.c:182
-msgid "Packaged software or standard software"
-msgstr "Paketoitu- tai varusohjelmisto"
-
-#: ../objects/SISSI/sissi_dialog.c:183
-msgid "Business application"
-msgstr "Liikesovellus"
-
-#: ../objects/SISSI/sissi_dialog.c:184
-msgid "Standard business application"
-msgstr "Standardi liikesovellus"
-
-#: ../objects/SISSI/sissi_dialog.c:185
-msgid "Specific business application"
-msgstr "Erityinen liikesovellus"
-
-#: ../objects/SISSI/sissi_dialog.c:190
-msgid "HARDWARE"
-msgstr "LAITTEISTO"
+#. Didn't find file in current dir.
+#: ../objects/standard/image.c:801 ../objects/standard/image.c:823
+#, c-format
+msgid "The image file '%s' was not found.\n"
+msgstr "Kuvatiedostoa \"%s\" ei löytynyt.\n"
 
-#: ../objects/SISSI/sissi_dialog.c:191
-msgid "Data-processing equipment (active)"
-msgstr "Tiedonkäsittelylaitteisto (aktiivinen)"
+#: ../objects/standard/line.c:117
+msgid "Arrows"
+msgstr "Nuolet"
 
-#: ../objects/SISSI/sissi_dialog.c:192
-msgid "Mobile equipment"
-msgstr "Liikkuva laitteisto"
+#: ../objects/standard/line.c:122
+msgid "Start point"
+msgstr "Aloituspiste"
 
-#: ../objects/SISSI/sissi_dialog.c:193
-msgid "Fixed equipment"
-msgstr "Kiinteä laitteisto"
+#: ../objects/standard/line.c:124
+msgid "End point"
+msgstr "Lopetuspiste"
 
-#: ../objects/SISSI/sissi_dialog.c:194
-msgid "Peripheral processing"
+#: ../objects/standard/line.c:320
+msgid "Upgrade to Polyline"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:195
-msgid "Electronic medium"
-msgstr "Elektroninen media"
-
-#: ../objects/SISSI/sissi_dialog.c:196
-msgid "Other media"
-msgstr "Muut mediat"
-
-#: ../objects/SISSI/sissi_dialog.c:197
-msgid "Data medium (passive)"
-msgstr "Tietomedia (passiivinen)"
+#: ../objects/standard/line.c:321
+#, fuzzy
+#| msgid "Zigzagline"
+msgid "Upgrade to Zigzagline"
+msgstr "Siksakkiviiva"
 
-#. Class page:
-#: ../objects/SISSI/sissi_dialog.c:301
-msgid "_Menace"
-msgstr ""
+#: ../objects/standard/outline.c:102
+msgid "Text content"
+msgstr "Tekstisisältö"
 
-#. ********* label of board *********
-#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
-msgid "Menace"
+#: ../objects/standard/outline.c:104
+msgid "Angle to rotate the outline"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
-msgid "P Action"
-msgstr "P-toimenpide"
-
-#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
-msgid "P Detection"
-msgstr "P-havaitseminen"
-
-#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
-msgid "Vulnerability"
-msgstr "Haavoittuvuus"
+#: ../objects/standard/polygon.c:486 ../objects/standard/polyline.c:623
+msgid "Add Corner"
+msgstr "Lisää kulma"
 
-#. Other properties of page:
-#: ../objects/SISSI/sissi_dialog.c:488
-msgid "Other properties"
-msgstr "Muut ominaisuudet"
+#: ../objects/standard/polygon.c:487 ../objects/standard/polyline.c:624
+msgid "Delete Corner"
+msgstr "Poista kulma"
 
-#. ********* selection menu of entity ********
-#. ********* Label of board *********
-#: ../objects/SISSI/sissi_dialog.c:726
-msgid "Label"
-msgstr "Otsikko"
+#: ../objects/standard/standard.c:58
+msgid "Standard objects"
+msgstr "Vakio-objektit"
 
-#: ../objects/SISSI/sissi_dialog.c:728
-msgid "value"
-msgstr "arvo"
+#: ../objects/standard/textobj.c:112
+msgid "First Line"
+msgstr "Ensimmäinen viiva"
 
-#. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:862
-msgid "Documents"
-msgstr "Asiakirjat"
+#: ../objects/standard/textobj.c:119
+msgid "Vertical text alignment"
+msgstr "Tekstin vaakasuuntainen tasaus"
 
-#: ../objects/SISSI/sissi_dialog.c:878
-msgid "Document title"
-msgstr "Asiakirjan nimi"
+#: ../objects/standard/zigzagline.c:448
+#, fuzzy
+#| msgid "Bezierline"
+msgid "Upgrade to Bezierline"
+msgstr "Bezier-viiva"
 
-#: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
-#: ../sheets/UML.sheet.in.h:2
+#: ../objects/UML/actor.c:351 ../objects/UML/actor.c:353
+#: ../sheets/UML.sheet.in.h:15
 msgid "Actor"
 msgstr "Tekijä"
 
-#: ../objects/UML/association.c:222
+#: ../objects/UML/association.c:221
 msgid "From A to B"
 msgstr "A:sta B:hen"
 
-#: ../objects/UML/association.c:223
+#: ../objects/UML/association.c:222
 msgid "From B to A"
 msgstr "B:stä A:han"
 
-#: ../objects/UML/association.c:228
+#: ../objects/UML/association.c:227
 msgid "Aggregation"
 msgstr "Kooste"
 
-#: ../objects/UML/association.c:229
+#: ../objects/UML/association.c:228
 msgid "Composition"
 msgstr "Koostumus"
 
-#: ../objects/UML/association.c:236
+#: ../objects/UML/association.c:238
 msgid "Direction"
 msgstr "Suunta"
 
-#: ../objects/UML/association.c:238
+#: ../objects/UML/association.c:240
 msgid "Show direction"
 msgstr "Näytä suunta"
 
-#: ../objects/UML/association.c:238
+#: ../objects/UML/association.c:240
 msgid "Show the small arrow denoting the reading direction"
 msgstr "Näytä pieni nuoli, joka kertoo lukusuunnan"
 
-#: ../objects/UML/association.c:245
+#: ../objects/UML/association.c:247
 msgid "Side A"
 msgstr "A-puoli"
 
-#: ../objects/UML/association.c:249
+#: ../objects/UML/association.c:251
 msgid "Multiplicity"
 msgstr "Monimuotoisuus"
 
-#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/association.c:253 ../objects/UML/umlattribute.c:45
 #: ../objects/UML/umloperation.c:71
 msgid "Visibility"
 msgstr "Näkyvyys"
 
-#: ../objects/UML/association.c:253
+#: ../objects/UML/association.c:255
 msgid "Show arrow"
 msgstr "Näytä nuoli"
 
-#: ../objects/UML/association.c:256
+#: ../objects/UML/association.c:258
 msgid "Side B"
 msgstr "B-puoli"
 
-#: ../objects/UML/class.c:142 ../objects/UML/class.c:325
-#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:6
+#. Attributes page:
+#: ../objects/UML/class_attributes_dialog.c:455
+msgid "_Attributes"
+msgstr "_Määritteet"
+
+#: ../objects/UML/class_attributes_dialog.c:507
+msgid "Attribute data"
+msgstr "Attribuuttidata"
+
+#: ../objects/UML/class_attributes_dialog.c:539
+msgid "Value:"
+msgstr "Arvo:"
+
+#: ../objects/UML/class_attributes_dialog.c:550
+#: ../objects/UML/class_dialog.c:343
+#: ../objects/UML/class_operations_dialog.c:848
+#: ../objects/UML/class_operations_dialog.c:1010
+msgid "Comment:"
+msgstr "Kommentti:"
+
+#: ../objects/UML/class_attributes_dialog.c:572
+#: ../objects/UML/class_operations_dialog.c:811
+msgid "Visibility:"
+msgstr "Näkyvyys:"
+
+#: ../objects/UML/class_attributes_dialog.c:577
+#: ../objects/UML/class_operations_dialog.c:816 ../objects/UML/uml.c:103
+msgid "Public"
+msgstr "Julkinen"
+
+#: ../objects/UML/class_attributes_dialog.c:578
+#: ../objects/UML/class_operations_dialog.c:817 ../objects/UML/uml.c:104
+msgid "Private"
+msgstr "Yksityinen"
+
+#: ../objects/UML/class_attributes_dialog.c:579
+#: ../objects/UML/class_operations_dialog.c:818 ../objects/UML/uml.c:105
+msgid "Protected"
+msgstr "Suojattu"
+
+#: ../objects/UML/class_attributes_dialog.c:580
+#: ../objects/UML/class_operations_dialog.c:819 ../objects/UML/uml.c:106
+msgid "Implementation"
+msgstr "Toimeenpano"
+
+#. end: Inheritance type
+#: ../objects/UML/class_attributes_dialog.c:592
+#: ../objects/UML/class_operations_dialog.c:840
+msgid "Class scope"
+msgstr "Luokan vaikutusalue"
+
+#: ../objects/UML/class.c:138 ../objects/UML/class.c:349
+#: ../objects/UML/class.c:1839 ../sheets/UML.sheet.in.h:3
 msgid "Class"
 msgstr "Luokka"
 
 #. how it used to be before 0.96+SVN
 #. one name, one type: but breaks forward-compatibiliy so kind of reverted
-#: ../objects/UML/class.c:146 ../objects/UML/classicon.c:140
-#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
-#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
-#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
+#: ../objects/UML/class.c:142 ../objects/UML/classicon.c:136
+#: ../objects/UML/classicon.c:138 ../objects/UML/component.c:123
+#: ../objects/UML/large_package.c:133 ../objects/UML/object.c:146
+#: ../objects/UML/small_package.c:125 ../objects/UML/umloperation.c:68
 msgid "Stereotype"
 msgstr "Stereotyyppi"
 
-#: ../objects/UML/class.c:150 ../objects/UML/class.c:183
-#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
-#: ../objects/UML/class_dialog.c:2083 ../objects/UML/uml.c:110
+#: ../objects/UML/class.c:149 ../objects/UML/class.c:205
+#: ../objects/UML/class_dialog.c:359 ../objects/UML/class_dialog.c:471
+#: ../objects/UML/class_operations_dialog.c:832
+#: ../objects/UML/umlattribute.c:48 ../objects/UML/uml.c:111
 msgid "Abstract"
 msgstr "Abstrakti"
 
-#: ../objects/UML/class.c:152 ../objects/UML/class.c:1770
-msgid "Template"
-msgstr "Malli"
-
-#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:477
-msgid "Suppress Attributes"
-msgstr "Ominaisuudet eivät näy"
-
-#: ../objects/UML/class.c:157
-msgid "Suppress Operations"
-msgstr "Operaatiot eivät näy"
-
-#: ../objects/UML/class.c:159
+#: ../objects/UML/class.c:151
 msgid "Visible Attributes"
 msgstr "Ominaisuudet näkyvissä"
 
-#: ../objects/UML/class.c:161
+#: ../objects/UML/class.c:153
 msgid "Visible Operations"
 msgstr "Operaatiot näkyvissä"
 
-#: ../objects/UML/class.c:163
+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:384
+msgid "Wrap Operations"
+msgstr "Pilko operaatiot"
+
+#: ../objects/UML/class.c:157
 msgid "Visible Comments"
 msgstr "Kommentit näkyvissä"
 
-#: ../objects/UML/class.c:165 ../objects/UML/class_dialog.c:493
-msgid "Wrap Operations"
-msgstr "Pilko operaatiot"
+#: ../objects/UML/class.c:161 ../objects/UML/class.c:344
+#, fuzzy
+#| msgid "Hollow Triangle"
+msgid "Allow resizing"
+msgstr "Ontto kolmio"
+
+#: ../objects/UML/class.c:165 ../objects/UML/class.c:1836
+msgid "Template"
+msgstr "Malli"
+
+#: ../objects/UML/class.c:167 ../objects/UML/class_dialog.c:368
+msgid "Suppress Attributes"
+msgstr "Ominaisuudet eivät näy"
+
+#: ../objects/UML/class.c:169
+msgid "Suppress Operations"
+msgstr "Operaatiot eivät näy"
 
-#: ../objects/UML/class.c:167
+#: ../objects/UML/class.c:171
 msgid "Wrap after char"
 msgstr "Pilko merkin jälkeen"
 
-#: ../objects/UML/class.c:169
+#: ../objects/UML/class.c:173
 msgid "Comment line length"
 msgstr "Kommenttiviivan pituus"
 
-#: ../objects/UML/class.c:181 ../objects/UML/class_dialog.c:575
-msgid "Polymorphic"
-msgstr "Polymorfinen"
-
-#: ../objects/UML/class.c:185
-msgid "Classname"
-msgstr "Luokan nimi"
-
-#: ../objects/UML/class.c:187
-msgid "Abstract Classname"
-msgstr "Abstraktin luokan nimi"
-
-#: ../objects/UML/class.c:211
+#. umlattribute_extra
+#: ../objects/UML/class.c:186
 msgid "Operations"
 msgstr "Operaatiot"
 
-#: ../objects/UML/class.c:214
+#. umloperations_extra
+#: ../objects/UML/class.c:190
 msgid "Template Parameters"
 msgstr "Malliparametrit"
 
-#: ../objects/UML/class.c:320
-msgid "Show Comments"
-msgstr "Näytä kommentit"
+#: ../objects/UML/class.c:203 ../objects/UML/class_dialog.c:466
+msgid "Polymorphic"
+msgstr "Polymorfinen"
+
+#: ../objects/UML/class.c:207 ../objects/UML/class_dialog.c:476
+msgid "Class Name"
+msgstr "Luokan nimi"
+
+#: ../objects/UML/class.c:209
+#, fuzzy
+#| msgid "Abstract Classname"
+msgid "Abstract Class Name"
+msgstr "Abstraktin luokan nimi"
 
 #. Class page:
-#: ../objects/UML/class_dialog.c:429
+#: ../objects/UML/class_dialog.c:320
 msgid "_Class"
 msgstr "_Luokka"
 
-#: ../objects/UML/class_dialog.c:437
+#: ../objects/UML/class_dialog.c:328
 msgid "Class name:"
 msgstr "Luokan nimi:"
 
-#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2032
-#: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
-#: ../objects/UML/realizes.c:136
+#: ../objects/UML/class_dialog.c:336
+#: ../objects/UML/class_operations_dialog.c:799
+#: ../objects/UML/dependency.c:134 ../objects/UML/generalization.c:131
+#: ../objects/UML/realizes.c:131
 msgid "Stereotype:"
 msgstr "Stereotyyppi:"
 
-#: ../objects/UML/class_dialog.c:474
+#: ../objects/UML/class_dialog.c:365
 msgid "Attributes visible"
 msgstr "Ominaisuudet näkyvät"
 
-#: ../objects/UML/class_dialog.c:483
+#: ../objects/UML/class_dialog.c:374
 msgid "Operations visible"
 msgstr "Operaatiot näkyvät"
 
-#: ../objects/UML/class_dialog.c:486
+#: ../objects/UML/class_dialog.c:377
 msgid "Suppress operations"
 msgstr "Operaatiot eivät näy"
 
-#: ../objects/UML/class_dialog.c:500
+#: ../objects/UML/class_dialog.c:391
 msgid "Wrap after this length: "
 msgstr "Pilko tämän pituuden jälkeen: "
 
-#: ../objects/UML/class_dialog.c:508
+#: ../objects/UML/class_dialog.c:399
 msgid "Comments visible"
 msgstr "Kommentit näkyvät"
 
-#: ../objects/UML/class_dialog.c:515
+#: ../objects/UML/class_dialog.c:406
 msgid "Wrap comment after this length: "
 msgstr "Katkaise pidemmät kommentit kuin: "
 
-#: ../objects/UML/class_dialog.c:585
-msgid "Class Name"
-msgstr "Luokan nimi"
+#: ../objects/UML/class_dialog.c:413
+msgid "Show documentation tag"
+msgstr "Näytä dokumentointitagi"
+
+#. * Fonts and Colors selection *
+#: ../objects/UML/class_dialog.c:442
+msgid "_Style"
+msgstr "_Tyyli"
+
+#. head line
+#: ../objects/UML/class_dialog.c:452 ../objects/UML/umlparameter.c:51
+msgid "Kind"
+msgstr "Laji"
 
-#: ../objects/UML/class_dialog.c:590
+#: ../objects/UML/class_dialog.c:457
+msgid "Size"
+msgstr "Koko"
+
+#: ../objects/UML/class_dialog.c:481
 msgid "Abstract Class"
 msgstr "Abstrakti luokka"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:607
+#: ../objects/UML/class_dialog.c:498
 msgid "Line Width"
 msgstr "Viivan paksuus"
 
-#: ../objects/UML/class_dialog.c:616
+#: ../objects/UML/class_dialog.c:507
 msgid "Text Color"
 msgstr "Tekstin väri"
 
-#: ../objects/UML/class_dialog.c:624
+#: ../objects/UML/class_dialog.c:516
 msgid "Foreground Color"
 msgstr "Edustaväri"
 
-#: ../objects/UML/class_dialog.c:632
+#: ../objects/UML/class_dialog.c:525
 msgid "Background Color"
 msgstr "Taustaväri"
 
-#: ../objects/UML/class_dialog.c:1166
-msgid "Value:"
-msgstr "Arvo:"
-
-#: ../objects/UML/class_dialog.c:1199 ../objects/UML/class_dialog.c:2044
-msgid "Visibility:"
-msgstr "Näkyvyys:"
-
-#: ../objects/UML/class_dialog.c:1208 ../objects/UML/class_dialog.c:2053
-#: ../objects/UML/uml.c:102
-msgid "Public"
-msgstr "Julkinen"
-
-#: ../objects/UML/class_dialog.c:1211 ../objects/UML/class_dialog.c:2056
-#: ../objects/UML/uml.c:103
-msgid "Private"
-msgstr "Yksityinen"
-
-#: ../objects/UML/class_dialog.c:1214 ../objects/UML/class_dialog.c:2059
-#: ../objects/UML/uml.c:104
-msgid "Protected"
-msgstr "Suojattu"
-
-#: ../objects/UML/class_dialog.c:1217 ../objects/UML/class_dialog.c:2062
-#: ../objects/UML/uml.c:105
-msgid "Implementation"
-msgstr "Toimeenpano"
+#: ../objects/UML/classicon.c:128
+msgid "Boundary"
+msgstr "Raja"
 
-#. end: Inheritance type
-#: ../objects/UML/class_dialog.c:1233 ../objects/UML/class_dialog.c:2099
-msgid "Class scope"
-msgstr "Luokan vaikutusalue"
+#: ../objects/UML/classicon.c:141
+msgid "Is object"
+msgstr "On objekti"
 
 #. end: Visibility
-#: ../objects/UML/class_dialog.c:2074
+#: ../objects/UML/class_operations_dialog.c:827
 msgid "Inheritance type:"
 msgstr "Periytymisen tyyppi:"
 
-#: ../objects/UML/class_dialog.c:2086 ../objects/UML/uml.c:111
+#: ../objects/UML/class_operations_dialog.c:833 ../objects/UML/uml.c:112
 msgid "Polymorphic (virtual)"
 msgstr "Polymorfinen (virtuaalinen)"
 
-#: ../objects/UML/class_dialog.c:2089 ../objects/UML/uml.c:112
+#: ../objects/UML/class_operations_dialog.c:834 ../objects/UML/uml.c:113
 msgid "Leaf (final)"
 msgstr "Lehti (lopullinen)"
 
-#: ../objects/UML/class_dialog.c:2103
+#: ../objects/UML/class_operations_dialog.c:844
+#: ../objects/UML/umloperation.c:75
 msgid "Query"
 msgstr "Kysely"
 
-#: ../objects/UML/class_dialog.c:2150
+#: ../objects/UML/class_operations_dialog.c:888
 msgid "Parameters:"
 msgstr "Parametrit:"
 
-#: ../objects/UML/class_dialog.c:2235
+#: ../objects/UML/class_operations_dialog.c:966
 msgid "Parameter data"
 msgstr "Parametrin tiedot"
 
-#: ../objects/UML/class_dialog.c:2268
+#: ../objects/UML/class_operations_dialog.c:999
 msgid "Def. value:"
 msgstr "Oletusarvo:"
 
-#: ../objects/UML/class_dialog.c:2302
+#: ../objects/UML/class_operations_dialog.c:1030
 msgid "Direction:"
 msgstr "Suunta:"
 
-#: ../objects/UML/class_dialog.c:2311 ../objects/UML/umlparameter.c:34
+#: ../objects/UML/class_operations_dialog.c:1035
+#: ../objects/UML/umlparameter.c:34
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
-#: ../objects/UML/class_dialog.c:2314 ../objects/UML/umlparameter.c:35
+#: ../objects/UML/class_operations_dialog.c:1036
+#: ../objects/UML/umlparameter.c:35
 msgid "In"
 msgstr "Sisään"
 
-#: ../objects/UML/class_dialog.c:2317 ../objects/UML/umlparameter.c:36
+#: ../objects/UML/class_operations_dialog.c:1037
+#: ../objects/UML/umlparameter.c:36
 msgid "Out"
 msgstr "Ulos"
 
-#: ../objects/UML/class_dialog.c:2320 ../objects/UML/umlparameter.c:37
+#: ../objects/UML/class_operations_dialog.c:1038
+#: ../objects/UML/umlparameter.c:37
 msgid "In & Out"
 msgstr "Sisään ja ulos"
 
 #. Operations page:
-#: ../objects/UML/class_dialog.c:2355
+#: ../objects/UML/class_operations_dialog.c:1069
 msgid "_Operations"
 msgstr "_Operaatiot"
 
-#: ../objects/UML/class_dialog.c:2413
+#: ../objects/UML/class_operations_dialog.c:1124
 msgid "Operation data"
 msgstr "Operaatiodata"
 
 #. Templates page:
-#: ../objects/UML/class_dialog.c:2776
+#: ../objects/UML/class_templates_dialog.c:368
 msgid "_Templates"
 msgstr "_Mallit"
 
-#: ../objects/UML/class_dialog.c:2782 ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:4
 msgid "Template class"
 msgstr "Malliluokka"
 
-#: ../objects/UML/class_dialog.c:2839
+#: ../objects/UML/class_templates_dialog.c:426
 msgid "Formal parameter data"
 msgstr "Muodollisen parametrin tiedot"
 
-#: ../objects/UML/classicon.c:130
-msgid "Boundary"
-msgstr "Raja"
-
-#: ../objects/UML/classicon.c:145
-msgid "Is object"
-msgstr "On objekti"
-
-#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
+#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:21
 msgid "Facet"
 msgstr "Näkökohta"
 
-#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
+#: ../objects/UML/component_feature.c:149 ../sheets/UML.sheet.in.h:22
 msgid "Receptacle"
 msgstr "Säiliö"
 
-#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:23
 msgid "Event Source"
 msgstr "Tapahtumalähde"
 
-#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:24
 msgid "Event Sink"
 msgstr "Tapahtumakohde"
 
-#: ../objects/UML/constraint.c:127
+#: ../objects/UML/constraint.c:126
 msgid "Constraint:"
 msgstr "Rajoite:"
 
-#: ../objects/UML/dependency.c:141
+#: ../objects/UML/dependency.c:136
 msgid "Show arrow:"
 msgstr "Näytä nuoli:"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
-#: ../objects/UML/implements.c:131 ../objects/UML/implements.c:133
+#: ../objects/UML/implements.c:127 ../objects/UML/implements.c:129
 msgid "Interface:"
 msgstr "Liitäntä:"
 
-#: ../objects/UML/lifeline.c:152
+#: ../objects/UML/lifeline.c:164
 msgid "Draw focus of control:"
 msgstr "Piirrä kontrollin fokus:"
 
-#: ../objects/UML/lifeline.c:154
+#: ../objects/UML/lifeline.c:166
 msgid "Draw destruction mark:"
 msgstr "Piirrä hävitysmerkki:"
 
-#: ../objects/UML/lifeline.c:505
+#: ../objects/UML/lifeline.c:531
 msgid "Add connection points"
 msgstr "Lisää liitoskohtia"
 
-#: ../objects/UML/lifeline.c:506
+#: ../objects/UML/lifeline.c:532
 msgid "Remove connection points"
 msgstr "Poista liitoskohtia"
 
-#: ../objects/UML/lifeline.c:507
+#: ../objects/UML/lifeline.c:533
 msgid "Increase connection points distance"
 msgstr "Kasvata liitoskohtien etäisyyttä"
 
-#: ../objects/UML/lifeline.c:508
+#: ../objects/UML/lifeline.c:534
 msgid "Decrease connection points distance"
 msgstr "Pienennä liitoskohtien etäisyyttä"
 
-#: ../objects/UML/lifeline.c:509
+#: ../objects/UML/lifeline.c:535
 msgid "Set default connection points distance"
 msgstr "Aseta liitoskohtien etäisyyden oletusarvo"
 
-#: ../objects/UML/lifeline.c:513
+#: ../objects/UML/lifeline.c:539
 msgid "UML Lifeline"
 msgstr "UML-elämänjana"
 
-#: ../objects/UML/message.c:137
+#: ../objects/UML/message.c:136
 msgid "Call"
 msgstr "Kutsu"
 
-#: ../objects/UML/message.c:138
+#: ../objects/UML/message.c:137
 msgid "Create"
 msgstr "Luo"
 
-#: ../objects/UML/message.c:139
+#: ../objects/UML/message.c:138
 msgid "Destroy"
 msgstr "Hävitä"
 
-#: ../objects/UML/message.c:140
+#: ../objects/UML/message.c:139
 msgid "Simple"
 msgstr "Yksinkertainen"
 
-#: ../objects/UML/message.c:141
+#: ../objects/UML/message.c:140
 msgid "Return"
 msgstr "Paluu"
 
-#: ../objects/UML/message.c:142
+#: ../objects/UML/message.c:141
 msgid "Send"
 msgstr "Lähetä"
 
-#: ../objects/UML/message.c:143
+#: ../objects/UML/message.c:142
 msgid "Recursive"
 msgstr "Rekursiivinen"
 
-#: ../objects/UML/message.c:158
+#: ../objects/UML/message.c:153
 msgid "Message type:"
 msgstr "Viestin tyyppi:"
 
-#: ../objects/UML/object.c:155
+#: ../objects/UML/object.c:148
 msgid "Explicit state"
 msgstr "Eksplisiittinen tila"
 
-#: ../objects/UML/object.c:160
+#: ../objects/UML/object.c:153
 msgid "Active object"
 msgstr "Toiminnallinen objekti"
 
-#: ../objects/UML/object.c:162
+#: ../objects/UML/object.c:155
 msgid "Show attributes"
 msgstr "Näytä ominaisuudet"
 
-#: ../objects/UML/object.c:164
+#: ../objects/UML/object.c:157
 msgid "Multiple instance"
 msgstr "Moniperintä"
 
-#: ../objects/UML/state.c:155
+#: ../objects/UML/state.c:147
 msgid "Entry action"
 msgstr "Saapumistoiminto"
 
-#: ../objects/UML/state.c:156
+#: ../objects/UML/state.c:148
 msgid "Do action"
 msgstr "Tehtävä toiminto"
 
-#: ../objects/UML/state.c:157
+#: ../objects/UML/state.c:149
 msgid "Exit action"
 msgstr "Poistumistoiminto"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:479
+#: ../objects/UML/state.c:487
+#, fuzzy
+#| msgid ""
+#| "This diagram uses the State object for initial/final states.\n"
+#| "That option will go away in future versions.\n"
+#| "Please use the Initial/Final State object instead\n"
 msgid ""
 "This diagram uses the State object for initial/final states.\n"
-"That option will go away in future versions.\n"
-"Please use the Initial/Final State object instead\n"
+"This option will go away in future versions.\n"
+"Please use the Initial/Final State object instead.\n"
 msgstr ""
 "Tämä kaavio käyttää Tila-objekteja alku- ja lopputiloihin.\n"
 "Tämä valitsin jää pois tulevissa versioissa.\n"
 "Käytä mieluummin Alku- ja Lopputila-objekteja\n"
 
-#: ../objects/UML/state_term.c:127
+#: ../objects/UML/state_term.c:122
 msgid "Is final"
 msgstr "On lopullinen"
 
@@ -5591,7 +6144,7 @@ msgstr "Toiminta"
 msgid "Action to perform when this transition is taken"
 msgstr "Toiminto joka suoritetaan, kun tämä siirros tapahtuu"
 
-#: ../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 "Ehto"
 
@@ -5599,430 +6152,153 @@ msgstr "Ehto"
 msgid "Condition for taking this transition when the event is fired"
 msgstr "Ehto tämän siirtymän tapahtuman laukaisemiseen"
 
-#: ../objects/UML/uml.c:66
-msgid "Unified Modelling Language diagram objects UML 1.3"
-msgstr "Unified Modelling Language -kaavio-objektit UML 1.3"
-
-#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
-msgid "Value"
-msgstr "Arvo"
-
-#: ../objects/UML/umlattribute.c:47
-msgid "Abstract (?)"
-msgstr "Abstrakti (?)"
+#: ../objects/UML/umlattribute.c:50 ../objects/UML/umloperation.c:77
+msgid "Scope"
+msgstr ""
 
-#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
-msgid "Class scope (static)"
+#: ../objects/UML/umlattribute.c:50
+#, fuzzy
+#| msgid "Class scope (static)"
+msgid "Class scope (C++ static class variable)"
 msgstr "Luokan näkyvyysalue (staattinen)"
 
+#: ../objects/UML/uml.c:67
+msgid "Unified Modelling Language diagram objects UML 1.3"
+msgstr "Unified Modelling Language -kaavio-objektit UML 1.3"
+
 #: ../objects/UML/umloperation.c:73
-msgid "Inheritance type"
+#, fuzzy
+#| msgid "Inheritance type"
+msgid "Inheritance"
 msgstr "Periytymisen tyyppi"
 
 #: ../objects/UML/umloperation.c:75
-msgid "Query (const)"
-msgstr "Kysely (vakio)"
-
-#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
-msgid "Parameters"
-msgstr "Parametrit"
+msgid "C++ const method"
+msgstr ""
 
-#: ../objects/UML/usecase.c:136
-msgid "Text outside"
-msgstr "Teksti ulkopuolella"
+#: ../objects/UML/umloperation.c:77
+#, fuzzy
+#| msgid "Class scope (static)"
+msgid "Class scope (C++ static method)"
+msgstr "Luokan näkyvyysalue (staattinen)"
 
-#: ../objects/UML/usecase.c:138
+#: ../objects/UML/usecase.c:130
 msgid "Collaboration"
 msgstr "Myötävaikutus"
 
-#: ../objects/chronogram/chronogram.c:40
-msgid "Chronogram diagram objects"
-msgstr "Kronogrammikaavio-objektit"
-
-#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
-msgid "Data"
-msgstr "Tieto"
-
-#: ../objects/chronogram/chronoline.c:152
-msgid "Data name"
-msgstr "Tiedon nimi"
-
-#: ../objects/chronogram/chronoline.c:154
-msgid "Events"
-msgstr "Tapahtumat"
-
-#: ../objects/chronogram/chronoline.c:157
-msgid "Event specification"
-msgstr "Tapahtuman määrittely"
-
-# Tässä 'sanat' olis parempi jos esim. sais kursiivilla?
-#: ../objects/chronogram/chronoline.c:158
-msgid ""
-"@ time    set the pointer at an absolute time.\n"
-"( duration  sets the signal up, then wait 'duration'.\n"
-") duration  sets the signal down, then wait 'duration'.\n"
-"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
-"example : @ 1.0 (2.0)1.0(2.0)\n"
-msgstr ""
-"@ aika    aseta osoitin absoluuttiseen aikaan.\n"
-"( kesto   asettaa signaalin ylös, sitten odota 'kesto'.\n"
-") kesto   asettaa signaalin alas, sitten odota 'kesto'.\n"
-"u kesto   asettaa signaalin \"tuntematon\"-tilaan, sitten odota 'kesto'.\n"
-"esimerkki: @ 1.0 (2.0)1.0(2.0)\n"
-
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
-msgid "Start time"
-msgstr "Lähtöaika"
-
-#: ../objects/chronogram/chronoline.c:168
-#: ../objects/chronogram/chronoref.c:150
-msgid "End time"
-msgstr "Lopetusaika"
-
-#: ../objects/chronogram/chronoline.c:170
-msgid "Rise time"
-msgstr "Nousuaika"
-
-#: ../objects/chronogram/chronoline.c:172
-msgid "Fall time"
-msgstr "Laskuaika"
-
-#: ../objects/chronogram/chronoline.c:173
-msgid "Multi-bit data"
-msgstr "Monibittinen tieto"
-
-#: ../objects/chronogram/chronoline.c:175
-#: ../objects/chronogram/chronoref.c:158
-msgid "Aspect"
-msgstr "Näkökohta"
-
-#: ../objects/chronogram/chronoline.c:177
-msgid "Data color"
-msgstr "Tiedon väri"
-
-#: ../objects/chronogram/chronoline.c:179
-msgid "Data line width"
-msgstr "Tietojanan leveys"
-
-#: ../objects/chronogram/chronoref.c:146
-msgid "Time data"
-msgstr "Aikatieto"
-
-#: ../objects/chronogram/chronoref.c:152
-msgid "Major time step"
-msgstr "Suuri aika-askel"
-
-#: ../objects/chronogram/chronoref.c:154
-msgid "Minor time step"
-msgstr "Pieni aika-askel"
-
-#: ../objects/chronogram/chronoref.c:164
-msgid "Minor step line width"
-msgstr "Pienen askeleen jananleveys"
-
-#: ../objects/custom/custom.c:140
-msgid "Custom"
-msgstr "Räätälöity"
-
-#: ../objects/custom/custom.c:140
-msgid "Custom XML shapes loader"
-msgstr "Räätälöity XML-kuviolataaja"
-
-#: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
-msgid "Flip horizontal"
-msgstr "Pyöräytä vaakatasossa"
-
-#: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
-msgid "Flip vertical"
-msgstr "Pyöräytä pystytasossa"
-
-#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:244
-msgid "Scale of the subshapes"
-msgstr "Alimuotojen mittakaava"
-
-#: ../objects/custom/custom_object.c:1780
-msgid "Flip Horizontal"
-msgstr "Pyöräytä vaakatasossa"
-
-#: ../objects/custom/custom_object.c:1781
-msgid "Flip Vertical"
-msgstr "Pyöräytä pystytasossa"
-
-#: ../objects/custom/custom_object.c:1818
-#: ../objects/custom_lines/custom_linetypes.c:263
-#, c-format
-msgid "Cannot open icon file %s for object type '%s'."
-msgstr "Kuvaketiedostoa %s ei voi avata objektityyppiä \"%s\" varten."
-
-#: ../objects/custom_lines/custom_lines.c:160
-msgid "CustomLines"
-msgstr "OmatRivit"
-
-#: ../objects/custom_lines/custom_lines.c:160
-msgid "Custom XML lines loader"
-msgstr "Omien XML-rivien lataaja"
-
-#: ../objects/custom_lines/custom_linetypes.c:226
-msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
-msgstr "SISÄINEN: CustomLines: Virheellinen rivin tyyppi LineInfo-oliossa."
-
-#: ../objects/custom_lines/custom_linetypes.c:251
-#, c-format
-msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
-msgstr "SISÄINEN: CustomLines: Virheellinen rivin tyyppi LineInfo-oliossa %s."
-
-#: ../objects/custom/shape_info.c:162
-#, c-format
-msgid ""
-"The file '%s' has invalid path data.\n"
-"svg:path data must start with moveto."
-msgstr ""
-"Tiedoston \"%s\" sisältää virheellisiä polkutietoja.\n"
-"svg:path -tiedon täytyy alkaa tagilla moveto."
-
-#: ../objects/flowchart/flowchart.c:37
-msgid "Flowchart objects"
-msgstr "Vuokaavio-objektit"
-
-#: ../objects/flowchart/parallelogram.c:154
-msgid "Shear angle"
-msgstr "Vääntökulma:"
-
-#: ../objects/network/basestation.c:137
-msgid "Sectors"
-msgstr "Sektorit"
-
-#: ../objects/network/basestation.c:398 ../objects/network/basestation.c:400
-msgid "Base Station"
-msgstr "Tukiasema"
-
-#: ../objects/network/network.c:43
-msgid "Network diagram objects"
-msgstr "Verkkokaavio-objektit"
-
-#: ../objects/network/radiocell.c:121
-msgid "Radius"
-msgstr "Säde"
-
-#: ../objects/network/wanlink.c:119
-msgid "Width"
-msgstr "Leveys"
-
-#: ../objects/standard/arc.c:142
-msgid "Curve distance"
-msgstr "Polun etäisyys"
-
-#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
-#: ../objects/standard/polyline.c:137
-msgid "Line gaps"
-msgstr "Rivivälit"
-
-#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:139
-msgid "Absolute start gap"
-msgstr "Absoluuttinen alkuväli"
-
-#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:147
-#: ../objects/standard/polyline.c:141
-msgid "Absolute end gap"
-msgstr "Absoluuttinen lopetusväli"
-
-#: ../objects/standard/bezier.c:731 ../objects/standard/beziergon.c:495
-msgid "Add Segment"
-msgstr "Lisää osa"
-
-#: ../objects/standard/bezier.c:732 ../objects/standard/beziergon.c:496
-msgid "Delete Segment"
-msgstr "Poista osa"
-
-#: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
-msgid "Symmetric control"
-msgstr "Symmetrinen kontrolli"
-
-#: ../objects/standard/bezier.c:736 ../objects/standard/beziergon.c:500
-msgid "Smooth control"
-msgstr "Pehmeä kontrolli"
-
-#: ../objects/standard/bezier.c:738 ../objects/standard/beziergon.c:502
-msgid "Cusp control"
-msgstr "Leikkauspiste kontrolli"
-
-#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
-msgid "Free"
-msgstr "Vapaa"
-
-#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
-msgid "Fixed"
-msgstr "Kiinnitetty"
-
-#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
-msgid "Square"
-msgstr "Neliö"
-
-#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
-msgid "Aspect ratio"
-msgstr "Kuvasuhde"
-
-#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:670
-msgid "Free aspect"
-msgstr "Vapaa suhde"
-
-#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:672
-msgid "Fixed aspect"
-msgstr "Kiinnitetty suhde"
-
-#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:674
-msgid "Circle"
-msgstr "Ympyrä"
-
-#: ../objects/standard/image.c:139
-msgid "Image file"
-msgstr "Kuvatiedosto"
-
-#: ../objects/standard/image.c:141
-msgid "Draw border"
-msgstr "Piirrä raja"
-
-#: ../objects/standard/image.c:143
-msgid "Keep aspect ratio"
-msgstr "Säilytä suhde"
-
-#. Found file in same dir as diagram.
-#. Found file in current dir.
-#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
-#, c-format
-msgid ""
-"The image file '%s' was not found in that directory.\n"
-"Using the file '%s' instead\n"
-msgstr ""
-"Kuvatiedostoa \"%s\" ei löytynyt hakemistosta.\n"
-"Käytetään tiedostoa \"%s\"\n"
-
-#. Didn't find file in current dir.
-#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
-#, c-format
-msgid "The image file '%s' was not found.\n"
-msgstr "Kuvatiedostoa \"%s\" ei löytynyt.\n"
-
-#: ../objects/standard/line.c:134
-msgid "Arrows"
-msgstr "Nuolet"
-
-#: ../objects/standard/line.c:139
-msgid "Start point"
-msgstr "Aloituspiste"
-
-#: ../objects/standard/line.c:141
-msgid "End point"
-msgstr "Lopetuspiste"
-
-#: ../objects/standard/outline.c:204
-msgid "Text content"
-msgstr "Tekstisisältö"
-
-#: ../objects/standard/outline.c:206
-msgid "Angle to rotate the outline"
-msgstr ""
-
-#: ../objects/standard/polygon.c:462 ../objects/standard/polyline.c:616
-msgid "Add Corner"
-msgstr "Lisää kulma"
-
-#: ../objects/standard/polygon.c:463 ../objects/standard/polyline.c:617
-msgid "Delete Corner"
-msgstr "Poista kulma"
-
-#: ../objects/standard/standard.c:46
-msgid "Standard objects"
-msgstr "Vakio-objektit"
-
-#: ../objects/standard/textobj.c:139
-msgid "First Line"
-msgstr "Ensimmäinen viiva"
-
-#: ../objects/standard/textobj.c:146
-msgid "Vertical text alignment"
-msgstr "Tekstin vaakasuuntainen tasaus"
-
-#: ../plug-ins/cairo/diacairo-interactive.c:263
-#: ../plug-ins/cairo/diacairo-interactive.c:264
-msgid "Zoom pointer"
-msgstr "Suurenna kohdistinta"
+#: ../objects/UML/usecase.c:132
+msgid "Text outside"
+msgstr "Teksti ulkopuolella"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:270
-#: ../plug-ins/cairo/diacairo-interactive.c:271
-msgid "Visible rect pointer"
-msgstr ""
+#: ../plug-ins/cairo/diacairo.c:125 ../plug-ins/drs/dia-render-script.c:124
+#: ../plug-ins/hpgl/hpgl.c:680
+#, fuzzy, c-format
+#| msgid "Can't open output file %s: %s\n"
+msgid "Can't open output file %s."
+msgstr "Tulostetiedostoa %s ei voi avata: %s\n"
 
-#: ../plug-ins/cairo/diacairo.c:129
-#, c-format
+#: ../plug-ins/cairo/diacairo.c:133
+#, fuzzy, c-format
+#| msgid ""
+#| "Can't convert output filename '%s' to locale encoding.\n"
+#| "Please choose a different name to save with cairo.\n"
 msgid ""
 "Can't convert output filename '%s' to locale encoding.\n"
-"Please choose a different name to save with cairo.\n"
+"Please choose a different name to save with Cairo.\n"
 msgstr ""
 "Tulostiedoston nimeä \"%s\" ei voi muuttaa maa-asetuston merkistöön.\n"
 "Valitse toinen nimi tallentaaksesi cairon avulla.\n"
 
-#: ../plug-ins/cairo/diacairo.c:256 ../plug-ins/cairo/diacairo.c:272
+#: ../plug-ins/cairo/diacairo.c:305 ../plug-ins/cairo/diacairo.c:321
 #, c-format
 msgid "Can't write %d bytes to %s"
 msgstr "Ei voitu kirjoittaa %d tavua kohteeseen %s"
 
-#: ../plug-ins/cairo/diacairo.c:285
+#: ../plug-ins/cairo/diacairo.c:334
 msgid "Clipboard copy failed"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1388
+#: ../plug-ins/cairo/diacairo.c:362 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1479
 msgid "Nothing to print"
 msgstr "Ei tulostettavaa"
 
-#: ../plug-ins/cairo/diacairo.c:322
-msgid "Printing with Gtk+(cairo) requires at least version 2.10."
-msgstr ""
-
-#: ../plug-ins/cairo/diacairo.c:329
+#: ../plug-ins/cairo/diacairo.c:379
 msgid "Cairo PostScript"
 msgstr "Cairo-PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:340
+#: ../plug-ins/cairo/diacairo.c:390
 msgid "Cairo Portable Document Format"
 msgstr "Cairo-PDF"
 
-#: ../plug-ins/cairo/diacairo.c:355
+#: ../plug-ins/cairo/diacairo.c:402
 msgid "Cairo Scalable Vector Graphics"
 msgstr "Cairo-SVG"
 
-#: ../plug-ins/cairo/diacairo.c:366
+#: ../plug-ins/cairo/diacairo.c:414
+#, fuzzy
+#| msgid "Cairo PostScript"
+msgid "CairoScript"
+msgstr "Cairo-PostScript"
+
+#: ../plug-ins/cairo/diacairo.c:425
 msgid "Cairo PNG"
 msgstr "Cairo-PNG"
 
-#: ../plug-ins/cairo/diacairo.c:374
+#: ../plug-ins/cairo/diacairo.c:433
 msgid "Cairo PNG (with alpha)"
 msgstr "Cairo-PNG (alfalla)"
 
-#: ../plug-ins/cairo/diacairo.c:384
+#: ../plug-ins/cairo/diacairo.c:443
 msgid "Cairo EMF"
 msgstr "Cairo-EMF"
 
-#: ../plug-ins/cairo/diacairo.c:394
+#: ../plug-ins/cairo/diacairo.c:453
 msgid "Cairo WMF"
 msgstr "Cairo-WMF"
 
-#: ../plug-ins/cairo/diacairo.c:416
+#: ../plug-ins/cairo/diacairo.c:467
+#, fuzzy
+#| msgid "Cairo Clipboard"
+msgid "Cairo Clipboard Copy"
+msgstr "Cairo-leikepöytä"
+
+#: ../plug-ins/cairo/diacairo.c:481
 msgid "Copy _Diagram"
 msgstr "Kopioi _kaavio"
 
-#: ../plug-ins/cairo/diacairo.c:426
-msgid "Print (GTK) ..."
+#: ../plug-ins/cairo/diacairo.c:490
+#, fuzzy
+#| msgid "Print (GTK) ..."
+msgid "Print (GTK) …"
 msgstr "Tulostus (GTK) ..."
 
-#: ../plug-ins/cairo/diacairo.c:471
-msgid "Cairo based Rendering"
+#: ../plug-ins/cairo/diacairo.c:539
+#, fuzzy
+#| msgid "Cairo based Rendering"
+msgid "Cairo-based Rendering"
 msgstr "Cairo-pohjainen piirto"
 
-#: ../plug-ins/cgm/cgm.c:1106
+#: ../plug-ins/cairo/diacairo-interactive.c:408
+#: ../plug-ins/cairo/diacairo-interactive.c:409
+msgid "Zoom pointer"
+msgstr "Suurenna kohdistinta"
+
+#: ../plug-ins/cairo/diacairo-interactive.c:415
+#: ../plug-ins/cairo/diacairo-interactive.c:416
+msgid "Visible rect pointer"
+msgstr ""
+
+#: ../plug-ins/cairo/diacairo-renderer.c:980
+#: ../plug-ins/cairo/diacairo-renderer.c:1015 ../plug-ins/cgm/cgm.c:1099
+#: ../plug-ins/libart/dialibartrenderer.c:1240
+#: ../plug-ins/metapost/render_metapost.c:932
+#: ../plug-ins/postscript/diapsrenderer.c:670
+#: ../plug-ins/pstricks/render_pstricks.c:771 ../plug-ins/wpg/wpg.c:889
+msgid "Not enough memory for image drawing."
+msgstr ""
+
+#: ../plug-ins/cgm/cgm.c:1092
 msgid ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
@@ -6030,128 +6306,250 @@ msgstr ""
 "Kuvan rivipituus on suurempi kuin solun enimmäskoko.\n"
 "Kuvaa ei viety CGM:ään."
 
-#: ../plug-ins/cgm/cgm.c:1361
+#: ../plug-ins/cgm/cgm.c:1354
 msgid "Computer Graphics Metafile"
 msgstr "Computer Graphics Metafile"
 
-#: ../plug-ins/cgm/cgm.c:1386
+#: ../plug-ins/cgm/cgm.c:1379
 msgid "Computer Graphics Metafile export filter"
 msgstr "Computer Graphics Metafile -vientisuodatin"
 
-#: ../plug-ins/drs/dia-render-script.c:153
+#: ../plug-ins/drs/dia-render-script.c:160
+#: ../plug-ins/drs/dia-render-script.c:165
 msgid "DiaRenderScript"
 msgstr ""
 
-#: ../plug-ins/drs/dia-render-script.c:164
+#: ../plug-ins/drs/dia-render-script.c:189
 msgid "DiaRenderScript filter"
 msgstr ""
 
-#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1402
+#: ../plug-ins/drs/dia-render-script-import.c:439
+msgid "Broken file?"
+msgstr ""
+
+#: ../plug-ins/dxf/dxf.c:50
+msgid "Drawing Interchange File import and export filters"
+msgstr "Drawing Interchange File tuonti- ja vientisuodattimet"
+
+#: ../plug-ins/dxf/dxf-export.c:632 ../plug-ins/dxf/dxf-import.c:1389
 msgid "Drawing Interchange File"
 msgstr "Drawing Interchange File"
 
-#: ../plug-ins/dxf/dxf-import.c:1319
-#, c-format
-msgid "read_dxf_codes failed on '%s'\n"
+#: ../plug-ins/dxf/dxf-import.c:1299
+#, fuzzy, c-format
+#| msgid "read_dxf_codes failed on '%s'\n"
+msgid "read_dxf_codes failed on '%s'"
 msgstr "read_dxf_codes epäonnistui tiedostolle \"%s\"\n"
 
-#: ../plug-ins/dxf/dxf-import.c:1326
-#, c-format
-msgid "Binary DXF from '%s' not supported\n"
+#: ../plug-ins/dxf/dxf-import.c:1306
+#, fuzzy, c-format
+#| msgid "Binary DXF from '%s' not supported\n"
+msgid "Binary DXF from '%s' not supported"
 msgstr "Binäärinen DXF tiedostosta \"%s\" ei ole tuettu\n"
 
-#: ../plug-ins/dxf/dxf.c:50
-msgid "Drawing Interchange File import and export filters"
-msgstr "Drawing Interchange File tuonti- ja vientisuodattimet"
-
-#: ../plug-ins/hpgl/hpgl.c:751
+#: ../plug-ins/hpgl/hpgl.c:723
 msgid "HP Graphics Language"
 msgstr "HP Graphics Language"
 
-#: ../plug-ins/hpgl/hpgl.c:776
+#: ../plug-ins/hpgl/hpgl.c:748
 msgid "HP Graphics Language export filter"
 msgstr "HP Graphics Language -vientisuodatin"
 
-#: ../plug-ins/libart/dialibart.c:59
-msgid "Libart based rendering"
+#: ../plug-ins/layout/layout.cpp:235
+msgid "Please select edges and nodes to layout."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:240
+#, fuzzy
+#| msgid "'%s' creation failed"
+msgid "Graph creation failed"
+msgstr "\"%s\" luonti epäonnistui"
+
+#: ../plug-ins/layout/layout.cpp:266
+msgid "No such module."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:267
+msgid "Out of memory."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:268
+msgid "Not a tree."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:269
+msgid "Not a forest."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:270
+msgid "Failed algorithm."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:271
+#, fuzzy
+#| msgid "Airconditioner"
+msgid "Failed precondition."
+msgstr "Ilmastointi"
+
+#: ../plug-ins/layout/layout.cpp:272
+#, fuzzy
+#| msgid "Dashed"
+msgid "OGDF crashed."
+msgstr "Katkoviiva"
+
+#: ../plug-ins/layout/layout.cpp:273
+#, fuzzy
+#| msgid "unknown arrow"
+msgid "Unknown reason"
+msgstr "tuntematon nuoli"
+
+#: ../plug-ins/layout/layout.cpp:275
+#, c-format
+msgid ""
+"Layout '%s' failed.\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:416
+msgid "OGDF Layout Algorithms"
+msgstr ""
+
+#: ../plug-ins/libart/dialibart.c:58
+#, fuzzy
+#| msgid "Libart based rendering"
+msgid "Libart-based rendering"
 msgstr "Libart-pohjainen piirto"
 
-#: ../plug-ins/libart/export_png.c:165
+#: ../plug-ins/libart/dialibartrenderer.c:1391
+msgid "Renderer transformation"
+msgstr ""
+
+#: ../plug-ins/libart/dialibartrenderer.c:1392
+#, fuzzy
+msgid "Transform pointer"
+msgstr "Siirrä"
+
+#: ../plug-ins/libart/export_png.c:159 ../plug-ins/xslt/xslt.c:105
+#, c-format
+msgid "Can't open output file %s: %s\n"
+msgstr "Tulostetiedostoa %s ei voi avata: %s\n"
+
+#: ../plug-ins/libart/export_png.c:167
 msgid "Could not create PNG write structure"
 msgstr "Ei pystynyt luomaan PNG-kirjoitusrakennetta"
 
-#: ../plug-ins/libart/export_png.c:174
+#: ../plug-ins/libart/export_png.c:176
 msgid "Could not create PNG header info structure"
 msgstr "Ei pystynyt luomaan PNG-otsaketietorakennetta"
 
-#: ../plug-ins/libart/export_png.c:182
+#: ../plug-ins/libart/export_png.c:184
 msgid "Error occurred while writing PNG"
 msgstr "Tapahtui virhe kirjoitettaessa PNG:tä"
 
 #. Create a dialog
-#: ../plug-ins/libart/export_png.c:322
+#: ../plug-ins/libart/export_png.c:328
 msgid "PNG Export Options"
 msgstr "PNG-vientiasetukset"
 
-#: ../plug-ins/libart/export_png.c:328
+#: ../plug-ins/libart/export_png.c:334
 msgid "Image width:"
 msgstr "Kuvan leveys:"
 
-#: ../plug-ins/libart/export_png.c:331
+#: ../plug-ins/libart/export_png.c:337
 msgid "Image height:"
 msgstr "Kuvan korkeus:"
 
-#: ../plug-ins/libart/export_png.c:377
-msgid "PNG (anti-aliased)"
-msgstr "PNG (antialiasoitu)"
-
-#: ../plug-ins/libart/dialibartrenderer.c:295
-msgid "gdk_renderer: Unsupported fill mode specified!\n"
-msgstr "gdk_renderer: Annettua täyttötapaa ei tueta.\n"
-
-#: ../plug-ins/libart/dialibartrenderer.c:1471
-msgid "Renderer transformation"
-msgstr ""
-
-#: ../plug-ins/libart/dialibartrenderer.c:1472
+#: ../plug-ins/libart/export_png.c:383
 #, fuzzy
-msgid "Transform pointer"
-msgstr "Siirrä"
+#| msgid "PNG (anti-aliased)"
+msgid "PNG (antialiased)"
+msgstr "PNG (antialiasoitu)"
 
 #: ../plug-ins/metapost/metapost.c:46
 msgid "TeX Metapost export filter"
 msgstr "TeX Pstricks -vientisuodatin"
 
-#: ../plug-ins/metapost/render_metapost.c:1262
+#: ../plug-ins/metapost/render_metapost.c:1167
 msgid "TeX Metapost macros"
 msgstr "TeX Metapost -makrot"
 
+#: ../plug-ins/pdf/pdf.c:29
+msgid "PDF import not available."
+msgstr ""
+
+#: ../plug-ins/pdf/pdf.c:37
+#, fuzzy
+#| msgid "Cairo Portable Document Format"
+msgid "Portable Document File"
+msgstr "Cairo-PDF"
+
+#: ../plug-ins/pdf/pdf.c:55
+#, fuzzy
+#| msgid "WMF export filter"
+msgid "PDF import filter"
+msgstr "WMF-vientisuodatin"
+
+#: ../plug-ins/pdf/pdf-import.cpp:400
+#, fuzzy, c-format
+#| msgid "Pager"
+msgid "Page %d"
+msgstr "Piippari"
+
+#: ../plug-ins/pdf/pdf-import.cpp:839
+#, c-format
+msgid ""
+"PDF document not OK.\n"
+"%s"
+msgstr ""
+
 #: ../plug-ins/pgf/pgf.c:26
 msgid "LaTeX PGF export filter"
 msgstr "LaTeX PGF-vientisuodatin"
 
-#: ../plug-ins/pgf/render_pgf.c:1112
-#: ../plug-ins/pstricks/render_pstricks.c:733
-msgid "Not valid UTF8"
+#: ../plug-ins/pgf/render_pgf.c:1113
+#: ../plug-ins/pstricks/render_pstricks.c:679
+#, fuzzy
+#| msgid "Not valid UTF8"
+msgid "Not valid UTF-8"
 msgstr "Virheellistä UTF8-merkistöä"
 
-#: ../plug-ins/pgf/render_pgf.c:1277
+#: ../plug-ins/pgf/render_pgf.c:1273
 msgid "LaTeX PGF macros"
 msgstr "LaTeX PGF-makrot"
 
-#: ../plug-ins/pixbuf/pixbuf.c:93
-#, c-format
+#: ../plug-ins/pixbuf/pixbuf.c:86
+msgid "Failed to create pixbuf from drawable."
+msgstr ""
+
+#: ../plug-ins/pixbuf/pixbuf.c:91
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not save file:\n"
+#| "%s\n"
+#| "%s"
 msgid ""
 "Could not save file:\n"
-"%s\n"
 "%s"
 msgstr ""
 "Ei voitu tallentaa tiedostoa:\n"
 "%s\n"
 "%s"
 
-#: ../plug-ins/pixbuf/pixbuf.c:199
-msgid "gdk-pixbuf based bitmap export/import"
+#: ../plug-ins/pixbuf/pixbuf.c:112
+msgid "Calling error, missing user_data."
+msgstr ""
+
+#: ../plug-ins/pixbuf/pixbuf.c:141
+#, c-format
+msgid ""
+"Pixbuf[%s] can't load:\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/pixbuf/pixbuf.c:196
+#, fuzzy
+#| msgid "gdk-pixbuf based bitmap export/import"
+msgid "gdk-pixbuf-based bitmap export/import"
 msgstr "gdk-pixbuf-pohjainen bittikartan vienti/tuonti"
 
 #: ../plug-ins/postscript/paginate_psprint.c:273
@@ -6159,92 +6557,102 @@ msgid "Select Printer"
 msgstr "Valitse Tulostin"
 
 #: ../plug-ins/postscript/paginate_psprint.c:285
-#: ../sheets/ciscocomputer.sheet.in.h:36
+#: ../sheets/ciscocomputer.sheet.in.h:37
 msgid "Printer"
 msgstr "Tulostin"
 
-#: ../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 "Tiedosto"
 
-#: ../plug-ins/postscript/paginate_psprint.c:314
-msgid "OK"
-msgstr "OK"
-
-#: ../plug-ins/postscript/paginate_psprint.c:456
+#: ../plug-ins/postscript/paginate_psprint.c:464
 #, c-format
 msgid "Could not run command '%s': %s"
 msgstr "Komentoa \"%s\" ei voitu suorittaa: %s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:459
+#: ../plug-ins/postscript/paginate_psprint.c:467
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Ei voitu avata \"%s\" kirjoittamista varten: %s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:481
+#: ../plug-ins/postscript/paginate_psprint.c:489
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "Tulostusvirhe: komento \"%s\" palautti arvon %d\n"
 
-#: ../plug-ins/postscript/paginate_psprint.c:492
+#: ../plug-ins/postscript/paginate_psprint.c:500
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr "Tulostusvirhe: komento \"%s\" aiheutti sigpipe-signaalin."
 
-#: ../plug-ins/postscript/render_eps.c:150
-msgid "Encapsulated Postscript (using Pango fonts)"
-msgstr "Encapsulated Postscriptiä (Pango-kirjasimilla)"
-
-#: ../plug-ins/postscript/render_eps.c:159
-msgid "Encapsulated Postscript with preview (using Pango fonts)"
-msgstr "Encapsulated Postscriptiä esikatselulla (Pango-kirjasimilla)"
-
-#: ../plug-ins/postscript/render_eps.c:169
-msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-msgstr "Encapsulated Postscriptiä (PostScript Latin-1 -kirjasimilla)"
-
-#: ../plug-ins/postscript/postscript.c:46
+#: ../plug-ins/postscript/postscript.c:47
 msgid "Print (PS)"
 msgstr "Tulosta (PS)"
 
-#: ../plug-ins/postscript/postscript.c:70
-msgid "Postscript Rendering"
+#: ../plug-ins/postscript/postscript.c:82
+#, fuzzy
+#| msgid "Postscript Rendering"
+msgid "PostScript Rendering"
 msgstr "Postscript-piirto"
 
+#: ../plug-ins/postscript/render_eps.c:168
+#| msgid "Encapsulated Postscript (using Pango fonts)"
+msgid "Encapsulated PostScript (using Pango fonts)"
+msgstr "Encapsulated PostScriptiä (Pango-fonteilla)"
+
+#: ../plug-ins/postscript/render_eps.c:177
+msgid "Encapsulated Postscript with preview (using Pango fonts)"
+msgstr "Encapsulated Postscriptiä esikatselulla (Pango-fonteilla)"
+
+#: ../plug-ins/postscript/render_eps.c:187
+#| msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
+msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
+msgstr "Encapsulated PostScriptiä (PostScript Latin-1 -fonteilla)"
+
 #: ../plug-ins/pstricks/pstricks.c:26
-msgid "TeX Pstricks export filter"
+#, fuzzy
+#| msgid "TeX Pstricks export filter"
+msgid "TeX PSTricks export filter"
 msgstr "TeX Pstricks -vientisuodatin"
 
-#: ../plug-ins/pstricks/render_pstricks.c:987
+#: ../plug-ins/pstricks/render_pstricks.c:936
 msgid "TeX PSTricks macros"
 msgstr "TeX PSTricks -makrot"
 
-#: ../plug-ins/python/pydia-render.c:719
+#: ../plug-ins/python/pydia-render.c:1113
 #, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "Ei voitu avata tiedostoa \"%s\" kirjoittamista varten.\n"
 
-#: ../plug-ins/python/python.c:96
+#: ../plug-ins/python/python.c:95
 msgid "Python scripting support"
 msgstr "Python-skriptaustuki"
 
-#: ../plug-ins/shape/shape-export.c:473
+#: ../plug-ins/shape/shape.c:36
+#, fuzzy
+#| msgid "dia shape export filter"
+msgid "Dia shape export filter"
+msgstr "dia-muotovientisuodatin"
+
+#: ../plug-ins/shape/shape-export.c:541
 msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
 msgstr ""
 
-#: ../plug-ins/shape/shape-export.c:484
-msgid "Can't export png without libart!"
+#: ../plug-ins/shape/shape-export.c:555
+#, fuzzy
+#| msgid "Can't export png without libart!"
+msgid "Can't export PNG icon without export plugin!"
 msgstr "Ei voitu viedä png:tä ilman libart:ia"
 
-#: ../plug-ins/shape/shape-export.c:509
+#: ../plug-ins/shape/shape-export.c:581
 msgid "Dia Shape File"
 msgstr "Dia-muototiedosto"
 
-#: ../plug-ins/shape/shape.c:36
-msgid "dia shape export filter"
-msgstr "dia-muotovientisuodatin"
+#: ../plug-ins/svg/svg.c:60
+msgid "Scalable Vector Graphics import and export filters"
+msgstr "Scalable Vector Graphics -tuonti- ja -vientisuodattimet"
 
-#: ../plug-ins/svg/svg-import.c:258
+#: ../plug-ins/svg/svg-import.c:675
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -6252,394 +6660,523 @@ msgstr ""
 "Virheellistä polkutietoa.\n"
 "svg:path -tiedon tulee alkaa tagilla moveto."
 
-#: ../plug-ins/svg/svg-import.c:806
-msgid "Expected SVG Namespace not found in file"
+#: ../plug-ins/svg/svg-import.c:1929
+msgid "'Shape Design' shapes missing."
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1963
+#, fuzzy, c-format
+#| msgid "'%s' creation failed"
+msgid "Object '%s' creation failed"
+msgstr "\"%s\" luonti epäonnistui"
+
+#: ../plug-ins/svg/svg-import.c:1989
+#, c-format
+msgid ""
+"Parse error for memory block.\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:2007
+#, c-format
+msgid ""
+"SVG parser error for %s\n"
+"%s"
+msgstr ""
+
+#. just a warning
+#: ../plug-ins/svg/svg-import.c:2013
+#, c-format
+msgid ""
+"SVG parser warning for %s\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:2046
+#, fuzzy
+#| msgid "Expected SVG Namespace not found in file"
+msgid "Expected SVG name-space not found in file"
 msgstr "Odotettua SVG-nimiavaruutta ei löydy tiedostosta"
 
-#: ../plug-ins/svg/svg-import.c:826
+#: ../plug-ins/svg/svg-import.c:2066
 #, c-format
 msgid "root element was '%s' -- expecting 'svg'."
 msgstr "juurialkio oli \"%s\" -- odotus oli \"svg\"."
 
-#: ../plug-ins/svg/svg.c:50
-msgid "Scalable Vector Graphics import and export filters"
-msgstr "Scalable Vector Graphics -tuonti- ja -vientisuodattimet"
+#: ../plug-ins/vdx/vdx.c:54
+msgid "Visio XML Format import and export filter"
+msgstr "Visio-XML-muodon tuonti- ja vientisuodattimet"
 
-#: ../plug-ins/vdx/vdx-export.c:1376 ../plug-ins/vdx/vdx-export.c:1385
+#: ../plug-ins/vdx/vdx-export.c:1805
 #, c-format
-msgid "Couldn't read file %s"
-msgstr "Ei voi lukea tiedostoa %s"
+msgid "Saving file '%s' failed."
+msgstr ""
 
-#: ../plug-ins/vdx/vdx-export.c:1905
+#: ../plug-ins/vdx/vdx-export.c:1816
 msgid "Visio XML format"
 msgstr "Visio-XML-muoto"
 
-#: ../plug-ins/vdx/vdx-import.c:226 ../plug-ins/xfig/xfig-import.c:1046
-#, c-format
-msgid "Couldn't read color: %s\n"
+#: ../plug-ins/vdx/vdx-import.c:222
+#, fuzzy, c-format
+#| msgid "Couldn't read color: %s\n"
+msgid "Couldn't read color: %s"
 msgstr "Ei voi lukea väriä: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:540
-#, c-format
-msgid "Couldn't find shape %d\n"
+#: ../plug-ins/vdx/vdx-import.c:536
+#, fuzzy, c-format
+#| msgid "Couldn't find shape %d\n"
+msgid "Couldn't find shape %d"
 msgstr "Muotoa %d ei löytynyt\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1046
-#, c-format
-msgid "Unexpected Ellipse object: %s\n"
+#: ../plug-ins/vdx/vdx-import.c:1011
+#, fuzzy, c-format
+#| msgid "Unexpected Ellipse object: %s\n"
+msgid "Unexpected Ellipse object: %s"
 msgstr "Odottamaton ellipsi-olio: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1060
-msgid "Can't rotate ellipse\n"
+#: ../plug-ins/vdx/vdx-import.c:1025
+#, fuzzy
+#| msgid "Can't rotate ellipse\n"
+msgid "Can't rotate ellipse"
 msgstr "Ei voi pyörittää ellipsiä\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1391
-msgid "MoveTo not at start of Bezier\n"
+#: ../plug-ins/vdx/vdx-import.c:1356
+#, fuzzy
+#| msgid "MoveTo not at start of Bezier\n"
+msgid "MoveTo not at start of Bezier"
 msgstr "MoveTo ei ole bezier-käytän alussa\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1739
+#: ../plug-ins/vdx/vdx-import.c:1706
 msgid "Invalid NURBS formula"
 msgstr "Virheellinen NURBS-kaava"
 
-#: ../plug-ins/vdx/vdx-import.c:1983
-#, c-format
-msgid "Couldn't write file %s"
-msgstr "Ei voitu kirjoittaa tiedostoa %s"
-
-#: ../plug-ins/vdx/vdx-import.c:2068 ../plug-ins/vdx/vdx-import.c:2081
+#: ../plug-ins/vdx/vdx-import.c:1964
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "Ei voitu käsitellä vierasta objektityyppiä %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2109
+#: ../plug-ins/vdx/vdx-import.c:2888
 #, c-format
-msgid "Couldn't make object dir %s"
-msgstr "Ei voitu luoda objektihakemistoa %s"
+msgid ""
+"VDX parser error for %s\n"
+"%s"
+msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:3090
+#: ../plug-ins/vdx/vdx-import.c:2900
+#, fuzzy
+#| msgid "Nothing to print"
+msgid "Nothing in document!"
+msgstr "Ei tulostettavaa"
+
+#: ../plug-ins/vdx/vdx-import.c:2905
+#, c-format
+msgid "Expecting VisioDocument, got %s"
+msgstr ""
+
+#: ../plug-ins/vdx/vdx-import.c:2989
 msgid "Visio XML File Format"
 msgstr "Visio-XML-tiedostomuoto"
 
-#: ../plug-ins/vdx/vdx-xml.c:3344
+#: ../plug-ins/vdx/vdx-xml.c:3343
 #, c-format
 msgid "Can't decode object %s"
 msgstr "Ei voitu purkaa objektia %s"
 
-#: ../plug-ins/vdx/vdx-xml.c:5125
-#, c-format
-msgid "Can't write object %u"
-msgstr "Ei voitu kirjoittaa objektia %u"
-
-#: ../plug-ins/vdx/vdx.c:53
-msgid "Visio XML Format import and export filter"
-msgstr "Visio-XML-muodon tuonti- ja vientisuodattimet"
+#: ../plug-ins/wmf/wmf.cpp:317
+#, fuzzy, c-format
+#| msgid "Couldn't write file %s"
+msgid ""
+"Couldn't write file %s\n"
+"%s"
+msgstr "Ei voitu kirjoittaa tiedostoa %s"
 
-#: ../plug-ins/wmf/wmf.cpp:506
+#: ../plug-ins/wmf/wmf.cpp:568
 #, c-format
+#| msgid ""
+#| "Can not render unknown font:\n"
+#| "%s"
 msgid ""
-"Can not render unknown font:\n"
+"Cannot render unknown font:\n"
 "%s"
 msgstr ""
-"Tuntematonta kirjasinta ei voi tulostaa:\n"
+"Tuntematonta fonttia ei voi tulostaa:\n"
 "%s"
 
-#: ../plug-ins/wmf/wmf.cpp:1265
-#, c-format
-msgid "Couldn't open: '%s' for writing.\n"
-msgstr "Ei voitu avata tiedostoa \"%s\" kirjoittamista varten.\n"
-
-#: ../plug-ins/wmf/wmf.cpp:1364
-msgid "Windows Meta File"
-msgstr "Windows-metatiedosto"
-
-#: ../plug-ins/wmf/wmf.cpp:1373
-msgid "Enhanced Meta File"
-msgstr "Parannettu metatiedosto"
-
-#: ../plug-ins/wmf/wmf.cpp:1395
+#: ../plug-ins/wmf/wmf.cpp:1490
 msgid "Print (GDI) ..."
 msgstr "Tulostus (GDI) ...."
 
-#: ../plug-ins/wmf/wmf.cpp:1410
+#: ../plug-ins/wmf/wmf.cpp:1506
 msgid "WMF export filter"
 msgstr "WMF-vientisuodatin"
 
-#: ../plug-ins/wpg/wpg.c:1190
-#, c-format
-msgid "File: %s type/version unsupported.\n"
-msgstr "Tiedosto: %s tyyppi/versio ei tuettu.\n"
-
-#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
+#: ../plug-ins/wpg/wpg.c:1117 ../plug-ins/wpg/wpg.c:1123
 msgid "WPG"
 msgstr "WPG"
 
-#: ../plug-ins/wpg/wpg.c:1356
+#: ../plug-ins/wpg/wpg.c:1148
 msgid "WordPerfect Graphics export filter"
 msgstr "WordPerfect Graphics -vientisuodatin"
 
-#: ../plug-ins/xfig/xfig-export.c:461
+#: ../plug-ins/wpg/wpg-import.c:475
+#, c-format
+msgid "File: %s type/version unsupported.\n"
+msgstr "Tiedosto: %s tyyppi/versio ei tuettu.\n"
+
+#: ../plug-ins/wpg/wpg-import.c:617
+#, fuzzy, c-format
+#| msgid "Unknown arrow type %d\n"
+msgid "Unknown WPG type %d size %d."
+msgstr "Tuntematon nuolityyppi %d\n"
+
+#: ../plug-ins/wpg/wpg-import.c:622
 #, c-format
-msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
+msgid "Size 0 on WPG type %d, expecting WPG_END\n"
+msgstr ""
+
+#: ../plug-ins/wpg/wpg-import.c:631
+#, c-format
+msgid "Unexpected end of file. WPG type %d, size %d.\n"
+msgstr ""
+
+#: ../plug-ins/wpg/wpg-import.c:641
+msgid "Empty WPG file?"
+msgstr ""
+
+#: ../plug-ins/xfig/xfig.c:52
+msgid "Fig Format import and export filter"
+msgstr "FIG-muodon tuonti- ja vientisuodattimet"
+
+#: ../plug-ins/xfig/xfig-export.c:476
+#, fuzzy, c-format
+#| msgid ""
+#| "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
+msgid "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
 msgstr ""
 "FIG-muodolla ei ole yhteensopivaa nuolityyliä %s, käytetään yksinkertaista "
 "nuolta.\n"
 
-#: ../plug-ins/xfig/xfig-export.c:484
+#: ../plug-ins/xfig/xfig-export.c:499
 msgid "No more user-definable colors - using black"
 msgstr "Käyttäjän määriteltäviä värejä ei riitä - käytetään mustaa"
 
-#: ../plug-ins/xfig/xfig-export.c:1205
-msgid "XFig format"
+#: ../plug-ins/xfig/xfig-export.c:1252
+#, fuzzy
+#| msgid "XFig format"
+msgid "Xfig format"
 msgstr "XFig-muoto"
 
-#: ../plug-ins/xfig/xfig-import.c:111
-#, c-format
-msgid "Color index %d too high, only 512 colors allowed. Using black instead."
+#: ../plug-ins/xfig/xfig-import.c:109
+#, fuzzy, c-format
+#| msgid ""
+#| "Color index %d too high, only 512 colors allowed. Using black instead."
+msgid "Color index %d too high; only 512 colors allowed. Using black instead."
 msgstr ""
 "Väri-indeksi %d liian suuri, vain 512 väriä sallittu. Käytetään mustaa."
 
-#: ../plug-ins/xfig/xfig-import.c:138
+#: ../plug-ins/xfig/xfig-import.c:140
 msgid "Patterns are not supported by Dia"
 msgstr "Dia ei tue täyttökuvioita"
 
-#: ../plug-ins/xfig/xfig-import.c:166
-msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
+#: ../plug-ins/xfig/xfig-import.c:168
+#, fuzzy
+#| msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
+msgid "Triple-dotted lines are not supported by Dia; using double-dotted"
 msgstr "Dia ei tue kolmipisteisiä viivoja, käytetään kaksipisteisiä"
 
-#: ../plug-ins/xfig/xfig-import.c:170
-#, c-format
-msgid "Line style %d should not appear\n"
+#: ../plug-ins/xfig/xfig-import.c:172
+#, fuzzy, c-format
+#| msgid "Line style %d should not appear\n"
+msgid "Line style %d should not appear"
 msgstr "Viivan tyyli %d ei pitäisi esiintyä\n"
 
-#: ../plug-ins/xfig/xfig-import.c:238
-#, c-format
-msgid "Error while reading %dth of %d points: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:244
+#, fuzzy, c-format
+#| msgid "Error while reading %dth of %d points: %s\n"
+msgid "Error while reading %dth of %d points"
 msgstr "Virhe luettaessa %d./%d pisteestä: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:266
-msgid "Error while reading arrowhead\n"
+#: ../plug-ins/xfig/xfig-import.c:253
+#, fuzzy
+#| msgid "Premature end of FIG file\n"
+msgid "Unexpected end of file."
+msgstr "FIG-tiedosto loppui kesken\n"
+
+#: ../plug-ins/xfig/xfig-import.c:273
+#, fuzzy
+#| msgid "Error while reading arrowhead\n"
+msgid "Error while reading arrowhead"
 msgstr "Virhe luettaessa nuolenpäätä\n"
 
-#: ../plug-ins/xfig/xfig-import.c:288
+#: ../plug-ins/xfig/xfig-import.c:295
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "Tuntematon nuolityyppi %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:379
+#: ../plug-ins/xfig/xfig-import.c:387
 #, c-format
 msgid "Depth %d of of range, only 0-%d allowed.\n"
 msgstr "Syvyys %d ei ole sallittu, vain arvot 0-%d kelpaavat.\n"
 
-#: ../plug-ins/xfig/xfig-import.c:426
-#, c-format
-msgid "Couldn't read ellipse info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:435
+#, fuzzy
+#| msgid "Couldn't read ellipse info: %s\n"
+msgid "Couldn't read ellipse info."
 msgstr "Ei voi lukea ellipsitietoa: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:494
-#, c-format
-msgid "Couldn't read polyline info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:504
+#, fuzzy
+#| msgid "Couldn't read polyline info: %s\n"
+msgid "Couldn't read polyline info.\n"
 msgstr "Ei voi lukea moniviivatietoa: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:509
-#, c-format
-msgid "Couldn't read flipped bit: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:519
+#, fuzzy
+#| msgid "Couldn't read flipped bit: %s\n"
+msgid "Couldn't read flipped bit."
 msgstr "Ei voi lukea käännettyä bittiä: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:527
-msgid "Negative corner radius, negating"
+#: ../plug-ins/xfig/xfig-import.c:537
+#, fuzzy
+#| msgid "Negative corner radius, negating"
+msgid "Negative corner radius; negating"
 msgstr "Negatiivinen kulmasäde, mitätöidään"
 
-#: ../plug-ins/xfig/xfig-import.c:570
+#: ../plug-ins/xfig/xfig-import.c:580
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "Tuntematon monijanan alityyppi: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
-#, c-format
-msgid "Couldn't read spline info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:732 ../plug-ins/xfig/xfig-import.c:764
+#, fuzzy
+#| msgid "Couldn't read spline info: %s\n"
+msgid "Couldn't read spline info."
 msgstr "Ei voi lukea spline-tietoja: %s\n"
 
 #. Open approximated spline
 #. Closed approximated spline
-#: ../plug-ins/xfig/xfig-import.c:739 ../plug-ins/xfig/xfig-import.c:757
+#: ../plug-ins/xfig/xfig-import.c:751 ../plug-ins/xfig/xfig-import.c:768
 msgid "Cannot convert approximated spline yet."
 msgstr "Ei voida vielä muuntaa likimääräikseksi spline-viivaksi."
 
-#: ../plug-ins/xfig/xfig-import.c:795
+#: ../plug-ins/xfig/xfig-import.c:806
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr "Tuntematon splinen alityyppi: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:860
-#, c-format
-msgid "Couldn't read arc info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:871
+#, fuzzy
+#| msgid "Couldn't read arc info: %s\n"
+msgid "Couldn't read arc info."
 msgstr "Ei voitu lukea kaaritietoa: %s\n"
 
 #. set new fill property on arc?
-#: ../plug-ins/xfig/xfig-import.c:889
+#: ../plug-ins/xfig/xfig-import.c:899
 msgid "Filled arc treated as unfilled"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:893
+#: ../plug-ins/xfig/xfig-import.c:903
 #, fuzzy, c-format
 msgid "Unknown polyline arc: %d\n"
 msgstr "Tuntematon monijanan alityyppi: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:957
-#, c-format
-msgid "Couldn't read text info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:968
+#, fuzzy
+#| msgid "Couldn't read text info: %s\n"
+msgid "Couldn't read text info."
 msgstr "Ei voitu lukea tekstitietoa: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1019
+#: ../plug-ins/xfig/xfig-import.c:996
+#, c-format
+msgid "Can't find LaTeX font nr. %d, using sans"
+msgstr ""
+
+#: ../plug-ins/xfig/xfig-import.c:1004
 #, c-format
-msgid "Couldn't identify FIG object: %s\n"
+msgid "Can't find Postscript font nr. %d, using sans"
+msgstr ""
+
+#: ../plug-ins/xfig/xfig-import.c:1032
+#, fuzzy
+#| msgid "Couldn't identify FIG object: %s\n"
+msgid "Couldn't identify Fig object."
 msgstr "Ei tunnistettu FIG-objektia: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1027
+#: ../plug-ins/xfig/xfig-import.c:1040
 msgid "Compound end outside compound\n"
 msgstr "Yhdistelmän loppu yhdistelmän ulkopuolella\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1051
+#: ../plug-ins/xfig/xfig-import.c:1059
+#, c-format
+msgid "Couldn't read color: %s\n"
+msgstr "Ei voi lukea väriä: %s\n"
+
+#: ../plug-ins/xfig/xfig-import.c:1064
 #, c-format
 msgid "Color number %d out of range 0..%d.  Discarding color.\n"
 msgstr "Värin numero %d alueen 0..%d ulkopuolella, hylätään väri.\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1097
-#, c-format
-msgid "Couldn't read group extend: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1111
+#, fuzzy
+#| msgid "Couldn't read group extend: %s\n"
+msgid "Couldn't read group extent."
 msgstr "Ei voi lukea ryhmälaajennosta: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1108
+#: ../plug-ins/xfig/xfig-import.c:1122
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "Tuntematon objektityyppi %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1132
+#: ../plug-ins/xfig/xfig-import.c:1147
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "\"%s\" ei ole \"%s\" eikä \"%s\"\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1142
-#, c-format
-msgid "Error reading paper size: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1157
+#, fuzzy
+#| msgid "Error reading paper size: %s\n"
+msgid "Error reading paper size."
 msgstr "Virhe luettaessa paperin kokoa: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1153
+#: ../plug-ins/xfig/xfig-import.c:1168
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "Tuntematon paperikoko \"%s\", käytetään oletuskokoa\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1165
-#, c-format
-msgid "Error reading paper orientation: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1181
+#, fuzzy
+#| msgid "Error reading paper orientation: %s\n"
+msgid "Error reading paper orientation."
 msgstr "Virhe luettaessa paperin suuntausta: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1175
-#, c-format
-msgid "Error reading justification: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1191
+#, fuzzy
+#| msgid "Error reading justification: %s\n"
+msgid "Error reading justification."
 msgstr "Virhe luettaessa paperin keskitystä: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1185
-#, c-format
-msgid "Error reading units: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1201
+#, fuzzy
+#| msgid "Error reading units: %s\n"
+msgid "Error reading units."
 msgstr "Virhe luettaessa yksiköitä: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1201
-#, c-format
-msgid "Error reading magnification: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1217
+#, fuzzy
+#| msgid "Error reading magnification: %s\n"
+msgid "Error reading magnification."
 msgstr "Virhe luettaessa suurennusta: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1214
-#, c-format
-msgid "Error reading multipage indicator: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1230
+#, fuzzy
+#| msgid "Error reading multipage indicator: %s\n"
+msgid "Error reading multipage indicator."
 msgstr "Virhe luettaessa monisivuisuusmerkintää: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1225
-#, c-format
-msgid "Error reading transparent color: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1241
+#, fuzzy
+#| msgid "Error reading transparent color: %s\n"
+msgid "Error reading transparent color."
 msgstr "Virhe luettaessa läpinäkyvyysväriä: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
-#: ../plug-ins/xfig/xfig-import.c:1308
-#, c-format
-msgid "Error reading FIG file: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1250 ../plug-ins/xfig/xfig-import.c:1311
+#: ../plug-ins/xfig/xfig-import.c:1329
+#, fuzzy
+#| msgid "Error reading FIG file: %s\n"
+msgid "Error reading Fig file."
 msgstr "Virhe luettaessa FIG-tiedostoa: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
-msgid "Premature end of FIG file\n"
+#: ../plug-ins/xfig/xfig-import.c:1252
+#, fuzzy
+#| msgid "Premature end of FIG file\n"
+msgid "Premature end of Fig file\n"
 msgstr "FIG-tiedosto loppui kesken\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1245
-#, c-format
-msgid "Error reading resolution: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1261
+#, fuzzy
+#| msgid "Error reading resolution: %s\n"
+msgid "Error reading resolution."
 msgstr "Virhe luettaessa tarkkuutta: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1277
-#, c-format
-msgid "Doesn't look like a Fig file: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1297
+#, fuzzy
+#| msgid "Doesn't look like a Fig file: %s\n"
+msgid "Doesn't look like a Fig file"
 msgstr "Ei näytä Fig-tiedostolta: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1283
-#, c-format
-msgid "This is a FIG version %d.%d file, I may not understand it\n"
+#: ../plug-ins/xfig/xfig-import.c:1303
+#, fuzzy, c-format
+#| msgid "This is a FIG version %d.%d file, I may not understand it\n"
+msgid ""
+"This is a Fig version %d.%d file.\n"
+" It may not be importable."
 msgstr "Tämä on FIG-version %d.%d tiedosto, en ehkä ymmärrä sitä\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1331
-msgid "XFig File Format"
-msgstr "XFig-tiedostomuoto"
+#: ../plug-ins/xfig/xfig-import.c:1313
+#, fuzzy
+#| msgid "Premature end of FIG file\n"
+msgid "Premature end of Fig file"
+msgstr "FIG-tiedosto loppui kesken\n"
 
-#: ../plug-ins/xfig/xfig.c:51
-msgid "Fig Format import and export filter"
-msgstr "FIG-muodon tuonti- ja vientisuodattimet"
+#: ../plug-ins/xfig/xfig-import.c:1352
+#, fuzzy
+#| msgid "XFig File Format"
+msgid "Xfig File Format"
+msgstr "XFig-tiedostomuoto"
 
-#: ../plug-ins/xslt/xslt.c:108
-#, c-format
-msgid "Error while parsing %s\n"
+#: ../plug-ins/xslt/xslt.c:114
+#, fuzzy, c-format
+#| msgid "Error while parsing %s\n"
+msgid ""
+"Error while parsing %s\n"
+"%s"
 msgstr "Virhe jäsennettäessä %s\n"
 
-#: ../plug-ins/xslt/xslt.c:117
+#: ../plug-ins/xslt/xslt.c:124
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "Virhe jäsennettäessä tyylitiedostoa %s\n"
 
-#: ../plug-ins/xslt/xslt.c:124
+#: ../plug-ins/xslt/xslt.c:131
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "Virhe sovellettaessa tyylitiedostoa %s\n"
 
-#: ../plug-ins/xslt/xslt.c:133
+#: ../plug-ins/xslt/xslt.c:140
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "Virhe jäsennettäessä tyylitiedostoa: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:142
+#: ../plug-ins/xslt/xslt.c:149
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "Virhe jäsennettäessä tyylitiedostoa: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:150
+#: ../plug-ins/xslt/xslt.c:157
 #, c-format
 msgid "Error while saving result: %s\n"
 msgstr "Virhe tallennettaessa tulosta: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:335
+#: ../plug-ins/xslt/xslt.c:343
 msgid "XSL Transformation filter"
 msgstr "XSL-muunnossuodatin"
 
-#: ../plug-ins/xslt/xslt.c:362
-msgid "No valid configuration files found for the XSLT plugin, not loading."
+#: ../plug-ins/xslt/xslt.c:370
+#, fuzzy
+#| msgid "No valid configuration files found for the XSLT plugin, not loading."
+msgid "No valid configuration files found for the XSLT plugin; not loading."
 msgstr ""
 "Kelpoa asetustiedostoa ei löydy XSLT-liitännäiselle, joten sitä ei ladata."
 
-#: ../plug-ins/xslt/xsltdialog.c:97
+#: ../plug-ins/xslt/xsltdialog.c:99
 msgid "Export through XSLT"
 msgstr "Vienti XSLT:n läpi"
 
-#: ../plug-ins/xslt/xsltdialog.c:112
+#: ../plug-ins/xslt/xsltdialog.c:114
 msgid "From:"
 msgstr "Mistä:"
 
-#: ../plug-ins/xslt/xsltdialog.c:147
+#: ../plug-ins/xslt/xsltdialog.c:149
 msgid "To:"
 msgstr "Mihin:"
 
@@ -6651,46 +7188,51 @@ msgstr "AADL"
 msgid "AADL Shapes"
 msgstr "AADL-muodot"
 
-#: ../sheets/AADL.sheet.in.h:3
-msgid "Bus"
-msgstr "Väylä"
-
-#: ../sheets/AADL.sheet.in.h:5
-msgid "Device"
-msgstr "Laite"
+#: ../sheets/AADL.sheet.in.h:4
+msgid "Thread"
+msgstr "Säie"
 
 #: ../sheets/AADL.sheet.in.h:6
+msgid "Processor"
+msgstr "Käsittelijä"
+
+#: ../sheets/AADL.sheet.in.h:7
 msgid "Memory"
 msgstr "Muisti"
 
-#: ../sheets/AADL.sheet.in.h:7
-msgid "Package"
-msgstr "Pakkaus"
+#: ../sheets/AADL.sheet.in.h:8
+msgid "Bus"
+msgstr "Väylä"
 
 #: ../sheets/AADL.sheet.in.h:9
-msgid "Processor"
-msgstr "Käsittelijä"
+msgid "System"
+msgstr "Järjestelmä"
 
 #: ../sheets/AADL.sheet.in.h:10
 msgid "Subprogram"
 msgstr "Aliohjelma"
 
 #: ../sheets/AADL.sheet.in.h:11
-msgid "System"
-msgstr "Järjestelmä"
+msgid "Thread Group"
+msgstr "Säieryhmä"
 
 #: ../sheets/AADL.sheet.in.h:12
-msgid "Thread"
-msgstr "Säie"
+msgid "Device"
+msgstr "Laite"
 
 #: ../sheets/AADL.sheet.in.h:13
-msgid "Thread Group"
-msgstr "Säieryhmä"
+msgid "Package"
+msgstr "Pakkaus"
+
+#. Please talk to me before making any changes to this sheet
+#: ../sheets/Assorted.sheet.in.h:2
+msgid "Assorted"
+msgstr "Muotoja"
 
 #. 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,561 +7240,638 @@ msgstr ""
 "Sekalainen kokoelma moni-, Bezier-kulmioita sekä muita kirjavia geometrisiä "
 "kuvioita"
 
-#. Please talk to me before making any changes to this sheet
-#: ../sheets/Assorted.sheet.in.h:6
-msgid "Assorted"
-msgstr "Muotoja"
-
-# Taitaa olla vähän sotilasslangia tämä "kulmarauta"
 #: ../sheets/Assorted.sheet.in.h:7
-msgid "Chevron"
-msgstr "Kulmarauta"
+msgid "Right angle triangle"
+msgstr "Suorakulmainen kolmio"
 
 #: ../sheets/Assorted.sheet.in.h:8
-msgid "Curved eight point star"
-msgstr "Kaareva kahdeksansakarainen tähti"
+#, fuzzy
+#| msgid "Isoceles triangle"
+msgid "Isosceles triangle"
+msgstr "Tasakylkinen kolmio"
 
 #: ../sheets/Assorted.sheet.in.h:9
-msgid "Curved four point star"
-msgstr "Kaareva nelisakarainen tähti"
+msgid "Perfect square, height equals width"
+msgstr "Täydellinen neliö, korkeus sama kuin leveys"
 
 #: ../sheets/Assorted.sheet.in.h:10
-msgid "Diamond"
-msgstr "Timantti"
+msgid "Perfect circle"
+msgstr "Täysi ympyrä"
 
 #: ../sheets/Assorted.sheet.in.h:11
-msgid "Down arrow"
-msgstr "Nuoli alas"
+msgid "Quarter circle"
+msgstr "Neljäsosaympyrä"
 
 #: ../sheets/Assorted.sheet.in.h:12
-msgid "Eight point star"
-msgstr "Kahdeksansakarainen tähti"
+msgid "Diamond"
+msgstr "Timantti"
 
 #: ../sheets/Assorted.sheet.in.h:13
-msgid "Five point star"
-msgstr "Viisisakarainen tähti"
+#, fuzzy
+#| msgid "Pentagon. Five sided shape"
+msgid "Pentagon. Five-point shape"
+msgstr "Pentagoni. Viisisivuinen muoto"
 
 #: ../sheets/Assorted.sheet.in.h:14
-msgid "Four point star"
-msgstr "Nelisakarainen tähti"
+#, fuzzy
+#| msgid "Hexagon. Six sided shape"
+msgid "Hexagon. Six-point shape"
+msgstr "Heksagoni. Kuusisivuinen muoto"
 
 #: ../sheets/Assorted.sheet.in.h:15
-msgid "Heart"
-msgstr "Sydän"
+#, fuzzy
+#| msgid "Heptagon. Seven sided shape"
+msgid "Heptagon. Seven-point shape"
+msgstr "Heptagoni. Seitsensivuinen muoto"
 
 #: ../sheets/Assorted.sheet.in.h:16
-msgid "Heptagon. Seven sided shape"
-msgstr "Heptagoni. Seitsensivuinen muoto"
+#, fuzzy
+#| msgid "Octogon. Eight sided shape"
+msgid "Octogon. Eight-point shape"
+msgstr "Oktagoni. Kahdeksansivuinen muoto"
 
 #: ../sheets/Assorted.sheet.in.h:17
-msgid "Hexagon. Six sided shape"
-msgstr "Heksagoni. Kuusisivuinen muoto"
-
-#: ../sheets/Assorted.sheet.in.h:18
 msgid "Horizontal parallelogram"
 msgstr "Vaakasuunnikas"
 
+#: ../sheets/Assorted.sheet.in.h:18
+msgid "Vertical parallelogram"
+msgstr "Pystysuunnikas"
+
 #: ../sheets/Assorted.sheet.in.h:19
-msgid "Isoceles triangle"
-msgstr "Tasakylkinen kolmio"
+msgid "Trapezoid"
+msgstr "Puolisuunnikas"
 
 #: ../sheets/Assorted.sheet.in.h:20
-msgid "Left arrow"
-msgstr "Nuoli vasen"
+#, fuzzy
+#| msgid "Four point star"
+msgid "Four-point star"
+msgstr "Nelisakarainen tähti"
 
 #: ../sheets/Assorted.sheet.in.h:21
-msgid "Left-right arrow"
-msgstr "Nuoli vasen-oikea"
+#, fuzzy
+#| msgid "Curved four point star"
+msgid "Curved four-point star"
+msgstr "Kaareva nelisakarainen tähti"
 
 #: ../sheets/Assorted.sheet.in.h:22
-msgid "Left-right-up arrow"
-msgstr "Nuoli vasen-oikea-ylös"
+#, fuzzy
+#| msgid "Five point star"
+msgid "Five-point star"
+msgstr "Viisisakarainen tähti"
 
 #: ../sheets/Assorted.sheet.in.h:23
-msgid "Left-up arrow"
-msgstr "Nuoli vasen-ylös"
+#, fuzzy
+#| msgid "Six point star"
+msgid "Six-point star"
+msgstr "Kuusisakarainen tähti"
 
 #: ../sheets/Assorted.sheet.in.h:24
-msgid "Maltese cross"
-msgstr "Maltalainen risti"
+#, fuzzy
+#| msgid "Seven point star"
+msgid "Seven-point star"
+msgstr "Seitsensakarainen tähti"
 
 #: ../sheets/Assorted.sheet.in.h:25
-msgid "Notched left arrow"
-msgstr "Lovettu nuoli vasemmalle"
+#, fuzzy
+#| msgid "Eight point star"
+msgid "Eight-point star"
+msgstr "Kahdeksansakarainen tähti"
 
 #: ../sheets/Assorted.sheet.in.h:26
-msgid "Notched right arrow"
-msgstr "Lovettu nuoli oikealle"
+#, fuzzy
+#| msgid "Sharp eight point star"
+msgid "Sharp eight-point star"
+msgstr "Terävä kahdeksansakarainen tähti"
 
 #: ../sheets/Assorted.sheet.in.h:27
-msgid "Octogon. Eight sided shape"
-msgstr "Oktagoni. Kahdeksansivuinen muoto"
+#, fuzzy
+#| msgid "Curved eight point star"
+msgid "Curved eight-point star"
+msgstr "Kaareva kahdeksansakarainen tähti"
 
 #: ../sheets/Assorted.sheet.in.h:28
-msgid "Pentagon block arrow"
-msgstr "Pentagonilohkonuoli"
+msgid "Swiss cross"
+msgstr "Sveitsiläinen risti"
 
 #: ../sheets/Assorted.sheet.in.h:29
-msgid "Pentagon. Five sided shape"
-msgstr "Pentagoni. Viisisivuinen muoto"
+msgid "Maltese cross"
+msgstr "Maltalainen risti"
 
 #: ../sheets/Assorted.sheet.in.h:30
-msgid "Perfect circle"
-msgstr "Täysi ympyrä"
+msgid "Down arrow"
+msgstr "Nuoli alas"
 
 #: ../sheets/Assorted.sheet.in.h:31
-msgid "Perfect square, height equals width"
-msgstr "Täydellinen neliö, korkeus sama kuin leveys"
+msgid "Up arrow"
+msgstr "Nuoli ylös"
 
 #: ../sheets/Assorted.sheet.in.h:32
-msgid "Quad arrow"
-msgstr "Nuoli neljään suuntaan"
+msgid "Left arrow"
+msgstr "Nuoli vasen"
 
 #: ../sheets/Assorted.sheet.in.h:33
-msgid "Quarter circle"
-msgstr "Neljäsosaympyrä"
+msgid "Right arrow"
+msgstr "Nuoli oikea"
 
 #: ../sheets/Assorted.sheet.in.h:34
-msgid "Quarter moon"
-msgstr "Neljäsosakuu"
+msgid "Notched left arrow"
+msgstr "Lovettu nuoli vasemmalle"
 
 #: ../sheets/Assorted.sheet.in.h:35
-msgid "Right angle triangle"
-msgstr "Suorakulmainen kolmio"
+msgid "Notched right arrow"
+msgstr "Lovettu nuoli oikealle"
 
 #: ../sheets/Assorted.sheet.in.h:36
-msgid "Right arrow"
-msgstr "Nuoli oikea"
+msgid "Left-up arrow"
+msgstr "Nuoli vasen-ylös"
 
 #: ../sheets/Assorted.sheet.in.h:37
-msgid "Seven point star"
-msgstr "Seitsensakarainen tähti"
+msgid "Turn-up arrow"
+msgstr "Kääntönuoli"
 
 #: ../sheets/Assorted.sheet.in.h:38
-msgid "Sharp eight point star"
-msgstr "Terävä kahdeksansakarainen tähti"
+msgid "Left-right arrow"
+msgstr "Nuoli vasen-oikea"
 
 #: ../sheets/Assorted.sheet.in.h:39
-msgid "Six point star"
-msgstr "Kuusisakarainen tähti"
+msgid "Up-down arrow"
+msgstr "Nuoli ylös-alas"
 
 #: ../sheets/Assorted.sheet.in.h:40
-msgid "Sun"
-msgstr "Aurinko"
+msgid "Quad arrow"
+msgstr "Nuoli neljään suuntaan"
 
 #: ../sheets/Assorted.sheet.in.h:41
-msgid "Swiss cross"
-msgstr "Sveitsiläinen risti"
+msgid "Left-right-up arrow"
+msgstr "Nuoli vasen-oikea-ylös"
 
 #: ../sheets/Assorted.sheet.in.h:42
-msgid "Trapezoid"
-msgstr "Puolisuunnikas"
+msgid "Up-down-left arrow"
+msgstr "Nuoli ylös-alas-vasen"
 
 #: ../sheets/Assorted.sheet.in.h:43
-msgid "Turn-up arrow"
-msgstr "Kääntönuoli"
+msgid "Pentagon block arrow"
+msgstr "Pentagonilohkonuoli"
 
+# Taitaa olla vähän sotilasslangia tämä "kulmarauta"
 #: ../sheets/Assorted.sheet.in.h:44
-msgid "Up arrow"
-msgstr "Nuoli ylös"
+msgid "Chevron"
+msgstr "Kulmarauta"
 
 #: ../sheets/Assorted.sheet.in.h:45
-msgid "Up-down arrow"
-msgstr "Nuoli ylös-alas"
+msgid "Heart"
+msgstr "Sydän"
 
 #: ../sheets/Assorted.sheet.in.h:46
-msgid "Up-down-left arrow"
-msgstr "Nuoli ylös-alas-vasen"
+msgid "Sun"
+msgstr "Aurinko"
 
 #: ../sheets/Assorted.sheet.in.h:47
-msgid "Vertical parallelogram"
-msgstr "Pystysuunnikas"
-
-#: ../sheets/BPMN.sheet.in.h:1
-msgid "Activity Looping"
-msgstr ""
-
-#: ../sheets/BPMN.sheet.in.h:2
-msgid "Ad-Hoc Collapsed Sub-Process"
-msgstr ""
+msgid "Quarter moon"
+msgstr "Neljäsosakuu"
 
 #. 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 "Liiketoimintaprosessien mallinnusnotattio"
 
+#: ../sheets/BPMN.sheet.in.h:4
+msgid "Start Event"
+msgstr "Aloitustapahtuma"
+
+#: ../sheets/BPMN.sheet.in.h:5
+#, fuzzy
+#| msgid "Start Event - Message"
+msgid "Start Event — Message"
+msgstr "Aloitustapahtuma - viesti"
+
 #: ../sheets/BPMN.sheet.in.h:6
-msgid "Collapsed Sub-Process"
-msgstr ""
+#, fuzzy
+#| msgid "Start Event - Timer"
+msgid "Start Event — Timer"
+msgstr "Aloitustapahtuma - ajastin"
 
 #: ../sheets/BPMN.sheet.in.h:7
-msgid "Compensation Collapsed Sub-Process"
-msgstr ""
+#, fuzzy
+#| msgid "Start Event - Rule"
+msgid "Start Event — Rule"
+msgstr "Aloitustapahtuma - sääntö"
 
 #: ../sheets/BPMN.sheet.in.h:8
-msgid "Compensation Task"
-msgstr ""
+#, fuzzy
+#| msgid "Start Event - Link"
+msgid "Start Event — Link"
+msgstr "Aloitustapahtuma - linkki"
 
 #: ../sheets/BPMN.sheet.in.h:9
-msgid "Complex"
-msgstr "Monimutkainen"
+#, fuzzy
+#| msgid "Start Event - Multiple"
+msgid "Start Event — Multiple"
+msgstr "Aloitustapahtuma - useita"
 
 #: ../sheets/BPMN.sheet.in.h:10
-msgid "Data Object"
-msgstr "Data-objekti"
+msgid "Intermediate Event"
+msgstr "Välitapahtuma"
 
 #: ../sheets/BPMN.sheet.in.h:11
-msgid "End Event"
-msgstr "Lopputapahtuma"
+#, fuzzy
+#| msgid "Intermediate Event - Message"
+msgid "Intermediate Event — Message"
+msgstr "Välitapahtuma - viesti"
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "End Event - Cancel"
-msgstr "Lopputapahtuma - peruminen"
+#, fuzzy
+#| msgid "Intermediate Event - Timer"
+msgid "Intermediate Event — Timer"
+msgstr "Välitapahtuma - ajastin"
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "End Event - Compensation"
-msgstr "Lopputapahtuma - korvaus"
+#, fuzzy
+#| msgid "Intermediate Event - Error"
+msgid "Intermediate Event — Error"
+msgstr "Välitapahtuma - virhe"
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "End Event - Error"
-msgstr "Lopputapahtuma - virhe"
+#, fuzzy
+#| msgid "Intermediate Event - Cancel"
+msgid "Intermediate Event — Cancel"
+msgstr "Välitapahtuma - peruminen"
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "End Event - Link"
-msgstr "Lopputapahtuma - linkki"
+#, fuzzy
+#| msgid "Intermediate Event - Compensation"
+msgid "Intermediate Event — Compensation"
+msgstr "Välitapahtuma - korvaus"
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "End Event - Message"
-msgstr "Lopputapahtuma - viesti"
+#, fuzzy
+#| msgid "Intermediate Event - Rule"
+msgid "Intermediate Event — Rule"
+msgstr "Välitapahtuma - sääntö"
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "End Event - Multiple"
-msgstr "Lopputapahtuma - useita"
+#, fuzzy
+#| msgid "Intermediate Event - Link"
+msgid "Intermediate Event — Link"
+msgstr "Välitapahtuma - linkki"
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "End Event - Terminate"
-msgstr "Lopputapahtuma - päättyminen"
+#, fuzzy
+#| msgid "Intermediate Event - Multiple"
+msgid "Intermediate Event — Multiple"
+msgstr "Välitapahtuma - useita"
 
 #: ../sheets/BPMN.sheet.in.h:19
-msgid "Exclusive (XOR) Data Based"
-msgstr ""
+msgid "End Event"
+msgstr "Lopputapahtuma"
 
 #: ../sheets/BPMN.sheet.in.h:20
-msgid "Exclusive (XOR) Event Based"
-msgstr ""
+#, fuzzy
+#| msgid "End Event - Message"
+msgid "End Event — Message"
+msgstr "Lopputapahtuma - viesti"
 
 #: ../sheets/BPMN.sheet.in.h:21
-msgid "Gateway"
-msgstr "Yhdyskäytävä"
+#, fuzzy
+#| msgid "End Event - Error"
+msgid "End Event — Error"
+msgstr "Lopputapahtuma - virhe"
 
 #: ../sheets/BPMN.sheet.in.h:22
-msgid "Group"
-msgstr "Ryhmä"
+#, fuzzy
+#| msgid "End Event - Cancel"
+msgid "End Event — Cancel"
+msgstr "Lopputapahtuma - peruminen"
 
 #: ../sheets/BPMN.sheet.in.h:23
-msgid "Inclusive (OR)"
-msgstr ""
+#, fuzzy
+#| msgid "End Event - Compensation"
+msgid "End Event — Compensation"
+msgstr "Lopputapahtuma - korvaus"
 
 #: ../sheets/BPMN.sheet.in.h:24
-msgid "Intermediate Event"
-msgstr "Välitapahtuma"
+#, fuzzy
+#| msgid "End Event - Link"
+msgid "End Event — Link"
+msgstr "Lopputapahtuma - linkki"
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "Intermediate Event - Cancel"
-msgstr "Välitapahtuma - peruminen"
+#, fuzzy
+#| msgid "End Event - Multiple"
+msgid "End Event — Multiple"
+msgstr "Lopputapahtuma - useita"
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "Intermediate Event - Compensation"
-msgstr "Välitapahtuma - korvaus"
+#, fuzzy
+#| msgid "End Event - Terminate"
+msgid "End Event — Terminate"
+msgstr "Lopputapahtuma - päättyminen"
 
 #: ../sheets/BPMN.sheet.in.h:27
-msgid "Intermediate Event - Error"
-msgstr "Välitapahtuma - virhe"
+msgid "Gateway"
+msgstr "Yhdyskäytävä"
 
 #: ../sheets/BPMN.sheet.in.h:28
-msgid "Intermediate Event - Link"
-msgstr "Välitapahtuma - linkki"
+msgid "Exclusive (XOR) Data Based"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:29
-msgid "Intermediate Event - Message"
-msgstr "Välitapahtuma - viesti"
+msgid "Exclusive (XOR) Event Based"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:30
-msgid "Intermediate Event - Multiple"
-msgstr "Välitapahtuma - useita"
+msgid "Inclusive (OR)"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:31
-msgid "Intermediate Event - Rule"
-msgstr "Välitapahtuma - sääntö"
+msgid "Complex"
+msgstr "Monimutkainen"
 
 #: ../sheets/BPMN.sheet.in.h:32
-msgid "Intermediate Event - Timer"
-msgstr "Välitapahtuma - ajastin"
-
-#: ../sheets/BPMN.sheet.in.h:33
-msgid "Looping Collapsed Sub-Process"
-msgstr ""
+msgid "Parallel (AND)"
+msgstr "Rinnakkainen (AND)"
 
 #: ../sheets/BPMN.sheet.in.h:34
-msgid "Multiple Instance Collapsed Sub-Process"
-msgstr "Monen instanssin pienennetty aliprosessi"
+msgid "Activity Looping"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:35
 msgid "Multiple Instance Task"
 msgstr "Monen instanssin tapahtuma"
 
 #: ../sheets/BPMN.sheet.in.h:36
-msgid "Parallel (AND)"
-msgstr "Rinnakkainen (AND)"
+msgid "Compensation Task"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:37
-msgid "Start Event"
-msgstr "Aloitustapahtuma"
+msgid "Collapsed Sub-Process"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:38
-msgid "Start Event - Link"
-msgstr "Aloitustapahtuma - linkki"
+msgid "Looping Collapsed Sub-Process"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:39
-msgid "Start Event - Message"
-msgstr "Aloitustapahtuma - viesti"
+msgid "Multiple Instance Collapsed Sub-Process"
+msgstr "Monen instanssin pienennetty aliprosessi"
 
 #: ../sheets/BPMN.sheet.in.h:40
-msgid "Start Event - Multiple"
-msgstr "Aloitustapahtuma - useita"
+msgid "Ad-Hoc Collapsed Sub-Process"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:41
-msgid "Start Event - Rule"
-msgstr "Aloitustapahtuma - sääntö"
+msgid "Compensation Collapsed Sub-Process"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:42
-msgid "Start Event - Timer"
-msgstr "Aloitustapahtuma - ajastin"
-
-#: ../sheets/BPMN.sheet.in.h:44
-msgid "Text Annotation"
-msgstr "Tekstin huomautukset"
+msgid "Group"
+msgstr "Ryhmä"
 
-#: ../sheets/BPMN.sheet.in.h:45
+#: ../sheets/BPMN.sheet.in.h:43
 msgid "Transaction"
 msgstr "Transaktio"
 
-#: ../sheets/ChemEng.sheet.in.h:1
-msgid "AC Generator"
-msgstr "Vaihtovirtageneraattori"
+#: ../sheets/BPMN.sheet.in.h:44
+msgid "Data Object"
+msgstr "Data-objekti"
+
+#: ../sheets/BPMN.sheet.in.h:45
+msgid "Text Annotation"
+msgstr "Tekstin huomautukset"
 
+#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:2
-msgid "Air Cooler"
-msgstr "Ilmanjäähdytin"
+msgid "ChemEng"
+msgstr "Kemian suunnittelu"
 
 #: ../sheets/ChemEng.sheet.in.h:3
-msgid "Autoclave"
-msgstr "Autoklaavi"
+msgid "Collection for chemical engineering"
+msgstr "Kokoelma kemialliseen suunnitteluun"
 
 #: ../sheets/ChemEng.sheet.in.h:4
-msgid "Axial Flow Fan"
-msgstr ""
+msgid "Fan or Stirrer"
+msgstr "Tuuletin tai sekoitin"
 
 #: ../sheets/ChemEng.sheet.in.h:5
-msgid "Basic Filter"
-msgstr "Perussuodatin"
+msgid "Spraying Device"
+msgstr "Suihkutuslaite"
 
 #: ../sheets/ChemEng.sheet.in.h:6
-msgid "Centrifugal Pump or Fan"
-msgstr "Sentrifugipumppu- tai tuuletin"
+msgid "Pneumatic Line"
+msgstr "Paineilmalinja"
 
 #: ../sheets/ChemEng.sheet.in.h:7
-msgid "Centrifuge"
-msgstr "Sentrifugi"
+msgid "Pneumatic Line, vertical"
+msgstr "Paineilmalinja, pystysuuntainen"
 
-#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:9
-msgid "ChemEng"
-msgstr "Kemian suunnittelu"
+msgid "Simple Heat Exchanger"
+msgstr "Yksinkertainen lämmönvaihdin"
 
 #: ../sheets/ChemEng.sheet.in.h:10
-msgid "Clarifier or Settling Tank"
-msgstr "Selvitys- tai asettumistankki"
+msgid "Simple Heat Exchanger, vertical"
+msgstr "Yksinkertainen lämmönvaihdin, vaakasuunnassa"
 
 #: ../sheets/ChemEng.sheet.in.h:11
-msgid "Collection for chemical engineering"
-msgstr "Kokoelma kemialliseen suunnitteluun"
+msgid "Water Cooler"
+msgstr "Vesijäähdytin"
 
 #: ../sheets/ChemEng.sheet.in.h:12
-msgid "Compressor or Turbine"
-msgstr "Kompressori tai turbiini"
+msgid "Water Cooler, vertical"
+msgstr "Vesijäähdytin, pysty"
 
 #: ../sheets/ChemEng.sheet.in.h:13
-msgid "Covered tank"
-msgstr "Peitetty tankki"
+msgid "Fixed-Sheet Exchanger"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:14
-msgid "Cyclone and hydrocyclone"
+msgid "Floating-Head or U-Tube Exchanger"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:15
-msgid "Double-Pipe Exchanger"
+msgid "Kettle Reboiler"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:16
-msgid "Ejector or Injector"
-msgstr ""
+msgid "Air Cooler"
+msgstr "Ilmanjäähdytin"
 
 #: ../sheets/ChemEng.sheet.in.h:17
-msgid "Fan or Stirrer"
-msgstr "Tuuletin tai sekoitin"
+msgid "Forced-Flow Air Cooler"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:18
-msgid "Fixed-Sheet Exchanger"
+msgid "Induced-Flow Air Cooler"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:19
-msgid "Floating-Head or U-Tube Exchanger"
+msgid "Plate Exchanger"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:20
-msgid "Fluid Contacting Vessel, simple"
+msgid "Double-Pipe Exchanger"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:21
-msgid "Forced-Flow Air Cooler"
-msgstr ""
+msgid "Heating/Cooling Coil"
+msgstr "Lämmitys- tai jäähdytyskela"
 
 #: ../sheets/ChemEng.sheet.in.h:22
-msgid "Gas Holder, basic"
-msgstr "Kaasusäiliö, tavallinen"
+msgid "Heating/Cooling Coil, vertical"
+msgstr "Lämmitys- tai jäähdytyskela, pystyssä"
 
 #: ../sheets/ChemEng.sheet.in.h:23
-msgid "Heating/Cooling Coil"
-msgstr "Lämmitys- tai jäähdytyskela"
+msgid "Simple Furnace"
+msgstr "Yksinkertainen uuni"
 
 #: ../sheets/ChemEng.sheet.in.h:24
-msgid "Heating/Cooling Coil, vertical"
-msgstr "Lämmitys- tai jäähdytyskela, pystyssä"
+msgid "Simple Vessel"
+msgstr "Yksinkertainen astia"
 
 #: ../sheets/ChemEng.sheet.in.h:25
-msgid "Induced-Flow Air Cooler"
+msgid "Knock-out Drum (with demister pad)"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:26
-msgid "Kettle Reboiler"
+msgid "Tray Column, simple"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:27
-msgid "Knock-out Drum (with demister pad)"
+msgid "Tray Column, detailed"
+msgstr ""
+
+#: ../sheets/ChemEng.sheet.in.h:28
+msgid "Fluid Contacting Vessel, simple"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:29
-msgid "Mixer"
-msgstr "Sekoitin"
+msgid "Reactor or Absorption Vessel, simple"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:30
-msgid "Open Tank"
-msgstr "Avoin tankki"
+msgid "Autoclave"
+msgstr "Autoklaavi"
 
 #: ../sheets/ChemEng.sheet.in.h:31
-msgid "Plate Exchanger"
-msgstr ""
+msgid "Open Tank"
+msgstr "Avoin tankki"
 
 #: ../sheets/ChemEng.sheet.in.h:32
-msgid "Pneumatic Line"
-msgstr "Paineilmalinja"
+msgid "Clarifier or Settling Tank"
+msgstr "Selvitys- tai asettumistankki"
 
 #: ../sheets/ChemEng.sheet.in.h:33
-msgid "Pneumatic Line, vertical"
-msgstr "Paineilmalinja, pystysuuntainen"
+msgid "Sealed Tank"
+msgstr "Suljettu tankki"
 
 #: ../sheets/ChemEng.sheet.in.h:34
-msgid "Positive Displacement Rotary Pump or Compressor"
-msgstr ""
+msgid "Covered tank"
+msgstr "Peitetty tankki"
 
 #: ../sheets/ChemEng.sheet.in.h:35
-msgid "Pressure Relief Valve"
-msgstr ""
+msgid "Tank with Fixed Roof"
+msgstr "Kiinteäkattoinen tankki"
 
 #: ../sheets/ChemEng.sheet.in.h:36
-msgid "Reactor or Absorption Vessel, simple"
-msgstr ""
+msgid "Tank with Floating Roof"
+msgstr "Kelluvakattoinen tankki"
 
 #: ../sheets/ChemEng.sheet.in.h:37
-msgid "Reciprocating Compressor or Pump"
-msgstr ""
+msgid "Storage Sphere"
+msgstr "Tallennusalue"
 
 #: ../sheets/ChemEng.sheet.in.h:38
-msgid "Regulable Valve"
-msgstr "Säädettävä venttiili"
+msgid "Gas Holder, basic"
+msgstr "Kaasusäiliö, tavallinen"
 
 #: ../sheets/ChemEng.sheet.in.h:39
-msgid "Regulable Valve, vertical"
-msgstr "Säädettävä venttiili, pystysuunnassa"
+msgid "Centrifugal Pump or Fan"
+msgstr "Sentrifugipumppu- tai tuuletin"
 
 #: ../sheets/ChemEng.sheet.in.h:40
-msgid "Sealed Tank"
-msgstr "Suljettu tankki"
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:41
-msgid "Simple Furnace"
-msgstr "Yksinkertainen uuni"
+msgid "Reciprocating Compressor or Pump"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:42
-msgid "Simple Heat Exchanger"
-msgstr "Yksinkertainen lämmönvaihdin"
+msgid "Axial Flow Fan"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:43
-msgid "Simple Heat Exchanger, vertical"
-msgstr "Yksinkertainen lämmönvaihdin, vaakasuunnassa"
+msgid "Compressor or Turbine"
+msgstr "Kompressori tai turbiini"
 
 #: ../sheets/ChemEng.sheet.in.h:44
-msgid "Simple Vessel"
-msgstr "Yksinkertainen astia"
+msgid "Ejector or Injector"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:45
-msgid "Spray Drier"
-msgstr "Suihkukuivaaja"
+msgid "AC Generator"
+msgstr "Vaihtovirtageneraattori"
 
 #: ../sheets/ChemEng.sheet.in.h:46
-msgid "Spraying Device"
-msgstr "Suihkutuslaite"
+msgid "Valve"
+msgstr "Venttiili"
 
 #: ../sheets/ChemEng.sheet.in.h:47
-msgid "Storage Sphere"
-msgstr "Tallennusalue"
+msgid "Valve, vertical"
+msgstr "Venttiili, pysty"
 
 #: ../sheets/ChemEng.sheet.in.h:48
-msgid "Tank with Fixed Roof"
-msgstr "Kiinteäkattoinen tankki"
+msgid "Regulable Valve"
+msgstr "Säädettävä venttiili"
 
 #: ../sheets/ChemEng.sheet.in.h:49
-msgid "Tank with Floating Roof"
-msgstr "Kelluvakattoinen tankki"
+msgid "Regulable Valve, vertical"
+msgstr "Säädettävä venttiili, pystysuunnassa"
 
 #: ../sheets/ChemEng.sheet.in.h:50
-msgid "Tray Column, detailed"
-msgstr ""
+msgid "Basic Filter"
+msgstr "Perussuodatin"
 
 #: ../sheets/ChemEng.sheet.in.h:51
-msgid "Tray Column, simple"
-msgstr ""
+msgid "Mixer"
+msgstr "Sekoitin"
 
 #: ../sheets/ChemEng.sheet.in.h:52
-msgid "Valve"
-msgstr "Venttiili"
+msgid "Cyclone and hydrocyclone"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:53
-msgid "Valve, vertical"
-msgstr "Venttiili, pysty"
+msgid "Spray Drier"
+msgstr "Suihkukuivaaja"
 
 #: ../sheets/ChemEng.sheet.in.h:54
-msgid "Water Cooler"
-msgstr "Vesijäähdytin"
+msgid "Centrifuge"
+msgstr "Sentrifugi"
 
 #: ../sheets/ChemEng.sheet.in.h:55
-msgid "Water Cooler, vertical"
-msgstr "Vesijäähdytin, pysty"
+msgid "Pressure Relief Valve"
+msgstr ""
+
+#: ../sheets/chronogram.sheet.in.h:1
+msgid "Chronogram"
+msgstr "Kronogrammi"
+
+#: ../sheets/chronogram.sheet.in.h:2
+msgid "Objects to design chronogram charts"
+msgstr "Objektit kronogrammikaavioiden suunnitteluun"
+
+#: ../sheets/chronogram.sheet.in.h:3
+msgid "Time scale"
+msgstr "Aikaskaala"
+
+#: ../sheets/chronogram.sheet.in.h:4
+msgid "Data line"
+msgstr "Tietojana"
 
 #: ../sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
@@ -7263,2101 +7882,705 @@ msgid "Components for circuit diagrams"
 msgstr "Komponentit virtapiirikaavioille"
 
 #: ../sheets/Circuit.sheet.in.h:3
-msgid "Ground point"
-msgstr "Maadoituspiste"
+msgid "Vertically aligned resistor"
+msgstr "Pystysuuntainen vastus"
 
 #: ../sheets/Circuit.sheet.in.h:4
-msgid "Horizontal jumper"
-msgstr "Vaakasuuntainen hyppyliitin"
+msgid "Horizontally aligned inductor"
+msgstr "Vaakasuuntainen kuristin"
 
 #: ../sheets/Circuit.sheet.in.h:5
-msgid "Horizontally aligned LED"
-msgstr "Vaakasuuntainen LED"
+msgid "Vertically aligned inductor"
+msgstr "Pystysuuntainen kuristin"
 
 #: ../sheets/Circuit.sheet.in.h:6
-msgid "Horizontally aligned capacitor"
-msgstr "Vaakasuuntainen kondensaattori"
+msgid "Horizontally aligned resistor"
+msgstr "Vaakasuuntainen vastus"
 
 #: ../sheets/Circuit.sheet.in.h:7
-msgid "Horizontally aligned diode"
-msgstr "Vaakasuntainen diodi"
+msgid "Vertically aligned resistor (European)"
+msgstr "Pystysuuntainen vastus (eurooppalainen)"
 
 #: ../sheets/Circuit.sheet.in.h:8
-msgid "Horizontally aligned fuse"
-msgstr "Vaakasuuntainen sulake"
-
-#: ../sheets/Circuit.sheet.in.h:9
-msgid "Horizontally aligned inductor"
-msgstr "Vaakasuuntainen kuristin"
-
-#: ../sheets/Circuit.sheet.in.h:10
 msgid "Horizontally aligned inductor (European)"
 msgstr "Vaakasuuntainen kuristin (eurooppalainen)"
 
-#: ../sheets/Circuit.sheet.in.h:11
-msgid "Horizontally aligned powersource"
-msgstr "Vaakasuuntainen virtalähde"
-
-#: ../sheets/Circuit.sheet.in.h:12
-msgid "Horizontally aligned resistor"
-msgstr "Vaakasuuntainen vastus"
+#: ../sheets/Circuit.sheet.in.h:9
+msgid "Vertically aligned inductor (European)"
+msgstr "Pystysuuntainen kuristin (eurooppalainen)"
 
-#: ../sheets/Circuit.sheet.in.h:13
+#: ../sheets/Circuit.sheet.in.h:10
 msgid "Horizontally aligned resistor (European)"
 msgstr "Vaakasuuntainen vastus (eurooppalainen)"
 
-#: ../sheets/Circuit.sheet.in.h:14
-msgid "Horizontally aligned zener diode"
-msgstr "Vaakasuuntainen zenerdiodi"
-
-#: ../sheets/Circuit.sheet.in.h:15
-msgid "Lamp"
-msgstr "Lamppu"
-
-#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
-msgid "Microphone"
-msgstr "Mikrofoni"
+#: ../sheets/Circuit.sheet.in.h:11
+msgid "Horizontally aligned capacitor"
+msgstr "Vaakasuuntainen kondensaattori"
 
-#: ../sheets/Circuit.sheet.in.h:17
-msgid "NMOS transistor"
-msgstr "NMOS-transistori"
+#: ../sheets/Circuit.sheet.in.h:12
+msgid "Vertically aligned capacitor"
+msgstr "Pystysuuntainen kondensaattori"
 
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:20
+#: ../sheets/Circuit.sheet.in.h:15
 msgid "NPN bipolar transistor"
 msgstr "Kaksinapainen NPN-transistori"
 
-#: ../sheets/Circuit.sheet.in.h:21
-msgid "Operational amplifier"
-msgstr "Operaatiovahvistin"
-
-#: ../sheets/Circuit.sheet.in.h:22
-msgid "PMOS transistor"
-msgstr "PMOS-transistori"
-
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:25
+#: ../sheets/Circuit.sheet.in.h:18
 msgid "PNP bipolar transistor"
 msgstr "Kaksinapainen PNP-transistori"
 
-#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
-msgid "Speaker"
-msgstr "Kaiutin"
-
-#: ../sheets/Circuit.sheet.in.h:27
-msgid "Vertically aligned LED"
-msgstr "Pystysuuntainen LED"
-
-#: ../sheets/Circuit.sheet.in.h:28
-msgid "Vertically aligned capacitor"
-msgstr "Pystysuuntainen kondensaattori"
+#: ../sheets/Circuit.sheet.in.h:19
+msgid "Horizontally aligned diode"
+msgstr "Vaakasuntainen diodi"
 
-#: ../sheets/Circuit.sheet.in.h:29
+#: ../sheets/Circuit.sheet.in.h:20
 msgid "Vertically aligned diode"
 msgstr "Pystysuuntainen diodi"
 
-#: ../sheets/Circuit.sheet.in.h:30
-msgid "Vertically aligned fuse"
-msgstr "Pystysuuntainen sulake"
-
-#: ../sheets/Circuit.sheet.in.h:31
-msgid "Vertically aligned inductor"
-msgstr "Pystysuuntainen kuristin"
-
-#: ../sheets/Circuit.sheet.in.h:32
-msgid "Vertically aligned inductor (European)"
-msgstr "Pystysuuntainen kuristin (eurooppalainen)"
-
-#: ../sheets/Circuit.sheet.in.h:33
-msgid "Vertically aligned powersource"
-msgstr "Pystysuuntainen virtalähde"
-
-#: ../sheets/Circuit.sheet.in.h:34
-msgid "Vertically aligned resistor"
-msgstr "Pystysuuntainen vastus"
-
-#: ../sheets/Circuit.sheet.in.h:35
-msgid "Vertically aligned resistor (European)"
-msgstr "Pystysuuntainen vastus (eurooppalainen)"
+#: ../sheets/Circuit.sheet.in.h:21
+msgid "Horizontally aligned zener diode"
+msgstr "Vaakasuuntainen zenerdiodi"
 
-#: ../sheets/Circuit.sheet.in.h:36
+#: ../sheets/Circuit.sheet.in.h:22
 msgid "Vertically aligned zener diode"
 msgstr "Pystysuuntainen zenerdiodi"
 
-#: ../sheets/Contact.sheet.in.h:1
-msgid "'if not' (normally closed) ladder contact"
-msgstr "'jos ei'-tikapuuyhteys (normaalisti kiinni)"
-
-#: ../sheets/Contact.sheet.in.h:2
-msgid "'if' (normally open) ladder contact"
-msgstr "'jos'-tikapuuyhteys (normaalisti auki)"
-
-#: ../sheets/Contact.sheet.in.h:3
-msgid "'jump' output variable"
-msgstr "'hyppää'-tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:4
-msgid "'reset' output variable"
-msgstr "'nollaa'-tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:5
-msgid "'set' output variable"
-msgstr "'aseta'-tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:6
-msgid "Components for LADDER circuits"
-msgstr "Komponentit LADDER-piireille"
-
-#: ../sheets/Contact.sheet.in.h:7
-msgid "Ladder"
-msgstr "Tikapuukaavio"
-
-#: ../sheets/Contact.sheet.in.h:8
-msgid "Negative output variable"
-msgstr "Kielteinen tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:9
-msgid "Power-saved 'reset' output variable"
-msgstr "Virtaa säästävä 'nollaa'-tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:10
-msgid "Power-saved 'set' output variable"
-msgstr "Virtaa säästävä 'aseta'-tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:11
-msgid "Power-saved negative output variable"
-msgstr "Virtaa säästävä kielteinen tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:12
-msgid "Power-saved simple output variable"
-msgstr "Virtaa säästävä yksinkertainen tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:13
-msgid "Receptivity output variable"
-msgstr "Vastaanottava tulostemuuttuja"
-
-#: ../sheets/Contact.sheet.in.h:14
-msgid "Simple output variable"
-msgstr "Yksinkertainen tulostemuuttuja"
-
-#: ../sheets/Cybernetics.sheet.in.h:1
-msgid "Constant factor below -1"
-msgstr "Vakiotekijä alle -1"
-
-#: ../sheets/Cybernetics.sheet.in.h:2
-msgid "Constant factor between 0 and -1"
-msgstr "Vakiotekijä 0 ja -1 välillä"
-
-#: ../sheets/Cybernetics.sheet.in.h:3
-msgid "Constant factor between 0 and 1"
-msgstr "Vakiotekijä 0 ja 1 välillä"
-
-#: ../sheets/Cybernetics.sheet.in.h:4
-msgid "Constant factor greater 1"
-msgstr "Vakiotekijä yli 1"
-
-#: ../sheets/Cybernetics.sheet.in.h:5
-msgid "Constant negative shift on the y-axis"
-msgstr "Negatiivinen vakiosiirtymä y-akselilla"
-
-#: ../sheets/Cybernetics.sheet.in.h:6
-msgid "Constant positive shift on the y-axis"
-msgstr "Positiivinen vakiosiirtymä y-akselilla"
-
-#: ../sheets/Cybernetics.sheet.in.h:7
-msgid "Cybernetics"
-msgstr "Kybernetiikka"
-
-#: ../sheets/Cybernetics.sheet.in.h:8
-msgid "Elements of cybernetic circuits"
-msgstr "Komponentit kybernetiikkapiireihin"
-
-#: ../sheets/Cybernetics.sheet.in.h:9
-msgid "Full wave rectifier (absolute value)"
-msgstr "Kokoaaltotasasuuntaaja (absoluuttinen arvo)"
-
-#: ../sheets/Cybernetics.sheet.in.h:10
-msgid "Half wave rectifier or ramp input"
-msgstr "Puoliaaltotasasuuntaaja"
-
-#: ../sheets/Cybernetics.sheet.in.h:11
-msgid "High pass filter"
-msgstr "Ylipäästösuodatin"
-
-#: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator - input bottom"
-msgstr "Integraattori - syöte, ala"
-
-#: ../sheets/Cybernetics.sheet.in.h:13
-msgid "Integrator - input left"
-msgstr "Integraattori - syöte, vasen"
-
-#: ../sheets/Cybernetics.sheet.in.h:14
-msgid "Integrator - input right"
-msgstr "Integraattori - syöte, oikea"
-
-#: ../sheets/Cybernetics.sheet.in.h:15
-msgid "Integrator - input top"
-msgstr "Integraattori - syöte, ylä"
-
-#: ../sheets/Cybernetics.sheet.in.h:16
-msgid "Low pass filter"
-msgstr "Alipäästösuodatin"
-
-#: ../sheets/Cybernetics.sheet.in.h:17
-msgid "Product"
-msgstr "Tulo"
-
-#: ../sheets/Cybernetics.sheet.in.h:18
-msgid "Relay characteristic (sigma)"
-msgstr "Viiveominaisuus (sigma)"
-
-#: ../sheets/Cybernetics.sheet.in.h:19
-msgid "Saturation characteristic"
-msgstr "Kyllästysominaisuus"
-
-#: ../sheets/Cybernetics.sheet.in.h:20
-msgid "Sensor - bottom"
-msgstr "Tunnistin - ala"
-
-#: ../sheets/Cybernetics.sheet.in.h:21
-msgid "Sensor - left"
-msgstr "Tunnistin - vasen"
-
-#: ../sheets/Cybernetics.sheet.in.h:22
-msgid "Sensor - right"
-msgstr "Tunnistin - oikea"
-
-#: ../sheets/Cybernetics.sheet.in.h:23
-msgid "Sensor - top"
-msgstr "Tunnistin - ylä"
-
-#: ../sheets/Cybernetics.sheet.in.h:24
-msgid "Sigmoid characteristic"
-msgstr "Sigmoid-ominaiskäyrä"
-
-#: ../sheets/Cybernetics.sheet.in.h:25
-msgid "Sine characteristic or input"
-msgstr "Sini-ominaiskäyrä tai syöte"
-
-#: ../sheets/Cybernetics.sheet.in.h:26
-msgid "Sum"
-msgstr "Summa"
-
-#: ../sheets/Cybernetics.sheet.in.h:27
-msgid "Sum, subtracting bottom input"
-msgstr "Summa, vähentäen alasyötteen"
-
-#: ../sheets/Cybernetics.sheet.in.h:28
-msgid "Sum, subtracting left input"
-msgstr "Summa, vähentäen vasemman syötteen"
-
-#: ../sheets/Cybernetics.sheet.in.h:29
-msgid "Sum, subtracting right input"
-msgstr "Summa, vähentäen oikean syötteen"
-
-#: ../sheets/Cybernetics.sheet.in.h:30
-msgid "Sum, subtracting top input"
-msgstr "Summa, vähentäen yläsyötteen"
-
-#: ../sheets/Cybernetics.sheet.in.h:31
-msgid "Template for custom characteristics"
-msgstr "Mallipohja omille ominaiskäyrille"
-
-#: ../sheets/Cybernetics.sheet.in.h:32
-msgid "Time delay"
-msgstr "Aikaviive"
-
-#: ../sheets/Database.sheet.in.h:1
-msgid "Attribute compound"
-msgstr ""
-
-#: ../sheets/Database.sheet.in.h:2
-msgid "Database"
-msgstr "Tietokanta"
-
-#: ../sheets/Database.sheet.in.h:3
-msgid "Editor for Database Table Relation Diagrams"
-msgstr "Muokkain tietokanteiden suhdekaavioille"
-
-#: ../sheets/ER.sheet.in.h:2
-msgid "ER"
-msgstr "ER"
-
-#: ../sheets/ER.sheet.in.h:3
-msgid "Editor for Entity Relations Diagrams"
-msgstr "Muokkain ER-kaavioille"
-
-#: ../sheets/ER.sheet.in.h:5
-msgid "Participation"
-msgstr "Osallisuus"
-
-#: ../sheets/ER.sheet.in.h:7
-msgid "Weak entity"
-msgstr "Heikko olio"
-
-#: ../sheets/Electric.sheet.in.h:1
-msgid "Components for electric circuits"
-msgstr "Komponentit sähköpiireihin"
-
-#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
-msgid "Connection point"
-msgstr "Liitoskohta"
-
-#: ../sheets/Electric.sheet.in.h:3
-msgid "Electric"
-msgstr "Virtapiiri 2"
-
-#: ../sheets/Electric.sheet.in.h:4
-msgid "Lamp or indicator light (horizontal)"
-msgstr "Lamppu tai merkkivalo (poikittain)"
-
-#: ../sheets/Electric.sheet.in.h:5
-msgid "Lamp or indicator light (vertical)"
-msgstr "Lamppu tai merkkivalo (pystyssä)"
-
-#: ../sheets/Electric.sheet.in.h:6
-msgid "Normally closed contact (horizontal)"
-msgstr "Normaalisti suljettu yhteys (poikittain)"
-
-#: ../sheets/Electric.sheet.in.h:7
-msgid "Normally closed contact (vertical)"
-msgstr "Normaalisti suljettu yhteys (pystyssä)"
-
-#: ../sheets/Electric.sheet.in.h:8
-msgid "Normally closed position switch (horizontal)"
-msgstr "Normaalisti suljettu sijainnin kytkin (poikittain)"
-
-#: ../sheets/Electric.sheet.in.h:9
-msgid "Normally closed position switch (vertical)"
-msgstr "Normaalisti suljettu sijainnin kytkin (pystyssä)"
-
-#: ../sheets/Electric.sheet.in.h:10
-msgid "Normally open contact (horizontal)"
-msgstr "Normaalisti avoin yhteys (poikittain)"
-
-#: ../sheets/Electric.sheet.in.h:11
-msgid "Normally open contact (vertical)"
-msgstr "Normaalisti avoin yhteys (pystyssä)"
-
-#: ../sheets/Electric.sheet.in.h:12
-msgid "Normally open position switch (horizontal)"
-msgstr "Normaalisti avoin sijaintikytkin (poikittain)"
-
-#: ../sheets/Electric.sheet.in.h:13
-msgid "Normally open position switch (vertical)"
-msgstr "Normaalisti avoin sijaintikytkin (pystyssä)"
-
-#: ../sheets/Electric.sheet.in.h:14
-msgid "Relay (horizontal)"
-msgstr "Rele (poikittain)"
-
-#: ../sheets/Electric.sheet.in.h:15
-msgid "Relay (vertical)"
-msgstr "Rele (pystyssä)"
-
-#: ../sheets/Electric.sheet.in.h:16
-msgid "The command organ of a relay (horizontal)"
-msgstr "Välityksen komentoelin (poikittain)"
-
-#: ../sheets/Electric.sheet.in.h:17
-msgid "The command organ of a relay (vertical)"
-msgstr "Välityksen komentoelin (pystyssä)"
-
-#: ../sheets/FS.sheet.in.h:1
-msgid "Editor for Function Structure Diagrams."
-msgstr "Muokkain funktiorakennekaavioille."
-
-#: ../sheets/FS.sheet.in.h:2
-msgid "FS"
-msgstr "FS"
-
-#: ../sheets/FS.sheet.in.h:3
-msgid "Flow"
-msgstr "Virtaus"
-
-#: ../sheets/FS.sheet.in.h:4
-msgid "Function"
-msgstr "Toiminto"
-
-#: ../sheets/FS.sheet.in.h:5
-msgid "Orthogonal polyline flow"
-msgstr "Kohtisuora moniviivavirtaus"
-
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:2
-msgid "Collate"
-msgstr "Kokoa"
-
-#: ../sheets/Flowchart.sheet.in.h:3
-msgid "Connector"
-msgstr "Liitin"
-
-#: ../sheets/Flowchart.sheet.in.h:4
-msgid "Data source"
-msgstr "Tietollähde"
-
-#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-msgid "Decision"
-msgstr "Päätös"
-
-#: ../sheets/Flowchart.sheet.in.h:6
-msgid "Delay"
-msgstr "Viive"
-
-#: ../sheets/Flowchart.sheet.in.h:8
-msgid "Document"
-msgstr "Asiakirja"
-
-#: ../sheets/Flowchart.sheet.in.h:11
-msgid "Input/Output"
-msgstr "Syöte/tuloste"
-
-#: ../sheets/Flowchart.sheet.in.h:12
-msgid "Internal storage"
-msgstr "Sisäinen tallennus"
-
-#: ../sheets/Flowchart.sheet.in.h:13
-msgid "Magnetic disk"
-msgstr "Magneettilevy"
-
-#: ../sheets/Flowchart.sheet.in.h:14
-msgid "Magnetic drum"
-msgstr "Magneettirumpu"
-
-#: ../sheets/Flowchart.sheet.in.h:15
-msgid "Magnetic tape"
-msgstr "Magneettinauha"
-
-#: ../sheets/Flowchart.sheet.in.h:16
-msgid "Manual input"
-msgstr "Käsisyöte"
-
-#: ../sheets/Flowchart.sheet.in.h:17
-msgid "Manual operation"
-msgstr "Käsitoiminta"
-
-#: ../sheets/Flowchart.sheet.in.h:18
-msgid "Merge"
-msgstr "Liitä"
-
-#: ../sheets/Flowchart.sheet.in.h:19
-msgid "Objects to draw flowcharts"
-msgstr "Objektit vuokaavioiden piirtämiseen"
-
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:21
-msgid "Off page connector"
-msgstr "Sivunvaihtoliitin"
-
-#: ../sheets/Flowchart.sheet.in.h:22
-msgid "Offline storage"
-msgstr "Yhteydetön tallennus"
-
-#: ../sheets/Flowchart.sheet.in.h:23
-msgid "Or"
-msgstr "Tai"
-
-#: ../sheets/Flowchart.sheet.in.h:24
-msgid "Predefined process"
-msgstr "Esimääritelty prosessi"
-
-#: ../sheets/Flowchart.sheet.in.h:25
-msgid "Preparation"
-msgstr "Valmistelu"
-
-#: ../sheets/Flowchart.sheet.in.h:26
-msgid "Process/Auxiliary Operation"
-msgstr "Prosessi/Toissijainen toiminto"
-
-#: ../sheets/Flowchart.sheet.in.h:27
-msgid "Punched card"
-msgstr "Reikäkortti"
-
-#: ../sheets/Flowchart.sheet.in.h:28
-msgid "Punched tape"
-msgstr "Reikänauha"
-
-#: ../sheets/Flowchart.sheet.in.h:29
-msgid "Sort"
-msgstr "Järjestä"
-
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:31
-msgid "Summing junction"
-msgstr "Summaliitos"
-
-#: ../sheets/Flowchart.sheet.in.h:32
-msgid "Terminal Interrupt"
-msgstr "Päätekeskeytys"
-
-#: ../sheets/Flowchart.sheet.in.h:33
-msgid "Transaction file"
-msgstr "Transaktiotiedosto"
-
-#: ../sheets/Flowchart.sheet.in.h:34
-msgid "Transmittal tape"
-msgstr "Siirtonauha"
-
-#: ../sheets/GRAFCET.sheet.in.h:1
-msgid "AND vergent"
-msgstr "AND-vergentti"
-
-#: ../sheets/GRAFCET.sheet.in.h:2
-msgid "Action to associate to a step"
-msgstr "Askeleeseen liitettävä toiminto"
-
-#: ../sheets/GRAFCET.sheet.in.h:3
-msgid "Arc (upward)"
-msgstr "Kaari (ylöspäin)"
-
-#: ../sheets/GRAFCET.sheet.in.h:4
-msgid "Condition (of an action)"
-msgstr "Ehto (toiminnon)"
-
-#: ../sheets/GRAFCET.sheet.in.h:5
-msgid "GRAFCET"
-msgstr "GRAFCET"
-
-#: ../sheets/GRAFCET.sheet.in.h:10
-msgid "Macro sub-program call step"
-msgstr "Makroaliohjelman kutsuaskel"
-
-#: ../sheets/GRAFCET.sheet.in.h:11
-msgid "OR vergent"
-msgstr "OR-vergentti"
-
-#: ../sheets/GRAFCET.sheet.in.h:12
-msgid "Objects to design GRAFCET charts"
-msgstr "Objektit GRAFCET-kaavioiden suunnitteluun"
-
-#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
-msgid "Transition"
-msgstr "Siirtymä"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:1
-msgid "Alternate external entity"
-msgstr "Vaihtoehtoinen ulkoinen kokonaisuus"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-msgid "Data store"
-msgstr "Tietovarasto"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-msgid "External entity"
-msgstr "Ulkoinen kokonaisuus"
-
-#. Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com
-#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-msgid "Gane and Sarson"
-msgstr "Gane- ja Sarson"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-msgid "Gane and Sarson DFD"
-msgstr "Gane- ja Sarson DFD"
-
-#: ../sheets/IsometricMap.sheet.in.h:1
-msgid "Block 1, 2:4"
-msgstr "Pala 1, 2:4"
-
-#: ../sheets/IsometricMap.sheet.in.h:2
-msgid "Block 2, 2:8"
-msgstr "Pala 2, 2:8"
-
-#: ../sheets/IsometricMap.sheet.in.h:3
-msgid "Block 3, 4:4"
-msgstr "Pala 3, 4:4"
-
-#: ../sheets/IsometricMap.sheet.in.h:4
-msgid "Block 4, 4:8"
-msgstr "Pala 4, 4:8"
-
-#: ../sheets/IsometricMap.sheet.in.h:5
-msgid "Block 5, 3:3"
-msgstr "Pala 5, 3:3"
-
-#: ../sheets/IsometricMap.sheet.in.h:6
-msgid "Block 6, 4:6"
-msgstr "Pala 6, 4:6"
-
-#: ../sheets/IsometricMap.sheet.in.h:7
-msgid "Block 7"
-msgstr "Pala 7"
-
-#: ../sheets/IsometricMap.sheet.in.h:8
-msgid "Car 1, Front View"
-msgstr "Auto 1, etunäkymä"
-
-#: ../sheets/IsometricMap.sheet.in.h:9
-msgid "Car 2, Rear View"
-msgstr "Auto 2, takanäkymä"
-
-#: ../sheets/IsometricMap.sheet.in.h:10
-msgid "Corner 1"
-msgstr "Nurkka 1"
-
-#: ../sheets/IsometricMap.sheet.in.h:11
-msgid "Corner 2"
-msgstr "Nurkka 2"
-
-#: ../sheets/IsometricMap.sheet.in.h:12
-msgid "Crossroads"
-msgstr "Risteykset"
-
-#: ../sheets/IsometricMap.sheet.in.h:13
-msgid "Elevated Road"
-msgstr "Ilmatie"
-
-#: ../sheets/IsometricMap.sheet.in.h:14
-msgid "Factory"
-msgstr "Tehdas"
-
-#: ../sheets/IsometricMap.sheet.in.h:15
-msgid "Footbridge, Pedestrian Bridge"
-msgstr "Jalankulkusilta"
-
-#. use dc:description instead?
-#: ../sheets/IsometricMap.sheet.in.h:17
-msgid "Isometric Directional Map Shapes"
-msgstr "Isometriset suunnatut karttamerkit"
-
-#: ../sheets/IsometricMap.sheet.in.h:18
-msgid "Long Straight Road Section"
-msgstr "Pitkä suora tienpätkä"
-
-#. use dc:title instead?
-#: ../sheets/IsometricMap.sheet.in.h:20
-msgid "Map, Isometric"
-msgstr "Kartta, isometrinen"
-
-#: ../sheets/IsometricMap.sheet.in.h:21
-msgid "One Way Road Sign"
-msgstr "Yksisuuntaisen tien merkki"
-
-#: ../sheets/IsometricMap.sheet.in.h:22
-msgid "River"
-msgstr "Joki"
-
-#: ../sheets/IsometricMap.sheet.in.h:23
-msgid "Road Section"
-msgstr "Tienpätkä"
-
-#: ../sheets/IsometricMap.sheet.in.h:24
-msgid "Roof1"
-msgstr "Katto1"
-
-#: ../sheets/IsometricMap.sheet.in.h:25
-msgid "T-Junction"
-msgstr "T-risteys"
-
-#: ../sheets/IsometricMap.sheet.in.h:26
-msgid "Train 1, angled downward"
-msgstr "Juna 1, suuntaa alaspäin"
-
-#: ../sheets/IsometricMap.sheet.in.h:27
-msgid "Train 2, angled upward"
-msgstr "Juna 2, suuntaa ylöspäin"
-
-#: ../sheets/IsometricMap.sheet.in.h:28
-msgid "Tree 1"
-msgstr "Puu 1"
-
-#: ../sheets/Istar.sheet.in.h:1
-msgid "An i* agent"
-msgstr "i*-agentti"
-
-#: ../sheets/Istar.sheet.in.h:2
-msgid "An i* decomposition link"
-msgstr "i*-hajottava linkki"
-
-#: ../sheets/Istar.sheet.in.h:3
-msgid "An i* dependency link"
-msgstr "i*-riippuvuuslinkki"
-
-#: ../sheets/Istar.sheet.in.h:4
-msgid "An i* goal"
-msgstr "i*-tavoite"
-
-#: ../sheets/Istar.sheet.in.h:5
-msgid "An i* means-ends link"
-msgstr ""
-
-#: ../sheets/Istar.sheet.in.h:6
-msgid "An i* negative contribution"
-msgstr "i*-negatiivinen osallistuminen"
-
-#: ../sheets/Istar.sheet.in.h:7
-msgid "An i* position"
-msgstr "i*-sijainti"
-
-#: ../sheets/Istar.sheet.in.h:8
-msgid "An i* positive contribution"
-msgstr "i*-positiivinen osallistuminen"
-
-#: ../sheets/Istar.sheet.in.h:9
-msgid "An i* resource"
-msgstr "i*-resurssi"
-
-#: ../sheets/Istar.sheet.in.h:10
-msgid "An i* role"
-msgstr "i*-rooli"
-
-#: ../sheets/Istar.sheet.in.h:11
-msgid "An i* softgoal"
-msgstr "i*-tavoite (pehmeä)"
-
-#: ../sheets/Istar.sheet.in.h:12
-msgid "An i* task"
-msgstr "i*-tehtävä"
-
-#: ../sheets/Istar.sheet.in.h:13
-msgid "An i* unspecified actor"
-msgstr "i*-määrittelemätön toimija"
-
-#: ../sheets/Istar.sheet.in.h:14
-msgid "An i* unspecified link"
-msgstr "i*-määrittelemätön linkki"
-
-#: ../sheets/Istar.sheet.in.h:15
-msgid "Objects to design i* diagrams"
-msgstr "Oliot i*-kaavioiden suunnitteluun"
-
-#: ../sheets/Istar.sheet.in.h:16
-msgid "RE-i*"
-msgstr "RE-i*"
-
-#: ../sheets/Jackson.sheet.in.h:1
-msgid "A Jackson designed domain"
-msgstr "Jackson - suunniteltu alue"
-
-#: ../sheets/Jackson.sheet.in.h:2
-msgid "A Jackson given domain"
-msgstr "Jackson - annettu alue"
-
-#: ../sheets/Jackson.sheet.in.h:3
-msgid "A Jackson machine domain"
-msgstr "Jackson - laitealue"
-
-#: ../sheets/Jackson.sheet.in.h:4
-msgid "A Jackson requirement"
-msgstr "Jackson-vaatimus"
-
-#: ../sheets/Jackson.sheet.in.h:5
-msgid "A Jackson requirement phenomenon"
-msgstr "Jackosn - vaatimusilmiö"
-
-#: ../sheets/Jackson.sheet.in.h:6
-msgid "A Jackson shared phenomenon"
-msgstr "Jackson - jaettu ilmiö"
-
-#: ../sheets/Jackson.sheet.in.h:7
-msgid "Objects to design Jackson diagrams"
-msgstr "Objektit Jackson-kaavioiden suunnitteluun"
-
-#: ../sheets/Jackson.sheet.in.h:8
-msgid "RE-Jackson"
-msgstr "RE-Jackson"
-
-#: ../sheets/KAOS.sheet.in.h:1
-msgid "A KAOS AND refinement"
-msgstr "KAOS AND-tarkennus"
-
-#: ../sheets/KAOS.sheet.in.h:2
-msgid "A KAOS OR refinement"
-msgstr "KAOS OR-tarkennus"
-
-#: ../sheets/KAOS.sheet.in.h:3
-msgid "A KAOS agent"
-msgstr "KAOS-agentti"
-
-#: ../sheets/KAOS.sheet.in.h:4
-msgid "A KAOS assumption"
-msgstr "KAOS-oletus"
-
-#: ../sheets/KAOS.sheet.in.h:5
-msgid "A KAOS binary conflict"
-msgstr "KAOS-binäärikonflikti"
-
-#: ../sheets/KAOS.sheet.in.h:6
-msgid "A KAOS capable-of"
-msgstr "KAOSn kykeneväisyys"
-
-#: ../sheets/KAOS.sheet.in.h:7
-msgid "A KAOS complete AND refinement"
-msgstr "KAOSin täysi AND-tarkennus"
-
-#: ../sheets/KAOS.sheet.in.h:8
-msgid "A KAOS complete OR refinement"
-msgstr "KAOSin täysi OR-tarkennus"
-
-#: ../sheets/KAOS.sheet.in.h:9
-msgid "A KAOS contribution"
-msgstr "KAOS-osallistuminen"
-
-#: ../sheets/KAOS.sheet.in.h:10
-msgid "A KAOS control link"
-msgstr "KAOS-ohjauslinkki"
-
-#: ../sheets/KAOS.sheet.in.h:11
-msgid "A KAOS goal"
-msgstr "KAOS-tavoite"
-
-#: ../sheets/KAOS.sheet.in.h:12
-msgid "A KAOS input"
-msgstr "KAOS-syöte"
-
-#: ../sheets/KAOS.sheet.in.h:13
-msgid "A KAOS monitor link"
-msgstr "KAOS-tarkkailulinkki"
-
-#: ../sheets/KAOS.sheet.in.h:14
-msgid "A KAOS obstacle"
-msgstr "KAOS-este"
-
-#: ../sheets/KAOS.sheet.in.h:15
-msgid "A KAOS obstruction"
-msgstr "KAOS-häiriö"
-
-#: ../sheets/KAOS.sheet.in.h:16
-msgid "A KAOS operation"
-msgstr "KAOS-operaatio"
-
-#: ../sheets/KAOS.sheet.in.h:17
-msgid "A KAOS operationalization"
-msgstr "KAOS-operationalisointi"
-
-#: ../sheets/KAOS.sheet.in.h:18
-msgid "A KAOS output"
-msgstr "KAOS-tuloste"
-
-#: ../sheets/KAOS.sheet.in.h:19
-msgid "A KAOS performs"
-msgstr "KAOS-suorittaja"
-
-#: ../sheets/KAOS.sheet.in.h:20
-msgid "A KAOS requirement"
-msgstr "KAOS-vaatimus"
-
-#: ../sheets/KAOS.sheet.in.h:21
-msgid "A KAOS responsibility"
-msgstr "KAOS-vastuu"
-
-#: ../sheets/KAOS.sheet.in.h:22
-msgid "A KAOS softgoal"
-msgstr "KAOS-välitavoite"
-
-#: ../sheets/KAOS.sheet.in.h:23
-msgid "Objects to design KAOS diagrams"
-msgstr "Objektit KAOS-kaavioiden suunnitteluun"
-
-#: ../sheets/KAOS.sheet.in.h:24
-msgid "RE-KAOS"
-msgstr "RE-KAOS"
-
-#: ../sheets/Lights.sheet.in.h:1
-msgid "ACL"
-msgstr "ACL"
-
-#: ../sheets/Lights.sheet.in.h:2
-msgid "Black light"
-msgstr "Musta viiva"
-
-#: ../sheets/Lights.sheet.in.h:3
-msgid "Blinders"
-msgstr "Verhot"
-
-#: ../sheets/Lights.sheet.in.h:4
-msgid "Ellipsoidal Reflector Spotlight"
-msgstr ""
-
-#: ../sheets/Lights.sheet.in.h:5
-msgid "Fresel lantern"
-msgstr ""
-
-#: ../sheets/Lights.sheet.in.h:6
-msgid "Lights"
-msgstr "Valot"
-
-#: ../sheets/Lights.sheet.in.h:7
-msgid "Moving head"
-msgstr "Liikkuva pää"
-
-#: ../sheets/Lights.sheet.in.h:8
-msgid "Objects to design simple lighting plots"
-msgstr "Oliot yksinkertaisten valaistusten suunnitteluun"
-
-#: ../sheets/Lights.sheet.in.h:9
-msgid "PAR"
-msgstr "PAR"
-
-#: ../sheets/Lights.sheet.in.h:10
-msgid "PAR on the floor"
-msgstr "PAR lattialla"
-
-#: ../sheets/Lights.sheet.in.h:11
-msgid "Pebble Convex lantern"
-msgstr ""
-
-#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
-msgid "Scanner"
-msgstr "Kuvanlukija"
-
-#: ../sheets/Lights.sheet.in.h:13
-msgid "Striplight"
-msgstr ""
-
-#: ../sheets/Lights.sheet.in.h:14
-msgid "Stroboscope light"
-msgstr "Strobe-valo"
-
-#: ../sheets/Lights.sheet.in.h:15
-msgid "Structure"
-msgstr "Rakenne"
-
-#: ../sheets/Logic.sheet.in.h:1
-msgid "AND gate"
-msgstr "AND-portti"
-
-#: ../sheets/Logic.sheet.in.h:2
-msgid "Boolean Logic"
-msgstr "Totuusarvologiikka"
-
-#: ../sheets/Logic.sheet.in.h:3
-msgid "Crossconnector"
-msgstr "Ristikytkentäliitin"
-
-#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
-msgid "Inverter"
-msgstr "Kääntöpiiri"
-
-#: ../sheets/Logic.sheet.in.h:5
-msgid "Logic"
-msgstr "Logiikka"
-
-#: ../sheets/Logic.sheet.in.h:6
-msgid "NAND gate"
-msgstr "NAND-portti"
-
-#: ../sheets/Logic.sheet.in.h:7
-msgid "NOR gate"
-msgstr "NOR-portti"
-
-#: ../sheets/Logic.sheet.in.h:8
-msgid "NOT"
-msgstr "NOT"
-
-#: ../sheets/Logic.sheet.in.h:9
-msgid "OR gate"
-msgstr "OR-portti"
-
-#: ../sheets/Logic.sheet.in.h:10
-msgid "Simple buffer"
-msgstr "Yksinkertainen puskuri"
-
-#: ../sheets/Logic.sheet.in.h:11
-msgid "XOR gate"
-msgstr "XOR-portti"
-
-#: ../sheets/MSE.sheet.in.h:1
-msgid "Demultiplexer"
-msgstr "Demultiplekseri"
-
-#: ../sheets/MSE.sheet.in.h:2
-msgid "Large extension node"
-msgstr "Suuri laajennussolmu"
-
-#: ../sheets/MSE.sheet.in.h:3
-msgid "MSE"
-msgstr "MSE"
-
-#: ../sheets/MSE.sheet.in.h:4
-msgid "Multiplexer"
-msgstr "Multiplekseri"
-
-#: ../sheets/MSE.sheet.in.h:5
-msgid "Node center"
-msgstr "Solmukeskus"
-
-#: ../sheets/MSE.sheet.in.h:6
-msgid "Small extension node"
-msgstr "Pieni laajennussolmu"
-
-#: ../sheets/MSE.sheet.in.h:7
-msgid "Tactical satellite communications terminal"
-msgstr "Taktinen satelliittiviestintäpääte"
-
-#: ../sheets/MSE.sheet.in.h:8
-msgid "U.S. Army Mobile Subscriber Equipment Components"
-msgstr "USA:n armeijan liikkuvan tilaajan välineistökomponentit"
-
-#: ../sheets/Misc.sheet.in.h:2
-msgid "Folder"
-msgstr "Kansio"
-
-#: ../sheets/Misc.sheet.in.h:3
-msgid "Measure distance"
-msgstr "Mittaa etäisyys"
-
-#: ../sheets/Misc.sheet.in.h:4
-msgid "Misc"
-msgstr "Sekalaista"
-
-#: ../sheets/Misc.sheet.in.h:5
-msgid "Miscellaneous Shapes"
-msgstr "Sekalaisia kuvioita"
-
-#: ../sheets/Misc.sheet.in.h:6
-msgid "New-style group object, for testing"
-msgstr "Uuden tyylinen ryhmäobjekti, testausta varten"
-
-#: ../sheets/Misc.sheet.in.h:7
-msgid "Resizable grid"
-msgstr "Muuntuvankokoinen ruudukko"
-
-#: ../sheets/Misc.sheet.in.h:8
-msgid "Traditional clock"
-msgstr "Perinteinen kello"
-
-#: ../sheets/Misc.sheet.in.h:9
-msgid "Tree"
-msgstr "Puu"
-
-#: ../sheets/Misc.sheet.in.h:10
-msgid "expended node"
-msgstr "laajennettu solmu"
-
-#: ../sheets/Misc.sheet.in.h:11
-msgid "expensible node"
-msgstr "laajennettava solmu"
-
-#: ../sheets/Pneumatic.sheet.in.h:1
-msgid "2/2 distributor"
-msgstr "2/2-jakaja"
-
-#: ../sheets/Pneumatic.sheet.in.h:2
-msgid "3/2 distributor"
-msgstr "3/2-jakaja"
-
-#: ../sheets/Pneumatic.sheet.in.h:3
-msgid "4/2 distributor"
-msgstr "4/2-jakaja"
-
-#: ../sheets/Pneumatic.sheet.in.h:4
-msgid "5/2 distributor"
-msgstr "5/2-jakaja"
-
-#: ../sheets/Pneumatic.sheet.in.h:5
-msgid "Air exhaust orifice"
-msgstr "Pakokaasuaukko"
-
-#: ../sheets/Pneumatic.sheet.in.h:6
-msgid "Components for pneumatic and hydraulic circuits"
-msgstr "Komponentit paineilma- ja hydrauliikkapiireille"
-
-#: ../sheets/Pneumatic.sheet.in.h:8
-msgid "Double-effect jack"
-msgstr "Kaksoisvaikutuspistukka"
-
-#: ../sheets/Pneumatic.sheet.in.h:9
-msgid "Electric command (double coil)"
-msgstr "Sähköinen komento (kaksoiskela)"
-
-#: ../sheets/Pneumatic.sheet.in.h:10
-msgid "Electric command (single coil)"
-msgstr "Sähköinen komento (yksöiskela)"
-
-#: ../sheets/Pneumatic.sheet.in.h:11
-msgid "Generic pressure source"
-msgstr "Yleinen painelähde"
-
-#: ../sheets/Pneumatic.sheet.in.h:12
-msgid "Hydraulic pressure source"
-msgstr "Hydraulinen painelähde"
-
-#: ../sheets/Pneumatic.sheet.in.h:13
-msgid "Indirect command by hydraulic driver"
-msgstr "Epäsuora komento hydrauliajurilta"
-
-#: ../sheets/Pneumatic.sheet.in.h:14
-msgid "Indirect command by pneumatic driver"
-msgstr "Epäsuora komento paineilma-ajurilta"
-
-#: ../sheets/Pneumatic.sheet.in.h:15
-msgid "Mechanical command by spring"
-msgstr "Mekaaninen komento jousella"
-
-#: ../sheets/Pneumatic.sheet.in.h:16
-msgid "Mechanical command by tappet"
-msgstr "Mekaaninen komento venttiilillä"
-
-#: ../sheets/Pneumatic.sheet.in.h:17
-msgid "Muscular command"
-msgstr "Lihaskomento"
-
-#: ../sheets/Pneumatic.sheet.in.h:18
-msgid "Normally-in simple-effect jack"
-msgstr "Oletuksena sisään, yksivaikutuspistukka"
-
-#: ../sheets/Pneumatic.sheet.in.h:19
-msgid "Normally-out simple-effect jack"
-msgstr "Oletuksena ulos, yksivaikutuspistukka"
-
-#: ../sheets/Pneumatic.sheet.in.h:20
-msgid "Pneumatic pressure source"
-msgstr "Ilmanpainelähde"
-
-#: ../sheets/Pneumatic.sheet.in.h:21
-msgid "Pneumatic/Hydraulic"
-msgstr "Paineilma/hydraulinen"
-
-#: ../sheets/Pneumatic.sheet.in.h:22
-msgid "Push-button command"
-msgstr "Painonappikomento"
-
-#: ../sheets/SADT.sheet.in.h:1
-msgid "Activity/data box"
-msgstr "Aktiviteetti/tietolaatikko"
-
-#: ../sheets/SADT.sheet.in.h:2
-msgid "Activity/data flow arrow"
-msgstr "Aktiviteetti/tietovirtanuoli"
-
-#: ../sheets/SADT.sheet.in.h:3
-msgid "Flow label"
-msgstr "Virtanimiö"
-
-#: ../sheets/SADT.sheet.in.h:4
-msgid "Objects to design SADT diagrams"
-msgstr "Objektit SADT-kaavioiden suunnitteluun"
-
-#: ../sheets/SADT.sheet.in.h:5
-msgid "SADT/IDEF0"
-msgstr "SADT/IDEF0"
-
-#: ../sheets/SDL.sheet.in.h:1
-msgid "Action being executed"
-msgstr "Suorituksessa oleva toiminto"
-
-#: ../sheets/SDL.sheet.in.h:2
-msgid "Block type reference"
-msgstr "Lohkon tyyppiviite"
-
-#: ../sheets/SDL.sheet.in.h:5
-msgid "Function call"
-msgstr "Funktiokutsu"
-
-#: ../sheets/SDL.sheet.in.h:6
-msgid "Function header"
-msgstr "Funktio-otsake"
-
-#: ../sheets/SDL.sheet.in.h:7
-msgid "Generic text note"
-msgstr "Yleinen tekstilappu"
-
-#: ../sheets/SDL.sheet.in.h:8
-msgid "In/Out connector"
-msgstr "Sisään/ulos-liitin"
-
-#: ../sheets/SDL.sheet.in.h:10
-msgid "Procedure return"
-msgstr "Proseduurin paluu"
-
-#: ../sheets/SDL.sheet.in.h:11
-msgid "Process type reference"
-msgstr "Prosessin tyyppiviite"
-
-#: ../sheets/SDL.sheet.in.h:12
-msgid "Receive message"
-msgstr "Vastaanota viesti"
-
-#: ../sheets/SDL.sheet.in.h:13
-msgid "SDL"
-msgstr "SDL"
-
-#: ../sheets/SDL.sheet.in.h:14
-msgid "Save state"
-msgstr "Tallenna tila"
-
-#: ../sheets/SDL.sheet.in.h:15
-msgid "Send message"
-msgstr "Lähetä viesti"
-
-#: ../sheets/SDL.sheet.in.h:16
-msgid "Service type reference"
-msgstr "Palvelutyyppiviite"
-
-#: ../sheets/SDL.sheet.in.h:17
-msgid "Specification and Description Language."
-msgstr "Määrittely- ja kuvauskieli."
-
-#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
-msgid "State"
-msgstr "Tila"
-
-#: ../sheets/SISSI.sheet.in.h:1
-msgid "Air filter"
-msgstr "Ilmasuodatin"
-
-#: ../sheets/SISSI.sheet.in.h:2
-msgid "Air quality detector"
-msgstr "Ilmanlaadun anturi"
-
-#: ../sheets/SISSI.sheet.in.h:3
-msgid "Airconditioner"
-msgstr "Ilmastointi"
-
-#: ../sheets/SISSI.sheet.in.h:4
-msgid "Alarm center"
-msgstr "Hälytyskeskus"
-
-#: ../sheets/SISSI.sheet.in.h:5
-msgid "Axial Ventilator"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:6
-msgid "Backup"
-msgstr "Varmistus"
-
-#: ../sheets/SISSI.sheet.in.h:7
-msgid "Badge reader"
-msgstr "Nimikortin lukija"
-
-#: ../sheets/SISSI.sheet.in.h:8
-msgid "Badge reader/keyboard"
-msgstr "Nimikortin lukija/näppäimistö"
-
-#: ../sheets/SISSI.sheet.in.h:9
-msgid "Biometric reader"
-msgstr "Biometrinen lukija"
-
-#: ../sheets/SISSI.sheet.in.h:10
-msgid "Cell phone"
-msgstr "Matkapuhelin"
-
-#: ../sheets/SISSI.sheet.in.h:11
-msgid "Centrifugal Ventilator"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:12
-msgid "Cipher machine"
-msgstr "Cipher-kone"
-
-#: ../sheets/SISSI.sheet.in.h:13
-msgid "Circulation pump"
-msgstr "Kiertopumppu"
-
-#: ../sheets/SISSI.sheet.in.h:14
-msgid "Condensator"
-msgstr "Kondensaattori"
-
-#: ../sheets/SISSI.sheet.in.h:15
-msgid "Current transducer"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:16
-msgid "Digital code"
-msgstr "Digitaalinen koodi"
-
-#: ../sheets/SISSI.sheet.in.h:17
-msgid "Enthalpy transducer"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:18
-msgid "Extinguisher"
-msgstr "Sammutin"
-
-#: ../sheets/SISSI.sheet.in.h:19
-msgid "Faraday cage"
-msgstr "Faradayn häkki"
-
-#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
-msgid "File cabinet"
-msgstr "Arkistokaappi"
-
-#: ../sheets/SISSI.sheet.in.h:21
-msgid "Gate"
-msgstr "Portti"
-
-#: ../sheets/SISSI.sheet.in.h:22
-msgid "Geographic site"
-msgstr "Geograafinen sijainti"
-
-#: ../sheets/SISSI.sheet.in.h:23
-msgid "Glass-break sensor"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
-msgid "Hub"
-msgstr "Hubi"
-
-#: ../sheets/SISSI.sheet.in.h:25
-msgid "Information"
-msgstr "Tiedot"
-
-#: ../sheets/SISSI.sheet.in.h:26
-msgid "Information system"
-msgstr "Tietojärjestelmä"
-
-#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
-msgid "Laptop"
-msgstr "Kannettava"
-
-#: ../sheets/SISSI.sheet.in.h:29
-msgid "Level detector"
-msgstr "Tasonilmaisin"
-
-#: ../sheets/SISSI.sheet.in.h:30
-msgid "Light detector"
-msgstr "Valonilmaisin"
-
-#: ../sheets/SISSI.sheet.in.h:31
-msgid "Log analysis"
-msgstr "Lokien analysointi"
-
-#: ../sheets/SISSI.sheet.in.h:32
-msgid "Magnetic storage"
-msgstr "Magneettinen tallennus"
-
-#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
-msgid "Modem"
-msgstr "Modeemi"
-
-#: ../sheets/SISSI.sheet.in.h:34
-msgid "Moisture extractor"
-msgstr "Kosteudenpoistaja"
-
-#: ../sheets/SISSI.sheet.in.h:35
-msgid "Moisture sensor"
-msgstr "Kosteusanturi"
-
-#: ../sheets/SISSI.sheet.in.h:36
-msgid "Movement detector"
-msgstr "Liiketunnistin"
-
-#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
-msgid "Network cloud"
-msgstr "Verkkopilvi"
-
-#: ../sheets/SISSI.sheet.in.h:38
-msgid "Objects to design sissi diagrams"
-msgstr "Oliot sissi-kaavioiden suunnitteluun"
-
-#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
-msgid "PDA"
-msgstr "PDA"
-
-#: ../sheets/SISSI.sheet.in.h:40
-msgid "Paper storage"
-msgstr "Paperisäilö"
-
-#: ../sheets/SISSI.sheet.in.h:41
-msgid "Person"
-msgstr "Henkilö"
-
-#: ../sheets/SISSI.sheet.in.h:42
-msgid "Power transducer"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:43
-msgid "Pressure transducer"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:44
-msgid "Pump"
-msgstr "Pumppu"
-
-#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
-msgid "Relational Database"
-msgstr "Relaatiotietokanta"
-
-#: ../sheets/SISSI.sheet.in.h:46
-msgid "Revolving door"
-msgstr "Pyörivä ovi"
-
-#: ../sheets/SISSI.sheet.in.h:47
-msgid "Room"
-msgstr "Huone"
-
-#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
-msgid "Router"
-msgstr "Reititin"
-
-#: ../sheets/SISSI.sheet.in.h:49
-msgid "Safe"
-msgstr "Kassakaappi"
-
-#: ../sheets/SISSI.sheet.in.h:50
-msgid "Security area"
-msgstr "Turva-alue"
-
-#: ../sheets/SISSI.sheet.in.h:51
-msgid "Sensor beam"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:52
-msgid "Server"
-msgstr "Palvelin"
-
-#: ../sheets/SISSI.sheet.in.h:53
-msgid "Smoke detector"
-msgstr "Savuntunnistin"
-
-# Kai tämä rypäs sopii tähän?
-#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
-msgid "Storage array"
-msgstr "Tallennusrypäs"
-
-#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
-msgid "Telephone"
-msgstr "Puhelin"
-
-#: ../sheets/SISSI.sheet.in.h:57
-msgid "Vehicle detector"
-msgstr "Kulkuneuvojen tunnistin"
-
-#: ../sheets/SISSI.sheet.in.h:58
-msgid "Ventilator"
-msgstr ""
-
-#: ../sheets/SISSI.sheet.in.h:59
-msgid "Vibration sensor"
-msgstr "Värinäanturi"
-
-#: ../sheets/SISSI.sheet.in.h:60
-msgid "Video camera"
-msgstr "Videokamera"
-
-#: ../sheets/SISSI.sheet.in.h:61
-msgid "Video movement detector"
-msgstr "Video-pohjainen liiketunnistin"
-
-#: ../sheets/SISSI.sheet.in.h:62
-msgid "Voltage detector"
-msgstr "Jänniteanturi"
-
-#: ../sheets/SISSI.sheet.in.h:63
-msgid "Workstation"
-msgstr "Työasema"
-
-#: ../sheets/UML.sheet.in.h:1
-msgid "Activity"
-msgstr "Toiminta"
-
-#: ../sheets/UML.sheet.in.h:3
-msgid "Aggregation, one class is part of another"
-msgstr "Aggregaatio, yksi luokka on osa toista"
-
-#: ../sheets/UML.sheet.in.h:4
-msgid "Association, two classes are associated"
-msgstr "Assosiaatio, kahdella luokalla on yhteys"
-
-#: ../sheets/UML.sheet.in.h:7
-msgid "Class stereotype icon"
-msgstr "Luokkastereotyypin kuvake"
-
-#: ../sheets/UML.sheet.in.h:8
-msgid "Component"
-msgstr "Komponentti"
-
-#: ../sheets/UML.sheet.in.h:9
-msgid "Constraint, place a constraint on something"
-msgstr "Rajoite, aseta rajoitus johonkin"
-
-#: ../sheets/UML.sheet.in.h:11
-msgid "Editor for UML Static Structure Diagrams"
-msgstr "Muokkain staattisille UML-rakennekaavioille"
-
-#: ../sheets/UML.sheet.in.h:15
-msgid "Fork/union"
-msgstr "Haara/liityntä"
-
-#: ../sheets/UML.sheet.in.h:16
-msgid "Generalization, class inheritance"
-msgstr "Yleistys, luokan perintä"
-
-#: ../sheets/UML.sheet.in.h:17
-msgid "Implements, class implements a specific interface"
-msgstr "Toteutus, luokka toteuttaa määrätyn rajapinnan"
+#: ../sheets/Circuit.sheet.in.h:23
+msgid "Ground point"
+msgstr "Maadoituspiste"
 
-#: ../sheets/UML.sheet.in.h:18
-msgid "Initial/end state"
-msgstr "Alku/lopputila"
+#: ../sheets/Circuit.sheet.in.h:24
+msgid "Operational amplifier"
+msgstr "Operaatiovahvistin"
 
-#: ../sheets/UML.sheet.in.h:19
-msgid "Large package"
-msgstr "Suuri paketti"
+#: ../sheets/Circuit.sheet.in.h:25
+msgid "Horizontally aligned fuse"
+msgstr "Vaakasuuntainen sulake"
 
-#: ../sheets/UML.sheet.in.h:20
-msgid "Lifeline"
-msgstr "Aikajana"
+#: ../sheets/Circuit.sheet.in.h:26
+msgid "Vertically aligned fuse"
+msgstr "Pystysuuntainen sulake"
 
-#: ../sheets/UML.sheet.in.h:21
-msgid "Message"
-msgstr "Viesti"
+#: ../sheets/Circuit.sheet.in.h:27
+#, fuzzy
+#| msgid "Horizontally aligned powersource"
+msgid "Horizontally aligned power source"
+msgstr "Vaakasuuntainen virtalähde"
 
-#: ../sheets/UML.sheet.in.h:22
-msgid "Node"
-msgstr "Solmu"
+#: ../sheets/Circuit.sheet.in.h:28
+#, fuzzy
+#| msgid "Vertically aligned powersource"
+msgid "Vertically aligned power source"
+msgstr "Pystysuuntainen virtalähde"
 
-#: ../sheets/UML.sheet.in.h:23
-msgid "Note"
-msgstr "Huomautus"
+#: ../sheets/Circuit.sheet.in.h:29
+msgid "Lamp"
+msgstr "Lamppu"
 
-#: ../sheets/UML.sheet.in.h:24
-msgid "Object"
-msgstr "Objekti"
+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
+msgid "Speaker"
+msgstr "Kaiutin"
 
-#: ../sheets/UML.sheet.in.h:25
-msgid "Realizes, implements a specific interface"
-msgstr "Realisoi, toteuttaa määrätyn rajapinnan"
+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
+msgid "Microphone"
+msgstr "Mikrofoni"
 
-#: ../sheets/UML.sheet.in.h:27
-msgid "Small package"
-msgstr "Pieni paketti"
+#: ../sheets/Circuit.sheet.in.h:32
+msgid "Horizontally aligned LED"
+msgstr "Vaakasuuntainen LED"
 
-#: ../sheets/UML.sheet.in.h:31
-msgid "UML"
-msgstr "UML"
+#: ../sheets/Circuit.sheet.in.h:33
+msgid "Vertically aligned LED"
+msgstr "Pystysuuntainen LED"
 
-#: ../sheets/UML.sheet.in.h:32
-msgid "Use case"
-msgstr "Käyttötapaus"
+#: ../sheets/Circuit.sheet.in.h:34
+msgid "NMOS transistor"
+msgstr "NMOS-transistori"
 
-#: ../sheets/chronogram.sheet.in.h:1
-msgid "Chronogram"
-msgstr "Kronogrammi"
+#: ../sheets/Circuit.sheet.in.h:35
+msgid "PMOS transistor"
+msgstr "PMOS-transistori"
 
-#: ../sheets/chronogram.sheet.in.h:2
-msgid "Data line"
-msgstr "Tietojana"
+#: ../sheets/Circuit.sheet.in.h:36
+msgid "Horizontal jumper"
+msgstr "Vaakasuuntainen hyppyliitin"
 
-#: ../sheets/chronogram.sheet.in.h:3
-msgid "Objects to design chronogram charts"
-msgstr "Objektit kronogrammikaavioiden suunnitteluun"
+#: ../sheets/Circuit.sheet.in.h:37
+#, fuzzy
+#| msgid "Horizontal rest"
+msgid "Horizontal xtal"
+msgstr "Vaakasuora tuki"
 
-#: ../sheets/chronogram.sheet.in.h:4
-msgid "Time scale"
-msgstr "Aikaskaala"
+#: ../sheets/Circuit.sheet.in.h:38
+#, fuzzy
+#| msgid "Vertical rest"
+msgid "Vertical xtal"
+msgstr "Pystysuora tuki"
 
 #: ../sheets/ciscocomputer.sheet.in.h:1
-msgid "BBS"
-msgstr "BBS"
+#, fuzzy
+#| msgid "Cisco - Computer"
+msgid "Cisco — Computer"
+msgstr "Cisco - tietokone"
 
 #: ../sheets/ciscocomputer.sheet.in.h:2
-msgid "Cisco - Computer"
-msgstr "Cisco - tietokone"
+msgid "Computer shapes by Cisco"
+msgstr "Tietokonekuvioita Ciscolta"
 
 #: ../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 "CiscoTietoturva"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../sheets/ciscocomputer.sheet.in.h:5
-msgid "CiscoWorks workstation"
-msgstr "CiscoWorks-työasema"
+msgid "Terminal"
+msgstr "Pääte"
 
 #: ../sheets/ciscocomputer.sheet.in.h:6
-msgid "Computer shapes by Cisco"
-msgstr "Tietokonekuvioita Ciscolta"
+msgid "SUN workstation"
+msgstr "SUN-työasema"
 
 #: ../sheets/ciscocomputer.sheet.in.h:7
-msgid "Disk subsystem"
-msgstr "Levyalijärjetelmä"
+msgid "CiscoWorks workstation"
+msgstr "CiscoWorks-työasema"
 
 #: ../sheets/ciscocomputer.sheet.in.h:8
-msgid "Diskette"
-msgstr "Levyke"
+msgid "PC Router Card"
+msgstr "PC-reititinkortti"
 
 #: ../sheets/ciscocomputer.sheet.in.h:9
-msgid "EtherClient"
-msgstr "EtherClient"
+msgid "PC Software"
+msgstr "PC-ohjelmisto"
 
 #: ../sheets/ciscocomputer.sheet.in.h:10
-msgid "FC Storage"
-msgstr "FC-tallennus"
+msgid "PC with Router-Based Software"
+msgstr "PC, jossa on reititinohjelmisto"
 
 #: ../sheets/ciscocomputer.sheet.in.h:11
-msgid "File Server"
-msgstr "Tiedostopalvelin"
+msgid "Workgroup director"
+msgstr "Työryhmän ohjain"
 
 #: ../sheets/ciscocomputer.sheet.in.h:12
-msgid "Front End Processor"
-msgstr "Edussuoritin"
+msgid "CiscoSecurity"
+msgstr "CiscoTietoturva"
 
 #: ../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 "Taskutietokone"
+msgid "WWW server"
+msgstr "Www-palvelin"
 
 #: ../sheets/ciscocomputer.sheet.in.h:15
-msgid "Host"
-msgstr "Isäntä"
+msgid "Web browser"
+msgstr "Www-selain"
 
 #: ../sheets/ciscocomputer.sheet.in.h:16
-msgid "IBM Mini (AS400)"
-msgstr "IBM-mini (AS400)"
+msgid "File Server"
+msgstr "Tiedostopalvelin"
 
 #: ../sheets/ciscocomputer.sheet.in.h:17
-msgid "IBM Tower"
-msgstr "IBM-torni"
+msgid "Software-Based Router on File Server"
+msgstr "Ohjelmistopohjainen reititin tai tiedostopalvelin"
 
 #: ../sheets/ciscocomputer.sheet.in.h:18
-msgid "IBM mainframe"
-msgstr "IBM-suurtietokone"
+msgid "Server with PC Router"
+msgstr "Palvelin PC-reitittimellä"
 
 #: ../sheets/ciscocomputer.sheet.in.h:19
-msgid "IBM mainframe with FEP"
-msgstr "IBM-suurtietokone, jossa PEP"
+msgid "IBM Tower"
+msgstr "IBM-torni"
 
 #: ../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 "Edussuoritin"
 
 #: ../sheets/ciscocomputer.sheet.in.h:22
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "IBM mainframe"
+msgstr "IBM-suurtietokone"
 
 #: ../sheets/ciscocomputer.sheet.in.h:23
-msgid "MicroWebserver"
-msgstr "Mikro-www-palvelin"
+msgid "IBM mainframe with FEP"
+msgstr "IBM-suurtietokone, jossa PEP"
 
 #: ../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 "Näyttö"
+#: ../sheets/ciscocomputer.sheet.in.h:25
+msgid "Supercomputer"
+msgstr "Supertietokone"
+
+#: ../sheets/ciscocomputer.sheet.in.h:26
+msgid "Web cluster"
+msgstr "Www-klusteri"
 
 #: ../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"
+msgid "PC Card"
+msgstr "PC-kortti"
 
-#: ../sheets/ciscocomputer.sheet.in.h:29
-msgid "PC Adapter Card"
-msgstr "PC-sovitinkortti"
+#: ../sheets/ciscocomputer.sheet.in.h:29 ../sheets/Lights.sheet.in.h:14
+msgid "Scanner"
+msgstr "Kuvanlukija"
 
+# Olikos se nyt Tietoviikko mikä ainakin käyttää tätä, Tablet PC = Lehtiö-PC
 #: ../sheets/ciscocomputer.sheet.in.h:30
-msgid "PC Card"
-msgstr "PC-kortti"
+msgid "Tablet"
+msgstr "Lehtiö"
 
 #: ../sheets/ciscocomputer.sheet.in.h:31
-msgid "PC Router Card"
-msgstr "PC-reititinkortti"
+msgid "EtherClient"
+msgstr "EtherClient"
 
 #: ../sheets/ciscocomputer.sheet.in.h:32
-msgid "PC Software"
-msgstr "PC-ohjelmisto"
+msgid "Handheld"
+msgstr "Taskutietokone"
 
 #: ../sheets/ciscocomputer.sheet.in.h:33
-msgid "PC Video"
-msgstr "PC-video"
+msgid "Wireless"
+msgstr "Langaton"
 
 #: ../sheets/ciscocomputer.sheet.in.h:34
-msgid "PC with Router-Based Software"
-msgstr "PC, jossa on reititinohjelmisto"
+msgid "PDA"
+msgstr "PDA"
 
-#: ../sheets/ciscocomputer.sheet.in.h:38
-msgid "SUN workstation"
-msgstr "SUN-työasema"
+#: ../sheets/ciscocomputer.sheet.in.h:35
+msgid "Newton"
+msgstr "Newton"
+
+#: ../sheets/ciscocomputer.sheet.in.h:36
+msgid "Laptop"
+msgstr "Kannettava"
+
+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
+msgid "Monitor"
+msgstr "Näyttö"
+
+#: ../sheets/ciscocomputer.sheet.in.h:39
+msgid "PC Video"
+msgstr "PC-video"
 
 #: ../sheets/ciscocomputer.sheet.in.h:40
-msgid "Server with PC Router"
-msgstr "Palvelin PC-reitittimellä"
+msgid "Modem"
+msgstr "Modeemi"
 
 #: ../sheets/ciscocomputer.sheet.in.h:41
-msgid "Software-Based Router on File Server"
-msgstr "Ohjelmistopohjainen reititin tai tiedostopalvelin"
+msgid "BBS"
+msgstr "BBS"
+
+#: ../sheets/ciscocomputer.sheet.in.h:42
+msgid "MicroWebserver"
+msgstr "Mikro-www-palvelin"
 
 #: ../sheets/ciscocomputer.sheet.in.h:43
-msgid "Supercomputer"
-msgstr "Supertietokone"
+msgid "Relational Database"
+msgstr "Relaatiotietokanta"
 
-# Olikos se nyt Tietoviikko mikä ainakin käyttää tätä, Tablet PC = Lehtiö-PC
 #: ../sheets/ciscocomputer.sheet.in.h:44
-msgid "Tablet"
-msgstr "Lehtiö"
+msgid "Diskette"
+msgstr "Levyke"
 
-# Kai tämä rypäs sopii tähän?
 #: ../sheets/ciscocomputer.sheet.in.h:45
-msgid "Tape array"
-msgstr "Nauharypäs"
+msgid "Host"
+msgstr "Isäntä"
 
+# Kai tämä rypäs sopii tähän?
 #: ../sheets/ciscocomputer.sheet.in.h:46
-msgid "Terminal"
-msgstr "Pääte"
+msgid "Tape array"
+msgstr "Nauharypäs"
 
 #: ../sheets/ciscocomputer.sheet.in.h:47
-msgid "WWW server"
-msgstr "Www-palvelin"
+msgid "Disk subsystem"
+msgstr "Levyalijärjetelmä"
 
 #: ../sheets/ciscocomputer.sheet.in.h:48
-msgid "Web browser"
-msgstr "Www-selain"
+msgid "JBOD"
+msgstr "JBOD"
 
+# Kai tämä rypäs sopii tähän?
 #: ../sheets/ciscocomputer.sheet.in.h:49
-msgid "Web cluster"
-msgstr "Www-klusteri"
+msgid "Storage array"
+msgstr "Tallennusrypäs"
 
 #: ../sheets/ciscocomputer.sheet.in.h:50
-msgid "Wireless"
-msgstr "Langaton"
+msgid "FC Storage"
+msgstr "FC-tallennus"
 
 #: ../sheets/ciscocomputer.sheet.in.h:51
-msgid "Workgroup director"
-msgstr "Työryhmän ohjain"
+msgid "PC Adapter Card"
+msgstr "PC-sovitinkortti"
 
 #: ../sheets/ciscohub.sheet.in.h:1
-msgid "100BaseT Hub"
-msgstr "100BaseT-hubi"
+#, fuzzy
+#| msgid "Cisco - Switch"
+msgid "Cisco — Switch"
+msgstr "Cisco - kytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:2
-msgid "7500ARS (7513) Router"
-msgstr "7500ARS-reititin (7513)"
+msgid "Router and switch shapes by Cisco"
+msgstr "Ciscon reititin- ja kytkinkuviot"
 
 #: ../sheets/ciscohub.sheet.in.h:3
-msgid "7505 Router"
-msgstr "7507-reititin"
+msgid "Router"
+msgstr "Reititin"
 
 #: ../sheets/ciscohub.sheet.in.h:4
-msgid "7507 Router"
-msgstr "7507-reititin"
+msgid "Router subdued"
+msgstr "Reititin (ei käytössä)"
 
 #: ../sheets/ciscohub.sheet.in.h:5
-msgid "ASIC Processor"
-msgstr "ASIC-suoritin"
+msgid "Router with Silicon Switch"
+msgstr "Reititin piikytkimellä"
 
 #: ../sheets/ciscohub.sheet.in.h:6
-msgid "ATM 3800"
-msgstr "ATM 3800"
+msgid "NetFlow router"
+msgstr "NetFlow-reititin"
 
 #: ../sheets/ciscohub.sheet.in.h:7
-msgid "ATM Fast Gigabit Etherswitch"
-msgstr "ATM-nopea gigabitin ether-kytkin"
+msgid "Broadband router"
+msgstr "Laajakaistareititin"
 
 #: ../sheets/ciscohub.sheet.in.h:8
-msgid "ATM Switch"
-msgstr "ATM-kytkin"
+msgid "Wavelength router"
+msgstr "Aallonpituusreititin"
 
 #: ../sheets/ciscohub.sheet.in.h:9
-msgid "ATM Tag Switch Router"
-msgstr "ATM-tagikytkinreititin"
+msgid "Wireless router"
+msgstr "Langaton reititin"
 
 #: ../sheets/ciscohub.sheet.in.h:10
-msgid "Access Gateway"
-msgstr "Sisääntuloyhdyskäytävä"
+msgid "7507 Router"
+msgstr "7507-reititin"
 
 #: ../sheets/ciscohub.sheet.in.h:11
-msgid "BBSM"
-msgstr "BBSM"
+msgid "7505 Router"
+msgstr "7507-reititin"
 
 #: ../sheets/ciscohub.sheet.in.h:12
-msgid "Broadband router"
-msgstr "Laajakaistareititin"
+msgid "7500ARS (7513) Router"
+msgstr "7500ARS-reititin (7513)"
 
 #: ../sheets/ciscohub.sheet.in.h:13
-msgid "CSM-S"
-msgstr "CSM-S"
+msgid "Edge Label Switch Router with NetFlow"
+msgstr "Merkkikytkentäinen reunareititin jossa on NetFlow"
 
 #: ../sheets/ciscohub.sheet.in.h:14
-msgid "Carrier Routing System"
-msgstr "Runkoverkon reititysjärjestelmä"
+msgid "Edge Label Switch Router"
+msgstr "Merkkikytkentäinen reunareititin"
 
 #: ../sheets/ciscohub.sheet.in.h:15
-msgid "Cisco - Switch"
-msgstr "Cisco - kytkin"
+msgid "Router with Firewall"
+msgstr "Reititin palomuurilla"
 
 #: ../sheets/ciscohub.sheet.in.h:16
-msgid "Cisco 1000"
-msgstr "Cisco 1000"
+msgid "Optical Services Router"
+msgstr "Optinen palvelureititin"
 
 #: ../sheets/ciscohub.sheet.in.h:17
-msgid "Cisco Hub"
-msgstr "Cisco-hubi"
-
-#: ../sheets/ciscohub.sheet.in.h:18
 msgid "Content Router"
 msgstr "Sisältöreititin"
 
+#: ../sheets/ciscohub.sheet.in.h:18
+msgid "Carrier Routing System"
+msgstr "Runkoverkon reititysjärjestelmä"
+
 #: ../sheets/ciscohub.sheet.in.h:19
-msgid "Content Service Module"
-msgstr "Sisältöpalvelumoduuli"
+msgid "Storage Router"
+msgstr "Tallennusreititin"
 
 #: ../sheets/ciscohub.sheet.in.h:20
-msgid "Content Service Switch 1100"
-msgstr "Sisältöpalvelukytkin 1100"
+msgid "NetSonar"
+msgstr "NetSonar"
 
 #: ../sheets/ciscohub.sheet.in.h:21
-msgid "Content Switch"
-msgstr "Sisältökytkin"
+msgid "Hub"
+msgstr "Hubi"
 
 #: ../sheets/ciscohub.sheet.in.h:22
-msgid "Data Center Switch"
-msgstr "Keskuskytkin"
+msgid "Hub subdued"
+msgstr "Hubi (ei käytössä)"
 
 #: ../sheets/ciscohub.sheet.in.h:23
-msgid "Data Center Switch Reversed"
-msgstr "Keskuskytkin (käänteinen)"
+msgid "Cisco Hub"
+msgstr "Cisco-hubi"
 
 #: ../sheets/ciscohub.sheet.in.h:24
-msgid "Data Switch Processor"
-msgstr "Tietokytkimen prosessori"
+msgid "Small Hub"
+msgstr "Pieni hubi"
 
 #: ../sheets/ciscohub.sheet.in.h:25
-msgid "Director-class Fibre Channel intelligent switch"
-msgstr "Director-luokan älykäs kuitukanavakytkin"
+msgid "100BaseT Hub"
+msgstr "100BaseT-hubi"
 
 #: ../sheets/ciscohub.sheet.in.h:26
-msgid "Edge Label Switch Router"
-msgstr "Merkkikytkentäinen reunareititin"
+msgid "Workgroup switch"
+msgstr "Työryhmäkytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:27
-msgid "Edge Label Switch Router with NetFlow"
-msgstr "Merkkikytkentäinen reunareititin jossa on NetFlow"
+msgid "Workgroup switch Subdued"
+msgstr "Työryhmäkytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:28
-msgid "Generic Processor"
-msgstr "Yleinen suoritin"
+msgid "Workgroup Switch Voice-Enabled"
+msgstr "Työryhmäkytkin puheominaisuuksilla"
+
+#: ../sheets/ciscohub.sheet.in.h:29
+msgid "BBSM"
+msgstr "BBSM"
 
 #: ../sheets/ciscohub.sheet.in.h:30
-msgid "Hub subdued"
-msgstr "Hubi (ei käytössä)"
+msgid "ATM Tag Switch Router"
+msgstr "ATM-tagikytkinreititin"
 
 #: ../sheets/ciscohub.sheet.in.h:31
-msgid "ISDN switch"
-msgstr "ISDN-kytkin"
+msgid "Switch Processor"
+msgstr "Kytkentäsuoritin"
 
 #: ../sheets/ciscohub.sheet.in.h:32
-msgid "LAN2LAN Switch"
-msgstr "LAN2LAN-kytkin"
+msgid "Route Switch Processor"
+msgstr "Reitinkytkentäsuoritin"
 
 #: ../sheets/ciscohub.sheet.in.h:33
-msgid "Label Switch Router"
-msgstr "Merkkikytkentäinen reititin"
+msgid "Route Switch Processor with Si"
+msgstr "Reitinkytkentäsuoritin"
 
 #: ../sheets/ciscohub.sheet.in.h:34
-msgid "Layer 2 Remote Switch"
-msgstr "Tason 2 etäkytkin"
+msgid "PXF"
+msgstr "PXF"
 
 #: ../sheets/ciscohub.sheet.in.h:35
-msgid "MGX 8220"
-msgstr "MGX 8220"
+msgid "ASIC Processor"
+msgstr "ASIC-suoritin"
 
 #: ../sheets/ciscohub.sheet.in.h:36
-msgid "MGX 8240"
-msgstr "MGX 8240"
+msgid "Generic Processor"
+msgstr "Yleinen suoritin"
 
 #: ../sheets/ciscohub.sheet.in.h:37
-msgid "MGX 8260"
-msgstr "MGX 8260"
+msgid "Data Center Switch"
+msgstr "Keskuskytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:38
-msgid "Multi-Fabric Server Switch"
-msgstr "Monirunkoinen palvelinkytkin"
+msgid "Data Center Switch Reversed"
+msgstr "Keskuskytkin (käänteinen)"
 
 #: ../sheets/ciscohub.sheet.in.h:39
-msgid "MultiSwitch Device"
-msgstr "Monikytkiminen laite"
+msgid "Data Switch Processor"
+msgstr "Tietokytkimen prosessori"
 
 #: ../sheets/ciscohub.sheet.in.h:40
-msgid "Multilayer Remote Switch"
-msgstr "Monitasoinen etäkytkin"
+msgid "Content Switch"
+msgstr "Sisältökytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:41
-msgid "Multilayer Switch"
-msgstr "Monitasoinen kytkin"
+msgid "Content Service Module"
+msgstr "Sisältöpalvelumoduuli"
 
 #: ../sheets/ciscohub.sheet.in.h:42
-msgid "Multilayer Switch with Silicon"
-msgstr "Monitasoinen kytkin piillä"
+msgid "CSM-S"
+msgstr "CSM-S"
 
 #: ../sheets/ciscohub.sheet.in.h:43
-msgid "Multilayer Switch with Silicon subdued"
-msgstr "Monitasoinen kytkinen piillä (ei käytössä)"
+msgid "Access Gateway"
+msgstr "Sisääntuloyhdyskäytävä"
 
 #: ../sheets/ciscohub.sheet.in.h:44
-msgid "NetFlow router"
-msgstr "NetFlow-reititin"
+msgid "ATM Switch"
+msgstr "ATM-kytkin"
 
 #: ../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 "Optinen palvelureititin"
+msgid "ISDN switch"
+msgstr "ISDN-kytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:48
-msgid "PXF"
-msgstr "PXF"
+msgid "Label Switch Router"
+msgstr "Merkkikytkentäinen reititin"
 
 #: ../sheets/ciscohub.sheet.in.h:49
-msgid "Programmable Switch"
-msgstr "Ohjelmoitava kytkin"
+msgid "MultiSwitch Device"
+msgstr "Monikytkiminen laite"
 
 #: ../sheets/ciscohub.sheet.in.h:50
-msgid "RateMUX"
-msgstr "Taso-MUX"
+msgid "LAN2LAN Switch"
+msgstr "LAN2LAN-kytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:51
-msgid "Route Switch Processor"
-msgstr "Reitinkytkentäsuoritin"
+msgid "Multilayer Switch"
+msgstr "Monitasoinen kytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:52
-msgid "Route Switch Processor with Si"
-msgstr "Reitinkytkentäsuoritin"
+msgid "Multilayer Switch with Silicon"
+msgstr "Monitasoinen kytkin piillä"
+
+#: ../sheets/ciscohub.sheet.in.h:53
+msgid "Multilayer Switch with Silicon subdued"
+msgstr "Monitasoinen kytkinen piillä (ei käytössä)"
 
 #: ../sheets/ciscohub.sheet.in.h:54
-msgid "Router and switch shapes by Cisco"
-msgstr "Ciscon reititin- ja kytkinkuviot"
+msgid "Programmable Switch"
+msgstr "Ohjelmoitava kytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:55
-msgid "Router subdued"
-msgstr "Reititin (ei käytössä)"
+msgid "Content Service Switch 1100"
+msgstr "Sisältöpalvelukytkin 1100"
 
 #: ../sheets/ciscohub.sheet.in.h:56
-msgid "Router with Firewall"
-msgstr "Reititin palomuurilla"
+msgid "ATM Fast Gigabit Etherswitch"
+msgstr "ATM-nopea gigabitin ether-kytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:57
-msgid "Router with Silicon Switch"
-msgstr "Reititin piikytkimellä"
+msgid "RateMUX"
+msgstr "Taso-MUX"
 
 #: ../sheets/ciscohub.sheet.in.h:58
-msgid "Server Switch"
-msgstr "Palvelinkytkin"
+msgid "Workgroup 5500"
+msgstr "Workgroup 5500"
 
 #: ../sheets/ciscohub.sheet.in.h:59
-msgid "Small Hub"
-msgstr "Pieni hubi"
+msgid "Workgroup 5000"
+msgstr "Workgroup 5000"
 
 #: ../sheets/ciscohub.sheet.in.h:60
-msgid "Storage Router"
-msgstr "Tallennusreititin"
+msgid "Workgroup 5002"
+msgstr "Workgroup 5002"
 
 #: ../sheets/ciscohub.sheet.in.h:61
-msgid "Switch Processor"
-msgstr "Kytkentäsuoritin"
+msgid "NetRanger"
+msgstr "NetRanger"
 
 #: ../sheets/ciscohub.sheet.in.h:62
-msgid "Universal Gateway"
-msgstr "Yleinen yhdyskäytävä"
+msgid "MGX 8220"
+msgstr "MGX 8220"
 
 #: ../sheets/ciscohub.sheet.in.h:63
-msgid "Virtual Layer Switch"
-msgstr "Virtuaalitasollinen kytkin"
+msgid "MGX 8240"
+msgstr "MGX 8240"
 
 #: ../sheets/ciscohub.sheet.in.h:64
-msgid "Wavelength router"
-msgstr "Aallonpituusreititin"
+msgid "MGX 8260"
+msgstr "MGX 8260"
 
 #: ../sheets/ciscohub.sheet.in.h:65
-msgid "Wireless router"
-msgstr "Langaton reititin"
+msgid "Universal Gateway"
+msgstr "Yleinen yhdyskäytävä"
 
 #: ../sheets/ciscohub.sheet.in.h:66
-msgid "Workgroup 5000"
-msgstr "Workgroup 5000"
+msgid "iSCSI switch"
+msgstr "ISCSI-kytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:67
-msgid "Workgroup 5002"
-msgstr "Workgroup 5002"
+msgid "Workgroup Fibre Channel intelligent switch"
+msgstr "Työryhmän älykäs kuitukanavakytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:68
-msgid "Workgroup 5500"
-msgstr "Workgroup 5500"
+msgid "Director-class Fibre Channel intelligent switch"
+msgstr "Director-luokan älykäs kuitukanavakytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:69
-msgid "Workgroup Fibre Channel intelligent switch"
-msgstr "Työryhmän älykäs kuitukanavakytkin"
+msgid "Multi-Fabric Server Switch"
+msgstr "Monirunkoinen palvelinkytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:70
-msgid "Workgroup Switch Voice-Enabled"
-msgstr "Työryhmäkytkin puheominaisuuksilla"
+msgid "Server Switch"
+msgstr "Palvelinkytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:71
-msgid "Workgroup switch"
-msgstr "Työryhmäkytkin"
+msgid "Multilayer Remote Switch"
+msgstr "Monitasoinen etäkytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:72
-msgid "Workgroup switch Subdued"
-msgstr "Työryhmäkytkin"
+msgid "Layer 2 Remote Switch"
+msgstr "Tason 2 etäkytkin"
 
 #: ../sheets/ciscohub.sheet.in.h:73
-msgid "iSCSI switch"
-msgstr "ISCSI-kytkin"
+msgid "Virtual Layer Switch"
+msgstr "Virtuaalitasollinen kytkin"
 
 #: ../sheets/ciscomisc.sheet.in.h:1
-msgid "Androgynous Person"
-msgstr "Sukupuoleton henkilö"
+#, fuzzy
+#| msgid "Cisco - Misc"
+msgid "Cisco — Miscellaneous"
+msgstr "Cisco - sekalaista"
 
 #: ../sheets/ciscomisc.sheet.in.h:2
-msgid "Antenna"
-msgstr "Antenni"
+msgid "Miscellaneous shapes by Cisco"
+msgstr "Sekalaisia kuvioita Ciscolta"
 
 #: ../sheets/ciscomisc.sheet.in.h:3
-msgid "Branch office"
-msgstr "Haaratoimisto"
+msgid "Government Building"
+msgstr "Hallintorakennus"
 
 #: ../sheets/ciscomisc.sheet.in.h:4
-msgid "Branch office blue"
-msgstr "Haaratoimisto (sininen)"
+msgid "University"
+msgstr "Yliopisto"
 
 #: ../sheets/ciscomisc.sheet.in.h:5
-msgid "Branch office subdued"
-msgstr "Haaratoimisto (ei käytössä"
+msgid "Small Business"
+msgstr "Pienyritys"
 
 #: ../sheets/ciscomisc.sheet.in.h:6
-msgid "Car"
-msgstr "Auto"
+msgid "Home office"
+msgstr "Kotitoimisto"
 
 #: ../sheets/ciscomisc.sheet.in.h:7
-msgid "Cisco - Misc"
-msgstr "Cisco - sekalaista"
+msgid "Branch office"
+msgstr "Haaratoimisto"
 
 #: ../sheets/ciscomisc.sheet.in.h:8
-msgid "CiscoWorks Man"
-msgstr "CiscoWorks-mies"
+msgid "Branch office subdued"
+msgstr "Haaratoimisto (ei käytössä"
+
+#: ../sheets/ciscomisc.sheet.in.h:9
+msgid "Branch office blue"
+msgstr "Haaratoimisto (sininen)"
 
 #: ../sheets/ciscomisc.sheet.in.h:10
 msgid "Generic Building"
 msgstr "Yleinen rakennus"
 
 #: ../sheets/ciscomisc.sheet.in.h:11
-msgid "Generic Building blue"
-msgstr "Yleinen rakennus (sininen)"
-
-#: ../sheets/ciscomisc.sheet.in.h:12
 msgid "Generic Building subdued"
 msgstr "Yleinen rakennus (ei käytössä)"
 
+#: ../sheets/ciscomisc.sheet.in.h:12
+msgid "Generic Building blue"
+msgstr "Yleinen rakennus (sininen)"
+
 #: ../sheets/ciscomisc.sheet.in.h:13
-msgid "Government Building"
-msgstr "Hallintorakennus"
+msgid "Medium Building"
+msgstr "Keskikokoinen rakennus"
 
 #: ../sheets/ciscomisc.sheet.in.h:14
-msgid "Headphones"
-msgstr "Kuulokkeet"
+msgid "Medium Building subdued"
+msgstr "Keskikokoinen rakennus (ei käytössä)"
 
 #: ../sheets/ciscomisc.sheet.in.h:15
-msgid "Home office"
-msgstr "Kotitoimisto"
+msgid "Medium Building blue"
+msgstr "Keskikokoinen sininen rakennus"
 
 #: ../sheets/ciscomisc.sheet.in.h:16
 msgid "House"
@@ -9368,1132 +8591,3109 @@ msgid "House blue"
 msgstr "Sininen talo"
 
 #: ../sheets/ciscomisc.sheet.in.h:18
-msgid "Key"
-msgstr "Avain"
+msgid "Telecommuter house"
+msgstr "Etätyöntekijän talo"
 
-#: ../sheets/ciscomisc.sheet.in.h:20
-msgid "Lock and Key"
-msgstr "Lukko ja avain"
+#: ../sheets/ciscomisc.sheet.in.h:19
+msgid "Telecommuter house subdued"
+msgstr "Etätyöntekijän talo (ei käytössä)"
 
-#: ../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 "Mies"
+
 #: ../sheets/ciscomisc.sheet.in.h:22
-msgid "Mac Woman"
-msgstr "Mac-nainen"
+msgid "Man red"
+msgstr "Punainen mies"
 
 #: ../sheets/ciscomisc.sheet.in.h:23
-msgid "Man"
-msgstr "Mies"
+msgid "Man gold"
+msgstr "Kultainen mies"
 
 #: ../sheets/ciscomisc.sheet.in.h:24
 msgid "Man blue"
 msgstr "Sininen mies"
 
 #: ../sheets/ciscomisc.sheet.in.h:25
-msgid "Man gold"
-msgstr "Kultainen mies"
+msgid "Standing Man"
+msgstr "Seisova mies"
 
 #: ../sheets/ciscomisc.sheet.in.h:26
-msgid "Man red"
-msgstr "Punainen mies"
+msgid "Standing woman"
+msgstr "Seisova nainen"
 
 #: ../sheets/ciscomisc.sheet.in.h:27
-msgid "Medium Building"
-msgstr "Keskikokoinen rakennus"
+msgid "Woman"
+msgstr "Nainen"
 
 #: ../sheets/ciscomisc.sheet.in.h:28
-msgid "Medium Building blue"
-msgstr "Keskikokoinen sininen rakennus"
+msgid "Woman red"
+msgstr "Punainen nainen"
 
 #: ../sheets/ciscomisc.sheet.in.h:29
-msgid "Medium Building subdued"
-msgstr "Keskikokoinen rakennus (ei käytössä)"
+msgid "Woman gold"
+msgstr "Kultainen nainen"
+
+#: ../sheets/ciscomisc.sheet.in.h:30
+msgid "Woman blue"
+msgstr "Sininen nainen"
 
 #: ../sheets/ciscomisc.sheet.in.h:31
-msgid "Miscellaneous shapes by Cisco"
-msgstr "Sekalaisia kuvioita Ciscolta"
+msgid "Running man"
+msgstr "Juokseva mies"
 
 #: ../sheets/ciscomisc.sheet.in.h:32
-msgid "PC Man"
-msgstr "PC-mies"
+msgid "Running man subdued"
+msgstr "Juokseva mies (ei käytössä)"
 
 #: ../sheets/ciscomisc.sheet.in.h:33
-msgid "PC Man left"
-msgstr "PC-mies vasen"
+msgid "Telecommuter"
+msgstr "Etätyöntekijä"
 
 #: ../sheets/ciscomisc.sheet.in.h:34
-msgid "Running man"
-msgstr "Juokseva mies"
+msgid "Running woman"
+msgstr "Juokseva naine"
 
 #: ../sheets/ciscomisc.sheet.in.h:35
-msgid "Running man subdued"
-msgstr "Juokseva mies (ei käytössä)"
+msgid "CiscoWorks Man"
+msgstr "CiscoWorks-mies"
 
 #: ../sheets/ciscomisc.sheet.in.h:36
-msgid "Running woman"
-msgstr "Juokseva naine"
+msgid "PC Man left"
+msgstr "PC-mies vasen"
 
 #: ../sheets/ciscomisc.sheet.in.h:37
-msgid "Satellite"
-msgstr "Satelliitti"
+msgid "PC Man"
+msgstr "PC-mies"
 
 #: ../sheets/ciscomisc.sheet.in.h:38
-msgid "Satellite dish"
-msgstr "Satelliittilautanen"
-
-#: ../sheets/ciscomisc.sheet.in.h:39
 msgid "Sitting Woman"
 msgstr "Istuva nainen"
 
-#: ../sheets/ciscomisc.sheet.in.h:40
+#: ../sheets/ciscomisc.sheet.in.h:39
 msgid "Sitting Woman right"
 msgstr "Istuva nainen oikea"
 
-#: ../sheets/ciscomisc.sheet.in.h:41
-msgid "Small Business"
-msgstr "Pienyritys"
+#: ../sheets/ciscomisc.sheet.in.h:40
+msgid "Mac Woman"
+msgstr "Mac-nainen"
 
-#: ../sheets/ciscomisc.sheet.in.h:43
-msgid "Standing Man"
-msgstr "Seisova mies"
+#: ../sheets/ciscomisc.sheet.in.h:41
+msgid "Androgynous Person"
+msgstr "Sukupuoleton henkilö"
 
 #: ../sheets/ciscomisc.sheet.in.h:44
-msgid "Standing woman"
-msgstr "Seisova nainen"
+msgid "Lock and Key"
+msgstr "Lukko ja avain"
 
 #: ../sheets/ciscomisc.sheet.in.h:45
-msgid "Telecommuter"
-msgstr "Etätyöntekijä"
+msgid "Satellite dish"
+msgstr "Satelliittilautanen"
 
 #: ../sheets/ciscomisc.sheet.in.h:46
-msgid "Telecommuter house"
-msgstr "Etätyöntekijän talo"
+msgid "Satellite"
+msgstr "Satelliitti"
 
 #: ../sheets/ciscomisc.sheet.in.h:47
-msgid "Telecommuter house subdued"
-msgstr "Etätyöntekijän talo (ei käytössä)"
+msgid "Antenna"
+msgstr "Antenni"
 
 #: ../sheets/ciscomisc.sheet.in.h:48
-msgid "Truck"
-msgstr "Kuorma-auto"
+msgid "File cabinet"
+msgstr "Arkistokaappi"
 
 #: ../sheets/ciscomisc.sheet.in.h:49
-msgid "University"
-msgstr "Yliopisto"
+msgid "Car"
+msgstr "Auto"
 
 #: ../sheets/ciscomisc.sheet.in.h:50
+msgid "Truck"
+msgstr "Kuorma-auto"
+
+#: ../sheets/ciscomisc.sheet.in.h:51
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../sheets/ciscomisc.sheet.in.h:51
+#: ../sheets/ciscomisc.sheet.in.h:52
 msgid "Video Camera right"
 msgstr "Videokamera oikea"
 
-#: ../sheets/ciscomisc.sheet.in.h:52
-msgid "Woman"
-msgstr "Nainen"
-
-#: ../sheets/ciscomisc.sheet.in.h:53
-msgid "Woman blue"
-msgstr "Sininen nainen"
-
 #: ../sheets/ciscomisc.sheet.in.h:54
-msgid "Woman gold"
-msgstr "Kultainen nainen"
-
-#: ../sheets/ciscomisc.sheet.in.h:55
-msgid "Woman red"
-msgstr "Punainen nainen"
+msgid "Headphones"
+msgstr "Kuulokkeet"
 
 #: ../sheets/cisconetwork.sheet.in.h:1
-msgid "10700"
-msgstr "10700"
+#, fuzzy
+#| msgid "Cisco - Network"
+msgid "Cisco — Network"
+msgstr "Cisco - verkko"
 
 #: ../sheets/cisconetwork.sheet.in.h:2
-msgid "15200"
-msgstr "15200"
+msgid "Network shapes by Cisco"
+msgstr "Verkkokuviot Ciscolta"
 
 #: ../sheets/cisconetwork.sheet.in.h:3
-msgid "15800"
-msgstr "15800"
+msgid "Network Management"
+msgstr "Verkonhallinta"
 
 #: ../sheets/cisconetwork.sheet.in.h:4
-msgid "3174 (desktop) cluster controller"
-msgstr "3174 (työpöytä) klusterin hallinta"
+msgid "Detector"
+msgstr "Ilmaisin"
 
 #: ../sheets/cisconetwork.sheet.in.h:5
-msgid "3X74 (floor) cluster controller"
-msgstr "3X74 (lattia) klusterin hallinta"
+msgid "Protocol Translator"
+msgstr "Protokollamuunnin"
 
 #: ../sheets/cisconetwork.sheet.in.h:6
-msgid "Access Server"
-msgstr "Sisääntulopalvelin"
+msgid "IP"
+msgstr "IP"
 
 #: ../sheets/cisconetwork.sheet.in.h:7
-msgid "AccessPoint"
-msgstr "Tukiasema"
+msgid "IP Old-style"
+msgstr "IP vanhantyylinen"
 
 #: ../sheets/cisconetwork.sheet.in.h:8
-msgid "Automatic Protection Switching"
-msgstr "Automaatisen suojauksen kytkentä"
+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-media"
+msgid "Terminal Server"
+msgstr "Päätepalvelin"
 
 #: ../sheets/cisconetwork.sheet.in.h:11
-msgid "Breakout box"
-msgstr "Tietojen purkulaite"
+msgid "Access Server"
+msgstr "Sisääntulopalvelin"
 
 #: ../sheets/cisconetwork.sheet.in.h:12
-msgid "Bridge"
-msgstr "Silta"
+msgid "System controller"
+msgstr "Järjestelmäohjain"
 
 #: ../sheets/cisconetwork.sheet.in.h:13
-msgid "CDDI/FDDI Concentrator"
-msgstr "CDDI/FDDI-keskitin"
+msgid "Directory Server"
+msgstr "Hakemistopalvelin"
 
 #: ../sheets/cisconetwork.sheet.in.h:14
-msgid "CDM Content Distribution Manager"
-msgstr "CDM-sisällönjakeluhallinta"
+msgid "Firewall"
+msgstr "Palomuuri"
 
 #: ../sheets/cisconetwork.sheet.in.h:15
-msgid "CSU/DSU"
-msgstr "CSU/DSU"
+msgid "Firewall subdued"
+msgstr "Palomuuri (ei käytössä)"
 
 #: ../sheets/cisconetwork.sheet.in.h:16
-msgid "Cable Modem"
-msgstr "Kaapelimodeemi"
+msgid "Firewall horizontal"
+msgstr "Palomuuri vaakatasossa"
 
 #: ../sheets/cisconetwork.sheet.in.h:17
-msgid "Catalyst Access Gateway"
-msgstr "Catalyst-sisääntuloyhdyskäytävä"
+msgid "Firewall Service Module"
+msgstr "Palomuurin palvelumoduli"
 
 #: ../sheets/cisconetwork.sheet.in.h:18
-msgid "Centri Firewall"
-msgstr "Centri-palomuuri"
+msgid "IOS Firewall"
+msgstr "IOS-palomuuri"
 
 #: ../sheets/cisconetwork.sheet.in.h:19
-msgid "Channelized Pipe"
-msgstr "Kanavaitu putki"
+msgid "PIX Firewall"
+msgstr "PIX-palomuuri"
 
 #: ../sheets/cisconetwork.sheet.in.h:20
-msgid "Cisco - Network"
-msgstr "Cisco - verkko"
+msgid "PIX Firewall Left"
+msgstr "PIX-palomuuri (vasen)"
 
 #: ../sheets/cisconetwork.sheet.in.h:21
-msgid "Cloud"
-msgstr "Pilvi"
-
-#: ../sheets/cisconetwork.sheet.in.h:22
-msgid "Cloud Dark"
-msgstr "Tumma pilvi"
+msgid "Centri Firewall"
+msgstr "Centri-palomuuri"
 
 #: ../sheets/cisconetwork.sheet.in.h:23
-msgid "Cloud Gold"
-msgstr "Kultainen pilvi"
+msgid "Security appliance"
+msgstr "Tietoturvalaite"
 
 #: ../sheets/cisconetwork.sheet.in.h:24
-msgid "Cloud White"
-msgstr "Valkoinen pilvi"
+msgid "VPN Concentrator"
+msgstr "VPN-keskitin"
 
 #: ../sheets/cisconetwork.sheet.in.h:25
-msgid "Concatenated Payload"
-msgstr "Keskitetty sisältö"
+msgid "VPN Gateway"
+msgstr "VPN-yhdyskäytävä"
 
 #: ../sheets/cisconetwork.sheet.in.h:26
-msgid "Content Engine (Cache Director)"
-msgstr "Sisältömoottori (Cache Director)"
+msgid "LAN to LAN"
+msgstr "LAN:sta LAN:iin"
 
 #: ../sheets/cisconetwork.sheet.in.h:27
-msgid "Content Transformation Engine (CTE)"
-msgstr "Sisällönmuunnosmoottori (CTE)"
+msgid "SSL Terminator"
+msgstr "SSL-pääte"
 
 #: ../sheets/cisconetwork.sheet.in.h:28
-msgid "DSLAM"
-msgstr "DSLAM"
+msgid "IP DSL Switch"
+msgstr "IP DSL-kytkin"
 
 #: ../sheets/cisconetwork.sheet.in.h:29
-msgid "DWDM Filter"
-msgstr "DWDM-suodatin"
+msgid "DSLAM"
+msgstr "DSLAM"
 
 #: ../sheets/cisconetwork.sheet.in.h:30
-msgid "Detector"
-msgstr "Ilmaisin"
+msgid "Cable Modem"
+msgstr "Kaapelimodeemi"
 
 #: ../sheets/cisconetwork.sheet.in.h:31
-msgid "Digital Cross-Connect"
-msgstr "Digitaalinen ristikytkentä"
+msgid "Wireless Connectivity"
+msgstr "Langato yhteys"
 
 #: ../sheets/cisconetwork.sheet.in.h:32
-msgid "Directory Server"
-msgstr "Hakemistopalvelin"
+msgid "Wireless Transport"
+msgstr "Langaton siirto"
 
 #: ../sheets/cisconetwork.sheet.in.h:33
-msgid "Distributed Director"
-msgstr "Hajautettu ohjain"
+msgid "AccessPoint"
+msgstr "Tukiasema"
 
 #: ../sheets/cisconetwork.sheet.in.h:34
-msgid "Dual Mode AccessPoint"
-msgstr "Kaksitaajuuksinen tukiasema"
+msgid "Wireless Bridge"
+msgstr "Langaton silta"
 
 #: ../sheets/cisconetwork.sheet.in.h:35
-msgid "FDDI Ring"
-msgstr "FDDI-rengas"
+msgid "Dual Mode AccessPoint"
+msgstr "Kaksitaajuuksinen tukiasema"
 
 #: ../sheets/cisconetwork.sheet.in.h:36
-msgid "File Engine"
-msgstr "Tiedostomoottori"
+msgid "Wi-Fi Tag"
+msgstr "Wi-Fi-tarra"
 
 #: ../sheets/cisconetwork.sheet.in.h:37
-msgid "Firewall"
-msgstr "Palomuuri"
+msgid "Wireless Location Appliance"
+msgstr "Langaton paikannuslaite"
 
 #: ../sheets/cisconetwork.sheet.in.h:38
-msgid "Firewall Service Module"
-msgstr "Palomuurin palvelumoduli"
+msgid "Location server"
+msgstr "Sijaintipalvelin"
 
 #: ../sheets/cisconetwork.sheet.in.h:39
-msgid "Firewall horizontal"
-msgstr "Palomuuri vaakatasossa"
+msgid "Lightweight AP"
+msgstr "Kevyt liityntäpiste"
 
 #: ../sheets/cisconetwork.sheet.in.h:40
-msgid "Firewall subdued"
-msgstr "Palomuuri (ei käytössä)"
+msgid "WLAN controller"
+msgstr "WLAN-ohjain"
 
 #: ../sheets/cisconetwork.sheet.in.h:41
-msgid "General Appliance"
-msgstr "Yleinen laite"
+msgid "BBFW"
+msgstr "BBFW"
 
 #: ../sheets/cisconetwork.sheet.in.h:42
-msgid "Generic Gateway"
-msgstr "Yleinen yhdyskäytävä"
+msgid "BBFW media"
+msgstr "BBFW-media"
+
+#: ../sheets/cisconetwork.sheet.in.h:43
+msgid "Channelized Pipe"
+msgstr "Kanavaitu putki"
 
 #: ../sheets/cisconetwork.sheet.in.h:44
-msgid "IOS Firewall"
-msgstr "IOS-palomuuri"
+msgid "Concatenated Payload"
+msgstr "Keskitetty sisältö"
 
 #: ../sheets/cisconetwork.sheet.in.h:45
-msgid "IOS SLB"
-msgstr "IOS SLB"
+msgid "Optical Cross-Connect"
+msgstr "Optinen ristikytkentä"
 
 #: ../sheets/cisconetwork.sheet.in.h:46
-msgid "IP"
-msgstr "IP"
+msgid "Optical Transport"
+msgstr "Optinen siirto"
 
 #: ../sheets/cisconetwork.sheet.in.h:47
-msgid "IP DSL Switch"
-msgstr "IP DSL-kytkin"
+msgid "Optical Fiber"
+msgstr "Optinen kuitu"
 
 #: ../sheets/cisconetwork.sheet.in.h:48
-msgid "IP Old-style"
-msgstr "IP vanhantyylinen"
+msgid "Optical Amplifier"
+msgstr "Optinen vahvistin"
 
 #: ../sheets/cisconetwork.sheet.in.h:49
-msgid "IP Transport Concentrator"
-msgstr "IP-keskitin"
+msgid "Digital Cross-Connect"
+msgstr "Digitaalinen ristikytkentä"
 
 #: ../sheets/cisconetwork.sheet.in.h:50
-msgid "IPTV broadcast server"
-msgstr "IPTV-lähetyspalvelin"
+msgid "IP Transport Concentrator"
+msgstr "IP-keskitin"
 
 #: ../sheets/cisconetwork.sheet.in.h:51
-msgid "IPTV content manager"
-msgstr "IPTV-sisällönhallinta"
+msgid "DWDM Filter"
+msgstr "DWDM-suodatin"
 
 #: ../sheets/cisconetwork.sheet.in.h:52
-msgid "LAN to LAN"
-msgstr "LAN:sta LAN:iin"
+msgid "WDM"
+msgstr "WDM"
 
 #: ../sheets/cisconetwork.sheet.in.h:53
-msgid "Lightweight AP"
-msgstr "Kevyt liityntäpiste"
+msgid "15200"
+msgstr "15200"
 
 #: ../sheets/cisconetwork.sheet.in.h:54
-msgid "LocalDirector"
-msgstr "LocalDirector"
+msgid "15800"
+msgstr "15800"
 
 #: ../sheets/cisconetwork.sheet.in.h:55
-msgid "Location server"
-msgstr "Sijaintipalvelin"
+msgid "ONS15104"
+msgstr "ONS15104"
 
 #: ../sheets/cisconetwork.sheet.in.h:56
-msgid "LongReach CPE"
-msgstr "Pitkäkantoinen CPE"
+msgid "10700"
+msgstr "10700"
 
 #: ../sheets/cisconetwork.sheet.in.h:57
-msgid "MAS Gateway"
-msgstr "MAS-yhdyskäytävä"
+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 "Automaatisen suojauksen kytkentä"
 
 #: ../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 "Pitkäkantoinen CPE"
 
 #: ../sheets/cisconetwork.sheet.in.h:63
-msgid "Network Management"
-msgstr "Verkonhallinta"
+msgid "3X74 (floor) cluster controller"
+msgstr "3X74 (lattia) klusterin hallinta"
 
 #: ../sheets/cisconetwork.sheet.in.h:64
-msgid "Network shapes by Cisco"
-msgstr "Verkkokuviot Ciscolta"
+msgid "3174 (desktop) cluster controller"
+msgstr "3174 (työpöytä) klusterin hallinta"
 
 #: ../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 "Optinen vahvistin"
+msgid "Cloud"
+msgstr "Pilvi"
 
 #: ../sheets/cisconetwork.sheet.in.h:68
-msgid "Optical Cross-Connect"
-msgstr "Optinen ristikytkentä"
+msgid "Cloud Gold"
+msgstr "Kultainen pilvi"
 
 #: ../sheets/cisconetwork.sheet.in.h:69
-msgid "Optical Fiber"
-msgstr "Optinen kuitu"
+msgid "Cloud White"
+msgstr "Valkoinen pilvi"
 
 #: ../sheets/cisconetwork.sheet.in.h:70
-msgid "Optical Transport"
-msgstr "Optinen siirto"
+msgid "Cloud Dark"
+msgstr "Tumma pilvi"
 
 #: ../sheets/cisconetwork.sheet.in.h:71
-msgid "PAD"
-msgstr "PAD"
+msgid "Distributed Director"
+msgstr "Hajautettu ohjain"
 
 #: ../sheets/cisconetwork.sheet.in.h:72
-msgid "PIX Firewall"
-msgstr "PIX-palomuuri"
+msgid "LocalDirector"
+msgstr "LocalDirector"
 
 #: ../sheets/cisconetwork.sheet.in.h:73
-msgid "PIX Firewall Left"
-msgstr "PIX-palomuuri (vasen)"
+msgid "IOS SLB"
+msgstr "IOS SLB"
 
 #: ../sheets/cisconetwork.sheet.in.h:74
-msgid "Protocol Translator"
-msgstr "Protokollamuunnin"
+msgid "MUX"
+msgstr "MUX"
 
 #: ../sheets/cisconetwork.sheet.in.h:75
-msgid "RPS"
-msgstr "RPS"
-
-#: ../sheets/cisconetwork.sheet.in.h:76
-msgid "Repeater"
-msgstr "Toistin"
-
-#: ../sheets/cisconetwork.sheet.in.h:77
-msgid "SSL Terminator"
-msgstr "SSL-pääte"
+msgid "General Appliance"
+msgstr "Yleinen laite"
 
+#. compatibility
+#. <alias name="Cisco - PAD"/>
 #: ../sheets/cisconetwork.sheet.in.h:78
-msgid "STB (set top box)"
-msgstr "STB (set-top-box)"
+msgid "PAD"
+msgstr "PAD"
 
 #: ../sheets/cisconetwork.sheet.in.h:79
-msgid "Security appliance"
-msgstr "Tietoturvalaite"
+msgid "CDDI/FDDI Concentrator"
+msgstr "CDDI/FDDI-keskitin"
 
 #: ../sheets/cisconetwork.sheet.in.h:80
-msgid "Service Control"
-msgstr "Palveluohjain"
+msgid "FDDI Ring"
+msgstr "FDDI-rengas"
 
 #: ../sheets/cisconetwork.sheet.in.h:81
-msgid "Storage Solution Engine"
-msgstr "Tallennusratkaisun moottori"
+msgid "TokenRing"
+msgstr "TokenRing"
 
 #: ../sheets/cisconetwork.sheet.in.h:82
-msgid "System controller"
-msgstr "Järjestelmäohjain"
+msgid "MAU"
+msgstr "MAU"
 
 #: ../sheets/cisconetwork.sheet.in.h:83
-msgid "TV"
-msgstr "TV"
+msgid "Repeater"
+msgstr "Toistin"
 
 #: ../sheets/cisconetwork.sheet.in.h:84
-msgid "Terminal Server"
-msgstr "Päätepalvelin"
+msgid "Bridge"
+msgstr "Silta"
 
 #: ../sheets/cisconetwork.sheet.in.h:85
-msgid "TokenRing"
-msgstr "TokenRing"
+msgid "Breakout box"
+msgstr "Tietojen purkulaite"
 
 #: ../sheets/cisconetwork.sheet.in.h:86
-msgid "TransPath"
-msgstr "TransPath"
+msgid "STB (set top box)"
+msgstr "STB (set-top-box)"
 
 #: ../sheets/cisconetwork.sheet.in.h:87
-msgid "UPS"
-msgstr "UPS"
+msgid "TV"
+msgstr "TV"
 
 #: ../sheets/cisconetwork.sheet.in.h:88
-msgid "VIP"
-msgstr "VIP"
+msgid "IPTV broadcast server"
+msgstr "IPTV-lähetyspalvelin"
 
 #: ../sheets/cisconetwork.sheet.in.h:89
-msgid "VN2900"
-msgstr "VN2900"
+msgid "IPTV content manager"
+msgstr "IPTV-sisällönhallinta"
 
 #: ../sheets/cisconetwork.sheet.in.h:90
-msgid "VN5900"
-msgstr "VN5900"
+msgid "VN2900"
+msgstr "VN2900"
 
 #: ../sheets/cisconetwork.sheet.in.h:91
 msgid "VN5902"
 msgstr "VN5902"
 
 #: ../sheets/cisconetwork.sheet.in.h:92
-msgid "VPN Concentrator"
-msgstr "VPN-keskitin"
+msgid "VN5900"
+msgstr "VN5900"
 
 #: ../sheets/cisconetwork.sheet.in.h:93
-msgid "VPN Gateway"
-msgstr "VPN-yhdyskäytävä"
+msgid "Catalyst Access Gateway"
+msgstr "Catalyst-sisääntuloyhdyskäytävä"
 
 #: ../sheets/cisconetwork.sheet.in.h:94
-msgid "WAN"
-msgstr "WAN"
+msgid "Generic Gateway"
+msgstr "Yleinen yhdyskäytävä"
 
 #: ../sheets/cisconetwork.sheet.in.h:95
-msgid "WDM"
-msgstr "WDM"
+msgid "TransPath"
+msgstr "TransPath"
 
 #: ../sheets/cisconetwork.sheet.in.h:96
-msgid "WLAN controller"
-msgstr "WLAN-ohjain"
+msgid "uBR910 Cable DSU"
+msgstr "uBR910 Cable DSU"
 
 #: ../sheets/cisconetwork.sheet.in.h:97
-msgid "Wi-Fi Tag"
-msgstr "Wi-Fi-tarra"
+msgid "Storage Solution Engine"
+msgstr "Tallennusratkaisun moottori"
 
 #: ../sheets/cisconetwork.sheet.in.h:98
-msgid "Wireless Bridge"
-msgstr "Langaton silta"
+msgid "Content Engine (Cache Director)"
+msgstr "Sisältömoottori (Cache Director)"
 
 #: ../sheets/cisconetwork.sheet.in.h:99
-msgid "Wireless Connectivity"
-msgstr "Langato yhteys"
+msgid "CDM Content Distribution Manager"
+msgstr "CDM-sisällönjakeluhallinta"
 
 #: ../sheets/cisconetwork.sheet.in.h:100
-msgid "Wireless Location Appliance"
-msgstr "Langaton paikannuslaite"
+msgid "Content Transformation Engine (CTE)"
+msgstr "Sisällönmuunnosmoottori (CTE)"
 
 #: ../sheets/cisconetwork.sheet.in.h:101
-msgid "Wireless Transport"
-msgstr "Langaton siirto"
+msgid "ME 1100"
+msgstr "ME 1100"
 
 #: ../sheets/cisconetwork.sheet.in.h:102
-msgid "uBR910 Cable DSU"
-msgstr "uBR910 Cable DSU"
+msgid "MAS Gateway"
+msgstr "MAS-yhdyskäytävä"
+
+#: ../sheets/cisconetwork.sheet.in.h:103
+msgid "File Engine"
+msgstr "Tiedostomoottori"
+
+#: ../sheets/cisconetwork.sheet.in.h:104
+msgid "Service Control"
+msgstr "Palveluohjain"
 
 #: ../sheets/ciscotelephony.sheet.in.h:1
-msgid "6701"
-msgstr "6701"
+#, fuzzy
+#| msgid "Cisco - Telephony"
+msgid "Cisco — Telephony"
+msgstr "Cisco - puhelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:2
-msgid "6705"
-msgstr "6705"
+msgid "Telephony shapes by Cisco"
+msgstr "Ciscon puhelinmuodot"
 
 #: ../sheets/ciscotelephony.sheet.in.h:3
-msgid "6732"
-msgstr "6732"
+msgid "Phone"
+msgstr "Puhelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:4
-msgid "ADM"
-msgstr "ADM"
+msgid "Phone 2"
+msgstr "Puhelin 2"
 
 #: ../sheets/ciscotelephony.sheet.in.h:5
-msgid "ATA"
-msgstr "ATA"
+msgid "Phone Ethernet"
+msgstr "Ethernet-puhelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:6
-msgid "BTS 10200"
-msgstr "BTS 10200"
+msgid "Phone Appliance"
+msgstr "Puhelinlaite"
 
 #: ../sheets/ciscotelephony.sheet.in.h:7
-msgid "CallManager"
-msgstr "Puhelunhallinta"
+msgid "Phone Feature"
+msgstr "Puhelimen ominaisuus"
 
 #: ../sheets/ciscotelephony.sheet.in.h:8
-msgid "Cellular Phone"
-msgstr "Langaton puhelin"
+msgid "Phone/Fax"
+msgstr "Puhelin/faksi"
 
 #: ../sheets/ciscotelephony.sheet.in.h:9
-msgid "Cisco - Telephony"
-msgstr "Cisco - puhelin"
+msgid "HootPhone"
+msgstr "Luuripuhelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:10
-msgid "Class 4/5 switch"
-msgstr "Luokan 4/5 kytkin"
+msgid "IP Phone"
+msgstr "IP-puhelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:11
-msgid "End Office"
-msgstr "Lopputoimisto"
+msgid "IP Softphone"
+msgstr "IP-ohjelmistopuhelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:12
-msgid "Fax"
-msgstr "Faksi"
+msgid "Softphone"
+msgstr "Ohjelmapuhelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:13
-msgid "Gatekeeper"
-msgstr "Porttivahti"
+msgid "Cellular Phone"
+msgstr "Langaton puhelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:14
-msgid "Generic softswitch"
-msgstr "Yleinen ohjelmistokytkin"
+msgid "Mobile Access IP Phone"
+msgstr "Kännykkä IP-puheluilla"
 
 #: ../sheets/ciscotelephony.sheet.in.h:15
-msgid "H.323"
-msgstr "H.323"
+msgid "Pager"
+msgstr "Piippari"
 
 #: ../sheets/ciscotelephony.sheet.in.h:16
-msgid "HootPhone"
-msgstr "Luuripuhelin"
+msgid "Fax"
+msgstr "Faksi"
 
 #: ../sheets/ciscotelephony.sheet.in.h:17
-msgid "IAD router"
-msgstr "IAD-reititin"
+msgid "Turret"
+msgstr "Kääntöpöytä"
 
 #: ../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 "Radiotorni"
 
 #: ../sheets/ciscotelephony.sheet.in.h:20
-msgid "IP Phone"
-msgstr "IP-puhelin"
+msgid "PBX"
+msgstr "PBX"
 
 #: ../sheets/ciscotelephony.sheet.in.h:21
-msgid "IP Softphone"
-msgstr "IP-ohjelmistopuhelin"
+msgid "PBX Switch"
+msgstr "PBX-kytkin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:22
-msgid "IP Telephony Router"
-msgstr "IP-puhelinreititin"
+msgid "Class 4/5 switch"
+msgstr "Luokan 4/5 kytkin"
 
 #: ../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-pino"
+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 8000 -sarjan puheyhdyskäytävä"
+msgid "ATA"
+msgstr "ATA"
 
 #: ../sheets/ciscotelephony.sheet.in.h:27
-msgid "MoH server (Music on Hold)"
-msgstr "MoH-palvelin (Music on Hold)"
+msgid "SIP Proxy Server"
+msgstr "SIP-välipalvelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:28
-msgid "Mobile Access IP Phone"
-msgstr "Kännykkä IP-puheluilla"
+msgid "Gatekeeper"
+msgstr "Porttivahti"
 
 #: ../sheets/ciscotelephony.sheet.in.h:29
-msgid "Mobile Access Router"
-msgstr "Kännyköiden sisääntuloreititin"
+msgid "MGX 8000 Series Voice Gateway"
+msgstr "MGX 8000 -sarjan puheyhdyskäytävä"
 
 #: ../sheets/ciscotelephony.sheet.in.h:30
-msgid "Octel"
-msgstr "Octel"
+msgid "End Office"
+msgstr "Lopputoimisto"
 
 #: ../sheets/ciscotelephony.sheet.in.h:31
-msgid "PBX"
-msgstr "PBX"
+msgid "Voice-Enabled Access Server"
+msgstr "Sisääntulopalvelin puheominaisuuksilla"
 
 #: ../sheets/ciscotelephony.sheet.in.h:32
-msgid "PBX Switch"
-msgstr "PBX-kytkin"
+msgid "Voice-Enabled Router"
+msgstr "Reititin puheominaisuuksilla"
 
 #: ../sheets/ciscotelephony.sheet.in.h:33
-msgid "Pager"
-msgstr "Piippari"
+msgid "Voice-Enabled ATM Switch"
+msgstr "ATM-kytkin puheominaisuuksilla"
 
 #: ../sheets/ciscotelephony.sheet.in.h:34
-msgid "Phone"
-msgstr "Puhelin"
+msgid "CallManager"
+msgstr "Puhelunhallinta"
 
 #: ../sheets/ciscotelephony.sheet.in.h:35
-msgid "Phone 2"
-msgstr "Puhelin 2"
+msgid "IP Telephony Router"
+msgstr "IP-puhelinreititin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:36
-msgid "Phone Appliance"
-msgstr "Puhelinlaite"
+msgid "Mobile Access Router"
+msgstr "Kännyköiden sisääntuloreititin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:37
-msgid "Phone Ethernet"
-msgstr "Ethernet-puhelin"
+msgid "H.323"
+msgstr "H.323"
 
 #: ../sheets/ciscotelephony.sheet.in.h:38
-msgid "Phone Feature"
-msgstr "Puhelimen ominaisuus"
+msgid "STP"
+msgstr "STP"
 
 #: ../sheets/ciscotelephony.sheet.in.h:39
-msgid "Phone/Fax"
-msgstr "Puhelin/faksi"
+msgid "BTS 10200"
+msgstr "BTS 10200"
 
 #: ../sheets/ciscotelephony.sheet.in.h:40
-msgid "Radio Tower"
-msgstr "Radiotorni"
+msgid "Generic softswitch"
+msgstr "Yleinen ohjelmistokytkin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:41
-msgid "SC2200 (Signalling Controller)"
-msgstr "SC2200 (signalointiohjain)"
-
-#: ../sheets/ciscotelephony.sheet.in.h:42
 msgid "SC2200/VSC3000 host"
 msgstr "SC2200/VSC3000-isäntä"
 
+#: ../sheets/ciscotelephony.sheet.in.h:42
+msgid "Virtual switch controller (VSC 3000)"
+msgstr "Virtuaalikytkimen hallinta (VSC 3000)"
+
 #: ../sheets/ciscotelephony.sheet.in.h:43
-msgid "SIP Proxy Server"
-msgstr "SIP-välipalvelin"
+msgid "SC2200 (Signalling Controller)"
+msgstr "SC2200 (signalointiohjain)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:44
-msgid "SONET MUX"
-msgstr "SONET MUX"
+msgid "MoH server (Music on Hold)"
+msgstr "MoH-palvelin (Music on Hold)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:45
-msgid "STP"
-msgstr "STP"
+msgid "TDM router"
+msgstr "TDM-reititin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:46
-msgid "Softphone"
-msgstr "Ohjelmapuhelin"
+msgid "6701"
+msgstr "6701"
 
 #: ../sheets/ciscotelephony.sheet.in.h:47
-msgid "TDM router"
-msgstr "TDM-reititin"
+msgid "6705"
+msgstr "6705"
 
 #: ../sheets/ciscotelephony.sheet.in.h:48
-msgid "Telephony shapes by Cisco"
-msgstr "Ciscon puhelinmuodot"
+msgid "6732"
+msgstr "6732"
 
 #: ../sheets/ciscotelephony.sheet.in.h:49
-msgid "Turret"
-msgstr "Kääntöpöytä"
+msgid "IAD router"
+msgstr "IAD-reititin"
 
 #: ../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-palvelin"
+msgid "ICM"
+msgstr "ICM"
 
 #: ../sheets/ciscotelephony.sheet.in.h:52
-msgid "Virtual switch controller (VSC 3000)"
-msgstr "Virtuaalikytkimen hallinta (VSC 3000)"
+msgid "IntelliSwitch Stack"
+msgstr "IntelliSwitch-pino"
 
 #: ../sheets/ciscotelephony.sheet.in.h:53
-msgid "Voice-Enabled ATM Switch"
-msgstr "ATM-kytkin puheominaisuuksilla"
+msgid "Unity server"
+msgstr "Unity-palvelin"
 
 #: ../sheets/ciscotelephony.sheet.in.h:54
-msgid "Voice-Enabled Access Server"
-msgstr "Sisääntulopalvelin puheominaisuuksilla"
+msgid "Unity Express"
+msgstr "Unity Express"
 
 #: ../sheets/ciscotelephony.sheet.in.h:55
-msgid "Voice-Enabled Router"
-msgstr "Reititin puheominaisuuksilla"
+msgid "MCU"
+msgstr "MCU"
 
 #: ../sheets/ciscotelephony.sheet.in.h:56
 msgid "uMG series"
 msgstr "uMG-sarja"
 
 #: ../sheets/civil.sheet.in.h:1
-msgid "Aerator with bubbles"
-msgstr "Ilmaaja kuplilla"
+msgid "Civil"
+msgstr "Siviili"
 
 #: ../sheets/civil.sheet.in.h:2
-msgid "Backflow preventer"
-msgstr "Takaisinvirtauksen esto"
+msgid "Civil Engineering Components"
+msgstr "Insinöörikomponentit"
 
 #: ../sheets/civil.sheet.in.h:3
-msgid "Basin"
-msgstr "Allas"
+msgid "Vertical rest"
+msgstr "Pystysuora tuki"
 
 #: ../sheets/civil.sheet.in.h:4
-msgid "Bivalent vertical rest"
-msgstr "Kaksinen pystysuora tuki"
+msgid "Horizontal rest"
+msgstr "Vaakasuora tuki"
 
 #: ../sheets/civil.sheet.in.h:5
-msgid "Civil"
-msgstr "Siviili"
+msgid "Bivalent vertical rest"
+msgstr "Kaksinen pystysuora tuki"
 
 #: ../sheets/civil.sheet.in.h:6
-msgid "Civil Engineering Components"
-msgstr "Insinöörikomponentit"
+msgid "Reference line"
+msgstr "Referenssiviiva"
 
 #: ../sheets/civil.sheet.in.h:7
-msgid "Container"
-msgstr "Säiliö"
+msgid "Water level"
+msgstr "Vedenkorkeus"
 
 #: ../sheets/civil.sheet.in.h:8
-msgid "Final-settling basin"
-msgstr "Lopullinen kokooma-allas"
+msgid "Soil"
+msgstr "Maapohja"
 
 #: ../sheets/civil.sheet.in.h:9
-msgid "Frequency converter"
-msgstr "Taajuusmuunnin"
+msgid "Horizontally aligned arrow"
+msgstr "Vaakanuoli"
 
 #: ../sheets/civil.sheet.in.h:10
-msgid "Gas bottle"
-msgstr "Kaasupullo"
+msgid "Vertically aligned arrow"
+msgstr "Pystynuoli"
 
 #: ../sheets/civil.sheet.in.h:11
 msgid "Horizontal limiting line"
 msgstr "Vaakasuoraan rajoittava viiva"
 
 #: ../sheets/civil.sheet.in.h:12
-msgid "Horizontal rest"
-msgstr "Vaakasuora tuki"
+msgid "Vertical limiting line"
+msgstr "Pystysuoraan rajoittava viiva"
 
 #: ../sheets/civil.sheet.in.h:13
-msgid "Horizontally aligned arrow"
-msgstr "Vaakanuoli"
+msgid "Horizontally aligned pump"
+msgstr "Vaakasuoraan suunnattu pumppu"
 
 #: ../sheets/civil.sheet.in.h:14
-msgid "Horizontally aligned compressor"
-msgstr "Vaakasuoraan suunnattu kompressori"
+msgid "Vertically aligned pump"
+msgstr "Pystysuoraan suunnattu pumppu"
 
 #: ../sheets/civil.sheet.in.h:15
-msgid "Horizontally aligned pump"
-msgstr "Vaakasuoraan suunnattu pumppu"
+msgid "Horizontally aligned compressor"
+msgstr "Vaakasuoraan suunnattu kompressori"
 
 #: ../sheets/civil.sheet.in.h:16
-msgid "Horizontally aligned valve"
-msgstr "Vaakasuoraan suunnattu venttiili"
+msgid "Vertically aligned compressor"
+msgstr "Pystysuoraan suunnattu kompressori"
 
 #: ../sheets/civil.sheet.in.h:17
-msgid "Motor"
-msgstr "Moottori"
+msgid "Vertically aligned valve"
+msgstr "Pystysuoraan suunnattu venttiili"
 
 #: ../sheets/civil.sheet.in.h:18
-msgid "Preliminary clarification tank"
-msgstr "Valmistava selvitystankki"
+msgid "Horizontally aligned valve"
+msgstr "Vaakasuoraan suunnattu venttiili"
 
 #: ../sheets/civil.sheet.in.h:19
-msgid "Reference line"
-msgstr "Referenssiviiva"
+msgid "Backflow preventer"
+msgstr "Takaisinvirtauksen esto"
 
 #: ../sheets/civil.sheet.in.h:20
-msgid "Rotor"
-msgstr "Roottori"
+msgid "Motor"
+msgstr "Moottori"
 
 #: ../sheets/civil.sheet.in.h:21
-msgid "Soil"
-msgstr "Maapohja"
+msgid "Gas bottle"
+msgstr "Kaasupullo"
 
 #: ../sheets/civil.sheet.in.h:22
-msgid "Vertical limiting line"
-msgstr "Pystysuoraan rajoittava viiva"
+msgid "Frequency converter"
+msgstr "Taajuusmuunnin"
 
 #: ../sheets/civil.sheet.in.h:23
-msgid "Vertical rest"
-msgstr "Pystysuora tuki"
+msgid "Vertically aligned propeller"
+msgstr "Pystysuoraan suunnattu potkuri"
 
 #: ../sheets/civil.sheet.in.h:24
-msgid "Vertically aligned arrow"
-msgstr "Pystynuoli"
+msgid "Aerator with bubbles"
+msgstr "Ilmaaja kuplilla"
 
 #: ../sheets/civil.sheet.in.h:25
-msgid "Vertically aligned compressor"
-msgstr "Pystysuoraan suunnattu kompressori"
+msgid "Rotor"
+msgstr "Roottori"
 
 #: ../sheets/civil.sheet.in.h:26
-msgid "Vertically aligned propeller"
-msgstr "Pystysuoraan suunnattu potkuri"
+msgid "Final-settling basin"
+msgstr "Lopullinen kokooma-allas"
 
 #: ../sheets/civil.sheet.in.h:27
-msgid "Vertically aligned pump"
-msgstr "Pystysuoraan suunnattu pumppu"
+msgid "Preliminary clarification tank"
+msgstr "Valmistava selvitystankki"
 
 #: ../sheets/civil.sheet.in.h:28
-msgid "Vertically aligned valve"
-msgstr "Pystysuoraan suunnattu venttiili"
+msgid "Basin"
+msgstr "Allas"
 
 #: ../sheets/civil.sheet.in.h:29
-msgid "Water level"
-msgstr "Vedenkorkeus"
+msgid "Container"
+msgstr "Säiliö"
+
+#: ../sheets/Contact.sheet.in.h:1
+msgid "Ladder"
+msgstr "Tikapuukaavio"
+
+#: ../sheets/Contact.sheet.in.h:2
+msgid "Components for LADDER circuits"
+msgstr "Komponentit LADDER-piireille"
+
+#: ../sheets/Contact.sheet.in.h:3
+msgid "'if' (normally open) ladder contact"
+msgstr "'jos'-tikapuuyhteys (normaalisti auki)"
+
+#: ../sheets/Contact.sheet.in.h:4
+msgid "'if not' (normally closed) ladder contact"
+msgstr "'jos ei'-tikapuuyhteys (normaalisti kiinni)"
+
+#: ../sheets/Contact.sheet.in.h:5
+msgid "Simple output variable"
+msgstr "Yksinkertainen tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:6
+msgid "Negative output variable"
+msgstr "Kielteinen tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:7
+msgid "'set' output variable"
+msgstr "'aseta'-tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:8
+msgid "'reset' output variable"
+msgstr "'nollaa'-tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:9
+msgid "'jump' output variable"
+msgstr "'hyppää'-tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:10
+msgid "Receptivity output variable"
+msgstr "Vastaanottava tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:11
+msgid "Power-saved simple output variable"
+msgstr "Virtaa säästävä yksinkertainen tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:12
+msgid "Power-saved negative output variable"
+msgstr "Virtaa säästävä kielteinen tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:13
+msgid "Power-saved 'set' output variable"
+msgstr "Virtaa säästävä 'aseta'-tulostemuuttuja"
+
+#: ../sheets/Contact.sheet.in.h:14
+msgid "Power-saved 'reset' output variable"
+msgstr "Virtaa säästävä 'nollaa'-tulostemuuttuja"
+
+#: ../sheets/Cybernetics.sheet.in.h:1
+msgid "Cybernetics"
+msgstr "Kybernetiikka"
+
+#: ../sheets/Cybernetics.sheet.in.h:2
+msgid "Elements of cybernetic circuits"
+msgstr "Komponentit kybernetiikkapiireihin"
+
+#: ../sheets/Cybernetics.sheet.in.h:3
+#, fuzzy
+#| msgid "Sensor - left"
+msgid "Sensor — left"
+msgstr "Tunnistin - vasen"
+
+#: ../sheets/Cybernetics.sheet.in.h:4
+#, fuzzy
+#| msgid "Sensor - right"
+msgid "Sensor — right"
+msgstr "Tunnistin - oikea"
+
+#: ../sheets/Cybernetics.sheet.in.h:5
+#, fuzzy
+#| msgid "Sensor - bottom"
+msgid "Sensor — bottom"
+msgstr "Tunnistin - ala"
+
+#: ../sheets/Cybernetics.sheet.in.h:6
+#, fuzzy
+#| msgid "Sensor - top"
+msgid "Sensor — top"
+msgstr "Tunnistin - ylä"
+
+#: ../sheets/Cybernetics.sheet.in.h:7
+msgid "Sum, subtracting left input"
+msgstr "Summa, vähentäen vasemman syötteen"
+
+#: ../sheets/Cybernetics.sheet.in.h:8
+msgid "Sum, subtracting right input"
+msgstr "Summa, vähentäen oikean syötteen"
+
+#: ../sheets/Cybernetics.sheet.in.h:9
+msgid "Sum, subtracting bottom input"
+msgstr "Summa, vähentäen alasyötteen"
+
+#: ../sheets/Cybernetics.sheet.in.h:10
+msgid "Sum, subtracting top input"
+msgstr "Summa, vähentäen yläsyötteen"
+
+#: ../sheets/Cybernetics.sheet.in.h:11
+#, fuzzy
+#| msgid "Integrator - input left"
+msgid "Integrator — input left"
+msgstr "Integraattori - syöte, vasen"
+
+#: ../sheets/Cybernetics.sheet.in.h:12
+#, fuzzy
+#| msgid "Integrator - input right"
+msgid "Integrator — input right"
+msgstr "Integraattori - syöte, oikea"
+
+#: ../sheets/Cybernetics.sheet.in.h:13
+#, fuzzy
+#| msgid "Integrator - input bottom"
+msgid "Integrator — input bottom"
+msgstr "Integraattori - syöte, ala"
+
+#: ../sheets/Cybernetics.sheet.in.h:14
+#, fuzzy
+#| msgid "Integrator - input top"
+msgid "Integrator — input top"
+msgstr "Integraattori - syöte, ylä"
+
+#: ../sheets/Cybernetics.sheet.in.h:15
+msgid "Sum"
+msgstr "Summa"
+
+#: ../sheets/Cybernetics.sheet.in.h:16
+msgid "Product"
+msgstr "Tulo"
+
+#: ../sheets/Cybernetics.sheet.in.h:17
+msgid "High pass filter"
+msgstr "Ylipäästösuodatin"
+
+#: ../sheets/Cybernetics.sheet.in.h:18
+msgid "Low pass filter"
+msgstr "Alipäästösuodatin"
+
+#: ../sheets/Cybernetics.sheet.in.h:19
+msgid "Sine characteristic or input"
+msgstr "Sini-ominaiskäyrä tai syöte"
+
+#: ../sheets/Cybernetics.sheet.in.h:20
+msgid "Sigmoid characteristic"
+msgstr "Sigmoid-ominaiskäyrä"
+
+#: ../sheets/Cybernetics.sheet.in.h:21
+msgid "Saturation characteristic"
+msgstr "Kyllästysominaisuus"
+
+#: ../sheets/Cybernetics.sheet.in.h:22
+msgid "Relay characteristic (sigma)"
+msgstr "Viiveominaisuus (sigma)"
+
+#: ../sheets/Cybernetics.sheet.in.h:23
+msgid "Half wave rectifier or ramp input"
+msgstr "Puoliaaltotasasuuntaaja"
+
+#: ../sheets/Cybernetics.sheet.in.h:24
+msgid "Full wave rectifier (absolute value)"
+msgstr "Kokoaaltotasasuuntaaja (absoluuttinen arvo)"
+
+#: ../sheets/Cybernetics.sheet.in.h:25
+msgid "Constant positive shift on the y-axis"
+msgstr "Positiivinen vakiosiirtymä y-akselilla"
+
+#: ../sheets/Cybernetics.sheet.in.h:26
+msgid "Constant negative shift on the y-axis"
+msgstr "Negatiivinen vakiosiirtymä y-akselilla"
+
+#: ../sheets/Cybernetics.sheet.in.h:27
+msgid "Constant factor greater 1"
+msgstr "Vakiotekijä yli 1"
+
+#: ../sheets/Cybernetics.sheet.in.h:28
+msgid "Constant factor between 0 and 1"
+msgstr "Vakiotekijä 0 ja 1 välillä"
+
+#: ../sheets/Cybernetics.sheet.in.h:29
+msgid "Constant factor between 0 and -1"
+msgstr "Vakiotekijä 0 ja -1 välillä"
+
+#: ../sheets/Cybernetics.sheet.in.h:30
+msgid "Constant factor below -1"
+msgstr "Vakiotekijä alle -1"
+
+#: ../sheets/Cybernetics.sheet.in.h:31
+msgid "Template for custom characteristics"
+msgstr "Mallipohja omille ominaiskäyrille"
+
+#: ../sheets/Cybernetics.sheet.in.h:32
+msgid "Time delay"
+msgstr "Aikaviive"
+
+#: ../sheets/Database.sheet.in.h:1
+msgid "Database"
+msgstr "Tietokanta"
+
+#: ../sheets/Database.sheet.in.h:2
+msgid "Editor for Database Table Relation Diagrams"
+msgstr "Muokkain tietokanteiden suhdekaavioille"
+
+#: ../sheets/Database.sheet.in.h:5
+msgid "Attribute compound"
+msgstr ""
+
+#: ../sheets/Electric.sheet.in.h:1
+msgid "Electric"
+msgstr "Virtapiiri 2"
+
+#: ../sheets/Electric.sheet.in.h:2
+msgid "Components for electric circuits"
+msgstr "Komponentit sähköpiireihin"
+
+#: ../sheets/Electric.sheet.in.h:3
+msgid "Normally open contact (horizontal)"
+msgstr "Normaalisti avoin yhteys (poikittain)"
+
+#: ../sheets/Electric.sheet.in.h:4
+msgid "Normally closed contact (horizontal)"
+msgstr "Normaalisti suljettu yhteys (poikittain)"
+
+#: ../sheets/Electric.sheet.in.h:5
+msgid "Normally open position switch (horizontal)"
+msgstr "Normaalisti avoin sijaintikytkin (poikittain)"
+
+#: ../sheets/Electric.sheet.in.h:6
+msgid "Normally closed position switch (horizontal)"
+msgstr "Normaalisti suljettu sijainnin kytkin (poikittain)"
+
+#: ../sheets/Electric.sheet.in.h:7
+msgid "Normally open contact (vertical)"
+msgstr "Normaalisti avoin yhteys (pystyssä)"
+
+#: ../sheets/Electric.sheet.in.h:8
+msgid "Normally closed contact (vertical)"
+msgstr "Normaalisti suljettu yhteys (pystyssä)"
+
+#: ../sheets/Electric.sheet.in.h:9
+msgid "Normally open position switch (vertical)"
+msgstr "Normaalisti avoin sijaintikytkin (pystyssä)"
+
+#: ../sheets/Electric.sheet.in.h:10
+msgid "Normally closed position switch (vertical)"
+msgstr "Normaalisti suljettu sijainnin kytkin (pystyssä)"
+
+#: ../sheets/Electric.sheet.in.h:11
+msgid "The command organ of a relay (horizontal)"
+msgstr "Välityksen komentoelin (poikittain)"
+
+#: ../sheets/Electric.sheet.in.h:12
+msgid "Relay (horizontal)"
+msgstr "Rele (poikittain)"
+
+#: ../sheets/Electric.sheet.in.h:13
+msgid "Lamp or indicator light (horizontal)"
+msgstr "Lamppu tai merkkivalo (poikittain)"
+
+#: ../sheets/Electric.sheet.in.h:14
+msgid "The command organ of a relay (vertical)"
+msgstr "Välityksen komentoelin (pystyssä)"
+
+#: ../sheets/Electric.sheet.in.h:15
+msgid "Relay (vertical)"
+msgstr "Rele (pystyssä)"
+
+#: ../sheets/Electric.sheet.in.h:16
+msgid "Lamp or indicator light (vertical)"
+msgstr "Lamppu tai merkkivalo (pystyssä)"
+
+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
+msgid "Connection point"
+msgstr "Liitoskohta"
+
+#: ../sheets/ER.sheet.in.h:1
+msgid "ER"
+msgstr "ER"
+
+#: ../sheets/ER.sheet.in.h:2
+msgid "Editor for Entity Relations Diagrams"
+msgstr "Muokkain ER-kaavioille"
+
+#: ../sheets/ER.sheet.in.h:4
+msgid "Weak entity"
+msgstr "Heikko olio"
+
+#: ../sheets/ER.sheet.in.h:7
+msgid "Participation"
+msgstr "Osallisuus"
+
+#: ../sheets/Flowchart.sheet.in.h:2
+msgid "Objects to draw flowcharts"
+msgstr "Objektit vuokaavioiden piirtämiseen"
+
+#: ../sheets/Flowchart.sheet.in.h:3
+msgid "Process/Auxiliary Operation"
+msgstr "Prosessi/Toissijainen toiminto"
+
+#: ../sheets/Flowchart.sheet.in.h:4
+msgid "Input/Output"
+msgstr "Syöte/tuloste"
+
+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
+msgid "Decision"
+msgstr "Päätös"
+
+#: ../sheets/Flowchart.sheet.in.h:6
+msgid "Connector"
+msgstr "Liitin"
+
+#: ../sheets/Flowchart.sheet.in.h:8
+msgid "Transaction file"
+msgstr "Transaktiotiedosto"
+
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:10
+msgid "Off page connector"
+msgstr "Sivunvaihtoliitin"
+
+#: ../sheets/Flowchart.sheet.in.h:11
+msgid "Document"
+msgstr "Asiakirja"
+
+#: ../sheets/Flowchart.sheet.in.h:12
+msgid "Manual operation"
+msgstr "Käsitoiminta"
+
+#: ../sheets/Flowchart.sheet.in.h:13
+msgid "Preparation"
+msgstr "Valmistelu"
+
+#: ../sheets/Flowchart.sheet.in.h:14
+msgid "Manual input"
+msgstr "Käsisyöte"
+
+#: ../sheets/Flowchart.sheet.in.h:15
+msgid "Predefined process"
+msgstr "Esimääritelty prosessi"
+
+#: ../sheets/Flowchart.sheet.in.h:16
+msgid "Terminal Interrupt"
+msgstr "Päätekeskeytys"
+
+#: ../sheets/Flowchart.sheet.in.h:17
+msgid "Magnetic disk"
+msgstr "Magneettilevy"
+
+#: ../sheets/Flowchart.sheet.in.h:18
+msgid "Magnetic drum"
+msgstr "Magneettirumpu"
+
+#: ../sheets/Flowchart.sheet.in.h:19
+msgid "Magnetic tape"
+msgstr "Magneettinauha"
+
+#: ../sheets/Flowchart.sheet.in.h:20
+msgid "Internal storage"
+msgstr "Sisäinen tallennus"
+
+#: ../sheets/Flowchart.sheet.in.h:21
+msgid "Merge"
+msgstr "Liitä"
+
+#: ../sheets/Flowchart.sheet.in.h:23
+msgid "Delay"
+msgstr "Viive"
+
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:25
+msgid "Summing junction"
+msgstr "Summaliitos"
+
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:27
+msgid "Collate"
+msgstr "Kokoa"
+
+#: ../sheets/Flowchart.sheet.in.h:28
+msgid "Sort"
+msgstr "Järjestä"
+
+#: ../sheets/Flowchart.sheet.in.h:29
+msgid "Or"
+msgstr "Tai"
+
+#: ../sheets/Flowchart.sheet.in.h:30
+msgid "Punched card"
+msgstr "Reikäkortti"
+
+#: ../sheets/Flowchart.sheet.in.h:31
+msgid "Punched tape"
+msgstr "Reikänauha"
+
+#: ../sheets/Flowchart.sheet.in.h:32
+msgid "Transmittal tape"
+msgstr "Siirtonauha"
+
+#: ../sheets/Flowchart.sheet.in.h:33
+msgid "Offline storage"
+msgstr "Yhteydetön tallennus"
+
+#: ../sheets/Flowchart.sheet.in.h:34
+msgid "Data source"
+msgstr "Tietollähde"
+
+#: ../sheets/FS.sheet.in.h:1
+msgid "FS"
+msgstr "FS"
+
+#: ../sheets/FS.sheet.in.h:2
+msgid "Editor for Function Structure Diagrams."
+msgstr "Muokkain funktiorakennekaavioille."
+
+#: ../sheets/FS.sheet.in.h:3
+msgid "Flow"
+msgstr "Virtaus"
+
+#: ../sheets/FS.sheet.in.h:4
+msgid "Orthogonal polyline flow"
+msgstr "Kohtisuora moniviivavirtaus"
+
+#: ../sheets/FS.sheet.in.h:5
+msgid "Function"
+msgstr "Toiminto"
+
+#. Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com
+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
+msgid "Gane and Sarson"
+msgstr "Gane- ja Sarson"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
+msgid "Gane and Sarson DFD"
+msgstr "Gane- ja Sarson DFD"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
+msgid "Alternate external entity"
+msgstr "Vaihtoehtoinen ulkoinen kokonaisuus"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
+msgid "Data store"
+msgstr "Tietovarasto"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
+msgid "External entity"
+msgstr "Ulkoinen kokonaisuus"
+
+#: ../sheets/GRAFCET.sheet.in.h:1
+msgid "GRAFCET"
+msgstr "GRAFCET"
+
+#: ../sheets/GRAFCET.sheet.in.h:2
+msgid "Objects to design GRAFCET charts"
+msgstr "Objektit GRAFCET-kaavioiden suunnitteluun"
+
+#: ../sheets/GRAFCET.sheet.in.h:8
+msgid "Macro sub-program call step"
+msgstr "Makroaliohjelman kutsuaskel"
+
+#: ../sheets/GRAFCET.sheet.in.h:9
+msgid "Action to associate to a step"
+msgstr "Askeleeseen liitettävä toiminto"
+
+#: ../sheets/GRAFCET.sheet.in.h:10
+msgid "Condition (of an action)"
+msgstr "Ehto (toiminnon)"
+
+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
+msgid "Transition"
+msgstr "Siirtymä"
+
+#: ../sheets/GRAFCET.sheet.in.h:12
+msgid "OR vergent"
+msgstr "OR-vergentti"
+
+#: ../sheets/GRAFCET.sheet.in.h:13
+msgid "AND vergent"
+msgstr "AND-vergentti"
+
+#: ../sheets/GRAFCET.sheet.in.h:14
+msgid "Arc (upward)"
+msgstr "Kaari (ylöspäin)"
+
+#. use dc:title instead?
+#: ../sheets/IsometricMap.sheet.in.h:2
+msgid "Map, Isometric"
+msgstr "Kartta, isometrinen"
+
+#. use dc:description instead?
+#: ../sheets/IsometricMap.sheet.in.h:4
+msgid "Isometric Directional Map Shapes"
+msgstr "Isometriset suunnatut karttamerkit"
+
+#: ../sheets/IsometricMap.sheet.in.h:5
+msgid "Road Section"
+msgstr "Tienpätkä"
+
+#: ../sheets/IsometricMap.sheet.in.h:6
+msgid "Long Straight Road Section"
+msgstr "Pitkä suora tienpätkä"
+
+#: ../sheets/IsometricMap.sheet.in.h:7
+msgid "Crossroads"
+msgstr "Risteykset"
+
+#: ../sheets/IsometricMap.sheet.in.h:8
+msgid "T-Junction"
+msgstr "T-risteys"
+
+#: ../sheets/IsometricMap.sheet.in.h:9
+msgid "Elevated Road"
+msgstr "Ilmatie"
+
+#: ../sheets/IsometricMap.sheet.in.h:10
+msgid "Corner 1"
+msgstr "Nurkka 1"
+
+#: ../sheets/IsometricMap.sheet.in.h:11
+msgid "Corner 2"
+msgstr "Nurkka 2"
+
+#: ../sheets/IsometricMap.sheet.in.h:12
+msgid "River"
+msgstr "Joki"
+
+#: ../sheets/IsometricMap.sheet.in.h:13
+#, fuzzy
+#| msgid "Roof1"
+msgid "Roof 1"
+msgstr "Katto1"
+
+#: ../sheets/IsometricMap.sheet.in.h:14
+msgid "Block 1, 2:4"
+msgstr "Pala 1, 2:4"
+
+#: ../sheets/IsometricMap.sheet.in.h:15
+msgid "Block 2, 2:8"
+msgstr "Pala 2, 2:8"
+
+#: ../sheets/IsometricMap.sheet.in.h:16
+msgid "Block 3, 4:4"
+msgstr "Pala 3, 4:4"
+
+#: ../sheets/IsometricMap.sheet.in.h:17
+msgid "Block 4, 4:8"
+msgstr "Pala 4, 4:8"
+
+#: ../sheets/IsometricMap.sheet.in.h:18
+msgid "Block 5, 3:3"
+msgstr "Pala 5, 3:3"
+
+#: ../sheets/IsometricMap.sheet.in.h:19
+msgid "Block 6, 4:6"
+msgstr "Pala 6, 4:6"
+
+#: ../sheets/IsometricMap.sheet.in.h:20
+msgid "Block 7"
+msgstr "Pala 7"
+
+#: ../sheets/IsometricMap.sheet.in.h:21
+msgid "Factory"
+msgstr "Tehdas"
+
+#: ../sheets/IsometricMap.sheet.in.h:22
+msgid "Car 1, Front View"
+msgstr "Auto 1, etunäkymä"
+
+#: ../sheets/IsometricMap.sheet.in.h:23
+msgid "Car 2, Rear View"
+msgstr "Auto 2, takanäkymä"
+
+#: ../sheets/IsometricMap.sheet.in.h:24
+msgid "Train 1, angled downward"
+msgstr "Juna 1, suuntaa alaspäin"
+
+#: ../sheets/IsometricMap.sheet.in.h:25
+msgid "Train 2, angled upward"
+msgstr "Juna 2, suuntaa ylöspäin"
+
+#: ../sheets/IsometricMap.sheet.in.h:26
+msgid "Tree 1"
+msgstr "Puu 1"
+
+#: ../sheets/IsometricMap.sheet.in.h:27
+msgid "Footbridge, Pedestrian Bridge"
+msgstr "Jalankulkusilta"
+
+#: ../sheets/IsometricMap.sheet.in.h:28
+msgid "One Way Road Sign"
+msgstr "Yksisuuntaisen tien merkki"
+
+#: ../sheets/Istar.sheet.in.h:1
+msgid "RE-i*"
+msgstr "RE-i*"
+
+#: ../sheets/Istar.sheet.in.h:2
+msgid "Objects to design i* diagrams"
+msgstr "Oliot i*-kaavioiden suunnitteluun"
+
+#: ../sheets/Istar.sheet.in.h:3
+msgid "An i* softgoal"
+msgstr "i*-tavoite (pehmeä)"
+
+#: ../sheets/Istar.sheet.in.h:4
+msgid "An i* goal"
+msgstr "i*-tavoite"
+
+#: ../sheets/Istar.sheet.in.h:5
+msgid "An i* resource"
+msgstr "i*-resurssi"
+
+#: ../sheets/Istar.sheet.in.h:6
+msgid "An i* task"
+msgstr "i*-tehtävä"
+
+#: ../sheets/Istar.sheet.in.h:7
+msgid "An i* unspecified actor"
+msgstr "i*-määrittelemätön toimija"
+
+#: ../sheets/Istar.sheet.in.h:8
+msgid "An i* agent"
+msgstr "i*-agentti"
+
+#: ../sheets/Istar.sheet.in.h:9
+msgid "An i* position"
+msgstr "i*-sijainti"
+
+#: ../sheets/Istar.sheet.in.h:10
+msgid "An i* role"
+msgstr "i*-rooli"
+
+#: ../sheets/Istar.sheet.in.h:11
+msgid "An i* unspecified link"
+msgstr "i*-määrittelemätön linkki"
+
+#: ../sheets/Istar.sheet.in.h:12
+msgid "An i* positive contribution"
+msgstr "i*-positiivinen osallistuminen"
+
+#: ../sheets/Istar.sheet.in.h:13
+msgid "An i* negative contribution"
+msgstr "i*-negatiivinen osallistuminen"
+
+#: ../sheets/Istar.sheet.in.h:14
+msgid "An i* dependency link"
+msgstr "i*-riippuvuuslinkki"
+
+#: ../sheets/Istar.sheet.in.h:15
+msgid "An i* decomposition link"
+msgstr "i*-hajottava linkki"
+
+#: ../sheets/Istar.sheet.in.h:16
+msgid "An i* means-ends link"
+msgstr ""
+
+#: ../sheets/Jackson.sheet.in.h:1
+msgid "RE-Jackson"
+msgstr "RE-Jackson"
+
+#: ../sheets/Jackson.sheet.in.h:2
+msgid "Objects to design Jackson diagrams"
+msgstr "Objektit Jackson-kaavioiden suunnitteluun"
+
+#: ../sheets/Jackson.sheet.in.h:3
+msgid "A Jackson given domain"
+msgstr "Jackson - annettu alue"
+
+#: ../sheets/Jackson.sheet.in.h:4
+msgid "A Jackson designed domain"
+msgstr "Jackson - suunniteltu alue"
+
+#: ../sheets/Jackson.sheet.in.h:5
+msgid "A Jackson machine domain"
+msgstr "Jackson - laitealue"
+
+#: ../sheets/Jackson.sheet.in.h:6
+msgid "A Jackson requirement"
+msgstr "Jackson-vaatimus"
+
+#: ../sheets/Jackson.sheet.in.h:7
+msgid "A Jackson shared phenomenon"
+msgstr "Jackson - jaettu ilmiö"
+
+#: ../sheets/Jackson.sheet.in.h:8
+msgid "A Jackson requirement phenomenon"
+msgstr "Jackosn - vaatimusilmiö"
 
 #: ../sheets/jigsaw.sheet.in.h:1
 msgid "Jigsaw"
 msgstr "Palapeli"
 
 #: ../sheets/jigsaw.sheet.in.h:2
-msgid "Jigsaw - part_iiii"
-msgstr "Palapeli - osa_iiii"
+msgid "Pieces of a jigsaw"
+msgstr "Palapelin palat"
 
 #: ../sheets/jigsaw.sheet.in.h:3
-msgid "Jigsaw - part_iiio"
-msgstr "Palapeli - osa_iiio"
+#, fuzzy
+#| msgid "Jigsaw - part_oioi"
+msgid "Jigsaw — part_oioi"
+msgstr "Palapeli - osa_oioi"
 
 #: ../sheets/jigsaw.sheet.in.h:4
-msgid "Jigsaw - part_iioi"
-msgstr "Palapeli - osa_iioi"
+#, fuzzy
+#| msgid "Jigsaw - part_ioio"
+msgid "Jigsaw — part_ioio"
+msgstr "Palapeli - osa_ioio"
 
 #: ../sheets/jigsaw.sheet.in.h:5
-msgid "Jigsaw - part_iioo"
-msgstr "Palapeli - osa_iioo"
+#, fuzzy
+#| msgid "Jigsaw - part_iiii"
+msgid "Jigsaw — part_iiii"
+msgstr "Palapeli - osa_iiii"
 
 #: ../sheets/jigsaw.sheet.in.h:6
-msgid "Jigsaw - part_ioii"
-msgstr "Palapeli - osa_ioii"
+#, fuzzy
+#| msgid "Jigsaw - part_oooo"
+msgid "Jigsaw — part_oooo"
+msgstr "Palapeli - osa_oooo"
 
 #: ../sheets/jigsaw.sheet.in.h:7
-msgid "Jigsaw - part_ioio"
-msgstr "Palapeli - osa_ioio"
+#, fuzzy
+#| msgid "Jigsaw - part_oooi"
+msgid "Jigsaw — part_oooi"
+msgstr "Palapeli - osa_oooi"
 
 #: ../sheets/jigsaw.sheet.in.h:8
-msgid "Jigsaw - part_iooi"
-msgstr "Palapeli - osa_iooi"
+#, fuzzy
+#| msgid "Jigsaw - part_iooo"
+msgid "Jigsaw — part_iooo"
+msgstr "Palapeli - osa_iooo"
 
 #: ../sheets/jigsaw.sheet.in.h:9
-msgid "Jigsaw - part_iooo"
-msgstr "Palapeli - osa_iooo"
+#, fuzzy
+#| msgid "Jigsaw - part_oioo"
+msgid "Jigsaw — part_oioo"
+msgstr "Palapeli - osa_oioo"
 
 #: ../sheets/jigsaw.sheet.in.h:10
-msgid "Jigsaw - part_oiii"
-msgstr "Palapeli - osa_oiii"
+#, fuzzy
+#| msgid "Jigsaw - part_ooio"
+msgid "Jigsaw — part_ooio"
+msgstr "Palapeli - osa_ooio"
 
 #: ../sheets/jigsaw.sheet.in.h:11
-msgid "Jigsaw - part_oiio"
-msgstr "Palapeli - osa_oiio"
+#, fuzzy
+#| msgid "Jigsaw - part_iioo"
+msgid "Jigsaw — part_iioo"
+msgstr "Palapeli - osa_iioo"
 
 #: ../sheets/jigsaw.sheet.in.h:12
-msgid "Jigsaw - part_oioi"
-msgstr "Palapeli - osa_oioi"
+#, fuzzy
+#| msgid "Jigsaw - part_oiio"
+msgid "Jigsaw — part_oiio"
+msgstr "Palapeli - osa_oiio"
 
 #: ../sheets/jigsaw.sheet.in.h:13
-msgid "Jigsaw - part_oioo"
-msgstr "Palapeli - osa_oioo"
+#, fuzzy
+#| msgid "Jigsaw - part_ooii"
+msgid "Jigsaw — part_ooii"
+msgstr "Palapeli - osa_ooii"
 
 #: ../sheets/jigsaw.sheet.in.h:14
-msgid "Jigsaw - part_ooii"
-msgstr "Palapeli - osa_ooii"
+#, fuzzy
+#| msgid "Jigsaw - part_iooi"
+msgid "Jigsaw — part_iooi"
+msgstr "Palapeli - osa_iooi"
 
 #: ../sheets/jigsaw.sheet.in.h:15
-msgid "Jigsaw - part_ooio"
-msgstr "Palapeli - osa_ooio"
+#, fuzzy
+#| msgid "Jigsaw - part_oiii"
+msgid "Jigsaw — part_oiii"
+msgstr "Palapeli - osa_oiii"
 
 #: ../sheets/jigsaw.sheet.in.h:16
-msgid "Jigsaw - part_oooi"
-msgstr "Palapeli - osa_oooi"
+#, fuzzy
+#| msgid "Jigsaw - part_ioii"
+msgid "Jigsaw — part_ioii"
+msgstr "Palapeli - osa_ioii"
 
 #: ../sheets/jigsaw.sheet.in.h:17
-msgid "Jigsaw - part_oooo"
-msgstr "Palapeli - osa_oooo"
+#, fuzzy
+#| msgid "Jigsaw - part_iioi"
+msgid "Jigsaw — part_iioi"
+msgstr "Palapeli - osa_iioi"
 
 #: ../sheets/jigsaw.sheet.in.h:18
-msgid "Pieces of a jigsaw"
-msgstr "Palapelin palat"
+#, fuzzy
+#| msgid "Jigsaw - part_iiio"
+msgid "Jigsaw — part_iiio"
+msgstr "Palapeli - osa_iiio"
+
+#: ../sheets/KAOS.sheet.in.h:1
+msgid "RE-KAOS"
+msgstr "RE-KAOS"
+
+#: ../sheets/KAOS.sheet.in.h:2
+msgid "Objects to design KAOS diagrams"
+msgstr "Objektit KAOS-kaavioiden suunnitteluun"
+
+#: ../sheets/KAOS.sheet.in.h:3
+msgid "A KAOS softgoal"
+msgstr "KAOS-välitavoite"
+
+#: ../sheets/KAOS.sheet.in.h:4
+msgid "A KAOS goal"
+msgstr "KAOS-tavoite"
+
+#: ../sheets/KAOS.sheet.in.h:5
+msgid "A KAOS requirement"
+msgstr "KAOS-vaatimus"
+
+#: ../sheets/KAOS.sheet.in.h:6
+msgid "A KAOS assumption"
+msgstr "KAOS-oletus"
+
+#: ../sheets/KAOS.sheet.in.h:7
+msgid "A KAOS obstacle"
+msgstr "KAOS-este"
+
+#: ../sheets/KAOS.sheet.in.h:8
+msgid "A KAOS AND refinement"
+msgstr "KAOS AND-tarkennus"
+
+#: ../sheets/KAOS.sheet.in.h:9
+msgid "A KAOS complete AND refinement"
+msgstr "KAOSin täysi AND-tarkennus"
+
+#: ../sheets/KAOS.sheet.in.h:10
+msgid "A KAOS OR refinement"
+msgstr "KAOS OR-tarkennus"
+
+#: ../sheets/KAOS.sheet.in.h:11
+msgid "A KAOS complete OR refinement"
+msgstr "KAOSin täysi OR-tarkennus"
+
+#: ../sheets/KAOS.sheet.in.h:12
+msgid "A KAOS operationalization"
+msgstr "KAOS-operationalisointi"
+
+#: ../sheets/KAOS.sheet.in.h:13
+msgid "A KAOS contribution"
+msgstr "KAOS-osallistuminen"
+
+#: ../sheets/KAOS.sheet.in.h:14
+msgid "A KAOS obstruction"
+msgstr "KAOS-häiriö"
+
+#: ../sheets/KAOS.sheet.in.h:15
+msgid "A KAOS binary conflict"
+msgstr "KAOS-binäärikonflikti"
+
+#: ../sheets/KAOS.sheet.in.h:16
+msgid "A KAOS agent"
+msgstr "KAOS-agentti"
+
+#: ../sheets/KAOS.sheet.in.h:17
+msgid "A KAOS responsibility"
+msgstr "KAOS-vastuu"
+
+#: ../sheets/KAOS.sheet.in.h:18
+msgid "A KAOS monitor link"
+msgstr "KAOS-tarkkailulinkki"
+
+#: ../sheets/KAOS.sheet.in.h:19
+msgid "A KAOS control link"
+msgstr "KAOS-ohjauslinkki"
+
+#: ../sheets/KAOS.sheet.in.h:20
+msgid "A KAOS capable-of"
+msgstr "KAOSn kykeneväisyys"
+
+#: ../sheets/KAOS.sheet.in.h:21
+msgid "A KAOS performs"
+msgstr "KAOS-suorittaja"
+
+#: ../sheets/KAOS.sheet.in.h:22
+msgid "A KAOS input"
+msgstr "KAOS-syöte"
+
+#: ../sheets/KAOS.sheet.in.h:23
+msgid "A KAOS output"
+msgstr "KAOS-tuloste"
+
+#: ../sheets/Lights.sheet.in.h:1
+msgid "Lights"
+msgstr "Valot"
+
+#: ../sheets/Lights.sheet.in.h:2
+msgid "Objects to design simple lighting plots"
+msgstr "Oliot yksinkertaisten valaistusten suunnitteluun"
+
+#: ../sheets/Lights.sheet.in.h:3
+msgid "PAR"
+msgstr "PAR"
+
+#: ../sheets/Lights.sheet.in.h:4
+msgid "PAR on the floor"
+msgstr "PAR lattialla"
+
+#: ../sheets/Lights.sheet.in.h:5
+msgid "ACL"
+msgstr "ACL"
+
+#: ../sheets/Lights.sheet.in.h:6
+msgid "Pebble Convex lantern"
+msgstr ""
+
+#: ../sheets/Lights.sheet.in.h:7
+msgid "Fresnel lantern"
+msgstr ""
+
+#: ../sheets/Lights.sheet.in.h:8
+msgid "Striplight"
+msgstr ""
+
+#: ../sheets/Lights.sheet.in.h:9
+msgid "Ellipsoidal Reflector Spotlight"
+msgstr ""
+
+#: ../sheets/Lights.sheet.in.h:10
+msgid "Blinders"
+msgstr "Verhot"
+
+#: ../sheets/Lights.sheet.in.h:11
+msgid "Black light"
+msgstr "Musta viiva"
+
+#: ../sheets/Lights.sheet.in.h:12
+msgid "Stroboscope light"
+msgstr "Strobe-valo"
+
+#: ../sheets/Lights.sheet.in.h:13
+msgid "Moving head"
+msgstr "Liikkuva pää"
+
+#: ../sheets/Lights.sheet.in.h:15
+msgid "Structure"
+msgstr "Rakenne"
+
+#: ../sheets/Logic.sheet.in.h:1
+msgid "Logic"
+msgstr "Logiikka"
+
+#: ../sheets/Logic.sheet.in.h:2
+msgid "Boolean Logic"
+msgstr "Totuusarvologiikka"
+
+#: ../sheets/Logic.sheet.in.h:3
+msgid "OR gate"
+msgstr "OR-portti"
+
+#: ../sheets/Logic.sheet.in.h:4
+msgid "AND gate"
+msgstr "AND-portti"
+
+#: ../sheets/Logic.sheet.in.h:5
+msgid "XOR gate"
+msgstr "XOR-portti"
+
+#: ../sheets/Logic.sheet.in.h:6
+msgid "Simple buffer"
+msgstr "Yksinkertainen puskuri"
+
+#: ../sheets/Logic.sheet.in.h:7
+msgid "Inverter"
+msgstr "Kääntöpiiri"
+
+#: ../sheets/Logic.sheet.in.h:8
+msgid "NAND gate"
+msgstr "NAND-portti"
+
+#: ../sheets/Logic.sheet.in.h:9
+msgid "NOR gate"
+msgstr "NOR-portti"
+
+#: ../sheets/Logic.sheet.in.h:10
+msgid "NOT"
+msgstr "NOT"
+
+#: ../sheets/Logic.sheet.in.h:11
+#, fuzzy
+#| msgid "Crossconnector"
+msgid "Cross-connector"
+msgstr "Ristikytkentäliitin"
+
+#: ../sheets/Misc.sheet.in.h:1
+#, fuzzy
+#| msgid "Miscellaneous Shapes"
+msgid "Miscellaneous"
+msgstr "Sekalaisia kuvioita"
+
+#: ../sheets/Misc.sheet.in.h:2
+msgid "Miscellaneous Shapes"
+msgstr "Sekalaisia kuvioita"
+
+#: ../sheets/Misc.sheet.in.h:3
+msgid "Tree"
+msgstr "Puu"
+
+#: ../sheets/Misc.sheet.in.h:4
+msgid "Folder"
+msgstr "Kansio"
+
+#: ../sheets/Misc.sheet.in.h:6
+#, fuzzy
+#| msgid "expensible node"
+msgid "expansible node"
+msgstr "laajennettava solmu"
+
+#: ../sheets/Misc.sheet.in.h:7
+#, fuzzy
+#| msgid "expended node"
+msgid "expanded node"
+msgstr "laajennettu solmu"
+
+#: ../sheets/Misc.sheet.in.h:8
+msgid "Traditional clock"
+msgstr "Perinteinen kello"
+
+#: ../sheets/Misc.sheet.in.h:9
+msgid "Measure distance"
+msgstr "Mittaa etäisyys"
+
+#: ../sheets/Misc.sheet.in.h:10
+msgid "Resizable grid"
+msgstr "Muuntuvankokoinen ruudukko"
+
+#: ../sheets/Misc.sheet.in.h:11
+#, fuzzy
+#| msgid "SADT diagram objects"
+msgid "Diagram object"
+msgstr "SADT-kaavio-objektit"
+
+#: ../sheets/MSE.sheet.in.h:1
+msgid "MSE"
+msgstr "MSE"
+
+#: ../sheets/MSE.sheet.in.h:2
+msgid "U.S. Army Mobile Subscriber Equipment Components"
+msgstr "USA:n armeijan liikkuvan tilaajan välineistökomponentit"
+
+#: ../sheets/MSE.sheet.in.h:3
+msgid "Node center"
+msgstr "Solmukeskus"
+
+#: ../sheets/MSE.sheet.in.h:4
+msgid "Large extension node"
+msgstr "Suuri laajennussolmu"
+
+#: ../sheets/MSE.sheet.in.h:5
+msgid "Small extension node"
+msgstr "Pieni laajennussolmu"
+
+#: ../sheets/MSE.sheet.in.h:6
+msgid "Tactical satellite communications terminal"
+msgstr "Taktinen satelliittiviestintäpääte"
+
+#: ../sheets/MSE.sheet.in.h:7
+msgid "Multiplexer"
+msgstr "Multiplekseri"
+
+#: ../sheets/MSE.sheet.in.h:8
+msgid "Demultiplexer"
+msgstr "Demultiplekseri"
 
 #: ../sheets/network.sheet.in.h:1
-msgid "24 Port Patch Panel"
-msgstr "24-porttinen pistokepaneeli"
+msgid "Network"
+msgstr "Verkko"
 
 #: ../sheets/network.sheet.in.h:2
-msgid "3 1/2 inch diskette"
-msgstr "3,5 tuuman levyke"
+msgid "Objects to design network diagrams with"
+msgstr "Verkkokaavioiden suunnitteluun objekteja"
 
 #: ../sheets/network.sheet.in.h:3
-msgid "ATM switch symbol"
-msgstr "ATM-kytkinsymboli"
-
-#: ../sheets/network.sheet.in.h:4
-msgid "Antenna for wireless transmission"
-msgstr "Antenni langattomaan siirtoon"
+msgid "Computer"
+msgstr "Tietokone"
 
 #: ../sheets/network.sheet.in.h:5
-msgid "Bigtower PC"
-msgstr "Jättitorni-PC"
+msgid "Storage"
+msgstr "Tallennus"
 
 #: ../sheets/network.sheet.in.h:6
-msgid "Computer"
-msgstr "Tietokone"
+msgid "Ethernet bus"
+msgstr "Ethernet-väylä"
 
 #: ../sheets/network.sheet.in.h:7
-msgid "Desktop PC"
-msgstr "Työpöytä-PC"
+msgid "Simple printer"
+msgstr "Yksinkertainen tulostin"
 
 #: ../sheets/network.sheet.in.h:8
-msgid "Digitizing board"
-msgstr "Digitointipöytä"
+msgid "WAN connection"
+msgstr "WAN-yhteys"
 
 #: ../sheets/network.sheet.in.h:9
-msgid "Ethernet bus"
-msgstr "Ethernet-väylä"
+msgid "WAN link"
+msgstr "WAN-linkki"
 
 #: ../sheets/network.sheet.in.h:10
-msgid "External DAT drive"
-msgstr "Ulkoinen DAT-asema"
+msgid "Stackable hub or switch"
+msgstr "Pinottava hubi tai kytkin"
 
 #: ../sheets/network.sheet.in.h:11
-msgid "Firewall router"
-msgstr "Palomuuri-reititin"
+msgid "Modular switching system"
+msgstr "Modulaarinen kytkentäjärjestelmä"
 
 #: ../sheets/network.sheet.in.h:12
-msgid "Laptop PC"
-msgstr "Kannettava PC"
+msgid "24 Port Patch Panel"
+msgstr "24-porttinen pistokepaneeli"
 
 #: ../sheets/network.sheet.in.h:13
-msgid "Miditower PC"
-msgstr "Miditorni-PC"
+msgid "RJ45 wall-plug"
+msgstr "RJ45-seinäpistoke"
 
 #: ../sheets/network.sheet.in.h:14
-msgid "Minitower PC"
-msgstr "Minitorni-PC"
+msgid "Wall-plug for the scEAD cabling system"
+msgstr "Seinäpistoke scEAD-kaapelointijärjestelmälle"
 
 #: ../sheets/network.sheet.in.h:15
-msgid "Mobile phone"
-msgstr "Kännykkä"
+msgid "Simple modem"
+msgstr "Yksinkertainen modeemi"
 
 #: ../sheets/network.sheet.in.h:16
+msgid "Antenna for wireless transmission"
+msgstr "Antenni langattomaan siirtoon"
+
+#: ../sheets/network.sheet.in.h:17
 msgid "Mobile telephony base station"
 msgstr "Kännykkätukiasema"
 
-#: ../sheets/network.sheet.in.h:17
+#: ../sheets/network.sheet.in.h:18
+msgid "Network cloud"
+msgstr "Verkkopilvi"
+
+#: ../sheets/network.sheet.in.h:19
 msgid "Mobile telephony cell"
 msgstr "Kännykkäsolu"
 
-#: ../sheets/network.sheet.in.h:18
-msgid "Modular switching system"
-msgstr "Modulaarinen kytkentäjärjestelmä"
+#: ../sheets/network.sheet.in.h:20
+msgid "Router symbol"
+msgstr "Reititinsymboli"
+
+#: ../sheets/network.sheet.in.h:21
+msgid "Switch symbol"
+msgstr "Kytkinsymboli"
 
 #: ../sheets/network.sheet.in.h:22
-msgid "Objects to design network diagrams with"
-msgstr "Verkkokaavioiden suunnitteluun objekteja"
+msgid "ATM switch symbol"
+msgstr "ATM-kytkinsymboli"
 
 #: ../sheets/network.sheet.in.h:23
-msgid "Plotter"
-msgstr "Piirturi"
+msgid "Firewall router"
+msgstr "Palomuuri-reititin"
 
 #: ../sheets/network.sheet.in.h:24
-msgid "RJ45 wall-plug"
-msgstr "RJ45-seinäpistoke"
+msgid "Workstation monitor"
+msgstr "Työaseman näyttö"
 
 #: ../sheets/network.sheet.in.h:25
-msgid "Router symbol"
-msgstr "Reititinsymboli"
+msgid "UNIX workstation"
+msgstr "UNIX-työasema"
 
 #: ../sheets/network.sheet.in.h:26
-msgid "Simple modem"
-msgstr "Yksinkertainen modeemi"
+msgid "Desktop PC"
+msgstr "Työpöytä-PC"
 
 #: ../sheets/network.sheet.in.h:27
-msgid "Simple printer"
-msgstr "Yksinkertainen tulostin"
+msgid "Laptop PC"
+msgstr "Kannettava PC"
 
 #: ../sheets/network.sheet.in.h:28
-msgid "Speaker with integrated amplifier"
-msgstr "Kaiutin integroidulla vahvistimella"
+msgid "Bigtower PC"
+msgstr "Jättitorni-PC"
 
 #: ../sheets/network.sheet.in.h:29
-msgid "Speaker without amplifier"
-msgstr "Kaiutin ilman vahvistinta"
+msgid "Miditower PC"
+msgstr "Miditorni-PC"
 
 #: ../sheets/network.sheet.in.h:30
-msgid "Stackable hub or switch"
-msgstr "Pinottava hubi tai kytkin"
+msgid "Minitower PC"
+msgstr "Minitorni-PC"
 
 #: ../sheets/network.sheet.in.h:31
-msgid "Storage"
-msgstr "Tallennus"
+msgid "Speaker with integrated amplifier"
+msgstr "Kaiutin integroidulla vahvistimella"
 
 #: ../sheets/network.sheet.in.h:32
-msgid "Switch symbol"
-msgstr "Kytkinsymboli"
+msgid "Speaker without amplifier"
+msgstr "Kaiutin ilman vahvistinta"
+
+#: ../sheets/network.sheet.in.h:33
+msgid "3 1/2 inch diskette"
+msgstr "3,5 tuuman levyke"
 
 #: ../sheets/network.sheet.in.h:34
-msgid "UNIX workstation"
-msgstr "UNIX-työasema"
+msgid "ZIP disk"
+msgstr "ZIP-levy"
 
 #: ../sheets/network.sheet.in.h:35
-msgid "WAN connection"
-msgstr "WAN-yhteys"
+msgid "External DAT drive"
+msgstr "Ulkoinen DAT-asema"
 
 #: ../sheets/network.sheet.in.h:36
-msgid "WAN link"
-msgstr "WAN-linkki"
+msgid "Mobile phone"
+msgstr "Kännykkä"
 
 #: ../sheets/network.sheet.in.h:37
-msgid "Wall-plug for the scEAD cabling system"
-msgstr "Seinäpistoke scEAD-kaapelointijärjestelmälle"
+msgid "Telephone"
+msgstr "Puhelin"
 
 #: ../sheets/network.sheet.in.h:38
-msgid "Workstation monitor"
-msgstr "Työaseman näyttö"
+msgid "Plotter"
+msgstr "Piirturi"
 
 #: ../sheets/network.sheet.in.h:39
-msgid "ZIP disk"
-msgstr "ZIP-levy"
+msgid "Digitizing board"
+msgstr "Digitointipöytä"
+
+#: ../sheets/Pneumatic.sheet.in.h:1
+msgid "Pneumatic/Hydraulic"
+msgstr "Paineilma/hydraulinen"
+
+#: ../sheets/Pneumatic.sheet.in.h:2
+msgid "Components for pneumatic and hydraulic circuits"
+msgstr "Komponentit paineilma- ja hydrauliikkapiireille"
+
+#: ../sheets/Pneumatic.sheet.in.h:3
+msgid "Double-effect jack"
+msgstr "Kaksoisvaikutuspistukka"
+
+#: ../sheets/Pneumatic.sheet.in.h:4
+msgid "Normally-in simple-effect jack"
+msgstr "Oletuksena sisään, yksivaikutuspistukka"
+
+#: ../sheets/Pneumatic.sheet.in.h:5
+msgid "Normally-out simple-effect jack"
+msgstr "Oletuksena ulos, yksivaikutuspistukka"
+
+#: ../sheets/Pneumatic.sheet.in.h:6
+msgid "Generic pressure source"
+msgstr "Yleinen painelähde"
+
+#: ../sheets/Pneumatic.sheet.in.h:7
+msgid "Hydraulic pressure source"
+msgstr "Hydraulinen painelähde"
+
+#: ../sheets/Pneumatic.sheet.in.h:8
+msgid "Pneumatic pressure source"
+msgstr "Ilmanpainelähde"
+
+#: ../sheets/Pneumatic.sheet.in.h:9
+msgid "Air exhaust orifice"
+msgstr "Pakokaasuaukko"
+
+#: ../sheets/Pneumatic.sheet.in.h:10
+msgid "2/2 distributor"
+msgstr "2/2-jakaja"
+
+#: ../sheets/Pneumatic.sheet.in.h:11
+msgid "3/2 distributor"
+msgstr "3/2-jakaja"
+
+#: ../sheets/Pneumatic.sheet.in.h:12
+msgid "4/2 distributor"
+msgstr "4/2-jakaja"
+
+#: ../sheets/Pneumatic.sheet.in.h:13
+msgid "5/2 distributor"
+msgstr "5/2-jakaja"
+
+#: ../sheets/Pneumatic.sheet.in.h:14
+msgid "Muscular command"
+msgstr "Lihaskomento"
+
+#: ../sheets/Pneumatic.sheet.in.h:15
+msgid "Push-button command"
+msgstr "Painonappikomento"
+
+#: ../sheets/Pneumatic.sheet.in.h:16
+msgid "Mechanical command by tappet"
+msgstr "Mekaaninen komento venttiilillä"
+
+#: ../sheets/Pneumatic.sheet.in.h:17
+msgid "Mechanical command by spring"
+msgstr "Mekaaninen komento jousella"
+
+#: ../sheets/Pneumatic.sheet.in.h:18
+msgid "Electric command (single coil)"
+msgstr "Sähköinen komento (yksöiskela)"
+
+#: ../sheets/Pneumatic.sheet.in.h:19
+msgid "Electric command (double coil)"
+msgstr "Sähköinen komento (kaksoiskela)"
+
+#: ../sheets/Pneumatic.sheet.in.h:20
+msgid "Indirect command by hydraulic driver"
+msgstr "Epäsuora komento hydrauliajurilta"
+
+#: ../sheets/Pneumatic.sheet.in.h:21
+msgid "Indirect command by pneumatic driver"
+msgstr "Epäsuora komento paineilma-ajurilta"
+
+#: ../sheets/SADT.sheet.in.h:1
+msgid "SADT/IDEF0"
+msgstr "SADT/IDEF0"
+
+#: ../sheets/SADT.sheet.in.h:2
+msgid "Objects to design SADT diagrams"
+msgstr "Objektit SADT-kaavioiden suunnitteluun"
+
+#: ../sheets/SADT.sheet.in.h:3
+msgid "Activity/data flow arrow"
+msgstr "Aktiviteetti/tietovirtanuoli"
+
+#: ../sheets/SADT.sheet.in.h:4
+msgid "Activity/data box"
+msgstr "Aktiviteetti/tietolaatikko"
+
+#: ../sheets/SADT.sheet.in.h:5
+msgid "Flow label"
+msgstr "Virtanimiö"
+
+#: ../sheets/SDL.sheet.in.h:1
+msgid "SDL"
+msgstr "SDL"
+
+#: ../sheets/SDL.sheet.in.h:2
+msgid "Specification and Description Language."
+msgstr "Määrittely- ja kuvauskieli."
+
+#: ../sheets/SDL.sheet.in.h:3
+msgid "Block type reference"
+msgstr "Lohkon tyyppiviite"
+
+#: ../sheets/SDL.sheet.in.h:4
+msgid "Service type reference"
+msgstr "Palvelutyyppiviite"
+
+#: ../sheets/SDL.sheet.in.h:5
+msgid "Process type reference"
+msgstr "Prosessin tyyppiviite"
+
+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
+msgid "State"
+msgstr "Tila"
+
+#: ../sheets/SDL.sheet.in.h:7
+msgid "Function header"
+msgstr "Funktio-otsake"
+
+#: ../sheets/SDL.sheet.in.h:8
+msgid "Send message"
+msgstr "Lähetä viesti"
+
+#: ../sheets/SDL.sheet.in.h:9
+msgid "Receive message"
+msgstr "Vastaanota viesti"
+
+#: ../sheets/SDL.sheet.in.h:10
+msgid "Function call"
+msgstr "Funktiokutsu"
+
+#: ../sheets/SDL.sheet.in.h:12
+msgid "Action being executed"
+msgstr "Suorituksessa oleva toiminto"
+
+#: ../sheets/SDL.sheet.in.h:13
+msgid "Save state"
+msgstr "Tallenna tila"
+
+#: ../sheets/SDL.sheet.in.h:15
+msgid "In/Out connector"
+msgstr "Sisään/ulos-liitin"
+
+#: ../sheets/SDL.sheet.in.h:17
+msgid "Procedure return"
+msgstr "Proseduurin paluu"
+
+#: ../sheets/SDL.sheet.in.h:19
+msgid "Generic text note"
+msgstr "Yleinen tekstilappu"
+
+#: ../sheets/Shape_Design.sheet.in.h:1
+msgid "Shape Design"
+msgstr ""
+
+#: ../sheets/Shape_Design.sheet.in.h:2
+msgid "Design Dia objects with individual connection points"
+msgstr ""
+
+#: ../sheets/Shape_Design.sheet.in.h:3
+#, fuzzy
+#| msgid "Connection Points:"
+msgid "Connection Point"
+msgstr "Liitoskohdat:"
+
+#: ../sheets/Shape_Design.sheet.in.h:4
+#, fuzzy
+#| msgid "Add Connection Point"
+msgid "Main Connection Point"
+msgstr "Lisää liitoskohta"
 
 #: ../sheets/sybase.sheet.in.h:1
-msgid "Log transfer manager or rep agent"
-msgstr "Lokisiirtohallinta tai varmistusagentti"
+msgid "Sybase"
+msgstr "Sybase"
 
 #: ../sheets/sybase.sheet.in.h:2
 msgid "Objects to design Sybase replication domain diagrams with"
 msgstr "Sybase-varmistusaluekaavioiden suunnitteluun objekteja"
 
 #: ../sheets/sybase.sheet.in.h:3
-msgid "Replication server manager"
-msgstr "Varmistuspalvelinhallinta"
+msgid "Sybase dataserver"
+msgstr "Sybase-tietopalvelin"
 
 #: ../sheets/sybase.sheet.in.h:4
-msgid "Stable storage device"
-msgstr "Vakaa tallennuslaite"
+msgid "Sybase replication server"
+msgstr "Sybase-varmistuspalvelin"
 
 #: ../sheets/sybase.sheet.in.h:5
-msgid "Sybase"
-msgstr "Sybase"
+msgid "Log transfer manager or rep agent"
+msgstr "Lokisiirtohallinta tai varmistusagentti"
 
 #: ../sheets/sybase.sheet.in.h:6
-msgid "Sybase client application"
-msgstr "Sybase-asiakassovellus"
+msgid "Stable storage device"
+msgstr "Vakaa tallennuslaite"
 
 #: ../sheets/sybase.sheet.in.h:7
-msgid "Sybase dataserver"
-msgstr "Sybase-tietopalvelin"
+msgid "Sybase client application"
+msgstr "Sybase-asiakassovellus"
 
 #: ../sheets/sybase.sheet.in.h:8
-msgid "Sybase replication server"
-msgstr "Sybase-varmistuspalvelin"
+msgid "Replication server manager"
+msgstr "Varmistuspalvelinhallinta"
+
+#: ../sheets/UML.sheet.in.h:1
+msgid "UML"
+msgstr "UML"
+
+#: ../sheets/UML.sheet.in.h:2
+msgid "Editor for UML Static Structure Diagrams"
+msgstr "Muokkain staattisille UML-rakennekaavioille"
+
+#: ../sheets/UML.sheet.in.h:5
+msgid "Note"
+msgstr "Huomautus"
+
+#: ../sheets/UML.sheet.in.h:7
+msgid "Realizes, implements a specific interface"
+msgstr "Realisoi, toteuttaa määrätyn rajapinnan"
+
+#: ../sheets/UML.sheet.in.h:8
+msgid "Generalization, class inheritance"
+msgstr "Yleistys, luokan perintä"
+
+#: ../sheets/UML.sheet.in.h:9
+msgid "Association, two classes are associated"
+msgstr "Assosiaatio, kahdella luokalla on yhteys"
+
+#: ../sheets/UML.sheet.in.h:10
+msgid "Aggregation, one class is part of another"
+msgstr "Aggregaatio, yksi luokka on osa toista"
+
+#: ../sheets/UML.sheet.in.h:11
+msgid "Implements, class implements a specific interface"
+msgstr "Toteutus, luokka toteuttaa määrätyn rajapinnan"
+
+#: ../sheets/UML.sheet.in.h:12
+msgid "Constraint, place a constraint on something"
+msgstr "Rajoite, aseta rajoitus johonkin"
+
+#: ../sheets/UML.sheet.in.h:13
+msgid "Small package"
+msgstr "Pieni paketti"
+
+#: ../sheets/UML.sheet.in.h:14
+msgid "Large package"
+msgstr "Suuri paketti"
+
+#: ../sheets/UML.sheet.in.h:16
+msgid "Use case"
+msgstr "Käyttötapaus"
+
+#: ../sheets/UML.sheet.in.h:17
+msgid "Lifeline"
+msgstr "Aikajana"
+
+#: ../sheets/UML.sheet.in.h:18
+msgid "Object"
+msgstr "Objekti"
+
+#: ../sheets/UML.sheet.in.h:19
+msgid "Message"
+msgstr "Viesti"
+
+#: ../sheets/UML.sheet.in.h:20
+msgid "Component"
+msgstr "Komponentti"
+
+#: ../sheets/UML.sheet.in.h:25
+msgid "Node"
+msgstr "Solmu"
+
+#: ../sheets/UML.sheet.in.h:26
+msgid "Class stereotype icon"
+msgstr "Luokkastereotyypin kuvake"
+
+#: ../sheets/UML.sheet.in.h:27
+#, fuzzy
+#| msgid "Initial/end state"
+msgid "Initial/End state"
+msgstr "Alku/lopputila"
+
+#: ../sheets/UML.sheet.in.h:29
+msgid "Activity"
+msgstr "Toiminta"
+
+#: ../sheets/UML.sheet.in.h:31
+#, fuzzy
+#| msgid "Fork/union"
+msgid "Fork/Union"
+msgstr "Haara/liityntä"
+
+#~ msgid "'%s' not found!\n"
+#~ msgstr "Tiedostoa \"%s\" ei löytynyt!\n"
+
+#~ msgid "'%s' not found in '%s'!\n"
+#~ msgstr "Tiedostoa \"%s\" ei löytynyt lähteestä \"%s\"!\n"
+
+#~ msgid "Recovering autosaved diagrams"
+#~ msgstr "Palautetaan automaattisesti tallennettuja kaavioita"
+
+#~ msgid ""
+#~ "Autosaved files exist.\n"
+#~ "Please select those you wish to recover."
+#~ msgstr ""
+#~ "Automaattisesti tallennettuja tiedostoja löytyi.\n"
+#~ "Valitse ne, jotka haluat palautettavan."
+
+#~ msgid "Could not initialize Bonobo!"
+#~ msgstr "Ei pystytty alustamaan Bonoboa"
+
+#~ msgid "X position"
+#~ msgstr "X-sijainti"
+
+#~ msgid "X position of child widget"
+#~ msgstr "Alisäätimen X-sijainti"
+
+#~ msgid "Y position"
+#~ msgstr "Y-sijainti"
+
+#~ msgid "Y position of child widget"
+#~ msgstr "Alisäätimen Y-sijainti"
+
+#~ msgid ""
+#~ "You cannot group objects that belong to different groups or have "
+#~ "different parents"
+#~ msgstr ""
+#~ "Et voi ryhmittää kohteita, jotka kuuluvat eri ryhmiin tai joilla on eri "
+#~ "äiti"
+
+#~ msgid "/_Sort objects"
+#~ msgstr "/_Järjestä objektit"
+
+#~ msgid "/Sort objects/by _name"
+#~ msgstr "/Järjestä objektit/_nimen perusteella"
+
+#~ msgid "/Sort objects/by _type"
+#~ msgstr "/Järjestä objektit/_tyypin perusteella"
+
+#~ msgid "/Sort objects/as _inserted"
+#~ msgstr "/Järjestä objektit/_lisäysjärjestys"
+
+#~ msgid "/Sort objects/All by name"
+#~ msgstr "/Järjestä objektit/Kaikki nimen perusteella"
+
+#~ msgid "/Sort objects/All by type"
+#~ msgstr "/Järjestä objektit/Kaikki tyypin perusteella"
+
+#~ msgid "/Sort objects/All as inserted"
+#~ msgstr "/Järjestä objektit/Kaikki lisäysjärjestykseen"
+
+#~ msgid "/Sort objects/_Default"
+#~ msgstr "/Järjestä objektit/_Oletus"
+
+#~ msgid "/Sort objects/Default/by _name"
+#~ msgstr "/Järjestä objektit/Oletus/_nimen perusteella"
+
+#~ msgid "/Sort objects/Default/by _type"
+#~ msgstr "/Järjestä objektit/Oletus/_tyypin perusteella"
+
+#~ msgid "/Sort objects/Default/as _inserted"
+#~ msgstr "/Järjestä objektit/Oletus/_lisäysjärjestykseen"
+
+#~ msgid "/Sort _diagrams"
+#~ msgstr "/Järjestä _kaaviot"
+
+#~ msgid "/Sort _diagrams/by _name"
+#~ msgstr "/Järjestä _kaaviot/_nimen perusteella"
+
+#~ msgid "/Sort _diagrams/as _inserted"
+#~ msgstr "/Järjestä _kaaviot/_lisäysjärjestykseen"
+
+#~ msgid "/Sort diagrams/_Default"
+#~ msgstr "/Järjestä kaaviot/_Oletus"
+
+#~ msgid "/Sort diagrams/Default/by _name"
+#~ msgstr "/Järjestä _kaaviot/Oletus/_nimen perusteella"
+
+#~ msgid "/Sort diagrams/Default/as _inserted"
+#~ msgstr "/Järjestä _kaaviot/Oletus/_lisäysjärjestykseen"
+
+#~ msgid "/_Locate"
+#~ msgstr "/P_aikanna"
+
+#~ msgid "/_Hide this type"
+#~ msgstr "/_Piilota tämä tyyppi"
+
+#~ msgid "Properties..."
+#~ msgstr "Ominaisuudet..."
+
+#~ msgid "active"
+#~ msgstr "käytössä"
+
+#~ msgid "NULL tooldata in tool_select_update"
+#~ msgstr "TYHJÄ työvälinetieto tool_select_update-funktiossa"
+
+#~ msgid "Edit Layer Attributes"
+#~ msgstr "Muokkaa tason ominaisuuksia"
+
+# Sheet "sisältää" joukon objekteja
+#~ msgid "Sheets and Objects..."
+#~ msgstr "Luokat ja _objektit..."
+
+#~ msgid "Plugins..."
+#~ msgstr "Liitännäiset..."
+
+#~ msgid "_Diagram tree..."
+#~ msgstr "_Kaaviopuu..."
+
+#~ msgid "_Export ..."
+#~ msgstr "_Vie..."
+
+#~ msgid "Page Set_up..."
+#~ msgstr "S_ivun asetukset..."
+
+#~ msgid "_Diagram"
+#~ msgstr "_Kaavio"
+
+#~ msgid "_Layers..."
+#~ msgstr "_Tasot..."
+
+#~ msgid "Fullscr_een"
+#~ msgstr "_Kokoruutu"
+
+#~ msgid "Integrated UI"
+#~ msgstr "Integroitu UI"
+
+#~ msgid "Diagram tree window:"
+#~ msgstr "Kaaviopuuikkuna:"
+
+#~ msgid "Save hidden object types"
+#~ msgstr "Tallenna piilotetut objektityypit"
+
+#~ msgid "User Interface type settings change will take after restart"
+#~ msgstr ""
+#~ "Käyttöliittymän tyyppiasetukset tulevat voimaan uudelleenkäynnistyksen "
+#~ "jälkeen"
+
+#~ msgid "Edit"
+#~ msgstr "Muokkaa"
+
+#~ msgid "New"
+#~ msgstr "Uusi"
+
+#~ msgid "Browse..."
+#~ msgstr "Selaa..."
+
+#~ msgid "SVG Shape:"
+#~ msgstr "SVG-muoto:"
+
+#~ msgid "description:"
+#~ msgstr "kuvaus:"
+
+#~ msgid "Sheet name:"
+#~ msgstr "Luokan nimi:"
+
+#~ msgid "Edit Attributes"
+#~ msgstr "Muokkaa ominaisuuksia"
+
+#~ msgid "DiaObject"
+#~ msgstr "Dia-objekti"
+
+#~ msgid "Description:"
+#~ msgstr "Kuvaus:"
+
+#~ msgid "Sheet"
+#~ msgstr "Luokka"
+
+#~ msgid "DiaObject:"
+#~ msgstr "Dia-objekti:"
+
+#~ msgid "Sheet:"
+#~ msgstr "Luokka:"
+
+#~ msgid "Internal error: Setting corner type of endpoint of bezier"
+#~ msgstr "Sisäinen virhe: Asetetaan bezierin päätepisteen kulmatyyppi"
+
+#~ msgid "%s<illegal characters>..."
+#~ msgstr "%s<kiellettyjä merkkejä>..."
+
+#~ msgid ""
+#~ "Your local character set is UTF-8. Because of issues with libxml1 and the "
+#~ "support of files generated by previous versions of dia, you will "
+#~ "encounter  problems. Please report to dia-list gnome org if you see this "
+#~ "message."
+#~ msgstr ""
+#~ "Paikalliseksi merkistöksesi on asetettu UTF-8. Tulet kohtaamaan ongelmia "
+#~ "libxml1:n seikkojen kanssa ja Dian aiempien versioiden luomien "
+#~ "tiedostojen tuen vuoksi. Ilmoita dia-list gnome org:n jos näet tämän "
+#~ "viestin. "
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "There are %d similar messages."
+#~ msgstr "%d samankaltaista viestiä."
+
+#~ msgid "Open group"
+#~ msgstr "Avoin ryhmä"
+
+#~ msgid ""
+#~ "Could not open `%s'\n"
+#~ "`%s'"
+#~ msgstr ""
+#~ "Tiedoston \"%s\" avaus ei onnistunut\n"
+#~ "\"%s\""
+
+#, fuzzy
+#~ msgid "sheets from '%s'"
+#~ msgstr "Ei luokkaa nimeltä %s"
+
+# Olikos se nyt Tietoviikko mikä ainakin käyttää tätä, Tablet PC = Lehtiö-PC
+#~ msgid "Tablename"
+#~ msgstr "Taulunimi"
+
+#~ msgid "_New"
+#~ msgstr "_Uusi"
+
+#~ msgid "_Delete"
+#~ msgstr "_Poista"
+
+#~ msgid "Move up"
+#~ msgstr "Siirrä ylöspäin"
+
+#~ msgid "Move down"
+#~ msgstr "Siirrä alaspäin"
+
+#~ msgid "_Primary key"
+#~ msgstr "_Päääavain"
+
+#~ msgid "N_ullable"
+#~ msgstr "Voi _olla NuLL"
+
+#~ msgid "Uni_que"
+#~ msgstr "_Yksikäsitteinen"
+
+# Olikos se nyt Tietoviikko mikä ainakin käyttää tätä, Tablet PC = Lehtiö-PC
+#~ msgid "_Table"
+#~ msgstr "_Taulu"
+
+#~ msgid "Comment visible"
+#~ msgstr "näkyvät kommentit"
+
+#~ msgid "Border width:"
+#~ msgstr "Reunan paksuus:"
+
+#~ msgid "Normal:"
+#~ msgstr "Normaali:"
+
+#~ msgid "Text Color:"
+#~ msgstr "Tekstin väri:"
+
+#~ msgid "Foreground Color:"
+#~ msgstr "Edustaväri:"
+
+#~ msgid "not null"
+#~ msgstr "ei NULL"
+
+#~ msgid "null"
+#~ msgstr "NULL"
+
+#~ msgid "unique"
+#~ msgstr "yksikäsitteinen"
+
+#~ msgid "Restricted Diffusion"
+#~ msgstr "Rajattu diffuusio"
+
+#~ msgid "Confidential"
+#~ msgstr "Luottamuksellinen"
+
+#~ msgid "NATO Confidential"
+#~ msgstr "NATO-luottamuksellin"
+
+#~ msgid "Personal Confidential"
+#~ msgstr "Henkiökohtainen luottamuksellinen"
+
+#~ msgid "Secret"
+#~ msgstr "Salainen"
+
+#~ msgid "Secret special country"
+#~ msgstr "Salainen, erityinen maa"
+
+#~ msgid "NATO Secret"
+#~ msgstr "NATO-salainen"
+
+#~ msgid "Very Secret"
+#~ msgstr "Erittäin salainen"
+
+#~ msgid "NATO Very Secret"
+#~ msgstr "NATOn erittäin salainen"
+
+#~ msgid "SISSI diagram"
+#~ msgstr "SISSI-kaavio"
+
+#~ msgid ""
+#~ "Error loading object.\n"
+#~ "Not a regular file: %s"
+#~ msgstr ""
+#~ "Virhe ladattaessa kohdetta.\n"
+#~ "Ei ole tavallinen tiedosto: %s"
+
+#~ msgid ""
+#~ "Error loading object.\n"
+#~ "Incorrect file type: %s"
+#~ msgstr ""
+#~ "Virhe ladattaessa kohdetta.\n"
+#~ "Tuntematon tiedostotyyppi: %s"
+
+#~ msgid ""
+#~ "Error loading object.\n"
+#~ "Not a Dia file: %s"
+#~ msgstr ""
+#~ "Virhe ladattaessa kohdetta.\n"
+#~ "Ei ole Dia-tiedosto: %s"
+
+#~ msgid "Millisecond"
+#~ msgstr "Millisekunti"
+
+#~ msgid "Second"
+#~ msgstr "Sekunti"
+
+#~ msgid "Minute"
+#~ msgstr "Minuutti"
+
+#~ msgid "Hour"
+#~ msgstr "Tunti"
+
+#~ msgid "Week"
+#~ msgstr "Viikko"
+
+#~ msgid "SYSTEM"
+#~ msgstr "JÄRJESTELMÄ"
+
+#~ msgid "Internet access device"
+#~ msgstr "Internet-pääsylaite"
+
+#~ msgid "Electronic messaging"
+#~ msgstr "Sähköinen viestintä"
+
+#~ msgid "Intranet"
+#~ msgstr "Internet"
+
+#~ msgid "Company directory"
+#~ msgstr "Yrityshakemisto"
+
+#~ msgid "External portal"
+#~ msgstr "Ulkoinen portaali"
+
+#~ msgid "ORGANISATION"
+#~ msgstr "ORGANISAATIO"
+
+#~ msgid "Higher-tier organisation"
+#~ msgstr "Ylemmän tason organisaatio"
+
+#~ msgid "Structure of the organisation"
+#~ msgstr "Organisaation rakenne"
+
+#~ msgid "Project or system organisation"
+#~ msgstr "Projekti tai järjestelmäorganisaatio"
+
+#~ msgid "Subcontractors / Suppliers / Manufacturers"
+#~ msgstr "Alihankkijat, toimittajat ja valmistajat"
+
+#~ msgid "SITE"
+#~ msgstr "PAIKKA"
+
+#~ msgid "Places"
+#~ msgstr "Sijainnit"
+
+#~ msgid "External environment"
+#~ msgstr "Ulkoinen ympäristö"
+
+#~ msgid "Premises"
+#~ msgstr "Tilat"
+
+#~ msgid "Zone"
+#~ msgstr "Alue"
+
+#~ msgid "Essential Services"
+#~ msgstr "Välttämättömät palvelut"
+
+#~ msgid "Communication"
+#~ msgstr "Tietoliikenne"
+
+#~ msgid "Power"
+#~ msgstr "Virta"
+
+#~ msgid "Cooling / Pollution"
+#~ msgstr "Viilentyminen / saasteet"
+
+#~ msgid "Thermal detection"
+#~ msgstr "Lämmön havaitseminen"
+
+#~ msgid "Fire detection"
+#~ msgstr "Tulen havaitseminen"
+
+#~ msgid "Air detection"
+#~ msgstr "Ilman havaitseminen"
+
+#~ msgid "Energy detection"
+#~ msgstr "Energian havaitseminen"
+
+#~ msgid "Intrusion detection"
+#~ msgstr "Hyökkäyksen havaitseminen"
+
+#~ msgid "Thermal action"
+#~ msgstr "Lämpötilan havaitseminen"
+
+#~ msgid "Fire action"
+#~ msgstr "Tulitoimenpide"
+
+#~ msgid "Water action"
+#~ msgstr "Vesitoimenpide"
+
+#~ msgid "Air action"
+#~ msgstr "Ilmatoimenpide"
+
+#~ msgid "Energy action"
+#~ msgstr "Energiatoimenpide"
+
+#~ msgid "Intrusion action"
+#~ msgstr "Hyökkäystoimenpide"
+
+#~ msgid "Personal"
+#~ msgstr "Henkilökohtainen"
+
+#~ msgid "Decision maker"
+#~ msgstr "Päätöksentekijä"
+
+#~ msgid "SSI Responsible"
+#~ msgstr "SSI-vastuullinen"
+
+#~ msgid "Users"
+#~ msgstr "Käyttäjät"
+
+#~ msgid "Functional administrator"
+#~ msgstr "Funktionaalinen ylläpitäjä"
+
+#~ msgid "Technical administrator"
+#~ msgstr "Tekninen ylläpitäjä"
+
+#~ msgid "SSI administrator"
+#~ msgstr "SSI-ylläpitäjä"
+
+#~ msgid "Developer"
+#~ msgstr "Kehittäjä"
+
+#~ msgid "Operator / Maintenance"
+#~ msgstr "Operaattori / ylläpito"
+
+#~ msgid "Medium and support"
+#~ msgstr "Media ja tuki"
+
+#~ msgid "Passive or active relay"
+#~ msgstr "Passiivinen tai aktiivinen rele"
+
+#~ msgid "Software"
+#~ msgstr "Ohjelmisto"
+
+#~ msgid "Operating System"
+#~ msgstr "Käyttöjärjestelmä"
+
+#~ msgid "Service - maintenance or administration software"
+#~ msgstr "Palvelu - ylläpito- tai hallintaohjelmisto"
+
+#~ msgid "Packaged software or standard software"
+#~ msgstr "Paketoitu- tai varusohjelmisto"
+
+#~ msgid "Business application"
+#~ msgstr "Liikesovellus"
+
+#~ msgid "Standard business application"
+#~ msgstr "Standardi liikesovellus"
+
+#~ msgid "Specific business application"
+#~ msgstr "Erityinen liikesovellus"
+
+#~ msgid "HARDWARE"
+#~ msgstr "LAITTEISTO"
+
+#~ msgid "Data-processing equipment (active)"
+#~ msgstr "Tiedonkäsittelylaitteisto (aktiivinen)"
+
+#~ msgid "Mobile equipment"
+#~ msgstr "Liikkuva laitteisto"
+
+#~ msgid "Fixed equipment"
+#~ msgstr "Kiinteä laitteisto"
+
+#~ msgid "Electronic medium"
+#~ msgstr "Elektroninen media"
+
+#~ msgid "Other media"
+#~ msgstr "Muut mediat"
+
+#~ msgid "Data medium (passive)"
+#~ msgstr "Tietomedia (passiivinen)"
+
+#~ msgid "P Action"
+#~ msgstr "P-toimenpide"
+
+#~ msgid "Vulnerability"
+#~ msgstr "Haavoittuvuus"
+
+#~ msgid "Other properties"
+#~ msgstr "Muut ominaisuudet"
+
+#~ msgid "Label"
+#~ msgstr "Otsikko"
+
+#~ msgid "value"
+#~ msgstr "arvo"
+
+#~ msgid "Documents"
+#~ msgstr "Asiakirjat"
+
+#~ msgid "Document title"
+#~ msgstr "Asiakirjan nimi"
+
+#~ msgid "Classname"
+#~ msgstr "Luokan nimi"
+
+#~ msgid "Show Comments"
+#~ msgstr "Näytä kommentit"
+
+#~ msgid "Abstract (?)"
+#~ msgstr "Abstrakti (?)"
+
+#~ msgid "Query (const)"
+#~ msgstr "Kysely (vakio)"
+
+#~ msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
+#~ msgstr ""
+#~ "SISÄINEN: CustomLines: Virheellinen rivin tyyppi LineInfo-oliossa %s."
+
+#~ msgid "gdk_renderer: Unsupported fill mode specified!\n"
+#~ msgstr "gdk_renderer: Annettua täyttötapaa ei tueta.\n"
+
+#~ msgid "Couldn't read file %s"
+#~ msgstr "Ei voi lukea tiedostoa %s"
+
+#~ msgid "Couldn't make object dir %s"
+#~ msgstr "Ei voitu luoda objektihakemistoa %s"
+
+#~ msgid "Can't write object %u"
+#~ msgstr "Ei voitu kirjoittaa objektia %u"
+
+#~ msgid "Couldn't open: '%s' for writing.\n"
+#~ msgstr "Ei voitu avata tiedostoa \"%s\" kirjoittamista varten.\n"
+
+#~ msgid "Windows Meta File"
+#~ msgstr "Windows-metatiedosto"
+
+#~ msgid "Enhanced Meta File"
+#~ msgstr "Parannettu metatiedosto"
+
+#~ msgid "A KAOS operation"
+#~ msgstr "KAOS-operaatio"
+
+#~ msgid "Misc"
+#~ msgstr "Sekalaista"
+
+#~ msgid "New-style group object, for testing"
+#~ msgstr "Uuden tyylinen ryhmäobjekti, testausta varten"
+
+#~ msgid "Air filter"
+#~ msgstr "Ilmasuodatin"
+
+#~ msgid "Air quality detector"
+#~ msgstr "Ilmanlaadun anturi"
+
+#~ msgid "Alarm center"
+#~ msgstr "Hälytyskeskus"
+
+#~ msgid "Backup"
+#~ msgstr "Varmistus"
+
+#~ msgid "Badge reader"
+#~ msgstr "Nimikortin lukija"
+
+#~ msgid "Badge reader/keyboard"
+#~ msgstr "Nimikortin lukija/näppäimistö"
+
+#~ msgid "Biometric reader"
+#~ msgstr "Biometrinen lukija"
+
+#~ msgid "Cell phone"
+#~ msgstr "Matkapuhelin"
+
+#~ msgid "Cipher machine"
+#~ msgstr "Cipher-kone"
+
+#~ msgid "Circulation pump"
+#~ msgstr "Kiertopumppu"
+
+#~ msgid "Condensator"
+#~ msgstr "Kondensaattori"
+
+#~ msgid "Digital code"
+#~ msgstr "Digitaalinen koodi"
+
+#~ msgid "Extinguisher"
+#~ msgstr "Sammutin"
+
+#~ msgid "Faraday cage"
+#~ msgstr "Faradayn häkki"
+
+#~ msgid "Gate"
+#~ msgstr "Portti"
+
+#~ msgid "Geographic site"
+#~ msgstr "Geograafinen sijainti"
+
+#~ msgid "Information system"
+#~ msgstr "Tietojärjestelmä"
+
+#~ msgid "Level detector"
+#~ msgstr "Tasonilmaisin"
+
+#~ msgid "Light detector"
+#~ msgstr "Valonilmaisin"
+
+#~ msgid "Log analysis"
+#~ msgstr "Lokien analysointi"
+
+#~ msgid "Magnetic storage"
+#~ msgstr "Magneettinen tallennus"
+
+#~ msgid "Moisture extractor"
+#~ msgstr "Kosteudenpoistaja"
+
+#~ msgid "Moisture sensor"
+#~ msgstr "Kosteusanturi"
+
+#~ msgid "Movement detector"
+#~ msgstr "Liiketunnistin"
+
+#~ msgid "Objects to design sissi diagrams"
+#~ msgstr "Oliot sissi-kaavioiden suunnitteluun"
+
+#~ msgid "Paper storage"
+#~ msgstr "Paperisäilö"
+
+#~ msgid "Person"
+#~ msgstr "Henkilö"
+
+#~ msgid "Pump"
+#~ msgstr "Pumppu"
+
+#~ msgid "Revolving door"
+#~ msgstr "Pyörivä ovi"
+
+#~ msgid "Room"
+#~ msgstr "Huone"
+
+#~ msgid "Safe"
+#~ msgstr "Kassakaappi"
+
+#~ msgid "Security area"
+#~ msgstr "Turva-alue"
+
+#~ msgid "Server"
+#~ msgstr "Palvelin"
+
+#~ msgid "Smoke detector"
+#~ msgstr "Savuntunnistin"
+
+#~ msgid "Vehicle detector"
+#~ msgstr "Kulkuneuvojen tunnistin"
+
+#~ msgid "Vibration sensor"
+#~ msgstr "Värinäanturi"
+
+#~ msgid "Video camera"
+#~ msgstr "Videokamera"
+
+#~ msgid "Video movement detector"
+#~ msgstr "Video-pohjainen liiketunnistin"
+
+#~ msgid "Voltage detector"
+#~ msgstr "Jänniteanturi"
+
+#~ msgid "Workstation"
+#~ msgstr "Työasema"
 
 #~ msgid ""
 #~ "You have loaded a non-Dia file.  The file has become an element in a new "
@@ -10508,18 +11708,12 @@ msgstr "Sybase-varmistuspalvelin"
 #~ msgid "Delete  connection point"
 #~ msgstr "Poista liitoskohta"
 
-#~ msgid "Cairo Clipboard"
-#~ msgstr "Cairo-leikepöytä"
-
 #~ msgid "Bad vertex bulge\n"
 #~ msgstr "Huono verteksipullistuma\n"
 
 #~ msgid "Scale: %f\n"
 #~ msgstr "Skaala: %f\n"
 
-#~ msgid "Unknown dxf code %d\n"
-#~ msgstr "Tuntematon dxf-koodi %d\n"
-
 #~ msgid ""
 #~ "GNOME Print Backend\n"
 #~ " '%s'\n"



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