[dia] Updated Norwegian bokmål translation



commit cd876e236c6a01b8a62ab57becb6445ddcc5da46
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Fri Feb 21 00:36:00 2014 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 2608 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1465 insertions(+), 1143 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index a9ecb96..32ea422 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,13 +1,14 @@
 # Norwegian translation of dia (bokmål dialect).
 # Copyright (C) 1999-2001 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas gnome org>, 1999-2010.
+# Kjartan Maraas <kmaraas gnome org>, 1999-2014.
 #
+#: ../objects/UML/class.c:193
 msgid ""
 msgstr ""
-"Project-Id-Version: dia 0.96.1\n"
+"Project-Id-Version: dia 0.97.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 09:33+0200\n"
-"PO-Revision-Date: 2012-08-23 09:45+0200\n"
+"POT-Creation-Date: 2014-02-20 18:10+0100\n"
+"PO-Revision-Date: 2014-02-20 18:17+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian <i18n-nb lister ping uio no>\n"
 "Language: no\n"
@@ -49,8 +50,8 @@ msgstr "%s feil: navn på inn- og utfil er identiske: %s"
 
 #. Translators: Menu item Verb/Channel/Import
 #. Translators: Menu item Verb/Channel/Import/Import
-#: ../app/app_procs.c:353 ../objects/FS/function.c:686
-#: ../objects/FS/function.c:688
+#: ../app/app_procs.c:353 ../objects/FS/function.c:680
+#: ../objects/FS/function.c:682
 msgid "Import"
 msgstr "Import"
 
@@ -130,7 +131,7 @@ msgid "Don't create an empty diagram"
 msgstr "Ikke lag et tomt diagram"
 
 #: ../app/app_procs.c:724
-msgid "Start integrated user interface (diagrams in tabs)"
+msgid "Start classic user interface (no diagrams in tabs)"
 msgstr ""
 
 #: ../app/app_procs.c:726
@@ -215,11 +216,11 @@ msgstr ""
 "Kunne ikke finne standardobjekter under søk etter objektbibliotek i «%s», "
 "avslutter...\n"
 
-#: ../app/app_procs.c:993
+#: ../app/app_procs.c:989
 msgid "Diagram1.dia"
 msgstr "Diagram1.dia"
 
-#: ../app/app_procs.c:1028
+#: ../app/app_procs.c:1024
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you caused this message to appear.\n"
@@ -227,16 +228,21 @@ msgstr ""
 "Dette burde ikke skje. Vennligst rapporter en feil i bugzilla.gnome.org\n"
 "og beskriv hvordan du fikk denne meldingen opp.\n"
 
-#: ../app/app_procs.c:1043
+#: ../app/app_procs.c:1039
 msgid "Exiting Dia"
 msgstr "Eksisterende Dia"
 
+#: ../app/app_procs.c:1066 ../app/display.c:1289 ../app/exit_dialog.c:115
+#: ../app/filedlg.c:582
+msgid "Save"
+msgstr "Lagre"
+
 #. no standard buttons
-#: ../app/app_procs.c:1107
+#: ../app/app_procs.c:1108
 msgid "Quitting without saving modified diagrams"
 msgstr "Avslutter uten å lagre endrede diagram"
 
-#: ../app/app_procs.c:1109
+#: ../app/app_procs.c:1110
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
@@ -244,15 +250,19 @@ msgstr ""
 "Endret diagram eksisterer. Er du sikker på at du vil avslutte Dia uten å "
 "lagre?"
 
-#: ../app/app_procs.c:1113
+#: ../app/app_procs.c:1114
 msgid "Quit Dia"
 msgstr "Avslutt dia"
 
-#: ../app/app_procs.c:1186 ../app/app_procs.c:1193
+#: ../app/app_procs.c:1144
+msgid "Exit"
+msgstr ""
+
+#: ../app/app_procs.c:1190 ../app/app_procs.c:1197
 msgid "Could not create per-user Dia configuration directory"
 msgstr "Kunne ikke opprette per-bruker konfigurasjonskatalog for Dia"
 
-#: ../app/app_procs.c:1196
+#: ../app/app_procs.c:1200
 msgid ""
 "Could not create per-user Dia configuration directory. Please make sure that "
 "the environment variable HOME points to an existing directory."
@@ -260,11 +270,11 @@ msgstr ""
 "Kunne ikke opprette per-bruker konfigurasjonskatalog for Dia. Vennligst "
 "sjekk at miljøvariabelen HOME peker til en eksisterende katalog."
 
-#: ../app/app_procs.c:1219
+#: ../app/app_procs.c:1223
 msgid "Objects and filters internal to Dia"
 msgstr "Interne objekter og filtre for Dia"
 
-#: ../app/app_procs.c:1272
+#: ../app/app_procs.c:1276
 #, c-format
 msgid ""
 "The original author of Dia was:\n"
@@ -273,7 +283,7 @@ msgstr ""
 "Dia er opprinnelig skrevet av:\n"
 "\n"
 
-#: ../app/app_procs.c:1277
+#: ../app/app_procs.c:1281
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +294,7 @@ msgstr ""
 "Nåværende vedlikeholdere av Dia er:\n"
 "\n"
 
-#: ../app/app_procs.c:1282
+#: ../app/app_procs.c:1286
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +305,7 @@ msgstr ""
 "Andre som har bidratt er:\n"
 "\n"
 
-#: ../app/app_procs.c:1287
+#: ../app/app_procs.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -306,11 +316,11 @@ msgstr ""
 "Dia er dokumentert av:\n"
 "\n"
 
-#: ../app/color_area.c:326 ../app/color_area.c:373
+#: ../app/color_area.c:333 ../app/color_area.c:343
 msgid "Select foreground color"
 msgstr "Velg forgrunnsfarge"
 
-#: ../app/color_area.c:327 ../app/color_area.c:374
+#: ../app/color_area.c:334 ../app/color_area.c:344
 msgid "Select background color"
 msgstr "Velg bakgrunnsfarge"
 
@@ -327,23 +337,33 @@ msgstr "Diagram%d.dia"
 msgid "No image from Clipboard to paste."
 msgstr ""
 
-#: ../app/commands.c:299
+#: ../app/commands.c:300
 msgid "No selected object can take an image."
 msgstr ""
 
-#: ../app/commands.c:359
+#: ../app/commands.c:327
+msgid "Clipboard Paste"
+msgstr ""
+
+#. might become more right some day ;)
+#: ../app/commands.c:335
+#, c-format
+msgid "No clipboard handler for '%s'"
+msgstr ""
+
+#: ../app/commands.c:426
 msgid "Clipboard Copy"
 msgstr ""
 
-#: ../app/commands.c:548
+#: ../app/commands.c:625
 msgid "No existing object to paste.\n"
 msgstr "Ingen eksisterende objekter kan limes inn.\n"
 
-#: ../app/commands.c:858 ../app/commands.c:896
+#: ../app/commands.c:935 ../app/commands.c:973
 msgid "Could not find help directory"
 msgstr "Kunne ikke finne hjelp-katalog"
 
-#: ../app/commands.c:865
+#: ../app/commands.c:942
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -352,11 +372,11 @@ msgstr ""
 "Kunne ikke åpne hjelp-katalog:\n"
 "%s"
 
-#: ../app/commands.c:934
+#: ../app/commands.c:1010
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr "Kjartan Maraas <kmaraas gnome org>"
 
-#: ../app/commands.c:936
+#: ../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"
@@ -373,27 +393,34 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: ../app/commands.c:963
+#: ../app/commands.c:1039
 msgid "A program for drawing structured diagrams."
 msgstr "Et program for tegning av strukturerte diagram."
 
-#: ../app/confirm.c:65
+#: ../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:67
+#: ../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:69
+#: ../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:77
+#: ../app/confirm.c:88
 msgid ""
 "You can adjust the size of the diagram by changing the 'Scaling' in the "
 "'Page Setup' dialog.\n"
@@ -401,11 +428,11 @@ msgid ""
 "the intended bounds."
 msgstr ""
 
-#: ../app/confirm.c:81
+#: ../app/confirm.c:92
 msgid "Confirm Diagram Size"
 msgstr "Bekreft størrelse på diagram"
 
-#: ../app/create_object.c:74
+#: ../app/create_object.c:71
 #, c-format
 msgid "'%s' creation failed"
 msgstr "Klarte ikke å lage «%s»"
@@ -422,21 +449,21 @@ msgstr "Dette objektet har ingen standardverdier."
 msgid "Defaults: "
 msgstr "Forvalg: "
 
-#: ../app/diagram.c:235
+#: ../app/diagram.c:237
 #, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr "Kunne ikke konvertere filnavn «%s» til UTF-8: %s\n"
 
-#: ../app/diagram.c:238 ../lib/message.c:91 ../lib/message.c:297
+#: ../app/diagram.c:240 ../lib/message.c:91 ../lib/message.c:299
 msgid "Error"
 msgstr "Feil"
 
 #. ToDo: move context further up in the callstack and to sth useful with it's content
-#: ../app/diagram.c:266
+#: ../app/diagram.c:272
 msgid "Load Into"
 msgstr ""
 
-#: ../app/diagram.c:1213
+#: ../app/diagram.c:1217
 msgid "Trying to group with no selected objects."
 msgstr "Forsøk på å lage gruppe uten å velge objekter."
 
@@ -445,7 +472,7 @@ msgid "Diagram"
 msgstr "Diagram"
 
 #: ../app/diagram_tree_view.c:171
-#: ../plug-ins/drs/dia-render-script-import.c:233
+#: ../plug-ins/drs/dia-render-script-import.c:234
 msgid "Layer"
 msgstr "Lag"
 
@@ -457,10 +484,10 @@ msgstr[0] "%d lag"
 msgstr[1] "%d lag"
 
 #: ../app/diagram_tree_view.c:181 ../app/diagram_tree_view.c:519
-#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:144
-#: ../objects/Istar/actor.c:145 ../objects/Istar/other.c:148
-#: ../objects/Istar/other.c:149 ../objects/KAOS/other.c:151
-#: ../objects/KAOS/other.c:152 ../objects/UML/association.c:243
+#: ../objects/Database/table.c:138 ../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"
@@ -487,8 +514,8 @@ msgstr "Velg"
 
 #. Translators: Menu item Verb/Support/Position/Locate
 #. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../app/diagram_tree_view.c:449 ../objects/FS/function.c:812
-#: ../objects/FS/function.c:1054
+#: ../app/diagram_tree_view.c:449 ../objects/FS/function.c:806
+#: ../objects/FS/function.c:1048
 msgid "Locate"
 msgstr "Finn"
 
@@ -496,10 +523,10 @@ msgstr "Finn"
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:123
-#: ../app/plugin-manager.c:262 ../objects/Database/table.c:138
-#: ../objects/Database/table.c:181 ../objects/UML/association.c:237
-#: ../objects/UML/class.c:144 ../objects/UML/large_package.c:132
+#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:125
+#: ../app/plugin-manager.c:270 ../objects/Database/table.c:136
+#: ../objects/Database/table.c:179 ../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"
@@ -603,7 +630,7 @@ msgstr ""
 msgid "Grid"
 msgstr "Rutenett"
 
-#: ../app/dia-props.c:210 ../lib/diagramdata.c:117
+#: ../app/dia-props.c:210 ../lib/diagramdata.c:123
 msgid "Background"
 msgstr "Bakgrunn"
 
@@ -625,7 +652,7 @@ msgstr "Farger"
 msgid "Diagram Properties: %s"
 msgstr "Egenskaper for diagram: %s"
 
-#: ../app/disp_callbacks.c:91 ../app/properties-dialog.c:156
+#: ../app/disp_callbacks.c:93 ../app/properties-dialog.c:156
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -633,19 +660,25 @@ msgstr ""
 "Dette objektet støtter ikke angre/gjenopprett. \n"
 "Angre-informasjon slettet."
 
-#: ../app/disp_callbacks.c:126
+#: ../app/disp_callbacks.c:128
 msgid "Properties…"
 msgstr "Egenskaper …"
 
-#: ../app/disp_callbacks.c:165
+#: ../app/disp_callbacks.c:167
 msgid "Follow link…"
 msgstr "Følg lenke …"
 
-#: ../app/disp_callbacks.c:287
+#: ../app/disp_callbacks.c:216 ../objects/standard/bezier.c:785
+#: ../objects/standard/beziergon.c:549 ../objects/standard/box.c:784
+#: ../objects/standard/textobj.c:450
+msgid "Convert to Path"
+msgstr "Konverter til sti"
+
+#: ../app/disp_callbacks.c:345
 msgid "Selection"
 msgstr "Utvalg"
 
-#: ../app/disp_callbacks.c:1067
+#: ../app/disp_callbacks.c:1115
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -674,16 +707,16 @@ msgstr "Valgte «%s»"
 msgid "No antialiased renderer found"
 msgstr ""
 
-#: ../app/display.c:1327
+#: ../app/display.c:1335
 msgid "<unnamed>"
 msgstr "<uten navn>"
 
 #. no standard buttons
-#: ../app/display.c:1333
+#: ../app/display.c:1341
 msgid "Closing diagram without saving"
 msgstr "Lukker diagram uten å lagre"
 
-#: ../app/display.c:1335
+#: ../app/display.c:1343
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -692,11 +725,11 @@ msgstr ""
 "Diagrammet «%s»\n"
 "er ikke lagret. Lagre endringer nå?"
 
-#: ../app/display.c:1337
+#: ../app/display.c:1345
 msgid "Close Diagram"
 msgstr "Lukk diagram"
 
-#: ../app/display.c:1342
+#: ../app/display.c:1350
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
@@ -716,33 +749,29 @@ msgstr "Lagre utvalg"
 msgid "The following are not saved:"
 msgstr "Følgende blir ikke lagret:"
 
-#: ../app/exit_dialog.c:113
-msgid "Save"
-msgstr "Lagre"
-
-#: ../app/exit_dialog.c:129
+#: ../app/exit_dialog.c:131
 msgid "Path"
 msgstr "Sti"
 
-#: ../app/exit_dialog.c:142
+#: ../app/exit_dialog.c:144
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../app/exit_dialog.c:150
+#: ../app/exit_dialog.c:152
 msgid "Select None"
 msgstr "Velg ingen"
 
-#: ../app/exit_dialog.c:236
+#: ../app/exit_dialog.c:244
 msgid "Nothing selected for saving.  Would you like to try again?"
 msgstr "Ingenting valgt for lagring. Vil du prøve igjen?"
 
 #: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-#: ../app/filedlg.c:819 ../lib/widgets.c:406
+#: ../app/filedlg.c:825 ../lib/widgets.c:402
 msgid "Supported Formats"
 msgstr "Støttede formater"
 
-#: ../app/filedlg.c:197 ../app/filedlg.c:199 ../app/filedlg.c:662
-#: ../app/filedlg.c:664
+#: ../app/filedlg.c:197 ../app/filedlg.c:199 ../app/filedlg.c:668
+#: ../app/filedlg.c:670
 msgid "By extension"
 msgstr "På etternavn"
 
@@ -754,11 +783,11 @@ msgstr "Åpne diagram"
 msgid "Open Options"
 msgstr "Alternativer for åpning"
 
-#: ../app/filedlg.c:334 ../app/filedlg.c:801
+#: ../app/filedlg.c:334 ../app/filedlg.c:807
 msgid "Determine file type:"
 msgstr "Bestem filtype:"
 
-#: ../app/filedlg.c:354 ../app/filedlg.c:814 ../lib/widgets.c:414
+#: ../app/filedlg.c:354 ../app/filedlg.c:820 ../lib/widgets.c:410
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -772,12 +801,12 @@ msgstr ""
 "din lokale koding.\n"
 "Noe vil gå galt."
 
-#: ../app/filedlg.c:403 ../app/filedlg.c:716
+#: ../app/filedlg.c:403 ../app/filedlg.c:722
 #: ../plug-ins/postscript/paginate_psprint.c:430
 msgid "File already exists"
 msgstr "Filen eksisterer allerede"
 
-#: ../app/filedlg.c:405 ../app/filedlg.c:718
+#: ../app/filedlg.c:405 ../app/filedlg.c:724
 #: ../plug-ins/postscript/paginate_psprint.c:426
 #, c-format
 msgid ""
@@ -787,17 +816,21 @@ msgstr ""
 "Filen «%s» eksisterer allerede.\n"
 "Vil du overskrive den?"
 
-#: ../app/filedlg.c:489
+#: ../app/filedlg.c:425
+msgid "Save as"
+msgstr "Lagre som"
+
+#: ../app/filedlg.c:493
 msgid "Save Diagram"
 msgstr "Lagre diagram"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: ../app/filedlg.c:503
+#: ../app/filedlg.c:507
 msgid "Compress diagram files"
 msgstr "Komprimer diagramfiler"
 
-#: ../app/filedlg.c:512
+#: ../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."
@@ -806,7 +839,15 @@ msgstr ""
 "og gjør lasting og lagring raskere. Noen tekstprogrammer har problemer med å "
 "manipulere komprimerte filer."
 
-#: ../app/filedlg.c:747
+#. 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:694
+#: ../objects/FS/function.c:696 ../plug-ins/libart/export_png.c:329
+msgid "Export"
+msgstr "Eksport"
+
+#: ../app/filedlg.c:753
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -815,75 +856,75 @@ msgstr ""
 "Kunne ikke bestemme hvilket eksportfilter\n"
 "som skulle brukes til å lagre «%s»"
 
-#: ../app/filedlg.c:774
+#: ../app/filedlg.c:780
 msgid "Export Diagram"
 msgstr "Eksporter diagram"
 
-#: ../app/filedlg.c:793
+#: ../app/filedlg.c:799
 msgid "Export Options"
 msgstr "Alternativer for eksport"
 
-#: ../app/find-and-replace.c:454
+#: ../app/find-and-replace.c:480
 msgid "_Search for:"
 msgstr "_Søk etter:"
 
-#: ../app/find-and-replace.c:467
+#: ../app/find-and-replace.c:493
 msgid "Replace _with:"
 msgstr "Erstatt _med:"
 
-#: ../app/find-and-replace.c:477
+#: ../app/find-and-replace.c:503
 #, fuzzy
 msgid "_Match case"
 msgstr "Makroens kall-steg"
 
-#: ../app/find-and-replace.c:481
+#: ../app/find-and-replace.c:507
 msgid "Match _entire word only"
 msgstr ""
 
-#: ../app/find-and-replace.c:485
+#: ../app/find-and-replace.c:511
 msgid "Match _all properties (not just object name)"
 msgstr ""
 
-#: ../app/find-and-replace.c:511
+#: ../app/find-and-replace.c:537
 msgid "Find"
 msgstr "Finn"
 
-#: ../app/find-and-replace.c:541 ../app/menus.c:260
+#: ../app/find-and-replace.c:567 ../app/menus.c:273
 msgid "Replace"
 msgstr "Erstatt"
 
-#: ../app/find-and-replace.c:544
+#: ../app/find-and-replace.c:570
 msgid "Replace _All"
 msgstr "Erstatt _alle"
 
 #. 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 "E_rstatt"
 
-#: ../app/interface.c:498
+#: ../app/interface.c:521
 msgid "Pops up the Navigation window."
 msgstr "Viser navigasjonsvinduet."
 
-#: ../app/interface.c:713
+#: ../app/interface.c:736
 msgid "Diagram menu."
 msgstr "Diagrammeny."
 
-#: ../app/interface.c:753
+#: ../app/interface.c:776
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../app/interface.c:768
+#: ../app/interface.c:791
 msgid "Toggles snap-to-grid for this window."
 msgstr "Slår av/på fest til rutenett for dette vinduet."
 
-#: ../app/interface.c:779
+#: ../app/interface.c:802
 msgid "Toggles object snapping for this window."
 msgstr "Slår av/på fest til rutenett for dette vinduet."
 
-#: ../app/interface.c:907 ../app/interface.c:1015 ../dia.desktop.in.in.h:2
+#: ../app/interface.c:970 ../app/interface.c:1087 ../dia.desktop.in.in.h:2
 msgid "Diagram Editor"
 msgstr "Diagramredigering"
 
@@ -903,46 +944,46 @@ msgstr "Senk lag"
 msgid "Delete Layer"
 msgstr "Slett lag"
 
-#: ../app/layer_dialog.c:311
+#: ../app/layer_dialog.c:305
 msgid "Layers:"
 msgstr "Lag:"
 
-#: ../app/layer_dialog.c:390
+#: ../app/layer_dialog.c:384
 msgid "Layers"
 msgstr "Lag"
 
-#: ../app/layer_dialog.c:404
+#: ../app/layer_dialog.c:398
 msgid "Diagram:"
 msgstr "Diagram:"
 
-#: ../app/layer_dialog.c:518 ../app/layer_dialog.c:1231
+#: ../app/layer_dialog.c:512 ../app/layer_dialog.c:1238
 #, c-format
 msgid "New layer %d"
 msgstr "Nytt lag %d"
 
-#: ../app/layer_dialog.c:733
+#: ../app/layer_dialog.c:727
 msgid "none"
 msgstr "ingen"
 
-#: ../app/layer_dialog.c:1201
+#: ../app/layer_dialog.c:1208
 msgid "Edit Layer"
 msgstr "Rediger lag"
 
-#: ../app/layer_dialog.c:1201
+#: ../app/layer_dialog.c:1208
 msgid "Add Layer"
 msgstr "Legg til lag"
 
-#: ../app/layer_dialog.c:1220
+#: ../app/layer_dialog.c:1227
 msgid "Layer name:"
 msgstr "Navn på lag:"
 
-#: ../app/linewidth_area.c:247 ../lib/properties.h:512 ../lib/properties.h:515
-#: ../objects/chronogram/chronoline.c:181
-#: ../objects/chronogram/chronoref.c:160
+#: ../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 "Linjebredde"
 
-#: ../app/linewidth_area.c:259
+#: ../app/linewidth_area.c:258
 msgid "Line width:"
 msgstr "Linjebredde:"
 
@@ -963,7 +1004,7 @@ msgstr ""
 "Feil under lasting av diagram.\n"
 "Håndtak for forbindelse %d eksisterer ikke på «%s»."
 
-#: ../app/load_save.c:288
+#: ../app/load_save.c:286
 #, c-format
 msgid ""
 "Error loading diagram.\n"
@@ -972,29 +1013,29 @@ msgstr ""
 "Feil under lasting av diagram.\n"
 "Punkt for forbindelse %d eksisterer ikke på «%s»."
 
-#: ../app/load_save.c:328
+#: ../app/load_save.c:326
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "Kan ikke finne opphav %s fra %s-objekt\n"
 
-#: ../app/load_save.c:378
+#: ../app/load_save.c:394
 msgid "You must specify a file, not a directory."
 msgstr "Du må spesifisere en fil ikke en katalog."
 
-#: ../app/load_save.c:385 ../plug-ins/dxf/dxf-import.c:1290
-#: ../plug-ins/wpg/wpg.c:1184 ../plug-ins/xfig/xfig-import.c:1288
-#: ../plug-ins/xslt/xslt.c:93
+#: ../app/load_save.c:401 ../plug-ins/dxf/dxf-import.c:1289
+#: ../plug-ins/wpg/wpg.c:1195 ../plug-ins/xfig/xfig-import.c:1288
+#: ../plug-ins/xslt/xslt.c:97
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "Kunne ikke åpne: '%s' for lesing.\n"
 
 #. this was talking about unknown file type but it could as well be broken XML
-#: ../app/load_save.c:403
+#: ../app/load_save.c:419
 #, c-format
 msgid "Error loading diagram %s."
 msgstr "Feil under lasting av diagram %s."
 
-#: ../app/load_save.c:408
+#: ../app/load_save.c:428
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1003,7 +1044,7 @@ msgstr ""
 "Feil under lasting av diagrammet %s.\n"
 "Ukjent filtype."
 
-#: ../app/load_save.c:416
+#: ../app/load_save.c:436
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1012,7 +1053,11 @@ msgstr ""
 "Feil under lasting av diagrammet %s.\n"
 "Ikke en dia fil."
 
-#: ../app/load_save.c:674
+#: ../app/load_save.c:681
+msgid "Error reading connections"
+msgstr "Feil ved lesing av tilkoblinger"
+
+#: ../app/load_save.c:701
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1023,45 +1068,54 @@ msgstr ""
 "%s.\n"
 "En gyldig Dia-fil definerer minst ett lag."
 
