Automated l10n update (.po files)

1 files changed, 2053 insertions, 2048 deletions

diff --git a/tde-i18n-en_GB/messages/tdesdk/umbrello.po b/tde-i18n-en_GB/messages/tdesdk/umbrello.po
index 073f20f5681..abd228b59a1 100644
--- a/tde-i18n-en_GB/messages/tdesdk/umbrello.po
+++ b/tde-i18n-en_GB/messages/tdesdk/umbrello.po
@@ -7,15 +7,1058 @@
 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-01-29 00:02+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\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"
 
+#. 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 "Documentation"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Jonathan Riddell"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kde-en-gb@jriddell.org"
+
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Align Left"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Align Right"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Align Top"
+
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Align Bottom"
+
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "AlignQt::Vertical Middle"
+msgstr "Align Vertical Middle"
+
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "AlignQt::Horizontal Middle"
+msgstr "Align Horizontal Middle"
+
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "AlignQt::Vertical Distribute"
+msgstr "Align Vertical Middle"
+
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "AlignQt::Horizontal Distribute"
+msgstr "Align Horizontal Middle"
+
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+msgstr ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
+"Double click one for\n"
+"the Properties dialogue.</p>\n"
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
+"again to create an automessage.</p>\n"
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+
+#: tips.txt:71
+msgid ""
+"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>You can turn on autosaving in the Configure Umbrello dialogue.</p>\n"
+
+#: 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 ""
+"<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"
+
+#: tips.txt:86
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+
+#: 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 ""
+"<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"
+
+#: 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 ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+
+#: tips.txt:103
+msgid ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+
+#: 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 ""
+"<p>You can create and setup a new class using the New Class Wizard in the Code "
+"menu.</p>\n"
+
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Externalise Folder"
+
+#: 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 "There was a problem saving file: %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 "Save Error"
+
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Enter Model Name"
+
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Enter the new name of the model:"
+
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Views"
+
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"The name you entered was invalid.\n"
+"Creation process has been cancelled."
+
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Name Not Valid"
+
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Name Not Unique"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Use Name"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Enter New Name"
+
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"The name you entered was not unique!\n"
+"Creation process has been cancelled."
+
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Creation cancelled"
+
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Loading listview..."
+
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "The folder must be emptied before it can be deleted."
+
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Folder Not Empty"
+
+#: 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 ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
+
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "Cannot Open File"
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid ""
+"Cannot create the folder:\n"
+msgstr ""
+"Cannot create the folder:\n"
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+"\n"
+"Please check the access rights"
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr "Cannot Create Folder"
+
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 Page %1"
+
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Enter State Name"
+
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Enter the name of the new state:"
+
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "new state"
+
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Enter Activity Name"
+
+#: 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 "Enter the name of the new activity:"
+
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "new activity"
+
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Enter Diagram Name"
+
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Enter the new name of the diagram:"
+
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Delete Diagram?"
+
+#: operation.cpp:185
+msgid "new_parameter"
+msgstr "new_parameter"
+
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
+msgstr "Stereotype"
+
+#: 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 "Enter name:"
+
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importing file: %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 "Ready."
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Is the scope %1 a namespace or a class?"
+
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ Import Requests Your Help"
+
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Namespace"
+
+#. 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 "Class"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Internal Error"
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntax Error before '%1'"
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Parse Error before '%1'"
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "expression expected"
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Declaration syntax error"
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} expected"
+
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "namespace expected"
+
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ expected"
+
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Namespace name expected"
+
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Need a type specifier to declare"
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "expected a declaration"
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Constant expression expected"
+
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' expected"
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} missing"
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Member initialisers expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Base class specifier expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Initialiser clause expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identifier expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Type id expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Class name expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "condition expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "statement expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for initialisation expected"
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch expected"
+
+#: 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 "&New Class Wizard..."
+
+#: uml.cpp:188
+msgid "&Add Default Datatypes for Active Language"
+msgstr "&Add Default Datatypes for Active Language"
+
+#: uml.cpp:193
+msgid "&Code Generation Wizard..."
+msgstr "&Code Generation Wizard..."
+
+#: uml.cpp:195
+msgid "&Generate All Code"
+msgstr "&Generate All Code"
+
+#: uml.cpp:198
+msgid "&Import Classes..."
+msgstr "&Import Classes..."
+
+#: uml.cpp:201
+msgid "Creates a new document"
+msgstr "Creates a new document"
+
+#: uml.cpp:202
+msgid "Opens an existing document"
+msgstr "Opens an existing document"
+
+#: uml.cpp:203
+msgid "Opens a recently used file"
+msgstr "Opens a recently used file"
+
+#: uml.cpp:204
+msgid "Saves the document"
+msgstr "Saves the document"
+
+#: uml.cpp:205
+msgid "Saves the document as..."
+msgstr "Saves the document as..."
+
+#: uml.cpp:206
+msgid "Closes the document"
+msgstr "Closes the document"
+
+#: uml.cpp:207
+msgid "Prints out the document"
+msgstr "Prints out the document"
+
+#: uml.cpp:208
+msgid "Quits the application"
+msgstr "Quits the application"
+
+#: 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 "Cuts the selected section and puts it to the clipboard"
+
+#: uml.cpp:212
+msgid "Copies the selected section to the clipboard"
+msgstr "Copies the selected section to the clipboard"
+
+#: uml.cpp:213
+msgid "Pastes the contents of the clipboard"
+msgstr "Pastes the contents of the clipboard"
+
+#: uml.cpp:214
+msgid "Set the default program preferences"
+msgstr "Set the default program preferences"
+
+#: uml.cpp:216
+msgid "Delete &Selected"
+msgstr "Delete &Selected"
+
+#: uml.cpp:224
+msgid "&Class Diagram..."
+msgstr "&Class Diagram..."
+
+#: uml.cpp:228
+msgid "&Autolayout..."
+msgstr "&Autolayout..."
+
+#: uml.cpp:231
+msgid "&Sequence Diagram..."
+msgstr "&Sequence Diagram..."
+
+#: uml.cpp:234
+msgid "C&ollaboration Diagram..."
+msgstr "C&ollaboration Diagram..."
+
+#: uml.cpp:237
+msgid "&Use Case Diagram..."
+msgstr "&Use Case Diagram..."
+
+#: uml.cpp:240
+msgid "S&tate Diagram..."
+msgstr "S&tate Diagram..."
+
+#: uml.cpp:243
+msgid "&Activity Diagram..."
+msgstr "&Activity Diagram..."
+
+#: uml.cpp:246
+msgid "Co&mponent Diagram..."
+msgstr "Co&mponent Diagram..."
+
+#: uml.cpp:250
+msgid "&Deployment Diagram..."
+msgstr "&Deployment Diagram..."
+
+#: uml.cpp:254
+msgid "&Entity Relationship Diagram..."
+msgstr "&Entity Relationship Diagram..."
+
+#: uml.cpp:258
+msgid "&Clear Diagram"
+msgstr "&Clear Diagram"
+
+#: uml.cpp:260
+msgid "&Snap to Grid"
+msgstr "&Snap to Grid"
+
+#: uml.cpp:262
+msgid "S&how Grid"
+msgstr "S&how Grid"
+
+#: uml.cpp:265
+msgid "&Hide Grid"
+msgstr "&Hide Grid"
+
+#: uml.cpp:269
+msgid "&Export as Picture..."
+msgstr "&Export as Picture..."
+
+#: uml.cpp:271
+#, fuzzy
+msgid "Export &All Diagrams as Pictures..."
+msgstr "Export All Diagrams as Images"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Properties"
+
+#: uml.cpp:286
+msgid "&Zoom Slider"
+msgstr "&Zoom Slider"
+
+#: uml.cpp:289
+#, c-format
+msgid "Z&oom to 100%"
+msgstr "Z&oom to 100%"
+
+#: uml.cpp:295
+msgid "&Move Tab Left"
+msgstr "&Move Tab Left"
+
+#: uml.cpp:296
+msgid "&Move Tab Right"
+msgstr "&Move Tab Right"
+
+#: uml.cpp:308
+msgid "Select Diagram on Left"
+msgstr "Select Diagram on Left"
+
+#: uml.cpp:309
+msgid "Select Diagram on Right"
+msgstr "Select Diagram on Right"
+
+#: uml.cpp:327
+msgid "&Windows"
+msgstr "&Windows"
+
+#: 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 "Diagram Toolbar"
+
+#: uml.cpp:398
+msgid "Alignment Toolbar"
+msgstr "Alignment Toolbar"
+
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
+msgstr "Class Diagram..."
+
+#: listpopupmenu.cpp:618 uml.cpp:421
+msgid "Sequence Diagram..."
+msgstr "Sequence Diagram..."
+
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
+msgstr "Collaboration Diagram..."
+
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
+msgstr "Use Case Diagram..."
+
+#: listpopupmenu.cpp:616 uml.cpp:424
+msgid "State Diagram..."
+msgstr "State Diagram..."
+
+#: listpopupmenu.cpp:617 uml.cpp:425
+msgid "Activity Diagram..."
+msgstr "Activity Diagram..."
+
+#: listpopupmenu.cpp:521 uml.cpp:426
+msgid "Component Diagram..."
+msgstr "Component Diagram..."
+
+#: listpopupmenu.cpp:528 uml.cpp:427
+msgid "Deployment Diagram..."
+msgstr "Deployment Diagram..."
+
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
+msgstr "Entity Relationship Diagram..."
+
+#: uml.cpp:458
+msgid "&Tree View"
+msgstr "&Tree View"
+
+#: uml.cpp:467
+msgid "&Documentation"
+msgstr "&Documentation"
+
+#: uml.cpp:479 uml.cpp:664 uml.cpp:692
+msgid "Opening file..."
+msgstr "Opening file..."
+
+#: uml.cpp:650
+msgid "Creating new document..."
+msgstr "Creating new document..."
+
+#: uml.cpp:673
+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 *.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"
+
+#: uml.cpp:677
+msgid "Open File"
+msgstr "Open File"
+
+#: uml.cpp:716
+msgid "Saving file..."
+msgstr "Saving file..."
+
+#: uml.cpp:727
+msgid "Saving file with a new filename..."
+msgstr "Saving file with a new filename..."
+
+#: 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 File\n"
+"*.xmi.tgz|Gzip Compressed XMI File\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
+"*|All Files"
+
+#: uml.cpp:740
+msgid ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+msgstr ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+
+#: uml.cpp:740
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: uml.cpp:764
+msgid "Closing file..."
+msgstr "Closing file..."
+
+#: uml.cpp:772
+msgid "Printing..."
+msgstr "Printing..."
+
+#: uml.cpp:779
+#, c-format
+msgid "Print %1"
+msgstr "Print %1"
+
+#: uml.cpp:787
+msgid "Exiting..."
+msgstr "Exiting..."
+
+#: uml.cpp:823
+msgid "Cutting selection..."
+msgstr "Cutting selection..."
+
+#: uml.cpp:836
+msgid "Copying selection to clipboard..."
+msgstr "Copying selection to clipboard..."
+
+#: uml.cpp:844
+msgid "Inserting clipboard contents..."
+msgstr "Inserting clipboard contents..."
+
+#: 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 could not paste the clipboard contents.  The objects in the clipboard "
+"may be of the wrong type to be pasted here."
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+msgstr "Paste Error"
+
+#: uml.cpp:863
+msgid "Toggling toolbar..."
+msgstr "Toggling toolbar..."
+
+#: uml.cpp:878
+msgid "Toggle the statusbar..."
+msgstr "Toggle the statusbar..."
+
+#: uml.cpp:1186
+msgid "Cannot view code until you generate some first."
+msgstr "Cannot view code until you generate some first."
+
+#: uml.cpp:1186 uml.cpp:1189
+msgid "Cannot View Code"
+msgstr "Cannot View Code"
+
+#: uml.cpp:1189
+msgid "Cannot view code from simple code writer."
+msgstr "Cannot view code from simple code writer."
+
+#: uml.cpp:1387
+msgid "*.idl|IDL Files (*.idl)"
+msgstr "*.idl|IDL Files (*.idl)"
+
+#: uml.cpp:1389
+msgid "*.py|Python Files (*.py)"
+msgstr "*.py|Python Files (*.py)"
+
+#: uml.cpp:1391
+msgid "*.java|Java Files (*.java)"
+msgstr "*.java|Java Files (*.java)"
+
+#: uml.cpp:1393
+#, fuzzy
+msgid "*.pas|Pascal Files (*.pas)"
+msgstr "*.java|Java Files (*.java)"
+
+#: uml.cpp:1395
+msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgstr "*.ads *.ada|Ada Files (*.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 Files (*.h *.hh *.hpp *.hxx *.H)"
+
+#: uml.cpp:1399
+msgid "All Files"
+msgstr "All Files"
+
+#: uml.cpp:1401
+msgid "Select Code to Import"
+msgstr "Select Code to Import"
+
+#: 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 "Name"
+
+#: 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 "That is an invalid name."
+
+#: 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 "Invalid Name"
+
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"This is a reserved keyword for the language of the configured code generator."
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reserved Keyword"
+
+#: 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 "That name is already being used."
+
+#: 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 "Not a Unique Name"
+
 #: worktoolbar.cpp:245
 msgid "Object"
 msgstr "Object"
