Automated l10n update (.po files)

1 files changed, 1984 insertions, 1982 deletions

diff --git a/tde-i18n-nb/messages/tdesdk/umbrello.po b/tde-i18n-nb/messages/tdesdk/umbrello.po
index dc257d84cc9..48e50733ae5 100644
--- a/tde-i18n-nb/messages/tdesdk/umbrello.po
+++ b/tde-i18n-nb/messages/tdesdk/umbrello.po
@@ -8,16 +8,1008 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2006-04-23 14:28+0200\n"
 "Last-Translator: Jørgen Grønlund <jorgenhg@broadpark.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=n != 1;\n"
 
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
+#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
+#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
+#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
+#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
+#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
+#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
+#: rc.cpp:207 rc.cpp:445 rc.cpp:492
+#, no-c-format
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Knut Yrvin, Espen Fjellvær Olsen"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "knuty@skolelinux.no, espenfjo@gmail.com"
+
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Venstrejuster"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Høyrejuster"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Toppjuster"
+
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Bunnjuster"
+
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "AlignQt::Vertical Middle"
+msgstr "Midtstill loddrett"
+
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "AlignQt::Horizontal Middle"
+msgstr "Midtstill vannrett"
+
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "AlignQt::Vertical Distribute"
+msgstr "Midtstill loddrett"
+
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "AlignQt::Horizontal Distribute"
+msgstr "Midtstill vannrett"
+
+#: aligntoolbar.cpp:383
+#, fuzzy
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+msgstr ""
+"For å sidejustere må du markere minst to elementer. Du kan ikke sidejustere "
+"forbindelser."
+
+#: tips.txt:3
+msgid ""
+"<p>Welcome to Umbrello.</p>\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
+msgstr ""
+
+#: tips.txt:9
+msgid ""
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
+"code generation, externalizable folders, ability to change interfaces into "
+"classes, and more.</p>\n"
+msgstr ""
+
+#: tips.txt:14
+msgid ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
+"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
+"Settings.</p>\n"
+msgstr ""
+
+#: tips.txt:19
+msgid ""
+"<p>Most diagram items can not be resized, they will resize themselves to fit to "
+"their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and drag "
+"on the red square.</p>\n"
+msgstr ""
+
+#: tips.txt:25
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+msgstr ""
+
+#: tips.txt:30
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+msgstr ""
+
+#: tips.txt:37
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
+"Double click one for\n"
+"the Properties dialogue.</p>\n"
+msgstr ""
+
+#: tips.txt:43
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object box "
+"(rather than the vertical line) to make it a constructor.</p>\n"
+msgstr ""
+
+#: tips.txt:48
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
+"again to create an automessage.</p>\n"
+msgstr ""
+
+#: tips.txt:53
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then properly "
+"populated.\n"
+"</p>\n"
+msgstr ""
+
+#: tips.txt:60
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+msgstr ""
+
+#: tips.txt:66
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+
+#: tips.txt:71
+msgid ""
+"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+
+#: tips.txt:76
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+".</li>\n"
+"</ul>\n"
+msgstr ""
+
+#: tips.txt:86
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+
+#: tips.txt:91
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+msgstr ""
+
+#: tips.txt:97
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+msgstr ""
+
+#: tips.txt:103
+msgid ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+
+#: tips.txt:108
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the Code "
+"menu.</p>\n"
+msgstr ""
+
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Gjør mappe ekstern"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr "Det oppsto et problem med å lagre filen: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Lagringsfeil"
+
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Angi modellnavn:"
+
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Skriv inn et nytt navn på modellen:"
+
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Visninger"
+
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Navnet du skrev inn er ugyldig.\n"
+"Opprettelsesprosessen har blitt avbrutt."
+
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ugyldig navn"
+
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+"Navnet du skrev inn var ikke unikt.\n"
+"Er dette det du ønsker?"
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Navnet er ikke unikt"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Bruk navn"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Skriv inn nytt navn"
+
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Navnet du skrev inn er ikke unikt.\n"
+"Opprettelsesprosessen har blitt avbrutt."
+
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Opprettelse avbrutt"
+
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Laster listevisning …"
+
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Mappa må være tom før den kan slettes."
+
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Mappa er ikke tom"
+
+#: codegenerator.cpp:473
+msgid ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
+msgstr ""
+"Kan ikke åpne fila %1 for skriving. Kontroller at mappa finnes, og at du har "
+"skrivetilgang til den."
+
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "Kan ikke åpne filen"
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid ""
+"Cannot create the folder:\n"
+msgstr ""
+"Kunne ikke opprette mappen:\n"
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+"\n"
+"Vennligst sjekk tilgangsrettighetene"
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr "Kan ikke opprette mappe"
+
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr ""
+
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr ""
+
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr ""
+
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr ""
+
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr ""
+
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+msgid "Enter the name of the new activity:"
+msgstr "Navn på den nye aktiviteten:"
+
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "ny aktivitet"
+
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr ""
+
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr ""
+
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr ""
+
+#: operation.cpp:185
+msgid "new_parameter"
+msgstr ""
+
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
+msgstr ""
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "Oppgi navn:"
+
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importerer filen: %1"
+
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Klar."
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Er virkefeltet %1 et navnerom, eller en klasse?"
+
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++-importeringer krever din hjelp"
+
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Navneområde"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 249
+#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
+#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
+#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "Klasse"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2374
+#, fuzzy
+msgid "Class name expected"
+msgstr "Klasse"
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
+
+#: uml.cpp:179
+msgid "&Export model to DocBook"
+msgstr ""
+
+#: uml.cpp:182
+msgid "&Export model to XHTML"
+msgstr ""
+
+#: uml.cpp:186
+msgid "&New Class Wizard..."
+msgstr ""
+
+#: uml.cpp:188
+msgid "&Add Default Datatypes for Active Language"
+msgstr ""
+
+#: uml.cpp:193
+msgid "&Code Generation Wizard..."
+msgstr "&Veiviser for kodeopprettelse …"
+
+#: uml.cpp:195
+msgid "&Generate All Code"
+msgstr "&Lag all kode"
+
+#: uml.cpp:198
+msgid "&Import Classes..."
+msgstr "&Importer klasser …"
+
+#: uml.cpp:201
+msgid "Creates a new document"
+msgstr "Lag et nytt dokument"
+
+#: uml.cpp:202
+msgid "Opens an existing document"
+msgstr "Åpne et eksisterende dokument"
+
+#: uml.cpp:203
+msgid "Opens a recently used file"
+msgstr "Åpne en nylig brukt fil"
+
+#: uml.cpp:204
+msgid "Saves the document"
+msgstr "Lagre dokumentet"
+
+#: uml.cpp:205
+msgid "Saves the document as..."
+msgstr "Lagre dokumentet som …"
+
+#: uml.cpp:206
+msgid "Closes the document"
+msgstr "Lukk dokumentet"
+
+#: uml.cpp:207
+msgid "Prints out the document"
+msgstr "Skriv ut dokumentet"
+
+#: uml.cpp:208
+msgid "Quits the application"
+msgstr "Avslutt programmet"
+
+#: uml.cpp:209
+msgid "Exports the model to the docbook format"
+msgstr ""
+
+#: uml.cpp:210
+msgid "Exports the model to the XHTML format"
+msgstr ""
+
+#: uml.cpp:211
+msgid "Cuts the selected section and puts it to the clipboard"
+msgstr "Klipper ut utvalget og legger det på utklippstavla"
+
+#: uml.cpp:212
+msgid "Copies the selected section to the clipboard"
+msgstr "Kopierer det valgte utvalgte til utklippstavla"
+
+#: uml.cpp:213
+msgid "Pastes the contents of the clipboard"
+msgstr "Limer inn innholdet fra utklippstavla"
+
+#: uml.cpp:214
+msgid "Set the default program preferences"
+msgstr "Angi standardinnstillinger for programmet"
+
+#: uml.cpp:216
+msgid "Delete &Selected"
+msgstr "Slett &valgte"
+
+#: uml.cpp:224
+msgid "&Class Diagram..."
+msgstr "&Klassediagram …"
+
+#: uml.cpp:228
+msgid "&Autolayout..."
+msgstr "&Autoutforming …"
+
+#: uml.cpp:231
+msgid "&Sequence Diagram..."
+msgstr "&Sekvensdiagram …"
+
+#: uml.cpp:234
+msgid "C&ollaboration Diagram..."
+msgstr "&Samarbeidsdiagram …"
+
+#: uml.cpp:237
+msgid "&Use Case Diagram..."
+msgstr "&Usecase-diagram …"
+
+#: uml.cpp:240
+msgid "S&tate Diagram..."
+msgstr "&Tilstandsdiagram …"
+
+#: uml.cpp:243
+msgid "&Activity Diagram..."
+msgstr "&Aktivitetsdiagram …"
+
+#: uml.cpp:246
+msgid "Co&mponent Diagram..."
+msgstr "&Komponentdiagram …"
+
+#: uml.cpp:250
+msgid "&Deployment Diagram..."
+msgstr ""
+
+#: uml.cpp:254
+msgid "&Entity Relationship Diagram..."
+msgstr "&Entitetrelasjonsdiagram …"
+
+#: uml.cpp:258
+msgid "&Clear Diagram"
+msgstr "&Rensk diagram …"
+
+#: uml.cpp:260
+msgid "&Snap to Grid"
+msgstr "&Fest til rutenett"
+
+#: uml.cpp:262
+msgid "S&how Grid"
+msgstr "&Vis rutenett"
+
+#: uml.cpp:265
+msgid "&Hide Grid"
+msgstr "&Skjul rutenett"
+
+#: uml.cpp:269
+msgid "&Export as Picture..."
+msgstr "&Eksporter som bilde …"
+
+#: uml.cpp:271
+#, fuzzy
+msgid "Export &All Diagrams as Pictures..."
+msgstr "&Eksporter som bilde …"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Egenskaper"
+
+#: uml.cpp:286
+msgid "&Zoom Slider"
+msgstr "&Skaleringsglidebryter"
+
+#: uml.cpp:289
+#, c-format
+msgid "Z&oom to 100%"
+msgstr "S&kaler til 100 %"
+
+#: uml.cpp:295
+msgid "&Move Tab Left"
+msgstr "&Flytt fane til venstre"
+
+#: uml.cpp:296
+msgid "&Move Tab Right"
+msgstr "&Flytt fane til høyre"
+
+#: uml.cpp:308
+msgid "Select Diagram on Left"
+msgstr "Velg diagrammet til venstre"
+
+#: uml.cpp:309
+msgid "Select Diagram on Right"
+msgstr "Velg diagrammet til høyre"
+
+#: uml.cpp:327
+msgid "&Windows"
+msgstr "&Vinduer"
+
+#: uml.cpp:347
+#, c-format
+msgid " &33%"
+msgstr " &33%"
+
+#: uml.cpp:348
+#, c-format
+msgid " &50%"
+msgstr " &50%"
+
+#: uml.cpp:349
+#, c-format
+msgid " &75%"
+msgstr " &75%"
+
+#: uml.cpp:350
+#, c-format
+msgid "&100%"
+msgstr "&100%"
+
+#: uml.cpp:351
+#, c-format
+msgid "1&50%"
+msgstr "1&50%"
+
+#: uml.cpp:352
+#, c-format
+msgid "&200%"
+msgstr "&200%"
+
+#: uml.cpp:353
+#, c-format
+msgid "3&00%"
+msgstr "3&00%"
+
+#: uml.cpp:394
+msgid "Diagram Toolbar"
+msgstr "Verktøylinje for diagrammer"
+
+#: uml.cpp:398
+msgid "Alignment Toolbar"
+msgstr "Verktøylinje for justering"
+
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
+msgstr "Klassediagram …"
+
+#: listpopupmenu.cpp:618 uml.cpp:421
+msgid "Sequence Diagram..."
+msgstr "Sekvensdiagram …"
+
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
+msgstr "Samarbeidsdiagram …"
+
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
+msgstr "Usecase-diagram …"
+
+#: listpopupmenu.cpp:616 uml.cpp:424
+msgid "State Diagram..."
+msgstr "Tilstandsdiagram …"
+
+#: listpopupmenu.cpp:617 uml.cpp:425
+msgid "Activity Diagram..."
+msgstr "Aktivitetsdiagram …"
+
+#: listpopupmenu.cpp:521 uml.cpp:426
+msgid "Component Diagram..."
+msgstr "Komponentdiagram …"
+
+#: listpopupmenu.cpp:528 uml.cpp:427
+msgid "Deployment Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
+msgstr "Entitetsrelasjonsdiagram …"
+
+#: uml.cpp:458
+msgid "&Tree View"
+msgstr "&Trevisning"
+
+#: uml.cpp:467
+msgid "&Documentation"
+msgstr "&Dokumentasjon"
+
+#: uml.cpp:479 uml.cpp:664 uml.cpp:692
+msgid "Opening file..."
+msgstr "Åpner fil …"
+
+#: uml.cpp:650
+msgid "Creating new document..."
+msgstr "Oppretter nytt dokument …"
+
+#: uml.cpp:673
+#, fuzzy
+msgid ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi|Uncompressed XMI Files (*.xmi)\n"
+"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
+"*.mdl|Rose model files"
+msgstr ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Alle støttede filer(*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2)\n"
+"*.xmi|Ukomprimert XMI-filer (*.xmi)\n"
+"*.xmi.tgz|Gzip-komprimerte XMI-filer (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2-komprimerte XMI-filer (*.xmi.tar.bz2)"
+
+#: uml.cpp:677
+msgid "Open File"
+msgstr "Åpne fil"
+
+#: uml.cpp:716
+msgid "Saving file..."
+msgstr "Lagrer fil …"
+
+#: uml.cpp:727
+msgid "Saving file with a new filename..."
+msgstr "Lagrer fil med nytt filnavn …"
+
+#: uml.cpp:732
+msgid ""
+"*.xmi|XMI File\n"
+"*.xmi.tgz|Gzip Compressed XMI File\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
+"*|All Files"
+msgstr ""
+"*.xmi|XMI-fil\n"
+"*.xmi.tgz|Gzip-komprimert XMI-fil\n"
+"*.xmi.tar.bz2|Bzip2-komprimert XMI-fil\n"
+"*|Alle filer"
+
+#: uml.cpp:740
+msgid ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+msgstr ""
+"Fila %1 finnes.\n"
+"Vil du overskrive den?"
+
+#: uml.cpp:740
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: uml.cpp:764
+msgid "Closing file..."
+msgstr "Lukker fil …"
+
+#: uml.cpp:772
+msgid "Printing..."
+msgstr "Skriver ut …"
+
+#: uml.cpp:779
+#, c-format
+msgid "Print %1"
+msgstr "Skriv ut %1"
+
+#: uml.cpp:787
+msgid "Exiting..."
+msgstr "Avslutter …"
+
+#: uml.cpp:823
+msgid "Cutting selection..."
+msgstr "Klipper ut utvalg …"
+
+#: uml.cpp:836
+msgid "Copying selection to clipboard..."
+msgstr "Kopier utvalg til utklippstavle …"
+
+#: uml.cpp:844
+msgid "Inserting clipboard contents..."
+msgstr "Sett inn innhold fra utklippstavla …"
+
+#: uml.cpp:849
+msgid ""
+"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
+"may be of the wrong type to be pasted here."
+msgstr ""
+"Umbrello klarte ikke å lime inn innholdet fra utklippstavla. Objektene på "
+"utklippstavla kan være av en annen type enn den som kan limes inn her."
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+msgstr "Feil ved innliming"
+
+#: uml.cpp:863
+msgid "Toggling toolbar..."
+msgstr "Skru av/på verktøylinje …"
+
+#: uml.cpp:878
+msgid "Toggle the statusbar..."
+msgstr "Skru av/på statuslinje …"
+
+#: uml.cpp:1186
+msgid "Cannot view code until you generate some first."
+msgstr "Du må ha laget noe kode før du kan se på den."
+
+#: uml.cpp:1186 uml.cpp:1189
+msgid "Cannot View Code"
+msgstr "Kan ikke vise kode"
+
+#: uml.cpp:1189
+#, fuzzy
+msgid "Cannot view code from simple code writer."
+msgstr "Kan ikke vise kode fra "
+
+#: uml.cpp:1387
+msgid "*.idl|IDL Files (*.idl)"
+msgstr "*.idl|IDL-filer (*.idl)"
+
+#: uml.cpp:1389
+msgid "*.py|Python Files (*.py)"
+msgstr "*.py|Python-filer (*.py)"
+
+#: uml.cpp:1391
+msgid "*.java|Java Files (*.java)"
+msgstr "*.java|Java-filer (*.java)"
+
+#: uml.cpp:1393
+#, fuzzy
+msgid "*.pas|Pascal Files (*.pas)"
+msgstr "*.java|Java-filer (*.java)"
+
+#: uml.cpp:1395
+msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgstr "*.ads *.ada|Ada-filer (*.ads *.ada)"
+
+#: uml.cpp:1397
+msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+msgstr "*.h *.hh *.hpp *.hxx *.H|Header-filer (*.h *.hh *.hpp *.hxx *.H)"
+
+#: uml.cpp:1399
+msgid "All Files"
+msgstr "Alle filer"
+
+#: uml.cpp:1401
+msgid "Select Code to Import"
+msgstr "Velg kode som skal importeres"
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Navn"
+
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
+msgstr "Det er et ugyldig navn:"
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Ugyldig navn"
+
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Dette er et reservert nøkkelord for språket til den kodegeneratoren som er satt "
+"opp."
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reservert nøkkelord"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
+msgstr "Navnet er allerede i bruk."
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
+msgstr "Navnet er ikke unikt"
+
 #: worktoolbar.cpp:245
 msgid "Object"
 msgstr "Objekt"