-#: ../app/load_save.c:1017
+#: ../app/load_save.c:1002
+msgid "Error saving connections"
+msgstr "Feil under lagring av tilkoblinger"
+
+#: ../app/load_save.c:1007
+#, c-format
+msgid "Connection saving is incomplete for layer '%s'"
+msgstr "Lagring av tilkoblinger er ikke komplett for lag «%s»"
+
+#: ../app/load_save.c:1060
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "Kan ikke skrive til utfil %s\n"
 
-#: ../app/load_save.c:1049
+#: ../app/load_save.c:1092
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr "Kan ikke lage midlertidige filer i %s\n"
 
-#: ../app/load_save.c:1072 ../plug-ins/cgm/cgm.c:1171
-#: ../plug-ins/dxf/dxf-export.c:600
-#: ../plug-ins/metapost/render_metapost.c:1181
-#: ../plug-ins/pgf/render_pgf.c:1204 ../plug-ins/postscript/render_eps.c:122
-#: ../plug-ins/pstricks/render_pstricks.c:920
-#: ../plug-ins/vdx/vdx-export.c:1801 ../plug-ins/wmf/wmf.cpp:1372
-#: ../plug-ins/wpg/wpg.c:1077 ../plug-ins/xfig/xfig-export.c:1158
+#: ../app/load_save.c:1115 ../plug-ins/cgm/cgm.c:1181
+#: ../plug-ins/dxf/dxf-export.c:599
+#: ../plug-ins/metapost/render_metapost.c:1179
+#: ../plug-ins/pgf/render_pgf.c:1207 ../plug-ins/postscript/render_eps.c:123
+#: ../plug-ins/pstricks/render_pstricks.c:917
+#: ../plug-ins/vdx/vdx-export.c:1801 ../plug-ins/wmf/wmf.cpp:1375
+#: ../plug-ins/wpg/wpg.c:1087 ../plug-ins/xfig/xfig-export.c:1178
 #, c-format
 msgid "Can't open output file %s"
 msgstr "Kunne ikke åpne utdatafil %s"
 
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:1083
+#: ../app/load_save.c:1126
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "Intern feil %d under skriving av fil %s\n"
 
-#: ../app/load_save.c:1094
+#: ../app/load_save.c:1137
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "Kunne endre navn på %s til endelig utfil %s: %s\n"
 
-#: ../app/load_save.c:1110
-#, fuzzy
-msgid "Diagram Save"
-msgstr "Diagramtre"
+#. no extra threads supported, stay in this one
+#: ../app/load_save.c:1253 ../app/load_save.c:1263 ../app/load_save.c:1271
+msgid "Auto save"
+msgstr ""
 
-#: ../app/load_save.c:1240 ../app/load_save.c:1245
+#: ../app/load_save.c:1295 ../app/load_save.c:1300
 msgid "Dia Diagram File"
 msgstr "Dia diagramfil"
 
@@ -1069,540 +1123,557 @@ msgstr "Dia diagramfil"
 msgid "Fit"
 msgstr "Tilpass"
 
-#: ../app/menus.c:80
+#: ../app/menus.c:90
 msgid "_File"
 msgstr "_Fil"
 
-#: ../app/menus.c:81
+#: ../app/menus.c:91
 msgid "Create a new diagram"
 msgstr "Lag et nytt diagram"
 
-#: ../app/menus.c:82
+#: ../app/menus.c:92
 msgid "_Open…"
 msgstr ""
 
-#: ../app/menus.c:82
+#: ../app/menus.c:92
 msgid "Open a diagram file"
 msgstr "Åpne en diagramfil"
 
-#: ../app/menus.c:84
+#: ../app/menus.c:94
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../app/menus.c:94
+#: ../app/menus.c:104
 msgid "Sheets and Objects…"
 msgstr "Ark og objekter …"
 
-#: ../app/menus.c:96
+#: ../app/menus.c:106
 msgid "Plugins…"
 msgstr "Tillegg …"
 
-#: ../app/menus.c:97
+#: ../app/menus.c:107
 msgid "_Diagram Tree"
 msgstr "_Diagramtre"
 
-#: ../app/menus.c:102
+#: ../app/menus.c:112
 msgid "Show Toolbar"
 msgstr "Vis verktøylinje"
 
-#: ../app/menus.c:103
+#: ../app/menus.c:113
 msgid "Show Statusbar"
 msgstr "Vis statuslinje"
 
-#: ../app/menus.c:104
+#: ../app/menus.c:114
 msgid "Show Layers"
 msgstr "Vis lag"
 
-#: ../app/menus.c:110
+#: ../app/menus.c:120
 msgid "Save the diagram"
 msgstr "Lagre diagrammet"
 
-#: ../app/menus.c:111
+#: ../app/menus.c:121
 msgid "Save _As…"
 msgstr ""
 
-#: ../app/menus.c:111
+#: ../app/menus.c:121
 msgid "Save the diagram with a new name"
 msgstr "Lagre diagrammet med et nytt navn"
 
-#: ../app/menus.c:112
+#: ../app/menus.c:122
 msgid "_Export…"
 msgstr "_Eksporter …"
 
-#: ../app/menus.c:112
+#: ../app/menus.c:122
 msgid "Export the diagram"
 msgstr "Eksporter diagrammet"
 
-#: ../app/menus.c:113
+#: ../app/menus.c:123
 msgid "_Diagram Properties"
 msgstr "E_genskaper for diagram"
 
-#: ../app/menus.c:114
+#: ../app/menus.c:124
 msgid "Page Set_up…"
 msgstr "Side_oppsett …"
 
-#: ../app/menus.c:115
+#: ../app/menus.c:125
 msgid "_Print…"
 msgstr "S_kriv ut …"
 
-#: ../app/menus.c:115
+#: ../app/menus.c:125
 msgid "Print the diagram"
 msgstr "Skriv ut diagrammet"
 
-#: ../app/menus.c:118
+#: ../app/menus.c:128
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../app/menus.c:122
+#: ../app/menus.c:129
+msgid "Undo"
+msgstr ""
+
+#: ../app/menus.c:130
+msgid "Redo"
+msgstr ""
+
+#: ../app/menus.c:132
 msgid "Copy selection"
 msgstr "Kopier utvalg"
 
-#: ../app/menus.c:123
+#: ../app/menus.c:133
 msgid "Cut selection"
 msgstr "Klipp ut utvalg"
 
-#: ../app/menus.c:124
+#: ../app/menus.c:134
 msgid "Paste selection"
 msgstr "Lim inn utvalg"
 
-#: ../app/menus.c:125
+#: ../app/menus.c:135
 msgid "_Duplicate"
 msgstr "_Dupliser"
 
-#: ../app/menus.c:128
+#: ../app/menus.c:138
 msgid "_Find…"
 msgstr "_Finn …"
 
-#: ../app/menus.c:129
+#: ../app/menus.c:139
 msgid "_Replace…"
 msgstr "E_rstatt …"
 
 #. the following used to bind to <control><shift>C which collides with Unicode input.
 #. * <control><alt> doesn't work either
-#: ../app/menus.c:133
+#: ../app/menus.c:143
 msgid "Copy Text"
 msgstr "Kopier tekst"
 
-#: ../app/menus.c:134
+#: ../app/menus.c:144
 msgid "Cut Text"
 msgstr "Klipp ut tekst"
 
-#: ../app/menus.c:135
+#: ../app/menus.c:145
 msgid "Paste _Text"
 msgstr "Lim inn _tekst"
 
-#: ../app/menus.c:137
+#: ../app/menus.c:147
 msgid "Paste _Image"
 msgstr "Lim _inn bilde"
 
-#: ../app/menus.c:139
+#: ../app/menus.c:149
 msgid "_Layers"
 msgstr "_Lag"
 
-#: ../app/menus.c:140
+#: ../app/menus.c:150
 msgid "Add Layer…"
 msgstr "Legg til lag …"
 
-#: ../app/menus.c:141
+#: ../app/menus.c:151
 msgid "Rename Layer…"
 msgstr "Endre navn på lag …"
 
-#: ../app/menus.c:142
+#: ../app/menus.c:152
 msgid "Move Selection to Layer above"
 msgstr "Flytt utvalg til laget over"
 
-#: ../app/menus.c:143
+#: ../app/menus.c:153
 msgid "Move Selection to Layer below"
 msgstr "Flytt utvalg til laget under"
 
-#: ../app/menus.c:144
+#: ../app/menus.c:154
 msgid "_Layers…"
 msgstr "_Lag …"
 
-#: ../app/menus.c:145
+#: ../app/menus.c:155
 msgid "_View"
 msgstr "_Vis"
 
-#: ../app/menus.c:146
+#: ../app/menus.c:156
 msgid "Zoom in"
 msgstr "Zoom inn"
 
-#: ../app/menus.c:147
+#: ../app/menus.c:157
 msgid "Zoom out"
 msgstr "Zoom ut"
 
-#: ../app/menus.c:148
+#: ../app/menus.c:158
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../app/menus.c:149
+#: ../app/menus.c:159
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:150 ../app/menus.c:575 ../app/menus.c:587
+#: ../app/menus.c:160 ../app/menus.c:587 ../app/menus.c:599
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:151 ../app/menus.c:576 ../app/menus.c:588
+#: ../app/menus.c:161 ../app/menus.c:588 ../app/menus.c:600
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:162
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:153
+#: ../app/menus.c:163
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:154
+#: ../app/menus.c:164
 msgid "141"
 msgstr "141"
 
-#: ../app/menus.c:156
+#: ../app/menus.c:166
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:157
+#: ../app/menus.c:167
 msgid "70.7"
 msgstr "70.7"
 
-#: ../app/menus.c:158
+#: ../app/menus.c:168
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:159
+#: ../app/menus.c:169
 msgid "35.4"
 msgstr "35.4"
 
-#: ../app/menus.c:160
+#: ../app/menus.c:170
 msgid "25"
 msgstr "25"
 
 #. Show All, Best Fit.  Same as the Gimp, Ctrl+E
-#: ../app/menus.c:162
+#: ../app/menus.c:172
 msgid "Zoom fit"
 msgstr "Tilpasset zoom"
 
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:166
+#: ../app/menus.c:176
 msgid "New _View"
 msgstr "Ny _visning"
 
-#: ../app/menus.c:167
+#: ../app/menus.c:177
 msgid "C_lone View"
 msgstr "Dup_liser visning"
 
-#: ../app/menus.c:170
+#: ../app/menus.c:180
 msgid "_Objects"
 msgstr "_Objekter"
 
-#: ../app/menus.c:171
+#: ../app/menus.c:181
 msgid "Send to _Back"
 msgstr "Send til _bakgrunn"
 
-#: ../app/menus.c:172
+#: ../app/menus.c:182
 msgid "Bring to _Front"
 msgstr "Hent _fram"
 
-#: ../app/menus.c:173
+#: ../app/menus.c:183
 msgid "Send Backwards"
 msgstr "Send bakover"
 
-#: ../app/menus.c:174
+#: ../app/menus.c:184
 msgid "Bring Forwards"
 msgstr "Hent fram"
 
-#: ../app/menus.c:176
+#: ../app/menus.c:186
 msgid "_Group"
 msgstr "_Grupper"
 
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:178
+#: ../app/menus.c:188
 msgid "_Ungroup"
 msgstr "_Del opp gruppe"
 
-#: ../app/menus.c:180
+#: ../app/menus.c:190
 msgid "_Parent"
 msgstr "_Opphav"
 
-#: ../app/menus.c:181
+#: ../app/menus.c:191
 msgid "_Unparent"
 msgstr "_Fjern opphav"
 
-#: ../app/menus.c:182
+#: ../app/menus.c:192
 msgid "_Unparent Children"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:184 ../objects/FS/function.c:810
+#: ../app/menus.c:194 ../objects/FS/function.c:804
 msgid "Align"
 msgstr "Juster"
 
-#: ../app/menus.c:189 ../objects/standard/textobj.c:135
+#: ../app/menus.c:199 ../objects/standard/textobj.c:110
 msgid "Top"
 msgstr "Topp"
 
-#: ../app/menus.c:190
+#: ../app/menus.c:200
 msgid "Middle"
 msgstr "Midt på"
 
-#: ../app/menus.c:191 ../objects/standard/textobj.c:134
+#: ../app/menus.c:201 ../objects/standard/textobj.c:109
 msgid "Bottom"
 msgstr "Bunn"
 
-#: ../app/menus.c:193
+#: ../app/menus.c:203
 msgid "Spread Out Horizontally"
 msgstr "Spre horisontalt"
 
-#: ../app/menus.c:194
+#: ../app/menus.c:204
 msgid "Spread Out Vertically"
 msgstr "Spre ut vertikalt"
 
-#: ../app/menus.c:195
+#: ../app/menus.c:205
 msgid "Adjacent"
 msgstr ""
 
-#: ../app/menus.c:196
+#: ../app/menus.c:206
 msgid "Stacked"
 msgstr "Stablet"
 
-#: ../app/menus.c:197 ../app/menus.c:207
+#: ../app/menus.c:207 ../app/menus.c:217
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../app/menus.c:201
+#: ../app/menus.c:211
 msgid "_Select"
 msgstr "_Velg"
 
-#: ../app/menus.c:202
+#: ../app/menus.c:212
 msgid "All"
 msgstr "Alle"
 
-#: ../app/menus.c:203 ../lib/arrows.c:1890 ../objects/Jackson/domain.c:94
-#: ../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 "Ingen"
 
-#: ../app/menus.c:204
+#: ../app/menus.c:214
 msgid "Invert"
 msgstr "Snu"
 
-#: ../app/menus.c:206
+#: ../app/menus.c:216
 msgid "Transitive"
 msgstr "Transitiv"
 
-#: ../app/menus.c:208
+#: ../app/menus.c:218
 msgid "Same Type"
 msgstr "Samme type"
 
 #. display_select_radio_entries go here
-#: ../app/menus.c:212
+#: ../app/menus.c:222
 msgid "Select By"
 msgstr "Velg etter"
 
-#: ../app/menus.c:214
+#. For placment of the toplevel Layout menu and it's accelerator
+#: ../app/menus.c:225
+msgid "L_ayout"
+msgstr ""
+
+#: ../app/menus.c:227
 msgid "_Input Methods"
 msgstr "_Inndatametoder"
 
-#: ../app/menus.c:216
+#: ../app/menus.c:229
 msgid "D_ialogs"
 msgstr "D_ialoger"
 
-#: ../app/menus.c:218
+#: ../app/menus.c:231
 msgid "D_ebug"
 msgstr "F_eilsøk"
 
-#: ../app/menus.c:224
+#: ../app/menus.c:237
 msgid "_Tools"
 msgstr "Verk_tøy"
 
-#: ../app/menus.c:225
+#: ../app/menus.c:238
 msgid "Modify"
 msgstr "Modifiser"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/menus.c:226 ../app/toolbox.c:86 ../objects/FS/function.c:990
+#: ../app/menus.c:239 ../app/toolbox.c:86 ../objects/FS/function.c:984
 msgid "Magnify"
 msgstr "Forstørr"
 
-#: ../app/menus.c:227
+#: ../app/menus.c:240
 msgid "Edit Text"
 msgstr "Rediger tekst"
 
-#: ../app/menus.c:228
+#: ../app/menus.c:241
 msgid "Scroll"
 msgstr "Rull"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../app/menus.c:229 ../app/toolbox.c:98 ../lib/properties.c:101
-#: ../lib/properties.h:563 ../objects/AADL/aadlbox.c:153
-#: ../objects/custom/custom_object.c:237 ../objects/Jackson/requirement.c:134
-#: ../objects/network/basestation.c:133 ../objects/network/radiocell.c:126
-#: ../objects/UML/activity.c:128 ../objects/UML/actor.c:122
-#: ../objects/UML/classicon.c:147 ../objects/UML/component.c:129
-#: ../objects/UML/component_feature.c:159 ../objects/UML/node.c:129
-#: ../objects/UML/node.c:131 ../objects/UML/note.c:120
-#: ../objects/UML/object.c:166 ../objects/UML/small_package.c:131
-#: ../objects/UML/state.c:157 ../objects/UML/usecase.c:138
+#: ../app/menus.c:242 ../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 "Tekst"
 
-#: ../app/menus.c:230 ../app/toolbox.c:104
+#: ../app/menus.c:243 ../app/toolbox.c:104
 msgid "Box"
 msgstr "Boks"
 
-#: ../app/menus.c:231 ../app/toolbox.c:110
+#: ../app/menus.c:244 ../app/toolbox.c:110
 msgid "Ellipse"
 msgstr "Elipse"
 
-#: ../app/menus.c:232 ../app/toolbox.c:116
+#: ../app/menus.c:245 ../app/toolbox.c:116
 msgid "Polygon"
 msgstr "Polygon"
 
-#: ../app/menus.c:233 ../app/toolbox.c:122
+#: ../app/menus.c:246 ../app/toolbox.c:122
 msgid "Beziergon"
 msgstr "Beziergon"
 
-#: ../app/menus.c:235 ../app/toolbox.c:128 ../objects/standard/line.c:231
+#: ../app/menus.c:248 ../app/toolbox.c:128 ../objects/standard/line.c:325
 msgid "Line"
 msgstr "Linje"
 
-#: ../app/menus.c:236 ../app/toolbox.c:134
+#: ../app/menus.c:249 ../app/toolbox.c:134
 msgid "Arc"
 msgstr "Bue"
 
-#: ../app/menus.c:237 ../app/toolbox.c:140
+#: ../app/menus.c:250 ../app/toolbox.c:140
 msgid "Zigzagline"
 msgstr "Sikksakk-linje"
 
-#: ../app/menus.c:238 ../app/toolbox.c:146
+#: ../app/menus.c:251 ../app/toolbox.c:146
 msgid "Polyline"
 msgstr "Polilinje"
 
-#: ../app/menus.c:239 ../app/toolbox.c:152
+#: ../app/menus.c:252 ../app/toolbox.c:152
 msgid "Bezierline"
 msgstr "Bezier linje"
 
-#: ../app/menus.c:240 ../app/toolbox.c:165
+#: ../app/menus.c:253 ../app/toolbox.c:165
 msgid "Outline"
 msgstr "Omriss"
 
-#: ../app/menus.c:242 ../app/toolbox.c:158
+#: ../app/menus.c:255 ../app/toolbox.c:158
 msgid "Image"
 msgstr "Bilde"
 
-#: ../app/menus.c:249
+#: ../app/menus.c:262
 msgid "_Antialiased"
 msgstr "_Fargeutjevnet"
 
-#: ../app/menus.c:250
+#: ../app/menus.c:263
 msgid "Show _Grid"
 msgstr "Vis _rutenett"
 
-#: ../app/menus.c:251
+#: ../app/menus.c:264
 msgid "_Snap to Grid"
 msgstr "_Fest til rutenett"
 
-#: ../app/menus.c:252
+#: ../app/menus.c:265
 msgid "Snap to _Objects"
 msgstr "Fest til _objekter"
 
-#: ../app/menus.c:253
+#: ../app/menus.c:266
 msgid "Show _Rulers"
 msgstr "Vis linjale_r"
 
-#: ../app/menus.c:254
+#: ../app/menus.c:267
 msgid "Show _Connection Points"
 msgstr "Vis _forbindelsespunkter"
 
-#: ../app/menus.c:261
+#: ../app/menus.c:274
 msgid "Union"
 msgstr "Union"
 
-#: ../app/menus.c:262
+#: ../app/menus.c:275
 msgid "Intersection"
 msgstr "Kryss"
 
 #. 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:263 ../objects/FS/function.c:710
-#: ../objects/FS/function.c:862 ../objects/FS/function.c:864
+#: ../app/menus.c:276 ../objects/FS/function.c:704
+#: ../objects/FS/function.c:856 ../objects/FS/function.c:858
 msgid "Remove"
 msgstr "Fjern"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:265
+#: ../app/menus.c:278
 msgid "Inverse"
 msgstr "Snudd"
 
-#: ../app/menus.c:328
+#: ../app/menus.c:340
 msgid "NULL tooldata in tool_menu_select"
 msgstr "NULL verktøydata i tool_menu_select"
 
-#: ../app/menus.c:577 ../app/menus.c:589
+#: ../app/menus.c:589 ../app/menus.c:601
 msgid "300%"
 msgstr "300%"
 
-#: ../app/menus.c:578 ../app/menus.c:590
+#: ../app/menus.c:590 ../app/menus.c:602
 msgid "200%"
 msgstr "200%"
 
-#: ../app/menus.c:579 ../app/menus.c:591
+#: ../app/menus.c:591 ../app/menus.c:603
 msgid "150%"
 msgstr "150%"
 
-#: ../app/menus.c:580 ../app/menus.c:592
+#: ../app/menus.c:592 ../app/menus.c:604
 msgid "100%"
 msgstr "100%"
 
-#: ../app/menus.c:581 ../app/menus.c:593
+#: ../app/menus.c:593 ../app/menus.c:605
 msgid "75%"
 msgstr "75%"
 
-#: ../app/menus.c:582 ../app/menus.c:594
+#: ../app/menus.c:594 ../app/menus.c:606
 msgid "50%"
 msgstr "50%"
 
-#: ../app/menus.c:583 ../app/menus.c:595
+#: ../app/menus.c:595 ../app/menus.c:607
 msgid "25%"
 msgstr "25%"
 
-#: ../app/menus.c:584 ../app/menus.c:596
+#: ../app/menus.c:596 ../app/menus.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../app/menus.c:622
+#: ../app/menus.c:634
 msgid "Toggles snap-to-grid."
 msgstr "Slår av/på fest til rutenett."
 
-#: ../app/menus.c:633
+#: ../app/menus.c:645
 msgid "Toggles object snapping."
 msgstr "Slår av/på fest til rutenett."
 
-#: ../app/modify_tool.c:368
+#: ../app/menus.c:1251
+msgid "The function is not available anymore."
+msgstr ""
+
+#: ../app/modify_tool.c:387
 msgid "Couldn't get GTK+ settings"
 msgstr "Kunne ikke hente innstillinger for GTK+"
 
-#: ../app/plugin-manager.c:200
+#: ../app/plugin-manager.c:208
 msgid "Plugins"
 msgstr "Tillegg"
 
-#: ../app/plugin-manager.c:255
+#: ../app/plugin-manager.c:263
 msgid "Loaded"
 msgstr "Lastet"
 
-#: ../app/plugin-manager.c:268
+#: ../app/plugin-manager.c:276
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../app/plugin-manager.c:277
+#: ../app/plugin-manager.c:285
 msgid "Load at Startup"
 msgstr "Last ved oppstart"
 
-#: ../app/plugin-manager.c:284
+#: ../app/plugin-manager.c:292
 msgid "Filename"
 msgstr "Filnavn"
 
@@ -1731,20 +1802,12 @@ msgstr "Fargeutjevning:"
 msgid "view antialised"
 msgstr ""
 
-#. Favored Filter
-#. Translators: Menu item Verb/Channel/Export
-#. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/preferences.c:220 ../objects/FS/function.c:700
-#: ../objects/FS/function.c:702 ../plug-ins/libart/export_png.c:329
-msgid "Export"
-msgstr "Eksport"
-
 #: ../app/preferences.c:222
 msgid "Portable Network Graphics"
 msgstr "Portabel nettverksgrafikk"
 
-#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:497
-#: ../plug-ins/svg/svg-import.c:1227
+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:605
+#: ../plug-ins/svg/svg-import.c:2053
 msgid "Scalable Vector Graphics"
 msgstr "Skalerbar vektorgrafikk"
 
@@ -1752,11 +1815,11 @@ msgstr "Skalerbar vektorgrafikk"
 msgid "PostScript"
 msgstr "PostScript"
 
-#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1473
+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1477
 msgid "Windows Metafile"
 msgstr "Windows Metafile"
 
-#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1482
+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1486
 msgid "Enhanced Metafile"
 msgstr "Forbedret Metafile"
 
@@ -1777,14 +1840,12 @@ msgid "Y Size:"
 msgstr "Y-størrelse:"
 
 #: ../app/preferences.c:239