@@ -85,14 +1128,6 @@ msgstr "Composition"
 msgid "Use Case"
 msgstr "Use Case"
 
-#. 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 "Class"
-
 #: listpopupmenu.cpp:1030 worktoolbar.cpp:263
 msgid "Initial State"
 msgstr "Initial State"
@@ -205,383 +1240,381 @@ msgstr "UNDEFINED"
 msgid "Select"
 msgstr "Select"
 
-#: 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."
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "new_association"
 
-#: 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."
-msgstr ""
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "new_attribute"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Initial activity"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "new_template"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "End activity"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "new_operation"
 
-#. 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 "General"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "new_literal"
 
-#: 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 "General Properties"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "new_field"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Activity type:"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Export as Picture..."
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Activity name:"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr ""
 
-#. 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 "Documentation"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML Modeller Authors"
 
-#: 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 "Font Settings"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "File to open"
 
-#: 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 "Colour"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Widget Colours"
+#: docgenerators/main.cpp:64
+#, fuzzy
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Destination File Already Exists"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML Modeller Authors"
 
-#: dialogs/overwritedialogue.cpp:31
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Exiting..."
+
+#: 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 ""
-"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."
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Apply to all remaining files"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "File Already Exists"
 
 #: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
 msgid "&Overwrite"
 msgstr "&Overwrite"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generate Similar File Name"
