Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: tdesdk/umbrello
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdesdk/umbrello/
(cherry picked from commit df1bba1504cd4f418cfff2762e5829bf1f0ee4b9)

1 files changed, 2164 insertions, 2065 deletions

diff --git a/tde-i18n-cy/messages/tdesdk/umbrello.po b/tde-i18n-cy/messages/tdesdk/umbrello.po
index 3f3e230c020..c310dc278c6 100644
--- a/tde-i18n-cy/messages/tdesdk/umbrello.po
+++ b/tde-i18n-cy/messages/tdesdk/umbrello.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/umbrello.po\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -10,1539 +10,1718 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr ""
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Ffeil i agor"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
 msgstr ""
 
-#: docgenerators/main.cpp:64
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
+#: 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 ""
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Alinio Chwith"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Alinio Dde"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Alinio Brig"
+
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alinio Gwaelod"
+
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Yn cadw ffeil..."
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
+msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
 msgstr ""
 
-#: 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"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
 msgstr ""
 
-#: 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 "Gwall Cadw"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Gwrthrych"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Gweithrediad"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
 msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
+#: association.cpp:84
+msgid "Generalization"
 msgstr ""
 
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr ""
+
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dibyniaeth"
+
 #: association.cpp:87 worktoolbar.cpp:248
 msgid "Association"
 msgstr "Cyd"
 
+#: association.cpp:88
+msgid "Self Association"
+msgstr ""
+
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr ""
+
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr ""
+
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr ""
+
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr ""
+
 #: association.cpp:93 worktoolbar.cpp:249
 msgid "Containment"
 msgstr ""
 
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr ""
+
+#: association.cpp:95
+msgid "Realization"
+msgstr ""
+
+#: association.cpp:96
+msgid "Uni Association"
+msgstr ""
+
 #: association.cpp:97 worktoolbar.cpp:250
 msgid "Anchor"
 msgstr ""
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Label"
+#: association.cpp:98 worktoolbar.cpp:284
+msgid "State Transition"
+msgstr ""
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Noder"
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
+msgstr ""
 
-#: worktoolbar.cpp:253
-msgid "Box"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
 msgstr ""
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
 msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dibyniaeth"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr ""
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
 msgstr ""
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Perthynas"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr ""
 
-#: worktoolbar.cpp:258
-msgid "Directional Association"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
 msgstr ""
 
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
+#: 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 ""
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
+#: 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 ""
 
-#. 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 "Dosbarth"
+#: 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 ""
 
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
+#: 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 ""
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
+#: clipboard/umlclipboard.cpp:687
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an "
+"item of the same name already exists.  Any other items have been pasted."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
+#: 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 ""
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pecyn"
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "Methu Agor y Ffeil"
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid "Cannot create the folder:\n"
 msgstr ""
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nôd"
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Rhyngwyneb"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
 msgstr ""
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Uniad"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr ""
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "Plygell"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr ""
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
+#: 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 "Parod."
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: association.cpp:98 worktoolbar.cpp:284
-msgid "State Transition"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
+#: codeimport/import_utils.cpp:183
+#, fuzzy
+msgid "Namespace"
+msgstr "Enw"
+
+#: codeimport/import_utils.cpp:183 dialogs/codegenerationwizardbase.ui:249
+#: dialogs/diagramprintpage.cpp:91 dialogs/diagramprintpage.cpp:198
+#: dialogs/settingsdlg.cpp:210 listpopupmenu.cpp:609 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "Dosbarth"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Gwall Mewnol"
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Cyflwr"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
 msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
 msgstr ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Neges"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr ""
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "ANIFFINIEDIG"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Dewis"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr ""
 
-#: clipboard/umlclipboard.cpp:687
-msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
 msgstr ""
 
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: codegenerator.cpp:473
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
 msgstr ""
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
-msgstr "Methu Agor y Ffeil"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 msgstr ""
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
 msgstr ""
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
 msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
 msgstr ""
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
 msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
 msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
 msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: dialogs/activitydialog.cpp:28 dialogs/activitydialog.cpp:74