-#, fuzzy
 msgid "Visual Spacing X:"
-msgstr "Synlig mellomrom"
+msgstr "Synlig mellomrom X:"
 
 #: ../app/preferences.c:240
-#, fuzzy
 msgid "Visual Spacing Y:"
-msgstr "Synlig mellomrom"
+msgstr "Synlig mellomrom Y:"
 
 #: ../app/preferences.c:242
 msgid "Lines per major line"
@@ -1794,18 +1855,19 @@ msgstr "Linjer per hovedlinje"
 msgid "Hex Size:"
 msgstr "Heksadesimal størrelse:"
 
-#: ../app/preferences.c:481 ../lib/prop_inttypes.c:159
-#: ../lib/prop_pixbuf.c:270
+#: ../app/preferences.c:470 ../lib/prop_inttypes.c:159
+#: ../lib/prop_pattern.c:217 ../lib/prop_pixbuf.c:270
 msgid "Yes"
 msgstr "Ja"
 
-#: ../app/preferences.c:481 ../app/preferences.c:492
+#: ../app/preferences.c:470 ../app/preferences.c:481
 #: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
+#: ../lib/prop_pattern.c:219 ../lib/prop_pattern.c:225
 #: ../lib/prop_pixbuf.c:272 ../lib/prop_pixbuf.c:278
 msgid "No"
 msgstr "Nei"
 
-#: ../app/preferences.c:595
+#: ../app/preferences.c:584
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -1864,7 +1926,7 @@ msgstr "SVG-form"
 msgid "Programmed DiaObject"
 msgstr "Programmert DiaObject"
 
-#: ../app/sheets_dialog.c:255
+#: ../app/sheets_dialog.c:253
 msgid "Select SVG Shape File"
 msgstr "Velg fil for SVG-form"
 
@@ -1900,7 +1962,7 @@ msgstr "<- Flytt"
 msgid "<- Move All"
 msgstr "<- Flytt alt"
 
-#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1072
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1071
 msgid "Line Break"
 msgstr "Linjebryting"
 
@@ -1931,63 +1993,63 @@ msgstr ""
 "%s\n"
 "Ikke tildelt type"
 
-#: ../app/sheets_dialog_callbacks.c:771
+#: ../app/sheets_dialog_callbacks.c:770
 msgid "Please select a .shape file"
 msgstr "Vennligst velg en .shape-fil"
 
-#: ../app/sheets_dialog_callbacks.c:778
+#: ../app/sheets_dialog_callbacks.c:777
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "Filnavnet må slutte på «%s»: «%s»"
 
-#: ../app/sheets_dialog_callbacks.c:786
+#: ../app/sheets_dialog_callbacks.c:785
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "Feil ved undersøking av %s: %s"
 
-#: ../app/sheets_dialog_callbacks.c:817
+#: ../app/sheets_dialog_callbacks.c:816
 msgid "Please export the diagram as a shape."
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:820
+#: ../app/sheets_dialog_callbacks.c:819
 #, c-format
 msgid "Could not interpret shape file: '%s'"
 msgstr "Kunne ikke tolke formfilen: «%s»"
 
-#: ../app/sheets_dialog_callbacks.c:888
+#: ../app/sheets_dialog_callbacks.c:887
 msgid "Sheet must have a Name"
 msgstr "Arket må ha et navn"
 
-#: ../app/sheets_dialog_callbacks.c:1582 ../app/sheets_dialog_callbacks.c:1589
+#: ../app/sheets_dialog_callbacks.c:1579 ../app/sheets_dialog_callbacks.c:1586
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "Kunne ikke åpne «%s»: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1643
+#: ../app/sheets_dialog_callbacks.c:1640
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "Kunne ikke åpne: «%s» for skriving"
 
-#: ../app/sheets_dialog_callbacks.c:1653
+#: ../app/sheets_dialog_callbacks.c:1650
 msgid "a user"
 msgstr "en bruker"
 
-#: ../app/sheets_dialog_callbacks.c:1666
+#: ../app/sheets_dialog_callbacks.c:1663
 #, c-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1669
+#: ../app/sheets_dialog_callbacks.c:1666
 #, c-format
 msgid "Date: %s"
 msgstr "Dato: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1673
+#: ../app/sheets_dialog_callbacks.c:1670
 #, c-format
 msgid "For: %s"
 msgstr "For: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1690
+#: ../app/sheets_dialog_callbacks.c:1687
 msgid "add shapes here"
 msgstr "legg til former her"
 
@@ -2016,20 +2078,20 @@ msgstr ""
 msgid "Scroll around the diagram"
 msgstr "Rull rundt i diagrammet"
 
-#: ../app/toolbox.c:354
+#: ../app/toolbox.c:352
 #, c-format
 msgid "No sheet named %s"
 msgstr "Ingen ark med navn %s"
 
-#: ../app/toolbox.c:392
+#: ../app/toolbox.c:390
 msgid "Other sheets"
 msgstr "Andre ark"
 
-#: ../app/toolbox.c:452 ../sheets/Flowchart.sheet.in.h:1
+#: ../app/toolbox.c:450 ../sheets/Flowchart.sheet.in.h:1
 msgid "Flowchart"
 msgstr "Flytdiagram"
 
-#: ../app/toolbox.c:496
+#: ../app/toolbox.c:494
 msgid ""
 "Foreground & background colors for new objects.  The small black and white "
 "squares reset colors.  The small arrows swap colors.  Double-click to change "
@@ -2039,7 +2101,7 @@ msgstr ""
 "nullstiller farger. De små pilene bytter farger. Dobbeltklikk for å endre "
 "farger."
 
-#: ../app/toolbox.c:510
+#: ../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."
@@ -2047,7 +2109,7 @@ msgstr ""
 "Linjebredde. Klikk på en linje for å sette forvalgt linjebredde for nye "
 "objekter. Dobbeltklikk for å sette linjebredden mer presist."
 
-#: ../app/toolbox.c:553
+#: ../app/toolbox.c:551
 msgid ""
 "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
 "arrow parameters with Details…"
@@ -2055,7 +2117,7 @@ msgstr ""
 "Stil for pil på begynnelsen av nye linjer. Klikk for å velge en pil, eller "
 "sett parametere for piler under Detaljer …"
 
-#: ../app/toolbox.c:558
+#: ../app/toolbox.c:556
 msgid ""
 "Line style for new lines.  Click to pick a line style, or set line style "
 "parameters with Details…"
@@ -2063,11 +2125,13 @@ msgstr ""
 "Stil for nye linjer. Klikk for å velge en linjestil eller sett parametere "
 "for linjestil med Detaljer …"
 
-#: ../app/toolbox.c:574
+#: ../app/toolbox.c:572
 msgid ""
 "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
 "parameters with Details…"
-msgstr "Stil for pil på slutten av nye linjer. Klikk for å velge en pil eller sett parametere for pilen 
under Detaljer …"
+msgstr ""
+"Stil for pil på slutten av nye linjer. Klikk for å velge en pil eller sett "
+"parametere for pilen under Detaljer …"
 
 #: ../dia.desktop.in.in.h:1
 msgid "Dia"
@@ -2149,174 +2213,240 @@ msgstr ""
 msgid "Dia (remove only)"
 msgstr ""
 
-#. Installer message: confirmation question. Keep $\r
+#. 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?$\r"
-"$\rNote: Any non-standard plugins that you may have installed will be "
-"deleted.$\rDia user settings will not be affected."
+"Your old Dia directory is about to be deleted. Would you like to continue?"
 msgstr ""
 
-#. Installer message: confirmatin question. Keep $\r
-#: ../installer/win32/gennsh.c:78
+#. Installer message: directory delete confirmation line 2
+#: ../installer/win32/gennsh.c:77
 msgid ""
-"The installation directory you specified already exists. Any contents$\rwill "
-"be deleted. Would you like to continue?"
+"Note: Any non-standard plugins that you may have installed will be deleted."
 msgstr ""
 
-#. Installer message: Uninstall Section Prompts. Keep $\r
-#: ../installer/win32/gennsh.c:81
-msgid ""
-"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-"another user installed this application."
+#. Installer message: directory delete confirmation line 3
+#: ../installer/win32/gennsh.c:79
+msgid "Dia user settings will not be affected."
 msgstr ""
 
-#. Installer message: Uninstall error message
+#. 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 "will be deleted. Would you like to continue?"
+msgstr "Ingenting valgt for lagring. Vil du prøve igjen?"
+
+#. 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:87
+#: ../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:90
+#: ../installer/win32/gennsh.c:98
 msgid ""
 "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
 msgstr ""
 
+#: ../lib/arrows.c:1890
+msgctxt "Arrow"
+msgid "None"
+msgstr "Ingen"
+
 #: ../lib/arrows.c:1891
+msgctxt "Arrow"
 msgid "Lines"
 msgstr "Linjer"
 
 #: ../lib/arrows.c:1892
+msgctxt "Arrow"
 msgid "Hollow Triangle"
 msgstr "Hult triangel"
 
 #: ../lib/arrows.c:1893
+msgctxt "Arrow"
 msgid "Filled Triangle"
 msgstr "Fylt triangel"
 
 #: ../lib/arrows.c:1894
+msgctxt "Arrow"
 msgid "Unfilled Triangle"
 msgstr "Triangel uten fyll"
 
 #: ../lib/arrows.c:1895
+msgctxt "Arrow"
 msgid "Hollow Diamond"
 msgstr "Hul diamant"
 
 #: ../lib/arrows.c:1896
+msgctxt "Arrow"
 msgid "Filled Diamond"
 msgstr "Fylt diamant"
 
 #: ../lib/arrows.c:1897
+msgctxt "Arrow"
 msgid "Half Diamond"
 msgstr "Halv diamant"
 
 #: ../lib/arrows.c:1898
+msgctxt "Arrow"
 msgid "Half Head"
 msgstr "Halvhodet"
 
 #: ../lib/arrows.c:1899
+msgctxt "Arrow"
 msgid "Slashed Cross"
 msgstr "Streket kryss"
 
 #: ../lib/arrows.c:1900
+msgctxt "Arrow"
 msgid "Filled Ellipse"
 msgstr "Fylt elipse"
 
 #: ../lib/arrows.c:1901
+msgctxt "Arrow"
 msgid "Hollow Ellipse"
 msgstr "Hul elipse"
 
 #: ../lib/arrows.c:1902
+msgctxt "Arrow"
 msgid "Filled Dot"
 msgstr "Fylt punkt"
 
 #: ../lib/arrows.c:1903
+msgctxt "Arrow"
 msgid "Dimension Origin"
 msgstr "Opprinnelse for dimensjon"
 
 #: ../lib/arrows.c:1904
+#, fuzzy
+msgctxt "Arrow"
 msgid "Blanked Dot"
 msgstr "Blankt punkt"
 
 #: ../lib/arrows.c:1905
+msgctxt "Arrow"
 msgid "Double Hollow Triangle"
 msgstr "Dobbelt hult triangel"
 
 #: ../lib/arrows.c:1906
+msgctxt "Arrow"
 msgid "Double Filled Triangle"
 msgstr "Dobbelt fylt triangel"
 
 #: ../lib/arrows.c:1907
+msgctxt "Arrow"
 msgid "Filled Dot and Triangle"
 msgstr "Fylt punkt og triangel"
 
 #: ../lib/arrows.c:1908
+msgctxt "Arrow"
 msgid "Filled Box"
 msgstr "Fylt boks"
 
 #: ../lib/arrows.c:1909
+msgctxt "Arrow"
 msgid "Blanked Box"
-msgstr "Blank boks"
+msgstr "Tom boks"
 
 #: ../lib/arrows.c:1910
+msgctxt "Arrow"
 msgid "Slashed"
 msgstr "Streket"
 
 #: ../lib/arrows.c:1911
+#, fuzzy
+msgctxt "Arrow"
 msgid "Integral Symbol"
 msgstr "Itegraltegn"
 
 #: ../lib/arrows.c:1912
+#, fuzzy
+msgctxt "Arrow"
 msgid "Crow Foot"
 msgstr "Kråkefot"
 
 #: ../lib/arrows.c:1913
+#, fuzzy
+msgctxt "Arrow"
 msgid "Cross"
 msgstr "Kryss"
 
 #: ../lib/arrows.c:1914
+#, fuzzy
+msgctxt "Arrow"
 msgid "1-or-many"
 msgstr "1-eller-mange"
 
 #: ../lib/arrows.c:1915
+#, fuzzy
+msgctxt "Arrow"
 msgid "0-or-many"
 msgstr "0-eller-mange"
 
 #: ../lib/arrows.c:1916
+#, fuzzy
+msgctxt "Arrow"
 msgid "1-or-0"
 msgstr "1-eller-0"
 
 #: ../lib/arrows.c:1917
+#, fuzzy
+msgctxt "Arrow"
 msgid "1 exactly"
 msgstr "Eksakt 1"
 
 #: ../lib/arrows.c:1918
+#, fuzzy
+msgctxt "Arrow"
 msgid "Filled Concave"
 msgstr "Fylt konkav"
 
 #: ../lib/arrows.c:1919
+#, fuzzy
+msgctxt "Arrow"
 msgid "Blanked Concave"
 msgstr "Tom konkav"
 
-#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
-#: ../lib/properties.h:490 ../lib/properties.h:496
+#: ../lib/arrows.c:1920
+#, fuzzy
+msgctxt "Arrow"
 msgid "Round"
 msgstr "Rund"
 
 #: ../lib/arrows.c:1921
+#, fuzzy
+msgctxt "Arrow"
 msgid "Open Round"
 msgstr "Åpen rund"
 
 #: ../lib/arrows.c:1922
+msgctxt "Arrow"
 msgid "Backslash"
 msgstr ""
 
 #: ../lib/arrows.c:1923
+#, fuzzy
+msgctxt "Arrow"
 msgid "Infinite Line"
 msgstr "Uendelig linje"
 
@@ -2334,9 +2464,10 @@ msgid "unknown arrow"
 msgstr "ukjent pil"
 
 #: ../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:333 ../plug-ins/vdx/vdx-import.c:143
+#: ../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:652
+#: ../plug-ins/vdx/vdx-import.c:144
 msgid "Can't find standard object"
 msgstr "Kan ikke finne standard-objekt"
 
@@ -2352,47 +2483,47 @@ msgstr "Flere piler"
 msgid "Size: "
 msgstr "Størrelse:"
 
-#: ../lib/diacolorselector.c:205
+#: ../lib/diacolorselector.c:204
 msgid "Select color"
 msgstr "Velg farge"
 
-#: ../lib/diacolorselector.c:287
+#: ../lib/diacolorselector.c:292
 msgid "More colors…"
 msgstr "Flere farger …"
 
-#: ../lib/dia_dirs.c:327
+#: ../lib/dia_dirs.c:315
 #, c-format
 msgid "Too many \"..\"s in filename %s\n"
 msgstr "For mange «..» i filnavn %s\n"
 
-#: ../lib/diadynamicmenu.c:392
+#: ../lib/diadynamicmenu.c:396
 msgid "Reset menu"
 msgstr "Nullstill meny"
 
-#: ../lib/diafontselector.c:159
+#: ../lib/diafontselector.c:158
 msgid "Other fonts"
 msgstr "Andre skrifter"
 
-#: ../lib/diafontselector.c:231
+#: ../lib/diafontselector.c:233
 #, c-format
 msgid "Couldn't find font family for %s\n"
 msgstr "Kunne ikke finne skriftfamilie for %s\n"
 
 #. pathologic case - pixbuf not even supporting PNG?
-#: ../lib/dia_image.c:295
+#: ../lib/dia_image.c:333
 #, c-format
 msgid ""
 "Unsupported file format for saving:\n"
 "%s\n"
-"%s"
+"%s\n"
 msgstr ""
 
-#: ../lib/dia_image.c:298
-#, c-format
+#: ../lib/dia_image.c:336
+#, fuzzy, c-format
 msgid ""
 "Could not save file:\n"
 "%s\n"
-"%s"
+"%s\n"
 msgstr ""
 "Kunne ikke lagre fil:\n"
 "%s\n"
@@ -2406,28 +2537,28 @@ msgstr "Egenskaper for linjestil"
 msgid "Details…"
 msgstr "Detaljer …"
 
-#: ../lib/dialinestyleselector.c:124
+#: ../lib/dialinestyleselector.c:107
 msgid "line|Solid"
 msgstr "Helfylt"
 
-#: ../lib/dialinestyleselector.c:130
+#: ../lib/dialinestyleselector.c:108
 msgid "line|Dashed"
 msgstr "Streket"
 
-#: ../lib/dialinestyleselector.c:136
+#: ../lib/dialinestyleselector.c:109
 msgid "line|Dash-Dot"
 msgstr "Strek-prikk"
 
-#: ../lib/dialinestyleselector.c:142
+#: ../lib/dialinestyleselector.c:110
 msgid "line|Dash-Dot-Dot"
 msgstr "Strek-prikk-prikk"
 
-#: ../lib/dialinestyleselector.c:148
+#: ../lib/dialinestyleselector.c:111
 msgid "line|Dotted"
 msgstr "Prikket"
 
 #. fs->sizebox = GTK_HBOX(box);
-#: ../lib/dialinestyleselector.c:166
+#: ../lib/dialinestyleselector.c:143
 msgid "Dash length: "
 msgstr "Lengde på strek: "
 
@@ -2439,7 +2570,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../lib/dia_xml.c:198
+#: ../lib/dia_xml.c:214
 #, c-format
 msgid ""
 "The file %s has no encoding specification;\n"
@@ -2448,80 +2579,80 @@ msgstr ""
 "Filen %s har ingen spesifikasjon for koding;\n"
 "antar at kodingen er %s"
 
-#: ../lib/dia_xml.c:472
+#: ../lib/dia_xml.c:512
 #, c-format
 msgid "Unknown type of DataNode '%s'"
 msgstr ""
 
-#: ../lib/dia_xml.c:488
+#: ../lib/dia_xml.c:531
 #, fuzzy
 msgid "Taking int value of non-int node."
 msgstr "Tar punktverdi for node som ikke er et punkt."
 
-#: ../lib/dia_xml.c:647
+#: ../lib/dia_xml.c:707
 msgid "Taking point value of non-point node."
 msgstr "Tar punktverdi for node som ikke er et punkt."
 
-#: ../lib/dia_xml.c:658
+#: ../lib/dia_xml.c:718
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "Ukorrekt punktverdi for x, \"%s\" %f; forkaster den."
 
-#: ../lib/dia_xml.c:665
+#: ../lib/dia_xml.c:725
 msgid "Error parsing point."
 msgstr "Feil ved lesing av punkt."
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:673
+#: ../lib/dia_xml.c:733
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "Ukorrekt punktverdi for y, «%s» %f; forkaster den."
 
-#: ../lib/dia_xml.c:690
+#: ../lib/dia_xml.c:753
 #, fuzzy
 msgid "Taking bezpoint value of non-point node."
 msgstr "Tar punktverdi for node som ikke er et punkt."
 
-#: ../lib/dia_xml.c:708
+#: ../lib/dia_xml.c:771
 #, fuzzy
 msgid "Error parsing bezpoint p1."
 msgstr "Feil ved lesing av punkt."
 
-#: ../lib/dia_xml.c:722
+#: ../lib/dia_xml.c:785
 #, fuzzy
 msgid "Error parsing bezpoint p2."
 msgstr "Feil ved lesing av punkt."
 
-#: ../lib/dia_xml.c:736
+#: ../lib/dia_xml.c:799
 #, fuzzy
 msgid "Error parsing bezpoint p3."
 msgstr "Feil ved lesing av punkt."
 
-#: ../lib/dia_xml.c:760
+#: ../lib/dia_xml.c:826
 #, fuzzy
 msgid "Taking rectangle value of non-rectangle node."
 msgstr "Tar punktverdi for node som ikke er et punkt."
 
-#: ../lib/dia_xml.c:772 ../lib/dia_xml.c:783 ../lib/dia_xml.c:794
+#: ../lib/dia_xml.c:838 ../lib/dia_xml.c:849 ../lib/dia_xml.c:860
 #, fuzzy
 msgid "Error parsing rectangle."
 msgstr "Feil ved lesing av punkt."
 
-#: ../lib/dia_xml.c:819
+#: ../lib/dia_xml.c:888
 #, fuzzy
 msgid "Taking string value of non-string node."
 msgstr "Tar punktverdi for node som ikke er et punkt."
 
-#: ../lib/dia_xml.c:845
+#: ../lib/dia_xml.c:914
 #, fuzzy
 msgid "Error in string tag."
 msgstr "Feil ved lesing av punkt."
 
-#: ../lib/dia_xml.c:863
+#: ../lib/dia_xml.c:932
 msgid "Error in file, string not starting with #"
 msgstr ""
 
-#: ../lib/dia_xml.c:911
+#: ../lib/dia_xml.c:994
 #, fuzzy
 msgid "Taking font value of non-font node."
 msgstr "Tar punktverdi for node som ikke er et punkt."
@@ -2531,17 +2662,22 @@ msgstr "Tar punktverdi for node som ikke er et punkt."
 msgid "Multiple export filters with unique name %s"
 msgstr "Flere eksportfiltre med unikt navn %s"
 
-#: ../lib/font.c:85
+#: ../lib/filter.c:195
+#, fuzzy, c-format
+msgid "Multiple import filters with unique name %s"
+msgstr "Flere eksportfiltre med unikt navn %s"
+
+#: ../lib/font.c:89
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "Kan ikke laste skrift %s.\n"
 
-#: ../lib/group.c:616
+#: ../lib/group.c:624
 #, fuzzy
 msgid "Transformation"
 msgstr "Informasjon"
 
-#: ../lib/message.c:93 ../lib/message.c:282
+#: ../lib/message.c:93 ../lib/message.c:284
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -2557,16 +2693,18 @@ msgstr "Vis gjentatte meldinger"
 msgid "Don't show this message again"
 msgstr "Ikke vis denne meldingen igjen"
 
-#: ../lib/message.c:204
-#, c-format
-msgid "There are %d similar messages."
-msgstr "Det finnes %d lignende meldinger"
+#: ../lib/message.c:206
+#, fuzzy, c-format
+msgid "There is %d similar message."
+msgid_plural "There are %d similar messages."
+msgstr[0] "Det finnes en lignende melding."
+msgstr[1] "Det finnes en lignende melding."
 
-#: ../lib/message.c:266
+#: ../lib/message.c:268
 msgid "Notice"
 msgstr "Melding"
 
-#: ../lib/object_defaults.c:133
+#: ../lib/object_defaults.c:134
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2576,48 +2714,48 @@ msgstr ""
 "Ikke en dia fil."
 
 #. base property stuff...
-#: ../lib/orth_conn.h:92
+#: ../lib/orth_conn.h:97
 #, fuzzy
 msgid "Autoroute"
 msgstr "IAD-ruter"
 
-#: ../lib/orth_conn.h:103
+#: ../lib/orth_conn.h:108
 msgid "Autorouting"
 msgstr ""
 
-#: ../lib/persistence.c:318
+#: ../lib/persistence.c:321
 #, fuzzy
 msgid "Persistence"
 msgstr "Innstillinger"
 
-#: ../lib/plug-ins.c:111
+#: ../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 ""
 
-#: ../lib/plug-ins.c:197
+#: ../lib/plug-ins.c:199
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr "Mangler symbol «dia_plugin_init»"
 
-#: ../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 "Kall til dia_plugin_init() feilet"
 
-#: ../lib/plug-ins.c:232
+#: ../lib/plug-ins.c:234
 #, c-format
 msgid "%s Plugin could not be unloaded"
 msgstr "%s tillegg kunne ikke lastes ut"
 
-#: ../lib/plug-ins.c:441
+#: ../lib/plug-ins.c:442
 msgid "Plugin Configuration"
 msgstr ""
 
-#: ../lib/propdialogs.c:324 ../objects/UML/association.c:235
-#: ../objects/UML/object.c:146
+#: ../lib/propdialogs.c:324 ../objects/UML/association.c:234
+#: ../objects/UML/object.c:144
 msgid "General"
 msgstr ""
 
@@ -2645,121 +2783,137 @@ msgstr "Endringsdato"
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:43
+#: ../lib/prop_dict.c:243 ../sheets/ciscomisc.sheet.in.h:43
 msgid "Key"
 msgstr "Nøkkel"
 