+#: 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 ""
+"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."
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Do Not Generate File"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML Model"
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Activities"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logical View"
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "New Activity..."
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Use Case View"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Rename"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Component View"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "New Activity"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Deployment View"
 
-#: 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 "Enter the name of the new activity:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entity Relationship Model"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "new activity"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datatypes"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Rename Activity"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Enter the new name of the activity:"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "The file %1 does not exist."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
-msgstr "Code Generation Options"
+#: 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 "Load Error"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generate"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "The file %1 seems to be corrupted."
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Finish"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "There was no XMI file found in the compressed file %1."
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Code Generated"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "There was a problem loading the extracted file: %1"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Not Generated"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "There was a problem loading file: %1"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Not Yet Generated"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "There was a problem uploading file: %1"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "The folder %1 does not exist. Do you want to create it now?"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "use case diagram"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Output Folder Does Not Exist"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "class diagram"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Create Folder"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sequence diagram"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Do Not Create"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "collaboration diagram"
 
-#: 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 ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "state diagram"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Error Creating Folder"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "activity diagram"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Please select a valid folder."
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "component diagram"
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-"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 "deployment diagram"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Error Writing to Output Folder"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "entity relationship diagram"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 does not seem to be a folder. Please choose a valid folder."
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "That is an invalid name for a diagram."
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Please Choose Valid Folder"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "A diagram is already using that name."
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Initial state"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Are you sure you want to delete diagram %1?"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "End state"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Delete Diagram"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "State type:"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Setting up the document..."
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "State name:"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Resolving object references..."
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Widget Colour"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Loading UML elements..."
 
-#: 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 "General Settings"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Loading diagrams..."
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Display"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Classes Display Options"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagram Colours"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
+msgstr ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "The name you have entered is invalid."
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Add Base Class"
 
-#: 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 "Invalid Name"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Add Derived Class"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "The name you have entered is not unique."
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Add Operation"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1918
-#: umllistview.cpp:1925 umllistview.cpp:2162
-msgid "Name Not Unique"
-msgstr "Name Not Unique"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Add Attribute"
 
-#. 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 "Code Viewer"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Add Base Interface"
+
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Add Derived Interface"
+
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Base Classifiers"
+
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Derived Classifiers"
 
 #: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
 #: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
 msgid "Attributes"
 msgstr "Attributes"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ew Attribute..."