@@ -87,14 +1079,6 @@ msgstr "Sammensettning"
 msgid "Use Case"
 msgstr "Skill mellom store og små bokstaver"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Klasse"
-
 #: listpopupmenu.cpp:1030 worktoolbar.cpp:263
 msgid "Initial State"
 msgstr "Starttilstand"
@@ -207,382 +1191,376 @@ msgstr "UDEFINERT"
 msgid "Select"
 msgstr "Valg"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#, fuzzy
+msgid "new_association"
+msgstr "ny_forbindelse"
+
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: umlwidgetcontroller.cpp:379
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel resize."
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Opprinnelig aktivitet"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Sluttaktivitet"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "Generelt"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "Generelle egenskaper"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "&Eksporter som bilde …"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Aktivitetstype:"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Aktivitetsnavn:"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML-modelleringsforfattere"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
-#, no-c-format
-msgid "Documentation"
-msgstr "Dokumentasjon"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Fil som skal åpnes"
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "Skriftinnstillinger"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Farge"
+#: docgenerators/main.cpp:64
+#, fuzzy
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "© 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML-modelleringsforfattere"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Elementfarger"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML-modelleringsforfattere"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Destinasjonsfila finnes allerede"
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Laster listevisning …"
 
-#: dialogs/overwritedialogue.cpp:31
+#: umlviewimageexporter.cpp:50
 msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