-#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
+#: ../lib/prop_dict.c:250 ../objects/UML/umlattribute.c:41
 #: ../objects/UML/umlparameter.c:47
 msgid "Value"
 msgstr "Verdi"
 
-#: ../lib/properties.c:67 ../lib/properties.h:477 ../lib/widgets.c:273
+#: ../lib/properties.c:68 ../lib/properties.h:591 ../lib/widgets.c:269
 msgid "Left"
 msgstr "Venstre"
 
-#: ../lib/properties.c:68 ../lib/properties.h:478 ../lib/widgets.c:274
-#: ../objects/standard/textobj.c:136
+#: ../lib/properties.c:69 ../lib/properties.h:592 ../lib/widgets.c:270
+#: ../objects/standard/textobj.c:111
 msgid "Center"
 msgstr "Senter"
 
-#: ../lib/properties.c:69 ../lib/properties.h:479 ../lib/widgets.c:275
+#: ../lib/properties.c:70 ../lib/properties.h:593 ../lib/widgets.c:271
 msgid "Right"
 msgstr "Høyre"
 
-#: ../lib/properties.c:74 ../lib/properties.h:483
+#: ../lib/properties.c:75 ../lib/properties.h:597
 msgid "Never"
 msgstr ""
 
-#: ../lib/properties.c:75 ../lib/properties.h:484
+#: ../lib/properties.c:76 ../lib/properties.h:598
 msgid "When Needed"
 msgstr ""
 
-#: ../lib/properties.c:76 ../lib/properties.h:485
+#: ../lib/properties.c:77 ../lib/properties.h:599
 msgid "Always"
 msgstr ""
 
-#: ../lib/properties.c:80 ../lib/properties.h:489
+#: ../lib/properties.c:81 ../lib/properties.h:603
+msgctxt "LineJoin"
 msgid "Miter"
 msgstr ""
 
-#: ../lib/properties.c:82 ../lib/properties.h:491
+#: ../lib/properties.c:82 ../lib/properties.h:604
+#, fuzzy
+msgctxt "LineJoin"
+msgid "Round"
+msgstr "Rund"
+
+#: ../lib/properties.c:83 ../lib/properties.h:605
+msgctxt "LineJoin"
 msgid "Bevel"
 msgstr ""
 
-#: ../lib/properties.c:86 ../lib/properties.h:495
+#: ../lib/properties.c:87 ../lib/properties.h:609
+msgctxt "LineCap"
 msgid "Butt"
 msgstr ""
 
-#: ../lib/properties.c:88 ../lib/properties.h:497
+#: ../lib/properties.c:88 ../lib/properties.h:610
 #, fuzzy
+msgctxt "LineCap"
+msgid "Round"
+msgstr "Rund"
+
+#: ../lib/properties.c:89 ../lib/properties.h:611
+#, fuzzy
+msgctxt "LineCap"
 msgid "Projecting"
 msgstr "Prosjekterer"
 
-#: ../lib/properties.c:95 ../lib/properties.h:518 ../lib/properties.h:521
-#: ../objects/chronogram/chronoline.c:179
-#: ../objects/chronogram/chronoref.c:158
+#: ../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 "Linjefarge"
 
-#: ../lib/properties.c:96 ../lib/properties.h:524 ../lib/properties.h:527
+#: ../lib/properties.c:97 ../lib/properties.h:638 ../lib/properties.h:641
 msgid "Line style"
 msgstr "Linjestil"
 
-#: ../lib/properties.c:97 ../lib/properties.h:543 ../lib/properties.h:546
+#: ../lib/properties.c:98 ../lib/properties.h:657 ../lib/properties.h:660
 msgid "Fill color"
 msgstr "Fyllfarge"
 
-#: ../lib/properties.c:98 ../lib/properties.h:549 ../lib/properties.h:552
+#. 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 "Tegn bakgrunn"
 
-#: ../lib/properties.c:99 ../lib/properties.h:556
+#: ../lib/properties.c:100 ../lib/properties.h:670
 msgid "Start arrow"
 msgstr "Start-pil"
 
-#: ../lib/properties.c:100 ../lib/properties.h:559
+#: ../lib/properties.c:101 ../lib/properties.h:673
 msgid "End arrow"
 msgstr "Slutt-pil"
 
-#: ../lib/properties.c:102 ../lib/properties.h:569
+#: ../lib/properties.c:103 ../lib/properties.h:683
 msgid "Text alignment"
 msgstr "Tekstjustering"
 
-#. all this just to make the defaults selectable ...
-#: ../lib/properties.c:103 ../lib/properties.h:574
-#: ../objects/chronogram/chronoline.c:183
-#: ../objects/chronogram/chronoref.c:164 ../objects/Database/reference.c:118
-#: ../objects/GRAFCET/condition.c:132 ../objects/GRAFCET/step.c:166
-#: ../objects/GRAFCET/transition.c:142 ../objects/UML/class.c:176
-#: ../objects/UML/class_dialog.c:455
+#: ../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 "Skrifttype"
 
-#: ../lib/properties.c:104 ../lib/properties.h:582
-#: ../objects/chronogram/chronoline.c:185
-#: ../objects/chronogram/chronoref.c:166 ../objects/GRAFCET/condition.c:134
-#: ../objects/GRAFCET/step.c:168 ../objects/GRAFCET/transition.c:144
+#: ../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 "Størrelse på skrifttype"
 
-#: ../lib/properties.c:105 ../lib/properties.h:588
-#: ../objects/chronogram/chronoline.c:187
-#: ../objects/chronogram/chronoref.c:168 ../objects/GRAFCET/step.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 "Tekstfarge"
 
-#: ../lib/properties.h:530 ../lib/properties.h:533
+#: ../lib/properties.h:644 ../lib/properties.h:647
 #, fuzzy
 msgid "Line join"
 msgstr "Linjebredde"
 
-#: ../lib/properties.h:536 ../lib/properties.h:539
+#: ../lib/properties.h:650 ../lib/properties.h:653
 #, fuzzy
 msgid "Line caps"
 msgstr "Linjeravstander"
 
-#: ../lib/properties.h:597
+#: ../lib/properties.h:711
 #, fuzzy
 msgid "Text fitting"
 msgstr "Tekstfyll"
@@ -2773,6 +2927,10 @@ msgstr ""
 msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr "Ingen attributt «%s» (%p) eller ingen data (%p) i denne attributten"
 
+#: ../lib/prop_pattern.c:243
+msgid "Cant create pattern from scratch!"
+msgstr ""
+
 #: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
 #, c-format
 msgid ""
@@ -2780,7 +2938,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/prop_pixbuf.c:200
+#: ../lib/prop_pixbuf.c:198
 #, c-format
 msgid ""
 "Saving inline pixbuf failed:\n"
@@ -2791,10 +2949,18 @@ msgstr ""
 msgid "Cant create image data from scratch!"
 msgstr ""
 
-#: ../lib/prop_text.c:474
-#, c-format
-msgid "Group with %d objects"
-msgstr "Gruppe med %d objekter"
+#. 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 "Parametere"
+
+#: ../lib/prop_text.c:483
+#, fuzzy, c-format
+msgid "Group with %d object"
+msgid_plural "Group with %d objects"
+msgstr[0] "Gruppe med %d objekter"
+msgstr[1] "Gruppe med %d objekter"
 
 #: ../lib/sheet.c:71 ../lib/sheet.c:86
 #, c-format
@@ -2803,7 +2969,7 @@ msgid ""
 "It will not be available for use."
 msgstr ""
 
-#: ../lib/sheet.c:316
+#: ../lib/sheet.c:319
 #, c-format
 msgid ""
 "The system sheet '%s' appears to be more recent than your custom\n"
@@ -2813,16 +2979,59 @@ msgid ""
 "or remove '%s', using the 'Sheets and Objects' dialog."
 msgstr ""
 
-#: ../lib/sheet.c:375
+#: ../lib/sheet.c:378
 #, c-format
 msgid "%s: you should use object tags rather than shape tags now"
 msgstr ""
 
-#: ../lib/widgets.c:394
+#: ../lib/standard-path.c:131
+msgid "Stroke"
+msgstr ""
+
+#. Translators: Menu item Verb/Provision/Supply/Fill
+#: ../lib/standard-path.c:132 ../objects/FS/function.c:932
+msgid "Fill"
+msgstr "Fyll"
+
+#: ../lib/standard-path.c:133
+msgid "Fill & Stroke"
+msgstr ""
+
+#: ../lib/standard-path.c:138
+#, fuzzy
+msgid "Bezier points"
+msgstr "Beziergon"
+
+#: ../lib/standard-path.c:139
+msgid "Drawing"
+msgstr ""
+
+#: ../lib/standard-path.c:148
+#, fuzzy
+msgid "Draw Control Lines"
+msgstr "Kontrollerer"
+
+#: ../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 "Pattern"
+msgstr "Spre"
+
+#: ../lib/standard-path.c:498
+msgid "Convert to Bezier"
+msgstr ""
+
+#: ../lib/standard-path.c:499
+#, fuzzy
+msgid "Show Control Lines"
+msgstr "Vis _forbindelsespunkter"
+
+#: ../lib/widgets.c:390
 msgid "Select image file"
 msgstr "Velg bildefil"
 
-#: ../lib/widgets.c:445
+#: ../lib/widgets.c:441
 msgid "Browse"
 msgstr "Bla gjennom"
 
@@ -2830,68 +3039,68 @@ msgstr "Bla gjennom"
 msgid "Declaration"
 msgstr "Deklarasjon"
 
-#: ../objects/AADL/aadlbox.c:358
+#: ../objects/AADL/aadlbox.c:356
 msgid "Add Access Provider"
 msgstr "Legg til tilbyder"
 
-#: ../objects/AADL/aadlbox.c:360
+#: ../objects/AADL/aadlbox.c:358
 #, fuzzy
 msgid "Add Access Requirer"
 msgstr "Tilgangstjener"
 
-#: ../objects/AADL/aadlbox.c:362
+#: ../objects/AADL/aadlbox.c:360
 msgid "Add In Data Port"
 msgstr "Legg til inndataport"
 
-#: ../objects/AADL/aadlbox.c:364
+#: ../objects/AADL/aadlbox.c:362
 msgid "Add In Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:366
+#: ../objects/AADL/aadlbox.c:364
 msgid "Add In Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:368
+#: ../objects/AADL/aadlbox.c:366
 msgid "Add Out Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:370
+#: ../objects/AADL/aadlbox.c:368
 msgid "Add Out Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:372
+#: ../objects/AADL/aadlbox.c:370
 msgid "Add Out Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:374
+#: ../objects/AADL/aadlbox.c:372
 msgid "Add In Out Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:376
+#: ../objects/AADL/aadlbox.c:374
 msgid "Add In Out Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:378
+#: ../objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:380
+#: ../objects/AADL/aadlbox.c:378
 msgid "Add Port Group"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:382
+#: ../objects/AADL/aadlbox.c:380
 msgid "Add Connection Point"
 msgstr "Legg til forbindelsespunkt"
 
-#: ../objects/AADL/aadlbox.c:386
+#: ../objects/AADL/aadlbox.c:384
 msgid "Delete Port"
 msgstr "Slett port"
 
-#: ../objects/AADL/aadlbox.c:387
+#: ../objects/AADL/aadlbox.c:385
 msgid "Edit Port Declaration"
 msgstr "Rediger portdeklarasjon"
 
-#: ../objects/AADL/aadlbox.c:391
+#: ../objects/AADL/aadlbox.c:389
 msgid "Delete Connection Point"
 msgstr "Slett forbindelsespunkt"
 
@@ -2903,23 +3112,23 @@ msgstr ""
 msgid "Chronogram diagram objects"
 msgstr "Kronogram diagramobjekter"
 
-#: ../objects/chronogram/chronoline.c:148 ../sheets/AADL.sheet.in.h:5
+#: ../objects/chronogram/chronoline.c:147 ../sheets/AADL.sheet.in.h:5
 msgid "Data"
 msgstr "Data"
 
-#: ../objects/chronogram/chronoline.c:150
+#: ../objects/chronogram/chronoline.c:149
 msgid "Data name"
 msgstr "Datanavn"
 
-#: ../objects/chronogram/chronoline.c:152
+#: ../objects/chronogram/chronoline.c:151
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../objects/chronogram/chronoline.c:155
+#: ../objects/chronogram/chronoline.c:154
 msgid "Event specification"
 msgstr "Hendelsesspesifikasjon"
 
-#: ../objects/chronogram/chronoline.c:156
+#: ../objects/chronogram/chronoline.c:155
 #, fuzzy
 msgid ""
 "@ time    set the pointer to an absolute time.\n"
@@ -2935,58 +3144,54 @@ msgstr ""
 "'varighet'.\n"
 "eksempel : @ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/chronogram/chronoline.c:162 ../objects/UML/umloperation.c:79
-msgid "Parameters"
-msgstr "Parametere"
-
-#: ../objects/chronogram/chronoline.c:164
-#: ../objects/chronogram/chronoref.c:146
+#: ../objects/chronogram/chronoline.c:163
+#: ../objects/chronogram/chronoref.c:145
 msgid "Start time"
 msgstr "Starttid"
 
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
+#: ../objects/chronogram/chronoline.c:165
+#: ../objects/chronogram/chronoref.c:147
 msgid "End time"
 msgstr "Slutt-tid"
 
-#: ../objects/chronogram/chronoline.c:168
+#: ../objects/chronogram/chronoline.c:167
 msgid "Rise time"
 msgstr "Hevingstid"
 
-#: ../objects/chronogram/chronoline.c:170
+#: ../objects/chronogram/chronoline.c:169
 msgid "Fall time"
 msgstr "Falltid"
 
-#: ../objects/chronogram/chronoline.c:171
+#: ../objects/chronogram/chronoline.c:170
 msgid "Multi-bit data"
 msgstr "Multi-bit data"
 
-#: ../objects/chronogram/chronoline.c:173
-#: ../objects/chronogram/chronoref.c:156
+#: ../objects/chronogram/chronoline.c:172
+#: ../objects/chronogram/chronoref.c:155
 msgid "Aspect"
 msgstr "Aspekt"
 
-#: ../objects/chronogram/chronoline.c:175
+#: ../objects/chronogram/chronoline.c:174
 msgid "Data color"
 msgstr "Datafarge"
 
-#: ../objects/chronogram/chronoline.c:177
+#: ../objects/chronogram/chronoline.c:176
 msgid "Data line width"
 msgstr "Data linjebredde"
 
-#: ../objects/chronogram/chronoref.c:144
+#: ../objects/chronogram/chronoref.c:143
 msgid "Time data"
 msgstr "Tidsdata"
 
-#: ../objects/chronogram/chronoref.c:150
+#: ../objects/chronogram/chronoref.c:149
 msgid "Major time step"
 msgstr "Stort tidssteg"
 
-#: ../objects/chronogram/chronoref.c:152
+#: ../objects/chronogram/chronoref.c:151
 msgid "Minor time step"
 msgstr "Mindre tidssteg"
 
-#: ../objects/chronogram/chronoref.c:162
+#: ../objects/chronogram/chronoref.c:161
 msgid "Minor step line width"
 msgstr "Mindre steg i linjebredde"
 
@@ -2998,34 +3203,33 @@ msgstr "Egendefinert"
 msgid "Custom XML shapes loader"
 msgstr "Egendefinert laster for XML-former"
 
-#: ../objects/custom/custom_object.c:208 ../objects/custom/custom_object.c:241
+#: ../objects/custom/custom_object.c:199 ../objects/custom/custom_object.c:232
 msgid "Flip horizontal"
 msgstr "Vend horisontalt"
 
-#: ../objects/custom/custom_object.c:210 ../objects/custom/custom_object.c:243
+#: ../objects/custom/custom_object.c:201 ../objects/custom/custom_object.c:234
 msgid "Flip vertical"
 msgstr "Vend vertikalt"
 
-#: ../objects/custom/custom_object.c:213 ../objects/custom/custom_object.c:246
+#: ../objects/custom/custom_object.c:204 ../objects/custom/custom_object.c:237
 msgid "Scale of the subshapes"
 msgstr ""
 
-#: ../objects/custom/custom_object.c:227 ../objects/flowchart/box.c:154
-#: ../objects/flowchart/diamond.c:152 ../objects/flowchart/ellipse.c:151
-#: ../objects/flowchart/parallelogram.c:156 ../objects/SADT/box.c:138
+#: ../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 "Tekstfyll"
 
-#: ../objects/custom/custom_object.c:1762
+#: ../objects/custom/custom_object.c:1776
 msgid "Flip Horizontal"
 msgstr "Vend horisontalt"
 
-#: ../objects/custom/custom_object.c:1763
+#: ../objects/custom/custom_object.c:1777
 msgid "Flip Vertical"
 msgstr "Vend vertikalt"
 
-#: ../objects/custom/custom_object.c:1800
-#: ../objects/custom_lines/custom_linetypes.c:281
+#: ../objects/custom/custom_object.c:1814
 #, c-format
 msgid "Cannot open icon file %s for object type '%s'."
 msgstr "Kan ikke åpne ikonfil %s for objekttype '%s'."
@@ -3040,16 +3244,11 @@ msgstr "Egendefinert"
 msgid "Custom XML lines loader"
 msgstr "Egendefinert laster for XML-former"
 
-#: ../objects/custom_lines/custom_linetypes.c:244
+#: ../objects/custom_lines/custom_linetypes.c:259
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
 msgstr ""
 
-#: ../objects/custom_lines/custom_linetypes.c:269
-#, c-format
-msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
-msgstr ""
-
-#: ../objects/custom/shape_info.c:165
+#: ../objects/custom/shape_info.c:170
 #, c-format
 msgid ""
 "The file '%s' has invalid path data.\n"
@@ -3058,31 +3257,31 @@ msgstr ""
 "Filen «%s» har ugyldige stidata.\n"
 "svg:path data må starte med moveto."
 
-#: ../objects/Database/compound.c:198
+#: ../objects/Database/compound.c:196
 msgid "Number of arms"
 msgstr "Antall armer"
 
-#: ../objects/Database/compound.c:221
+#: ../objects/Database/compound.c:219
 msgid "Flip arms vertically"
 msgstr "Vend armer vertikalt"
 
-#: ../objects/Database/compound.c:223
+#: ../objects/Database/compound.c:221
 msgid "Flip arms horizontally"
 msgstr "Vend armer horisontalt"
 
-#: ../objects/Database/compound.c:225
+#: ../objects/Database/compound.c:223
 msgid "Center mount point vertically"
 msgstr "Sentrer monteringspunkt vertikalt"
 
-#: ../objects/Database/compound.c:227
+#: ../objects/Database/compound.c:225
 msgid "Center mount point horizontally"
 msgstr "Sentrer monteringspunkt horisontalt"
 
-#: ../objects/Database/compound.c:229
+#: ../objects/Database/compound.c:227
 msgid "Center mount point"
 msgstr "Sentrer monteringspunkt"
 
-#: ../objects/Database/compound.c:234
+#: ../objects/Database/compound.c:232
 msgid "Compound"
 msgstr "Sammensatt"
 
@@ -3090,9 +3289,9 @@ msgstr "Sammensatt"
 msgid "Entity/Relationship table diagram objects"
 msgstr "Diagramobjekter for entitet/relasjon"
 
-#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:152
-#: ../objects/standard/box.c:150 ../objects/standard/polyline.c:137
-#: ../objects/standard/zigzagline.c:133
+#: ../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 "Hjørneradius:"
 
@@ -3104,32 +3303,32 @@ msgstr "Start beskrivelse"
 msgid "End description"
 msgstr "Avslutt beskrivelse"
 
-#: ../objects/Database/reference.c:121 ../objects/Database/table.c:214
-#: ../objects/Database/table.c:216 ../objects/Database/table.c:218
-#: ../objects/UML/association.c:248 ../objects/UML/association.c:259
-#: ../objects/UML/association.c:261 ../objects/UML/association.c:263
-#: ../objects/UML/association.c:265 ../objects/UML/association.c:267
-#: ../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 ../objects/UML/class.c:205
+#: ../objects/Database/reference.c:121 ../objects/Database/table.c:212
+#: ../objects/Database/table.c:214 ../objects/Database/table.c:216
+#: ../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:405
-#: ../objects/FS/flow-ortho.c:631 ../objects/GRAFCET/vector.c:311
-#: ../objects/SADT/arrow.c:463 ../objects/standard/zigzagline.c:382
-#: ../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:172
+#: ../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 "Legg til segment"
 
-#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:406
-#: ../objects/FS/flow-ortho.c:632 ../objects/GRAFCET/vector.c:312
-#: ../objects/SADT/arrow.c:464 ../objects/standard/zigzagline.c:383
-#: ../objects/UML/association.c:868 ../objects/UML/component_feature.c:191
-#: ../objects/UML/dependency.c:382 ../objects/UML/generalization.c:379
-#: ../objects/UML/realizes.c:369 ../objects/UML/transition.c:173
+#: ../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 "Slett segment"
 
@@ -3137,128 +3336,130 @@ msgstr "Slett segment"
 msgid "Reference"
 msgstr "Referanse"
 
-#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
-#: ../objects/Database/table.c:211 ../objects/UML/class.c:148
-#: ../objects/UML/class.c:191 ../objects/UML/class_dialog.c:486
+#: ../objects/Database/table.c:140 ../objects/Database/table.c:181
+#: ../objects/Database/table.c:209 ../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:18
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../objects/Database/table.c:144
+#: ../objects/Database/table.c:142
 msgid "Primary"
 msgstr "Primær"
 
-#: ../objects/Database/table.c:144
+#: ../objects/Database/table.c:142
 msgid "Primary key"
 msgstr "Hovednøkkel"
 
-#: ../objects/Database/table.c:146
+#: ../objects/Database/table.c:144
 msgid "Nullable"
 msgstr ""
 
-#: ../objects/Database/table.c:148
+#: ../objects/Database/table.c:146
 msgid "Unique"
 msgstr "Unik"
 
-#: ../objects/Database/table.c:150
+#: ../objects/Database/table.c:148
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../objects/Database/table.c:150
+#: ../objects/Database/table.c:148
 msgid "Default value"
 msgstr "Forvalgt verdi"
 
 #. init data
-#: ../objects/Database/table.c:179 ../objects/Database/table.c:269
-#: ../objects/Database/table.c:376 ../sheets/Database.sheet.in.h:3
+#: ../objects/Database/table.c:177 ../objects/Database/table.c:267
+#: ../objects/Database/table.c:374 ../sheets/Database.sheet.in.h:3
 msgid "Table"
 msgstr "Tabell"
 
-#: ../objects/Database/table.c:188
+#: ../objects/Database/table.c:186
 msgid "Visible comments"
 msgstr "Synlige kommentarer"
 
-#: ../objects/Database/table.c:190
+#: ../objects/Database/table.c:188
 msgid "Underline primary keys"
 msgstr ""
 
-#: ../objects/Database/table.c:193 ../objects/UML/class.c:171
+#: ../objects/Database/table.c:191 ../objects/UML/class.c:159
 #, fuzzy
 msgid "Comment tagging"
 msgstr "Lengde på kommentarlinje"
 
-#: ../objects/Database/table.c:195
+#: ../objects/Database/table.c:193
 msgid "Use bold font for primary keys"
 msgstr ""
 
-#: ../objects/Database/table.c:198 ../objects/UML/class.c:211
-#: ../objects/UML/object.c:152
+#: ../objects/Database/table.c:196 ../objects/UML/class.c:181
+#: ../objects/UML/object.c:150
 msgid "Attributes"
 msgstr "Attributter"
 
-#: ../objects/Database/table.c:202 ../objects/UML/association.c:270
-#: ../objects/UML/object.c:161
+#. umlformalparameters_extra
+#. all this just to make the defaults selectable ...
+#: ../objects/Database/table.c:200 ../objects/UML/association.c:269
+#: ../objects/UML/class.c:196 ../objects/UML/object.c:159
 msgid "Style"
 msgstr "Stil"
 
-#: ../objects/Database/table.c:203
+#: ../objects/Database/table.c:201 ../objects/UML/class.c:197
 msgid "Fonts"
 msgstr "Skrifter"
 
 #. property rows