+#: dialogs/assocgenpage.cpp:55 dialogs/classpropdlg.cpp:37
+#: dialogs/classpropdlg.cpp:56 dialogs/classpropdlg.cpp:86
+#: dialogs/parmpropdlg.cpp:55 dialogs/statedialog.cpp:33
+#: dialogs/statedialog.cpp:89 dialogs/umlviewdialog.cpp:38
+#: listpopupmenu.cpp:468 refactoring/refactoringassistant.cpp:307
+#, fuzzy
+msgid "Properties"
+msgstr "&Priodweddau"
+
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
 msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 msgstr ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 msgstr ""
-"Addaswyd y ffeil gyfredol.\n"
-"Hoffech ei chadw?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Nid yw'r ffeil %1 yn bodoli!."
+#: codegenerators/cppcodegenerationformbase.ui:118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/codegenerationoptionsbase.ui:50
+#: dialogs/settingsdlg.cpp:99 dialogs/statedialog.cpp:88
+#: dialogs/umlviewdialog.cpp:70
+#, no-c-format
+msgid "General"
+msgstr "Cyffredinol"
 
-#: 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 "Gwall Llwytho"
+#: 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 "Priodweddau Cyffredinol"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: codegenerators/cppcodegenerationformbase.ui:36
+#: codegenerators/javacodegenerationformbase.ui:225
+#: codegenerators/rubycodegenerationformbase.ui:196
+#: 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/diagrampropertiespage.ui:388 dialogs/notedialog.cpp:29
+#: dialogs/parmpropdlg.cpp:100 dialogs/statedialog.cpp:104
+#: dialogs/umlrolepropertiesbase.ui:88 docwindow.cpp:33
+#, no-c-format
+msgid "Documentation"
+msgstr "Dogfenniaeth"
+
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+#, fuzzy
+msgid "Font"
+msgstr "Wynebfath:"
+
+#: 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 "Gosodiadau Ffont"
+
+#: 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 "Lliw"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
 msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
 msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+msgid "Delete"
 msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Ail-enwi"
+
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
 msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
 msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
+
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Math:"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: 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 "Gosodiadau Cyffredinol"
+
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
 msgstr ""
 
-#: 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 "Enw"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr ""
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Rhowch enw:"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#: 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"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#: 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."
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#: 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."
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, no-c-format
+msgid "Rolename:"
 msgstr ""
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, no-c-format
+msgid "Multiplicity:"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
+#: codegenerators/javacodegenerationformbase.ui:129
+#: codegenerators/javacodegenerationformbase.ui:183
+#: codegenerators/rubycodegenerationformbase.ui:100
+#: codegenerators/rubycodegenerationformbase.ui:154
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267
+#: dialogs/umlrolepropertiesbase.ui:167
+#, no-c-format
+msgid "Public"
+msgstr "Cyhoeddus"
+
+#: codegenerators/javacodegenerationformbase.ui:134
+#: codegenerators/javacodegenerationformbase.ui:188
+#: codegenerators/rubycodegenerationformbase.ui:105
+#: codegenerators/rubycodegenerationformbase.ui:159
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268
+#: dialogs/umlrolepropertiesbase.ui:178
+#, no-c-format
+msgid "Private"
+msgstr "Preivat"
+
+#: codegenerators/javacodegenerationformbase.ui:139
+#: codegenerators/javacodegenerationformbase.ui:193
+#: codegenerators/rubycodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:164
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269
+#: dialogs/umlrolepropertiesbase.ui:186
+#, no-c-format
+msgid "Protected"
+msgstr "Gwarchodir"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Dogfenniaeth"
+
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, no-c-format
+msgid "Changeable"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Use Name"
-msgstr "Enw"
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
+#, no-c-format
+msgid "Frozen"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Enter New Name"
-msgstr "Rhowch enw:"
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, no-c-format
+msgid "Add only"
+msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
 msgstr ""
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
 msgstr ""
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
 msgstr ""
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
 msgstr ""
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
 msgstr ""
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
 msgstr ""
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
 msgstr ""
 
-#: umllistview.cpp:416
+#: dialogs/classgenpage.cpp:68
 #, fuzzy
-msgid "Enter Model Name"
+msgid "Entity &name:"
 msgstr "Rhowch enw:"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
 msgstr ""
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Golygon"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr ""
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
 msgstr ""
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
 msgstr ""
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Gweithredadwyn"
+
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
 msgstr ""
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Rhagosod"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Llenwi :"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
 msgstr ""
 