+"An error happened when exporting the image:\n"
 msgstr ""
-"Fila %1 finnes allerede i %2. \n"
-"Umbrello kan overskrive filen, lage et lignende filnavn, eller ikke lage denne "
-"fila."
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Legg til i alle gjenstående filer"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr ""
 
 #: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
 msgid "&Overwrite"
 msgstr "&Overskriv"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Opprett lignende filnavn"
+#: clipboard/umlclipboard.cpp:687
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Ikke lag filen"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-modell"
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktiviteter"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logisk visning"
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Ny aktivitet …"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Usecase-visning"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Endre navn"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentvisning"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Ny aktivitet"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Uplasseringsvisning"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Navn på den nye aktiviteten:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entitetsrelasjonmodell"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "ny aktivitet"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datatyper"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Endre navn på aktivitet"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Gjeldende fil har blitt modifisert.\n"
+"Vil du lagre den?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Navn på aktiviteten:"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Fila %1 finnes ikke."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
-msgstr "Egenskaper for kodeopprettelse"
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Innlastingsfeil"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Opprett"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Fila %1 ser ut til å være ødelagt."
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Fullfør"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Det ble ikke funnet en XMI-fil i den komprimerte fila %1."
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kode opprettet"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Det oppsto et problem med å laste den utpakkede filen: %1"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Ikke opprettet"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Det var et problem med å laste filen: %1"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ikke opprettet enda"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Det var et problem med å laste opp filen: %1"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Mappa %1 finnes ikke. Vil du lage den nå?"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "usecase-diagram"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Utdatamappa finnes ikke"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "klassediagram"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Opprett mappe"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "rekkediagram"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ikke opprett"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "samarbeidsdiagram"
 