-#: ../objects/Database/table.c:207 ../objects/SADT/arrow.c:136
-#: ../objects/UML/class.c:181 ../objects/UML/class_dialog.c:461
+#: ../objects/Database/table.c:205 ../objects/SADT/arrow.c:135
+#: ../objects/UML/class.c:201 ../objects/UML/class_dialog.c:461
 msgid "Normal"
 msgstr "Normal"
 
-#: ../objects/Database/table.c:209
+#: ../objects/Database/table.c:207
 msgid "Table name"
 msgstr "Navn på tabell"
 
-#: ../objects/Database/table.c:264 ../objects/UML/class.c:323
+#: ../objects/Database/table.c:262 ../objects/UML/class.c:342
 msgid "Show comments"
 msgstr "Vis kommentarer"
 
-#: ../objects/ER/attribute.c:153 ../objects/ER/entity.c:135
-#: ../objects/ER/relationship.c:140
+#: ../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:133
-#: ../objects/UML/generalization.c:130 ../objects/UML/realizes.c:130
+#: ../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 "Navn:"
 
-#: ../objects/ER/attribute.c:155
+#: ../objects/ER/attribute.c:154
 msgid "Key:"
 msgstr "Nøkkel:"
 
-#: ../objects/ER/attribute.c:157
+#: ../objects/ER/attribute.c:156
 msgid "Weak key:"
 msgstr "Svak nøkkel:"
 
-#: ../objects/ER/attribute.c:159
+#: ../objects/ER/attribute.c:158
 msgid "Derived:"
 msgstr "Utledet:"
 
-#: ../objects/ER/attribute.c:161
+#: ../objects/ER/attribute.c:160
 msgid "Multivalue:"
 msgstr "Multiverdi:"
 
-#: ../objects/ER/attribute.c:434 ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/attribute.c:433 ../sheets/ER.sheet.in.h:6
 msgid "Attribute"
 msgstr "Attributt"
 
-#: ../objects/ER/entity.c:137
+#: ../objects/ER/entity.c:136
 msgid "Weak:"
 msgstr "Svak:"
 
-#: ../objects/ER/entity.c:139
+#: ../objects/ER/entity.c:138
 msgid "Associative:"
 msgstr "Assosiativ:"
 
-#: ../objects/ER/entity.c:413 ../objects/UML/classicon.c:131
+#: ../objects/ER/entity.c:412 ../objects/UML/classicon.c:129
 #: ../sheets/ER.sheet.in.h:3
 msgid "Entity"
 msgstr "Enhet"
@@ -3267,27 +3468,27 @@ msgstr "Enhet"
 msgid "Entity/Relationship diagram objects"
 msgstr "Diagramobjekter for entitet/relasjon"
 
-#: ../objects/ER/participation.c:117
+#: ../objects/ER/participation.c:116
 msgid "Total:"
 msgstr "Total:"
 
-#: ../objects/ER/relationship.c:142
+#: ../objects/ER/relationship.c:141
 msgid "Left Cardinality:"
 msgstr "Venstrekardinalitet:"
 
-#: ../objects/ER/relationship.c:144
+#: ../objects/ER/relationship.c:143
 msgid "Right Cardinality:"
 msgstr "Høyrekardinalitet:"
 
-#: ../objects/ER/relationship.c:146
+#: ../objects/ER/relationship.c:145
 msgid "Rotate:"
 msgstr "Roter:"
 
-#: ../objects/ER/relationship.c:148
+#: ../objects/ER/relationship.c:147
 msgid "Identifying:"
 msgstr "Identifiserer:"
 
-#: ../objects/ER/relationship.c:457 ../sheets/ER.sheet.in.h:5
+#: ../objects/ER/relationship.c:456 ../sheets/ER.sheet.in.h:5
 msgid "Relationship"
 msgstr "Forhold"
 
@@ -3295,21 +3496,21 @@ msgstr "Forhold"
 msgid "Flowchart objects"
 msgstr "Objekter for flytdiagram"
 
-#: ../objects/flowchart/parallelogram.c:154
+#: ../objects/flowchart/parallelogram.c:152
 msgid "Shear angle"
 msgstr "Klippevinkel"
 
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow.c:136 ../objects/FS/flow.c:630
-#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:628
-#: ../objects/FS/function.c:1100
+#: ../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:1094
 msgid "Energy"
 msgstr "Energi"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:631
-#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:629
-#: ../objects/FS/function.c:1076
+#: ../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:1070
 msgid "Material"
 msgstr "Materiale"
 
@@ -3317,14 +3518,14 @@ msgstr "Materiale"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:632
-#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:630
-#: ../objects/FS/function.c:1038 ../objects/FS/function.c:1040
-#: ../objects/FS/function.c:1176 ../objects/FS/function.c:1178
+#: ../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:1032 ../objects/FS/function.c:1034
+#: ../objects/FS/function.c:1170 ../objects/FS/function.c:1172
 msgid "Signal"
 msgstr "Signal"
 
-#: ../objects/FS/flow.c:145 ../objects/FS/flow-ortho.c:168
+#: ../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
@@ -3338,319 +3539,319 @@ msgstr "Type:"
 msgid "Function structure diagram objects"
 msgstr "Diagramobjekter for funksjonsstruktur"
 
-#: ../objects/FS/function.c:143
+#: ../objects/FS/function.c:141
 msgid "Wish function"
 msgstr "Wish-funksjon"
 
-#: ../objects/FS/function.c:145
+#: ../objects/FS/function.c:143
 msgid "User function"
 msgstr "Bruker funksjon"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:680
+#: ../objects/FS/function.c:674
 msgid "Verb"
 msgstr "Verb"
 
 #. Translators: Menu item Verb/Channel
 #. Translators: Menu item Verb/Channel/Channel
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
-#: ../objects/FS/function.c:682 ../objects/FS/function.c:684
-#: ../objects/FS/function.c:724
+#: ../objects/FS/function.c:676 ../objects/FS/function.c:678
+#: ../objects/FS/function.c:718
 msgid "Channel"
 msgstr "Kanal"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:690 ../objects/KAOS/metabinrel.c:164
+#: ../objects/FS/function.c:684 ../objects/KAOS/metabinrel.c:164
 msgid "Input"
 msgstr "Inndata"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:692
+#: ../objects/FS/function.c:686
 msgid "Receive"
 msgstr "Motta"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:694 ../objects/FS/function.c:966
+#: ../objects/FS/function.c:688 ../objects/FS/function.c:960
 msgid "Allow"
 msgstr "Tillat"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:696
+#: ../objects/FS/function.c:690
 msgid "Form Entrance"
 msgstr "Fra inngang"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:698 ../objects/FS/function.c:932
+#: ../objects/FS/function.c:692 ../objects/FS/function.c:926
 msgid "Capture"
 msgstr "Hent"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:704
+#: ../objects/FS/function.c:698
 msgid "Discharge"
 msgstr "Lad ut"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:706
+#: ../objects/FS/function.c:700
 msgid "Eject"
 msgstr "Løs ut"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:708
+#: ../objects/FS/function.c:702
 msgid "Dispose"
 msgstr "Fjern"
 
 #. 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:712 ../objects/FS/function.c:714
-#: ../objects/FS/function.c:732
+#: ../objects/FS/function.c:706 ../objects/FS/function.c:708
+#: ../objects/FS/function.c:726
 msgid "Transfer"
 msgstr "Overfør"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:716 ../objects/FS/function.c:718
+#: ../objects/FS/function.c:710 ../objects/FS/function.c:712
 msgid "Transport"
 msgstr "Transport"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:720
+#: ../objects/FS/function.c:714
 msgid "Lift"
 msgstr "Løft"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:722
+#: ../objects/FS/function.c:716
 msgid "Move"
 msgstr "Flytt"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:726 ../objects/FS/function.c:728
+#: ../objects/FS/function.c:720 ../objects/FS/function.c:722
 msgid "Transmit"
 msgstr "Send"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:730
+#: ../objects/FS/function.c:724
 msgid "Conduct"
 msgstr "Utfør"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:734
+#: ../objects/FS/function.c:728
 msgid "Convey"
 msgstr "Formidle"
 
 #. 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:736 ../objects/FS/function.c:738
-#: ../objects/FS/function.c:740
+#: ../objects/FS/function.c:730 ../objects/FS/function.c:732
+#: ../objects/FS/function.c:734
 msgid "Guide"
 msgstr "Guide"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:742
+#: ../objects/FS/function.c:736
 msgid "Direct"
 msgstr "Rett"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:744
+#: ../objects/FS/function.c:738
 msgid "Straighten"
 msgstr "Rett ut"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:746
+#: ../objects/FS/function.c:740
 msgid "Steer"
 msgstr "Styr"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:748
+#: ../objects/FS/function.c:742
 msgid "Translate"
 msgstr "Oversett"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:750 ../objects/FS/function.c:752
+#: ../objects/FS/function.c:744 ../objects/FS/function.c:746
 msgid "Rotate"
 msgstr "Roter"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:754
+#: ../objects/FS/function.c:748
 msgid "Turn"
 msgstr "Vend"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:756
+#: ../objects/FS/function.c:750
 msgid "Spin"
 msgstr "Spinn"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-#: ../objects/FS/function.c:758 ../objects/FS/function.c:760
+#: ../objects/FS/function.c:752 ../objects/FS/function.c:754
 msgid "Allow DOF"
 msgstr "Tillat DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:762
+#: ../objects/FS/function.c:756
 msgid "Constrain"
 msgstr "Begrens"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:764
+#: ../objects/FS/function.c:758
 msgid "Unlock"
 msgstr "Lås opp"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:766 ../objects/FS/function.c:768
+#: ../objects/FS/function.c:760 ../objects/FS/function.c:762
 msgid "Support"
 msgstr "Støtte"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:770 ../objects/FS/function.c:772
+#: ../objects/FS/function.c:764 ../objects/FS/function.c:766
 #: ../sheets/SDL.sheet.in.h:16
 msgid "Stop"
 msgstr "Stopp"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:774
+#: ../objects/FS/function.c:768
 msgid "Insulate"
 msgstr "Insuler"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:776
+#: ../objects/FS/function.c:770
 msgid "Protect"
 msgstr "Beskytt"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:778 ../objects/FS/function.c:968
+#: ../objects/FS/function.c:772 ../objects/FS/function.c:962
 msgid "Prevent"
 msgstr "Forhindre"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:780
+#: ../objects/FS/function.c:774
 msgid "Shield"
 msgstr "Skjerm"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:782
+#: ../objects/FS/function.c:776
 msgid "Inhibit"
 msgstr "Hindre"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:784 ../objects/FS/function.c:786
+#: ../objects/FS/function.c:778 ../objects/FS/function.c:780
 msgid "Stabilize"
 msgstr "Stabiliser"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:788
+#: ../objects/FS/function.c:782
 msgid "Steady"
 msgstr "Støtt"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:790 ../objects/FS/function.c:792
+#: ../objects/FS/function.c:784 ../objects/FS/function.c:786
 msgid "Secure"
 msgstr "Sikre"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:794 ../objects/FS/function.c:826
+#: ../objects/FS/function.c:788 ../objects/FS/function.c:820
 msgid "Attach"
 msgstr "Legg ved"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:796
+#: ../objects/FS/function.c:790
 msgid "Mount"
 msgstr "Monter"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:798 ../sheets/ciscomisc.sheet.in.h:42
+#: ../objects/FS/function.c:792 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Lock"
 msgstr "Lås"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:800
+#: ../objects/FS/function.c:794
 msgid "Fasten"
 msgstr "Fest"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:802
+#: ../objects/FS/function.c:796
 msgid "Hold"
 msgstr "Hold"
 
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:804 ../objects/FS/function.c:806
+#: ../objects/FS/function.c:798 ../objects/FS/function.c:800
 #: ../objects/Istar/actor.c:68
 msgid "Position"
 msgstr "Posisjon"
 
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:808
+#: ../objects/FS/function.c:802
 msgid "Orient"
 msgstr "Orientering"
 
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:814 ../objects/FS/function.c:816
+#: ../objects/FS/function.c:808 ../objects/FS/function.c:810
 msgid "Connect"
 msgstr "Koble til"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:818 ../objects/FS/function.c:820
+#: ../objects/FS/function.c:812 ../objects/FS/function.c:814
 msgid "Couple"
 msgstr "Koble sammen"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:822
+#: ../objects/FS/function.c:816
 msgid "Join"
 msgstr "Slå sammen"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:824
+#: ../objects/FS/function.c:818
 msgid "Assemble"
 msgstr "Sett sammen"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:828 ../objects/FS/function.c:830
+#: ../objects/FS/function.c:822 ../objects/FS/function.c:824
 msgid "Mix"
 msgstr "Bland"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:832
+#: ../objects/FS/function.c:826
 msgid "Combine"
 msgstr "Slå sammen"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:834
+#: ../objects/FS/function.c:828
 msgid "Blend"
 msgstr "Bland"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:836
+#: ../objects/FS/function.c:830
 msgid "Add"
 msgstr "Legg til"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:838
+#: ../objects/FS/function.c:832
 msgid "Pack"
 msgstr "Pakk"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:840
+#: ../objects/FS/function.c:834
 msgid "Coalesce"
 msgstr "Slå sammen"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:842 ../objects/FS/function.c:844
+#: ../objects/FS/function.c:836 ../objects/FS/function.c:838
 #: ../sheets/UML.sheet.in.h:30
 msgid "Branch"
 msgstr "Forgreining"
@@ -3658,737 +3859,732 @@ msgstr "Forgreining"
 #. 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:846 ../objects/FS/function.c:848
-#: ../objects/FS/function.c:850
+#: ../objects/FS/function.c:840 ../objects/FS/function.c:842
+#: ../objects/FS/function.c:844
 msgid "Separate"
 msgstr "Separer"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:852
+#: ../objects/FS/function.c:846
 msgid "Switch"
 msgstr "Bytt"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:854
+#: ../objects/FS/function.c:848
 msgid "Divide"
 msgstr "Del opp"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:856
+#: ../objects/FS/function.c:850
 msgid "Release"
 msgstr "Slipp"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:858
+#: ../objects/FS/function.c:852
 msgid "Detach"
 msgstr "Ta av"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:860
+#: ../objects/FS/function.c:854
 msgid "Disconnect"
 msgstr "Koble fra"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:866
+#: ../objects/FS/function.c:860
 msgid "Cut"
 msgstr "Klipp"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:868
+#: ../objects/FS/function.c:862
 msgid "Polish"
 msgstr "Poler"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:870
+#: ../objects/FS/function.c:864
 msgid "Sand"
 msgstr "Puss"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:872
+#: ../objects/FS/function.c:866
 msgid "Drill"
 msgstr "Bor"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:874
+#: ../objects/FS/function.c:868
 msgid "Lathe"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:876 ../objects/FS/function.c:878
+#: ../objects/FS/function.c:870 ../objects/FS/function.c:872
 msgid "Refine"
 msgstr "Raffiner"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:880
+#: ../objects/FS/function.c:874
 msgid "Purify"
 msgstr "Rens"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:882
+#: ../objects/FS/function.c:876
 msgid "Strain"
 msgstr "Press"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:884
+#: ../objects/FS/function.c:878
 msgid "Filter"
 msgstr "Filtrer"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:886
+#: ../objects/FS/function.c:880
 msgid "Percolate"
 msgstr "Filtrer"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:888
+#: ../objects/FS/function.c:882
 msgid "Clear"
 msgstr "Tøm"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:890 ../objects/FS/function.c:892
+#: ../objects/FS/function.c:884 ../objects/FS/function.c:886
 msgid "Distribute"
 msgstr "Distribuer"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:894
+#: ../objects/FS/function.c:888
 msgid "Diverge"
 msgstr "Del"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:896
+#: ../objects/FS/function.c:890
 msgid "Scatter"
 msgstr "Spre"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:898
+#: ../objects/FS/function.c:892
 msgid "Disperse"
 msgstr "Spre"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:900 ../objects/FS/function.c:914
+#: ../objects/FS/function.c:894 ../objects/FS/function.c:908
 msgid "Diffuse"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:902
+#: ../objects/FS/function.c:896
 msgid "Empty"
 msgstr "Tøm"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:904 ../objects/FS/function.c:906
+#: ../objects/FS/function.c:898 ../objects/FS/function.c:900
 msgid "Dissipate"
 msgstr "Tilintetgjør"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:908
+#: ../objects/FS/function.c:902
 msgid "Absorb"
 msgstr "Ta opp"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:910
+#: ../objects/FS/function.c:904
 msgid "Dampen"
 msgstr "Fukt"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:912
+#: ../objects/FS/function.c:906
 msgid "Dispel"
 msgstr "Avvis"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:916
+#: ../objects/FS/function.c:910
 msgid "Resist"
 msgstr "Motstå"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:918 ../objects/FS/function.c:920
+#: ../objects/FS/function.c:912 ../objects/FS/function.c:914
 msgid "Provision"
 msgstr "Provisjon"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:922 ../objects/FS/function.c:924
+#: ../objects/FS/function.c:916 ../objects/FS/function.c:918
 msgid "Store"
 msgstr "Lagre"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:926
+#: ../objects/FS/function.c:920
 msgid "Contain"
 msgstr "Innehold"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:928
+#: ../objects/FS/function.c:922
 msgid "Collect"
 msgstr "Samle"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:930
+#: ../objects/FS/function.c:924
 msgid "Reserve"
 msgstr "Reserver"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:934 ../objects/FS/function.c:936
+#: ../objects/FS/function.c:928 ../objects/FS/function.c:930
 msgid "Supply"
 msgstr "Forsyn"
 
-#. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:938
-msgid "Fill"
-msgstr "Fyll"
-
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:940
+#: ../objects/FS/function.c:934
 msgid "Provide"
 msgstr "Gi"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:942
+#: ../objects/FS/function.c:936
 msgid "Replenish"
 msgstr "Fyll opp"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:944
+#: ../objects/FS/function.c:938
 msgid "Expose"
 msgstr "Vis"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:946 ../sheets/Flowchart.sheet.in.h:22
+#: ../objects/FS/function.c:940 ../sheets/Flowchart.sheet.in.h:22
 msgid "Extract"
 msgstr "Hent ut"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:948 ../objects/FS/function.c:950
+#: ../objects/FS/function.c:942 ../objects/FS/function.c:944
 msgid "Control Magnitude"
 msgstr "Kontroller størrelse"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:952 ../objects/FS/function.c:954
+#: ../objects/FS/function.c:946 ../objects/FS/function.c:948
 msgid "Actuate"
 msgstr "Aktuer"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:956
+#: ../objects/FS/function.c:950
 msgid "Start"
 msgstr "Start"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:958
+#: ../objects/FS/function.c:952
 msgid "Initiate"
 msgstr "Initier"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:960 ../objects/FS/function.c:962
+#: ../objects/FS/function.c:954 ../objects/FS/function.c:956
 msgid "Regulate"
 msgstr "Reguler"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:964 ../objects/FS/function.c:1182
-#: ../objects/UML/classicon.c:129
+#: ../objects/FS/function.c:958 ../objects/FS/function.c:1176
+#: ../objects/UML/classicon.c:127
 msgid "Control"
 msgstr "Kontroll"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:970
+#: ../objects/FS/function.c:964
 msgid "Enable"
 msgstr "Slå på"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:972
+#: ../objects/FS/function.c:966
 msgid "Disable"
 msgstr "Slå av"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:974
+#: ../objects/FS/function.c:968
 msgid "Limit"
 msgstr "Begrens"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:976
+#: ../objects/FS/function.c:970
 msgid "Interrupt"
 msgstr "Avbryt"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:978 ../objects/FS/function.c:980
+#: ../objects/FS/function.c:972 ../objects/FS/function.c:974
 msgid "Change"
 msgstr "Endre"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:982
+#: ../objects/FS/function.c:976
 msgid "Increase"
 msgstr "Øk"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:984
+#: ../objects/FS/function.c:978
 msgid "Decrease"
 msgstr "Minsk"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:986
+#: ../objects/FS/function.c:980
 msgid "Amplify"
 msgstr "Forsterk"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:988
+#: ../objects/FS/function.c:982
 msgid "Reduce"
 msgstr "Reduser"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:992
+#: ../objects/FS/function.c:986
 msgid "Normalize"
 msgstr "Normaliser"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:994
+#: ../objects/FS/function.c:988
 msgid "Multiply"
 msgstr "Multipliser"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
 #. FIXME: mark read-only
-#: ../objects/FS/function.c:996 ../objects/Misc/measure.c:186
+#: ../objects/FS/function.c:990 ../objects/Misc/measure.c:185
 msgid "Scale"
 msgstr "Skaler"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:998
+#: ../objects/FS/function.c:992
 msgid "Rectify"
 msgstr "Rett opp"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:1000
+#: ../objects/FS/function.c:994
 msgid "Adjust"
 msgstr "Juster"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:1002 ../objects/FS/function.c:1004
+#: ../objects/FS/function.c:996 ../objects/FS/function.c:998
 msgid "Form"
 msgstr "Formgi"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1006
+#: ../objects/FS/function.c:1000
 msgid "Compact"
 msgstr "Trykk sammen"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1008
+#: ../objects/FS/function.c:1002
 msgid "Crush"
 msgstr "Knus"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1010
+#: ../objects/FS/function.c:1004
 msgid "Shape"
 msgstr "Form"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1012
+#: ../objects/FS/function.c:1006
 msgid "Compress"
 msgstr "Trykk sammen"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1014
+#: ../objects/FS/function.c:1008
 msgid "Pierce"
 msgstr "Gjennomhull"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1016 ../objects/FS/function.c:1018
+#: ../objects/FS/function.c:1010 ../objects/FS/function.c:1012
 msgid "Convert"
 msgstr "Konverter"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1020
+#: ../objects/FS/function.c:1014
 msgid "Transform"
 msgstr "Overfør"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1022
+#: ../objects/FS/function.c:1016
 msgid "Liquefy"
 msgstr "Likvifiser"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1024
+#: ../objects/FS/function.c:1018
 msgid "Solidify"
 msgstr "Solidifiser"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1026
+#: ../objects/FS/function.c:1020
 msgid "Evaporate"
 msgstr "Fordamp"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1028
+#: ../objects/FS/function.c:1022
 msgid "Sublimate"
 msgstr "Sublimer"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1030
+#: ../objects/FS/function.c:1024
 msgid "Condense"
 msgstr "Kondenser"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1032
+#: ../objects/FS/function.c:1026
 msgid "Integrate"
 msgstr "Integrer"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1034
+#: ../objects/FS/function.c:1028
 msgid "Differentiate"
 msgstr "Differensier"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1036 ../sheets/AADL.sheet.in.h:3
+#: ../objects/FS/function.c:1030 ../sheets/AADL.sheet.in.h:3
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
 msgstr "Prosesser"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1042 ../objects/FS/function.c:1044
+#: ../objects/FS/function.c:1036 ../objects/FS/function.c:1038
 msgid "Sense"
 msgstr "Føl"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1046
+#: ../objects/FS/function.c:1040
 msgid "Perceive"
 msgstr "Sans"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1048
+#: ../objects/FS/function.c:1042
 msgid "Recognize"
 msgstr "Gjenkjenn"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1050
+#: ../objects/FS/function.c:1044
 msgid "Discern"
 msgstr "Tyd"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1052
+#: ../objects/FS/function.c:1046
 msgid "Check"
 msgstr "Sjekk"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1056
+#: ../objects/FS/function.c:1050
 msgid "Verify"
 msgstr "Verifiser"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1058 ../objects/FS/function.c:1060
+#: ../objects/FS/function.c:1052 ../objects/FS/function.c:1054
 msgid "Indicate"
 msgstr "Indiker"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1062
+#: ../objects/FS/function.c:1056
 msgid "Mark"
 msgstr "Merk"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1064 ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1058 ../sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "Vis"
 
 #. Translators: Menu item Verb/Signal/Measure
 #. Translators: Menu item Verb/Signal/Measure/Measure
-#: ../objects/FS/function.c:1066 ../objects/FS/function.c:1068
+#: ../objects/FS/function.c:1060 ../objects/FS/function.c:1062
 msgid "Measure"
 msgstr "Mål"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1070