-
 #: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
 #: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
 msgid "Operations"
 msgstr "Operations"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&ew Operation..."
-
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Templates"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&ew Template..."
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid ""
+"An operation with that signature already exists in %1.\n"
+msgstr ""
+"An operation with that signature already exists in %1.\n"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum Literals"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Choose a different name or parameter list."
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ew Enum Literal..."
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Operation Name Invalid"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entity Attributes"
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "The folderfile %1 does not exist."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ew Entity Attribute..."
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "The folderfile %1 cannot be opened."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Properties"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Association Properties"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#. 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 "Role Properties"
-msgstr "Role Properties"
-
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Display Options"
-
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribute Settings"
+msgid "General"
+msgstr "General"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operation Settings"
+#: 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 "General Settings"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Templates Settings"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roles"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Enum Literals Settings"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Role Settings"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Entity Attributes Settings"
+#: 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 "Font Settings"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Contents Settings"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Association font"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associations"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">No Options Available.</p>"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Class Associations"
+#. 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 "Code Viewer"
 
 #: dialogs/umloperationdialog.cpp:50
 msgid "Operation Properties"
 msgstr "Operation Properties"
 
+#: 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 "General Properties"
+
 #: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
 #: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
 #: dialogs/umltemplatedialog.cpp:61
@@ -673,36 +1706,15 @@ msgstr ""
 msgid "You have entered an invalid operation name."
 msgstr "You have entered an invalid operation name."
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operation Name Invalid"
-
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"An operation with that signature already exists in %1.\n"
-
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Choose a different name or parameter list."
-
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "new_class"
-
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "New Class"
-
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Class Attributes"
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "Name:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Class Operations"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type:"
 
 #: dialogs/parmpropdlg.cpp:35
 msgid "Parameter Properties"
@@ -724,32 +1736,6 @@ msgstr ""
 "\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
 "is a parameter for reading and writing."
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attribute Properties"
-
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
-
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "You have entered an invalid attribute name."
-
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Attribute Name Invalid"
-
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr ""
-"The attribute name you have chosen is already being used in this operation."
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attribute Name Not Unique"
-
 #: dialogs/classgenpage.cpp:50
 msgid "Class &name:"
 msgstr "Class &name:"
@@ -878,288 +1864,6 @@ msgstr ""
 msgid "Name is Not Unique"
 msgstr "Name is Not Unique"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Entity Attribute Properties"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Default value:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Length/Values:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto increment"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Allow &null"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributes:"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexing"
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&None"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primary"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unique"
-
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "You have entered an invalid entity attribute name."
-
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Entity Attribute Name Invalid"
-
-#: dialogs/umlentityattributedialog.cpp:192
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Entity Attribute Name Not Unique"
-
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrams"
-
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
-
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Current diagram"
-
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&All diagrams"
-
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Select diagrams"
-
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Type of diagram"
-
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selection"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Collaboration"
-
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sequence"
-
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Deployment"
-
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
-
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "No diagrams selected."
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Role A Properties"
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Role B Properties"
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Role A Visibility"
-
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Role B Visibility"
-
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Role A Changeability"
-
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Role B Changeability"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rolename:"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicity:"
-
-#. 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 "Public"
-
-#. 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 "Private"
-
-#. 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 "Protected"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementation"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Changeable"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Frozen"
-
-#. 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 "Add only"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Line:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Fill:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "D&efault"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Use fill"
-
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Template Properties"
-
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "You have entered an invalid template name."
-
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Template Name Invalid"
-
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Template Name Not Unique"
-
-#. 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 "Select Operation"
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sequence number:"
-
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Class operation:"
-
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Custom operation:"
-
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Note Documentation"
-
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Contained Items"
-
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Association Properties"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roles"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Role Settings"
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Association font"
-
 #: dialogs/settingsdlg.cpp:30
 msgid "Umbrello Setup"
 msgstr "Umbrello Setup"
@@ -1172,6 +1876,14 @@ msgstr "User Interface"
 msgid "User Interface Settings"
 msgstr "User Interface Settings"
 
+#: 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 "Colour"
+
 #: dialogs/settingsdlg.cpp:54
 msgid "Line color:"
 msgstr "Line colour:"
@@ -1347,6 +2059,30 @@ msgstr "Default attribute scope:"
 msgid "Default operation scope:"
 msgstr "Default operation scope:"
 
+#. 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 "Public"
+
+#. 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 "Private"
+
+#. 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 "Protected"
+
 #: dialogs/settingsdlg.cpp:294
 msgid "Code Generation"
 msgstr "Code Generation"
@@ -1359,1272 +2095,623 @@ msgstr "Code Generation Settings"
 msgid "Code Viewer Settings"
 msgstr "Code Viewer Settings"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">No Options Available.</p>"
-
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Show"
-
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operatio&ns"
-
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibility"
-
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&peration signature"
-
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pac&kage"
-
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ributes"
-
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&ype"
-
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibute signature"
-
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Draw as circle"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Name:"
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Type:"
-
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Externalise Folder"
-
-#: 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 "There was a problem saving file: %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 "Save Error"
-
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Enter Model Name"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associations"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Enter the new name of the model:"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Contained Items"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Views"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Widget Colours"
 
-#: umllistview.cpp:1907
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"The name you entered was invalid.\n"
-"Creation process has been cancelled."
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Display"
 
-#: umllistview.cpp:1908 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Name Not Valid"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Display Options"
 
-#: umldoc.cpp:1067 umllistview.cpp:1917
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribute Settings"
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Use Name"
-msgstr "Use Name"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operation Settings"
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Enter New Name"
-msgstr "Enter New Name"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Templates"
 
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"The name you entered was not unique!\n"
-"Creation process has been cancelled."
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Templates Settings"
 