-#: umllistview.cpp:2338
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabl"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "C&yhoeddus"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&reivat"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Gwa&rchodir"
+
+#: dialogs/classgenpage.cpp:186
 #, fuzzy
-msgid "Loading listview..."
-msgstr "Yn cadw ffeil..."
+msgid "Imple&mentation"
+msgstr "&Dogfenniaeth"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
 msgstr ""
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
 msgstr ""
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
 msgstr ""
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
 msgstr ""
 
-#: association.cpp:90
-msgid "Sequence Message"
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
+msgid ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Priodweddion"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Gweithrediadau"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Patrymluniau"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Newydd"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "Priodweddion"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Da&ngos"
+#: dialogs/classifierlistpage.cpp:51
+#, fuzzy
+msgid "N&ew Entity Attribute..."
+msgstr "Priodoleddau ..."
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+msgid "&Delete"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Priodweddau"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Dangos"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Gweithre&diadau"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
 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 "Dogfenniaeth"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, no-c-format
-msgid "Slash-Slash (//)"
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pec&yn"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Pri&odweddion"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, no-c-format
-msgid "Slash-Star (/**  */)"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Arddull:"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Dangos"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Dewisiadau masg"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Newidyn</b>"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "llinell"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\\\"center\\\">Llinell</p>"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\\\"center\\\">Rhestr</p>"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
-msgid "qptrlist.h"
+msgid "Code Generation Options"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Creu"
+
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Gorffen"
+
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Creu Plygell"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: 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 ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: 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 ""
 
-#. 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 "Cyhoeddus"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr ""
 
-#. 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 "Preivat"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr ""
 
-#. 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 "Gwarchodir"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "From Parent Object"
+msgid "Code Viewer"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Hidlo"
+
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Dewisiad"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Iaith"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Plygyll"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Cyflwr"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Por&i..."
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Po&ri..."
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
-msgid ""
-"Files in this folder will be used as heading files in the generated code"
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"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 ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "T&rosysgrifo"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Trosysgrifo"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Go&fyn"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
-#, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Math:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Enw:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"If a file already exists in the destination folder, select a different name to "
-"use by adding a suffix to the file name"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Llinellau"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Lliw y llinell:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "L&liw Rhagosodol"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Lliw llenwi:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Ll&iw Rhagosodol"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Lled y llinell:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Gofodnod"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Hunangadw"
+
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:148
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"<qt><p>The autosave file will be saved to ~/autosave.xmi if the autosaving "
+"occurs before you have manually saved the file.</p><p>If you've already "
+"saved it, the autosave file will be saved in the same folder as the file and "
+"will be named like the file's name, followed by the suffix specified.</"
+"p><p>If the suffix is equal to the suffix of the file you've saved, the "
+"autosave will overwrite your file automatically.</p></qt>"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Ymgychwyn"
+
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Cymhorthyn y Dydd"
+
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Dangos nodweddion"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Lliwiau"
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
-msgid "Font:"
-msgstr "Wynebfath:"
+msgid "Show operation signature"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papur :"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Wedi'u dewis:"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Enw:"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Chwyddo:"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Lliw Celfigyn"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Dangos &grid"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Snapio &i'r grid"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Cyhoeddus"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Gwar&chodir"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "&Dogfenniaeth"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
-msgid ""
-"Snap the size of the components to be a multiple of the grid spacing.\n"
-"If 'Snap to Grid' is enabled a component will always be aligned with the grid "
-"on all 4 sides."
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
+#: dialogs/umlattributedialog.cpp:163
+msgid ""
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Lled y llinell:  "
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Gwerth ragosod :"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 55
-#: rc.cpp:454 rc.cpp:457
-#, no-c-format
-msgid "The base directory used to save the images"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Priodweddion :"
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. 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"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Dim"
+
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Cynradd"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Mynega&i"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unigryw"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "plygell"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Paramedrau"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"The views are stored in folders in the document. The same tree structure used "
-"in the document to store the views can be created in the selected base "
-"directory with this option.\n"
-"Only the folders made by the user are created in the base directory (Logical "
-"view, use case view and so on aren't created)."
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
-msgid "Changeable"
+msgid "Role Properties"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, fuzzy, no-c-format
-msgid "Implementation"
-msgstr "Dogfenniaeth"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr ""
 
-#: 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"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
 msgstr ""
 