+#: ../objects/FS/function.c:1064
 msgid "Calculate"
 msgstr "Kalkuler"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1072
+#: ../objects/FS/function.c:1066
 msgid "Represent"
 msgstr "Representer"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1074
+#: ../objects/FS/function.c:1068
 msgid "Noun"
 msgstr "Substantiv"
 
 #. Translators: Menu item Noun/Material/Solid
-#: ../objects/FS/function.c:1078
+#: ../objects/FS/function.c:1072
 msgid "Solid"
 msgstr "Helfylt"
 
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1080
+#: ../objects/FS/function.c:1074
 msgid "Liquid"
 msgstr "Flytende"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1082
+#: ../objects/FS/function.c:1076
 msgid "Gas"
 msgstr "Gass"
 
 #. Translators: Menu item Noun/Material/Human
 #. Translators: Menu item Noun/Material/Human/Human
 #. Translators: Menu item Noun/Energy/Human
-#: ../objects/FS/function.c:1084 ../objects/FS/function.c:1086
-#: ../objects/FS/function.c:1170
+#: ../objects/FS/function.c:1078 ../objects/FS/function.c:1080
+#: ../objects/FS/function.c:1164
 msgid "Human"
 msgstr "Menneskelig"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1088
+#: ../objects/FS/function.c:1082
 msgid "Hand"
 msgstr "Hånd"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1090
+#: ../objects/FS/function.c:1084
 msgid "Foot"
 msgstr "Fot"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1092
+#: ../objects/FS/function.c:1086
 msgid "Head"
 msgstr "Hode"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1094
+#: ../objects/FS/function.c:1088
 msgid "Finger"
 msgstr "Finger"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1096
+#: ../objects/FS/function.c:1090
 msgid "Toe"
 msgstr "Tå"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1098
+#: ../objects/FS/function.c:1092
 msgid "Biological"
 msgstr "Biologisk"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1102
+#: ../objects/FS/function.c:1096
 msgid "Mechanical"
 msgstr "Mekanisk"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1104
+#: ../objects/FS/function.c:1098
 msgid "Mech. Energy"
 msgstr "Mekanisk energi"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1106
+#: ../objects/FS/function.c:1100
 msgid "Translation"
 msgstr "Oversettelse"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1108
+#: ../objects/FS/function.c:1102
 msgid "Force"
 msgstr "Kraft"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1110 ../objects/standard/outline.c:206
+#: ../objects/FS/function.c:1104 ../objects/standard/outline.c:104
 msgid "Rotation"
 msgstr "Rotasjon"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1112
+#: ../objects/FS/function.c:1106
 msgid "Torque"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1114
+#: ../objects/FS/function.c:1108
 msgid "Random Motion"
 msgstr "Tilfeldig bevegelse"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1116
+#: ../objects/FS/function.c:1110
 msgid "Vibration"
 msgstr "Vibrasjon"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1118
+#: ../objects/FS/function.c:1112
 msgid "Rotational Energy"
 msgstr "Rotasjonsenergi"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1120
+#: ../objects/FS/function.c:1114
 msgid "Translational Energy"
 msgstr "Oversettbar energi"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1122
+#: ../objects/FS/function.c:1116
 msgid "Electrical"
 msgstr "Elektrisk"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1124
+#: ../objects/FS/function.c:1118
 msgid "Electricity"
 msgstr "Elektrisitet"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1126
+#: ../objects/FS/function.c:1120
 msgid "Voltage"
 msgstr "Spenning"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1128
+#: ../objects/FS/function.c:1122
 msgid "Current"
 msgstr "Strøm"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1130
+#: ../objects/FS/function.c:1124
 msgid "Hydraulic"
 msgstr "Hydraulisk"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1132
+#: ../objects/FS/function.c:1126
 msgid "Pressure"
 msgstr "Trykk"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1134
+#: ../objects/FS/function.c:1128
 msgid "Volumetric Flow"
 msgstr "Volumetrisk strøm"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1136
+#: ../objects/FS/function.c:1130
 msgid "Thermal"
 msgstr "Termisk"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1138
+#: ../objects/FS/function.c:1132
 msgid "Heat"
 msgstr "Varme"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1140
+#: ../objects/FS/function.c:1134
 msgid "Conduction"
 msgstr "Konduksjon"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1142
+#: ../objects/FS/function.c:1136
 msgid "Convection"
 msgstr "Konveksjon"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1144 ../objects/FS/function.c:1152
+#: ../objects/FS/function.c:1138 ../objects/FS/function.c:1146
 msgid "Radiation"
 msgstr "Stråling"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1146
+#: ../objects/FS/function.c:1140
 msgid "Pneumatic"
 msgstr "Pneumatisk"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1148
+#: ../objects/FS/function.c:1142
 msgid "Chemical"
 msgstr "Kjemisk"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1150
+#: ../objects/FS/function.c:1144
 msgid "Radioactive"
 msgstr "Radioaktiv"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1154
+#: ../objects/FS/function.c:1148
 msgid "Microwaves"
 msgstr "Mikrobølger"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1156
+#: ../objects/FS/function.c:1150
 msgid "Radio waves"
 msgstr "Radiobølger"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1158
+#: ../objects/FS/function.c:1152
 msgid "X-Rays"
 msgstr "Røngtenstråler"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1160
+#: ../objects/FS/function.c:1154
 msgid "Gamma Rays"
 msgstr "Gammastråler"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1162
+#: ../objects/FS/function.c:1156
 msgid "Acoustic Energy"
 msgstr "Akustisk energi"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1164
+#: ../objects/FS/function.c:1158
 msgid "Optical Energy"
 msgstr "Optisk energi"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1166
+#: ../objects/FS/function.c:1160
 msgid "Solar Energy"
 msgstr "Solenergi"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1168
+#: ../objects/FS/function.c:1162
 msgid "Magnetic Energy"
 msgstr "Magnetisk energi"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1172
+#: ../objects/FS/function.c:1166
 msgid "Human Motion"
 msgstr "Menneskelig bevegelse"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1174
+#: ../objects/FS/function.c:1168
 msgid "Human Force"
 msgstr "Menneskelig kraft"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1180
+#: ../objects/FS/function.c:1174
 msgid "Status"
 msgstr "Status"
 
-#: ../objects/FS/function.c:1184
+#: ../objects/FS/function.c:1178
 msgid "User/Device Fn"
 msgstr "Bruker/Enhetsfunksjon"
 
-#: ../objects/FS/function.c:1185
+#: ../objects/FS/function.c:1179
 msgid "Wish Fn"
 msgstr "Wish-funksjon"
 
-#: ../objects/GRAFCET/action.c:134 ../sheets/SDL.sheet.in.h:11
+#: ../objects/GRAFCET/action.c:132 ../sheets/SDL.sheet.in.h:11
 msgid "Macro call"
 msgstr "Makrokall"
 
-#: ../objects/GRAFCET/action.c:134
+#: ../objects/GRAFCET/action.c:132
 msgid "This action is a call to a macro-step"
 msgstr "Denne handlingen er et kall til et makro-steg"
 
-#: ../objects/GRAFCET/condition.c:130
+#: ../objects/GRAFCET/condition.c:129
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../objects/GRAFCET/condition.c:130
+#: ../objects/GRAFCET/condition.c:129
 msgid "The boolean equation of the condition"
 msgstr "Boolsk ligning for betingelsen"
 
-#: ../objects/GRAFCET/condition.c:132
+#: ../objects/GRAFCET/condition.c:131
 msgid "The condition's font"
 msgstr "Betingelsens skrifttype"
 
-#: ../objects/GRAFCET/condition.c:134
+#: ../objects/GRAFCET/condition.c:133
 msgid "The condition's font size"
 msgstr "Størrelse på skrifttype for betingelse"
 
-#: ../objects/GRAFCET/condition.c:137 ../objects/GRAFCET/transition.c:147
+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/transition.c:146
 msgid "Color"
 msgstr "Farge"
 
-#: ../objects/GRAFCET/condition.c:137
+#: ../objects/GRAFCET/condition.c:136
 msgid "The condition's color"
 msgstr "Farge for betingelse"
 
@@ -4396,113 +4592,113 @@ msgstr "Farge for betingelse"
 msgid "GRAFCET diagram objects"
 msgstr "GRAFCET diagramobjekter"
 
-#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:3
+#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:3
 msgid "Regular step"
 msgstr "Vanlig steg"
 
-#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:4
+#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:4
 msgid "Initial step"
 msgstr "Første steg"
 
-#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:5
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:5
 msgid "Macro entry step"
 msgstr "Makroens innledende steg"
 
-#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Macro exit step"
 msgstr "Makroens avsluttende steg"
 
-#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:7
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
 msgid "Macro call step"
 msgstr "Makroens kall-steg"
 
-#: ../objects/GRAFCET/step.c:152
+#: ../objects/GRAFCET/step.c:151
 msgid "Subprogram call step"
 msgstr "Underprograms kall-steg"
 
-#: ../objects/GRAFCET/step.c:159
+#: ../objects/GRAFCET/step.c:158
 msgid "Step name"
 msgstr "Navn på steg"
 
-#: ../objects/GRAFCET/step.c:159
+#: ../objects/GRAFCET/step.c:158
 msgid "The name of the step"
 msgstr "Navn på steget"
 
-#: ../objects/GRAFCET/step.c:162
+#: ../objects/GRAFCET/step.c:161
 msgid "Step type"
 msgstr "Stegtype"
 
-#: ../objects/GRAFCET/step.c:162
+#: ../objects/GRAFCET/step.c:161
 msgid "The kind of step"
 msgstr "Type steg"
 
-#: ../objects/GRAFCET/step.c:164
+#: ../objects/GRAFCET/step.c:163
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../objects/GRAFCET/step.c:164
+#: ../objects/GRAFCET/step.c:163
 msgid "Shows a red dot to figure the step's activity"
 msgstr "Viser en rød prikk for å synliggjøre stegets aktivitet"
 
-#: ../objects/GRAFCET/transition.c:140
+#: ../objects/GRAFCET/transition.c:139
 msgid "Receptivity"
 msgstr "Mottagelighet"
 
-#: ../objects/GRAFCET/transition.c:140
+#: ../objects/GRAFCET/transition.c:139
 msgid "The boolean equation of the receptivity"
 msgstr "Boolsk ligning for mottakelighet"
 
-#: ../objects/GRAFCET/transition.c:142
+#: ../objects/GRAFCET/transition.c:141
 msgid "The receptivity's font"
 msgstr "Skrifttype for mottakelighet"
 
-#: ../objects/GRAFCET/transition.c:144
+#: ../objects/GRAFCET/transition.c:143
 msgid "The receptivity's font size"
 msgstr "Størrelse på skrifttype for mottakelighet"
 
-#: ../objects/GRAFCET/transition.c:147
+#: ../objects/GRAFCET/transition.c:146
 msgid "The receptivity's color"
 msgstr "Farge for mottakelighet"
 
-#: ../objects/GRAFCET/transition.c:148
+#: ../objects/GRAFCET/transition.c:147
 msgid "North point"
 msgstr "Nordpunkt"
 
-#: ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/transition.c:148
 msgid "South point"
 msgstr "Sydpunkt"
 
-#: ../objects/GRAFCET/vector.c:128
+#: ../objects/GRAFCET/vector.c:126
 msgid "Draw arrow heads on upward arcs:"
 msgstr "Tegn pilhoder på oppoverpekende buer:"
 
-#: ../objects/GRAFCET/vergent.c:121
+#: ../objects/GRAFCET/vergent.c:120
 msgid "OR"
 msgstr "ELLER"
 
-#: ../objects/GRAFCET/vergent.c:122
+#: ../objects/GRAFCET/vergent.c:121
 msgid "AND"
 msgstr "OG"
 
-#: ../objects/GRAFCET/vergent.c:133
+#: ../objects/GRAFCET/vergent.c:132
 msgid "Vergent type:"
 msgstr "Vergenttype:"
 
-#: ../objects/GRAFCET/vergent.c:404 ../objects/Istar/other.c:469
-#: ../objects/Jackson/domain.c:531 ../objects/KAOS/goal.c:572
-#: ../objects/KAOS/other.c:523 ../objects/SADT/box.c:452
-#: ../objects/standard/line.c:225
+#: ../objects/GRAFCET/vergent.c:403 ../objects/Istar/other.c:466
+#: ../objects/Jackson/domain.c:528 ../objects/KAOS/goal.c:569
+#: ../objects/KAOS/other.c:520 ../objects/SADT/box.c:447
+#: ../objects/standard/line.c:318
 msgid "Add connection point"
 msgstr "Legg til forbindelsespunkt"
 
-#: ../objects/GRAFCET/vergent.c:405 ../objects/Istar/other.c:470
-#: ../objects/Jackson/domain.c:532 ../objects/KAOS/goal.c:573
-#: ../objects/KAOS/other.c:524 ../objects/SADT/box.c:453
-#: ../objects/standard/line.c:226
+#: ../objects/GRAFCET/vergent.c:404 ../objects/Istar/other.c:467
+#: ../objects/Jackson/domain.c:529 ../objects/KAOS/goal.c:570
+#: ../objects/KAOS/other.c:521 ../objects/SADT/box.c:448
+#: ../objects/standard/line.c:319
 msgid "Delete connection point"
 msgstr "Slett forbindelsespunkt"
 
-#: ../objects/GRAFCET/vergent.c:409
+#: ../objects/GRAFCET/vergent.c:408
 msgid "GRAFCET OR/AND vergent"
 msgstr "GRAFCET OG/ELLER vergent"
 
@@ -4514,7 +4710,7 @@ msgstr "Uspesifisert"
 msgid "Agent"
 msgstr "Agent"
 
-#: ../objects/Istar/actor.c:69 ../objects/UML/association.c:250
+#: ../objects/Istar/actor.c:69 ../objects/UML/association.c:249
 msgid "Role"
 msgstr "Rolle"
 
@@ -4526,8 +4722,8 @@ msgstr ""
 msgid "Goal"
 msgstr "Mål"
 
-#: ../objects/Istar/goal.c:154 ../objects/Istar/goal.c:155
-#: ../objects/KAOS/goal.c:157 ../objects/KAOS/goal.c:158
+#: ../objects/Istar/goal.c:153 ../objects/Istar/goal.c:154
+#: ../objects/KAOS/goal.c:156 ../objects/KAOS/goal.c:157
 msgid "Goal Type"
 msgstr "Måltype"
 
@@ -4563,7 +4759,7 @@ msgstr "Ressurs"
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../objects/Istar/other.c:475
+#: ../objects/Istar/other.c:472
 msgid "i* other"
 msgstr ""
 
@@ -4591,20 +4787,20 @@ msgstr ""
 msgid "Lexical"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:176 ../objects/Jackson/domain.c:177
+#: ../objects/Jackson/domain.c:175 ../objects/Jackson/domain.c:176
 msgid "Domain Type"
 msgstr "Domenetype"
 
-#: ../objects/Jackson/domain.c:181
+#: ../objects/Jackson/domain.c:180
 msgid "Domain Kind"
 msgstr "Type domene"
 
-#: ../objects/Jackson/domain.c:182
+#: ../objects/Jackson/domain.c:181
 #, fuzzy
 msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr "Identifikator som vises i nedre venstre hjørne av boksen"
 
-#: ../objects/Jackson/domain.c:537
+#: ../objects/Jackson/domain.c:534
 msgid "Jackson domain"
 msgstr "Jackson-domene"
 
@@ -4635,7 +4831,7 @@ msgstr "Antagelse"
 msgid "Obstacle"
 msgstr "Hindring"
 
-#: ../objects/KAOS/goal.c:578
+#: ../objects/KAOS/goal.c:575
 msgid "KAOS goal"
 msgstr "KAOS-mål"
 
@@ -4699,27 +4895,27 @@ msgstr "Utfører"
 msgid "Output"
 msgstr "Utdata"
 
-#: ../objects/KAOS/other.c:529
+#: ../objects/KAOS/other.c:526
 msgid "KAOS other"
 msgstr "KAOS annet"
 
-#: ../objects/Misc/analog_clock.c:137
+#: ../objects/Misc/analog_clock.c:136
 msgid "Arrow color"
 msgstr "Farge på pil"
 
-#: ../objects/Misc/analog_clock.c:139
+#: ../objects/Misc/analog_clock.c:138
 msgid "Arrow line width"
 msgstr "Linjebredde på viser"
 
-#: ../objects/Misc/analog_clock.c:141
+#: ../objects/Misc/analog_clock.c:140
 msgid "Seconds arrow color"
 msgstr "Farge på sekundviser"
 
-#: ../objects/Misc/analog_clock.c:143
+#: ../objects/Misc/analog_clock.c:142
 msgid "Seconds arrow line width"
 msgstr "Linjebredde på sekundviser"
 
-#: ../objects/Misc/analog_clock.c:145
+#: ../objects/Misc/analog_clock.c:144
 msgid "Show hours"
 msgstr "Vis timer"
 
@@ -4727,19 +4923,19 @@ msgstr "Vis timer"
 msgid "Diagram file"
 msgstr "Diagramfil"
 
-#: ../objects/Misc/grid_object.c:138
+#: ../objects/Misc/grid_object.c:137
 msgid "Rows"
 msgstr "Rader"
 
-#: ../objects/Misc/grid_object.c:140
+#: ../objects/Misc/grid_object.c:139
 msgid "Columns"
 msgstr "Kolonner"
 
-#: ../objects/Misc/grid_object.c:142
+#: ../objects/Misc/grid_object.c:141
 msgid "Grid line color"
 msgstr "Farge på linjer i rutenett"
 
-#: ../objects/Misc/grid_object.c:144
+#: ../objects/Misc/grid_object.c:143
 msgid "Grid line width"
 msgstr "Bredde på linjer i rutenett"
 
@@ -4747,48 +4943,64 @@ msgstr "Bredde på linjer i rutenett"
 msgid "Miscellaneous objects"
 msgstr "Forskjellige objekter"
 
-#: ../objects/Misc/measure.c:169
+#: ../objects/Misc/measure.c:168
+#, fuzzy
+msgctxt "length unit"
 msgid "cm"
 msgstr "cm"
 
-#: ../objects/Misc/measure.c:170
+#: ../objects/Misc/measure.c:169
+#, fuzzy
+msgctxt "length unit"
 msgid "dm"
 msgstr "dm"
 
-#: ../objects/Misc/measure.c:171
+#: ../objects/Misc/measure.c:170
+#, fuzzy
+msgctxt "length unit"
 msgid "ft"
 msgstr "ft"
 
-#: ../objects/Misc/measure.c:172
+#: ../objects/Misc/measure.c:171
+#, fuzzy
+msgctxt "length unit"
 msgid "in"
 msgstr "tomme"
 
-#: ../objects/Misc/measure.c:173
+#: ../objects/Misc/measure.c:172
+#, fuzzy
+msgctxt "length unit"
 msgid "m"
 msgstr "m"
 
-#: ../objects/Misc/measure.c:174
+#: ../objects/Misc/measure.c:173
+#, fuzzy
+msgctxt "length unit"
 msgid "mm"
 msgstr "mm"
 
-#: ../objects/Misc/measure.c:175
+#: ../objects/Misc/measure.c:174
+#, fuzzy
+msgctxt "length unit"
 msgid "pt"
 msgstr "pt"
 
-#: ../objects/Misc/measure.c:176
+#: ../objects/Misc/measure.c:175
+#, fuzzy
+msgctxt "length unit"
 msgid "pi"
 msgstr "pi"
 
 #. PROP_FLAG_VISIBLE|
-#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
+#: ../objects/Misc/measure.c:184 ../sheets/ChemEng.sheet.in.h:8
 msgid "Measurement"
 msgstr "Mål"
 
-#: ../objects/Misc/measure.c:187
+#: ../objects/Misc/measure.c:186
 msgid "Unit"
 msgstr "Enhet"
 
-#: ../objects/Misc/measure.c:188
+#: ../objects/Misc/measure.c:187
 msgid "Precision"
 msgstr "Presisjon"
 
@@ -4800,11 +5012,11 @@ msgstr "Legg til håndtak"
 msgid "Delete Handle"
 msgstr "Slett håndtak"
 
-#: ../objects/network/basestation.c:135
+#: ../objects/network/basestation.c:134
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: ../objects/network/basestation.c:399 ../objects/network/basestation.c:401
+#: ../objects/network/basestation.c:395 ../objects/network/basestation.c:397
 msgid "Base Station"
 msgstr "Basestasjon"
 
@@ -4812,7 +5024,7 @@ msgstr "Basestasjon"
 msgid "Network diagram objects"
 msgstr "Objekter for nettverksdiagram"
 
-#: ../objects/network/radiocell.c:120
+#: ../objects/network/radiocell.c:119
 msgid "Radius"
 msgstr "Radius"
 
@@ -4820,31 +5032,31 @@ msgstr "Radius"
 msgid "Width"
 msgstr "Bredde"
 
-#: ../objects/SADT/arrow.c:137
+#: ../objects/SADT/arrow.c:136
 msgid "Import resource (not shown upstairs)"
 msgstr "Importkilde (ikke vist ovenpå)"
 
-#: ../objects/SADT/arrow.c:138
+#: ../objects/SADT/arrow.c:137
 msgid "Imply resource (not shown downstairs)"
 msgstr "Implisitt kilde (ikke vist nedenunder)"
 
-#: ../objects/SADT/arrow.c:139
+#: ../objects/SADT/arrow.c:138
 msgid "Dotted arrow"
 msgstr "Prikket pil"
 
-#: ../objects/SADT/arrow.c:140
+#: ../objects/SADT/arrow.c:139
 msgid "disable arrow heads"
 msgstr "slå av pilhoder"
 
-#: ../objects/SADT/arrow.c:147
+#: ../objects/SADT/arrow.c:146
 msgid "Flow style:"
 msgstr "Flyttype:"
 
-#: ../objects/SADT/arrow.c:149
+#: ../objects/SADT/arrow.c:148
 msgid "Automatically gray vertical flows:"
 msgstr "Automatisk gråing av vertikale strømmer:"
 
-#: ../objects/SADT/arrow.c:150
+#: ../objects/SADT/arrow.c:149
 msgid ""
 "To improve the ease of reading, flows which begin and end vertically can be "
 "rendered gray"
@@ -4852,19 +5064,19 @@ msgstr ""
 "For å forbedre lesbarheten kan flyt som begynner og slutter vertikalt "
 "rendres grått"
 
-#: ../objects/SADT/arrow.c:469
+#: ../objects/SADT/arrow.c:468
 msgid "SADT Arrow"
 msgstr "SADT pil"
 
-#: ../objects/SADT/box.c:147
+#: ../objects/SADT/box.c:144
 msgid "Activity/Data identifier"
 msgstr "Identifikator for aktivitet/data"
 
-#: ../objects/SADT/box.c:148
+#: ../objects/SADT/box.c:145
 msgid "The identifier which appears in the lower-right corner of the Box"
 msgstr "Identifikator som vises i nedre høyre hjørne av boksen"
 
-#: ../objects/SADT/box.c:458
+#: ../objects/SADT/box.c:453
 msgid "SADT box"
 msgstr "SADT-boks"
 
@@ -4872,111 +5084,111 @@ msgstr "SADT-boks"
 msgid "SADT diagram objects"
 msgstr "SADT diagramobjekter"
 
-#: ../objects/standard/arc.c:144
+#: ../objects/standard/arc.c:120
 msgid "Curve distance"
 msgstr "Kurveavstand"
 
-#: ../objects/standard/bezier.c:140 ../objects/standard/line.c:144
-#: ../objects/standard/polyline.c:138
+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:126
+#: ../objects/standard/polyline.c:108
 msgid "Line gaps"
 msgstr "Linjeravstander"
 
-#: ../objects/standard/bezier.c:142 ../objects/standard/line.c:146
-#: ../objects/standard/polyline.c:140
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:128
+#: ../objects/standard/polyline.c:110
 msgid "Absolute start gap"
 msgstr ""
 
-#: ../objects/standard/bezier.c:144 ../objects/standard/line.c:148
-#: ../objects/standard/polyline.c:142
+#: ../objects/standard/bezier.c:149 ../objects/standard/line.c:130
+#: ../objects/standard/polyline.c:112
 msgid "Absolute end gap"
 msgstr ""
 