-#: umllistview.cpp:2119 umllistview.cpp:2136 umllistview.cpp:2151
-msgid "Creation canceled"
-msgstr "Creation cancelled"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum Literals"
 
-#: umllistview.cpp:2339
-msgid "Loading listview..."
-msgstr "Loading listview..."
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Enum Literals Settings"
 
-#: umllistview.cpp:2671
-msgid "The folder must be emptied before it can be deleted."
-msgstr "The folder must be emptied before it can be deleted."
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entity Attributes"
 
-#: umllistview.cpp:2672
-msgid "Folder Not Empty"
-msgstr "Folder Not Empty"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Entity Attributes Settings"
 
-#: 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 "Name"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Contents Settings"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Enter operation name:"
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Class Associations"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Enter role name:"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
+msgstr "Role Properties"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Enter multiplicity:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Entity Attribute Properties"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Enter association name:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Default value:"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Enter new text:"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Length/Values:"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERROR"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto increment"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Change Text"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Allow &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 ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributes:"
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
-msgstr "Cannot Open File"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexing"
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Cannot create the folder:\n"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&None"
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
-msgstr ""
-"\n"
-"Please check the access rights"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primary"
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
-msgstr "Cannot Create Folder"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Exiting..."
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unique"
 
-#: 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 "You have entered an invalid entity attribute name."
 
-#: 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 "Ready."
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Entity Attribute Name Invalid"
 
-#: umlviewimageexporter.cpp:66
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "File Already Exists"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Align Left"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Align Right"
-
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Align Top"
-
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Align Bottom"
-
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr "Align Vertical Middle"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr "Align Horizontal Middle"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Entity Attribute Name Not Unique"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Align Vertical Middle"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Line:"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Align Horizontal Middle"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Fill:"
 
-#: aligntoolbar.cpp:383
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
-msgstr ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "D&efault"
 
-#: 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 "Enter name:"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Use fill"
 
-#: 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 "That is an invalid name."
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Destination File Already Exists"
 
-#: 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 ""
-"This is a reserved keyword for the language of the configured code generator."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reserved Keyword"
-
-#: 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 "That name is already being used."
-
-#: 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 "Not a Unique Name"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Cannot Create Folder"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Can not save an empty diagram"
+"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."
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Apply to all remaining files"
 
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "new_actor"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Generate Similar File Name"
 
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "new_usecase"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Do Not Generate File"
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "new_package"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Initial state"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "new_component"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "End state"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "new_node"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "State type:"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "new_artifact"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "State name:"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "new_interface"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Widget Colour"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "new_datatype"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Activities"
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "new_enum"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ew Attribute..."
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "new_entity"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&ew Operation..."
 
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "new_node"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&ew Template..."
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "new_association"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ew Enum Literal..."
 
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "new_object"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ew Entity Attribute..."
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Empty"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "new_class"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Malformed argument"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "New Class"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Unknown argument type"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Class Attributes"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Illegal method name"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Class Operations"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Unknown return type"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "New Activity..."
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Unspecified error"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Rename"
 
-#: codeimport/classimport.cpp:34
-#, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importing file: %1"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "New Activity"
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Is the scope %1 a namespace or a class?"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Rename Activity"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ Import Requests Your Help"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Enter the new name of the activity:"
 
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Namespace"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrams"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: 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 "expression expected"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Current diagram"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Declaration syntax error"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&All diagrams"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} expected"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Select diagrams"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "namespace expected"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Type of diagram"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ expected"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selection"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Namespace name expected"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Collaboration"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Need a type specifier to declare"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sequence"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "expected a declaration"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Deployment"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Constant expression expected"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "No diagrams selected."
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' expected"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Role A Properties"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} missing"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Role B Properties"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Member initialisers expected"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Role A Visibility"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Base class specifier expected"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Role B Visibility"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Initialiser clause expected"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Role A Changeability"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identifier expected"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Role B Changeability"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Type id expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, no-c-format
+msgid "Rolename:"
+msgstr "Rolename:"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Class name expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, no-c-format
+msgid "Multiplicity:"
+msgstr "Multiplicity:"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "condition expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, no-c-format
+msgid "Implementation"
+msgstr "Implementation"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "statement expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, no-c-format
+msgid "Changeable"
+msgstr "Changeable"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for initialisation expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, no-c-format
+msgid "Frozen"
+msgstr "Frozen"
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch expected"
+#. 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 "Add only"
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Internal Error"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attribute Properties"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntax Error before '%1'"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Parse Error before '%1'"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "You have entered an invalid attribute name."
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Jonathan Riddell"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Attribute Name Invalid"
 
-#: _translatorinfo.cpp:3
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kde-en-gb@jriddell.org"
-
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr "Umbrello UML Modeller"
-
-#: main.cpp:40
-msgid "File to open"
-msgstr "File to open"
-
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
-msgstr "export diagrams to extension and exit"
-
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
-msgstr ""
-
-#: main.cpp:42
-msgid "the directory of the file"
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
+"The attribute name you have chosen is already being used in this operation."
 
-#: 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 "Attribute Name Not Unique"
 
-#: main.cpp:95
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Show"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operatio&ns"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibility"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "File to open"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&peration signature"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pac&kage"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ributes"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Export as Picture..."
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&ype"
 