-#: tips.txt:9
+#: dialogs/umltemplatedialog.cpp:138
 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"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
 msgstr ""
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
 msgstr ""
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
 msgstr ""
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
 msgstr ""
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
 msgstr ""
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
 msgstr ""
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Llinell :"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Llenwi :"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "R&hagosodedig"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
 msgstr ""
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Yn cadw ffeil..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
+#: 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 ""
 
-#: 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"
+#: 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 "Gwall Cadw"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
 msgstr ""
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Ffeil i agor"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:76
+#: docgenerators/main.cpp:64
 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"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
 msgstr ""
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+#: 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 "Enw"
+
+#: 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 "Rhowch enw:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
 msgstr ""
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
 msgstr ""
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "GWALL"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Newid y Testun"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
 msgstr ""
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+#: 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 "Gwall Llwytho"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -1600,6 +1779,10 @@ msgstr ""
 msgid "Select Operation..."
 msgstr ""
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Newid y Testun ..."
@@ -1649,6 +1832,18 @@ msgstr "Newydd"
 msgid "Rename..."
 msgstr "Ail-enwi..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+msgid "Paste"
+msgstr ""
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Lliw y llinell..."
@@ -1679,14 +1874,26 @@ msgstr "Gwall Mewnol"
 msgid "Import Classes..."
 msgstr "Dosbarth ..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pecyn"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr ""
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr ""
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nôd"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr ""
@@ -1695,10 +1902,18 @@ msgstr ""
 msgid "Folder"
 msgstr "Plygell"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr ""
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr ""
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr ""
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr ""
@@ -1736,6 +1951,18 @@ msgstr "Priodoleddau ..."
 msgid "Export as Picture..."
 msgstr ""
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Rhyngwyneb"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr ""
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr ""
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr ""
@@ -1756,26 +1983,10 @@ msgstr ""
 msgid "Collaboration Diagram..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Priodweddion"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Gweithrediadau"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr ""
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr ""
@@ -1788,11 +1999,6 @@ msgstr ""
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Dangos"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Priodoleddau ..."
@@ -1817,14 +2023,6 @@ msgstr "Lliw Llenwad ..."
 msgid "Use Fill Color"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Lliw"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1853,10 +2051,26 @@ msgstr ""
 msgid "Package..."
 msgstr "Pecyn ..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr ""
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr ""
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Cyflwr ..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr ""
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr ""
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -1903,6 +2117,14 @@ msgstr ""
 msgid "Change Association Name..."
 msgstr ""
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr ""
@@ -1937,193 +2159,102 @@ msgstr ""
 
 #: main.cpp:43
 msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
+"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 ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr ""
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr ""
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr ""
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: 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 "Parod."
-
-#: 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 ""
-
-#: 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 ""
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr ""
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr ""
-
-#: codeimport/import_utils.cpp:183
-#, fuzzy
-msgid "Namespace"
-msgstr "Enw"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Gwall Mewnol"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
+#: model_utils.cpp:246
+msgid "new_usecase"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
+#: model_utils.cpp:248
+msgid "new_package"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
+#: model_utils.cpp:250
+msgid "new_component"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
+#: model_utils.cpp:252
+msgid "new_node"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
+#: model_utils.cpp:254
+msgid "new_artifact"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
+#: model_utils.cpp:256
+msgid "new_interface"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
+#: model_utils.cpp:258
+msgid "new_datatype"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
+#: model_utils.cpp:260
+msgid "new_enum"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
+#: model_utils.cpp:262
+msgid "new_entity"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "plygell"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: model_utils.cpp:268
+msgid "new_object"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr ""
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Gwag"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#: model_utils.cpp:559
+msgid "Malformed argument"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
+#: model_utils.cpp:560
+msgid "Illegal method name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
+#: model_utils.cpp:561
+msgid "Unknown return type"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
+#: model_utils.cpp:561
+msgid "Unspecified error"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
 msgstr ""
 
 #: objectwidget.cpp:90
@@ -2138,101 +2269,65 @@ msgstr ""
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr ""
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: umlview.cpp:2578
-#, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Rhowch enw:"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
 msgstr ""
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
 msgstr ""
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
 msgstr ""
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
 msgstr ""
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
 msgstr ""
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
 msgstr ""
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
 msgstr ""
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
 msgstr ""
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
 msgstr ""
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
+#: statewidget.cpp:176
+msgid "Enter Activity"
 msgstr ""
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
 msgstr ""
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
 msgstr ""
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
 msgstr ""
 
 #: uml.cpp:179