-#: ../objects/standard/bezier.c:752 ../objects/standard/beziergon.c:504
+#: ../objects/standard/bezier.c:776 ../objects/standard/beziergon.c:540
 msgid "Add Segment"
 msgstr "Legg til segment"
 
-#: ../objects/standard/bezier.c:753 ../objects/standard/beziergon.c:505
+#: ../objects/standard/bezier.c:777 ../objects/standard/beziergon.c:541
 msgid "Delete Segment"
 msgstr "Slett segment"
 
-#: ../objects/standard/bezier.c:755 ../objects/standard/beziergon.c:507
+#: ../objects/standard/bezier.c:779 ../objects/standard/beziergon.c:543
 msgid "Symmetric control"
 msgstr "Symmetrisk kontroll"
 
-#: ../objects/standard/bezier.c:757 ../objects/standard/beziergon.c:509
+#: ../objects/standard/bezier.c:781 ../objects/standard/beziergon.c:545
 msgid "Smooth control"
 msgstr "Jevn kontroll"
 
-#: ../objects/standard/bezier.c:759 ../objects/standard/beziergon.c:511
+#: ../objects/standard/bezier.c:783 ../objects/standard/beziergon.c:547
 msgid "Cusp control"
 msgstr "Cusp kontroll"
 
-#: ../objects/standard/box.c:137 ../objects/standard/ellipse.c:131
+#: ../objects/standard/box.c:130 ../objects/standard/ellipse.c:120
 msgid "Free"
 msgstr "Ledig"
 
-#: ../objects/standard/box.c:138 ../objects/standard/ellipse.c:132
+#: ../objects/standard/box.c:131 ../objects/standard/ellipse.c:121
 msgid "Fixed"
 msgstr "Fast"
 
-#: ../objects/standard/box.c:139 ../objects/standard/box.c:697
+#: ../objects/standard/box.c:132 ../objects/standard/box.c:782
 msgid "Square"
 msgstr "Firkantet"
 
-#: ../objects/standard/box.c:152 ../objects/standard/ellipse.c:144
+#: ../objects/standard/box.c:146 ../objects/standard/ellipse.c:133
 msgid "Aspect ratio"
 msgstr "Høyde-/breddeforhold"
 
-#: ../objects/standard/box.c:693 ../objects/standard/ellipse.c:671
+#: ../objects/standard/box.c:778 ../objects/standard/ellipse.c:686
 msgid "Free aspect"
 msgstr ""
 
-#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
+#: ../objects/standard/box.c:780 ../objects/standard/ellipse.c:688
 msgid "Fixed aspect"
 msgstr ""
 
-#: ../objects/standard/ellipse.c:133 ../objects/standard/ellipse.c:675
+#: ../objects/standard/ellipse.c:122 ../objects/standard/ellipse.c:690
 msgid "Circle"
 msgstr "Sirkel"
 
-#: ../objects/standard/image.c:143
+#: ../objects/standard/image.c:118
 msgid "Image file"
 msgstr "Bildefil"
 
-#: ../objects/standard/image.c:145
+#: ../objects/standard/image.c:120
 #, fuzzy
 msgid "Inline data"
 msgstr "Tidsdata"
 
-#: ../objects/standard/image.c:145
+#: ../objects/standard/image.c:120
 #, fuzzy
 msgid "Store image data in diagram"
 msgstr "Lag et nytt diagram"
 
-#: ../objects/standard/image.c:147
+#: ../objects/standard/image.c:122
 msgid "Pixbuf"
 msgstr ""
 
-#: ../objects/standard/image.c:147
+#: ../objects/standard/image.c:122
 #, fuzzy
 msgid "The Pixbuf reference"
 msgstr "Innstillinger"
 
-#: ../objects/standard/image.c:149
+#: ../objects/standard/image.c:124
 msgid "Draw border"
 msgstr "Tegn kant"
 
-#: ../objects/standard/image.c:151
+#: ../objects/standard/image.c:126
 msgid "Keep aspect ratio"
 msgstr "Behold høyde/bredde forhold"
 
-#: ../objects/standard/image.c:670
+#: ../objects/standard/image.c:683
 msgid "Inconsistent pixbuf during image save."
 msgstr ""
 
 #. Found file in same dir as diagram.
 #. Found file in current dir.
-#: ../objects/standard/image.c:767 ../objects/standard/image.c:778
+#: ../objects/standard/image.c:780 ../objects/standard/image.c:791
 #, c-format
 msgid ""
 "The image file '%s' was not found in the specified directory.\n"
@@ -4986,102 +5198,116 @@ msgstr ""
 "Bruker filen '%s' i stedet.\n"
 
 #. Didn't find file in current dir.
-#: ../objects/standard/image.c:784 ../objects/standard/image.c:806
+#: ../objects/standard/image.c:797 ../objects/standard/image.c:819
 #, c-format
 msgid "The image file '%s' was not found.\n"
 msgstr "Bildefilen '%s' ble ikke funnet.\n"
 
-#: ../objects/standard/line.c:135
+#: ../objects/standard/line.c:117
 msgid "Arrows"
 msgstr "Piler"
 
-#: ../objects/standard/line.c:140
+#: ../objects/standard/line.c:122
 msgid "Start point"
 msgstr "Startpunkt"
 
-#: ../objects/standard/line.c:142
+#: ../objects/standard/line.c:124
 msgid "End point"
 msgstr "Endepunkt"
 
-#: ../objects/standard/outline.c:204
+#: ../objects/standard/line.c:320
+msgid "Upgrade to Polyline"
+msgstr ""
+
+#: ../objects/standard/line.c:321
+#, fuzzy
+msgid "Upgrade to Zigzagline"
+msgstr "Sikksakk-linje"
+
+#: ../objects/standard/outline.c:102
 msgid "Text content"
 msgstr "Tekstinnhold"
 
-#: ../objects/standard/outline.c:206
+#: ../objects/standard/outline.c:104
 msgid "Angle to rotate the outline"
 msgstr ""
 
-#: ../objects/standard/polygon.c:470 ../objects/standard/polyline.c:634
+#: ../objects/standard/polygon.c:481 ../objects/standard/polyline.c:623
 msgid "Add Corner"
 msgstr "Legg til hjørne"
 
-#: ../objects/standard/polygon.c:471 ../objects/standard/polyline.c:635
+#: ../objects/standard/polygon.c:482 ../objects/standard/polyline.c:624
 msgid "Delete Corner"
 msgstr "Slett hjørne"
 
-#: ../objects/standard/standard.c:46
+#: ../objects/standard/standard.c:58
 msgid "Standard objects"
 msgstr "Standard objekter"
 
-#: ../objects/standard/textobj.c:137
+#: ../objects/standard/textobj.c:112
 msgid "First Line"
 msgstr "Første linje"
 
-#: ../objects/standard/textobj.c:144
+#: ../objects/standard/textobj.c:119
 msgid "Vertical text alignment"
 msgstr "Vertikal tekstjustering"
 
-#: ../objects/UML/actor.c:355 ../objects/UML/actor.c:357
+#: ../objects/standard/zigzagline.c:448
+#, fuzzy
+msgid "Upgrade to Bezierline"
+msgstr "Bezier linje"
+
+#: ../objects/UML/actor.c:351 ../objects/UML/actor.c:353
 #: ../sheets/UML.sheet.in.h:15
 msgid "Actor"
 msgstr "Aktør"
 
-#: ../objects/UML/association.c:222
+#: ../objects/UML/association.c:221
 msgid "From A to B"
 msgstr "Fra A til B"
 
-#: ../objects/UML/association.c:223
+#: ../objects/UML/association.c:222
 msgid "From B to A"
 msgstr "Fra B til A"
 
-#: ../objects/UML/association.c:228
+#: ../objects/UML/association.c:227
 msgid "Aggregation"
 msgstr "Aggregering"
 
-#: ../objects/UML/association.c:229
+#: ../objects/UML/association.c:228
 msgid "Composition"
 msgstr "Komposisjon"
 
-#: ../objects/UML/association.c:239
+#: ../objects/UML/association.c:238
 msgid "Direction"
 msgstr "Retning"
 
-#: ../objects/UML/association.c:241
+#: ../objects/UML/association.c:240
 msgid "Show direction"
 msgstr "Vis retning"
 
-#: ../objects/UML/association.c:241
+#: ../objects/UML/association.c:240
 msgid "Show the small arrow denoting the reading direction"
 msgstr ""
 
-#: ../objects/UML/association.c:248
+#: ../objects/UML/association.c:247
 msgid "Side A"
 msgstr "Side A"
 
-#: ../objects/UML/association.c:252
+#: ../objects/UML/association.c:251
 msgid "Multiplicity"
 msgstr "Multiplisietet"
 
-#: ../objects/UML/association.c:254 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/association.c:253 ../objects/UML/umlattribute.c:45
 #: ../objects/UML/umloperation.c:71
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: ../objects/UML/association.c:256
+#: ../objects/UML/association.c:255
 msgid "Show arrow"
 msgstr "Vis pil"
 
-#: ../objects/UML/association.c:259
+#: ../objects/UML/association.c:258
 msgid "Side B"
 msgstr "Side B"
 
@@ -5136,86 +5362,89 @@ msgstr "Implementasjon"
 msgid "Class scope"
 msgstr "Virkeområde for klasse"
 
-#: ../objects/UML/class.c:142 ../objects/UML/class.c:330
-#: ../objects/UML/class.c:1826 ../sheets/UML.sheet.in.h:3
+#: ../objects/UML/class.c:138 ../objects/UML/class.c:349
+#: ../objects/UML/class.c:1845 ../sheets/UML.sheet.in.h:3
 msgid "Class"
 msgstr "Klasse"
 
 #. 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:138
-#: ../objects/UML/classicon.c:140 ../objects/UML/component.c:125
-#: ../objects/UML/large_package.c:134 ../objects/UML/object.c:148
-#: ../objects/UML/small_package.c:127 ../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 "Stereotype"
 
-#: ../objects/UML/class.c:150 ../objects/UML/class.c:185
+#: ../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/uml.c:111
+#: ../objects/UML/class_operations_dialog.c:832
+#: ../objects/UML/umlattribute.c:48 ../objects/UML/uml.c:111
 msgid "Abstract"
 msgstr "Abstrakt"
 
-#: ../objects/UML/class.c:152 ../objects/UML/class.c:1823
-msgid "Template"
-msgstr "Mal"
-
-#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:368
-msgid "Suppress Attributes"
-msgstr "Skjul attributter"
-
-#: ../objects/UML/class.c:157
-msgid "Suppress Operations"
-msgstr "Skjul operasjoner"
-
-#: ../objects/UML/class.c:159
+#: ../objects/UML/class.c:151
 msgid "Visible Attributes"
 msgstr "Synlige attributter"
 
-#: ../objects/UML/class.c:161
+#: ../objects/UML/class.c:153
 msgid "Visible Operations"
 msgstr "Synlige operasjoner"
 
-#: ../objects/UML/class.c:163
+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:384
+msgid "Wrap Operations"
+msgstr "Operasjoner for bryting"
+
+#: ../objects/UML/class.c:157
 msgid "Visible Comments"
 msgstr "Synlige kommentarer"
 
-#: ../objects/UML/class.c:165 ../objects/UML/class_dialog.c:384
-msgid "Wrap Operations"
-msgstr "Operasjoner for bryting"
+#: ../objects/UML/class.c:161 ../objects/UML/class.c:344
+msgid "Allow resizing"
+msgstr "Tillat endring av størrelse"
+
+#: ../objects/UML/class.c:165 ../objects/UML/class.c:1842
+msgid "Template"
+msgstr "Mal"
+
+#: ../objects/UML/class.c:167 ../objects/UML/class_dialog.c:368
+msgid "Suppress Attributes"
+msgstr "Skjul attributter"
 
-#: ../objects/UML/class.c:167
+#: ../objects/UML/class.c:169
+msgid "Suppress Operations"
+msgstr "Skjul operasjoner"
+
+#: ../objects/UML/class.c:171
 msgid "Wrap after char"
 msgstr "Bryt etter tegn"
 
-#: ../objects/UML/class.c:169
+#: ../objects/UML/class.c:173
 msgid "Comment line length"
 msgstr "Lengde på kommentarlinje"
 
-#: ../objects/UML/class.c:173 ../objects/UML/class.c:325
-msgid "Allow resizing"
-msgstr "Tillat endring av størrelse"
+#. umlattribute_extra
+#: ../objects/UML/class.c:186
+msgid "Operations"
+msgstr "Operasjoner"
 
-#: ../objects/UML/class.c:183 ../objects/UML/class_dialog.c:466
+#. umloperations_extra
+#: ../objects/UML/class.c:190
+msgid "Template Parameters"
+msgstr "Parametere for maler"
+
+#: ../objects/UML/class.c:203 ../objects/UML/class_dialog.c:466
 msgid "Polymorphic"
 msgstr "Polymorfisk"
 
-#: ../objects/UML/class.c:187 ../objects/UML/class_dialog.c:476
+#: ../objects/UML/class.c:207 ../objects/UML/class_dialog.c:476
 msgid "Class Name"
 msgstr "Navn på klasse"
 
-#: ../objects/UML/class.c:189
+#: ../objects/UML/class.c:209
 msgid "Abstract Class Name"
 msgstr "Abstrakt klassenavn"
 
-#: ../objects/UML/class.c:213
-msgid "Operations"
-msgstr "Operasjoner"
-
-#: ../objects/UML/class.c:216
-msgid "Template Parameters"
-msgstr "Parametere for maler"
-
 #. Class page:
 #: ../objects/UML/class_dialog.c:320
 msgid "_Class"
@@ -5227,8 +5456,8 @@ msgstr "Navn på klasse:"
 
 #: ../objects/UML/class_dialog.c:336
 #: ../objects/UML/class_operations_dialog.c:799
-#: ../objects/UML/dependency.c:135 ../objects/UML/generalization.c:132
-#: ../objects/UML/realizes.c:132
+#: ../objects/UML/dependency.c:134 ../objects/UML/generalization.c:131
+#: ../objects/UML/realizes.c:131
 msgid "Stereotype:"
 msgstr "Stereotype:"
 
@@ -5296,11 +5525,11 @@ msgstr "Forgrunnsfarge"
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
 
-#: ../objects/UML/classicon.c:130
+#: ../objects/UML/classicon.c:128
 msgid "Boundary"
 msgstr "Grense"
 
-#: ../objects/UML/classicon.c:143
+#: ../objects/UML/classicon.c:141
 msgid "Is object"
 msgstr "Er et objekt"
 
@@ -5318,6 +5547,7 @@ msgid "Leaf (final)"
 msgstr "Løv (endelig)"
 
 #: ../objects/UML/class_operations_dialog.c:844
+#: ../objects/UML/umloperation.c:75
 msgid "Query"
 msgstr "Spørring"
 
@@ -5379,19 +5609,19 @@ msgstr "Malklasse"
 msgid "Formal parameter data"
 msgstr "Formelle parameterdata"
 
-#: ../objects/UML/component_feature.c:149 ../sheets/UML.sheet.in.h:21
+#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:21
 msgid "Facet"
 msgstr "Fasett"
 
-#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:22
+#: ../objects/UML/component_feature.c:149 ../sheets/UML.sheet.in.h:22
 msgid "Receptacle"
 msgstr ""
 
-#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:23
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:23
 msgid "Event Source"
 msgstr "Hendelseskilde"
 
-#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:24
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:24
 msgid "Event Sink"
 msgstr ""
 
@@ -5399,7 +5629,7 @@ msgstr ""
 msgid "Constraint:"
 msgstr "Begrensning:"
 
-#: ../objects/UML/dependency.c:137
+#: ../objects/UML/dependency.c:136
 msgid "Show arrow:"
 msgstr "Vis pil:"
 
@@ -5476,38 +5706,38 @@ msgstr "Rekursiv"
 msgid "Message type:"
 msgstr "Meldingstype:"
 
-#: ../objects/UML/object.c:150
+#: ../objects/UML/object.c:148
 msgid "Explicit state"
 msgstr "Eksplisitt tilstand"
 
-#: ../objects/UML/object.c:155
+#: ../objects/UML/object.c:153
 msgid "Active object"
 msgstr "Aktiver objekt"
 
-#: ../objects/UML/object.c:157
+#: ../objects/UML/object.c:155
 msgid "Show attributes"
 msgstr "Vis attributter"
 
-#: ../objects/UML/object.c:159
+#: ../objects/UML/object.c:157
 msgid "Multiple instance"
 msgstr "Flere hendelser"
 
-#: ../objects/UML/state.c:150
+#: ../objects/UML/state.c:147
 #, fuzzy
 msgid "Entry action"
 msgstr "Hent ut"
 
-#: ../objects/UML/state.c:151
+#: ../objects/UML/state.c:148
 msgid "Do action"
 msgstr "Utfør handling"
 
-#: ../objects/UML/state.c:152
+#: ../objects/UML/state.c:149
 msgid "Exit action"
 msgstr "Avslutt handling"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:492
+#: ../objects/UML/state.c:486
 #, fuzzy
 msgid ""
 "This diagram uses the State object for initial/final states.\n"
@@ -5518,7 +5748,7 @@ msgstr ""
 "Det alternativet vil forsvinne i fremtidige versjoner.\n"
 "Vennligst bruk objektet for start/sluttilstand i stedet\n"
 
-#: ../objects/UML/state_term.c:126
+#: ../objects/UML/state_term.c:125
 msgid "Is final"
 msgstr "Er endelig"
 
@@ -5547,12 +5777,13 @@ msgstr "Vakt"
 msgid "Condition for taking this transition when the event is fired"
 msgstr ""
 
-#: ../objects/UML/umlattribute.c:47
-msgid "Abstract (?)"
-msgstr "Abstrakt (?)"
+#: ../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 (C++ static class variable)"
 msgstr "Virkeområde for klasse (statisk)"
 
 #: ../objects/UML/uml.c:67
@@ -5560,18 +5791,24 @@ msgid "Unified Modelling Language diagram objects UML 1.3"
 msgstr "Unified Modelling Language diagramobjekter UML 1.3"
 
 #: ../objects/UML/umloperation.c:73
-msgid "Inheritance type"
+#, fuzzy
+msgid "Inheritance"
 msgstr "Type arv"
 
 #: ../objects/UML/umloperation.c:75
-msgid "Query (const)"
-msgstr "Spørring (konstant)"
+msgid "C++ const method"
+msgstr ""
 
-#: ../objects/UML/usecase.c:132
+#: ../objects/UML/umloperation.c:77
+#, fuzzy
+msgid "Class scope (C++ static method)"
+msgstr "Virkeområde for klasse (statisk)"
+
+#: ../objects/UML/usecase.c:130
 msgid "Collaboration"
 msgstr "Samarbeid"
 
-#: ../objects/UML/usecase.c:134
+#: ../objects/UML/usecase.c:132
 msgid "Text outside"
 msgstr "Tekst utenfor"
 
@@ -5597,81 +5834,81 @@ msgstr "Kan ikke skrive %d byte til %s"
 msgid "Clipboard copy failed"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:361 ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1500
+#: ../plug-ins/cairo/diacairo.c:362 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1504
 msgid "Nothing to print"
 msgstr "Ingen ting å skrive ut"
 
-#: ../plug-ins/cairo/diacairo.c:378
+#: ../plug-ins/cairo/diacairo.c:379
 msgid "Cairo PostScript"
 msgstr "Cairo PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:389
+#: ../plug-ins/cairo/diacairo.c:390
 msgid "Cairo Portable Document Format"
 msgstr "Cairo Portable Document Format"
 
-#: ../plug-ins/cairo/diacairo.c:401
+#: ../plug-ins/cairo/diacairo.c:402
 msgid "Cairo Scalable Vector Graphics"
 msgstr "Cairo skalerbar vektorgrafikk"
 
-#: ../plug-ins/cairo/diacairo.c:413
+#: ../plug-ins/cairo/diacairo.c:414
 msgid "CairoScript"
 msgstr "CairoScript"
 
-#: ../plug-ins/cairo/diacairo.c:424
+#: ../plug-ins/cairo/diacairo.c:425
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: ../plug-ins/cairo/diacairo.c:432
+#: ../plug-ins/cairo/diacairo.c:433
 msgid "Cairo PNG (with alpha)"
 msgstr "Cairo PNG (med alfa)"
 
-#: ../plug-ins/cairo/diacairo.c:442
+#: ../plug-ins/cairo/diacairo.c:443
 msgid "Cairo EMF"
 msgstr "Cairo EMF"
 
-#: ../plug-ins/cairo/diacairo.c:452
+#: ../plug-ins/cairo/diacairo.c:453
 msgid "Cairo WMF"
 msgstr "Cairo WMF"
 
-#: ../plug-ins/cairo/diacairo.c:466
+#: ../plug-ins/cairo/diacairo.c:467
 msgid "Cairo Clipboard Copy"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:480
+#: ../plug-ins/cairo/diacairo.c:481
 msgid "Copy _Diagram"
 msgstr "Kopier _diagram"
 
-#: ../plug-ins/cairo/diacairo.c:489
+#: ../plug-ins/cairo/diacairo.c:490
 msgid "Print (GTK) …"
 msgstr "Skriv ut (GTK+) …"
 
-#: ../plug-ins/cairo/diacairo.c:536
+#: ../plug-ins/cairo/diacairo.c:539
 msgid "Cairo-based Rendering"
 msgstr "Cairo-basert tegning"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:406
-#: ../plug-ins/cairo/diacairo-interactive.c:407
+#: ../plug-ins/cairo/diacairo-interactive.c:408
+#: ../plug-ins/cairo/diacairo-interactive.c:409
 #, fuzzy
 msgid "Zoom pointer"
 msgstr "Enkel skriver"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:413
-#: ../plug-ins/cairo/diacairo-interactive.c:414
+#: ../plug-ins/cairo/diacairo-interactive.c:415
+#: ../plug-ins/cairo/diacairo-interactive.c:416
 #, fuzzy
 msgid "Visible rect pointer"
 msgstr "Synlige attributter"
 
-#: ../plug-ins/cairo/diacairo-renderer.c:838
-#: ../plug-ins/cairo/diacairo-renderer.c:873 ../plug-ins/cgm/cgm.c:1125
-#: ../plug-ins/libart/dialibartrenderer.c:1325
-#: ../plug-ins/metapost/render_metapost.c:1110
-#: ../plug-ins/postscript/diapsrenderer.c:719
-#: ../plug-ins/pstricks/render_pstricks.c:826 ../plug-ins/wpg/wpg.c:891
+#: ../plug-ins/cairo/diacairo-renderer.c:985
+#: ../plug-ins/cairo/diacairo-renderer.c:1020 ../plug-ins/cgm/cgm.c:1135
+#: ../plug-ins/libart/dialibartrenderer.c:1329
+#: ../plug-ins/metapost/render_metapost.c:1108
+#: ../plug-ins/postscript/diapsrenderer.c:715
+#: ../plug-ins/pstricks/render_pstricks.c:825 ../plug-ins/wpg/wpg.c:901
 msgid "Not enough memory for image drawing."
 msgstr ""
 
-#: ../plug-ins/cgm/cgm.c:1118
+#: ../plug-ins/cgm/cgm.c:1128
 msgid ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
@@ -5679,24 +5916,24 @@ msgstr ""
 "Bildets radlengde større enn maksimum cellematrise.\n"
 "Bilde ikke eksportert til CGM."
 
-#: ../plug-ins/cgm/cgm.c:1381
+#: ../plug-ins/cgm/cgm.c:1392
 msgid "Computer Graphics Metafile"
 msgstr "Computer Graphics Metafile"
 
-#: ../plug-ins/cgm/cgm.c:1406
+#: ../plug-ins/cgm/cgm.c:1417
 msgid "Computer Graphics Metafile export filter"
 msgstr "Computer Graphics Metafile eksportfilter"
 
-#: ../plug-ins/drs/dia-render-script.c:158
-#: ../plug-ins/drs/dia-render-script.c:163
+#: ../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:187
+#: ../plug-ins/drs/dia-render-script.c:189
 msgid "DiaRenderScript filter"
 msgstr ""
 