-#: 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 "Attr&ibute signature"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisation"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Draw as circle"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Self Association"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Classes Display Options"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Collaboration Message"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagram Colours"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sequence Message"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "The name you have entered is invalid."
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Collaboration Self Message"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "The name you have entered is not unique."
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sequence Self Message"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, no-c-format
+msgid "Code Generation Options"
+msgstr "Code Generation Options"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisation"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generate"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni Association"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Finish"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML Model"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Code Generated"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logical View"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Not Generated"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Use Case View"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Not Yet Generated"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Component View"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "The folder %1 does not exist. Do you want to create it now?"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Deployment View"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Output Folder Does Not Exist"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entity Relationship Model"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Create Folder"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datatypes"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Do Not Create"
 
-#: umldoc.cpp:229
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 msgstr ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "The file %1 does not exist."
-
-#: 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 "Load Error"
-
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "The file %1 seems to be corrupted."
-
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "There was no XMI file found in the compressed file %1."
-
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "There was a problem loading the extracted file: %1"
-
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "There was a problem loading file: %1"
-
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "There was a problem uploading file: %1"
-
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "use case diagram"
-
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "class diagram"
-
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sequence diagram"
-
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "collaboration diagram"
-
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "state diagram"
-
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "activity diagram"
-
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "component diagram"
-
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "deployment diagram"
-
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "entity relationship diagram"
-
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "That is an invalid name for a diagram."
-
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "A diagram is already using that name."
-
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Are you sure you want to delete diagram %1?"
-
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Delete Diagram"
-
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Setting up the document..."
-
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Resolving object references..."
-
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Loading UML elements..."
-
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Loading diagrams..."
-
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%1"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Rename cancelled"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Renaming an item of listview type %1 is not yet implemented."
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Error Creating Folder"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Function Not Implemented"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Please select a valid folder."
 
-#: umllistviewitem.cpp:478
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"The name you entered was invalid.\n"
-"Renaming process has been cancelled."
-
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "General Options"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Package is a namespace"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtual destructors"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generate empty constructors"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generate accessor methods"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operations are inline"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Accessors are inline"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Accessors are public"
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "new_attribute"
-
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "new_template"
-
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "new_operation"
-
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "new_literal"
-
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "new_field"
-
-#: uml.cpp:179
-msgid "&Export model to DocBook"
-msgstr ""
-
-#: uml.cpp:182
-msgid "&Export model to XHTML"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 
-#: uml.cpp:186
-msgid "&New Class Wizard..."
-msgstr "&New Class Wizard..."
-
-#: uml.cpp:188
-msgid "&Add Default Datatypes for Active Language"
-msgstr "&Add Default Datatypes for Active Language"
-
-#: uml.cpp:193
-msgid "&Code Generation Wizard..."
-msgstr "&Code Generation Wizard..."
-
-#: uml.cpp:195
-msgid "&Generate All Code"
-msgstr "&Generate All Code"
-
-#: uml.cpp:198
-msgid "&Import Classes..."
-msgstr "&Import Classes..."
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Error Writing to Output Folder"
 
-#: uml.cpp:201
-msgid "Creates a new document"
-msgstr "Creates a new document"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 does not seem to be a folder. Please choose a valid folder."
 
-#: uml.cpp:202
-msgid "Opens an existing document"
-msgstr "Opens an existing document"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Please Choose Valid Folder"
 
-#: uml.cpp:203
-msgid "Opens a recently used file"
-msgstr "Opens a recently used file"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Select Operation"
 
-#: uml.cpp:204
-msgid "Saves the document"
-msgstr "Saves the document"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sequence number:"
 
-#: uml.cpp:205
-msgid "Saves the document as..."
-msgstr "Saves the document as..."
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Class operation:"
 
-#: uml.cpp:206
-msgid "Closes the document"
-msgstr "Closes the document"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Custom operation:"
 
-#: uml.cpp:207
-msgid "Prints out the document"
-msgstr "Prints out the document"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Template Properties"
 
-#: uml.cpp:208
-msgid "Quits the application"
-msgstr "Quits the application"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "You have entered an invalid template name."
 
-#: uml.cpp:209
-msgid "Exports the model to the docbook format"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Template Name Invalid"
 