@@ -2388,11 +2483,6 @@ msgstr ""
 msgid "Export &All Diagrams as Pictures..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Priodweddau"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr ""
@@ -2477,14 +2567,21 @@ msgstr "&Dogfenniaeth"
 msgid "Opening file..."
 msgstr "Agor ffeil..."
 
+#: uml.cpp:519 uml.cpp:591 uml.cpp:717 umldoc.cpp:232 umldoc.cpp:312
+#: umldoc.cpp:356 umldoc.cpp:381 umldoc.cpp:423 umldoc.cpp:435 umldoc.cpp:449
+#: umldoc.cpp:462 umldoc.cpp:473 umldoc.cpp:634 umldoc.cpp:642 umldoc.cpp:2103
+#: umldoc.cpp:2106
+msgid "Untitled"
+msgstr ""
+
 #: uml.cpp:650
 msgid "Creating new document..."
 msgstr "Yn creu dogfen newydd..."
 
 #: uml.cpp:673
 msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.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"
@@ -2511,12 +2608,20 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
 "Do you wish to overwrite it?"
 msgstr ""
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Trosysgrifo"
@@ -2552,8 +2657,8 @@ msgstr "Yn mewnosod cynnwys y clipfwrdd..."
 
 #: 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."
+"Umbrello could not paste the clipboard contents.  The objects in the "
+"clipboard may be of the wrong type to be pasted here."
 msgstr ""
 
 #: uml.cpp:863
@@ -2608,1232 +2713,1226 @@ msgstr "Pob Ffeil"
 msgid "Select Code to Import"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:68
-#, fuzzy
-msgid "Entity &name:"
-msgstr "Rhowch enw:"
-
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Gweithredadwyn"
-
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
+#: umldoc.cpp:108
+msgid "Component View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Rhagosod"
-
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabl"
-
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "C&yhoeddus"
-
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&reivat"
-
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Gwa&rchodir"
-
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "&Dogfenniaeth"
-
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"Addaswyd y ffeil gyfredol.\n"
+"Hoffech ei chadw?"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr ""
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Nid yw'r ffeil %1 yn bodoli!."
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
-msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Llinell :"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Llenwi :"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "R&hagosodedig"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Ail-enwi"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
+#: umldoc.cpp:942
+msgid "state diagram"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+#: umldoc.cpp:944
+msgid "activity diagram"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:946
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: 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 "Gosodiadau Cyffredinol"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: 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 "Gosodiadau Ffont"
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "Priodweddau Cyffredinol"
-
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Math:"
-
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Enw:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Enw"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr ""
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "Rhowch enw:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Gwerth ragosod :"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Priodweddion :"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Dim"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Cynradd"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Mynega&i"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unigryw"
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "Rhowch enw:"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr ""
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Golygon"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistview.cpp:1906
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Dangos"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr ""
+#: umllistview.cpp:2338
+#, fuzzy
+msgid "Loading listview..."
+msgstr "Yn cadw ffeil..."
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Math:"
-
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Lliw y llinell:"
-
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "L&liw Rhagosodol"
-
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Lliw llenwi:"
-
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Ll&iw Rhagosodol"
-
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Lled y llinell:"
-
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr ""
+#: umlview.cpp:2578
+#, fuzzy
+msgid "Enter Diagram Name"
+msgstr "Rhowch enw:"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Hunangadw"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr ""
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Terfynu..."
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:148
+#: umlviewimageexporter.cpp:66
 msgid ""
-"<qt>"
-"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
-"before you have manually saved the file.</p>"
-"<p>If you've already saved it, the autosave file will be saved in the same "
-"folder as the file and will be named like the file's name, followed by the "
-"suffix specified.</p>"
-"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
-"will overwrite your file automatically.</p></qt>"
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Ymgychwyn"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Ffeil yn Bodoli'n Barod"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Cymhorthyn y Dydd"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
+#: 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 ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
+#: 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 ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr ""
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Gwrthrych"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr ""
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Label"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr ""
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Noder"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
+#: worktoolbar.cpp:253
+msgid "Box"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr ""
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Perthynas"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Dangos nodweddion"
-
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr ""
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Uniad"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr ""
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "Plygell"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr ""
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Neges"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr ""
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "ANIFFINIEDIG"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr ""
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Dewis"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Gwar&chodir"
-
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "&Dogfenniaeth"
-
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Paramedrau"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Gweithrediad"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Rhowch enw:"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Dewisiadau Cyffredinol"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
 msgid ""