-#: dialogs/codegenerationwizard.cpp:168
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
-msgstr ""
-"Mappa kunne ikke opprettes.\n"
-"Sørg for at du har skrivetilgang til foreldremappen, eller velg en annen gyldig "
-"mappe."
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "tilstandsdiagram"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Feil ved oppretting av mappe"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "aktivitetsdiagram"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Velg en gyldig mappe."
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "komponentdiagram"
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
-"Utdatamappa finnes, men er ikke skrivbar.\n"
-"Vennligst sett nødvendige tilganger, eller velg en annen mappe."
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Feil under skriving til utdatamappe"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "entitetsrelasjonsdiagram"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 er ikke en mappe. Velg en gyldig mappe."
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Dette er et ugyldig navn for et diagram."
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Velg en gyldig mappe"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "En annet diagram bruker dette navnet."
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Starttilstand"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Er du sikker på at du vil slette diagrammet %1?"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Sluttilstand"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Slett diagram"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tilstandstype:"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Setter opp dokumentet …"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Tilstandsnavn:"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Skjermelementsfarge"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Laster UML-elementer …"
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "Generelle innstillinger"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Laster diagrammer …"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Vis"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Vindusklasseinnstillinger"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagramfarger"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Navnet du har skrevet inn er ugyldig."
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Ugyldig navn"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Navnet du oppga er ikke unikt."
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1918
-#: umllistview.cpp:1925 umllistview.cpp:2162
-msgid "Name Not Unique"
-msgstr "Navnet er ikke unikt"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kodevisning"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr ""
 
 #: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
 #: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
 msgid "Attributes"
 msgstr "Egenskaper"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&y egenskap …"
-
 #: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
 #: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
 msgid "Operations"
 msgstr "Operasjoner"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&y operasjon …"
-
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Maler"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&y mal …"
-
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr ""
-
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid ""
+"An operation with that signature already exists in %1.\n"
 msgstr ""
+"En operasjon med denne signaturen finnes allerede i %1.\n"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entitetsegenskaper"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Velg et annet navn eller en annen parameterliste."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&y entitetsegenskap …"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Operasjonsnavn ugyldig"
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Egenskaper"
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Mappefila %1 finnes ikke."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Rolleegenskaper"
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Mappefila %1 kan ikke åpnes."
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Visningsalternativer"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Forbindelseegenskaper"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attributtinnstillinger"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
+#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
+#: rc.cpp:225
+#, no-c-format
+msgid "General"
+msgstr "Generelt"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operasjonsinnstillinger"
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
+msgstr "Generelle innstillinger"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Malinnstillinger"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roller"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Rolleegenskaper"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Innstillinger for entitetsegenskaper"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "Skriftinnstillinger"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Innholdsinnstillinger"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Forbindelsesskrift"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Forbindelser"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Ingen alternativer tilgjengelig.</p>"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klasseforbindelser"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 21
+#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#, no-c-format
+msgid "Code Viewer"
+msgstr "Kodevisning"
 
 #: dialogs/umloperationdialog.cpp:50
 msgid "Operation Properties"
 msgstr "Operasjonsegenskaper"
 
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "Generelle egenskaper"
+
 #: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
 #: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
 #: dialogs/umltemplatedialog.cpp:61
@@ -673,36 +1651,15 @@ msgstr "Parameternavnet du har valg er allerede i bruk i denne operasjonen."
 msgid "You have entered an invalid operation name."
 msgstr "Du har skrevet inn et ugyldig operasjonsnavn."
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operasjonsnavn ugyldig"
-
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"En operasjon med denne signaturen finnes allerede i %1.\n"
-
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Velg et annet navn eller en annen parameterliste."
-
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "ny_klasse"
-
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Ny_klasse"
-
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klasseattributter"
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "Navn:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klasseoperasjoner"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type:"
 
 #: dialogs/parmpropdlg.cpp:35
 msgid "Parameter Properties"
@@ -724,31 +1681,6 @@ msgstr ""
 "«inn» er en skrivebeskyttet parameter. «ut» er en lesebeskyttet parameter. "
 "«innut» er en parameter for både skriving og lesing."
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attributtegenskaper"
-
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Offentlig"
-
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Du har angitt et ugyldig attributtnavn."
-
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Attributtnavnet er ugyldig"
-
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Attributtnavnet du valgte er allerede i bruk i denne operasjonen."
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attributtnavnet er ikke unikt"
-
 #: dialogs/classgenpage.cpp:50
 msgid "Class &name:"
 msgstr "Klasse&navn:"
@@ -877,287 +1809,6 @@ msgstr ""
 msgid "Name is Not Unique"
 msgstr "Navnet er ikke unikt"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Egenskaper for entitetsattributter"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Standardverdi:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Lengde/Verdier:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Autoøk"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Tillat &null"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributter:"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksering"
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Ingen"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primær"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unik"
-
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Du har oppgitt et ugyldig navn til entitetsattributten."
-
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Navnet til entitetsattributten er ugyldig"
-
-#: dialogs/umlentityattributedialog.cpp:192
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-"Entitetsattributt-navnet du valgte er allerede i bruk i denne operasjonen."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Navnet til entitetsattributten er ikke unikt."
-
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrammer"
-
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
-
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Gjeldende diagram"
-
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Alle diagrammer"
-
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Velg diagram"
-
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Diagramtype"
-
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Utvalg"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Samarbeid"
-
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Rekke"
-
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Utplassering"
-
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
-
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Ingen diagram valgt."
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "A-rolleegenskaper"
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "B-rolleegenskaper"
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "A-rollesikt"
-
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "B-rollesikt"
-
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Rolle A, skiftbarhet"
-
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Rolle B, skiftbarhet"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rollenavn:"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, fuzzy, no-c-format
-msgid "Multiplicity:"
-msgstr "Mangfold:"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Offentlig"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Privat"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Beskyttet"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementasjon"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Skiftbar"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Fryst"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Bare legg til"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linje:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Fyll:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Standard"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Bruk fyll"
-
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Malegenskaper"
-
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Du har skrevet inn et ugyldig malnavn."
-
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Ugyldig malnavn"
-
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-"Navnet på malparameteren du har valgt er allerede i bruk i denne operasjonen."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Navnet på malen er ikke unikt"
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Velg en operasjon"
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Rekkefølgenummer:"
-
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klasseoperasjon:"
-
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Tilpasset operasjon:"
-
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "Notatdokumentasjon"
-
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Inneværende elementer"
-
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Forbindelseegenskaper"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roller"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Rolleegenskaper"
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Forbindelsesskrift"
-
 #: dialogs/settingsdlg.cpp:30
 msgid "Umbrello Setup"
 msgstr "Oppsett av Umbrello"
@@ -1170,6 +1821,14 @@ msgstr "Brukergrensesnitt"
 msgid "User Interface Settings"
 msgstr "Innstillinger for brukergrensesnitt"
 
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Farge"
+
 #: dialogs/settingsdlg.cpp:54
 msgid "Line color:"
 msgstr "Linjefarge:"
@@ -1347,6 +2006,30 @@ msgstr "Standard virkefelt for attributt:"
 msgid "Default operation scope:"
 msgstr "Standard virkefelt for operasjon:"
 
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
+#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
+#, no-c-format
+msgid "Public"
+msgstr "Offentlig"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
+#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
+#, no-c-format
+msgid "Private"
+msgstr "Privat"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
+#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
+#, no-c-format
+msgid "Protected"
+msgstr "Beskyttet"
+
 #: dialogs/settingsdlg.cpp:294
 msgid "Code Generation"
 msgstr "Kodeopprettelse"
@@ -1359,1282 +2042,621 @@ msgstr "Innstillinger for kodeopprettelse"
 msgid "Code Viewer Settings"
 msgstr "Innstillinger for kodevisning"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Ingen alternativer tilgjengelig.</p>"