-#: ../plug-ins/drs/dia-render-script-import.c:225
+#: ../plug-ins/drs/dia-render-script-import.c:226
 msgid "Broken file?"
 msgstr "Ødelagt fil?"
 
@@ -5704,16 +5941,16 @@ msgstr "Ødelagt fil?"
 msgid "Drawing Interchange File import and export filters"
 msgstr "Drawing Interchange File import- og eksportfilter"
 
-#: ../plug-ins/dxf/dxf-export.c:656 ../plug-ins/dxf/dxf-import.c:1390
+#: ../plug-ins/dxf/dxf-export.c:655 ../plug-ins/dxf/dxf-import.c:1389
 msgid "Drawing Interchange File"
 msgstr "Drawing Interchange File"
 
-#: ../plug-ins/dxf/dxf-import.c:1300
+#: ../plug-ins/dxf/dxf-import.c:1299
 #, c-format
 msgid "read_dxf_codes failed on '%s'"
 msgstr "read_dxf_codes feilet på «%s»"
 
-#: ../plug-ins/dxf/dxf-import.c:1307
+#: ../plug-ins/dxf/dxf-import.c:1306
 #, c-format
 msgid "Binary DXF from '%s' not supported"
 msgstr "Binær DXF fra «%s» er ikke støttet"
@@ -5726,77 +5963,73 @@ msgstr "HP Graphics Language"
 msgid "HP Graphics Language export filter"
 msgstr "HP Graphics Language eksportfilter"
 
-#: ../plug-ins/layout/layout.cpp:211
+#: ../plug-ins/layout/layout.cpp:235
 msgid "Please select edges and nodes to layout."
 msgstr ""
 
-#: ../plug-ins/layout/layout.cpp:219
+#: ../plug-ins/layout/layout.cpp:240
 #, fuzzy
 msgid "Graph creation failed"
 msgstr "Klarte ikke å lage «%s»"
 
-#: ../plug-ins/layout/layout.cpp:245
+#: ../plug-ins/layout/layout.cpp:266
 msgid "No such module."
 msgstr ""
 
-#: ../plug-ins/layout/layout.cpp:246
+#: ../plug-ins/layout/layout.cpp:267
 msgid "Out of memory."
 msgstr ""
 
-#: ../plug-ins/layout/layout.cpp:247
+#: ../plug-ins/layout/layout.cpp:268
 msgid "Not a tree."
 msgstr "Ikke et tre."
 
-#: ../plug-ins/layout/layout.cpp:248
+#: ../plug-ins/layout/layout.cpp:269
 msgid "Not a forest."
 msgstr "Ikke en skog."
 
-#: ../plug-ins/layout/layout.cpp:249
+#: ../plug-ins/layout/layout.cpp:270
 msgid "Failed algorithm."
 msgstr ""
 
-#: ../plug-ins/layout/layout.cpp:250
+#: ../plug-ins/layout/layout.cpp:271
 #, fuzzy
 msgid "Failed precondition."
 msgstr "Avslutt handling"
 
-#: ../plug-ins/layout/layout.cpp:251
+#: ../plug-ins/layout/layout.cpp:272
 msgid "OGDF crashed."
 msgstr "OGDF krasjet."
 
-#: ../plug-ins/layout/layout.cpp:252
+#: ../plug-ins/layout/layout.cpp:273
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: ../plug-ins/layout/layout.cpp:254
+#: ../plug-ins/layout/layout.cpp:275
 #, c-format
 msgid ""
 "Layout '%s' failed.\n"
 "%s"
 msgstr ""
 
-#: ../plug-ins/layout/layout.cpp:365
+#: ../plug-ins/layout/layout.cpp:416
 msgid "OGDF Layout Algorithms"
 msgstr ""
 
-#: ../plug-ins/libart/dialibart.c:59
+#: ../plug-ins/libart/dialibart.c:58
 msgid "Libart-based rendering"
 msgstr "Libart-basert tegning"
 
-#: ../plug-ins/libart/dialibartrenderer.c:304
-msgid "gdk_renderer: Unsupported fill mode specified!\n"
-msgstr "gdk_renderer: Ugyldig fyllmodus spesifisert!\n"
-
-#: ../plug-ins/libart/dialibartrenderer.c:1476
+#: ../plug-ins/libart/dialibartrenderer.c:1480
 msgid "Renderer transformation"
 msgstr ""
 
-#: ../plug-ins/libart/dialibartrenderer.c:1477
+#: ../plug-ins/libart/dialibartrenderer.c:1481
 #, fuzzy
 msgid "Transform pointer"
 msgstr "Overfør"
 
-#: ../plug-ins/libart/export_png.c:159 ../plug-ins/xslt/xslt.c:101
+#: ../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 "Kunne ikke åpne utfil %s: %s\n"
@@ -5834,10 +6067,36 @@ msgstr "PNG (utjevnet)"
 msgid "TeX Metapost export filter"
 msgstr "TeX Metapost eksportfilter"
 
-#: ../plug-ins/metapost/render_metapost.c:1268
+#: ../plug-ins/metapost/render_metapost.c:1267
 msgid "TeX Metapost macros"
 msgstr "TeX Metapost-makroer"
 
+#: ../plug-ins/pdf/pdf.c:29
+msgid "PDF import not available."
+msgstr ""
+
+#: ../plug-ins/pdf/pdf.c:37
+#, fuzzy
+msgid "Portable Document File"
+msgstr "Cairo Portable Document Format"
+
+#: ../plug-ins/pdf/pdf.c:55
+#, fuzzy
+msgid "PDF import filter"
+msgstr "WMF eksportfilter"
+
+#: ../plug-ins/pdf/pdf-import.cpp:400
+#, fuzzy, c-format
+msgid "Page %d"
+msgstr "Personsøker"
+
+#: ../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-eksportfilter"
@@ -5847,15 +6106,15 @@ msgstr "LaTeX PGF-eksportfilter"
 msgid "Not valid UTF-8"
 msgstr "Ikke gyldig UTF-8"
 
-#: ../plug-ins/pgf/render_pgf.c:1267
+#: ../plug-ins/pgf/render_pgf.c:1271
 msgid "LaTeX PGF macros"
 msgstr "LaTeX PGF-makroer"
 
-#: ../plug-ins/pixbuf/pixbuf.c:88
+#: ../plug-ins/pixbuf/pixbuf.c:86
 msgid "Failed to create pixbuf from drawable."
 msgstr ""
 
-#: ../plug-ins/pixbuf/pixbuf.c:93
+#: ../plug-ins/pixbuf/pixbuf.c:91
 #, c-format
 msgid ""
 "Could not save file:\n"
@@ -5864,18 +6123,18 @@ msgstr ""
 "Kunne ikke lagre fil:\n"
 "%s"
 
-#: ../plug-ins/pixbuf/pixbuf.c:114
+#: ../plug-ins/pixbuf/pixbuf.c:112
 msgid "Calling error, missing user_data."
 msgstr ""
 
-#: ../plug-ins/pixbuf/pixbuf.c:150
+#: ../plug-ins/pixbuf/pixbuf.c:141
 #, c-format
 msgid ""
 "Pixbuf[%s] can't load:\n"
 "%s"
 msgstr ""
 
-#: ../plug-ins/pixbuf/pixbuf.c:205
+#: ../plug-ins/pixbuf/pixbuf.c:196
 msgid "gdk-pixbuf-based bitmap export/import"
 msgstr "gdk-pixbuf-basert eksport/import av bitkart"
 
@@ -5916,19 +6175,19 @@ msgstr ""
 msgid "Print (PS)"
 msgstr "Skriv ut (PS)"
 
-#: ../plug-ins/postscript/postscript.c:71
+#: ../plug-ins/postscript/postscript.c:82
 msgid "PostScript Rendering"
 msgstr "PostScript tegning"
 
-#: ../plug-ins/postscript/render_eps.c:167
+#: ../plug-ins/postscript/render_eps.c:168
 msgid "Encapsulated PostScript (using Pango fonts)"
 msgstr "Encapsulated PostScript (bruker Pango-skrifter)"
 
-#: ../plug-ins/postscript/render_eps.c:176
+#: ../plug-ins/postscript/render_eps.c:177
 msgid "Encapsulated Postscript with preview (using Pango fonts)"
 msgstr ""
 
-#: ../plug-ins/postscript/render_eps.c:186
+#: ../plug-ins/postscript/render_eps.c:187
 #, fuzzy
 msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
 msgstr "Encapsulated Postskript (bruker Pango-skrifter)"
@@ -5937,16 +6196,16 @@ msgstr "Encapsulated Postskript (bruker Pango-skrifter)"
 msgid "TeX PSTricks export filter"
 msgstr "TeX PSTricks eksportfilter"
 
-#: ../plug-ins/pstricks/render_pstricks.c:994
+#: ../plug-ins/pstricks/render_pstricks.c:990
 msgid "TeX PSTricks macros"
 msgstr "TeX PSTricks makroer"
 
-#: ../plug-ins/python/pydia-render.c:932
+#: ../plug-ins/python/pydia-render.c:1115
 #, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "Kunne ikke åpne: «%s» for skriving.\n"
 
-#: ../plug-ins/python/python.c:96
+#: ../plug-ins/python/python.c:95
 msgid "Python scripting support"
 msgstr "Støtte for Python-skripting"
 
@@ -5954,15 +6213,15 @@ msgstr "Støtte for Python-skripting"
 msgid "Dia shape export filter"
 msgstr "Dia form-eksportfilter"
 
-#: ../plug-ins/shape/shape-export.c:471
+#: ../plug-ins/shape/shape-export.c:536
 msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
 msgstr ""
 
-#: ../plug-ins/shape/shape-export.c:485
+#: ../plug-ins/shape/shape-export.c:550
 msgid "Can't export PNG icon without export plugin!"
 msgstr "Kan ikke eksportere PNG-ikon uten tillegg for eksport!"
 
-#: ../plug-ins/shape/shape-export.c:511
+#: ../plug-ins/shape/shape-export.c:576
 msgid "Dia Shape File"
 msgstr "Dia form-fil"
 
@@ -5970,7 +6229,7 @@ msgstr "Dia form-fil"
 msgid "Scalable Vector Graphics import and export filters"
 msgstr "Import- og eksportfilter for skalerbar vektorgrafikk"
 
-#: ../plug-ins/svg/svg-import.c:324
+#: ../plug-ins/svg/svg-import.c:633
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -5978,85 +6237,120 @@ msgstr ""
 "Ugyldige stidata.\n"
 "svg:path må starte med moveto."
 
-#: ../plug-ins/svg/svg-import.c:1126
+#: ../plug-ins/svg/svg-import.c:1839
+msgid "'Shape Design' shapes missing."
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1873
+#, fuzzy, c-format
+msgid "Object '%s' creation failed"
+msgstr "Klarte ikke å lage «%s»"
+
+#: ../plug-ins/svg/svg-import.c:1895
 #, c-format
-msgid "Parse error for %s"
+msgid ""
+"Parse error for memory block.\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1909
+#, c-format
+msgid ""
+"SVG parser error for %s\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/svg/svg-import.c:1142
-msgid "Expected SVG Namespace not found in file"
+#. just a warning
+#: ../plug-ins/svg/svg-import.c:1915
+#, c-format
+msgid ""
+"SVG parser warning for %s\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1948
+#, fuzzy
+msgid "Expected SVG name-space not found in file"
 msgstr "Forventet SVG-navneområde ikke funnet i filen"
 
-#: ../plug-ins/svg/svg-import.c:1162
+#: ../plug-ins/svg/svg-import.c:1968
 #, c-format
 msgid "root element was '%s' -- expecting 'svg'."
 msgstr "rot-element var «%s» -- ventet «svg»."
 
-#: ../plug-ins/vdx/vdx.c:53
+#: ../plug-ins/vdx/vdx.c:54
 msgid "Visio XML Format import and export filter"
 msgstr "Import- og eksportfilter for Visio XML-format"
 
-#: ../plug-ins/vdx/vdx-export.c:1863
+#: ../plug-ins/vdx/vdx-export.c:1857
+#, c-format
+msgid "Saving file '%s' failed."
+msgstr ""
+
+#: ../plug-ins/vdx/vdx-export.c:1868
 msgid "Visio XML format"
 msgstr "Visio XML-format"
 
-#: ../plug-ins/vdx/vdx-import.c:221 ../plug-ins/xfig/xfig-import.c:1059
-#, 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"
 msgstr "Kunne ikke lese farge: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:534
-#, 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"
 msgstr "Kunne ikke finne form %d\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1009
+#: ../plug-ins/vdx/vdx-import.c:1011
 #, c-format
-msgid "Unexpected Ellipse object: %s\n"
+msgid "Unexpected Ellipse object: %s"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:1023
-msgid "Can't rotate ellipse\n"
+#: ../plug-ins/vdx/vdx-import.c:1025
+#, fuzzy
+msgid "Can't rotate ellipse"
 msgstr "Kan ikke rotere elipse\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1354
-msgid "MoveTo not at start of Bezier\n"
+#: ../plug-ins/vdx/vdx-import.c:1356
+msgid "MoveTo not at start of Bezier"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:1704
+#: ../plug-ins/vdx/vdx-import.c:1706
 msgid "Invalid NURBS formula"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:1962
+#: ../plug-ins/vdx/vdx-import.c:1964
 #, fuzzy, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "Kunne ikke identifiserte FIG-objekt: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:2879
+#: ../plug-ins/vdx/vdx-import.c:2888
+#, c-format
+msgid ""
+"VDX parser error for %s\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/vdx/vdx-import.c:2900
 #, fuzzy
 msgid "Nothing in document!"
 msgstr "Ingen ting å skrive ut"
 
-#: ../plug-ins/vdx/vdx-import.c:2884
+#: ../plug-ins/vdx/vdx-import.c:2905
 #, c-format
 msgid "Expecting VisioDocument, got %s"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:2968
+#: ../plug-ins/vdx/vdx-import.c:2989
 msgid "Visio XML File Format"
 msgstr "Visio XML-filformat"
 
-#: ../plug-ins/vdx/vdx-xml.c:3344
+#: ../plug-ins/vdx/vdx-xml.c:3343
 #, c-format
 msgid "Can't decode object %s"
 msgstr "Kan ikke dekode objekt %s."
 
-#: ../plug-ins/vdx/vdx-xml.c:5187
-#, c-format
-msgid "Can't write object %u"
-msgstr "Kan ikke skrive objekt %u"
-
-#: ../plug-ins/wmf/wmf.cpp:315
+#: ../plug-ins/wmf/wmf.cpp:316
 #, c-format
 msgid ""
 "Couldn't write file %s\n"
@@ -6065,50 +6359,50 @@ msgstr ""
 "Kunne ikke skrive fil %s\n"
 "%s"
 
-#: ../plug-ins/wmf/wmf.cpp:564
+#: ../plug-ins/wmf/wmf.cpp:567
 #, c-format
 msgid ""
 "Cannot render unknown font:\n"
 "%s"
 msgstr ""
 
-#: ../plug-ins/wmf/wmf.cpp:1511
+#: ../plug-ins/wmf/wmf.cpp:1515
 msgid "Print (GDI) ..."
 msgstr "Skriv ut (GDI) …"
 
-#: ../plug-ins/wmf/wmf.cpp:1527
+#: ../plug-ins/wmf/wmf.cpp:1531
 msgid "WMF export filter"
 msgstr "WMF eksportfilter"
 
-#: ../plug-ins/wpg/wpg.c:1196
+#: ../plug-ins/wpg/wpg.c:1207
 #, c-format
 msgid "File: %s type/version unsupported.\n"
 msgstr "Fil: %s type/versjon ikke støttet.\n"
 
-#: ../plug-ins/wpg/wpg.c:1326 ../plug-ins/wpg/wpg.c:1333
+#: ../plug-ins/wpg/wpg.c:1337 ../plug-ins/wpg/wpg.c:1344
 msgid "WPG"
 msgstr "WPG"
 
-#: ../plug-ins/wpg/wpg.c:1361
+#: ../plug-ins/wpg/wpg.c:1372
 msgid "WordPerfect Graphics export filter"
 msgstr "WordPerfect Graphics Metafile eksportfilter"
 
-#: ../plug-ins/xfig/xfig.c:51
+#: ../plug-ins/xfig/xfig.c:52
 msgid "Fig Format import and export filter"
 msgstr "Fig format import- og eksportfilter"
 
-#: ../plug-ins/xfig/xfig-export.c:464
+#: ../plug-ins/xfig/xfig-export.c:484
 #, fuzzy, c-format
 msgid "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
 msgstr ""
 "FIG-formatet har ingen ekvivalent for stil på pil %s Bruker en enkel pil.\n"
 
-#: ../plug-ins/xfig/xfig-export.c:487
+#: ../plug-ins/xfig/xfig-export.c:507
 #, fuzzy
 msgid "No more user-definable colors - using black"
 msgstr "Ikke flere brukerdefinerte farger - bruker sort"
 
-#: ../plug-ins/xfig/xfig-export.c:1214
+#: ../plug-ins/xfig/xfig-export.c:1234
 msgid "Xfig format"
 msgstr "Xfig-format"
 
@@ -6136,57 +6430,62 @@ msgstr "Linjestil %d burde ikke kommet til syne"
 msgid "Error while reading %dth of %d points"
 msgstr "Feil under lesing av %d av %d punkter"
 
-#: ../plug-ins/xfig/xfig-import.c:272
+#: ../plug-ins/xfig/xfig-import.c:253
+#, fuzzy
+msgid "Unexpected end of file."
+msgstr "For tidlig slutt på Fig-fil"
+
+#: ../plug-ins/xfig/xfig-import.c:273
 msgid "Error while reading arrowhead"
 msgstr "Feil under lesing av pilhodet"
 
-#: ../plug-ins/xfig/xfig-import.c:294
+#: ../plug-ins/xfig/xfig-import.c:295
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "Ukjent piltype %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:386
+#: ../plug-ins/xfig/xfig-import.c:387
 #, c-format
 msgid "Depth %d of of range, only 0-%d allowed.\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:434
+#: ../plug-ins/xfig/xfig-import.c:435
 msgid "Couldn't read ellipse info."
 msgstr "Kunne ikke lese informasjon om elipse."
 
-#: ../plug-ins/xfig/xfig-import.c:503
+#: ../plug-ins/xfig/xfig-import.c:504
 msgid "Couldn't read polyline info.\n"
 msgstr "Kunne ikke lese info om polilinje.\n"
 
-#: ../plug-ins/xfig/xfig-import.c:518
+#: ../plug-ins/xfig/xfig-import.c:519
 msgid "Couldn't read flipped bit."
 msgstr "Kunne ikke lese vendt bit."
 
-#: ../plug-ins/xfig/xfig-import.c:536
+#: ../plug-ins/xfig/xfig-import.c:537
 msgid "Negative corner radius; negating"
 msgstr "Negativ hjørneradius, negerer"
 
-#: ../plug-ins/xfig/xfig-import.c:579
+#: ../plug-ins/xfig/xfig-import.c:580
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "Ukjent undertype for polilinje: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:730 ../plug-ins/xfig/xfig-import.c:762
+#: ../plug-ins/xfig/xfig-import.c:732 ../plug-ins/xfig/xfig-import.c:764
 msgid "Couldn't read spline info."
 msgstr "Kunne ikke lese info om spline."
 
 #. Open approximated spline
 #. Closed approximated spline
-#: ../plug-ins/xfig/xfig-import.c:749 ../plug-ins/xfig/xfig-import.c:766
+#: ../plug-ins/xfig/xfig-import.c:751 ../plug-ins/xfig/xfig-import.c:768
 msgid "Cannot convert approximated spline yet."
 msgstr "Kan ikke konvertere tilnærmet spline ennå."
 
-#: ../plug-ins/xfig/xfig-import.c:804
+#: ../plug-ins/xfig/xfig-import.c:806
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr "Ukjent undertype for spline: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:870
+#: ../plug-ins/xfig/xfig-import.c:871
 msgid "Couldn't read arc info."
 msgstr "Kunne ikke lese informasjon om bue."
 
@@ -6196,7 +6495,7 @@ msgid "Filled arc treated as unfilled"
 msgstr ""
 
 #: ../plug-ins/xfig/xfig-import.c:903
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Unknown polyline arc: %d\n"
 msgstr "Ukjent undertype for polilinje."
 
@@ -6222,13 +6521,19 @@ msgstr "Kunne ikke identifiserte Fig-objekt."
 msgid "Compound end outside compound\n"
 msgstr "Sammensatt ende utenfor sammensatt objekt\n"
 
+#: ../plug-ins/xfig/xfig-import.c:1059
+#, c-format
+msgid "Couldn't read color: %s\n"
+msgstr "Kunne ikke lese farge: %s\n"
+
 #: ../plug-ins/xfig/xfig-import.c:1064
 #, c-format
 msgid "Color number %d out of range 0..%d.  Discarding color.\n"
 msgstr ""
 
 #: ../plug-ins/xfig/xfig-import.c:1111
-msgid "Couldn't read group extend."
+#, fuzzy
+msgid "Couldn't read group extent."
 msgstr "Kunne ikke lese gruppeutvidelse."
 
 #: ../plug-ins/xfig/xfig-import.c:1122
@@ -6310,41 +6615,43 @@ msgstr "For tidlig slutt på Fig-fil"
 msgid "Xfig File Format"
 msgstr "Xfig filformat"
 
-#: ../plug-ins/xslt/xslt.c:110
-#, c-format
-msgid "Error while parsing %s\n"
+#: ../plug-ins/xslt/xslt.c:114
+#, fuzzy, c-format
+msgid ""
+"Error while parsing %s\n"
+"%s"
 msgstr "Feil ved lesing av %s\n"
 
-#: ../plug-ins/xslt/xslt.c:119
+#: ../plug-ins/xslt/xslt.c:124
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "Feil ved lesing av stilark %s\n"
 
-#: ../plug-ins/xslt/xslt.c:126
+#: ../plug-ins/xslt/xslt.c:131
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "Feil ved påføring av stilark %s\n"
 
-#: ../plug-ins/xslt/xslt.c:135
+#: ../plug-ins/xslt/xslt.c:140
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "Feil ved lesing av stilark: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:144
+#: ../plug-ins/xslt/xslt.c:149
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "Feil ved påføring av stilark: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:152
+#: ../plug-ins/xslt/xslt.c:157
 #, c-format
 msgid "Error while saving result: %s\n"
 msgstr "Feil ved lagring av resultat: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:336
+#: ../plug-ins/xslt/xslt.c:343
 msgid "XSL Transformation filter"
 msgstr "Filter for XSL-transformering"
 
-#: ../plug-ins/xslt/xslt.c:363
+#: ../plug-ins/xslt/xslt.c:370
 msgid "No valid configuration files found for the XSLT plugin; not loading."
 msgstr ""
 "Ingen gyldige konfigurasjonfiler funnet for XSLT-tillegget, ikke lastet."
@@ -9448,14 +9755,10 @@ msgid "A KAOS performs"
 msgstr ""
 
 #: ../sheets/KAOS.sheet.in.h:22
-msgid "A KAOS operation"
-msgstr "En KAOS-operasjon"
-
-#: ../sheets/KAOS.sheet.in.h:23
 msgid "A KAOS input"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:24
+#: ../sheets/KAOS.sheet.in.h:23
 msgid "A KAOS output"
 msgstr ""
 
@@ -9598,8 +9901,9 @@ msgid "Resizable grid"
 msgstr ""
 
 #: ../sheets/Misc.sheet.in.h:11
-msgid "New-style group object, for testing"
-msgstr ""
+#, fuzzy
+msgid "Diagram object"
+msgstr "SADT diagramobjekter"
 
 #: ../sheets/MSE.sheet.in.h:1
 msgid "MSE"
@@ -9949,6 +10253,24 @@ msgstr "Retur fra prosedyre"
 msgid "Generic text note"
 msgstr "Vanlig tekstmelding"
 
+#: ../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 Point"
+msgstr "Forbindelsespunkter:"
+
+#: ../sheets/Shape_Design.sheet.in.h:4
+#, fuzzy
+msgid "Main Connection Point"
+msgstr "Legg til forbindelsespunkt"
+
 #: ../sheets/sybase.sheet.in.h:1
 msgid "Sybase"
 msgstr "Sybase"


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