-"The parameter name you have chosen is already being used in this operation."
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Cyd"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Rhagosod"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Arddull:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Patrymluniau"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Newidyn</b>"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Priodweddion"
-
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "Priodoleddau ..."
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "llinell"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\\\"center\\\">Llinell</p>"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\\\"center\\\">Rhestr</p>"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Cyhoeddus"
-
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Hidlo"
-
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Dewisiad"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Iaith"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Plygyll"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Dewisiadau masg"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Por&i..."
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Po&ri..."
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
+#: dialogs/codegenerationoptionsbase.ui:214
+#, no-c-format
+msgid ""
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
 msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "T&rosysgrifo"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Gweithre&diadau"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Go&fyn"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pec&yn"
-
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Pri&odweddion"
-
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
+msgid ""
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Llinellau"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
 msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Lliw Celfigyn"
-
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
 msgstr ""
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
 msgstr ""
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
 msgstr ""
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Gofodnod"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Creu"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Gorffen"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: dialogs/codegenerationoptionsbase.ui:436
+#, no-c-format
+msgid ""
+"Writes comments to indicate the different sections (public, private etc) in "
+"a class, even if the sections are empty"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Creu Plygell"
-
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
 msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:31
-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."
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Trosysgrifo"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
 msgstr ""
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Lliwiau"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Wynebfath:"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papur :"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Wedi'u dewis:"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
 msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
 msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "GWALL"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Newid y Testun"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Alinio Chwith"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Chwyddo:"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Alinio Dde"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Alinio Brig"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Dangos &grid"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alinio Gwaelod"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Snapio &i'r grid"
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
+msgid ""
+"Snap the size of the components to be a multiple of the grid spacing.\n"
+"If 'Snap to Grid' is enabled a component will always be aligned with the "
+"grid on all 4 sides."
 msgstr ""
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
+
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
+
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Lled y llinell:  "
+
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
 msgstr ""
 
-#: aligntoolbar.cpp:383
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: object_factory.cpp:164
-msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
 msgstr ""
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Terfynu..."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "plygell"
 
-#: umlviewimageexporter.cpp:50
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"An error happened when exporting the image:\n"
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: umlviewimageexporter.cpp:66
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"The views are stored in folders in the document. The same tree structure "
+"used in the document to store the views can be created in the selected base "
+"directory with this option.\n"
+"Only the folders made by the user are created in the base directory (Logical "
+"view, use case view and so on aren't created)."
 msgstr ""
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Ffeil yn Bodoli'n Barod"
-
-#: model_utils.cpp:244
-msgid "new_actor"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: model_utils.cpp:246
-msgid "new_usecase"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
 msgstr ""
 
-#: model_utils.cpp:248
-msgid "new_package"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: model_utils.cpp:250
-msgid "new_component"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
 
-#: model_utils.cpp:252
-msgid "new_node"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
 msgstr ""
 
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr ""
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Newydd"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr ""
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Da&ngos"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr ""
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Chwyddo:"
 
-#: model_utils.cpp:260
-msgid "new_enum"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
 msgstr ""
 
-#: model_utils.cpp:262
-msgid "new_entity"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
 msgstr ""
 
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "plygell"
+#: tips:3
+msgid ""
+"<p>Welcome to Umbrello.</p>\n"
+"\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 ""
 
-#: model_utils.cpp:268
-msgid "new_object"
+#: tips:11
+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 ""
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Gwag"
+#: tips:17
+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 ""
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
+#: tips:23
+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 ""
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: tips:30
+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 ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: tips:36
+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 ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: tips:44
+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 ""
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: tips:51
+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 ""
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
+#: tips:63
+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 ""
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
+#: tips:71
+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 ""
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
+#: tips:78
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
+#: tips:90
+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 ""
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
+#: tips:107
+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 ""
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
+#: tips:114
+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 ""
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+#: tips:127
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
 msgstr ""
 
 #~ msgid "Enables/disables the toolbar"