-
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Vis"
-
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Operasjoner"
-
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Synlighet"
-
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "&Operasjonssignatur"
-
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Pakke"
-
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "&Attributter"
-
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Stereotyp"
-
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "&Attributtsignatur"
-
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Tegn som sirkel"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Navn:"
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Type:"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Forbindelser"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Gjør mappe ekstern"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Inneværende elementer"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
-msgstr "Det oppsto et problem med å lagre filen: %1"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Elementfarger"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Lagringsfeil"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Vis"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Angi modellnavn:"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Visningsalternativer"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Skriv inn et nytt navn på modellen:"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attributtinnstillinger"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Visninger"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operasjonsinnstillinger"
 
-#: umllistview.cpp:1907
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Navnet du skrev inn er ugyldig.\n"
-"Opprettelsesprosessen har blitt avbrutt."
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Maler"
 
-#: umllistview.cpp:1908 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ugyldig navn"
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Malinnstillinger"
 
-#: umldoc.cpp:1067 umllistview.cpp:1917
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
-"Navnet du skrev inn var ikke unikt.\n"
-"Er dette det du ønsker?"
-
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Use Name"
-msgstr "Bruk navn"
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Enter New Name"
-msgstr "Skriv inn nytt navn"
-
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
-"Navnet du skrev inn er ikke unikt.\n"
-"Opprettelsesprosessen har blitt avbrutt."
-
-#: umllistview.cpp:2119 umllistview.cpp:2136 umllistview.cpp:2151
-msgid "Creation canceled"
-msgstr "Opprettelse avbrutt"
 
-#: umllistview.cpp:2339
-msgid "Loading listview..."
-msgstr "Laster listevisning …"
-
-#: umllistview.cpp:2671
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Mappa må være tom før den kan slettes."
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entitetsegenskaper"
 
-#: umllistview.cpp:2672
-msgid "Folder Not Empty"
-msgstr "Mappa er ikke tom"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Innstillinger for entitetsegenskaper"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Navn"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Innholdsinnstillinger"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr ""
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klasseforbindelser"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr ""
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
+msgstr "Rolleegenskaper"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Egenskaper for entitetsattributter"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Standardverdi:"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Lengde/Verdier:"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Autoøk"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Tillat &null"
 
-#: codegenerator.cpp:473
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
-msgstr ""
-"Kan ikke åpne fila %1 for skriving. Kontroller at mappa finnes, og at du har "
-"skrivetilgang til den."
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributter:"
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
-msgstr "Kan ikke åpne filen"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksering"
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Kunne ikke opprette mappen:\n"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Ingen"
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
-msgstr ""
-"\n"
-"Vennligst sjekk tilgangsrettighetene"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primær"
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
-msgstr "Kan ikke opprette mappe"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Laster listevisning …"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unik"
 
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Du har oppgitt et ugyldig navn til entitetsattributten."
 
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Klar."
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Navnet til entitetsattributten er ugyldig"
 
-#: umlviewimageexporter.cpp:66
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Entitetsattributt-navnet du valgte er allerede i bruk i denne operasjonen."
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Venstrejuster"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Høyrejuster"
-
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Toppjuster"
-
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Bunnjuster"
-
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Midtstill loddrett"
-
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr "Midtstill vannrett"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Navnet til entitetsattributten er ikke unikt."
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Midtstill loddrett"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linje:"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Midtstill vannrett"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Fyll:"
 
-#: aligntoolbar.cpp:383
-#, fuzzy
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
-msgstr ""
-"For å sidejustere må du markere minst to elementer. Du kan ikke sidejustere "
-"forbindelser."
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Standard"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Oppgi navn:"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Bruk fyll"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
-msgstr "Det er et ugyldig navn:"
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Destinasjonsfila finnes allerede"
 
-#: object_factory.cpp:164
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"The file %1 already exists in %2.\n"
+"\n"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 msgstr ""
-"Dette er et reservert nøkkelord for språket til den kodegeneratoren som er satt "
-"opp."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reservert nøkkelord"
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-msgid "That name is already being used."
-msgstr "Navnet er allerede i bruk."
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-msgid "Not a Unique Name"
-msgstr "Navnet er ikke unikt"
+"Fila %1 finnes allerede i %2. \n"
+"Umbrello kan overskrive filen, lage et lignende filnavn, eller ikke lage denne "
+"fila."
 
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr ""
-"Kunne ikke opprette mappen:\n"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Legg til i alle gjenstående filer"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Opprett lignende filnavn"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Ikke lag filen"
 
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "ny_aktør"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Starttilstand"
 
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr ""
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Sluttilstand"
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "ny_pakke"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tilstandstype:"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "ny_komponent"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Tilstandsnavn:"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nytt_punkt"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Skjermelementsfarge"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr ""
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktiviteter"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nytt_grensesnitt"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&y egenskap …"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "ny_datatype"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&y operasjon …"
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr ""
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&y mal …"
 
-#: model_utils.cpp:262
-msgid "new_entity"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "nytt_punkt"
-
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-#, fuzzy
-msgid "new_association"
-msgstr "ny_forbindelse"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nytt_objekt"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&y entitetsegenskap …"
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Tom"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "ny_klasse"
 
-#: model_utils.cpp:559
-#, fuzzy
-msgid "Malformed argument"
-msgstr "Malformatert argument"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Ny_klasse"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Ukjent argumenttype"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klasseattributter"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Ulovlig navn på metode"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klasseoperasjoner"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Ukjent tilbakemeldingstype"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Ny aktivitet …"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Uspesifisert feil"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Endre navn"
 
-#: codeimport/classimport.cpp:34
-#, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importerer filen: %1"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Ny aktivitet"
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Er virkefeltet %1 et navnerom, eller en klasse?"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Endre navn på aktivitet"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++-importeringer krever din hjelp"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Navn på aktiviteten:"
 
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Navneområde"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrammer"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Gjeldende diagram"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Alle diagrammer"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Velg diagram"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Diagramtype"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Utvalg"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Samarbeid"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Rekke"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Utplassering"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Ingen diagram valgt."
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "A-rolleegenskaper"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr ""
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "B-rolleegenskaper"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "A-rollesikt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr ""
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "B-rollesikt"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr ""
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Rolle A, skiftbarhet"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr ""
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Rolle B, skiftbarhet"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr ""
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, no-c-format
+msgid "Rolename:"
+msgstr "Rollenavn:"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-#, fuzzy
-msgid "Class name expected"
-msgstr "Klasse"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, fuzzy, no-c-format
+msgid "Multiplicity:"
+msgstr "Mangfold:"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr ""
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, no-c-format
+msgid "Implementation"
+msgstr "Implementasjon"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr ""
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, no-c-format
+msgid "Changeable"
+msgstr "Skiftbar"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr ""
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, no-c-format
+msgid "Frozen"
+msgstr "Fryst"
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr ""
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
+#, no-c-format
+msgid "Add only"
+msgstr "Bare legg til"
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attributtegenskaper"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Offentlig"
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Du har angitt et ugyldig attributtnavn."
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Knut Yrvin, Espen Fjellvær Olsen"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Attributtnavnet er ugyldig"
 