-#: uml.cpp:210
-msgid "Exports the model to the XHTML format"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 
-#: uml.cpp:211
-msgid "Cuts the selected section and puts it to the clipboard"
-msgstr "Cuts the selected section and puts it to the clipboard"
-
-#: uml.cpp:212
-msgid "Copies the selected section to the clipboard"
-msgstr "Copies the selected section to the clipboard"
-
-#: uml.cpp:213
-msgid "Pastes the contents of the clipboard"
-msgstr "Pastes the contents of the clipboard"
-
-#: uml.cpp:214
-msgid "Set the default program preferences"
-msgstr "Set the default program preferences"
-
-#: uml.cpp:216
-msgid "Delete &Selected"
-msgstr "Delete &Selected"
-
-#: uml.cpp:224
-msgid "&Class Diagram..."
-msgstr "&Class Diagram..."
-
-#: uml.cpp:228
-msgid "&Autolayout..."
-msgstr "&Autolayout..."
-
-#: uml.cpp:231
-msgid "&Sequence Diagram..."
-msgstr "&Sequence Diagram..."
-
-#: uml.cpp:234
-msgid "C&ollaboration Diagram..."
-msgstr "C&ollaboration Diagram..."
-
-#: uml.cpp:237
-msgid "&Use Case Diagram..."
-msgstr "&Use Case Diagram..."
-
-#: uml.cpp:240
-msgid "S&tate Diagram..."
-msgstr "S&tate Diagram..."
-
-#: uml.cpp:243
-msgid "&Activity Diagram..."
-msgstr "&Activity Diagram..."
-
-#: uml.cpp:246
-msgid "Co&mponent Diagram..."
-msgstr "Co&mponent Diagram..."
-
-#: uml.cpp:250
-msgid "&Deployment Diagram..."
-msgstr "&Deployment Diagram..."
-
-#: uml.cpp:254
-msgid "&Entity Relationship Diagram..."
-msgstr "&Entity Relationship Diagram..."
-
-#: uml.cpp:258
-msgid "&Clear Diagram"
-msgstr "&Clear Diagram"
-
-#: uml.cpp:260
-msgid "&Snap to Grid"
-msgstr "&Snap to Grid"
-
-#: uml.cpp:262
-msgid "S&how Grid"
-msgstr "S&how Grid"
-
-#: uml.cpp:265
-msgid "&Hide Grid"
-msgstr "&Hide Grid"
-
-#: uml.cpp:269
-msgid "&Export as Picture..."
-msgstr "&Export as Picture..."
-
-#: uml.cpp:271
-#, fuzzy
-msgid "Export &All Diagrams as Pictures..."
-msgstr "Export All Diagrams as Images"
-
-#: uml.cpp:286
-msgid "&Zoom Slider"
-msgstr "&Zoom Slider"
-
-#: uml.cpp:289
-#, c-format
-msgid "Z&oom to 100%"
-msgstr "Z&oom to 100%"
-
-#: uml.cpp:295
-msgid "&Move Tab Left"
-msgstr "&Move Tab Left"
-
-#: uml.cpp:296
-msgid "&Move Tab Right"
-msgstr "&Move Tab Right"
-
-#: uml.cpp:308
-msgid "Select Diagram on Left"
-msgstr "Select Diagram on Left"
-
-#: uml.cpp:309
-msgid "Select Diagram on Right"
-msgstr "Select Diagram on Right"
-
-#: uml.cpp:327
-msgid "&Windows"
-msgstr "&Windows"
-
-#: 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 "Diagram Toolbar"
-
-#: uml.cpp:398
-msgid "Alignment Toolbar"
-msgstr "Alignment Toolbar"
-
-#: listpopupmenu.cpp:615 uml.cpp:420
-msgid "Class Diagram..."
-msgstr "Class Diagram..."
-
-#: listpopupmenu.cpp:618 uml.cpp:421
-msgid "Sequence Diagram..."
-msgstr "Sequence Diagram..."
-
-#: listpopupmenu.cpp:619 uml.cpp:422
-msgid "Collaboration Diagram..."
-msgstr "Collaboration Diagram..."
-
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
-msgstr "Use Case Diagram..."
-
-#: listpopupmenu.cpp:616 uml.cpp:424
-msgid "State Diagram..."
-msgstr "State Diagram..."
-
-#: listpopupmenu.cpp:617 uml.cpp:425
-msgid "Activity Diagram..."
-msgstr "Activity Diagram..."
-
-#: listpopupmenu.cpp:521 uml.cpp:426
-msgid "Component Diagram..."
-msgstr "Component Diagram..."
-
-#: listpopupmenu.cpp:528 uml.cpp:427
-msgid "Deployment Diagram..."
-msgstr "Deployment Diagram..."
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Template Name Not Unique"
 
-#: listpopupmenu.cpp:541 uml.cpp:428
-msgid "Entity Relationship Diagram..."
-msgstr "Entity Relationship Diagram..."
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Note Documentation"
 
-#: uml.cpp:458
-msgid "&Tree View"
-msgstr "&Tree View"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Initial activity"
 
-#: uml.cpp:467
-msgid "&Documentation"
-msgstr "&Documentation"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "End activity"
 
-#: uml.cpp:479 uml.cpp:664 uml.cpp:692
-msgid "Opening file..."
-msgstr "Opening file..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Activity type:"
 
-#: uml.cpp:650
-msgid "Creating new document..."
-msgstr "Creating new document..."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Activity name:"
 
-#: uml.cpp:673
-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"
+#. 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 ""
-"*.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"
-
-#: uml.cpp:677
-msgid "Open File"
-msgstr "Open File"
 
-#: uml.cpp:716
-msgid "Saving file..."
-msgstr "Saving file..."
+#: objectwidget.cpp:90
+msgid "Rename Object"
+msgstr "Rename Object"
 
-#: uml.cpp:727
-msgid "Saving file with a new filename..."
-msgstr "Saving file with a new filename..."
+#: objectwidget.cpp:91
+msgid "Enter object name:"
+msgstr "Enter object name:"
 
-#: uml.cpp:732
+#: umlwidgetcontroller.cpp:128
 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 move."
 msgstr ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
 
-#: uml.cpp:740
+#: umlwidgetcontroller.cpp:379
 msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+"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 ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
 
-#: uml.cpp:740
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#: uml.cpp:764
-msgid "Closing file..."
-msgstr "Closing file..."
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Cannot Create Folder"
 
-#: uml.cpp:772
-msgid "Printing..."
-msgstr "Printing..."
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Can not save an empty diagram"
 
-#: uml.cpp:779
+#: umlviewimageexportermodel.cpp:151
 #, c-format