-#: _translatorinfo.cpp:3
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "knuty@skolelinux.no, espenfjo@gmail.com"
-
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr "Umbrello UML-modellerer"
-
-#: main.cpp:40
-msgid "File to open"
-msgstr "Fil som skal åpnes"
-
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
-msgstr ""
-
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
-msgstr ""
-
-#: main.cpp:42
-msgid "the directory of the file"
-msgstr ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Attributtnavnet du valgte er allerede i bruk i denne operasjonen."
 
-#: main.cpp:43
-msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attributtnavnet er ikke unikt"
 
-#: main.cpp:95
-#, fuzzy
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr "© 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML-modelleringsforfattere"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Vis"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML-modelleringsforfattere"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Operasjoner"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML-modelleringsforfattere"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Synlighet"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Fil som skal åpnes"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "&Operasjonssignatur"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Pakke"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "© 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML-modelleringsforfattere"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "&Attributter"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "&Eksporter som bilde …"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Stereotyp"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "&Attributtsignatur"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisering"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Tegn som sirkel"
 
-#: association.cpp:88
-#, fuzzy
-msgid "Self Association"
-msgstr "Selvutvalg"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Vindusklasseinnstillinger"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Samarbeidsmelding"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagramfarger"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Rekkemelding"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Navnet du har skrevet inn er ugyldig."
 
-#: association.cpp:91
-#, fuzzy
-msgid "Collaboration Self Message"
-msgstr "Selvsammarbeidsmelding"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Navnet du oppga er ikke unikt."
 
-#: association.cpp:92
-#, fuzzy
-msgid "Sequence Self Message"
-msgstr "Selvrekkemelding"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, no-c-format
+msgid "Code Generation Options"
+msgstr "Egenskaper for kodeopprettelse"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisering"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Opprett"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni-forbindelse"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Fullfør"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-modell"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kode opprettet"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logisk visning"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Ikke opprettet"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Usecase-visning"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ikke opprettet enda"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentvisning"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Mappa %1 finnes ikke. Vil du lage den nå?"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Uplasseringsvisning"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Utdatamappa finnes ikke"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entitetsrelasjonmodell"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Opprett mappe"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datatyper"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ikke opprett"
 
-#: umldoc.cpp:229
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Gjeldende fil har blitt modifisert.\n"
-"Vil du lagre den?"
-
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Fila %1 finnes ikke."
-
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "Innlastingsfeil"
-
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Fila %1 ser ut til å være ødelagt."
-
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Det ble ikke funnet en XMI-fil i den komprimerte fila %1."
-
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Det oppsto et problem med å laste den utpakkede filen: %1"
-
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Det var et problem med å laste filen: %1"
-
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Det var et problem med å laste opp filen: %1"
-
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "usecase-diagram"
-
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "klassediagram"
-
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "rekkediagram"
-
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "samarbeidsdiagram"
-
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "tilstandsdiagram"
-
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "aktivitetsdiagram"
-
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "komponentdiagram"
-
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr ""
-
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "entitetsrelasjonsdiagram"
-
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Dette er et ugyldig navn for et diagram."
-
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "En annet diagram bruker dette navnet."
-
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Er du sikker på at du vil slette diagrammet %1?"
-
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Slett diagram"
-
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Setter opp dokumentet …"
-
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 msgstr ""
+"Mappa kunne ikke opprettes.\n"
+"Sørg for at du har skrivetilgang til foreldremappen, eller velg en annen gyldig "
+"mappe."
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Laster UML-elementer …"
-
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Laster diagrammer …"
-
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%1"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Tildeling av nytt navn ble avbrutt"
-
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Feil ved oppretting av mappe"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funksjonen er ikke implementert"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Velg en gyldig mappe."
 
-#: umllistviewitem.cpp:478
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Navnet du anga var ugyldig.\n"
-"Prosessen med å gi nytt navn ble avbrutt."
-
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Generelle innstillinger"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuell destruktør"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Lag tom konstruktør"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
+"Utdatamappa finnes, men er ikke skrivbar.\n"
+"Vennligst sett nødvendige tilganger, eller velg en annen mappe."
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Feil under skriving til utdatamappe"
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 er ikke en mappe. Velg en gyldig mappe."
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Velg en gyldig mappe"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr ""
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Velg en operasjon"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr ""
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Rekkefølgenummer:"
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr ""
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klasseoperasjon:"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr ""
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Tilpasset operasjon:"
 
-#: uml.cpp:179
-msgid "&Export model to DocBook"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Malegenskaper"
 
-#: uml.cpp:182
-msgid "&Export model to XHTML"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Du har skrevet inn et ugyldig malnavn."
 
-#: uml.cpp:186
-msgid "&New Class Wizard..."
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Ugyldig malnavn"
 
-#: uml.cpp:188
-msgid "&Add Default Datatypes for Active Language"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Navnet på malparameteren du har valgt er allerede i bruk i denne operasjonen."
 
-#: uml.cpp:193
-msgid "&Code Generation Wizard..."
-msgstr "&Veiviser for kodeopprettelse …"
-
-#: uml.cpp:195
-msgid "&Generate All Code"
-msgstr "&Lag all kode"
-
-#: uml.cpp:198
-msgid "&Import Classes..."
-msgstr "&Importer klasser …"
-
-#: uml.cpp:201
-msgid "Creates a new document"
-msgstr "Lag et nytt dokument"
-
-#: uml.cpp:202
-msgid "Opens an existing document"
-msgstr "Åpne et eksisterende dokument"
-
-#: uml.cpp:203
-msgid "Opens a recently used file"
-msgstr "Åpne en nylig brukt fil"
-
-#: uml.cpp:204
-msgid "Saves the document"
-msgstr "Lagre dokumentet"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Navnet på malen er ikke unikt"
 
-#: uml.cpp:205
-msgid "Saves the document as..."
-msgstr "Lagre dokumentet som …"
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "Notatdokumentasjon"
 
-#: uml.cpp:206
-msgid "Closes the document"
-msgstr "Lukk dokumentet"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Opprinnelig aktivitet"
 
-#: uml.cpp:207
-msgid "Prints out the document"
-msgstr "Skriv ut dokumentet"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Sluttaktivitet"
 
-#: uml.cpp:208
-msgid "Quits the application"
-msgstr "Avslutt programmet"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Aktivitetstype:"
 
-#: uml.cpp:209
-msgid "Exports the model to the docbook format"
-msgstr ""
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Aktivitetsnavn:"
 
-#: uml.cpp:210
-msgid "Exports the model to the XHTML format"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
+#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
+#, no-c-format
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#: uml.cpp:211
-msgid "Cuts the selected section and puts it to the clipboard"
-msgstr "Klipper ut utvalget og legger det på utklippstavla"
-
-#: uml.cpp:212
-msgid "Copies the selected section to the clipboard"
-msgstr "Kopierer det valgte utvalgte til utklippstavla"
-
-#: uml.cpp:213
-msgid "Pastes the contents of the clipboard"
-msgstr "Limer inn innholdet fra utklippstavla"
-
-#: uml.cpp:214
-msgid "Set the default program preferences"
-msgstr "Angi standardinnstillinger for programmet"
-
-#: uml.cpp:216
-msgid "Delete &Selected"
-msgstr "Slett &valgte"
-
-#: uml.cpp:224
-msgid "&Class Diagram..."
-msgstr "&Klassediagram …"
-
-#: uml.cpp:228
-msgid "&Autolayout..."
-msgstr "&Autoutforming …"
-
-#: uml.cpp:231
-msgid "&Sequence Diagram..."
-msgstr "&Sekvensdiagram …"
-
-#: uml.cpp:234
-msgid "C&ollaboration Diagram..."
-msgstr "&Samarbeidsdiagram …"
-
-#: uml.cpp:237
-msgid "&Use Case Diagram..."
-msgstr "&Usecase-diagram …"
-
-#: uml.cpp:240
-msgid "S&tate Diagram..."
-msgstr "&Tilstandsdiagram …"
-
-#: uml.cpp:243
-msgid "&Activity Diagram..."
-msgstr "&Aktivitetsdiagram …"
-
-#: uml.cpp:246
-msgid "Co&mponent Diagram..."
-msgstr "&Komponentdiagram …"
-
-#: uml.cpp:250
-msgid "&Deployment Diagram..."
+#: objectwidget.cpp:90
+msgid "Rename Object"
 msgstr ""
 
-#: uml.cpp:254
-msgid "&Entity Relationship Diagram..."
-msgstr "&Entitetrelasjonsdiagram …"
-
-#: uml.cpp:258
-msgid "&Clear Diagram"
-msgstr "&Rensk diagram …"
-
-#: uml.cpp:260
-msgid "&Snap to Grid"
-msgstr "&Fest til rutenett"
-
-#: uml.cpp:262
-msgid "S&how Grid"
-msgstr "&Vis rutenett"
-
-#: uml.cpp:265
-msgid "&Hide Grid"
-msgstr "&Skjul rutenett"
-
-#: uml.cpp:269
-msgid "&Export as Picture..."
-msgstr "&Eksporter som bilde …"
-
-#: uml.cpp:271
-#, fuzzy
-msgid "Export &All Diagrams as Pictures..."
-msgstr "&Eksporter som bilde …"
-
-#: uml.cpp:286
-msgid "&Zoom Slider"
-msgstr "&Skaleringsglidebryter"
-
-#: uml.cpp:289
-#, c-format
-msgid "Z&oom to 100%"
-msgstr "S&kaler til 100 %"
-
-#: uml.cpp:295
-msgid "&Move Tab Left"
-msgstr "&Flytt fane til venstre"
-
-#: uml.cpp:296
-msgid "&Move Tab Right"
-msgstr "&Flytt fane til høyre"
-
-#: uml.cpp:308
-msgid "Select Diagram on Left"
-msgstr "Velg diagrammet til venstre"
-
-#: uml.cpp:309
-msgid "Select Diagram on Right"
-msgstr "Velg diagrammet til høyre"
-
-#: uml.cpp:327
-msgid "&Windows"
-msgstr "&Vinduer"
-
-#: uml.cpp:347
-#, c-format
-msgid " &33%"
-msgstr " &33%"
-
-#: uml.cpp:348
-#, c-format
-msgid " &50%"
-msgstr " &50%"
-
-#: uml.cpp:349
-#, c-format
-msgid " &75%"
-msgstr " &75%"
-
-#: uml.cpp:350
-#, c-format
-msgid "&100%"
-msgstr "&100%"
-
-#: uml.cpp:351
-#, c-format
-msgid "1&50%"
-msgstr "1&50%"
-
-#: uml.cpp:352
-#, c-format
-msgid "&200%"
-msgstr "&200%"
-
-#: uml.cpp:353
-#, c-format
-msgid "3&00%"
-msgstr "3&00%"
-
-#: uml.cpp:394
-msgid "Diagram Toolbar"
-msgstr "Verktøylinje for diagrammer"
-
-#: uml.cpp:398
-msgid "Alignment Toolbar"
-msgstr "Verktøylinje for justering"
-
-#: listpopupmenu.cpp:615 uml.cpp:420
-msgid "Class Diagram..."
-msgstr "Klassediagram …"
-
-#: listpopupmenu.cpp:618 uml.cpp:421
-msgid "Sequence Diagram..."
-msgstr "Sekvensdiagram …"
-
-#: listpopupmenu.cpp:619 uml.cpp:422
-msgid "Collaboration Diagram..."
-msgstr "Samarbeidsdiagram …"
-
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
-msgstr "Usecase-diagram …"
-
-#: listpopupmenu.cpp:616 uml.cpp:424
-msgid "State Diagram..."
-msgstr "Tilstandsdiagram …"
-
-#: listpopupmenu.cpp:617 uml.cpp:425
-msgid "Activity Diagram..."
-msgstr "Aktivitetsdiagram …"
-
-#: listpopupmenu.cpp:521 uml.cpp:426
-msgid "Component Diagram..."
-msgstr "Komponentdiagram …"
-
-#: listpopupmenu.cpp:528 uml.cpp:427
-msgid "Deployment Diagram..."
+#: objectwidget.cpp:91
+msgid "Enter object name:"
 msgstr ""
 
-#: listpopupmenu.cpp:541 uml.cpp:428
-msgid "Entity Relationship Diagram..."
-msgstr "Entitetsrelasjonsdiagram …"
-
-#: uml.cpp:458
-msgid "&Tree View"
-msgstr "&Trevisning"
-
-#: uml.cpp:467
-msgid "&Documentation"
-msgstr "&Dokumentasjon"
-
-#: uml.cpp:479 uml.cpp:664 uml.cpp:692
-msgid "Opening file..."
-msgstr "Åpner fil …"
-
-#: uml.cpp:650
-msgid "Creating new document..."
-msgstr "Oppretter nytt dokument …"
-
-#: uml.cpp:673
-#, fuzzy
+#: umlwidgetcontroller.cpp:128
 msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
-"*.xmi|Uncompressed XMI Files (*.xmi)\n"
-"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
-"*.mdl|Rose model files"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel move."
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Alle støttede filer(*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2)\n"
-"*.xmi|Ukomprimert XMI-filer (*.xmi)\n"
-"*.xmi.tgz|Gzip-komprimerte XMI-filer (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2-komprimerte XMI-filer (*.xmi.tar.bz2)"
 
-#: uml.cpp:677
-msgid "Open File"
-msgstr "Åpne fil"
-
-#: uml.cpp:716
-msgid "Saving file..."
-msgstr "Lagrer fil …"
-
-#: uml.cpp:727
-msgid "Saving file with a new filename..."
-msgstr "Lagrer fil med nytt filnavn …"
-
-#: uml.cpp:732
+#: umlwidgetcontroller.cpp:379
 msgid ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel resize."
 msgstr ""
-"*.xmi|XMI-fil\n"
-"*.xmi.tgz|Gzip-komprimert XMI-fil\n"
-"*.xmi.tar.bz2|Bzip2-komprimert XMI-fil\n"
-"*|Alle filer"
 
-#: uml.cpp:740
-msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
 msgstr ""
-"Fila %1 finnes.\n"
-"Vil du overskrive den?"
-
-#: uml.cpp:740
-msgid "Overwrite"
-msgstr "Overskriv"
-
-#: uml.cpp:764
-msgid "Closing file..."
-msgstr "Lukker fil …"
+"Kunne ikke opprette mappen:\n"
 
-#: uml.cpp:772
-msgid "Printing..."
-msgstr "Skriver ut …"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr ""
 