-msgid "Print %1"
-msgstr "Print %1"
-
-#: uml.cpp:787
-msgid "Exiting..."
-msgstr "Exiting..."
-
-#: uml.cpp:823
-msgid "Cutting selection..."
-msgstr "Cutting selection..."
-
-#: uml.cpp:836
-msgid "Copying selection to clipboard..."
-msgstr "Copying selection to clipboard..."
-
-#: uml.cpp:844
-msgid "Inserting clipboard contents..."
-msgstr "Inserting clipboard contents..."
-
-#: 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 could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
-
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
-msgstr "Paste Error"
-
-#: uml.cpp:863
-msgid "Toggling toolbar..."
-msgstr "Toggling toolbar..."
-
-#: uml.cpp:878
-msgid "Toggle the statusbar..."
-msgstr "Toggle the statusbar..."
-
-#: uml.cpp:1186
-msgid "Cannot view code until you generate some first."
-msgstr "Cannot view code until you generate some first."
-
-#: uml.cpp:1186 uml.cpp:1189
-msgid "Cannot View Code"
-msgstr "Cannot View Code"
-
-#: uml.cpp:1189
-msgid "Cannot view code from simple code writer."
-msgstr "Cannot view code from simple code writer."
-
-#: uml.cpp:1387
-msgid "*.idl|IDL Files (*.idl)"
-msgstr "*.idl|IDL Files (*.idl)"
-
-#: uml.cpp:1389
-msgid "*.py|Python Files (*.py)"
-msgstr "*.py|Python Files (*.py)"
-
-#: uml.cpp:1391
-msgid "*.java|Java Files (*.java)"
-msgstr "*.java|Java Files (*.java)"
-
-#: uml.cpp:1393
-#, fuzzy
-msgid "*.pas|Pascal Files (*.pas)"
-msgstr "*.java|Java Files (*.java)"
-
-#: uml.cpp:1395
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
-msgstr "*.ads *.ada|Ada Files (*.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 Files (*.h *.hh *.hpp *.hxx *.H)"
-
-#: uml.cpp:1399
-msgid "All Files"
-msgstr "All Files"
-
-#: uml.cpp:1401
-msgid "Select Code to Import"
-msgstr "Select Code to Import"
 
 #. i18n: file umbrelloui.rc line 5
 #: rc.cpp:6
@@ -3343,328 +3430,73 @@ msgstr "Role Changeability"
 msgid "Role Visibility"
 msgstr "Role Visibility"
 
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "The folderfile %1 does not exist."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "The folderfile %1 cannot be opened."
-
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Enter Activity Name"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Enter State Name"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Enter the name of the new state:"
-
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "new state"
-
-#: listpopupmenu.cpp:695 stereotype.cpp:76
-msgid "Stereotype"
-msgstr "Stereotype"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicity"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Association Name"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Role Name"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 Page %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Enter Diagram Name"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Enter the new name of the diagram:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Delete Diagram?"
-
-#: objectwidget.cpp:90
-msgid "Rename Object"
-msgstr "Rename Object"
-
-#: objectwidget.cpp:91
-msgid "Enter object name:"
-msgstr "Enter object name:"
-
-#: 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 ""
-"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."
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Add Base Class"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Add Derived Class"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Add Operation"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Add Attribute"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Add Base Interface"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Add Derived Interface"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Base Classifiers"
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Derived Classifiers"
-
-#: 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 ""
-"<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"
-
-#: 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 ""
-"<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"
-
-#: 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 ""
-"<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"
-
-#: 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 ""
-"<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"
-
-#: 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 ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-
-#: 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 ""
-"<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"
-
-#: 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 ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisation"
 
-#: 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 ""
-"<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"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Self Association"
 
-#: 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 ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Collaboration Message"
 
-#: 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 ""
-"<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"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sequence Message"
 
-#: 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 ""
-"<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"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Collaboration Self Message"
 
-#: 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 ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sequence Self Message"
 
-#: tips.cpp:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>You can turn on autosaving in the Configure Umbrello dialogue.</p>\n"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisation"
 
-#: 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 ""
-"<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"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni Association"
 
-#: tips.cpp:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Enter Activity"
 
-#: 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 ""
-"<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"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "General Options"
 
-#: 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"
-msgstr ""
-"<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 "Package is a namespace"
 
-#: tips.cpp:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtual destructors"
 
-#: 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 ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generate empty constructors"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generate accessor methods"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Incorrect use of associations."
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operations are inline"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Association Error"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Accessors are inline"
 
-#: operation.cpp:185
-msgid "new_parameter"
-msgstr "new_parameter"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Accessors are public"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -3731,11 +3563,13 @@ msgid "Change State Name..."
 msgstr "Change State Name..."
 
 #: listpopupmenu.cpp:376
-msgid "Flip Horizontal"
+#, fuzzy
+msgid "FlipQt::Horizontal"
 msgstr "Flip Horizontal"
 
 #: listpopupmenu.cpp:378
-msgid "Flip Vertical"
+#, fuzzy
+msgid "FlipQt::Vertical"
 msgstr "Flip Vertical"
 
 #: listpopupmenu.cpp:388
@@ -3960,6 +3794,177 @@ msgstr "Snap to Grid"
 msgid "Show Grid"
 msgstr "Show Grid"
 
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Rename cancelled"
+
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Renaming an item of listview type %1 is not yet implemented."
+
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Function Not Implemented"
+
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"The name you entered was invalid.\n"
+"Renaming process has been cancelled."
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Enter operation name:"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Enter role name:"
+
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Enter multiplicity:"
+
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Enter association name:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Enter new text:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERROR"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Change Text"
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicity"
+
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Association Name"
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Role Name"
+
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
+msgstr "Umbrello UML Modeller"
+
+#: main.cpp:40
+msgid "File to open"
+msgstr "File to open"
+
+#: main.cpp:41
+msgid "export diagrams to extension and exit"
+msgstr "export diagrams to extension and exit"
+
+#: 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
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "new_actor"
+
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "new_usecase"
+
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "new_package"
+
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "new_component"
+
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "new_node"
+
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "new_artifact"
+
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "new_interface"
+
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "new_datatype"
+
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "new_enum"
+
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "new_entity"
+
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "new_node"
+
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "new_object"
+
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Empty"
+
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Malformed argument"
+
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Unknown argument type"
+
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Illegal method name"
+
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Unknown return type"
+
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Unspecified error"
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Incorrect use of associations."
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Association Error"
+
 #~ msgid "new_stereotype"
 #~ msgstr "new_stereotype"