-#: uml.cpp:779
+#: umlviewimageexportermodel.cpp:151
 #, c-format
-msgid "Print %1"
-msgstr "Skriv ut %1"
-
-#: uml.cpp:787
-msgid "Exiting..."
-msgstr "Avslutter …"
-
-#: uml.cpp:823
-msgid "Cutting selection..."
-msgstr "Klipper ut utvalg …"
-
-#: uml.cpp:836
-msgid "Copying selection to clipboard..."
-msgstr "Kopier utvalg til utklippstavle …"
-
-#: uml.cpp:844
-msgid "Inserting clipboard contents..."
-msgstr "Sett inn innhold fra utklippstavla …"
-
-#: uml.cpp:849
-msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
-"Umbrello klarte ikke å lime inn innholdet fra utklippstavla. Objektene på "
-"utklippstavla kan være av en annen type enn den som kan limes inn her."
-
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
-msgstr "Feil ved innliming"
-
-#: uml.cpp:863
-msgid "Toggling toolbar..."
-msgstr "Skru av/på verktøylinje …"
-
-#: uml.cpp:878
-msgid "Toggle the statusbar..."
-msgstr "Skru av/på statuslinje …"
-
-#: uml.cpp:1186
-msgid "Cannot view code until you generate some first."
-msgstr "Du må ha laget noe kode før du kan se på den."
-
-#: uml.cpp:1186 uml.cpp:1189
-msgid "Cannot View Code"
-msgstr "Kan ikke vise kode"
-
-#: uml.cpp:1189
-#, fuzzy
-msgid "Cannot view code from simple code writer."
-msgstr "Kan ikke vise kode fra "
-
-#: uml.cpp:1387
-msgid "*.idl|IDL Files (*.idl)"
-msgstr "*.idl|IDL-filer (*.idl)"
-
-#: uml.cpp:1389
-msgid "*.py|Python Files (*.py)"
-msgstr "*.py|Python-filer (*.py)"
-
-#: uml.cpp:1391
-msgid "*.java|Java Files (*.java)"
-msgstr "*.java|Java-filer (*.java)"
-
-#: uml.cpp:1393
-#, fuzzy
-msgid "*.pas|Pascal Files (*.pas)"
-msgstr "*.java|Java-filer (*.java)"
-
-#: uml.cpp:1395
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
-msgstr "*.ads *.ada|Ada-filer (*.ads *.ada)"
-
-#: uml.cpp:1397
-msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
-msgstr "*.h *.hh *.hpp *.hxx *.H|Header-filer (*.h *.hh *.hpp *.hxx *.H)"
-
-#: uml.cpp:1399
-msgid "All Files"
-msgstr "Alle filer"
-
-#: uml.cpp:1401
-msgid "Select Code to Import"
-msgstr "Velg kode som skal importeres"
 
 #. i18n: file umbrelloui.rc line 5
 #: rc.cpp:6
@@ -3343,268 +3365,75 @@ msgstr ""
 msgid "Role Visibility"
 msgstr ""
 
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Mappefila %1 finnes ikke."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Mappefila %1 kan ikke åpnes."
-
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr ""
-
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr ""
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr ""
-
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr ""
-
-#: listpopupmenu.cpp:695 stereotype.cpp:76
-msgid "Stereotype"
-msgstr ""
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr ""
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr ""
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr ""
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr ""
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr ""
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr ""
-
-#: objectwidget.cpp:90
-msgid "Rename Object"
-msgstr ""
-
-#: objectwidget.cpp:91
-msgid "Enter object name:"
-msgstr ""
-
-#: clipboard/umlclipboard.cpp:687
-msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr ""
-
-#: tips.cpp:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-
-#: tips.cpp:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-
-#: tips.cpp:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-
-#: tips.cpp:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-
-#: tips.cpp:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-
-#: tips.cpp:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisering"
 
-#: tips.cpp:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: association.cpp:88
+#, fuzzy
+msgid "Self Association"
+msgstr "Selvutvalg"
 
-#: tips.cpp:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Samarbeidsmelding"
 
-#: tips.cpp:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Rekkemelding"
 
-#: tips.cpp:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
+#: association.cpp:91
+#, fuzzy
+msgid "Collaboration Self Message"
+msgstr "Selvsammarbeidsmelding"
 
-#: tips.cpp:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
+#: association.cpp:92
+#, fuzzy
+msgid "Sequence Self Message"
+msgstr "Selvrekkemelding"
 
-#: tips.cpp:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisering"
 
-#: tips.cpp:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni-forbindelse"
 
-#: tips.cpp:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: statewidget.cpp:176
+msgid "Enter Activity"
 msgstr ""
 
-#: tips.cpp:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Generelle innstillinger"
 
-#: tips.cpp:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: tips.cpp:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuell destruktør"
 
-#: tips.cpp:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Lag tom konstruktør"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: operation.cpp:185
-msgid "new_parameter"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -3678,12 +3507,12 @@ msgstr ""
 
 #: listpopupmenu.cpp:376
 #, fuzzy
-msgid "Flip Horizontal"
+msgid "FlipQt::Horizontal"
 msgstr "Midtstill vannrett"
 
 #: listpopupmenu.cpp:378
 #, fuzzy
-msgid "Flip Vertical"
+msgid "FlipQt::Vertical"
 msgstr "Midtstill loddrett"
 
 #: listpopupmenu.cpp:388
@@ -3914,6 +3743,179 @@ msgstr "Fest til gitteret"
 msgid "Show Grid"
 msgstr ""
 
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Tildeling av nytt navn ble avbrutt"
+
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funksjonen er ikke implementert"
+
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Navnet du anga var ugyldig.\n"
+"Prosessen med å gi nytt navn ble avbrutt."
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr ""
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr ""
+
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr ""
+
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr ""
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr ""
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr ""
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr ""
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr ""
+
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr ""
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr ""
+
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
+msgstr "Umbrello UML-modellerer"
+
+#: main.cpp:40
+msgid "File to open"
+msgstr "Fil som skal åpnes"
+
+#: main.cpp:41
+msgid "export diagrams to extension and exit"
+msgstr ""
+
+#: main.cpp:42
+msgid "the local directory to save the exported diagrams in"
+msgstr ""
+
+#: main.cpp:42
+msgid "the directory of the file"
+msgstr ""
+
+#: main.cpp:43
+msgid ""
+"keep the tree structure used to store the views in the document in the target "
+"directory"
+msgstr ""
+
+#: main.cpp:95
+#, fuzzy
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+msgstr "© 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML-modelleringsforfattere"
+
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "ny_aktør"
+
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr ""
+
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "ny_pakke"
+
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "ny_komponent"
+
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nytt_punkt"
+
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr ""
+
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nytt_grensesnitt"
+
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "ny_datatype"
+
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr ""
+
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr ""
+
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "nytt_punkt"
+
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nytt_objekt"
+
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Tom"
+
+#: model_utils.cpp:559
+#, fuzzy
+msgid "Malformed argument"
+msgstr "Malformatert argument"
+
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Ukjent argumenttype"
+
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Ulovlig navn på metode"
+
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Ukjent tilbakemeldingstype"
+
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Uspesifisert feil"
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr ""
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr ""
+
 #~ msgid "folder"
 #~ msgstr "mappe"